@configuratorware/configurator-frontendgui 1.28.0-beta.1 → 1.28.1

package/scripts/updateLocalPackages.js

@@ -0,0 +1,68 @@
+/* eslint no-console: 0 */
+
+/**
+ * A tool to copy local modifications of local packages (graphics editor and visualization component)
+ * over to the node_modules of this project in order to test them in the integrated environment.
+ * This script is made only for development purposes, does not replace the package version update in package.json.
+ *
+ * It uses the configuration file localPackages.json (should be placed in the project root)
+ * Example for localPackages.json:
+ * {
+ *   "visualization": {                      // alias of the package
+ *     "path": "../visualization_component", // location in the local file system, relative to the project path
+ *     "name": "redhotmagma-visualization"   // name of the package in package.json
+ *   },
+ *   ...
+ * }
+ * Usage of the script:
+ * node .\scripts\updateLocalPackages.js               // update all local dependencies listed in localPackages.json
+ * node .\scripts\updateLocalPackages.js visualization // update only a single package identified by its alias
+ *
+ * @author boda@redhotmagma.de (2019.09.24)
+ */
+
+const { resolve } = require('path');
+const { cpDirDeep } = require('./utils/fileSystem');
+
+const _alias = process.argv[2];
+
+try {
+    let items = require('../localPackages.json');
+    if (_alias && _alias.length) {
+        const selectedItem = items[_alias];
+        if (!selectedItem) {
+            console.log('Package not found:', _alias);
+            console.log('Available packages:');
+            console.table(items);
+            process.exit(0);
+        } else {
+            items = { [_alias]: selectedItem };
+        }
+    }
+    // eslint-disable-next-line no-unused-vars
+    for (let [alias, { path, name }] of Object.entries(items)) {
+        console.log(`Updating package: ${name} -> ${path}`);
+        updatePackage({ name, path });
+    }
+} catch (e) {
+    console.error(e);
+}
+
+function updatePackage(options = {}) {
+    const { name, path, buildScript = 'npm run package', libDir = 'lib' } = options;
+    const cwd = process.cwd();
+    const projectPath = resolve(cwd, path);
+    const packagePath = resolve(cwd, 'node_modules', name);
+    try {
+        const { exec } = require('child_process');
+        const childProcess = exec(buildScript, { cwd: projectPath });
+        childProcess.stdout.pipe(process.stdout);
+        childProcess.stderr.pipe(process.stderr);
+        childProcess.on('close', code => {
+            console.log(`child process exited with code ${code}`);
+            cpDirDeep(resolve(projectPath, libDir), packagePath);
+        });
+    } catch (e) {
+        console.error(e);
+    }
+}

package/scripts/utils/process.js

@@ -0,0 +1,19 @@
+/**
+ * These utils are made to simplify querying process information for the node scripts.
+ *
+ * @author boda@redhotmagma.de
+ */
+
+/**
+ * Checks if the current installation process is a dependency installation
+ * @return {boolean}
+ */
+function isDependency() {
+    // if the path of the initial directory contains 'node_modules', it's probably installed as a dependency
+    const { INIT_CWD } = process.env;
+    return INIT_CWD.indexOf('node_modules') !== -1;
+}
+
+module.exports = {
+    isDependency,
+};

package/src/App/Error/ProductionErrorPage/Style.scss

@@ -37,7 +37,7 @@ $font-color: #282828;
   }
 
   .error-icon {
-    background: url('res/error_gears.png');
+    background: url('./res/error_gears.png');
     background-size: 100% 100%;
     height: 20vh;
     width: 20vh;

package/src/App/Modules/Creator/Components/Option/index.test.js

@@ -4,7 +4,7 @@ import { mount, render } from 'enzyme';
 import { Provider } from 'react-redux';
 import { noop } from 'lodash';
 import DefaultThemeProvider from 'App/Screens/Configurator/ThemeProvider';
-import Option from './index';
+import Option from '../Option';
 
 const reducer = (state = {}, action) => {
     return { ...action, ...state };

package/src/App/Modules/Creator/Components/OptionAmount/index.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import OptionAmount from './index';
+import OptionAmount from '../OptionAmount';
 import { mount, render } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { TextField } from '@material-ui/core';

package/src/App/Modules/Creator/Components/ProductPart/index.test.js

@@ -4,7 +4,7 @@ import { Provider } from 'react-redux';
 import { mount, render } from 'enzyme';
 import { noop } from 'lodash';
 import DefaultThemeProvider from 'App/Screens/Configurator/ThemeProvider';
-import ProductPart from './index';
+import ProductPart from '../ProductPart';
 
 const initialState = {
     displaySwitchedOptions: false,

package/src/App/Modules/Designer/Components/AddGalleryImage/index.story.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import ServiceLocator from 'App/ServiceLocator';
-import AddGalleryImage from './index';
+import AddGalleryImage from './';
 import blueImg from './res/blau.jpg';
 import greyIMG from './res/grau.jpg';
 import redIMG from './res/rot.jpg';

package/src/App/Modules/Designer/Components/ColorPalettes/index.test.jsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import { noop } from 'lodash';
 import { mount, render } from 'enzyme';
-import ColorPalettes from './index';
+import ColorPalettes from '../ColorPalettes';
 
 const colorPalettes = {
     colorPalettes: [

package/src/App/Modules/Designer/Components/DesignAreaControlbox/index.test.jsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import { noop } from 'lodash';
 import { mount, render } from 'enzyme';
-import DesignAreaControlbox from './index';
+import DesignAreaControlbox from '../DesignAreaControlbox';
 import MenuItem from '@material-ui/core/MenuItem';
 import ServiceLocator from 'App/ServiceLocator';
 

package/src/App/Modules/Designer/Components/TextControlbox/index.test.jsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { noop } from 'lodash';
 import { mount, render } from 'enzyme';
 import MenuItem from '@material-ui/core/MenuItem';
-import TextControlbox from './index';
+import TextControlbox from '../TextControlbox';
 import ServiceLocator from 'App/ServiceLocator';
 
 const mockedFontsList = [

package/src/App/Reducers/DesignView/Actions.js

@@ -2,7 +2,8 @@ export const actionTypes = {
     SELECT_DESIGN_VIEW: 'DesignView/SELECT_DESIGN_VIEW',
 };
 
-export const selectDesignView = designViewIdentifier => ({
+export const selectDesignView = (designViewIdentifier, options) => ({
     type: actionTypes.SELECT_DESIGN_VIEW,
     designViewIdentifier,
+    options,
 });

package/src/App/Reducers/DesignView/Reducer.js

@@ -1,4 +1,4 @@
-import { actionTypes as designViewActionTypes } from './Actions';
+import { actionTypes as designViewActionTypes } from '../DesignView/Actions';
 import find from 'lodash/find';
 import get from 'lodash/get';
 import * as configuratorActionTypes from '../Configurator/Actions';
@@ -16,6 +16,7 @@ const prepareDesignViews = designViews =>
 const initialState = {
     designViews: [],
     selectedDesignView: {},
+    lastSelectedDesignView: {},
     autogeneratedDesignViews: [],
     viewThumbnailImages: [],
 };
@@ -23,11 +24,13 @@ const initialState = {
 export default function designViewReducer(state = initialState, action = {}) {
     switch (action.type) {
         case designViewActionTypes.SELECT_DESIGN_VIEW: {
-            const { designViewIdentifier } = action;
+            const { designViewIdentifier, options = {} } = action;
             const designView = find(state.designViews, { identifier: designViewIdentifier });
+            const { saveLast = true } = options;
             return {
                 ...state,
                 selectedDesignView: designView,
+                ...(saveLast ? { lastSelectedDesignView: designView } : null),
             };
         }
         case configuratorActionTypes.RECEIVE_DESIGNER_DATA: {
@@ -59,12 +62,14 @@ export default function designViewReducer(state = initialState, action = {}) {
                     ...state,
                     designViews: prepareDesignViews(updatedDesignViews),
                     selectedDesignView: {},
+                    lastSelectedDesignView: {},
                 };
             }
             return {
                 ...state,
                 designViews: prepareDesignViews(designViews),
                 selectedDesignView: {},
+                lastSelectedDesignView: {},
             };
         }
         case configuratorActionTypes.RECEIVE_CONFIGURATION: {
@@ -82,6 +87,7 @@ export default function designViewReducer(state = initialState, action = {}) {
                         ...state,
                         designViews: [],
                         selectedDesignView: {},
+                        lastSelectedDesignView: {},
                         autogeneratedDesignViews,
                         viewThumbnailImages,
                     };
@@ -93,6 +99,7 @@ export default function designViewReducer(state = initialState, action = {}) {
                     ...state,
                     designViews: autogeneratedDesignViews,
                     selectedDesignView,
+                    lastSelectedDesignView: selectedDesignView,
                     autogeneratedDesignViews,
                     viewThumbnailImages,
                 };
@@ -102,6 +109,7 @@ export default function designViewReducer(state = initialState, action = {}) {
                 ...state,
                 designViews: [],
                 selectedDesignView: {},
+                lastSelectedDesignView: {},
                 autogeneratedDesignViews: [],
                 viewThumbnailImages: [],
             };

package/src/App/Reducers/DesignView/__mocks__/designerViewData.js

@@ -91,4 +91,5 @@ export const simpleState = {
     selectedDesignView: {
         identifier: 'front_view',
     },
+    lastSelectedDesignView: {},
 };

package/src/App/Reducers/DesignView/__tests__/Reducer.test.js

@@ -13,6 +13,7 @@ describe('Reducers/DesignView.designViewReducer', () => {
         expect(initialState).toEqual({
             designViews: [],
             selectedDesignView: {},
+            lastSelectedDesignView: {},
             autogeneratedDesignViews: [],
             viewThumbnailImages: [],
         });
@@ -41,6 +42,23 @@ describe('Reducers/DesignView.designViewReducer', () => {
         const action = selectDesignView(identifier);
         const state = designViewReducer(initialState, action);
         expect(state.selectedDesignView.identifier).toBe(identifier);
+        expect(state.lastSelectedDesignView.identifier).toBe(identifier);
+    });
+    test('returns the correct state for SELECT_DESIGN_VIEW action, if the { saveLast: false } option is provided', () => {
+        // select a view directly (eg. user clicks the view buttons)
+        const initialState = designViewReducer(simpleState);
+        const selectedDesignViewIdentifier = simpleState.designViews[1].identifier;
+        const selectDesignViewAction = selectDesignView(selectedDesignViewIdentifier);
+        const state1 = designViewReducer(initialState, selectDesignViewAction);
+        expect(state1.selectedDesignView.identifier).toBe(selectedDesignViewIdentifier);
+        expect(state1.lastSelectedDesignView.identifier).toBe(selectedDesignViewIdentifier);
+
+        // select a view automatically (eg. user switches to a component which has a linked view)
+        const autoDesignViewIdentifier = simpleState.designViews[0].identifier;
+        const action = selectDesignView(autoDesignViewIdentifier, { saveLast: false });
+        const state2 = designViewReducer(state1, action);
+        expect(state2.selectedDesignView.identifier).toBe(autoDesignViewIdentifier);
+        expect(state2.lastSelectedDesignView.identifier).toBe(selectedDesignViewIdentifier);
     });
     test('clears the selectedDesignView for RECEIVE_CONFIGURATION action', () => {
         const initialState = designViewReducer(simpleState);
@@ -52,6 +70,7 @@ describe('Reducers/DesignView.designViewReducer', () => {
         const action = { type: RECEIVE_CONFIGURATION };
         const state = designViewReducer(stateWithSelectedDesignView, action);
         expect(state.selectedDesignView).toEqual({});
+        expect(state.lastSelectedDesignView).toEqual({});
     });
     test(
         'creates the designViews list and sets the selectedDesignView if visualizationData is available ' +
@@ -81,6 +100,9 @@ describe('Reducers/DesignView.designViewReducer', () => {
             expect(state.selectedDesignView).toEqual({
                 identifier: 'front',
             });
+            expect(state.lastSelectedDesignView).toEqual({
+                identifier: 'front',
+            });
         }
     );
 

package/src/App/Reducers/ImageGallery/Actions.js

@@ -1,6 +1,6 @@
 import { createDefaultReceiver, fetchDataAsync, postDataAsync } from '../Actions';
 import { createAsyncTask } from '../UI/Actions';
-import { getUserImagesByDesignArea } from './Selectors';
+import { getUserImagesByDesignArea } from '../ImageGallery/Selectors';
 import { calculateImageBrightness } from '../../Services/DesignDataService';
 import { getImageUsageInfo } from './Selectors';
 import { getCurrentCompatibilityInfoHash } from '../DesignArea/Selectors';

package/src/App/Screens/Configurator/Components/CalculationWidget/index.test.jsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import { noop } from 'lodash';
 import { mount, render } from 'enzyme';
-import CalculationWidget from './index';
+import CalculationWidget from '../CalculationWidget';
 import MenuItem from '@material-ui/core/MenuItem';
 import { Select, ExpansionPanel, ExpansionPanelDetails } from '@material-ui/core';
 import ServiceLocator from 'App/ServiceLocator';

package/src/App/Screens/Configurator/Components/DesignApproval/index.test.jsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import noop from 'lodash/noop';
 import { render } from 'enzyme';
-import DesignApproval from './index';
+import DesignApproval from '../DesignApproval';
 
 it('renders correctly without error', () => {
     const tree = render(<DesignApproval checked={true} error={false} link={'fakeLink'} onChange={noop} />);

package/src/App/Screens/Configurator/Components/FullScreenView/index.test.jsx

@@ -1,7 +1,7 @@
 /* eslint-env jest */
 import React from 'react';
 import { mount, render } from 'enzyme';
-import FullScreenView from './index';
+import FullScreenView from '../FullScreenView';
 
 describe('Screens/Configurator/Components/FullScreenView', () => {
     it('renders correctly', () => {

package/src/App/Screens/Configurator/Containers/AmountPrice.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import AmountPrice from 'App/Shared/Containers/AmountPrice';
 import ProductVariant from 'App/Shared/Containers/ProductVariant';
-import ConfigurationModeSwitch from './ConfigurationModeSwitch';
+import ConfigurationModeSwitch from '../Containers/ConfigurationModeSwitch';
 import { makeStyles } from '@material-ui/core';
 
 export const useStyles = makeStyles(

package/src/App/Screens/Configurator/Containers/Confirm.js

@@ -1,5 +1,5 @@
 import containerConnect from 'Framework/ComponentContainer';
-import Confirm from '../Components/Confirm';
+import Confirm from '../Components/Confirm/index';
 import { hideConfirm } from '../../../Reducers/Confirm/Actions';
 
 const mapStateToProps = ({ confirm }) => {

package/src/App/Screens/Configurator/Screen.js

@@ -11,7 +11,7 @@ import * as uiActions from 'App/Reducers/UI/Actions';
 import Error from '../../Shared/Containers/Error';
 import ErrorPage from '../../Error/ProductionErrorPage';
 import AlertMessages from 'App/Shared/Containers/AlertMessages';
-import LandscapeInformation from './Components/LandscapeInformation';
+import LandscapeInformation from '../Configurator/Components/LandscapeInformation';
 import Confirm from './Containers/Confirm';
 import SaveConfiguration from 'App/Shared/Containers/SaveConfiguration';
 import SendEmail from 'App/Shared/Containers/SendEmail';

package/src/App/Services/__tests__/DesignDataService.selectViewForComponent.test.js

@@ -178,4 +178,57 @@ describe('DesignDataService.selectViewForComponent', () => {
 
         expect(srv.selectDesignView).toHaveBeenCalledWith('front_view', { saveLast: false });
     });
+
+    it('calls selectDesignView with the identifier of lastSelectedDesignView if no creatorView is referenced by the selected component', () => {
+        const componentWithNoCreatorView = {
+            identifier: 'id1',
+            title: 'title1',
+            creatorView: null,
+        };
+
+        ServiceLocator.provide(
+            new (class StoreService {
+                static serviceName = 'StoreService';
+                state = {
+                    designArea: {
+                        filteredDesignAreas: mockDesignAreas,
+                        selectedDesignArea: {},
+                    },
+                    designView: {
+                        designViews: [
+                            { identifier: 'front_view' },
+                            { identifier: 'side_view' },
+                            { identifier: 'top_view' },
+                        ],
+                        selectedDesignView: {
+                            identifier: 'side_view',
+                        },
+                        lastSelectedDesignView: {
+                            identifier: 'top_view',
+                        },
+                    },
+                    configurator: {
+                        configuration: {
+                            optionclassifications: [
+                                componentWithNoCreatorView,
+                                {
+                                    identifier: 'id2',
+                                    title: 'title2',
+                                    creatorView: { identifier: 'side_view' },
+                                },
+                            ],
+                        },
+                    },
+                };
+                dispatch = v => v;
+            })()
+        );
+        const srv = new DesignDataService();
+
+        srv.selectDesignView = jest.fn();
+
+        srv.selectViewForComponent(componentWithNoCreatorView);
+
+        expect(srv.selectDesignView).toHaveBeenCalledWith('top_view', { saveLast: false });
+    });
 });

package/src/App/Shared/Containers/AlertMessages.js

@@ -1,5 +1,5 @@
 import { containerConnect } from 'Framework/ComponentContainer';
-import AlertDialog from '../Components/AlertDialog';
+import AlertDialog from '../Components/AlertDialog/index';
 import { Services } from 'App/ServiceLocator';
 import { t } from 'Framework/i18n';
 

package/src/App/Shared/Containers/AmountPrice/index.test.js

@@ -2,7 +2,7 @@ import AmountPrice, {
     createAmountPropsFromState,
     createPricePropsFromState,
     showProductVariantsForItem,
-} from './index';
+} from '../AmountPrice';
 import mountWithState from 'Utils/Test/mountWithState';
 import ServiceLocator from 'App/ServiceLocator';
 

package/src/App/Shared/Containers/Error.js

@@ -1,5 +1,5 @@
 import { containerConnect } from 'Framework/ComponentContainer';
-import AlertDialog from '../Components/AlertDialog';
+import AlertDialog from '../Components/AlertDialog/index';
 import { Services } from 'App/ServiceLocator';
 import { t } from 'Framework/i18n';
 

package/src/App/Shared/Containers/SaveConfiguration.js

@@ -1,7 +1,7 @@
 import CircularProgress from '@material-ui/core/CircularProgress/CircularProgress';
 import containerConnect from 'Framework/ComponentContainer';
 import { Services } from 'App/ServiceLocator';
-import SaveConfiguration from '../Components/SaveConfiguration';
+import SaveConfiguration from '../Components/SaveConfiguration/index';
 import { getShareUrl } from '../../Reducers/Configurator/Selectors';
 
 const mapStateToProps = ({ ui, configurator }) => ({

package/src/App/Translations.js

@@ -1,5 +1,5 @@
 import { use } from 'Framework/i18n';
-import { isProduction } from './configuration';
+import { isProduction } from '../App/configuration';
 export async function initLanguage(lang) {
     // ensure that the filename always has an underscore and no dash
     const fileKey = lang.replace('-', '_');

package/src/Framework/i18n.js

@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import ReactDOMServer from 'react-dom/server';
 import { connect } from 'react-redux';
 import _ from 'lodash';
+import * as reactI18nify from 'react-i18nify';
 import Hyphen from 'react-hyphen';
 import { getConf } from '../App/configuration';
 
@@ -230,10 +231,10 @@ export function translateComponent(ComponentToTranslate, mapStateToProps, mapDis
 export const t = I18n.t.bind(I18n);
 
 export function useTranslationWithoutStore() {
-    I18n.setTranslationsGetter(function() {
+    reactI18nify.I18n.setTranslationsGetter(function() {
         return translations;
     });
-    I18n.setLocaleGetter(function() {
+    reactI18nify.I18n.setLocaleGetter(function() {
         return 'en-GB';
     });
 }

package/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    // Target latest version of ECMAScript.
+    "target": "esnext",
+    // Search under node_modules for non-relative imports.
+    "moduleResolution": "node",
+    // Process & infer types from .js files.
+    "allowJs": true,
+    // Don't emit; allow Babel to transform files.
+    "noEmit": true,
+    // Enable strictest settings like strictNullChecks & noImplicitAny.
+    "strict": true,
+    // Disallow features that require cross-file information for emit.
+    "isolatedModules": true,
+    // Import non-ES modules as default imports.
+    "esModuleInterop": true
+  },
+  "include": [
+    "./src",
+    "./node_modules/redhotmagma-graphics-editor"
+  ]
+}

package/App/Constant.js

@@ -1,73 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.EventTypes = void 0;
-var EventTypes = {
-  //header
-  change_variant: 'header_change_variant',
-  save: 'header_save_configuration',
-  load: 'header_load_configuration_open_dialog',
-  load_request: 'header_load_configuration_request',
-  mail: 'header_email',
-  picture_as_pdf: 'header_pdf',
-  //preview
-  preview_open: 'preview_open',
-  preview_close: 'preview_close',
-  //add image
-  add_image: 'image_add',
-  uploaded_file_type: 'image_edit_upload_file',
-  //image_edit
-  edit_image: 'image_edit',
-  image_edit_options: 'image_edit_option_usage',
-  image_colorize: 'image_edit_colorize',
-  image_background: 'image_edit_remove_background',
-  image_edit_colorize_found_colors: 'image_edit_colorize_select_color_amount',
-  image_edit_colorize_color: 'image_edit_colorize_select_color',
-  //object_controls
-  align_horizontal_center: 'object_controls_align_center_horizontal',
-  align_vertical_center: 'object_controls_align_center_vertical',
-  align_move_down: 'object_controls_level_down',
-  align_move_up: 'object_controls_level_up',
-  //image_gallery
-  upload_new: 'image_gallery_upload_new',
-  image_thumbnail_select: 'image_gallery_select_gallery_image',
-  //add text
-  add_text: 'text_controls_add',
-  //text_controls
-  text_bold: 'text_controls_bold',
-  text_italic: 'text_controls_italic',
-  text_align_left: 'text_controls_align_left',
-  text_align_center: 'text_controls_align_center',
-  text_align_right: 'text_controls_align_right',
-  text_align_justify: 'text_controls_align_justify',
-  text_font: 'text_controls_select_font',
-  //color palette
-  text_color: ' text_controls_select_color',
-  //design_area
-  design_area_switch: 'edit_design_change_design_area',
-  //design_production
-  design_production_switch: 'edit_design_change_design_production_method',
-  //summary
-  add_to_cart: 'accept_design_open_dialog',
-  selected_amounts: 'accept_design_approve',
-  //calculation_widget
-  widget_print_view: 'calculation_widget_pdf ',
-  widget_open_configurator: 'calculation_widget_open_configurator',
-  widget_change_amount: 'calculation_widget_change_amount',
-  widget_add_design_area: 'calculation_widget_add_design_area',
-  widget_remove_design_area: 'calculation_widget_remove_design_area',
-  widget_change_design_production_method: 'calculation_widget_change_design_production_method',
-  //on_load
-  load_item: 'load_item',
-  //component and option_selection
-  select_component: 'components_select_component',
-  switch_option: 'components_select_option',
-  //mode switch
-  configuration_mode_switch: 'configuration_mode_switch',
-  //creator summay
-  configuration_selected_amounts: 'accept_configuration_approve',
-  configuration_add_to_cart: 'accept_configuration_open_dialog'
-};
-exports.EventTypes = EventTypes;