Allow managing instance rules

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2024-04-07 11:07:32 +02:00
parent b36b636493
commit 9375f1f117
12 changed files with 329 additions and 10 deletions

View File

@@ -0,0 +1,111 @@
import React from 'react';
import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
import { openModal } from 'soapbox/actions/modals';
import { useRules } from 'soapbox/api/hooks/admin';
import ScrollableList from 'soapbox/components/scrollable-list';
import { Button, Column, HStack, Stack, Text } from 'soapbox/components/ui';
import { useAppDispatch } from 'soapbox/hooks';
import { AdminRule } from 'soapbox/schemas';
import toast from 'soapbox/toast';
const messages = defineMessages({
heading: { id: 'column.admin.rules', defaultMessage: 'Instance rules' },
deleteConfirm: { id: 'confirmations.admin.delete_rule.confirm', defaultMessage: 'Delete' },
deleteHeading: { id: 'confirmations.admin.delete_rule.heading', defaultMessage: 'Delete rule' },
deleteMessage: { id: 'confirmations.admin.delete_rule.message', defaultMessage: 'Are you sure you want to delete the rule?' },
ruleDeleteSuccess: { id: 'admin.edit_rule.deleted', defaultMessage: 'Rule deleted' },
});
interface IRule {
rule: AdminRule;
}
const Rule: React.FC<IRule> = ({ rule }) => {
const intl = useIntl();
const dispatch = useAppDispatch();
const { deleteRule } = useRules();
const handleEditRule = (rule: AdminRule) => () => {
dispatch(openModal('EDIT_RULE', { rule }));
};
const handleDeleteRule = (id: string) => () => {
dispatch(openModal('CONFIRM', {
heading: intl.formatMessage(messages.deleteHeading),
message: intl.formatMessage(messages.deleteMessage),
confirm: intl.formatMessage(messages.deleteConfirm),
onConfirm: () => deleteRule(id, {
onSuccess: () => toast.success(messages.ruleDeleteSuccess),
}),
}));
};
return (
<div key={rule.id} className='rounded-lg bg-gray-100 p-4 dark:bg-primary-800'>
<Stack space={2}>
<Text>{rule.text}</Text>
<Text tag='span' theme='muted' size='sm'>{rule.hint}</Text>
{rule.priority !== null && (
<Text size='sm'>
<Text tag='span' size='sm' weight='medium'>
<FormattedMessage id='admin.rule.priority' defaultMessage='Priority:' />
</Text>
{' '}
{rule.priority}
</Text>
)}
<HStack justifyContent='end' space={2}>
<Button theme='primary' onClick={handleEditRule(rule)}>
<FormattedMessage id='admin.rules.edit' defaultMessage='Edit' />
</Button>
<Button theme='primary' onClick={handleDeleteRule(rule.id)}>
<FormattedMessage id='admin.rules.delete' defaultMessage='Delete' />
</Button>
</HStack>
</Stack>
</div>
);
};
const Rules: React.FC = () => {
const intl = useIntl();
const dispatch = useAppDispatch();
const { data, isLoading } = useRules();
const handleCreateRule = () => {
dispatch(openModal('EDIT_RULE'));
};
const emptyMessage = <FormattedMessage id='empty_column.admin.rules' defaultMessage='There are no instance rules yet.' />;
return (
<Column label={intl.formatMessage(messages.heading)}>
<Stack className='gap-4'>
<Button
className='sm:w-fit sm:self-end'
icon={require('@tabler/icons/outline/plus.svg')}
onClick={handleCreateRule}
theme='secondary'
block
>
<FormattedMessage id='admin.rules.action' defaultMessage='Create rule' />
</Button>
<ScrollableList
scrollKey='rules'
emptyMessage={emptyMessage}
itemClassName='py-3 first:pt-0 last:pb-0'
isLoading={isLoading}
showLoading={isLoading}
>
{data!.map((rule) => (
<Rule key={rule.id} rule={rule} />
))}
</ScrollableList>
</Stack>
</Column>
);
};
export default Rules;

View File

@@ -100,6 +100,13 @@ const Dashboard: React.FC = () => {
/>
)}
{features.adminRules && (
<ListItem
to='/soapbox/admin/rules'
label={<FormattedMessage id='column.admin.rules' defaultMessage='Instance rules' />}
/>
)}
{features.domains && (
<ListItem
to='/soapbox/admin/domains'

View File

@@ -41,6 +41,7 @@ import {
SelectBookmarkFolderModal,
UnauthorizedModal,
VideoModal,
EditRuleModal,
} from 'soapbox/features/ui/util/async-components';
import ModalLoading from './modal-loading';
@@ -63,6 +64,7 @@ const MODAL_COMPONENTS: Record<string, React.LazyExoticComponent<any>> = {
'EDIT_BOOKMARK_FOLDER': EditBookmarkFolderModal,
'EDIT_DOMAIN': EditDomainModal,
'EDIT_FEDERATION': EditFederationModal,
'EDIT_RULE': EditRuleModal,
'EMBED': EmbedModal,
'EVENT_MAP': EventMapModal,
'EVENT_PARTICIPANTS': EventParticipantsModal,

View File

@@ -0,0 +1,92 @@
import React from 'react';
import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
import { useRules } from 'soapbox/api/hooks/admin';
import { Form, FormGroup, Input, Modal } from 'soapbox/components/ui';
import { useTextField } from 'soapbox/hooks/forms';
import { type AdminRule } from 'soapbox/schemas';
import toast from 'soapbox/toast';
const messages = defineMessages({
save: { id: 'admin.edit_rule.save', defaultMessage: 'Save' },
ruleTextPlaceholder: { id: 'admin.edit_rule.fields.text_placeholder', defaultMessage: 'Instance rule text' },
rulePriorityPlaceholder: { id: 'admin.edit_rule.fields.priority_placeholder', defaultMessage: 'Instance rule display priority' },
ruleCreateSuccess: { id: 'admin.edit_rule.created', defaultMessage: 'Rule created' },
ruleUpdateSuccess: { id: 'admin.edit_rule.updated', defaultMessage: 'Rule edited' },
});
interface IEditRuleModal {
onClose: (type?: string) => void;
rule?: AdminRule;
}
const EditRuleModal: React.FC<IEditRuleModal> = ({ onClose, rule }) => {
const intl = useIntl();
const { createRule, updateRule } = useRules();
const text = useTextField(rule?.text);
const priority = useTextField(rule?.priority?.toString());
const onClickClose = () => {
onClose('EDIT_RULE');
};
const handleSubmit = () => {
if (rule) {
updateRule({
id: rule.id,
text: text.value,
priority: isNaN(Number(priority.value)) ? undefined : Number(priority.value),
}, {
onSuccess: () => {
toast.success(messages.ruleUpdateSuccess);
onClickClose();
},
});
} else {
createRule({
text: text.value,
priority: isNaN(Number(priority.value)) ? undefined : Number(priority.value),
}, {
onSuccess: () => {
toast.success(messages.ruleUpdateSuccess);
onClickClose();
},
});
}
};
return (
<Modal
onClose={onClickClose}
title={rule
? <FormattedMessage id='column.admin.edit_rule' defaultMessage='Edit rule' />
: <FormattedMessage id='column.admin.create_rule' defaultMessage='Create rule' />}
confirmationAction={handleSubmit}
confirmationText={intl.formatMessage(messages.save)}
>
<Form>
<FormGroup
labelText={<FormattedMessage id='admin.edit_rule.fields.text_label' defaultMessage='Rule text' />}
>
<Input
placeholder={intl.formatMessage(messages.ruleTextPlaceholder)}
{...text}
/>
</FormGroup>
<FormGroup
labelText={<FormattedMessage id='admin.edit_rule.fields.priority_label' defaultMessage='Rule priority' />}
>
<Input
placeholder={intl.formatMessage(messages.rulePriorityPlaceholder)}
type='number'
{...priority}
/>
</FormGroup>
</Form>
</Modal>
);
};
export default EditRuleModal;

View File

@@ -142,6 +142,7 @@ import {
NostrRelays,
Bech32Redirect,
Relays,
Rules,
} from './util/async-components';
import GlobalHotkeys from './util/global-hotkeys';
import { WrappedRoute } from './util/react-router-helpers';
@@ -332,9 +333,10 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
<WrappedRoute path='/soapbox/admin/log' staffOnly page={AdminPage} component={ModerationLog} content={children} exact />
<WrappedRoute path='/soapbox/admin/users' staffOnly page={AdminPage} component={UserIndex} content={children} exact />
<WrappedRoute path='/soapbox/admin/theme' staffOnly page={AdminPage} component={ThemeEditor} content={children} exact />
<WrappedRoute path='/soapbox/admin/relays' staffOnly page={AdminPage} component={Relays} content={children} exact />
{features.adminAnnouncements && <WrappedRoute path='/soapbox/admin/announcements' staffOnly page={AdminPage} component={Announcements} content={children} exact />}
{features.domains && <WrappedRoute path='/soapbox/admin/domains' staffOnly page={AdminPage} component={Domains} content={children} exact />}
<WrappedRoute path='/soapbox/admin/relays' staffOnly page={AdminPage} component={Relays} content={children} exact />
{features.adminRules && <WrappedRoute path='/soapbox/admin/rules' staffOnly page={AdminPage} component={Rules} content={children} exact />}
<WrappedRoute path='/info' page={EmptyPage} component={ServerInfo} content={children} />
<WrappedRoute path='/developers/apps/create' developerOnly page={DefaultPage} component={CreateApp} content={children} />

View File

@@ -173,3 +173,5 @@ export const EditDomainModal = lazy(() => import('soapbox/features/ui/components
export const NostrRelays = lazy(() => import('soapbox/features/nostr-relays'));
export const Bech32Redirect = lazy(() => import('soapbox/features/nostr/Bech32Redirect'));
export const Relays = lazy(() => import('soapbox/features/admin/relays'));
export const Rules = lazy(() => import('soapbox/features/admin/rules'));
export const EditRuleModal = lazy(() => import('soapbox/features/ui/components/modals/edit-rule-modal'));