rez_core 2.1.2 → 2.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.2",
+  "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/module/repository/module-access.repository.ts

@@ -1,6 +1,6 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { In, Not, 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,7 @@ export class ModuleAccessRepository {
     private readonly moduleActionRepo: Repository<ModuleAction>,
   ) {}
 
+ 
 
   async getRoles({
     appcode,
@@ -35,7 +36,7 @@ export class ModuleAccessRepository {
   }) {
     const where: any = {
       appcode,
-      is_factory: Not(1), // Exclude factory roles
+      is_factory: [Not(1), IsNull()], // Include NULL or anything not 1
     };
   
     if (level_type) where.level_type = level_type;
@@ -48,6 +49,8 @@ export class ModuleAccessRepository {
       value: role.id,
     }));
   }
+  
+
   async getModules({ appcode }: { appcode: string }) {
     const modules = await this.moduleRepo.find({
       where: { module_level: 'MAINMOD', appcode },