Admin: add link to moderation log within reports

fix/tabs-bar-issues
Alex Gleason 2021-01-01 14:06:12 -06:00
rodzic acf0619790
commit c5641a566d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
4 zmienionych plików z 92 dodań i 3 usunięć

Wyświetl plik

@ -39,7 +39,7 @@ class ModerationLog extends ImmutablePureComponent {
const showLoading = isLoading && items.count() === 0;
return (
<Column icon='gavel' heading={intl.formatMessage(messages.heading)} backBtnSlim>
<Column icon='balance-scale' heading={intl.formatMessage(messages.heading)} backBtnSlim>
<ScrollableList
isLoading={isLoading}
showLoading={showLoading}

Wyświetl plik

@ -4,7 +4,7 @@ import { connect } from 'react-redux';
import ImmutablePureComponent from 'react-immutable-pure-component';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import Column from '../ui/components/column';
import Column from '../ui/components/better_column';
import ScrollableList from 'soapbox/components/scrollable_list';
import { fetchReports } from 'soapbox/actions/admin';
import Report from './components/report';
@ -12,6 +12,7 @@ import { makeGetReport } from 'soapbox/selectors';
const messages = defineMessages({
heading: { id: 'column.admin.reports', defaultMessage: 'Reports' },
modlog: { id: 'column.admin.reports.menu.moderation_log', defaultMessage: 'Moderation Log' },
emptyMessage: { id: 'admin.reports.empty_message', defaultMessage: 'There are no open reports. If a user gets reported, they will show up here.' },
});
@ -37,6 +38,15 @@ class Reports extends ImmutablePureComponent {
isLoading: true,
}
makeColumnMenu = () => {
const { intl } = this.props;
return [{
text: intl.formatMessage(messages.modlog),
to: '/admin/log',
}];
}
componentDidMount() {
const { dispatch } = this.props;
dispatch(fetchReports())
@ -50,7 +60,7 @@ class Reports extends ImmutablePureComponent {
const showLoading = isLoading && reports.count() === 0;
return (
<Column icon='gavel' heading={intl.formatMessage(messages.heading)} backBtnSlim>
<Column icon='gavel' heading={intl.formatMessage(messages.heading)} menu={this.makeColumnMenu()}>
<ScrollableList
isLoading={isLoading}
showLoading={showLoading}

Wyświetl plik

@ -0,0 +1,38 @@
import React from 'react';
import ColumnHeader from './column_header';
import PropTypes from 'prop-types';
import ColumnBackButton from '../../../components/column_back_button_slim';
import DropdownMenu from 'soapbox/containers/dropdown_menu_container';
// Yes, there are 3 types of columns at this point, but this one is better, I swear
export default class Column extends React.PureComponent {
static propTypes = {
heading: PropTypes.string,
icon: PropTypes.string,
children: PropTypes.node,
active: PropTypes.bool,
menu: PropTypes.array,
};
render() {
const { heading, icon, children, active, menu } = this.props;
const columnHeaderId = heading.replace(/ /g, '-');
return (
<div role='region' aria-labelledby={columnHeaderId} className='column column--better'>
<div className='column__top'>
<ColumnHeader icon={icon} active={active} type={heading} columnHeaderId={columnHeaderId} />
{menu && (
<div className='column__menu'>
<DropdownMenu items={menu} icon='ellipsis-v' size={18} direction='right' />
</div>
)}
<ColumnBackButton />
</div>
{children}
</div>
);
}
}

Wyświetl plik

@ -726,3 +726,44 @@
margin-right: 8px;
}
}
.column--better {
.column__top {
display: flex;
align-items: center;
}
.column-header {
margin-right: auto;
}
.column__menu {
display: flex;
align-items: center;
justify-content: center;
&,
> div,
button {
height: 100%;
}
button {
padding: 0 15px;
> div {
display: flex;
align-items: center;
justify-content: center;
}
}
}
.column-back-button--slim {
&-button {
position: relative;
top: auto;
right: auto;
}
}
}