fix: tidy index.tsx and response type

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

Hide file tree

Showing 4 changed files with 11 additions and 22 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#306a172",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#3891420",
     "@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,13 +1,8 @@
 import Container from "@mui/material/Container";
 import Typography from "@mui/material/Typography";
-import {
-  TeamContactSettings,
-  TeamSettings,
-} from "@opensystemslab/planx-core/types";
+import { 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";
@@ -22,12 +17,6 @@ export interface FormProps {
   onSuccess: () => void;
 }
 
-interface GetTeamEmailSettings {
-  teams: {
-    teamSettings: TeamContactSettings;
-  }[];
-}
-
 const GeneralSettings: React.FC = () => {
   const [formikConfig, setFormikConfig] = useState<
     FormikConfig<TeamSettings> | undefined
@@ -40,11 +29,11 @@ const GeneralSettings: React.FC = () => {
         const fetchedTeamSettings = await useStore
           .getState()
           .fetchCurrentTeamSettings();
-        console.log(fetchedTeamSettings);
-        if (!fetchedTeamSettings.settings) throw Error("Unable to find team");
+
+        if (!fetchedTeamSettings) throw Error("Unable to find team");
 
         setFormikConfig({
-          initialValues: fetchedTeamSettings.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,7 +26,7 @@ export interface TeamStore {
   initTeamStore: (slug: string) => Promise<void>;
   clearTeamStore: () => void;
   fetchCurrentTeam: () => Promise<Team>;
-  fetchCurrentTeamSettings: () => Partial<Team>;
+  fetchCurrentTeamSettings: () => Promise<TeamSettings>;
   updateTeamTheme: (theme: Partial<TeamTheme>) => Promise<boolean>;
   updateTeamSettings: (teamSettings: Partial<TeamSettings>) => Promise<boolean>;
   createTeam: (newTeam: { name: string; slug: string }) => Promise<number>;