@configuratorware/configurator-admingui 1.26.5 → 1.27.2

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import Actions, { LIST_KEY } from '../Reducers/Actions';
 const { detailsAction, hideDetails, showDetails, createEntity, listAction, deleteEntities } = Actions;
 
@@ -24,13 +25,12 @@ const columns = [
 const listParams = {
     entity: 'fonts',
     addButtonLabel: 'fontScreen.addButtonLabel',
-    orderby: 'font.name',
-    orderdir: 'asc',
 };
 
 import generateConnectedList from '../../../Components/DefaultConnectedList';
+import OrderList from '../../../Components/OrderList';
 
-export default generateConnectedList(
+export const ConnectedList = generateConnectedList(
     columns,
     listParams,
     LIST_KEY,
@@ -41,3 +41,14 @@ export default generateConnectedList(
     createEntity,
     deleteEntities
 );
+
+export const list = () => {
+    return (
+        <div>
+            <ConnectedList />
+            <OrderList listUrl={LIST_KEY} entity={'font'} orderSequenceNumber={'sequence_number'} />
+        </div>
+    );
+};
+
+export default list;

package/src/Screens/Item/Containers/Styles.scss

@@ -85,5 +85,8 @@
 
 .itemEdit {
   position: relative;
+  @media (max-width: 960px) {
+    margin-top: 40px;
+  }
   .configuratorQuickView {}
 }

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

@@ -10,6 +10,26 @@ const formFields = [
         label: 'Identifier',
         type: 'text',
     },
+    {
+        name: 'texts',
+        label: 'Title',
+        type: 'intl',
+        intl: {
+            name: 'title',
+            type: 'text',
+        },
+    },
+    {
+        name: 'texts',
+        label: 'Description',
+        type: 'intl',
+        intl: {
+            name: 'description',
+            type: 'text',
+        },
+        multiLine: true,
+        rows: 6,
+    },
     {
         name: 'options',
         label: 'Options',

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

@@ -7,12 +7,13 @@ const initialState = {
         {
             id: null,
             identifier: { value: '', constraints: { identifier: true } },
+            texts: { value: [] },
             options: {
                 value: [],
                 schema: {
                     id: { value: null },
-                    identifier: { value: '' },
-                    translated_title: { value: '' }, // form helper
+                    identifier: { value: null, constraints: { presence: true } },
+                    translated_title: { value: '' },
                 },
             },
         },

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

@@ -57,6 +57,12 @@ const formFields = [
         label: 'settingsScreen.maxZoom2d',
         type: 'number',
     },
+    {
+        type: 'text',
+        label: 'settingsScreen.shareUrl',
+        name: 'shareurl',
+        helperText: 'settingsScreen.shareUrlHelperText'
+    },
     {
         name: 'showItemIdentifier',
         label: 'settingsScreen.showItemIdentifier',

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

@@ -16,6 +16,7 @@ const initialState = {
             showItemIdentifier: false,
             callToAction: 'addToCart',
             calculationMethod: 'sumofall',
+            shareurl: '',
         },
         {},
         SETTING_DATA_KEY

package/src/Screens/Setting/Translations.js

@@ -10,6 +10,8 @@ require('../../App/i18n').use(
                 showItemIdentifier:
                     'Display item identifier in the configurator</br>(termkey for the label: item_identifier_label)',
                 calculationMethod: 'Price calculation',
+                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.'
             },
             callToAction: {
                 callToAction: 'Call-to-Action Element',
@@ -32,6 +34,8 @@ require('../../App/i18n').use(
                 showItemIdentifier:
                     'Produkt Identifier im Konfigurator anzeigen</br>(Übersetzungskey für das Label: item_identifier_label)',
                 calculationMethod: 'Preiskalkulation',
+                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.'
             },
             callToAction: {
                 callToAction: 'Call-to-Action Element',

package/src/Screens/ColorPalettes/Components/DefaultColorRadio.js

@@ -1,35 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-import get from 'lodash/get';
-import Radio from '@material-ui/core/Radio';
-import Actions, { COLORPALETTES_REDUCER_NAME } from '../Reducers/Actions';
-
-export class DefaultColorRadio extends Component {
-    static propTypes = {
-        color: PropTypes.object,
-    };
-
-    onRadioChange = () => {
-        this.props.setDefaultColor(this.props.color);
-    };
-
-    render() {
-        return <Radio checked={this.props.isDefaultColor} onChange={this.onRadioChange} />;
-    }
-}
-
-const mapStateToProps = (state, ownProps) => {
-    const colorId = get(ownProps.color, 'id', null);
-    const defaultColorId = get(state, `${COLORPALETTES_REDUCER_NAME}.data.defaultColor.value.id`, null);
-
-    return {
-        isDefaultColor: colorId === defaultColorId,
-    };
-};
-
-const mapDispatchToProps = dispatch => ({
-    setDefaultColor: color => dispatch(Actions.setFieldData('defaultColor', color)),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(DefaultColorRadio);