fix: replacing fetchCurrentTeam with fetchCurrentTeamSettings in Gene…

…ral Settings (#3663)
theopensystemslab · Sep 12, 2024 · be56687 · be56687
1 parent f037b2c
commit be56687
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 24 deletions.
diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@airbrake/node": "^2.1.8",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#8162d4f",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2dccab9",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",

diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml
diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json
@@ -7,7 +7,7 @@
   "packageManager": "[email protected]",
   "dependencies": {
     "@cucumber/cucumber": "^9.3.0",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#8162d4f",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2dccab9",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",

diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml
diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json
@@ -8,7 +8,7 @@
     "postinstall": "./install-dependencies.sh"
   },
   "dependencies": {
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#8162d4f",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2dccab9",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.0",

diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml
diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json
@@ -15,7 +15,7 @@
     "@mui/material": "^5.15.10",
     "@mui/utils": "^5.15.11",
     "@opensystemslab/map": "1.0.0-alpha.3",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#8162d4f",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2dccab9",
     "@tiptap/core": "^2.4.0",
     "@tiptap/extension-bold": "^2.0.3",
     "@tiptap/extension-bubble-menu": "^2.1.13",

diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Settings/GeneralSettings/index.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Settings/GeneralSettings/index.tsx
@@ -26,11 +26,14 @@ const GeneralSettings: React.FC = () => {
   useEffect(() => {
     const fetchTeam = async () => {
       try {
-        const fetchedTeam = await useStore.getState().fetchCurrentTeam();
-        if (!fetchedTeam) throw Error("Unable to find team");
+        const fetchedTeamSettings = await useStore
+          .getState()
+          .fetchCurrentTeamSettings();
+
+        if (!fetchedTeamSettings) throw Error("Unable to find team");
 
         setFormikConfig({
-          initialValues: fetchedTeam.settings,
+          initialValues: fetchedTeamSettings,
           onSubmit: () => {},
           validateOnBlur: false,
           validateOnChange: false,

diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/team.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/team.ts
@@ -26,6 +26,7 @@ export interface TeamStore {
   initTeamStore: (slug: string) => Promise<void>;
   clearTeamStore: () => void;
   fetchCurrentTeam: () => Promise<Team>;
+  fetchCurrentTeamSettings: () => Promise<TeamSettings>;
   updateTeamTheme: (theme: Partial<TeamTheme>) => Promise<boolean>;
   updateTeamSettings: (teamSettings: Partial<TeamSettings>) => Promise<boolean>;
   createTeam: (newTeam: { name: string; slug: string }) => Promise<number>;
@@ -138,6 +139,11 @@ export const teamStore: StateCreator<
     return await $client.team.getBySlug(teamSlug);
   },
 
+  fetchCurrentTeamSettings: async () => {
+    const { teamSlug, $client } = get();
+    return await $client.team.getTeamSettings(teamSlug);
+  },
+
   updateTeamTheme: async (theme: Partial<TeamTheme>) => {
     const { teamId, $client } = get();
     return await $client.team.updateTheme(teamId, theme);