From 11cb5e8f3f30986dbfc54556d107ada58cec2f89 Mon Sep 17 00:00:00 2001
From: yassinedorbozgithub <yassine.dorboz.2022@gmail.com>
Date: Thu, 6 Feb 2025 11:55:56 +0100
Subject: [PATCH] fix(frontend): move MenuFormData to menuForm component

---
 frontend/src/components/Menu/MenuForm.tsx       | 12 ++++++++----
 frontend/src/components/Menu/MenuFormDialog.tsx | 12 ++----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Menu/MenuForm.tsx b/frontend/src/components/Menu/MenuForm.tsx
index 2e887ab7..71152966 100644
--- a/frontend/src/components/Menu/MenuForm.tsx
+++ b/frontend/src/components/Menu/MenuForm.tsx
@@ -19,14 +19,18 @@ import { useToast } from "@/hooks/useToast";
 import { useTranslate } from "@/hooks/useTranslate";
 import { EntityType } from "@/services/types";
 import { ComponentFormProps } from "@/types/common/dialogs.types";
-import { IMenuItemAttributes, MenuType } from "@/types/menu.types";
+import { IMenuItem, IMenuItemAttributes, MenuType } from "@/types/menu.types";
 import { isAbsoluteUrl } from "@/utils/URL";
 
-import { MenuFormDialogProps } from "./MenuFormDialog";
-
 const DEFAULT_VALUES = { title: "", type: MenuType.web_url, url: undefined };
 
-export const MenuForm: FC<ComponentFormProps<MenuFormDialogProps>> = ({
+export type MenuFormData = {
+  row?: IMenuItem;
+  rowId?: string;
+  parentId?: string;
+};
+
+export const MenuForm: FC<ComponentFormProps<MenuFormData>> = ({
   data,
   Wrapper = Fragment,
   WrapperProps,
diff --git a/frontend/src/components/Menu/MenuFormDialog.tsx b/frontend/src/components/Menu/MenuFormDialog.tsx
index c1da6c8a..dc5a95f6 100644
--- a/frontend/src/components/Menu/MenuFormDialog.tsx
+++ b/frontend/src/components/Menu/MenuFormDialog.tsx
@@ -8,18 +8,10 @@
 
 import { GenericFormDialog } from "@/app-components/dialogs";
 import { ComponentFormDialogProps } from "@/types/common/dialogs.types";
-import { IMenuItem } from "@/types/menu.types";
 
-import { MenuForm } from "./MenuForm";
+import { MenuForm, MenuFormData } from "./MenuForm";
 
-export type MenuFormDialogProps = {
-  row?: IMenuItem;
-  rowId?: string;
-  parentId?: string;
-};
-export const MenuFormDialog = <
-  T extends MenuFormDialogProps = MenuFormDialogProps,
->(
+export const MenuFormDialog = <T extends MenuFormData = MenuFormData>(
   props: ComponentFormDialogProps<T>,
 ) => (
   <GenericFormDialog<T>