From eedefe20b0227ae2deb24f91ead06fe65f94ef40 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Thu, 5 Dec 2024 20:10:13 +0100
Subject: [PATCH] fix: make pattern pages work

---
 .../core/admin/components/EditForm/index.tsx  |  2 +-
 .../admin/components/PatternField/index.tsx   |  2 +-
 packages/core/admin/containers/App/index.tsx  | 11 +++++----
 .../screens/Patterns/CreatePage/index.tsx     |  4 ++--
 .../admin/screens/Patterns/EditPage/index.tsx |  8 ++++---
 .../admin/screens/Patterns/ListPage/index.tsx |  2 +-
 .../core/admin/screens/Patterns/index.tsx     | 24 -------------------
 7 files changed, 16 insertions(+), 37 deletions(-)
 delete mode 100644 packages/core/admin/screens/Patterns/index.tsx

diff --git a/packages/core/admin/components/EditForm/index.tsx b/packages/core/admin/components/EditForm/index.tsx
index 57dfc9d6..63d7daa4 100644
--- a/packages/core/admin/components/EditForm/index.tsx
+++ b/packages/core/admin/components/EditForm/index.tsx
@@ -76,7 +76,7 @@ const EditForm = () => {
                     defaultMessage: ' Generate automatic URL alias',
                   })}
                 </Checkbox>
-                <Link href="/plugins/webtools/patterns">Configure URL alias patterns.</Link>
+                <Link href="/admin/plugins/webtools/patterns">Configure URL alias patterns.</Link>
               </Box>
               <Box paddingTop={4}>
                 <Field.Root
diff --git a/packages/core/admin/components/PatternField/index.tsx b/packages/core/admin/components/PatternField/index.tsx
index 52ff08a3..5d29dadd 100644
--- a/packages/core/admin/components/PatternField/index.tsx
+++ b/packages/core/admin/components/PatternField/index.tsx
@@ -54,7 +54,7 @@ const PatternField: FC<Props> = ({
       setLoadingError(true);
       setLoading(false);
     });
-  }, [error, get]);
+  }, [error]);
 
   const HoverBox = styled(Box)`
     cursor: pointer;
diff --git a/packages/core/admin/containers/App/index.tsx b/packages/core/admin/containers/App/index.tsx
index 88739ea0..e3f7f66f 100644
--- a/packages/core/admin/containers/App/index.tsx
+++ b/packages/core/admin/containers/App/index.tsx
@@ -13,9 +13,11 @@ import { Page, useStrapiApp, Layouts } from '@strapi/strapi/admin';
 
 import pluginPermissions from '../../permissions';
 import pluginId from '../../helpers/pluginId';
-import Patterns from '../../screens/Patterns';
 import List from '../../screens/List';
 import Overview from '../../screens/Overview';
+import PatternsListPage from '../../screens/Patterns/ListPage';
+import PatternsEditPage from '../../screens/Patterns/EditPage';
+import PatternsCreatePage from '../../screens/Patterns/CreatePage';
 
 const App = () => {
   const getPlugin = useStrapiApp('MyComponent', (state) => state.getPlugin);
@@ -61,10 +63,9 @@ const App = () => {
         <Routes>
           <Route path="/overview" element={<Overview />} />
           <Route path="/urls" element={<List />} />
-          <Route
-            path="/patterns"
-            element={<Patterns />}
-          />
+          <Route path="/patterns" element={<PatternsListPage />} />
+          <Route path="/patterns/new" element={<PatternsCreatePage />} />
+          <Route path="/patterns/:id" element={<PatternsEditPage />} />
           {routerComponents.map(({ Component }) => {
             console.log(Component);
             return (
diff --git a/packages/core/admin/screens/Patterns/CreatePage/index.tsx b/packages/core/admin/screens/Patterns/CreatePage/index.tsx
index 12caa307..1823b760 100644
--- a/packages/core/admin/screens/Patterns/CreatePage/index.tsx
+++ b/packages/core/admin/screens/Patterns/CreatePage/index.tsx
@@ -50,7 +50,7 @@ const CreatePatternPage = () => {
       .catch(() => {
         setLoading(false);
       });
-  }, [get]);
+  }, []);
 
   const handleCreateSubmit = async (
     values: PatternFormValues,
@@ -147,7 +147,7 @@ const CreatePatternPage = () => {
               defaultMessage: 'Add a pattern for automatic URL alias generation.',
             })}
             navigationAction={(
-              <Link startIcon={<ArrowLeft />} href={`/plugins/${pluginId}/patterns`}>
+              <Link startIcon={<ArrowLeft />} href={`/admin/plugins/${pluginId}/patterns`}>
                 {formatMessage({
                   id: 'global.back',
                   defaultMessage: 'Back',
diff --git a/packages/core/admin/screens/Patterns/EditPage/index.tsx b/packages/core/admin/screens/Patterns/EditPage/index.tsx
index 03f56add..f9de6a4f 100644
--- a/packages/core/admin/screens/Patterns/EditPage/index.tsx
+++ b/packages/core/admin/screens/Patterns/EditPage/index.tsx
@@ -35,6 +35,8 @@ const EditPatternPage = () => {
   const { formatMessage } = useIntl();
   const { get, put, post } = getFetchClient();
 
+  console.log('why rerender?');
+
   useEffect(() => {
     setLoading(true);
     get<EnabledContentTypes>('/webtools/info/getContentTypes')
@@ -46,7 +48,7 @@ const EditPatternPage = () => {
       .catch(() => {
         setLoading(false);
       });
-  }, [get]);
+  }, []);
 
   useEffect(() => {
     setLoading(true);
@@ -60,7 +62,7 @@ const EditPatternPage = () => {
         setLoading(false);
       });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [get, id]);
+  }, [id]);
 
   const handleEditSubmit = async (
     values: PatternFormValues,
@@ -171,7 +173,7 @@ const EditPatternPage = () => {
             navigationAction={(
               <Link
                 startIcon={<ArrowLeft />}
-                href={`/plugins/${pluginId}/patterns`}
+                href={`/admin/plugins/${pluginId}/patterns`}
               >
                 {formatMessage({
                   id: 'global.back',
diff --git a/packages/core/admin/screens/Patterns/ListPage/index.tsx b/packages/core/admin/screens/Patterns/ListPage/index.tsx
index 28b9b375..4c8e9992 100644
--- a/packages/core/admin/screens/Patterns/ListPage/index.tsx
+++ b/packages/core/admin/screens/Patterns/ListPage/index.tsx
@@ -38,7 +38,7 @@ const ListPatternPage = () => {
     fetchData().catch((error) => {
       console.error('Failed to fetch data:', error);
     });
-  }, [get]);
+  }, []);
 
   if (loading) {
     return (
diff --git a/packages/core/admin/screens/Patterns/index.tsx b/packages/core/admin/screens/Patterns/index.tsx
deleted file mode 100644
index 072d8dde..00000000
--- a/packages/core/admin/screens/Patterns/index.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { Routes, Route } from 'react-router-dom';
-import { Page } from '@strapi/strapi/admin';
-import pluginId from '../../helpers/pluginId';
-import pluginPermissions from '../../permissions';
-import PatternsListPage from './ListPage';
-import PatternsEditPage from './EditPage';
-import PatternsCreatePage from './CreatePage';
-
-const Patterns = () => (
-  <Page.Protect permissions={pluginPermissions['settings.patterns']}>
-    <Routes>
-      <Route
-        path={`/plugins/${pluginId}/patterns/new`}
-        element={<PatternsCreatePage />}
-      />
-      <Route path={`/plugins/${pluginId}/patterns/:id`} element={<PatternsEditPage />} />
-      <Route path={`/plugins/${pluginId}/patterns`} element={<PatternsListPage />} />
-      {/* <Route path="" component={NotFound} /> */}
-    </Routes>
-  </Page.Protect>
-);
-
-export default Patterns;