Allow importing csv files

Change-Id: I8f4c417c1762ba6dbc0fa929ecf8262e6e8a2e42

.dockerignore

@@ -1,4 +1,5 @@
 # Exclude a bunch of stuff which can make the build context a larger than it needs to be
+.git/
 tests/
 build/
 lib/

README.md

@@ -4,33 +4,6 @@
 
 This project is built using [react-admin](https://marmelab.com/react-admin/).
 
-It needs at least Synapse v1.15.0 for all functions to work as expected!
+Use `yarn install` after cloning this repo.
 
-## Step-By-Step install:
+Use `yarn start` to launch the webserver.
-
-You have two options:
-
-1.  Download the source code from github and run using nodejs
-2.  Run the Docker container
-
-Steps for 1):
-
-- make sure you have installed the following: git, yarn, nodejs
-- download the source code: `git clone https://github.com/Awesome-Technologies/synapse-admin.git`
-- change into downloaded directory: `cd synapse-admin`
-- download dependencies: `yarn install`
-- start web server: `yarn start`
-
-Steps for 2):
-
-- run the Docker container: `docker run -p 8080:80 awesometechnologies/synapse-admin`
-- browse to http://localhost:8080
-
-## Screenshots
-
-![Screenshots](./screenshots.jpg)
-
-## Development
-
-- Use `yarn test` to run all style, lint and unit tests
-- Use `yarn fix` to fix the coding style

package.json

@@ -1,10 +1,9 @@
 {
   "name": "synapse-admin",
-  "version": "0.2.1",
+  "version": "0.1.0",
   "description": "Admin GUI for the Matrix.org server Synapse",
   "author": "Awesome Technologies Innovationslabor GmbH",
   "license": "Apache-2.0",
-  "homepage": ".",
   "repository": {
     "type": "git",
     "url": "https://github.com/Awesome-Technologies/synapse-admin"
@@ -12,26 +11,26 @@
   "devDependencies": {
     "@testing-library/jest-dom": "^5.1.1",
     "@testing-library/react": "^10.0.2",
-    "@testing-library/user-event": "^12.0.11",
+    "@testing-library/user-event": "^10.0.1",
     "enzyme": "^3.11.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.0.0"
   },
   "dependencies": {
     "prop-types": "^15.7.2",
     "ra-language-german": "^2.1.2",
     "react": "^16.13.1",
-    "react-admin": "^3.7.0",
+    "react-admin": "^3.4.0",
     "react-dom": "^16.13.1",
-    "react-scripts": "^3.4.1"
+    "react-scripts": "^3.4.1",
+    "react-admin-import-csv": "^0.2.5"
   },
   "scripts": {
-    "start": "REACT_APP_VERSION=$(git describe --tags) react-scripts start",
+    "start": "react-scripts start",
-    "build": "REACT_APP_VERSION=$(git describe --tags) react-scripts build",
+    "build": "react-scripts build",
     "fix:other": "yarn prettier --write",
     "fix:code": "yarn test:lint --fix",
     "fix": "yarn fix:code && yarn fix:other",

public/index.html

@@ -38,12 +38,5 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-    <footer
-      style="position: relative; z-index: 2; height: 2em; margin-top: -2em; line-height: 2em; background-color: #eee; border: 0.5px solid #ddd">
-      <a id="copyright" href="https://github.com/Awesome-Technologies/synapse-admin"
-        style="margin-left: 1em; color: #888; font-family: Roboto, Helvetica, Arial, sans-serif; font-weight: 100; font-size: 0.8em; text-decoration: none;">
-        Synapse-Admin <b>(%REACT_APP_VERSION%)</b> by Awesome Technologies Innovationslabor GmbH
-      </a>
-    </footer>
   </body>
 </html>

src/App.js

@@ -4,7 +4,7 @@ import polyglotI18nProvider from "ra-i18n-polyglot";
 import authProvider from "./synapse/authProvider";
 import dataProvider from "./synapse/dataProvider";
 import { UserList, UserCreate, UserEdit } from "./components/users";
-import { RoomList, RoomShow } from "./components/rooms";
+import { RoomList } from "./components/rooms";
 import LoginPage from "./components/LoginPage";
 import UserIcon from "@material-ui/icons/Group";
 import { ViewListIcon as RoomIcon } from "@material-ui/icons/ViewList";
@@ -35,10 +35,8 @@ const App = () => (
       edit={UserEdit}
       icon={UserIcon}
     />
-    <Resource name="rooms" list={RoomList} show={RoomShow} icon={RoomIcon} />
+    <Resource name="rooms" list={RoomList} icon={RoomIcon} />
     <Resource name="connections" />
-    <Resource name="devices" />
-    <Resource name="servernotices" />
   </Admin>
 );
 

src/components/LoginPage.js

@@ -1,17 +1,13 @@
-import React, { useState, useEffect } from "react";
+import React, { useState } from "react";
 import {
-  fetchUtils,
-  FormDataConsumer,
   Notification,
   useLogin,
   useNotify,
   useLocale,
   useSetLocale,
   useTranslate,
-  PasswordInput,
-  TextInput,
 } from "react-admin";
-import { Form, useForm } from "react-final-form";
+import { Field, Form } from "react-final-form";
 import {
   Avatar,
   Button,
@@ -29,7 +25,7 @@ const useStyles = makeStyles(theme => ({
   main: {
     display: "flex",
     flexDirection: "column",
-    minHeight: "calc(100vh - 1em)",
+    minHeight: "100vh",
     alignItems: "center",
     justifyContent: "flex-start",
     background: "url(./images/floating-cogs.svg)",
@@ -38,9 +34,8 @@ const useStyles = makeStyles(theme => ({
     backgroundSize: "cover",
   },
   card: {
-    minWidth: "30em",
+    minWidth: 300,
     marginTop: "6em",
-    marginBottom: "6em",
   },
   avatar: {
     margin: "1em",
@@ -65,12 +60,6 @@ const useStyles = makeStyles(theme => ({
   actions: {
     padding: "0 1em 1em 1em",
   },
-  serverVersion: {
-    color: "#9e9e9e",
-    fontFamily: "Roboto, Helvetica, Arial, sans-serif",
-    marginBottom: "1em",
-    marginLeft: "0.5em",
-  },
 }));
 
 const LoginPage = ({ theme }) => {
@@ -81,7 +70,7 @@ const LoginPage = ({ theme }) => {
   var locale = useLocale();
   const setLocale = useSetLocale();
   const translate = useTranslate();
-  const base_url = localStorage.getItem("base_url");
+  const homeserver = localStorage.getItem("base_url");
 
   const renderInput = ({
     meta: { touched, error } = {},
@@ -99,23 +88,15 @@ const LoginPage = ({ theme }) => {
 
   const validate = values => {
     const errors = {};
+    if (!values.homeserver) {
+      errors.homeserver = translate("ra.validation.required");
+    }
     if (!values.username) {
       errors.username = translate("ra.validation.required");
     }
     if (!values.password) {
       errors.password = translate("ra.validation.required");
     }
-    if (!values.base_url) {
-      errors.base_url = translate("ra.validation.required");
-    } else {
-      if (!values.base_url.match(/^(http|https):\/\//)) {
-        errors.base_url = translate("synapseadmin.auth.protocol_error");
-      } else if (
-        !values.base_url.match(/^(http|https):\/\/[a-zA-Z0-9\-.]+(:\d{1,5})?$/)
-      ) {
-        errors.base_url = translate("synapseadmin.auth.url_error");
-      }
-    }
     return errors;
   };
 
@@ -134,101 +115,9 @@ const LoginPage = ({ theme }) => {
     });
   };
 
-  const extractHomeServer = username => {
-    const usernameRegex = /@[a-zA-Z0-9._=\-/]+:([a-zA-Z0-9\-.]+\.[a-zA-Z]+)/;
-    if (!username) return null;
-    const res = username.match(usernameRegex);
-    if (res) return res[1];
-    return null;
-  };
-
-  const UserData = ({ formData }) => {
-    const form = useForm();
-    const [serverVersion, setServerVersion] = useState("");
-
-    const handleUsernameChange = _ => {
-      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`;
-      if (home_server) {
-        // fetch .well-known entry to get base_url
-        fetchUtils
-          .fetchJson(wellKnownUrl, { method: "GET" })
-          .then(({ json }) => {
-            form.change("base_url", json["m.homeserver"].base_url);
-          })
-          .catch(_ => {
-            // if there is no .well-known entry, try the home server name
-            form.change("base_url", `https://${home_server}`);
-          });
-      }
-    };
-
-    useEffect(
-      _ => {
-        if (
-          !formData.base_url ||
-          !formData.base_url.match(/^(http|https):\/\/[a-zA-Z0-9\-.]+$/)
-        )
-          return;
-        const versionUrl = `${formData.base_url}/_synapse/admin/v1/server_version`;
-        fetchUtils
-          .fetchJson(versionUrl, { method: "GET" })
-          .then(({ json }) => {
-            setServerVersion(
-              `${translate("synapseadmin.auth.server_version")} ${
-                json["server_version"]
-              }`
-            );
-          })
-          .catch(_ => {
-            setServerVersion("");
-          });
-      },
-      [formData.base_url]
-    );
-
-    return (
-      <div>
-        <div className={classes.input}>
-          <TextInput
-            autoFocus
-            name="username"
-            component={renderInput}
-            label={translate("ra.auth.username")}
-            disabled={loading}
-            onBlur={handleUsernameChange}
-            fullWidth
-          />
-        </div>
-        <div className={classes.input}>
-          <PasswordInput
-            name="password"
-            component={renderInput}
-            label={translate("ra.auth.password")}
-            type="password"
-            disabled={loading}
-            fullWidth
-          />
-        </div>
-        <div className={classes.input}>
-          <TextInput
-            name="base_url"
-            component={renderInput}
-            label={translate("synapseadmin.auth.base_url")}
-            disabled={loading}
-            fullWidth
-          />
-        </div>
-        <div className={classes.serverVersion}>{serverVersion}</div>
-      </div>
-    );
-  };
-
   return (
     <Form
-      initialValues={{ base_url: base_url }}
+      initialValues={{ homeserver: homeserver }}
       onSubmit={handleSubmit}
       validate={validate}
       render={({ handleSubmit }) => (
@@ -257,9 +146,32 @@ const LoginPage = ({ theme }) => {
                     <MenuItem value="en">English</MenuItem>
                   </Select>
                 </div>
-                <FormDataConsumer>
+                <div className={classes.input}>
-                  {formDataProps => <UserData {...formDataProps} />}
+                  <Field
-                </FormDataConsumer>
+                    autoFocus
+                    name="homeserver"
+                    component={renderInput}
+                    label={translate("synapseadmin.auth.homeserver")}
+                    disabled={loading}
+                  />
+                </div>
+                <div className={classes.input}>
+                  <Field
+                    name="username"
+                    component={renderInput}
+                    label={translate("ra.auth.username")}
+                    disabled={loading}
+                  />
+                </div>
+                <div className={classes.input}>
+                  <Field
+                    name="password"
+                    component={renderInput}
+                    label={translate("ra.auth.password")}
+                    type="password"
+                    disabled={loading}
+                  />
+                </div>
               </div>
               <CardActions className={classes.actions}>
                 <Button

src/components/ServerNotices.js

@@ -1,148 +0,0 @@
-import React, { Fragment, useState } from "react";
-import {
-  Button,
-  SaveButton,
-  SimpleForm,
-  TextInput,
-  Toolbar,
-  required,
-  useCreate,
-  useMutation,
-  useNotify,
-  useTranslate,
-  useUnselectAll,
-} from "react-admin";
-import MessageIcon from "@material-ui/icons/Message";
-import IconCancel from "@material-ui/icons/Cancel";
-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";
-
-const ServerNoticeDialog = ({ open, loading, onClose, onSend }) => {
-  const translate = useTranslate();
-
-  const ServerNoticeToolbar = props => (
-    <Toolbar {...props}>
-      <SaveButton label="resources.servernotices.action.send" />
-      <Button label="ra.action.cancel" onClick={onClose}>
-        <IconCancel />
-      </Button>
-    </Toolbar>
-  );
-
-  return (
-    <Dialog open={open} onClose={onClose} loading={loading}>
-      <DialogTitle>
-        {translate("resources.servernotices.action.send")}
-      </DialogTitle>
-      <DialogContent>
-        <DialogContentText>
-          {translate("resources.servernotices.helper.send")}
-        </DialogContentText>
-        <SimpleForm
-          toolbar={<ServerNoticeToolbar />}
-          submitOnEnter={false}
-          redirect={false}
-          save={onSend}
-        >
-          <TextInput
-            source="body"
-            label="resources.servernotices.fields.body"
-            fullWidth
-            multiline
-            rows="4"
-            resettable
-            validate={required()}
-          />
-        </SimpleForm>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export const ServerNoticeButton = ({ record }) => {
-  const [open, setOpen] = useState(false);
-  const notify = useNotify();
-  const [create, { loading }] = useCreate("servernotices");
-
-  const handleDialogOpen = () => setOpen(true);
-  const handleDialogClose = () => setOpen(false);
-
-  const handleSend = values => {
-    create(
-      { payload: { data: { id: record.id, ...values } } },
-      {
-        onSuccess: () => {
-          notify("resources.servernotices.action.send_success");
-          handleDialogClose();
-        },
-        onFailure: () =>
-          notify("resources.servernotices.action.send_failure", "error"),
-      }
-    );
-  };
-
-  return (
-    <Fragment>
-      <Button
-        label="resources.servernotices.send"
-        onClick={handleDialogOpen}
-        disabled={loading}
-      >
-        <MessageIcon />
-      </Button>
-      <ServerNoticeDialog
-        open={open}
-        onClose={handleDialogClose}
-        onSend={handleSend}
-      />
-    </Fragment>
-  );
-};
-
-export const ServerNoticeBulkButton = ({ selectedIds }) => {
-  const [open, setOpen] = useState(false);
-  const notify = useNotify();
-  const unselectAll = useUnselectAll();
-  const [createMany, { loading }] = useMutation();
-
-  const handleDialogOpen = () => setOpen(true);
-  const handleDialogClose = () => setOpen(false);
-
-  const handleSend = values => {
-    createMany(
-      {
-        type: "createMany",
-        resource: "servernotices",
-        payload: { ids: selectedIds, data: values },
-      },
-      {
-        onSuccess: ({ data }) => {
-          notify("resources.servernotices.action.send_success");
-          unselectAll("users");
-          handleDialogClose();
-        },
-        onFailure: error =>
-          notify("resources.servernotices.action.send_failure", "error"),
-      }
-    );
-  };
-
-  return (
-    <Fragment>
-      <Button
-        label="resources.servernotices.send"
-        onClick={handleDialogOpen}
-        disabled={loading}
-      >
-        <MessageIcon />
-      </Button>
-      <ServerNoticeDialog
-        open={open}
-        onClose={handleDialogClose}
-        onSend={handleSend}
-      />
-    </Fragment>
-  );
-};

src/components/devices.js

@@ -1,89 +0,0 @@
-import React, { Fragment, useState } from "react";
-import {
-  Button,
-  useMutation,
-  useNotify,
-  Confirm,
-  useRefresh,
-} from "react-admin";
-import ActionDelete from "@material-ui/icons/Delete";
-import { makeStyles } from "@material-ui/core/styles";
-import { fade } from "@material-ui/core/styles/colorManipulator";
-import classnames from "classnames";
-
-const useStyles = makeStyles(
-  theme => ({
-    deleteButton: {
-      color: theme.palette.error.main,
-      "&:hover": {
-        backgroundColor: fade(theme.palette.error.main, 0.12),
-        // Reset on mouse devices
-        "@media (hover: none)": {
-          backgroundColor: "transparent",
-        },
-      },
-    },
-  }),
-  { name: "RaDeleteDeviceButton" }
-);
-
-export const DeviceRemoveButton = props => {
-  const { record } = props;
-  const classes = useStyles(props);
-  const [open, setOpen] = useState(false);
-  const refresh = useRefresh();
-  const notify = useNotify();
-
-  const [removeDevice, { loading }] = useMutation();
-
-  if (!record) return null;
-
-  const handleClick = () => setOpen(true);
-  const handleDialogClose = () => setOpen(false);
-
-  const handleConfirm = () => {
-    removeDevice(
-      {
-        type: "delete",
-        resource: "devices",
-        payload: {
-          id: record.id,
-          user_id: record.user_id,
-        },
-      },
-      {
-        onSuccess: () => {
-          notify("resources.devices.action.erase.success");
-          refresh();
-        },
-        onFailure: () =>
-          notify("resources.devices.action.erase.failure", "error"),
-      }
-    );
-    setOpen(false);
-  };
-
-  return (
-    <Fragment>
-      <Button
-        label="ra.action.remove"
-        onClick={handleClick}
-        className={classnames("ra-delete-button", classes.deleteButton)}
-      >
-        <ActionDelete />
-      </Button>
-      <Confirm
-        isOpen={open}
-        loading={loading}
-        onConfirm={handleConfirm}
-        onClose={handleDialogClose}
-        title="resources.devices.action.erase.title"
-        content="resources.devices.action.erase.content"
-        translateOptions={{
-          id: record.id,
-          name: record.display_name ? record.display_name : record.id,
-        }}
-      />
-    </Fragment>
-  );
-};

src/components/rooms.js

@@ -1,224 +1,17 @@
 import React from "react";
-import { connect } from "react-redux";
+import { Datagrid, List, TextField, Pagination } from "react-admin";
-import {
-  BooleanField,
-  Datagrid,
-  Filter,
-  List,
-  Pagination,
-  SelectField,
-  Show,
-  Tab,
-  TabbedShowLayout,
-  TextField,
-  useTranslate,
-} from "react-admin";
-import get from "lodash/get";
-import { Tooltip, Typography, Chip } from "@material-ui/core";
-import HttpsIcon from "@material-ui/icons/Https";
-import NoEncryptionIcon from "@material-ui/icons/NoEncryption";
-import PageviewIcon from "@material-ui/icons/Pageview";
-import ViewListIcon from "@material-ui/icons/ViewList";
-import VisibilityIcon from "@material-ui/icons/Visibility";
 
 const RoomPagination = props => (
   <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
 );
 
-const EncryptionField = ({ source, record = {}, emptyText }) => {
+export const RoomList = props => (
-  const translate = useTranslate();
+  <List {...props} pagination={<RoomPagination />}>
-  const value = get(record, source);
+    <Datagrid>
-  let ariaLabel = value === false ? "ra.boolean.false" : "ra.boolean.true";
+      <TextField source="room_id" />
-
+      <TextField source="name" />
-  if (value === false || value === true) {
+      <TextField source="canonical_alias" />
-    return (
+      <TextField source="joined_members" />
-      <Typography component="span" variant="body2">
+    </Datagrid>
-        <Tooltip title={translate(ariaLabel, { _: ariaLabel })}>
+  </List>
-          {value === true ? (
+);
-            <HttpsIcon data-testid="true" htmlColor="limegreen" />
-          ) : (
-            <NoEncryptionIcon data-testid="false" color="error" />
-          )}
-        </Tooltip>
-      </Typography>
-    );
-  }
-
-  return (
-    <Typography component="span" variant="body2">
-      {emptyText}
-    </Typography>
-  );
-};
-
-const RoomTitle = ({ record }) => {
-  const translate = useTranslate();
-  var name = "";
-  if (record) {
-    name = record.name !== "" ? record.name : record.id;
-  }
-
-  return (
-    <span>
-      {translate("resources.rooms.name", 1)} {name}
-    </span>
-  );
-};
-
-export const RoomShow = props => {
-  const translate = useTranslate();
-  return (
-    <Show {...props} title={<RoomTitle />}>
-      <TabbedShowLayout>
-        <Tab label="synapseadmin.rooms.tabs.basic" icon={<ViewListIcon />}>
-          <TextField source="room_id" />
-          <TextField source="name" />
-          <TextField source="canonical_alias" />
-          <TextField source="creator" />
-        </Tab>
-
-        <Tab
-          label="synapseadmin.rooms.tabs.detail"
-          icon={<PageviewIcon />}
-          path="detail"
-        >
-          <TextField source="joined_members" />
-          <TextField source="joined_local_members" />
-          <TextField source="state_events" />
-          <TextField source="version" />
-          <TextField
-            source="encryption"
-            emptyText={translate("resources.rooms.enums.unencrypted")}
-          />
-        </Tab>
-
-        <Tab
-          label="synapseadmin.rooms.tabs.permission"
-          icon={<VisibilityIcon />}
-          path="permission"
-        >
-          <BooleanField source="federatable" />
-          <BooleanField source="public" />
-          <SelectField
-            source="join_rules"
-            choices={[
-              { id: "public", name: "resources.rooms.enums.join_rules.public" },
-              { id: "knock", name: "resources.rooms.enums.join_rules.knock" },
-              { id: "invite", name: "resources.rooms.enums.join_rules.invite" },
-              {
-                id: "private",
-                name: "resources.rooms.enums.join_rules.private",
-              },
-            ]}
-          />
-          <SelectField
-            source="guest_access"
-            choices={[
-              {
-                id: "can_join",
-                name: "resources.rooms.enums.guest_access.can_join",
-              },
-              {
-                id: "forbidden",
-                name: "resources.rooms.enums.guest_access.forbidden",
-              },
-            ]}
-          />
-          <SelectField
-            source="history_visibility"
-            choices={[
-              {
-                id: "invited",
-                name: "resources.rooms.enums.history_visibility.invited",
-              },
-              {
-                id: "joined",
-                name: "resources.rooms.enums.history_visibility.joined",
-              },
-              {
-                id: "shared",
-                name: "resources.rooms.enums.history_visibility.shared",
-              },
-              {
-                id: "world_readable",
-                name: "resources.rooms.enums.history_visibility.world_readable",
-              },
-            ]}
-          />
-        </Tab>
-      </TabbedShowLayout>
-    </Show>
-  );
-};
-const RoomFilter = ({ ...props }) => {
-  const translate = useTranslate();
-  return (
-    <Filter {...props}>
-      <Chip
-        label={translate("resources.rooms.fields.joined_local_members")}
-        source="joined_local_members"
-        defaultValue={false}
-        style={{ marginBottom: 8 }}
-      />
-      <Chip
-        label={translate("resources.rooms.fields.state_events")}
-        source="state_events"
-        defaultValue={false}
-        style={{ marginBottom: 8 }}
-      />
-      <Chip
-        label={translate("resources.rooms.fields.version")}
-        source="version"
-        defaultValue={false}
-        style={{ marginBottom: 8 }}
-      />
-      <Chip
-        label={translate("resources.rooms.fields.federatable")}
-        source="federatable"
-        defaultValue={false}
-        style={{ marginBottom: 8 }}
-      />
-    </Filter>
-  );
-};
-
-const FilterableRoomList = ({ ...props }) => {
-  const filter = props.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;
-
-  return (
-    <List
-      {...props}
-      pagination={<RoomPagination />}
-      sort={{ field: "name", order: "ASC" }}
-      filters={<RoomFilter />}
-    >
-      <Datagrid rowClick="show">
-        <EncryptionField
-          source="is_encrypted"
-          sortBy="encryption"
-          label={<HttpsIcon />}
-        />
-        <TextField source="name" />
-        <TextField source="joined_members" />
-        {localMembersFilter && <TextField source="joined_local_members" />}
-        {stateEventsFilter && <TextField source="state_events" />}
-        {versionFilter && <TextField source="version" />}
-        {federateableFilter && <BooleanField source="federatable" />}
-        <BooleanField source="public" />
-      </Datagrid>
-    </List>
-  );
-};
-
-function mapStateToProps(state) {
-  return {
-    roomFilters: state.admin.resources.rooms.list.params.displayedFilters,
-  };
-}
-
-export const RoomList = connect(mapStateToProps)(FilterableRoomList);

src/components/users.js

@@ -1,8 +1,5 @@
-import React, { cloneElement, Fragment } from "react";
+import React from "react";
-import Avatar from "@material-ui/core/Avatar";
 import PersonPinIcon from "@material-ui/icons/PersonPin";
-import ContactMailIcon from "@material-ui/icons/ContactMail";
-import DevicesIcon from "@material-ui/icons/Devices";
 import SettingsInputComponentIcon from "@material-ui/icons/SettingsInputComponent";
 import {
   ArrayInput,
@@ -13,84 +10,25 @@ import {
   Edit,
   List,
   Filter,
-  Toolbar,
   SimpleForm,
   SimpleFormIterator,
   TabbedForm,
   FormTab,
   BooleanField,
   BooleanInput,
+  ImageField,
   PasswordInput,
   TextField,
   TextInput,
   ReferenceField,
-  ReferenceManyField,
+  Toolbar,
-  SelectInput,
-  BulkDeleteButton,
-  DeleteButton,
-  SaveButton,
-  regex,
-  useTranslate,
-  Pagination,
-  CreateButton,
-  ExportButton,
   TopToolbar,
-  sanitizeListRestProps,
+  SelectInput,
+  regex,
+  Pagination,
 } from "react-admin";
-import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
+import { ImportButton } from "react-admin-import-csv";
-import { DeviceRemoveButton } from "./devices";
+import { CreateButton, ExportButton } from "ra-ui-materialui";
-import { makeStyles } from "@material-ui/core/styles";
-
-const useStyles = makeStyles({
-  small: {
-    height: "40px",
-    width: "40px",
-  },
-  large: {
-    height: "120px",
-    width: "120px",
-    float: "right",
-  },
-});
-
-const UserListActions = ({
-  currentSort,
-  className,
-  resource,
-  filters,
-  displayedFilters,
-  exporter, // you can hide ExportButton if exporter = (null || false)
-  filterValues,
-  permanentFilter,
-  hasCreate, // you can hide CreateButton if hasCreate = false
-  basePath,
-  selectedIds,
-  onUnselectItems,
-  showFilter,
-  maxResults,
-  total,
-  ...rest
-}) => (
-  <TopToolbar className={className} {...sanitizeListRestProps(rest)}>
-    {filters &&
-      cloneElement(filters, {
-        resource,
-        showFilter,
-        displayedFilters,
-        filterValues,
-        context: "button",
-      })}
-    <CreateButton basePath={basePath} />
-    <ExportButton
-      disabled={total === 0}
-      resource={resource}
-      sort={currentSort}
-      filter={{ ...filterValues, ...permanentFilter }}
-      exporter={exporter}
-      maxResults={maxResults}
-    />
-  </TopToolbar>
-);
 
 const UserPagination = props => (
   <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
@@ -107,71 +45,72 @@ const UserFilter = props => (
   </Filter>
 );
 
-const UserBulkActionButtons = props => {
+const ListActions = props => {
-  const translate = useTranslate();
+  const {
+    className,
+    basePath,
+    total,
+    resource,
+    currentSort,
+    filterValues,
+    exporter
+  } = props;
   return (
-    <Fragment>
+    <TopToolbar className={className}>
-      <ServerNoticeBulkButton {...props} />
+      <CreateButton basePath={basePath} />
-      <BulkDeleteButton
+      <ImportButton {...props} />
-        {...props}
+      <ExportButton
-        label="resources.users.action.erase"
+        disabled={total === 0}
-        title={translate("resources.users.helper.erase")}
+        resource={resource}
+        sort={currentSort}
+        filter={filterValues}
+        exporter={exporter}
       />
-    </Fragment>
+    </TopToolbar>
   );
 };
 
-const AvatarField = ({ source, className, record = {} }) => (
+export const UserList = props => (
-  <Avatar src={record[source]} className={className} />
+  <List
+    {...props}
+    filters={<UserFilter />}
+    filterDefaultValues={{ guests: true, deactivated: false }}
+    bulkActionButtons={false}
+    pagination={<UserPagination />}
+    actions={<ListActions />}
+  >
+    <Datagrid rowClick="edit">
+      <ReferenceField
+        source="Avatar"
+        reference="users"
+        link={false}
+        sortable={false}
+      >
+        <ImageField source="avatar_url" title="displayname" />
+      </ReferenceField>
+      <TextField source="id" />
+      {/* Hack since the users endpoint does not give displaynames in the list*/}
+      <ReferenceField
+        source="name"
+        reference="users"
+        link={false}
+        sortable={false}
+      >
+        <TextField source="displayname" />
+      </ReferenceField>
+      <BooleanField source="is_guest" sortable={false} />
+      <BooleanField source="admin" sortable={false} />
+      <BooleanField source="deactivated" sortable={false} />
+    </Datagrid>
+  </List>
 );
 
-export const UserList = props => {
-  const classes = useStyles();
-  return (
-    <List
-      {...props}
-      filters={<UserFilter />}
-      filterDefaultValues={{ guests: true, deactivated: false }}
-      actions={<UserListActions maxResults={10000} />}
-      bulkActionButtons={<UserBulkActionButtons />}
-      pagination={<UserPagination />}
-    >
-      <Datagrid rowClick="edit">
-        <AvatarField
-          source="avatar_src"
-          sortable={false}
-          className={classes.small}
-        />
-        <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
 const validateUser = regex(
   /^@[a-z0-9._=\-/]+:.*/,
   "synapseadmin.users.invalid_user_id"
 );
 
-const UserEditToolbar = props => {
-  const translate = useTranslate();
-  return (
-    <Toolbar {...props}>
-      <SaveButton submitOnEnter={true} />
-      <DeleteButton
-        label="resources.users.action.erase"
-        title={translate("resources.users.helper.erase")}
-      />
-      <ServerNoticeButton />
-    </Toolbar>
-  );
-};
-
 export const UserCreate = props => (
   <Create {...props}>
     <SimpleForm>
@@ -195,85 +134,44 @@ export const UserCreate = props => (
   </Create>
 );
 
-const UserTitle = ({ record }) => {
+export const UserEdit = props => (
-  const translate = useTranslate();
+  <Edit {...props}>
-  return (
+    <TabbedForm>
-    <span>
+      <FormTab label="resources.users.name" icon={<PersonPinIcon />}>
-      {translate("resources.users.name", {
+        <TextInput source="id" disabled />
-        smart_count: 1,
+        <TextInput source="displayname" />
-      })}{" "}
+        <PasswordInput source="password" autoComplete="new-password" />
-      {record ? `"${record.displayname}"` : ""}
+        <BooleanInput source="admin" />
-    </span>
+        <BooleanInput
-  );
+          source="deactivated"
-};
+          helperText="resources.users.helper.deactivate"
-export const UserEdit = props => {
+        />
-  const classes = useStyles();
+        <ArrayInput source="threepids">
-  const translate = useTranslate();
+          <SimpleFormIterator>
-  return (
+            <SelectInput
-    <Edit {...props} title={<UserTitle />}>
+              source="medium"
-      <TabbedForm toolbar={<UserEditToolbar />}>
+              choices={[
-        <FormTab label="resources.users.name" icon={<PersonPinIcon />}>
+                { id: "email", name: "resources.users.email" },
-          <AvatarField
+                { id: "msisdn", name: "resources.users.msisdn" },
-            source="avatar_src"
+              ]}
-            sortable={false}
+            />
-            className={classes.large}
+            <TextInput source="address" />
-          />
+          </SimpleFormIterator>
-          <TextInput source="id" disabled />
+        </ArrayInput>
-          <TextInput source="displayname" />
+      </FormTab>
-          <PasswordInput source="password" autoComplete="new-password" />
+      <FormTab
-          <BooleanInput source="admin" />
+        label="resources.connections.name"
-          <BooleanInput
+        icon={<SettingsInputComponentIcon />}
-            source="deactivated"
+      >
-            helperText="resources.users.helper.deactivate"
+        <ReferenceField reference="connections" source="id" addLabel={false}>
-          />
+          <ArrayField
-          <DateField
+            source="devices[].sessions[0].connections"
-            source="creation_ts_ms"
+            label="resources.connections.name"
-            showTime
-            options={{
-              year: "numeric",
-              month: "2-digit",
-              day: "2-digit",
-              hour: "2-digit",
-              minute: "2-digit",
-              second: "2-digit",
-            }}
-          />
-          <TextField source="consent_version" />
-        </FormTab>
-        <FormTab
-          label="resources.users.threepid"
-          icon={<ContactMailIcon />}
-          path="threepid"
-        >
-          <ArrayInput source="threepids">
-            <SimpleFormIterator>
-              <SelectInput
-                source="medium"
-                choices={[
-                  { id: "email", name: "resources.users.email" },
-                  { id: "msisdn", name: "resources.users.msisdn" },
-                ]}
-              />
-              <TextInput source="address" />
-            </SimpleFormIterator>
-          </ArrayInput>
-        </FormTab>
-        <FormTab
-          label={translate("resources.devices.name", { smart_count: 2 })}
-          icon={<DevicesIcon />}
-          path="devices"
-        >
-          <ReferenceManyField
-            reference="devices"
-            target="user_id"
-            addLabel={false}
           >
             <Datagrid style={{ width: "100%" }}>
-              <TextField source="device_id" sortable={false} />
+              <TextField source="ip" sortable={false} />
-              <TextField source="display_name" sortable={false} />
-              <TextField source="last_seen_ip" sortable={false} />
               <DateField
-                source="last_seen_ts"
+                source="last_seen"
                 showTime
                 options={{
                   year: "numeric",
@@ -285,50 +183,15 @@ export const UserEdit = props => {
                 }}
                 sortable={false}
               />
-              <DeviceRemoveButton />
+              <TextField
+                source="user_agent"
+                sortable={false}
+                style={{ width: "100%" }}
+              />
             </Datagrid>
-          </ReferenceManyField>
+          </ArrayField>
-        </FormTab>
+        </ReferenceField>
-        <FormTab
+      </FormTab>
-          label="resources.connections.name"
+    </TabbedForm>
-          icon={<SettingsInputComponentIcon />}
+  </Edit>
-          path="connections"
+);
-        >
-          <ReferenceField
-            reference="connections"
-            source="id"
-            addLabel={false}
-            link={false}
-          >
-            <ArrayField
-              source="devices[].sessions[0].connections"
-              label="resources.connections.name"
-            >
-              <Datagrid style={{ width: "100%" }}>
-                <TextField source="ip" sortable={false} />
-                <DateField
-                  source="last_seen"
-                  showTime
-                  options={{
-                    year: "numeric",
-                    month: "2-digit",
-                    day: "2-digit",
-                    hour: "2-digit",
-                    minute: "2-digit",
-                    second: "2-digit",
-                  }}
-                  sortable={false}
-                />
-                <TextField
-                  source="user_agent"
-                  sortable={false}
-                  style={{ width: "100%" }}
-                />
-              </Datagrid>
-            </ArrayField>
-          </ReferenceField>
-        </FormTab>
-      </TabbedForm>
-    </Edit>
-  );
-};

src/i18n/de.js

@@ -4,26 +4,13 @@ export default {
   ...germanMessages,
   synapseadmin: {
     auth: {
-      base_url: "Heimserver URL",
+      homeserver: "Heimserver",
       welcome: "Willkommen bei Synapse-admin",
-      server_version: "Synapse Version",
-      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",
     },
     users: {
       invalid_user_id:
         "Muss eine vollständige Matrix Benutzer-ID sein, z.B. @benutzer_id:homeserver",
     },
-    rooms: {
-      details: "Raumdetails",
-      tabs: {
-        basic: "Allgemein",
-        members: "Mitglieder",
-        detail: "Details",
-        permission: "Berechtigungen",
-      },
-    },
   },
   resources: {
     users: {
@@ -31,13 +18,12 @@ export default {
       name: "Benutzer",
       email: "E-Mail",
       msisdn: "Telefon",
-      threepid: "E-Mail / Telefon",
       fields: {
         avatar: "Avatar",
         id: "Benutzer-ID",
         name: "Name",
         is_guest: "Gast",
-        admin: "Server Administrator",
+        admin: "Admin",
         deactivated: "Deaktiviert",
         guests: "Zeige Gäste",
         show_deactivated: "Zeige deaktivierte Benutzer",
@@ -45,24 +31,12 @@ export default {
         displayname: "Anzeigename",
         password: "Passwort",
         avatar_url: "Avatar URL",
-        avatar_src: "Avatar",
         medium: "Medium",
         threepids: "3PIDs",
         address: "Adresse",
-        creation_ts_ms: "Zeitpunkt der Erstellung",
-        consent_version: "Zugestimmte Geschäftsbedingungen",
-        // Devices:
-        device_id: "Geräte-ID",
-        display_name: "Gerätename",
-        last_seen_ts: "Zeitstempel",
-        last_seen_ip: "IP-Adresse",
       },
       helper: {
         deactivate: "Deaktivierte Nutzer können nicht wieder aktiviert werden.",
-        erase: "DSGVO konformes Löschen der Benutzerdaten",
-      },
-      action: {
-        erase: "Lösche Benutzerdaten",
       },
     },
     rooms: {
@@ -72,36 +46,6 @@ export default {
         name: "Name",
         canonical_alias: "Alias",
         joined_members: "Mitglieder",
-        joined_local_members: "Lokale Mitglieder",
-        state_events: "Ereignisse",
-        version: "Version",
-        is_encrypted: "Verschlüsselt",
-        encryption: "Verschlüsselungs-Algorithmus",
-        federatable: "Fö­de­rierbar",
-        public: "Öffentlich",
-        creator: "Ersteller",
-        join_rules: "Beitrittsregeln",
-        guest_access: "Gastzugriff",
-        history_visibility: "Historie-Sichtbarkeit",
-      },
-      enums: {
-        join_rules: {
-          public: "Öffentlich",
-          knock: "Auf Anfrage",
-          invite: "Nur auf Einladung",
-          private: "Privat",
-        },
-        guest_access: {
-          can_join: "Gäste können beitreten",
-          forbidden: "Gäste können nicht beitreten",
-        },
-        history_visibility: {
-          invited: "Ab Einladung",
-          joined: "Ab Beitritt",
-          shared: "Ab Setzen der Einstellung",
-          world_readable: "Jeder",
-        },
-        unencrypted: "Nicht verschlüsselt",
       },
     },
     connections: {
@@ -112,51 +56,5 @@ export default {
         user_agent: "User Agent",
       },
     },
-    devices: {
-      name: "Gerät |||| Geräte",
-      action: {
-        erase: {
-          title: "Entferne %{id}",
-          content: 'Möchten Sie das Gerät "%{name}" wirklich entfernen?',
-          success: "Gerät erfolgreich entfernt.",
-          failure: "Beim Entfernen ist ein Fehler aufgetreten.",
-        },
-      },
-    },
-    servernotices: {
-      name: "Serverbenachrichtigungen",
-      send: "Servernachricht versenden",
-      fields: {
-        body: "Nachricht",
-      },
-      action: {
-        send: "Sende Nachricht",
-        send_success: "Nachricht erfolgreich versendet.",
-        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.',
-      },
-    },
-  },
-  ra: {
-    ...germanMessages.ra,
-    auth: {
-      ...germanMessages.ra.auth,
-      auth_check_error: "Anmeldung fehlgeschlagen",
-    },
-    input: {
-      ...germanMessages.ra.input,
-      password: {
-        ...germanMessages.ra.input.password,
-        toggle_hidden: "Anzeigen",
-        toggle_visible: "Verstecken",
-      },
-    },
-    notification: {
-      ...germanMessages.ra.notifiaction,
-      logged_out: "Abgemeldet",
-    },
   },
 };

src/i18n/en.js

@@ -4,24 +4,13 @@ export default {
   ...englishMessages,
   synapseadmin: {
     auth: {
-      base_url: "Homeserver URL",
+      homeserver: "Homeserver",
       welcome: "Welcome to Synapse-admin",
-      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",
     },
     users: {
       invalid_user_id:
         "Must be a fully qualified Matrix user-id, e.g. @user_id:homeserver",
     },
-    rooms: {
-      tabs: {
-        basic: "Basic",
-        members: "Members",
-        detail: "Details",
-        permission: "Permissions",
-      },
-    },
   },
   resources: {
     users: {
@@ -29,13 +18,12 @@ export default {
       name: "User |||| Users",
       email: "Email",
       msisdn: "Phone",
-      threepid: "Email / Phone",
       fields: {
         avatar: "Avatar",
         id: "User-ID",
         name: "Name",
         is_guest: "Guest",
-        admin: "Server Administrator",
+        admin: "Admin",
         deactivated: "Deactivated",
         guests: "Show guests",
         show_deactivated: "Show deactivated users",
@@ -43,24 +31,12 @@ export default {
         displayname: "Displayname",
         password: "Password",
         avatar_url: "Avatar URL",
-        avatar_src: "Avatar",
         medium: "Medium",
         threepids: "3PIDs",
         address: "Address",
-        creation_ts_ms: "Creation timestamp",
-        consent_version: "Consent version",
-        // Devices:
-        device_id: "Device-ID",
-        display_name: "Device name",
-        last_seen_ts: "Timestamp",
-        last_seen_ip: "IP address",
       },
       helper: {
         deactivate: "Deactivated users cannot be reactivated",
-        erase: "Mark the user as GDPR-erased",
-      },
-      action: {
-        erase: "Erase user data",
       },
     },
     rooms: {
@@ -70,36 +46,6 @@ export default {
         name: "Name",
         canonical_alias: "Alias",
         joined_members: "Members",
-        joined_local_members: "local members",
-        state_events: "State events",
-        version: "Version",
-        is_encrypted: "Encrypted",
-        encryption: "Encryption",
-        federatable: "Federatable",
-        public: "Public",
-        creator: "Creator",
-        join_rules: "Join rules",
-        guest_access: "Guest access",
-        history_visibility: "History visibility",
-      },
-      enums: {
-        join_rules: {
-          public: "Public",
-          knock: "Knock",
-          invite: "Invite",
-          private: "Private",
-        },
-        guest_access: {
-          can_join: "Guests can join",
-          forbidden: "Guests can not join",
-        },
-        history_visibility: {
-          invited: "Since invited",
-          joined: "Since joined",
-          shared: "Since shared",
-          world_readable: "Anyone",
-        },
-        unencrypted: "Unencrypted",
       },
     },
     connections: {
@@ -110,32 +56,5 @@ export default {
         user_agent: "User agent",
       },
     },
-    devices: {
-      name: "Device |||| Devices",
-      action: {
-        erase: {
-          title: "Removing %{id}",
-          content: 'Are you sure you want to remove the device "%{name}"?',
-          success: "Device successfully removed.",
-          failure: "An error has occurred.",
-        },
-      },
-    },
-    servernotices: {
-      name: "Server Notices",
-      send: "Send server notices",
-      fields: {
-        body: "Message",
-      },
-      action: {
-        send: "Send note",
-        send_success: "Server notice successfully sent.",
-        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.',
-      },
-    },
   },
 };

src/setupTests.js

@@ -1,6 +1,4 @@
 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

@@ -1,8 +1,23 @@
 import { fetchUtils } from "react-admin";
 
+const ensureHttpsForUrl = url => {
+  if (/^https:\/\//i.test(url)) {
+    return url;
+  }
+  const domain = url.replace(/http.?:\/\//g, "");
+  return "https://" + domain;
+};
+
+const stripTrailingSlash = str => {
+  if (!str) {
+    return;
+  }
+  return str.endsWith("/") ? str.slice(0, -1) : str;
+};
+
 const authProvider = {
   // called when the user attempts to log in
-  login: ({ base_url, username, password }) => {
+  login: ({ homeserver, username, password }) => {
     console.log("login ");
     const options = {
       method: "POST",
@@ -13,16 +28,17 @@ const authProvider = {
       }),
     };
 
-    // use the base_url from login instead of the well_known entry from the
+    const url = window.decodeURIComponent(homeserver);
-    // server, since the admin might want to access the admin API via some
+    const trimmed_url = url.trim().replace(/\s/g, "");
-    // private address
+    const login_api_url =
-    localStorage.setItem("base_url", base_url);
+      ensureHttpsForUrl(trimmed_url) + "/_matrix/client/r0/login";
-
-    const decoded_base_url = window.decodeURIComponent(base_url);
-    const login_api_url = decoded_base_url + "/_matrix/client/r0/login";
 
     return fetchUtils.fetchJson(login_api_url, options).then(({ json }) => {
-      localStorage.setItem("home_server", json.home_server);
+      const normalized_base_url = stripTrailingSlash(
+        json.well_known["m.homeserver"].base_url
+      );
+      localStorage.setItem("base_url", normalized_base_url);
+      localStorage.setItem("home_server_url", json.home_server);
       localStorage.setItem("user_id", json.user_id);
       localStorage.setItem("access_token", json.access_token);
       localStorage.setItem("device_id", json.device_id);

src/synapse/dataProvider.js

@@ -14,42 +14,22 @@ const jsonClient = (url, options = {}) => {
   return fetchUtils.fetchJson(url, options);
 };
 
-const mxcUrlToHttp = mxcUrl => {
-  const homeserver = localStorage.getItem("base_url");
-  const re = /^mxc:\/\/([^/]+)\/(\w+)/;
-  var ret = re.exec(mxcUrl);
-  console.log("mxcClient " + ret);
-  if (ret == null) return null;
-  const serverName = ret[1];
-  const mediaId = ret[2];
-  return `${homeserver}/_matrix/media/r0/thumbnail/${serverName}/${mediaId}?width=24&height=24&method=scale`;
-};
-
 const resourceMap = {
   users: {
     path: "/_synapse/admin/v2/users",
     map: u => ({
       ...u,
       id: u.name,
-      avatar_src: mxcUrlToHttp(u.avatar_url),
       is_guest: !!u.is_guest,
       admin: !!u.admin,
       deactivated: !!u.deactivated,
-      // need timestamp in milliseconds
-      creation_ts_ms: u.creation_ts * 1000,
     }),
     data: "users",
-    total: json => json.total,
+    total: (json, from, perPage) => {
-    create: data => ({
+      return json.next_token
-      endpoint: `/_synapse/admin/v2/users/${data.id}`,
+        ? parseInt(json.next_token, 10) + perPage
-      body: data,
+        : from + json.users.length;
-      method: "PUT",
+    },
-    }),
-    delete: params => ({
-      endpoint: `/_synapse/admin/v1/deactivate/${params.id}`,
-      body: { erase: true },
-      method: "POST",
-    }),
   },
   rooms: {
     path: "/_synapse/admin/v1/rooms",
@@ -58,28 +38,12 @@ const resourceMap = {
       id: r.room_id,
       alias: r.canonical_alias,
       members: r.joined_members,
-      is_encrypted: !!r.encryption,
-      federatable: !!r.federatable,
-      public: !!r.public,
     }),
     data: "rooms",
     total: json => {
       return json.total_rooms;
     },
   },
-  devices: {
-    map: d => ({
-      ...d,
-      id: d.device_id,
-    }),
-    data: "devices",
-    reference: id => ({
-      endpoint: `/_synapse/admin/v2/users/${id}/devices`,
-    }),
-    delete: params => ({
-      endpoint: `/_synapse/admin/v2/users/${params.user_id}/devices/${params.id}`,
-    }),
-  },
   connections: {
     path: "/_synapse/admin/v1/whois",
     map: c => ({
@@ -88,20 +52,6 @@ const resourceMap = {
     }),
     data: "connections",
   },
-  servernotices: {
-    map: n => ({ id: n.event_id }),
-    create: data => ({
-      endpoint: "/_synapse/admin/v1/send_server_notice",
-      body: {
-        user_id: data.id,
-        content: {
-          msgtype: "m.text",
-          body: data.body,
-        },
-      },
-      method: "POST",
-    }),
-  },
 };
 
 function filterNullValues(key, value) {
@@ -112,20 +62,11 @@ function filterNullValues(key, value) {
   return value;
 }
 
-function getSearchOrder(order) {
-  if (order === "DESC") {
-    return "b";
-  } else {
-    return "f";
-  }
-}
-
 const dataProvider = {
   getList: (resource, params) => {
     console.log("getList " + resource);
     const { user_id, guests, deactivated } = params.filter;
     const { page, perPage } = params.pagination;
-    const { field, order } = params.sort;
     const from = (page - 1) * perPage;
     const query = {
       from: from,
@@ -133,16 +74,14 @@ const dataProvider = {
       user_id: user_id,
       guests: guests,
       deactivated: deactivated,
-      order_by: field,
-      dir: getSearchOrder(order),
     };
     const homeserver = localStorage.getItem("base_url");
     if (!homeserver || !(resource in resourceMap)) return Promise.reject();
 
     const res = resourceMap[resource];
 
-    const endpoint_url = homeserver + res.path;
+    const homeserver_url = homeserver + res.path;
-    const url = `${endpoint_url}?${stringify(query)}`;
+    const url = `${homeserver_url}?${stringify(query)}`;
 
     return jsonClient(url).then(({ json }) => ({
       data: json[res.data].map(res.map),
@@ -157,8 +96,8 @@ const dataProvider = {
 
     const res = resourceMap[resource];
 
-    const endpoint_url = homeserver + res.path;
+    const homeserver_url = homeserver + res.path;
-    return jsonClient(`${endpoint_url}/${params.id}`).then(({ json }) => ({
+    return jsonClient(`${homeserver_url}/${params.id}`).then(({ json }) => ({
       data: res.map(json),
     }));
   },
@@ -170,27 +109,39 @@ const dataProvider = {
 
     const res = resourceMap[resource];
 
-    const endpoint_url = homeserver + res.path;
+    const homeserver_url = homeserver + res.path;
     return Promise.all(
-      params.ids.map(id => jsonClient(`${endpoint_url}/${id}`))
+      params.ids.map(id => jsonClient(`${homeserver_url}/${id}`))
     ).then(responses => ({
       data: responses.map(({ json }) => res.map(json)),
     }));
   },
 
   getManyReference: (resource, params) => {
+    // FIXME
     console.log("getManyReference " + resource);
+    const { page, perPage } = params.pagination;
+    const { field, order } = params.sort;
+    const query = {
+      sort: JSON.stringify([field, order]),
+      range: JSON.stringify([(page - 1) * perPage, page * perPage - 1]),
+      filter: JSON.stringify({
+        ...params.filter,
+        [params.target]: params.id,
+      }),
+    };
 
     const homeserver = localStorage.getItem("base_url");
     if (!homeserver || !(resource in resourceMap)) return Promise.reject();
 
     const res = resourceMap[resource];
 
-    const ref = res["reference"](params.id);
+    const homeserver_url = homeserver + res.path;
-    const endpoint_url = homeserver + ref.endpoint;
+    const url = `${homeserver_url}?${stringify(query)}`;
 
-    return jsonClient(endpoint_url).then(({ headers, json }) => ({
+    return jsonClient(url).then(({ headers, json }) => ({
-      data: json[res.data].map(res.map),
+      data: json,
+      total: parseInt(headers.get("content-range").split("/").pop(), 10),
     }));
   },
 
@@ -201,8 +152,8 @@ const dataProvider = {
 
     const res = resourceMap[resource];
 
-    const endpoint_url = homeserver + res.path;
+    const homeserver_url = homeserver + res.path;
-    return jsonClient(`${endpoint_url}/${params.data.id}`, {
+    return jsonClient(`${homeserver_url}/${params.data.id}`, {
       method: "PUT",
       body: JSON.stringify(params.data, filterNullValues),
     }).then(({ json }) => ({
@@ -217,9 +168,9 @@ const dataProvider = {
 
     const res = resourceMap[resource];
 
-    const endpoint_url = homeserver + res.path;
+    const homeserver_url = homeserver + res.path;
     return Promise.all(
-      params.ids.map(id => jsonClient(`${endpoint_url}/${id}`), {
+      params.ids.map(id => jsonClient(`${homeserver_url}/${id}`), {
         method: "PUT",
         body: JSON.stringify(params.data, filterNullValues),
       })
@@ -234,41 +185,16 @@ const dataProvider = {
     if (!homeserver || !(resource in resourceMap)) return Promise.reject();
 
     const res = resourceMap[resource];
-    if (!("create" in res)) return Promise.reject();
 
-    const create = res["create"](params.data);
+    const homeserver_url = homeserver + res.path;
-    const endpoint_url = homeserver + create.endpoint;
+    return jsonClient(`${homeserver_url}/${params.data.id}`, {
-    return jsonClient(endpoint_url, {
+      method: "PUT",
-      method: create.method,
+      body: JSON.stringify(params.data, filterNullValues),
-      body: JSON.stringify(create.body, filterNullValues),
     }).then(({ json }) => ({
       data: res.map(json),
     }));
   },
 
-  createMany: (resource, params) => {
-    console.log("createMany " + resource);
-    const homeserver = localStorage.getItem("base_url");
-    if (!homeserver || !(resource in resourceMap)) return Promise.reject();
-
-    const res = resourceMap[resource];
-    if (!("create" in res)) return Promise.reject();
-
-    return Promise.all(
-      params.ids.map(id => {
-        params.data.id = id;
-        const cre = res["create"](params.data);
-        const endpoint_url = homeserver + cre.endpoint;
-        return jsonClient(endpoint_url, {
-          method: cre.method,
-          body: JSON.stringify(cre.body, filterNullValues),
-        });
-      })
-    ).then(responses => ({
-      data: responses.map(({ json }) => json),
-    }));
-  },
-
   delete: (resource, params) => {
     console.log("delete " + resource);
     const homeserver = localStorage.getItem("base_url");
@@ -276,24 +202,12 @@ const dataProvider = {
 
     const res = resourceMap[resource];
 
-    if ("delete" in res) {
+    const homeserver_url = homeserver + res.path;
-      const del = res["delete"](params);
+    return jsonClient(`${homeserver_url}/${params.id}`, {
-      const endpoint_url = homeserver + del.endpoint;
+      method: "DELETE",
-      return jsonClient(endpoint_url, {
+    }).then(({ json }) => ({
-        method: "method" in del ? del.method : "DELETE",
+      data: json,
-        body: "body" in del ? JSON.stringify(del.body) : null,
+    }));
-      }).then(({ json }) => ({
-        data: json,
-      }));
-    } else {
-      const endpoint_url = homeserver + res.path;
-      return jsonClient(`${endpoint_url}/${params.id}`, {
-        method: "DELETE",
-        body: JSON.stringify(params.data, filterNullValues),
-      }).then(({ json }) => ({
-        data: json,
-      }));
-    }
   },
 
   deleteMany: (resource, params) => {
@@ -303,32 +217,17 @@ const dataProvider = {
 
     const res = resourceMap[resource];
 
-    if ("delete" in res) {
+    const homeserver_url = homeserver + res.path;
-      return Promise.all(
+    return Promise.all(
-        params.ids.map(id => {
+      params.ids.map(id =>
-          const del = res["delete"]({ ...params, id: id });
+        jsonClient(`${homeserver_url}/${id}`, {
-          const endpoint_url = homeserver + del.endpoint;
+          method: "DELETE",
-          return jsonClient(endpoint_url, {
+          body: JSON.stringify(params.data, filterNullValues),
-            method: "method" in del ? del.method : "DELETE",
+        }).then(responses => ({
-            body: "body" in del ? JSON.stringify(del.body) : null,
+          data: responses.map(({ json }) => json),
-          });
+        }))
-        })
+      )
-      ).then(responses => ({
+    );
-        data: responses.map(({ json }) => json),
-      }));
-    } else {
-      const endpoint_url = homeserver + res.path;
-      return Promise.all(
-        params.ids.map(id =>
-          jsonClient(`${endpoint_url}/${id}`, {
-            method: "DELETE",
-            body: JSON.stringify(params.data, filterNullValues),
-          })
-        )
-      ).then(responses => ({
-        data: responses.map(({ json }) => json),
-      }));
-    }
   },
 };
 

src/synapse/dataProvider.test.js

@@ -1,78 +0,0 @@
-import dataProvider from "./dataProvider";
-
-beforeEach(() => {
-  fetch.resetMocks();
-});
-
-describe("dataProvider", () => {
-  localStorage.setItem("base_url", "http://localhost");
-  localStorage.setItem("access_token", "access_token");
-
-  it("fetches all users", async () => {
-    fetch.mockResponseOnce(
-      JSON.stringify({
-        users: [
-          {
-            name: "user_id1",
-            password_hash: "password_hash1",
-            is_guest: 0,
-            admin: 0,
-            user_type: null,
-            deactivated: 0,
-            displayname: "User One",
-          },
-          {
-            name: "user_id2",
-            password_hash: "password_hash2",
-            is_guest: 0,
-            admin: 1,
-            user_type: null,
-            deactivated: 0,
-            displayname: "User Two",
-          },
-        ],
-        next_token: "100",
-        total: 200,
-      })
-    );
-
-    const users = await dataProvider.getList("users", {
-      pagination: { page: 1, perPage: 5 },
-      sort: { field: "title", order: "ASC" },
-      filter: { author_id: 12 },
-    });
-
-    expect(users["data"][0]["id"]).toEqual("user_id1");
-    expect(users["total"]).toEqual(200);
-    expect(fetch).toHaveBeenCalledTimes(1);
-  });
-
-  it("fetches one user", async () => {
-    fetch.mockResponseOnce(
-      JSON.stringify({
-        name: "user_id1",
-        password: "user_password",
-        displayname: "User",
-        threepids: [
-          {
-            medium: "email",
-            address: "user@mail_1.com",
-          },
-          {
-            medium: "email",
-            address: "user@mail_2.com",
-          },
-        ],
-        avatar_url: "mxc://localhost/user1",
-        admin: false,
-        deactivated: false,
-      })
-    );
-
-    const user = await dataProvider.getOne("users", { id: "user_id1" });
-
-    expect(user["data"]["id"]).toEqual("user_id1");
-    expect(user["data"]["displayname"]).toEqual("User");
-    expect(fetch).toHaveBeenCalledTimes(1);
-  });
-});