orc-shared 1.7.0-dev.8 → 5.2.0-dev.1

package/src/hooks/useEditState.js

@@ -190,18 +190,8 @@ export const useDynamicEditState = (entityId, sectionName, extendedValidationRul
 		};
 
 		const resetEditState = (path = []) => {
-			const pathToField = getValidPath(path);
-			const fullPath = !path.length ? [...keys] : [...keys, "value", ...pathToField];
-
-			const initialFieldValue = !path.length ? initialValue : get(initialValue, pathToField);
-
-			dispatchWithModulesData(setEditModelField, [
-				fullPath,
-				initialFieldValue,
-				initialFieldValue,
-				entityId,
-				sectionName,
-			]);
+			const fullPath = !path.length ? [...keys] : [...keys, "value", ...getValidPath(path)];
+			dispatchWithModulesData(setEditModelField, [fullPath, initialValue, initialValue, entityId, sectionName]);
 		};
 
 		const isEditStateValid = (value, path = [], errorTypes = [], dependencies = {}) => {

package/src/hooks/useEditState.test.js

@@ -1171,7 +1171,7 @@ describe("useDynamicEditState", () => {
 		expect(useDispatchWithModulesDataSpy, "to have a call satisfying", {
 			args: [
 				setEditModelField,
-				[["field", "value", "c", "d"], initialFieldValue.c.d, initialFieldValue.c.d, entityId, sectionName],
+				[["field", "value", "c", "d"], initialFieldValue, initialFieldValue, entityId, sectionName],
 			],
 		});
 

package/src/hooks/useLabelMessage.test.js

@@ -5,14 +5,12 @@ import Immutable from "immutable";
 import sinon from "sinon";
 import { messageContainsValues } from "./useLabelMessage";
 import useLabelMessage from "./useLabelMessage";
-import { createMuiTheme, extractMessages, TestWrapper } from "../utils/testUtils";
 
 const TestComp = ({ message, buildMessage }) => {
 	const [msgResult, missingValues = false] = useLabelMessage(message, buildMessage);
 
 	return <div missing-values={missingValues ? 1 : 0}>{msgResult}</div>;
 };
-const theme = createMuiTheme();
 
 describe("useLabelMessage", () => {
 	let store, state;
@@ -47,18 +45,12 @@ describe("useLabelMessage", () => {
 			values: { aValue: "testValue" },
 		};
 
-		const messages = extractMessages({ "test.msg": message });
-
 		return expect(
-			<TestWrapper
-				provider={{ store }}
-				intlProvider={{ messages }}
-				memoryRouter
-				stylesProvider
-				muiThemeProvider={{ theme }}
-			>
-				<TestComp message={message} />
-			</TestWrapper>,
+			<Provider store={store}>
+				<IntlProvider locale="en">
+					<TestComp message={message} />
+				</IntlProvider>
+			</Provider>,
 			"when mounted",
 			"to satisfy",
 			<div>Test message testValue</div>,
@@ -73,9 +65,11 @@ describe("useLabelMessage", () => {
 		};
 
 		return expect(
-			<TestWrapper provider={{ store }} intlProvider memoryRouter stylesProvider muiThemeProvider={{ theme }}>
-				<TestComp message={message} />
-			</TestWrapper>,
+			<Provider store={store}>
+				<IntlProvider locale="en">
+					<TestComp message={message} />
+				</IntlProvider>
+			</Provider>,
 			"when mounted",
 			"to satisfy",
 			<div missing-values={1}></div>,

package/src/reducers/modules.js

@@ -3,10 +3,10 @@ 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";
-import { APPLICATION_SCOPE_HAS_CHANGED } from "../actions/scopes";
 
 const initialState = Immutable.fromJS({
 	tree: {},
@@ -58,10 +58,10 @@ const viewStateReducer = (state = initialState, action) => {
 			return state.set("visibleModules", Immutable.fromJS(visibleModules));
 		}
 
-		case APPLICATION_SCOPE_HAS_CHANGED: {
+		case SET_NEW_SCOPE_AND_MODULE_NAME: {
 			const lastScopeAndModuleSelection = state.get("lastScopeAndModuleSelection").toJS();
 
-			if (action.payload.newScope !== lastScopeAndModuleSelection.scope) {
+			if (action.payload.scope !== lastScopeAndModuleSelection.scope) {
 				state = state.set("visibleModules", Immutable.fromJS([]));
 			}
 
@@ -69,7 +69,7 @@ const viewStateReducer = (state = initialState, action) => {
 				"lastScopeAndModuleSelection",
 				Immutable.fromJS({
 					moduleName: action.payload.moduleName,
-					scope: action.payload.newScope,
+					scope: action.payload.scope,
 					routingPerformed: false,
 				}),
 			);

package/src/reducers/modules.test.js

@@ -3,10 +3,10 @@ import {
 	initializeFirstModuleScope,
 	setModuleAsVisible,
 	setModulesStructure,
+	setNewScopeAndModuleName,
 	setRoutingPerformed,
 } from "../actions/modules";
 import modulesReducer from "./modules";
-import { applicationScopeHasChanged } from "../actions/scopes";
 
 describe("View state reducer", () => {
 	const initialState = {
@@ -145,7 +145,7 @@ describe("View state reducer", () => {
 		const oldState = Immutable.fromJS({
 			...initialState,
 			lastScopeAndModuleSelection: {
-				scope: "newScope",
+				scope: "aScope",
 				moduleName: null,
 				routingPerformed: true,
 			},
@@ -154,13 +154,13 @@ describe("View state reducer", () => {
 		const expected = {
 			...initialState,
 			lastScopeAndModuleSelection: {
-				scope: "newScope",
+				scope: "aScope",
 				moduleName: "moduleMatrix",
 				routingPerformed: false,
 			},
 		};
 
-		const action = applicationScopeHasChanged("prevScope", "newScope", "moduleMatrix");
+		const action = setNewScopeAndModuleName("aScope", "moduleMatrix");
 		const newState = modulesReducer(oldState, action);
 		return expect(newState, "not to be", oldState).and("to equal", Immutable.fromJS(expected));
 	});
@@ -180,7 +180,7 @@ describe("View state reducer", () => {
 			},
 		};
 
-		const action = applicationScopeHasChanged("prevScope", "newScope", "moduleMatrix");
+		const action = setNewScopeAndModuleName("newScope", "moduleMatrix");
 		const newState = modulesReducer(oldState, action);
 		return expect(newState, "not to be", oldState).and("to equal", Immutable.fromJS(expected));
 	});

package/src/reducers/navigation.js

@@ -6,7 +6,6 @@ import {
 	SET_HREF_CONFIG,
 	SET_CURRENT_PREPEND_PATH,
 	SET_CLOSING_TAB_HANDLER_ACTIONS,
-	REMOVE_MODULE_TABS,
 } from "../actions/navigation";
 import { getAllAfterPrependHref } from "../utils/parseHelper";
 import { APPLICATION_SCOPE_HAS_CHANGED } from "../actions/scopes";
@@ -74,29 +73,6 @@ const navigationReducer = (state = initialState, action) => {
 					s.deleteIn(["tabIndex", remainingSection]);
 				}
 			});
-		case REMOVE_MODULE_TABS:
-			return state.withMutations(s => {
-				const { module } = action.payload;
-
-				s.deleteIn(["moduleTabs", module]);
-				s.deleteIn(["closingTabsHandlerActions", module]);
-
-				s.get("tabIndex")
-					.keySeq()
-					.forEach(key => {
-						if (key.startsWith(module)) {
-							s.deleteIn(["tabIndex", key]);
-						}
-					});
-
-				s.get("mappedHrefs")
-					.keySeq()
-					.forEach(key => {
-						if (key.startsWith(module)) {
-							s.deleteIn(["mappedHrefs", key]);
-						}
-					});
-			});
 		case SET_HREF_CONFIG:
 			return state.set("config", Immutable.fromJS(action.payload));
 		case SET_CURRENT_PREPEND_PATH:

package/src/reducers/navigation.test.js

@@ -6,7 +6,6 @@ import {
 	setHrefConfig,
 	setCurrentPrependPath,
 	setClosingTabHandlerActions,
-	removeModuleTabs,
 } from "../actions/navigation";
 import reducer from "./navigation";
 import { applicationScopeHasChanged } from "../actions/scopes";
@@ -296,43 +295,6 @@ describe("Navigation reducer", () => {
 		});
 	});
 
-	describe("REMOVE_MODULE_TABS", () => {
-		it("can remove module tabs", () => {
-			const oldState = Immutable.fromJS({
-				moduleTabs: { test: ["test/new", "test/old"], another: [1, 2, 3] },
-				closingTabsHandlerActions: { test: [0, 1, 2], another: [] },
-				tabIndex: { "test/old": {}, "test/new": {}, test: {}, another: {} },
-				mappedHrefs: { "test/old": {}, "test/new": {}, test: {}, another2: {} },
-				config: { prependPath: "/:scope/" },
-			});
-			const action = removeModuleTabs("test");
-			const newState = reducer(oldState, action);
-			return expect(newState, "not to be", oldState).and(
-				"to equal",
-				Immutable.fromJS({
-					moduleTabs: { another: [1, 2, 3] },
-					closingTabsHandlerActions: { another: [] },
-					tabIndex: { another: {} },
-					mappedHrefs: { another2: {} },
-					config: { prependPath: "/:scope/" },
-				}),
-			);
-		});
-
-		it("does nothing if the module to remove is not found", () => {
-			const oldState = Immutable.fromJS({
-				moduleTabs: { test: ["test/new", "test/old"], another: [1, 2, 3] },
-				closingTabsHandlerActions: { test: [0, 1, 2], another: [] },
-				tabIndex: { "test/old": {}, "test/new": {}, test: {}, another: {} },
-				mappedHrefs: { "test/old": {}, "test/new": {}, test: {}, another2: {} },
-				config: { prependPath: "/:scope/" },
-			});
-			const action = removeModuleTabs("unknown");
-			const newState = reducer(oldState, action);
-			return expect(newState, "to be", oldState);
-		});
-	});
-
 	describe("SET_HREF_CONFIG", () => {
 		it("update href config in navigation state", () => {
 			const oldState = Immutable.fromJS({

package/src/reducers/request.js

@@ -11,10 +11,6 @@ export const LOGOUT = "logout";
 
 const requestReducer = (state = initialState, action) => {
 	if (action.type.endsWith("_REQUEST")) {
-		if (safeGet(action, "meta", "addToActiveRequests") === false) {
-			// this flag should only be used by requests triggered by a background process to avoid the spinner
-			return state;
-		}
 		const requestName = action.type.replace(/_REQUEST$/, "");
 		return state.setIn(["actives", requestName], true);
 	}
@@ -24,8 +20,7 @@ const requestReducer = (state = initialState, action) => {
 	}
 	if (action.type.endsWith("_FAILURE")) {
 		const requestName = action.type.replace(/_FAILURE$/, "");
-		const status = safeGet(action, "payload", "status");
-		if (status === 403 || status === 401) {
+		if (safeGet(action, "payload", "status") === 403) {
 			return state.deleteIn(["actives", requestName]).set("logout", true);
 		} else {
 			return state.deleteIn(["actives", requestName]).set("error", Immutable.fromJS(action));

package/src/reducers/request.test.js

@@ -28,17 +28,6 @@ describe("Request reducer", () => {
 		);
 	});
 
-	it("ignore activity flag when a request is started because addToActiveRequests is false", () => {
-		const oldState = Immutable.fromJS({
-			actives: {
-				SOME_FLAG: true,
-			},
-		});
-		const action = { type: "TEST_THIS_REQUEST", meta: { addToActiveRequests: false } };
-		const newState = reducer(oldState, action);
-		expect(newState, "to be", oldState);
-	});
-
 	it("clears activity and logout flag when a request succeeds", () => {
 		const oldState = Immutable.fromJS({
 			actives: {
@@ -125,27 +114,4 @@ describe("Request reducer", () => {
 			}),
 		);
 	});
-
-	it("clears activity flag and sets login flag when a request fails with status 401", () => {
-		const oldState = Immutable.fromJS({
-			actives: {
-				SOME_FLAG: true,
-				TEST_THIS: true,
-			},
-		});
-		const action = {
-			type: "TEST_THIS_FAILURE",
-			payload: { status: 401, message: "UnauthorizedAccessException" },
-		};
-		const newState = reducer(oldState, action);
-		expect(newState, "not to be", oldState).and(
-			"to equal",
-			Immutable.fromJS({
-				actives: {
-					SOME_FLAG: true,
-				},
-				[LOGOUT]: true,
-			}),
-		);
-	});
 });

package/src/reducers/scopes.js

@@ -10,9 +10,6 @@ const scopeReducer = (state = initialState, action) => {
 		case GET_SCOPES_SUCCESS: {
 			const loadedScopes = state.toJS();
 			const normalizedScopes = normalize(action.payload, scopeSchema);
-			if (action.meta && action.meta.reset) {
-				return Immutable.fromJS(normalizedScopes.entities.scopes);
-			}
 
 			if (Object.keys(loadedScopes).length > 0) {
 				const addedScope = {};

package/src/reducers/scopes.test.js

@@ -91,51 +91,4 @@ describe("scopes", () => {
 			}),
 		);
 	});
-
-	it("reset option should override previous state", () => {
-		const oldState = Immutable.Map({
-			Global: {
-				id: "Global",
-				isAuthorizedScope: true,
-				children: ["Child1", "Child2", "Child3"],
-				scopePath: ["Global"],
-			},
-			Child1: { id: "Child1", isAuthorizedScope: true, scopePath: ["Global", "Child1"], children: [] },
-			Child2: { id: "Child2", isAuthorizedScope: false, scopePath: ["Global", "Child2"], children: [] },
-			ChildOld: { id: "ChildOld", isAuthorizedScope: false, scopePath: ["Global", "ChildOld"], children: [] },
-		});
-
-		const action = {
-			type: GET_SCOPES_SUCCESS,
-			payload: {
-				id: "Global",
-				isAuthorizedScope: true,
-				children: [
-					{ id: "Child1", isAuthorizedScope: false, children: [], parentScopeId: "Global" },
-					{ id: "Child2", isAuthorizedScope: true, children: [], parentScopeId: "Global" },
-					{ id: "Child3", isAuthorizedScope: false, children: [], parentScopeId: "Global" },
-					{ id: "Child4", isAuthorizedScope: true, children: [], parentScopeId: "Global" },
-				],
-			},
-			meta: {
-				reset: true,
-			},
-		};
-		const newState = reducer(oldState, action);
-		return expect(newState, "not to be", oldState).and(
-			"to satisfy",
-			Immutable.fromJS({
-				Global: {
-					id: "Global",
-					isAuthorizedScope: true,
-					children: ["Child1", "Child2", "Child3", "Child4"],
-					scopePath: ["Global"],
-				},
-				Child1: { id: "Child1", isAuthorizedScope: false, scopePath: ["Global", "Child1"], children: [] },
-				Child2: { id: "Child2", isAuthorizedScope: true, scopePath: ["Global", "Child2"], children: [] },
-				Child3: { id: "Child3", isAuthorizedScope: false, scopePath: ["Global", "Child3"], children: [] },
-				Child4: { id: "Child4", isAuthorizedScope: true, scopePath: ["Global", "Child4"], children: [] },
-			}),
-		);
-	});
 });

package/src/reducers/view.js

@@ -100,7 +100,7 @@ const viewStateReducer = (state = initialState, action) => {
 			return state;
 		}
 		case APPLICATION_SCOPE_HAS_CHANGED: {
-			return initialState;
+			return state.remove("edit");
 		}
 		default:
 			return state;

package/src/reducers/view.test.js

@@ -522,7 +522,14 @@ describe("View state reducer", () => {
 		});
 		const action = applicationScopeHasChanged("oldScope", "newScope");
 		const newState = viewReducer(oldState, action);
-		return expect(newState, "not to be", oldState).and("to exhaustively satisfy", Immutable.fromJS({}));
+		return expect(newState, "not to be", oldState).and(
+			"to exhaustively satisfy",
+			Immutable.fromJS({
+				anotherKey: {
+					id: "ThisValueShouldRemain",
+				},
+			}),
+		);
 	});
 
 	it("Removes edit model field correctly", () => {

package/src/selectors/authentication.js

@@ -42,19 +42,6 @@ export const hasEditorPermissionsForScope = (scope, roleGroup) =>
 		hasRolePermissions(appRolesClaims, scope, platformRoles.Editor, scopes),
 	);
 
-export const hasPermissionsForRole = (roleGroup, role) =>
-	createSelector(
-		selectGroupRolesClaims(roleGroup),
-		getCurrentScope,
-		getScopesSelector,
-		(appRolesClaims, currentScope, scopes) => hasRolePermissions(appRolesClaims, currentScope, role, scopes),
-	);
-
-export const hasPermissionsForRoleAndScope = (scope, roleGroup, role) =>
-	createSelector(selectGroupRolesClaims(roleGroup), getScopesSelector, (appRolesClaims, scopes) =>
-		hasRolePermissions(appRolesClaims, scope, role, scopes),
-	);
-
 export const hasAdministratorPermissions = roleGroup =>
 	createSelector(
 		selectGroupRolesClaims(roleGroup),