chore: Bump planx-core

theopensystemslab · Jan 15, 2024 · bfa2fc4 · bfa2fc4
1 parent d455a2d
commit bfa2fc4
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 32 deletions.
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#b8da594",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#4b625d9",
     "@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#b8da594",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#4b625d9",
     "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/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#b8da594",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#4b625d9",
     "axios": "^1.6.2",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.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/package.json b/editor.planx.uk/package.json
@@ -14,7 +14,7 @@
     "@mui/styles": "^5.15.2",
     "@mui/utils": "^5.15.2",
     "@opensystemslab/map": "^0.7.5",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#b8da594",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#4b625d9",
     "@tiptap/core": "^2.0.3",
     "@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/components/Header.test.tsx b/editor.planx.uk/src/components/Header.test.tsx
@@ -30,7 +30,7 @@ const mockTeam2: Team = {
   name: "Closed Systems Lab",
   slug: "closedsystemslab",
   theme: {
-    logo: "logo.jpg",
+    logo: null,
     primaryColour: "#0010A4",
     actionColour: "#0010A4",
     linkColour: "#0010A4",

diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/shared.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/shared.ts
@@ -32,8 +32,8 @@ export interface SharedStore extends Store.Store {
   setPreviewEnvironment: (previewEnvironment: PreviewEnvironment) => void;
   setFlowSlug: (flowSlug: string) => void;
   setFlowNameFromSlug: (flowSlug: string) => void;
-  $public: CoreDomainClient,
-  $client: CoreDomainClient,
+  $public: CoreDomainClient;
+  $client: CoreDomainClient;
 }
 
 export const sharedStore: StateCreator<
@@ -115,6 +115,9 @@ export const sharedStore: StateCreator<
     targetURL: process.env.REACT_APP_HASURA_URL!,
   }),
 
+  /**
+   * Authenticated client is re-instantiated upon user login
+   */
   $client: new CoreDomainClient({
     targetURL: process.env.REACT_APP_HASURA_URL!,
   }),

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,10 +26,12 @@ export interface TeamStore {
   fetchCurrentTeam: () => Promise<Team>;
 }
 
-export const teamStore: StateCreator<TeamStore & SharedStore, [], [], TeamStore> = (
-  set,
-  get,
-) => ({
+export const teamStore: StateCreator<
+  TeamStore & SharedStore,
+  [],
+  [],
+  TeamStore
+> = (set, get) => ({
   teamId: 0,
   teamTheme: {} as TeamTheme,
   teamName: "",
@@ -109,9 +111,8 @@ export const teamStore: StateCreator<TeamStore & SharedStore, [], [], TeamStore>
    * Does not necessarily match team held in store as this is context-based (e.g. we don't use the team theme in the Editor)
    */
   fetchCurrentTeam: async () => {
-    const { teamSlug, $client } = get()
+    const { teamSlug, $client } = get();
     const team = await $client.team.getBySlug(teamSlug);
-    console.log({team})
     return team;
   },
 });
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/user.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/user.ts
@@ -27,7 +27,7 @@ export const userStore: StateCreator<
       auth: { jwt },
     });
     set({ $client: authenticatedClient });
-    set({ jwt, user })
+    set({ jwt, user });
   },
 
   getUser: () => get().user,

diff --git a/editor.planx.uk/src/pages/Pay/MakePayment.tsx b/editor.planx.uk/src/pages/Pay/MakePayment.tsx
@@ -170,7 +170,7 @@ export default function MakePayment({
     );
 
   const PaymentDetails = () => {
-    const $public = useStore(state => state.$public);
+    const $public = useStore((state) => state.$public);
     const [projectType, setProjectType] = useState<string | undefined>();
 
     useEffect(() => {