Toast fixes/refactoring (#4289)

* Memoize Toast functions
* Rename Toast.success to Toast.toast, add new Toast.success
* Disable prefer-destructuring on AssignmentExpression
This commit is contained in:
DingDongSoLong4
2023-11-20 05:14:34 +02:00
committed by GitHub
parent 049a1b15c3
commit f9e11813f0
52 changed files with 336 additions and 387 deletions

View File

@@ -62,13 +62,13 @@ export const DeleteEntityDialog: React.FC<IDeleteEntityDialogProps> = ({
if (onDeleted) {
onDeleted();
}
Toast.success({
content: intl.formatMessage(messages.deleteToast, {
Toast.success(
intl.formatMessage(messages.deleteToast, {
count,
singularEntity,
pluralEntity,
}),
});
})
);
} catch (e) {
Toast.error(e);
}

View File

@@ -44,7 +44,7 @@ export const DeleteFilesDialog: React.FC<IDeleteSceneDialogProps> = (
setIsDeleting(true);
try {
await mutateDeleteFiles(props.selected.map((f) => f.id));
Toast.success({ content: toastMessage });
Toast.success(toastMessage);
props.onClose(true);
} catch (e) {
Toast.error(e);

View File

@@ -197,13 +197,11 @@ export const FilterSelectComponent = <
}
setLoading(false);
Toast.success({
content: (
<span>
{message}: <b>{name}</b>
</span>
),
});
Toast.success(
<span>
{message}: <b>{name}</b>
</span>
);
} catch (e) {
Toast.error(e);
}

View File

@@ -72,7 +72,6 @@ export const GridCard: React.FC<ICardProps> = (props: ICardProps) => {
checked={props.selected}
onChange={() => props.onSelectedChanged!(!props.selected, shiftKey)}
onClick={(event: React.MouseEvent<HTMLInputElement, MouseEvent>) => {
// eslint-disable-next-line prefer-destructuring
shiftKey = event.shiftKey;
event.stopPropagation();
}}

View File

@@ -50,7 +50,7 @@ export const ReassignFilesDialog: React.FC<IReassignFilesDialogProps> = (
setReassigning(true);
try {
await mutateSceneAssignFile(scenes[0].id, props.selected.id);
Toast.success({ content: toastMessage });
Toast.success(toastMessage);
props.onClose();
} catch (e) {
Toast.error(e);

View File

@@ -22,16 +22,16 @@ function useCreateObject<T>(
try {
await createFunc(o);
Toast.success({
content: intl.formatMessage(
Toast.success(
intl.formatMessage(
{ id: "toast.created_entity" },
{
entity: intl
.formatMessage({ id: entityTypeID })
.toLocaleLowerCase(),
}
),
});
)
);
} catch (e) {
Toast.error(e);
}

View File

@@ -311,13 +311,11 @@ const FilterSelectComponent = <T extends boolean>(
newItem,
]);
setLoading(false);
Toast.success({
content: (
<span>
{message}: <b>{name}</b>
</span>
),
});
Toast.success(
<span>
{message}: <b>{name}</b>
</span>
);
} catch (e) {
Toast.error(e);
}