theopensystemslab · jessicamcinchak · Dec 1, 2023 · Nov 30, 2023 · Nov 30, 2023 · Nov 30, 2023
diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@airbrake/node": "^2.1.8",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#415ae86",
     "@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
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@cucumber/cucumber": "^9.3.0",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#415ae86",
     "axios": "^1.6.0",
     "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/api-driven/src/permissions/queries/flows.ts b/e2e/tests/api-driven/src/permissions/queries/flows.ts
@@ -3,11 +3,7 @@ import { gql } from "graphql-tag";
 export const INSERT_FLOW_QUERY = gql`
   mutation InsertFlowE2E($team1Id: Int) {
     result: insert_flows(
-      objects: {
-        data: "{hello: 'world'}"
-        slug: "e2e-test-flow"
-        team_id: $team1Id
-      }
+      objects: { slug: "e2e-test-flow", team_id: $team1Id }
     ) {
       returning {
         id
@@ -20,7 +16,7 @@ export const UPDATE_FLOW_QUERY = gql`
   mutation UpdateFlowE2E($team1FlowId: uuid!) {
     result: update_flows_by_pk(
       pk_columns: { id: $team1FlowId }
-      _set: { data: "{hello: 'world2'}" }
+      _set: { slug: "new-slug" }
     ) {
       id
     }

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#d38a7d3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#415ae86",
     "axios": "^1.6.0",
     "dotenv": "^16.3.1",
     "eslint": "^8.44.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/.storybook/preview-head.html b/editor.planx.uk/.storybook/preview-head.html
@@ -3,10 +3,3 @@
   href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&display=swap"
   rel="stylesheet"
 />
-<!-- OS vector tile source specifies fonts in .pbf format, which OpenLayers can't load, so make them available directly  -->
-<link rel="preconnect" href="https://fonts.googleapis.com" />
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-<link
-  href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600&display=swap"
-  rel="stylesheet"
-/>
diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json
@@ -14,7 +14,7 @@
     "@mui/styles": "^5.14.5",
     "@mui/utils": "^5.14.5",
     "@opensystemslab/map": "^0.7.5",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d38a7d3",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#415ae86",
     "@tiptap/core": "^2.0.3",
     "@tiptap/extension-bold": "^2.0.3",
     "@tiptap/extension-bubble-menu": "^2.1.6",

diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml
diff --git a/editor.planx.uk/public/index.html b/editor.planx.uk/public/index.html
@@ -25,16 +25,6 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <title>PlanX</title>
-    <!--
-      Fonts for @opensystemslab/map:
-      OS vector tile source specifies fonts in .pbf format, which OpenLayers can't load, so make them available directly
-    -->
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600&display=swap"
-      rel="stylesheet"
-    />
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/editor.planx.uk/src/@planx/components/Calculate/Editor.tsx b/editor.planx.uk/src/@planx/components/Calculate/Editor.tsx
@@ -73,7 +73,11 @@ export default function Component(props: Props) {
       <ModalSection>
         <ModalSectionContent title="Calculate" Icon={ICONS[TYPES.Calculate]}>
           <Typography variant="body2">
-            This component does math! Write formulas using <a href="https://mathjs.org/index.html" target="_blank">Math.js</a>, omitting the <code>math.</code> prefix
+            This component does math! Write formulas using{" "}
+            <a href="https://mathjs.org/index.html" target="_blank">
+              Math.js
+            </a>
+            , omitting the <code>math.</code> prefix
           </Typography>
         </ModalSectionContent>
         <ModalSectionContent title="Output">
@@ -82,6 +86,7 @@ export default function Component(props: Props) {
               required
               placeholder="output data field"
               name="output"
+              format="data"
               value={formik.values.output}
               onChange={formik.handleChange}
             />

diff --git a/editor.planx.uk/src/@planx/components/Checklist/Editor.tsx b/editor.planx.uk/src/@planx/components/Checklist/Editor.tsx
@@ -146,7 +146,7 @@ const OptionEditor: React.FC<{
 
 const Options: React.FC<{ formik: FormikHookReturn }> = ({ formik }) => {
   return (
-    <ModalSectionContent title="Options">
+    <ModalSectionContent subtitle="Options">
       {formik.values.groupedOptions ? (
         <Box>
           {formik.values.groupedOptions.map(

diff --git a/editor.planx.uk/src/@planx/components/Confirmation/Editor.tsx b/editor.planx.uk/src/@planx/components/Confirmation/Editor.tsx
@@ -18,7 +18,7 @@ export type Props = EditorProps<TYPES.Confirmation, Confirmation>;
 
 function StepEditor(props: ListManagerEditorProps<Step>) {
   return (
-    <Box>
+    <Box width="100%">
       <InputRow>
         <Input
           required

diff --git a/editor.planx.uk/src/@planx/components/DrawBoundary/Editor.tsx b/editor.planx.uk/src/@planx/components/DrawBoundary/Editor.tsx
@@ -65,6 +65,7 @@ function DrawBoundaryComponent(props: Props) {
               <Input
                 name="dataFieldBoundary"
                 placeholder=""
+                format="data"
                 value={formik.values.dataFieldBoundary}
                 onChange={formik.handleChange}
               />
@@ -75,6 +76,7 @@ function DrawBoundaryComponent(props: Props) {
               <Input
                 name="dataFieldArea"
                 placeholder="property.boundary.area"
+                format="data"
                 value={formik.values.dataFieldArea}
                 onChange={formik.handleChange}
               />

diff --git a/editor.planx.uk/src/@planx/components/FileUploadAndLabel/Editor.tsx b/editor.planx.uk/src/@planx/components/FileUploadAndLabel/Editor.tsx
@@ -150,6 +150,7 @@ function FileTypeEditor(props: ListManagerEditorProps<FileType>) {
         <Input
           required
           name="fn"
+          format="data"
           value={props.value.fn}
           onChange={(e) =>
             props.onChange(merge(props.value, { fn: e.target.value }))

diff --git a/editor.planx.uk/src/@planx/components/InternalPortal/Editor.tsx b/editor.planx.uk/src/@planx/components/InternalPortal/Editor.tsx
@@ -47,14 +47,15 @@ const InternalPortalForm: React.FC<{
   return (
     <form id="modal" onSubmit={formik.handleSubmit} data-testid="form">
       <div>
-        Create new internal portal:{" "}
+        <label htmlFor="portalFlowId">Create new internal portal: </label>
         <InputField
           name="text"
           onChange={formik.handleChange}
           placeholder="Portal name"
           rows={2}
           value={formik.values.text}
           disabled={!!formik.values.flowId}
+          id="portalFlowId"
           // required={!formik.values.flowId} (was ignored by @testing-library?)
         />
         {formik.errors.text && <FormError message={formik.errors.text} />}

diff --git a/editor.planx.uk/src/@planx/components/PlanningConstraints/Editor.tsx b/editor.planx.uk/src/@planx/components/PlanningConstraints/Editor.tsx
@@ -53,6 +53,7 @@ function PlanningConstraintsComponent(props: Props) {
           <InputGroup label="Planning constraints data field">
             <InputRow>
               <Input
+                format="data"
                 name="fn"
                 placeholder={formik.values.fn}
                 value={formik.values.fn}

diff --git a/editor.planx.uk/src/@planx/components/Question/Editor.tsx b/editor.planx.uk/src/@planx/components/Question/Editor.tsx
@@ -44,7 +44,7 @@ const OptionEditor: React.FC<{
       {props.value.id && (
         <input type="hidden" value={props.value.id} readOnly />
       )}
-      <InputRowItem width="50%">
+      <InputRowItem width="100%">
         <Input
           // required
           format="bold"
@@ -86,11 +86,11 @@ const OptionEditor: React.FC<{
             },
           });
         }}
+        sx={{ width: "160px", maxWidth: "160px" }}
       />
     </InputRow>
     <InputRow>
       <Input
-        format="data"
         value={props.value.data.description || ""}
         placeholder="Description"
         onChange={(ev) => {
@@ -210,7 +210,7 @@ export const Question: React.FC<Props> = (props) => {
           </InputGroup>
         </ModalSectionContent>
 
-        <ModalSectionContent title="Options">
+        <ModalSectionContent subtitle="Options">
           <ListManager
             values={formik.values.options}
             onChange={(newOptions) => {

diff --git a/editor.planx.uk/src/lib/featureFlags.ts b/editor.planx.uk/src/lib/featureFlags.ts
@@ -1,5 +1,8 @@
 // add/edit/remove feature flags in array below
-const AVAILABLE_FEATURE_FLAGS = ["DISABLE_SAVE_AND_RETURN"] as const;
+const AVAILABLE_FEATURE_FLAGS = [
+  "DISABLE_SAVE_AND_RETURN",
+  "SHOW_TEAM_SETTINGS",
+] as const;
 
 type featureFlag = (typeof AVAILABLE_FEATURE_FLAGS)[number];