@veloceapps/api 9.0.0-7 → 9.0.0-9

package/fesm2020/veloceapps-api.mjs

@@ -403,7 +403,7 @@ class ConfigurationApiService {
             if (runtimeModel) {
                 return {
                     ...configurePrice,
-                    lineItem: this.updatePortDomains(configurePrice.lineItem, runtimeModel),
+                    lineItem: this.updateDomains(configurePrice.lineItem, runtimeModel),
                 };
             }
             else {
@@ -423,7 +423,7 @@ class ConfigurationApiService {
             if (runtimeModel) {
                 return {
                     ...configurePrice,
-                    lineItem: this.updatePortDomains(configurePrice.lineItem, runtimeModel),
+                    lineItem: this.updateDomains(configurePrice.lineItem, runtimeModel),
                 };
             }
             else {
@@ -450,37 +450,35 @@ class ConfigurationApiService {
             url: `${this.SERVICE_URL}/${modelId}/model-test`,
         });
     }
-    updatePortDomains(lineItem, runtimeModel) {
-        const type = runtimeModel.components.get(lineItem.type);
+    updateDomains(lineItem, runtimeModel) {
+        const component = runtimeModel.components.get(lineItem.type);
         const portDomains = { ...lineItem.portDomains };
         // loop through ports to look for 'None' type domain computations
-        for (const port of type?.ports ?? []) {
-            const { name: portName, type: typeName, min, max, domainTypes, properties } = port;
-            const portDomain = portDomains[portName];
-            if (portDomain) {
-                // there's a 'None' type domain computation
-                if (portDomain.properties?.['domainComputation'] === ('None')) {
-                    portDomain.domainTypes = domainTypes;
-                }
-            }
-            else {
-                // there's no port domain so consider that as 'None' type domain computation
-                portDomains[portName] = {
-                    name: portName,
-                    type: typeName,
-                    minCard: Number(min),
-                    maxCard: Number(max),
-                    domainTypes: domainTypes,
-                    properties: {
-                        ...properties,
-                        domainComputation: 'None',
-                    },
-                };
+        for (const port of component?.ports ?? []) {
+            const portDomain = portDomains[port.name];
+            if (portDomain?.properties?.['domainComputation'] === ('None')) {
+                portDomain.domainTypes = port.domainTypes;
             }
         }
+        const type = runtimeModel.types.find(({ name }) => {
+            return lineItem.type === name;
+        });
+        const attributeDomains = lineItem.attributeDomains;
+        if (type) {
+            const initialDomains = lineItem.attributeDomains;
+            type.attributes.forEach(attribute => {
+                if (Object.prototype.hasOwnProperty.call(initialDomains, attribute.name)) {
+                    return;
+                }
+                if (attribute.attributeDomain) {
+                    attributeDomains[attribute.name] = attribute.attributeDomain;
+                }
+            });
+        }
         return {
             ...lineItem,
-            lineItems: lineItem.lineItems?.map(i => this.updatePortDomains(i, runtimeModel)),
+            lineItems: lineItem.lineItems?.map(i => this.updateDomains(i, runtimeModel)),
+            attributeDomains,
             portDomains,
         };
     }