@configuratorware/configurator-admingui 1.42.1 → 1.42.2

package/Components/CloseButton.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _core = require("@material-ui/core");
+var _CloseIcon = _interopRequireDefault(require("../UIComponents/icons/CloseIcon"));
+require("./Styles.scss");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var CloseButton = function CloseButton(props) {
+  var onClick = props.onClick;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "closeButton"
+  }, /*#__PURE__*/_react["default"].createElement(_core.IconButton, {
+    onClick: onClick,
+    id: "close"
+  }, /*#__PURE__*/_react["default"].createElement(_CloseIcon["default"], null)));
+};
+var _default = exports["default"] = CloseButton;

package/Components/ModalContainer.js

@@ -10,8 +10,7 @@ var _GeneralFragments = require("./GeneralFragments");
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _withStyles = _interopRequireDefault(require("@material-ui/core/styles/withStyles"));
 var _reactRedux = require("react-redux");
-var _IconButton = _interopRequireDefault(require("../UIComponents/IconButton"));
-var _CloseIcon = _interopRequireDefault(require("../UIComponents/icons/CloseIcon"));
+var _CloseButton = _interopRequireDefault(require("./CloseButton"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -34,16 +33,10 @@ var styles = function styles() {
       flexDirection: 'column',
       flex: 1,
       width: '100%'
-    },
-    closeButton: {
-      position: 'absolute',
-      right: 28,
-      top: 28,
-      zIndex: 999999
     }
   };
 };
-var CloseButton = (0, _reactRedux.connect)(function () {
+var Close = (0, _reactRedux.connect)(function () {
   return {};
 }, function (dispatch, _ref) {
   var hideDetailsAction = _ref.hideDetailsAction;
@@ -54,10 +47,9 @@ var CloseButton = (0, _reactRedux.connect)(function () {
   };
 })(function (_ref2) {
   var hideDetails = _ref2.hideDetails;
-  return /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
-    onClick: hideDetails,
-    id: "close"
-  }, " ", /*#__PURE__*/_react["default"].createElement(_CloseIcon["default"], null), " ");
+  return /*#__PURE__*/_react["default"].createElement(_CloseButton["default"], {
+    onClick: hideDetails
+  });
 });
 var ModalContainer = /*#__PURE__*/function (_React$Component) {
   _inherits(ModalContainer, _React$Component);
@@ -128,7 +120,7 @@ var ModalContainer = /*#__PURE__*/function (_React$Component) {
         classes: classes
       }, hideDetails && /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.closeButton
-      }, /*#__PURE__*/_react["default"].createElement(CloseButton, {
+      }, /*#__PURE__*/_react["default"].createElement(Close, {
         hideDetailsAction: hideDetails
       })), /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.dialogContentContainer,

package/Components/Styles.scss

@@ -138,4 +138,11 @@ td, th {
   margin-top: 15px;
   background-color: #fff !important;
   margin-left: 10px !important;
+}
+
+.closeButton {
+  position: absolute;
+  right: 28px;
+  top: 28px;
+  z-index: 999999;
 }

package/Screens/Creator/Components/VisualizationAndMediaData/VisualizationAndMediaData.js

@@ -37,6 +37,7 @@ var _ImageEditTools = _interopRequireDefault(require("./Components/ImageEditTool
 require("./Translations");
 var _clsx = _interopRequireDefault(require("clsx"));
 var _InfoIcon = _interopRequireDefault(require("../../../../UIComponents/icons/InfoIcon"));
+var _CloseButton = _interopRequireDefault(require("../../../../Components/CloseButton"));
 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; }
@@ -557,7 +558,11 @@ var VisualizationAndMediaData = exports.VisualizationAndMediaData = (0, _withSty
     classes: {
       dialogContentTextRoot: classes.dialog
     }
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement(_CloseButton["default"], {
+    onClick: function onClick() {
+      return setOpen(false);
+    }
+  }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _clsx["default"])('hintbox')
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _clsx["default"])('hinttext')

package/Screens/Designer/Components/DesignDataTransfer.js

@@ -17,6 +17,7 @@ var _Switch = _interopRequireDefault(require("@material-ui/core/Switch"));
 var _DialogContent = _interopRequireDefault(require("@material-ui/core/DialogContent"));
 var _FlatButton = _interopRequireDefault(require("../../../UIComponents/FlatButton"));
 var _TemplateList = _interopRequireDefault(require("../Containers/TemplateList"));
+var _CloseButton = _interopRequireDefault(require("../../../Components/CloseButton"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -270,7 +271,9 @@ var DesignDataTransfer = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
         variant: "body1",
         color: "inherit"
-      }, (0, _i18n.T)('designDataTransfer.settingsTransfer')), /*#__PURE__*/_react["default"].createElement(_FormGroup["default"], {
+      }, (0, _i18n.T)('designDataTransfer.settingsTransfer')), /*#__PURE__*/_react["default"].createElement(_CloseButton["default"], {
+        onClick: _this.closeDesignDataTransferDialog
+      }), /*#__PURE__*/_react["default"].createElement(_FormGroup["default"], {
         row: true
       }, /*#__PURE__*/_react["default"].createElement(_FormControlLabel["default"], {
         labelPlacement: "start",

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.42.1",
+  "version": "1.42.2",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.42.1",
+    "@configuratorware/scripts": "1.42.2",
     "@material-ui/core": "^3.9.4",
     "@material-ui/icons": "^3.0.2",
     "@tweenjs/tween.js": "^17.6.0",
@@ -28,7 +28,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.42.1",
+    "redhotmagma-visualization": "1.42.2",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/scripts/getDefaultBabelConfig.js

@@ -1,19 +1,20 @@
-const isProduction = process.env.NODE_ENV === 'production';
-const isDev = process.env.NODE_ENV === 'development' || !process.env.NODE_ENV;
-
 const presets = ['@babel/preset-env', '@babel/preset-react'];
 
 const plugins = ['@babel/plugin-proposal-class-properties', '@babel/plugin-syntax-dynamic-import'];
 
-isDev && plugins.push('react-refresh/babel');
+const ignore = [];
 
-const ignore = isProduction ? ['**/__tests__', '**/*.test.js', '**/__mocks__', '**/*.dev.js'] : [];
+function getConfig(customConfigDecorator) {
+    return api => {
+        api.env('production') && ignore.push('**/__tests__', '**/*.test.js', '**/__mocks__', '**/*.dev.js');
+        api.env('development') && plugins.push('react-refresh/babel');
 
-function getConfig() {
-    return {
-        ignore,
-        presets,
-        plugins,
+        const config = {
+            ignore,
+            presets,
+            plugins,
+        };
+        return customConfigDecorator ? customConfigDecorator(config, api) : config;
     };
 }
 

package/scripts/getDefaultWebpackConfig.js

@@ -27,11 +27,14 @@ const createProxyMiddleware = (options = {}) => {
 
 const entry = ['@babel/polyfill', 'url-search-params-polyfill'];
 
-const moduleRules = [
+const getModuleRules = (envName = 'development') => [
     {
         test: /\.jsx?$/,
-        use: ['babel-loader'],
+        loader: 'babel-loader',
         exclude: /node_modules/,
+        options: {
+            envName,
+        },
     },
     {
         test: /\.(png|jpg|gif|svg)$/,
@@ -89,7 +92,6 @@ function getDevConfig(dirname, options = {}) {
         },
         devtool: 'eval-cheap-module-source-map',
         devServer: {
-            hot: 'only',
             historyApiFallback: {
                 disableDotRule: true,
             },
@@ -111,7 +113,7 @@ function getDevConfig(dirname, options = {}) {
         },
         module: {
             rules: [
-                ...moduleRules,
+                ...getModuleRules(),
                 {
                     test: /\.s?css$/,
                     use: [
@@ -192,7 +194,7 @@ function getProdConfig(dirname) {
         },
         module: {
             rules: [
-                ...moduleRules,
+                ...getModuleRules('production'),
                 {
                     test: /\.s?css$/,
                     use: [