Compare commits

..

No commits in common. "master" and "0.11.1" have entirely different histories.

5 changed files with 336 additions and 476 deletions

View File

@ -2,7 +2,7 @@ import type { JestConfigWithTsJest } from "ts-jest";
const config: JestConfigWithTsJest = { const config: JestConfigWithTsJest = {
preset: "ts-jest", preset: "ts-jest",
testEnvironment: "jest-fixed-jsdom", testEnvironment: "jsdom",
collectCoverage: true, collectCoverage: true,
coveragePathIgnorePatterns: ["node_modules", "dist"], coveragePathIgnorePatterns: ["node_modules", "dist"],
coverageDirectory: "<rootDir>/coverage/", coverageDirectory: "<rootDir>/coverage/",

View File

@ -13,8 +13,7 @@
"packageManager": "yarn@4.4.1", "packageManager": "yarn@4.4.1",
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.7.0", "@eslint/js": "^9.7.0",
"@mui/system": "^7.1.0", "@mui/utils": "^6.1.3",
"@mui/utils": "^7.1.0",
"@testing-library/dom": "^10.4.0", "@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.0.0", "@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^16.0.0", "@testing-library/react": "^16.0.0",
@ -37,10 +36,9 @@
"jest": "^29.7.0", "jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0", "jest-environment-jsdom": "^29.7.0",
"jest-fetch-mock": "^3.0.3", "jest-fetch-mock": "^3.0.3",
"jest-fixed-jsdom": "^0.0.9",
"prettier": "^3.3.3", "prettier": "^3.3.3",
"react-test-renderer": "^18.3.1", "react-test-renderer": "^18.3.1",
"ts-jest": "^29.3.4", "ts-jest": "^29.2.3",
"ts-node": "^10.9.2", "ts-node": "^10.9.2",
"typescript": "^5.4.5", "typescript": "^5.4.5",
"typescript-eslint": "^8.32.1", "typescript-eslint": "^8.32.1",
@ -48,31 +46,31 @@
"vite-plugin-version-mark": "^0.1.0" "vite-plugin-version-mark": "^0.1.0"
}, },
"dependencies": { "dependencies": {
"@emotion/react": "^11.14.0", "@emotion/react": "^11.13.0",
"@emotion/styled": "^11.14.0", "@emotion/styled": "^11.13.0",
"@haleos/ra-language-german": "^1.0.0", "@haleos/ra-language-german": "^1.0.0",
"@haxqer/ra-language-chinese": "^4.16.2", "@haxqer/ra-language-chinese": "^4.16.2",
"@mui/icons-material": "^7.1.0", "@mui/icons-material": "^5.16.4",
"@mui/material": "^7.1.0", "@mui/material": "^5.16.4",
"@tanstack/react-query": "^5.59.12", "@tanstack/react-query": "^5.59.12",
"history": "^5.3.0", "history": "^5.3.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"papaparse": "^5.4.1", "papaparse": "^5.4.1",
"query-string": "^7.1.3", "query-string": "^7.1.3",
"ra-core": "^5.8.3", "ra-core": "^5.2.3",
"ra-i18n-polyglot": "^5.8.3", "ra-i18n-polyglot": "^5.2.3",
"ra-language-english": "^5.8.3", "ra-language-english": "^5.8.2",
"ra-language-farsi": "^5.0.0", "ra-language-farsi": "^5.0.0",
"ra-language-french": "^5.8.3", "ra-language-french": "^5.2.3",
"ra-language-italian": "^3.13.1", "ra-language-italian": "^3.13.1",
"ra-language-russian": "^4.14.2", "ra-language-russian": "^4.14.2",
"react": "^18.3.1", "react": "^18.3.1",
"react-admin": "^5.8.3", "react-admin": "^5.2.3",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
"react-hook-form": "^7.52.1", "react-hook-form": "^7.52.1",
"react-is": "^18.3.1", "react-is": "^18.3.1",
"react-router": "^7.6.1", "react-router": "6.27.0",
"react-router-dom": "^7.6.1" "react-router-dom": "6.27.0"
}, },
"scripts": { "scripts": {
"start": "vite serve", "start": "vite serve",

View File

@ -21,7 +21,6 @@ import userMediaStats from "./resources/user_media_statistics";
import users from "./resources/users"; import users from "./resources/users";
import authProvider from "./synapse/authProvider"; import authProvider from "./synapse/authProvider";
import dataProvider from "./synapse/dataProvider"; import dataProvider from "./synapse/dataProvider";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
// TODO: Can we use lazy loading together with browser locale? // TODO: Can we use lazy loading together with browser locale?
const messages = { const messages = {
@ -46,40 +45,36 @@ const i18nProvider = polyglotI18nProvider(
] ]
); );
const queryClient = new QueryClient();
const App = () => ( const App = () => (
<QueryClientProvider client={queryClient}> <Admin
<Admin disableTelemetry
disableTelemetry requireAuth
requireAuth loginPage={LoginPage}
loginPage={LoginPage} authProvider={authProvider}
authProvider={authProvider} dataProvider={dataProvider}
dataProvider={dataProvider} i18nProvider={i18nProvider}
i18nProvider={i18nProvider} >
> <CustomRoutes>
<CustomRoutes> <Route path="/import_users" element={<ImportFeature />} />
<Route path="/import_users" element={<ImportFeature />} /> </CustomRoutes>
</CustomRoutes> <Resource {...users} />
<Resource {...users} /> <Resource {...rooms} />
<Resource {...rooms} /> <Resource {...userMediaStats} />
<Resource {...userMediaStats} /> <Resource {...reports} />
<Resource {...reports} /> <Resource {...roomDirectory} />
<Resource {...roomDirectory} /> <Resource {...destinations} />
<Resource {...destinations} /> <Resource {...registrationToken} />
<Resource {...registrationToken} /> <Resource name="connections" />
<Resource name="connections" /> <Resource name="devices" />
<Resource name="devices" /> <Resource name="room_members" />
<Resource name="room_members" /> <Resource name="users_media" />
<Resource name="users_media" /> <Resource name="joined_rooms" />
<Resource name="joined_rooms" /> <Resource name="pushers" />
<Resource name="pushers" /> <Resource name="servernotices" />
<Resource name="servernotices" /> <Resource name="forward_extremities" />
<Resource name="forward_extremities" /> <Resource name="room_state" />
<Resource name="room_state" /> <Resource name="destination_rooms" />
<Resource name="destination_rooms" /> </Admin>
</Admin>
</QueryClientProvider>
); );
export default App; export default App;

View File

@ -80,6 +80,11 @@ const UserListActions = () => {
); );
}; };
UserListActions.defaultProps = {
selectedIds: [],
onUnselectItems: () => null,
};
const UserPagination = () => <Pagination rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />; const UserPagination = () => <Pagination rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />;
const userFilters = [ const userFilters = [

714
yarn.lock

File diff suppressed because it is too large Load Diff