@contrail/flexplm 1.1.60 → 1.1.62

package/.github/workflows/flexplm-lib.yml

@@ -4,10 +4,10 @@ on:
   workflow_dispatch: # allow running in github actions manually
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
-        node-version: [16.17.0]
+        node-version: [22.14.0]
     steps:
       - name: Node.js
         uses: actions/setup-node@v3

package/lib/util/data-converter.js

@@ -462,7 +462,6 @@ class DataConverter {
                 const currentObjPath = '' + currentObj['typePath'];
                 if (!currentObjPath.startsWith(entityTypePath)) {
                     found = false;
-                    break;
                 }
             }
             for (const key in criteria) {

package/lib/util/data-converter.spec.js

@@ -287,7 +287,7 @@ describe('getPersistableChanges', () => {
         };
         const diffs = dc.getPersistableChanges(entity, potentialChanges);
         expect(Object.getOwnPropertyNames(diffs).length).toEqual(1);
-        expect(diffs['str']).toBeNull();
+        expect(diffs['str']).toBe('');
     });
 });
 describe('getObjectReferenceValue cache', () => {
@@ -651,6 +651,19 @@ describe('checkKeysAndValues', () => {
         const results = dc.checkKeysAndValues(criteria, testData, typePath);
         expect(results.length).toBe(1);
     });
+    it('first & last entity have the wrong typePath', () => {
+        const criteria = {
+            objectId: "2562",
+        };
+        const typePath = 'custom-entity:group2';
+        const testData = [
+            { "typePath": "custom-entity:group1", "name": "BLACK (BK)", "id": "o1v2rh8olgQ78GcL", "objectId": "2562", "entityType": "custom-entity" },
+            { "typePath": "custom-entity:group2", "name": "BLACK (BK)", "id": "t5n22S2gqswe8GcL", "objectId": "2562", "entityType": "custom-entity" },
+            { "typePath": "custom-entity:group1", "name": "BLACK (BK)", "id": "t5rh8o2gqswk3drt", "objectId": "2562", "entityType": "custom-entity" }
+        ];
+        const results = dc.checkKeysAndValues(criteria, testData, typePath);
+        expect(results.length).toBe(1);
+    });
 });
 describe('setUserListValue', () => {
     const config = {

package/lib/util/thumbnail-util.js

@@ -87,22 +87,18 @@ class ThumbnailUtil {
         return sizes;
     }
     async getContentEntity(primaryViewableId, sizes) {
-        const criteria = {
-            id: primaryViewableId
-        };
         const relations = sizes.map(s => s.slug);
         relations.push('primaryFile');
-        const contentResults = await this.entities.get({
+        const content = await this.entities.get({
             entityName: 'content',
-            criteria,
+            id: primaryViewableId,
             relations
         });
-        const content = (contentResults && contentResults[0]) ? contentResults[0] : undefined;
         this.logContentResults(content, relations);
         return content;
     }
     logContentResults(content, relations) {
-        if (app_framework_1.Logger.isDebugOn()) {
+        if (app_framework_1.Logger.isDebugOn() && content && relations) {
             const contentCopy = JSON.parse(JSON.stringify(content));
             relations.forEach(r => {
                 delete contentCopy[r];

package/lib/util/thumbnail-util.spec.js

@@ -211,4 +211,32 @@ describe('ThumbnailUtil Tests', () => {
             expect(results).toBeTruthy();
         });
     });
+    describe('logContentResults', () => {
+        it('no content - doesnt error', () => {
+            const tu = new thumbnail_util_1.ThumbnailUtil(config);
+            const content = undefined;
+            const relations = [];
+            tu.logContentResults(content, relations);
+        });
+        it('no relations - doesnt error', () => {
+            const tu = new thumbnail_util_1.ThumbnailUtil(config);
+            const content = undefined;
+            const relations = undefined;
+            tu.logContentResults(content, relations);
+        });
+        it('content and relations - logs', () => {
+            const tu = new thumbnail_util_1.ThumbnailUtil(config);
+            const content = {
+                id: '123',
+                name: 'Test',
+                primaryFile: { id: 'file123' }
+            };
+            const relations = ['primaryFile'];
+            tu.logContentResults(content, relations);
+            expect(Object.keys(content)).toHaveLength(3);
+            expect(content).toHaveProperty('primaryFile');
+            expect(content.primaryFile).toHaveProperty('id');
+            expect(content.primaryFile.id).toEqual('file123');
+        });
+    });
 });

package/package.json

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

package/src/interfaces/interfaces.ts

@@ -1,122 +1,122 @@
-export interface FCConfig {
-    apiKey?: string;
-    orgSlug?: string;
-    action?: string;
-    configFile? :string;
-    eventObjectClassParam?: string;
-    eventFlexTypePathParam?: string;
-    flexplmConnect?: any;
-    taskId?: string;
-    apiHost: string;
-    userName(): string;
-    password(): string;
-    plmEnviornment?: string;
-    urlContext: string;
-    vibeEventEndpoint: string;
-    csrfEndpoint: string;
-    itemPreDevelopmentLifecycleStages: string[];
-    identifierAtts?: {
-        [key:string]: string[]
-    };
-    propertyMapping?: object;
-    [key: string]: any;
-}
-
-export interface ProductFederation {
-    entityReference: string;
-    objectClass: 'LCSProduct';
-    federatedId?: string;
-    flexPLMTypePath?: string;
-    vibeIQIdentifier?: string
-}
-export interface ProductData extends ProductFederation {
-    data: object;
-    productSeason: {
-        data: object;
-    }
-}
-
-export interface SeasonFederation {
-    entityReference: string;
-    objectClass: 'LCSSeason';
-    flexPLMSeasonName?: string;
-    federationId?: string;
-    flexPLMTypePath?: string;
-}
-
-export interface SeasonGroupFederation {
-    entityReference: string;
-    objectClass: 'SeasonGroup';
-    seasonGroupName?: string;
-    federationId?: string;
-    flexPLMTypePath?: string;
-}
-
-export interface SkuFederation {
-    entityReference: string;
-    objectClass: 'LCSSKU';
-    LCSProduct?: ProductFederation;
-    federatedId?: string;
-    flexPLMTypePath?: string;
-    vibeIQIdentifier?: string;
-}
-export interface SkuData extends SkuFederation{
-    data: object;
-}
-
-export interface PayloadType {
-    eventType: string;
-    objectClass: string;
-}
-export interface AsyncPayloadType extends PayloadType {
-    taskId: string;
-}
-export interface AsyncEventsPayloadType extends AsyncPayloadType {
-    events?: PayloadType[];
-    eventsFileId?: string;
-    eventsDownloadLink?: string;
-    eventsAdminDownloadLink?: string;
-}
-
-export interface EntityPayloadType extends PayloadType {
-    entityReference: string;
-    federatedId?: string;
-    flexPLMTypePath?: string;
-    data: object;
-}
-
-export interface ItemPayloadType extends EntityPayloadType {
-    LCSProduct?: ProductFederation;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-///////// Custom seasonalPayload: start
-/////////////////////////////////////////////////////////////////////////////
-export interface SeasonalPayload extends EntityPayloadType {
-    eventType: 'UPSERT_ON_SEASON' | 'REMOVE_FROM_SEASON';
-    objectClass: 'LCSProductSeasonLink' | 'LCSSKUSeasonLink';
-    LCSSeason : SeasonFederation;
-    LCSProduct? : ProductFederation;
-    LCSSKU? : SkuFederation;
-    carriedFromSeason? : object;
-}
-/////////////////////////////////////////////////////////////////////////////
-///////// Custom seasonalPayload: start
-/////////////////////////////////////////////////////////////////////////////
-
-export interface ExportPayloadType extends AsyncPayloadType {
-    flexPLMTypePath: string;
-}
-
-export interface FederationRecord {
-    reference: string;
-    mappedReference: string
-    appIdentifier: string;
-    federationSchema: string
-}
-
-export interface FlexPLMResponseData {
-    status: number;
-    data?: object;
-    error?: string;
+export interface FCConfig {
+    apiKey?: string;
+    orgSlug?: string;
+    action?: string;
+    configFile? :string;
+    eventObjectClassParam?: string;
+    eventFlexTypePathParam?: string;
+    flexplmConnect?: any;
+    taskId?: string;
+    apiHost: string;
+    userName(): string;
+    password(): string;
+    plmEnviornment?: string;
+    urlContext: string;
+    vibeEventEndpoint: string;
+    csrfEndpoint: string;
+    itemPreDevelopmentLifecycleStages: string[];
+    identifierAtts?: {
+        [key:string]: string[]
+    };
+    propertyMapping?: object;
+    [key: string]: any;
+}
+
+export interface ProductFederation {
+    entityReference: string;
+    objectClass: 'LCSProduct';
+    federatedId?: string;
+    flexPLMTypePath?: string;
+    vibeIQIdentifier?: string
+}
+export interface ProductData extends ProductFederation {
+    data: object;
+    productSeason: {
+        data: object;
+    }
+}
+
+export interface SeasonFederation {
+    entityReference: string;
+    objectClass: 'LCSSeason';
+    flexPLMSeasonName?: string;
+    federationId?: string;
+    flexPLMTypePath?: string;
+}
+
+export interface SeasonGroupFederation {
+    entityReference: string;
+    objectClass: 'SeasonGroup';
+    seasonGroupName?: string;
+    federationId?: string;
+    flexPLMTypePath?: string;
+}
+
+export interface SkuFederation {
+    entityReference: string;
+    objectClass: 'LCSSKU';
+    LCSProduct?: ProductFederation;
+    federatedId?: string;
+    flexPLMTypePath?: string;
+    vibeIQIdentifier?: string;
+}
+export interface SkuData extends SkuFederation{
+    data: object;
+}
+
+export interface PayloadType {
+    eventType: string;
+    objectClass: string;
+}
+export interface AsyncPayloadType extends PayloadType {
+    taskId: string;
+}
+export interface AsyncEventsPayloadType extends AsyncPayloadType {
+    events?: PayloadType[];
+    eventsFileId?: string;
+    eventsDownloadLink?: string;
+    eventsAdminDownloadLink?: string;
+}
+
+export interface EntityPayloadType extends PayloadType {
+    entityReference: string;
+    federatedId?: string;
+    flexPLMTypePath?: string;
+    data: object;
+}
+
+export interface ItemPayloadType extends EntityPayloadType {
+    LCSProduct?: ProductFederation;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+///////// Custom seasonalPayload: start
+/////////////////////////////////////////////////////////////////////////////
+export interface SeasonalPayload extends EntityPayloadType {
+    eventType: 'UPSERT_ON_SEASON' | 'REMOVE_FROM_SEASON';
+    objectClass: 'LCSProductSeasonLink' | 'LCSSKUSeasonLink';
+    LCSSeason : SeasonFederation;
+    LCSProduct? : ProductFederation;
+    LCSSKU? : SkuFederation;
+    carriedFromSeason? : object;
+}
+/////////////////////////////////////////////////////////////////////////////
+///////// Custom seasonalPayload: start
+/////////////////////////////////////////////////////////////////////////////
+
+export interface ExportPayloadType extends AsyncPayloadType {
+    flexPLMTypePath: string;
+}
+
+export interface FederationRecord {
+    reference: string;
+    mappedReference: string
+    appIdentifier: string;
+    federationSchema: string
+}
+
+export interface FlexPLMResponseData {
+    status: number;
+    data?: object;
+    error?: string;
 }