orc-shared 5.8.0-dev.2 → 5.8.0-dev.3

package/dist/utils/flatten.js

@@ -13,8 +13,8 @@ exports.flattenObj = exports.flatten = void 0;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }

package/dist/utils/modelValidationHelper.js

@@ -14,8 +14,8 @@ var _lodash = require("lodash");
   enterModule && enterModule(module);
 })();
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };

package/dist/utils/stripKey.js

@@ -12,8 +12,8 @@ exports.default = void 0;
 })();
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "5.8.0-dev.2",
+	"version": "5.8.0-dev.3",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {
@@ -54,11 +54,8 @@
 	"devDependencies": {
 		"@testing-library/react": "^10.4.9"
 	},
-	"peerDependencies": {
-		"orc-scripts": "2.0.0-dev.4"
-	},
 	"dependencies": {
-		"orc-scripts": "2.0.0-dev.4",
+		"orc-scripts": "^2.0.0",
 		"react-number-format": "^5.3.0"
 	},
 	"sideEffects": false,

package/src/components/MaterialUI/DataDisplay/PredefinedElements/InformationItem.js

@@ -15,11 +15,10 @@ const useStyles = makeStyles(theme => ({
 		color: props => (!props.error ? theme.palette.text.hint : theme.palette.error.main),
 		fontFamily: theme.typography.fontFamily,
 		marginBottom: theme.spacing(1),
-
-		"&:after": {
-			content: props => props.required && '" *"',
-			color: theme.palette.error.main,
-		},
+	},
+	titleRequired: {
+		paddingLeft: theme.spacing(0.5),
+		color: theme.palette.error.main,
 	},
 	value: {
 		fontSize: theme.typography.fontSize,
@@ -77,9 +76,25 @@ const InformationItemChildren = ({
 	return <MultipleLinesText textProps={multipleLinesTextProps} children={value} tooltipClasses={tooltipClasses} />;
 };
 
-const InformationItemHeader = ({ classes, label, headerIcon, headerIconClassName }) => {
+const InformationItemHeader = ({ classes, label, headerIcon, headerIconClassName, required }) => {
 	const formattedLabel = typeof label === "object" ? <FormattedMessage {...label} /> : label;
-	const headerText = (formattedLabel && <Typography className={classes.title} children={formattedLabel} />) ?? null;
+	const headerText =
+		(formattedLabel && (
+			<Typography
+				className={classes.title}
+				children={
+					<>
+						{formattedLabel}
+						{required && (
+							<span data-qa="required" className={classes.titleRequired}>
+								*
+							</span>
+						)}
+					</>
+				}
+			/>
+		)) ??
+		null;
 
 	if (headerIcon) {
 		return (
@@ -113,6 +128,7 @@ const InformationItem = ({
 			<InformationItemHeader
 				classes={classes}
 				label={label}
+				required={required}
 				headerIcon={headerIcon}
 				headerIconClassName={headerIconClassName}
 			/>

package/src/components/MaterialUI/DataDisplay/PredefinedElements/InformationItem.test.js

@@ -237,7 +237,7 @@ describe("Information Item", () => {
 
 		const component = (
 			<IntlProvider locale="en" messages={{ label }}>
-				<InformationItem label={label} required={true}>
+				<InformationItem label={label} required={false}>
 					{value}
 				</InformationItem>
 			</IntlProvider>
@@ -272,19 +272,31 @@ describe("Information Item", () => {
 
 	it("Renders Information Item with required", () => {
 		const label = "label";
-		const value = "value";
+		const value = <p>Value</p>;
 
-		const component = mount(
+		const component = (
 			<IntlProvider locale="en-US">
 				<InformationItem label={label} required={true}>
 					{value}
 				</InformationItem>
-			</IntlProvider>,
+			</IntlProvider>
 		);
 
-		const labelContainer = component.find("p").get(0);
+		const expected = (
+			<div>
+				<Typography
+					children={
+						<>
+							{label}
+							<span data-qa="required">*</span>
+						</>
+					}
+				/>
+				{value}
+			</div>
+		);
 
-		expect(labelContainer, "when mounted", "to have style rules satisfying", "to contain", 'content: " *"');
+		expect(component, "when mounted", "to satisfy", expected);
 	});
 
 	it("Renders Information Item properly with a header icon", () => {

package/src/components/Routing/SegmentPage.js

@@ -64,6 +64,7 @@ export const List = styled.div`
 	border-right: 1px solid ${getThemeProp(["colors", "borderLight"], "#cccccc")};
 	display: flex;
 	flex-direction: column;
+	overflow-y: auto;
 `;
 
 const FilteredLink = ({ active, ...props }) => (props.to ? <Link {...props} /> : <div {...props} />);