@veloceapps/sdk 7.0.2-41 → 7.0.2-42

package/fesm2020/veloceapps-sdk-runtime.mjs

@@ -3,7 +3,7 @@ import { Injectable, ViewContainerRef, Component, Input, ViewChild, Inject, Even
 import * as i4 from '@angular/forms';
 import { FormGroup, FormControl, NG_VALUE_ACCESSOR, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import * as i7 from '@veloceapps/core';
-import { EntityUtil, UUID, SectionPathUtil, TypeValidators, ConfigurationMode, RuntimeModel, OrderByPipe, PricingUtils, PagedEntity, CoreModule, SalesforceIdUtils, SearchFilterPipe, ConfigurationContextMode } from '@veloceapps/core';
+import { EntityUtil, UUID, SectionPathUtil, TypeValidators, ConfigurationMode, RuntimeModel, isLegacyUIDefinition, OrderByPipe, PricingUtils, PagedEntity, CoreModule, SalesforceIdUtils, SearchFilterPipe, ConfigurationContextMode } from '@veloceapps/core';
 import * as i2 from '@veloceapps/sdk/core';
 import { RuntimeMode, RuntimeStep, SdkCoreModule } from '@veloceapps/sdk/core';
 import * as rxjs from 'rxjs';
@@ -1010,7 +1010,7 @@ class RuntimeContextService {
     }
     getRuntimeContext(productId, offeringId) {
         return this.configurationApiService.getRuntimeDataByProductId(productId, offeringId).pipe(map(runtimeData => {
-            const uiDefinition = this.getUIDefinition(runtimeData.uiDefinitions);
+            const uiDefinition = this.getUIDefinition(runtimeData);
             const runtimeModel = RuntimeModel.create(runtimeData.types, runtimeData.products);
             const { productName, properties } = Array.from(runtimeModel.components.values()).find(c => c.productId === productId) ?? {};
             return {
@@ -1027,9 +1027,12 @@ class RuntimeContextService {
             };
         }));
     }
-    getUIDefinition(uiDefinitions = []) {
+    getUIDefinition(runtimeData) {
         const { uiDefinitionId } = this.contextService.resolve();
-        const findByFn = (uiDef) => (uiDefinitionId ? uiDefinitionId === uiDef.id : uiDef.primary);
+        const findByFn = (uiDef) => uiDefinitionId ? uiDefinitionId === uiDef.id : uiDef.primary;
+        const uiDefinitions = runtimeData.uiDefinitions
+            .map(({ source }) => source)
+            .filter((uiDefinition) => isLegacyUIDefinition(uiDefinition));
         const uiDefinition = uiDefinitions.find(findByFn) || (uiDefinitions.length === 1 && { ...uiDefinitions[0] });
         if (!uiDefinition) {
             const errMsg = `Unable to find ${uiDefinitionId ? uiDefinitionId : 'Default'} UI`;