@wise/dynamic-flow-client 3.9.1-experimental-152372b → 3.9.2-experimental-535221d

package/build/legacy/dynamicFlow/DynamicFlow.js

@@ -50,7 +50,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { DynamicFlowProvider, getEventDispatcher, EventsContextProvider, LogProvider, getLogger, } from '../common/contexts';
 import { FeatureContextProvider } from '../common/contexts/featureContext/FeatureContext';
 import { isObjectModel } from '../common/utils';
-import { isValidSchema } from '../common/validators';
+import { isObject, isValidSchema } from '../common/validators';
 import { DynamicFlowStep } from './DynamicFlowStep';
 import { ErrorBoundary, useLoader, useDynamicFlowState, useDebouncedRefresh, parseFetchResponse, getJsonObjectOrNull, parseErrorResponse, } from './utils';
 import { HttpClientProvider } from '../../common/httpClientContext';
@@ -112,7 +112,7 @@ var DynamicFlowComponent = function (_a) {
                     case 3:
                         _a.sent();
                         return [2 /*return*/];
-                    case 4: return [4 /*yield*/, handleResponse(response, 'submission')];
+                    case 4: return [4 /*yield*/, handleResponse(response, 'submission', action.result)];
                     case 5:
                         _a.sent();
                         return [3 /*break*/, 7];
@@ -179,9 +179,9 @@ var DynamicFlowComponent = function (_a) {
         if (initialStep) {
             warnIfNoStepLayout(initialStep);
         }
-        // // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [httpClient, JSON.stringify(initialStep), JSON.stringify(initialAction)]);
-    var handleResponse = function (response, fetchType) { return __awaiter(void 0, void 0, void 0, function () {
+    var handleResponse = function (response, fetchType, actionResult) { return __awaiter(void 0, void 0, void 0, function () {
         var errorResponse, result, error_3;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -204,7 +204,7 @@ var DynamicFlowComponent = function (_a) {
                         void performAction(result.action, result.action.data);
                     }
                     else if (result.type === 'exit') {
-                        dispatchEventAndComplete(result.result);
+                        dispatchEventAndComplete(isObject(actionResult) ? __assign(__assign({}, result.result), actionResult) : result.result);
                     }
                     else {
                         updateStep(result.step, result.etag, fetchType);

package/build/legacy/dynamicFlow/tests/Actions.spec.js

@@ -81,7 +81,7 @@ describe('Actions', function () {
                                 onError = jest.fn();
                                 onCompletion = jest.fn();
                                 httpClient = jest.fn(function () {
-                                    return Promise.resolve(new Response(JSON.stringify({ key: 'new value', extra_key: 'value' }), {
+                                    return Promise.resolve(new Response(JSON.stringify({ key: 'response body value', extra_key: 'value' }), {
                                         status: 200,
                                     }));
                                 });
@@ -90,7 +90,7 @@ describe('Actions', function () {
                                     layout: [
                                         {
                                             type: 'button',
-                                            action: { url: '/submit', exit: true, result: { key: 'old value' } },
+                                            action: { url: '/submit', exit: true, result: { key: 'action result value' } },
                                         },
                                     ],
                                     schemas: [],
@@ -106,7 +106,7 @@ describe('Actions', function () {
                                     })];
                             case 3:
                                 _c.sent();
-                                expect(onCompletion).toHaveBeenCalledWith(expect.objectContaining({ key: 'old value', extra_key: 'value' }));
+                                expect(onCompletion).toHaveBeenCalledWith(expect.objectContaining({ key: 'action result value', extra_key: 'value' }));
                                 expect(onError).not.toHaveBeenCalled();
                                 return [2 /*return*/];
                         }
@@ -182,4 +182,51 @@ describe('Actions', function () {
             }); });
         });
     });
+    describe('given an non-exit action', function () {
+        describe('when the response contains "X-DF-ResponseType: exit" header', function () {
+            it('should exit the flow with a merged object of the response body and result when the action has a result', function () { return __awaiter(void 0, void 0, void 0, function () {
+                var onError, onCompletion, httpClient, step, _a, _b;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            onError = jest.fn();
+                            onCompletion = jest.fn();
+                            httpClient = jest.fn(function () { return __awaiter(void 0, void 0, void 0, function () {
+                                return __generator(this, function (_a) {
+                                    return [2 /*return*/, Promise.resolve(new Response(JSON.stringify({ key: 'response body value', extra_key: 'value' }), {
+                                            status: 200,
+                                            headers: { 'X-DF-Response-Type': 'exit' },
+                                        }))];
+                                });
+                            }); });
+                            step = {
+                                id: 'step-id',
+                                title: 'Step Title',
+                                layout: [
+                                    {
+                                        type: 'button',
+                                        action: { url: '/submit', result: { key: 'action result value' } },
+                                    },
+                                ],
+                                schemas: [],
+                            };
+                            renderWithProviders(_jsx(DynamicFlow, { flowId: "the-flow-id", initialStep: step, httpClient: httpClient, onCompletion: onCompletion, onError: onError }));
+                            _b = (_a = userEvent).click;
+                            return [4 /*yield*/, screen.findByRole('button')];
+                        case 1: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
+                        case 2:
+                            _c.sent();
+                            return [4 /*yield*/, waitFor(function () {
+                                    expect(onCompletion).toHaveBeenCalledTimes(1);
+                                })];
+                        case 3:
+                            _c.sent();
+                            expect(onCompletion).toHaveBeenCalledWith(expect.objectContaining({ key: 'action result value', extra_key: 'value' }));
+                            expect(onError).not.toHaveBeenCalled();
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
+        });
+    });
 });

package/build/legacy/formControl/FormControl.js

@@ -111,10 +111,12 @@ var FormControl = /** @class */ (function (_super) {
                                 var query = _a.query;
                                 onSearchChange(query);
                             }
-                            : undefined, onClear: function () {
-                            _this.setState({ selectedOption: null });
-                            _this.props.onChange(null);
-                        } }) }));
+                            : undefined, onClear: required
+                            ? undefined
+                            : function () {
+                                _this.setState({ selectedOption: null });
+                                _this.props.onChange(null);
+                            } }) }));
             }
             case FormControlType.TAB:
                 return (_jsx(Tabs, { selected: (((_b = this.getSelectedOption(options)) === null || _b === void 0 ? void 0 : _b.value) || 0), tabs: options.map(function (option) { return ({

package/build/legacy/jsonSchemaForm/JsonSchemaForm.end-to-end.spec.js

@@ -495,35 +495,6 @@ describe('E2E: Given a component for rendering a JSON schema form', function ()
                         }
                     });
                 }); });
-                it('...and if the oneOf is unselected, the validation message is back', function () { return __awaiter(void 0, void 0, void 0, function () {
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0:
-                                renderComponent({ schema: schema, initialModel: {}, submitted: true });
-                                expect(screen.getByText(/please, choose/i)).toBeInTheDocument();
-                                expect(screen.getByText('Custom required validation error')).toBeInTheDocument();
-                                expect(screen.queryByText('Please fill out this field.')).not.toBeInTheDocument();
-                                fireEvent.click(screen.getByText(/please, choose an option/i));
-                                fireEvent.click(screen.getByText(/iban tab/i));
-                                return [4 /*yield*/, waitFor(function () {
-                                        expect(screen.queryByText(/please, choose an option/i)).not.toBeInTheDocument();
-                                    })];
-                            case 1:
-                                _a.sent();
-                                expect(screen.queryByText('Custom required validation error')).not.toBeInTheDocument();
-                                expect(screen.getAllByText('Please fill out this field.')).toHaveLength(2);
-                                fireEvent.click(screen.getByLabelText(/clear/i));
-                                expect(screen.getByText(/please, choose an option/i)).toBeInTheDocument();
-                                fireEvent.click(screen.getByText(/please, choose an option/i));
-                                return [4 /*yield*/, waitFor(function () {
-                                        expect(screen.getByText('Custom required validation error')).toBeInTheDocument();
-                                    })];
-                            case 2:
-                                _a.sent();
-                                return [2 /*return*/];
-                        }
-                    });
-                }); });
             });
         });
     });

package/build/legacy/jsonSchemaForm/oneOfSchema/OneOfSchema.js

@@ -111,7 +111,7 @@ function OneOfSchema(props) {
             ((props.submitted || (changed && blurred)) && validations.length),
     };
     var feedbackId = "".concat(id, "-feedback");
-    return (_jsxs(_Fragment, { children: [(props.schema.oneOf.length > 1 || isConstSchema(props.schema.oneOf[0])) && (_jsxs(_Fragment, { children: [props.schema.alert && _jsx(DynamicAlert, { component: props.schema.alert }), _jsxs("div", { className: classNames(formGroupClasses), children: [getTitleAndHelp(props.schema, id), _jsx(SchemaFormControl, { id: id, schema: schemaForSelect, value: schemaIndex, disabled: props.disabled, describedBy: feedbackId, onChange: onChooseNewSchema, onFocus: onFocus, onBlur: onBlur, onSearchChange: onSearchChange }), _jsx(ControlFeedback, { id: feedbackId, changed: changed, focused: focused, blurred: blurred, submitted: props.submitted, errors: errorsToString(props.errors), schema: props.schema, validations: validations, infoMessage: null })] })] })), isNoNConstSchema(props.schema.oneOf[schemaIndex]) && (_jsx(GenericSchema, { schema: props.schema.oneOf[schemaIndex], model: models[schemaIndex], errors: props.errors, submitted: props.submitted, hideTitle: true, disabled: props.disabled, onChange: function (parameters) { return onChildModelChange(schemaIndex, parameters); }, onPersistAsync: props.onPersistAsync }))] }));
+    return (_jsxs(_Fragment, { children: [(props.schema.oneOf.length > 1 || isConstSchema(props.schema.oneOf[0])) && (_jsxs(_Fragment, { children: [props.schema.alert && _jsx(DynamicAlert, { component: props.schema.alert }), _jsxs("div", { className: classNames(formGroupClasses), children: [getTitleAndHelp(props.schema, id), _jsx(SchemaFormControl, { id: id, schema: schemaForSelect, value: schemaIndex, disabled: props.disabled, describedBy: feedbackId, required: props.required, onChange: onChooseNewSchema, onFocus: onFocus, onBlur: onBlur, onSearchChange: onSearchChange }), _jsx(ControlFeedback, { id: feedbackId, changed: changed, focused: focused, blurred: blurred, submitted: props.submitted, errors: errorsToString(props.errors), schema: props.schema, validations: validations, infoMessage: null })] })] })), isNoNConstSchema(props.schema.oneOf[schemaIndex]) && (_jsx(GenericSchema, { schema: props.schema.oneOf[schemaIndex], model: models[schemaIndex], errors: props.errors, submitted: props.submitted, hideTitle: true, disabled: props.disabled, onChange: function (parameters) { return onChildModelChange(schemaIndex, parameters); }, onPersistAsync: props.onPersistAsync }))] }));
 }
 function getTitleAndHelp(schema, forId) {
     var _a;

package/build/legacy/jsonSchemaForm/schemaFormControl/SchemaFormControl.js

@@ -25,7 +25,10 @@ export var getControlType = function (schema) {
         if (schema.control === FormControlType.TAB && schema.oneOf.length > 3) {
             return FormControlType.SELECT;
         }
-        return schema.control || FormControlType.SELECT;
+        if (schema.control == null || !Object.values(FormControlType).includes(schema.control)) {
+            return FormControlType.SELECT;
+        }
+        return schema.control;
     }
     if (isStringSchema(schema)) {
         return getStringSchemaControlType(schema);
@@ -75,7 +78,7 @@ var getOptions = function (schema, controlType) {
     return null;
 };
 function SchemaFormControl(props) {
-    var id = props.id, schema = props.schema, value = props.value, disabled = props.disabled, onChange = props.onChange, onFocus = props.onFocus, onBlur = props.onBlur, onSearchChange = props.onSearchChange, describedBy = props.describedBy;
+    var id = props.id, schema = props.schema, value = props.value, disabled = props.disabled, required = props.required, onChange = props.onChange, onFocus = props.onFocus, onBlur = props.onBlur, onSearchChange = props.onSearchChange, describedBy = props.describedBy;
     var log = useLogger();
     var getSanitisedValue = function (value) {
         return isNativeInput(schema.type) && (isNull(value) || isUndefined(value)) ? '' : value;
@@ -110,6 +113,7 @@ function SchemaFormControl(props) {
         // TODO: LOW avoid type assertion below
         uploadProps: mapSchemaToUploadOptions(schema),
         describedBy: describedBy,
+        required: required,
     };
     return (_jsx("div", { "aria-describedby": describedBy, children: _jsx(FormControl, __assign({ type: controlType, value: safeValue }, events, controlProps)) }));
 }