Merge remote-tracking branch 'origin/feature/CSR-99' into feature/CSR-98
This commit is contained in:
commit
04bd941d03
2 changed files with 6 additions and 3 deletions
|
|
@ -1,10 +1,11 @@
|
||||||
// Supporting files
|
// Supporting files
|
||||||
import { createWebHistory, createRouter } from "vue-router";
|
import { createWebHistory, createRouter } from "vue-router";
|
||||||
import { storeActions } from "@/constants/store-actions";
|
import { storeActions } from "@/constants/store-actions";
|
||||||
import baseMixin from "@/mixins/base-mixin";
|
|
||||||
import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
|
import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
|
||||||
import { routingTable } from "@/router/router-constants/routing-table.js";
|
import { routingTable } from "@/router/router-constants/routing-table.js";
|
||||||
import { globalEvents, globalEventTypes } from "@/constants/events";
|
import { globalEvents, globalEventTypes } from "@/constants/events";
|
||||||
|
import { routerParameterKeys } from '@/router/router-constants/router-parameter-keys'
|
||||||
|
import baseMixin from "@/mixins/base-mixin";
|
||||||
import eventBus from "@/helpers/event-bus/event-bus";
|
import eventBus from "@/helpers/event-bus/event-bus";
|
||||||
import store from "@/store";
|
import store from "@/store";
|
||||||
import { handleInfoFromHeritageFunnel, saveOrder, } from "@/helpers/heritage-integration-helper";
|
import { handleInfoFromHeritageFunnel, saveOrder, } from "@/helpers/heritage-integration-helper";
|
||||||
|
|
@ -165,7 +166,7 @@ async function navigate(scenario, currentRoute, invalidateOnSave, optionalQuery
|
||||||
query: Object.assign(optionalQuery, {
|
query: Object.assign(optionalQuery, {
|
||||||
fmgPage: destinationFmgPageValue,
|
fmgPage: destinationFmgPageValue,
|
||||||
}),
|
}),
|
||||||
params: optionalParams,
|
params: Object.assign(optionalParams, {[routerParameterKeys.FROM_ROUTER_NAVIGATE]: true})
|
||||||
});
|
});
|
||||||
} else if (matchingScenarioMap.destinationUrl !== undefined) {
|
} else if (matchingScenarioMap.destinationUrl !== undefined) {
|
||||||
if (matchingScenarioMap.shouldNavigateToHeritageFunnel) {
|
if (matchingScenarioMap.shouldNavigateToHeritageFunnel) {
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
const routerParameterKeys = { };
|
const routerParameterKeys = {
|
||||||
|
FROM_ROUTER_NAVIGATE: 'fromRouterNavigate',
|
||||||
|
};
|
||||||
|
|
||||||
export { routerParameterKeys };
|
export { routerParameterKeys };
|
||||||
Loading…
Reference in a new issue