From c4907c0891832e4d93669c1241537a7a5bb328f3 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Thu, 27 Oct 2022 10:19:21 +0100 Subject: [PATCH] azure storage to require not import for build fix --- actions/azurestorage.js | 4 ++-- package.json | 2 +- pages/api/endpoint/getlpa_api.js | 2 +- store/store.js | 29 ++++++++++++++++++++++------- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/actions/azurestorage.js b/actions/azurestorage.js index 9aaadbe9..4b7d5888 100644 --- a/actions/azurestorage.js +++ b/actions/azurestorage.js @@ -1,5 +1,5 @@ import { v4 as uuidv4 } from "uuid"; -import { +const { ContainerClient, BlockBlobClient, BlobServiceClient, @@ -7,7 +7,7 @@ import { ContainerSASPermissions, generateBlobSASQueryParameters, SASProtocol, -} from "@azure/storage-blob"; +} = require("@azure/storage-blob"); import { DefaultAzureCredential } from "@azure/identity"; import { consoleLogger, conLog, hashAPIPath } from "."; import _ from "lodash"; diff --git a/package.json b/package.json index 94fb9ee9..5885aa2e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@azure/identity": "^2.0.5", - "@azure/storage-blob": "^12.10.0", + "@azure/storage-blob": "^12.12.0", "@googlemaps/react-wrapper": "^1.1.24", "@magic-sdk/admin": "^1.4.0", "@next-auth/prisma-adapter": "^1.0.4", diff --git a/pages/api/endpoint/getlpa_api.js b/pages/api/endpoint/getlpa_api.js index 3f52b01a..9ef309f7 100644 --- a/pages/api/endpoint/getlpa_api.js +++ b/pages/api/endpoint/getlpa_api.js @@ -31,7 +31,7 @@ export default async function ApiProxy(req, res) { var queryUrl = "accounts?$count=true&$filter=pinswg_isalocalplanningauthorityaccount eq 846040000&$select=name&$orderby=name asc"; - console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl)); + //console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl)); return axios .get( WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), diff --git a/store/store.js b/store/store.js index 81c662e7..5bbc7116 100644 --- a/store/store.js +++ b/store/store.js @@ -81,6 +81,26 @@ const reducer = (state = {}, action) => { } }; +const migrations = { + 1: (state) => { + return { + ...state, + }; + }, + 2: (state) => { + delete state["formData"]; + delete state["govGateway"]; + const newStateObj = { + ...state, + "currentView": {}, + "searchResultsObj": {}, + }; + + console.info("v2 schema migration:" + JSON.stringify(newStateObj)); + return newStateObj; + }, +}; + // BINDING MIDDLEWARE const bindMiddleware = (middleware) => { if (process.env.NODE_ENV !== "production") { @@ -107,9 +127,7 @@ const makeStore = ({ isServer }) => { key: "acp", whitelist: [ "currentView", - // "search", "searchResultsObj", - //"formData", "appealType", "LPAData", "accountDetails", @@ -119,13 +137,10 @@ const makeStore = ({ isServer }) => { "watchedCases", "form", ], - version: 1.4, + version: 2, storage: storage, stateReconciler: autoMergeLevel2, // if needed, use a safer storage - migrate: (state) => { - console.log("Migration Running!"); - return Promise.resolve(state); - }, + migrate: createMigrate(migrations, { debug: true }), }; const persistedReducer = persistReducer(persistConfig, reducer); // Create a new reducer with our existing reducer