rez_core 2.0.76 → 2.0.78
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/module/filter/repository/saved-filter.repository.js +1 -0
- package/dist/module/filter/repository/saved-filter.repository.js.map +1 -1
- package/dist/module/master/service/master.service.js +10 -0
- package/dist/module/master/service/master.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/filter/repository/saved-filter.repository.ts +2 -3
- package/src/module/master/service/master.service.ts +12 -1
package/package.json
CHANGED
|
@@ -72,6 +72,7 @@ export class SavedFilterRepositoryService {
|
|
|
72
72
|
where: {
|
|
73
73
|
user_id: userId,
|
|
74
74
|
mapped_entity_type: entityType,
|
|
75
|
+
status: 'ACTIVE',
|
|
75
76
|
},
|
|
76
77
|
order: {
|
|
77
78
|
modified_date: 'DESC',
|
|
@@ -84,9 +85,7 @@ export class SavedFilterRepositoryService {
|
|
|
84
85
|
}));
|
|
85
86
|
}
|
|
86
87
|
|
|
87
|
-
async getFilterById(
|
|
88
|
-
id: number,
|
|
89
|
-
): Promise<
|
|
88
|
+
async getFilterById(id: number): Promise<
|
|
90
89
|
{
|
|
91
90
|
filter_attribute: string;
|
|
92
91
|
filter_operator: string;
|
|
@@ -459,10 +459,21 @@ export class MasterService {
|
|
|
459
459
|
)
|
|
460
460
|
.andWhere(`${entityMaster.db_table_name}.organization_id = :orgId`, {
|
|
461
461
|
orgId: loggedInUser.organization_id,
|
|
462
|
+
})
|
|
463
|
+
.andWhere(`${entityMaster.db_table_name}.level_type = :levelType`, {
|
|
464
|
+
levelType: loggedInUser.level_type,
|
|
465
|
+
})
|
|
466
|
+
.andWhere(`${entityMaster.db_table_name}.level_id = :levelId`, {
|
|
467
|
+
levelId: loggedInUser.level_id,
|
|
462
468
|
});
|
|
463
|
-
|
|
469
|
+
|
|
464
470
|
const existing = await qb.limit(1).getRawOne();
|
|
465
471
|
|
|
472
|
+
row.entity_type = entityType;
|
|
473
|
+
row.organization_id = loggedInUser.organization_id;
|
|
474
|
+
row.status="ACTIVE"
|
|
475
|
+
|
|
476
|
+
let errors = [];
|
|
466
477
|
if (existing) {
|
|
467
478
|
if (duplicateHandling === 'skip_duplicates') continue;
|
|
468
479
|
if (duplicateHandling === 'overwrite_items') {
|