@veloceapps/api 7.0.2-40 → 7.0.2-42

package/fesm2020/veloceapps-api.mjs

@@ -3,7 +3,7 @@ import { HttpParams, HttpErrorResponse, HttpClientModule } from '@angular/common
 import * as i0 from '@angular/core';
 import { Injectable, NgModule } from '@angular/core';
 import * as i1 from '@veloceapps/core';
-import { ModelTranslatorUtils, ConfigurationContextMode, isLegacyDocumentTemplate, DocxTemplater, QuoteDraft, StringUtils, Expression, Operator, ProductModelsContainer, ModelUtils, EntityUtil, RuleGroupTypes, parseJsonSafely, BaseHttpService, XrayService } from '@veloceapps/core';
+import { uiDefinitionFromDTO, isLegacyUIDefinition, ModelTranslatorUtils, ConfigurationContextMode, isLegacyDocumentTemplate, DocxTemplater, QuoteDraft, StringUtils, Expression, Operator, ProductModelsContainer, ModelUtils, EntityUtil, RuleGroupTypes, parseJsonSafely, BaseHttpService, XrayService } from '@veloceapps/core';
 import { throwError, of, zip, forkJoin, map as map$1, noop, catchError as catchError$1, switchMap as switchMap$1 } from 'rxjs';
 import { map, catchError, tap, switchMap, defaultIfEmpty } from 'rxjs/operators';
 import * as i2 from 'primeng/api';
@@ -366,11 +366,16 @@ class ConfigurationApiService {
             url: `${this.SERVICE_URL}/${productId}/model` + ((offeringId && `/${offeringId}`) || ''),
         })
             .pipe(map(runtimeData => {
-            runtimeData.uiDefinitions = JSON.parse(runtimeData.uiDefinitionsSource);
-            runtimeData.uiDefinitions.forEach(uiDefinition => {
-                ModelTranslatorUtils.toLocalUIDefinition(uiDefinition);
-            });
-            return runtimeData;
+            return {
+                ...runtimeData,
+                uiDefinitions: runtimeData.uiDefinitions.map(dto => {
+                    const uiDefinitionContainer = uiDefinitionFromDTO(dto);
+                    if (isLegacyUIDefinition(uiDefinitionContainer.source)) {
+                        ModelTranslatorUtils.toLocalUIDefinition(uiDefinitionContainer.source);
+                    }
+                    return uiDefinitionContainer;
+                }),
+            };
         }));
     }
     getRuntimeDataByModelId(modelId) {
@@ -1669,6 +1674,11 @@ class ProductModelApiService {
             return linkedModels;
         }));
     }
+    /**
+     *
+     * @deprecated
+     * Will be removed in next major release
+     */
     load(id, version) {
         return forkJoin([this.getModel(id, version), this.getLinkedModels(id, version)]).pipe(map(([model, linkedModels]) => {
             const container = new ProductModelsContainer(model, linkedModels ?? []);