@veloceapps/api 8.0.0-204 → 8.0.0-206
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/services/configuration-api.service.mjs +26 -28
- package/fesm2015/veloceapps-api.mjs +25 -24
- package/fesm2015/veloceapps-api.mjs.map +1 -1
- package/fesm2020/veloceapps-api.mjs +25 -27
- package/fesm2020/veloceapps-api.mjs.map +1 -1
- package/lib/services/configuration-api.service.d.ts +1 -1
- package/package.json +1 -1
@@ -21,7 +21,7 @@ export class ConfigurationApiService {
|
|
21
21
|
if (runtimeModel) {
|
22
22
|
return {
|
23
23
|
...configurePrice,
|
24
|
-
lineItem: this.
|
24
|
+
lineItem: this.updateDomains(configurePrice.lineItem, runtimeModel),
|
25
25
|
};
|
26
26
|
}
|
27
27
|
else {
|
@@ -41,7 +41,7 @@ export class ConfigurationApiService {
|
|
41
41
|
if (runtimeModel) {
|
42
42
|
return {
|
43
43
|
...configurePrice,
|
44
|
-
lineItem: this.
|
44
|
+
lineItem: this.updateDomains(configurePrice.lineItem, runtimeModel),
|
45
45
|
};
|
46
46
|
}
|
47
47
|
else {
|
@@ -68,37 +68,35 @@ export class ConfigurationApiService {
|
|
68
68
|
url: `${this.SERVICE_URL}/${modelId}/model-test`,
|
69
69
|
});
|
70
70
|
}
|
71
|
-
|
72
|
-
const
|
71
|
+
updateDomains(lineItem, runtimeModel) {
|
72
|
+
const component = runtimeModel.components.get(lineItem.type);
|
73
73
|
const portDomains = { ...lineItem.portDomains };
|
74
74
|
// loop through ports to look for 'None' type domain computations
|
75
|
-
for (const port of
|
76
|
-
const
|
77
|
-
|
78
|
-
|
79
|
-
// there's a 'None' type domain computation
|
80
|
-
if (portDomain.properties?.['domainComputation'] === ('None')) {
|
81
|
-
portDomain.domainTypes = domainTypes;
|
82
|
-
}
|
83
|
-
}
|
84
|
-
else {
|
85
|
-
// there's no port domain so consider that as 'None' type domain computation
|
86
|
-
portDomains[portName] = {
|
87
|
-
name: portName,
|
88
|
-
type: typeName,
|
89
|
-
minCard: Number(min),
|
90
|
-
maxCard: Number(max),
|
91
|
-
domainTypes: domainTypes,
|
92
|
-
properties: {
|
93
|
-
...properties,
|
94
|
-
domainComputation: 'None',
|
95
|
-
},
|
96
|
-
};
|
75
|
+
for (const port of component?.ports ?? []) {
|
76
|
+
const portDomain = portDomains[port.name];
|
77
|
+
if (portDomain?.properties?.['domainComputation'] === ('None')) {
|
78
|
+
portDomain.domainTypes = port.domainTypes;
|
97
79
|
}
|
98
80
|
}
|
81
|
+
const type = runtimeModel.types.find(({ name }) => {
|
82
|
+
return lineItem.type === name;
|
83
|
+
});
|
84
|
+
const attributeDomains = lineItem.attributeDomains;
|
85
|
+
if (type) {
|
86
|
+
const initialDomains = lineItem.attributeDomains;
|
87
|
+
type.attributes.forEach(attribute => {
|
88
|
+
if (Object.prototype.hasOwnProperty.call(initialDomains, attribute.name)) {
|
89
|
+
return;
|
90
|
+
}
|
91
|
+
if (attribute.attributeDomain) {
|
92
|
+
attributeDomains[attribute.name] = attribute.attributeDomain;
|
93
|
+
}
|
94
|
+
});
|
95
|
+
}
|
99
96
|
return {
|
100
97
|
...lineItem,
|
101
|
-
lineItems: lineItem.lineItems?.map(i => this.
|
98
|
+
lineItems: lineItem.lineItems?.map(i => this.updateDomains(i, runtimeModel)),
|
99
|
+
attributeDomains,
|
102
100
|
portDomains,
|
103
101
|
};
|
104
102
|
}
|
@@ -108,4 +106,4 @@ ConfigurationApiService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.
|
|
108
106
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ConfigurationApiService, decorators: [{
|
109
107
|
type: Injectable
|
110
108
|
}], ctorParameters: function () { return [{ type: i1.BaseHttpService }]; } });
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
109
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"configuration-api.service.js","sourceRoot":"","sources":["../../../../../../libs/api/src/lib/services/configuration-api.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport {\n  BaseHttpService,\n  ConfigurationRequest,\n  ConfigurePrice,\n  DomainComputation,\n  LineItem,\n  RuntimeData,\n  RuntimeDataDTO,\n  RuntimeModel,\n  uiDefinitionFromDTO,\n} from '@veloceapps/core';\nimport { Observable, throwError } from 'rxjs';\nimport { map } from 'rxjs/operators';\nimport { Dictionary } from 'lodash';\n\n@Injectable()\nexport class ConfigurationApiService {\n  private readonly SERVICE_URL = '/configuration';\n\n  constructor(private httpService: BaseHttpService) {}\n\n  public configureLineItem({\n    configurationRequest,\n    runtimeModel,\n    pricingEnabled,\n  }: {\n    configurationRequest: ConfigurationRequest;\n    runtimeModel?: RuntimeModel;\n    pricingEnabled?: boolean;\n  }): Observable<ConfigurePrice> {\n    return this.httpService\n      .api<ConfigurePrice>({\n        method: 'post',\n        url: `${this.SERVICE_URL}${pricingEnabled ? '/price' : ''}`,\n        body: configurationRequest,\n        errorHandler: e => throwError(e),\n      })\n      .pipe(\n        map(configurePrice => {\n          if (runtimeModel) {\n            return {\n              ...configurePrice,\n              lineItem: this.updateDomains(configurePrice.lineItem, runtimeModel),\n            };\n          } else {\n            return configurePrice;\n          }\n        }),\n      );\n  }\n\n  public customConfigurePrice({\n    url,\n    configurationRequest,\n    runtimeModel,\n  }: {\n    url: string;\n    configurationRequest: ConfigurationRequest;\n    runtimeModel?: RuntimeModel;\n  }): Observable<ConfigurePrice> {\n    return this.httpService\n      .api<ConfigurePrice>({\n        method: 'post',\n        url,\n        body: configurationRequest,\n        errorHandler: e => throwError(e),\n      })\n      .pipe(\n        map(configurePrice => {\n          if (runtimeModel) {\n            return {\n              ...configurePrice,\n              lineItem: this.updateDomains(configurePrice.lineItem, runtimeModel),\n            };\n          } else {\n            return configurePrice;\n          }\n        }),\n      );\n  }\n\n  public getRuntimeDataByProductId(productId: string, offeringId?: string): Observable<RuntimeData> {\n    return this.httpService\n      .api<RuntimeDataDTO>({\n        method: 'get',\n        url: `${this.SERVICE_URL}/${productId}/model` + ((offeringId && `/${offeringId}`) || ''),\n      })\n      .pipe(\n        map<RuntimeDataDTO, RuntimeData>(runtimeData => {\n          return {\n            ...runtimeData,\n            uiDefinitions: runtimeData.uiDefinitions.map(dto => uiDefinitionFromDTO(dto)),\n          };\n        }),\n      );\n  }\n\n  public getRuntimeDataByModelId(modelId: string): Observable<RuntimeData> {\n    return this.httpService.api({\n      method: 'get',\n      url: `${this.SERVICE_URL}/${modelId}/model-test`,\n    });\n  }\n\n  private updateDomains(lineItem: LineItem, runtimeModel: RuntimeModel): LineItem {\n    const component = runtimeModel.components.get(lineItem.type);\n    const portDomains = { ...lineItem.portDomains };\n\n    // loop through ports to look for 'None' type domain computations\n    for (const port of component?.ports ?? []) {\n      const portDomain = portDomains[port.name];\n      if (portDomain?.properties?.['domainComputation'] === ('None' satisfies DomainComputation)) {\n        portDomain.domainTypes = port.domainTypes;\n      }\n    }\n\n    const type = runtimeModel.types.find(({ name }) => {\n      return lineItem.type === name;\n    });\n\n    const attributeDomains = lineItem.attributeDomains;\n    if (type) {\n      const initialDomains = lineItem.attributeDomains;\n      type.attributes.forEach(attribute => {\n        if (Object.prototype.hasOwnProperty.call(initialDomains, attribute.name)) {\n          return;\n        }\n\n        if (attribute.attributeDomain) {\n          attributeDomains[attribute.name] = attribute.attributeDomain;\n        }\n      });\n    }\n\n    return {\n      ...lineItem,\n      lineItems: lineItem.lineItems?.map(i => this.updateDomains(i, runtimeModel)),\n      attributeDomains,\n      portDomains,\n    };\n  }\n}\n"]}
|
@@ -368,7 +368,7 @@ class ConfigurationApiService {
|
|
368
368
|
})
|
369
369
|
.pipe(map(configurePrice => {
|
370
370
|
if (runtimeModel) {
|
371
|
-
return Object.assign(Object.assign({}, configurePrice), { lineItem: this.
|
371
|
+
return Object.assign(Object.assign({}, configurePrice), { lineItem: this.updateDomains(configurePrice.lineItem, runtimeModel) });
|
372
372
|
}
|
373
373
|
else {
|
374
374
|
return configurePrice;
|
@@ -385,7 +385,7 @@ class ConfigurationApiService {
|
|
385
385
|
})
|
386
386
|
.pipe(map(configurePrice => {
|
387
387
|
if (runtimeModel) {
|
388
|
-
return Object.assign(Object.assign({}, configurePrice), { lineItem: this.
|
388
|
+
return Object.assign(Object.assign({}, configurePrice), { lineItem: this.updateDomains(configurePrice.lineItem, runtimeModel) });
|
389
389
|
}
|
390
390
|
else {
|
391
391
|
return configurePrice;
|
@@ -408,33 +408,34 @@ class ConfigurationApiService {
|
|
408
408
|
url: `${this.SERVICE_URL}/${modelId}/model-test`,
|
409
409
|
});
|
410
410
|
}
|
411
|
-
|
411
|
+
updateDomains(lineItem, runtimeModel) {
|
412
412
|
var _a, _b, _c;
|
413
|
-
const
|
413
|
+
const component = runtimeModel.components.get(lineItem.type);
|
414
414
|
const portDomains = Object.assign({}, lineItem.portDomains);
|
415
415
|
// loop through ports to look for 'None' type domain computations
|
416
|
-
for (const port of (_a =
|
417
|
-
const
|
418
|
-
|
419
|
-
|
420
|
-
// there's a 'None' type domain computation
|
421
|
-
if (((_b = portDomain.properties) === null || _b === void 0 ? void 0 : _b['domainComputation']) === ('None')) {
|
422
|
-
portDomain.domainTypes = domainTypes;
|
423
|
-
}
|
424
|
-
}
|
425
|
-
else {
|
426
|
-
// there's no port domain so consider that as 'None' type domain computation
|
427
|
-
portDomains[portName] = {
|
428
|
-
name: portName,
|
429
|
-
type: typeName,
|
430
|
-
minCard: Number(min),
|
431
|
-
maxCard: Number(max),
|
432
|
-
domainTypes: domainTypes,
|
433
|
-
properties: Object.assign(Object.assign({}, properties), { domainComputation: 'None' }),
|
434
|
-
};
|
416
|
+
for (const port of (_a = component === null || component === void 0 ? void 0 : component.ports) !== null && _a !== void 0 ? _a : []) {
|
417
|
+
const portDomain = portDomains[port.name];
|
418
|
+
if (((_b = portDomain === null || portDomain === void 0 ? void 0 : portDomain.properties) === null || _b === void 0 ? void 0 : _b['domainComputation']) === ('None')) {
|
419
|
+
portDomain.domainTypes = port.domainTypes;
|
435
420
|
}
|
436
421
|
}
|
437
|
-
|
422
|
+
const type = runtimeModel.types.find(({ name }) => {
|
423
|
+
return lineItem.type === name;
|
424
|
+
});
|
425
|
+
const attributeDomains = lineItem.attributeDomains;
|
426
|
+
if (type) {
|
427
|
+
const initialDomains = lineItem.attributeDomains;
|
428
|
+
type.attributes.forEach(attribute => {
|
429
|
+
if (Object.prototype.hasOwnProperty.call(initialDomains, attribute.name)) {
|
430
|
+
return;
|
431
|
+
}
|
432
|
+
if (attribute.attributeDomain) {
|
433
|
+
attributeDomains[attribute.name] = attribute.attributeDomain;
|
434
|
+
}
|
435
|
+
});
|
436
|
+
}
|
437
|
+
return Object.assign(Object.assign({}, lineItem), { lineItems: (_c = lineItem.lineItems) === null || _c === void 0 ? void 0 : _c.map(i => this.updateDomains(i, runtimeModel)), attributeDomains,
|
438
|
+
portDomains });
|
438
439
|
}
|
439
440
|
}
|
440
441
|
ConfigurationApiService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ConfigurationApiService, deps: [{ token: i1.BaseHttpService }], target: i0.ɵɵFactoryTarget.Injectable });
|