+
-
diff --git a/webroot/src/store/global/global.getters.ts b/webroot/src/store/global/global.getters.ts
index 91702047d..ed4404f8d 100644
--- a/webroot/src/store/global/global.getters.ts
+++ b/webroot/src/store/global/global.getters.ts
@@ -5,10 +5,13 @@
// Created by InspiringApps on 4/12/20.
//
-// import { State } from './global.state';
+import { AppModes } from '@/app.config';
+import { State } from './global.state';
export default {
// isLoading: (state: State) => state.isLoading,
// error: (state: State) => state.error,
// isModalOpen: (state: State) => state.isModalOpen,
+ isAppModeJcc: (state: State) => state.appMode === AppModes.JCC,
+ isAppModeCosmetology: (state: State) => state.appMode === AppModes.COSMETOLOGY,
};
diff --git a/webroot/src/store/license/license.mutations.ts b/webroot/src/store/license/license.mutations.ts
index e6ce2f2c3..9631cefb3 100644
--- a/webroot/src/store/license/license.mutations.ts
+++ b/webroot/src/store/license/license.mutations.ts
@@ -110,6 +110,7 @@ export default {
firstName: '',
lastName: '',
state: '',
+ licenseNumber: '',
};
},
[MutationTypes.STORE_RESET_LICENSE]: (state: any) => {
@@ -122,6 +123,7 @@ export default {
firstName: '',
lastName: '',
state: '',
+ licenseNumber: '',
};
},
[MutationTypes.GET_PRIVILEGE_HISTORY_REQUEST]: (state: any) => {
diff --git a/webroot/src/store/license/license.spec.ts b/webroot/src/store/license/license.spec.ts
index 3364f7860..288f43efa 100644
--- a/webroot/src/store/license/license.spec.ts
+++ b/webroot/src/store/license/license.spec.ts
@@ -157,6 +157,7 @@ describe('License Store Mutations', () => {
firstName: 'test',
lastName: 'test',
state: 'test',
+ licenseNumber: 'test',
},
};
@@ -167,6 +168,7 @@ describe('License Store Mutations', () => {
firstName: '',
lastName: '',
state: '',
+ licenseNumber: '',
});
});
it('should successfully reset license store', () => {
@@ -180,6 +182,7 @@ describe('License Store Mutations', () => {
firstName: 'test',
lastName: 'test',
state: 'test',
+ licenseNumber: 'test',
},
};
@@ -195,6 +198,7 @@ describe('License Store Mutations', () => {
firstName: '',
lastName: '',
state: '',
+ licenseNumber: '',
},
});
});
diff --git a/webroot/src/store/user/user.actions.ts b/webroot/src/store/user/user.actions.ts
index 840e71034..bd87647f9 100644
--- a/webroot/src/store/user/user.actions.ts
+++ b/webroot/src/store/user/user.actions.ts
@@ -16,7 +16,7 @@ import {
autoLogoutConfig
} from '@/app.config';
import localStorage from '@store/local.storage';
-import { Compact } from '@models/Compact/Compact.model';
+import { Compact, CompactType } from '@models/Compact/Compact.model';
import { PurchaseFlowStep } from '@/models/PurchaseFlowStep/PurchaseFlowStep.model';
import moment from 'moment';
import axios from 'axios';
@@ -178,6 +178,14 @@ export default {
commit(MutationTypes.STORE_UPDATE_CURRENT_COMPACT, compact);
if (compact?.type) {
+ // Set the AppMode based on compact
+ if (compact.type === CompactType.COSMETOLOGY) {
+ dispatch('setAppMode', AppModes.COSMETOLOGY, { root: true });
+ } else {
+ dispatch('setAppMode', AppModes.JCC, { root: true });
+ }
+
+ // Fetch the states for the compact
await dispatch('getCompactStatesRequest', { compact: compact.type });
}
},
diff --git a/webroot/src/store/user/user.spec.ts b/webroot/src/store/user/user.spec.ts
index fce3be555..481c4ef9c 100644
--- a/webroot/src/store/user/user.spec.ts
+++ b/webroot/src/store/user/user.spec.ts
@@ -1074,7 +1074,7 @@ describe('User Store Actions', async () => {
expect(commit.firstCall.args).to.matchPattern([MutationTypes.STORE_UPDATE_CURRENT_COMPACT, null]);
expect(dispatch.callCount, 'dispatch').to.equal(0);
});
- it('should successfully set current compact (with compact)', async () => {
+ it('should successfully set current compact (with compact - jcc)', async () => {
const commit = sinon.spy();
const dispatch = sinon.spy();
const compact = new Compact({ type: CompactType.ASLP });
@@ -1083,8 +1083,24 @@ describe('User Store Actions', async () => {
expect(commit.calledOnce, 'commit').to.equal(true);
expect(commit.firstCall.args).to.matchPattern([MutationTypes.STORE_UPDATE_CURRENT_COMPACT, compact]);
- expect(dispatch.callCount, 'dispatch').to.equal(1);
- expect([dispatch.firstCall.args[0]]).to.matchPattern(['getCompactStatesRequest']);
+ expect(dispatch.callCount, 'dispatch').to.equal(2);
+ expect([dispatch.firstCall.args[0]]).to.matchPattern(['setAppMode']);
+ expect([dispatch.firstCall.args[1]]).to.matchPattern([AppModes.JCC]);
+ expect([dispatch.secondCall.args[0]]).to.matchPattern(['getCompactStatesRequest']);
+ });
+ it('should successfully set current compact (with compact - cosmetology)', async () => {
+ const commit = sinon.spy();
+ const dispatch = sinon.spy();
+ const compact = new Compact({ type: CompactType.COSMETOLOGY });
+
+ await actions.setCurrentCompact({ commit, dispatch }, compact);
+
+ expect(commit.calledOnce, 'commit').to.equal(true);
+ expect(commit.firstCall.args).to.matchPattern([MutationTypes.STORE_UPDATE_CURRENT_COMPACT, compact]);
+ expect(dispatch.callCount, 'dispatch').to.equal(2);
+ expect([dispatch.firstCall.args[0]]).to.matchPattern(['setAppMode']);
+ expect([dispatch.firstCall.args[1]]).to.matchPattern([AppModes.COSMETOLOGY]);
+ expect([dispatch.secondCall.args[0]]).to.matchPattern(['getCompactStatesRequest']);
});
it('should successfully start updateHomeJurisdictionRequest', async () => {
const commit = sinon.spy();