@configuratorware/configurator-admingui 1.35.0 → 1.35.2

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.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;
+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;
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
@@ -43,6 +43,8 @@ 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 {
@@ -62,6 +64,15 @@ 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.dispatchFetchData = void 0;
+exports["default"] = exports.getMethods = exports.apiActionHandler = exports.handleNetworkErrorAction = exports.dispatchDeleteData = exports.dispatchPostData = exports.dispatchResetSource = exports.dispatchFetchData = void 0;
 
 var _Actions = require("./Actions");
 
@@ -45,6 +45,14 @@ 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,6 +84,11 @@ var data = function data() {
         isDeleted: action.ids
       });
 
+    case _Actions.RESET_SOURCE:
+      return _objectSpread(_objectSpread({}, state), {}, {
+        source: null
+      });
+
     default:
       return state;
   }
@@ -103,6 +108,7 @@ 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,7 +305,9 @@ var generateDefaultActions = function generateDefaultActions(listKey, dataKey, r
       return dispatch(triggerUnsavedEntity()).then(function () {
         dispatch(unmountEntity());
         dispatch(initUnsavedEntity(reducerName));
-        dispatch(mountNewEntity());
+        dispatch(mountNewEntity()); // source might still be set from last fetch, so reset it here
+
+        (0, _Helpers.dispatchResetSource)(dispatch)(dataKey);
         dispatch(loadDependencies());
         dispatch(showDetails());
       });

package/Screens/Designer/SubScreens/Designviews/Containers/Edit.js

@@ -17,6 +17,8 @@ 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"));
@@ -108,7 +110,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[_Actions.REDUCER_NAME], 'source.item.id');
+    return (0, _get["default"])(state[_Actions2.DESIGNER_REDUCER_NAME], 'source.id');
   });
   var colorGroupEntries = (0, _reactRedux.useSelector)(getGroupEntries('color'));
   var viewImages = (0, _reactRedux.useSelector)(function (state) {
@@ -198,7 +200,7 @@ var formFields = [{
   }
 }, {
   name: 'images',
-  label: 'Item View image',
+  label: "designcontainer.imageUploadLabel",
   type: FileInput,
   accept: '.png,.jpg',
   openEnabled: false,

package/Screens/Designer/SubScreens/Designviews/Translations.js

@@ -5,12 +5,18 @@ require("../../../../App/i18n").use({
     designviews: 'Designviews',
     designview: {
       addButtonLabel: 'Add Designview'
+    },
+    designcontainer: {
+      imageUploadLabel: "Background image of the designarea"
     }
   },
   de: {
     designviews: 'Designansichten',
     designview: {
       addButtonLabel: 'Designansichten hinzufügen'
+    },
+    designcontainer: {
+      imageUploadLabel: "Hintergrundbild der Designfläche"
     }
   }
 }, true);

package/Screens/Finder/Containers/List.js

@@ -31,7 +31,7 @@ var columns = [{
 var listParams = {
   entity: 'questionTree',
   orderdir: 'asc',
-  addButtonLabel: 'item.addButtonLabel'
+  addButtonLabel: 'addButtonLabel'
 };
 
 var _default = (0, _DefaultConnectedList["default"])(columns, listParams, _Actions.FINDER_LIST_KEY, _Actions["default"].listAction, _Actions["default"].detailsAction, _Actions["default"].hideDetails, _Actions["default"].showDetails, _Actions["default"].createEntity, _Actions["default"].deleteEntities);

package/Screens/Finder/Reducers/Actions.js

@@ -99,8 +99,9 @@ actions.postData = function () {
                         text = text.replace(/"'/g, '"');
                         text = text.replace(/'/g, '"'); // fix fieldnames wrapped in single quotes - json only allows for double quotes
 
-                        text = text.replace(/(['"])?([a-zA-Z0-9_]+)(['"])?:([^\/])/g, '"$2":$4');
+                        text = JSON.stringify(eval(text));
                       } catch (e) {
+                        console.log(e);
                         console.log('error doing json replacements');
                       }
 

package/Screens/Finder/Translations.js

@@ -2,9 +2,11 @@
 
 require("../../App/i18n").use({
   en: {
-    questionTree: 'Question Tree'
+    questionTree: 'Question Tree',
+    addButtonLabel: 'Add Question Tree'
   },
   de: {
-    questionTree: 'Fragebaum'
+    questionTree: 'Fragebaum',
+    addButtonLabel: 'Fragebaum hinzufügen'
   }
 }, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.35.0",
+  "version": "1.35.2",
   "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.35.0",
+    "redhotmagma-visualization": "1.35.2",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

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

@@ -11,6 +11,7 @@ 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,
@@ -22,6 +23,11 @@ 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,6 +1,7 @@
 import {
     fetchDataIfNeeded,
     invalidateSource,
+    resetSource,
     postData,
     deleteData,
     dismissRequest,
@@ -17,6 +18,10 @@ 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,6 +8,7 @@ import {
     CANCEL_REQUEST,
     EXPIRED_RESPONSE,
     RESET_DID_INVALIDATE,
+    RESET_SOURCE,
 } from './Actions';
 
 const data = (
@@ -81,6 +82,11 @@ const data = (
                 didInvalidate: false,
                 isDeleted: action.ids,
             };
+        case RESET_SOURCE:
+            return {
+                ...state,
+                source: null,
+            };
         default:
             return state;
     }
@@ -97,6 +103,7 @@ 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,6 +80,7 @@ import {
     dispatchPostData,
     dispatchDeleteData,
     invalidateSource,
+    dispatchResetSource,
     dismissRequest,
 } from '../Api/Helpers';
 import { RECEIVE_DATA, HANDLED_NETWORK_ERROR, NETWORK_ERROR } from '../Api/Actions';
@@ -221,6 +222,8 @@ 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/Designer/SubScreens/Designviews/Containers/Edit.js

@@ -3,6 +3,7 @@ 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';
@@ -41,7 +42,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[REDUCER_NAME], 'source.item.id'));
+    const itemId = useSelector(state => get(state[DESIGNER_REDUCER_NAME], 'source.id'));
     const colorGroupEntries = useSelector(getGroupEntries('color'));
     const viewImages = useSelector(state => get(state[REDUCER_NAME], 'viewImages'));
     if (colorGroupEntries.length) {
@@ -114,7 +115,7 @@ const formFields = [
     },
     {
         name: 'images',
-        label: 'Item View image',
+        label: `designcontainer.imageUploadLabel`,
         type: FileInput,
         accept: '.png,.jpg',
         openEnabled: false,

package/src/Screens/Designer/SubScreens/Designviews/Translations.js

@@ -5,12 +5,18 @@ require('../../../../App/i18n').use(
             designview: {
                 addButtonLabel: 'Add Designview',
             },
+            designcontainer: {
+                imageUploadLabel: "Background image of the designarea",
+            },
         },
         de: {
             designviews: 'Designansichten',
             designview: {
                 addButtonLabel: 'Designansichten hinzufügen',
             },
+            designcontainer: {
+                imageUploadLabel: "Hintergrundbild der Designfläche",
+            },
         },
     },
     true

package/src/Screens/Finder/Containers/List.js

@@ -18,7 +18,7 @@ const columns = [
 const listParams = {
     entity: 'questionTree',
     orderdir: 'asc',
-    addButtonLabel: 'item.addButtonLabel',
+    addButtonLabel: 'addButtonLabel',
 };
 
 import generateConnectedList from '../../../Components/DefaultConnectedList';

package/src/Screens/Finder/Reducers/Actions.js

@@ -45,6 +45,7 @@ actions.postData = () => (dispatch, getState) => {
             const questionTreeId = result.data.id;
             state.data.data.value.forEach((treeFile) => {
                 const languageId = languages.findIndex((language) => language.iso === treeFile.language) + 1;
+                
                 if (languageId > 0 && treeFile.fileName.name) {
                     filesToUpload.push({
                         value: treeFile.fileName,
@@ -61,7 +62,6 @@ actions.postData = () => (dispatch, getState) => {
                     dispatch(originalPostDataAction());
                     return;
                 }
-    
                 const reader = new FileReader();
                 reader.onload = function(fileContent) {
                     let text = reader.result;
@@ -73,8 +73,9 @@ actions.postData = () => (dispatch, getState) => {
                       text = text.replace(/"'/g, '"');
                       text = text.replace(/'/g, '"');
                       // fix fieldnames wrapped in single quotes - json only allows for double quotes
-                      text = text.replace(/(['"])?([a-zA-Z0-9_]+)(['"])?:([^\/])/g, '"$2":$4');
+                      text = JSON.stringify(eval(text));
                     } catch (e) {
+                      console.log(e)
                       console.log('error doing json replacements')
                     }
                     uploadFile(file.value.name, text, file.languageId, questionTreeId, dispatch, resolve, () => {

package/src/Screens/Finder/Translations.js

@@ -2,9 +2,11 @@ require('../../App/i18n').use(
     {
         en: {
             questionTree: 'Question Tree',
+            addButtonLabel: 'Add Question Tree',
         },
         de: {
             questionTree: 'Fragebaum',
+            addButtonLabel: 'Fragebaum hinzufügen'
         },
     },
     true