@configuratorware/configurator-admingui 1.42.5 → 1.43.1

package/App/Styles.scss

@@ -47,24 +47,6 @@ div + h2 {
     display: none
   }
 }
-.hintbox {
-  font-size: 15px;
-  border-radius: 0.5em;
-  border: 1px solid #45c08a;
-  border-left-width: 10px;
-  height: auto;
-  width: 52%;
-}
-.hinttext {
-  padding: 10px;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-.hinticon {
-  color: #45c08a;
-  margin-right: 10px;
-}
 .split-left {
   overflow-x: auto;
   width: 50%;
@@ -88,9 +70,6 @@ div + h2 {
   .split-left {
     display: none;
   }
-  .withDetails.hintbox {
-    display: none;
-  }
   .split-right {
     width: 100%;
     padding: 0;

package/Components/Hint.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _InfoIcon = _interopRequireDefault(require("../UIComponents/icons/InfoIcon"));
+var _react = _interopRequireDefault(require("react"));
+require("./Styles.scss");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var Hint = function Hint(props) {
+  var hintText = props.hintText,
+    children = props.children;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "hintBox"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "hintText"
+  }, /*#__PURE__*/_react["default"].createElement(_InfoIcon["default"], {
+    className: "hintIcon"
+  }), children, hintText));
+};
+var _default = exports["default"] = Hint;

package/Components/ModalContainer.js

@@ -116,7 +116,7 @@ var ModalContainer = /*#__PURE__*/function (_React$Component) {
         onClose: props.hideDetailsAction,
         actions: actions,
         className: containerClassName,
-        maxWidth: "lg",
+        maxWidth: "md",
         classes: classes
       }, hideDetails && /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.closeButton

package/Components/SplitContainer.js

@@ -5,13 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _clsx = _interopRequireDefault(require("clsx"));
 var _GeneralFragments = require("./GeneralFragments");
 var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
 var _CloseIcon = _interopRequireDefault(require("../UIComponents/icons/CloseIcon"));
 var _Tooltip = _interopRequireDefault(require("../UIComponents/Tooltip"));
 var _i18n = require("../App/i18n");
-var _InfoIcon = _interopRequireDefault(require("../UIComponents/icons/InfoIcon"));
+var _Hint = _interopRequireDefault(require("./Hint"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 var SplitContainer = function SplitContainer(props) {
   var showDetails = props.showDetails,
@@ -25,13 +24,9 @@ var SplitContainer = function SplitContainer(props) {
     className: 'split-container ' + className
   }, /*#__PURE__*/_react["default"].createElement(_GeneralFragments.Headline, {
     text: headlineText
-  }), hintText && /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _clsx["default"])('hintbox', showDetails && 'withDetails')
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _clsx["default"])('hinttext')
-  }, /*#__PURE__*/_react["default"].createElement(_InfoIcon["default"], {
-    className: (0, _clsx["default"])('hinticon')
-  }), hintText)), /*#__PURE__*/_react["default"].createElement("div", {
+  }), hintText && /*#__PURE__*/_react["default"].createElement(_Hint["default"], {
+    hintText: hintText
+  }), /*#__PURE__*/_react["default"].createElement("div", {
     className: showDetails ? 'split-left' : ''
   }, listComponent), showDetails && /*#__PURE__*/_react["default"].createElement("div", {
     className: "split-right"

package/Components/Styles.scss

@@ -64,7 +64,9 @@
       justify-content: flex-end;
     }
   }
-
+  #orderList {
+    padding-bottom: 0;
+  }
   #subheadline {
     margin-left: 0;
   }
@@ -140,6 +142,28 @@ td, th {
   margin-left: 10px !important;
 }
 
+.hintBox {
+  font-size: 15px;
+  border-radius: 0.5em;
+  border: 1px solid #45c08a;
+  border-left-width: 10px;
+  height: auto;
+  width: 52%;
+  margin-bottom: 10px;
+}
+
+.hintText {
+  padding: 10px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.hintIcon {
+  color: #45c08a;
+  margin-right: 10px;
+}
+
 .closeButton {
   position: absolute;
   right: 28px;

package/Screens/ColorPalettes/Containers/Edit.js

@@ -36,7 +36,13 @@ var ConnectedOrderedButton = function ConnectedOrderedButton(_ref) {
   var value = _ref.value,
     reloadPalette = _ref.reloadPalette,
     props = _objectWithoutProperties(_ref, _excluded);
-  return /*#__PURE__*/_react["default"].createElement(_OrderList["default"], {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      display: 'flex',
+      flexDirection: 'row',
+      justifyContent: 'flex-end'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_OrderList["default"], {
     listUrl: "/colorpalettes/".concat(value),
     saveListUrl: "/colorpalettes/".concat(value, "/colors/savesequencenumbers"),
     entity: 'colorpalettes.colors',
@@ -45,7 +51,7 @@ var ConnectedOrderedButton = function ConnectedOrderedButton(_ref) {
     onListSaved: function onListSaved() {
       reloadPalette(value);
     }
-  });
+  }));
 };
 var formFields = [{
   name: 'subheadline',
@@ -67,6 +73,9 @@ var formFields = [{
   name: 'subheadline',
   label: 'Colors',
   type: 'subheadline'
+}, {
+  type: withLoadDetails(ConnectedOrderedButton),
+  name: 'orderList'
 }, {
   name: 'colors',
   type: 'array',
@@ -134,8 +143,5 @@ var formFields = [{
       type: 'text'
     }]
   }
-}, {
-  type: withLoadDetails(ConnectedOrderedButton),
-  name: 'id'
 }];
 var _default = exports["default"] = (0, _DefaultConnectedForm["default"])(formFields, _Actions.COLORPALETTES_REDUCER_NAME, setFieldData, postData);

package/Screens/ColorPalettes/Reducers/Reducer.js

@@ -15,6 +15,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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); }
 var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
   id: null,
+  orderList: null,
   subheadline: {
     value: ''
   },

package/Screens/Creator/Components/Rules/Containers/List.js

@@ -9,6 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _Actions = _interopRequireWildcard(require("../../../Reducers/Rules/Actions"));
 var _DefaultConnectedList = _interopRequireDefault(require("../../../../../Components/DefaultConnectedList"));
 var _i18n = require("../../../../../App/i18n");
+var _Hint = _interopRequireDefault(require("../../../../../Components/Hint"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -26,7 +27,7 @@ var RuleList = exports.RuleList = (0, _DefaultConnectedList["default"])(columns,
   reducerName: _Actions.REDUCER_NAME
 });
 var _default = exports["default"] = function _default() {
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "listHeadline"
-  }, (0, _i18n.T)('ruleEditor.listHeadline')), /*#__PURE__*/_react["default"].createElement(RuleList, null));
+  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Hint["default"], {
+    hintText: (0, _i18n.T)('ruleEditor.listHeadline')
+  }), /*#__PURE__*/_react["default"].createElement(RuleList, null));
 };

package/Screens/Creator/Components/Rules/Styles.scss

@@ -23,10 +23,6 @@
       }
     }
   }
-  .hintText {
-    margin-bottom: 20px;
-    color: black;
-  }
   .split-right {
     padding-bottom: 110px;
     .action-buttons {

package/Screens/Creator/Components/VisualizationAndMediaData/VisualizationAndMediaData.js

@@ -38,6 +38,7 @@ require("./Translations");
 var _clsx = _interopRequireDefault(require("clsx"));
 var _InfoIcon = _interopRequireDefault(require("../../../../UIComponents/icons/InfoIcon"));
 var _CloseButton = _interopRequireDefault(require("../../../../Components/CloseButton"));
+var _Hint = _interopRequireDefault(require("../../../../Components/Hint"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -562,13 +563,7 @@ var VisualizationAndMediaData = exports.VisualizationAndMediaData = (0, _withSty
     onClick: function onClick() {
       return setOpen(false);
     }
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _clsx["default"])('hintbox')
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _clsx["default"])('hinttext')
-  }, /*#__PURE__*/_react["default"].createElement(_InfoIcon["default"], {
-    className: (0, _clsx["default"])('hinticon')
-  }), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", null, (0, _i18n.T)("visualizationAndMediaData.missingImageNotice.".concat(showMissingImageNotice ? 'imagesAreMissing' : 'noMissingImage'))), (0, _i18n.T)('visualizationAndMediaData.infoBoxText')))), /*#__PURE__*/_react["default"].createElement(_Tabs.Tabs, {
+  }), /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", null, (0, _i18n.T)("visualizationAndMediaData.missingImageNotice.".concat(showMissingImageNotice ? 'imagesAreMissing' : 'noMissingImage'))), (0, _i18n.T)('visualizationAndMediaData.infoBoxText'))), /*#__PURE__*/_react["default"].createElement(_Tabs.Tabs, {
     value: editorMode,
     onChange: function onChange(evt, value) {
       return setEditorMode(value);

package/Screens/Dashboard/Screen.js

@@ -10,8 +10,8 @@ var _reactRedux = require("react-redux");
 var _i18n = require("../../App/i18n");
 require("./Translations");
 require("./Styles.scss");
-var _Typography = _interopRequireDefault(require("@material-ui/core/es/Typography/Typography"));
 var _Actions = require("../SoftwareUpdates/Reducers/Actions");
+var _Hint = _interopRequireDefault(require("../../Components/Hint"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -20,9 +20,9 @@ var Dashboard = function Dashboard(_ref) {
   (0, _react.useEffect)(function () {
     getVersionInformation();
   }, []);
-  return /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
-    variant: 'h5'
-  }, /*#__PURE__*/_react["default"].createElement(_i18n.T, null, "dashboard.text"));
+  return /*#__PURE__*/_react["default"].createElement(_Hint["default"], {
+    hintText: (0, _i18n.T)('dashboard.text')
+  });
 };
 var mapDispatchToProps = function mapDispatchToProps(dispatch) {
   return {

package/Screens/Dashboard/Styles.scss

@@ -1,3 +1,3 @@
 .welcome {
   color: red;
-}
+}

package/Screens/Designer/Containers/Edit.js

@@ -21,6 +21,7 @@ var _DesignAreas = _interopRequireDefault(require("../SubScreens/DesignAreas"));
 var _Designviews = _interopRequireDefault(require("../SubScreens/Designviews"));
 var _Visualization = _interopRequireDefault(require("../SubScreens/Visualization"));
 var _CheckData = _interopRequireDefault(require("../../Creator/Components/CheckData/CheckData"));
+var _Hint = _interopRequireDefault(require("../../../Components/Hint"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -160,7 +161,9 @@ var DesignerForm = /*#__PURE__*/function (_Component) {
               '2dVariant': /*#__PURE__*/_react["default"].createElement(_Designviews["default"], null)
             };
             var currentDesignerMode = _lodash["default"].get(this.props.item, 'visualizationMode.identifier');
-            return designerModeComponentMap[currentDesignerMode] || /*#__PURE__*/_react["default"].createElement("div", null, (0, _i18n.T)('pleaseUseVisualMaintanance'));
+            return designerModeComponentMap[currentDesignerMode] || /*#__PURE__*/_react["default"].createElement(_Hint["default"], {
+              hintText: (0, _i18n.T)('pleaseUseVisualMaintanance')
+            });
           }
         case designerFormTabs.visualMaintenance:
           {

package/Screens/PriceTypes/Containers/Edit.js

@@ -28,6 +28,13 @@ var formFields = [{
   name: 'itemAmountDependent',
   label: 'item Amount Dependent',
   type: 'toggle'
+}, {
+  name: 'pricePerItem',
+  label: 'pricePerItem',
+  type: 'toggle',
+  shouldRender: function shouldRender(schema) {
+    return schema.itemAmountDependent.value;
+  }
 }, {
   name: 'bulkNameDependent',
   label: 'bulkNameDependent',

package/Screens/PriceTypes/Reducers/Reducer.js

@@ -27,6 +27,9 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
   itemAmountDependent: {
     value: true
   },
+  pricePerItem: {
+    value: false
+  },
   bulkNameDependent: {
     value: true
   },

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.42.5",
+  "version": "1.43.1",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.42.5",
+    "@configuratorware/scripts": "1.43.1",
     "@material-ui/core": "^3.9.4",
     "@material-ui/icons": "^3.0.2",
     "@tweenjs/tween.js": "^17.6.0",
@@ -28,7 +28,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.42.5",
+    "redhotmagma-visualization": "1.43.1",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",