rez_core 2.1.1 → 2.1.3

package/package.json

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

package/src/module/filter/service/filter.service.ts

@@ -206,7 +206,7 @@ export class FilterService {
         tabAttrMeta,
       );
       if (tabCondition) {
-        dataWhere.push(tabCondition);
+        if (tabs.value.toLowerCase() !== 'all') dataWhere.push(tabCondition);
       }
     }
 

package/src/module/layout_preference/service/layout_preference.service.ts

@@ -74,6 +74,7 @@ export class LayoutPreferenceService extends EntityServiceImpl {
         .select(`${column} AS column_value`)
         .addSelect(`COUNT(*) AS count`)
         .from(tableName, tableName)
+        .where(`${column} IS NOT NULL`)
         .groupBy(column)
         .getRawMany();
 

package/src/module/master/service/master.service.ts

@@ -472,7 +472,6 @@ export class MasterService {
       row.entity_type = entityType;
       row.organization_id = loggedInUser.organization_id;
       row.status = 'ACTIVE';
-
       let errors = [];
       if (existing) {
         if (duplicateHandling === 'skip_duplicates') continue;

package/src/module/module/controller/module-access.controller.ts

@@ -45,7 +45,9 @@ export class ModuleAccessController {
   ) {
     const roleIdArray = roleIds.split(',').map(Number);
     const appcode = queryAppcode || req.user.userData.appcode;
-    return this.moduleAccessService.getAccessListing(roleIdArray, appcode, '');
+    const level_type =  req.user.userData.appcode;
+    const level_id =  req.user.userData.appcode;
+    return this.moduleAccessService.getAccessListing(roleIdArray, appcode, level_type, level_id);
   }
 
   @Get('menu-listing')

package/src/module/module/repository/module-access.repository.ts

@@ -1,6 +1,6 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { In, Repository } from 'typeorm';
+import { In, Not, Repository , IsNull} from 'typeorm';
 import { Role } from 'src/module/user/entity/role.entity';
 import { ModuleAccess } from '../entity/module-access.entity';
 import { ModuleAction } from '../entity/module-action.entity';
@@ -23,6 +23,8 @@ export class ModuleAccessRepository {
     private readonly moduleActionRepo: Repository<ModuleAction>,
   ) {}
 
+ 
+
   async getRoles({
     appcode,
     level_type,
@@ -32,17 +34,22 @@ export class ModuleAccessRepository {
     level_type?: string;
     level_id?: number;
   }) {
-    const where: any = { appcode };
+    const where: any = {
+      appcode,
+      is_factory: [Not(1), IsNull()], // Include NULL or anything not 1
+    };
+  
     if (level_type) where.level_type = level_type;
     if (level_id !== undefined) where.level_id = String(level_id);
-
+  
     const roles = await this.roleRepo.find({ where });
-
+  
     return roles.map((role) => ({
       label: role.name,
       value: role.id,
     }));
   }
+  
 
   async getModules({ appcode }: { appcode: string }) {
     const modules = await this.moduleRepo.find({
@@ -59,23 +66,48 @@ export class ModuleAccessRepository {
   }
 
   async getAccessListing(
-    roleIds: number[],
+    roleIds: (number | string)[],
     appcode: string,
     levelType: string,
+    levelId?: number, // add levelId as input so we can fetch roles based on it
   ) {
-    const roles = await this.roleRepo.find({
-      where: { id: In(roleIds), appcode },
-    });
-
+    let roles;
+  
+    if (roleIds.length === 1 && roleIds[0] === '-1') {
+      // Internally call getRoles
+      const fetchedRoles = await this.getRoles({
+        appcode,
+        level_type: levelType,
+        level_id: levelId,
+      });
+  
+      const fetchedRoleIds = fetchedRoles.map((r) => r.value);
+      roles = await this.roleRepo.find({
+        where: {
+          id: In(fetchedRoleIds),
+          appcode,
+        },
+      });
+    } else {
+      roles = await this.roleRepo.find({
+        where: {
+          id: In(roleIds.map((id) => Number(id))),
+          appcode,
+        },
+      });
+    }
+  
+    if (!roles.length) return [];
+  
     const roleCodes = roles.map((role) => role.code);
-
+  
     const moduleAccesses = await this.moduleAccessRepo.find({
       where: {
         role_code: In(roleCodes),
         appcode,
       },
     });
-
+  
     return roles.map((role) => ({
       role_code: role.code,
       name: role.name,
@@ -89,6 +121,7 @@ export class ModuleAccessRepository {
         })),
     }));
   }
+  
 
   async getAllModulesByLevel(mainModIds: string[], appcode: string, levelType) {
     const mainModules =

package/src/module/module/service/module-access.service.ts

@@ -40,11 +40,13 @@ export class ModuleAccessService {
     roleIds: number[],
     appcode: string,
     levelType: string,
+    level_id?: number,
   ) {
     return this.moduleAccessRepository.getAccessListing(
       roleIds,
       appcode,
       levelType,
+      level_id
     );
   }