@configuratorware/configurator-admingui 1.27.3-beta.8 → 1.27.6

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 : 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
-};
+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
+};

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

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

package/src/Screens/Item/Translations.js

@@ -16,8 +16,7 @@ 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',
@@ -92,8 +91,7 @@ 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,15 +18,6 @@ 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 = {
@@ -56,7 +47,11 @@ export const list = () => {
     return (
         <div>
             <ConnectedList />
-            <OrderList listUrl={OPTION_LIST_URL} entity={'option'} orderSequenceNumber={'sequencenumber'} />
+            <OrderList
+                listUrl={OPTION_LIST_URL}
+                entity={'item.option'}
+                orderSequenceNumber={'sequencenumber'}
+            />
         </div>
     );
 };

package/src/Screens/Option/Translations.js

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

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

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

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

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

package/src/Screens/Optionclassification/Translations.js

@@ -6,19 +6,15 @@ 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': 'Reihenfolge',
+            'Sequence number': 'Sequenznummer',
             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)',
+                'versteckt (diese Komponente taucht in keiner Liste auf, kann aber z.B. für Regeln verwendet werden',
         },
     },
     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;
@@ -16,20 +16,6 @@ const creatorAidedMediaEditingField = (function createCreatorAidedMediaEditingFi
     };
 })();
 
-const configurationsClientRestrictedField = (function createConfigurationsClientRestrictedField() {
-    let shouldRender = false;
-    return {
-        name: 'configurationsClientRestricted',
-        label: 'settingsScreen.configurationsClientRestricted',
-        type: 'toggle',
-        invert: true,
-        shouldRender: () => shouldRender,
-        setShouldRender: value => {
-            shouldRender = value;
-        },
-    };
-})();
-
 const formFields = [
     {
         name: 'defaultVisualizationModeLabel',
@@ -37,6 +23,35 @@ const formFields = [
         type: 'select',
         source: ['2d', '3d'],
     },
+    {
+        name: 'callToAction',
+        label: 'callToAction.callToAction',
+        type: 'select',
+        sourceConfig: {
+            text: function text(_ref) {
+                const label = _ref.label;
+                return t(label);
+            },
+            value: 'value',
+        },
+        source: [
+            {
+                value: 'addToCart',
+                label: 'callToAction.addToCart',
+                id: 'addToCart',
+            },
+            {
+                value: 'requestOffer',
+                label: 'callToAction.requestOffer',
+                id: 'requestOffer',
+            },
+            {
+                value: 'none',
+                label: 'callToAction.none',
+                id: 'none',
+            },
+        ],
+    },
     {
         name: 'maxZoom2d',
         label: 'settingsScreen.maxZoom2d',
@@ -46,7 +61,7 @@ const formFields = [
         type: 'text',
         label: 'settingsScreen.shareUrl',
         name: 'shareurl',
-        helperText: 'settingsScreen.shareUrlHelperText',
+        helperText: 'settingsScreen.shareUrlHelperText'
     },
     {
         name: 'showItemIdentifier',
@@ -60,7 +75,7 @@ const formFields = [
         sourceConfig: {
             text: function text(_ref) {
                 const label = _ref.label;
-                return T(label);
+                return t(label);
             },
             value: 'value',
         },
@@ -77,7 +92,6 @@ const formFields = [
             },
         ],
     },
-    configurationsClientRestrictedField,
     {
         name: 'customCss',
         label: 'settingsScreen.customCss',
@@ -95,7 +109,6 @@ class SettingForm extends Component {
     componentDidMount() {
         this.props.loadFirstSetting();
         creatorAidedMediaEditingField.setShouldRender(this.props.creatorItems);
-        configurationsClientRestrictedField.setShouldRender(this.props.hasClientsFeature);
     }
 
     render() {
@@ -105,7 +118,6 @@ class SettingForm extends Component {
 
 const mapStateToProps = ({ loginData }) => ({
     creatorItems: hasCredentialFor(loginData, 'items_creator'),
-    hasClientsFeature: hasCredentialFor(loginData, 'clients'),
 });
 
 const mapDispatchToProps = dispatch => ({

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

@@ -14,8 +14,8 @@ const initialState = {
             customCss: '',
             defaultVisualizationModeLabel: '',
             showItemIdentifier: false,
+            callToAction: 'addToCart',
             calculationMethod: 'sumofall',
-            configurationsClientRestricted: true,
             shareurl: '',
         },
         {},

package/src/Screens/Setting/Translations.js

@@ -10,7 +10,6 @@ require('../../App/i18n').use(
                 showItemIdentifier:
                     'Display item identifier in the configurator</br>(termkey for the label: item_identifier_label)',
                 calculationMethod: 'Price calculation',
-                configurationsClientRestricted: 'Clients can load configurations from other clients',
                 shareUrl: 'URL for sharing configurations',
                 shareUrlHelperText: 'include placeholder for configuration code, e.g. https://www.myshop.com/configurator/code:{code}<br>For more dynamic needs, \'&_share_url=\' can be passed as a GET parameter to the frontend.'
             },
@@ -35,7 +34,6 @@ require('../../App/i18n').use(
                 showItemIdentifier:
                     'Produkt Identifier im Konfigurator anzeigen</br>(Übersetzungskey für das Label: item_identifier_label)',
                 calculationMethod: 'Preiskalkulation',
-                configurationsClientRestricted: 'Klienten können die Konfigurationen anderer Klienten laden',
                 shareUrl: 'URL zum Teilen von Konfigurationen',
                 shareUrlHelperText: 'Mit Platzhalter für Konfigurations-Code, z.B. https://www.myshop.com/configurator/code:{code}<br>Für dynamischere Anforderungen kann der GET Parameter \'&_share_url=\' beim Aufruf des Frontends übergeben werden.'
             },

package/src/UIComponents/SelectField.js

@@ -35,11 +35,10 @@ 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 shrink={shrinkLabel} htmlFor="inputselect">{label}</InputLabel>}
+                {label && <InputLabel 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,6 +38,7 @@ 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('./' + target + '/' + compName + '.dev').default;
+        return require('../src/' + target + '/' + compName + '.dev').default;
     } catch (e) {
         if (e.code === 'MODULE_NOT_FOUND') {
             // if not found, try it with <target>.dev.js
             try {
-                return require('./' + target + '.dev').default;
+                return require('../src/' + target + '.dev').default;
             } catch (e) {
                 if (e.code === 'MODULE_NOT_FOUND') {
                     // if not found, try it with <target>/dev.js
-                    return require('./' + target + '/dev').default;
+                    return require('../src/' + target + '/dev').default;
                 }
             }
         }