Compare commits

...

6 Commits

Author SHA1 Message Date
Michael Albert ff0201273a Bump version and update packages
Change-Id: If148587c9e5895ab6b8a70ec34c9190f0bb8f2e0
2021-07-05 14:48:25 +02:00
Dirk Klimpel e50c95b4be Fix CSV import button (#154) 2021-07-05 14:32:51 +02:00
Dirk Klimpel 9f16e5c6ba Change delete room API to DELETE (#151) 2021-07-05 14:32:44 +02:00
dependabot[bot] 509a45cba4 Bump dns-packet from 1.3.1 to 1.3.4 (#145)
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-15 11:03:47 +02:00
dependabot[bot] 5c6e5a9641 Bump ws from 6.2.1 to 6.2.2 (#152)
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-15 11:03:31 +02:00
Dirk Klimpel e3d5d51342 Fix broken RoomDirectoryFilter (#155) 2021-06-15 11:03:03 +02:00
6 changed files with 1347 additions and 1516 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
This project is built using [react-admin](https://marmelab.com/react-admin/). 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`. 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). See also [Synapse version API](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/version_api.rst).
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "synapse-admin", "name": "synapse-admin",
"version": "0.8.1", "version": "0.8.2",
"description": "Admin GUI for the Matrix.org server Synapse", "description": "Admin GUI for the Matrix.org server Synapse",
"author": "Awesome Technologies Innovationslabor GmbH", "author": "Awesome Technologies Innovationslabor GmbH",
"license": "Apache-2.0", "license": "Apache-2.0",
+7 -3
View File
@@ -171,10 +171,14 @@ const RoomDirectoryFilter = ({ ...props }) => {
); );
}; };
export const FilterableRoomDirectoryList = ({ dispatch, ...props }) => { export const FilterableRoomDirectoryList = ({
roomDirectoryFilters,
dispatch,
...props
}) => {
const classes = useStyles(); const classes = useStyles();
const translate = useTranslate(); const translate = useTranslate();
const filter = props.roomDirectoryFilters; const filter = roomDirectoryFilters;
const roomIdFilter = filter && filter.room_id ? true : false; const roomIdFilter = filter && filter.room_id ? true : false;
const topicFilter = filter && filter.topic ? true : false; const topicFilter = filter && filter.topic ? true : false;
const canonicalAliasFilter = filter && filter.canonical_alias ? true : false; const canonicalAliasFilter = filter && filter.canonical_alias ? true : false;
@@ -242,7 +246,7 @@ export const FilterableRoomDirectoryList = ({ dispatch, ...props }) => {
function mapStateToProps(state) { function mapStateToProps(state) {
return { return {
roomdirectoryfilters: roomDirectoryFilters:
state.admin.resources.room_directory.list.params.displayedFilters, state.admin.resources.room_directory.list.params.displayedFilters,
}; };
} }
+3 -9
View File
@@ -36,7 +36,6 @@ import {
DeleteButton, DeleteButton,
SaveButton, SaveButton,
regex, regex,
useRedirect,
useTranslate, useTranslate,
Pagination, Pagination,
CreateButton, CreateButton,
@@ -45,11 +44,12 @@ import {
sanitizeListRestProps, sanitizeListRestProps,
NumberField, NumberField,
} from "react-admin"; } from "react-admin";
import { Link } from "react-router-dom";
import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices"; import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
import { DeviceRemoveButton } from "./devices"; import { DeviceRemoveButton } from "./devices";
import { makeStyles } from "@material-ui/core/styles"; import { makeStyles } from "@material-ui/core/styles";
const redirect = (basePath, id, data) => { const redirect = () => {
return { return {
pathname: "/import_users", pathname: "/import_users",
}; };
@@ -85,7 +85,6 @@ const UserListActions = ({
total, total,
...rest ...rest
}) => { }) => {
const redirectTo = useRedirect();
return ( return (
<TopToolbar className={className} {...sanitizeListRestProps(rest)}> <TopToolbar className={className} {...sanitizeListRestProps(rest)}>
{filters && {filters &&
@@ -106,12 +105,7 @@ const UserListActions = ({
maxResults={maxResults} maxResults={maxResults}
/> />
{/* Add your custom actions */} {/* Add your custom actions */}
<Button <Button component={Link} to={redirect} label="CSV Import">
onClick={() => {
redirectTo(redirect);
}}
label="CSV Import"
>
<GetAppIcon style={{ transform: "rotate(180deg)", fontSize: "20" }} /> <GetAppIcon style={{ transform: "rotate(180deg)", fontSize: "20" }} />
</Button> </Button>
</TopToolbar> </TopToolbar>
+1 -2
View File
@@ -67,9 +67,8 @@ const resourceMap = {
return json.total_rooms; return json.total_rooms;
}, },
delete: params => ({ delete: params => ({
endpoint: `/_synapse/admin/v1/rooms/${params.id}/delete`, endpoint: `/_synapse/admin/v1/rooms/${params.id}`,
body: { block: false }, body: { block: false },
method: "POST",
}), }),
}, },
reports: { reports: {
+1334 -1500
View File
File diff suppressed because it is too large Load Diff