@contrail/flexplm 1.1.63 → 1.1.64

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

@@ -30,6 +30,7 @@ export declare class DataConverter {
     setObjectReferenceValue(prop: any, nd: any): Promise<any>;
     getAllObjectReferences(entityType: string, rootTypeCriteria: any, postProcessCriteria?: any): Promise<any[]>;
     checkKeysAndValues(criteria: any, arrayOfObjects: any, entityTypePath: any): any[];
+    filterOutArchivedAndTrashedEntities(entities: any[]): any[];
     setUserListValue(prop: any, nd: any): Promise<any>;
     getUserByEmail(nd: any): Promise<any>;
     processGroupMemberCheck(prop: any, userEmail: any): Promise<void>;

package/lib/util/data-converter.js

@@ -415,7 +415,7 @@ class DataConverter {
             nextPageKey = loadPage?.nextPageKey;
             if (Object.keys(loadPage).includes('results')) {
                 usedV2 = true;
-                let postProcessedResults = loadPage.results;
+                let postProcessedResults = this.filterOutArchivedAndTrashedEntities(loadPage?.results);
                 if (postProcessedResults?.length > 0 && postProcessCriteria && Object.keys(postProcessCriteria).length !== 0) {
                     const subEntityTypePath = rootTypeCriteria.typePath || entityType;
                     postProcessedResults = this.checkKeysAndValues(postProcessCriteria, postProcessedResults, subEntityTypePath);
@@ -437,7 +437,7 @@ class DataConverter {
                     take,
                     skip,
                 });
-                let postProcessedResults = loadPage;
+                let postProcessedResults = this.filterOutArchivedAndTrashedEntities(loadPage);
                 if (postProcessCriteria && Object.keys(postProcessCriteria).length !== 0) {
                     const subEntityTypePath = rootTypeCriteria.typePath || entityType;
                     postProcessedResults = this.checkKeysAndValues(postProcessCriteria, postProcessedResults, subEntityTypePath);
@@ -476,6 +476,16 @@ class DataConverter {
         }
         return arrOfMatchObjects;
     }
+    filterOutArchivedAndTrashedEntities(entities) {
+        if (!entities || !Array.isArray(entities) || entities.length === 0) {
+            return [];
+        }
+        return entities.filter(entity => {
+            const isArchived = entity?.isArchived;
+            const isTrashed = entity?.isTrashed;
+            return !isArchived && !isTrashed;
+        });
+    }
     async setUserListValue(prop, nd) {
         if (!nd?.email) {
             return "";

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

@@ -665,6 +665,46 @@ describe('checkKeysAndValues', () => {
         expect(results.length).toBe(1);
     });
 });
+describe('filterOutArchivedAndTrashedEntities', () => {
+    const config = {
+        apiHost: 'host',
+        userName: () => 'user',
+        password: () => 'pass',
+        urlContext: 'xxx',
+        vibeEventEndpoint: '/rfa/vibeiq/vibeEvents',
+        csrfEndpoint: '/servlet/rest/security/csrf',
+        itemPreDevelopmentLifecycleStages: ['concept']
+    };
+    const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
+    const dc = new data_converter_1.DataConverter(config, mapFileUtil);
+    it('filter out isArchived and isTrashed entities', () => {
+        const entities = [
+            { id: '1', name: 'Entity 1', isArchived: false, isTrashed: false },
+            { id: '2', name: 'Entity 2', isArchived: true, isTrashed: false },
+            { id: '3', name: 'Entity 3', isArchived: false, isTrashed: true },
+            { id: '4', name: 'Entity 4', isArchived: false, isTrashed: false }
+        ];
+        const filteredEntities = dc.filterOutArchivedAndTrashedEntities(entities);
+        expect(filteredEntities.length).toBe(2);
+        expect(filteredEntities).toEqual([
+            { id: '1', name: 'Entity 1', isArchived: false, isTrashed: false },
+            { id: '4', name: 'Entity 4', isArchived: false, isTrashed: false }
+        ]);
+    });
+    it('no entities to filter', () => {
+        const entities = [];
+        const filteredEntities = dc.filterOutArchivedAndTrashedEntities(entities);
+        expect(filteredEntities.length).toBe(0);
+    });
+    it('all entities are archived or trashed', () => {
+        const entities = [
+            { id: '1', name: 'Entity 1', isArchived: true, isTrashed: false },
+            { id: '2', name: 'Entity 2', isArchived: false, isTrashed: true }
+        ];
+        const filteredEntities = dc.filterOutArchivedAndTrashedEntities(entities);
+        expect(filteredEntities.length).toBe(0);
+    });
+});
 describe('setUserListValue', () => {
     const config = {
         apiHost: 'host',

package/package.json

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

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

@@ -758,6 +758,51 @@ describe('checkKeysAndValues', () =>{
   });
 });
 
+describe('filterOutArchivedAndTrashedEntities', () =>{
+    const config: FCConfig = {
+    apiHost: 'host',
+    userName: () => 'user',
+    password: () => 'pass',
+    urlContext: 'xxx',
+    vibeEventEndpoint: '/rfa/vibeiq/vibeEvents',
+    csrfEndpoint: '/servlet/rest/security/csrf',
+    itemPreDevelopmentLifecycleStages: ['concept']
+  };
+
+  const mapFileUtil = new MapFileUtil(new Entities());
+  const dc = new DataConverter(config, mapFileUtil);
+
+  it('filter out isArchived and isTrashed entities', () =>{
+    const entities = [
+      {id: '1', name: 'Entity 1', isArchived: false, isTrashed: false},
+      {id: '2', name: 'Entity 2', isArchived: true, isTrashed: false},
+      {id: '3', name: 'Entity 3', isArchived: false, isTrashed: true},
+      {id: '4', name: 'Entity 4', isArchived: false, isTrashed: false}
+    ];
+
+    const filteredEntities = dc.filterOutArchivedAndTrashedEntities(entities);
+    expect(filteredEntities.length).toBe(2);
+    expect(filteredEntities).toEqual([
+      {id: '1', name: 'Entity 1', isArchived: false, isTrashed: false},
+      {id: '4', name: 'Entity 4', isArchived: false, isTrashed: false}
+    ]);
+  });
+  it('no entities to filter', () =>{
+    const entities = [];
+    const filteredEntities = dc.filterOutArchivedAndTrashedEntities(entities);
+    expect(filteredEntities.length).toBe(0);
+  });
+  it('all entities are archived or trashed', () =>{
+    const entities = [
+      {id: '1', name: 'Entity 1', isArchived: true, isTrashed: false},
+      {id: '2', name: 'Entity 2', isArchived: false, isTrashed: true}
+    ];
+
+    const filteredEntities = dc.filterOutArchivedAndTrashedEntities(entities);
+    expect(filteredEntities.length).toBe(0);
+  });
+});
+
 describe('setUserListValue', () =>{
   const config: FCConfig = {
     apiHost: 'host',

package/src/util/data-converter.ts

@@ -512,7 +512,7 @@ export class DataConverter {
       nextPageKey = loadPage?.nextPageKey;
       if (Object.keys(loadPage).includes('results')) {
         usedV2 = true;
-        let postProcessedResults = loadPage.results;
+        let postProcessedResults = this.filterOutArchivedAndTrashedEntities(loadPage?.results);
         if(postProcessedResults?.length > 0 && postProcessCriteria && Object.keys(postProcessCriteria).length !== 0) {
           const subEntityTypePath = rootTypeCriteria.typePath || entityType;
           postProcessedResults = this.checkKeysAndValues(postProcessCriteria, postProcessedResults, subEntityTypePath);
@@ -534,7 +534,7 @@ export class DataConverter {
           take,
           skip,
         });
-        let postProcessedResults = loadPage;
+        let postProcessedResults = this.filterOutArchivedAndTrashedEntities(loadPage);
         if(postProcessCriteria && Object.keys(postProcessCriteria).length !== 0) {
           const subEntityTypePath = rootTypeCriteria.typePath || entityType;
           postProcessedResults = this.checkKeysAndValues(postProcessCriteria, postProcessedResults, subEntityTypePath);
@@ -587,6 +587,23 @@ export class DataConverter {
     return arrOfMatchObjects;
   }
 
+  /** Filters out archived and trashed entities from the provided array of entities.
+   *
+   * @param entities
+   * @returns
+   */
+
+  filterOutArchivedAndTrashedEntities(entities: any[]) {
+    if(!entities || !Array.isArray(entities) || entities.length === 0){
+      return [];
+    }
+    return entities.filter(entity => {
+      const isArchived = entity?.isArchived;
+      const isTrashed = entity?.isTrashed;
+      return !isArchived && !isTrashed;
+    });
+  }
+
   /** Sets userListId value from FlexPLM data passed in
    * 
    * @param prop the VibeIQ property