@configuratorware/configurator-admingui 1.36.0-beta.0 → 1.36.1

package/src/Screens/Designer/__tests__/__snapshots__/FormProductionMethods.test.js.snap

@@ -249,6 +249,44 @@ exports[`Unit- FormProductionMethods renders correctly 1`] = `
         </span>
       </label>
     </div>
+    <div
+      class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
+    >
+      <label
+        class="MuiFormControlLabel-root-205"
+      >
+        <span
+          class="MuiButtonBase-root-227 MuiIconButton-root-221 MuiPrivateSwitchBase-root-217 MuiCheckbox-root-211 MuiCheckbox-colorPrimary-215"
+        >
+          <span
+            class="MuiIconButton-label-226"
+          >
+            <svg
+              aria-hidden="true"
+              class="MuiSvgIcon-root-184"
+              focusable="false"
+              role="presentation"
+              viewBox="0 0 24 24"
+            >
+              <path
+                d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+              />
+            </svg>
+            <input
+              class="MuiPrivateSwitchBase-input-220"
+              data-indeterminate="false"
+              type="checkbox"
+              value="oneLineText"
+            />
+          </span>
+        </span>
+        <span
+          class="MuiTypography-root-230 MuiTypography-body1-239 MuiFormControlLabel-label-210"
+        >
+          oneLineText
+        </span>
+      </label>
+    </div>
     <div
       class="MuiGrid-item-44 MuiGrid-grid-xs-12-83 FormProductionMethods-checkboxGrid-1"
     >

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

@@ -10,6 +10,7 @@ import { SET_DATA } from '../../../App/Reducers/Entity/Actions';
 
 import { generateDefaultActions } from '../../../App/Reducers/Entity/Actions';
 import { dispatchPostData } from '../../../App/Reducers/Api/Helpers';
+import { whiteSpacePattern } from "../../../App/Data";
 
 const actions = generateDefaultActions(LIST_KEY, DATA_KEY, REDUCER_NAME, 'fonts');
 
@@ -45,24 +46,28 @@ actions.postData = () => (dispatch, getState) => {
         const fontsToUpload = [];
 
         const fontName = state.data.name.value;
-
-        if (fontName) {
+        if (fontName && fontName.match(whiteSpacePattern) && fontName.match(whiteSpacePattern)[0] === fontName) {
             const fontTypeMap = {
                 fileNameRegular: 'regular',
                 fileNameBold: 'bold',
                 fileNameItalic: 'italic',
                 fileNameBoldItalic: 'bolditalic',
             };
-
+    
             for (const fontType in fontTypeMap) {
                 const fontFile = state.data[fontType].value;
-
-                if (fontFile && !isString(fontFile)) {
-                    fontsToUpload.push({
-                        name: fontType,
-                        value: fontFile,
-                        filename: fontName + '-' + fontTypeMap[fontType] + '.ttf',
-                    });
+                if (fontFile) {
+                    const filename = fontName + '-' + fontTypeMap[fontType] + '.ttf';
+                    if (!isString(fontFile)) {
+                        fontsToUpload.push({
+                            name: fontType,
+                            value: fontFile,
+                            filename
+                        });
+                    }
+                    else {
+                        dispatch(setFilenameField(fontType, filename));
+                    }
                 }
             }
         }
@@ -82,7 +87,7 @@ actions.postData = () => (dispatch, getState) => {
                 });
 
                 checkFontsToUpload();
-            });
+            }); 
         };
 
         checkFontsToUpload();

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

@@ -8,7 +8,7 @@ const initialState = {
     ...getDefaultEntityState(
         {
             id: null,
-            name: { value: '', constraints: { presence: true } },
+            name: { value: '', constraints: { noWhitespace: true, presence: true } },
             active: false,
             isDefault: { value: false },
             fileNameRegular: null,

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

@@ -235,6 +235,27 @@ const formFields = [
         type: 'toggle',
         shouldRender: schema => schema.children.value.length > 0,
     },
+    {
+        name: 'itemclassifications',
+        label: 'itemclassifications',
+        type: 'dynSource',
+        sourceConfig: {
+            value: 'id',
+            text: 'translated_title',
+        },
+        dynSource: {
+            type: 'chip',
+            listKey: ITEMCLASSIFICATION_LIST_KEY,
+            url: ITEMCLASSIFICATIONS_URL,
+            autoLoad: false,
+            maxSearchResults: 25,
+            mapItems: item => ({ ...item, label: `${item.translated_title}` }),
+        },
+        openOnFocus: true,
+        loadEntity: Actions.loadEntity,
+        entityReducerName: 'itemclassificationData',
+        equalityCheckAttribute: 'identifier',
+    },
     {
         name: 'minimumOrderAmount',
         label: 'MinimumOrderAmount',
@@ -357,7 +378,8 @@ import { LOGIN_REDUCER_NAME } from '../../Login/Reducers/Actions';
 import CheckData from '../../Creator/Components/CheckData/CheckData';
 import LocalizedPriceValue from '../../../Components/LocalizedPriceValue';
 import { LocalizedPriceTextField } from '../../../Components/LocalizedPriceTextField';
-import {CallToActionField} from "../../../Components/CallToActionField";
+import { CallToActionField } from "../../../Components/CallToActionField";
+import { ITEMCLASSIFICATION_LIST_KEY, ITEMCLASSIFICATIONS_URL } from "../../Itemclassification/Reducers/Actions";
 
 const styles = theme => ({
     root: {

package/src/Screens/Item/Translations.js

@@ -18,6 +18,7 @@ require('../../App/i18n').use(
             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.',
+            itemclassifications: 'Product categories',
             visualizationData: {
               '2d': "2D",
               '3d': "3D",
@@ -99,6 +100,7 @@ require('../../App/i18n').use(
             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.',
+            itemclassifications: 'Produktkategorien',
             visualizationData: {
                 '2d': "2D",
                 '3d': "3D",

package/src/Screens/Item/index.js

@@ -1,10 +1,11 @@
 import Screen from './Screen';
 import itemData from './Reducers/ItemReducer';
 import variantData from './Reducers/Variant/Reducer';
+import itemClassificationData from './../Itemclassification/Reducers/Reducer';
 
 import { addReducers } from '../../App/FeatureReducers';
 
-addReducers([itemData, variantData]);
+addReducers([itemData, variantData, itemClassificationData]);
 
 export default {
     Screen,

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

@@ -0,0 +1,49 @@
+import React from 'react';
+import Actions, { ITEMCLASSIFICATION_REDUCER_NAME } from '../Reducers/Actions';
+
+const { setFieldData, postData, customAction } = Actions;
+import attributesDataStructure from '../../Item/DataStructures/Attributes/Editor';
+
+const formFields = [
+    {
+        name: 'identifier',
+        label: 'Identifier',
+        type: 'text',
+    },
+    {
+        name: 'texts',
+        label: 'Title',
+        type: 'intl',
+        intl: {
+            name: 'title',
+            type: 'text',
+        },
+    },
+    {
+        name: 'minimumOrderAmount',
+        label: 'Minimum order amount',
+        type: 'text',
+    },
+    ...attributesDataStructure,
+];
+
+import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
+import EditorPopup from '../../Item/Components/AttributeEditorPopup';
+
+const BaseDataForm = generateConnectedEdit(
+    formFields,
+    ITEMCLASSIFICATION_REDUCER_NAME,
+    setFieldData,
+    postData,
+    false,
+    customAction
+);
+
+const ItemClassificationForm = () => (
+    <div>
+        <BaseDataForm />
+        <EditorPopup />
+    </div>
+);
+
+export default ItemClassificationForm;

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

@@ -0,0 +1,64 @@
+import React from 'react';
+import Actions, {
+    ITEMCLASSIFICATION_LIST_KEY,
+    ITEMCLASSIFICATIONS_URL,
+    ITEMCLASSIFICATION_REDUCER_NAME,
+} from '../Reducers/Actions';
+const { detailsAction, hideDetails, showDetails, createEntity, listAction, deleteEntities } = Actions;
+
+const columns = [
+    {
+        name: 'identifier',
+        label: 'Identifier',
+        filterable: true,
+        sortable: true,
+        filterKey: 'itemclassification.identifier',
+        sortKey: 'itemclassification.identifier',
+    },
+    {
+        name: 'translated_title',
+        label: 'Title',
+        filterable: true,
+        sortable: true,
+        filterKey: 'itemclassification.itemClassificationText.title',
+        sortKey: 'itemclassification.itemClassificationText.title',
+    },
+];
+
+const listParams = {
+    entity: 'itemclassifications',
+    addButtonLabel: 'itemclassifications.addButtonLabel',
+};
+
+import generateConnectedList from '../../../Components/DefaultConnectedList';
+import OrderList from '../../../Components/OrderList';
+
+export const ConnectedList = generateConnectedList(
+    columns,
+    listParams,
+    ITEMCLASSIFICATION_LIST_KEY,
+    listAction,
+    detailsAction,
+    hideDetails,
+    showDetails,
+    createEntity,
+    deleteEntities,
+    {
+        reducerName: ITEMCLASSIFICATION_REDUCER_NAME,
+    }
+);
+
+const list = () => {
+    return (
+        <div>
+            <ConnectedList />
+            <OrderList
+                listUrl={ITEMCLASSIFICATIONS_URL}
+                entity={'itemclassification'}
+                orderSequenceNumber={'sequencenumber'}
+            />
+        </div>
+    );
+};
+
+export default list;

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

@@ -0,0 +1,17 @@
+export const ITEMCLASSIFICATION_LIST_KEY = 'itemclassifications';
+export const ITEMCLASSIFICATION_DATA_KEY = 'itemclassification';
+export const ITEMCLASSIFICATION_REDUCER_NAME = 'itemclassificationData';
+export const ITEMCLASSIFICATIONS_URL = 'itemclassifications';
+
+import { generateDefaultActions } from '../../../App/Reducers/Entity/Actions';
+
+const actions = generateDefaultActions(
+    ITEMCLASSIFICATION_LIST_KEY,
+    ITEMCLASSIFICATION_DATA_KEY,
+    ITEMCLASSIFICATION_REDUCER_NAME,
+    ITEMCLASSIFICATIONS_URL
+);
+
+export const { hideDetails, loadEntity, postData } = actions;
+
+export default actions;

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

@@ -0,0 +1,43 @@
+import { ITEMCLASSIFICATION_DATA_KEY, ITEMCLASSIFICATION_REDUCER_NAME } from './Actions';
+import { defaultEntityReducer, getDefaultEntityState } from '../../../App/Reducers/Entity/Reducer';
+import { createFeatureReducer } from '../../../App/FeatureReducers';
+import attributesDataStructure from '../../Item/DataStructures/Attributes/Reducer';
+
+const initialState = {
+    ...getDefaultEntityState(
+        {
+            id: null,
+            identifier: { value: '', constraints: { identifier: true } },
+            sequencenumber: {
+                value: null,
+                constraints: { numericality: { strict: true, onlyInteger: true } },
+            },
+            texts: [],
+            minimumOrderAmount: {
+                value: null,
+                constraints: { numericality: { strict: true, onlyInteger: true } },
+            },
+            ...attributesDataStructure,
+        },
+        {
+            source: 'itemclassifications',
+            dependencies: [
+                {
+                    name: 'itemclassifications',
+                    dataKey: 'parent_itemclassifications',
+                    source: 'itemclassifications',
+                },
+            ],
+        },
+        ITEMCLASSIFICATION_DATA_KEY
+    ),
+};
+
+export const itemClassificationData = createFeatureReducer(
+    ITEMCLASSIFICATION_REDUCER_NAME,
+    (state = initialState, action) => {
+        return defaultEntityReducer(state, action, initialState);
+    }
+);
+
+export default itemClassificationData;

package/src/Screens/Itemclassification/Screen.js

@@ -0,0 +1,19 @@
+import Actions, { ITEMCLASSIFICATION_REDUCER_NAME } from './Reducers/Actions';
+const { invalidateList, triggerUnsavedEntity, hideDetails } = Actions;
+
+import List from './Containers/List';
+import Edit from './Containers/Edit';
+
+import './Translations';
+
+import { generateConnectedSplitScreen } from '../../Components/DefaultConnectedScreen';
+
+export default generateConnectedSplitScreen(
+    'item_classifications',
+    List,
+    Edit,
+    ITEMCLASSIFICATION_REDUCER_NAME,
+    invalidateList,
+    triggerUnsavedEntity,
+    hideDetails
+);

package/src/Screens/Itemclassification/Translations.js

@@ -0,0 +1,22 @@
+require('../../App/i18n').use(
+    {
+        en: {
+            itemclassifications: {
+                addButtonLabel: 'Add Product category',
+                menuLabel: 'Product Categories',
+            },
+            item_classifications: 'Product categories',
+            'Minimum order amount': 'Minimum order amount',
+        },
+        de: {
+            itemclassifications: {
+                addButtonLabel: 'Produktkategorie hinzufügen',
+                menuLabel: 'Produktkategorien',
+            },
+            'Sequence number': 'Reihenfolge',
+            item_classifications: 'Produktkategorien',
+            'Minimum order amount': 'Mindestbestellmenge',
+        },
+    },
+    true
+);

package/src/Screens/Itemclassification/index.js

@@ -0,0 +1,9 @@
+import Screen from './Screen';
+import Reducer from './Reducers/Reducer';
+import { addReducers } from '../../App/FeatureReducers';
+
+addReducers(Reducer);
+
+export default {
+    Screen,
+};

package/src/Screens/index.js

@@ -19,7 +19,8 @@ import Savedconfigurations from './Savedconfigurations';
 import SoftwareUpdates from './SoftwareUpdates';
 import TrackingCodes from './TrackingCodes';
 import User from './User';
-import Finder from './Finder'
+import Itemclassification from './Itemclassification';
+import Finder from './Finder';
 
 export { Dashboard };
 export { Login };
@@ -36,6 +37,7 @@ export const features = {
     designer: Designer,
     design_production_methods: DesignProductionMethods,
     items: Item,
+    item_classifications: Itemclassification,
     licenses: License,
     options: Option,
     option_classifications: Optionclassification,