@contrail/flexplm 1.1.25 → 1.1.26

package/lib/util/data-converter.js

@@ -374,20 +374,53 @@ class DataConverter {
             }
         }
         if (!objectReferenceId) {
-            console.warn(`The passed in object reference criteria ${JSON.stringify(combinedCriteria)} not found.`);
+            console.warn(`The passed in object reference criteria ${JSON.stringify(combinedCriteria)} didn't match any entities.`);
             return objectReferenceId;
         }
         this.objRefCache[cacheKey] = objectReferenceId;
         return objectReferenceId;
     }
     async getAllObjectReferences(entityType, rootTypeCriteria) {
+        const entities = new sdk_1.Entities();
         let loads = [];
         let nextPageKey;
+        let usedV2 = false;
         do {
-            const loadPage = await new sdk_1.Entities().get({ entityName: entityType, criteria: rootTypeCriteria, apiVersion: sdk_1.API_VERSION.V2, nextPageKey });
-            nextPageKey = loadPage.nextPageKey;
-            loads.push(...loadPage.results);
+            const loadPage = await entities.get({
+                entityName: entityType,
+                criteria: rootTypeCriteria,
+                apiVersion: sdk_1.API_VERSION.V2,
+                nextPageKey,
+            });
+            nextPageKey = loadPage?.nextPageKey;
+            if (Object.keys(loadPage).includes('results')) {
+                usedV2 = true;
+                loads.push(...loadPage.results);
+            }
+            else {
+                nextPageKey = null;
+            }
         } while (nextPageKey);
+        if (!usedV2) {
+            const take = 1000;
+            let skip = 0;
+            let done = false;
+            while (!done) {
+                const loadPage = await entities.get({
+                    entityName: entityType,
+                    criteria: rootTypeCriteria,
+                    take,
+                    skip,
+                });
+                loads.push(...loadPage);
+                if (loadPage.length !== take) {
+                    done = true;
+                }
+                else {
+                    skip += take;
+                }
+            }
+        }
         return loads;
     }
     checkKeysAndValues(criteria, arrayOfObjects, entityTypePath) {

package/package.json

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

package/src/util/data-converter.ts

@@ -458,7 +458,7 @@ export class DataConverter {
     }
 
     if (!objectReferenceId) {
-      console.warn(`The passed in object reference criteria ${JSON.stringify(combinedCriteria)} not found.`);
+      console.warn(`The passed in object reference criteria ${JSON.stringify(combinedCriteria)} didn't match any entities.`);
       return objectReferenceId;
     }
 
@@ -475,13 +475,47 @@ export class DataConverter {
    * @returns {Promise<Array>} A Promise that resolves to an array containing all object references.
    */
   async getAllObjectReferences(entityType, rootTypeCriteria) {
-    let loads = []
+    const entities = new Entities();
+    let loads = [];
     let nextPageKey;
+    let usedV2 = false;
     do {
-      const loadPage = await new Entities().get({ entityName: entityType, criteria: rootTypeCriteria, apiVersion: API_VERSION.V2, nextPageKey })
-      nextPageKey = loadPage.nextPageKey;
-      loads.push(...loadPage.results);
+      const loadPage = await entities.get({
+        entityName: entityType,
+        criteria: rootTypeCriteria,
+        apiVersion: API_VERSION.V2,
+        nextPageKey,
+      });
+      nextPageKey = loadPage?.nextPageKey;
+      if (Object.keys(loadPage).includes('results')) {
+        usedV2 = true;
+        loads.push(...loadPage.results);
+      } else {
+        nextPageKey = null;
+      }
     } while (nextPageKey);
+
+    if (!usedV2) {
+      const take = 1000;
+      let skip = 0;
+      let done = false;
+      while (!done) {
+        const loadPage = await entities.get({
+          entityName: entityType,
+          criteria: rootTypeCriteria,
+          take,
+          skip,
+        });
+        loads.push(...loadPage);
+
+        if (loadPage.length !== take) {
+          done = true;
+        } else {
+          skip += take;
+        }
+      }
+    }
+
     return loads;
   }