@configuratorware/configurator-admingui 1.27.3-beta.1 → 1.27.3-beta.5

package/src/Screens/Item/Reducers/Actions.js

@@ -1,73 +1,73 @@
-export const ITEM_LIST_KEY = 'items';
-export const ITEM_LIST_URL = 'items';
-export const ITEM_STATUS_URL = 'items/status';
-export const ITEM_DATA_KEY = 'item';
-export const ITEM_REDUCER_NAME = 'itemData';
-
-import * as apiActions from "../../../App/Reducers/Api/Actions";
-import { generateDefaultActions } from '../../../App/Reducers/Entity/Actions';
-import { customDispatchHandler } from '../DataStructures/Attributes/Actions';
-
-const actions = generateDefaultActions(ITEM_LIST_KEY, ITEM_DATA_KEY, ITEM_REDUCER_NAME, ITEM_LIST_URL, {
-    customDispatchHandler,
-});
-
-const configurationModeChangeMap = (value, target, checked) => {
-    if (!value) {
-        return checked ? target : '';
-    }
-    return {
-        creator: {
-            creator: checked ? value : '',
-            designer: checked ? 'creator+designer' : value,
-        },
-        designer: {
-            creator: checked ? 'creator+designer' : value,
-            designer: checked ? value : '',
-        },
-        'creator+designer': {
-            creator: checked ? value : 'designer',
-            designer: checked ? value : 'creator',
-        },
-    }[value][target];
-};
-
-const loadItemStatus = () => (dispatch) => {
-    return dispatch(apiActions.fetchDataIfNeeded('itemstatus', 'itemstatus'));
-};
-
-const setItemStatusForMultipleItems = (selectedItems, itemStatus) => (dispatch, getState) => {
-    return dispatch(apiActions.postData(ITEM_STATUS_URL, {
-        "itemStatusId": itemStatus,
-        "itemIds": selectedItems
-    }))
-}
-
-const setFieldData = (field, value) => (dispatch, getState) => {
-    const entityState = getState()[ITEM_REDUCER_NAME];
-    let configurationMode = entityState.data.configurationMode.value;
-    if (field === 'configurationModeCreator') {
-        dispatch(
-            actions.setFieldData(
-                'configurationMode',
-                configurationModeChangeMap(configurationMode, 'creator', value)
-            )
-        );
-    } else if (field === 'configurationModeDesigner') {
-        dispatch(
-            actions.setFieldData(
-                'configurationMode',
-                configurationModeChangeMap(configurationMode, 'designer', value)
-            )
-        );
-    } else {
-        dispatch(actions.setFieldData(field, value));
-    }
-};
-
-export default {
-    ...actions,
-    setFieldData,
-    setItemStatusForMultipleItems,
-    loadItemStatus
-};
+export const ITEM_LIST_KEY = 'items';
+export const ITEM_LIST_URL = 'items';
+export const ITEM_STATUS_URL = 'items/status';
+export const ITEM_DATA_KEY = 'item';
+export const ITEM_REDUCER_NAME = 'itemData';
+
+import * as apiActions from "../../../App/Reducers/Api/Actions";
+import { generateDefaultActions } from '../../../App/Reducers/Entity/Actions';
+import { customDispatchHandler } from '../DataStructures/Attributes/Actions';
+
+const actions = generateDefaultActions(ITEM_LIST_KEY, ITEM_DATA_KEY, ITEM_REDUCER_NAME, ITEM_LIST_URL, {
+    customDispatchHandler,
+});
+
+const configurationModeChangeMap = (value, target, checked) => {
+    if (!value) {
+        return checked ? target : null;
+    }
+    return {
+        creator: {
+            creator: checked ? value : null,
+            designer: checked ? 'creator+designer' : value,
+        },
+        designer: {
+            creator: checked ? 'creator+designer' : value,
+            designer: checked ? value : null,
+        },
+        'creator+designer': {
+            creator: checked ? value : 'designer',
+            designer: checked ? value : 'creator',
+        },
+    }[value][target];
+};
+
+const loadItemStatus = () => (dispatch) => {
+    return dispatch(apiActions.fetchDataIfNeeded('itemstatus', 'itemstatus'));
+};
+
+const setItemStatusForMultipleItems = (selectedItems, itemStatus) => (dispatch, getState) => {
+    return dispatch(apiActions.postData(ITEM_STATUS_URL, {
+        "itemStatusId": itemStatus,
+        "itemIds": selectedItems
+    }))
+}
+
+const setFieldData = (field, value) => (dispatch, getState) => {
+    const entityState = getState()[ITEM_REDUCER_NAME];
+    let configurationMode = entityState.data.configurationMode.value;
+    if (field === 'configurationModeCreator') {
+        dispatch(
+            actions.setFieldData(
+                'configurationMode',
+                configurationModeChangeMap(configurationMode, 'creator', value)
+            )
+        );
+    } else if (field === 'configurationModeDesigner') {
+        dispatch(
+            actions.setFieldData(
+                'configurationMode',
+                configurationModeChangeMap(configurationMode, 'designer', value)
+            )
+        );
+    } else {
+        dispatch(actions.setFieldData(field, value));
+    }
+};
+
+export default {
+    ...actions,
+    setFieldData,
+    setItemStatusForMultipleItems,
+    loadItemStatus
+};

package/src/Screens/Item/Reducers/ItemReducer.js

@@ -9,7 +9,7 @@ const initialState = {
             id: null,
             identifier: { value: '', constraints: { identifier: true } },
             itemStatus: null,
-            configurationMode: '',
+            configurationMode: { value: null, constraints: { presence: true } },
             visualizationMode: null,
             deactivated: false,
             price: null,
@@ -27,7 +27,7 @@ const initialState = {
             accumulateAmounts: { value: true },
             minimumOrderAmount: { value: 1 },
             children: { value: [] },
-            callToAction: null,
+            callToAction: '',
             ...attributesDataStructure,
 
             itemclassifications: [], // ??? NO DOC

package/src/Screens/Item/Translations.js

@@ -16,7 +16,8 @@ require('../../App/i18n').use(
             cancel: 'Cancel',
             save: 'Save',
             editDialogTitle: 'Edit selected entries',
-            editDialogHint: 'Use the checkboxes to select one or more entries in the list</br>and then click this icon to set the item status for them.',
+            editDialogHint:
+                'Use the checkboxes to select one or more entries in the list</br>and then click this icon to set the item status for them.',
             itemCoreData: {
                 visualizationComponent: 'Visualization component',
                 configurationMode: 'Configuration mode',
@@ -91,7 +92,8 @@ require('../../App/i18n').use(
             cancel: 'Abbrechen',
             save: 'Speichern',
             editDialogTitle: 'Gewählte Einträge bearbeiten',
-            editDialogHint: 'Nutze die Checkboxen in der Liste und klicke dann dieses Icon,</br>um den Status für einen oder mehrere Einträge zu setzen.',
+            editDialogHint:
+                'Nutze die Checkboxen in der Liste und klicke dann dieses Icon,</br>um den Status für einen oder mehrere Einträge zu setzen.',
             itemCoreData: {
                 visualizationComponent: 'Visualisierungskomponente',
                 configurationMode: 'Konfigurationsmodus',

package/src/Screens/Option/Containers/List.js

@@ -18,6 +18,15 @@ const columns = [
         filterKey: 'option.optionText.title',
         sortKey: 'option.optionText.title',
     },
+    {
+        name: 'sequencenumber',
+        label: 'Sequence number',
+        filterable: true,
+        sortable: true,
+        filterKey: 'option.sequencenumber',
+        sortKey: 'option.sequencenumber',
+        show: false,
+    },
 ];
 
 const listParams = {
@@ -47,11 +56,7 @@ export const list = () => {
     return (
         <div>
             <ConnectedList />
-            <OrderList
-                listUrl={OPTION_LIST_URL}
-                entity={'option'}
-                orderSequenceNumber={'sequencenumber'}
-            />
+            <OrderList listUrl={OPTION_LIST_URL} entity={'option'} orderSequenceNumber={'sequencenumber'} />
         </div>
     );
 };

package/src/Screens/Option/Translations.js

@@ -10,6 +10,7 @@ require('../../App/i18n').use(
             },
         },
         de: {
+            'Sequence number': 'Reihenfolge',
             option: {
                 addButtonLabel: 'Option hinzufügen',
                 prices: {

package/src/Screens/Optionclassification/Containers/Edit.js

@@ -44,7 +44,12 @@ const formFields = [
     {
         name: 'hiddenInFrontend',
         label: 'hiddenInFrontend',
-        type: 'checkbox',
+        type: 'toggle',
+    },
+    {
+        name: 'hiddenInPdf',
+        label: 'hiddenInPdf',
+        type: 'toggle',
     },
 
     ...attributesDataStructure,

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

@@ -16,6 +16,7 @@ const initialState = {
             texts: [],
             is_multiselect: { value: null },
             hiddenInFrontend: false,
+            hiddenInPdf: false,
             ...attributesDataStructure,
         },
         {

package/src/Screens/Optionclassification/Translations.js

@@ -6,15 +6,19 @@ require('../../App/i18n').use(
             },
             hiddenInFrontend:
                 'Hidden (this component does not appear in lists but can be used for e.g. rules)',
+            hiddenInPdf:
+                'Hidden in PDF (this component does not appear in the PDF but can be used for e.g. to select a background)',
         },
         de: {
             optionclassifications: {
                 addButtonLabel: 'Komponente hinzufügen',
             },
-            'Sequence number': 'Sequenznummer',
+            'Sequence number': 'Reihenfolge',
             Parent: 'Eltern',
             hiddenInFrontend:
                 'versteckt (diese Komponente taucht in keiner Liste auf, kann aber z.B. für Regeln verwendet werden)',
+            hiddenInPdf:
+                'versteckt im PDF (diese Komponente taucht nicht im PDF auf, kann aber z.B. verwendet werden, um Hintergründe auswählbar zu machen)',
         },
     },
     true

package/src/Screens/Setting/Containers/Edit.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { setFieldData, postData, SETTING_REDUCER_NAME, loadFirstSetting } from '../Reducers/Actions';
-import { t } from '../../../App/i18n';
+import { T } from '../../../App/i18n';
 
 const creatorAidedMediaEditingField = (function createCreatorAidedMediaEditingField() {
     let shouldRender = false;
@@ -46,7 +46,7 @@ const formFields = [
         type: 'text',
         label: 'settingsScreen.shareUrl',
         name: 'shareurl',
-        helperText: 'settingsScreen.shareUrlHelperText'
+        helperText: 'settingsScreen.shareUrlHelperText',
     },
     {
         name: 'showItemIdentifier',
@@ -60,7 +60,7 @@ const formFields = [
         sourceConfig: {
             text: function text(_ref) {
                 const label = _ref.label;
-                return t(label);
+                return T(label);
             },
             value: 'value',
         },

package/src/UIComponents/SelectField.js

@@ -35,10 +35,11 @@ class UISelectField extends React.Component {
             disableUnderline,
             disabled,
             error,
+            shrinkLabel
         } = this.props;
         return (
             <FormControl className={classes.formControl} style={style} error={error && error.length() > 0}>
-                {label && <InputLabel htmlFor="inputselect">{label}</InputLabel>}
+                {label && <InputLabel shrink={shrinkLabel} htmlFor="inputselect">{label}</InputLabel>}
                 <Select
                     value={value}
                     onChange={onChange}

package/src/UIComponents/Table/TableHead.js

@@ -4,7 +4,7 @@ import TableHead from '@material-ui/core/TableHead/TableHead';
 import TableCell from '@material-ui/core/TableCell/TableCell';
 import TableRow from './TableRow';
 import Checkbox from '../Checkbox';
-import {Tooltip} from "@material-ui/core";
+import { Tooltip } from '@material-ui/core';
 import { t } from '../../App/i18n';
 
 const styles = {
@@ -38,7 +38,6 @@ class UITableHead extends React.Component {
                                                   onChange={evt => onAllRowsSelected(evt)}
                                               />
                                           </Tooltip>
-
                                       </TableCell>
                                   ),
                               });

package/src/dev.js

@@ -21,16 +21,16 @@ const target = window.location.search.substr(1);
 function tryToLoadComponent() {
     try {
         const compName = target.split('/').pop();
-        return require('../src/' + target + '/' + compName + '.dev').default;
+        return require('./' + target + '/' + compName + '.dev').default;
     } catch (e) {
         if (e.code === 'MODULE_NOT_FOUND') {
             // if not found, try it with <target>.dev.js
             try {
-                return require('../src/' + target + '.dev').default;
+                return require('./' + target + '.dev').default;
             } catch (e) {
                 if (e.code === 'MODULE_NOT_FOUND') {
                     // if not found, try it with <target>/dev.js
-                    return require('../src/' + target + '/dev').default;
+                    return require('./' + target + '/dev').default;
                 }
             }
         }

package/babel.config.js

@@ -1 +0,0 @@
-module.exports = require('./scripts/getDefaultBabelConfig').getConfig();

package/scripts/cpPath.js

@@ -1,152 +0,0 @@
-/* eslint-disable no-console */
-
-/**
- * This script is created to copy specific files with their folder structure
- * usage: node copyWithFolder.js src dst [filterRegExp]
- * @author boda@redhotmagma.de
- */
-
-const fs = require('fs');
-
-let src = null;
-let dst = null;
-let reg = null;
-
-process.argv.forEach(function(val, index) {
-    switch (index) {
-        case 2:
-            src = val;
-            break;
-        case 3:
-            dst = val;
-            break;
-        case 4:
-            reg = new RegExp(val);
-    }
-});
-
-if (!src || !fs.existsSync(src)) {
-    throw new Error('src must be an existing directory');
-}
-if (!dst || !fs.existsSync(dst)) {
-    throw new Error('dst must be an existing directory');
-}
-
-function walk(path, cb) {
-    try {
-        const files = fs.readdirSync(path);
-        for (const f of files) {
-            const cf = path + '/' + f;
-            const s = fs.lstatSync(cf);
-            cb(cf);
-            s.isDirectory() && walk(cf, cb);
-        }
-    } catch (e) {
-        return;
-    }
-}
-
-function copyWithParent(src, dst) {
-    if (typeof dst === 'function') {
-        dst = dst(src);
-    }
-    createDirDeep(dst.replace(/\/[^/]+$/, ''));
-    console.log(src + ' -> ' + dst);
-    const fileExt = src.replace(/.+\.([\w]+)$/, '$1');
-    switch (fileExt) {
-        case 'scss':
-            fs.readFile(src, 'utf8', function read(err, data) {
-                if (err) {
-                    throw err;
-                }
-                const modifiedContent = prepareSassFile(src, data);
-                fs.writeFile(dst, modifiedContent, 'utf8', function write(err) {
-                    if (err) {
-                        throw err;
-                    }
-                });
-            });
-            break;
-        default:
-            fs.createReadStream(src).pipe(fs.createWriteStream(dst));
-    }
-}
-
-function prepareSassFile(src, content) {
-    if (!content || !content.match) {
-        return content;
-    }
-    const replaceImports = content.match(/@import ['"][^.~].+/g);
-    let output = content;
-    if (replaceImports) {
-        const pathUp =
-            '..' +
-            src
-                .match(/src\/.+/)[0]
-                .match(/\//g)
-                .splice(1)
-                .join('..');
-        for (let i in replaceImports) {
-            const pathToImport = replaceImports[i].replace(/@import ['"][/]?([^'"]+).*/, '$1');
-            const resolverPath = pathUp + pathToImport;
-
-            const srcPathDir = src.replace(/\/[^/]+$/, '/');
-            const relativeImportPath = srcPathDir + pathToImport;
-            const rootImportPath = srcPathDir + resolverPath;
-
-            let resolveRootImport = false;
-            try {
-                fs.accessSync(relativeImportPath);
-            } catch (err) {
-                try {
-                    fs.accessSync(relativeImportPath + '.scss');
-                } catch (err) {
-                    try {
-                        fs.accessSync(rootImportPath);
-                        resolveRootImport = true;
-                    } catch (err) {
-                        try {
-                            fs.accessSync(rootImportPath + '.scss');
-                            resolveRootImport = true;
-                        } catch (err) {
-                            throw 'Cannot resolve import path: ' + replaceImports[i] + ' in ' + src;
-                        }
-                    }
-                }
-            }
-            if (resolveRootImport) {
-                console.log('Resolved root import in ' + src + ': ' + pathToImport + ' -> ' + resolverPath);
-                const resolvedImport = replaceImports[i].replace(
-                    /(@import ['"])[^'"]+(.*)/,
-                    '$1' + resolverPath + '$2'
-                );
-                output = output.replace(replaceImports[i], resolvedImport);
-            }
-        }
-    }
-    return output;
-}
-
-function createDirDeep(path) {
-    const ps = path.split('/');
-    let dir = ps.splice(0, 1);
-    for (const p of ps) {
-        dir = [dir, p].join('/');
-        if (!fs.existsSync(dir)) {
-            fs.mkdirSync(dir);
-        }
-    }
-}
-
-console.log(
-    '\x1b[32m%s\x1b[0m',
-    'Copying files from ' + src + ' to ' + dst + (reg ? ' with filter: ' + reg : ' without filter')
-);
-
-walk(src, function(f) {
-    if (reg === null || (reg && reg.test(f))) {
-        copyWithParent(f, function(path) {
-            return dst + path.replace(src, '');
-        });
-    }
-});

package/scripts/updateLocalPackages.js

@@ -1,68 +0,0 @@
-/* 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);
-    }
-}