lirent/synapse-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove filter

Browse Source
This commit is contained in:
dklimpel 2021-08-18 12:06:21 +02:00
parent 1b55f64ed1
commit 1f898bf7a8
1 changed files with 27 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/components/users.js
View File

@ -1,6 +1,4 @@
import React, { cloneElement, Fragment } from "react"; import React, { cloneElement, Fragment } from "react";
import { connect } from "react-redux";
import { Chip } from "@material-ui/core";
import Avatar from "@material-ui/core/Avatar"; import Avatar from "@material-ui/core/Avatar";
import PersonPinIcon from "@material-ui/icons/PersonPin"; import PersonPinIcon from "@material-ui/icons/PersonPin";
import AssignmentIndIcon from "@material-ui/icons/AssignmentInd"; import AssignmentIndIcon from "@material-ui/icons/AssignmentInd";
@ -124,9 +122,7 @@ const UserPagination = props => (
<Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} /> <Pagination {...props} rowsPerPageOptions={[10, 25, 50, 100, 500, 1000]} />
); );
const UserFilter = props => { const UserFilter = props => (
const translate = useTranslate();
return (
<Filter {...props}> <Filter {...props}>
<SearchInput source="name" alwaysOn /> <SearchInput source="name" alwaysOn />
<BooleanInput source="guests" alwaysOn /> <BooleanInput source="guests" alwaysOn />
@ -135,27 +131,8 @@ const UserFilter = props => {
source="deactivated" source="deactivated"
alwaysOn alwaysOn
/> />
<Chip
label={translate("resources.users.fields.admin")}
source="admin"
defaultValue={false}
style={{ marginBottom: 8 }}
/>
<Chip
label={translate("resources.users.fields.is_guest")}
source="is_guest"
defaultValue={false}
style={{ marginBottom: 8 }}
/>
<Chip
label={translate("resources.users.fields.creation_ts_ms")}
source="creation_ts"
defaultValue={false}
style={{ marginBottom: 8 }}
/>
</Filter> </Filter>
); );
};
const UserBulkActionButtons = props => ( const UserBulkActionButtons = props => (
<Fragment> <Fragment>
@ -173,13 +150,8 @@ const AvatarField = ({ source, className, record = {} }) => (
<Avatar src={record[source]} className={className} /> <Avatar src={record[source]} className={className} />
); );
const FilterableUserList = ({ userFilters, dispatch, ...props }) => { export const UserList = props => {
const classes = useStyles(); const classes = useStyles();
const filter = userFilters;
const adminFilter = filter && filter.admin ? true : false;
const isGuestFilter = filter && filter.is_guest ? true : false;
const creationTimeFilter = filter && filter.creation_ts ? true : false;
return ( return (
<List <List
{...props} {...props}
@ -199,9 +171,8 @@ const FilterableUserList = ({ userFilters, dispatch, ...props }) => {
<TextField source="id" sortBy="name" /> <TextField source="id" sortBy="name" />
<TextField source="displayname" /> <TextField source="displayname" />
<BooleanField source="deactivated" /> <BooleanField source="deactivated" />
{adminFilter && <BooleanField source="admin" />} <BooleanField source="admin" />
{isGuestFilter && <BooleanField source="is_guest" />} <BooleanField source="is_guest" />
{creationTimeFilter && (
<DateField <DateField
source="creation_ts" source="creation_ts"
label="resources.users.fields.creation_ts_ms" label="resources.users.fields.creation_ts_ms"
@ -215,18 +186,10 @@ const FilterableUserList = ({ userFilters, dispatch, ...props }) => {
second: "2-digit", second: "2-digit",
}} }}
/> />
)}
</Datagrid> </Datagrid>
</List> </List>
); );
}; };
function mapStateToProps(state) {
return {
userFilters: state.admin.resources.users.list.params.displayedFilters,
};
}
export const UserList = connect(mapStateToProps)(FilterableUserList);
// https://matrix.org/docs/spec/appendices#user-identifiers // https://matrix.org/docs/spec/appendices#user-identifiers
const validateUser = regex( const validateUser = regex(