@veloceapps/sdk 11.0.0-13 → 11.0.0-15

package/fesm2020/veloceapps-sdk.mjs

@@ -14,7 +14,8 @@ import * as i3 from 'primeng/button';
 import { ButtonModule } from 'primeng/button';
 import * as i1 from 'primeng/dynamicdialog';
 import * as i1$1 from '@veloceapps/api/v2';
-import { BehaviorSubject, Subject, filter, first, tap, takeUntil, catchError, of, map, switchMap, shareReplay, startWith, distinctUntilChanged, from, take, combineLatest, timer, noop } from 'rxjs';
+import { UIDefinitionsApiService } from '@veloceapps/api/v2';
+import { BehaviorSubject, Subject, filter, first, tap, takeUntil, catchError, of, map, switchMap, shareReplay, startWith, distinctUntilChanged, from, take, combineLatest } from 'rxjs';
 import { DomHandler } from 'primeng/dom';
 import * as i1$2 from '@angular/router';
 import { NavigationEnd, NavigationStart, NavigationCancel, NavigationError, RouterModule } from '@angular/router';
@@ -1149,80 +1150,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }] });
 
 class ProductComponent {
-    constructor(
-    // private configurationRuntimeService: ConfigurationRuntimeService,
-    configurationService, configurationStateService, salesTransactionService, flowInfoService, integrationState, uiDefinitionsApiService, customizationService) {
-        this.configurationService = configurationService;
+    constructor(route, configurationStateService) {
+        this.route = route;
         this.configurationStateService = configurationStateService;
-        this.salesTransactionService = salesTransactionService;
-        this.flowInfoService = flowInfoService;
-        this.integrationState = integrationState;
-        this.uiDefinitionsApiService = uiDefinitionsApiService;
-        this.customizationService = customizationService;
         this.uiDefinitionContainer$ = new BehaviorSubject(null);
+        const uiDefContainer = this.route.snapshot.data['uiDef'];
+        this.uiDefinitionContainer$.next(uiDefContainer);
         this.config = {
             init$: () => this.init$(),
         };
     }
-    customizeUI$() {
-        const { productId } = this.flowInfoService.context;
-        if (!productId || !this.customizationService?.getUiDefinition) {
-            return of(undefined);
-        }
-        return this.customizationService.getUiDefinition(productId).pipe(map(uiDefinitionContainer => {
-            this.uiDefinitionContainer$.next(uiDefinitionContainer);
-        }));
-    }
-    fetchUIDefinition$() {
-        const flowContext = this.flowInfoService.context;
-        if (flowContext.requiredUIDefinitionId) {
-            return this.uiDefinitionsApiService
-                .fetchUIDefinition$(flowContext.requiredUIDefinitionId)
-                .pipe(map((uiDefContainer) => this.uiDefinitionContainer$.next(uiDefContainer)));
-        }
-        return this.uiDefinitionsApiService
-            .fetchUIDefinitions$({
-            productId: flowContext.productId,
-            defaultUIDefinitionId: flowContext.defaultUIDefinitionId,
-        })
-            .pipe(map((uiDefinitionContainers) => {
-            const uiDefContainer = uiDefinitionContainers[0];
-            if (uiDefContainer) {
-                this.uiDefinitionContainer$.next(uiDefContainer);
-            }
-        }));
-    }
     init$() {
-        let state$;
-        if (!this.flowInfoService.isStateful) {
-            state$ = this.salesTransactionService.state$;
-        }
-        else {
-            state$ = of(undefined);
-        }
-        return state$.pipe(first(), tap(() => {
-            if (!this.flowInfoService.context.productId) {
-                throw new Error(`Unable to start configuration for 'productId == null'`);
-            }
-        }), switchMap(() => this.customizeUI$()), switchMap(() => (this.uiDefinitionContainer$.value ? of(undefined) : this.fetchUIDefinition$())), tap(() => {
-            if (!this.uiDefinitionContainer$.value) {
-                throw new Error('Product does not have Configuration UI');
-            }
-        }), switchMap(() => this.configurationStateService.init$()), switchMap(() => timer(1)), // wait until updates inputs on child components
-        map(noop));
+        return this.configurationStateService.init$();
     }
 }
-ProductComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ProductComponent, deps: [{ token: i2.ConfigurationService }, { token: i2.ConfigurationStateService }, { token: i2.SalesTransactionService }, { token: i2.FlowInfoService }, { token: i2.IntegrationState }, { token: i1$1.UIDefinitionsApiService }, { token: FLOW_CUSTOMIZATION, optional: true }], target: i0.ɵɵFactoryTarget.Component });
+ProductComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ProductComponent, deps: [{ token: i1$2.ActivatedRoute }, { token: i2.ConfigurationStateService }], target: i0.ɵɵFactoryTarget.Component });
 ProductComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.9", type: ProductComponent, selector: "vl-flow-product", ngImport: i0, template: "<vl-cms-preview [uiDefinition]=\"(uiDefinitionContainer$ | async)?.source\" [config]=\"config\"></vl-cms-preview>\n", styles: [""], dependencies: [{ kind: "component", type: i5.PreviewComponent, selector: "vl-cms-preview", inputs: ["uiDefinition", "config"] }, { kind: "pipe", type: i4.AsyncPipe, name: "async" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ProductComponent, decorators: [{
             type: Component,
             args: [{ selector: 'vl-flow-product', changeDetection: ChangeDetectionStrategy.OnPush, template: "<vl-cms-preview [uiDefinition]=\"(uiDefinitionContainer$ | async)?.source\" [config]=\"config\"></vl-cms-preview>\n" }]
-        }], ctorParameters: function () { return [{ type: i2.ConfigurationService }, { type: i2.ConfigurationStateService }, { type: i2.SalesTransactionService }, { type: i2.FlowInfoService }, { type: i2.IntegrationState }, { type: i1$1.UIDefinitionsApiService }, { type: undefined, decorators: [{
-                    type: Optional
-                }, {
-                    type: Inject,
-                    args: [FLOW_CUSTOMIZATION]
-                }] }]; } });
+        }], ctorParameters: function () { return [{ type: i1$2.ActivatedRoute }, { type: i2.ConfigurationStateService }]; } });
 
 class ProductModule {
 }
@@ -1493,6 +1440,43 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
             type: Injectable
         }], ctorParameters: function () { return [{ type: i1$2.Router }, { type: i2.QuoteDraftService }, { type: FlowRouterService }, { type: i2.FlowInfoService }, { type: i2.FlowStateService }]; } });
 
+const resolveUIDefinition = () => {
+    const customizationService = inject(FLOW_CUSTOMIZATION, { optional: true });
+    const flowInfoService = inject(FlowInfoService);
+    const uiDefinitionsApiService = inject(UIDefinitionsApiService);
+    const { productId } = flowInfoService.context;
+    if (!productId) {
+        throw new Error(`Unable to start configuration for 'productId == null'`);
+    }
+    return of(undefined).pipe(switchMap(() => {
+        // Try resolving via customization service
+        if (!productId || !customizationService?.getUiDefinition) {
+            return of(undefined);
+        }
+        return customizationService.getUiDefinition(productId);
+    }), switchMap(uiDefContainer => {
+        // Resolve UIDefinition from the org
+        if (uiDefContainer) {
+            return of(uiDefContainer);
+        }
+        if (flowInfoService.context.requiredUIDefinitionId) {
+            return uiDefinitionsApiService.fetchUIDefinition$(flowInfoService.context.requiredUIDefinitionId);
+        }
+        return uiDefinitionsApiService
+            .fetchUIDefinitions$({
+            productId,
+            defaultUIDefinitionId: flowInfoService.context.defaultUIDefinitionId,
+        })
+            .pipe(map((uiDefinitionContainers) => {
+            const uiDefContainer = uiDefinitionContainers[0];
+            if (!uiDefContainer) {
+                throw new Error(`UI Definition for productId=${productId} is not resolved`);
+            }
+            return uiDefContainer;
+        }));
+    }));
+};
+
 const rootRoute = {
     id: VELOCE_FLOW_ROOT_ROUTE,
     path: '',
@@ -1515,7 +1499,7 @@ const rootRoute = {
                     path: 'product',
                     component: ProductComponent,
                     runGuardsAndResolvers: 'paramsOrQueryParamsChange',
-                    resolve: { quote: QuoteResolver },
+                    resolve: { quote: QuoteResolver, uiDef: resolveUIDefinition },
                     canDeactivate: [ProductUnloadGuard],
                     data: { showHeader: true },
                 },