From 535b4f0f8eac6b44dc481f02fc7d371b0ff2d357 Mon Sep 17 00:00:00 2001
From: Emnaghz <emnaghzaiel176@gmail.com>
Date: Wed, 9 Oct 2024 16:32:08 +0100
Subject: [PATCH] fix: content reload after import

---
 .../app-components/attachment/AttachmentInput.tsx   |  2 +-
 .../attachment/AttachmentUploader.tsx               | 13 +++++++------
 .../src/app-components/dialogs/DeleteDialog.tsx     | 11 ++++++++++-
 .../src/components/contents/ContentImportDialog.tsx | 10 ++++++++--
 frontend/src/components/contents/index.tsx          |  9 +++++++--
 frontend/src/hooks/useDialog.tsx                    |  2 +-
 6 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/frontend/src/app-components/attachment/AttachmentInput.tsx b/frontend/src/app-components/attachment/AttachmentInput.tsx
index 82f3938b..28c7a5ec 100644
--- a/frontend/src/app-components/attachment/AttachmentInput.tsx
+++ b/frontend/src/app-components/attachment/AttachmentInput.tsx
@@ -46,7 +46,7 @@ const AttachmentInput = forwardRef<HTMLDivElement, AttachmentThumbnailProps>(
     ref,
   ) => {
     const hasPermission = useHasPermission();
-    const handleChange = (attachment: IAttachment | null) => {
+    const handleChange = (attachment?: IAttachment | null) => {
       onChange && onChange(attachment?.id || null, attachment?.type || null);
     };
 
diff --git a/frontend/src/app-components/attachment/AttachmentUploader.tsx b/frontend/src/app-components/attachment/AttachmentUploader.tsx
index 3587367b..2a7f75a4 100644
--- a/frontend/src/app-components/attachment/AttachmentUploader.tsx
+++ b/frontend/src/app-components/attachment/AttachmentUploader.tsx
@@ -65,7 +65,7 @@ export type FileUploadProps = {
   imageButton?: boolean;
   accept: string;
   enableMediaLibrary?: boolean;
-  onChange?: (data: IAttachment | null) => void;
+  onChange?: (data?: IAttachment | null) => void;
 };
 
 const AttachmentUploader: FC<FileUploadProps> = ({
@@ -99,15 +99,16 @@ const AttachmentUploader: FC<FileUploadProps> = ({
       const file = event.target.files.item(0);
 
       if (file) {
-        const acceptedTypes = accept.split(',');
-        const isValidType = acceptedTypes.some((type) =>
-          file.type === type || file.name.endsWith(type.replace('.*', ''))
+        const acceptedTypes = accept.split(",");
+        const isValidType = acceptedTypes.some(
+          (type) =>
+            file.type === type || file.name.endsWith(type.replace(".*", "")),
         );
 
         if (!isValidType) {
           toast.error(t("message.invalid_file_type"));
-          
-return;
+
+          return;
         }
 
         uploadAttachment(file);
diff --git a/frontend/src/app-components/dialogs/DeleteDialog.tsx b/frontend/src/app-components/dialogs/DeleteDialog.tsx
index f9114992..d5097939 100644
--- a/frontend/src/app-components/dialogs/DeleteDialog.tsx
+++ b/frontend/src/app-components/dialogs/DeleteDialog.tsx
@@ -43,7 +43,16 @@ export const DeleteDialog: FC<DeleteDialogProps> = ({
         </Grid>
       </DialogContent>
       <DialogActions>
-        <Button variant="contained" color="error" onClick={callback} autoFocus>
+        <Button
+          variant="contained"
+          color="error"
+          onClick={() => {
+            if (callback) {
+              callback();
+            }
+          }}
+          autoFocus
+        >
           {t("button.yes")}
         </Button>
         <Button variant="outlined" onClick={closeFunction}>
diff --git a/frontend/src/components/contents/ContentImportDialog.tsx b/frontend/src/components/contents/ContentImportDialog.tsx
index 127dd88c..41954ece 100644
--- a/frontend/src/components/contents/ContentImportDialog.tsx
+++ b/frontend/src/components/contents/ContentImportDialog.tsx
@@ -38,17 +38,23 @@ export const ContentImportDialog: FC<ContentImportDialogProps> = ({
   const { refetch, isFetching } = useQuery(
     ["importContent", data?.contentType?.id, attachmentId],
     async () => {
-      await apiClient.importContent(data?.contentType?.id!, attachmentId!)},
+      if (data?.contentType?.id && attachmentId) {
+        await apiClient.importContent(data.contentType.id, attachmentId);
+      }
+    },
     {
       enabled: false,
       onSuccess: () => {
         handleCloseDialog();
         toast.success(t("message.success_save"));
+        if (rest.callback) {
+          rest.callback();
+        }
       },
       onError: () => {
         toast.error(t("message.internal_server_error"));
       },
-    }
+    },
   );
   const handleCloseDialog = () => {
     closeDialog();
diff --git a/frontend/src/components/contents/index.tsx b/frontend/src/components/contents/index.tsx
index 3db5f548..646455d7 100644
--- a/frontend/src/components/contents/index.tsx
+++ b/frontend/src/components/contents/index.tsx
@@ -67,7 +67,7 @@ export const Contents = () => {
   const { data: contentType } = useGet(String(query.id), {
     entity: EntityType.CONTENT_TYPE,
   });
-  const { dataGridProps } = useFind(
+  const { dataGridProps, refetch } = useFind(
     { entity: EntityType.CONTENT, format: Format.FULL },
     {
       params: searchPayload,
@@ -161,7 +161,12 @@ export const Contents = () => {
         <Paper>
           <ContentDialog {...getDisplayDialogs(addDialogCtl)} />
           <ContentDialog {...getDisplayDialogs(editDialogCtl)} />
-          <ContentImportDialog {...getDisplayDialogs(importDialogCtl)} />
+          <ContentImportDialog
+            {...getDisplayDialogs(importDialogCtl)}
+            callback={() => {
+              refetch();
+            }}
+          />
           <DeleteDialog
             {...deleteDialogCtl}
             callback={() => {
diff --git a/frontend/src/hooks/useDialog.tsx b/frontend/src/hooks/useDialog.tsx
index 2fcb53c5..5eb53434 100644
--- a/frontend/src/hooks/useDialog.tsx
+++ b/frontend/src/hooks/useDialog.tsx
@@ -15,7 +15,7 @@ export type DialogControlProps<T, C = never> = Omit<
 >;
 export type DialogControl<T = null, C = never> = DialogProps & {
   data?: T;
-  callback?: (data: C) => void;
+  callback?: (data?: C) => void;
   openDialog: (data?: T) => void;
   closeDialog: () => void;
 };