Merge branch 'master' into media_protect

package.json

@@ -1,6 +1,6 @@
 {
   "name": "synapse-admin",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Admin GUI for the Matrix.org server Synapse",
   "author": "Awesome Technologies Innovationslabor GmbH",
   "license": "Apache-2.0",

src/components/RoomDirectory.js

@@ -171,10 +171,14 @@ const RoomDirectoryFilter = ({ ...props }) => {
   );
 };
 
-export const FilterableRoomDirectoryList = ({ dispatch, ...props }) => {
+export const FilterableRoomDirectoryList = ({
+  roomDirectoryFilters,
+  dispatch,
+  ...props
+}) => {
   const classes = useStyles();
   const translate = useTranslate();
-  const filter = props.roomDirectoryFilters;
+  const filter = roomDirectoryFilters;
   const roomIdFilter = filter && filter.room_id ? true : false;
   const topicFilter = filter && filter.topic ? true : false;
   const canonicalAliasFilter = filter && filter.canonical_alias ? true : false;
@@ -242,7 +246,7 @@ export const FilterableRoomDirectoryList = ({ dispatch, ...props }) => {
 
 function mapStateToProps(state) {
   return {
-    roomdirectoryfilters:
+    roomDirectoryFilters:
       state.admin.resources.room_directory.list.params.displayedFilters,
   };
 }

src/components/users.js

@@ -36,7 +36,6 @@ import {
   DeleteButton,
   SaveButton,
   regex,
-  useRedirect,
   useTranslate,
   Pagination,
   CreateButton,
@@ -45,12 +44,13 @@ import {
   sanitizeListRestProps,
   NumberField,
 } from "react-admin";
+import { Link } from "react-router-dom";
 import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
 import { DeviceRemoveButton } from "./devices";
 import { ProtectMediaButton } from "./media";
 import { makeStyles } from "@material-ui/core/styles";
 
-const redirect = (basePath, id, data) => {
+const redirect = () => {
   return {
     pathname: "/import_users",
   };
@@ -86,7 +86,6 @@ const UserListActions = ({
   total,
   ...rest
 }) => {
-  const redirectTo = useRedirect();
   return (
     <TopToolbar className={className} {...sanitizeListRestProps(rest)}>
       {filters &&
@@ -107,12 +106,7 @@ const UserListActions = ({
         maxResults={maxResults}
       />
       {/* Add your custom actions */}
-      <Button
-        onClick={() => {
-          redirectTo(redirect);
-        }}
-        label="CSV Import"
-      >
+      <Button component={Link} to={redirect} label="CSV Import">
         <GetAppIcon style={{ transform: "rotate(180deg)", fontSize: "20" }} />
       </Button>
     </TopToolbar>

src/synapse/dataProvider.js

@@ -67,9 +67,8 @@ const resourceMap = {
       return json.total_rooms;
     },
     delete: params => ({
-      endpoint: `/_synapse/admin/v1/rooms/${params.id}/delete`,
+      endpoint: `/_synapse/admin/v1/rooms/${params.id}`,
       body: { block: false },
-      method: "POST",
     }),
   },
   reports: {