From 9e9a168460c84d88876ae366f09dba46901e0b75 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Fri, 30 Jul 2021 14:24:22 +0100
Subject: [PATCH] wrapped calls in promise all

---
 components/header.js             | 17 +++++++++++++++--
 package.json                     |  4 ++--
 pages/myportal/index.js          | 15 +++++++++++----
 pages/newappeal/[appealtypes].js |  8 +++++---
 pages/newappeal/index.js         |  8 ++++----
 store/store.js                   |  7 ++++++-
 6 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/components/header.js b/components/header.js
index fa6b92d2..f4fcf1d9 100644
--- a/components/header.js
+++ b/components/header.js
@@ -65,6 +65,9 @@ const Header = (props) => {
                 <div className="govuk-header__content govuk-!-width-one-half govuk-!-margin-top-3">
                     <Link href="/logout">
                         <a
+                            onClick={() => {
+                                window.localStorage.clear();
+                            }}
                             className="govuk-header__link
                         govuk-header__link--service-name"
                         >
@@ -102,7 +105,12 @@ const Header = (props) => {
                                     ) : (
                                         <li>
                                             <Link href="/logout">
-                                                <a className="govuk-header__link ">
+                                                <a
+                                                    onClick={() => {
+                                                        window.localStorage.clear();
+                                                    }}
+                                                    className="govuk-header__link "
+                                                >
                                                     {t("common:signout-label")}
                                                 </a>
                                             </Link>
@@ -152,7 +160,12 @@ const Header = (props) => {
                         {router.pathname != "/" ||
                         router.pathname != "/logout" ? (
                             <Link href="/logout">
-                                <a className="govuk-header__link govuk-!-margin-right-3">
+                                <a
+                                    onClick={() => {
+                                        window.localStorage.clear();
+                                    }}
+                                    className="govuk-header__link govuk-!-margin-right-3"
+                                >
                                     {t("common:signout-label")}
                                 </a>
                             </Link>
diff --git a/package.json b/package.json
index 14186c7e..15204e88 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "next dev",
     "dev:app": "node ./server/server.js && yarn lint:js",
-    "build": "NODE_ENV=production node_modules/next/dist/bin/next build --debug",
+    "build": "NODE_ENV=production node_modules/next/dist/bin/next build",
     "start": "node_modules/next/dist/bin/next start"
   },
   "dependencies": {
@@ -52,4 +52,4 @@
     "eslint-config-next": "^11.0.1",
     "prettier": "2.3.2"
   }
-}
+}
\ No newline at end of file
diff --git a/pages/myportal/index.js b/pages/myportal/index.js
index 192bf766..5fcb0d75 100644
--- a/pages/myportal/index.js
+++ b/pages/myportal/index.js
@@ -70,10 +70,17 @@ export const getServerSideProps = wrapper.getServerSideProps(
         async ({ query, req, res }) => {
             //console.log("the query", query);
 
-            const myCases = await getMyCases();
-            const myRepresentations = await getMyRepresentations();
-            const watchedCases = await getWatchedCases();
-            const awaitingSubmission = await getAwaitingSubmission();
+            const [
+                myCases,
+                myRepresentations,
+                watchedCases,
+                awaitingSubmission,
+            ] = await Promise.all([
+                await getMyCases(),
+                await getMyRepresentations(),
+                await getWatchedCases(),
+                await getAwaitingSubmission(),
+            ]);
 
             store.dispatch(setMyCases(myCases));
             store.dispatch(setMyRepresentations(myRepresentations));
diff --git a/pages/newappeal/[appealtypes].js b/pages/newappeal/[appealtypes].js
index c8a077e3..544b1835 100644
--- a/pages/newappeal/[appealtypes].js
+++ b/pages/newappeal/[appealtypes].js
@@ -154,15 +154,17 @@ export const getServerSideProps = wrapper.getServerSideProps(
     (store) =>
         async ({ query, req, res }) => {
             //console.log("the query", query);
-            store.dispatch(setAppealTypeID(query.appealtypes));
-            const appealTypeData = await getAppealsTypes();
-            const formdata = (await getFormData(query.appealtypes)) || null;
+            const [appealTypeData, formdata] = await Promise.all([
+                await getAppealsTypes(),
+                await getFormData(query.appealtypes),
+            ]);
 
             const caseReference = createCase("asasa", "asasa");
 
             let xmlStr = formdata;
             xmlStr = formdata.value[0].formxml;
             xmlStr = xmlStr.replace(/\\"/g, "");
+            store.dispatch(setAppealTypeID(query.appealtypes));
             store.dispatch(setCaseReference(caseReference));
             store.dispatch(setForm(xmlStr));
             store.dispatch(setAppealType(appealTypeData));
diff --git a/pages/newappeal/index.js b/pages/newappeal/index.js
index e946b9fe..9363df91 100644
--- a/pages/newappeal/index.js
+++ b/pages/newappeal/index.js
@@ -75,10 +75,10 @@ const Home = (props) => {
 export const getServerSideProps = wrapper.getServerSideProps(
     (store) =>
         async ({ query, req, res }) => {
-            const appealTypeData = await getAppealsTypes();
-            const lpaData = await getLPA();
-            console.log("appeal types", appealTypeData);
-            console.log("lpa typeswwwww", lpaData);
+            const [appealTypeData, lpaData] = await Promise.all([
+                await getAppealsTypes(),
+                await getLPA(),
+            ]);
             store.dispatch(setAppealType(appealTypeData));
             store.dispatch(setLPA(lpaData));
         }
diff --git a/store/store.js b/store/store.js
index 634c5334..e59d8bdb 100644
--- a/store/store.js
+++ b/store/store.js
@@ -95,7 +95,11 @@ const makeStore = ({ isServer }) => {
         return createStore(reducer, bindMiddleware([thunkMiddleware]));
     } else {
         //If it's on client side, create a store which will persist
-        const { persistStore, persistReducer } = require("redux-persist");
+        const {
+            persistStore,
+            persistReducer,
+            createMigrate,
+        } = require("redux-persist");
         const storage = require("redux-persist/lib/storage").default;
 
         const persistConfig = {
@@ -114,6 +118,7 @@ const makeStore = ({ isServer }) => {
                 "watchedCases",
                 "form",
             ],
+            version: 1,
             storage: storage,
             stateReconciler: autoMergeLevel2, // if needed, use a safer storage
         };