@configuratorware/configurator-frontendgui 1.34.1 → 1.35.0

package/src/App/Modules/Creator/Components/ProductPartsList/index.js

@@ -51,6 +51,7 @@ const ProductPartsList = ({
     CallToActionComponent,
     width,
     optionListVisible,
+    onCloseSelectedPart,
 }) => {
     const classes = useStyles();
     const [anchorRef, setAnchorRef] = useState(null);
@@ -72,6 +73,7 @@ const ProductPartsList = ({
                             selectedOption={selectedoptionclassification}
                             verticalMode={vertical}
                             optionListVisible={optionListVisible}
+                            onCloseSelected={onCloseSelectedPart}
                             {...refProps}
                         />
                     );
@@ -98,6 +100,7 @@ ProductPartsList.defaultProps = {
     showStartHere: false,
     vertical: true,
     ProductPartComponent: ProductPart,
+    onCloseSelectedPart: () => {},
 };
 
 ProductPartsList.propTypes = {
@@ -111,6 +114,7 @@ ProductPartsList.propTypes = {
     CallToActionComponent: PropTypes.elementType,
     width: PropTypes.string,
     optionListVisible: PropTypes.bool,
+    onCloseSelectedPart: PropTypes.func,
 };
 
 export default withWidth({ initialWidth: 'lg' })(ProductPartsList);

package/src/App/Modules/Creator/Containers/InvalidConfigurationNotice/index.js

@@ -22,8 +22,11 @@ const getValidationErrors = configuratorState => {
         return !optionclassifications
             ? []
             : Object.entries(errors).map(([key, error]) => ({
-                  title: optionclassifications.find(({ identifier }) => identifier === key).title,
+                  title:
+                      optionclassifications.find(({ identifier }) => identifier === key)?.title ||
+                      error.componentTitle,
                   errors: error.errors,
+                  key,
               }));
     });
 };

package/src/App/Modules/Creator/Containers/OptionsList/index.js

@@ -3,6 +3,7 @@ import { setStockInformationOption } from 'App/Reducers/Configurator/Actions';
 import { setVisible } from 'App/Reducers/UI/Actions';
 import OptionsList from '../../Components/OptionsList';
 import { getConf } from '../../../../configuration';
+import { Services } from 'App/ServiceLocator';
 
 const mapStateToProps = ({ ui, configurator, api }) => {
     const showDialog = !!ui.visibilityMap.incompatibility || !!ui.visibilityMap.optionDetails;
@@ -23,6 +24,7 @@ const mapDispatchToProps = dispatch => ({
         dispatch(setVisible('stockInformation', true));
     },
     onClose: () => dispatch(setVisible('optionlist', false)),
+    setOptionInputText: (identifier, value) => Services.configurator.setOptionInputText(identifier, value),
 });
 
 export default containerConnect(mapStateToProps, mapDispatchToProps);

package/src/App/Modules/Creator/Containers/ProductPartsList/index.js

@@ -4,6 +4,7 @@ import { getConf } from 'App/configuration';
 import { getComponent } from 'App/configuration';
 import CallToAction from 'App/Shared/Components/CallToAction';
 import memoize from 'Utils/Function/memoize';
+import { applyOptionInputText } from '../../../../Reducers/Configurator/Actions';
 
 const removeHiddenComponents = memoize(components =>
     components.filter(({ hiddenInFrontend }) => !hiddenInFrontend)
@@ -24,6 +25,8 @@ const mapStateToProps = ({ configurator, device, ui }) => {
     };
 };
 
-const mapDispatchToProps = () => ({});
+const mapDispatchToProps = dispatch => ({
+    onCloseSelectedPart: optionClassification => dispatch(applyOptionInputText(optionClassification)),
+});
 
 export default containerConnect(mapStateToProps, mapDispatchToProps);

package/src/App/Reducers/Configurator/Actions.js

@@ -1,5 +1,6 @@
 import * as apiActions from '../Actions';
 import { first, isObject, get, isArray, flatten } from 'lodash';
+import find from 'lodash/find';
 import uniq from 'lodash/uniq';
 import { t } from 'Framework/i18n';
 import Api from 'Framework/Api';
@@ -60,6 +61,8 @@ export const SET_CALCULATION_AUTO_RESOLVE_ENABLED = 'SET_CALCULATION_AUTO_RESOLV
 export const SET_OPTIONCLASSIFICATION_CHECKED = 'SET_OPTIONCLASSIFICATION_CHECKED';
 export const SET_CONFLICTING_SWITCHOPTION_DATA = 'SET_CONFLICTING_SWITCHOPTION_DATA';
 export const SET_SELECTED_AMOUNT = 'SET_SELECTED_AMOUNT';
+export const SET_OPTION_INPUT_TEXT = 'SET_OPTION_INPUT_TEXT';
+export const RESET_OPTION_INPUT_TEXTS = 'RESET_OPTION_INPUT_TEXTS';
 export const SWITCH_SELECTED_AMOUNT = 'SWITCH_SELECTED_AMOUNT';
 export const SAVE_BULKNAMES = 'SAVE_BULKNAMES';
 export const CLEAR_BULKNAMES = 'CLEAR_BULKNAMES';
@@ -731,6 +734,7 @@ export const selectOption = (
         component: optionclassification.identifier,
         option: option.identifier,
     });
+
     const switchOptionData = {
         [optionclassification.identifier]: {
             ...option,
@@ -744,6 +748,29 @@ export const selectOption = (
     return dispatch(switchOptions(configuration, switchOptionData, false, refreshOptionlist, true));
 };
 
+export const applyOptionInputText = optionClassification => (dispatch, getState) => {
+    const switchOptionData = { [optionClassification.identifier]: [] };
+    const { configuration, optionInputTexts } = getState().configurator;
+    for (let selectedOption of optionClassification.selectedoptions) {
+        const inputText = get(
+            find(optionInputTexts, ['optionIdentifier', selectedOption.identifier]),
+            'inputText',
+            null
+        );
+        if (inputText && inputText !== selectedOption.inputText) {
+            switchOptionData[optionClassification.identifier].push({
+                ...selectedOption,
+                inputText: inputText,
+                check_results: null,
+            });
+        }
+    }
+    dispatch(resetOptionInputTexts());
+    if (switchOptionData[optionClassification.identifier].length > 0) {
+        return dispatch(switchOptions(configuration, switchOptionData, false, true, true));
+    }
+};
+
 export const selectMultipleOptions = optionsList => (dispatch, getState) => {
     const configuration = getConfiguration(getConfigurator(getState()));
     const switchOptionData = {};
@@ -870,3 +897,13 @@ export const setSelectedCalculation = (identifier, value) => ({
     identifier,
     value,
 });
+
+export const setOptionInputText = (identifier, value) => ({
+    type: SET_OPTION_INPUT_TEXT,
+    identifier,
+    value,
+});
+
+export const resetOptionInputTexts = () => ({
+    type: RESET_OPTION_INPUT_TEXTS,
+});

package/src/App/Reducers/Configurator/Reducer.js

@@ -1,6 +1,7 @@
 import * as actionTypes from './Actions';
 import _ from 'lodash';
 import get from 'lodash/get';
+import findIndex from 'lodash/findIndex';
 import omit from 'lodash/omit';
 import forEach from 'lodash/forEach';
 import reduce from 'lodash/reduce';
@@ -34,6 +35,7 @@ const initialState = {
     filteredOptionclassifications: [],
     selectedVariantIdentifier: null,
     selectedAmountsUpdated: false,
+    optionInputTexts: [],
 };
 
 export function configurationHandler(state, action) {
@@ -536,6 +538,35 @@ export function configurationModifierHandler(state, action) {
             );
         }
 
+        case actionTypes.SET_OPTION_INPUT_TEXT: {
+            const optionInputTexts = state.optionInputTexts;
+            const optionInputTextIndex = findIndex(optionInputTexts, ['optionIdentifier', action.identifier]);
+            if (optionInputTextIndex !== -1) {
+                optionInputTexts[optionInputTextIndex] = {
+                    optionIdentifier: action.identifier,
+                    inputText: action.value,
+                };
+            } else if (optionInputTextIndex === -1 && action.value) {
+                optionInputTexts.push({
+                    optionIdentifier: action.identifier,
+                    inputText: action.value,
+                });
+            }
+            return {
+                ...state,
+                optionInputTexts,
+            };
+        }
+
+        case actionTypes.RESET_OPTION_INPUT_TEXTS: {
+            const optionInputTexts = [];
+
+            return {
+                ...state,
+                optionInputTexts,
+            };
+        }
+
         default:
             return state;
     }

package/src/App/Services/ConfiguratorService.js

@@ -724,6 +724,10 @@ export default class ConfiguratorService extends AbstractConfiguratorService {
         return Services.store.dispatch(configuratorActions.setSelectedVariantIdentifier(identifier));
     }
 
+    setOptionInputText(identifier, value) {
+        return Services.store.dispatch(configuratorActions.setOptionInputText(identifier, value));
+    }
+
     /**
      * A simple method for saving the configuration without any additional design data or screenshot
      * @param {string} saveType