orc-shared 5.8.0-dev.12 → 5.8.0-dev.14

package/dist/components/MaterialUI/ScopeSelector/TreeItem.js

@@ -58,6 +58,9 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
       display: "flex",
       alignItems: "center"
     },
+    scopeLabelInactive: {
+      color: theme.palette.secondary.light
+    },
     scopeIcon: {
       marginRight: theme.spacing(0.7),
       height: theme.spacing(2.4),
@@ -150,7 +153,9 @@ var ScopeLabel = exports.ScopeLabel = function ScopeLabel(_ref2) {
     type = _ref2.type,
     isRootScope = _ref2.isRootScope,
     hasChildren = _ref2.hasChildren,
-    isVirtualScope = _ref2.isVirtualScope;
+    isVirtualScope = _ref2.isVirtualScope,
+    _ref2$isActive = _ref2.isActive,
+    isActive = _ref2$isActive === void 0 ? true : _ref2$isActive;
   var classes = useStyles({
     hasChildren: hasChildren
   });
@@ -163,7 +168,7 @@ var ScopeLabel = exports.ScopeLabel = function ScopeLabel(_ref2) {
   // 16.8 height of 1 lines of text
 
   var label = /*#__PURE__*/_react.default.createElement("div", {
-    className: classes.scopeLabel
+    className: (0, _classnames.default)(classes.scopeLabel, isActive === false ? classes.scopeLabelInactive : "")
   }, icon, /*#__PURE__*/_react.default.createElement(_MultipleLinesText.default, {
     textProps: multipleLinesTextProps,
     children: name
@@ -208,7 +213,8 @@ var TreeItem = function TreeItem(_ref3) {
       type: scope.type,
       isRootScope: isRootScope,
       isVirtualScope: isVirtualScope,
-      hasChildren: hasChildren
+      hasChildren: hasChildren,
+      isActive: scope.isActive
     }),
     expandIcon: isRootScope ? null : expandIcon,
     collapseIcon: isRootScope ? null : collapseIcon,

package/dist/utils/inputHelper.js

@@ -20,8 +20,20 @@ var trimSpacesAndLeadingZeros = exports.trimSpacesAndLeadingZeros = function tri
   if (fallback === void 0) {
     fallback = "";
   }
-  var trimmed = (value != null ? value : "").trim().replace(/^0+/, "");
-  return trimmed === "" ? fallback : limitNumericValueLength(trimmed);
+  if (!value || isNaN(value)) {
+    return fallback;
+  }
+  var trimmed = value.trim();
+  var isNegative = trimmed[0] === "-";
+  if (isNegative) {
+    trimmed = trimmed.substring(1, trimmed.length);
+  }
+  var withoutLeadingZeros = trimmed.replace(/^0+/, "");
+  if (withoutLeadingZeros == "") {
+    return "0";
+  }
+  var cleanNumber = "".concat(isNegative ? "-" : "").concat(withoutLeadingZeros);
+  return limitNumericValueLength(cleanNumber);
 };
 var limitNumericValueLength = exports.limitNumericValueLength = function limitNumericValueLength(value, maximum) {
   if (maximum === void 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "5.8.0-dev.12",
+	"version": "5.8.0-dev.14",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {
@@ -55,7 +55,7 @@
 		"@testing-library/react": "^10.4.9"
 	},
 	"dependencies": {
-		"orc-scripts": "^4.0.0-dev.7",
+		"orc-scripts": "^4.0.0-dev.9",
 		"react-number-format": "^5.3.0"
 	},
 	"sideEffects": false,

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

@@ -34,6 +34,9 @@ const useStyles = makeStyles(theme => ({
 		display: "flex",
 		alignItems: "center",
 	},
+	scopeLabelInactive: {
+		color: theme.palette.secondary.light,
+	},
 	scopeIcon: {
 		marginRight: theme.spacing(0.7),
 		height: theme.spacing(2.4),
@@ -102,7 +105,7 @@ export const ScopeIcon = ({ type }) => {
 	}
 };
 
-export const ScopeLabel = ({ name, type, isRootScope, hasChildren, isVirtualScope }) => {
+export const ScopeLabel = ({ name, type, isRootScope, hasChildren, isVirtualScope, isActive = true }) => {
 	const classes = useStyles({ hasChildren });
 
 	const icon = <ScopeIcon type={type} />;
@@ -116,7 +119,7 @@ export const ScopeLabel = ({ name, type, isRootScope, hasChildren, isVirtualScop
 	// 16.8 height of 1 lines of text
 
 	const label = (
-		<div className={classes.scopeLabel}>
+		<div className={classNames(classes.scopeLabel, isActive === false ? classes.scopeLabelInactive : "")}>
 			{icon}
 			<MultipleLinesText textProps={multipleLinesTextProps} children={name} />
 		</div>
@@ -153,6 +156,7 @@ const TreeItem = ({ scope, rootId, onScopeSelect, isScopeSelectable, children })
 					isRootScope={isRootScope}
 					isVirtualScope={isVirtualScope}
 					hasChildren={hasChildren}
+					isActive={scope.isActive}
 				/>
 			}
 			expandIcon={isRootScope ? null : expandIcon}

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

@@ -50,6 +50,14 @@ describe("TreeItem", () => {
 		children: ["TestSale"],
 	};
 
+	const inActiveScope = {
+		id: "TestInactive",
+		name: "Test Inactive",
+		type: scopeTypes.sale,
+		children: [],
+		isActive: false,
+	};
+
 	const saleScope = {
 		id: "TestSale",
 		name: "Test Sale",
@@ -109,6 +117,37 @@ describe("TreeItem", () => {
 		expect(component, "when mounted", "to satisfy", expected);
 	});
 
+	it("Renders Tree Item correctly for not active Scope", () => {
+		const expectedVirtualLabel = (
+			<ScopeLabel
+				name={inActiveScope.name}
+				type={inActiveScope.type}
+				isRootScope={false}
+				isVirtualScope={false}
+				isActive={false}
+			/>
+		);
+
+		const component = (
+			<TestWrapper provider={{ store }} memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<TreeItem scope={inActiveScope} rootId={rootId} />
+			</TestWrapper>
+		);
+
+		const expected = (
+			<TestWrapper stylesProvider muiThemeProvider={{ theme }}>
+				<TreeItemMui
+					nodeId={inActiveScope.id}
+					label={expectedVirtualLabel}
+					expandIcon={expandIcon}
+					collapseIcon={collapseIcon}
+				/>
+			</TestWrapper>
+		);
+
+		expect(component, "when mounted", "to satisfy", expected);
+	});
+
 	it("Calls scope select handler on label click if scope type is not virtual", () => {
 		const component = (
 			<TestWrapper provider={{ store }} memoryRouter stylesProvider muiThemeProvider={{ theme }}>

package/src/utils/inputHelper.js

@@ -1,6 +1,22 @@
 export const trimSpacesAndLeadingZeros = (value, fallback = "") => {
-	const trimmed = (value ?? "").trim().replace(/^0+/, "");
-	return trimmed === "" ? fallback : limitNumericValueLength(trimmed);
+	if (!value || isNaN(value)) {
+		return fallback;
+	}
+
+	let trimmed = value.trim();
+	const isNegative = trimmed[0] === "-";
+	if (isNegative) {
+		trimmed = trimmed.substring(1, trimmed.length);
+	}
+
+	const withoutLeadingZeros = trimmed.replace(/^0+/, "");
+	if (withoutLeadingZeros == "") {
+		return "0";
+	}
+
+	const cleanNumber = `${isNegative ? "-" : ""}${withoutLeadingZeros}`;
+
+	return limitNumericValueLength(cleanNumber);
 };
 
 export const limitNumericValueLength = (value, maximum = 9) => value.substring(0, maximum);

package/src/utils/inputHelper.test.js

@@ -5,14 +5,26 @@ describe("Numeric Input Helper", () => {
 		expect(trimSpacesAndLeadingZeros, "when called with", ["  00013 "], "to equal", "13");
 	});
 
-	it("trimSpacesAndLeadingZeros trims spaces and leading zeros returning fallback value", () => {
-		expect(trimSpacesAndLeadingZeros, "when called with", [" 000  ", "def"], "to equal", "def");
+	it("trimSpacesAndLeadingZeros trims spaces and leading zeros returning 0 when 000 value", () => {
+		expect(trimSpacesAndLeadingZeros, "when called with", [" 000  ", "def"], "to equal", "0");
+	});
+
+	it("trimSpacesAndLeadingZeros trims spaces and leading zeros returning fallback when empty string value", () => {
+		expect(trimSpacesAndLeadingZeros, "when called with", ["", "def"], "to equal", "def");
+	});
+
+	it("trimSpacesAndLeadingZeros trims spaces and leading zeros returning 0 when 0 value", () => {
+		expect(trimSpacesAndLeadingZeros, "when called with", [" 0 ", "def"], "to equal", "0");
 	});
 
 	it("trimSpacesAndLeadingZeros should work on floating values", () => {
 		expect(trimSpacesAndLeadingZeros, "when called with", ["042.2", "def"], "to equal", "42.2");
 	});
 
+	it("trimSpacesAndLeadingZeros should work on negative values", () => {
+		expect(trimSpacesAndLeadingZeros, "when called with", ["-0012.2", "def"], "to equal", "-12.2");
+	});
+
 	it("trimSpacesAndLeadingZeros returns fallback on null value", () => {
 		expect(trimSpacesAndLeadingZeros, "when called with", [null, "def"], "to equal", "def");
 	});
@@ -21,6 +33,10 @@ describe("Numeric Input Helper", () => {
 		expect(trimSpacesAndLeadingZeros, "when called with", [undefined, "def"], "to equal", "def");
 	});
 
+	it("trimSpacesAndLeadingZeros returns fallback when value is not a number", () => {
+		expect(trimSpacesAndLeadingZeros, "when called with", ["hello", "def"], "to equal", "def");
+	});
+
 	it("limitNumericValueLength trims extra characters", () => {
 		expect(limitNumericValueLength, "when called with", ["01234567890"], "to equal", "012345678");
 	});