@configuratorware/configurator-admingui 1.33.3 → 1.34.0

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

@@ -28,10 +28,10 @@
     color: black;
   }
   .split-right {
-    padding-bottom: 74px;
+    padding-bottom: 110px;
     .action-buttons {
       position: absolute;
-      bottom: 24px;
+      bottom: -15px;
       right: 24px;
     }
   }

package/Screens/Item/Containers/Edit.js

@@ -344,10 +344,13 @@ var formFields = [{
   noWrap: true,
   field: {
     name: 'visualizationMode',
-    label: 'itemCoreData.visualizationComponent',
+    label: 'visualizationData.visualizationComponent',
     type: 'select',
     sourceConfig: {
-      text: 'label',
+      text: function text(_ref11) {
+        var label = _ref11.label;
+        return (0, _i18n.T)("visualizationData.".concat(label));
+      },
       value: 'id'
     },
     source: [],
@@ -376,9 +379,9 @@ var formFields = [{
   label: 'Prices',
   type: 'dynSource',
   sourceConfig: {
-    text: function text(_ref11) {
-      var identifier = _ref11.identifier,
-          currency = _ref11.currency;
+    text: function text(_ref12) {
+      var identifier = _ref12.identifier,
+          currency = _ref12.currency;
       return "".concat(identifier, " / ").concat(currency.symbol, " (").concat(currency.iso, ")");
     }
   },

package/Screens/Item/Translations.js

@@ -17,8 +17,13 @@ require("../../App/i18n").use({
     save: 'Save',
     editDialogTitle: 'Edit selected entries',
     editDialogHint: 'Use the checkboxes to select one or more entries in the list</br>and then click this icon to set the item status for them.',
+    visualizationData: {
+      '2d': "2D",
+      '3d': "3D",
+      '2doverlay': '2D image in the foreground',
+      visualizationComponent: 'Visualization component'
+    },
     itemCoreData: {
-      visualizationComponent: 'Visualization component',
       configurationMode: 'Configuration mode',
       creator: 'creator',
       designer: 'designer'
@@ -88,8 +93,13 @@ require("../../App/i18n").use({
     save: 'Speichern',
     editDialogTitle: 'Gewählte Einträge bearbeiten',
     editDialogHint: 'Nutze die Checkboxen in der Liste und klicke dann dieses Icon,</br>um den Status für einen oder mehrere Einträge zu setzen.',
+    visualizationData: {
+      '2d': "2D",
+      '3d': "3D",
+      '2doverlay': '2D, Bild im Vordergrund',
+      visualizationComponent: 'Visualisierungskomponente'
+    },
     itemCoreData: {
-      visualizationComponent: 'Visualisierungskomponente',
       configurationMode: 'Konfigurationsmodus',
       creator: 'creator',
       designer: 'designer'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.33.3",
+  "version": "1.34.0",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
@@ -29,7 +29,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.33.3",
+    "redhotmagma-visualization": "1.34.0",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

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

@@ -28,10 +28,10 @@
     color: black;
   }
   .split-right {
-    padding-bottom: 74px;
+    padding-bottom: 110px;
     .action-buttons {
       position: absolute;
-      bottom: 24px;
+      bottom: -15px;
       right: 24px;
     }
   }

package/src/Screens/Item/Containers/Edit.js

@@ -219,10 +219,10 @@ const formFields = [
         noWrap: true,
         field: {
             name: 'visualizationMode',
-            label: 'itemCoreData.visualizationComponent',
+            label: 'visualizationData.visualizationComponent',
             type: 'select',
             sourceConfig: {
-                text: 'label',
+                text: ({label}) => T(`visualizationData.${label}`),
                 value: 'id',
             },
             source: [],

package/src/Screens/Item/Containers/Edit.test.js

@@ -243,8 +243,8 @@ describe('Item/Edit', () => {
         const selectWrapper = wrapper.find('select[name="visualizationMode"]');
 
         const findButton = text => findWithText('li', text, selectWrapper);
-        const button2D = findButton('2d');
-        const button3D = findButton('3d');
+        const button2D = findButton('visualizationData.2d');
+        const button3D = findButton('visualizationData.3d');
         expect(button2D).toHaveLength(1);
         expect(button3D).toHaveLength(1);
         button3D.simulate('click');

package/src/Screens/Item/Translations.js

@@ -18,8 +18,13 @@ require('../../App/i18n').use(
             editDialogTitle: 'Edit selected entries',
             editDialogHint:
                 'Use the checkboxes to select one or more entries in the list</br>and then click this icon to set the item status for them.',
+            visualizationData: {
+              '2d': "2D",
+              '3d': "3D",
+              '2doverlay': '2D image in the foreground',
+              visualizationComponent: 'Visualization component',
+            },
             itemCoreData: {
-                visualizationComponent: 'Visualization component',
                 configurationMode: 'Configuration mode',
                 creator: 'creator',
                 designer: 'designer',
@@ -94,8 +99,13 @@ require('../../App/i18n').use(
             editDialogTitle: 'Gewählte Einträge bearbeiten',
             editDialogHint:
                 'Nutze die Checkboxen in der Liste und klicke dann dieses Icon,</br>um den Status für einen oder mehrere Einträge zu setzen.',
-            itemCoreData: {
+            visualizationData: {
+                '2d': "2D",
+                '3d': "3D",
+                '2doverlay': '2D, Bild im Vordergrund',
                 visualizationComponent: 'Visualisierungskomponente',
+            },
+            itemCoreData: {
                 configurationMode: 'Konfigurationsmodus',
                 creator: 'creator',
                 designer: 'designer',