@smartbit4all/ng-client 2.1.2 → 2.2.0

package/fesm2015/smartbit4all-ng-client.mjs

@@ -4120,18 +4120,28 @@ class UiActionService {
                 identifier: uiAction.identifier,
                 params: (_a = uiAction.params) !== null && _a !== void 0 ? _a : {},
             };
-            if (uiAction.submit) {
-                this.uiActionModel.serviceToUse.submit.next();
-                try {
-                    yield this.uiActionModel.serviceToUse.submit.toPromise();
-                    this.uiActionModel.serviceToUse.submit = new SmartSubject(this._destroy$);
-                    this.uiActionModel.serviceToUse.reSubscribeToChange.next();
+            if (uiAction.submit || uiAction.model) {
+                // submit: with validation, model: without validation. both can be undefined
+                const validate = !uiAction.model;
+                if ('reSubscribeToChange' in this.uiActionModel.serviceToUse) {
+                    if (!validate) {
+                        console.error(`Validate = false, but UseUiAction doesn't support it`);
+                    }
+                    this.uiActionModel.serviceToUse.submit.next();
+                    try {
+                        yield this.uiActionModel.serviceToUse.submit.toPromise();
+                        this.uiActionModel.serviceToUse.submit = new SmartSubject(this._destroy$);
+                        this.uiActionModel.serviceToUse.reSubscribeToChange.next();
+                    }
+                    catch (error) {
+                        console.error(error);
+                        this.uiActionModel.serviceToUse.submit = new SmartSubject(this._destroy$);
+                        this.uiActionModel.serviceToUse.reSubscribeToChange.next();
+                        return;
+                    }
                 }
-                catch (error) {
-                    console.error(error);
-                    this.uiActionModel.serviceToUse.submit = new SmartSubject(this._destroy$);
-                    this.uiActionModel.serviceToUse.reSubscribeToChange.next();
-                    return;
+                else {
+                    this.uiActionModel.serviceToUse.submitForm(validate);
                 }
             }
             if (uiAction.confirm) {
@@ -5912,14 +5922,31 @@ let SmartComponentApiClient = class SmartComponentApiClient {
         this.pageName = pageName;
         this._destroy$ = new Subject();
         this.sendDataChanges = false;
-        this._useAutoSubmit = false;
-        this._useAutoSubmitTurnedOff = new SmartSubject(this._destroy$);
+        // private _useAutoSubmit: boolean = false;
+        // private _useAutoSubmitTurnedOff: Subject<void> = new SmartSubject(this._destroy$);
+        // protected get useAutoSubmit(): boolean {
+        //   return this._useAutoSubmit;
+        // }
+        // protected set useAutoSubmit(useAutoSubmit: boolean) {
+        //   this._useAutoSubmit = useAutoSubmit;
+        //   if (this._useAutoSubmit) {
+        //     this.subscribeToAutoSubmit();
+        //     this.reSubscribeToChange.pipe(takeUntil(this._useAutoSubmitTurnedOff)).subscribe(() => {
+        //       this.subscribeToAutoSubmit();
+        //     });
+        //   } else {
+        //     this._useAutoSubmitTurnedOff.next();
+        //   }
+        // }
+        // private subscribeToAutoSubmit(): void {
+        //   this.submit.pipe(takeUntil(this._useAutoSubmitTurnedOff)).subscribe(() => {
+        //     this.submitForms();
+        //     this.submit.complete();
+        //   });
+        // }
         this.detectChange = new SmartSubject(this._destroy$);
         this.uiActionModels = [];
         this.dataChanged = new SmartSubject(this._destroy$);
-        // UseUiAction
-        this.submit = new SmartSubject(this._destroy$);
-        this.reSubscribeToChange = new SmartSubject(this._destroy$);
         // Contained Widgets
         this.widgets = new WidgetMap();
         this.formWidgets = new WidgetMap();
@@ -5930,27 +5957,6 @@ let SmartComponentApiClient = class SmartComponentApiClient {
         this.uiActionService = inject.get(UiActionService);
         this.uiActionDescriptorService = inject.get(UiActionDescriptorService);
     }
-    get useAutoSubmit() {
-        return this._useAutoSubmit;
-    }
-    set useAutoSubmit(useAutoSubmit) {
-        this._useAutoSubmit = useAutoSubmit;
-        if (this._useAutoSubmit) {
-            this.subscribeToAutoSubmit();
-            this.reSubscribeToChange.pipe(takeUntil(this._useAutoSubmitTurnedOff)).subscribe(() => {
-                this.subscribeToAutoSubmit();
-            });
-        }
-        else {
-            this._useAutoSubmitTurnedOff.next();
-        }
-    }
-    subscribeToAutoSubmit() {
-        this.submit.pipe(takeUntil(this._useAutoSubmitTurnedOff)).subscribe(() => {
-            this.submitForms();
-            this.submit.complete();
-        });
-    }
     get uuid() {
         return this._uuid;
     }
@@ -6063,6 +6069,9 @@ let SmartComponentApiClient = class SmartComponentApiClient {
     getModel() {
         return this.data;
     }
+    submitForm(validate) {
+        this.submitForms(validate);
+    }
     performUiActionRequest(uiActionRequest, widgetId, nodeId) {
         return __awaiter(this, void 0, void 0, function* () {
             if (uiActionRequest.params['_files']) {
@@ -6097,10 +6106,10 @@ let SmartComponentApiClient = class SmartComponentApiClient {
     /**
      * Submits all the registered forms in the SmartComponent
      */
-    submitForms() {
+    submitForms(validate) {
         Object.keys(this.formWidgets.widgets).map((key) => {
             var _a;
-            (_a = this.formWidgets.widgets.get(key)) === null || _a === void 0 ? void 0 : _a.submitForm();
+            (_a = this.formWidgets.widgets.get(key)) === null || _a === void 0 ? void 0 : _a.submitForm(validate);
         });
     }
     addGrid(smartGrid, options, useAsDefaultGrid, componentReference) {
@@ -6176,14 +6185,17 @@ let SmartComponentApiClient = class SmartComponentApiClient {
             if (change.changes) {
                 const changes = change.changes;
                 Object.keys(changes).map((changeKey) => {
-                    var _a, _b;
+                    var _a, _b, _c;
                     if (changeKey.startsWith('data.')) {
                         this.handleDataChange(changes, changeKey);
                     }
                     else if (changeKey.startsWith('layouts.') && ((_a = this.model) === null || _a === void 0 ? void 0 : _a.layouts)) {
                         this.handleLayoutChange(changes, changeKey);
                     }
-                    else if (changeKey.startsWith('valueSets.') && ((_b = this.model) === null || _b === void 0 ? void 0 : _b.valueSets)) {
+                    else if (changeKey.startsWith('componentLayouts.') && ((_b = this.model) === null || _b === void 0 ? void 0 : _b.layouts)) {
+                        this.handleComponentLayoutChange(changes, changeKey);
+                    }
+                    else if (changeKey.startsWith('valueSets.') && ((_c = this.model) === null || _c === void 0 ? void 0 : _c.valueSets)) {
                         this.handleValueSetChange(changes, changeKey);
                     }
                     else if (changeKey === 'actions') {
@@ -6258,6 +6270,11 @@ let SmartComponentApiClient = class SmartComponentApiClient {
         let layoutKey = changeKey.split('.')[1];
         this.model.layouts[layoutKey] = changes[changeKey];
     }
+    handleComponentLayoutChange(changes, changeKey) {
+        let layoutKey = changeKey.split('.')[1];
+        let componentLayouts = this.model.componentLayouts;
+        componentLayouts[layoutKey] = changes[changeKey];
+    }
     handleValueSetChange(changes, changeKey) {
         let valueSetKey = changeKey.split('.')[1];
         this.model.valueSets[valueSetKey] = changes[changeKey];