Fix conflicts

demo/admin/src/common/MasterMenu.tsx

@@ -1,5 +1,11 @@
 import { Assets, Dashboard, Mail, PageTree, Wrench } from "@comet/admin-icons";
-import { BrevoConfigPage, createBrevoContactsPage, createEmailCampaignsPage, createTargetGroupsPage } from "@comet/brevo-admin";
+import {
+    BrevoConfigPage,
+    createBrevoContactsPage,
+    createBrevoTestContactsPage,
+    createEmailCampaignsPage,
+    createTargetGroupsPage,
+} from "@comet/brevo-admin";
 import {
     AllCategories,
     ContentScopeIndicator,
@@ -28,7 +34,6 @@ export const pageTreeCategories: AllCategories = [
     },
 ];
 
-<<<<<<< HEAD
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const pageTreeDocumentTypes: Record<string, DocumentInterface<any, any>> = {
     Page,
@@ -58,6 +63,14 @@ const getMasterMenuData = ({ brevoContactConfig }: { brevoContactConfig: BrevoCo
         EmailCampaignContentBlock,
     });
 
+    const BrevoTestContactsPage = createBrevoTestContactsPage({
+        scopeParts: ["domain", "language"],
+        additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment,
+        additionalGridFields: brevoContactConfig.additionalGridFields,
+        additionalFormFields: brevoContactConfig.additionalFormFields,
+        input2State: brevoContactConfig.input2State,
+    });
+
     return [
         {
             type: "route",
@@ -107,6 +120,14 @@ const getMasterMenuData = ({ brevoContactConfig }: { brevoContactConfig: BrevoCo
                         render: () => <BrevoContactsPage />,
                     },
                 },
+                {
+                    type: "route",
+                    primary: <FormattedMessage id="menu.newsletter.testContacts" defaultMessage="Test contacts" />,
+                    route: {
+                        path: "/newsletter/test-contacts",
+                        render: () => <BrevoTestContactsPage />,
+                    },
+                },
                 {
                     type: "route",
                     primary: <FormattedMessage id="menu.newsletter.targetGroups" defaultMessage="Target groups" />,
@@ -179,70 +200,4 @@ export const MasterRoutes = () => {
     const masterMenuDataForScope = React.useMemo(() => getMasterMenuData({ brevoContactConfig: getBrevoContactConfig(intl) }), [intl]);
 
     return <MasterMenuRoutes menu={masterMenuDataForScope} />;
-=======
-export const MasterMenu: React.FC = () => {
-    const { open, toggleOpen } = React.useContext(MenuContext);
-    const windowSize = useWindowSize();
-    const intl = useIntl();
-    const match = useRouteMatch();
-
-    const useTemporaryMenu: boolean = windowSize.width < permanentMenuMinWidth;
-
-    // Open menu when changing to permanent variant and close when changing to temporary variant.
-    React.useEffect(() => {
-        if ((useTemporaryMenu && open) || (!useTemporaryMenu && !open)) {
-            toggleOpen();
-        }
-        // useEffect dependencies must only include `location`, because the function should only be called once after changing the location.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [location]);
-
-    return (
-        <Menu variant={useTemporaryMenu ? "temporary" : "permanent"}>
-            <MenuItemRouterLink
-                primary={intl.formatMessage({ id: "menu.dashboard", defaultMessage: "Dashboard" })}
-                icon={<Dashboard />}
-                to={`${match.url}/dashboard`}
-            />
-            <MenuItemRouterLink
-                primary={intl.formatMessage({ id: "menu.pageTree", defaultMessage: "Page tree" })}
-                icon={<PageTree />}
-                to={`${match.url}/pages/pagetree/main-navigation`}
-            />
-            <MenuCollapsibleItem primary={intl.formatMessage({ id: "menu.newsletter", defaultMessage: "Newsletter" })} icon={<Mail />}>
-                <MenuItemRouterLink
-                    primary={intl.formatMessage({ id: "menu.newsletter.contacts", defaultMessage: "Contacts" })}
-                    to={`${match.url}/newsletter/contacts`}
-                />
-                <MenuItemRouterLink
-                    primary={intl.formatMessage({ id: "menu.newsletter.testContacts", defaultMessage: "Test contacts" })}
-                    to={`${match.url}/newsletter/test-contacts`}
-                />
-                <MenuItemRouterLink
-                    primary={intl.formatMessage({ id: "menu.newsletter.targetGroups", defaultMessage: "Target groups" })}
-                    to={`${match.url}/newsletter/target-groups`}
-                />
-                <MenuItemRouterLink
-                    primary={intl.formatMessage({ id: "menu.newsletter.emailCampaigns", defaultMessage: "Email campaigns" })}
-                    to={`${match.url}/newsletter/email-campaigns`}
-                />
-            </MenuCollapsibleItem>
-            <MenuItemRouterLink
-                primary={intl.formatMessage({ id: "menu.dam", defaultMessage: "Assets" })}
-                icon={<Assets />}
-                to={`${match.url}/assets`}
-            />
-            <MenuCollapsibleItem primary={intl.formatMessage({ id: "menu.system", defaultMessage: "System" })} icon={<Wrench />}>
-                <MenuItemRouterLink
-                    primary={intl.formatMessage({ id: "menu.publisher", defaultMessage: "Publisher" })}
-                    to={`${match.url}/system/publisher`}
-                />
-                <MenuItemRouterLink
-                    primary={intl.formatMessage({ id: "menu.redirects", defaultMessage: "Redirects" })}
-                    to={`${match.url}/system/redirects`}
-                />
-            </MenuCollapsibleItem>
-        </Menu>
-    );
->>>>>>> main
 };