From fc5217daf8d90434c9196c8c716e7a1227f955f4 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Wed, 15 Feb 2023 08:34:04 +0000 Subject: [PATCH] show login boolean in redux store --- components/case/summary.js | 100 +++++++++++++++++--------------- pages/index.js | 4 ++ pages/myportal/searchresults.js | 4 +- store/currentView/action.js | 4 +- store/currentView/reducer.js | 2 + store/store.js | 2 +- 6 files changed, 65 insertions(+), 51 deletions(-) diff --git a/components/case/summary.js b/components/case/summary.js index 20717ea0..24907426 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -292,60 +292,64 @@ const CaseSummary = (props) => { -
-
-
- {props.currentView.showReps == true || - (props.currentView.showReps == "true" && - _.has(detailsObj, "pinswg_startdate") && - hasEndDate && - showReps( - detailsObj.pinswg_startdate, - detailsObj.pinswg_representation_period_end_date - ) && ( - <> - - + {(props.currentView.showLogin == true || + props.currentView.showLogin == "true") && ( +
+ -
{" "} + )} +
{props.currentView.showReps == true || diff --git a/pages/index.js b/pages/index.js index 1674b167..382b1c65 100644 --- a/pages/index.js +++ b/pages/index.js @@ -14,6 +14,7 @@ import { setAccountDetails, setContainerID, } from "../store/accountDetails/action"; +import { setShowReps } from "../store/currentView/action"; import { wrapper } from "../store/store"; import { getSession, useSession, signIn, signOut } from "next-auth/react"; @@ -159,7 +160,10 @@ export const getServerSideProps = wrapper.getServerSideProps( const showLoginCheck = process.env.SHOWLOGIN || false; const showMapCheck = process.env.SHOWMAPS || false; + const showReps = process.env.SHOWREPRESENTATIONS || false; + store.dispatch(setShowReps(showReps, showLoginCheck)); + console.log("server checks :", showReps, showLoginCheck); let hasLoginCode = thisSession != null; console.log("server side has session:", thisSession != null); diff --git a/pages/myportal/searchresults.js b/pages/myportal/searchresults.js index 86b172ab..1e51cc69 100644 --- a/pages/myportal/searchresults.js +++ b/pages/myportal/searchresults.js @@ -90,9 +90,11 @@ export const getServerSideProps = wrapper.getServerSideProps( ]); const showReps = process.env.SHOWREPRESENTATIONS || false; + const showLoginCheck = process.env.SHOWLOGIN || false; + store.dispatch(setShowReps(showReps, showLoginCheck)); console.log("env var ", process.env.SHOWREPRESENTATIONS); - store.dispatch(setShowReps(showReps)); + store.dispatch(setShowReps(showReps, showLoginCheck)); searchResultsObj = searchResultsObj.status == 502 diff --git a/store/currentView/action.js b/store/currentView/action.js index 9d6601bd..386f9c85 100644 --- a/store/currentView/action.js +++ b/store/currentView/action.js @@ -10,6 +10,7 @@ export const currentViewActionTypes = { SETSHOWREPS: "SETSHOWREPS", SETREPRESENTATIONMESSAGESENT: "SETREPRESENTATIONMESSAGESENT", SETREPRESENTATIONRESET: "SETREPRESENTATIONRESET", + SETSHOWLOGIN: "SETSHOWLOGIN", }; export const getCurrentViewObj = () => (dispatch) => { @@ -94,9 +95,10 @@ export const setCurrentPage = (currentPage) => (dispatch) => { }); }; -export const setShowReps = (showReps) => (dispatch) => { +export const setShowReps = (showReps, showLogin) => (dispatch) => { return dispatch({ type: currentViewActionTypes.SETSHOWREPS, + showLogin: showLogin, showReps: showReps, }); }; diff --git a/store/currentView/reducer.js b/store/currentView/reducer.js index b5a8a8be..52056d9a 100644 --- a/store/currentView/reducer.js +++ b/store/currentView/reducer.js @@ -10,6 +10,7 @@ const currentViewInitialState = { linkedCaseReferences: {}, currentPage: 1, showReps: false, + showLogin: false, }; export default function reducer(state = currentViewInitialState, action) { @@ -69,6 +70,7 @@ export default function reducer(state = currentViewInitialState, action) { return { ...state, showReps: action.showReps, + showLogin: action.showLogin, }; default: return state; diff --git a/store/store.js b/store/store.js index 5bbc7116..9ba9d16f 100644 --- a/store/store.js +++ b/store/store.js @@ -137,7 +137,7 @@ const makeStore = ({ isServer }) => { "watchedCases", "form", ], - version: 2, + version: 3, storage: storage, stateReconciler: autoMergeLevel2, // if needed, use a safer storage migrate: createMigrate(migrations, { debug: true }),