diff --git a/frontend/src/app-components/attachment/AttachmentThumbnail.tsx b/frontend/src/app-components/attachment/AttachmentThumbnail.tsx index ae0ad6f4..49b86408 100644 --- a/frontend/src/app-components/attachment/AttachmentThumbnail.tsx +++ b/frontend/src/app-components/attachment/AttachmentThumbnail.tsx @@ -114,10 +114,10 @@ const AttachmentThumbnail: FC = ({ { + onError={() => { toast.error(t("message.internal_server_error")); }} - onDeleteSuccess={() => { + onSuccess={() => { toast.success(t("message.success_save")); onChange?.(null); }} diff --git a/frontend/src/app-components/dialogs/DeleteDialog.tsx b/frontend/src/app-components/dialogs/DeleteDialog.tsx index d40c9586..182b7b24 100644 --- a/frontend/src/app-components/dialogs/DeleteDialog.tsx +++ b/frontend/src/app-components/dialogs/DeleteDialog.tsx @@ -28,19 +28,19 @@ export type DeleteDialogProps = DialogControl; export const DeleteDialog = ({ data: ids, entity = EntityType.ATTACHMENT, - onDeleteError = () => {}, - onDeleteSuccess = () => {}, + onError = () => {}, + onSuccess = () => {}, ...rest }: DeleteDialogProps & { entity?: keyof IEntityMapTypes; - onDeleteError?: (error: Error) => void; - onDeleteSuccess?: (data?: unknown) => void; + onError?: (error: Error) => void; + onSuccess?: (data?: unknown) => void; }) => { const { t } = useTranslate(); const options = { - onError: onDeleteError, + onError, onSuccess: (data: unknown) => { - onDeleteSuccess(data); + onSuccess(data); rest.reset?.(); }, }; diff --git a/frontend/src/components/categories/index.tsx b/frontend/src/components/categories/index.tsx index 8a52a737..c36ddb17 100644 --- a/frontend/src/components/categories/index.tsx +++ b/frontend/src/components/categories/index.tsx @@ -109,10 +109,10 @@ export const Categories = () => { { + onError={(error) => { toast.error(error.message || t("message.internal_server_error")); }} - onDeleteSuccess={() => { + onSuccess={() => { deleteDialogCtl.closeDialog(); toast.success(t("message.item_delete_success")); }} diff --git a/frontend/src/components/content-types/index.tsx b/frontend/src/components/content-types/index.tsx index 63b8a4cf..26864f65 100644 --- a/frontend/src/components/content-types/index.tsx +++ b/frontend/src/components/content-types/index.tsx @@ -108,10 +108,10 @@ export const ContentTypes = () => { { + onError={(error) => { toast.error(error.message || t("message.internal_server_error")); }} - onDeleteSuccess={() => { + onSuccess={() => { deleteDialogCtl.closeDialog(); toast.success(t("message.item_delete_success")); }} diff --git a/frontend/src/components/contents/index.tsx b/frontend/src/components/contents/index.tsx index 94cb617c..264ab4ee 100644 --- a/frontend/src/components/contents/index.tsx +++ b/frontend/src/components/contents/index.tsx @@ -163,7 +163,7 @@ export const Contents = () => { { + onSuccess={() => { deleteDialogCtl.closeDialog(); toast.success(t("message.item_delete_success")); }} diff --git a/frontend/src/components/context-vars/index.tsx b/frontend/src/components/context-vars/index.tsx index af52fd5b..8ce89469 100644 --- a/frontend/src/components/context-vars/index.tsx +++ b/frontend/src/components/context-vars/index.tsx @@ -141,10 +141,10 @@ export const ContextVars = () => { { + onError={(error) => { toast.error(error); }} - onDeleteSuccess={() => { + onSuccess={() => { deleteDialogCtl.closeDialog(); toast.success(t("message.item_delete_success")); }} diff --git a/frontend/src/components/labels/index.tsx b/frontend/src/components/labels/index.tsx index 02c18ff6..04a573aa 100644 --- a/frontend/src/components/labels/index.tsx +++ b/frontend/src/components/labels/index.tsx @@ -143,10 +143,10 @@ export const Labels = () => { { + onError={() => { toast.error(t("message.internal_server_error")); }} - onDeleteSuccess={() => { + onSuccess={() => { deleteDialogCtl.closeDialog(); toast.success(t("message.item_delete_success")); }} diff --git a/frontend/src/components/languages/index.tsx b/frontend/src/components/languages/index.tsx index ece4c35a..c2947133 100644 --- a/frontend/src/components/languages/index.tsx +++ b/frontend/src/components/languages/index.tsx @@ -170,10 +170,10 @@ export const Languages = () => { { + onError={() => { toast.error(t("message.internal_server_error")); }} - onDeleteSuccess={() => { + onSuccess={() => { queryClient.removeQueries({ predicate: ({ queryKey }) => { const [_qType, qEntity] = queryKey; diff --git a/frontend/src/components/nlp/components/NlpEntity.tsx b/frontend/src/components/nlp/components/NlpEntity.tsx index 475ef2db..216e7048 100644 --- a/frontend/src/components/nlp/components/NlpEntity.tsx +++ b/frontend/src/components/nlp/components/NlpEntity.tsx @@ -153,10 +153,10 @@ const NlpEntity = () => { { + onError={() => { toast.error(t("message.internal_server_error")); }} - onDeleteSuccess={() => { + onSuccess={() => { deleteDialogCtl.closeDialog(); toast.success(t("message.item_delete_success")); }} diff --git a/frontend/src/components/nlp/components/NlpSample.tsx b/frontend/src/components/nlp/components/NlpSample.tsx index ac764688..bbed6fc4 100644 --- a/frontend/src/components/nlp/components/NlpSample.tsx +++ b/frontend/src/components/nlp/components/NlpSample.tsx @@ -232,8 +232,8 @@ export default function NlpSample() { val.value === NlpSampleType.train ? "enabled" : val.value === NlpSampleType.inbox - ? "inbox" - : "test" + ? "inbox" + : "test" } /> ), @@ -276,10 +276,10 @@ export default function NlpSample() { { + onError={(error) => { toast.error(error); }} - onDeleteSuccess={() => { + onSuccess={() => { deleteDialogCtl.closeDialog(); toast.success(t("message.item_delete_success")); }} diff --git a/frontend/src/components/nlp/components/NlpValues.tsx b/frontend/src/components/nlp/components/NlpValues.tsx index 03f5f5dc..692d5802 100644 --- a/frontend/src/components/nlp/components/NlpValues.tsx +++ b/frontend/src/components/nlp/components/NlpValues.tsx @@ -202,10 +202,10 @@ export const NlpValues = ({ entityId }: { entityId: string }) => { { + onError={(error) => { toast.error(error); }} - onDeleteSuccess={() => { + onSuccess={() => { deleteDialogCtl.closeDialog(); toast.success(t("message.item_delete_success")); }} diff --git a/frontend/src/components/roles/index.tsx b/frontend/src/components/roles/index.tsx index f946de12..751a85d9 100644 --- a/frontend/src/components/roles/index.tsx +++ b/frontend/src/components/roles/index.tsx @@ -122,10 +122,10 @@ export const Roles = () => { { + onError={(error) => { toast.error(error); }} - onDeleteSuccess={() => { + onSuccess={() => { deleteDialogCtl.closeDialog(); toast.success(t("message.item_delete_success")); }} diff --git a/frontend/src/components/translations/index.tsx b/frontend/src/components/translations/index.tsx index 731a9018..d2524f7d 100644 --- a/frontend/src/components/translations/index.tsx +++ b/frontend/src/components/translations/index.tsx @@ -158,10 +158,10 @@ export const Translations = () => { { + onError={() => { toast.error(t("message.internal_server_error")); }} - onDeleteSuccess={() => { + onSuccess={() => { deleteDialogCtl.closeDialog(); toast.success(t("message.item_delete_success")); }} diff --git a/frontend/src/hooks/useDialog.tsx b/frontend/src/hooks/useDialog.tsx index 2fb2c3c5..7a9a51dc 100644 --- a/frontend/src/hooks/useDialog.tsx +++ b/frontend/src/hooks/useDialog.tsx @@ -16,7 +16,7 @@ type TCloseDialog = ( ) => void; type TFnVoid = (data?: T) => void; type TStatesMode = "datumOrData" | "datumAndData"; -export type DialogControl = DialogProps & { +export type DialogControl = Omit & { data?: T[]; datum?: T; reset?: () => void;