Create node.js.yml

bring up2date

.env

@@ -1,5 +0,0 @@
-# This setting allows to fix the homeserver.
-# If you set this setting, the user will not be able to select
-# the server and have to use synapse-admin with this server.
-
-#REACT_APP_SERVER=https://yourmatrixserver.example.com

.github/workflows/node.js.yml

@@ -0,0 +1,29 @@
+name: Create release tarball and attach to tag
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+      - run: yarn install
+      - run: yarn build
+      - run: |
+          version=`git describe --dirty --tags || echo unknown`
+          mkdir -p dist
+          cp -r build synapse-admin-$version
+          tar chvzf dist/synapse-admin-$version.tar.gz synapse-admin-$version
+          rm -r synapse-admin-$version
+      - uses: softprops/action-gh-release@b7e450da2a4b4cb4bfbae528f788167786cfcedf
+        with:
+          files: dist/*.tar.gz
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - lts/*
+  - 13
 
 cache: yarn

README.md

@@ -4,7 +4,7 @@
 
 This project is built using [react-admin](https://marmelab.com/react-admin/).
 
-It needs at least Synapse v1.34.0 for all functions to work as expected!
+It needs at least Synapse v1.23.0 for all functions to work as expected!
 
 You get your server version with the request `/_synapse/admin/v1/server_version`.
 See also [Synapse version API](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/version_api.rst).
@@ -33,11 +33,6 @@ Steps for 1):
 - download dependencies: `yarn install`
 - start web server: `yarn start`
 
-You can fix the homeserver, so that the user can no longer define it himself.
-Either you define it at startup (e.g. `REACT_APP_SERVER=https://yourmatrixserver.example.com yarn start`)
-or by editing it in the [.env](.env) file. See also the
-[documentation](https://create-react-app.dev/docs/adding-custom-environment-variables/).
-
 Steps for 2):
 
 - run the Docker container from the public docker registry: `docker run -p 8080:80 awesometechnologies/synapse-admin` or use the (docker-compose.yml)[docker-compose.yml]: `docker-compose up -d`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "synapse-admin",
-  "version": "0.8.2",
+  "version": "0.7.0",
   "description": "Admin GUI for the Matrix.org server Synapse",
   "author": "Awesome Technologies Innovationslabor GmbH",
   "license": "Apache-2.0",
@@ -11,24 +11,25 @@
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.1.1",
-    "@testing-library/react": "^11.2.6",
+    "@testing-library/react": "^10.0.2",
-    "@testing-library/user-event": "^13.1.8",
+    "@testing-library/user-event": "^12.0.11",
-    "eslint": "^7.25.0",
+    "enzyme": "^3.11.0",
-    "eslint-config-prettier": "^8.3.0",
+    "enzyme-adapter-react-16": "^1.15.2",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.2",
     "jest-fetch-mock": "^3.0.3",
-    "prettier": "^2.2.0",
+    "prettier": "^2.0.0",
-    "ra-test": "^3.15.0"
+    "ra-test": "^3.14.0"
   },
   "dependencies": {
     "papaparse": "^5.2.0",
     "prop-types": "^15.7.2",
-    "ra-language-chinese": "^2.0.10",
+    "ra-language-german": "^2.1.2",
-    "ra-language-german": "^3.13.4",
     "react": "^17.0.0",
-    "react-admin": "^3.15.0",
+    "react-admin": "^3.14.0",
-    "react-dom": "^17.0.2",
+    "react-dom": "^16.14.0",
-    "react-scripts": "^4.0.0"
+    "react-scripts": "^3.4.4"
   },
   "scripts": {
     "start": "REACT_APP_VERSION=$(git describe --tags) react-scripts start",

src/App.js

@@ -12,19 +12,15 @@ import EqualizerIcon from "@material-ui/icons/Equalizer";
 import { UserMediaStatsList } from "./components/statistics";
 import RoomIcon from "@material-ui/icons/ViewList";
 import ReportIcon from "@material-ui/icons/Warning";
-import FolderSharedIcon from "@material-ui/icons/FolderShared";
 import { ImportFeature } from "./components/ImportFeature";
-import { RoomDirectoryList } from "./components/RoomDirectory";
 import { Route } from "react-router-dom";
 import germanMessages from "./i18n/de";
 import englishMessages from "./i18n/en";
-import chineseMessages from "./i18n/zh";
 
 // TODO: Can we use lazy loading together with browser locale?
 const messages = {
   de: germanMessages,
   en: englishMessages,
-  zh: chineseMessages,
 };
 const i18nProvider = polyglotI18nProvider(
   locale => (messages[locale] ? messages[locale] : messages.en),
@@ -61,11 +57,6 @@ const App = () => (
       show={ReportShow}
       icon={ReportIcon}
     />
-    <Resource
-      name="room_directory"
-      list={RoomDirectoryList}
-      icon={FolderSharedIcon}
-    />
     <Resource name="connections" />
     <Resource name="devices" />
     <Resource name="room_members" />
@@ -73,8 +64,6 @@ const App = () => (
     <Resource name="joined_rooms" />
     <Resource name="pushers" />
     <Resource name="servernotices" />
-    <Resource name="forward_extremities" />
-    <Resource name="room_state" />
   </Admin>
 );
 

src/App.test.js

@@ -1,9 +1,14 @@
 import React from "react";
-import { render } from "@testing-library/react";
+import { TestContext } from "ra-test";
+import { shallow } from "enzyme";
 import App from "./App";
 
 describe("App", () => {
   it("renders", () => {
-    render(<App />);
+    shallow(
+      <TestContext>
+        <App />
+      </TestContext>
+    );
   });
 });

src/components/LoginPage.js

@@ -82,7 +82,6 @@ const LoginPage = ({ theme }) => {
   const setLocale = useSetLocale();
   const translate = useTranslate();
   const base_url = localStorage.getItem("base_url");
-  const cfg_base_url = process.env.REACT_APP_SERVER;
 
   const renderInput = ({
     meta: { touched, error } = {},
@@ -112,9 +111,7 @@ const LoginPage = ({ theme }) => {
       if (!values.base_url.match(/^(http|https):\/\//)) {
         errors.base_url = translate("synapseadmin.auth.protocol_error");
       } else if (
-        !values.base_url.match(
+        !values.base_url.match(/^(http|https):\/\/[a-zA-Z0-9\-.]+(:\d{1,5})?$/)
-          /^(http|https):\/\/[a-zA-Z0-9\-.]+(:\d{1,5})?[^?&\s]*$/
-        )
       ) {
         errors.base_url = translate("synapseadmin.auth.url_error");
       }
@@ -150,7 +147,7 @@ const LoginPage = ({ theme }) => {
     const [serverVersion, setServerVersion] = useState("");
 
     const handleUsernameChange = _ => {
-      if (formData.base_url || cfg_base_url) return;
+      if (formData.base_url) return;
       // check if username is a full qualified userId then set base_url accordially
       const home_server = extractHomeServer(formData.username);
       const wellKnownUrl = `https://${home_server}/.well-known/matrix/client`;
@@ -202,7 +199,6 @@ const LoginPage = ({ theme }) => {
             label={translate("ra.auth.username")}
             disabled={loading}
             onBlur={handleUsernameChange}
-            resettable
             fullWidth
           />
         </div>
@@ -213,7 +209,6 @@ const LoginPage = ({ theme }) => {
             label={translate("ra.auth.password")}
             type="password"
             disabled={loading}
-            resettable
             fullWidth
           />
         </div>
@@ -222,8 +217,7 @@ const LoginPage = ({ theme }) => {
             name="base_url"
             component={renderInput}
             label={translate("synapseadmin.auth.base_url")}
-            disabled={cfg_base_url || loading}
+            disabled={loading}
-            resettable
             fullWidth
           />
         </div>
@@ -234,7 +228,7 @@ const LoginPage = ({ theme }) => {
 
   return (
     <Form
-      initialValues={{ base_url: cfg_base_url || base_url }}
+      initialValues={{ base_url: base_url }}
       onSubmit={handleSubmit}
       validate={validate}
       render={({ handleSubmit }) => (
@@ -261,7 +255,6 @@ const LoginPage = ({ theme }) => {
                   >
                     <MenuItem value="de">Deutsch</MenuItem>
                     <MenuItem value="en">English</MenuItem>
-                    <MenuItem value="zh">简体中文</MenuItem>
                   </Select>
                 </div>
                 <FormDataConsumer>

src/components/LoginPage.test.js

@@ -1,11 +1,11 @@
 import React from "react";
-import { render } from "@testing-library/react";
 import { TestContext } from "ra-test";
+import { shallow } from "enzyme";
 import LoginPage from "./LoginPage";
 
 describe("LoginForm", () => {
   it("renders", () => {
-    render(
+    shallow(
       <TestContext>
         <LoginPage />
       </TestContext>

src/components/RoomDirectory.js

@@ -1,256 +0,0 @@
-import React, { Fragment } from "react";
-import Avatar from "@material-ui/core/Avatar";
-import { Chip } from "@material-ui/core";
-import { connect } from "react-redux";
-import FolderSharedIcon from "@material-ui/icons/FolderShared";
-import { makeStyles } from "@material-ui/core/styles";
-import {
-  BooleanField,
-  BulkDeleteButton,
-  Button,
-  Datagrid,
-  DeleteButton,
-  Filter,
-  List,
-  NumberField,
-  Pagination,
-  TextField,
-  useCreate,
-  useMutation,
-  useNotify,
-  useTranslate,
-  useRefresh,
-  useUnselectAll,
-} from "react-admin";
-
-const useStyles = makeStyles({
-  small: {
-    height: "40px",
-    width: "40px",
-  },
-});
-
-const RoomDirectoryPagination = props => (
-  <Pagination {...props} rowsPerPageOptions={[100, 500, 1000, 2000]} />
-);
-
-export const RoomDirectoryDeleteButton = props => {
-  const translate = useTranslate();
-
-  return (
-    <DeleteButton
-      {...props}
-      label="resources.room_directory.action.erase"
-      redirect={false}
-      mutationMode="pessimistic"
-      confirmTitle={translate("resources.room_directory.action.title", {
-        smart_count: 1,
-      })}
-      confirmContent={translate("resources.room_directory.action.content", {
-        smart_count: 1,
-      })}
-      resource="room_directory"
-      icon={<FolderSharedIcon />}
-    />
-  );
-};
-
-export const RoomDirectoryBulkDeleteButton = props => (
-  <BulkDeleteButton
-    {...props}
-    label="resources.room_directory.action.erase"
-    undoable={false}
-    confirmTitle="resources.room_directory.action.title"
-    confirmContent="resources.room_directory.action.content"
-    resource="room_directory"
-    icon={<FolderSharedIcon />}
-  />
-);
-
-export const RoomDirectoryBulkSaveButton = ({ selectedIds }) => {
-  const notify = useNotify();
-  const refresh = useRefresh();
-  const unselectAll = useUnselectAll();
-  const [createMany, { loading }] = useMutation();
-
-  const handleSend = values => {
-    createMany(
-      {
-        type: "createMany",
-        resource: "room_directory",
-        payload: { ids: selectedIds, data: {} },
-      },
-      {
-        onSuccess: ({ data }) => {
-          notify("resources.room_directory.action.send_success");
-          unselectAll("rooms");
-          refresh();
-        },
-        onFailure: error =>
-          notify("resources.room_directory.action.send_failure", "error"),
-      }
-    );
-  };
-
-  return (
-    <Button
-      label="resources.room_directory.action.create"
-      onClick={handleSend}
-      disabled={loading}
-    >
-      <FolderSharedIcon />
-    </Button>
-  );
-};
-
-export const RoomDirectorySaveButton = ({ record }) => {
-  const notify = useNotify();
-  const refresh = useRefresh();
-  const [create, { loading }] = useCreate("room_directory");
-
-  const handleSend = values => {
-    create(
-      {
-        payload: { data: { id: record.id } },
-      },
-      {
-        onSuccess: ({ data }) => {
-          notify("resources.room_directory.action.send_success");
-          refresh();
-        },
-        onFailure: error =>
-          notify("resources.room_directory.action.send_failure", "error"),
-      }
-    );
-  };
-
-  return (
-    <Button
-      label="resources.room_directory.action.create"
-      onClick={handleSend}
-      disabled={loading}
-    >
-      <FolderSharedIcon />
-    </Button>
-  );
-};
-
-const RoomDirectoryBulkActionButtons = props => (
-  <Fragment>
-    <RoomDirectoryBulkDeleteButton {...props} />
-  </Fragment>
-);
-
-const AvatarField = ({ source, className, record = {} }) => (
-  <Avatar src={record[source]} className={className} />
-);
-
-const RoomDirectoryFilter = ({ ...props }) => {
-  const translate = useTranslate();
-  return (
-    <Filter {...props}>
-      <Chip
-        label={translate("resources.rooms.fields.room_id")}
-        source="room_id"
-        defaultValue={false}
-        style={{ marginBottom: 8 }}
-      />
-      <Chip
-        label={translate("resources.rooms.fields.topic")}
-        source="topic"
-        defaultValue={false}
-        style={{ marginBottom: 8 }}
-      />
-      <Chip
-        label={translate("resources.rooms.fields.canonical_alias")}
-        source="canonical_alias"
-        defaultValue={false}
-        style={{ marginBottom: 8 }}
-      />
-    </Filter>
-  );
-};
-
-export const FilterableRoomDirectoryList = ({
-  roomDirectoryFilters,
-  dispatch,
-  ...props
-}) => {
-  const classes = useStyles();
-  const translate = useTranslate();
-  const filter = roomDirectoryFilters;
-  const roomIdFilter = filter && filter.room_id ? true : false;
-  const topicFilter = filter && filter.topic ? true : false;
-  const canonicalAliasFilter = filter && filter.canonical_alias ? true : false;
-
-  return (
-    <List
-      {...props}
-      pagination={<RoomDirectoryPagination />}
-      bulkActionButtons={<RoomDirectoryBulkActionButtons />}
-      filters={<RoomDirectoryFilter />}
-      perPage={100}
-    >
-      <Datagrid>
-        <AvatarField
-          source="avatar_src"
-          sortable={false}
-          className={classes.small}
-          label={translate("resources.rooms.fields.avatar")}
-        />
-        <TextField
-          source="name"
-          sortable={false}
-          label={translate("resources.rooms.fields.name")}
-        />
-        {roomIdFilter && (
-          <TextField
-            source="room_id"
-            sortable={false}
-            label={translate("resources.rooms.fields.room_id")}
-          />
-        )}
-        {canonicalAliasFilter && (
-          <TextField
-            source="canonical_alias"
-            sortable={false}
-            label={translate("resources.rooms.fields.canonical_alias")}
-          />
-        )}
-        {topicFilter && (
-          <TextField
-            source="topic"
-            sortable={false}
-            label={translate("resources.rooms.fields.topic")}
-          />
-        )}
-        <NumberField
-          source="num_joined_members"
-          sortable={false}
-          label={translate("resources.rooms.fields.joined_members")}
-        />
-        <BooleanField
-          source="world_readable"
-          sortable={false}
-          label={translate("resources.room_directory.fields.world_readable")}
-        />
-        <BooleanField
-          source="guest_can_join"
-          sortable={false}
-          label={translate("resources.room_directory.fields.guest_can_join")}
-        />
-      </Datagrid>
-    </List>
-  );
-};
-
-function mapStateToProps(state) {
-  return {
-    roomDirectoryFilters:
-      state.admin.resources.room_directory.list.params.displayedFilters,
-  };
-}
-
-export const RoomDirectoryList = connect(mapStateToProps)(
-  FilterableRoomDirectoryList
-);

src/components/rooms.js

@@ -2,13 +2,11 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import {
   BooleanField,
-  BulkDeleteButton,
+  BulkDeleteWithConfirmButton,
-  DateField,
   Datagrid,
   DeleteButton,
   Filter,
   List,
-  NumberField,
   Pagination,
   ReferenceField,
   ReferenceManyField,
@@ -19,34 +17,16 @@ import {
   TabbedShowLayout,
   TextField,
   TopToolbar,
-  useRecordContext,
   useTranslate,
 } from "react-admin";
 import get from "lodash/get";
-import PropTypes from "prop-types";
-import { makeStyles } from "@material-ui/core/styles";
 import { Tooltip, Typography, Chip } from "@material-ui/core";
-import FastForwardIcon from "@material-ui/icons/FastForward";
 import HttpsIcon from "@material-ui/icons/Https";
 import NoEncryptionIcon from "@material-ui/icons/NoEncryption";
 import PageviewIcon from "@material-ui/icons/Pageview";
 import UserIcon from "@material-ui/icons/Group";
 import ViewListIcon from "@material-ui/icons/ViewList";
 import VisibilityIcon from "@material-ui/icons/Visibility";
-import EventIcon from "@material-ui/icons/Event";
-import {
-  RoomDirectoryBulkDeleteButton,
-  RoomDirectoryBulkSaveButton,
-  RoomDirectoryDeleteButton,
-  RoomDirectorySaveButton,
-} from "./RoomDirectory";
-
-const useStyles = makeStyles(theme => ({
-  helper_forward_extremities: {
-    fontFamily: "Roboto, Helvetica, Arial, sans-serif",
-    margin: "0.5em",
-  },
-}));
 
 const RoomPagination = props => (
   <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
@@ -93,33 +73,22 @@ const RoomTitle = ({ record }) => {
 };
 
 const RoomShowActions = ({ basePath, data, resource }) => {
-  var roomDirectoryStatus = "";
+  const translate = useTranslate();
-  if (data) {
-    roomDirectoryStatus = data.public;
-  }
-
   return (
     <TopToolbar>
-      {roomDirectoryStatus === false && (
-        <RoomDirectorySaveButton record={data} />
-      )}
-      {roomDirectoryStatus === true && (
-        <RoomDirectoryDeleteButton record={data} />
-      )}
       <DeleteButton
         basePath={basePath}
         record={data}
         resource={resource}
-        mutationMode="pessimistic"
+        undoable={false}
-        confirmTitle="resources.rooms.action.erase.title"
+        confirmTitle={translate("synapseadmin.rooms.delete.title")}
-        confirmContent="resources.rooms.action.erase.content"
+        confirmContent={translate("synapseadmin.rooms.delete.message")}
       />
     </TopToolbar>
   );
 };
 
 export const RoomShow = props => {
-  const classes = useStyles({ props });
   const translate = useTranslate();
   return (
     <Show {...props} actions={<RoomShowActions />} title={<RoomTitle />}>
@@ -128,9 +97,7 @@ export const RoomShow = props => {
           <TextField source="room_id" />
           <TextField source="name" />
           <TextField source="canonical_alias" />
-          <ReferenceField source="creator" reference="users">
+          <TextField source="creator" />
-            <TextField source="id" />
-          </ReferenceField>
         </Tab>
 
         <Tab
@@ -140,7 +107,6 @@ export const RoomShow = props => {
         >
           <TextField source="joined_members" />
           <TextField source="joined_local_members" />
-          <TextField source="joined_local_devices" />
           <TextField source="state_events" />
           <TextField source="version" />
           <TextField
@@ -231,77 +197,6 @@ export const RoomShow = props => {
             ]}
           />
         </Tab>
-
-        <Tab
-          label={translate("resources.room_state.name", { smart_count: 2 })}
-          icon={<EventIcon />}
-          path="state"
-        >
-          <ReferenceManyField
-            reference="room_state"
-            target="room_id"
-            addLabel={false}
-          >
-            <Datagrid style={{ width: "100%" }}>
-              <TextField source="type" sortable={false} />
-              <DateField
-                source="origin_server_ts"
-                showTime
-                options={{
-                  year: "numeric",
-                  month: "2-digit",
-                  day: "2-digit",
-                  hour: "2-digit",
-                  minute: "2-digit",
-                  second: "2-digit",
-                }}
-                sortable={false}
-              />
-              <TextField source="content" sortable={false} />
-              <ReferenceField
-                source="sender"
-                reference="users"
-                sortable={false}
-              >
-                <TextField source="id" />
-              </ReferenceField>
-            </Datagrid>
-          </ReferenceManyField>
-        </Tab>
-
-        <Tab
-          label="resources.forward_extremities.name"
-          icon={<FastForwardIcon />}
-          path="forward_extremities"
-        >
-          <div className={classes.helper_forward_extremities}>
-            {translate("resources.rooms.helper.forward_extremities")}
-          </div>
-          <ReferenceManyField
-            reference="forward_extremities"
-            target="room_id"
-            addLabel={false}
-          >
-            <Datagrid style={{ width: "100%" }}>
-              <TextField source="id" sortable={false} />
-              <DateField
-                source="received_ts"
-                showTime
-                options={{
-                  year: "numeric",
-                  month: "2-digit",
-                  day: "2-digit",
-                  hour: "2-digit",
-                  minute: "2-digit",
-                  second: "2-digit",
-                }}
-                sortable={false}
-              />
-              <NumberField source="depth" sortable={false} />
-              <TextField source="state_group" sortable={false} />
-            </Datagrid>
-          </ReferenceManyField>
-        </Tab>
       </TabbedShowLayout>
     </Show>
   );
@@ -309,14 +204,7 @@ export const RoomShow = props => {
 
 const RoomBulkActionButtons = props => (
   <Fragment>
-    <RoomDirectoryBulkSaveButton {...props} />
+    <BulkDeleteWithConfirmButton {...props} />
-    <RoomDirectoryBulkDeleteButton {...props} />
-    <BulkDeleteButton
-      {...props}
-      confirmTitle="resources.rooms.action.erase.title"
-      confirmContent="resources.rooms.action.erase.content"
-      undoable={false}
-    />
   </Fragment>
 );
 
@@ -353,27 +241,14 @@ const RoomFilter = ({ ...props }) => {
   );
 };
 
-const RoomNameField = props => {
+const FilterableRoomList = ({ ...props }) => {
-  const { source } = props;
+  const filter = props.roomFilters;
-  const record = useRecordContext(props);
-  return (
-    <span>{record[source] || record["canonical_alias"] || record["id"]}</span>
-  );
-};
-
-RoomNameField.propTypes = {
-  label: PropTypes.string,
-  record: PropTypes.object,
-  source: PropTypes.string.isRequired,
-};
-
-const FilterableRoomList = ({ roomFilters, dispatch, ...props }) => {
-  const filter = roomFilters;
   const localMembersFilter =
     filter && filter.joined_local_members ? true : false;
   const stateEventsFilter = filter && filter.state_events ? true : false;
   const versionFilter = filter && filter.version ? true : false;
   const federateableFilter = filter && filter.federatable ? true : false;
+  const translate = useTranslate();
 
   return (
     <List
@@ -381,7 +256,12 @@ const FilterableRoomList = ({ roomFilters, dispatch, ...props }) => {
       pagination={<RoomPagination />}
       sort={{ field: "name", order: "ASC" }}
       filters={<RoomFilter />}
-      bulkActionButtons={<RoomBulkActionButtons />}
+      bulkActionButtons={
+        <RoomBulkActionButtons
+          confirmTitle={translate("synapseadmin.rooms.delete.title")}
+          confirmContent={translate("synapseadmin.rooms.delete.message")}
+        />
+      }
     >
       <Datagrid rowClick="show">
         <EncryptionField
@@ -389,7 +269,7 @@ const FilterableRoomList = ({ roomFilters, dispatch, ...props }) => {
           sortBy="encryption"
           label={<HttpsIcon />}
         />
-        <RoomNameField source="name" />
+        <TextField source="name" />
         <TextField source="joined_members" />
         {localMembersFilter && <TextField source="joined_local_members" />}
         {stateEventsFilter && <TextField source="state_events" />}

src/components/users.js

@@ -36,6 +36,7 @@ import {
   DeleteButton,
   SaveButton,
   regex,
+  useRedirect,
   useTranslate,
   Pagination,
   CreateButton,
@@ -44,12 +45,11 @@ import {
   sanitizeListRestProps,
   NumberField,
 } from "react-admin";
-import { Link } from "react-router-dom";
 import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
 import { DeviceRemoveButton } from "./devices";
 import { makeStyles } from "@material-ui/core/styles";
 
-const redirect = () => {
+const redirect = (basePath, id, data) => {
   return {
     pathname: "/import_users",
   };
@@ -85,6 +85,7 @@ const UserListActions = ({
   total,
   ...rest
 }) => {
+  const redirectTo = useRedirect();
   return (
     <TopToolbar className={className} {...sanitizeListRestProps(rest)}>
       {filters &&
@@ -105,7 +106,12 @@ const UserListActions = ({
         maxResults={maxResults}
       />
       {/* Add your custom actions */}
-      <Button component={Link} to={redirect} label="CSV Import">
+      <Button
+        onClick={() => {
+          redirectTo(redirect);
+        }}
+        label="CSV Import"
+      >
         <GetAppIcon style={{ transform: "rotate(180deg)", fontSize: "20" }} />
       </Button>
     </TopToolbar>
@@ -133,17 +139,19 @@ const UserFilter = props => (
   </Filter>
 );
 
-const UserBulkActionButtons = props => (
+const UserBulkActionButtons = props => {
+  const translate = useTranslate();
+  return (
     <Fragment>
       <ServerNoticeBulkButton {...props} />
       <BulkDeleteButton
         {...props}
         label="resources.users.action.erase"
-      confirmTitle="resources.users.helper.erase"
+        title={translate("resources.users.helper.erase")}
-      undoable={false}
       />
     </Fragment>
-);
+  );
+};
 
 const AvatarField = ({ source, className, record = {} }) => (
   <Avatar src={record[source]} className={className} />
@@ -156,7 +164,6 @@ export const UserList = props => {
       {...props}
       filters={<UserFilter />}
       filterDefaultValues={{ guests: true, deactivated: false }}
-      sort={{ field: "name", order: "ASC" }}
       actions={<UserListActions maxResults={10000} />}
       bulkActionButtons={<UserBulkActionButtons />}
       pagination={<UserPagination />}
@@ -164,14 +171,14 @@ export const UserList = props => {
       <Datagrid rowClick="edit">
         <AvatarField
           source="avatar_src"
+          sortable={false}
           className={classes.small}
-          sortBy="avatar_url"
         />
-        <TextField source="id" sortBy="name" />
+        <TextField source="id" sortable={false} />
-        <TextField source="displayname" />
+        <TextField source="displayname" sortable={false} />
-        <BooleanField source="is_guest" />
+        <BooleanField source="is_guest" sortable={false} />
-        <BooleanField source="admin" />
+        <BooleanField source="admin" sortable={false} />
-        <BooleanField source="deactivated" />
+        <BooleanField source="deactivated" sortable={false} />
       </Datagrid>
     </List>
   );
@@ -231,10 +238,7 @@ const UserEditToolbar = props => {
       <SaveButton submitOnEnter={true} />
       <DeleteButton
         label="resources.users.action.erase"
-        confirmTitle={translate("resources.users.helper.erase", {
+        title={translate("resources.users.helper.erase")}
-          smart_count: 1,
-        })}
-        mutationMode="pessimistic"
       />
       <ServerNoticeButton />
     </Toolbar>
@@ -415,7 +419,6 @@ export const UserEdit = props => {
             addLabel={false}
             pagination={<UserPagination />}
             perPage={50}
-            sort={{ field: "created_ts", order: "DESC" }}
           >
             <Datagrid style={{ width: "100%" }}>
               <DateField
@@ -429,6 +432,7 @@ export const UserEdit = props => {
                   minute: "2-digit",
                   second: "2-digit",
                 }}
+                sortable={false}
               />
               <DateField
                 source="last_access_ts"
@@ -441,14 +445,15 @@ export const UserEdit = props => {
                   minute: "2-digit",
                   second: "2-digit",
                 }}
+                sortable={false}
               />
-              <TextField source="media_id" />
+              <TextField source="media_id" sortable={false} />
-              <NumberField source="media_length" />
+              <NumberField source="media_length" sortable={false} />
-              <TextField source="media_type" />
+              <TextField source="media_type" sortable={false} />
-              <TextField source="upload_name" />
+              <TextField source="upload_name" sortable={false} />
-              <TextField source="quarantined_by" />
+              <TextField source="quarantined_by" sortable={false} />
-              <BooleanField source="safe_from_quarantine" />
+              <BooleanField source="safe_from_quarantine" sortable={false} />
-              <DeleteButton mutationMode="pessimistic" redirect={false} />
+              <DeleteButton undoable={false} redirect={false} />
             </Datagrid>
           </ReferenceManyField>
         </FormTab>

src/i18n/de.js

@@ -1,6 +1,6 @@
 import germanMessages from "ra-language-german";
 
-const de = {
+export default {
   ...germanMessages,
   synapseadmin: {
     auth: {
@@ -23,6 +23,11 @@ const de = {
         detail: "Details",
         permission: "Berechtigungen",
       },
+      delete: {
+        title: "Raum löschen",
+        message:
+          "Sind Sie sicher dass Sie den Raum löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden. Alle Nachrichten und Medien, die der Raum beinhaltet werden vom Server gelöscht!",
+      },
     },
     reports: { tabs: { basic: "Allgemein", detail: "Details" } },
   },
@@ -138,23 +143,16 @@ const de = {
         canonical_alias: "Alias",
         joined_members: "Mitglieder",
         joined_local_members: "Lokale Mitglieder",
-        joined_local_devices: "Lokale Endgeräte",
+        state_events: "Ereignisse",
-        state_events: "Zustandsereignisse / Komplexität",
         version: "Version",
         is_encrypted: "Verschlüsselt",
         encryption: "Verschlüsselungs-Algorithmus",
         federatable: "Fö­de­rierbar",
-        public: "Sichtbar im Raumverzeichnis",
+        public: "Öffentlich",
         creator: "Ersteller",
         join_rules: "Beitrittsregeln",
         guest_access: "Gastzugriff",
         history_visibility: "Historie-Sichtbarkeit",
-        topic: "Thema",
-        avatar: "Avatar",
-      },
-      helper: {
-        forward_extremities:
-          "Forward extremities are the leaf events at the end of a Directed acyclic graph (DAG) in a room, aka events that have no children. The more exist in a room, the more state resolution that Synapse needs to perform (hint: it's an expensive operation). While Synapse has code to prevent too many of these existing at one time in a room, bugs can sometimes make them crop up again. If a room has >10 forward extremities, it's worth checking which room is the culprit and potentially removing them using the SQL queries mentioned in #1760.",
       },
       enums: {
         join_rules: {
@@ -175,13 +173,6 @@ const de = {
         },
         unencrypted: "Nicht verschlüsselt",
       },
-      action: {
-        erase: {
-          title: "Raum löschen",
-          content:
-            "Sind Sie sicher dass Sie den Raum löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden. Alle Nachrichten und Medien, die der Raum beinhaltet werden vom Server gelöscht!",
-        },
-      },
     },
     reports: {
       name: "Ereignisbericht |||| Ereignisberichte",
@@ -299,41 +290,6 @@ const de = {
         media_length: "Größe der Dateien",
       },
     },
-    forward_extremities: {
-      name: "Vorderextremitäten",
-      fields: {
-        id: "Event-ID",
-        received_ts: "Zeitstempel",
-        depth: "Tiefe",
-        state_group: "Zustandsgruppe",
-      },
-    },
-    room_state: {
-      name: "Zustandsereignisse",
-      fields: {
-        type: "Typ",
-        content: "Inhalt",
-        origin_server_ts: "Sendezeit",
-        sender: "Absender",
-      },
-    },
-    room_directory: {
-      name: "Raumverzeichnis",
-      fields: {
-        world_readable: "Gastbenutzer dürfen ohne Beitritt lesen",
-        guest_can_join: "Gastbenutzer dürfen beitreten",
-      },
-      action: {
-        title:
-          "Raum aus Verzeichnis löschen |||| %{smart_count} Räume aus Verzeichnis löschen",
-        content:
-          "Möchten Sie den Raum wirklich aus dem Raumverzeichnis löschen? |||| Möchten Sie die %{smart_count} Räume wirklich aus dem Raumverzeichnis löschen?",
-        erase: "Lösche aus Verzeichnis",
-        create: "Eintragen ins Verzeichnis",
-        send_success: "Raum erfolgreich eingetragen.",
-        send_failure: "Beim Entfernen ist ein Fehler aufgetreten.",
-      },
-    },
   },
   ra: {
     ...germanMessages.ra,
@@ -362,10 +318,5 @@ const de = {
       empty: "Keine Einträge vorhanden",
       invite: "",
     },
-    navigation: {
-      ...germanMessages.ra.navigation,
-      skip_nav: "Zum Inhalt springen",
-    },
   },
 };
-export default de;

src/i18n/en.js

@@ -1,6 +1,6 @@
 import englishMessages from "ra-language-english";
 
-const en = {
+export default {
   ...englishMessages,
   synapseadmin: {
     auth: {
@@ -22,6 +22,11 @@ const en = {
         detail: "Details",
         permission: "Permissions",
       },
+      delete: {
+        title: "Delete room",
+        message:
+          "Are you sure you want to delete the room? This cannot be undone. All messages and shared media in the room will be deleted from the server!",
+      },
     },
     reports: { tabs: { basic: "Basic", detail: "Details" } },
   },
@@ -136,23 +141,16 @@ const en = {
         canonical_alias: "Alias",
         joined_members: "Members",
         joined_local_members: "Local members",
-        joined_local_devices: "Local devices",
+        state_events: "State events",
-        state_events: "State events / Complexity",
         version: "Version",
         is_encrypted: "Encrypted",
         encryption: "Encryption",
         federatable: "Federatable",
-        public: "Visible in room directory",
+        public: "Public",
         creator: "Creator",
         join_rules: "Join rules",
         guest_access: "Guest access",
         history_visibility: "History visibility",
-        topic: "Topic",
-        avatar: "Avatar",
-      },
-      helper: {
-        forward_extremities:
-          "Forward extremities are the leaf events at the end of a Directed acyclic graph (DAG) in a room, aka events that have no children. The more exist in a room, the more state resolution that Synapse needs to perform (hint: it's an expensive operation). While Synapse has code to prevent too many of these existing at one time in a room, bugs can sometimes make them crop up again. If a room has >10 forward extremities, it's worth checking which room is the culprit and potentially removing them using the SQL queries mentioned in #1760.",
       },
       enums: {
         join_rules: {
@@ -173,11 +171,6 @@ const en = {
         },
         unencrypted: "Unencrypted",
       },
-      erase: {
-        title: "Delete room",
-        content:
-          "Are you sure you want to delete the room? This cannot be undone. All messages and shared media in the room will be deleted from the server!",
-      },
     },
     reports: {
       name: "Reported event |||| Reported events",
@@ -232,7 +225,7 @@ const en = {
       name: "Media",
       fields: {
         media_id: "Media ID",
-        media_length: "File Size (in Bytes)",
+        media_length: "Lenght",
         media_type: "Type",
         upload_name: "File name",
         quarantined_by: "Quarantined by",
@@ -295,41 +288,5 @@ const en = {
         media_length: "Media length",
       },
     },
-    forward_extremities: {
-      name: "Forward Extremities",
-      fields: {
-        id: "Event ID",
-        received_ts: "Timestamp",
-        depth: "Depth",
-        state_group: "State group",
-      },
-    },
-    room_state: {
-      name: "State events",
-      fields: {
-        type: "Type",
-        content: "Content",
-        origin_server_ts: "time of send",
-        sender: "Sender",
-      },
-    },
-    room_directory: {
-      name: "Room directory",
-      fields: {
-        world_readable: "guest users may view without joining",
-        guest_can_join: "guest users may join",
-      },
-      action: {
-        title:
-          "Delete room from directory |||| Delete %{smart_count} rooms from directory",
-        content:
-          "Are you sure you want to remove this room from directory? |||| Are you sure you want to remove these %{smart_count} rooms from directory",
-        erase: "Delete from room directory",
-        create: "Publish in room directory",
-        send_success: "Room successfully published.",
-        send_failure: "An error has occurred.",
-      },
-    },
   },
 };
-export default en;

src/i18n/zh.js

@@ -1,291 +0,0 @@
-import chineseMessages from "ra-language-chinese";
-
-const zh = {
-  ...chineseMessages,
-  synapseadmin: {
-    auth: {
-      base_url: "服务器 URL",
-      welcome: "欢迎来到 Synapse-admin",
-      server_version: "Synapse 版本",
-      username_error: "请输入完整有效的用户 ID: '@user:domain'",
-      protocol_error: "URL 需要以'http://'或'https://'作为起始",
-      url_error: "不是一个有效的 Matrix 服务器地址",
-    },
-    users: {
-      invalid_user_id:
-        "必须要是一个有效的 Matrix 用户 ID ，例如 @user_id:homeserver",
-    },
-    rooms: {
-      tabs: {
-        basic: "基本",
-        members: "成员",
-        detail: "细节",
-        permission: "权限",
-      },
-      delete: {
-        title: "删除房间",
-        message:
-          "您确定要删除这个房间吗？该操作无法被撤销。这个房间里所有的消息和分享的媒体都将被从服务器上删除！",
-      },
-    },
-    reports: { tabs: { basic: "基本", detail: "细节" } },
-  },
-  import_users: {
-    error: {
-      at_entry: "在条目 %{entry}: %{message}",
-      error: "错误",
-      required_field: "需要的值 '%{field}' 未被设置。",
-      invalid_value:
-        "第 %{row} 行出现无效值。 '%{field}' 只可以是 'true' 或 'false'。",
-      unreasonably_big: "拒绝加载过大的文件： %{size} MB",
-      already_in_progress: "一个导入进程已经在运行中",
-      id_exits: "ID %{id} 已经存在",
-    },
-    title: "通过 CSV 导入用户",
-    goToPdf: "转到 PDF",
-    cards: {
-      importstats: {
-        header: "导入用户",
-        users_total:
-          "%{smart_count} 用户在 CSV 文件中 |||| %{smart_count} 用户在 CSV 文件中",
-        guest_count: "%{smart_count} 访客 |||| %{smart_count} 访客",
-        admin_count: "%{smart_count} 管理员 |||| %{smart_count} 管理员",
-      },
-      conflicts: {
-        header: "冲突处理策略",
-        mode: {
-          stop: "在冲突处停止",
-          skip: "显示错误并跳过冲突",
-        },
-      },
-      ids: {
-        header: "IDs",
-        all_ids_present: "每条记录的 ID",
-        count_ids_present:
-          "%{smart_count} 个含 ID 的记录 |||| %{smart_count} 个含 ID 的记录",
-        mode: {
-          ignore: "忽略 CSV 中的 ID 并创建新的",
-          update: "更新已经存在的记录",
-        },
-      },
-      passwords: {
-        header: "密码",
-        all_passwords_present: "每条记录的密码",
-        count_passwords_present:
-          "%{smart_count} 个含密码的记录 |||| %{smart_count} 个含密码的记录",
-        use_passwords: "使用 CSV 中标记的密码",
-      },
-      upload: {
-        header: "导入 CSV 文件",
-        explanation:
-          "在这里，你可以上传一个用逗号分隔的文件，用于创建或更新用户。该文件必须包括 'id' 和 'displayname' 字段。你可以在这里下载并修改一个示例文件：",
-      },
-      startImport: {
-        simulate_only: "模拟模式",
-        run_import: "导入",
-      },
-      results: {
-        header: "导入结果",
-        total: "共计 %{smart_count} 条记录 |||| 共计 %{smart_count} 条记录",
-        successful: "%{smart_count} 条记录导入成功",
-        skipped: "跳过 %{smart_count} 条记录",
-        download_skipped: "下载跳过的记录",
-        with_error:
-          "%{smart_count} 条记录出现错误 ||| %{smart_count} 条记录出现错误",
-        simulated_only: "只是一次模拟运行",
-      },
-    },
-  },
-  resources: {
-    users: {
-      backtolist: "回到列表",
-      name: "用户",
-      email: "邮箱",
-      msisdn: "电话",
-      threepid: "邮箱 / 电话",
-      fields: {
-        avatar: "邮箱",
-        id: "用户 ID",
-        name: "用户名",
-        is_guest: "访客",
-        admin: "服务器管理员",
-        deactivated: "被禁用",
-        guests: "显示访客",
-        show_deactivated: "显示被禁用的账户",
-        user_id: "搜索用户",
-        displayname: "显示名字",
-        password: "密码",
-        avatar_url: "头像 URL",
-        avatar_src: "头像",
-        medium: "Medium",
-        threepids: "3PIDs",
-        address: "地址",
-        creation_ts_ms: "创建时间戳",
-        consent_version: "协议版本",
-      },
-      helper: {
-        deactivate: "您必须提供一串密码来激活账户。",
-        erase: "将用户标记为根据 GDPR 的要求抹除了",
-      },
-      action: {
-        erase: "抹除用户信息",
-      },
-    },
-    rooms: {
-      name: "房间",
-      fields: {
-        room_id: "房间 ID",
-        name: "房间名",
-        canonical_alias: "别名",
-        joined_members: "成员",
-        joined_local_members: "本地成员",
-        state_events: "状态事件",
-        version: "版本",
-        is_encrypted: "已经加密",
-        encryption: "加密",
-        federatable: "可联合的",
-        public: "公开",
-        creator: "创建者",
-        join_rules: "加入规则",
-        guest_access: "访客访问",
-        history_visibility: "历史可见性",
-      },
-      enums: {
-        join_rules: {
-          public: "公开",
-          knock: "申请",
-          invite: "邀请",
-          private: "私有",
-        },
-        guest_access: {
-          can_join: "访客可以加入",
-          forbidden: "访客不可加入",
-        },
-        history_visibility: {
-          invited: "自从被邀请",
-          joined: "自从加入",
-          shared: "自从分享",
-          world_readable: "任何人",
-        },
-        unencrypted: "未加密",
-      },
-    },
-    reports: {
-      name: "报告事件",
-      fields: {
-        id: "ID",
-        received_ts: "报告时间",
-        user_id: "报告者",
-        name: "房间名",
-        score: "分数",
-        reason: "原因",
-        event_id: "事件 ID",
-        event_json: {
-          origin: "原始服务器",
-          origin_server_ts: "发送时间",
-          type: "事件类型",
-          content: {
-            msgtype: "内容类型",
-            body: "内容",
-            format: "格式",
-            formatted_body: "格式化的数据",
-            algorithm: "算法",
-          },
-        },
-      },
-    },
-    connections: {
-      name: "连接",
-      fields: {
-        last_seen: "日期",
-        ip: "IP 地址",
-        user_agent: "用户代理 (UA)",
-      },
-    },
-    devices: {
-      name: "设备",
-      fields: {
-        device_id: "设备 ID",
-        display_name: "设备名",
-        last_seen_ts: "时间戳",
-        last_seen_ip: "IP 地址",
-      },
-      action: {
-        erase: {
-          title: "移除 %{id}",
-          content: '您确定要移除设备 "%{name}"?',
-          success: "设备移除成功。",
-          failure: "出现了一个错误。",
-        },
-      },
-    },
-    users_media: {
-      name: "媒体文件",
-      fields: {
-        media_id: "媒体文件 ID",
-        media_length: "长度",
-        media_type: "类型",
-        upload_name: "文件名",
-        quarantined_by: "被隔离",
-        safe_from_quarantine: "取消隔离",
-        created_ts: "创建",
-        last_access_ts: "上一次访问",
-      },
-    },
-    delete_media: {
-      name: "媒体文件",
-      fields: {
-        before_ts: "最后访问时间",
-        size_gt: "大于 (字节)",
-        keep_profiles: "保留头像",
-      },
-      action: {
-        send: "删除媒体",
-        send_success: "请求发送成功。",
-        send_failure: "出现了一个错误。",
-      },
-      helper: {
-        send:
-          "这个API会删除您硬盘上的本地媒体。包含了任何的本地缓存和下载的媒体备份。这个API不会影响上传到外部媒体存储库上的媒体文件。",
-      },
-    },
-    pushers: {
-      name: "发布者",
-      fields: {
-        app: "App",
-        app_display_name: "App 名称",
-        app_id: "App ID",
-        device_display_name: "设备显示名",
-        kind: "类型",
-        lang: "语言",
-        profile_tag: "数据标签",
-        pushkey: "Pushkey",
-        data: { url: "URL" },
-      },
-    },
-    servernotices: {
-      name: "服务器提示",
-      send: "发送服务器提示",
-      fields: {
-        body: "信息",
-      },
-      action: {
-        send: "发送提示",
-        send_success: "服务器提示发送成功。",
-        send_failure: "出现了一个错误。",
-      },
-      helper: {
-        send:
-          '向选中的用户发送服务器提示。服务器配置中的 "服务器提示(Server Notices)" 选项需要被设置为启用。',
-      },
-    },
-    user_media_statistics: {
-      name: "用户的媒体文件",
-      fields: {
-        media_count: "媒体文件统计",
-        media_length: "媒体文件长度",
-      },
-    },
-  },
-};
-export default zh;

src/setupTests.js

@@ -1,3 +1,6 @@
+import { configure } from "enzyme";
+import Adapter from "enzyme-adapter-react-16";
 import fetchMock from "jest-fetch-mock";
 
+configure({ adapter: new Adapter() });
 fetchMock.enableMocks();

src/synapse/authProvider.js

@@ -3,9 +3,6 @@ import { fetchUtils } from "react-admin";
 const authProvider = {
   // called when the user attempts to log in
   login: ({ base_url, username, password }) => {
-    // force homeserver for protection in case the form is manipulated
-    base_url = process.env.REACT_APP_SERVER || base_url;
-
     console.log("login ");
     const options = {
       method: "POST",
@@ -13,7 +10,6 @@ const authProvider = {
         type: "m.login.password",
         user: username,
         password: password,
-        device_id: localStorage.getItem("device_id"),
         initial_device_display_name: "Synapse Admin",
       }),
     };
@@ -21,7 +17,6 @@ const authProvider = {
     // use the base_url from login instead of the well_known entry from the
     // server, since the admin might want to access the admin API via some
     // private address
-    base_url = base_url.replace(/\/+$/g, "");
     localStorage.setItem("base_url", base_url);
 
     const decoded_base_url = window.decodeURIComponent(base_url);
@@ -53,6 +48,7 @@ const authProvider = {
     if (typeof access_token === "string") {
       fetchUtils.fetchJson(logout_api_url, options).then(({ json }) => {
         localStorage.removeItem("access_token");
+        localStorage.removeItem("device_id");
       });
     }
     return Promise.resolve();

src/synapse/dataProvider.js

@@ -67,8 +67,9 @@ const resourceMap = {
       return json.total_rooms;
     },
     delete: params => ({
-      endpoint: `/_synapse/admin/v1/rooms/${params.id}`,
+      endpoint: `/_synapse/admin/v1/rooms/${params.id}/delete`,
       body: { block: false },
+      method: "POST",
     }),
   },
   reports: {
@@ -116,19 +117,6 @@ const resourceMap = {
       return json.total;
     },
   },
-  room_state: {
-    map: rs => ({
-      ...rs,
-      id: rs.event_id,
-    }),
-    reference: id => ({
-      endpoint: `/_synapse/admin/v1/rooms/${id}/state`,
-    }),
-    data: "state",
-    total: json => {
-      return json.state.length;
-    },
-  },
   pushers: {
     map: p => ({
       ...p,
@@ -207,46 +195,6 @@ const resourceMap = {
       return json.total;
     },
   },
-  forward_extremities: {
-    map: fe => ({
-      ...fe,
-      id: fe.event_id,
-    }),
-    reference: id => ({
-      endpoint: `/_synapse/admin/v1/rooms/${id}/forward_extremities`,
-    }),
-    data: "results",
-    total: json => {
-      return json.count;
-    },
-    delete: params => ({
-      endpoint: `/_synapse/admin/v1/rooms/${params.id}/forward_extremities`,
-    }),
-  },
-  room_directory: {
-    path: "/_matrix/client/r0/publicRooms",
-    map: rd => ({
-      ...rd,
-      id: rd.room_id,
-      public: !!rd.public,
-      guest_access: !!rd.guest_access,
-      avatar_src: mxcUrlToHttp(rd.avatar_url),
-    }),
-    data: "chunk",
-    total: json => {
-      return json.total_room_count_estimate;
-    },
-    create: params => ({
-      endpoint: `/_matrix/client/r0/directory/list/room/${params.id}`,
-      body: { visibility: "public" },
-      method: "PUT",
-    }),
-    delete: params => ({
-      endpoint: `/_matrix/client/r0/directory/list/room/${params.id}`,
-      body: { visibility: "private" },
-      method: "PUT",
-    }),
-  },
 };
 
 function filterNullValues(key, value) {
@@ -329,13 +277,10 @@ const dataProvider = {
   getManyReference: (resource, params) => {
     console.log("getManyReference " + resource);
     const { page, perPage } = params.pagination;
-    const { field, order } = params.sort;
     const from = (page - 1) * perPage;
     const query = {
       from: from,
       limit: perPage,
-      order_by: field,
-      dir: getSearchOrder(order),
     };
 
     const homeserver = localStorage.getItem("base_url");