@veloceapps/sdk 9.0.0-19 → 9.0.0-20

package/fesm2020/veloceapps-sdk-core.mjs

@@ -2097,68 +2097,57 @@ class ConfigurationStateService {
         this.executedFunctions = {};
         this.configurationService.reset();
     }
-    execute$(req, forceSubscriptions) {
-        const fullRequest = cloneDeep(req);
-        if (fullRequest.actions?.length || forceSubscriptions) {
-            for (const subscription of Object.values(this.subscriptions)) {
-                fullRequest.selectors = assign(fullRequest.selectors, subscription.request.selectors);
-            }
-        }
-        let execution$;
-        if (this.isStatefulConfiguration) {
-            execution$ = this.executeStateful$(fullRequest);
-        }
-        else {
-            execution$ = this.executeStateless$(fullRequest);
-        }
-        return execution$.pipe(tap$1(result => this.handleSelectorsResponse(result.selectors)));
-    }
-    handleSelectorsResponse(selectors) {
-        Object.entries(selectors).forEach(([requestId, selectorResult]) => {
-            if (!selectorResult.success) {
-                this.toastService.add({ severity: ToastType.error, summary: selectorResult.errorMessage });
-            }
-            const subscription$ = this.subscriptions[requestId]?.data$;
-            if (subscription$) {
-                subscription$.next(selectorResult);
-            }
-        });
+    execute$(exec) {
+        const request = this.execToRequest(exec);
+        return this.executeRequest$(request).pipe(map$1(result => {
+            // Keep only requested results
+            const actualSelectors = Object.entries(result.selectors).reduce((trunk, [requestId, result]) => {
+                if (exec.selectors?.[requestId]) {
+                    trunk[requestId] = result;
+                }
+                return trunk;
+            }, {});
+            return actualSelectors;
+        }));
     }
     dispatch$(actionName, inputData = {}) {
-        return this.execute$({ actions: [{ apiName: actionName, inputData, ownerId: this.ownerId }] });
+        const exec = {
+            actions: [{ name: actionName, inputData }],
+        };
+        const request = this.execToRequest(exec);
+        return this.executeRequest$(request);
     }
     select$(selectorName, inputData = {}) {
         const requestId = UUID.UUID();
-        return this.execute$({
+        const request = this.execToRequest({
             selectors: {
                 [requestId]: {
-                    apiName: selectorName,
+                    name: selectorName,
                     inputData,
-                    ownerId: this.ownerId,
                 },
             },
-        }).pipe(map$1(response => response.selectors[requestId]));
+        });
+        return this.executeRequest$(request).pipe(map$1(response => response.selectors[requestId]));
     }
     subscribe$(selectorName, inputData = {}, options) {
         const requestId = UUID.UUID();
         let subscription = this.subscriptions[requestId];
         if (!subscription) {
-            const request = {
+            const request = this.execToRequest({
                 selectors: {
                     [requestId]: {
-                        apiName: selectorName,
+                        name: selectorName,
                         inputData,
-                        ownerId: this.ownerId,
                     },
                 },
-            };
+            });
             subscription = {
                 request,
                 data$: new BehaviorSubject(this.NOT_INITIALIZED),
             };
             this.subscriptions[requestId] = subscription;
             if (!options?.cold) {
-                this.execute$(request).subscribe();
+                this.executeRequest$(request).subscribe();
             }
         }
         return subscription.data$.pipe(filter$1(data => data != this.NOT_INITIALIZED), map$1(data => data), distinctUntilChanged(), finalize(() => {
@@ -2260,6 +2249,47 @@ class ConfigurationStateService {
     initStateless$() {
         return this.configurationService.configure().pipe(map$1(() => undefined));
     }
+    execToRequest(exec) {
+        return {
+            actions: exec.actions?.map(action => ({
+                apiName: action.name,
+                ownerId: this.ownerId,
+                inputData: action.inputData ?? {},
+            })),
+            selectors: exec.selectors &&
+                Object.entries(exec.selectors).reduce((trunk, [key, selector]) => ({
+                    ...trunk,
+                    [key]: { apiName: selector.name, ownerId: this.ownerId, inputData: selector.inputData ?? {} },
+                }), {}),
+        };
+    }
+    handleSelectorsResponse(selectors) {
+        Object.entries(selectors).forEach(([requestId, selectorResult]) => {
+            if (!selectorResult.success) {
+                this.toastService.add({ severity: ToastType.error, summary: selectorResult.errorMessage });
+            }
+            const subscription$ = this.subscriptions[requestId]?.data$;
+            if (subscription$) {
+                subscription$.next(selectorResult);
+            }
+        });
+    }
+    executeRequest$(req, forceSubscriptions) {
+        const fullRequest = cloneDeep(req);
+        if (fullRequest.actions?.length || forceSubscriptions) {
+            for (const subscription of Object.values(this.subscriptions)) {
+                fullRequest.selectors = assign(fullRequest.selectors, subscription.request.selectors);
+            }
+        }
+        let execution$;
+        if (this.isStatefulConfiguration) {
+            execution$ = this.executeStateful$(fullRequest);
+        }
+        else {
+            execution$ = this.executeStateless$(fullRequest);
+        }
+        return execution$.pipe(tap$1(result => this.handleSelectorsResponse(result.selectors)));
+    }
     executeStateless$(request) {
         this.executionInProgress$.next(true);
         return of(undefined).pipe(switchMap(() => {