@contrail/flexplm 1.1.59 → 1.1.61

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']).toEqual(potentialChanges['str']);
+        expect(diffs['str']).toBeNull();
     });
 });
 describe('getObjectReferenceValue cache', () => {

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,30 @@ 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');
+        });
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.1.59",
+  "version": "1.1.61",
   "description": "Library used for integration with flexplm.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -40,9 +40,10 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@contrail/app-framework": "^1.2.4",
-    "@contrail/sdk": "^1.3.7",
-    "@contrail/transform-data": "^1.1.1",
+    "@contrail/app-framework": "^1.3.4",
+    "@contrail/sdk": "^1.4.3",
+    "@contrail/transform-data": "^1.1.3",
+    "@contrail/util": "^1.0.48",
     "axios": "^1.4.0",
     "p-limit": "^3.1.0"
   }

package/src/util/data-converter.spec.ts

@@ -321,7 +321,7 @@ describe('getPersistableChanges', () =>{
 
     const diffs = dc.getPersistableChanges(entity, potentialChanges);
     expect(Object.getOwnPropertyNames(diffs).length).toEqual(1);
-    expect(diffs['str']).toEqual(potentialChanges['str']);
+    expect(diffs['str']).toBeNull();
   });
 
 });

package/src/util/thumbnail-util.spec.ts

@@ -234,4 +234,34 @@ describe('ThumbnailUtil Tests', () =>{
       expect(results).toBeTruthy();
     });
   });
+
+  describe('logContentResults', () =>{
+    it('no content - doesnt error', () =>{
+      const tu = new ThumbnailUtil(config);
+      const content = undefined;
+      const relations = [];
+      tu.logContentResults(content, relations);
+    });
+    it('no relations - doesnt error', () =>{
+      const tu = new ThumbnailUtil(config);
+      const content = undefined;
+      const relations = undefined;
+      tu.logContentResults(content, relations);
+    });
+
+    it('content and relations - logs', () =>{
+      const tu = new 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');
+    });
+
+  });
 });

package/src/util/thumbnail-util.ts

@@ -105,17 +105,13 @@ export class ThumbnailUtil {
   }
 
   async getContentEntity(primaryViewableId: any, sizes: any[]) {
-    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;
   }
@@ -129,7 +125,7 @@ export class ThumbnailUtil {
    * @param relations: string[] of the slugs for inflated objects
    */
     logContentResults(content: any, relations: string[]) {
-      if(Logger.isDebugOn()){
+      if(Logger.isDebugOn() && content && relations){
         const contentCopy = JSON.parse(JSON.stringify(content));
         relations.forEach(r => {
           delete contentCopy[r];