@configuratorware/configurator-admingui 1.35.2 → 1.36.0-beta.0

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/Components/FormFragments/MonacoEditor.js

@@ -73,7 +73,7 @@ var MonacoEditor = (0, _withStyles["default"])({
     var editor;
     Promise.resolve().then(function () {
       return _interopRequireWildcard(require('monaco-editor/esm/vs/editor/editor.api'));
-    }).then(function () {
+    }).then(function (monaco) {
       if (ref.current) {
         editor = monaco.editor.create(ref.current, {
           value: value,

package/Screens/Client/Reducers/Reducer.js

@@ -25,12 +25,6 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
       identifier: true
     }
   },
-  email: {
-    value: '',
-    constraints: {
-      presence: true
-    }
-  },
   users: {
     value: [],
     schema: {

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,11 +1,11 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.35.2",
+  "version": "1.36.0-beta.0",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@hot-loader/react-dom": "^16.14.0",
+    "@hot-loader/react-dom": "^17.0.2",
     "@material-ui/core": "^3.9.4",
     "@material-ui/icons": "^3.0.2",
     "@tweenjs/tween.js": "^17.6.0",
@@ -15,21 +15,21 @@
     "css-element-queries": "^1.2.3",
     "downshift": "^3.4.8",
     "lodash": "^4.17.21",
-    "monaco-editor": "^0.20.0",
-    "monaco-editor-webpack-plugin": "^1.9.1",
+    "monaco-editor": "^0.33.0",
+    "monaco-editor-webpack-plugin": "^7.0.1",
     "prop-types": "^15.7.2",
     "qs": "^6.10.1",
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0",
-    "react-file-drop": "^0.2.8",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-file-drop": "^3.1.5",
     "react-hot-loader": "^4.13.0",
     "react-i18nify": "^1.11.18",
     "react-mde": "^11.5.0",
     "react-redux": "^7.2.4",
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
-    "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.35.2",
+    "react-sortable-hoc": "^2.0.0",
+    "redhotmagma-visualization": "1.36.0-beta.0",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",
@@ -39,23 +39,17 @@
     "validate.js": "^0.12.0"
   },
   "peerDependencies": {
-    "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.2.2",
-    "@babel/plugin-proposal-class-properties": "^7.2.3",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/preset-env": "^7.2.3",
-    "@babel/preset-react": "^7.0.0",
     "babel-loader": "^8.0.5",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "css-loader": "^2.1.0",
-    "file-loader": "^3.0.1",
-    "mini-css-extract-plugin": "^0.5.0",
-    "node-sass": "^4.11.0",
+    "css-loader": "^5.2.7",
+    "css-minimizer-webpack-plugin": "^4.0.0",
+    "file-loader": "^6.2.0",
+    "mini-css-extract-plugin": "^2.1.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "sass-loader": "^7.1.0",
-    "style-loader": "^0.23.1",
-    "terser-webpack-plugin": "^1.2.1",
-    "url-loader": "^1.1.2"
+    "sass": "^1.53.0",
+    "sass-loader": "^13.0.2",
+    "style-loader": "^2.0.0",
+    "terser-webpack-plugin": "^5.1.4",
+    "url-loader": "^4.1.1"
   },
   "scripts": {
     "copy-public": "node ./scripts/cpFavicon.js",

package/scripts/getDefaultWebpackConfig.js

@@ -23,11 +23,19 @@ const moduleRules = [
     },
     {
         test: /\.(png|jpg|gif|svg)$/,
-        loader: 'url-loader?limit=16384&name=images/[name].[hash].[ext]',
+        loader: 'url-loader',
+        options: {
+            limit: 16384,
+            name: 'images/[name].[hash].[ext]',
+        },
     },
     {
         test: /\.ttf$/,
-        loader: 'url-loader?limit=16384&name=fonts/[name].[hash].[ext]',
+        loader: 'url-loader',
+        options: {
+            limit: 16384,
+            name: 'fonts/[name].[hash].[ext]',
+        },
     },
 ];
 
@@ -65,7 +73,7 @@ function getDevConfig(dirname, options = {}) {
             filename: 'bundle.js',
             publicPath: '/',
         },
-        devtool: 'cheap-module-eval-source-map',
+        devtool: 'eval-cheap-module-source-map',
         devServer: {
             hot: true,
             contentBase: BUILD_DIR,
@@ -104,7 +112,10 @@ function getDevConfig(dirname, options = {}) {
             'react/lib/ExecutionEnvironment': true,
             'react/lib/ReactContext': true,
         },
-        plugins: [new webpack.HotModuleReplacementPlugin(), new webpack.NamedModulesPlugin(), monaco],
+        optimization: {
+            moduleIds: 'named',
+        },
+        plugins: [new webpack.HotModuleReplacementPlugin(), monaco],
     };
 }
 
@@ -112,17 +123,17 @@ function importPluginsForBuild() {
     try {
         const TerserPlugin = require('terser-webpack-plugin');
         const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-        const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+        const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
         return {
             TerserPlugin,
             MiniCssExtractPlugin,
-            OptimizeCSSAssetsPlugin,
+            CssMinimizerPlugin,
         };
     } catch (e) {
         const packages = [
             'terser-webpack-plugin',
             'mini-css-extract-plugin',
-            'optimize-css-assets-webpack-plugin',
+            'css-minimizer-webpack-plugin',
         ];
         console.error(
             'To use the build script, please install the following packages: ' + packages.join(', ')
@@ -135,14 +146,14 @@ function getProdConfig(dirname) {
     const BUILD_DIR = path.resolve(dirname, 'public');
     const APP_DIR = path.resolve(dirname, 'src');
 
-    const { TerserPlugin, MiniCssExtractPlugin, OptimizeCSSAssetsPlugin } = importPluginsForBuild();
+    const { TerserPlugin, MiniCssExtractPlugin, CssMinimizerPlugin } = importPluginsForBuild();
 
     const extractSass = new MiniCssExtractPlugin({
         filename: 'bundle.css',
         chunkFilename: 'bundle.[name].css',
     });
 
-    const optimizeCss = new OptimizeCSSAssetsPlugin({});
+    const optimizeCss = new CssMinimizerPlugin();
 
     const minimizer = new TerserPlugin({
         extractComments: true,
@@ -188,9 +199,9 @@ function getProdConfig(dirname) {
             ],
             noParse: moduleNoParse,
         },
-        plugins: [env, extractSass, optimizeCss, monaco],
+        plugins: [env, extractSass, monaco],
         optimization: {
-            minimizer: [minimizer],
+            minimizer: [minimizer, optimizeCss],
         },
     };
 }

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/Components/FormFragments/MonacoEditor.js

@@ -27,7 +27,7 @@ const MonacoEditor = withStyles({
     useEffect(() => {
         let editor;
         import('monaco-editor/esm/vs/editor/editor.api')
-            .then(() => {
+            .then((monaco) => {
                 if (ref.current) {
                     editor = monaco.editor.create(ref.current, {
                         value,

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

@@ -7,7 +7,6 @@ const initialState = {
         {
             id: null,
             identifier: { value: '', constraints: { identifier: true } },
-            email: { value: '', constraints: { presence: true } },
             users: {
                 value: [],
                 schema: {

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>
 `;