@configuratorware/configurator-admingui 1.26.5 → 1.27.2

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

@@ -1,25 +1,34 @@
 import React from 'react';
 import Actions, { COLORPALETTES_REDUCER_NAME } from '../Reducers/Actions';
-import DefaultColorRadio from '../Components/DefaultColorRadio';
-const { setFieldData, postData } = Actions;
+import DefaultColorSwitch from '../Components/DefaultColorSwitch';
+const { setFieldData, postData, detailsAction } = Actions;
+
+function withLoadDetails(Component) {
+    return connect(() => ({}), {
+        reloadPalette: id => detailsAction({ id }),
+    })(Component);
+}
+
+const ConnectedOrderedButton = ({ value, reloadPalette, ...props }) => {
+    return (
+        <OrderList
+            listUrl={`/colorpalettes/${value}`}
+            saveListUrl={`/colorpalettes/${value}/colors/savesequencenumbers`}
+            entity={'colorpalettes.colors'}
+            orderSequenceNumber={'sequence_number'}
+            listField={'colors'}
+            onListSaved={() => {
+                reloadPalette(value);
+            }}
+        />
+    );
+};
 
 const formFields = [
     {
         name: 'identifier',
         label: 'Identifier',
         type: 'text',
-        /*type: 'autocompleteEntity',
-        sourceConfig: {
-            value: 'id',
-            text: 'identifier'
-        },
-        dynSource: {
-            listKey: COLORPALETTES_LIST_KEY,
-            url: COLORPALETTES_LIST_URL
-        },
-        loadEntity: Actions.loadEntity,
-        entityReducerName: COLORPALETTES_REDUCER_NAME,
-        equalityCheckAttribute: 'identifier'*/
     },
     {
         name: 'texts',
@@ -34,14 +43,17 @@ const formFields = [
         name: 'colors',
         label: 'Colors',
         type: 'array',
+        buttonsPosition: 'top',
+        showPopup: true,
         array: {
             columns: [
                 {
-                    name: 'defaultColorRadio',
+                    name: 'defaultColorSwitch',
                     label: 'defaultColor',
                     renderValue: (value, rowData) => {
-                        return <DefaultColorRadio color={rowData} />;
+                        return <DefaultColorSwitch color={rowData} />;
                     },
+                    disableSelection: true,
                 },
                 {
                     name: 'identifier',
@@ -56,16 +68,16 @@ const formFields = [
                 },
                 {
                     name: 'hex_value',
-                    label: 'Value',
+                    label: 'Hex value',
                     renderValue: value => (
-                        <span>
+                        <span style={{ display: 'flex', alignItems: 'center', minWidth: 95 }}>
                             <div
                                 style={{
                                     background: '#' + value,
-                                    width: 30,
-                                    height: 30,
+                                    minWidth: 20,
+                                    height: 20,
                                     outline: '1px solid black',
-                                    margin: 13,
+                                    marginRight: 8,
                                 }}
                             />
                             {'#' + value}
@@ -96,8 +108,14 @@ const formFields = [
             ],
         },
     },
+    {
+        type: withLoadDetails(ConnectedOrderedButton),
+        name: 'id',
+    },
 ];
 
 import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
 import TranslationFinder from '../../../Components/TranslationFinder';
+import OrderList from '../../../Components/OrderList';
+import { connect } from 'react-redux';
 export default generateConnectedEdit(formFields, COLORPALETTES_REDUCER_NAME, setFieldData, postData);

package/src/Screens/ColorPalettes/Translations.js

@@ -18,6 +18,7 @@ require('../../App/i18n').use(
             },
             Colors: 'Farben',
             defaultColor: 'Standard-</br>farbe',
+            'Hex value': 'Hex Wert',
         },
     },
     true

package/src/Screens/Creator/Reducers/ConfigurationActions.js

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
 
-export const CONFIGURATION_LIST_KEY = 'items';
+export const CONFIGURATION_LIST_KEY = 'creator_items';
 export const CONFIGURATION_DATA_KEY = 'base_configuration';
 export const CONFIGURATION_REDUCER_NAME = 'baseConfigurationData';
 export const CONFIGURATION_POST_URL = 'constructionpatterns';

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

@@ -65,11 +65,6 @@ const formFields = [
                 type: 'number',
                 helperText: T('designProductionMethod.minimumFontSizeHint'),
             },
-            {
-                name: 'hasEngravingBackgroundColors',
-                label: 'Has Engraving Background Colors',
-                type: 'checkbox',
-            },
         ],
     },
     {

package/src/Screens/DesignProductionMethods/Reducers/DesignProductionMethodsReducer.js

@@ -25,7 +25,6 @@ const initialState = {
                             numericality: { strict: true, onlyInteger: true, greaterThanOrEqualTo: 1 },
                         },
                     },
-                    hasEngravingBackgroundColors: { value: false },
                 },
             },
             colorPalettes: {