@configuratorware/configurator-admingui 1.33.4 → 1.34.0

package/App/Reducers/Api/Actions.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.dismissRequest = exports.deleteData = exports.postData = exports.fetchDataIfNeeded = exports.fetchData = exports.expiredResponse = exports.deleteRequest = exports.postRequest = exports.networkError = exports.receiveData = exports.requestData = exports.resetSource = exports.resetDidInvalidate = exports.invalidateSource = exports.RESET_SOURCE = exports.RESET_DID_INVALIDATE = exports.EXPIRED_RESPONSE = exports.CANCEL_REQUEST = exports.DELETE_DATA = exports.POST_DATA = exports.HANDLED_NETWORK_ERROR = exports.NETWORK_ERROR = exports.INVALIDATE_SOURCE = exports.RECEIVE_DATA = exports.REQUEST_DATA = void 0;
+exports.dismissRequest = exports.deleteData = exports.postData = exports.fetchDataIfNeeded = exports.fetchData = exports.expiredResponse = exports.deleteRequest = exports.postRequest = exports.networkError = exports.receiveData = exports.requestData = exports.resetDidInvalidate = exports.invalidateSource = exports.RESET_DID_INVALIDATE = exports.EXPIRED_RESPONSE = exports.CANCEL_REQUEST = exports.DELETE_DATA = exports.POST_DATA = exports.HANDLED_NETWORK_ERROR = exports.NETWORK_ERROR = exports.INVALIDATE_SOURCE = exports.RECEIVE_DATA = exports.REQUEST_DATA = void 0;
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
@@ -43,8 +43,6 @@ var EXPIRED_RESPONSE = 'EXPIRED_RESPONSE';
 exports.EXPIRED_RESPONSE = EXPIRED_RESPONSE;
 var RESET_DID_INVALIDATE = 'RESET_DID_INVALIDATE';
 exports.RESET_DID_INVALIDATE = RESET_DID_INVALIDATE;
-var RESET_SOURCE = 'RESET_SOURCE';
-exports.RESET_SOURCE = RESET_SOURCE;
 
 var invalidateSource = function invalidateSource(key) {
   return {
@@ -64,15 +62,6 @@ var resetDidInvalidate = function resetDidInvalidate(key) {
 
 exports.resetDidInvalidate = resetDidInvalidate;
 
-var resetSource = function resetSource(key) {
-  return {
-    type: RESET_SOURCE,
-    key: key
-  };
-};
-
-exports.resetSource = resetSource;
-
 var requestData = function requestData(source, key) {
   return {
     type: REQUEST_DATA,

package/App/Reducers/Api/Helpers.js

@@ -33,7 +33,7 @@ Object.defineProperty(exports, "HANDLED_NETWORK_ERROR", {
     return _Actions.HANDLED_NETWORK_ERROR;
   }
 });
-exports["default"] = exports.getMethods = exports.apiActionHandler = exports.handleNetworkErrorAction = exports.dispatchDeleteData = exports.dispatchPostData = exports.dispatchResetSource = exports.dispatchFetchData = void 0;
+exports["default"] = exports.getMethods = exports.apiActionHandler = exports.handleNetworkErrorAction = exports.dispatchDeleteData = exports.dispatchPostData = exports.dispatchFetchData = void 0;
 
 var _Actions = require("./Actions");
 
@@ -45,14 +45,6 @@ var dispatchFetchData = function dispatchFetchData(dispatch) {
 
 exports.dispatchFetchData = dispatchFetchData;
 
-var dispatchResetSource = function dispatchResetSource(dispatch) {
-  return function (key) {
-    return dispatch((0, _Actions.resetSource)(key));
-  };
-};
-
-exports.dispatchResetSource = dispatchResetSource;
-
 var dispatchPostData = function dispatchPostData(dispatch) {
   return function (key, source, data) {
     return dispatch((0, _Actions.postData)(source, data, key));

package/App/Reducers/Api/Reducer.js

@@ -84,11 +84,6 @@ var data = function data() {
         isDeleted: action.ids
       });
 
-    case _Actions.RESET_SOURCE:
-      return _objectSpread(_objectSpread({}, state), {}, {
-        source: null
-      });
-
     default:
       return state;
   }
@@ -108,7 +103,6 @@ var dataBySource = function dataBySource() {
     case _Actions.CANCEL_REQUEST:
     case _Actions.EXPIRED_RESPONSE:
     case _Actions.RESET_DID_INVALIDATE:
-    case _Actions.RESET_SOURCE:
       return _objectSpread(_objectSpread({}, state), {}, _defineProperty({}, action.key, data(state[action.key], action)));
 
     default:

package/App/Reducers/Entity/Actions.js

@@ -305,9 +305,7 @@ var generateDefaultActions = function generateDefaultActions(listKey, dataKey, r
       return dispatch(triggerUnsavedEntity()).then(function () {
         dispatch(unmountEntity());
         dispatch(initUnsavedEntity(reducerName));
-        dispatch(mountNewEntity()); // source might still be set from last fetch, so reset it here
-
-        (0, _Helpers.dispatchResetSource)(dispatch)(dataKey);
+        dispatch(mountNewEntity());
         dispatch(loadDependencies());
         dispatch(showDetails());
       });

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/Designer/SubScreens/Designviews/Containers/Edit.js

@@ -17,8 +17,6 @@ var _DefaultConnectedForm = _interopRequireWildcard(require("../../../../../Comp
 
 var _Actions = _interopRequireWildcard(require("../Reducers/Actions"));
 
-var _Actions2 = require("../../../Reducers/Actions");
-
 var _File = _interopRequireDefault(require("../../../../../Components/FormFragments/File"));
 
 var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress"));
@@ -110,7 +108,7 @@ var FileInput = (0, _styles.withStyles)({
     return (0, _get["default"])(state[_Actions.REDUCER_NAME], 'source.item.identifier');
   });
   var itemId = (0, _reactRedux.useSelector)(function (state) {
-    return (0, _get["default"])(state[_Actions2.DESIGNER_REDUCER_NAME], 'source.id');
+    return (0, _get["default"])(state[_Actions.REDUCER_NAME], 'source.item.id');
   });
   var colorGroupEntries = (0, _reactRedux.useSelector)(getGroupEntries('color'));
   var viewImages = (0, _reactRedux.useSelector)(function (state) {

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.4",
+  "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.4",
+    "redhotmagma-visualization": "1.34.0",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/Reducers/Api/Actions.js

@@ -11,7 +11,6 @@ export const DELETE_DATA = 'DELETE_DATA';
 export const CANCEL_REQUEST = 'CANCEL_REQUEST';
 export const EXPIRED_RESPONSE = 'EXPIRED_RESPONSE';
 export const RESET_DID_INVALIDATE = 'RESET_DID_INVALIDATE';
-export const RESET_SOURCE = 'RESET_SOURCE';
 
 export const invalidateSource = key => ({
     type: INVALIDATE_SOURCE,
@@ -23,11 +22,6 @@ export const resetDidInvalidate = key => ({
     key,
 });
 
-export const resetSource = key => ({
-    type: RESET_SOURCE,
-    key,
-});
-
 export const requestData = (source, key) => ({
     type: REQUEST_DATA,
     source,

package/src/App/Reducers/Api/Helpers.js

@@ -1,7 +1,6 @@
 import {
     fetchDataIfNeeded,
     invalidateSource,
-    resetSource,
     postData,
     deleteData,
     dismissRequest,
@@ -18,10 +17,6 @@ export const dispatchFetchData = dispatch => (key, source) => {
 
 export { invalidateSource };
 
-export const dispatchResetSource = dispatch => key => {
-    return dispatch(resetSource(key));
-};
-
 export const dispatchPostData = dispatch => (key, source, data) => {
     return dispatch(postData(source, data, key));
 };

package/src/App/Reducers/Api/Reducer.js

@@ -8,7 +8,6 @@ import {
     CANCEL_REQUEST,
     EXPIRED_RESPONSE,
     RESET_DID_INVALIDATE,
-    RESET_SOURCE,
 } from './Actions';
 
 const data = (
@@ -82,11 +81,6 @@ const data = (
                 didInvalidate: false,
                 isDeleted: action.ids,
             };
-        case RESET_SOURCE:
-            return {
-                ...state,
-                source: null,
-            };
         default:
             return state;
     }
@@ -103,7 +97,6 @@ export const dataBySource = (state = {}, action) => {
         case CANCEL_REQUEST:
         case EXPIRED_RESPONSE:
         case RESET_DID_INVALIDATE:
-        case RESET_SOURCE:
             return {
                 ...state,
                 [action.key]: data(state[action.key], action),

package/src/App/Reducers/Entity/Actions.js

@@ -80,7 +80,6 @@ import {
     dispatchPostData,
     dispatchDeleteData,
     invalidateSource,
-    dispatchResetSource,
     dismissRequest,
 } from '../Api/Helpers';
 import { RECEIVE_DATA, HANDLED_NETWORK_ERROR, NETWORK_ERROR } from '../Api/Actions';
@@ -222,8 +221,6 @@ export const generateDefaultActions = (listKey, dataKey, reducerName, url, ctx =
             dispatch(unmountEntity());
             dispatch(initUnsavedEntity(reducerName));
             dispatch(mountNewEntity());
-            // source might still be set from last fetch, so reset it here
-            dispatchResetSource(dispatch)(dataKey);
             dispatch(loadDependencies());
             dispatch(showDetails());
         });

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/Designer/SubScreens/Designviews/Containers/Edit.js

@@ -3,7 +3,6 @@ import { useSelector } from 'react-redux';
 import get from 'lodash/get';
 import generateConnectedEdit, { CancelButton } from '../../../../../Components/DefaultConnectedForm';
 import Actions, { REDUCER_NAME } from '../Reducers/Actions';
-import { DESIGNER_REDUCER_NAME } from '../../../Reducers/Actions';
 import File from '../../../../../Components/FormFragments/File';
 import CircularProgress from '@material-ui/core/CircularProgress';
 import { withStyles } from '@material-ui/core/styles';
@@ -42,7 +41,7 @@ const FileInput = withStyles({
     },
 })(({ value, onChange, classes, ...props }) => {
     const itemIdentifier = useSelector(state => get(state[REDUCER_NAME], 'source.item.identifier'));
-    const itemId = useSelector(state => get(state[DESIGNER_REDUCER_NAME], 'source.id'));
+    const itemId = useSelector(state => get(state[REDUCER_NAME], 'source.item.id'));
     const colorGroupEntries = useSelector(getGroupEntries('color'));
     const viewImages = useSelector(state => get(state[REDUCER_NAME], 'viewImages'));
     if (colorGroupEntries.length) {

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',