new fix for sub email in GeneralSettings form

theopensystemslab · Sep 12, 2024 · b885d0e · b885d0e
1 parent 77c78b4
commit b885d0e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
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#306a172",
     "@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
@@ -1,8 +1,13 @@
 import Container from "@mui/material/Container";
 import Typography from "@mui/material/Typography";
-import { TeamSettings } from "@opensystemslab/planx-core/types";
+import {
+  TeamContactSettings,
+  TeamSettings,
+} from "@opensystemslab/planx-core/types";
 import { FormikConfig } from "formik";
+import gql from "graphql-tag";
 import { useToast } from "hooks/useToast";
+import { client } from "lib/graphql";
 import { useStore } from "pages/FlowEditor/lib/store";
 import React, { useEffect, useState } from "react";
 import SettingsSection from "ui/editor/SettingsSection";
@@ -17,6 +22,12 @@ export interface FormProps {
   onSuccess: () => void;
 }
 
+interface GetTeamEmailSettings {
+  teams: {
+    teamSettings: TeamContactSettings;
+  }[];
+}
+
 const GeneralSettings: React.FC = () => {
   const [formikConfig, setFormikConfig] = useState<
     FormikConfig<TeamSettings> | undefined
@@ -26,11 +37,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();
+        console.log(fetchedTeamSettings);
+        if (!fetchedTeamSettings.settings) throw Error("Unable to find team");
 
         setFormikConfig({
-          initialValues: fetchedTeam.settings,
+          initialValues: fetchedTeamSettings.settings,
           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: () => Partial<Team>;
   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);