@configuratorware/configurator-admingui 1.34.2 → 1.35.1

package/App/Config/defaultConfig.js

@@ -69,6 +69,14 @@ var _default = {
         name: 'tags'
       }]
     }]
+  }, {
+    name: 'finderitems',
+    label: 'finder',
+    credentials: ['question_trees'],
+    items: [{
+      name: 'finder',
+      label: 'question_trees'
+    }]
   }, {
     name: 'configurations',
     label: 'user_configuration',

package/App/Config/icons.js

@@ -13,6 +13,7 @@ var iconMap = {
   items: 'local_offer',
   creatoritems: 'perm_data_setting',
   designeritems: 'create',
+  finderitems: 'filter_alt',
   configurations: 'format_list_bulleted',
   basic_settings: 'settings',
   clients: 'filter_9_plus'

package/App/Translations.js

@@ -39,6 +39,7 @@ require("./i18n").use({
     design_production_methods: 'Production methods',
     roles: 'Roles',
     basic_settings: 'Settings',
+    question_trees: 'Question Trees',
     //General
     selectAll: 'select all',
     unSelectAll: 'unselect all',
@@ -105,6 +106,7 @@ require("./i18n").use({
     design_production_methods: 'Produktionsverfahren',
     roles: 'Rollen',
     basic_settings: 'Einstellungen',
+    question_trees: 'Fragebäume',
     // ROUTING
     'No routing found for the specified URL[DOT]': 'Kein Routing für die angegebene URL gefunden.',
     // DELETE ITEMS

package/Components/FormFragments/File.js

@@ -73,7 +73,8 @@ var styles = {
     opacity: 0
   },
   fileInputName: {
-    display: 'inline-block'
+    display: 'inline-block',
+    marginLeft: 15
   },
   folderIcon: {
     verticalAlign: 'middle',

package/Components/FormFragments/Select.js

@@ -28,7 +28,7 @@ var select = function select(props) {
       width: '100%'
     },
     label: props.label,
-    value: value || '',
+    value: value,
     onChange: function onChange(event) {
       if (props.useObjects && props.sourceConfig) {
         var key = props.sourceConfig.value;
@@ -43,7 +43,10 @@ var select = function select(props) {
     },
     disabled: props.disabled,
     error: props.error,
-    shrinkLabel: props.shrinkLabel
+    shrinkLabel: props.shrinkLabel,
+    placeholderValue: props.placeholderValue,
+    placeholder: props.placeholder,
+    disablePlaceholder: props.disablePlaceholder
   }, props.source.map(function (item, idx) {
     var _getInputItemParamsBy = (0, _InputWithSource.getInputItemParamsByConfig)(item, props.sourceConfig),
         value = _getInputItemParamsBy.value,

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

@@ -200,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/Edit.js

@@ -0,0 +1,49 @@
+"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"] = void 0;
+
+var _Actions = _interopRequireWildcard(require("../Reducers/Actions"));
+
+var _DefaultConnectedForm = _interopRequireDefault(require("../../../Components/DefaultConnectedForm"));
+
+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; }
+
+var setFieldData = _Actions["default"].setFieldData,
+    postData = _Actions["default"].postData;
+var formFields = [{
+  name: 'identifier',
+  label: 'identifier',
+  type: 'text'
+}, {
+  name: 'texts',
+  label: 'Title',
+  type: 'intl',
+  intl: {
+    name: 'title',
+    type: 'text'
+  }
+}, {
+  name: 'data',
+  type: 'intl',
+  label: 'questionTree',
+  accept: '.json',
+  deleteEnabled: false,
+  showFileName: true,
+  intl: {
+    name: 'fileName',
+    type: 'file'
+  }
+}];
+
+var _default = (0, _DefaultConnectedForm["default"])(formFields, _Actions.FINDER_REDUCER_NAME, setFieldData, postData);
+
+exports["default"] = _default;

package/Screens/Finder/Containers/List.js

@@ -0,0 +1,39 @@
+"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"] = void 0;
+
+var _Actions = _interopRequireWildcard(require("../Reducers/Actions"));
+
+var _DefaultConnectedList = _interopRequireDefault(require("../../../Components/DefaultConnectedList"));
+
+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; }
+
+var columns = [{
+  name: 'identifier',
+  label: 'Identifier',
+  filterable: true,
+  sortable: true
+}, {
+  name: 'translated_title',
+  label: 'Title',
+  filterable: true,
+  sortable: true
+}];
+var listParams = {
+  entity: 'questionTree',
+  orderdir: 'asc',
+  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);
+
+exports["default"] = _default;

package/Screens/Finder/Reducers/Actions.js

@@ -0,0 +1,137 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.FINDER_UPLOAD_KEY = exports.FINDER_ITEM_URL = exports.FINDER_REDUCER_NAME = exports.FINDER_DATA_KEY = exports.FINDER_LIST_URL = exports.FINDER_LIST_KEY = void 0;
+
+var _Helpers = require("../../../App/Reducers/Api/Helpers");
+
+var _Actions = require("../../../App/Reducers/Entity/Actions");
+
+var _lodash = require("lodash");
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+var FINDER_LIST_KEY = 'questiontrees';
+exports.FINDER_LIST_KEY = FINDER_LIST_KEY;
+var FINDER_LIST_URL = 'questiontrees';
+exports.FINDER_LIST_URL = FINDER_LIST_URL;
+var FINDER_DATA_KEY = 'questiontree';
+exports.FINDER_DATA_KEY = FINDER_DATA_KEY;
+var FINDER_REDUCER_NAME = 'questiontreeData';
+exports.FINDER_REDUCER_NAME = FINDER_REDUCER_NAME;
+var FINDER_ITEM_URL = 'questiontrees/{itemId}';
+exports.FINDER_ITEM_URL = FINDER_ITEM_URL;
+var FINDER_UPLOAD_KEY = 'questionTreeUpload';
+exports.FINDER_UPLOAD_KEY = FINDER_UPLOAD_KEY;
+var actions = (0, _Actions.generateDefaultActions)(FINDER_LIST_KEY, FINDER_DATA_KEY, FINDER_REDUCER_NAME, FINDER_LIST_URL);
+var originalPostDataAction = actions.postData;
+
+var uploadFile = function uploadFile(filename, jsonContent, languageId, questionTreeId, dispatch, resolve, cb) {
+  var files = new FormData();
+  var blob = new Blob([jsonContent], {
+    type: 'text/json'
+  });
+  files.append('file', blob, filename);
+  (0, _Helpers.dispatchPostData)(dispatch)(FINDER_UPLOAD_KEY, "questiontrees/".concat(questionTreeId, "/data/").concat(languageId, "/upload"), files).then(function (uploadApiAction) {
+    if (uploadApiAction.type === _Helpers.RECEIVE_DATA) {
+      cb();
+    } else {
+      resolve(uploadApiAction);
+    }
+  });
+};
+
+actions.postData = function () {
+  return function (dispatch, getState) {
+    return new Promise( /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(resolve) {
+        var state, languages, result, filesToUpload, questionTreeId, checkFilesToUpload;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                state = (0, _lodash.cloneDeep)(getState()[FINDER_REDUCER_NAME]);
+                languages = (0, _lodash.cloneDeep)(getState()['language']).languages;
+                _context.next = 4;
+                return dispatch(originalPostDataAction());
+
+              case 4:
+                result = _context.sent;
+                filesToUpload = [];
+
+                if (state.data.data.value.length > 0 && result && result.data && result.data.id) {
+                  questionTreeId = result.data.id;
+                  state.data.data.value.forEach(function (treeFile) {
+                    var languageId = languages.findIndex(function (language) {
+                      return language.iso === treeFile.language;
+                    }) + 1;
+
+                    if (languageId > 0 && treeFile.fileName.name) {
+                      filesToUpload.push({
+                        value: treeFile.fileName,
+                        languageId: languageId,
+                        questionTreeId: questionTreeId
+                      });
+                    }
+                  });
+
+                  checkFilesToUpload = function checkFilesToUpload() {
+                    var file = filesToUpload.length ? filesToUpload[0] : null;
+
+                    if (file === null) {
+                      dispatch(originalPostDataAction());
+                      return;
+                    }
+
+                    var reader = new FileReader();
+
+                    reader.onload = function (fileContent) {
+                      var text = reader.result; // "repair" (possibly) broken json from mindmap tool
+
+                      try {
+                        text = text.replace(/''"/g, '"');
+                        text = text.replace(/"''/g, '"');
+                        text = text.replace(/'"/g, '"');
+                        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');
+                      } catch (e) {
+                        console.log('error doing json replacements');
+                      }
+
+                      uploadFile(file.value.name, text, file.languageId, questionTreeId, dispatch, resolve, function () {
+                        (0, _lodash.remove)(filesToUpload, function (n) {
+                          return n === file;
+                        });
+                        checkFilesToUpload();
+                      });
+                    };
+
+                    reader.readAsText(file.value);
+                  };
+
+                  checkFilesToUpload();
+                }
+
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+  };
+};
+
+var _default = actions;
+exports["default"] = _default;

package/Screens/Finder/Reducers/FinderReducer.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.finderData = void 0;
+
+var _Actions = require("./Actions");
+
+var _Reducer = require("../../../App/Reducers/Entity/Reducer");
+
+var _FeatureReducers = require("../../../App/FeatureReducers");
+
+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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
+  id: null,
+  identifier: '',
+  texts: [],
+  data: []
+}, _Actions.FINDER_DATA_KEY));
+
+var finderData = (0, _FeatureReducers.createFeatureReducer)(_Actions.FINDER_REDUCER_NAME, function () {
+  var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
+  var action = arguments.length > 1 ? arguments[1] : undefined;
+  state = (0, _Reducer.defaultEntityReducer)(state, action, initialState);
+  return state;
+});
+exports.finderData = finderData;
+var _default = finderData;
+exports["default"] = _default;

package/Screens/Finder/Screen.js

@@ -0,0 +1,32 @@
+"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"] = void 0;
+
+var _Actions = _interopRequireWildcard(require("./Reducers/Actions"));
+
+var _List = _interopRequireDefault(require("./Containers/List"));
+
+var _Edit = _interopRequireDefault(require("./Containers/Edit"));
+
+require("./Translations");
+
+var _DefaultConnectedScreen = require("../../Components/DefaultConnectedScreen");
+
+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; }
+
+var invalidateList = _Actions["default"].invalidateList,
+    triggerUnsavedEntity = _Actions["default"].triggerUnsavedEntity,
+    hideDetails = _Actions["default"].hideDetails;
+
+var _default = (0, _DefaultConnectedScreen.generateConnectedSplitScreen)('question_trees', _List["default"], _Edit["default"], _Actions.FINDER_REDUCER_NAME, invalidateList, triggerUnsavedEntity, hideDetails);
+
+exports["default"] = _default;

package/Screens/Finder/Translations.js

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

package/Screens/Finder/index.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _Screen = _interopRequireDefault(require("./Screen"));
+
+var _FinderReducer = _interopRequireDefault(require("./Reducers/FinderReducer"));
+
+var _FeatureReducers = require("../../App/FeatureReducers");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+(0, _FeatureReducers.addReducers)(_FinderReducer["default"]);
+var _default = {
+  Screen: _Screen["default"],
+  credentials: ['question_trees']
+};
+exports["default"] = _default;

package/Screens/Option/Containers/Edit.js

@@ -21,6 +21,12 @@ var _LocalizedPriceTextField = require("../../../Components/LocalizedPriceTextFi
 
 var _LocalizedPriceValue = _interopRequireDefault(require("../../../Components/LocalizedPriceValue"));
 
+var _i18n = require("../../../App/i18n");
+
+var _reactRedux = require("react-redux");
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
 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; }
@@ -39,6 +45,20 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+var noValidationPlaceholder = 'noValidation';
+var InputValidationTypeField = (0, _reactRedux.connect)(function (state) {
+  var hasTextinput = _lodash["default"].get(state, "".concat(_Actions.OPTION_REDUCER_NAME, ".data.hasTextinput.value"), false);
+
+  return {
+    hasTextinput: hasTextinput
+  };
+})(function (_ref) {
+  var field = _ref.field,
+      renderWrappedInput = _ref.renderWrappedInput,
+      hasTextinput = _ref.hasTextinput;
+  field.disabled = !hasTextinput;
+  return /*#__PURE__*/_react["default"].createElement("div", null, renderWrappedInput(field));
+});
 var formFields = [{
   name: 'identifier',
   label: 'Identifier',
@@ -73,14 +93,44 @@ var formFields = [{
     name: 'description',
     type: 'markDown'
   }
+}, {
+  name: 'hasTextinput',
+  label: 'hasTextinput',
+  type: 'toggle'
+}, {
+  type: InputValidationTypeField,
+  field: {
+    name: 'inputValidationType',
+    label: 'hasTextinputValidation',
+    type: 'dynSource',
+    placeholder: (0, _i18n.T)(noValidationPlaceholder),
+    placeholderValue: null,
+    disablePlaceholder: false,
+    shrinkLabel: true,
+    sourceConfig: {
+      text: 'label',
+      value: 'value'
+    },
+    dynSource: {
+      type: 'select',
+      listKey: 'options/inputvalidationtypes',
+      url: 'options/inputvalidationtypes',
+      mapItems: function mapItems(item) {
+        return {
+          value: item,
+          label: (0, _i18n.T)(item)
+        };
+      }
+    }
+  }
 }, {
   name: 'prices',
   label: 'Prices',
   type: 'dynSource',
   sourceConfig: {
-    text: function text(_ref) {
-      var identifier = _ref.identifier,
-          currency = _ref.currency;
+    text: function text(_ref2) {
+      var identifier = _ref2.identifier,
+          currency = _ref2.currency;
       return "".concat(identifier, " / ").concat(currency.symbol, " (").concat(currency.iso, ")");
     }
   },

package/Screens/Option/Reducers/Reducer.js

@@ -32,6 +32,8 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)(_object
   configurable: false,
   deactivated: false,
   price: null,
+  hasTextinput: false,
+  inputValidationType: null,
   texts: [],
   // title, abstract, description
   prices: {

package/Screens/Option/Translations.js

@@ -2,6 +2,11 @@
 
 require("../../App/i18n").use({
   en: {
+    hasTextinput: 'Has Textinput',
+    hasTextinputValidation: 'Textinput Type',
+    optionInputNotEmpty: 'Text must not be empty',
+    optionInputNumber: 'Text must be a number',
+    noValidation: 'No validation',
     option: {
       addButtonLabel: 'Add Option',
       prices: {
@@ -12,6 +17,11 @@ require("../../App/i18n").use({
   },
   de: {
     'Sequence number': 'Reihenfolge',
+    hasTextinput: 'Texteingabe',
+    hasTextinputValidation: 'Art der Texteingabe',
+    optionInputNotEmpty: 'Text darf nicht leer sein',
+    optionInputNumber: 'Text muss eine Zahl sein',
+    noValidation: 'Keine Validierung',
     option: {
       addButtonLabel: 'Option hinzufügen',
       prices: {

package/Screens/index.js

@@ -70,6 +70,8 @@ var _TrackingCodes = _interopRequireDefault(require("./TrackingCodes"));
 
 var _User = _interopRequireDefault(require("./User"));
 
+var _Finder = _interopRequireDefault(require("./Finder"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
@@ -95,7 +97,8 @@ var features = {
   roles: _Roles["default"],
   softwareupdate: _SoftwareUpdates["default"],
   trackingCodes: _TrackingCodes["default"],
-  users: _User["default"]
+  users: _User["default"],
+  finder: _Finder["default"]
 };
 exports.features = features;
 

package/UIComponents/SelectField.js

@@ -84,6 +84,8 @@ var UISelectField = /*#__PURE__*/function (_React$Component) {
           style = _this$props.style,
           children = _this$props.children,
           placeholderValue = _this$props.placeholderValue,
+          _this$props$disablePl = _this$props.disablePlaceholder,
+          disablePlaceholder = _this$props$disablePl === void 0 ? true : _this$props$disablePl,
           disableUnderline = _this$props.disableUnderline,
           disabled = _this$props.disabled,
           error = _this$props.error,
@@ -110,7 +112,7 @@ var UISelectField = /*#__PURE__*/function (_React$Component) {
         disabled: disabled
       }, placeholder && /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
         value: placeholderValue,
-        disabled: true
+        disabled: disablePlaceholder
       }, placeholder), children), /*#__PURE__*/_react["default"].createElement(_FormHelperText["default"], null, error));
     }
   }]);

package/package.json

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

package/src/App/Config/defaultConfig.js

@@ -94,6 +94,17 @@ export default {
                 },
             ],
         },
+        {
+          name: 'finderitems',
+          label: 'finder',
+          credentials: ['question_trees'],
+          items: [
+            {
+                name: 'finder',
+                label: 'question_trees',
+            },
+          ]
+        },
         {
             name: 'configurations',
             label: 'user_configuration',

package/src/App/Config/icons.js

@@ -6,6 +6,7 @@ const iconMap = {
     items: 'local_offer',
     creatoritems: 'perm_data_setting',
     designeritems: 'create',
+    finderitems: 'filter_alt',
     configurations: 'format_list_bulleted',
     basic_settings: 'settings',
     clients: 'filter_9_plus',

package/src/App/Translations.js

@@ -40,6 +40,7 @@ require('./i18n').use(
             design_production_methods: 'Production methods',
             roles: 'Roles',
             basic_settings: 'Settings',
+            question_trees: 'Question Trees',
             //General
             selectAll: 'select all',
             unSelectAll: 'unselect all',
@@ -112,6 +113,7 @@ require('./i18n').use(
             design_production_methods: 'Produktionsverfahren',
             roles: 'Rollen',
             basic_settings: 'Einstellungen',
+            question_trees: 'Fragebäume',
             // ROUTING
 
             'No routing found for the specified URL[DOT]': 'Kein Routing für die angegebene URL gefunden.',

package/src/Components/FormFragments/File.js

@@ -34,6 +34,7 @@ const styles = {
     },
     fileInputName: {
         display: 'inline-block',
+        marginLeft: 15,
     },
     folderIcon: {
         verticalAlign: 'middle',

package/src/Components/FormFragments/Select.js

@@ -12,7 +12,7 @@ const select = props => {
         <SelectField
             style={{ width: '100%' }}
             label={props.label}
-            value={value || ''}
+            value={value}
             onChange={event => {
                 if (props.useObjects && props.sourceConfig) {
                     const key = props.sourceConfig.value;
@@ -26,6 +26,9 @@ const select = props => {
             disabled={props.disabled}
             error={props.error}
             shrinkLabel={props.shrinkLabel}
+            placeholderValue={props.placeholderValue}
+            placeholder={props.placeholder}
+            disablePlaceholder={props.disablePlaceholder}
         >
             {props.source.map((item, idx) => {
                 const { value, text } = getInputItemParamsByConfig(item, props.sourceConfig);

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

@@ -115,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/Edit.js

@@ -0,0 +1,35 @@
+import Actions, { FINDER_REDUCER_NAME } from '../Reducers/Actions';
+const { setFieldData, postData } = Actions;
+
+const formFields = [
+    {
+        name: 'identifier',
+        label: 'identifier',
+        type: 'text',
+    },
+    {
+        name: 'texts',
+        label: 'Title',
+        type: 'intl',
+        intl: {
+            name: 'title',
+            type: 'text',
+        },
+    },
+    {
+        name: 'data',
+        type: 'intl',
+        label: 'questionTree',
+        accept: '.json',
+        deleteEnabled: false,
+        showFileName: true,
+        intl: {
+            name: 'fileName',
+            type: 'file',
+       
+        },
+    },
+];
+
+import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
+export default generateConnectedEdit(formFields, FINDER_REDUCER_NAME, setFieldData, postData);

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

@@ -0,0 +1,36 @@
+import Actions, { FINDER_LIST_KEY, FINDER_REDUCER_NAME } from '../Reducers/Actions';
+
+const columns = [
+    {
+        name: 'identifier',
+        label: 'Identifier',
+        filterable: true,
+        sortable: true,
+    },
+    {
+        name: 'translated_title',
+        label: 'Title',
+        filterable: true,
+        sortable: true,
+    },
+];
+
+const listParams = {
+    entity: 'questionTree',
+    orderdir: 'asc',
+    addButtonLabel: 'addButtonLabel',
+};
+
+import generateConnectedList from '../../../Components/DefaultConnectedList';
+
+export default generateConnectedList(
+    columns,
+    listParams,
+    FINDER_LIST_KEY,
+    Actions.listAction,
+    Actions.detailsAction,
+    Actions.hideDetails,
+    Actions.showDetails,
+    Actions.createEntity,
+    Actions.deleteEntities,
+);

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

@@ -0,0 +1,96 @@
+import { dispatchPostData, RECEIVE_DATA } from "../../../App/Reducers/Api/Helpers"; 
+export const FINDER_LIST_KEY = 'questiontrees';
+export const FINDER_LIST_URL = 'questiontrees';
+export const FINDER_DATA_KEY = 'questiontree';
+export const FINDER_REDUCER_NAME = 'questiontreeData';
+export const FINDER_ITEM_URL = 'questiontrees/{itemId}';
+export const FINDER_UPLOAD_KEY = 'questionTreeUpload';
+
+import { generateDefaultActions } from '../../../App/Reducers/Entity/Actions'; 
+import { cloneDeep, remove } from "lodash"; 
+
+const actions = generateDefaultActions(
+     FINDER_LIST_KEY,
+     FINDER_DATA_KEY,
+     FINDER_REDUCER_NAME,
+     FINDER_LIST_URL,
+ );
+
+const originalPostDataAction = actions.postData;
+
+const uploadFile = (filename, jsonContent, languageId, questionTreeId, dispatch, resolve, cb) => {
+    const files = new FormData();
+    const blob = new Blob([jsonContent], {
+        type: 'text/json'
+    });
+    files.append('file', blob, filename);
+
+    dispatchPostData(dispatch)(FINDER_UPLOAD_KEY, `questiontrees/${questionTreeId}/data/${languageId}/upload`, files).then(uploadApiAction => {
+        if (uploadApiAction.type === RECEIVE_DATA) {
+            cb();
+        } else {
+            resolve(uploadApiAction);
+        }
+    });
+};
+
+actions.postData = () => (dispatch, getState) => {
+    return new Promise(async resolve => {
+        const state = cloneDeep(getState()[FINDER_REDUCER_NAME]);
+        const languages = cloneDeep(getState()['language']).languages;
+
+        const result = await dispatch(originalPostDataAction());
+        const filesToUpload = [];
+        if (state.data.data.value.length > 0 && result && result.data && result.data.id) {
+            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,
+                        languageId,
+                        questionTreeId
+                    });
+                }
+            });
+            
+            const checkFilesToUpload = () => {
+                let file = filesToUpload.length ? filesToUpload[0] : null;
+         
+                if (file === null) {
+                    dispatch(originalPostDataAction());
+                    return;
+                }
+    
+                const reader = new FileReader();
+                reader.onload = function(fileContent) {
+                    let text = reader.result;
+                    // "repair" (possibly) broken json from mindmap tool
+                    try {
+                      text = text.replace(/''"/g, '"');
+                      text = text.replace(/"''/g, '"');
+                      text = text.replace(/'"/g, '"');
+                      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');
+                    } catch (e) {
+                      console.log('error doing json replacements')
+                    }
+                    uploadFile(file.value.name, text, file.languageId, questionTreeId, dispatch, resolve, () => {
+                        remove(filesToUpload, function(n) {
+                            return n === file;
+                        });
+        
+                        checkFilesToUpload();
+                    });
+                }
+                reader.readAsText(file.value);
+
+            };
+            checkFilesToUpload();
+        }
+    });
+};
+
+export default actions;

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

@@ -0,0 +1,22 @@
+import { FINDER_DATA_KEY, FINDER_REDUCER_NAME } from './Actions';
+import { getDefaultEntityState, defaultEntityReducer } from '../../../App/Reducers/Entity/Reducer';
+import { createFeatureReducer } from '../../../App/FeatureReducers';
+
+const initialState = {
+    ...getDefaultEntityState(
+        {
+            id: null,
+            identifier: '',
+            texts: [],
+            data: [],
+        },
+        FINDER_DATA_KEY
+    ),
+};
+
+export const finderData = createFeatureReducer(FINDER_REDUCER_NAME, (state = initialState, action) => {
+    state = defaultEntityReducer(state, action, initialState);
+    return state;
+});
+
+export default finderData;

package/src/Screens/Finder/Screen.js

@@ -0,0 +1,19 @@
+import Actions, { FINDER_REDUCER_NAME } from './Reducers/Actions';
+const { invalidateList, triggerUnsavedEntity, hideDetails } = Actions;
+
+import List from './Containers/List';
+import Edit from './Containers/Edit';
+
+import './Translations';
+
+import { generateConnectedSplitScreen } from '../../Components/DefaultConnectedScreen';
+
+export default generateConnectedSplitScreen(
+    'question_trees',
+    List,
+    Edit,
+    FINDER_REDUCER_NAME,
+    invalidateList,
+    triggerUnsavedEntity,
+    hideDetails
+);

package/src/Screens/Finder/Translations.js

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

package/src/Screens/Finder/index.js

@@ -0,0 +1,11 @@
+import Screen from './Screen';
+import designerData from './Reducers/FinderReducer';
+
+import { addReducers } from '../../App/FeatureReducers';
+
+addReducers(designerData);
+
+export default {
+    Screen,
+    credentials: ['question_trees'],
+};

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

@@ -1,6 +1,39 @@
 import React from 'react';
 import Actions, { OPTION_REDUCER_NAME } from '../Reducers/Actions';
 import attributesDataStructure from '../../Item/DataStructures/Attributes/Editor';
+import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
+import EditorPopup from '../../Item/Components/AttributeEditorPopup';
+import {LocalizedPriceTextField} from "../../../Components/LocalizedPriceTextField";
+import LocalizedPriceValue from "../../../Components/LocalizedPriceValue"; 
+import {T} from "../../../App/i18n"; import {connect, useSelector} from "react-redux";
+import _ from "lodash";
+
+const noValidationPlaceholder = 'noValidation';
+
+const InputValidationTypeField = connect(
+    state => {
+        const hasTextinput = _.get(
+            state,
+            `${OPTION_REDUCER_NAME}.data.hasTextinput.value`,
+            false
+        );
+        return {
+            hasTextinput
+        };
+    },
+)(
+    ({
+        field,
+        renderWrappedInput,
+        hasTextinput,
+    }) => {
+        field.disabled = !hasTextinput;
+        return (
+          <div >
+              {renderWrappedInput(field)}
+          </div>
+        )
+});
 
 const formFields = [
     {
@@ -42,6 +75,36 @@ const formFields = [
             type: 'markDown',
         },
     },
+    {
+        name: 'hasTextinput',
+        label: 'hasTextinput',
+        type: 'toggle',
+    },
+    {
+        type: InputValidationTypeField,
+        field: {
+            name: 'inputValidationType',
+            label: 'hasTextinputValidation',
+            type: 'dynSource',
+            placeholder: T(noValidationPlaceholder),
+            placeholderValue: null,
+            disablePlaceholder: false,
+            shrinkLabel: true,
+            sourceConfig: {
+                text: 'label',
+                value: 'value'
+            },
+            dynSource: {
+                type: 'select',
+                listKey: 'options/inputvalidationtypes',
+                url: 'options/inputvalidationtypes',
+                mapItems: item  => ({
+                      value: item,
+                      label: T(item),
+                }),
+            },
+        },
+    },
     {
         name: 'prices',
         label: 'Prices',
@@ -90,10 +153,6 @@ const formFields = [
     ...attributesDataStructure,
 ];
 
-import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
-import EditorPopup from '../../Item/Components/AttributeEditorPopup';
-import {LocalizedPriceTextField} from "../../../Components/LocalizedPriceTextField";
-import LocalizedPriceValue from "../../../Components/LocalizedPriceValue";
 const BaseDataForm = generateConnectedEdit(
     formFields,
     OPTION_REDUCER_NAME,

package/src/Screens/Option/Reducers/Reducer.js

@@ -15,6 +15,8 @@ const initialState = {
             configurable: false,
             deactivated: false,
             price: null,
+            hasTextinput: false,
+            inputValidationType: null,
             texts: [], // title, abstract, description
             prices: {
                 value: [],

package/src/Screens/Option/Translations.js

@@ -1,6 +1,11 @@
 require('../../App/i18n').use(
     {
         en: {
+            hasTextinput: 'Has Textinput',
+            hasTextinputValidation: 'Textinput Type',
+            optionInputNotEmpty: 'Text must not be empty',
+            optionInputNumber: 'Text must be a number',
+            noValidation: 'No validation',
             option: {
                 addButtonLabel: 'Add Option',
                 prices: {
@@ -11,6 +16,11 @@ require('../../App/i18n').use(
         },
         de: {
             'Sequence number': 'Reihenfolge',
+            hasTextinput: 'Texteingabe',
+            hasTextinputValidation: 'Art der Texteingabe',
+            optionInputNotEmpty: 'Text darf nicht leer sein',
+            optionInputNumber: 'Text muss eine Zahl sein',
+            noValidation: 'Keine Validierung',
             option: {
                 addButtonLabel: 'Option hinzufügen',
                 prices: {

package/src/Screens/index.js

@@ -19,6 +19,7 @@ import Savedconfigurations from './Savedconfigurations';
 import SoftwareUpdates from './SoftwareUpdates';
 import TrackingCodes from './TrackingCodes';
 import User from './User';
+import Finder from './Finder'
 
 export { Dashboard };
 export { Login };
@@ -43,6 +44,7 @@ export const features = {
     softwareupdate: SoftwareUpdates,
     trackingCodes: TrackingCodes,
     users: User,
+    finder: Finder,
 };
 
 for (let { name } of getFlattenedFeatures()) {

package/src/UIComponents/SelectField.js

@@ -32,6 +32,7 @@ class UISelectField extends React.Component {
             style,
             children,
             placeholderValue,
+            disablePlaceholder = true,
             disableUnderline,
             disabled,
             error,
@@ -52,7 +53,7 @@ class UISelectField extends React.Component {
                     disabled={disabled}
                 >
                     {placeholder && (
-                        <MenuItem value={placeholderValue} disabled>
+                        <MenuItem value={placeholderValue} disabled={disablePlaceholder}>
                             {placeholder}
                         </MenuItem>
                     )}