rez_core 2.1.103 → 2.1.105

package/package.json

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

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

@@ -20,15 +20,43 @@ export class ListMasterItemsRepository {
     return this.repo.findOne({ where: { id } });
   }
 
-  async findItemsByType(type: string, organizationId?: number) {
+  async findItemsByType(type: string, sort_by?, organizationId?: number) {
+    let orderBy: Record<string, 'ASC' | 'DESC'> = {}; // no default sort unless specified
+
+    // Only proceed if sort_by is a valid number
+    if (typeof sort_by === 'number' && !isNaN(sort_by)) {
+      const listMasterItem = await this.repo.find({
+        where: { id: sort_by },
+      });
+
+      const sortValue = listMasterItem?.[0]?.value;
+
+      if (sortValue) {
+        const listMasterSortBy = String(sortValue).toLowerCase();
+
+        switch (listMasterSortBy) {
+          case 'az':
+            orderBy = { name: 'ASC' };
+            break;
+          case 'za':
+            orderBy = { name: 'DESC' };
+            break;
+          case 'custom':
+            orderBy = { sortindex: 'ASC' };
+            break;
+        }
+      }
+    }
+
     const items = await this.repo.find({
       where: {
         listtype: type,
         organization_id: organizationId,
         status: 'ACTIVE',
       },
-      order: { sortindex: 'ASC' },
+      order: orderBy,
     });
+
     return items.map((i) => ({ label: i.name, value: i.id }));
   }
 

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

@@ -73,6 +73,7 @@ export class ListMasterService {
       case 'master':
         return this.listItemsRepo.findItemsByType(
           type,
+          config.sort_by,
           loggedInUser?.organization_id,
         );
 
@@ -107,7 +108,7 @@ export class ListMasterService {
 
     const applyCommonFilters = (qb: any, status?: number) => {
       if (status) {
-        qb.where(`${tableName}.status = :status`, { status } );
+        qb.where(`${tableName}.status = :status`, { status });
         qb.orWhere(`${tableName}.status = 'Active'`);
       }
 

package/src/module/meta/repository/entity-table-column.repository.ts

@@ -13,6 +13,7 @@ export class EntityTableColumnRepository {
   async findByParentIdAndParentType(
     parentId: number,
     parentType: string,
+    organization_id,
     isVisible?: boolean,
   ) {
     if (isVisible) {
@@ -20,6 +21,7 @@ export class EntityTableColumnRepository {
         where: {
           parent_id: parentId,
           parent_type: parentType,
+          organization_id: organization_id,
         },
         order: { col_position: 'ASC' },
       });
@@ -29,6 +31,7 @@ export class EntityTableColumnRepository {
         parent_id: parentId,
         parent_type: parentType,
         visible: '1',
+        organization_id: organization_id,
       },
       order: { col_position: 'ASC' },
     });

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

@@ -356,6 +356,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
         await this.entityTableColumnService.findByParentIdAndParentType(
           entityTable.id,
           entityTable.entity_type,
+          loggedInUser.organization_id,
         );
 
       sheet.headers = entityTableColumnList.map((col) => col.name);

package/src/module/meta/service/entity-table-column.service.ts

@@ -24,6 +24,7 @@ export class EntityTableColumnService {
   async findByParentIdAndParentType(
     parentId: number,
     parentType: string,
+    organization_id,
     isVisible?: boolean,
   ) {
     let entityTableColumns =
@@ -31,6 +32,7 @@ export class EntityTableColumnService {
         parentId,
         parentType,
         isVisible,
+        organization_id,
       );
     return entityTableColumns;
   }

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

@@ -95,6 +95,7 @@ export class EntityTableService {
         await this.entityTableColumnRepository.findByParentIdAndParentType(
           entityTable.id,
           entityTable.entity_type,
+          loggedInUser.organization_id,
         );
       entityTableDto.operation_list = {
         text: await this.listMasterService.getDropdownOptions(