Show reports counter icon for staff members, fixes #273

manage-followers-section
Alex Gleason 2020-08-24 17:18:53 -05:00
rodzic fd5fd9d41e
commit c3c77c1795
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
7 zmienionych plików z 68 dodań i 0 usunięć

Wyświetl plik

@ -4,6 +4,10 @@ export const ADMIN_CONFIG_UPDATE_REQUEST = 'ADMIN_CONFIG_UPDATE_REQUEST';
export const ADMIN_CONFIG_UPDATE_SUCCESS = 'ADMIN_CONFIG_UPDATE_SUCCESS'; export const ADMIN_CONFIG_UPDATE_SUCCESS = 'ADMIN_CONFIG_UPDATE_SUCCESS';
export const ADMIN_CONFIG_UPDATE_FAIL = 'ADMIN_CONFIG_UPDATE_FAIL'; export const ADMIN_CONFIG_UPDATE_FAIL = 'ADMIN_CONFIG_UPDATE_FAIL';
export const ADMIN_REPORTS_FETCH_REQUEST = 'ADMIN_REPORTS_FETCH_REQUEST';
export const ADMIN_REPORTS_FETCH_SUCCESS = 'ADMIN_REPORTS_FETCH_SUCCESS';
export const ADMIN_REPORTS_FETCH_FAIL = 'ADMIN_REPORTS_FETCH_FAIL';
export function updateAdminConfig(params) { export function updateAdminConfig(params) {
return (dispatch, getState) => { return (dispatch, getState) => {
dispatch({ type: ADMIN_CONFIG_UPDATE_REQUEST }); dispatch({ type: ADMIN_CONFIG_UPDATE_REQUEST });
@ -16,3 +20,16 @@ export function updateAdminConfig(params) {
}); });
}; };
} }
export function fetchReports(params) {
return (dispatch, getState) => {
dispatch({ type: ADMIN_REPORTS_FETCH_REQUEST, params });
return api(getState)
.get('/api/pleroma/admin/reports', params)
.then(({ data }) => {
dispatch({ type: ADMIN_REPORTS_FETCH_SUCCESS, data, params });
}).catch(error => {
dispatch({ type: ADMIN_REPORTS_FETCH_FAIL, error, params });
});
};
}

Wyświetl plik

@ -0,0 +1,9 @@
import { connect } from 'react-redux';
import IconWithBadge from 'soapbox/components/icon_with_badge';
const mapStateToProps = state => ({
count: state.getIn(['admin', 'report_count']),
id: 'gavel',
});
export default connect(mapStateToProps)(IconWithBadge);

Wyświetl plik

@ -6,6 +6,7 @@ import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import classNames from 'classnames'; import classNames from 'classnames';
import NotificationsCounterIcon from './notifications_counter_icon'; import NotificationsCounterIcon from './notifications_counter_icon';
import ReportsCounterIcon from './reports_counter_icon';
import SearchContainer from 'soapbox/features/compose/containers/search_container'; import SearchContainer from 'soapbox/features/compose/containers/search_container';
import Avatar from '../../../components/avatar'; import Avatar from '../../../components/avatar';
import ActionBar from 'soapbox/features/compose/components/action_bar'; import ActionBar from 'soapbox/features/compose/components/action_bar';
@ -14,6 +15,7 @@ import { openSidebar } from '../../../actions/sidebar';
import Icon from '../../../components/icon'; import Icon from '../../../components/icon';
import ThemeToggle from '../../ui/components/theme_toggle'; import ThemeToggle from '../../ui/components/theme_toggle';
import { getSoapboxConfig } from 'soapbox/actions/soapbox'; import { getSoapboxConfig } from 'soapbox/actions/soapbox';
import { isStaff } from 'soapbox/utils/accounts';
const messages = defineMessages({ const messages = defineMessages({
post: { id: 'tabs_bar.post', defaultMessage: 'Post' }, post: { id: 'tabs_bar.post', defaultMessage: 'Post' },
@ -66,6 +68,14 @@ class TabsBar extends React.PureComponent {
<span><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></span> <span><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></span>
</NavLink>); </NavLink>);
} }
if (account && isStaff(account)) {
links.push(
<a key='reports' className='tabs-bar__link' href='/pleroma/admin/#/reports/index' target='_blank' data-preview-title-id='tabs_bar.reports'>
<Icon id='gavel' />
<ReportsCounterIcon />
<span><FormattedMessage id='tabs_bar.reports' defaultMessage='Reports' /></span>
</a>);
}
links.push( links.push(
<NavLink key='search' className='tabs-bar__link tabs-bar__link--search' to='/search' data-preview-title-id='tabs_bar.search'> <NavLink key='search' className='tabs-bar__link tabs-bar__link--search' to='/search' data-preview-title-id='tabs_bar.search'>
<Icon id='search' /> <Icon id='search' />

Wyświetl plik

@ -16,6 +16,7 @@ import { debounce } from 'lodash';
import { uploadCompose, resetCompose } from '../../actions/compose'; import { uploadCompose, resetCompose } from '../../actions/compose';
import { expandHomeTimeline } from '../../actions/timelines'; import { expandHomeTimeline } from '../../actions/timelines';
import { expandNotifications } from '../../actions/notifications'; import { expandNotifications } from '../../actions/notifications';
import { fetchReports } from '../../actions/admin';
import { fetchFilters } from '../../actions/filters'; import { fetchFilters } from '../../actions/filters';
import { clearHeight } from '../../actions/height_cache'; import { clearHeight } from '../../actions/height_cache';
import { openModal } from '../../actions/modal'; import { openModal } from '../../actions/modal';
@ -420,6 +421,7 @@ class UI extends React.PureComponent {
this.props.dispatch(expandHomeTimeline()); this.props.dispatch(expandHomeTimeline());
this.props.dispatch(expandNotifications()); this.props.dispatch(expandNotifications());
// this.props.dispatch(fetchGroups('member')); // this.props.dispatch(fetchGroups('member'));
this.props.dispatch(fetchReports());
setTimeout(() => this.props.dispatch(fetchFilters()), 500); setTimeout(() => this.props.dispatch(fetchFilters()), 500);
} }

Wyświetl plik

@ -0,0 +1,11 @@
import reducer from '../admin';
import { fromJS } from 'immutable';
describe('admin reducer', () => {
it('should return the initial state', () => {
expect(reducer(undefined, {})).toEqual(fromJS({
reports: [],
report_count: 0,
}));
});
});

Wyświetl plik

@ -0,0 +1,17 @@
import { ADMIN_REPORTS_FETCH_SUCCESS } from '../actions/admin';
import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
const initialState = ImmutableMap({
reports: ImmutableList(),
report_count: 0,
});
export default function admin(state = initialState, action) {
switch(action.type) {
case ADMIN_REPORTS_FETCH_SUCCESS:
return state.set('reports', fromJS(action.data.reports))
.set('report_count', action.data.total);
default:
return state;
}
};

Wyświetl plik

@ -42,6 +42,7 @@ import soapbox from './soapbox';
import instance from './instance'; import instance from './instance';
import me from './me'; import me from './me';
import auth from './auth'; import auth from './auth';
import admin from './admin';
const reducers = { const reducers = {
dropdown_menu, dropdown_menu,
@ -87,6 +88,7 @@ const reducers = {
instance, instance,
me, me,
auth, auth,
admin,
}; };
export default combineReducers(reducers); export default combineReducers(reducers);