@contrail/flexplm 1.1.2 → 1.1.4

package/lib/util/data-converter.d.ts

@@ -9,10 +9,10 @@ export declare class DataConverter {
     private objRefCache;
     constructor(config: FCConfig, mapFileUtil: MapFileUtil);
     getFlexPLMObjectDataFromEvent(event: any, dataToSkip: string[]): Promise<{}>;
-    getFlexPLMObjectData(newData: any, dataToSkip: string[], expandObjRef: boolean): Promise<{}>;
-    getFlexPLMValue(prop: any, newData: any, expandObjRef: boolean): Promise<any>;
+    getFlexPLMObjectData(newData: any, dataToSkip: string[], inflateObjRef: boolean): Promise<{}>;
+    getFlexPLMValue(prop: any, newData: any, inflateObjRef: boolean): Promise<any>;
     getEnumerationValue(prop: any, nd: any): any;
-    getObjectReferenceValue(prop: any, newData: any, expandObjRef?: boolean): Promise<any>;
+    getObjectReferenceValue(prop: any, newData: any, inflateObjRef?: boolean): Promise<any>;
     getMappingClass(entity: object, mapping: any): string;
     setEntityValues(entity: any, data: any, keysToSkip?: string[]): Promise<any>;
     getEntityValues(objectClass: string, data: any, keysToSkip?: string[]): Promise<{}>;

package/lib/util/data-converter.js

@@ -21,7 +21,7 @@ class DataConverter {
     async getFlexPLMObjectDataFromEvent(event, dataToSkip) {
         return this.getFlexPLMObjectData(event.newData, dataToSkip, true);
     }
-    async getFlexPLMObjectData(newData, dataToSkip, expandObjRef) {
+    async getFlexPLMObjectData(newData, dataToSkip, inflateObjRef) {
         if (app_framework_1.Logger.isDebugOn()) {
             console.debug('newData: ' + JSON.stringify(newData));
         }
@@ -39,14 +39,14 @@ class DataConverter {
             if (dataToSkip.includes(slug)) {
                 continue;
             }
-            data[slug] = await this.getFlexPLMValue(prop, newData, expandObjRef);
+            data[slug] = await this.getFlexPLMValue(prop, newData, inflateObjRef);
         }
         if (app_framework_1.Logger.isDebugOn()) {
             console.debug('getFlexPLMObjectData-data:  ' + JSON.stringify(data));
         }
         return data;
     }
-    async getFlexPLMValue(prop, newData, expandObjRef) {
+    async getFlexPLMValue(prop, newData, inflateObjRef) {
         const propertyType = prop['propertyType'];
         const slug = prop['slug'];
         const nd = newData[slug];
@@ -75,7 +75,7 @@ class DataConverter {
             value = this.getEnumerationValue(prop, nd);
         }
         else if ('object_reference' === propertyType) {
-            value = await this.getObjectReferenceValue(prop, newData, expandObjRef);
+            value = await this.getObjectReferenceValue(prop, newData, inflateObjRef);
             if (app_framework_1.Logger.isDebugOn()) {
                 console.debug('object_reference: ' + JSON.stringify(value));
             }
@@ -94,7 +94,7 @@ class DataConverter {
         const propertyType = prop['propertyType'];
         let value;
         if (['choice', 'multi_select'].includes(propertyType)) {
-            const options = prop['options'];
+            const options = prop['options'] || [];
             if ('choice' === propertyType) {
                 if (nd) {
                     const option = options.find(option => option.value == nd);
@@ -102,7 +102,7 @@ class DataConverter {
                         value = Object.assign({}, option);
                     }
                 }
-                else {
+                if (!value) {
                     value = {};
                 }
             }
@@ -128,13 +128,13 @@ class DataConverter {
         }
         return value;
     }
-    async getObjectReferenceValue(prop, newData, expandObjRef = false) {
+    async getObjectReferenceValue(prop, newData, inflateObjRef = false) {
         const slug = prop['slug'];
         console.debug('getObjectReferenceValue-prop: ' + slug);
         let value = newData[slug];
         const entityType = prop['referencedTypeRootSlug'];
         const entityId = newData[slug + 'Id'];
-        if ((!value || typeof value === 'string') && expandObjRef) {
+        if ((!value || typeof value === 'string') && inflateObjRef) {
             if (entityId) {
                 if (this.objRefCache[entityId]) {
                     console.log('cache hit: ' + entityId);

package/lib/util/type-defaults.js

@@ -33,7 +33,12 @@ class TypeDefaults {
             objectClass = 'LCSSeason';
         }
         else if ('assortment' === entityType) {
-            objectClass = 'SeasonGroup';
+            if ('LCSSeason' === entity.flex2vibeMapKeyRoot || entity.publishToFlexPLM) {
+                objectClass = 'LCSSeason';
+            }
+            else {
+                objectClass = 'SeasonGroup';
+            }
         }
         return objectClass;
     }
@@ -51,12 +56,17 @@ class TypeDefaults {
             case 'custom-entity':
                 typePath = 'Revisable Entity';
                 break;
-            case 'assortment':
-                typePath = 'Season Group';
-                break;
             case 'project':
                 typePath = 'Season';
                 break;
+            case 'assortment':
+                if ('LCSSeason' === entity.flex2vibeMapKeyRoot || entity.publishToFlexPLM) {
+                    typePath = 'Season';
+                }
+                else {
+                    typePath = 'Season Group';
+                }
+                break;
         }
         return typePath;
     }
@@ -71,7 +81,12 @@ class TypeDefaults {
                 identifierProps.push('flexPLMSeasonName');
                 break;
             case 'assortment':
-                identifierProps.push('seasonGroupName');
+                if ('LCSSeason' === entity.flex2vibeMapKeyRoot || entity.publishToFlexPLM) {
+                    identifierProps.push('flexPLMSeasonName');
+                }
+                else {
+                    identifierProps.push('seasonGroupName');
+                }
                 break;
             case 'color':
             case 'custom-entity':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Library used for integration with flexplm.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",