@configuratorware/configurator-frontendgui 1.29.1 → 1.29.4

package/App/Modules/Creator/Components/Incompatibility/OptionExclusionRule/index.js

@@ -0,0 +1,186 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.decorateOptionlistitem = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _isArray = _interopRequireDefault(require("lodash/isArray"));
+
+var _get = _interopRequireDefault(require("lodash/get"));
+
+var _i18n = require("../../../../../../Framework/i18n");
+
+var _Typography = _interopRequireDefault(require("@material-ui/core/Typography/Typography"));
+
+var _withStyles = _interopRequireDefault(require("@material-ui/core/styles/withStyles"));
+
+var _RuleComponent2 = require("../RuleComponent");
+
+var _memoize = _interopRequireDefault(require("../../../../../../Utils/Function/memoize"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+var optionlistitemStyles = function optionlistitemStyles() {
+  return {
+    root: {
+      cursor: 'auto'
+    },
+    details: {
+      display: 'none'
+    }
+  };
+};
+
+var decorateOptionlistitem = (0, _memoize["default"])(function (OptionlistitemComponent) {
+  return (0, _withStyles["default"])(optionlistitemStyles, {
+    name: 'OptionRuleOptionlistitem'
+  })(function (props) {
+    if (!OptionlistitemComponent) {
+      return null;
+    }
+
+    return /*#__PURE__*/_react["default"].createElement(OptionlistitemComponent, _extends({}, props, {
+      OptionAmountComponent: null
+    }));
+  });
+});
+exports.decorateOptionlistitem = decorateOptionlistitem;
+
+var styles = function styles() {
+  return {
+    root: {},
+    resolveText: {
+      fontWeight: 'bold',
+      paddingTop: 10
+    }
+  };
+};
+
+var OptionExclusionRule = /*#__PURE__*/function (_RuleComponent) {
+  _inherits(OptionExclusionRule, _RuleComponent);
+
+  var _super = _createSuper(OptionExclusionRule);
+
+  function OptionExclusionRule(props) {
+    var _this;
+
+    _classCallCheck(this, OptionExclusionRule);
+
+    _this = _super.call(this, props);
+    _this.state = {
+      result: {}
+    };
+    return _this;
+  }
+
+  _createClass(OptionExclusionRule, [{
+    key: "initState",
+    value: function initState(props) {
+      var result = props.result;
+
+      if (result) {
+        this.setState({
+          result: result
+        });
+      }
+    }
+  }, {
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.initState(this.props);
+    }
+  }, {
+    key: "componentWillReceiveProps",
+    value: function componentWillReceiveProps(props) {
+      this.initState(props);
+    }
+  }, {
+    key: "renderInfoText",
+    value: function renderInfoText() {
+      var isReverseCheck = (0, _get["default"])(this.state.result, 'data.reverseCheck', false);
+      var ruleType = isReverseCheck ? 'optionexclusionreverse' : 'optionexclusion';
+      return (0, _i18n.T)("incompatibility.rules.".concat(ruleType, ".text"), {
+        tag: _Typography["default"]
+      });
+    }
+  }, {
+    key: "renderResolveText",
+    value: function renderResolveText() {
+      var ruleType = this.ruleType,
+          classes = this.props.classes;
+      return (0, _i18n.T)("incompatibility.rules.".concat(ruleType, ".resolveText"), {
+        tag: _Typography["default"],
+        className: classes.resolveText
+      });
+    }
+  }, {
+    key: "renderRules",
+    value: function renderRules() {
+      var _this$props = this.props,
+          Optionlistitem = _this$props.Optionlistitem,
+          viewDetails = _this$props.viewDetails,
+          checkedOptionIndex = _this$props.checkedOptionIndex,
+          ruleTypeIndex = _this$props.ruleTypeIndex,
+          classes = _this$props.classes;
+      var _this$state$result = this.state.result,
+          checked_option = _this$state$result.checked_option,
+          conflicting_options = _this$state$result.conflicting_options;
+      var OptionComponent = OptionExclusionRule.OptionComponent || decorateOptionlistitem(Optionlistitem);
+      var isReverseCheck = (0, _get["default"])(this.state.result, 'data.reverseCheck', false);
+
+      if (!OptionComponent) {
+        return null;
+      }
+
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: classes.root
+      }, checkedOptionIndex === 0 && isReverseCheck === false && /*#__PURE__*/_react["default"].createElement(OptionComponent, {
+        option: checked_option,
+        viewDetails: viewDetails,
+        className: "checkedOption"
+      }), ruleTypeIndex === 0 && this.renderInfoText(), ruleTypeIndex === 0 && this.renderResolveText(), (0, _isArray["default"])(conflicting_options) && conflicting_options.map(function (option, key) {
+        return /*#__PURE__*/_react["default"].createElement(OptionComponent, {
+          key: key,
+          option: option,
+          viewDetails: viewDetails,
+          className: "conflictingOption"
+        });
+      }));
+    }
+  }]);
+
+  return OptionExclusionRule;
+}(_RuleComponent2.RuleComponent);
+
+var _default = (0, _withStyles["default"])(styles, {
+  name: 'OptionExclusionRule'
+})(OptionExclusionRule);
+
+exports["default"] = _default;

package/App/Modules/Creator/Components/Incompatibility/index.js

@@ -27,6 +27,8 @@ var _OptionRule = _interopRequireDefault(require("./OptionRule"));
 
 var _RuleComponent = _interopRequireDefault(require("./RuleComponent"));
 
+var _OptionExclusionRule = _interopRequireDefault(require("./OptionExclusionRule"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -143,7 +145,7 @@ var Incompatibility = /*#__PURE__*/function (_React$Component) {
     _this2 = _super.call.apply(_super, [this].concat(args));
 
     _defineProperty(_assertThisInitialized(_this2), "ruleTypeComponents", {
-      optionexclusion: _OptionRule["default"],
+      optionexclusion: _OptionExclusionRule["default"],
       optiondependency: _OptionRule["default"],
       itemattributematch: _OptionRule["default"]
     });

package/App/Modules/Creator/Components/Optiondetail/index.js

@@ -149,6 +149,9 @@ var styles = function styles(theme) {
     },
     dialogContentRootWithZoom: {
       overflow: 'hidden'
+    },
+    detailDialogContentRoot: {
+      overflowY: 'auto'
     }
   };
 };
@@ -359,8 +362,7 @@ var Optiondetail = /*#__PURE__*/function (_React$Component) {
           onClose = _this$props5.onClose,
           details = _this$props5.details,
           classes = _this$props5.classes,
-          width = _this$props5.width,
-          isTabletDevice = _this$props5.isTabletDevice;
+          width = _this$props5.width;
       var _this$state = this.state,
           loading = _this$state.loading,
           loadingContainerHeight = _this$state.loadingContainerHeight;
@@ -385,7 +387,7 @@ var Optiondetail = /*#__PURE__*/function (_React$Component) {
         className: classes.detailsTypography
       }, details.description));
 
-      var showFullScreenModal = ['xs', 'sm'].includes(width) && !isTabletDevice;
+      var showFullScreenModal = ['xs', 'sm'].includes(width);
       var maxZoomedWidth = this.getMaxZoomedWidth(width);
       var isLandscapeFormat = false;
 
@@ -415,8 +417,10 @@ var Optiondetail = /*#__PURE__*/function (_React$Component) {
         fullScreen: showFullScreenModal
       }, /*#__PURE__*/_react["default"].createElement(_DialogContent["default"], {
         classes: this.state.hasZoom ? {
-          root: classes.dialogContentRootWithZoom
-        } : null
+          root: (0, _clsx2["default"])(classes.detailDialogContentRoot, classes.dialogContentRootWithZoom)
+        } : {
+          root: classes.detailDialogContentRoot
+        }
       }, loading ? /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           height: loadingContainerHeight,
@@ -479,7 +483,6 @@ _defineProperty(Optiondetail, "propTypes", {
   onClose: _propTypes["default"].func,
   LoadingComponent: _propTypes["default"].elementType,
   width: _propTypes["default"].string,
-  isTabletDevice: _propTypes["default"].bool,
   isLoading: _propTypes["default"].bool
 });
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.29.1",
+  "version": "1.29.4",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.29.1",
+    "@configuratorware/scripts": "1.29.4",
     "@hot-loader/react-dom": "^17.0.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.11.2",
@@ -39,8 +39,8 @@
     "react-router-dom": "^5.2.0",
     "react-swipeable": "^5.5.1",
     "react-zoom-pan-pinch": "^2.1.3",
-    "redhotmagma-graphics-editor": "1.29.1",
-    "redhotmagma-visualization": "1.29.1",
+    "redhotmagma-graphics-editor": "1.29.4",
+    "redhotmagma-visualization": "1.29.4",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/public/translations/de_DE.json

@@ -418,6 +418,9 @@
         "text": "Die Auswahl passt nicht zu folgenden Teilen in der Konfiguration.",
         "resolveText": "Diese Teile werden entfernt:"
       },
+      "optionexclusionreverse": {
+        "text": "Das abgewählte Teil ist Voraussetzung für andere gewählte Teile."
+      },
       "optiondependency": {
         "text": "Die Auswahl setzt andere Teile voraus.",
         "resolveText": "Folgende Teile werden eingetauscht:"

package/public/translations/en_GB.json

@@ -416,6 +416,9 @@
         "text": "The selection does not match the following parts in the configuration.",
         "resolveText": "These options will be removed:"
       },
+      "optionexclusionreverse": {
+        "text": "The removed part is a requirement for other parts."
+      },
       "optiondependency": {
         "text": "The selection requires other parts.",
         "resolveText": "The following parts are added:"

package/src/App/Modules/Creator/Components/Incompatibility/OptionExclusionRule/index.js

@@ -0,0 +1,116 @@
+import React from 'react';
+import isArray from 'lodash/isArray';
+import get from 'lodash/get';
+import { T } from 'Framework/i18n';
+import Typography from '@material-ui/core/Typography/Typography';
+import withStyles from '@material-ui/core/styles/withStyles';
+import { RuleComponent } from '../RuleComponent';
+import memoize from 'Utils/Function/memoize';
+
+const optionlistitemStyles = () => ({
+    root: {
+        cursor: 'auto',
+    },
+    details: {
+        display: 'none',
+    },
+});
+
+export const decorateOptionlistitem = memoize(OptionlistitemComponent =>
+    withStyles(optionlistitemStyles, { name: 'OptionRuleOptionlistitem' })(props => {
+        if (!OptionlistitemComponent) {
+            return null;
+        }
+
+        return <OptionlistitemComponent {...props} OptionAmountComponent={null} />;
+    })
+);
+
+const styles = () => ({
+    root: {},
+    resolveText: {
+        fontWeight: 'bold',
+        paddingTop: 10,
+    },
+});
+
+class OptionExclusionRule extends RuleComponent {
+    constructor(props) {
+        super(props);
+        this.state = {
+            result: {},
+        };
+    }
+
+    initState(props) {
+        const { result } = props;
+        if (result) {
+            this.setState({ result });
+        }
+    }
+
+    componentDidMount() {
+        this.initState(this.props);
+    }
+
+    componentWillReceiveProps(props) {
+        this.initState(props);
+    }
+
+    renderInfoText() {
+        const isReverseCheck = get(this.state.result, 'data.reverseCheck', false);
+        const ruleType = isReverseCheck ? 'optionexclusionreverse' : 'optionexclusion';
+        return T(`incompatibility.rules.${ruleType}.text`, { tag: Typography });
+    }
+
+    renderResolveText() {
+        const {
+            ruleType,
+            props: { classes },
+        } = this;
+        return T(`incompatibility.rules.${ruleType}.resolveText`, {
+            tag: Typography,
+            className: classes.resolveText,
+        });
+    }
+
+    renderRules() {
+        const { Optionlistitem, viewDetails, checkedOptionIndex, ruleTypeIndex, classes } = this.props;
+        const { checked_option, conflicting_options } = this.state.result;
+        const OptionComponent = OptionExclusionRule.OptionComponent || decorateOptionlistitem(Optionlistitem);
+        const isReverseCheck = get(this.state.result, 'data.reverseCheck', false);
+
+        if (!OptionComponent) {
+            return null;
+        }
+
+        return (
+            <div className={classes.root}>
+                {checkedOptionIndex === 0 && isReverseCheck === false && (
+                    <OptionComponent
+                        option={checked_option}
+                        viewDetails={viewDetails}
+                        className="checkedOption"
+                    />
+                )}
+
+                {ruleTypeIndex === 0 && this.renderInfoText()}
+                {ruleTypeIndex === 0 && this.renderResolveText()}
+
+                {isArray(conflicting_options) &&
+                    conflicting_options.map((option, key) => {
+                        return (
+                            <OptionComponent
+                                key={key}
+                                option={option}
+                                viewDetails={viewDetails}
+                                className="conflictingOption"
+                            />
+                        );
+                    })}
+            </div>
+        );
+    }
+}
+
+export default withStyles(styles, { name: 'OptionExclusionRule' })(OptionExclusionRule);

package/src/App/Modules/Creator/Components/Incompatibility/index.js

@@ -10,6 +10,7 @@ import CustomDialog from 'Shared/Components/CustomDialog';
 
 import OptionRule from './OptionRule';
 import RuleComponent from './RuleComponent';
+import OptionExclusionRule from './OptionExclusionRule';
 
 const styles = theme => ({
     incompatibilityDialog: {
@@ -80,7 +81,7 @@ export class RuleCounter {
 
 class Incompatibility extends React.Component {
     ruleTypeComponents = {
-        optionexclusion: OptionRule,
+        optionexclusion: OptionExclusionRule,
         optiondependency: OptionRule,
         itemattributematch: OptionRule,
     };

package/src/App/Modules/Creator/Components/Optiondetail/__snapshots__/index.test.js.snap

@@ -3,7 +3,7 @@
 exports[`Screens/Components/ImageEditDialog/MessageBox renders as a modal screen on larger screens 1`] = `
 <div>
   <div
-    class="MuiDialogContent-root"
+    class="MuiDialogContent-root Optiondetail-detailDialogContentRoot-14"
   >
     <div>
       <div
@@ -60,7 +60,7 @@ exports[`Screens/Components/ImageEditDialog/MessageBox renders as a modal screen
 exports[`Screens/Components/ImageEditDialog/MessageBox renders as full screen on smaller screens 1`] = `
 <div>
   <div
-    class="MuiDialogContent-root"
+    class="MuiDialogContent-root Optiondetail-detailDialogContentRoot-14"
   >
     <div>
       <div
@@ -117,7 +117,7 @@ exports[`Screens/Components/ImageEditDialog/MessageBox renders as full screen on
 exports[`Screens/Components/ImageEditDialog/MessageBox renders with previous and next navigation buttons 1`] = `
 <div>
   <div
-    class="MuiDialogContent-root"
+    class="MuiDialogContent-root Optiondetail-detailDialogContentRoot-14"
   >
     <div>
       <div

package/src/App/Modules/Creator/Components/Optiondetail/index.js

@@ -96,6 +96,9 @@ const styles = theme => ({
     dialogContentRootWithZoom: {
         overflow: 'hidden',
     },
+    detailDialogContentRoot: {
+        overflowY: 'auto',
+    },
 });
 
 class Optiondetail extends React.Component {
@@ -112,7 +115,6 @@ class Optiondetail extends React.Component {
         onClose: PropTypes.func,
         LoadingComponent: PropTypes.elementType,
         width: PropTypes.string,
-        isTabletDevice: PropTypes.bool,
         isLoading: PropTypes.bool,
     };
 
@@ -261,16 +263,7 @@ class Optiondetail extends React.Component {
     };
 
     render() {
-        const {
-            LoadingComponent,
-            options,
-            show,
-            onClose,
-            details,
-            classes,
-            width,
-            isTabletDevice,
-        } = this.props;
+        const { LoadingComponent, options, show, onClose, details, classes, width } = this.props;
         const { loading, loadingContainerHeight } = this.state;
         const showNav = _.isArray(options) && options.length > 1;
         const detailImage = details.detailImage;
@@ -307,7 +300,7 @@ class Optiondetail extends React.Component {
             </div>
         );
 
-        const showFullScreenModal = ['xs', 'sm'].includes(width) && !isTabletDevice;
+        const showFullScreenModal = ['xs', 'sm'].includes(width);
         let maxZoomedWidth = this.getMaxZoomedWidth(width);
         let isLandscapeFormat = false;
         if (
@@ -341,7 +334,16 @@ class Optiondetail extends React.Component {
                 fullScreen={showFullScreenModal}
             >
                 <DialogContent
-                    classes={this.state.hasZoom ? { root: classes.dialogContentRootWithZoom } : null}
+                    classes={
+                        this.state.hasZoom
+                            ? {
+                                  root: clsx(
+                                      classes.detailDialogContentRoot,
+                                      classes.dialogContentRootWithZoom
+                                  ),
+                              }
+                            : { root: classes.detailDialogContentRoot }
+                    }
                 >
                     {loading ? (
                         <div style={{ height: loadingContainerHeight, boxSizing: 'border-box' }}>