fix: Correctly populate flow settings and status (#3412)

theopensystemslab · Jul 12, 2024 · 80ae221 · 80ae221
1 parent 1060db4
commit 80ae221
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/editor.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/editor.ts
@@ -282,7 +282,7 @@ export const editorStore: StateCreator<
     client.cache.reset();
     const { data } = await client.query({
       query: gql`
-        query GetFlow($teamId: Int!) {
+        query GetFlows($teamId: Int!) {
           flows(where: { team: { id: { _eq: $teamId } } }) {
             id
             name

diff --git a/editor.planx.uk/src/routes/flow.tsx b/editor.planx.uk/src/routes/flow.tsx
@@ -224,7 +224,7 @@ const routes = compose(
       withView(SettingsContainer),
 
       route(async (req) => ({
-        getData: getFlowSettings,
+        getData: await getFlowSettings(req),
         title: makeTitle(
           [req.params.team, req.params.flow, "service"].join("/"),
         ),
@@ -236,7 +236,7 @@ const routes = compose(
       withView(SettingsContainer),
 
       route(async (req) => ({
-        getData: getFlowSettings,
+        getData: await getFlowSettings(req),
         title: makeTitle(
           [req.params.team, req.params.flow, "service-flags"].join("/"),
         ),

diff --git a/editor.planx.uk/src/routes/flowSettings.tsx b/editor.planx.uk/src/routes/flowSettings.tsx
@@ -95,13 +95,13 @@ const flowSettingsRoutes = compose(
           `User does not have access to ${req.originalUrl}`,
         );
 
-      return route({
-        getData: getFlowSettings,
+      return route(async (req) => ({
+        getData: await getFlowSettings(req),
         title: makeTitle(
           [req.params.team, req.params.flow, "Flow Settings"].join("/"),
         ),
         view: <Settings currentTab={req.params.tab} tabs={tabs} />,
-      });
+      }));
     }),
   }),
 );

diff --git a/editor.planx.uk/src/routes/views/flowEditor.tsx b/editor.planx.uk/src/routes/views/flowEditor.tsx
@@ -6,17 +6,14 @@ import { View } from "react-navi";
 
 import { client } from "../../lib/graphql";
 import { useStore } from "../../pages/FlowEditor/lib/store";
-import type { FlowSettings } from "../../types";
 
 interface FlowMetadata {
-  flowSettings: FlowSettings;
   flowAnalyticsLink: string;
   isFlowPublished: boolean;
 }
 
 interface GetFlowMetadata {
   flows: {
-    flowSettings: FlowSettings;
     flowAnalyticsLink: string;
     publishedFlowsAggregate: {
       aggregate: {
@@ -34,13 +31,12 @@ const getFlowMetadata = async (
     data: { flows },
   } = await client.query<GetFlowMetadata>({
     query: gql`
-      query GetFlow($slug: String!, $team_slug: String!) {
+      query GetFlowMetadata($slug: String!, $team_slug: String!) {
         flows(
           limit: 1
           where: { slug: { _eq: $slug }, team: { slug: { _eq: $team_slug } } }
         ) {
           id
-          flowSettings: settings
           flowAnalyticsLink: analytics_link
           publishedFlowsAggregate: published_flows_aggregate {
             aggregate {
@@ -60,7 +56,6 @@ const getFlowMetadata = async (
   if (!flows) throw new NotFoundError(`Flow ${flowSlug} not found for ${team}`);
 
   const metadata = {
-    flowSettings: flow.flowSettings,
     flowAnalyticsLink: flow.flowAnalyticsLink,
     isFlowPublished: flow.publishedFlowsAggregate?.aggregate.count > 0,
   };
@@ -72,9 +67,9 @@ const getFlowMetadata = async (
  */
 export const flowEditorView = async (req: NaviRequest) => {
   const [flow] = req.params.flow.split(",");
-  const { flowSettings, flowAnalyticsLink, isFlowPublished } =
+  const { flowAnalyticsLink, isFlowPublished } =
     await getFlowMetadata(flow, req.params.team);
-  useStore.setState({ flowSettings, flowAnalyticsLink, isFlowPublished });
+  useStore.setState({ flowAnalyticsLink, isFlowPublished });
 
   return (
     <FlowEditorLayout>