rez_core 2.1.106 → 2.1.107

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.106",
+  "version": "2.1.107",
   "description": "",
   "author": "", 
   "private": false,

package/src/module/listmaster/repository/list-master-items.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { Repository, In } from 'typeorm';
 import { ListMasterItems } from '../entity/list-master-items.entity';
 
 @Injectable()
@@ -20,7 +20,12 @@ export class ListMasterItemsRepository {
     return this.repo.findOne({ where: { id } });
   }
 
-  async findItemsByType(type: string, sort_by?, organizationId?: number) {
+  async findItemsByType(
+    type: string,
+    sort_by?,
+    inactiveIdsArray?: number[],
+    organizationId?: number,
+  ) {
     let orderBy: Record<string, 'ASC' | 'DESC'> = {}; // no default sort unless specified
 
     // Only sort if sort_by is provided
@@ -57,7 +62,29 @@ export class ListMasterItemsRepository {
       order: orderBy,
     });
 
-    return items.map((i) => ({ label: i.name, value: i.id }));
+    let result = items.map((i) => ({ label: i.name, value: i.id }));
+
+    // If inactive IDs are passed, fetch them
+    if (inactiveIdsArray?.length) {
+      const inactiveItems = await this.repo.find({
+        where: {
+          listtype: type,
+          organization_id: organizationId,
+          status: 'INACTIVE',
+          id: In(inactiveIdsArray),
+        },
+        order: orderBy,
+      });
+
+      const inactiveMapped = inactiveItems.map((i) => ({
+        label: `${i.name} [INACTIVE]`,
+        value: i.id,
+      }));
+
+      result = [...result, ...inactiveMapped];
+    }
+
+    return result;
   }
 
   async findOperatorsByType(type: string, organizationId?: number) {

package/src/module/listmaster/service/list-master.service.ts

@@ -58,7 +58,6 @@ export class ListMasterService {
       loggedInUser?.organization_id,
     );
 
-    console.log(config, 'config');
     if (!config) throw new NotFoundException(`Type ${type} not found`);
 
     switch (config.source) {
@@ -74,6 +73,7 @@ export class ListMasterService {
         return this.listItemsRepo.findItemsByType(
           type,
           config.sort_by,
+          inactiveIdsArray,
           loggedInUser?.organization_id,
         );
 
@@ -108,8 +108,9 @@ export class ListMasterService {
 
     const applyCommonFilters = (qb: any, status?: number) => {
       if (status) {
-        qb.where(`${tableName}.status = :status`, { status });
-        qb.orWhere(`${tableName}.status = 'Active'`);
+        const isView = tableName.endsWith('_vw'); // auto-detect view
+        const statusColumn = isView ? 'status_id' : 'status';
+        qb.andWhere(`${tableName}.${statusColumn} = :status`, { status });
       }
 
       if (loggedInUser?.level_type && loggedInUser?.level_id) {
@@ -159,7 +160,7 @@ export class ListMasterService {
         .createQueryBuilder()
         .select('*')
         .from(tableName, tableName),
-      resolveStatus.id || null,
+      resolveStatus.id,
     );
 
     const activeResults = await activeQuery.getRawMany();
@@ -182,7 +183,7 @@ export class ListMasterService {
           .createQueryBuilder()
           .select('*')
           .from(tableName, tableName),
-        resolveInactiveStatus.id || null,
+        resolveInactiveStatus.id,
       );
 
       inactiveQuery.andWhere(`${tableName}.id IN (:...ids)`, {