@configuratorware/configurator-admingui 1.35.2 → 1.35.4

package/App/Main.js

@@ -287,7 +287,7 @@ var Main = /*#__PURE__*/function (_Component) {
       });
 
       var credentials = this.props.credentials;
-      var showLicenseError = !this.props.license || ['creator', 'designer', 'creator+designer'].indexOf(this.props.license) < 0;
+      var showLicenseError = !this.props.license || ['creator', 'designer', 'creator+designer', 'finder'].indexOf(this.props.license) === -1;
       return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_AppBar["default"], {
         title: (0, _i18n.T)('header.title'),
         licenseInfo: /*#__PURE__*/_react["default"].createElement(_LicenseInfo["default"], {

package/App/Translations.js

@@ -15,7 +15,8 @@ require("./i18n").use({
       infoUrl: 'https://www.configuratorware.com/eula',
       creator_designer: 'creator and designer',
       creator: 'creator',
-      designer: 'designer'
+      designer: 'designer',
+      finder: 'finder'
     },
     // MENUPOINTS
     users: 'Users',
@@ -81,7 +82,8 @@ require("./i18n").use({
       infoUrl: 'https://www.configuratorware.de/eula',
       creator_designer: 'creator und designer',
       creator: 'creator',
-      designer: 'designer'
+      designer: 'designer',
+      finder: 'finder'
     },
     // MENUPOINTS
     users: 'Benutzer',

package/Screens/Designer/SubScreens/Designviews/Reducers/Actions.js

@@ -42,6 +42,13 @@ exports.START_UPLOAD = START_UPLOAD;
 var FINISH_UPLOAD = 'DESIGNVIEW_FINISH_IMAGE_UPLOAD';
 exports.FINISH_UPLOAD = FINISH_UPLOAD;
 
+var renameFile = function renameFile(originalFile, newName) {
+  return new File([originalFile], newName, {
+    type: originalFile.type,
+    lastModified: originalFile.lastModified
+  });
+};
+
 var beforeApiStateHandler = function beforeApiStateHandler(apiAction) {
   return function (dispatch, getState) {
     return new Promise(function (resolve) {
@@ -55,21 +62,22 @@ var beforeApiStateHandler = function beforeApiStateHandler(apiAction) {
         });
         return Promise.all(keys.map( /*#__PURE__*/function () {
           var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(key) {
-            var _viewImages$key, file, type, id, files, url, result;
+            var _viewImages$key, file, type, id, renamedFile, files, url, result;
 
             return regeneratorRuntime.wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
                   case 0:
                     _viewImages$key = viewImages[key], file = _viewImages$key.file, type = _viewImages$key.type, id = _viewImages$key.id;
+                    renamedFile = renameFile(file, file.name.replace(/\s/g, ''));
                     files = new FormData();
-                    files.append('file', file); //const itemId = get(state, 'source.item.id');
+                    files.append('file', renamedFile); //const itemId = get(state, 'source.item.id');
 
                     url = "/designviews/".concat(apiAction.data.id, "/").concat(type, "/upload/detail_image/").concat(id);
-                    _context.next = 6;
+                    _context.next = 7;
                     return (0, _Helpers.dispatchPostData)(dispatch)("designview/images/".concat(key), url, files);
 
-                  case 6:
+                  case 7:
                     result = _context.sent;
                     dispatch({
                       type: FINISH_UPLOAD,
@@ -77,7 +85,7 @@ var beforeApiStateHandler = function beforeApiStateHandler(apiAction) {
                     });
                     return _context.abrupt("return", result);
 
-                  case 9:
+                  case 10:
                   case "end":
                     return _context.stop();
                 }

package/Screens/License/Screen.js

@@ -62,6 +62,7 @@ var License = function License(props) {
 
   var isCreator = uploadedLicense === null && (license === 'creator' || license === 'creator+designer') || uploadedLicense === 'creator' || uploadedLicense === 'creator+designer';
   var isDesigner = uploadedLicense === null && (license === 'designer' || license === 'creator+designer') || uploadedLicense === 'designer' || uploadedLicense === 'creator+designer';
+  var isFinder = uploadedLicense === null && license && license.indexOf('finder') !== -1 || uploadedLicense && uploadedLicense.indexOf('finder') !== -1;
   var styles = {
     success: {
       color: 'green'
@@ -104,7 +105,12 @@ var License = function License(props) {
   }, /*#__PURE__*/_react["default"].createElement(_core.Typography, {
     className: "label",
     variant: "body1"
-  }, (0, _i18n.T)('license.designer')), /*#__PURE__*/_react["default"].createElement(_core.IconButton, null, isDesigner ? /*#__PURE__*/_react["default"].createElement(_CheckmarkIcon["default"], null) : /*#__PURE__*/_react["default"].createElement(_Cancel["default"], null)))));
+  }, (0, _i18n.T)('license.designer')), /*#__PURE__*/_react["default"].createElement(_core.IconButton, null, isDesigner ? /*#__PURE__*/_react["default"].createElement(_CheckmarkIcon["default"], null) : /*#__PURE__*/_react["default"].createElement(_Cancel["default"], null))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: isFinder ? 'row success' : 'row invalid'
+  }, /*#__PURE__*/_react["default"].createElement(_core.Typography, {
+    className: "label",
+    variant: "body1"
+  }, (0, _i18n.T)('license.finder')), /*#__PURE__*/_react["default"].createElement(_core.IconButton, null, isFinder ? /*#__PURE__*/_react["default"].createElement(_CheckmarkIcon["default"], null) : /*#__PURE__*/_react["default"].createElement(_Cancel["default"], null)))));
 };
 
 var mapStateToProps = function mapStateToProps(state) {

package/package.json

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

package/src/App/Main.js

@@ -148,7 +148,7 @@ class Main extends Component {
         const { credentials } = this.props;
         const showLicenseError =
             !this.props.license ||
-            ['creator', 'designer', 'creator+designer'].indexOf(this.props.license) < 0;
+            ['creator', 'designer', 'creator+designer', 'finder'].indexOf(this.props.license) === -1;
 
         return (
             <div>

package/src/App/Translations.js

@@ -16,6 +16,7 @@ require('./i18n').use(
                 creator_designer: 'creator and designer',
                 creator: 'creator',
                 designer: 'designer',
+                finder: 'finder',
             },
             // MENUPOINTS
 
@@ -88,6 +89,7 @@ require('./i18n').use(
                 creator_designer: 'creator und designer',
                 creator: 'creator',
                 designer: 'designer',
+                finder: 'finder',
             },
             // MENUPOINTS
 

package/src/Screens/Designer/SubScreens/Designviews/Reducers/Actions.js

@@ -19,6 +19,13 @@ import {
 } from '../../../../../App/Reducers/Entity/Actions';
 import { dispatchPostData } from '../../../../../App/Reducers/Api/Helpers';
 
+const renameFile = (originalFile, newName) => {
+    return new File([originalFile], newName, {
+        type: originalFile.type,
+        lastModified: originalFile.lastModified,
+    });
+};
+
 const beforeApiStateHandler = apiAction => (dispatch, getState) => {
     return new Promise(resolve => {
         const state = getState()[REDUCER_NAME];
@@ -31,8 +38,9 @@ const beforeApiStateHandler = apiAction => (dispatch, getState) => {
             return Promise.all(
                 keys.map(async key => {
                     const { file, type, id } = viewImages[key];
+                    const renamedFile = renameFile(file, file.name.replace(/\s/g, ''));
                     const files = new FormData();
-                    files.append('file', file);
+                    files.append('file', renamedFile);
                     //const itemId = get(state, 'source.item.id');
                     const url = `/designviews/${apiAction.data.id}/${type}/upload/detail_image/${id}`;
                     const result = await dispatchPostData(dispatch)(`designview/images/${key}`, url, files);

package/src/Screens/License/Screen.js

@@ -26,6 +26,10 @@ const License = props => {
         (uploadedLicense === null && (license === 'designer' || license === 'creator+designer')) ||
         uploadedLicense === 'designer' ||
         uploadedLicense === 'creator+designer';
+    
+    const isFinder =
+        (uploadedLicense === null && license && license.indexOf('finder') !== -1) ||
+        (uploadedLicense && uploadedLicense.indexOf('finder') !== -1);
 
     const styles = {
         success: {
@@ -85,6 +89,13 @@ const License = props => {
                     </Typography>
                     <IconButton>{isDesigner ? <CheckCircleIcon /> : <CancelIcon />}</IconButton>
                 </div>
+                
+                <div className={isFinder ? 'row success' : 'row invalid'}>
+                    <Typography className="label" variant="body1">
+                        {T('license.finder')}
+                    </Typography>
+                    <IconButton>{isFinder ? <CheckCircleIcon /> : <CancelIcon />}</IconButton>
+                </div>
             </div>
         </div>
     );

package/src/Screens/License/__tests__/LicenseScreen.test.js

@@ -7,7 +7,7 @@ import { initConnectedComponent } from '../../../App/TestHelpers';
 const ConnectedScreen = initConnectedComponent(License);
 
 // Labels to be shown
-const licenseTypes = ['creator', 'designer'];
+const licenseTypes = ['creator', 'designer', 'finder'];
 
 describe('License / Screen', () => {
     it('INTEGRATION - renders the screen', () => {

package/src/Screens/License/__tests__/__snapshots__/LicenseScreen.test.js.snap

@@ -178,6 +178,42 @@ exports[`License / Screen INTEGRATION - renders the screen 1`] = `
         </span>
       </button>
     </div>
+    <div
+      class="row invalid"
+    >
+      <p
+        class="MuiTypography-root-19 MuiTypography-body1-28 label"
+      >
+        <span>
+          license.finder
+        </span>
+      </p>
+      <button
+        class="MuiButtonBase-root-7 MuiIconButton-root-1"
+        tabindex="0"
+        type="button"
+      >
+        <span
+          class="MuiIconButton-label-6"
+        >
+          <svg
+            aria-hidden="true"
+            class="MuiSvgIcon-root-10"
+            focusable="false"
+            role="presentation"
+            viewBox="0 0 24 24"
+          >
+            <path
+              d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"
+            />
+            <path
+              d="M0 0h24v24H0z"
+              fill="none"
+            />
+          </svg>
+        </span>
+      </button>
+    </div>
   </div>
 </div>
 `;