refactor(frontend): optimize useDialogs logic

2025-06-26 18:27:28 +00:00 · 2025-02-09 01:45:35 +01:00 · 2025-02-09 01:45:35 +01:00 · f4a438b9dd
commit f4a438b9dd
parent 90a7c55646
19 changed files with 19 additions and 83 deletions
--- a/frontend/src/app-components/attachment/AttachmentForm.tsx
+++ b/frontend/src/app-components/attachment/AttachmentForm.tsx
@ -32,7 +32,6 @@ export const AttachmentForm: FC<ComponentFormProps<AttachmentFormData>> = ({

  return (
    <Wrapper
-      open={!!WrapperProps?.open}
      onSubmit={() => {
        data?.onChange?.(selected);
        rest.onSuccess?.();
--- a/frontend/src/components/Menu/MenuForm.tsx
+++ b/frontend/src/components/Menu/MenuForm.tsx
@ -98,11 +98,7 @@ export const MenuForm: FC<ComponentFormProps<MenuFormData>> = ({
  }, [reset, data?.row]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentContainer flexDirection="row">
--- a/frontend/src/components/categories/CategoryForm.tsx
+++ b/frontend/src/components/categories/CategoryForm.tsx
@ -71,11 +71,7 @@ export const CategoryForm: FC<ComponentFormProps<ICategory>> = ({
  }, [data, reset]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentItem>
@ -93,5 +89,3 @@ export const CategoryForm: FC<ComponentFormProps<ICategory>> = ({
    </Wrapper>
  );
 };
-
-CategoryForm.displayName = "CategoryForm";
--- a/frontend/src/components/content-types/ContentTypeForm.tsx
+++ b/frontend/src/components/content-types/ContentTypeForm.tsx
@ -106,11 +106,7 @@ export const ContentTypeForm: FC<ComponentFormProps<IContentType>> = ({
  }, [data, reset]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentItem>
--- a/frontend/src/components/contents/ContentForm.tsx
+++ b/frontend/src/components/contents/ContentForm.tsx
@ -203,11 +203,7 @@ export const ContentForm: FC<ComponentFormProps<ContentFormData>> = ({
  }, [content, reset]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          {(contentType?.fields || []).map((contentField, index) => (
--- a/frontend/src/components/contents/ContentImportForm.tsx
+++ b/frontend/src/components/contents/ContentImportForm.tsx
@ -53,7 +53,6 @@ export const ContentImportForm: FC<

  return (
    <Wrapper
-      open={!!WrapperProps?.open}
      onSubmit={handleImportClick}
      {...WrapperProps}
      confirmButtonProps={{
--- a/frontend/src/components/context-vars/ContextVarForm.tsx
+++ b/frontend/src/components/context-vars/ContextVarForm.tsx
@ -93,11 +93,7 @@ export const ContextVarForm: FC<ComponentFormProps<IContextVar>> = ({
  }, [data, reset]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentItem>
--- a/frontend/src/components/labels/LabelForm.tsx
+++ b/frontend/src/components/labels/LabelForm.tsx
@ -81,11 +81,7 @@ export const LabelForm: FC<ComponentFormProps<ILabel>> = ({
  }, [data, reset]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentItem>
--- a/frontend/src/components/languages/LanguageForm.tsx
+++ b/frontend/src/components/languages/LanguageForm.tsx
@ -82,11 +82,7 @@ export const LanguageForm: FC<ComponentFormProps<ILanguage>> = ({
  }, [data, reset]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentItem>
--- a/frontend/src/components/nlp/components/NlpEntityForm.tsx
+++ b/frontend/src/components/nlp/components/NlpEntityForm.tsx
@ -89,11 +89,7 @@ export const NlpEntityVarForm: FC<ComponentFormProps<INlpEntity>> = ({
  }, [data, reset]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          {!data ? (
--- a/frontend/src/components/nlp/components/NlpSampleForm.tsx
+++ b/frontend/src/components/nlp/components/NlpSampleForm.tsx
@ -62,13 +62,8 @@ export const NlpSampleForm: FC<ComponentFormProps<INlpDatasetSample>> = ({
  };

  return (
-    <Wrapper open={!!WrapperProps?.open} onSubmit={() => {}} {...WrapperProps}>
-      <form>
-        <NlpDatasetSample
-          sample={data || undefined}
-          submitForm={onSubmitForm}
-        />
-      </form>
+    <Wrapper onSubmit={() => {}} {...WrapperProps}>
+      <NlpDatasetSample sample={data || undefined} submitForm={onSubmitForm} />
    </Wrapper>
  );
 };
--- a/frontend/src/components/nlp/components/NlpValueForm.tsx
+++ b/frontend/src/components/nlp/components/NlpValueForm.tsx
@ -91,11 +91,7 @@ export const NlpValueForm: FC<
  }, [data, reset]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentItem>
--- a/frontend/src/components/roles/PermissionsBody.tsx
+++ b/frontend/src/components/roles/PermissionsBody.tsx
@ -117,7 +117,7 @@ export const PermissionsBody: FC<ComponentFormProps<IRole>> = ({
  }, [models]);

  return (
-    <Wrapper open={!!WrapperProps?.open} onSubmit={() => {}} {...WrapperProps}>
+    <Wrapper onSubmit={() => {}} {...WrapperProps}>
      <Typography fontWeight={700} sx={{ marginBottom: 2 }}>
        {role?.name}
      </Typography>
--- a/frontend/src/components/roles/RoleForm.tsx
+++ b/frontend/src/components/roles/RoleForm.tsx
@ -70,11 +70,7 @@ export const RoleForm: FC<ComponentFormProps<IRole>> = ({
  }, [data, reset]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentItem>
--- a/frontend/src/components/subscribers/SubscriberForm.tsx
+++ b/frontend/src/components/subscribers/SubscriberForm.tsx
@ -61,11 +61,7 @@ export const SubscriberForm: FC<ComponentFormProps<ISubscriber>> = ({
  }, [data, reset]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentItem>
--- a/frontend/src/components/translations/TranslationForm.tsx
+++ b/frontend/src/components/translations/TranslationForm.tsx
@ -82,11 +82,7 @@ export const TranslationForm: FC<ComponentFormProps<ITranslation>> = ({
  };

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentItem>
          <FormLabel>{t("label.original_text")}</FormLabel>
--- a/frontend/src/components/users/EditUserForm.tsx
+++ b/frontend/src/components/users/EditUserForm.tsx
@ -74,11 +74,7 @@ export const EditUserForm: FC<ComponentFormProps<EditUserFormData>> = ({
  }, [reset, data?.user]);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentItem>
--- a/frontend/src/components/users/InviteUserForm.tsx
+++ b/frontend/src/components/users/InviteUserForm.tsx
@ -62,11 +62,7 @@ export const InviteUserForm: FC<ComponentFormProps<undefined>> = ({
    sendInvitation(params);

  return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
      <form onSubmit={handleSubmit(onSubmitForm)}>
        <ContentContainer>
          <ContentItem>
--- a/frontend/src/types/common/dialogs.types.ts
+++ b/frontend/src/types/common/dialogs.types.ts
@ -151,8 +151,9 @@ export interface DialogProviderProps {
 // form dialog
 export interface FormDialogProps
  extends FormButtonsProps,
-    Omit<MuiDialogProps, "onSubmit">,
+    Omit<MuiDialogProps, "onSubmit" | "open">,
    DialogExtraOptions {
+  open?: boolean;
  title?: string;
  children?: React.ReactNode;
 }