@smartbit4all/ng-client 2.1.3 → 2.2.0

package/fesm2020/smartbit4all-ng-client.mjs

@@ -4138,18 +4138,28 @@ class UiActionService {
             identifier: uiAction.identifier,
             params: uiAction.params ?? {},
         };
-        if (uiAction.submit) {
-            this.uiActionModel.serviceToUse.submit.next();
-            try {
-                await 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;
+        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 {
+                    await 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;
+                }
+            }
+            else {
+                this.uiActionModel.serviceToUse.submitForm(validate);
             }
         }
         if (uiAction.confirm) {
@@ -5882,14 +5892,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();
@@ -5900,27 +5927,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;
     }
@@ -6029,6 +6035,9 @@ let SmartComponentApiClient = class SmartComponentApiClient {
     getModel() {
         return this.data;
     }
+    submitForm(validate) {
+        this.submitForms(validate);
+    }
     async performUiActionRequest(uiActionRequest, widgetId, nodeId) {
         if (uiActionRequest.params['_files']) {
             const param = uiActionRequest.params['param'];
@@ -6061,9 +6070,9 @@ let SmartComponentApiClient = class SmartComponentApiClient {
     /**
      * Submits all the registered forms in the SmartComponent
      */
-    submitForms() {
+    submitForms(validate) {
         Object.keys(this.formWidgets.widgets).map((key) => {
-            this.formWidgets.widgets.get(key)?.submitForm();
+            this.formWidgets.widgets.get(key)?.submitForm(validate);
         });
     }
     addGrid(smartGrid, options, useAsDefaultGrid, componentReference) {