procode-lowcode-core 1.0.15 → 1.0.17

package/dist/index.js

@@ -75,6 +75,7 @@ const eventServiceType = {
     UI_SCHEMA_ACTION: "UI_SCHEMA_ACTION",
     UISCHEMA: "UISCHEMA",
     DATASTATE: "DATASTATE",
+    APP_STATE: "APP_STATE",
     REQUEST_START: "REQUEST_START",
     REQUEST_END: "REQUEST_END",
 };
@@ -424,6 +425,20 @@ class NotificationService {
     }
 }
 
+class FieldValidationDispatcher {
+    static registerHandler(handler) {
+        FieldValidationDispatcher.handler = handler;
+    }
+    static dispatch(errors) {
+        if (FieldValidationDispatcher.handler) {
+            FieldValidationDispatcher.handler(errors);
+        }
+        else {
+            console.warn("Field validation dispatcher handler not registered.");
+        }
+    }
+}
+
 function getStatusBaseNotifiType(status) {
     if (status >= 200 && status < 300)
         return "SUCCESS";
@@ -436,7 +451,7 @@ class CentralService {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: null
+            value: void 0
         });
         Object.defineProperty(this, "setHeaders", {
             enumerable: true,
@@ -449,7 +464,6 @@ class CentralService {
                         base.headers[key] = customHeaders[key];
                     });
                 }
-                return base;
             }
         });
         Object.defineProperty(this, "getMessage", {
@@ -457,16 +471,15 @@ class CentralService {
             configurable: true,
             writable: true,
             value: (response, responseConfig) => {
-                var _a;
-                const statusRelatedConfig = (responseConfig !== null && responseConfig !== void 0 ? responseConfig : {})[response === null || response === void 0 ? void 0 : response.status];
-                let errorMessage = "";
-                if (statusRelatedConfig === null || statusRelatedConfig === void 0 ? void 0 : statusRelatedConfig.enableMessage) {
-                    errorMessage =
-                        (statusRelatedConfig === null || statusRelatedConfig === void 0 ? void 0 : statusRelatedConfig.message) ||
-                            ((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.message) ||
-                            ErrorMessageProvider.get(response.config.method, response === null || response === void 0 ? void 0 : response.status);
-                }
-                return errorMessage;
+                var _a, _b;
+                const status = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.status;
+                const statusRelatedConfig = (responseConfig !== null && responseConfig !== void 0 ? responseConfig : {})[status];
+                if (!(statusRelatedConfig === null || statusRelatedConfig === void 0 ? void 0 : statusRelatedConfig.enableMessage))
+                    return "";
+                const payloadMessage = (_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.message;
+                return ((statusRelatedConfig === null || statusRelatedConfig === void 0 ? void 0 : statusRelatedConfig.message) ||
+                    (typeof payloadMessage === "string" ? payloadMessage : "") ||
+                    ErrorMessageProvider.get(response.config.method, status));
             }
         });
         Object.defineProperty(this, "handleResponseStatus", {
@@ -474,23 +487,38 @@ class CentralService {
             configurable: true,
             writable: true,
             value: (response) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-                if (((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.status) === 401) {
+                var _a, _b;
+                const status = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.status;
+                if (status === 401) {
                     window.location.href = env.baseLogoutUrl || "/";
+                    return;
                 }
-                else if (((_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.status) >= 200 && ((_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.status) < 500) {
-                    const customAxiosRequestConfig = response.config;
-                    response.data.message = this.getMessage(response, customAxiosRequestConfig === null || customAxiosRequestConfig === void 0 ? void 0 : customAxiosRequestConfig.responseConfig);
-                    response.data.alertType =
-                        ((_f = (_d = customAxiosRequestConfig === null || customAxiosRequestConfig === void 0 ? void 0 : customAxiosRequestConfig.responseConfig) === null || _d === void 0 ? void 0 : _d[(_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.status]) === null || _f === void 0 ? void 0 : _f.alertType) || AlertType.TOAST;
-                    const statusRelatedConfig = ((_g = customAxiosRequestConfig === null || customAxiosRequestConfig === void 0 ? void 0 : customAxiosRequestConfig.responseConfig) !== null && _g !== void 0 ? _g : {})[(_h = response === null || response === void 0 ? void 0 : response.data) === null || _h === void 0 ? void 0 : _h.status];
-                    if (response.data.alertType === AlertType.TOAST &&
-                        (statusRelatedConfig === null || statusRelatedConfig === void 0 ? void 0 : statusRelatedConfig.enableMessage)) {
-                        NotificationService.showNotification(response.data.message, getStatusBaseNotifiType((_j = response === null || response === void 0 ? void 0 : response.data) === null || _j === void 0 ? void 0 : _j.status));
+                if (!(status >= 200 && status < 500)) {
+                    throw new Error("Unhandled response status " + status);
+                }
+                const customAxiosRequestConfig = response.config;
+                const responseConfig = customAxiosRequestConfig === null || customAxiosRequestConfig === void 0 ? void 0 : customAxiosRequestConfig.responseConfig;
+                const statusRelatedConfig = (responseConfig !== null && responseConfig !== void 0 ? responseConfig : {})[status];
+                const alertType = (statusRelatedConfig === null || statusRelatedConfig === void 0 ? void 0 : statusRelatedConfig.alertType) || AlertType.TOAST;
+                response.data.alertType = alertType;
+                if (alertType === AlertType.FIELDVALIDATION) {
+                    // Structured payload (default convention {propertyName, message}, or
+                    // whatever shape the registered fieldErrorMapper recognizes): route to
+                    // the per-field validation slice. If the mapper finds nothing — e.g.
+                    // the server returned a plain string — fall through to the toast path
+                    // below, so the message still surfaces as a notification.
+                    const fieldErrorMapper = AppDependenceyProvider.getInstance()
+                        .getFieldErrorMapper();
+                    const fieldErrors = fieldErrorMapper((_b = response.data) === null || _b === void 0 ? void 0 : _b.message);
+                    if (Object.keys(fieldErrors).length > 0) {
+                        response.data.fieldErrors = fieldErrors;
+                        FieldValidationDispatcher.dispatch(fieldErrors);
+                        return;
                     }
                 }
-                else {
-                    throw new Error("Unhandled response status " + ((_k = response === null || response === void 0 ? void 0 : response.data) === null || _k === void 0 ? void 0 : _k.status));
+                response.data.message = this.getMessage(response, responseConfig);
+                if (statusRelatedConfig === null || statusRelatedConfig === void 0 ? void 0 : statusRelatedConfig.enableMessage) {
+                    NotificationService.showNotification(response.data.message, getStatusBaseNotifiType(status));
                 }
             }
         });
@@ -521,15 +549,13 @@ class CentralService {
             configurable: true,
             writable: true,
             value: (axiosInstance) => {
-                if (axiosInstance) {
-                    axiosInstance.interceptors.request.use((request) => {
-                        this.setHeaders(request, AppDependenceyProvider.getInstance().getRequestHeaders());
-                        return request;
-                    }, (error) => {
-                        console.error("Request error:", error);
-                        throw error;
-                    });
-                }
+                axiosInstance.interceptors.request.use((request) => {
+                    this.setHeaders(request, AppDependenceyProvider.getInstance().getRequestHeaders());
+                    return request;
+                }, (error) => {
+                    console.error("Request error:", error);
+                    throw error;
+                });
             }
         });
         Object.defineProperty(this, "getAxioInstance", {
@@ -873,28 +899,50 @@ const handleFetchRequest = (queryParam, apiConfig, eventService, fetchService, d
 
 class CoreViewModelHandler {
     constructor() {
+        // Resolve & apply the configured "before request" adapter to the input.
+        // Order: disable flag wins, then a custom-named adapter from EventService,
+        // then the supplied default serializer.
+        Object.defineProperty(this, "applyBefore", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (eventService, opConfig, input, defaultSerializer) => {
+                if (opConfig === null || opConfig === void 0 ? void 0 : opConfig.disableBeforeRequest)
+                    return input;
+                const custom = eventService.emit(AdapterType.GET_CUSTOM_ADAPTER_METHOD, opConfig === null || opConfig === void 0 ? void 0 : opConfig.beforeRequestMethodName);
+                return (custom !== null && custom !== void 0 ? custom : defaultSerializer)(eventService, input);
+            }
+        });
+        // Build the "after request" adapter callable. Returns null when disabled,
+        // so it can be passed straight to handleFetchRequest (which treats null as
+        // "skip deserialization") and re-used directly for create/update flows.
+        Object.defineProperty(this, "resolveAfter", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (eventService, opConfig, defaultDeserializer) => {
+                if (opConfig === null || opConfig === void 0 ? void 0 : opConfig.disableAfterRequest)
+                    return null;
+                const custom = eventService.emit(AdapterType.GET_CUSTOM_ADAPTER_METHOD, opConfig === null || opConfig === void 0 ? void 0 : opConfig.afterRequestMethodName);
+                return custom !== null && custom !== void 0 ? custom : defaultDeserializer;
+            }
+        });
         Object.defineProperty(this, "getViewModel", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: (screenDataQueryParams, supportiveQueryParams, apiConfig, eventService) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
-                const viewModel = {
-                    screenData: null,
-                    supportiveData: null,
-                };
                 const [supportiveData, screenData] = yield Promise.all([
                     ((_a = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.loadSupportiveData) === null || _a === void 0 ? void 0 : _a.endPoint) &&
                         (supportiveQueryParams === null || supportiveQueryParams === void 0 ? void 0 : supportiveQueryParams.length) > 0
-                        ? handleFetchRequest(serializedSupportiveQueryParams(eventService, supportiveQueryParams), apiConfig, eventService, fetchSupportiveDataService, deserializedSupportiveData)
+                        ? this.getSupportiveData(supportiveQueryParams, apiConfig, eventService)
                         : Promise.resolve(null),
                     ((_b = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.get) === null || _b === void 0 ? void 0 : _b.endPoint)
-                        ? handleFetchRequest(serializedScreenDataQueryParams(eventService, screenDataQueryParams), apiConfig, eventService, fetchScreenDataService, deserializedModel)
+                        ? this.getModel(screenDataQueryParams, apiConfig, eventService)
                         : Promise.resolve(null),
                 ]);
-                viewModel.screenData = screenData;
-                viewModel.supportiveData = supportiveData;
-                return viewModel;
+                return { screenData, supportiveData };
             })
         });
         Object.defineProperty(this, "getModel", {
@@ -902,16 +950,9 @@ class CoreViewModelHandler {
             configurable: true,
             writable: true,
             value: (screenDataQueryParams, apiConfig, eventService) => __awaiter(this, void 0, void 0, function* () {
-                var _c, _d, _e, _f;
-                const customAdapterBefore = eventService.emit("GET_CUSTOM_ADAPTER_METHOD", (_c = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.get) === null || _c === void 0 ? void 0 : _c.beforeRequestMethodName);
-                const customAdapterAfter = eventService.emit("GET_CUSTOM_ADAPTER_METHOD", (_d = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.get) === null || _d === void 0 ? void 0 : _d.afterRequestMethodName);
-                const applicableParams = ((_e = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.get) === null || _e === void 0 ? void 0 : _e.disableBeforeRequest)
-                    ? screenDataQueryParams
-                    : (customAdapterBefore !== null && customAdapterBefore !== void 0 ? customAdapterBefore : serializedScreenDataQueryParams)(eventService, screenDataQueryParams);
-                const applicableResponse = ((_f = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.get) === null || _f === void 0 ? void 0 : _f.disableAfterRequest)
-                    ? null
-                    : customAdapterAfter !== null && customAdapterAfter !== void 0 ? customAdapterAfter : deserializedModel;
-                return handleFetchRequest(applicableParams, apiConfig, eventService, fetchScreenDataService, applicableResponse);
+                const params = this.applyBefore(eventService, apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.get, screenDataQueryParams, serializedScreenDataQueryParams);
+                const after = this.resolveAfter(eventService, apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.get, deserializedModel);
+                return handleFetchRequest(params, apiConfig, eventService, fetchScreenDataService, after);
             })
         });
         Object.defineProperty(this, "getSupportiveData", {
@@ -919,16 +960,9 @@ class CoreViewModelHandler {
             configurable: true,
             writable: true,
             value: (supportiveQueryParams, apiConfig, eventService) => __awaiter(this, void 0, void 0, function* () {
-                var _g, _h, _j, _k;
-                const customAdapterBefore = eventService.emit("GET_CUSTOM_ADAPTER_METHOD", (_g = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.loadSupportiveData) === null || _g === void 0 ? void 0 : _g.beforeRequestMethodName);
-                const customAdapterAfter = eventService.emit("GET_CUSTOM_ADAPTER_METHOD", (_h = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.loadSupportiveData) === null || _h === void 0 ? void 0 : _h.afterRequestMethodName);
-                const applicableParams = ((_j = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.loadSupportiveData) === null || _j === void 0 ? void 0 : _j.disableBeforeRequest)
-                    ? supportiveQueryParams
-                    : (customAdapterBefore !== null && customAdapterBefore !== void 0 ? customAdapterBefore : serializedSupportiveQueryParams)(eventService, supportiveQueryParams);
-                const applicableResponse = ((_k = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.loadSupportiveData) === null || _k === void 0 ? void 0 : _k.disableAfterRequest)
-                    ? null
-                    : customAdapterAfter !== null && customAdapterAfter !== void 0 ? customAdapterAfter : deserializedSupportiveData;
-                return handleFetchRequest(applicableParams, apiConfig, eventService, fetchSupportiveDataService, applicableResponse);
+                const params = this.applyBefore(eventService, apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.loadSupportiveData, supportiveQueryParams, serializedSupportiveQueryParams);
+                const after = this.resolveAfter(eventService, apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.loadSupportiveData, deserializedSupportiveData);
+                return handleFetchRequest(params, apiConfig, eventService, fetchSupportiveDataService, after);
             })
         });
         Object.defineProperty(this, "createModel", {
@@ -936,19 +970,11 @@ class CoreViewModelHandler {
             configurable: true,
             writable: true,
             value: (model, apiConfig, eventService) => __awaiter(this, void 0, void 0, function* () {
-                var _l, _m, _o;
-                const customAdapterBefore = eventService.emit("GET_CUSTOM_ADAPTER_METHOD", (_l = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.create) === null || _l === void 0 ? void 0 : _l.beforeRequestMethodName);
-                const customAdapterAfter = eventService.emit("GET_CUSTOM_ADAPTER_METHOD", (_m = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.create) === null || _m === void 0 ? void 0 : _m.afterRequestMethodName);
-                const applicableModel = ((_o = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.create) === null || _o === void 0 ? void 0 : _o.disableBeforeRequest)
-                    ? model
-                    : (customAdapterBefore !== null && customAdapterBefore !== void 0 ? customAdapterBefore : serializedModel)(eventService, model);
+                const payload = this.applyBefore(eventService, apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.create, model, serializedModel);
+                const after = this.resolveAfter(eventService, apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.create, deserializedModel);
                 return handleRequest(() => __awaiter(this, void 0, void 0, function* () {
-                    var _p;
-                    const servicesResponse = yield createService(apiConfig, applicableModel, eventService);
-                    const applicableResponse = ((_p = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.create) === null || _p === void 0 ? void 0 : _p.disableAfterRequest)
-                        ? servicesResponse
-                        : (customAdapterAfter !== null && customAdapterAfter !== void 0 ? customAdapterAfter : deserializedModel)(eventService, servicesResponse);
-                    return applicableResponse;
+                    const servicesResponse = yield createService(apiConfig, payload, eventService);
+                    return after ? after(eventService, servicesResponse) : servicesResponse;
                 }), eventService);
             })
         });
@@ -957,22 +983,15 @@ class CoreViewModelHandler {
             configurable: true,
             writable: true,
             value: (model, apiConfig, eventService) => __awaiter(this, void 0, void 0, function* () {
-                var _q, _r;
-                const customAdapterBefore = eventService.emit("GET_CUSTOM_ADAPTER_METHOD", (_q = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.update) === null || _q === void 0 ? void 0 : _q.beforeRequestMethodName);
-                const customAdapterAfter = eventService.emit("GET_CUSTOM_ADAPTER_METHOD", (_r = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.update) === null || _r === void 0 ? void 0 : _r.afterRequestMethodName);
+                var _c;
+                const serviceFn = ((_c = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.update) === null || _c === void 0 ? void 0 : _c.isPatchUpdate)
+                    ? patchService
+                    : updateService;
+                const payload = this.applyBefore(eventService, apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.update, model, serializedModel);
+                const after = this.resolveAfter(eventService, apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.update, deserializedModel);
                 return handleRequest(() => __awaiter(this, void 0, void 0, function* () {
-                    var _s, _t, _u;
-                    const serviceFc = ((_s = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.update) === null || _s === void 0 ? void 0 : _s.isPatchUpdate)
-                        ? patchService
-                        : updateService;
-                    const applicableModel = ((_t = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.update) === null || _t === void 0 ? void 0 : _t.disableBeforeRequest)
-                        ? model
-                        : (customAdapterBefore !== null && customAdapterBefore !== void 0 ? customAdapterBefore : serializedModel)(eventService, model);
-                    const servicesResponse = yield serviceFc(apiConfig, applicableModel, eventService);
-                    const applicableResponse = ((_u = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.update) === null || _u === void 0 ? void 0 : _u.disableAfterRequest)
-                        ? servicesResponse
-                        : (customAdapterAfter !== null && customAdapterAfter !== void 0 ? customAdapterAfter : deserializedModel)(eventService, servicesResponse);
-                    return applicableResponse;
+                    const servicesResponse = yield serviceFn(apiConfig, payload, eventService);
+                    return after ? after(eventService, servicesResponse) : servicesResponse;
                 }), eventService);
             })
         });
@@ -981,11 +1000,7 @@ class CoreViewModelHandler {
             configurable: true,
             writable: true,
             value: (screenDataQueryParams, apiConfig, eventService) => __awaiter(this, void 0, void 0, function* () {
-                var _v, _w;
-                const customAdapter = eventService.emit("GET_CUSTOM_ADAPTER_METHOD", (_v = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.delete) === null || _v === void 0 ? void 0 : _v.beforeRequestMethodName);
-                const params = ((_w = apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.delete) === null || _w === void 0 ? void 0 : _w.disableBeforeRequest)
-                    ? screenDataQueryParams
-                    : (customAdapter !== null && customAdapter !== void 0 ? customAdapter : serializedScreenDataQueryParams)(eventService, screenDataQueryParams);
+                const params = this.applyBefore(eventService, apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.delete, screenDataQueryParams, serializedScreenDataQueryParams);
                 return handleRequest(() => __awaiter(this, void 0, void 0, function* () {
                     yield deleteService(apiConfig, params, eventService);
                 }), eventService);
@@ -1007,6 +1022,34 @@ const coreResponseFormatter = (data, status) => {
     return Object.assign(Object.assign({}, data), { status: (_a = data.status) !== null && _a !== void 0 ? _a : status });
 };
 
+// Default mapper assumes the common `{ propertyName, message }` convention.
+// Accepts either a single object or an array of them, and groups multiple
+// messages on the same field into one bucket.
+const defaultFieldErrorMapper = (raw) => {
+    const errors = {};
+    const append = (item) => {
+        var _a;
+        if (item &&
+            typeof item === "object" &&
+            "propertyName" in item &&
+            "message" in item) {
+            const { propertyName, message } = item;
+            if (typeof propertyName === "string" && propertyName.length > 0) {
+                const list = (_a = errors[propertyName]) !== null && _a !== void 0 ? _a : [];
+                list.push(typeof message === "string" ? message : String(message !== null && message !== void 0 ? message : ""));
+                errors[propertyName] = list;
+            }
+        }
+    };
+    if (Array.isArray(raw)) {
+        raw.forEach(append);
+    }
+    else {
+        append(raw);
+    }
+    return errors;
+};
+
 const axiosInstance = axios.create();
 const getSchemaBySlugService = (slug, appCode) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d, _e, _f;
@@ -1029,7 +1072,7 @@ class UninitializedInstanceException extends Error {
     }
 }
 class AppDependenceyProvider {
-    constructor({ adapterProvider, viewModelHandler, widgetProvider, templateWidgetProvider, customWidgetProvider, requestHeaders, getSchemaBySlugService: getSchemaBySlugService$1, responseFormatter, }) {
+    constructor({ adapterProvider, viewModelHandler, widgetProvider, templateWidgetProvider, customWidgetProvider, requestHeaders, getSchemaBySlugService: getSchemaBySlugService$1, responseFormatter, fieldErrorMapper, }) {
         Object.defineProperty(this, "_adapterProvider", {
             enumerable: true,
             configurable: true,
@@ -1078,6 +1121,12 @@ class AppDependenceyProvider {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "_fieldErrorMapper", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "getAdapterProvider", {
             enumerable: true,
             configurable: true,
@@ -1150,6 +1199,16 @@ class AppDependenceyProvider {
                 return this._responseFormatter;
             }
         });
+        Object.defineProperty(this, "getFieldErrorMapper", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                if (!this._fieldErrorMapper)
+                    return defaultFieldErrorMapper;
+                return this._fieldErrorMapper;
+            }
+        });
         this._adapterProvider = adapterProvider;
         this._viewModelHandler = viewModelHandler;
         this._widgetProvider = widgetProvider;
@@ -1158,13 +1217,14 @@ class AppDependenceyProvider {
         this._requestHeaders = requestHeaders;
         this._getSchemaBySlugService = getSchemaBySlugService$1;
         this._responseFormatter = responseFormatter;
+        this._fieldErrorMapper = fieldErrorMapper;
     }
 }
 Object.defineProperty(AppDependenceyProvider, "initInstance", {
     enumerable: true,
     configurable: true,
     writable: true,
-    value: ({ adapterProvider, viewModelHandler, widgetProvider, templateWidgetProvider, customWidgetProvider, requestHeaders, getSchemaBySlugService, responseFormatter, }) => {
+    value: ({ adapterProvider, viewModelHandler, widgetProvider, templateWidgetProvider, customWidgetProvider, requestHeaders, getSchemaBySlugService, responseFormatter, fieldErrorMapper, }) => {
         if (!AppDependenceyProvider.instance)
             AppDependenceyProvider.instance = new AppDependenceyProvider({
                 adapterProvider,
@@ -1175,6 +1235,7 @@ Object.defineProperty(AppDependenceyProvider, "initInstance", {
                 requestHeaders,
                 getSchemaBySlugService,
                 responseFormatter,
+                fieldErrorMapper,
             });
     }
 });
@@ -18677,11 +18738,21 @@ const appSlice = toolkit.createSlice({
 const appActions = appSlice.actions;
 var appReducer = appSlice.reducer;
 
+// Reads the latest `state.app.validation` slice and returns true if any field
+// currently carries one or more error messages. Used by save/update actions to
+// skip navigation when server-side field validation has populated errors after
+// the API call resolved.
+const hasFieldValidationErrors = (eventService) => {
+    var _a;
+    const appState = eventService === null || eventService === void 0 ? void 0 : eventService.emit(eventServiceType.APP_STATE);
+    const validation = ((_a = appState === null || appState === void 0 ? void 0 : appState.validation) !== null && _a !== void 0 ? _a : {});
+    return Object.values(validation).some((messages) => Array.isArray(messages) && messages.length > 0);
+};
+
 const handleUpdateAndNavigate = (actionInvokerProps) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const eventService = actionInvokerProps.eventService;
     const dispatch = eventService === null || eventService === void 0 ? void 0 : eventService.emit(eventServiceType.DISPATCH_STORE);
-    // const appActions = eventService?.emit(eventServiceType.DATASTATE_ACTION);
     const uiSchema = eventService === null || eventService === void 0 ? void 0 : eventService.emit(eventServiceType.UISCHEMA);
     const apiConfig = (_a = actionInvokerProps.actionProps.config.apiConfig) !== null && _a !== void 0 ? _a : _.cloneDeep(uiSchema.apiConfig);
     const validationResult = {
@@ -18694,11 +18765,16 @@ const handleUpdateAndNavigate = (actionInvokerProps) => __awaiter(void 0, void 0
         validationResult.schemaInvalidMessages = schemaInvalidMessages;
     }
     dispatch === null || dispatch === void 0 ? void 0 : dispatch(appActions === null || appActions === void 0 ? void 0 : appActions.loadValidation(validationResult.schemaInvalidMessages));
-    if (validationResult.isSchemaValid) {
-        yield ((_b = AppDependenceyProvider.getInstance()
-            .getViewModelHandler()) === null || _b === void 0 ? void 0 : _b.updateModel(actionInvokerProps.viewModel.screenData, apiConfig, eventService));
-        handleNavigation(actionInvokerProps);
-    }
+    if (!validationResult.isSchemaValid)
+        return;
+    yield ((_b = AppDependenceyProvider.getInstance()
+        .getViewModelHandler()) === null || _b === void 0 ? void 0 : _b.updateModel(actionInvokerProps.viewModel.screenData, apiConfig, eventService));
+    // The response interceptor pushes server-side field errors into
+    // state.validation via FieldValidationDispatcher. Don't navigate away
+    // from a form the user still has to fix.
+    if (hasFieldValidationErrors(eventService))
+        return;
+    handleNavigation(actionInvokerProps);
 });
 
 const replaceEndPointParams = (endPoint, data) => {
@@ -18747,7 +18823,6 @@ const handleCreateAndNavigate = (actionInvokerProps) => __awaiter(void 0, void 0
     var _a, _b;
     const eventService = actionInvokerProps.eventService;
     const dispatch = eventService === null || eventService === void 0 ? void 0 : eventService.emit(eventServiceType.DISPATCH_STORE);
-    // const appActions = eventService?.emit(eventServiceType.DATASTATE_ACTION);
     const uiSchema = eventService === null || eventService === void 0 ? void 0 : eventService.emit(eventServiceType.UISCHEMA);
     const apiConfig = (_a = actionInvokerProps.actionProps.config.apiConfig) !== null && _a !== void 0 ? _a : _.cloneDeep(uiSchema.apiConfig);
     const validationResult = {
@@ -18760,11 +18835,16 @@ const handleCreateAndNavigate = (actionInvokerProps) => __awaiter(void 0, void 0
         validationResult.schemaInvalidMessages = schemaInvalidMessages;
     }
     dispatch === null || dispatch === void 0 ? void 0 : dispatch(appActions === null || appActions === void 0 ? void 0 : appActions.loadValidation(validationResult.schemaInvalidMessages));
-    if (validationResult.isSchemaValid) {
-        yield ((_b = AppDependenceyProvider.getInstance()
-            .getViewModelHandler()) === null || _b === void 0 ? void 0 : _b.createModel(actionInvokerProps.viewModel.screenData, apiConfig, eventService));
-        handleNavigation(actionInvokerProps);
-    }
+    if (!validationResult.isSchemaValid)
+        return;
+    yield ((_b = AppDependenceyProvider.getInstance()
+        .getViewModelHandler()) === null || _b === void 0 ? void 0 : _b.createModel(actionInvokerProps.viewModel.screenData, apiConfig, eventService));
+    // The response interceptor pushes server-side field errors into
+    // state.validation via FieldValidationDispatcher. Don't navigate away
+    // from a form the user still has to fix.
+    if (hasFieldValidationErrors(eventService))
+        return;
+    handleNavigation(actionInvokerProps);
 });
 
 const handleAPIGet = (actionInvokerProps, queryParams) => __awaiter(void 0, void 0, void 0, function* () {
@@ -18893,6 +18973,7 @@ const BOUND_PROP_NAMES = [
     "step",
     "placeHolder",
     "disabled",
+    "format",
 ];
 
 var StandardValidationType;
@@ -19694,10 +19775,17 @@ const setupStoreAction = (dispatch, eventService, store) => {
         [eventServiceType.UI_SCHEMA_ACTION]: metaDataActions,
         [eventServiceType.DISPATCH_STORE]: dispatch,
         [eventServiceType.DATASTATE]: () => store.getState().app.viewModel,
+        [eventServiceType.APP_STATE]: () => store.getState().app,
     };
     Object.entries(actions).forEach(([eventType, action]) => {
         eventService === null || eventService === void 0 ? void 0 : eventService.subscribe(eventType, () => action);
     });
+    // Route server-side field validation errors (alertType=fieldvalidation,
+    // typically 422) into the same redux slice the client validator writes to,
+    // so withValidations can render them under the relevant fields.
+    FieldValidationDispatcher.registerHandler((errors) => {
+        dispatch(appActions.loadValidation(errors));
+    });
     // Register loader handlers for external services
     eventService === null || eventService === void 0 ? void 0 : eventService.subscribe(eventServiceType.REQUEST_START, () => () => {
         dispatch(commonDataActions.updatePendingRequests(LoadingStatus.INPROCESS));