orc-shared 1.2.0-dev.1 → 1.2.0-dev.5

package/src/components/Routing/withWaypointing.test.js

@@ -6,7 +6,7 @@ import { Router, Route } from "react-router-dom";
 import { mount, act } from "unexpected-reaction";
 import sinon from "sinon";
 import { PropStruct } from "../../utils/testUtils";
-import { setRoute, mapHref } from "../../actions/navigation";
+import { setRoute, mapHref, setCurrentPrependPath } from "../../actions/navigation";
 import withWaypointing from "./withWaypointing";
 
 describe("withWaypointing", () => {
@@ -22,6 +22,7 @@ describe("withWaypointing", () => {
 						params: { some: "meep" },
 						isExact: true,
 					},
+					modulePrependPath: "foo",
 				},
 			},
 			requests: {
@@ -94,6 +95,21 @@ describe("withWaypointing", () => {
 			})
 			.then(() => expect(store.dispatch, "to have calls satisfying", [])));
 
+	it("does not render the component if the component is not visible", () =>
+		expect(withWaypointing, "called with", [PropStruct, false])
+			.then(EnhancedView => {
+				return expect(
+					<Provider store={store}>
+						<Router history={history}>
+							<Route path="/feep/:some" component={EnhancedView} />
+						</Router>
+					</Provider>,
+					"when mounted",
+					"to be null",
+				);
+			})
+			.then(() => expect(store.dispatch, "to have calls satisfying", [])));
+
 	it("does fire action if path parameters different", () =>
 		expect(withWaypointing, "called with", [PropStruct])
 			.then(EnhancedView => {
@@ -128,7 +144,7 @@ describe("withWaypointing", () => {
 			));
 
 	it("does fire action if path parameters different and with custom props", () =>
-		expect(withWaypointing, "called with", [PropStruct, { foo: 123 }])
+		expect(withWaypointing, "called with", [PropStruct, true, { foo: 123 }])
 			.then(EnhancedView => {
 				history.replace("/feep/moof");
 				return expect(
@@ -161,7 +177,7 @@ describe("withWaypointing", () => {
 			));
 
 	it("does not fire action if route match is not exact with custom props", () =>
-		expect(withWaypointing, "called with", [PropStruct, { foo: 123 }])
+		expect(withWaypointing, "called with", [PropStruct, true, { foo: 123 }])
 			.then(EnhancedView => {
 				history.replace("/feep/meep/mef");
 				return expect(
@@ -201,16 +217,28 @@ describe("withWaypointing", () => {
 				return expect(
 					<Provider store={store}>
 						<Router history={history}>
-							<Route path="/foo/bar" render={props => <EnhancedView {...props} mapFrom="/foo" />} />
+							<Route
+								path="/foo/bar"
+								render={props => <EnhancedView {...props} mapFrom="/foo" modulePrependPath="foo" />}
+							/>
 						</Router>
 					</Provider>,
 					"when mounted",
 					"to satisfy",
-					<PropStruct history="__ignore" location="__ignore" match="__ignore" mapFrom="/foo" />,
+					<PropStruct
+						history="__ignore"
+						location="__ignore"
+						match="__ignore"
+						mapFrom="/foo"
+						modulePrependPath="__ignore"
+					/>,
 				);
 			})
 			.then(() =>
 				expect(store.dispatch, "to have calls satisfying", [
+					{
+						args: [setCurrentPrependPath("foo")],
+					},
 					{
 						args: [mapHref("/foo", "/foo/bar")],
 					},

package/src/components/Scope/useScopeConfirmationModalState.js

@@ -6,8 +6,7 @@ import { applicationScopeHasChanged } from "../../actions/scopes";
 import useScopeData from "./useScopeData";
 import { hasUnsavedDataSelector } from "../../selectors/view";
 import { scopeConfirmationDialogTypes } from "../../constants";
-import { useHistory } from "react-router-dom";
-import UrlPattern from "url-pattern";
+import { setNewScopeAndModuleName } from "../../actions/modules";
 
 const ExecuteClosingTabHandlerActions = async closingTabHandlerActions => {
 	if (closingTabHandlerActions.length <= 0) return Promise.resolve();
@@ -19,23 +18,13 @@ const ExecuteClosingTabHandlerActions = async closingTabHandlerActions => {
 
 const useApplicationScopeChanger = closingTabHandlerActions => {
 	const dispatch = useDispatch();
-	const history = useHistory();
 	const moduleName = useSelectorAndUnwrap(selectCurrentModuleName);
 
 	return (previousScope, newScope) => {
-		const params = {
-			scope: newScope,
-		};
-
-		// did not find a more reliable way to get the URL for the first tab of the module
-		const pattern = new UrlPattern(`/:scope/${moduleName}`);
-		const href = pattern.stringify(params);
-
-		history.push(href);
-
-		ExecuteClosingTabHandlerActions(closingTabHandlerActions).then(() =>
-			dispatch(applicationScopeHasChanged(previousScope, newScope)),
-		);
+		ExecuteClosingTabHandlerActions(closingTabHandlerActions).then(() => {
+			dispatch(setNewScopeAndModuleName(newScope, moduleName));
+			dispatch(applicationScopeHasChanged(previousScope, newScope));
+		});
 	};
 };
 

package/src/components/Scope/useScopeConfirmationModalState.test.js

@@ -4,8 +4,8 @@ import sinon from "sinon";
 import { TestWrapper } from "../../utils/testUtils";
 import useScopeConfirmationModalState from "./useScopeConfirmationModalState";
 import { mount } from "enzyme";
-import { createMemoryHistory } from "history";
 import { APPLICATION_SCOPE_HAS_CHANGED } from "../../actions/scopes";
+import { SET_NEW_SCOPE_AND_MODULE_NAME } from "../../actions/modules";
 
 jest.mock("../../utils/buildUrl", () => {
 	const modExport = {};
@@ -35,13 +35,9 @@ const TestComp = () => {
 };
 
 describe("useScopeConfirmationModalState", () => {
-	let state, store, history;
+	let state, store;
 
 	beforeEach(() => {
-		history = createMemoryHistory({ initialEntries: ["/TestScope/demos?arg=data"] });
-		sinon.spy(history, "push");
-		history.push.named("history.push");
-
 		state = Immutable.fromJS({
 			input: {},
 			locale: {
@@ -170,7 +166,7 @@ describe("useScopeConfirmationModalState", () => {
 
 	it("selecting a new scope without active tabs changes the scope", async () => {
 		const component = (
-			<TestWrapper provider={{ store }} router={{ history }}>
+			<TestWrapper provider={{ store }}>
 				<TestComp />
 			</TestWrapper>
 		);
@@ -183,8 +179,18 @@ describe("useScopeConfirmationModalState", () => {
 
 		await new Promise(resolve => setTimeout(resolve, 10));
 
-		expect(history.push, "to have calls satisfying", [{ args: ["/newScope/TheModuleName"] }]);
 		expect(store.dispatch, "to have calls satisfying", [
+			{
+				args: [
+					{
+						type: SET_NEW_SCOPE_AND_MODULE_NAME,
+						payload: {
+							scope: "newScope",
+							moduleName: "TheModuleName",
+						},
+					},
+				],
+			},
 			{
 				args: [
 					{
@@ -227,7 +233,7 @@ describe("useScopeConfirmationModalState", () => {
 		openTabs();
 
 		const component = (
-			<TestWrapper provider={{ store }} router={{ history }}>
+			<TestWrapper provider={{ store }}>
 				<TestComp />
 			</TestWrapper>
 		);
@@ -248,8 +254,18 @@ describe("useScopeConfirmationModalState", () => {
 		isModalOpened = mountedComponent.find("#isModalOpened").text();
 		expect(isModalOpened, "to equal", "false");
 
-		expect(history.push, "to have calls satisfying", [{ args: ["/newScope/TheModuleName"] }]);
 		expect(store.dispatch, "to have calls satisfying", [
+			{
+				args: [
+					{
+						type: SET_NEW_SCOPE_AND_MODULE_NAME,
+						payload: {
+							scope: "newScope",
+							moduleName: "TheModuleName",
+						},
+					},
+				],
+			},
 			{
 				args: [
 					{
@@ -281,7 +297,7 @@ describe("useScopeConfirmationModalState", () => {
 		openTabs();
 
 		const component = (
-			<TestWrapper provider={{ store }} router={{ history }}>
+			<TestWrapper provider={{ store }}>
 				<TestComp />
 			</TestWrapper>
 		);
@@ -309,9 +325,19 @@ describe("useScopeConfirmationModalState", () => {
 			{ args: [null, true] },
 		]);
 
-		expect(history.push, "to have calls satisfying", [{ args: ["/newScope/TheModuleName"] }]);
-		expect(store.dispatch.callCount, "to be", 1);
+		expect(store.dispatch.callCount, "to be", 2);
 		expect(store.dispatch, "to have calls satisfying", [
+			{
+				args: [
+					{
+						type: SET_NEW_SCOPE_AND_MODULE_NAME,
+						payload: {
+							scope: "newScope",
+							moduleName: "TheModuleName",
+						},
+					},
+				],
+			},
 			{
 				args: [
 					{

package/src/components/Scope/useScopeData.js

@@ -1,8 +1,6 @@
 import { useSelector } from "react-redux";
-import useLoader from "../../hooks/useLoader";
 import { unwrapImmutable } from "../../utils";
 import { currentScopeSelector, scopeGetter } from "../../selectors/scope";
-import { getScopes } from "../../actions/scopes";
 
 const buildDefaultNodeState = (current, getScope) => {
 	let node = current;
@@ -16,7 +14,6 @@ const buildDefaultNodeState = (current, getScope) => {
 const useScopeData = () => {
 	const currentScope = unwrapImmutable(useSelector(currentScopeSelector));
 	const getScope = useSelector(scopeGetter);
-	useLoader(getScopes(), () => currentScope.name);
 	const defaultNodeState = buildDefaultNodeState(currentScope, getScope);
 	return [currentScope, defaultNodeState, getScope];
 };

package/src/components/Scope/useScopeData.test.js

@@ -2,7 +2,6 @@ import React from "react";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
 import Immutable from "immutable";
-import { RSAA } from "redux-api-middleware";
 import sinon from "sinon";
 import { PropStruct } from "../../utils/testUtils";
 import useScopeData from "./useScopeData";
@@ -122,30 +121,4 @@ describe("useScopeData", () => {
 			)
 
 			.then(() => expect(store.dispatch, "was not called")));
-
-	it("loads scopes if it has none", () => {
-		state = state.setIn(["scopes"], Immutable.Map());
-		return expect(
-			<Provider store={store}>
-				<MemoryRouter>
-					<TestComp />
-				</MemoryRouter>
-			</Provider>,
-			"when mounted",
-			"to be a",
-			"DOMElement",
-		).then(() =>
-			expect(store.dispatch, "to have calls satisfying", [
-				{
-					args: [
-						{
-							[RSAA]: {
-								types: ["GET_SCOPES_REQUEST", "GET_SCOPES_SUCCESS", "GET_SCOPES_FAILURE"],
-							},
-						},
-					],
-				},
-			]),
-		);
-	});
 });

package/src/constants.js

@@ -23,6 +23,7 @@ export const roleGroups = {
 	Shopping: "Shopping",
 	Search: "Search",
 	Profiles: "Profiles",
+	Locations: "Locations",
 	Orchestrator: "Orchestrator",
 	PriceManagement: "PriceManagement",
 	UserManagement: "UserManagement",
@@ -73,6 +74,20 @@ export const attributeDataType = {
 	customType: "CustomType",
 };
 
+// It is intended that some of them have a different value of its keys
+export const overtureModule = {
+	System: "System",
+	Products: "Product",
+	Customers: "Customer",
+	Orders: "Order",
+	Marketing: "Marketing",
+	Report: "Reports",
+	Administration: "Administration",
+	UserManagement: "UserManagement",
+	PriceManagement: "PriceManagement",
+	Locations: "Location",
+};
+
 export const definitionType = {
 	shared: "Shared",
 	embedded: "Embedded",

package/src/content/icons/orckestra-icon.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="260" height="260" viewBox="0 0 260 260">
+	<path d="M1.11,125.62C1.11,74.94,40.22,39,93.72,39S186,74.94,186,125.62s-38.79,86.66-92.29,86.66S1.11,176.3,1.11,125.62Zm135.47,0c0-29.1-18.46-46.62-42.86-46.62S50.54,96.52,50.54,125.62s18.77,46.62,43.18,46.62S136.58,154.72,136.58,125.62Z" fill="#000000"/>
+	<circle id="ac06531b-599d-4b05-a30e-b1c94e55ddff" data-name="fullLogo" cx="227.6" cy="181.13" r="31.29" fill="#000000" opacity="0.33"/>
+	<circle id="af2ef0cf-5c47-4a93-b3be-f4e8ec48b016" data-name="fullLogo" cx="227.6" cy="181.13" r="31.29" fill="#e00600"/>
+</svg>

package/src/content/iconsSheet.svg

@@ -122,6 +122,9 @@
 <symbol id="icon-dropdown-chevron-down" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
  <polyline fill="none" stroke-linecap="round" stroke-linejoin="round" points="9 3 5 7 1 3"/>
 </symbol>
+<symbol id="icon-open-in-new-tab" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+ <path stroke="none" fill-rule="evenodd" d="M8.4375,6.25 L7.8125,6.25 C7.63991102,6.25 7.5,6.38991102 7.5,6.5625 L7.5,8.75 L1.25,8.75 L1.25,2.5 L4.0625,2.5 C4.23508898,2.5 4.375,2.36008898 4.375,2.1875 L4.375,1.5625 C4.375,1.38991102 4.23508898,1.25 4.0625,1.25 L0.9375,1.25 C0.419733047,1.25 0,1.66973305 0,2.1875 L0,9.0625 C0,9.58026695 0.419733047,10 0.9375,10 L7.8125,10 C8.33026695,10 8.75,9.58026695 8.75,9.0625 L8.75,6.5625 C8.75,6.38991102 8.61008898,6.25 8.4375,6.25 Z M9.53125,0 L7.03125,0 C6.61386719,0 6.40527344,0.506054688 6.69921875,0.80078125 L7.39707031,1.49863281 L2.63671875,6.25722656 C2.54845882,6.34518057 2.49884911,6.46465556 2.49884911,6.58925781 C2.49884911,6.71386007 2.54845882,6.83333506 2.63671875,6.92128906 L3.07949219,7.36328125 C3.16744619,7.45154118 3.28692118,7.50115089 3.41152344,7.50115089 C3.53612569,7.50115089 3.65560068,7.45154118 3.74355469,7.36328125 L8.5015625,2.60390625 L9.19921875,3.30078125 C9.4921875,3.59375 10,3.38867188 10,2.96875 L10,0.46875 C10,0.209866524 9.79013348,0 9.53125,0 Z"/>
+</symbol>
 <symbol id="icon-dropdown-chevron-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
  <polyline fill="none" stroke-linecap="round" stroke-linejoin="round" points="9 3 5 7 1 3" transform="rotate(-90 5 5)"/>
 </symbol>
@@ -355,6 +358,11 @@
  <path d="M19.28 2.46A12 12 0 1 0 24 12a12 12 0 0 0-4.72-9.54zm-11 16.09A10.86 10.86 0 0 1 7.9 5.92h0a5.25 5.25 0 0 1 4.17-2.33c3.33 0 6 3.78 6 8.44s-2.71 8.45-6 8.45a5.09 5.09 0 0 1-3.83-1.92z" fill="url(#OperaA)"/>
  <path d="M24,12a12,12,0,0,1-4.72,9.54,9.15,9.15,0,0,1-3.61.75,9.34,9.34,0,0,1-7.42-3.74,5.09,5.09,0,0,0,3.83,1.92c3.33,0,6-3.78,6-8.45s-2.71-8.44-6-8.44A5.25,5.25,0,0,0,7.91,5.91a9.41,9.41,0,0,1,7.76-4.2,9.15,9.15,0,0,1,3.61.75A12,12,0,0,1,24,12Z" fill="url(#OperaB)"/>
 </symbol>
+<symbol id="icon-orckestra-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 260 260">
+	<path stroke="none" d="M1.11,125.62C1.11,74.94,40.22,39,93.72,39S186,74.94,186,125.62s-38.79,86.66-92.29,86.66S1.11,176.3,1.11,125.62Zm135.47,0c0-29.1-18.46-46.62-42.86-46.62S50.54,96.52,50.54,125.62s18.77,46.62,43.18,46.62S136.58,154.72,136.58,125.62Z" />
+	<circle id="ac06531b-599d-4b05-a30e-b1c94e55ddff" data-name="fullLogo" cx="227.6" cy="181.13" r="31.29" fill="#000000" opacity="0.33"/>
+	<circle id="af2ef0cf-5c47-4a93-b3be-f4e8ec48b016" data-name="fullLogo" cx="227.6" cy="181.13" r="31.29" fill="#e00600"/>
+</symbol>
 <symbol id="icon-orders-settings" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
  <path stroke="none" d="M12.1212737,0.0149273899 L12.1993631,0.0414649719 L23.6993631,5.04146497 C23.7267178,5.05378722 23.7458342,5.06406299 23.7642168,5.07551155 L23.6993631,5.04146497 C23.7308114,5.05513816 23.7601438,5.07165577 23.78719,5.09058546 C23.8752368,5.15228138 23.9440986,5.24234048 23.9776191,5.35045242 C23.9802724,5.36045426 23.9832498,5.37111525 23.9858736,5.38187225 C23.9952103,5.41944845 24,5.45894924 24,5.5 L23.9953562,5.43148585 C23.9967469,5.44147074 23.9978376,5.45151191 23.998623,5.46159578 L24,5.5 L24,18.5 C24,18.6960717 23.8853986,18.8740482 23.7069015,18.9551832 L23.7069015,18.9551832 L12.7069015,23.9551832 C12.6983028,23.9590917 12.6896739,23.9627354 12.6810221,23.9661191 C12.6644847,23.9727264 12.6477069,23.9782939 12.6306305,23.982966 C12.620519,23.9856515 12.6101188,23.9881575 12.5997187,23.9903149 C12.572237,23.9960541 12.5437253,23.9994522 12.5148271,24.0003058 C12.5014662,24.0007477 12.488556,24.0006156 12.4757251,23.9999825 C12.4670436,23.999429 12.4607455,23.9989604 12.4544383,23.998368 C12.4364185,23.9967958 12.4185026,23.9941212 12.4008462,23.9904983 L12.3904992,23.9880981 L12.3904992,23.9880981 L12.3744849,23.9843374 C12.3533008,23.9787756 12.3325557,23.9718389 12.3123792,23.9636106 L12.3076923,23.9615385 L8.11432939,22.2143039 C7.85942874,22.1080953 7.73889002,21.8153584 7.84509862,21.5604578 C7.93950627,21.3338794 8.1812943,21.2134636 8.41288432,21.2640954 L8.49894478,21.291227 L12,22.75 L12,10.833 L1,6.25 L1,18.166 L1.66956979,18.4456541 C1.89614815,18.5400617 2.01656399,18.7818498 1.96593211,19.0134398 L1.93880056,19.0995002 C1.84439291,19.3260786 1.60260489,19.4464944 1.37101486,19.3958626 L1.28495441,19.368731 L0.307692308,18.9615385 C0.147986477,18.8949944 0.0360024157,18.7517347 0.0072662723,18.5850485 L0,18.5 L0,5.5 L0.000261662773,5.48059656 C0.000995508743,5.46203925 0.00276487427,5.44359664 0.00553689598,5.42535217 L0,5.5 C0,5.45998969 0.00456440138,5.4214232 0.0131339416,5.38467337 C0.0169397718,5.36998047 0.0211530399,5.35526567 0.0260244955,5.34077917 C0.0315748534,5.32261012 0.0387562627,5.30467967 0.0468964169,5.287344 C0.0491575156,5.28372548 0.051376597,5.27915382 0.053665113,5.27461569 C0.0628828278,5.25536515 0.0731857541,5.2378939 0.0844589219,5.22118267 C0.0896903619,5.2139764 0.0953028029,5.20607213 0.101150512,5.19832596 C0.114371261,5.1805673 0.128643394,5.16419047 0.143874622,5.14882541 C0.146734857,5.14594128 0.149900432,5.14280918 0.153111875,5.13971631 C0.200589899,5.09587346 0.246688688,5.0654823 0.296626138,5.04311459 L0.300636944,5.04146497 L11.8006369,0.0414649719 C11.9023643,-0.00276433146 12.0151307,-0.0116101921 12.1212737,0.0149273899 Z M3.97267123,15.0674776 C4.99377958,14.0472295 6.49125771,13.7663134 7.79554839,14.3190245 C8.12583688,14.4589887 8.20563603,14.8909416 7.94715575,15.1396753 L7.94715575,15.1396753 L6.60445396,16.431939 L6.60445396,17.425939 L7.59945396,17.425939 L8.89175427,16.0840962 C9.11989856,15.8471313 9.50199604,15.8946635 9.67172912,16.1588147 L9.67172912,16.1588147 L9.71247951,16.2361756 C10.2637941,17.540178 9.98468461,19.0093693 8.96326123,20.0299316 C8.04649024,20.9482486 6.71990797,21.2687813 5.5110051,20.9206164 L5.5110051,20.9206164 L5.43745396,20.895939 L2.83943318,23.4947737 C2.78560777,23.5472916 2.70868751,23.6111734 2.61009303,23.677149 L2.61009303,23.677149 L2.50432643,23.7434792 C1.90095763,24.0980698 1.20669408,24.1124825 0.593239927,23.5478093 L0.593239927,23.5478093 L0.534281025,23.4913673 L0.371442461,23.3092933 C-0.0880238492,22.7287303 -0.0530937435,22.0865148 0.280581463,21.5245821 C0.369628975,21.3746198 0.460405096,21.2622765 0.532845501,21.1888084 L0.532845501,21.1888084 L3.11945396,18.593939 L3.09509424,18.5190572 C2.76429265,17.3749038 3.02480991,16.1295108 3.82573255,15.2237099 L3.82573255,15.2237099 Z M6.50756303,15.0417845 C5.9022234,15.023285 5.30214145,15.2291843 4.82046621,15.6440275 L4.82046621,15.6440275 L4.67962899,15.7747333 C3.95513926,16.4992231 3.76002654,17.5874199 4.15767782,18.5288513 C4.23675546,18.716066 4.1946478,18.9325193 4.05115362,19.076436 L4.05115362,19.076436 L1.24298032,21.8928684 L1.17219893,21.9847138 L1.14041764,22.0351521 C0.9885,22.2909922 0.983930789,22.5088263 1.20978842,22.7516687 L1.20978842,22.7516687 L1.25514704,22.7976512 L1.35159492,22.878993 C1.5660328,23.0353152 1.76744252,23.0166323 1.99765898,22.8813376 L1.99765898,22.8813376 L2.08955554,22.8211801 C2.11340753,22.8037557 2.12980084,22.7900519 2.13669993,22.7833468 L2.13669993,22.7833468 L4.95438617,19.9656606 C5.09835629,19.8216905 5.31524648,19.7793979 5.50275955,19.8587304 C6.43792725,20.2543782 7.52764107,20.0525662 8.25600574,19.3229738 C8.7594648,18.8199389 9.0097268,18.1735652 8.98910375,17.5162583 L8.98910375,17.5162583 L8.98345396,17.429939 L8.1720744,18.273412 C8.09667101,18.3517306 7.99836307,18.4027964 7.89247687,18.4200899 L7.89247687,18.4200899 L7.81188076,18.4266259 L6.10396414,18.4266259 C5.82782176,18.4266259 5.60396414,18.2027683 5.60396414,17.9266259 L5.60396414,17.9266259 L5.60396414,16.2194617 C5.60396414,16.0835213 5.65931519,15.9534408 5.75726863,15.8591809 L5.75726863,15.8591809 L6.60045396,15.047939 Z M23,6.276 L13,10.821 L13,22.723 L23,18.177 L23,6.276 Z M3.64605009,9.5215423 L3.7236068,9.5527864 L9.7236068,12.5527864 C9.86476681,12.6233664 9.96259986,12.75536 9.99128976,12.9069957 L10,13 L10,14.5410822 C10,14.8172245 9.77614237,15.0410822 9.5,15.0410822 C9.25454011,15.0410822 9.05039163,14.864207 9.00805567,14.6309578 L9,14.5410822 L9,13.309 L4,10.809 L4,13.9778457 C4,14.2233056 3.82312484,14.4274541 3.58987563,14.46979 L3.5,14.4778457 C3.25454011,14.4778457 3.05039163,14.3009705 3.00805567,14.0677213 L3,13.9778457 L3,10 C3,9.65690061 3.3332929,9.424522 3.64605009,9.5215423 Z M7.175,3.143 L1.776,5.49 L12.491,9.954 L17.098,7.86 L7.175,3.143 Z M12,1.045 L8.392,2.614 L18.289,7.319 L22.269,5.51 L12,1.045 Z"/>
 </symbol>

package/src/hocs/withScopeData.test.js

@@ -2,7 +2,6 @@ import React from "react";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
 import Immutable from "immutable";
-import { RSAA } from "redux-api-middleware";
 import sinon from "sinon";
 import { PropStruct, spyOnConsole } from "../utils/testUtils";
 import withScopeData from "./withScopeData";
@@ -142,34 +141,4 @@ describe("withScopeData", () => {
 				),
 			)
 			.then(() => expect(store.dispatch, "was not called")));
-
-	it("loads scopes if it has none", () => {
-		state = state.setIn(["scopes"], Immutable.Map());
-		return expect(withScopeData, "when called with", [TestComp])
-			.then(Comp =>
-				expect(
-					<Provider store={store}>
-						<MemoryRouter>
-							<Comp />
-						</MemoryRouter>
-					</Provider>,
-					"when mounted",
-					"to be a",
-					"DOMElement",
-				),
-			)
-			.then(() =>
-				expect(store.dispatch, "to have calls satisfying", [
-					{
-						args: [
-							{
-								[RSAA]: {
-									types: ["GET_SCOPES_REQUEST", "GET_SCOPES_SUCCESS", "GET_SCOPES_FAILURE"],
-								},
-							},
-						],
-					},
-				]),
-			);
-	});
 });

package/src/reducers/modules.js

@@ -1,8 +1,22 @@
 import Immutable from "immutable";
-import { SET_MODULES_STRUCTURE } from "../actions/modules";
+import {
+	INITIALIZE_FIRST_MODULE_SCOPE,
+	SET_MODULE_AS_VISIBLE,
+	SET_MODULES_STRUCTURE,
+	SET_NEW_SCOPE_AND_MODULE_NAME,
+	SET_ROUTING_PERFORMED,
+} from "../actions/modules";
 import { infoBar } from "./../constants";
 
-const initialState = Immutable.Map({});
+const initialState = Immutable.fromJS({
+	tree: {},
+	visibleModules: [],
+	lastScopeAndModuleSelection: {
+		scope: null,
+		moduleName: null,
+		routingPerformed: true,
+	},
+});
 
 const viewStateReducer = (state = initialState, action) => {
 	switch (action.type) {
@@ -32,6 +46,38 @@ const viewStateReducer = (state = initialState, action) => {
 
 			return state.set("tree", Immutable.fromJS(modulesTree));
 		}
+
+		case INITIALIZE_FIRST_MODULE_SCOPE: {
+			return state.setIn(["lastScopeAndModuleSelection", "scope"], action.payload);
+		}
+
+		case SET_MODULE_AS_VISIBLE: {
+			const visibleModules = state.get("visibleModules").toJS();
+			visibleModules.push(action.payload);
+
+			return state.set("visibleModules", Immutable.fromJS(visibleModules));
+		}
+
+		case SET_NEW_SCOPE_AND_MODULE_NAME: {
+			const lastScopeAndModuleSelection = state.get("lastScopeAndModuleSelection").toJS();
+
+			if (action.payload.scope !== lastScopeAndModuleSelection.scope) {
+				state = state.set("visibleModules", Immutable.fromJS([]));
+			}
+
+			return state.set(
+				"lastScopeAndModuleSelection",
+				Immutable.fromJS({
+					moduleName: action.payload.moduleName,
+					scope: action.payload.scope,
+					routingPerformed: false,
+				}),
+			);
+		}
+
+		case SET_ROUTING_PERFORMED:
+			return state.setIn(["lastScopeAndModuleSelection", "routingPerformed"], true);
+
 		default:
 			return state;
 	}

package/src/reducers/modules.test.js

@@ -1,9 +1,25 @@
 import Immutable from "immutable";
-import { setModulesStructure } from "../actions/modules";
+import {
+	initializeFirstModuleScope,
+	setModuleAsVisible,
+	setModulesStructure,
+	setNewScopeAndModuleName,
+	setRoutingPerformed,
+} from "../actions/modules";
 import modulesReducer from "./modules";
 
 describe("View state reducer", () => {
-	it("behaves as a reducer should", () => expect(modulesReducer, "to be a reducer with initial state", {}));
+	const initialState = {
+		tree: {},
+		visibleModules: [],
+		lastScopeAndModuleSelection: {
+			scope: null,
+			moduleName: null,
+			routingPerformed: true,
+		},
+	};
+
+	it("behaves as a reducer should", () => expect(modulesReducer, "to be a reducer with initial state", initialState));
 
 	it("Sets module structure correctly", () => {
 		const oldState = Immutable.Map({});
@@ -92,4 +108,103 @@ describe("View state reducer", () => {
 		const newState = modulesReducer(oldState, action);
 		return expect(newState, "not to be", oldState).and("to equal", Immutable.fromJS({ tree: modules }));
 	});
+
+	it("Initialize first scope", () => {
+		const oldState = Immutable.fromJS(initialState);
+
+		const expected = {
+			...initialState,
+			lastScopeAndModuleSelection: {
+				...initialState.lastScopeAndModuleSelection,
+				scope: "firstScope",
+			},
+		};
+
+		const action = initializeFirstModuleScope("firstScope");
+		const newState = modulesReducer(oldState, action);
+		return expect(newState, "not to be", oldState).and("to equal", Immutable.fromJS(expected));
+	});
+
+	it("Add a visible module into the array", () => {
+		const oldState = Immutable.fromJS({
+			...initialState,
+			visibleModules: ["moduleReality"],
+		});
+
+		const expected = {
+			...initialState,
+			visibleModules: ["moduleReality", "moduleMatrix"],
+		};
+
+		const action = setModuleAsVisible("moduleMatrix");
+		const newState = modulesReducer(oldState, action);
+		return expect(newState, "not to be", oldState).and("to equal", Immutable.fromJS(expected));
+	});
+
+	it("set a new scope and module for eventual redirection", () => {
+		const oldState = Immutable.fromJS({
+			...initialState,
+			lastScopeAndModuleSelection: {
+				scope: "aScope",
+				moduleName: null,
+				routingPerformed: true,
+			},
+		});
+
+		const expected = {
+			...initialState,
+			lastScopeAndModuleSelection: {
+				scope: "aScope",
+				moduleName: "moduleMatrix",
+				routingPerformed: false,
+			},
+		};
+
+		const action = setNewScopeAndModuleName("aScope", "moduleMatrix");
+		const newState = modulesReducer(oldState, action);
+		return expect(newState, "not to be", oldState).and("to equal", Immutable.fromJS(expected));
+	});
+
+	it("set a new scope and module for eventual redirection and reinitialize visible modules", () => {
+		const oldState = Immutable.fromJS({
+			...initialState,
+			visibleModules: ["moduleReality"],
+		});
+
+		const expected = {
+			...initialState,
+			lastScopeAndModuleSelection: {
+				scope: "newScope",
+				moduleName: "moduleMatrix",
+				routingPerformed: false,
+			},
+		};
+
+		const action = setNewScopeAndModuleName("newScope", "moduleMatrix");
+		const newState = modulesReducer(oldState, action);
+		return expect(newState, "not to be", oldState).and("to equal", Immutable.fromJS(expected));
+	});
+
+	it("set routing was perform on scope and module", () => {
+		const oldState = Immutable.fromJS({
+			...initialState,
+			lastScopeAndModuleSelection: {
+				scope: "aScope",
+				moduleName: "aModule",
+				routingPerformed: false,
+			},
+		});
+		const expected = {
+			...initialState,
+			lastScopeAndModuleSelection: {
+				scope: "aScope",
+				moduleName: "aModule",
+				routingPerformed: true,
+			},
+		};
+
+		const action = setRoutingPerformed();
+		const newState = modulesReducer(oldState, action);
+		return expect(newState, "not to be", oldState).and("to equal", Immutable.fromJS(expected));
+	});
 });

package/src/reducers/scopes.js

@@ -8,7 +8,37 @@ const initialState = Immutable.fromJS({});
 const scopeReducer = (state = initialState, action) => {
 	switch (action.type) {
 		case GET_SCOPES_SUCCESS: {
+			const loadedScopes = state.toJS();
 			const normalizedScopes = normalize(action.payload, scopeSchema);
+
+			if (Object.keys(loadedScopes).length > 0) {
+				const addedScope = {};
+
+				Object.values(normalizedScopes.entities.scopes).forEach(scope => {
+					if (!loadedScopes[scope.id]) {
+						loadedScopes[scope.id] = scope;
+						addedScope[scope.id] = scope;
+					} else if (scope.isAuthorizedScope) {
+						loadedScopes[scope.id] = scope;
+					}
+				});
+
+				Object.values(addedScope).forEach(scope => {
+					const parentScope = loadedScopes[scope.parentScopeId];
+
+					if (parentScope) {
+						if (!parentScope.children.includes(scope.id)) {
+							parentScope.children.push(scope.id);
+						}
+					} else {
+						// Should not happen, but for safety
+						delete loadedScopes[scope.id];
+					}
+				});
+
+				return state.merge(Immutable.fromJS(loadedScopes));
+			}
+
 			return state.merge(Immutable.fromJS(normalizedScopes.entities.scopes));
 		}
 		default: