Skip to content

Commit

Permalink
fix: sanitize custom user status and fix the inf loop
Browse files Browse the repository at this point in the history
  • Loading branch information
dougfabris committed May 9, 2022
1 parent c2b8692 commit 593d255
Show file tree
Hide file tree
Showing 11 changed files with 317 additions and 405 deletions.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
import { IUserStatus } from '@rocket.chat/core-typings';
import { Button, ButtonGroup, TextInput, Field, Select, Icon, SelectOption } from '@rocket.chat/fuselage';
import { useSetModal, useRoute, useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
import React, { useCallback, ReactElement } from 'react';
import { useForm, Controller } from 'react-hook-form';

import GenericModal from '../../../components/GenericModal';
import VerticalBar from '../../../components/VerticalBar';

type CustomUserStatusFormProps = {
onClose: () => void;
onReload: () => void;
status?: IUserStatus;
};

const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFormProps): ReactElement => {
const t = useTranslation();
const { _id, name, statusType } = status || {};
const setModal = useSetModal();
const route = useRoute('custom-user-status');
const dispatchToastMessage = useToastMessageDispatch();

const {
register,
control,
handleSubmit,
formState: { isDirty, errors },
} = useForm({
defaultValues: { name: status?.name ?? '', statusType: status?.statusType ?? '' },
});

const saveStatus = useMethod('insertOrUpdateUserStatus');
const deleteStatus = useMethod('deleteCustomUserStatus');

const handleSave = useCallback(
async (data) => {
try {
await saveStatus({ _id, previousName: name, previousStatusType: statusType, ...data });

dispatchToastMessage({
type: 'success',
message: t('Custom_User_Status_Updated_Successfully'),
});

onReload();
route.push({});
} catch (error) {
dispatchToastMessage({ type: 'error', message: String(error) });
}
},
[saveStatus, _id, name, statusType, route, dispatchToastMessage, t, onReload],
);

const handleDeleteStatus = useCallback(() => {
const handleCancel = (): void => {
setModal(null);
};

const handleDelete = async (): Promise<void> => {
try {
await deleteStatus(_id);
dispatchToastMessage({ type: 'success', message: t('Custom_User_Status_Has_Been_Deleted') });
onReload();
route.push({});
} catch (error) {
dispatchToastMessage({ type: 'error', message: String(error) });
} finally {
setModal(null);
}
};

setModal(() => (
<GenericModal variant='danger' onConfirm={handleDelete} onCancel={handleCancel} onClose={handleCancel} confirmText={t('Delete')}>
{t('Custom_User_Status_Delete_Warning')}
</GenericModal>
));
}, [_id, route, deleteStatus, dispatchToastMessage, onReload, setModal, t]);

const presenceOptions: SelectOption[] = [
['online', t('Online')],
['busy', t('Busy')],
['away', t('Away')],
['offline', t('Offline')],
];

return (
<VerticalBar.ScrollableContent>
<Field>
<Field.Label>{t('Name')}</Field.Label>
<Field.Row>
<TextInput {...register('name', { required: true })} placeholder={t('Name')} />
</Field.Row>
{errors?.name && <Field.Error>{t('error-the-field-is-required', { field: t('Name') })}</Field.Error>}
</Field>
<Field>
<Field.Label>{t('Presence')}</Field.Label>
<Field.Row>
<Controller
name='statusType'
control={control}
rules={{ required: true }}
render={({ field }): ReactElement => <Select {...field} placeholder={t('Presence')} options={presenceOptions} />}
/>
</Field.Row>
{errors?.statusType && <Field.Error>{t('error-the-field-is-required', { field: t('Presence') })}</Field.Error>}
</Field>
<Field>
<Field.Row>
<ButtonGroup stretch w='full'>
<Button onClick={onClose}>{t('Cancel')}</Button>
<Button primary onClick={handleSubmit(handleSave)} disabled={!isDirty}>
{t('Save')}
</Button>
</ButtonGroup>
</Field.Row>
</Field>
{_id && (
<Field>
<Field.Row>
<ButtonGroup stretch w='full'>
<Button primary danger onClick={handleDeleteStatus}>
<Icon name='trash' mie='x4' />
{t('Delete')}
</Button>
</ButtonGroup>
</Field.Row>
</Field>
)}
</VerticalBar.ScrollableContent>
);
};

export default CustomUserStatusForm;
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@
import { Box, Button, ButtonGroup, Skeleton, Throbber, InputBox } from '@rocket.chat/fuselage';
import { IUserStatus } from '@rocket.chat/core-typings';
import { Box, Button, ButtonGroup, Skeleton, Throbber, InputBox, Callout } from '@rocket.chat/fuselage';
import { useTranslation } from '@rocket.chat/ui-contexts';
import React, { useMemo, FC } from 'react';
import React, { useMemo, ReactElement } from 'react';

import { AsyncStatePhase } from '../../../hooks/useAsyncState';
import { useEndpointData } from '../../../hooks/useEndpointData';
import EditCustomUserStatus from './EditCustomUserStatus';
import CustomUserStatusForm from './CustomUserStatusForm';

type EditCustomUserStatusWithDataProps = {
_id: string | undefined;
close: () => void;
onChange: () => void;
type CustomUserStatusFormWithDataProps = {
_id?: IUserStatus['_id'];
onClose: () => void;
onReload: () => void;
};

export const EditCustomUserStatusWithData: FC<EditCustomUserStatusWithDataProps> = ({ _id, onChange, ...props }) => {
const CustomUserStatusFormWithData = ({ _id, onReload, onClose }: CustomUserStatusFormWithDataProps): ReactElement => {
const t = useTranslation();
const query = useMemo(() => ({ query: JSON.stringify({ _id }) }), [_id]);

const { value: data, phase: state, error, reload } = useEndpointData('custom-user-status.list', query);

const handleReload = (): void => {
onReload?.();
reload?.();
};

if (!_id) {
return <CustomUserStatusForm onReload={handleReload} onClose={onClose} />;
}

if (state === AsyncStatePhase.LOADING) {
return (
<Box pb='x20'>
<Box p='x20'>
<Skeleton mbs='x8' />
<InputBox.Skeleton w='full' />
<Skeleton mbs='x8' />
Expand All @@ -44,18 +54,13 @@ export const EditCustomUserStatusWithData: FC<EditCustomUserStatusWithDataProps>

if (error || !data || data.statuses.length < 1) {
return (
<Box fontScale='h2' pb='x20'>
{t('Custom_User_Status_Error_Invalid_User_Status')}
<Box p='x20'>
<Callout type='danger'>{t('Custom_User_Status_Error_Invalid_User_Status')}</Callout>
</Box>
);
}

const handleChange = (): void => {
onChange?.();
reload?.();
};

return <EditCustomUserStatus data={data.statuses[0]} onChange={handleChange} {...props} />;
return <CustomUserStatusForm status={data.statuses[0]} onReload={handleReload} onClose={onClose} />;
};

export default EditCustomUserStatusWithData;
export default CustomUserStatusFormWithData;
Loading

0 comments on commit 593d255

Please sign in to comment.