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/build-test.yml

@@ -1,21 +0,0 @@
-name: build-test
-
-on:
-  push:
-    branches: ["master"]
-  pull_request:
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14
-      - name: Install dependencies
-        run: yarn --frozen-lockfile
-      - name: Run tests
-        run: yarn test

.github/workflows/docker-release.yml

@@ -1,51 +0,0 @@
-name: Create docker image(s) and push to docker hub
-
-on:
-  push:
-    # Sequence of patterns matched against refs/heads
-    # prettier-ignore
-    branches:    
-      # Push events on master branch
-      - master
-    # Sequence of patterns matched against refs/tags
-    tags:        
-      - '[0-9]+\.[0-9]+\.[0-9]+'             # Push events to 0.X.X tag
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Calculate docker image tag
-        id: set-tag
-        run: |
-          case "${GITHUB_REF}" in
-              refs/heads/master|refs/heads/main)
-                  tag=latest
-                  ;;
-              refs/tags/*)
-                  tag=${GITHUB_REF#refs/tags/}
-                  ;;
-              *)
-                  tag=${GITHUB_SHA}
-                  ;;
-          esac
-          echo "::set-output name=tag::$tag"
-      - name: Build and Push Tag
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: true
-          tags: "awesometechnologies/synapse-admin:${{ steps.set-tag.outputs.tag }}"
-          platforms: linux/amd64,linux/arm64

.github/workflows/edge_ghpage.yml

@@ -1,26 +0,0 @@
-name: Build and Deploy Edge version to GH Pages
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-      - master
-jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout 🛎️
-        uses: actions/checkout@v2.3.1
-      - uses: actions/setup-node@v2
-        with:
-          node-version: "14"
-      - name: Install and Build 🔧
-        run: |
-          yarn install
-          yarn build
-
-      - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@4.1.5
-        with:
-          branch: gh-pages
-          folder: build

.github/workflows/node.js.yml

@@ -8,9 +8,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      packages: write
 
     steps:
       - uses: actions/checkout@v2
@@ -24,6 +21,7 @@ jobs:
           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

.prettierrc

@@ -7,5 +7,5 @@
   "trailingComma": "es5",
   "bracketSpacing": true,
   "jsxBracketSameLine": false,
-  "arrowParens": "avoid"
+  "arrowParens": "avoid",
 }

.travis.yml

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

Dockerfile

@@ -1,5 +1,5 @@
 # Builder
-FROM node:lts as builder
+FROM node:current as builder
 
 WORKDIR /src
 

README.md

@@ -1,14 +1,13 @@
 [![Build Status](https://travis-ci.org/Awesome-Technologies/synapse-admin.svg?branch=master)](https://travis-ci.org/Awesome-Technologies/synapse-admin)
-[![build-test](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/build-test.yml/badge.svg)](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/build-test.yml)
 
 # Synapse admin ui
 
 This project is built using [react-admin](https://marmelab.com/react-admin/).
 
-It needs at least Synapse v1.42.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://matrix-org.github.io/synapse/develop/admin_api/version_api.html).
+See also [Synapse version API](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/version_api.rst).
 
 After entering the URL on the login page of synapse-admin the server version appears below the input field.
 
@@ -17,26 +16,16 @@ You need access to the following endpoints:
 - `/_matrix`
 - `/_synapse/admin`
 
-See also [Synapse administration endpoints](https://matrix-org.github.io/synapse/develop/reverse_proxy.html#synapse-administration-endpoints)
+See also [Synapse administration endpoints](https://github.com/matrix-org/synapse/blob/develop/docs/reverse_proxy.md#synapse-administration-endpoints)
 
-## Step-By-Step install
+## Step-By-Step install:
 
-You have three options:
+You have two options:
 
-1.  [Download the tarball and serve with any webserver](#steps-for-1)
+1.  Download the source code from github and run using nodejs
-2.  [Download the source code from github and run using nodejs](#steps-for-2)
+2.  Run the Docker container
-3.  [Run the Docker container](#steps-for-3)
 
-### Steps for 1)
+Steps for 1):
-
-- make sure you have a webserver installed that can serve static files (any webserver like nginx or apache will do)
-- configure a vhost for synapse admin on your webserver
-- download the .tar.gz from the latest release: https://github.com/Awesome-Technologies/synapse-admin/releases/latest
-- unpack the .tar.gz
-- move or symlink the `synapse-admin-x.x.x` into your vhosts root dir
-- open the url of the vhost in your browser
-
-### Steps for 2)
 
 - make sure you have installed the following: git, yarn, nodejs
 - download the source code: `git clone https://github.com/Awesome-Technologies/synapse-admin.git`
@@ -44,14 +33,9 @@ You have three options:
 - download dependencies: `yarn install`
 - start web server: `yarn start`
 
-You can fix the homeserver, so that the user can no longer define it himself.
+Steps for 2):
-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 3)
+- 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`
-
-- 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`
 
   > note: if you're building on an architecture other than amd64 (for example a raspberry pi), make sure to define a maximum ram for node. otherwise the build will fail.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "synapse-admin",
-  "version": "0.8.5",
+  "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",
@@ -36,7 +37,7 @@
     "fix:other": "yarn prettier --write",
     "fix:code": "yarn test:lint --fix",
     "fix": "yarn fix:code && yarn fix:other",
-    "prettier": "prettier --ignore-path .gitignore \"**/*.{js,jsx,json,md,scss,yaml,yml}\"",
+    "prettier": "prettier \"**/*.{js,jsx,json,md,scss,yaml,yml}\"",
     "test:code": "react-scripts test",
     "test:lint": "eslint --ignore-path .gitignore --ext .js,.jsx .",
     "test:style": "yarn prettier --list-different",

src/App.js

@@ -8,29 +8,19 @@ import { RoomList, RoomShow } from "./components/rooms";
 import { ReportList, ReportShow } from "./components/EventReports";
 import LoginPage from "./components/LoginPage";
 import UserIcon from "@material-ui/icons/Group";
-import ConfirmationNumberIcon from "@material-ui/icons/ConfirmationNumber";
 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 {
-  RegistrationTokenCreate,
-  RegistrationTokenEdit,
-  RegistrationTokenList,
-} from "./components/RegistrationTokens";
-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),
@@ -67,18 +57,6 @@ const App = () => (
       show={ReportShow}
       icon={ReportIcon}
     />
-    <Resource
-      name="room_directory"
-      list={RoomDirectoryList}
-      icon={FolderSharedIcon}
-    />
-    <Resource
-      name="registration_tokens"
-      list={RegistrationTokenList}
-      create={RegistrationTokenCreate}
-      edit={RegistrationTokenEdit}
-      icon={ConfirmationNumberIcon}
-    />
     <Resource name="connections" />
     <Resource name="devices" />
     <Resource name="room_members" />
@@ -86,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/EventReports.js

@@ -15,15 +15,6 @@ import {
 import PageviewIcon from "@material-ui/icons/Pageview";
 import ViewListIcon from "@material-ui/icons/ViewList";
 
-const date_format = {
-  year: "numeric",
-  month: "2-digit",
-  day: "2-digit",
-  hour: "2-digit",
-  minute: "2-digit",
-  second: "2-digit",
-};
-
 const ReportPagination = props => (
   <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
 );
@@ -42,7 +33,14 @@ export const ReportShow = props => {
           <DateField
             source="received_ts"
             showTime
-            options={date_format}
+            options={{
+              year: "numeric",
+              month: "2-digit",
+              day: "2-digit",
+              hour: "2-digit",
+              minute: "2-digit",
+              second: "2-digit",
+            }}
             sortable={true}
           />
           <ReferenceField source="user_id" reference="users">
@@ -74,7 +72,14 @@ export const ReportShow = props => {
           <DateField
             source="event_json.origin_server_ts"
             showTime
-            options={date_format}
+            options={{
+              year: "numeric",
+              month: "2-digit",
+              day: "2-digit",
+              hour: "2-digit",
+              minute: "2-digit",
+              second: "2-digit",
+            }}
             sortable={true}
           />
           <ReferenceField source="sender" reference="users">
@@ -111,7 +116,14 @@ export const ReportList = ({ ...props }) => {
         <DateField
           source="received_ts"
           showTime
-          options={date_format}
+          options={{
+            year: "numeric",
+            month: "2-digit",
+            day: "2-digit",
+            hour: "2-digit",
+            minute: "2-digit",
+            second: "2-digit",
+          }}
           sortable={true}
         />
         <TextField sortable={false} source="user_id" />

src/components/LoginPage.js

@@ -78,48 +78,10 @@ const LoginPage = ({ theme }) => {
   const login = useLogin();
   const notify = useNotify();
   const [loading, setLoading] = useState(false);
-  const [supportPassAuth, setSupportPassAuth] = useState(true);
   var locale = useLocale();
   const setLocale = useSetLocale();
   const translate = useTranslate();
   const base_url = localStorage.getItem("base_url");
-  const cfg_base_url = process.env.REACT_APP_SERVER;
-  const [ssoBaseUrl, setSSOBaseUrl] = useState("");
-  const loginToken = /\?loginToken=([a-zA-Z0-9_-]+)/.exec(window.location.href);
-
-  if (loginToken) {
-    const ssoToken = loginToken[1];
-    console.log("SSO token is", ssoToken);
-    // Prevent further requests
-    window.history.replaceState(
-      {},
-      "",
-      window.location.href.replace(loginToken[0], "#").split("#")[0]
-    );
-    const baseUrl = localStorage.getItem("sso_base_url");
-    localStorage.removeItem("sso_base_url");
-    if (baseUrl) {
-      const auth = {
-        base_url: baseUrl,
-        username: null,
-        password: null,
-        loginToken: ssoToken,
-      };
-      console.log("Base URL is:", baseUrl);
-      console.log("SSO Token is:", ssoToken);
-      console.log("Let's try token login...");
-      login(auth).catch(error => {
-        alert(
-          typeof error === "string"
-            ? error
-            : typeof error === "undefined" || !error.message
-            ? "ra.auth.sign_in_error"
-            : error.message
-        );
-        console.error(error);
-      });
-    }
-  }
 
   const renderInput = ({
     meta: { touched, error } = {},
@@ -149,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");
       }
@@ -174,14 +134,6 @@ const LoginPage = ({ theme }) => {
     });
   };
 
-  const handleSSO = () => {
-    localStorage.setItem("sso_base_url", ssoBaseUrl);
-    const ssoFullUrl = `${ssoBaseUrl}/_matrix/client/r0/login/sso/redirect?redirectUrl=${encodeURIComponent(
-      window.location.href
-    )}`;
-    window.location.href = ssoFullUrl;
-  };
-
   const extractHomeServer = username => {
     const usernameRegex = /@[a-zA-Z0-9._=\-/]+:([a-zA-Z0-9\-.]+\.[a-zA-Z]+)/;
     if (!username) return null;
@@ -195,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`;
@@ -233,31 +185,6 @@ const LoginPage = ({ theme }) => {
           .catch(_ => {
             setServerVersion("");
           });
-
-        // Set SSO Url
-        const authMethodUrl = `${formData.base_url}/_matrix/client/r0/login`;
-        let supportPass = false,
-          supportSSO = false;
-        fetchUtils
-          .fetchJson(authMethodUrl, { method: "GET" })
-          .then(({ json }) => {
-            json.flows.forEach(f => {
-              if (f.type === "m.login.password") {
-                supportPass = true;
-              } else if (f.type === "m.login.sso") {
-                supportSSO = true;
-              }
-            });
-            setSupportPassAuth(supportPass);
-            if (supportSSO) {
-              setSSOBaseUrl(formData.base_url);
-            } else {
-              setSSOBaseUrl("");
-            }
-          })
-          .catch(_ => {
-            setSSOBaseUrl("");
-          });
       },
       [formData.base_url]
     );
@@ -270,9 +197,8 @@ const LoginPage = ({ theme }) => {
             name="username"
             component={renderInput}
             label={translate("ra.auth.username")}
-            disabled={loading || !supportPassAuth}
+            disabled={loading}
             onBlur={handleUsernameChange}
-            resettable
             fullWidth
           />
         </div>
@@ -282,8 +208,7 @@ const LoginPage = ({ theme }) => {
             component={renderInput}
             label={translate("ra.auth.password")}
             type="password"
-            disabled={loading || !supportPassAuth}
+            disabled={loading}
-            resettable
             fullWidth
           />
         </div>
@@ -292,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>
@@ -304,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 }) => (
@@ -331,7 +255,6 @@ const LoginPage = ({ theme }) => {
                   >
                     <MenuItem value="de">Deutsch</MenuItem>
                     <MenuItem value="en">English</MenuItem>
-                    <MenuItem value="zh">简体中文</MenuItem>
                   </Select>
                 </div>
                 <FormDataConsumer>
@@ -343,24 +266,13 @@ const LoginPage = ({ theme }) => {
                   variant="contained"
                   type="submit"
                   color="primary"
-                  disabled={loading || !supportPassAuth}
+                  disabled={loading}
                   className={classes.button}
                   fullWidth
                 >
                   {loading && <CircularProgress size={25} thickness={2} />}
                   {translate("ra.auth.sign_in")}
                 </Button>
-                <Button
-                  variant="contained"
-                  color="secondary"
-                  onClick={handleSSO}
-                  disabled={loading || ssoBaseUrl === ""}
-                  className={classes.button}
-                  fullWidth
-                >
-                  {loading && <CircularProgress size={25} thickness={2} />}
-                  {translate("synapseadmin.auth.sso_sign_in")}
-                </Button>
               </CardActions>
             </Card>
             <Notification />

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/RegistrationTokens.js

@@ -1,132 +0,0 @@
-import React from "react";
-import {
-  BooleanInput,
-  Create,
-  Datagrid,
-  DateField,
-  DateTimeInput,
-  Edit,
-  Filter,
-  List,
-  maxValue,
-  number,
-  NumberField,
-  NumberInput,
-  regex,
-  SimpleForm,
-  TextInput,
-  TextField,
-  Toolbar,
-} from "react-admin";
-
-const date_format = {
-  year: "numeric",
-  month: "2-digit",
-  day: "2-digit",
-  hour: "2-digit",
-  minute: "2-digit",
-  second: "2-digit",
-};
-
-const validateToken = [regex(/^[A-Za-z0-9._~-]{0,64}$/)];
-const validateUsesAllowed = [number()];
-const validateLength = [number(), maxValue(64)];
-
-const dateParser = v => {
-  const d = new Date(v);
-  if (isNaN(d)) return 0;
-  return d.getTime();
-};
-
-const dateFormatter = v => {
-  if (v === undefined || v === null) return;
-  const d = new Date(v);
-
-  const pad = "00";
-  const year = d.getFullYear().toString();
-  const month = (pad + (d.getMonth() + 1).toString()).slice(-2);
-  const day = (pad + d.getDate().toString()).slice(-2);
-  const hour = (pad + d.getHours().toString()).slice(-2);
-  const minute = (pad + d.getMinutes().toString()).slice(-2);
-
-  // target format yyyy-MM-ddThh:mm
-  return `${year}-${month}-${day}T${hour}:${minute}`;
-};
-
-const RegistrationTokenFilter = props => (
-  <Filter {...props}>
-    <BooleanInput source="valid" alwaysOn />
-  </Filter>
-);
-
-export const RegistrationTokenList = props => {
-  return (
-    <List
-      {...props}
-      filters={<RegistrationTokenFilter />}
-      filterDefaultValues={{ valid: true }}
-      pagination={false}
-      perPage={500}
-    >
-      <Datagrid rowClick="edit">
-        <TextField source="token" sortable={false} />
-        <NumberField source="uses_allowed" sortable={false} />
-        <NumberField source="pending" sortable={false} />
-        <NumberField source="completed" sortable={false} />
-        <DateField
-          source="expiry_time"
-          showTime
-          options={date_format}
-          sortable={false}
-        />
-      </Datagrid>
-    </List>
-  );
-};
-
-export const RegistrationTokenCreate = props => (
-  <Create {...props}>
-    <SimpleForm redirect="list" toolbar={<Toolbar alwaysEnableSaveButton />}>
-      <TextInput
-        source="token"
-        autoComplete="off"
-        validate={validateToken}
-        resettable
-      />
-      <NumberInput
-        source="length"
-        validate={validateLength}
-        helperText="resources.registration_tokens.helper.length"
-        step={1}
-      />
-      <NumberInput
-        source="uses_allowed"
-        validate={validateUsesAllowed}
-        step={1}
-      />
-      <DateTimeInput source="expiry_time" parse={dateParser} />
-    </SimpleForm>
-  </Create>
-);
-
-export const RegistrationTokenEdit = props => {
-  return (
-    <Edit {...props}>
-      <SimpleForm>
-        <TextInput source="token" disabled />
-        <NumberInput source="pending" disabled />
-        <NumberInput source="completed" disabled />
-        <NumberInput
-          source="uses_allowed"
-          validate={validateUsesAllowed}
-          step={1}
-        />
-        <DateTimeInput
-          source="expiry_time"
-          parse={dateParser}
-          format={dateFormatter}
-        />
-      </SimpleForm>
-    </Edit>
-  );
-};

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"
-    mutationMode="pessimistic"
-    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 rowClick={(id, basePath, record) => "/rooms/" + id + "/show"}>
-        <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/ServerNotices.js

@@ -24,10 +24,7 @@ const ServerNoticeDialog = ({ open, loading, onClose, onSend }) => {
 
   const ServerNoticeToolbar = props => (
     <Toolbar {...props}>
-      <SaveButton
+      <SaveButton label="resources.servernotices.action.send" />
-        label="resources.servernotices.action.send"
-        disabled={props.pristine}
-      />
       <Button label="ra.action.cancel" onClick={onClose}>
         <IconCancel />
       </Button>

src/components/devices.js

@@ -8,7 +8,7 @@ import {
 } from "react-admin";
 import ActionDelete from "@material-ui/icons/Delete";
 import { makeStyles } from "@material-ui/core/styles";
-import { alpha } from "@material-ui/core/styles/colorManipulator";
+import { fade } from "@material-ui/core/styles/colorManipulator";
 import classnames from "classnames";
 
 const useStyles = makeStyles(
@@ -16,7 +16,7 @@ const useStyles = makeStyles(
     deleteButton: {
       color: theme.palette.error.main,
       "&:hover": {
-        backgroundColor: alpha(theme.palette.error.main, 0.12),
+        backgroundColor: fade(theme.palette.error.main, 0.12),
         // Reset on mouse devices
         "@media (hover: none)": {
           backgroundColor: "transparent",

src/components/media.js

@@ -1,8 +1,7 @@
 import React, { Fragment, useState } from "react";
 import classnames from "classnames";
-import { alpha } from "@material-ui/core/styles/colorManipulator";
+import { fade } from "@material-ui/core/styles/colorManipulator";
 import { makeStyles } from "@material-ui/core/styles";
-import { Tooltip } from "@material-ui/core";
 import {
   BooleanInput,
   Button,
@@ -11,29 +10,23 @@ import {
   SaveButton,
   SimpleForm,
   Toolbar,
-  useCreate,
   useDelete,
   useNotify,
-  useRefresh,
   useTranslate,
 } from "react-admin";
-import BlockIcon from "@material-ui/icons/Block";
+import IconCancel from "@material-ui/icons/Cancel";
-import ClearIcon from "@material-ui/icons/Clear";
-import DeleteSweepIcon from "@material-ui/icons/DeleteSweep";
 import Dialog from "@material-ui/core/Dialog";
 import DialogContent from "@material-ui/core/DialogContent";
 import DialogContentText from "@material-ui/core/DialogContentText";
 import DialogTitle from "@material-ui/core/DialogTitle";
-import IconCancel from "@material-ui/icons/Cancel";
+import DeleteSweepIcon from "@material-ui/icons/DeleteSweep";
-import LockIcon from "@material-ui/icons/Lock";
-import LockOpenIcon from "@material-ui/icons/LockOpen";
 
 const useStyles = makeStyles(
   theme => ({
     deleteButton: {
       color: theme.palette.error.main,
       "&:hover": {
-        backgroundColor: alpha(theme.palette.error.main, 0.12),
+        backgroundColor: fade(theme.palette.error.main, 0.12),
         // Reset on mouse devices
         "@media (hover: none)": {
           backgroundColor: "transparent",
@@ -150,178 +143,3 @@ export const DeleteMediaButton = props => {
     </Fragment>
   );
 };
-
-export const ProtectMediaButton = props => {
-  const { record } = props;
-  const translate = useTranslate();
-  const refresh = useRefresh();
-  const notify = useNotify();
-  const [create, { loading }] = useCreate("protect_media");
-  const [deleteOne] = useDelete("protect_media");
-
-  if (!record) return null;
-
-  const handleProtect = () => {
-    create(
-      { payload: { data: record } },
-      {
-        onSuccess: () => {
-          notify("resources.protect_media.action.send_success");
-          refresh();
-        },
-        onFailure: () =>
-          notify("resources.protect_media.action.send_failure", "error"),
-      }
-    );
-  };
-
-  const handleUnprotect = () => {
-    deleteOne(
-      { payload: { ...record } },
-      {
-        onSuccess: () => {
-          notify("resources.protect_media.action.send_success");
-          refresh();
-        },
-        onFailure: () =>
-          notify("resources.protect_media.action.send_failure", "error"),
-      }
-    );
-  };
-
-  return (
-    /*
-    Wrapping Tooltip with <div>
-    https://github.com/marmelab/react-admin/issues/4349#issuecomment-578594735
-    */
-    <Fragment>
-      {record.quarantined_by && (
-        <Tooltip
-          title={translate("resources.protect_media.action.none", {
-            _: "resources.protect_media.action.none",
-          })}
-        >
-          <div>
-            {/*
-            Button instead BooleanField for
-            consistent appearance and position in the column
-            */}
-            <Button disabled={true}>
-              <ClearIcon />
-            </Button>
-          </div>
-        </Tooltip>
-      )}
-      {record.safe_from_quarantine && (
-        <Tooltip
-          title={translate("resources.protect_media.action.delete", {
-            _: "resources.protect_media.action.delete",
-          })}
-          arrow
-        >
-          <div>
-            <Button onClick={handleUnprotect} disabled={loading}>
-              <LockIcon />
-            </Button>
-          </div>
-        </Tooltip>
-      )}
-      {!record.safe_from_quarantine && !record.quarantined_by && (
-        <Tooltip
-          title={translate("resources.protect_media.action.create", {
-            _: "resources.protect_media.action.create",
-          })}
-        >
-          <div>
-            <Button onClick={handleProtect} disabled={loading}>
-              <LockOpenIcon />
-            </Button>
-          </div>
-        </Tooltip>
-      )}
-    </Fragment>
-  );
-};
-
-export const QuarantineMediaButton = props => {
-  const { record } = props;
-  const translate = useTranslate();
-  const refresh = useRefresh();
-  const notify = useNotify();
-  const [create, { loading }] = useCreate("quarantine_media");
-  const [deleteOne] = useDelete("quarantine_media");
-
-  if (!record) return null;
-
-  const handleQuarantaine = () => {
-    create(
-      { payload: { data: record } },
-      {
-        onSuccess: () => {
-          notify("resources.quarantine_media.action.send_success");
-          refresh();
-        },
-        onFailure: () =>
-          notify("resources.quarantine_media.action.send_failure", "error"),
-      }
-    );
-  };
-
-  const handleRemoveQuarantaine = () => {
-    deleteOne(
-      { payload: { ...record } },
-      {
-        onSuccess: () => {
-          notify("resources.quarantine_media.action.send_success");
-          refresh();
-        },
-        onFailure: () =>
-          notify("resources.quarantine_media.action.send_failure", "error"),
-      }
-    );
-  };
-
-  return (
-    <Fragment>
-      {record.safe_from_quarantine && (
-        <Tooltip
-          title={translate("resources.quarantine_media.action.none", {
-            _: "resources.quarantine_media.action.none",
-          })}
-        >
-          <div>
-            <Button disabled={true}>
-              <ClearIcon />
-            </Button>
-          </div>
-        </Tooltip>
-      )}
-      {record.quarantined_by && (
-        <Tooltip
-          title={translate("resources.quarantine_media.action.delete", {
-            _: "resources.quarantine_media.action.delete",
-          })}
-        >
-          <div>
-            <Button onClick={handleRemoveQuarantaine} disabled={loading}>
-              <BlockIcon color="error" />
-            </Button>
-          </div>
-        </Tooltip>
-      )}
-      {!record.safe_from_quarantine && !record.quarantined_by && (
-        <Tooltip
-          title={translate("resources.quarantine_media.action.create", {
-            _: "resources.quarantine_media.action.create",
-          })}
-        >
-          <div>
-            <Button onClick={handleQuarantaine} disabled={loading}>
-              <BlockIcon />
-            </Button>
-          </div>
-        </Tooltip>
-      )}
-    </Fragment>
-  );
-};

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,43 +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 date_format = {
-  year: "numeric",
-  month: "2-digit",
-  day: "2-digit",
-  hour: "2-digit",
-  minute: "2-digit",
-  second: "2-digit",
-};
-
-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]} />
@@ -102,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 />}>
@@ -137,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
@@ -149,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
@@ -240,63 +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={date_format}
-                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={date_format}
-                sortable={false}
-              />
-              <NumberField source="depth" sortable={false} />
-              <TextField source="state_group" sortable={false} />
-            </Datagrid>
-          </ReferenceManyField>
-        </Tab>
       </TabbedShowLayout>
     </Show>
   );
@@ -304,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"
-      mutationMode="pessimistic"
-    />
   </Fragment>
 );
 
@@ -348,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
@@ -376,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
@@ -384,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

@@ -1,13 +1,12 @@
 import React, { cloneElement, Fragment } from "react";
 import Avatar from "@material-ui/core/Avatar";
-import AssignmentIndIcon from "@material-ui/icons/AssignmentInd";
+import PersonPinIcon from "@material-ui/icons/PersonPin";
 import ContactMailIcon from "@material-ui/icons/ContactMail";
 import DevicesIcon from "@material-ui/icons/Devices";
 import GetAppIcon from "@material-ui/icons/GetApp";
+import SettingsInputComponentIcon from "@material-ui/icons/SettingsInputComponent";
 import NotificationsIcon from "@material-ui/icons/Notifications";
 import PermMediaIcon from "@material-ui/icons/PermMedia";
-import PersonPinIcon from "@material-ui/icons/PersonPin";
-import SettingsInputComponentIcon from "@material-ui/icons/SettingsInputComponent";
 import ViewListIcon from "@material-ui/icons/ViewList";
 import {
   ArrayInput,
@@ -36,9 +35,8 @@ import {
   BulkDeleteButton,
   DeleteButton,
   SaveButton,
-  maxLength,
   regex,
-  required,
+  useRedirect,
   useTranslate,
   Pagination,
   CreateButton,
@@ -47,13 +45,11 @@ import {
   sanitizeListRestProps,
   NumberField,
 } from "react-admin";
-import { Link } from "react-router-dom";
 import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
 import { DeviceRemoveButton } from "./devices";
-import { ProtectMediaButton, QuarantineMediaButton } from "./media";
 import { makeStyles } from "@material-ui/core/styles";
 
-const redirect = () => {
+const redirect = (basePath, id, data) => {
   return {
     pathname: "/import_users",
   };
@@ -71,15 +67,6 @@ const useStyles = makeStyles({
   },
 });
 
-const date_format = {
-  year: "numeric",
-  month: "2-digit",
-  day: "2-digit",
-  hour: "2-digit",
-  minute: "2-digit",
-  second: "2-digit",
-};
-
 const UserListActions = ({
   currentSort,
   className,
@@ -98,6 +85,7 @@ const UserListActions = ({
   total,
   ...rest
 }) => {
+  const redirectTo = useRedirect();
   return (
     <TopToolbar className={className} {...sanitizeListRestProps(rest)}>
       {filters &&
@@ -118,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>
@@ -146,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")}
-      mutationMode="pessimistic"
       />
     </Fragment>
   );
+};
 
 const AvatarField = ({ source, className, record = {} }) => (
   <Avatar src={record[source]} className={className} />
@@ -169,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 />}
@@ -177,36 +171,24 @@ 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="displayname" />
-        <BooleanField source="is_guest" />
-        <BooleanField source="admin" />
-        <BooleanField source="deactivated" />
-        <DateField
-          source="creation_ts"
-          label="resources.users.fields.creation_ts_ms"
-          showTime
-          options={date_format}
         />
+        <TextField source="id" sortable={false} />
+        <TextField source="displayname" sortable={false} />
+        <BooleanField source="is_guest" sortable={false} />
+        <BooleanField source="admin" sortable={false} />
+        <BooleanField source="deactivated" sortable={false} />
       </Datagrid>
     </List>
   );
 };
 
 // https://matrix.org/docs/spec/appendices#user-identifiers
-// here only local part of user_id
+const validateUser = regex(
-// maxLength = 255 - "@" - ":" - localStorage.getItem("home_server").length
+  /^@[a-z0-9._=\-/]+:.*/,
-// localStorage.getItem("home_server").length is not valid here
+  "synapseadmin.users.invalid_user_id"
-const validateUser = [
+);
-  required(),
-  maxLength(253),
-  regex(/^[a-z0-9._=\-/]+$/, "synapseadmin.users.invalid_user_id"),
-];
-
-const validateAddress = [required(), maxLength(255)];
 
 export function generateRandomUser() {
   const homeserver = localStorage.getItem("home_server");
@@ -253,13 +235,10 @@ const UserEditToolbar = props => {
   const translate = useTranslate();
   return (
     <Toolbar {...props}>
-      <SaveButton submitOnEnter={true} disabled={props.pristine} />
+      <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>
@@ -270,12 +249,8 @@ export const UserCreate = props => (
   <Create {...props}>
     <SimpleForm>
       <TextInput source="id" autoComplete="off" validate={validateUser} />
-      <TextInput source="displayname" validate={maxLength(256)} />
+      <TextInput source="displayname" />
-      <PasswordInput
+      <PasswordInput source="password" autoComplete="new-password" />
-        source="password"
-        autoComplete="new-password"
-        validate={maxLength(512)}
-      />
       <BooleanInput source="admin" />
       <ArrayInput source="threepids">
         <SimpleFormIterator>
@@ -285,19 +260,8 @@ export const UserCreate = props => (
               { id: "email", name: "resources.users.email" },
               { id: "msisdn", name: "resources.users.msisdn" },
             ]}
-            validate={required()}
-          />
-          <TextInput source="address" validate={validateAddress} />
-        </SimpleFormIterator>
-      </ArrayInput>
-      <ArrayInput source="external_ids" label="synapseadmin.users.tabs.sso">
-        <SimpleFormIterator>
-          <TextInput source="auth_provider" validate={required()} />
-          <TextInput
-            source="external_id"
-            label="resources.users.fields.id"
-            validate={required()}
           />
+          <TextInput source="address" />
         </SimpleFormIterator>
       </ArrayInput>
     </SimpleForm>
@@ -338,7 +302,18 @@ export const UserEdit = props => {
             source="deactivated"
             helperText="resources.users.helper.deactivate"
           />
-          <DateField source="creation_ts_ms" showTime options={date_format} />
+          <DateField
+            source="creation_ts_ms"
+            showTime
+            options={{
+              year: "numeric",
+              month: "2-digit",
+              day: "2-digit",
+              hour: "2-digit",
+              minute: "2-digit",
+              second: "2-digit",
+            }}
+          />
           <TextField source="consent_version" />
         </FormTab>
 
@@ -361,23 +336,6 @@ export const UserEdit = props => {
           </ArrayInput>
         </FormTab>
 
-        <FormTab
-          label="synapseadmin.users.tabs.sso"
-          icon={<AssignmentIndIcon />}
-          path="sso"
-        >
-          <ArrayInput source="external_ids" label={false}>
-            <SimpleFormIterator>
-              <TextInput source="auth_provider" validate={required()} />
-              <TextInput
-                source="external_id"
-                label="resources.users.fields.id"
-                validate={required()}
-              />
-            </SimpleFormIterator>
-          </ArrayInput>
-        </FormTab>
-
         <FormTab
           label={translate("resources.devices.name", { smart_count: 2 })}
           icon={<DevicesIcon />}
@@ -395,7 +353,14 @@ export const UserEdit = props => {
               <DateField
                 source="last_seen_ts"
                 showTime
-                options={date_format}
+                options={{
+                  year: "numeric",
+                  month: "2-digit",
+                  day: "2-digit",
+                  hour: "2-digit",
+                  minute: "2-digit",
+                  second: "2-digit",
+                }}
                 sortable={false}
               />
               <DeviceRemoveButton />
@@ -423,7 +388,14 @@ export const UserEdit = props => {
                 <DateField
                   source="last_seen"
                   showTime
-                  options={date_format}
+                  options={{
+                    year: "numeric",
+                    month: "2-digit",
+                    day: "2-digit",
+                    hour: "2-digit",
+                    minute: "2-digit",
+                    second: "2-digit",
+                  }}
                   sortable={false}
                 />
                 <TextField
@@ -447,23 +419,41 @@ export const UserEdit = props => {
             addLabel={false}
             pagination={<UserPagination />}
             perPage={50}
-            sort={{ field: "created_ts", order: "DESC" }}
           >
             <Datagrid style={{ width: "100%" }}>
-              <DateField source="created_ts" showTime options={date_format} />
+              <DateField
+                source="created_ts"
+                showTime
+                options={{
+                  year: "numeric",
+                  month: "2-digit",
+                  day: "2-digit",
+                  hour: "2-digit",
+                  minute: "2-digit",
+                  second: "2-digit",
+                }}
+                sortable={false}
+              />
               <DateField
                 source="last_access_ts"
                 showTime
-                options={date_format}
+                options={{
+                  year: "numeric",
+                  month: "2-digit",
+                  day: "2-digit",
+                  hour: "2-digit",
+                  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} />
-              <QuarantineMediaButton label="resources.quarantine_media.action.name" />
+              <BooleanField source="safe_from_quarantine" sortable={false} />
-              <ProtectMediaButton label="resources.users_media.fields.safe_from_quarantine" />
+              <DeleteButton undoable={false} redirect={false} />
-              <DeleteButton mutationMode="pessimistic" 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: {
@@ -10,11 +10,10 @@ const de = {
       username_error: "Bitte vollständigen Nutzernamen angeben: '@user:domain'",
       protocol_error: "Die URL muss mit 'http://' oder 'https://' beginnen",
       url_error: "Keine gültige Matrix Server URL",
-      sso_sign_in: "Anmeldung mit SSO",
     },
     users: {
-      invalid_user_id: "Lokaler Anteil der Matrix Benutzer-ID ohne Homeserver.",
+      invalid_user_id:
-      tabs: { sso: "SSO" },
+        "Muss eine vollständige Matrix Benutzer-ID sein, z.B. @benutzer_id:homeserver",
     },
     rooms: {
       details: "Raumdetails",
@@ -24,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" } },
   },
@@ -97,6 +101,7 @@ const de = {
   },
   resources: {
     users: {
+      backtolist: "Zurück zur Liste",
       name: "Benutzer",
       email: "E-Mail",
       msisdn: "Telefon",
@@ -120,7 +125,6 @@ const de = {
         address: "Adresse",
         creation_ts_ms: "Zeitpunkt der Erstellung",
         consent_version: "Zugestimmte Geschäftsbedingungen",
-        auth_provider: "Provider",
       },
       helper: {
         deactivate:
@@ -139,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: {
@@ -176,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",
@@ -241,7 +231,7 @@ const de = {
         media_type: "Typ",
         upload_name: "Dateiname",
         quarantined_by: "Zur Quarantäne hinzugefügt",
-        safe_from_quarantine: "Schutz vor Quarantäne",
+        safe_from_quarantine: "Geschützt vor Quarantäne",
         created_ts: "Erstellt",
         last_access_ts: "Letzter Zugriff",
       },
@@ -259,26 +249,8 @@ const de = {
         send_failure: "Beim Versenden ist ein Fehler aufgetreten.",
       },
       helper: {
-        send: "Diese API löscht die lokalen Medien von der Festplatte des eigenen Servers. Dies umfasst alle lokalen Miniaturbilder und Kopien von Medien. Diese API wirkt sich nicht auf Medien aus, die sich in externen Medien-Repositories befinden.",
+        send:
-      },
+          "Diese API löscht die lokalen Medien von der Festplatte des eigenen Servers. Dies umfasst alle lokalen Miniaturbilder und Kopien von Medien. Diese API wirkt sich nicht auf Medien aus, die sich in externen Medien-Repositories befinden.",
-    },
-    protect_media: {
-      action: {
-        create: "Ungeschützt, Schutz erstellen",
-        delete: "Geschützt, Schutz aufheben",
-        none: "In Quarantäne",
-        send_success: "Erfolgreich den Schutz-Status geändert.",
-        send_failure: "Beim Versenden ist ein Fehler aufgetreten.",
-      },
-    },
-    quarantine_media: {
-      action: {
-        name: "Quarantäne",
-        create: "Zur Quarantäne hinzufügen",
-        delete: "In Quarantäne, Quarantäne aufheben",
-        none: "Geschützt vor Quarantäne",
-        send_success: "Erfolgreich den Quarantäne-Status geändert.",
-        send_failure: "Beim Versenden ist ein Fehler aufgetreten.",
       },
     },
     pushers: {
@@ -307,7 +279,8 @@ const de = {
         send_failure: "Beim Versenden ist ein Fehler aufgetreten.",
       },
       helper: {
-        send: 'Sendet eine Serverbenachrichtigung an die ausgewählten Nutzer. Hierfür muss das Feature "Server Notices" auf dem Server aktiviert sein.',
+        send:
+          'Sendet eine Serverbenachrichtigung an die ausgewählten Nutzer. Hierfür muss das Feature "Server Notices" auf dem Server aktiviert sein.',
       },
     },
     user_media_statistics: {
@@ -317,54 +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.",
-      },
-    },
-    registration_tokens: {
-      name: "Registrierungstoken",
-      fields: {
-        token: "Token",
-        valid: "Gültige Token",
-        uses_allowed: "Anzahl",
-        pending: "Ausstehend",
-        completed: "Abgeschlossen",
-        expiry_time: "Ablaufzeit",
-        length: "Länge",
-      },
-      helper: { length: "Länge des Tokens, wenn kein Token vorgegeben wird." },
-    },
   },
   ra: {
     ...germanMessages.ra,
@@ -385,7 +310,7 @@ const de = {
       },
     },
     notification: {
-      ...germanMessages.ra.notification,
+      ...germanMessages.ra.notifiaction,
       logged_out: "Abgemeldet",
     },
     page: {
@@ -393,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: {
@@ -10,11 +10,10 @@ const en = {
       username_error: "Please enter fully qualified user ID: '@user:domain'",
       protocol_error: "URL has to start with 'http://' or 'https://'",
       url_error: "Not a valid Matrix server URL",
-      sso_sign_in: "Sign in with SSO",
     },
     users: {
-      invalid_user_id: "Localpart of a Matrix user-id without homeserver.",
+      invalid_user_id:
-      tabs: { sso: "SSO" },
+        "Must be a fully qualified Matrix user-id, e.g. @user_id:homeserver",
     },
     rooms: {
       tabs: {
@@ -23,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" } },
   },
@@ -96,6 +100,7 @@ const en = {
   },
   resources: {
     users: {
+      backtolist: "Back to list",
       name: "User |||| Users",
       email: "Email",
       msisdn: "Phone",
@@ -119,7 +124,6 @@ const en = {
         address: "Address",
         creation_ts_ms: "Creation timestamp",
         consent_version: "Consent version",
-        auth_provider: "Provider",
       },
       helper: {
         deactivate: "You must provide a password to re-activate an account.",
@@ -137,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: {
@@ -174,13 +171,6 @@ const en = {
         },
         unencrypted: "Unencrypted",
       },
-      action: {
-        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",
@@ -235,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",
@@ -257,26 +247,8 @@ const en = {
         send_failure: "An error has occurred.",
       },
       helper: {
-        send: "This API deletes the local media from the disk of your own server. This includes any local thumbnails and copies of media downloaded. This API will not affect media that has been uploaded to external media repositories.",
+        send:
-      },
+          "This API deletes the local media from the disk of your own server. This includes any local thumbnails and copies of media downloaded. This API will not affect media that has been uploaded to external media repositories.",
-    },
-    protect_media: {
-      action: {
-        create: "Unprotected, create protection",
-        delete: "Protected, remove protection",
-        none: "In quarantine",
-        send_success: "Successfully changed the protection status.",
-        send_failure: "An error has occurred.",
-      },
-    },
-    quarantine_media: {
-      action: {
-        name: "Quarantine",
-        create: "Add to quarantine",
-        delete: "In quarantine, unquarantine",
-        none: "Protected from quarantine",
-        send_success: "Successfully changed the quarantine status.",
-        send_failure: "An error has occurred.",
       },
     },
     pushers: {
@@ -305,7 +277,8 @@ const en = {
         send_failure: "An error has occurred.",
       },
       helper: {
-        send: 'Sends a server notice to the selected users. The feature "Server Notices" has to be activated at the server.',
+        send:
+          'Sends a server notice to the selected users. The feature "Server Notices" has to be activated at the server.',
       },
     },
     user_media_statistics: {
@@ -315,54 +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.",
-      },
-    },
-  },
-  registration_tokens: {
-    name: "Registration tokens",
-    fields: {
-      token: "Token",
-      valid: "Valid token",
-      uses_allowed: "Uses allowed",
-      pending: "Pending",
-      completed: "Completed",
-      expiry_time: "Expiry time",
-      length: "Length",
-    },
-    helper: { length: "Length of the token if no token is given." },
   },
 };
-export default en;

src/i18n/zh.js

@@ -1,290 +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 服务器地址",
-      sso_sign_in: "使用 SSO 登录",
-    },
-    users: {
-      invalid_user_id:
-        "必须要是一个有效的 Matrix 用户 ID ，例如 @user_id:homeserver",
-      tabs: { sso: "SSO" },
-    },
-    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: {
-      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

@@ -2,37 +2,21 @@ import { fetchUtils } from "react-admin";
 
 const authProvider = {
   // called when the user attempts to log in
-  login: ({ base_url, username, password, loginToken }) => {
+  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",
-      body: JSON.stringify(
+      body: JSON.stringify({
-        Object.assign(
-          {
-            device_id: localStorage.getItem("device_id"),
-            initial_device_display_name: "Synapse Admin",
-          },
-          loginToken
-            ? {
-                type: "m.login.token",
-                token: loginToken,
-              }
-            : {
         type: "m.login.password",
         user: username,
         password: password,
-              }
+        initial_device_display_name: "Synapse Admin",
-        )
+      }),
-      ),
     };
 
     // 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);
@@ -64,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

@@ -41,9 +41,7 @@ const resourceMap = {
     data: "users",
     total: json => json.total,
     create: data => ({
-      endpoint: `/_synapse/admin/v2/users/@${data.id}:${localStorage.getItem(
+      endpoint: `/_synapse/admin/v2/users/${data.id}`,
-        "home_server"
-      )}`,
       body: data,
       method: "PUT",
     }),
@@ -69,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: {
@@ -118,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,
@@ -184,32 +170,6 @@ const resourceMap = {
       method: "POST",
     }),
   },
-  protect_media: {
-    map: pm => ({ id: pm.media_id }),
-    create: params => ({
-      endpoint: `/_synapse/admin/v1/media/protect/${params.media_id}`,
-      method: "POST",
-    }),
-    delete: params => ({
-      endpoint: `/_synapse/admin/v1/media/unprotect/${params.media_id}`,
-      method: "POST",
-    }),
-  },
-  quarantine_media: {
-    map: qm => ({ id: qm.media_id }),
-    create: params => ({
-      endpoint: `/_synapse/admin/v1/media/quarantine/${localStorage.getItem(
-        "home_server"
-      )}/${params.media_id}`,
-      method: "POST",
-    }),
-    delete: params => ({
-      endpoint: `/_synapse/admin/v1/media/unquarantine/${localStorage.getItem(
-        "home_server"
-      )}/${params.media_id}`,
-      method: "POST",
-    }),
-  },
   servernotices: {
     map: n => ({ id: n.event_id }),
     create: data => ({
@@ -235,65 +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",
-    }),
-  },
-  registration_tokens: {
-    path: "/_synapse/admin/v1/registration_tokens",
-    map: rt => ({
-      ...rt,
-      id: rt.token,
-    }),
-    data: "registration_tokens",
-    total: json => {
-      return json.registration_tokens.length;
-    },
-    create: params => ({
-      endpoint: "/_synapse/admin/v1/registration_tokens/new",
-      body: params,
-      method: "POST",
-    }),
-    delete: params => ({
-      endpoint: `/_synapse/admin/v1/registration_tokens/${params.id}`,
-    }),
-  },
 };
 
 function filterNullValues(key, value) {
@@ -315,8 +216,7 @@ function getSearchOrder(order) {
 const dataProvider = {
   getList: (resource, params) => {
     console.log("getList " + resource);
-    const { user_id, name, guests, deactivated, search_term, valid } =
+    const { user_id, name, guests, deactivated, search_term } = params.filter;
-      params.filter;
     const { page, perPage } = params.pagination;
     const { field, order } = params.sort;
     const from = (page - 1) * perPage;
@@ -328,7 +228,6 @@ const dataProvider = {
       name: name,
       guests: guests,
       deactivated: deactivated,
-      valid: valid,
       order_by: field,
       dir: getSearchOrder(order),
     };
@@ -378,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");