orc-shared 1.2.0-dev.7 → 1.3.0-dev.2

package/src/components/MaterialUI/Inputs/DatePicker.js

@@ -5,12 +5,6 @@ import DatePicker from "react-datepicker";
 import "react-datepicker/dist/react-datepicker.css";
 import TimePicker from "./TimePicker";
 import { makeStyles } from "@material-ui/core/styles";
-import { useIntl } from "react-intl";
-import { registerLocale } from "react-datepicker";
-import { frCA, enUS, it } from "date-fns/locale";
-registerLocale("fr-CA", frCA);
-registerLocale("en-US", enUS);
-registerLocale("it-IT", it);
 
 const useStyles = makeStyles(theme => ({
 	container: {
@@ -111,21 +105,13 @@ const useStyles = makeStyles(theme => ({
 	},
 }));
 
-const AMPMLocales = ["en-US", "en-CA"];
-
-export const createFormat = (useDate, useTime, selectedLocale) => {
+export const createFormat = (useDate, useTime) => {
 	if (useDate && !useTime) {
 		return "P";
 	} else if (useTime && !useDate) {
-		if (AMPMLocales.includes(selectedLocale)) {
-			return "p";
-		}
-		return "HH:mm";
+		return "p";
 	} else {
-		if (AMPMLocales.includes(selectedLocale)) {
-			return "P p";
-		}
-		return "P HH:mm";
+		return "P p";
 	}
 };
 
@@ -144,7 +130,6 @@ const WrappedDatePicker = ({
 	error,
 	...props
 }) => {
-	const { locale } = useIntl();
 	const classes = useStyles({ readOnly });
 	const startDate = value ? new Date(value) : null;
 	const disabledCls = classNames({ [classes.disabled]: props.disabled });
@@ -161,24 +146,17 @@ const WrappedDatePicker = ({
 				<div className={classes.datePickerContainer}>
 					<DatePicker
 						{...props}
-						dateFormat={dateFormat || createFormat(useDate, useTime, locale)}
+						dateFormat={dateFormat || createFormat(useDate, useTime)}
 						selected={startDate}
 						onChange={date => updateDate(date, metadata)}
 						showTimeInput={useTime ?? false}
 						useTime={useTime ?? false}
 						customTimeInput={
-							useTime ? (
-								<TimePicker
-									showTimeZone={showTimeZone}
-									showAMPM={AMPMLocales.includes(locale)}
-									requestedTimeZone={timePickerTimeZone}
-								/>
-							) : null
+							useTime ? <TimePicker showTimeZone={showTimeZone} requestedTimeZone={timePickerTimeZone} /> : null
 						}
 						timeInputLabel={timeInputLabel ?? ""}
 						readOnly={readOnly}
 						showTimeSelectOnly={showTimeSelectOnly}
-						locale={locale}
 					/>
 				</div>
 				{!readOnly ? (

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

@@ -314,43 +314,15 @@ describe("DatePicker", () => {
 });
 
 describe("createFormat", () => {
-	it("Retrieves proper format if locale is in AMPMLocales list for date and time", () => {
-		const locale1 = "en-CA";
-		const locale2 = "en-US";
-
-		expect(createFormat(true, true, locale1), "to equal", "P p");
-		expect(createFormat(true, true, locale2), "to equal", "P p");
-	});
-
-	it("Retrieves proper format if locale is in AMPMLocales list for date", () => {
-		const locale1 = "en-CA";
-		const locale2 = "en-US";
-
-		expect(createFormat(true, false, locale1), "to equal", "P");
-		expect(createFormat(true, false, locale2), "to equal", "P");
-	});
-
-	it("Retrieves proper format if locale is in AMPMLocales list for time", () => {
-		const locale1 = "en-CA";
-		const locale2 = "en-US";
-
-		expect(createFormat(false, true, locale1), "to equal", "p");
-		expect(createFormat(false, true, locale2), "to equal", "p");
-	});
-
-	it("Retrieves proper format if locale is not in AMPMLocales list for date and time", () => {
-		expect(createFormat(true, true, "fr-CA"), "to equal", "P HH:mm");
-	});
-
-	it("Retrieves proper format if locale is not in AMPMLocales list for date", () => {
-		expect(createFormat(true, false, "fr-CA"), "to equal", "P");
+	it("Retrieves proper format for date and time", () => {
+		expect(createFormat(true, true), "to equal", "P p");
 	});
 
-	it("Retrieves proper format if locale is not in AMPMLocales list for time", () => {
-		expect(createFormat(false, true, "fr-CA"), "to equal", "HH:mm");
+	it("Retrieves proper format for date only", () => {
+		expect(createFormat(true, false), "to equal", "P");
 	});
 
-	it("Retrieves date and time in 24h system by default", () => {
-		expect(createFormat(), "to equal", "P HH:mm");
+	it("Retrieves proper format for date only", () => {
+		expect(createFormat(false, true), "to equal", "p");
 	});
 });

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

@@ -99,6 +99,7 @@ const InputBase = ({ inputProps }) => {
 	const endAdornment = inputProps?.get(InputBaseProps.propNames.endAdornment);
 	const metadata = inputProps?.get(InputBaseProps.propNames.metadata);
 	const autoComplete = inputProps?.get(InputBaseProps.propNames.autoComplete);
+	const timeoutDelay = inputProps?.get(InputBaseProps.propNames.timeoutDelay) || 100;
 
 	const tooltipText = type === "text" ? value : "";
 
@@ -111,12 +112,29 @@ const InputBase = ({ inputProps }) => {
 
 	const onChangeHandler = event => {
 		event.persist();
-		update(event.target.value, metadata);
+
+		if (!event.target.value || window.bypassDebounce === true) {
+			update(event.target.value, metadata);
+		}
+
+		setInputText(event.target.value);
 	};
 
 	const inputBaseInputStyle = inputProps?.getStyle(InputBaseProps.ruleNames.input);
 	const errorTextStyle = inputProps?.getStyle(InputBaseProps.ruleNames.errorText);
 
+	const [inputText, setInputText] = React.useState(null);
+
+	const textToDisplay = inputText ?? value;
+
+	React.useEffect(() => {
+		if (inputText !== value && inputText != null && window.bypassDebounce !== true) {
+			const timeOutId = setTimeout(() => update(inputText, metadata), timeoutDelay);
+			return () => clearTimeout(timeOutId);
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [inputText, value]);
+
 	return (
 		<div className={classes.container}>
 			<div className={classes.inputContainer}>
@@ -133,7 +151,7 @@ const InputBase = ({ inputProps }) => {
 					onClick={onClick}
 					type={type}
 					placeholder={placeholder}
-					value={value}
+					value={textToDisplay}
 					fullWidth={true}
 					onChange={event => onChangeHandler(event)}
 					error={!!error}

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/Inputs/InputBaseProps.js

@@ -17,6 +17,7 @@ class InputBaseProps extends ComponentProps {
 		endAdornment: "endAdornment",
 		metadata: "metadata",
 		autoComplete: "autoComplete",
+		timeoutDelay: "timeoutDelay",
 	};
 
 	static ruleNames = {
@@ -41,6 +42,7 @@ class InputBaseProps extends ComponentProps {
 		this.componentProps.set(this.constructor.propNames.endAdornment, null);
 		this.componentProps.set(this.constructor.propNames.metadata, null);
 		this.componentProps.set(this.constructor.propNames.autoComplete, null);
+		this.componentProps.set(this.constructor.propNames.timeoutDelay, null);
 
 		this.componentClasses.set(this.constructor.ruleNames.input, null);
 		this.componentClasses.set(this.constructor.ruleNames.errorText, null);

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

@@ -18,6 +18,7 @@ describe("InputBase Props", () => {
 			"endAdornment",
 			"metadata",
 			"autoComplete",
+			"timeoutDelay",
 		];
 
 		expect(InputBaseProps.propNames, "to have keys", propNames);
@@ -40,6 +41,7 @@ describe("InputBase Props", () => {
 			"endAdornment",
 			"metadata",
 			"autoComplete",
+			"timeoutDelay",
 		];
 
 		const ruleNames = ["input", "errorText"];

package/src/components/MaterialUI/Inputs/TimePicker.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { makeStyles } from "@material-ui/core/styles";
 import Select from "./Select";
 import SelectProps from "./SelectProps";
@@ -178,7 +178,11 @@ export const MinsSelect = ({ updateTimeOptions, time }) => {
 const TimePicker = ({ value, onChange, showTimeZone, showAMPM, requestedTimeZone }) => {
 	const classes = useStyles();
 	showAMPM = showAMPM ?? isBrowserUsingAMPM();
-	const [time, setTime] = useState(parseTime(value || "00:00"));
+	const [time, setTime] = useState( parseTime(value || "00:00"));
+
+	useEffect(() => {
+		setTime(parseTime(value || "00:00"));
+	}, [value, setTime]);
 
 	const userTimeZone = getTimeZoneName();
 	const localizedTimeZoneName = useSelector(namedLookupLocalizedSelector("customer", "TimeZone", userTimeZone, null));

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/Provision.js

@@ -10,6 +10,7 @@ import DevPages from "./DevPages";
 import Head from "./Head";
 import I18n from "./I18n";
 import InternetExplorerWarningMessage from "./InternetExplorerWarningMessage";
+import Culture from "./Culture";
 
 const GlobalStyle = createGlobalStyle`
 	html {
@@ -41,6 +42,7 @@ const Provision = ({ store, theme = {}, muiTheme, children }) => {
 					<MuiThemeProvider theme={muiTheme}>
 						<React.Fragment>
 							<Head />
+							<Culture />
 							<GlobalStyle />
 							<Authenticate>
 								<React.Fragment>

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/content/icons/archives.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<path fill="#333" fill-rule="evenodd" d="M23.5,3 C23.7761424,3 24,3.22385763 24,3.5 L24,3.5 L24,8.5 C24,8.77614237 23.7761424,9 23.5,9 L23.5,9 L23,9 L23,21.5 C23,21.7454599 22.8231248,21.9496084 22.5898756,21.9919443 L22.5,22 L1.5,22 C1.22385763,22 1,21.7761424 1,21.5 L1,21.5 L1,9 L0.5,9 C0.254540111,9 0.0503916296,8.82312484 0.00805566941,8.58987563 L0,8.5 L0,3.5 C0,3.22385763 0.223857625,3 0.5,3 L0.5,3 Z M22,9 L2,9 L2,21 L22,21 L22,9 Z M15.5,11 C15.7761424,11 16,11.2238576 16,11.5 L16,11.5 L16,13.5 C16,13.7761424 15.7761424,14 15.5,14 L15.5,14 L8.5,14 C8.22385763,14 8,13.7761424 8,13.5 L8,13.5 L8,11.5 C8,11.2238576 8.22385763,11 8.5,11 L8.5,11 Z M15,12 L9,12 L9,13 L15,13 L15,12 Z M23,4 L1,4 L1,8 L23,8 L23,4 Z"/>
+</svg>

package/src/content/icons/lock.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<path fill="#333" fill-rule="evenodd" d="M12,0 C15.3141424,0 18,2.68585763 18,6 L18,6 L18,11 L20.5,11 C20.7454599,11 20.9496084,11.1768752 20.9919443,11.4101244 L21,11.5 L21,23.5 C21,23.7761424 20.7761424,24 20.5,24 L20.5,24 L3.5,24 C3.22385763,24 3,23.7761424 3,23.5 L3,23.5 L3,11.5 C3,11.2238576 3.22385763,11 3.5,11 L3.5,11 L6,11 L6,6 C6,2.76117904 8.56516051,0.122408965 11.7750335,0.00413781501 Z M20,12 L4,12 L4,23 L20,23 L20,12 Z M12,15 C12.5523336,15 13,15.4470481 13,16 C13,16.3687862 12.7995319,16.6916367 12.5015919,16.8649998 L12.5,19.5 C12.5,19.7761424 12.2761424,20 12,20 C11.7545401,20 11.5503916,19.8231248 11.5080557,19.5898756 L11.5,19.5 L11.4994027,16.8655778 C11.2009143,16.6923549 11,16.3691964 11,16 C11,15.4470481 11.4476664,15 12,15 Z M12,1 C9.23814237,1 7,3.23814237 7,6 L7,6 L7,11 L17,11 L17,6 C17,3.31082284 14.8781046,1.11815965 12.2169221,1.00461864 L12.2169221,1.00461864 Z"/>
+</svg>

package/src/content/icons/unlock.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<path fill="#333" fill-rule="evenodd" d="M12,0 C15.2381675,0 17.8775613,2.56547691 17.9958612,5.77505506 L18,6 L18,11 L20.5,11 C20.7454599,11 20.9496084,11.1768752 20.9919443,11.4101244 L21,11.5 L21,23.5 C21,23.7761424 20.7761424,24 20.5,24 L20.5,24 L3.5,24 C3.22385763,24 3,23.7761424 3,23.5 L3,23.5 L3,11.5 C3,11.2238576 3.22385763,11 3.5,11 L3.5,11 L17,11 L17,6 C17,3.23850178 14.7612171,1 12,1 C9.23814237,1 7,3.23814237 7,6 C7,6.27614237 6.77614237,6.5 6.5,6.5 C6.22385763,6.5 6,6.27614237 6,6 C6,2.68585763 8.68585763,0 12,0 Z M20,12 L4,12 L4,23 L20,23 L20,12 Z M12,15 C12.5523336,15 13,15.4470481 13,16 C13,16.3687862 12.7995319,16.6916367 12.5015919,16.8649998 L12.5,19.5 C12.5,19.7761424 12.2761424,20 12,20 C11.7545401,20 11.5503916,19.8231248 11.5080557,19.5898756 L11.5,19.5 L11.4994027,16.8655778 C11.2009143,16.6923549 11,16.3691964 11,16 C11,15.4470481 11.4476664,15 12,15 Z"/>
+</svg>

package/src/content/iconsSheet.svg

@@ -8,6 +8,9 @@
 <symbol id="icon-app-list" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
  <path stroke="none" fill-rule="evenodd" d="M21,18 C22.7,18 24,19.3 24,21 C24,22.7 22.7,24 21,24 C19.3,24 18,22.7 18,21 C18,19.3 19.3,18 21,18 Z M3,0 C4.7,0 6,1.3 6,3 C6,4.7 4.7,6 3,6 C1.3,6 0,4.7 0,3 C0,1.3 1.3,0 3,0 Z M12,0 C13.7,0 15,1.3 15,3 C15,4.7 13.7,6 12,6 C10.3,6 9,4.7 9,3 C9,1.3 10.3,0 12,0 Z M21,0 C22.7,0 24,1.3 24,3 C24,4.7 22.7,6 21,6 C19.3,6 18,4.7 18,3 C18,1.3 19.3,0 21,0 Z M3,9 C4.7,9 6,10.3 6,12 C6,13.7 4.7,15 3,15 C1.3,15 0,13.7 0,12 C0,10.3 1.3,9 3,9 Z M12,9 C13.7,9 15,10.3 15,12 C15,13.7 13.7,15 12,15 C10.3,15 9,13.7 9,12 C9,10.3 10.3,9 12,9 Z M21,9 C22.7,9 24,10.3 24,12 C24,13.7 22.7,15 21,15 C19.3,15 18,13.7 18,12 C18,10.3 19.3,9 21,9 Z M3,18 C4.7,18 6,19.3 6,21 C6,22.7 4.7,24 3,24 C1.3,24 0,22.7 0,21 C0,19.3 1.3,18 3,18 Z M12,18 C13.7,18 15,19.3 15,21 C15,22.7 13.7,24 12,24 C10.3,24 9,22.7 9,21 C9,19.3 10.3,18 12,18 Z"/>
 </symbol>
+<symbol id="icon-archives" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path stroke="none" fill-rule="evenodd" d="M23.5,3 C23.7761424,3 24,3.22385763 24,3.5 L24,3.5 L24,8.5 C24,8.77614237 23.7761424,9 23.5,9 L23.5,9 L23,9 L23,21.5 C23,21.7454599 22.8231248,21.9496084 22.5898756,21.9919443 L22.5,22 L1.5,22 C1.22385763,22 1,21.7761424 1,21.5 L1,21.5 L1,9 L0.5,9 C0.254540111,9 0.0503916296,8.82312484 0.00805566941,8.58987563 L0,8.5 L0,3.5 C0,3.22385763 0.223857625,3 0.5,3 L0.5,3 Z M22,9 L2,9 L2,21 L22,21 L22,9 Z M15.5,11 C15.7761424,11 16,11.2238576 16,11.5 L16,11.5 L16,13.5 C16,13.7761424 15.7761424,14 15.5,14 L15.5,14 L8.5,14 C8.22385763,14 8,13.7761424 8,13.5 L8,13.5 L8,11.5 C8,11.2238576 8.22385763,11 8.5,11 L8.5,11 Z M15,12 L9,12 L9,13 L15,13 L15,12 Z M23,4 L1,4 L1,8 L23,8 L23,4 Z"/>
+</symbol>
 <symbol id="icon-arrow-large-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21">
  <path stroke="none" fill-rule="evenodd" d="M8.79069767,17.6511628 C8.69302326,17.6511628 8.59534884,17.6511628 8.49767442,17.5534884 L0.195348837,10.7162791 C0.0976744186,10.6186047 0,10.5209302 0,10.3255814 C0,10.1302326 0.0976744186,10.0325581 0.195348837,9.93488372 L8.49767442,3.09767442 C8.59534884,3 8.79069767,3 8.98604651,3 C9.18139535,3.09767442 9.27906977,3.29302326 9.27906977,3.48837209 L9.27906977,6.90697674 L20.5116279,6.90697674 C20.8046512,6.90697674 21,7.10232558 21,7.39534884 L21,13.255814 C21,13.5488372 20.8046512,13.744186 20.5116279,13.744186 L9.27906977,13.744186 L9.27906977,17.1627907 C9.27906977,17.3581395 9.18139535,17.5534884 8.98604651,17.6511628 C8.88837209,17.6511628 8.88837209,17.6511628 8.79069767,17.6511628 Z M1.26976744,10.3255814 L8.30232558,16.0883721 L8.30232558,13.255814 C8.30232558,12.9627907 8.49767442,12.7674419 8.79069767,12.7674419 L20.0232558,12.7674419 L20.0232558,7.88372093 L8.79069767,7.88372093 C8.49767442,7.88372093 8.30232558,7.68837209 8.30232558,7.39534884 L8.30232558,4.5627907 L1.26976744,10.3255814 Z"/>
 </symbol>
@@ -122,9 +125,6 @@
 <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>
@@ -333,6 +333,9 @@
 <symbol id="icon-list-view" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21">
  <path stroke="none" fill-rule="evenodd" d="M4,18 L4,16 L2,16 L2,18 L4,18 Z M4.5,19 L1.5,19 C1.2,19 1,18.7 1,18.5 L1,15.5 C1,15.2 1.2,15 1.5,15 L4.5,15 C4.8,15 5,15.2 5,15.5 L5,18.5 C5,18.7 4.8,19 4.5,19 Z M7.5,4 L18.5,4 C19.2,4 19.2,5 18.5,5 L7.5,5 C6.8,5 6.8,4 7.5,4 Z M4,6 L4,4 L2,4 L2,6 L4,6 Z M4.5,7 L1.5,7 C1.2,7 1,6.7 1,6.5 L1,3.5 C1,3.2 1.2,3 1.5,3 L4.5,3 C4.8,3 5,3.2 5,3.5 L5,6.5 C5,6.7 4.8,7 4.5,7 Z M7.5,10 L18.5,10 C19.2,10 19.2,11 18.5,11 L7.5,11 C6.8,11 6.8,10 7.5,10 Z M4,12 L4,10 L2,10 L2,12 L4,12 Z M4.5,13 L1.5,13 C1.2,13 1,12.7 1,12.5 L1,9.5 C1,9.2 1.2,9 1.5,9 L4.5,9 C4.8,9 5,9.2 5,9.5 L5,12.5 C5,12.7 4.8,13 4.5,13 Z M7.5,16 L18.5,16 C19.2,16 19.2,17 18.5,17 L7.5,17 C6.8,17 6.8,16 7.5,16 Z"/>
 </symbol>
+<symbol id="icon-lock" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path stroke="none" fill-rule="evenodd" d="M12,0 C15.3141424,0 18,2.68585763 18,6 L18,6 L18,11 L20.5,11 C20.7454599,11 20.9496084,11.1768752 20.9919443,11.4101244 L21,11.5 L21,23.5 C21,23.7761424 20.7761424,24 20.5,24 L20.5,24 L3.5,24 C3.22385763,24 3,23.7761424 3,23.5 L3,23.5 L3,11.5 C3,11.2238576 3.22385763,11 3.5,11 L3.5,11 L6,11 L6,6 C6,2.76117904 8.56516051,0.122408965 11.7750335,0.00413781501 Z M20,12 L4,12 L4,23 L20,23 L20,12 Z M12,15 C12.5523336,15 13,15.4470481 13,16 C13,16.3687862 12.7995319,16.6916367 12.5015919,16.8649998 L12.5,19.5 C12.5,19.7761424 12.2761424,20 12,20 C11.7545401,20 11.5503916,19.8231248 11.5080557,19.5898756 L11.5,19.5 L11.4994027,16.8655778 C11.2009143,16.6923549 11,16.3691964 11,16 C11,15.4470481 11.4476664,15 12,15 Z M12,1 C9.23814237,1 7,3.23814237 7,6 L7,6 L7,11 L17,11 L17,6 C17,3.31082284 14.8781046,1.11815965 12.2169221,1.00461864 L12.2169221,1.00461864 Z"/>
+</symbol>
 <symbol id="icon-logout" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
  <path stroke="none" fill-rule="evenodd" d="M15.4666667,0 C15.7284905,0 15.9462489,0.184565385 15.9914073,0.427955862 L16,0.52173913 L16,4.89440994 C16,5.1825585 15.7612185,5.41614907 15.4666667,5.41614907 C15.2048428,5.41614907 14.9870844,5.23158368 14.941926,4.98819321 L14.9333333,4.89440994 L14.9333333,1.04295652 L1.06666667,1.04295652 L1.06666667,22.956 L14.9333333,22.956 L14.9333333,20.2206211 C14.9333333,19.9644891 15.1220002,19.7514646 15.3707993,19.7072879 L15.4666667,19.698882 C15.7284905,19.698882 15.9462489,19.8834474 15.9914073,20.1268378 L16,20.2206211 L16,23.4782609 C16,23.7343929 15.8113332,23.9474174 15.562534,23.9915941 L15.4666667,24 L0.533333333,24 C0.271509452,24 0.0537510716,23.8154346 0.00859271404,23.5720441 L0,23.4782609 L0,0.52173913 C0,0.265607073 0.188666838,0.0525825701 0.437465992,0.00840591591 L0.533333333,0 L15.4666667,0 Z M18.8035555,6.11113193 L18.8699731,6.17730595 L23.8699701,12.1356358 C23.9447152,12.224707 23.987236,12.3340227 23.9975325,12.4461271 C23.9989527,12.4634134 24,12.4815905 24,12.5 L23.9974814,12.5544268 C23.990112,12.6338364 23.9665709,12.711832 23.9268582,12.7822079 L23.8699701,12.8643642 L18.8699731,18.822694 C18.6842197,19.0440501 18.3679957,19.0603633 18.163667,18.8591305 C17.9820415,18.6802569 17.949963,18.3897047 18.0755373,18.1718804 L18.1300334,18.0939656 L22.405,13 L4.52631579,13 C4.23563961,13 4,12.7761424 4,12.5 C4,12.2545401 4.18618438,12.0503916 4.43170986,12.0080557 L4.52631579,12 L22.406,12 L18.1300334,6.90603439 C17.9649193,6.70927343 17.9584712,6.41673378 18.1025833,6.2128219 L18.163667,6.14086953 C18.3452925,5.96199593 18.6153291,5.95501048 18.8035555,6.11113193 Z"/>
 </symbol>
@@ -613,6 +616,9 @@
 <symbol id="icon-tree-view" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21">
  <path stroke="none" fill-rule="evenodd" d="M1,5 L11,5 L11,3 L1,3 L1,5 Z M10.001,19 L20.001,19 L20.001,17 L10.001,17 L10.001,19 Z M10.001,12 L20.001,12 L20.001,10 L10.001,10 L10.001,12 Z M9.501,13 L20.501,13 C20.777,13 21.001,12.776 21.001,12.5 L21.001,9.5 C21.001,9.224 20.777,9 20.501,9 L9.501,9 C9.225,9 9.001,9.224 9.001,9.5 L9.001,10 L5.997,10 L5.997,6 L11.5,6 C11.776,6 12,5.776 12,5.5 L12,2.5 C12,2.224 11.776,2 11.5,2 L0.5,2 C0.224,2 0,2.224 0,2.5 L0,5.5 C0,5.776 0.224,6 0.5,6 L4.997,6 L4.997,17.477 C4.997,17.753 5.221,17.977 5.497,17.977 L9.001,17.977 L9.001,19.5 C9.001,19.776 9.225,20 9.501,20 L20.501,20 C20.777,20 21.001,19.776 21.001,19.5 L21.001,16.5 C21.001,16.224 20.777,16 20.501,16 L9.501,16 C9.225,16 9.001,16.224 9.001,16.5 L9.001,16.977 L5.997,16.977 L5.997,11 L9.001,11 L9.001,12.5 C9.001,12.776 9.225,13 9.501,13 L9.501,13 Z"/>
 </symbol>
+<symbol id="icon-unlock" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path stroke="none" fill-rule="evenodd" d="M12,0 C15.2381675,0 17.8775613,2.56547691 17.9958612,5.77505506 L18,6 L18,11 L20.5,11 C20.7454599,11 20.9496084,11.1768752 20.9919443,11.4101244 L21,11.5 L21,23.5 C21,23.7761424 20.7761424,24 20.5,24 L20.5,24 L3.5,24 C3.22385763,24 3,23.7761424 3,23.5 L3,23.5 L3,11.5 C3,11.2238576 3.22385763,11 3.5,11 L3.5,11 L17,11 L17,6 C17,3.23850178 14.7612171,1 12,1 C9.23814237,1 7,3.23814237 7,6 C7,6.27614237 6.77614237,6.5 6.5,6.5 C6.22385763,6.5 6,6.27614237 6,6 C6,2.68585763 8.68585763,0 12,0 Z M20,12 L4,12 L4,23 L20,23 L20,12 Z M12,15 C12.5523336,15 13,15.4470481 13,16 C13,16.3687862 12.7995319,16.6916367 12.5015919,16.8649998 L12.5,19.5 C12.5,19.7761424 12.2761424,20 12,20 C11.7545401,20 11.5503916,19.8231248 11.5080557,19.5898756 L11.5,19.5 L11.4994027,16.8655778 C11.2009143,16.6923549 11,16.3691964 11,16 C11,15.4470481 11.4476664,15 12,15 Z"/>
+</symbol>
 <symbol id="icon-user-roles" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
  <path stroke="none" fill-rule="evenodd" d="M19.5031,13.3780522 C19.6602209,13.3780522 19.8082035,13.451908 19.9026601,13.5774665 C20.2862817,14.0874039 20.8587574,14.3777043 21.4951,14.3777043 C22.0321572,14.3777043 22.5621497,14.1609261 23.2052212,13.6913055 C23.535597,13.4500395 24.0001,13.6860022 24.0001,14.0950957 L24.0001,14.0950957 L24.0001,20.2777043 L23.9835753,20.4051862 C23.8374978,20.9591855 23.3900868,21.7397869 22.4808405,22.5024942 C21.7467126,23.1183062 20.8067606,23.6159986 19.6403783,23.9569274 C19.5487759,23.9837024 19.4514241,23.9837024 19.3598217,23.9569274 C18.1934394,23.6159986 17.2534874,23.1183062 16.5193595,22.5024942 C15.6101132,21.7397869 15.1627022,20.9591855 15.0166247,20.4051862 L15.0166247,20.4051862 L15.0001,20.2777043 L15.0001,14.0950957 C15.0001,13.6860022 15.464603,13.4500395 15.7949788,13.6913055 C16.4375333,14.1605485 16.9686498,14.3777043 17.5051,14.3777043 C18.1414426,14.3777043 18.7139183,14.0874039 19.0975399,13.5774665 C19.1919965,13.451908 19.3399791,13.3780522 19.5031,13.3780522 Z M19.5,14.612 L19.3239345,14.7604529 C18.8101178,15.1577421 18.1789949,15.3777043 17.5051,15.3777043 C17.0096002,15.3777043 16.5369786,15.2581354 16.0528484,15.0207931 L16.0528484,15.0207931 L16,14.993 L16,20.202 L16.0185663,20.2524264 C16.0440701,20.3168844 16.0820786,20.4005949 16.1348076,20.5000423 L16.1348076,20.5000423 L16.1925253,20.604605 C16.4113975,20.9864729 16.7281346,21.3723851 17.162028,21.7363499 C17.7890296,22.2623006 18.6054499,22.6945846 19.6403783,22.99709 L19.6403783,22.99709 L19.5,22.953 L19.6967448,22.8914978 C20.4642016,22.6341317 21.1014298,22.3006848 21.6221161,21.9081481 L21.6221161,21.9081481 L21.838172,21.7363499 C22.2720654,21.3723851 22.5888025,20.9864729 22.8076747,20.604605 C22.8913929,20.4585411 22.9476287,20.3383703 22.9816337,20.2524264 L22.9816337,20.2524264 L23,20.202 L23,14.992 L22.9472978,15.0209557 C22.5324656,15.2243804 22.1262069,15.3411781 21.706296,15.3703973 L21.706296,15.3703973 L21.4951,15.3777043 C20.7463279,15.3777043 20.0503607,15.106146 19.5094401,14.621514 L19.5094401,14.621514 L19.5,14.612 Z M19.5,15.7052174 C19.7454599,15.7052174 19.9496084,15.8820926 19.9919443,16.1153418 L20,16.2052174 L19.999664,17.759361 L21.5195,17.7598261 C21.7956424,17.7598261 22.0195,17.9836837 22.0195,18.2598261 C22.0195,18.505286 21.8426248,18.7094345 21.6093756,18.7517704 L21.5195,18.7598261 L19.999664,18.759361 L20,20.3467826 C20,20.622925 19.7761424,20.8467826 19.5,20.8467826 C19.2545401,20.8467826 19.0503916,20.6699074 19.0080557,20.4366582 L19,20.3467826 L18.999664,18.759361 L17.5195,18.7598261 C17.2433576,18.7598261 17.0195,18.5359685 17.0195,18.2598261 C17.0195,18.0143662 17.1963752,17.8102177 17.4296244,17.7678818 L17.5195,17.7598261 L18.999664,17.759361 L19,16.2052174 C19,15.929075 19.2238576,15.7052174 19.5,15.7052174 Z M13.9862583,1.96981303 L14.0281678,2.1762093 C14.1528349,2.91197976 14.0381057,3.65096383 13.7617956,4.46665502 L13.6360115,4.81558961 L13.609,4.885 L13.6618859,4.9344037 C14.2560656,5.56624941 14.2263566,7.04865663 13.572759,7.59544618 L13.489,7.657 L13.4775129,7.83712248 C13.4038188,8.69604279 13.1503611,9.39730571 12.7618562,9.94951059 L12.6412981,10.1107089 C12.4727074,10.3229279 12.3013737,10.4905446 12.139886,10.6190158 L11.999,10.722 L11.999,12.7 L12.4685843,12.8764299 L13.3946906,13.2065538 L14.1283598,13.460207 L13.8032402,14.4058799 L13.0604369,14.1490575 L12.2880214,13.8751328 L11.7967259,13.6930502 L11.3161794,13.5069759 C11.1525303,13.4423624 11.0369805,13.2976443 11.0073061,13.1283507 L10.9998,13.041913 L10.9998,10.4332174 C10.9998,10.2620446 11.0871044,10.1049426 11.2275545,10.0138118 L11.3020502,9.9739843 C11.4186366,9.92378119 11.6329833,9.77230954 11.8583019,9.48868239 C12.2562147,8.98779675 12.4998,8.27771371 12.4998,7.30278261 C12.4998,7.02664023 12.7236576,6.80278261 12.9998,6.80278261 L12.9983048,6.79493225 L13.0446516,6.61514691 C13.0658673,6.51794899 13.0863,6.38532124 13.0863,6.22278261 C13.0863,6.10087864 13.0748066,5.99579953 13.0601096,5.90987361 L13.0289,5.76424919 L12.9983048,5.65063297 C12.9975217,5.64542814 12.9979177,5.64278261 12.9998,5.64278261 C12.7236576,5.64278261 12.4998,5.41892498 12.4998,5.14278261 C12.4998,5.09771364 12.5233658,5.00205597 12.557638,4.8869217 L12.6366473,4.63990273 L12.788871,4.21129345 L12.8153727,4.14225527 L12.8936441,3.89737369 C13.0625747,3.326574 13.1224756,2.81692192 13.0422204,2.34326576 L13.0134497,2.20142314 C12.6716439,0.768735941 8.10999202,0.727802021 7.52705219,2.07862138 L7.45813808,2.28540173 C7.36528954,2.4987833 7.13292796,2.62407138 6.89740504,2.57479428 C6.46643115,2.48462411 6.28475826,2.54025499 6.2020687,2.67534124 C6.1057249,2.8327338 6.07915909,3.14641132 6.13613512,3.57236853 C6.15876036,3.7415166 6.1928592,3.92027213 6.23827631,4.11552233 L6.35697963,4.57756105 L6.44732721,4.90612207 L6.48275591,5.05392008 C6.49504169,5.11538868 6.4998,5.16266995 6.4998,5.21582609 C6.4998,5.49196846 6.27594237,5.71582609 5.9998,5.71582609 L5.99932681,5.7249767 L5.96045364,5.85771867 C5.93721493,5.95030606 5.91255,6.08617562 5.91255,6.25930435 C5.91255,6.43243307 5.93721493,6.56830264 5.96045364,6.66089002 L5.99932681,6.79363199 C6.00093259,6.79970103 6.00122621,6.80278261 5.9998,6.80278261 C6.27594237,6.80278261 6.4998,7.02664023 6.4998,7.30278261 C6.4998,8.27771371 6.74338534,8.98779675 7.14129809,9.48868239 C7.36661669,9.77230954 7.58096337,9.92378119 7.69754976,9.9739843 C7.85476623,10.0416831 7.96453015,10.184003 7.99268277,10.3490438 L7.9998,10.4332174 L7.9998,13.041913 C7.9998,13.2468324 7.87476301,13.4310077 7.68430594,13.5066254 L7.18821619,13.6980869 L5.9051075,14.1572455 L4.32750495,14.7069156 L3.83269728,14.889434 C3.7544249,14.9191801 3.67823564,14.9485984 3.6041075,14.9777027 L3.18389621,15.1486688 L2.81209623,15.3127529 C2.00022172,15.6880967 1.57508475,16.0125924 1.47633505,16.3237227 C1.3524308,16.713779 1.25136302,17.2292785 1.17343637,17.8361953 C1.12061254,18.2476035 1.08052044,18.6827253 1.05149067,19.1239548 L1.02192555,19.6535891 L1.013,19.846 L10.9998,19.8462609 L10.9998,20.8462609 L0.4998,20.8462609 C0.221762673,20.8462609 -0.00287200353,20.6194378 -0.000314408739,20.3414135 L0.0124547607,19.8579012 L0.0272977253,19.5173651 C0.0576097596,18.9020505 0.107433351,18.2863108 0.1815788,17.7088432 C0.266494196,17.0474959 0.378247439,16.4774948 0.523228222,16.0210886 C0.74878462,15.3104289 1.41838558,14.8066131 2.73664169,14.2487159 L3.20036533,14.0603893 L3.71382153,13.8659091 L4.69076079,13.5199898 L6.01515136,13.0601937 L6.57712723,12.8582495 L6.999,12.699 L6.999,10.722 L6.97878695,10.7081147 C6.82300904,10.5988751 6.65423792,10.4518544 6.48506254,10.2615955 L6.35830191,10.1107089 C5.90172808,9.53598172 5.60315061,8.78193482 5.5220871,7.83712248 L5.511,7.66 L5.42644551,7.60023877 C4.77239668,7.06608827 4.74266719,5.61794693 5.33725703,5.00070635 L5.416,4.927 L5.31864514,4.56430996 C5.23914154,4.25345753 5.18104725,3.97471855 5.14496271,3.70494774 C5.060237,3.0715318 5.1040992,2.55362601 5.34917157,2.15326223 C5.60826896,1.7299864 6.04267426,1.52326451 6.6096213,1.53626177 L6.684,1.54 L6.69412529,1.52141884 C7.88818769,-0.519198372 13.4280676,-0.369857688 13.9862583,1.96981303 Z"/>
 </symbol>

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);
 		},
 	),