Preinstall icons-material to avoid timeout

Change-Id: Ie4b5fa3a923cac19a3f2eeae5f6c06245d0b8cc2

.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      # Major updates for react-admin have breaking changes
+      - dependency-name: "react-admin"
+        update-types: ["version-update:semver-major"]
+
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build-test.yml

@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
       - name: Install dependencies
         run: yarn --frozen-lockfile
       - name: Run tests

.github/workflows/docker-release.yml

@@ -17,13 +17,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -43,7 +43,7 @@ jobs:
           esac
           echo "::set-output name=tag::$tag"
       - name: Build and Push Tag
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true

.github/workflows/edge_ghpage.yml

@@ -10,17 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
-          node-version: "14"
+          node-version: "16"
       - name: Install and Build 🔧
         run: |
           yarn install
           yarn build
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@4.1.5
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
         with:
           branch: gh-pages
           folder: build

.github/workflows/github-release.yml

@@ -13,10 +13,10 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
-          node-version: "14"
+          node-version: "16"
       - run: yarn install
       - run: yarn build
       - run: |
@@ -24,7 +24,7 @@ jobs:
           mkdir -p dist
           cp -r build synapse-admin-$version
           tar chvzf dist/synapse-admin-$version.tar.gz synapse-admin-$version
-      - uses: softprops/action-gh-release@b7e450da2a4b4cb4bfbae528f788167786cfcedf
+      - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
         with:
           files: dist/*.tar.gz
         env:

.github/workflows/test-docker-image.yml

@@ -0,0 +1,51 @@
+name: Test docker image creation
+
+on:
+  push:
+    # Sequence of patterns matched against refs/heads
+    # prettier-ignore
+    branches:
+      # Push events on branch fix_docker_cd
+      - fix_docker_cd
+    # 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@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        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@v3
+        with:
+          context: .
+          push: false
+          tags: "awesometechnologies/synapse-admin:${{ steps.set-tag.outputs.tag }}"
+          platforms: linux/amd64,linux/arm64

.prettierrc

@@ -6,6 +6,6 @@
   "singleQuote": false,
   "trailingComma": "es5",
   "bracketSpacing": true,
-  "jsxBracketSameLine": false,
+  "bracketSameLine": false,
   "arrowParens": "avoid"
 }

.travis.yml

@@ -1,5 +1,6 @@
+dist: focal
 language: node_js
 node_js:
-  - lts/*
+  - 17
 
 cache: yarn

Dockerfile

@@ -1,11 +1,15 @@
 # Builder
 FROM node:lts as builder
 
+ARG PUBLIC_URL=/
+ARG REACT_APP_SERVER
+
 WORKDIR /src
 
 COPY . /src
+RUN yarn --network-timeout 500000 add @mui/icons-material
 RUN yarn --network-timeout=100000 install
-RUN yarn build
+RUN PUBLIC_URL=$PUBLIC_URL REACT_APP_SERVER=$REACT_APP_SERVER yarn build
 
 
 # App

README.md

@@ -1,17 +1,27 @@
-[![Build Status](https://travis-ci.org/Awesome-Technologies/synapse-admin.svg?branch=master)](https://travis-ci.org/Awesome-Technologies/synapse-admin)
+[![GitHub license](https://img.shields.io/github/license/Awesome-Technologies/synapse-admin)](https://github.com/Awesome-Technologies/synapse-admin/blob/master/LICENSE)
+[![Build Status](https://api.travis-ci.com/Awesome-Technologies/synapse-admin.svg?branch=master)](https://app.travis-ci.com/github/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)
+[![gh-pages](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/edge_ghpage.yml/badge.svg)](https://awesome-technologies.github.io/synapse-admin/)
+[![docker-release](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/docker-release.yml/badge.svg)](https://hub.docker.com/r/awesometechnologies/synapse-admin)
+[![github-release](https://github.com/Awesome-Technologies/synapse-admin/actions/workflows/github-release.yml/badge.svg)](https://github.com/Awesome-Technologies/synapse-admin/releases)
 
 # 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!
+## Usage
+
+### Supported Synapse
+
+It needs at least [Synapse](https://github.com/matrix-org/synapse) v1.52.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).
 
 After entering the URL on the login page of synapse-admin the server version appears below the input field.
 
+### Prerequisites
+
 You need access to the following endpoints:
 
 - `/_matrix`
@@ -19,7 +29,17 @@ You need access to the following endpoints:
 
 See also [Synapse administration endpoints](https://matrix-org.github.io/synapse/develop/reverse_proxy.html#synapse-administration-endpoints)
 
-## Step-By-Step install
+### Use without install
+
+You can use the current version of Synapse Admin without own installation direct
+via [GitHub Pages](https://awesome-technologies.github.io/synapse-admin/).
+
+**Note:**
+If you want to use the deployment, you have to make sure that the admin endpoints (`/_synapse/admin`) are accessible for your browser.
+**Remember: You have no need to expose these endpoints to the internet but to your network.**
+If you want your own deployment, follow the [Step-By-Step Install Guide](#step-by-step-install) below.
+
+### Step-By-Step install
 
 You have three options:
 
@@ -27,7 +47,7 @@ You have three options:
 2.  [Download the source code from github and run using nodejs](#steps-for-2)
 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
@@ -36,7 +56,7 @@ You have three options:
 - 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)
+#### 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`
@@ -49,7 +69,7 @@ Either you define it at startup (e.g. `REACT_APP_SERVER=https://yourmatrixserver
 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)
+#### 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`
 
@@ -66,6 +86,9 @@ or by editing it in the [.env](.env) file. See also the
         context: https://github.com/Awesome-Technologies/synapse-admin.git
         # args:
         #   - NODE_OPTIONS="--max_old_space_size=1024"
+        #   # see #266, PUBLIC_URL must be without surrounding quotation marks
+        #   - PUBLIC_URL=/synapse-admin
+        #   - REACT_APP_SERVER="https://matrix.example.com"
       ports:
         - "8080:80"
       restart: unless-stopped

docker-compose.yml

@@ -12,10 +12,15 @@ services:
     # replace the context definition with this:
     # context: https://github.com/Awesome-Technologies/synapse-admin.git
 
+    # args:
     # if you're building on an architecture other than amd64, make sure
     # to define a maximum ram for node. otherwise the build will fail.
-    # args:
     #   - NODE_OPTIONS="--max_old_space_size=1024"
+    # default is /
+    #   - PUBLIC_URL=/synapse-admin
+    # You can use a fixed homeserver, so that the user can no longer
+    # define it himself
+    #   - REACT_APP_SERVER="https://matrix.example.com"
     ports:
       - "8080:80"
     restart: unless-stopped

package.json

@@ -10,25 +10,31 @@
     "url": "https://github.com/Awesome-Technologies/synapse-admin"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.1.1",
+    "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^11.2.6",
-    "@testing-library/user-event": "^13.1.8",
+    "@testing-library/user-event": "^14.4.3",
-    "eslint": "^7.25.0",
+    "eslint": "^8.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-config-react-app": "^7.0.1",
+    "eslint-plugin-prettier": "^4.2.1",
     "jest-fetch-mock": "^3.0.3",
     "prettier": "^2.2.0",
     "ra-test": "^3.15.0"
   },
   "dependencies": {
+    "@emotion/react": "^11.7.1",
+    "@emotion/styled": "^11.6.0",
+    "@mui/icons-material": "^5.3.1",
+    "@mui/material": "^5.4.0",
     "papaparse": "^5.2.0",
     "prop-types": "^15.7.2",
     "ra-language-chinese": "^2.0.10",
+    "ra-language-french": "^4.2.0",
     "ra-language-german": "^3.13.4",
     "react": "^17.0.0",
-    "react-admin": "^3.15.0",
+    "react-admin": "^3.19.7",
     "react-dom": "^17.0.2",
-    "react-scripts": "^4.0.0"
+    "react-scripts": "^5.0.1"
   },
   "scripts": {
     "start": "REACT_APP_VERSION=$(git describe --tags) react-scripts start",

src/App.js

@@ -7,13 +7,15 @@ import { UserList, UserCreate, UserEdit } from "./components/users";
 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 "@mui/icons-material/ConfirmationNumber";
-import ConfirmationNumberIcon from "@material-ui/icons/ConfirmationNumber";
+import CloudQueueIcon from "@mui/icons-material/CloudQueue";
-import EqualizerIcon from "@material-ui/icons/Equalizer";
+import EqualizerIcon from "@mui/icons-material/Equalizer";
+import UserIcon from "@mui/icons-material/Group";
 import { UserMediaStatsList } from "./components/statistics";
-import RoomIcon from "@material-ui/icons/ViewList";
+import RoomIcon from "@mui/icons-material/ViewList";
-import ReportIcon from "@material-ui/icons/Warning";
+import ReportIcon from "@mui/icons-material/Warning";
-import FolderSharedIcon from "@material-ui/icons/FolderShared";
+import FolderSharedIcon from "@mui/icons-material/FolderShared";
+import { DestinationList, DestinationShow } from "./components/destinations";
 import { ImportFeature } from "./components/ImportFeature";
 import {
   RegistrationTokenCreate,
@@ -24,12 +26,14 @@ import { RoomDirectoryList } from "./components/RoomDirectory";
 import { Route } from "react-router-dom";
 import germanMessages from "./i18n/de";
 import englishMessages from "./i18n/en";
+import frenchMessages from "./i18n/fr";
 import chineseMessages from "./i18n/zh";
 
 // TODO: Can we use lazy loading together with browser locale?
 const messages = {
   de: germanMessages,
   en: englishMessages,
+  fr: frenchMessages,
   zh: chineseMessages,
 };
 const i18nProvider = polyglotI18nProvider(
@@ -72,6 +76,12 @@ const App = () => (
       list={RoomDirectoryList}
       icon={FolderSharedIcon}
     />
+    <Resource
+      name="destinations"
+      list={DestinationList}
+      show={DestinationShow}
+      icon={CloudQueueIcon}
+    />
     <Resource
       name="registration_tokens"
       list={RegistrationTokenList}
@@ -88,6 +98,7 @@ const App = () => (
     <Resource name="servernotices" />
     <Resource name="forward_extremities" />
     <Resource name="room_state" />
+    <Resource name="destination_rooms" />
   </Admin>
 );
 

src/components/EventReports.js

@@ -12,8 +12,8 @@ import {
   TextField,
   useTranslate,
 } from "react-admin";
-import PageviewIcon from "@material-ui/icons/Pageview";
+import PageviewIcon from "@mui/icons-material/Pageview";
-import ViewListIcon from "@material-ui/icons/ViewList";
+import ViewListIcon from "@mui/icons-material/ViewList";
 
 const date_format = {
   year: "numeric",
@@ -70,7 +70,6 @@ export const ReportShow = props => {
           icon={<PageviewIcon />}
           path="detail"
         >
-          {" "}
           <DateField
             source="event_json.origin_server_ts"
             showTime

src/components/ImportFeature.js

@@ -6,19 +6,19 @@ import {
   Title,
 } from "react-admin";
 import { parse as parseCsv, unparse as unparseCsv } from "papaparse";
-import GetAppIcon from "@material-ui/icons/GetApp";
+import GetAppIcon from "@mui/icons-material/GetApp";
 import {
   Button,
   Card,
   CardActions,
   CardContent,
   CardHeader,
-  FormControlLabel,
   Checkbox,
+  Container,
+  FormControlLabel,
   NativeSelect,
-} from "@material-ui/core";
+} from "@mui/material";
 import { useTranslate } from "ra-core";
-import Container from "@material-ui/core/Container/Container";
 import { generateRandomUser } from "./users";
 
 const LOGGING = true;

src/components/LoginPage.js

@@ -21,9 +21,9 @@ import {
   MenuItem,
   Select,
   TextField,
-} from "@material-ui/core";
+} from "@mui/material";
 import { makeStyles } from "@material-ui/core/styles";
-import LockIcon from "@material-ui/icons/Lock";
+import LockIcon from "@mui/icons-material/Lock";
 
 const useStyles = makeStyles(theme => ({
   main: {
@@ -169,7 +169,7 @@ const LoginPage = ({ theme }) => {
           : typeof error === "undefined" || !error.message
           ? "ra.auth.sign_in_error"
           : error.message,
-        "warning"
+        { type: "warning" }
       );
     });
   };
@@ -269,7 +269,7 @@ const LoginPage = ({ theme }) => {
             autoFocus
             name="username"
             component={renderInput}
-            label={translate("ra.auth.username")}
+            label="ra.auth.username"
             disabled={loading || !supportPassAuth}
             onBlur={handleUsernameChange}
             resettable
@@ -280,7 +280,7 @@ const LoginPage = ({ theme }) => {
           <PasswordInput
             name="password"
             component={renderInput}
-            label={translate("ra.auth.password")}
+            label="ra.auth.password"
             type="password"
             disabled={loading || !supportPassAuth}
             resettable
@@ -291,7 +291,7 @@ const LoginPage = ({ theme }) => {
           <TextInput
             name="base_url"
             component={renderInput}
-            label={translate("synapseadmin.auth.base_url")}
+            label="synapseadmin.auth.base_url"
             disabled={cfg_base_url || loading}
             resettable
             fullWidth
@@ -331,6 +331,7 @@ const LoginPage = ({ theme }) => {
                   >
                     <MenuItem value="de">Deutsch</MenuItem>
                     <MenuItem value="en">English</MenuItem>
+                    <MenuItem value="fr">Français</MenuItem>
                     <MenuItem value="zh">简体中文</MenuItem>
                   </Select>
                 </div>

src/components/Menu.js

@@ -1,10 +1,10 @@
 // in src/Menu.js
 import * as React from "react";
 import { useSelector } from "react-redux";
-import { useMediaQuery } from "@material-ui/core";
+import { useMediaQuery } from "@mui/material";
 import { MenuItemLink, getResources } from "react-admin";
-import DefaultIcon from "@material-ui/icons/ViewList";
+import DefaultIcon from "@mui/icons-material/ViewList";
-import LabelIcon from "@material-ui/icons/Label";
+import LabelIcon from "@mui/icons-material/Label";
 
 const Menu = ({ onMenuClick, logout }) => {
   const isXSmall = useMediaQuery(theme => theme.breakpoints.down("xs"));

src/components/RoomDirectory.js

@@ -1,8 +1,7 @@
 import React, { Fragment } from "react";
-import Avatar from "@material-ui/core/Avatar";
+import { Avatar, Chip } from "@mui/material";
-import { Chip } from "@material-ui/core";
 import { connect } from "react-redux";
-import FolderSharedIcon from "@material-ui/icons/FolderShared";
+import FolderSharedIcon from "@mui/icons-material/FolderShared";
 import { makeStyles } from "@material-ui/core/styles";
 import {
   BooleanField,
@@ -19,6 +18,7 @@ import {
   useMutation,
   useNotify,
   useTranslate,
+  useRecordContext,
   useRefresh,
   useUnselectAll,
 } from "react-admin";
@@ -87,7 +87,9 @@ export const RoomDirectoryBulkSaveButton = ({ selectedIds }) => {
           refresh();
         },
         onFailure: error =>
-          notify("resources.room_directory.action.send_failure", "error"),
+          notify("resources.room_directory.action.send_failure", {
+            type: "error",
+          }),
       }
     );
   };
@@ -103,7 +105,8 @@ export const RoomDirectoryBulkSaveButton = ({ selectedIds }) => {
   );
 };
 
-export const RoomDirectorySaveButton = ({ record }) => {
+export const RoomDirectorySaveButton = props => {
+  const record = useRecordContext();
   const notify = useNotify();
   const refresh = useRefresh();
   const [create, { loading }] = useCreate("room_directory");
@@ -119,7 +122,9 @@ export const RoomDirectorySaveButton = ({ record }) => {
           refresh();
         },
         onFailure: error =>
-          notify("resources.room_directory.action.send_failure", "error"),
+          notify("resources.room_directory.action.send_failure", {
+            type: "error",
+          }),
       }
     );
   };
@@ -177,7 +182,6 @@ export const FilterableRoomDirectoryList = ({
   ...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;
@@ -196,48 +200,48 @@ export const FilterableRoomDirectoryList = ({
           source="avatar_src"
           sortable={false}
           className={classes.small}
-          label={translate("resources.rooms.fields.avatar")}
+          label="resources.rooms.fields.avatar"
         />
         <TextField
           source="name"
           sortable={false}
-          label={translate("resources.rooms.fields.name")}
+          label="resources.rooms.fields.name"
         />
         {roomIdFilter && (
           <TextField
             source="room_id"
             sortable={false}
-            label={translate("resources.rooms.fields.room_id")}
+            label="resources.rooms.fields.room_id"
           />
         )}
         {canonicalAliasFilter && (
           <TextField
             source="canonical_alias"
             sortable={false}
-            label={translate("resources.rooms.fields.canonical_alias")}
+            label="resources.rooms.fields.canonical_alias"
           />
         )}
         {topicFilter && (
           <TextField
             source="topic"
             sortable={false}
-            label={translate("resources.rooms.fields.topic")}
+            label="resources.rooms.fields.topic"
           />
         )}
         <NumberField
           source="num_joined_members"
           sortable={false}
-          label={translate("resources.rooms.fields.joined_members")}
+          label="resources.rooms.fields.joined_members"
         />
         <BooleanField
           source="world_readable"
           sortable={false}
-          label={translate("resources.room_directory.fields.world_readable")}
+          label="resources.room_directory.fields.world_readable"
         />
         <BooleanField
           source="guest_can_join"
           sortable={false}
-          label={translate("resources.room_directory.fields.guest_can_join")}
+          label="resources.room_directory.fields.guest_can_join"
         />
       </Datagrid>
     </List>

src/components/ServerNotices.js

@@ -9,15 +9,18 @@ import {
   useCreate,
   useMutation,
   useNotify,
+  useRecordContext,
   useTranslate,
   useUnselectAll,
 } from "react-admin";
-import MessageIcon from "@material-ui/icons/Message";
+import MessageIcon from "@mui/icons-material/Message";
-import IconCancel from "@material-ui/icons/Cancel";
+import IconCancel from "@mui/icons-material/Cancel";
-import Dialog from "@material-ui/core/Dialog";
+import {
-import DialogContent from "@material-ui/core/DialogContent";
+  Dialog,
-import DialogContentText from "@material-ui/core/DialogContentText";
+  DialogContent,
-import DialogTitle from "@material-ui/core/DialogTitle";
+  DialogContentText,
+  DialogTitle,
+} from "@mui/material";
 
 const ServerNoticeDialog = ({ open, loading, onClose, onSend }) => {
   const translate = useTranslate();
@@ -64,7 +67,8 @@ const ServerNoticeDialog = ({ open, loading, onClose, onSend }) => {
   );
 };
 
-export const ServerNoticeButton = ({ record }) => {
+export const ServerNoticeButton = props => {
+  const record = useRecordContext();
   const [open, setOpen] = useState(false);
   const notify = useNotify();
   const [create, { loading }] = useCreate("servernotices");
@@ -81,7 +85,9 @@ export const ServerNoticeButton = ({ record }) => {
           handleDialogClose();
         },
         onFailure: () =>
-          notify("resources.servernotices.action.send_failure", "error"),
+          notify("resources.servernotices.action.send_failure", {
+            type: "error",
+          }),
       }
     );
   };
@@ -127,7 +133,9 @@ export const ServerNoticeBulkButton = ({ selectedIds }) => {
           handleDialogClose();
         },
         onFailure: error =>
-          notify("resources.servernotices.action.send_failure", "error"),
+          notify("resources.servernotices.action.send_failure", {
+            type: "error",
+          }),
       }
     );
   };

src/components/destinations.js

@@ -0,0 +1,185 @@
+import React from "react";
+import {
+  Button,
+  Datagrid,
+  DateField,
+  Filter,
+  List,
+  Pagination,
+  ReferenceField,
+  ReferenceManyField,
+  SearchInput,
+  Show,
+  Tab,
+  TabbedShowLayout,
+  TextField,
+  TopToolbar,
+  useRecordContext,
+  useDelete,
+  useNotify,
+  useRefresh,
+  useTranslate,
+} from "react-admin";
+import AutorenewIcon from "@material-ui/icons/Autorenew";
+import FolderSharedIcon from "@material-ui/icons/FolderShared";
+import ViewListIcon from "@material-ui/icons/ViewList";
+
+const DestinationPagination = props => (
+  <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
+);
+
+const date_format = {
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit",
+  hour: "2-digit",
+  minute: "2-digit",
+  second: "2-digit",
+};
+
+const destinationRowStyle = (record, index) => ({
+  backgroundColor: record.retry_last_ts > 0 ? "#ffcccc" : "white",
+});
+
+const DestinationFilter = ({ ...props }) => {
+  return (
+    <Filter {...props}>
+      <SearchInput source="destination" alwaysOn />
+    </Filter>
+  );
+};
+
+export const DestinationReconnectButton = props => {
+  const record = useRecordContext();
+  const refresh = useRefresh();
+  const notify = useNotify();
+  const [handleReconnect, { isLoading }] = useDelete("destinations");
+
+  // Reconnect is not required if no error has occurred. (`failure_ts`)
+  if (!record || !record.failure_ts) return null;
+
+  const handleClick = e => {
+    // Prevents redirection to the detail page when clicking in the list
+    e.stopPropagation();
+
+    handleReconnect(
+      { payload: { id: record.id } },
+      {
+        onSuccess: () => {
+          notify("ra.notification.updated", {
+            messageArgs: { smart_count: 1 },
+          });
+          refresh();
+        },
+        onFailure: () => {
+          notify("ra.message.error", { type: "error" });
+        },
+      }
+    );
+  };
+
+  return (
+    <Button
+      label="resources.destinations.action.reconnect"
+      onClick={handleClick}
+      disabled={isLoading}
+    >
+      <AutorenewIcon />
+    </Button>
+  );
+};
+
+const DestinationShowActions = props => (
+  <TopToolbar>
+    <DestinationReconnectButton />
+  </TopToolbar>
+);
+
+const DestinationTitle = props => {
+  const record = useRecordContext();
+  const translate = useTranslate();
+  return (
+    <span>
+      {translate("resources.destinations.name", 1)} {record.destination}
+    </span>
+  );
+};
+
+export const DestinationList = props => {
+  return (
+    <List
+      {...props}
+      filters={<DestinationFilter />}
+      pagination={<DestinationPagination />}
+      sort={{ field: "destination", order: "ASC" }}
+      bulkActionButtons={false}
+    >
+      <Datagrid
+        rowStyle={destinationRowStyle}
+        rowClick={(id, basePath, record) => `${basePath}/${id}/show/rooms`}
+      >
+        <TextField source="destination" />
+        <DateField source="failure_ts" showTime options={date_format} />
+        <DateField source="retry_last_ts" showTime options={date_format} />
+        <TextField source="retry_interval" />
+        <TextField source="last_successful_stream_ordering" />
+        <DestinationReconnectButton />
+      </Datagrid>
+    </List>
+  );
+};
+
+export const DestinationShow = props => {
+  const translate = useTranslate();
+  return (
+    <Show
+      actions={<DestinationShowActions />}
+      title={<DestinationTitle />}
+      {...props}
+    >
+      <TabbedShowLayout>
+        <Tab label="status" icon={<ViewListIcon />}>
+          <TextField source="destination" />
+          <DateField source="failure_ts" showTime options={date_format} />
+          <DateField source="retry_last_ts" showTime options={date_format} />
+          <TextField source="retry_interval" />
+          <TextField source="last_successful_stream_ordering" />
+        </Tab>
+
+        <Tab
+          label={translate("resources.rooms.name", { smart_count: 2 })}
+          icon={<FolderSharedIcon />}
+          path="rooms"
+        >
+          <ReferenceManyField
+            reference="destination_rooms"
+            target="destination"
+            addLabel={false}
+            pagination={<DestinationPagination />}
+            perPage={50}
+          >
+            <Datagrid
+              style={{ width: "100%" }}
+              rowClick={(id, basePath, record) => `/rooms/${id}/show`}
+            >
+              <TextField
+                source="room_id"
+                label="resources.rooms.fields.room_id"
+              />
+              <TextField source="stream_ordering" sortable={false} />
+              <ReferenceField
+                label="resources.rooms.fields.name"
+                source="id"
+                reference="rooms"
+                sortable={false}
+                link=""
+              >
+                <TextField source="name" sortable={false} />
+              </ReferenceField>
+            </Datagrid>
+          </ReferenceManyField>
+        </Tab>
+      </TabbedShowLayout>
+    </Show>
+  );
+};

src/components/devices.js

@@ -1,14 +1,15 @@
 import React, { Fragment, useState } from "react";
 import {
   Button,
-  useMutation,
+  useDelete,
   useNotify,
   Confirm,
+  useRecordContext,
   useRefresh,
 } from "react-admin";
-import ActionDelete from "@material-ui/icons/Delete";
+import ActionDelete from "@mui/icons-material/Delete";
 import { makeStyles } from "@material-ui/core/styles";
-import { alpha } from "@material-ui/core/styles/colorManipulator";
+import { alpha } from "@mui/material/styles";
 import classnames from "classnames";
 
 const useStyles = makeStyles(
@@ -28,13 +29,13 @@ const useStyles = makeStyles(
 );
 
 export const DeviceRemoveButton = props => {
-  const { record } = props;
+  const record = useRecordContext();
   const classes = useStyles(props);
   const [open, setOpen] = useState(false);
   const refresh = useRefresh();
   const notify = useNotify();
 
-  const [removeDevice, { loading }] = useMutation();
+  const [removeDevice, { isLoading }] = useDelete("devices");
 
   if (!record) return null;
 
@@ -43,21 +44,15 @@ export const DeviceRemoveButton = props => {
 
   const handleConfirm = () => {
     removeDevice(
-      {
+      { payload: { id: record.id, user_id: record.user_id } },
-        type: "delete",
-        resource: "devices",
-        payload: {
-          id: record.id,
-          user_id: record.user_id,
-        },
-      },
       {
         onSuccess: () => {
           notify("resources.devices.action.erase.success");
           refresh();
         },
-        onFailure: () =>
+        onFailure: () => {
-          notify("resources.devices.action.erase.failure", "error"),
+          notify("resources.devices.action.erase.failure", { type: "error" });
+        },
       }
     );
     setOpen(false);
@@ -74,7 +69,7 @@ export const DeviceRemoveButton = props => {
       </Button>
       <Confirm
         isOpen={open}
-        loading={loading}
+        loading={isLoading}
         onConfirm={handleConfirm}
         onClose={handleDialogClose}
         title="resources.devices.action.erase.title"

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 { alpha } from "@mui/material/styles";
 import { makeStyles } from "@material-ui/core/styles";
-import { Tooltip } from "@material-ui/core";
 import {
   BooleanInput,
   Button,
@@ -14,19 +13,23 @@ import {
   useCreate,
   useDelete,
   useNotify,
+  useRecordContext,
   useRefresh,
   useTranslate,
 } from "react-admin";
-import BlockIcon from "@material-ui/icons/Block";
+import BlockIcon from "@mui/icons-material/Block";
-import ClearIcon from "@material-ui/icons/Clear";
+import ClearIcon from "@mui/icons-material/Clear";
-import DeleteSweepIcon from "@material-ui/icons/DeleteSweep";
+import DeleteSweepIcon from "@mui/icons-material/DeleteSweep";
-import Dialog from "@material-ui/core/Dialog";
+import {
-import DialogContent from "@material-ui/core/DialogContent";
+  Dialog,
-import DialogContentText from "@material-ui/core/DialogContentText";
+  DialogContent,
-import DialogTitle from "@material-ui/core/DialogTitle";
+  DialogContentText,
-import IconCancel from "@material-ui/icons/Cancel";
+  DialogTitle,
-import LockIcon from "@material-ui/icons/Lock";
+  Tooltip,
-import LockOpenIcon from "@material-ui/icons/LockOpen";
+} from "@mui/material";
+import IconCancel from "@mui/icons-material/Cancel";
+import LockIcon from "@mui/icons-material/Lock";
+import LockOpenIcon from "@mui/icons-material/LockOpen";
 
 const useStyles = makeStyles(
   theme => ({
@@ -127,7 +130,9 @@ export const DeleteMediaButton = props => {
           handleDialogClose();
         },
         onFailure: () =>
-          notify("resources.delete_media.action.send_failure", "error"),
+          notify("resources.delete_media.action.send_failure", {
+            type: "error",
+          }),
       }
     );
   };
@@ -152,7 +157,7 @@ export const DeleteMediaButton = props => {
 };
 
 export const ProtectMediaButton = props => {
-  const { record } = props;
+  const record = useRecordContext();
   const translate = useTranslate();
   const refresh = useRefresh();
   const notify = useNotify();
@@ -170,7 +175,9 @@ export const ProtectMediaButton = props => {
           refresh();
         },
         onFailure: () =>
-          notify("resources.protect_media.action.send_failure", "error"),
+          notify("resources.protect_media.action.send_failure", {
+            type: "error",
+          }),
       }
     );
   };
@@ -184,7 +191,9 @@ export const ProtectMediaButton = props => {
           refresh();
         },
         onFailure: () =>
-          notify("resources.protect_media.action.send_failure", "error"),
+          notify("resources.protect_media.action.send_failure", {
+            type: "error",
+          }),
       }
     );
   };
@@ -244,7 +253,7 @@ export const ProtectMediaButton = props => {
 };
 
 export const QuarantineMediaButton = props => {
-  const { record } = props;
+  const record = useRecordContext();
   const translate = useTranslate();
   const refresh = useRefresh();
   const notify = useNotify();
@@ -262,7 +271,9 @@ export const QuarantineMediaButton = props => {
           refresh();
         },
         onFailure: () =>
-          notify("resources.quarantine_media.action.send_failure", "error"),
+          notify("resources.quarantine_media.action.send_failure", {
+            type: "error",
+          }),
       }
     );
   };
@@ -276,7 +287,9 @@ export const QuarantineMediaButton = props => {
           refresh();
         },
         onFailure: () =>
-          notify("resources.quarantine_media.action.send_failure", "error"),
+          notify("resources.quarantine_media.action.send_failure", {
+            type: "error",
+          }),
       }
     );
   };

src/components/rooms.js

@@ -25,15 +25,15 @@ import {
 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 { Tooltip, Typography, Chip } from "@mui/material";
-import FastForwardIcon from "@material-ui/icons/FastForward";
+import FastForwardIcon from "@mui/icons-material/FastForward";
-import HttpsIcon from "@material-ui/icons/Https";
+import HttpsIcon from "@mui/icons-material/Https";
-import NoEncryptionIcon from "@material-ui/icons/NoEncryption";
+import NoEncryptionIcon from "@mui/icons-material/NoEncryption";
-import PageviewIcon from "@material-ui/icons/Pageview";
+import PageviewIcon from "@mui/icons-material/Pageview";
-import UserIcon from "@material-ui/icons/Group";
+import UserIcon from "@mui/icons-material/Group";
-import ViewListIcon from "@material-ui/icons/ViewList";
+import ViewListIcon from "@mui/icons-material/ViewList";
-import VisibilityIcon from "@material-ui/icons/Visibility";
+import VisibilityIcon from "@mui/icons-material/Visibility";
-import EventIcon from "@material-ui/icons/Event";
+import EventIcon from "@mui/icons-material/Event";
 import {
   RoomDirectoryBulkDeleteButton,
   RoomDirectoryBulkSaveButton,
@@ -87,7 +87,8 @@ const EncryptionField = ({ source, record = {}, emptyText }) => {
   );
 };
 
-const RoomTitle = ({ record }) => {
+const RoomTitle = props => {
+  const record = useRecordContext();
   const translate = useTranslate();
   var name = "";
   if (record) {
@@ -158,7 +159,11 @@ export const RoomShow = props => {
           />
         </Tab>
 
-        <Tab label="synapseadmin.rooms.tabs.members" icon={<UserIcon />}>
+        <Tab
+          label="synapseadmin.rooms.tabs.members"
+          icon={<UserIcon />}
+          path="members"
+        >
           <ReferenceManyField
             reference="room_members"
             target="room_id"
@@ -350,7 +355,7 @@ const RoomFilter = ({ ...props }) => {
 
 const RoomNameField = props => {
   const { source } = props;
-  const record = useRecordContext(props);
+  const record = useRecordContext();
   return (
     <span>{record[source] || record["canonical_alias"] || record["id"]}</span>
   );

src/components/users.js

@@ -1,14 +1,14 @@
 import React, { cloneElement, Fragment } from "react";
-import Avatar from "@material-ui/core/Avatar";
+import Avatar from "@mui/material/Avatar";
-import AssignmentIndIcon from "@material-ui/icons/AssignmentInd";
+import AssignmentIndIcon from "@mui/icons-material/AssignmentInd";
-import ContactMailIcon from "@material-ui/icons/ContactMail";
+import ContactMailIcon from "@mui/icons-material/ContactMail";
-import DevicesIcon from "@material-ui/icons/Devices";
+import DevicesIcon from "@mui/icons-material/Devices";
-import GetAppIcon from "@material-ui/icons/GetApp";
+import GetAppIcon from "@mui/icons-material/GetApp";
-import NotificationsIcon from "@material-ui/icons/Notifications";
+import NotificationsIcon from "@mui/icons-material/Notifications";
-import PermMediaIcon from "@material-ui/icons/PermMedia";
+import PermMediaIcon from "@mui/icons-material/PermMedia";
-import PersonPinIcon from "@material-ui/icons/PersonPin";
+import PersonPinIcon from "@mui/icons-material/PersonPin";
-import SettingsInputComponentIcon from "@material-ui/icons/SettingsInputComponent";
+import SettingsInputComponentIcon from "@mui/icons-material/SettingsInputComponent";
-import ViewListIcon from "@material-ui/icons/ViewList";
+import ViewListIcon from "@mui/icons-material/ViewList";
 import {
   ArrayInput,
   ArrayField,
@@ -39,6 +39,7 @@ import {
   maxLength,
   regex,
   required,
+  useRecordContext,
   useTranslate,
   Pagination,
   CreateButton,
@@ -71,6 +72,16 @@ const useStyles = makeStyles({
   },
 });
 
+const choices_medium = [
+  { id: "email", name: "resources.users.email" },
+  { id: "msisdn", name: "resources.users.msisdn" },
+];
+
+const choices_type = [
+  { id: "bot", name: "bot" },
+  { id: "support", name: "support" },
+];
+
 const date_format = {
   year: "numeric",
   month: "2-digit",
@@ -249,20 +260,31 @@ export function generateRandomUser() {
   };
 }
 
-const UserEditToolbar = props => {
+const UserEditToolbar = props => (
+  <Toolbar {...props}>
+    <SaveButton submitOnEnter={true} disabled={props.pristine} />
+  </Toolbar>
+);
+
+const UserEditActions = ({ data }) => {
   const translate = useTranslate();
+  var userStatus = "";
+  if (data) {
+    userStatus = data.deactivated;
+  }
+
   return (
-    <Toolbar {...props}>
+    <TopToolbar>
-      <SaveButton submitOnEnter={true} disabled={props.pristine} />
+      {!userStatus && <ServerNoticeButton record={data} />}
       <DeleteButton
+        record={data}
         label="resources.users.action.erase"
         confirmTitle={translate("resources.users.helper.erase", {
           smart_count: 1,
         })}
         mutationMode="pessimistic"
       />
-      <ServerNoticeButton />
+    </TopToolbar>
-    </Toolbar>
   );
 };
 
@@ -276,22 +298,26 @@ export const UserCreate = props => (
         autoComplete="new-password"
         validate={maxLength(512)}
       />
+      <SelectInput
+        source="user_type"
+        choices={choices_type}
+        translateChoice={false}
+        allowEmpty={true}
+        resettable
+      />
       <BooleanInput source="admin" />
       <ArrayInput source="threepids">
-        <SimpleFormIterator>
+        <SimpleFormIterator disableReordering>
           <SelectInput
             source="medium"
-            choices={[
+            choices={choices_medium}
-              { 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>
+        <SimpleFormIterator disableReordering>
           <TextInput source="auth_provider" validate={required()} />
           <TextInput
             source="external_id"
@@ -304,7 +330,8 @@ export const UserCreate = props => (
   </Create>
 );
 
-const UserTitle = ({ record }) => {
+const UserTitle = props => {
+  const record = useRecordContext();
   const translate = useTranslate();
   return (
     <span>
@@ -315,11 +342,12 @@ const UserTitle = ({ record }) => {
     </span>
   );
 };
+
 export const UserEdit = props => {
   const classes = useStyles();
   const translate = useTranslate();
   return (
-    <Edit {...props} title={<UserTitle />}>
+    <Edit {...props} title={<UserTitle />} actions={<UserEditActions />}>
       <TabbedForm toolbar={<UserEditToolbar />}>
         <FormTab
           label={translate("resources.users.name", { smart_count: 1 })}
@@ -332,7 +360,18 @@ export const UserEdit = props => {
           />
           <TextInput source="id" disabled />
           <TextInput source="displayname" />
-          <PasswordInput source="password" autoComplete="new-password" />
+          <PasswordInput
+            source="password"
+            autoComplete="new-password"
+            helperText="resources.users.helper.password"
+          />
+          <SelectInput
+            source="user_type"
+            choices={choices_type}
+            translateChoice={false}
+            allowEmpty={true}
+            resettable
+          />
           <BooleanInput source="admin" />
           <BooleanInput
             source="deactivated"
@@ -348,14 +387,8 @@ export const UserEdit = props => {
           path="threepid"
         >
           <ArrayInput source="threepids">
-            <SimpleFormIterator>
+            <SimpleFormIterator disableReordering>
-              <SelectInput
+              <SelectInput source="medium" choices={choices_medium} />
-                source="medium"
-                choices={[
-                  { id: "email", name: "resources.users.email" },
-                  { id: "msisdn", name: "resources.users.msisdn" },
-                ]}
-              />
               <TextInput source="address" />
             </SimpleFormIterator>
           </ArrayInput>
@@ -367,7 +400,7 @@ export const UserEdit = props => {
           path="sso"
         >
           <ArrayInput source="external_ids" label={false}>
-            <SimpleFormIterator>
+            <SimpleFormIterator disableReordering>
               <TextInput source="auth_provider" validate={required()} />
               <TextInput
                 source="external_id"

src/i18n/de.js

@@ -121,8 +121,11 @@ const de = {
         creation_ts_ms: "Zeitpunkt der Erstellung",
         consent_version: "Zugestimmte Geschäftsbedingungen",
         auth_provider: "Provider",
+        user_type: "Benutzertyp",
       },
       helper: {
+        password:
+          "Durch die Änderung des Passworts wird der Benutzer von allen Sitzungen abgemeldet.",
         deactivate:
           "Sie müssen ein Passwort angeben, um ein Konto wieder zu aktivieren.",
         erase: "DSGVO konformes Löschen der Benutzerdaten",
@@ -352,6 +355,18 @@ const de = {
         send_failure: "Beim Entfernen ist ein Fehler aufgetreten.",
       },
     },
+    destinations: {
+      name: "Föderation",
+      fields: {
+        destination: "Ziel",
+        failure_ts: "Fehlerzeitpunkt",
+        retry_last_ts: "Letzter Wiederholungsversuch",
+        retry_interval: "Wiederholungsintervall",
+        last_successful_stream_ordering: "letzte erfogreicher Stream",
+        stream_ordering: "Stream",
+      },
+      action: { reconnect: "Neu verbinden" },
+    },
     registration_tokens: {
       name: "Registrierungstoken",
       fields: {

src/i18n/en.js

@@ -120,8 +120,10 @@ const en = {
         creation_ts_ms: "Creation timestamp",
         consent_version: "Consent version",
         auth_provider: "Provider",
+        user_type: "User type",
       },
       helper: {
+        password: "Changing password will log user out of all sessions.",
         deactivate: "You must provide a password to re-activate an account.",
         erase: "Mark the user as GDPR-erased",
       },
@@ -195,7 +197,7 @@ const en = {
         event_json: {
           origin: "origin server",
           origin_server_ts: "time of send",
-          type: "event typ",
+          type: "event type",
           content: {
             msgtype: "content type",
             body: "content",
@@ -343,13 +345,25 @@ const en = {
         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",
+          "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.",
       },
     },
+    destinations: {
+      name: "Federation",
+      fields: {
+        destination: "Destination",
+        failure_ts: "Failure timestamp",
+        retry_last_ts: "Last retry timestamp",
+        retry_interval: "Retry interval",
+        last_successful_stream_ordering: "Last successful stream",
+        stream_ordering: "Stream",
+      },
+      action: { reconnect: "Reconnect" },
+    },
   },
   registration_tokens: {
     name: "Registration tokens",

src/i18n/fr.js

@@ -0,0 +1,377 @@
+import frenchMessages from "ra-language-french";
+
+const fr = {
+  ...frenchMessages,
+  synapseadmin: {
+    auth: {
+      base_url: "URL du serveur d’accueil",
+      welcome: "Bienvenue sur Synapse-admin",
+      server_version: "Version du serveur Synapse",
+      username_error:
+        "Veuillez entrer un nom d'utilisateur complet : « @utilisateur:domaine »",
+      protocol_error: "L'URL doit commencer par « http:// » ou « https:// »",
+      url_error: "L'URL du serveur Matrix n'est pas valide",
+      sso_sign_in: "Se connecter avec l’authentification unique",
+    },
+    users: {
+      invalid_user_id:
+        "Partie locale d'un identifiant utilisateur Matrix sans le nom du serveur d’accueil.",
+      tabs: { sso: "Authentification unique" },
+    },
+    rooms: {
+      tabs: {
+        basic: "Informations de base",
+        members: "Membres",
+        detail: "Détails",
+        permission: "Permissions",
+      },
+    },
+    reports: { tabs: { basic: "Informations de base", detail: "Détails" } },
+  },
+  import_users: {
+    error: {
+      at_entry: "Pour l'entrée %{entry} : %{message}",
+      error: "Erreur",
+      required_field: "Le champ requis « %{field} » est manquant",
+      invalid_value:
+        "Valeur non valide à la ligne %{row}. Le champ « %{field} » ne peut être que « true » ou « false »",
+      unreasonably_big:
+        "Refus de charger un fichier trop volumineux de %{size} mégaoctets",
+      already_in_progress: "Un import est déjà en cours",
+      id_exits: "L'identifiant %{id} déjà présent",
+    },
+    title: "Importer des utilisateurs à partir d'un fichier CSV",
+    goToPdf: "Voir le PDF",
+    cards: {
+      importstats: {
+        header: "Importer des utilisateurs",
+        users_total:
+          "%{smart_count} utilisateur dans le fichier CSV |||| %{smart_count} utilisateurs dans le fichier CSV",
+        guest_count: "%{smart_count} visiteur |||| %{smart_count} visiteurs",
+        admin_count:
+          "%{smart_count} administrateur |||| %{smart_count} administrateurs",
+      },
+      conflicts: {
+        header: "Stratégie de résolution des conflits",
+        mode: {
+          stop: "S'arrêter en cas de conflit",
+          skip: "Afficher l'erreur et ignorer le conflit",
+        },
+      },
+      ids: {
+        header: "Identifiants",
+        all_ids_present: "Identifiants présents pour chaque entrée",
+        count_ids_present:
+          "%{smart_count} entrée avec identifiant |||| %{smart_count} entrées avec identifiant",
+        mode: {
+          ignore:
+            "Ignorer les identifiants dans le ficher CSV et en créer de nouveaux",
+          update: "Mettre à jour les enregistrements existants",
+        },
+      },
+      passwords: {
+        header: "Mots de passe",
+        all_passwords_present: "Mots de passe présents pour chaque entrée",
+        count_passwords_present:
+          "%{smart_count} entrée avec mot de passe |||| %{smart_count} entrées avec mot de passe",
+        use_passwords: "Utiliser les mots de passe provenant du fichier CSV",
+      },
+      upload: {
+        header: "Fichier CSV en entrée",
+        explanation:
+          "Vous pouvez télécharger ici un fichier contenant des valeurs séparées par des virgules qui sera traité pour créer ou mettre à jour des utilisateurs. Le fichier doit inclure les champs « id » et « displayname ». Vous pouvez télécharger et adapter un fichier d'exemple ici : ",
+      },
+      startImport: {
+        simulate_only: "Simuler",
+        run_import: "Importer",
+      },
+      results: {
+        header: "Résultats de l'import",
+        total:
+          "%{smart_count} entrée au total |||| %{smart_count} entrées au total",
+        successful: "%{smart_count} entrées importées avec succès",
+        skipped: "%{smart_count} entrées ignorées",
+        download_skipped: "Télécharger les entrées ignorées",
+        with_error:
+          "%{smart_count} entrée avec des erreurs ||| %{smart_count} entrées avec des erreurs",
+        simulated_only: "L'import était simulé",
+      },
+    },
+  },
+  resources: {
+    users: {
+      name: "Utilisateur |||| Utilisateurs",
+      email: "Adresse électronique",
+      msisdn: "Numéro de téléphone",
+      threepid: "Adresse électronique / Numéro de téléphone",
+      fields: {
+        avatar: "Avatar",
+        id: "Identifiant",
+        name: "Nom",
+        is_guest: "Visiteur",
+        admin: "Administrateur du serveur",
+        deactivated: "Désactivé",
+        guests: "Afficher les visiteurs",
+        show_deactivated: "Afficher les utilisateurs désactivés",
+        user_id: "Rechercher un utilisateur",
+        displayname: "Nom d'affichage",
+        password: "Mot de passe",
+        avatar_url: "URL de l'avatar",
+        avatar_src: "Avatar",
+        medium: "Type",
+        threepids: "Identifiants tiers",
+        address: "Adresse",
+        creation_ts_ms: "Date de création",
+        consent_version: "Version du consentement",
+        auth_provider: "Fournisseur d'identité",
+      },
+      helper: {
+        deactivate:
+          "Vous devrez fournir un mot de passe pour réactiver le compte.",
+        erase: "Marquer l'utilisateur comme effacé conformément au RGPD",
+      },
+      action: {
+        erase: "Effacer les données de l'utilisateur",
+      },
+    },
+    rooms: {
+      name: "Salon |||| Salons",
+      fields: {
+        room_id: "Identifiant du salon",
+        name: "Nom",
+        canonical_alias: "Alias",
+        joined_members: "Membres",
+        joined_local_members: "Membres locaux",
+        joined_local_devices: "Appareils locaux",
+        state_events: "Événements d'État / Complexité",
+        version: "Version",
+        is_encrypted: "Chiffré",
+        encryption: "Chiffrement",
+        federatable: "Fédérable",
+        public: "Visible dans le répertoire des salons",
+        creator: "Créateur",
+        join_rules: "Règles d'adhésion",
+        guest_access: "Accès des visiteurs",
+        history_visibility: "Visibilité de l'historique",
+        topic: "Sujet",
+        avatar: "Avatar",
+      },
+      helper: {
+        forward_extremities:
+          "Les extrémités avant sont les événements feuilles à la fin d'un graphe orienté acyclique (DAG) dans un salon, c'est-à-dire les événements qui n'ont pas de descendants. Plus il y en a dans un salon, plus la résolution d'état que Synapse doit effectuer est importante (indice : c'est une opération coûteuse). Bien que Synapse dispose d'un algorithme pour éviter qu'un trop grand nombre de ces événements n'existent en même temps dans un salon, des bogues peuvent parfois les faire réapparaître. Si un salon présente plus de 10 extrémités avant, cela vaut la peine d'y prêter attention et éventuellement de les supprimer en utilisant les requêtes SQL mentionnées dans la discussion traitant du problème https://github.com/matrix-org/synapse/issues/1760.",
+      },
+      enums: {
+        join_rules: {
+          public: "Public",
+          knock: "Sur demande",
+          invite: "Sur invitation",
+          private: "Privé",
+        },
+        guest_access: {
+          can_join: "Les visiteurs peuvent rejoindre le salon",
+          forbidden: "Les visiteurs ne peuvent pas rejoindre le salon",
+        },
+        history_visibility: {
+          invited: "Depuis l'invitation",
+          joined: "Depuis l'adhésion",
+          shared: "Depuis le partage",
+          world_readable: "Tout le monde",
+        },
+        unencrypted: "Non chiffré",
+      },
+      action: {
+        erase: {
+          title: "Supprimer le salon",
+          content:
+            "Voulez-vous vraiment supprimer le salon ? Cette opération ne peut être annulée. Tous les messages et médias partagés du salon seront supprimés du serveur !",
+        },
+      },
+    },
+    reports: {
+      name: "Événement signalé |||| Événements signalés",
+      fields: {
+        id: "Identifiant",
+        received_ts: "Date du rapport",
+        user_id: "Rapporteur",
+        name: "Nom du salon",
+        score: "Score",
+        reason: "Motif",
+        event_id: "Identifiant de l'événement",
+        event_json: {
+          origin: "Serveur d'origine",
+          origin_server_ts: "Date d'envoi",
+          type: "Type d'événement",
+          content: {
+            msgtype: "Type de contenu",
+            body: "Contenu",
+            format: "Format",
+            formatted_body: "Contenu mis en forme",
+            algorithm: "Algorithme",
+          },
+        },
+      },
+    },
+    connections: {
+      name: "Connexions",
+      fields: {
+        last_seen: "Date",
+        ip: "Adresse IP",
+        user_agent: "Agent utilisateur",
+      },
+    },
+    devices: {
+      name: "Appareil |||| Appareils",
+      fields: {
+        device_id: "Identifiant de l'appareil",
+        display_name: "Nom de l'appareil",
+        last_seen_ts: "Date",
+        last_seen_ip: "Adresse IP",
+      },
+      action: {
+        erase: {
+          title: "Suppression de %{id}",
+          content: "Voulez-vous vraiment supprimer l'appareil « %{name} » ?",
+          success: "Appareil supprimé avec succès",
+          failure: "Une erreur s'est produite",
+        },
+      },
+    },
+    users_media: {
+      name: "Media",
+      fields: {
+        media_id: "Identifiant du média",
+        media_length: "Taille du fichier (en octets)",
+        media_type: "Type",
+        upload_name: "Nom du fichier",
+        quarantined_by: "Mis en quarantaine par",
+        safe_from_quarantine: "Protection contre la mise en quarantaine",
+        created_ts: "Date de création",
+        last_access_ts: "Dernier accès",
+      },
+    },
+    delete_media: {
+      name: "Media",
+      fields: {
+        before_ts: "Dernier accès avant",
+        size_gt: "Plus grand que (en octets)",
+        keep_profiles: "Conserver les images de profil",
+      },
+      action: {
+        send: "Supprimer le média",
+        send_success: "Requête envoyée avec succès",
+        send_failure: "Une erreur s'est produite",
+      },
+      helper: {
+        send: "Cette API supprime les médias locaux du disque de votre propre serveur. Cela inclut toutes les vignettes locales et les copies des médias téléchargés. Cette API n'affectera pas les médias qui ont été téléversés dans des dépôts de médias externes.",
+      },
+    },
+    protect_media: {
+      action: {
+        create: "Protéger",
+        delete: "Révoquer la protection",
+        none: "En quarantaine",
+        send_success: "Le statut de protection a été modifié avec succès",
+        send_failure: "Une erreur s'est produite",
+      },
+    },
+    quarantine_media: {
+      action: {
+        name: "Quarantaine",
+        create: "Mettre en quarantaine",
+        delete: "Révoquer la mise en quarantaine",
+        none: "Protégé contre la mise en quarantaine",
+        send_success: "Le statut de la quarantaine a été modifié avec succès",
+        send_failure: "Une erreur s'est produite",
+      },
+    },
+    pushers: {
+      name: "Émetteur de notifications |||| Émetteurs de notifications",
+      fields: {
+        app: "Application",
+        app_display_name: "Nom d'affichage de l'application",
+        app_id: "Identifiant de l'application",
+        device_display_name: "Nom d'affichage de l'appareil",
+        kind: "Type",
+        lang: "Langue",
+        profile_tag: "Profil",
+        pushkey: "Identifiant de l'émetteur",
+        data: { url: "URL" },
+      },
+    },
+    servernotices: {
+      name: "Annonces du serveur",
+      send: "Envoyer des « Annonces du serveur »",
+      fields: {
+        body: "Message",
+      },
+      action: {
+        send: "Envoyer une annonce",
+        send_success: "Annonce envoyée avec succès",
+        send_failure: "Une erreur s'est produite",
+      },
+      helper: {
+        send: "Envoie une annonce au nom du serveur aux utilisateurs sélectionnés. La fonction « Annonces du serveur » doit être activée sur le serveur.",
+      },
+    },
+    user_media_statistics: {
+      name: "Médias des utilisateurs",
+      fields: {
+        media_count: "Nombre de médias",
+        media_length: "Taille des médias",
+      },
+    },
+    forward_extremities: {
+      name: "Extrémités avant",
+      fields: {
+        id: "Identifiant de l'événement",
+        received_ts: "Date de réception",
+        depth: "Profondeur",
+        state_group: "Groupe d'état",
+      },
+    },
+    room_state: {
+      name: "Événements d'état",
+      fields: {
+        type: "Type",
+        content: "Contenu",
+        origin_server_ts: "Date d'envoi",
+        sender: "Expéditeur",
+      },
+    },
+    room_directory: {
+      name: "Répertoire des salons",
+      fields: {
+        world_readable:
+          "Tout utilisateur peut avoir un aperçu du salon, sans en devenir membre",
+        guest_can_join: "Les visiteurs peuvent rejoindre le salon",
+      },
+      action: {
+        title:
+          "Supprimer un salon du répertoire |||| Supprimer %{smart_count} salons du répertoire",
+        content:
+          "Voulez-vous vraiment supprimer ce salon du répertoire ? |||| Voulez-vous vraiment supprimer ces %{smart_count} salons du répertoire ?",
+        erase: "Supprimer du répertoire des salons",
+        create: "Publier dans le répertoire des salons",
+        send_success: "Salon publié avec succès",
+        send_failure: "Une erreur s'est produite",
+      },
+    },
+  },
+  registration_tokens: {
+    name: "Jetons d'inscription",
+    fields: {
+      token: "Jeton",
+      valid: "Jeton valide",
+      uses_allowed: "Nombre d'inscription autorisées",
+      pending: "Nombre d'inscription en cours",
+      completed: "Nombre d'inscription accomplie",
+      expiry_time: "Date d'expiration",
+      length: "Longueur",
+    },
+    helper: {
+      length:
+        "Longueur du jeton généré aléatoirement si aucun jeton n'est pas spécifié",
+    },
+  },
+};
+export default fr;

src/synapse/dataProvider.js

@@ -41,14 +41,16 @@ const resourceMap = {
     data: "users",
     total: json => json.total,
     create: data => ({
-      endpoint: `/_synapse/admin/v2/users/@${data.id}:${localStorage.getItem(
+      endpoint: `/_synapse/admin/v2/users/@${encodeURIComponent(
-        "home_server"
+        data.id
-      )}`,
+      )}:${localStorage.getItem("home_server")}`,
       body: data,
       method: "PUT",
     }),
     delete: params => ({
-      endpoint: `/_synapse/admin/v1/deactivate/${params.id}`,
+      endpoint: `/_synapse/admin/v1/deactivate/${encodeURIComponent(
+        params.id
+      )}`,
       body: { erase: true },
       method: "POST",
     }),
@@ -69,7 +71,7 @@ const resourceMap = {
       return json.total_rooms;
     },
     delete: params => ({
-      endpoint: `/_synapse/admin/v1/rooms/${params.id}`,
+      endpoint: `/_synapse/admin/v2/rooms/${params.id}`,
       body: { block: false },
     }),
   },
@@ -92,10 +94,12 @@ const resourceMap = {
       return json.total;
     },
     reference: id => ({
-      endpoint: `/_synapse/admin/v2/users/${id}/devices`,
+      endpoint: `/_synapse/admin/v2/users/${encodeURIComponent(id)}/devices`,
     }),
     delete: params => ({
-      endpoint: `/_synapse/admin/v2/users/${params.user_id}/devices/${params.id}`,
+      endpoint: `/_synapse/admin/v2/users/${encodeURIComponent(
+        params.user_id
+      )}/devices/${params.id}`,
     }),
   },
   connections: {
@@ -137,7 +141,7 @@ const resourceMap = {
       id: p.pushkey,
     }),
     reference: id => ({
-      endpoint: `/_synapse/admin/v1/users/${id}/pushers`,
+      endpoint: `/_synapse/admin/v1/users/${encodeURIComponent(id)}/pushers`,
     }),
     data: "pushers",
     total: json => {
@@ -149,7 +153,9 @@ const resourceMap = {
       id: jr,
     }),
     reference: id => ({
-      endpoint: `/_synapse/admin/v1/users/${id}/joined_rooms`,
+      endpoint: `/_synapse/admin/v1/users/${encodeURIComponent(
+        id
+      )}/joined_rooms`,
     }),
     data: "joined_rooms",
     total: json => {
@@ -162,7 +168,7 @@ const resourceMap = {
       id: um.media_id,
     }),
     reference: id => ({
-      endpoint: `/_synapse/admin/v1/users/${id}/media`,
+      endpoint: `/_synapse/admin/v1/users/${encodeURIComponent(id)}/media`,
     }),
     data: "media",
     total: json => {
@@ -275,6 +281,34 @@ const resourceMap = {
       method: "PUT",
     }),
   },
+  destinations: {
+    path: "/_synapse/admin/v1/federation/destinations",
+    map: dst => ({
+      ...dst,
+      id: dst.destination,
+    }),
+    data: "destinations",
+    total: json => {
+      return json.total;
+    },
+    delete: params => ({
+      endpoint: `/_synapse/admin/v1/federation/destinations/${params.id}/reset_connection`,
+      method: "POST",
+    }),
+  },
+  destination_rooms: {
+    map: dstroom => ({
+      ...dstroom,
+      id: dstroom.room_id,
+    }),
+    reference: id => ({
+      endpoint: `/_synapse/admin/v1/federation/destinations/${id}/rooms`,
+    }),
+    data: "rooms",
+    total: json => {
+      return json.total;
+    },
+  },
   registration_tokens: {
     path: "/_synapse/admin/v1/registration_tokens",
     map: rt => ({
@@ -298,7 +332,8 @@ const resourceMap = {
 
 function filterNullValues(key, value) {
   // Filtering out null properties
-  if (value === null) {
+  // to reset user_type from user, it must be null
+  if (value === null && key !== "user_type") {
     return undefined;
   }
   return value;
@@ -315,8 +350,15 @@ function getSearchOrder(order) {
 const dataProvider = {
   getList: (resource, params) => {
     console.log("getList " + resource);
-    const { user_id, name, guests, deactivated, search_term, valid } =
+    const {
-      params.filter;
+      user_id,
+      name,
+      guests,
+      deactivated,
+      search_term,
+      destination,
+      valid,
+    } = params.filter;
     const { page, perPage } = params.pagination;
     const { field, order } = params.sort;
     const from = (page - 1) * perPage;
@@ -326,6 +368,7 @@ const dataProvider = {
       user_id: user_id,
       search_term: search_term,
       name: name,
+      destination: destination,
       guests: guests,
       deactivated: deactivated,
       valid: valid,
@@ -354,9 +397,11 @@ const dataProvider = {
     const res = resourceMap[resource];
 
     const endpoint_url = homeserver + res.path;
-    return jsonClient(`${endpoint_url}/${params.id}`).then(({ json }) => ({
+    return jsonClient(`${endpoint_url}/${encodeURIComponent(params.id)}`).then(
-      data: res.map(json),
+      ({ json }) => ({
-    }));
+        data: res.map(json),
+      })
+    );
   },
 
   getMany: (resource, params) => {
@@ -368,7 +413,9 @@ const dataProvider = {
 
     const endpoint_url = homeserver + res.path;
     return Promise.all(
-      params.ids.map(id => jsonClient(`${endpoint_url}/${id}`))
+      params.ids.map(id =>
+        jsonClient(`${endpoint_url}/${encodeURIComponent(id)}`)
+      )
     ).then(responses => ({
       data: responses.map(({ json }) => res.map(json)),
       total: responses.length,
@@ -409,7 +456,7 @@ const dataProvider = {
     const res = resourceMap[resource];
 
     const endpoint_url = homeserver + res.path;
-    return jsonClient(`${endpoint_url}/${params.data.id}`, {
+    return jsonClient(`${endpoint_url}/${encodeURIComponent(params.data.id)}`, {
       method: "PUT",
       body: JSON.stringify(params.data, filterNullValues),
     }).then(({ json }) => ({
@@ -426,10 +473,13 @@ const dataProvider = {
 
     const endpoint_url = homeserver + res.path;
     return Promise.all(
-      params.ids.map(id => jsonClient(`${endpoint_url}/${id}`), {
+      params.ids.map(
-        method: "PUT",
+        id => jsonClient(`${endpoint_url}/${encodeURIComponent(id)}`),
-        body: JSON.stringify(params.data, filterNullValues),
+        {
-      })
+          method: "PUT",
+          body: JSON.stringify(params.data, filterNullValues),
+        }
+      )
     ).then(responses => ({
       data: responses.map(({ json }) => json),
     }));