@smartbit4all/ng-client 3.1.45 → 3.1.47

package/fesm2020/smartbit4all-ng-client.mjs

@@ -1555,7 +1555,9 @@ class ViewService {
         let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
         if (localVarHttpHeaderAcceptSelected === undefined) {
             // to determine the Accept header
-            const httpHeaderAccepts = [];
+            const httpHeaderAccepts = [
+                'application/json'
+            ];
             localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
         }
         if (localVarHttpHeaderAcceptSelected !== undefined) {
@@ -2949,10 +2951,10 @@ class SmartViewContextService {
         return uuid;
     }
     async message(messageData, messageResult) {
-        await this.view
+        return await this.handlePerformActionResponse(await this.view
             .message(messageData.viewUuid ?? '', messageData.uuid, messageResult)
-            .toPromise();
-        await this.getAndSyncViewContext();
+            .toPromise());
+        // in future use this.apiQueueService.addToQueue
     }
     async getSmartViewContextApiErrorByCode(code) {
         let buttonLabel;
@@ -7233,16 +7235,24 @@ class UiActionDescriptorService {
     async getActionDescriptor(uiAction) {
         let code = uiAction.code;
         let isUnkown = false;
-        let isFromServer = false;
-        let actionDescriptor = uiAction.descriptor;
-        if (actionDescriptor) {
-            isFromServer = true;
+        let server = uiAction.descriptor;
+        let client = null;
+        let actionDescriptorFromDescriptors = this.viewContext.getActionDescriptors()?.get(code);
+        if (actionDescriptorFromDescriptors) {
+            client = JSON.parse(JSON.stringify(actionDescriptorFromDescriptors));
+        }
+        let actionDescriptor;
+        if (!client) {
+            // server only
+            actionDescriptor = server;
         }
         else {
-            let actionDescriptorFromDescriptors = this.viewContext.getActionDescriptors()?.get(code);
-            if (actionDescriptorFromDescriptors) {
-                actionDescriptor = JSON.parse(JSON.stringify(actionDescriptorFromDescriptors));
+            // client exists
+            if (server) {
+                // server & client -> merge into client what's filled from server
+                this.mergeActionDescriptorIntoClient(server, client);
             }
+            actionDescriptor = client;
         }
         if (!actionDescriptor) {
             isUnkown = true;
@@ -7256,11 +7266,55 @@ class UiActionDescriptorService {
         if (!actionDescriptor.feedbackType && uiAction.submit) {
             actionDescriptor.feedbackType = UiActionFeedbackType.Snackbar;
         }
-        if (this.viewContext.translateService && !isUnkown && !isFromServer) {
+        if (this.viewContext.translateService && !isUnkown && !server) {
             actionDescriptor = await this.translateUiActionDescriptor(actionDescriptor);
         }
         return actionDescriptor;
     }
+    mergeActionDescriptorIntoClient(server, client) {
+        if (server.title) {
+            client.title = server.title;
+        }
+        if (server.icon) {
+            client.icon = server.icon;
+        }
+        if (server.color) {
+            client.color = server.color;
+        }
+        if (server.confirmDialog) {
+            if (!client.confirmDialog) {
+                client.confirmDialog = server.confirmDialog;
+            }
+            this.mergeActionDialogDescriptorIntoClient(server.confirmDialog, client.confirmDialog);
+            client.confirmDialog = server.confirmDialog;
+        }
+    }
+    // TODO use prop name to handle all dialogs
+    // private mergeActionDescriptorDialog(
+    //   server: UiActionDescriptor,
+    //   client: UiActionDescriptor,
+    //   prop: string
+    // ): void {
+    //   //let serverDialog: UiActionDialogDescriptor = server[prop] as UiActionDialogDescriptor;
+    //   if (server.confirmDialog) {
+    //     if (!client.confirmDialog) {
+    //       client.confirmDialog = server.confirmDialog;
+    //     }
+    //     this.mergeActionDialogDescriptorIntoClient(server.confirmDialog, client.confirmDialog);
+    //     client.confirmDialog = server.confirmDialog;
+    //   }
+    // }
+    mergeActionDialogDescriptorIntoClient(serverDialog, clientDialog) {
+        if (serverDialog.title) {
+            clientDialog.title = serverDialog.title;
+        }
+        if (serverDialog.placeholder) {
+            clientDialog.placeholder = serverDialog.placeholder;
+        }
+        if (serverDialog.text) {
+            clientDialog.text = serverDialog.text;
+        }
+    }
     async translateUiActionDescriptor(uiActionDescriptor) {
         uiActionDescriptor = await this.deepTranslate(uiActionDescriptor);
         return uiActionDescriptor;