@configuratorware/configurator-admingui 1.39.0 → 1.39.2

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

@@ -120,6 +120,8 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 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 styles = function styles(theme) {
+  var _visualizationRoot;
+
   var breakPoint = {
     max: "@media screen and (max-width:".concat(1144 + 2 * theme.spacing.unit, "px)")
   };
@@ -127,7 +129,9 @@ var styles = function styles(theme) {
     editorRoot: _defineProperty({
       display: 'flex',
       flexDirection: 'row',
-      height: 'calc(100vh - 180px)',
+      '&.fullHeight': {
+        height: 'calc(100vh - 180px)'
+      },
       '& > $header': _defineProperty({
         display: 'none'
       }, breakPoint.max, {
@@ -206,13 +210,16 @@ var styles = function styles(theme) {
     advancedEditor: {
       maxWidth: 600
     },
-    visualizationRoot: {
-      '& > $leftSide': _defineProperty({
-        width: '70%'
-      }, breakPoint.max, {
-        width: '100%'
-      })
-    },
+    visualizationRoot: (_visualizationRoot = {
+      display: 'flex',
+      flexDirection: 'row'
+    }, _defineProperty(_visualizationRoot, breakPoint.max, {
+      flexDirection: 'column'
+    }), _defineProperty(_visualizationRoot, '& > $leftSide', _defineProperty({
+      width: '70%'
+    }, breakPoint.max, {
+      width: '100%'
+    })), _visualizationRoot),
     visualizationContainer: {
       width: '100%',
       height: '39vw'
@@ -853,7 +860,7 @@ var VisualizationSettingsEdit = /*#__PURE__*/function (_Component) {
 
       if (isKindOf2D(mode)) {
         return /*#__PURE__*/_react["default"].createElement("div", {
-          className: [classes.editorRoot, classes.visualizationRoot].join(' ')
+          className: classes.visualizationRoot
         }, /*#__PURE__*/_react["default"].createElement("div", {
           className: classes.leftSide
         }, /*#__PURE__*/_react["default"].createElement(_VisualizationContainer["default"], {
@@ -913,7 +920,7 @@ var VisualizationSettingsEdit = /*#__PURE__*/function (_Component) {
       }
 
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: classes.editorRoot
+        className: "".concat(classes.editorRoot, " ").concat(isKindOf3D(mode) ? 'fullHeight' : '')
       }, loading && /*#__PURE__*/_react["default"].createElement(LoadingComponent, {
         fullSize: true
       }), isKindOf3D(mode) ? this.renderHeader3D(data) : this.renderHeader(), imageElement && /*#__PURE__*/_react["default"].createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.39.0",
+  "version": "1.39.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.39.0",
+    "redhotmagma-visualization": "1.39.2",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",
@@ -58,7 +58,7 @@
     "url-loader": "^1.1.2"
   },
   "scripts": {
-    "copy-public": "node ./scripts/cpFavicon.js",
+    "copy-public": "node ./scripts/cpPublic.js",
     "install": "npm run copy-public"
   },
   "readme": "# configurator-admingui\n\n## Setup for development\n1. Follow the \"preparation\", \"install\" and \"start development\" steps in frontend/README.md\n1. Open the core app in the browser: http://localhost:3000\n\n## Ready to build the artifacts\n- run `pnpm build` from project scope (does not build workspace dependencies automatically)\n- or run `pnpm build` from workspace root\n"

package/scripts/cpPublic.js

@@ -0,0 +1,32 @@
+/* eslint no-console: 0 */
+
+/**
+ * This script is made to copy the content of the public folder
+ * into the same destination in the client projects
+ *
+ * Runs only when installing this package as a dependency in client projects
+ *
+ * usage: node ./scripts/cpPublic.js
+ *
+ * @author boda@redhotmagma.de
+ */
+
+const path = require('path');
+
+const { cpDirDeep, testMatchers } = require('@configuratorware/scripts/utils/fileSystem');
+const { isDependency } = require('@configuratorware/scripts/utils/process');
+
+// keep existing files listed below
+const test = testMatchers.keepIfExists(/favicon\.ico$/);
+
+if (isDependency()) {
+    console.log(
+        '\x1b[37m\x1b[42m%s\x1b[0m',
+        'Copying public content into the public directory of the client project'
+    );
+
+    const src = path.resolve(__dirname, '../public');
+    const dst = path.resolve(__dirname, '../../../../public');
+
+    cpDirDeep(src, dst, { testFn: test });
+}

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

@@ -58,7 +58,9 @@ const styles = theme => {
         editorRoot: {
             display: 'flex',
             flexDirection: 'row',
-            height: 'calc(100vh - 180px)',
+            '&.fullHeight': {
+                height: 'calc(100vh - 180px)',
+            },
             '& > $header': {
                 display: 'none',
                 [breakPoint.max]: {
@@ -146,6 +148,11 @@ const styles = theme => {
             maxWidth: 600,
         },
         visualizationRoot: {
+            display: 'flex',
+            flexDirection: 'row',
+            [breakPoint.max]: {
+                flexDirection: 'column',
+            },
             '& > $leftSide': {
                 width: '70%',
                 [breakPoint.max]: {
@@ -634,7 +641,7 @@ export class VisualizationSettingsEdit extends Component {
         const { three } = this;
         if (isKindOf2D(mode)) {
             return (
-                <div className={[classes.editorRoot, classes.visualizationRoot].join(' ')}>
+                <div className={classes.visualizationRoot}>
                     <div className={classes.leftSide}>
                         <VisualizationContainer three={three} className={classes.visualizationContainer} />
                     </div>
@@ -688,7 +695,7 @@ export class VisualizationSettingsEdit extends Component {
         }
 
         return (
-            <div className={classes.editorRoot}>
+            <div className={`${classes.editorRoot} ${isKindOf3D(mode) ? 'fullHeight' : ''}`}>
                 {loading && <LoadingComponent fullSize />}
 
                 {isKindOf3D(mode) ? this.renderHeader3D(data) : this.renderHeader()}

package/scripts/cpFavicon.js

@@ -1,28 +0,0 @@
-/* eslint no-console: 0 */
-
-/**
- * This script is made to copy the favicon from public folder
- * into the same destination in the client projects
- *
- * Runs only when installing this package as a dependency in client projects
- *
- * usage: node ./scripts/cpFavicon.js
- *
- */
-
-const path = require('path');
-const fs = require('fs');
-const { isDependency } = require('./utils/process');
-
-if (isDependency()) {
-    const dir = path.resolve(__dirname, '../../../../public');
-    if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir);
-    }
-    const src = path.resolve(__dirname, '../public/favicon.ico');
-    const dst = path.resolve(dir, 'favicon.ico');
-    // copy it only if there is no favicon.ico (which can be already a custom one) in the target location
-    if (!fs.existsSync(dst)) {
-        fs.createReadStream(src).pipe(fs.createWriteStream(dst));
-    }
-}