@veloceapps/sdk 8.0.0-170 → 8.0.0-172

package/fesm2020/veloceapps-sdk-core.mjs

@@ -1404,10 +1404,7 @@ class ConfigurationService {
         this.dialogService = dialogService;
         this.runtimeSettings = runtimeSettings;
         this.mode = ConfigurationMode.SEARCH;
-        this.lineItem = new BehaviorSubject(undefined);
-        this.charges = new BehaviorSubject({});
-        this.pricePlans = new BehaviorSubject({});
-        this.procedureContext = new BehaviorSubject({});
+        this.configurationState = new BehaviorSubject(null);
         this.isLoadingSubj$ = new BehaviorSubject(false);
         this.isLoading$ = this.isLoadingSubj$.asObservable();
         this.hasUnsavedChanges = false;
@@ -1416,23 +1413,23 @@ class ConfigurationService {
         this.hasUnsavedChanges = false;
         this.runtimeService.reset();
         this.configurableRamp = undefined;
-        this.lineItem.next(undefined);
-        this.charges.next({});
-        this.pricePlans.next({});
+        this.configurationState.next(null);
     }
     patch$(lineItem, options) {
-        if (!this.lineItem.value) {
+        const source = this.getSnapshot();
+        if (!source) {
             return throwError(() => new Error(`Source LineItem not found`));
         }
         const skipCardinalityCalculation = options?.skipCardinalityCalculation || this.contextSnapshot.properties['#skipCardinalityCalculation'] === 'true';
-        this.configurableRamp = new LineItemWorker(this.lineItem.value).replace(lineItem, skipCardinalityCalculation).li;
+        this.configurableRamp = new LineItemWorker(source).replace(lineItem, skipCardinalityCalculation).li;
         return this.configure().pipe(catchError$1(error => {
             console.error(error);
             if (!this.runtimeService.uiDefinitionProperties.suppressToastMessages) {
                 this.messageService.add({ severity: 'error', summary: error });
             }
             // bounce back if configuration call has failed
-            this.lineItem.next(this.lineItem.value ? { ...this.lineItem.value } : undefined);
+            const prevState = this.configurationState.value;
+            this.configurationState.next(prevState ? { ...prevState } : null);
             return throwError(() => error);
         }), tap(() => {
             if (!this.hasUnsavedChanges) {
@@ -1447,10 +1444,10 @@ class ConfigurationService {
         this.configurableRamp = lineItem;
     }
     get() {
-        return this.lineItem.asObservable().pipe(shareReplay$1());
+        return this.configurationState.pipe(map(state => state?.lineItem), shareReplay$1());
     }
     getSnapshot() {
-        return this.lineItem.value ? { ...this.lineItem.value } : undefined;
+        return this.configurationState.value?.lineItem ? { ...this.configurationState.value?.lineItem } : undefined;
     }
     getRuntimeModel() {
         const runtimeModel = this.runtimeService.runtimeModel;
@@ -1466,6 +1463,12 @@ class ConfigurationService {
         }
         return runtimeContext;
     }
+    get state$() {
+        return this.configurationState.asObservable();
+    }
+    get stateSnapshot() {
+        return this.configurationState.value;
+    }
     get contextSnapshot() {
         return this.contextService.resolve();
     }
@@ -1473,22 +1476,22 @@ class ConfigurationService {
         return this.contextService.resolve$();
     }
     get charges$() {
-        return this.charges.asObservable();
+        return this.configurationState.pipe(map(state => state?.charges ?? {}));
     }
     get chargesSnapshot() {
-        return this.charges.value;
+        return this.configurationState.value?.charges ?? {};
     }
     get pricePlans$() {
-        return this.pricePlans.asObservable();
+        return this.configurationState.pipe(map(state => state?.pricePlans ?? {}));
     }
     get pricePlansSnapshot() {
-        return this.pricePlans.value;
+        return this.configurationState.value?.pricePlans ?? {};
     }
     get procedureContext$() {
-        return this.procedureContext.asObservable();
+        return this.configurationState.pipe(map(state => state?.procedureContext ?? {}));
     }
     get procedureContextSnapshot() {
-        return this.procedureContext.value;
+        return this.configurationState.value?.procedureContext ?? {};
     }
     configure() {
         return this.configureRequest$(this.generateRequest());
@@ -1508,18 +1511,13 @@ class ConfigurationService {
                 runtimeModel,
                 pricingEnabled,
             });
-        return configure$.pipe(tap(({ lineItem, context, charges, pricePlans, deletedLineItems, procedureContext }) => {
-            this.contextService.update(context ?? {});
-            this.charges.next(charges ?? {});
-            this.pricePlans.next(pricePlans ?? {});
-            this.procedureContext.next(procedureContext ?? {});
-            if (lineItem) {
-                this.lineItem.next(lineItem);
-            }
-            if (deletedLineItems?.length) {
+        return configure$.pipe(tap(result => {
+            this.contextService.update(result.context);
+            this.configurationState.next(result);
+            if (result.deletedLineItems?.length) {
                 this.showInactiveProductsConfirmation();
             }
-            this.configurableRamp = lineItem;
+            this.configurableRamp = result.lineItem;
         }), map(({ lineItem }) => lineItem), catchError$1(error => throwError(() => new Error(error.error?.message || error.message || JSON.stringify(error)))), finalize$1(() => this.isLoadingSubj$.next(false)));
     }
     configureExternal$(props) {
@@ -1547,7 +1545,7 @@ class ConfigurationService {
         let request = {
             lineItem,
             mode: this.mode,
-            step: !this.lineItem.value ? RuntimeStep.START : RuntimeStep.UPDATE,
+            step: !this.configurationState.value?.lineItem ? RuntimeStep.START : RuntimeStep.UPDATE,
             attributeDomainMode: 'ALL',
             context: this.contextService.resolve(),
             lineItems: this.quoteDraftService.quoteDraft?.currentState || [],
@@ -2204,7 +2202,7 @@ class ConfigurationStateService {
                 this.execute$(request).subscribe();
             }
         }
-        return subscription.data$.pipe(filter$1(data => data != this.NOT_INITIALIZED), map$1(data => data), finalize(() => {
+        return subscription.data$.pipe(filter$1(data => data != this.NOT_INITIALIZED), map$1(data => data), distinctUntilChanged(), finalize(() => {
             if (!this.subscriptions[requestId]?.data$.observed) {
                 delete this.subscriptions[requestId];
             }
@@ -2315,12 +2313,15 @@ class ConfigurationStateService {
             return this.configurationService.configureRequest$(configurationRequest);
         }), map$1(() => {
             // Run selectors and apply them to the state
-            const finalConfigurationRequest = this.configurationService.generateRequest(false);
+            const configurationState = cloneDeep(this.configurationService.stateSnapshot);
+            if (!configurationState) {
+                return { stateId: '', selectors: {} };
+            }
             const selectorsResult = EntityUtil.entries(request.selectors ?? {}).reduce((result, [key, selector]) => {
                 try {
                     result.selectors[key] = {
                         success: true,
-                        result: this.executeSelectorScript(finalConfigurationRequest, selector),
+                        result: this.executeSelectorScript(configurationState, selector),
                     };
                 }
                 catch (e) {