Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff0201273a | ||
|
|
e50c95b4be | ||
|
|
9f16e5c6ba | ||
|
|
509a45cba4 | ||
|
|
5c6e5a9641 | ||
|
|
e3d5d51342 |
@@ -4,7 +4,7 @@
|
||||
|
||||
This project is built using [react-admin](https://marmelab.com/react-admin/).
|
||||
|
||||
It needs at least Synapse v1.32.0 for all functions to work as expected!
|
||||
It needs at least Synapse v1.34.0 for all functions to work as expected!
|
||||
|
||||
You get your server version with the request `/_synapse/admin/v1/server_version`.
|
||||
See also [Synapse version API](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/version_api.rst).
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -36,7 +36,6 @@ import {
|
||||
DeleteButton,
|
||||
SaveButton,
|
||||
regex,
|
||||
useRedirect,
|
||||
useTranslate,
|
||||
Pagination,
|
||||
CreateButton,
|
||||
@@ -45,11 +44,12 @@ import {
|
||||
sanitizeListRestProps,
|
||||
NumberField,
|
||||
} from "react-admin";
|
||||
import { Link } from "react-router-dom";
|
||||
import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
|
||||
import { DeviceRemoveButton } from "./devices";
|
||||
import { makeStyles } from "@material-ui/core/styles";
|
||||
|
||||
const redirect = (basePath, id, data) => {
|
||||
const redirect = () => {
|
||||
return {
|
||||
pathname: "/import_users",
|
||||
};
|
||||
@@ -85,7 +85,6 @@ const UserListActions = ({
|
||||
total,
|
||||
...rest
|
||||
}) => {
|
||||
const redirectTo = useRedirect();
|
||||
return (
|
||||
<TopToolbar className={className} {...sanitizeListRestProps(rest)}>
|
||||
{filters &&
|
||||
@@ -106,12 +105,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>
|
||||
|
||||
@@ -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: {
|
||||
|
||||
Reference in New Issue
Block a user