@smartbit4all/ng-client 3.1.44 → 3.1.46

package/fesm2020/smartbit4all-ng-client.mjs

@@ -7233,16 +7233,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 +7264,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;
@@ -12301,7 +12353,7 @@ class FilterService {
     }
     // @ts-ignore
     addToHttpParams(httpParams, value, key) {
-        if (typeof value === "object" && value instanceof Date === false) {
+        if (typeof value === 'object' && value instanceof Date === false) {
             httpParams = this.addToHttpParamsRecursive(httpParams, value);
         }
         else {
@@ -12313,27 +12365,27 @@ class FilterService {
         if (value == null) {
             return httpParams;
         }
-        if (typeof value === "object") {
+        if (typeof value === 'object') {
             if (Array.isArray(value)) {
-                value.forEach(elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+                value.forEach((elem) => (httpParams = this.addToHttpParamsRecursive(httpParams, elem, key)));
             }
             else if (value instanceof Date) {
                 if (key != null) {
                     httpParams = httpParams.append(key, value.toISOString().substr(0, 10));
                 }
                 else {
-                    throw Error("key may not be null if value is Date");
+                    throw Error('key may not be null if value is Date');
                 }
             }
             else {
-                Object.keys(value).forEach(k => httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k));
+                Object.keys(value).forEach((k) => (httpParams = this.addToHttpParamsRecursive(httpParams, value[k], key != null ? `${key}.${k}` : k)));
             }
         }
         else if (key != null) {
             httpParams = httpParams.append(key, value);
         }
         else {
-            throw Error("key may not be null if value is not object or array");
+            throw Error('key may not be null if value is not object or array');
         }
         return httpParams;
     }
@@ -12348,9 +12400,7 @@ class FilterService {
         let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
         if (localVarHttpHeaderAcceptSelected === undefined) {
             // to determine the Accept header
-            const httpHeaderAccepts = [
-                'application/json'
-            ];
+            const httpHeaderAccepts = ['application/json'];
             localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
         }
         if (localVarHttpHeaderAcceptSelected !== undefined) {
@@ -12372,14 +12422,30 @@ class FilterService {
                 responseType_ = 'blob';
             }
         }
-        let localVarPath = `/filter/${this.configuration.encodeParam({ name: "uuid", value: uuid, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: "uuid" })}/${this.configuration.encodeParam({ name: "filterIdentifier", value: filterIdentifier, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined })}/load`;
+        let localVarPath = `/filter/${this.configuration.encodeParam({
+            name: 'uuid',
+            value: uuid,
+            in: 'path',
+            style: 'simple',
+            explode: false,
+            dataType: 'string',
+            dataFormat: 'uuid',
+        })}/${this.configuration.encodeParam({
+            name: 'filterIdentifier',
+            value: filterIdentifier,
+            in: 'path',
+            style: 'simple',
+            explode: false,
+            dataType: 'string',
+            dataFormat: undefined,
+        })}/load`;
         return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, {
             context: localVarHttpContext,
             responseType: responseType_,
             withCredentials: this.configuration.withCredentials,
             headers: localVarHeaders,
             observe: observe,
-            reportProgress: reportProgress
+            reportProgress: reportProgress,
         });
     }
     performWidgetAction(uuid, filterIdentifier, body, observe = 'body', reportProgress = false, options) {
@@ -12396,9 +12462,7 @@ class FilterService {
         let localVarHttpHeaderAcceptSelected = options && options.httpHeaderAccept;
         if (localVarHttpHeaderAcceptSelected === undefined) {
             // to determine the Accept header
-            const httpHeaderAccepts = [
-                'application/json'
-            ];
+            const httpHeaderAccepts = ['application/json'];
             localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
         }
         if (localVarHttpHeaderAcceptSelected !== undefined) {
@@ -12409,9 +12473,7 @@ class FilterService {
             localVarHttpContext = new HttpContext();
         }
         // to determine the Content-Type header
-        const consumes = [
-            'application/json'
-        ];
+        const consumes = ['application/json'];
         const httpContentTypeSelected = this.configuration.selectHeaderContentType(consumes);
         if (httpContentTypeSelected !== undefined) {
             localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
@@ -12428,7 +12490,23 @@ class FilterService {
                 responseType_ = 'blob';
             }
         }
-        let localVarPath = `/filter/${this.configuration.encodeParam({ name: "uuid", value: uuid, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: "uuid" })}/${this.configuration.encodeParam({ name: "filterIdentifier", value: filterIdentifier, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined })}/performWidgetAction`;
+        let localVarPath = `/filter/${this.configuration.encodeParam({
+            name: 'uuid',
+            value: uuid,
+            in: 'path',
+            style: 'simple',
+            explode: false,
+            dataType: 'string',
+            dataFormat: 'uuid',
+        })}/${this.configuration.encodeParam({
+            name: 'filterIdentifier',
+            value: filterIdentifier,
+            in: 'path',
+            style: 'simple',
+            explode: false,
+            dataType: 'string',
+            dataFormat: undefined,
+        })}/performWidgetAction`;
         return this.httpClient.request('post', `${this.configuration.basePath}${localVarPath}`, {
             context: localVarHttpContext,
             body: body,
@@ -12436,7 +12514,7 @@ class FilterService {
             withCredentials: this.configuration.withCredentials,
             headers: localVarHeaders,
             observe: observe,
-            reportProgress: reportProgress
+            reportProgress: reportProgress,
         });
     }
 }
@@ -12445,7 +12523,7 @@ FilterService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", versio
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: FilterService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
                     type: Optional