rez_core 2.0.3 → 2.0.5

package/package.json

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

package/src/core.module.ts

@@ -1,5 +1,6 @@
-import { Module, DynamicModule, Global } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config'; // Import ConfigModule
+import { Module, DynamicModule } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
+
 import { EnterpriseModule } from './module/enterprise/enterprise.module';
 import { UtilsModule } from './utils/utils.module';
 import { UserModule } from './module/user/user.module';
@@ -10,43 +11,46 @@ import { LayoutModule } from './module/layout/layout.module';
 import { ListMasterModule } from './module/listmaster/listmaster.module';
 import { FilterModule } from './module/filter/filter.module';
 
-@Global()
 @Module({})
 export class CoreModule {
-  static forRootAsync(dbModule: DynamicModule): DynamicModule {
+  static forRootAsync(dbModule: DynamicModule, isSso: boolean): DynamicModule {
     if (!dbModule) {
       throw new Error('Database module must be provided.');
     }
-  
+
+    const importsArray = [
+      ConfigModule.forRoot({ isGlobal: true }),
+      dbModule,
+      EntityModule,
+      EnterpriseModule,
+      UtilsModule,
+      NotificationModule,
+      LayoutModule,
+      ListMasterModule,
+      FilterModule,
+    ];
+
+    const exportsArray = [
+      ConfigModule,
+      dbModule,
+      EntityModule,
+      EnterpriseModule,
+      UtilsModule,
+      NotificationModule,
+      LayoutModule,
+      ListMasterModule,
+      FilterModule,
+    ];
+
+    if (isSso) {
+      importsArray.push(UserModule, ModuleModule);
+      exportsArray.push(UserModule, ModuleModule);
+    }
+
     return {
       module: CoreModule,
-      imports: [
-        ConfigModule.forRoot({ isGlobal: true }),
-        dbModule, 
-        EntityModule,
-        EnterpriseModule,
-        UtilsModule,
-        UserModule,
-        ModuleModule,
-        NotificationModule,
-        LayoutModule,
-        ListMasterModule,
-        FilterModule
-      ],
-      exports: [
-        ConfigModule,
-        dbModule,
-        EntityModule,
-        EnterpriseModule,
-        UtilsModule,
-        UserModule,
-        ModuleModule,
-        NotificationModule,
-        LayoutModule,
-        ListMasterModule,
-        FilterModule
-      ],
+      imports: importsArray,
+      exports: exportsArray,
     };
   }
-  
 }

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

@@ -6,7 +6,6 @@ import { SavedFilterService } from './saved-filter.service';
 import { FilterRequestDto } from '../dto/filter-request.dto';
 import { EntityTableService } from 'src/module/meta/service/entity-table.service';
 import { EntityTableColumnService } from 'src/module/meta/service/entity-table-column.service';
-import { get } from 'http';
 
 @Injectable()
 export class FilterService {
@@ -100,11 +99,11 @@ export class FilterService {
     // Get and parse filters
     const savedFilters = await this.getSavedFilters(savedFilterCode);
     const baseFilters = [
-      ...(quickFilter || []).filter(f => f.filter_value !== ""),
-      ...savedFilters.filter(f => f.filter_value !== ""),
-      ...(attributeFilter || []).filter(f => f.filter_value !== ""),
+      ...(quickFilter || []).filter((f) => f.filter_value !== ''),
+      ...savedFilters.filter((f) => f.filter_value !== ''),
+      ...(attributeFilter || []).filter((f) => f.filter_value !== ''),
     ];
-    
+
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
     // Build query for tab counts (no tab.value filter here)

package/src/module/meta/service/entity-list.service.ts

@@ -71,9 +71,9 @@ export class EntityListService {
     appcode?: string,
   ) {
     // Add appcode to filters if provided
-    if (appcode) {
-      filters = { ...filters, appcode };
-    }
+    // if (appcode) {
+    //   filters = { ...filters, appcode };
+    // }
 
     let query = this.getQuery(entityTable.data_source, null);
     let whereClause = await this.getWhereClause(entityTable, filters);
@@ -95,7 +95,7 @@ export class EntityListService {
     appcode?: string,
   ) {
     let query = this.getQuery(entityTable.data_source, entityTable.tab_column);
-    let whereClause = await this.getWhereClause(entityTable, filters, appcode);
+    let whereClause = await this.getWhereClause(entityTable, filters);
     if (whereClause.query) {
       query += whereClause.query;
     }