orc-shared 1.6.0-dev.2 → 1.6.0-dev.4

package/dist/components/MaterialUI/DataDisplay/PredefinedElements/StepperModal.js

@@ -119,6 +119,7 @@ var StepperModal = function StepperModal(_ref) {
     open = _ref.open,
     closeCallback = _ref.closeCallback,
     confirmCallback = _ref.confirmCallback,
+    backdropCallback = _ref.backdropCallback,
     confirmTitle = _ref.confirmTitle,
     _ref$type = _ref.type,
     type = _ref$type === void 0 ? "wide" : _ref$type;
@@ -150,7 +151,7 @@ var StepperModal = function StepperModal(_ref) {
   }, (_steps$currentStep3 = steps[currentStep]) == null ? void 0 : _steps$currentStep3.content);
   modalProps.set(_modalProps.default.propNames.title, titleComponent);
   modalProps.set(_modalProps.default.propNames.open, open);
-  modalProps.set(_modalProps.default.propNames.backdropClickCallback, closeCallback);
+  modalProps.set(_modalProps.default.propNames.backdropClickCallback, backdropCallback != null ? backdropCallback : closeCallback);
   modalProps.set(_modalProps.default.propNames.type, type);
   var nextClick = (0, _react.useCallback)(function () {
     return changeCurrentStep(function (step) {

package/dist/components/MaterialUI/DataDisplay/Table.js

@@ -296,8 +296,8 @@ var buildTableRows = function buildTableRows(rows, classes, customClasses, selec
   };
   var mappedRows = rows.map(function (row) {
     var _row$style$show, _row$style, _row$style$customClas, _row$style2;
-    var showStyle = (_row$style$show = row == null ? void 0 : (_row$style = row.style) == null ? void 0 : _row$style.show) != null ? _row$style$show : false;
-    var rowClass = (_row$style$customClas = row == null ? void 0 : (_row$style2 = row.style) == null ? void 0 : _row$style2.customClass) != null ? _row$style$customClas : "";
+    var showStyle = (_row$style$show = row == null || (_row$style = row.style) == null ? void 0 : _row$style.show) != null ? _row$style$show : false;
+    var rowClass = (_row$style$customClas = row == null || (_row$style2 = row.style) == null ? void 0 : _row$style2.customClass) != null ? _row$style$customClas : "";
     var customClassName = showStyle ? rowClass : "";
     return /*#__PURE__*/_react.default.createElement(MemoTableRow, {
       className: (0, _classnames.default)(classes.tableRow, customClasses.tableRow, customClasses[row.className], customClasses[customClassName]),

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

@@ -204,7 +204,7 @@ var InputBase = function InputBase(_ref) {
     multiline: multiline,
     startAdornment: startAdornment,
     endAdornment: endAdornment,
-    rows: rows,
+    minRows: rows,
     title: tooltipText,
     autoComplete: autoComplete
   })), error && /*#__PURE__*/_react.default.createElement("div", {

package/dist/components/MaterialUI/hocs/withDeferredPopper.js

@@ -116,7 +116,7 @@ var withDeferredPopper = function withDeferredPopper(Comp) {
     }, props));
     var togglePopper = function togglePopper(event) {
       var _event$_dispatchInsta;
-      var linkParent = event == null ? void 0 : (_event$_dispatchInsta = event._dispatchInstances) == null ? void 0 : _event$_dispatchInsta.filter(function (item) {
+      var linkParent = event == null || (_event$_dispatchInsta = event._dispatchInstances) == null ? void 0 : _event$_dispatchInsta.filter(function (item) {
         return item.elementType === "a";
       });
       if (linkParent) {

package/dist/components/Routing/SubPage.js

@@ -46,7 +46,7 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
   };
 });
 var SubPage = function SubPage(_ref) {
-  var _props$title, _props$title2, _props$title3, _props$componentProps, _props$componentProps2;
+  var _props$title, _props$title2, _props$title3, _props$componentProps;
   var config = _ref.config,
     match = _ref.match,
     location = _ref.location,
@@ -78,13 +78,12 @@ var SubPage = function SubPage(_ref) {
   }));
   var modalProps = new _modalProps.default();
   var titleComponent = props != null && (_props$title = props.title) != null && _props$title.id ? /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, {
-    id: props == null ? void 0 : (_props$title2 = props.title) == null ? void 0 : _props$title2.id,
-    defaultMesaage: props == null ? void 0 : (_props$title3 = props.title) == null ? void 0 : _props$title3.defaultMessage
+    id: props == null || (_props$title2 = props.title) == null ? void 0 : _props$title2.id,
+    defaultMesaage: props == null || (_props$title3 = props.title) == null ? void 0 : _props$title3.defaultMessage
   }) : props == null ? void 0 : props.title;
   modalProps.set(_modalProps.default.propNames.title, titleComponent);
   modalProps.set(_modalProps.default.propNames.open, true);
   modalProps.set(_modalProps.default.propNames.type, "fullwidth");
-  modalProps.set(_modalProps.default.propNames.backdropClickCallback, closeSubPage);
   var actionPanel = /*#__PURE__*/_react.default.createElement("div", {
     className: classes.actionPanel
   }, /*#__PURE__*/_react.default.createElement(_Button.default, {
@@ -93,11 +92,11 @@ var SubPage = function SubPage(_ref) {
     disableElevation: true,
     onClick: closeSubPage
   }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _sharedMessages.default.close)));
-  if (((_props$componentProps = props.componentProps) == null ? void 0 : (_props$componentProps2 = _props$componentProps.actionPanel()) == null ? void 0 : _props$componentProps2.length) > 0) {
-    var _props$componentProps3;
+  if (((_props$componentProps = props.componentProps) == null || (_props$componentProps = _props$componentProps.actionPanel()) == null ? void 0 : _props$componentProps.length) > 0) {
+    var _props$componentProps2;
     actionPanel = /*#__PURE__*/_react.default.createElement("div", {
       className: classes.actionPanel
-    }, (_props$componentProps3 = props.componentProps) == null ? void 0 : _props$componentProps3.actionPanel().map(function (action) {
+    }, (_props$componentProps2 = props.componentProps) == null ? void 0 : _props$componentProps2.actionPanel().map(function (action) {
       var _action$label;
       return /*#__PURE__*/_react.default.createElement(_Button.default, {
         key: (_action$label = action.label) == null ? void 0 : _action$label.id,

package/dist/hooks/useNotificationRequestState.js

@@ -68,8 +68,8 @@ var useNotificationRequestState = function useNotificationRequestState(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [formatMessage, successAction, successMessageId, successMessageValues]);
   var onError = (0, _react.useCallback)(function (errorResponse) {
-    var _errorResponse$respon, _errorResponse$respon2, _errorResponse$respon3;
-    var errorMessage = (_errorResponse$respon = errorResponse == null ? void 0 : (_errorResponse$respon2 = errorResponse.response) == null ? void 0 : (_errorResponse$respon3 = _errorResponse$respon2.responseStatus) == null ? void 0 : _errorResponse$respon3.message) != null ? _errorResponse$respon : null;
+    var _errorResponse$respon, _errorResponse$respon2;
+    var errorMessage = (_errorResponse$respon = errorResponse == null || (_errorResponse$respon2 = errorResponse.response) == null || (_errorResponse$respon2 = _errorResponse$respon2.responseStatus) == null ? void 0 : _errorResponse$respon2.message) != null ? _errorResponse$respon : null;
     var message = formatMessage(errorMessageId, _objectSpread(_objectSpread({}, errorMessageValues), {}, {
       errorMessage: errorMessage != null ? errorMessage : formatMessage(_sharedMessages.default.errorUnknown)
     }));

package/dist/selectors/authentication.js

@@ -41,8 +41,8 @@ var hasRolePermissions = function hasRolePermissions(appRolesClaims, scopeId, ro
   if (appRolesClaims != null && scopeId != null) {
     var allowed = !!appRolesClaims.getIn(["*", role]) || !!appRolesClaims.getIn([scopeId, role]);
     if (!allowed) {
-      var _scopes$get$toJS$pare, _scopes$get, _scopes$get$toJS;
-      var parentScopeId = (_scopes$get$toJS$pare = (_scopes$get = scopes.get(scopeId)) == null ? void 0 : (_scopes$get$toJS = _scopes$get.toJS()) == null ? void 0 : _scopes$get$toJS.parentScopeId) != null ? _scopes$get$toJS$pare : null;
+      var _scopes$get$toJS$pare, _scopes$get;
+      var parentScopeId = (_scopes$get$toJS$pare = (_scopes$get = scopes.get(scopeId)) == null || (_scopes$get = _scopes$get.toJS()) == null ? void 0 : _scopes$get.parentScopeId) != null ? _scopes$get$toJS$pare : null;
       return hasRolePermissions(appRolesClaims, parentScopeId, role, scopes);
     }
     return allowed;

package/dist/selectors/metadata.js

@@ -369,7 +369,7 @@ var resolveProductPropertyValue = function resolveProductPropertyValue(property,
       case "Lookup":
         var lookupName = (_property$lookupDefin = property.lookupDefinition) == null ? void 0 : _property$lookupDefin.lookupName;
         var lookup = lookups == null ? void 0 : lookups.get(lookupName);
-        var lookupValue = lookup == null ? void 0 : (_lookup$get = lookup.get("values")) == null ? void 0 : _lookup$get.get(propertyValue);
+        var lookupValue = lookup == null || (_lookup$get = lookup.get("values")) == null ? void 0 : _lookup$get.get(propertyValue);
         return (0, _localizationHelper.getLocalization)(lookupValue == null ? void 0 : lookupValue.get("displayName"), locale, lookupValue == null ? void 0 : lookupValue.get("value"));
       default:
         return propertyValue;

package/dist/utils/buildUrl.js

@@ -47,7 +47,7 @@ var loadConfig = function loadConfig() {
   }).catch(function () {
     console.warn("Failed to load config.json, falling back to dev defaults");
     return {
-      serviceApiUrl: "https://orc-dev-ocs-cm.develop.orckestra.cloud:443/api"
+      serviceApiUrl: "https://occ-dev-ocs-cm.develop.orckestra.cloud:443/api"
     };
   }).then(function (config) {
     var host = config.serviceApiUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "1.6.0-dev.2",
+	"version": "1.6.0-dev.4",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {

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

@@ -96,6 +96,7 @@ const StepperModal = ({
 	open,
 	closeCallback,
 	confirmCallback,
+	backdropCallback,
 	confirmTitle,
 	type = "wide",
 }) => {
@@ -138,7 +139,7 @@ const StepperModal = ({
 
 	modalProps.set(ModalProps.propNames.title, titleComponent);
 	modalProps.set(ModalProps.propNames.open, open);
-	modalProps.set(ModalProps.propNames.backdropClickCallback, closeCallback);
+	modalProps.set(ModalProps.propNames.backdropClickCallback, backdropCallback ?? closeCallback);
 	modalProps.set(ModalProps.propNames.type, type);
 
 	const nextClick = useCallback(() => changeCurrentStep(step => step + 1), []);

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

@@ -3,6 +3,7 @@ import StepperModal from "./StepperModal";
 import Modal from "./../Modal";
 import ModalProps from "./../modalProps";
 import Button from "@material-ui/core/Button";
+import ModalMui from "@material-ui/core/Modal";
 import { mount } from "enzyme";
 import sinon from "sinon";
 import { IntlProvider } from "react-intl";
@@ -163,6 +164,25 @@ describe("StepperModal", () => {
 		expect(cancelCallbackSpy, "was called");
 	});
 
+	it("Calls backdropCallback when clicking away from component", () => {
+		const open = true;
+		const backdropCallbackSpy = sinon.spy();
+
+		const component = (
+			<IntlProvider locale="en-US" messages={messages}>
+				<StepperModal open={open} backdropCallback={backdropCallbackSpy} />
+			</IntlProvider>
+		);
+
+		const mountedComponent = mount(component);
+
+		const muiModal = mountedComponent.find(ModalMui);
+
+		muiModal.invoke("onClose")({}, "backdropClick");
+
+		expect(backdropCallbackSpy, "was called");
+	});
+
 	it("Calls cancelCallback when ok button is pressed", () => {
 		const open = true;
 		const okCallback = sinon.spy();

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

@@ -170,7 +170,7 @@ const InputBase = ({ inputProps }) => {
 					multiline={multiline}
 					startAdornment={startAdornment}
 					endAdornment={endAdornment}
-					rows={rows}
+					minRows={rows}
 					title={tooltipText}
 					autoComplete={autoComplete}
 				/>

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

@@ -71,7 +71,7 @@ describe("InputBase Component", () => {
 		const component = <InputBase inputProps={inputProps} />;
 
 		const mountedComponent = mount(component);
-		const expected = <InputBaseMUI value={aValue} title={aValue} rows={defaultRows} />;
+		const expected = <InputBaseMUI value={aValue} title={aValue} minRows={defaultRows} />;
 
 		expect(mountedComponent.containsMatchingElement(expected), "to be truthy");
 	});
@@ -91,7 +91,7 @@ describe("InputBase Component", () => {
 		const component = <InputBase inputProps={inputProps} />;
 
 		const mountedComponent = mount(component);
-		const expected = <InputBaseMUI value={aValue} title={aValue} rows={desiredNumberOfRows} />;
+		const expected = <InputBaseMUI value={aValue} title={aValue} minRows={desiredNumberOfRows} />;
 
 		expect(mountedComponent.containsMatchingElement(expected), "to be truthy");
 	});

package/src/components/Routing/SubPage.js

@@ -56,7 +56,6 @@ export const SubPage = ({ config, match, location, history, root, modulePrependP
 	modalProps.set(ModalProps.propNames.title, titleComponent);
 	modalProps.set(ModalProps.propNames.open, true);
 	modalProps.set(ModalProps.propNames.type, "fullwidth");
-	modalProps.set(ModalProps.propNames.backdropClickCallback, closeSubPage);
 
 	let actionPanel = (
 		<div className={classes.actionPanel}>

package/src/utils/buildUrl.js

@@ -21,7 +21,7 @@ export const loadConfig = () =>
 		.catch(() => {
 			console.warn("Failed to load config.json, falling back to dev defaults");
 			return {
-				serviceApiUrl: "https://orc-dev-ocs-cm.develop.orckestra.cloud:443/api",
+				serviceApiUrl: "https://occ-dev-ocs-cm.develop.orckestra.cloud:443/api",
 			};
 		})
 		.then(config => {