fix: Always extend BaseNodeData, remove duplicate MoreInfo properties

theopensystemslab · Oct 3, 2024 · 2159a1e · 2159a1e
1 parent 323bc62
commit 2159a1e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 28 deletions.
diff --git a/editor.planx.uk/src/@planx/components/Checklist/Editor.tsx b/editor.planx.uk/src/@planx/components/Checklist/Editor.tsx
@@ -22,7 +22,7 @@ import Input from "ui/shared/Input";
 import InputRow from "ui/shared/InputRow";
 import InputRowItem from "ui/shared/InputRowItem";
 
-import { Option, parseBaseNodeData } from "../shared";
+import { BaseNodeData, Option, parseBaseNodeData } from "../shared";
 import PermissionSelect from "../shared/PermissionSelect";
 import { ICONS, InternalNotes, MoreInformation } from "../ui";
 import type { Category, Checklist, Group } from "./model";
@@ -35,16 +35,11 @@ export interface ChecklistProps extends Checklist {
     data?: {
       allRequired?: boolean;
       categories?: Array<Category>;
-      definitionImg?: string;
       description?: string;
       fn?: string;
-      howMeasured?: string;
       img?: string;
-      info?: string;
-      notes?: string;
-      policyRef?: string;
       text: string;
-    };
+    } & BaseNodeData;
   };
 }
 

diff --git a/editor.planx.uk/src/@planx/components/Confirmation/model.ts b/editor.planx.uk/src/@planx/components/Confirmation/model.ts
@@ -1,9 +1,11 @@
+import { BaseNodeData } from "../shared";
+
 export interface Step {
   title: string;
   description: string;
 }
 
-export interface Confirmation {
+export interface Confirmation extends BaseNodeData {
   heading?: string;
   description?: string;
   color?: { text: string; background: string };

diff --git a/editor.planx.uk/src/@planx/components/DrawBoundary/model.ts b/editor.planx.uk/src/@planx/components/DrawBoundary/model.ts
@@ -15,10 +15,6 @@ export interface DrawBoundary extends BaseNodeData {
   hideFileUpload?: boolean;
   dataFieldBoundary: string;
   dataFieldArea: string;
-  info?: string;
-  policyRef?: string;
-  howMeasured?: string;
-  definitionImg?: string;
 }
 
 export const parseDrawBoundary = (

diff --git a/editor.planx.uk/src/@planx/components/Notice/model.ts b/editor.planx.uk/src/@planx/components/Notice/model.ts
@@ -4,7 +4,6 @@ export interface Notice extends BaseNodeData {
   title: string;
   description: string;
   color: string;
-  notes?: string;
   resetButton?: boolean;
 }
 

diff --git a/editor.planx.uk/src/@planx/components/Question/Editor.tsx b/editor.planx.uk/src/@planx/components/Question/Editor.tsx
@@ -11,24 +11,19 @@ import Input from "ui/shared/Input";
 import InputRow from "ui/shared/InputRow";
 import InputRowItem from "ui/shared/InputRowItem";
 
-import { Option, parseBaseNodeData } from "../shared";
+import { BaseNodeData, Option, parseBaseNodeData } from "../shared";
 import PermissionSelect from "../shared/PermissionSelect";
 import { ICONS, InternalNotes, MoreInformation } from "../ui";
 
 interface Props {
   node: {
     data?: {
-      definitionImg?: string;
       description?: string;
       fn?: string;
-      howMeasured?: string;
       img?: string;
-      info?: string;
-      notes?: string;
-      policyRef?: string;
       text: string;
       type?: string;
-    };
+    } & BaseNodeData;
   };
   options?: Option[];
   handleSubmit?: Function;

diff --git a/editor.planx.uk/src/@planx/components/Question/model.ts b/editor.planx.uk/src/@planx/components/Question/model.ts
@@ -1,14 +1,12 @@
 import { Store } from "pages/FlowEditor/lib/store";
 import { HandleSubmit } from "pages/Preview/Node";
 
-export interface Question {
+import { BaseNodeData } from "../shared";
+
+export interface Question extends BaseNodeData {
   id?: string;
   text?: string;
   description?: string;
-  info?: string;
-  policyRef?: string;
-  howMeasured?: string;
-  definitionImg?: string;
   img?: string;
   responses: {
     id?: string;

diff --git a/editor.planx.uk/src/@planx/components/Result/model.ts b/editor.planx.uk/src/@planx/components/Result/model.ts
@@ -4,12 +4,14 @@ import { Response } from "pages/FlowEditor/lib/store/preview";
 import type { HandleSubmit } from "pages/Preview/Node";
 import type { TextContent } from "types";
 
+import { BaseNodeData } from "../shared";
+
 export interface FlagDisplayText {
   heading?: string;
   description?: string;
 }
 
-export interface Result {
+export interface Result extends BaseNodeData {
   flagSet: FlagSet;
   overrides?: { [flagId: string]: FlagDisplayText };
 }

diff --git a/editor.planx.uk/src/@planx/components/Review/model.ts b/editor.planx.uk/src/@planx/components/Review/model.ts
@@ -1,7 +1,8 @@
-export interface Review {
+import { BaseNodeData } from "../shared";
+
+export interface Review extends BaseNodeData {
   title: string;
   description: string;
-  notes: string;
 }
 
 export const parseContent = (