orc-shared 1.2.0-dev.10 → 1.2.0-dev.14

package/src/components/MaterialUI/Inputs/InputBase.test.js

@@ -5,15 +5,19 @@ import InputBaseMUI from "@material-ui/core/InputBase";
 import sinon from "sinon";
 import { ignoreConsoleError } from "../../../utils/testUtils";
 import InputBaseProps from "./InputBaseProps";
+import { act } from "unexpected-reaction";
 
 describe("InputBase Component", () => {
 	let update, container;
 	beforeEach(() => {
+		window.bypassDebounce = true;
+
 		container = document.createElement("div");
 		document.body.appendChild(container);
 		update = sinon.spy().named("update");
 	});
 	afterEach(() => {
+		delete window.bypassDebounce;
 		document.body.removeChild(container);
 		container = null;
 	});
@@ -243,3 +247,67 @@ describe("InputBase Component", () => {
 		expect(mountedComponent.containsMatchingElement(expected), "to be truthy");
 	});
 });
+
+describe("InputBase component debouce", () => {
+	const clock = sinon.useFakeTimers();
+	let update, container;
+
+	beforeEach(() => {
+		container = document.createElement("div");
+		document.body.appendChild(container);
+		update = sinon.spy().named("update");
+	});
+
+	afterEach(() => {
+		clock.restore();
+	});
+
+	it("InputBase component updates when debounced update", async () => {
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+		const aValue = "value";
+
+		const metadata = {
+			test: "value",
+		};
+
+		inputProps.set(InputBaseProps.propNames.value, "");
+		inputProps.set(InputBaseProps.propNames.update, update);
+		inputProps.set(InputBaseProps.propNames.label, aLabel);
+		inputProps.set(InputBaseProps.propNames.metadata, metadata);
+
+		const component = <InputBase inputProps={inputProps} />;
+		const mountedComponent = mount(component);
+
+		const input = mountedComponent.find("input");
+		input.simulate("change", { target: { value: aValue } });
+
+		act(() => {
+			clock.tick(200);
+		});
+
+		input.simulate("change", { target: { value: "differentValue" } });
+		expect(update, "to have calls satisfying", [{ args: [aValue, metadata] }]);
+	});
+
+	it("InputBase component update to empty when text to display is null", async () => {
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+
+		const metadata = {
+			test: "value",
+		};
+
+		inputProps.set(InputBaseProps.propNames.value, null);
+		inputProps.set(InputBaseProps.propNames.update, update);
+		inputProps.set(InputBaseProps.propNames.label, aLabel);
+		inputProps.set(InputBaseProps.propNames.metadata, metadata);
+
+		const component = <InputBase inputProps={inputProps} />;
+		const mountedComponent = mount(component);
+
+		const input = mountedComponent.find("input");
+		input.simulate("change", { target: { value: null } });
+		expect(input.get(0).props.value, "to equal", "");
+	});
+});

package/src/components/MaterialUI/ScopeSelector/ScopeSelector.js

@@ -16,6 +16,10 @@ const useStyles = makeStyles(theme => ({
 		border: `1px solid ${theme.palette.grey.borders}`,
 		boxShadow: "0 2px 4px rgba(0,0,0,0.5)",
 		width: theme.spacing(50),
+		display: "flex",
+	},
+	scopeContainer: {
+		width: "100%",
 	},
 	scopeSelector: {
 		display: "flex",
@@ -64,7 +68,7 @@ const ScopeSelector = ({ show, getScope, selectedScope, closeSelector, filter, u
 		<Sidepanel className={classes.container} in={show} timeout={300}>
 			<ClickAwayListener onClickAway={e => closeSelector(e)}>
 				{/* this div is required since ClickAwayListener child element should be able to hold ref */}
-				<div>{show ? scopeSelectorContent : null}</div>
+				<div className={classes.scopeContainer}>{show ? scopeSelectorContent : null}</div>
 			</ClickAwayListener>
 		</Sidepanel>
 	);

package/src/components/Routing/FullPage.js

@@ -2,8 +2,16 @@ import React from "react";
 import Page from "./Page";
 import SegmentPage from "./SegmentPage";
 
-const FullPage = ({ path, config, location, match, modulePrependPath, isVisible }) => {
-	const { component, componentProps, pages = {}, segments, subpages, entityIdResolver } = config;
+const FullPage = ({ path, config, location, match, modulePrependPath, isVisible = true }) => {
+	const {
+		component,
+		routerComponent = null,
+		componentProps,
+		pages = {},
+		segments,
+		subpages,
+		entityIdResolver,
+	} = config;
 	if (segments) {
 		return (
 			<SegmentPage
@@ -21,12 +29,12 @@ const FullPage = ({ path, config, location, match, modulePrependPath, isVisible
 	return (
 		<Page
 			path={path}
-			component={component}
+			component={component ?? routerComponent}
 			pages={pages}
 			subpages={subpages}
 			location={location}
 			match={match}
-			isVisible={isVisible}
+			isVisible={isVisible === true || routerComponent != null}
 			modulePrependPath={modulePrependPath}
 		/>
 	);

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

@@ -86,6 +86,30 @@ describe("Fullpage", () => {
 			<View2 />,
 		));
 
+	it("shows a page when there is a router component no matter how visible is set", () =>
+		expect(
+			<TestWrapper
+				provider={{ store }}
+				memoryRouter={{ initialEntries: ["/meep/snap/stuff"] }}
+				stylesProvider
+				muiThemeProvider={{ theme }}
+			>
+				<FullPage
+					path="/meep/snap"
+					config={{
+						routerComponent: View1,
+						pages: { "/stuff": { component: View2 } },
+					}}
+					location={{ location: true }}
+					match={{ match: true }}
+					isVisible={false}
+				/>
+			</TestWrapper>,
+			"when mounted",
+			"to satisfy",
+			<View2 />,
+		));
+
 	it("does not show a page when not visible", () =>
 		expect(
 			<TestWrapper

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

@@ -204,10 +204,14 @@ describe("ScopeBar", () => {
 describe("Scope", () => {
 	let nodeState;
 	beforeEach(() => {
+		window.bypassDebounce = true;
+
 		nodeState = { foo: true, bar: false };
 		state = state.setIn(["view", "scopeSelector", "nodeState"], Immutable.fromJS(nodeState));
 	});
 
+	afterEach(() => delete window.bypassDebounce);
+
 	it("renders a scope bar, selector panel with handlers, and viewport", () => {
 		const scopes = [
 			{

package/src/selectors/metadata.js

@@ -46,8 +46,10 @@ export const namedLookupSelector = memoize((moduleName, lookupName) =>
 );
 
 export const namedLookupValuesSelector = memoize((moduleName, lookupName) =>
-	createSelector(namedLookupSelector(moduleName, lookupName), currentLocaleOrDefault, (statuses, locale) =>
-		(statuses.get("values") || Immutable.Map()).map(status => setTranslation(locale, status, "displayName")),
+	createSelector(namedLookupSelector(moduleName, lookupName), currentLocaleOrDefault, (lookup, locale) =>
+		(lookup.get("values") || Immutable.Map()).map(lookupValue =>
+			setTranslationWithFallbackField(locale, lookupValue, "name", "displayName"),
+		),
 	),
 );
 
@@ -157,7 +159,8 @@ const definitionEntityAttributes = memoize((moduleName, entityName) =>
 	),
 );
 
-const filterIsBuiltInAttributes = isBuiltIn => attributes => attributes.filter(a => a.get("isBuiltIn") === isBuiltIn);
+const filterIsBuiltInAttributes = isBuiltIn => attributes =>
+	attributes.filter(a => a.get("isBuiltIn") === isBuiltIn).sortBy(x => x.get("displayOrder"));
 
 export const definitionEntityCustomAttributesSelector = memoize((moduleName, entityName) =>
 	createSelector(definitionEntityAttributes(moduleName, entityName), filterIsBuiltInAttributes(false)),
@@ -204,11 +207,15 @@ export const groupedCustomAttributesDefinitionSelector = memoize((moduleName, en
 					})
 						.set(
 							"baseAttributes",
-							group.filter(i => i.get("dataType") !== attributeDataType.entityReference),
+							group
+								.filter(i => i.get("dataType") !== attributeDataType.entityReference)
+								.sortBy(x => x.get("displayOrder")),
 						)
 						.set(
 							"profileAttributes",
-							group.filter(i => i.get("dataType") === attributeDataType.entityReference),
+							group
+								.filter(i => i.get("dataType") === attributeDataType.entityReference)
+								.sortBy(x => x.get("displayOrder")),
 						);
 				})
 				.sortBy(x => x.get("displayOrder")),
@@ -220,8 +227,12 @@ export const customAttributesDefinitionSelector = memoize((moduleName, profileEn
 		mappedDefinitionEntity(moduleName, profileEntityName),
 		customAttributesSelector(moduleName, profileEntityName),
 		(definition, attributes) => {
-			const profileAttributes = attributes?.filter(a => a.get("dataType") === attributeDataType.entityReference);
-			const baseAttributes = attributes?.filter(a => a.get("dataType") !== attributeDataType.entityReference);
+			const profileAttributes = attributes
+				?.filter(a => a.get("dataType") === attributeDataType.entityReference)
+				.sortBy(x => x.get("displayOrder"));
+			const baseAttributes = attributes
+				?.filter(a => a.get("dataType") !== attributeDataType.entityReference)
+				.sortBy(x => x.get("displayOrder"));
 			return definition.set("baseAttributes", baseAttributes).set("profileAttributes", profileAttributes);
 		},
 	),