@veloceapps/sdk 9.0.0-6 → 9.0.0-8

package/fesm2020/veloceapps-sdk-core.mjs

@@ -480,7 +480,7 @@ class FlowStateService {
         this.processors = {};
         this.subscriptions = {};
         this.flowStore = {};
-        this.statefulExecutionInProgress$ = new BehaviorSubject(false);
+        this.executionInProgress$ = new BehaviorSubject(false);
         this.statefulRequestStream$ = new Subject();
         this.cleanup$ = new Subject();
         this.statefulExecutionRequest$ = this.initBufferedRequest$();
@@ -566,7 +566,7 @@ class FlowStateService {
         return this.stateId$.value;
     }
     get isExecutionInProgress$() {
-        return this.statefulExecutionInProgress$.asObservable();
+        return this.executionInProgress$.asObservable();
     }
     isInitialized$() {
         return combineLatest([this.stateId$, this.quoteDraftService.isInitialized$]).pipe(map$1(values => values.some(Boolean)));
@@ -760,15 +760,15 @@ class FlowStateService {
                     .filter(isDefined)
                     .reduce((acc, selectorsMap) => Object.assign(acc, selectorsMap), {}),
             };
-            this.statefulExecutionInProgress$.next(true);
+            this.executionInProgress$.next(true);
             return this.flowStateApiService.execute(this.stateId$.value, request);
-        }), tap$1(({ stateId }) => this.stateId$.next(stateId)), share(), tap$1(() => this.statefulExecutionInProgress$.next(false)), catchError(e => {
-            this.statefulExecutionInProgress$.next(false);
+        }), tap$1(({ stateId }) => this.stateId$.next(stateId)), share(), tap$1(() => this.executionInProgress$.next(false)), catchError(e => {
+            this.executionInProgress$.next(false);
             return throwError(() => e);
         }));
     }
     executeStateful$(request) {
-        return this.statefulExecutionInProgress$.pipe(filter$1(inProgress => !inProgress), take$1(1), switchMap(() => 
+        return this.executionInProgress$.pipe(filter$1(inProgress => !inProgress), take$1(1), switchMap(() => 
         // make sure stream switches to statefulExecutionRequest$ before pushing an execution request
         combineLatest([
             this.statefulExecutionRequest$,
@@ -809,6 +809,7 @@ class FlowStateService {
         return this.flowConfiguration.calculate$(flowState);
     }
     executeStateless$(request) {
+        this.executionInProgress$.next(true);
         return of(undefined).pipe(tap$1(() => this.executeStatelessActions(request)), switchMap(() => {
             /*
               Skip price calculation in case
@@ -821,7 +822,10 @@ class FlowStateService {
             else {
                 return this.calculate$();
             }
-        }), map$1(() => this.executeStatelessSelectors(request)));
+        }), map$1(() => this.executeStatelessSelectors(request)), tap$1(() => this.executionInProgress$.next(false)), catchError(e => {
+            this.executionInProgress$.next(false);
+            return throwError(() => e);
+        }));
     }
     executeStatelessActions(request) {
         if (!this.quoteDraftService.quoteDraft || !request.actions?.length) {
@@ -2058,10 +2062,13 @@ class ConfigurationStateService {
         this.ownerId = '';
         this.subscriptions = {};
         this.configurationStore = {};
-        this.statefulExecutionInProgress$ = new BehaviorSubject(false);
+        this.executionInProgress$ = new BehaviorSubject(false);
         this.statefulRequestStream$ = new Subject();
         this.statefulExecutionRequest$ = this.initBufferedRequest$();
     }
+    get isExecutionInProgress$() {
+        return this.executionInProgress$.asObservable();
+    }
     init$() {
         let request$;
         if (this.flowStateService.stateId && this.isStatefulConfiguration) {
@@ -2155,7 +2162,8 @@ class ConfigurationStateService {
             }
         }), takeUntil(this.canceledConfiguration$));
     }
-    saveConfiguration(quoteId, flow) {
+    saveConfiguration(first, second) {
+        const flow = typeof first === 'boolean' ? first : second;
         if (this.isStatefulConfiguration) {
             return this.flowStateApiService
                 .saveConfiguration(this.flowStateService.stateId ?? '', this.stateId ?? '')
@@ -2163,16 +2171,15 @@ class ConfigurationStateService {
         }
         else {
             if (!flow) {
-                if (!quoteId) {
+                const quoteDraft = this.quoteDraftService.quoteDraft;
+                if (!quoteDraft) {
                     return of({ quoteId: '' });
                 }
                 const rootLineItem = this.configurationService.getSnapshot();
                 const asset = this.configurationService.getAsset();
                 const currentState = rootLineItem ? [rootLineItem] : [];
                 const initialState = asset ? [asset] : [];
-                return this.quoteApiService
-                    .getQuoteState(quoteId)
-                    .pipe(switchMap(quoteDraft => this.quoteApiService.upsertQuote({ ...quoteDraft, currentState, initialState })));
+                return this.quoteApiService.upsertQuote({ ...quoteDraft, currentState, initialState });
             }
             else {
                 const quoteDraft = this.quoteDraftService.quoteDraft;
@@ -2249,6 +2256,7 @@ class ConfigurationStateService {
         return this.configurationService.configure().pipe(map$1(() => undefined));
     }
     executeStateless$(request) {
+        this.executionInProgress$.next(true);
         return of(undefined).pipe(switchMap(() => {
             // Apply actions and execute configuration/price call
             // No need to run configuration if no actions in the request
@@ -2259,6 +2267,7 @@ class ConfigurationStateService {
             request.actions.forEach(action => {
                 configurationRequest = this.executeActionScript(configurationRequest, action) ?? configurationRequest;
             });
+            configurationRequest = ConfigurationTranslatorUtils.lightenConfigurationRequest(configurationRequest);
             return this.configurationService.configureRequest$(configurationRequest);
         }), map$1(() => {
             // Run selectors and apply them to the state
@@ -2283,7 +2292,8 @@ class ConfigurationStateService {
                 return result;
             }, { stateId: '', selectors: {} });
             return selectorsResult;
-        }), catchError(error => {
+        }), tap$1(() => this.executionInProgress$.next(false)), catchError(error => {
+            this.executionInProgress$.next(false);
             if (!this.configurationRuntimeService.uiDefinitionProperties.suppressToastMessages) {
                 this.toastService.add({ severity: ToastType.error, summary: String(error) });
             }
@@ -2303,15 +2313,15 @@ class ConfigurationStateService {
                     .filter(isDefined)
                     .reduce((acc, selectorsMap) => Object.assign(acc, selectorsMap), {}),
             };
-            this.statefulExecutionInProgress$.next(true);
+            this.executionInProgress$.next(true);
             return this.flowStateApiService.executeConfiguration(this.flowStateService.stateId, this.stateId, request);
-        }), tap$1(({ stateId }) => (this.stateId = stateId)), share(), tap$1(() => this.statefulExecutionInProgress$.next(false)), catchError(e => {
-            this.statefulExecutionInProgress$.next(false);
+        }), tap$1(({ stateId }) => (this.stateId = stateId)), share(), tap$1(() => this.executionInProgress$.next(false)), catchError(e => {
+            this.executionInProgress$.next(false);
             return throwError(() => e);
         }));
     }
     executeStateful$(request) {
-        return this.statefulExecutionInProgress$.pipe(filter$1(inProgress => !inProgress), take$1(1), switchMap(() => 
+        return this.executionInProgress$.pipe(filter$1(inProgress => !inProgress), take$1(1), switchMap(() => 
         // make sure stream switches to statefulExecutionRequest$ before pushing an execution request
         combineLatest([
             this.statefulExecutionRequest$,