@configuratorware/configurator-frontendgui 1.36.2 → 1.37.0

package/App/Reducers/DesignArea/Selectors.js

@@ -493,6 +493,8 @@ function getSelectedDesignProductionMethodForDesignArea(state, designArea) {
 
   return (0, _find2["default"])(designProductionMethods, {
     identifier: designProductionMethodIdentifier
+  }) || (0, _find2["default"])(designProductionMethods, {
+    isDefault: true
   }) || (0, _first["default"])(designProductionMethods);
 }
 

package/App/Services/InteractionService.js

@@ -522,28 +522,32 @@ var InteractionService = /*#__PURE__*/function (_AbstractInteractionS) {
                 });
 
               case 21:
-                _context8.next = 27;
+                this.postMessageToContainer({
+                  method: _createMessageInterface.METHOD_REQUEST_OFFER_FORM_SENT,
+                  code: configuration.code
+                });
+                _context8.next = 28;
                 break;
 
-              case 23:
-                _context8.prev = 23;
+              case 24:
+                _context8.prev = 24;
                 _context8.t1 = _context8["catch"](18);
 
                 _ServiceLocator.Services.ui.reportError((0, _i18n.t)('receiveOfferForm.sentError'));
 
                 return _context8.abrupt("return", false);
 
-              case 27:
+              case 28:
                 _ServiceLocator.Services.ui.reportError((0, _i18n.t)('receiveOfferForm.sentOk'));
 
                 return _context8.abrupt("return", true);
 
-              case 29:
+              case 30:
               case "end":
                 return _context8.stop();
             }
           }
-        }, _callee8, null, [[2, 9, 13, 16], [18, 23]]);
+        }, _callee8, this, [[2, 9, 13, 16], [18, 24]]);
       }));
 
       function sendReceiveOfferRequest(_x2) {

package/App/Shared/Components/AmountPrice/index.js

@@ -204,7 +204,8 @@ var styles = function styles(theme) {
         }), _defineProperty(_MuiDialogActions, "marginRight", 8), _MuiDialogActions),
         '& .MuiDialogTitle-root, .MuiDialogActions-root': (_MuiDialogTitleRo = {
           paddingLeft: 32,
-          paddingRight: 32
+          paddingRight: 20,
+          marginRight: 4
         }, _defineProperty(_MuiDialogTitleRo, theme.breakpoints.down('xs'), {
           paddingLeft: 0,
           paddingRight: 0

package/App/Shared/Components/PriceList/index.js

@@ -114,7 +114,10 @@ var styles = function styles(theme) {
       flex: 0,
       justifyContent: 'flex-end',
       display: 'flex'
-    })
+    }),
+    container: {
+      marginBottom: 'auto'
+    }
   };
 };
 
@@ -154,7 +157,10 @@ var PriceList = /*#__PURE__*/function (_React$Component) {
           hidePrices = _this$props.hidePrices;
       return /*#__PURE__*/_react["default"].createElement(_Grid["default"], {
         container: true,
-        spacing: 2
+        spacing: 2,
+        classes: {
+          root: classes.container
+        }
       }, /*#__PURE__*/_react["default"].createElement(_Grid["default"], {
         item: true,
         xs: 12

package/App/Utils/createMessageInterface.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = createMessageInterface;
-exports.LISTENER_SAVE_CONFIGURATION = exports.LISTENER_SWITCH_OPTIONS = exports.METHOD_CONFIGURATION_SAVED_REMOTELY = exports.METHOD_CONFIGURATION_SAVED = exports.METHOD_ADD_TO_CART = void 0;
+exports.LISTENER_SAVE_CONFIGURATION = exports.LISTENER_SWITCH_OPTIONS = exports.METHOD_CONFIGURATION_SAVED_REMOTELY = exports.METHOD_REQUEST_OFFER_FORM_SENT = exports.METHOD_CONFIGURATION_SAVED = exports.METHOD_ADD_TO_CART = void 0;
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
@@ -14,6 +14,8 @@ var METHOD_ADD_TO_CART = 'addtocart';
 exports.METHOD_ADD_TO_CART = METHOD_ADD_TO_CART;
 var METHOD_CONFIGURATION_SAVED = 'configurationsaved';
 exports.METHOD_CONFIGURATION_SAVED = METHOD_CONFIGURATION_SAVED;
+var METHOD_REQUEST_OFFER_FORM_SENT = 'requestoffer_form_sent';
+exports.METHOD_REQUEST_OFFER_FORM_SENT = METHOD_REQUEST_OFFER_FORM_SENT;
 var METHOD_CONFIGURATION_SAVED_REMOTELY = 'configurationsaved_remotely';
 exports.METHOD_CONFIGURATION_SAVED_REMOTELY = METHOD_CONFIGURATION_SAVED_REMOTELY;
 var LISTENER_SWITCH_OPTIONS = 'switch_options';

package/App/configuration.js

@@ -238,6 +238,12 @@ function preventLeavingPage() {
 }
 
 function init() {
+  var externalConfig = window.externalConfiguration;
+
+  if (externalConfig) {
+    applicationConfiguration = _lodash["default"].merge(applicationConfiguration, externalConfig);
+  }
+
   applicationConfiguration = _lodash["default"].merge(applicationConfiguration, getQueryParams());
 
   _Api["default"].init(applicationConfiguration.network);

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.36.2",
+  "version": "1.37.0",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.36.2",
+    "@configuratorware/scripts": "1.37.0",
     "@hot-loader/react-dom": "^17.0.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.11.2",
@@ -39,8 +39,8 @@
     "react-router-dom": "^5.2.0",
     "react-swipeable": "^5.5.1",
     "react-zoom-pan-pinch": "^2.1.3",
-    "redhotmagma-graphics-editor": "1.36.2",
-    "redhotmagma-visualization": "1.36.2",
+    "redhotmagma-graphics-editor": "1.37.0",
+    "redhotmagma-visualization": "1.37.0",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/public/configuration.js

@@ -0,0 +1,137 @@
+
+const externalConfiguration = {
+    // the default language code (format: de-DE, en-GB, etc.), use false to select the browser language
+    //language: false,
+
+    // the available locales
+    //locales: [{ code: 'de_DE', preferred: true }, { code: 'en_GB' }],
+
+    // show custom title input before saving the configuration
+    //editCustomTitleBeforeSave: false, // default: false
+    
+    // set true to load available variants before loading the configuration
+    //loadVariantsFirst: false, // default: false
+
+    // set true to load
+    //loadInspirations: false, // default: false
+
+    // set true to open the first optionclassification instead of the "start here" text
+    //showInitialOptionclassification: false, // default: false
+
+    // show the "start here" animation
+    //showStartHere: true,
+
+    // show the "add to cart" button by default
+    //showAddToCartButton: true,
+
+    // set true to run server-side validation before addToCart
+    //validateBeforeCTA: true,
+
+    // set false to decide by screen orientation, or can be fixed 'left' or 'bottom'
+    //dock: false,
+
+    // set true to display the selected option for each optionclassification
+    //displaySwitchedOptions: false, // default: false
+
+    // set true to check the optionclassification immediately after selected
+    //checkOptionclassificationOnSelect: false,
+
+    // which method is used for addToCart? default: postMessage
+    // when it is set to 'functionCall' it calls window.parent.addToCart(configuration.code)
+    //addToCartMethod: 'postMessage',
+
+    // use carousel for optionclassification list
+    //optionclassificationCarousel: true,
+
+    // set true to disable beforeunload warning
+    //disableBeforeunloadWarning: false,
+
+    // set true to hide optionlist when user clicks somewhere else
+    //hideOptionListOnAwayClick: true,
+
+    // set true to force the option details dialog shown with an image
+    //optionDetailsWithImage: false,
+
+    // set true to disable optionlist moving
+    //fixedOptionlist: false,
+
+    //set true to show accept design checkbox approval
+    //displayAcceptDesign: true,
+
+    // available tools in the toolbar
+    /*availableTools: {
+        fastConfiguration: false,
+        save: false,
+        load: false,
+        share: false,
+        print: false,
+    },*/
+
+    // relative position of the option list dialog
+    // [
+    //   [<dialogSideH{left|center|right}>, <relToSideH{left|center|right}>],
+    //   [<dialogSideV{top|center|bottom}>, <relToSideV{top|center|bottom}>]
+    // ]
+    /*optionlistDialogPositioning: {
+        left: [
+            ['left', 'right'],
+            ['top', 'top'],
+        ],
+        bottom: [
+            ['center', 'center'],
+            ['bottom', 'top'],
+        ],
+    },*/
+
+    // override this to set a default item identifier to load if not defined in the route
+    //defaultLoadIdentifier: false,
+
+    // should the option list be fixed to the left side, or it can open up above the selected option classification
+    //optionListFixedToLeft: true,
+
+    // the components used in the Screen (override any component in custom project)
+    //components: {},
+
+    // the containers used in the Screen (override any container in custom project)
+    //containers: {},
+
+    // load the available configuration modes (might be set to false in older configurators)
+    //loadConfigurationModes: true,
+
+    // if set to false only the amount for the currently selected variant can be selected
+    // when switching the variant the selected amount is transferred to the newly selected variant
+    //restrictAmountselectionToSelectedVariant: false,
+
+    //displayColorAmountWarnings: true,
+
+    //displayEditorRulers: true,
+
+    /*visualization: {
+        designAreaHighlightBackgroundColor: 'transparent',
+        options: {
+            // when zoom = 1 use NearestFilter (for sharper product image)
+            sharperFullView: false,
+            // upscale or downscale the product image to fit 2048 x 2048
+            // Warning! not recommended, use better image resources instead
+            optimizeProductImage: false,
+        },
+    },*/
+
+    /*designer: {
+        dpi: 300, // the default canvas dpi as project specific option
+        maxColorAmount: 10, // the default max number of colors in the colorizing feature
+        allowedImageUploadFormats: 'jpg,jpeg,svg,png,pdf,bmp,tif,tiff,eps,ai,gif', // the image formats users can upload to designareas / designer items
+    },*/
+
+    //vectorizeImageQuality: 45000,
+
+    //renderPreviewImagesForCheckout: true,
+
+    // automatically show the vectorization preview in colorizing step
+    //autoPreviewVectorization: true,
+
+    // switch to the previously selected view when selecting a component that has no view specified
+    //switchViewOnComponentSelection: true,
+};
+
+window.externalConfiguration = externalConfiguration;

package/src/App/Reducers/DesignArea/Selectors.js

@@ -238,6 +238,7 @@ export function getSelectedDesignProductionMethodForDesignArea(state, designArea
     const { designProductionMethodIdentifier } = designAreaData || {};
     return (
         find(designProductionMethods, { identifier: designProductionMethodIdentifier }) ||
+        find(designProductionMethods, { isDefault: true }) ||
         first(designProductionMethods)
     );
 }

package/src/App/Services/InteractionService.js

@@ -5,7 +5,7 @@ import Api from '../../Framework/Api';
 import { t } from 'Framework/i18n';
 import { getConfiguration } from '../Reducers/Configurator/Selectors';
 import { EventTypes } from '../Constant';
-import { METHOD_CONFIGURATION_SAVED } from '../Utils/createMessageInterface';
+import { METHOD_CONFIGURATION_SAVED, METHOD_REQUEST_OFFER_FORM_SENT } from '../Utils/createMessageInterface';
 
 export default class InteractionService extends AbstractInteractionService {
     constructor() {
@@ -227,6 +227,10 @@ export default class InteractionService extends AbstractInteractionService {
 
         try {
             await Api.request({ url: 'receiveoffers/request', method: 'post', data: data });
+            this.postMessageToContainer({
+                method: METHOD_REQUEST_OFFER_FORM_SENT,
+                code: configuration.code,
+            });
         } catch (error) {
             Services.ui.reportError(t('receiveOfferForm.sentError'));
 

package/src/App/Shared/Components/AmountPrice/index.js

@@ -116,7 +116,8 @@ const styles = theme => ({
             },
             '& .MuiDialogTitle-root, .MuiDialogActions-root': {
                 paddingLeft: 32,
-                paddingRight: 32,
+                paddingRight: 20,
+                marginRight: 4,
                 [theme.breakpoints.down('xs')]: {
                     paddingLeft: 0,
                     paddingRight: 0,

package/src/App/Shared/Components/PriceList/__snapshots__/index.test.js.snap

@@ -2,7 +2,7 @@
 
 exports[`renders correctly 1`] = `
 <div
-  class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-2"
+  class="MuiGrid-root PriceList-container-10 MuiGrid-container MuiGrid-spacing-xs-2"
 >
   <div
     class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12"
@@ -33,13 +33,13 @@ exports[`renders correctly 1`] = `
       >
         <span
           aria-disabled="false"
-          class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-10 MuiCheckbox-root PriceList-MuiCheckboxRoot-2 MuiCheckbox-colorPrimary MuiIconButton-colorPrimary"
+          class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-11 MuiCheckbox-root PriceList-MuiCheckboxRoot-2 MuiCheckbox-colorPrimary MuiIconButton-colorPrimary"
         >
           <span
             class="MuiIconButton-label"
           >
             <input
-              class="PrivateSwitchBase-input-13"
+              class="PrivateSwitchBase-input-14"
               data-indeterminate="false"
               tabindex="-1"
               type="checkbox"
@@ -76,7 +76,7 @@ exports[`renders correctly 1`] = `
 
 exports[`renders correctly with default props 1`] = `
 <div
-  class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-2"
+  class="MuiGrid-root PriceList-container-10 MuiGrid-container MuiGrid-spacing-xs-2"
 >
   <div
     class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12"

package/src/App/Shared/Components/PriceList/index.js

@@ -74,6 +74,9 @@ const styles = theme => ({
             display: 'flex',
         },
     },
+    container: {
+        marginBottom: 'auto',
+    },
 });
 
 class PriceList extends React.Component {
@@ -102,7 +105,7 @@ class PriceList extends React.Component {
     render() {
         const { list, productTitle, classes, amount, hidePrices } = this.props;
         return (
-            <Grid container spacing={2}>
+            <Grid container spacing={2} classes={{ root: classes.container }}>
                 <Grid item xs={12}>
                     {amount > 0 && list && list.length <= 0 && (
                         <List dense={false}>

package/src/App/Utils/createMessageInterface.js

@@ -4,6 +4,8 @@ export const METHOD_ADD_TO_CART = 'addtocart';
 
 export const METHOD_CONFIGURATION_SAVED = 'configurationsaved';
 
+export const METHOD_REQUEST_OFFER_FORM_SENT = 'requestoffer_form_sent';
+
 export const METHOD_CONFIGURATION_SAVED_REMOTELY = 'configurationsaved_remotely';
 
 export const LISTENER_SWITCH_OPTIONS = 'switch_options';

package/src/App/configuration.js

@@ -255,6 +255,10 @@ function preventLeavingPage() {
 }
 
 export function init() {
+    const externalConfig = window.externalConfiguration;
+    if (externalConfig) {
+        applicationConfiguration = _.merge(applicationConfiguration, externalConfig);
+    }
     applicationConfiguration = _.merge(applicationConfiguration, getQueryParams());
 
     Api.init(applicationConfiguration.network);