rez_core 6.1.3 → 6.1.5
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/entity_json/service/entity_json.service.js +3 -0
- package/dist/module/entity_json/service/entity_json.service.js.map +1 -1
- package/dist/module/filter/service/flatjson-filter.service.js +5 -5
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/entity_json/service/entity_json.service.ts +3 -0
- package/src/module/filter/service/flatjson-filter.service.ts +5 -5
package/package.json
CHANGED
|
@@ -48,6 +48,7 @@ export class EntityJSONService {
|
|
|
48
48
|
])
|
|
49
49
|
.where('attr.mapped_entity_type = :entityType', { entityType })
|
|
50
50
|
.andWhere('attr.enterprise_id = :entId', { entId })
|
|
51
|
+
.andWhere('attr.data_type != :uploadType', { uploadType: 'upload' })
|
|
51
52
|
.getMany();
|
|
52
53
|
|
|
53
54
|
await this.loggerService.log(
|
|
@@ -95,6 +96,7 @@ export class EntityJSONService {
|
|
|
95
96
|
types: relatedTypesList,
|
|
96
97
|
})
|
|
97
98
|
.andWhere('attr.enterprise_id = :entId', { entId })
|
|
99
|
+
.andWhere('attr.data_type != :uploadType', { uploadType: 'upload' })
|
|
98
100
|
.getMany()
|
|
99
101
|
: [];
|
|
100
102
|
|
|
@@ -124,6 +126,7 @@ export class EntityJSONService {
|
|
|
124
126
|
'attr.data_type AS data_type',
|
|
125
127
|
])
|
|
126
128
|
.where('attr.enterprise_id = :entId', { entId })
|
|
129
|
+
.andWhere('attr.data_type != :uploadType', { uploadType: 'upload' })
|
|
127
130
|
.getRawMany();
|
|
128
131
|
|
|
129
132
|
await this.loggerService.log(
|
|
@@ -84,7 +84,7 @@ export class FlatjsonFilterService {
|
|
|
84
84
|
|
|
85
85
|
const attributeMetaMap: Record<string, any> = {};
|
|
86
86
|
attributes.forEach((attr) => {
|
|
87
|
-
attributeMetaMap[attr.
|
|
87
|
+
attributeMetaMap[attr.attribute_key] = attr;
|
|
88
88
|
});
|
|
89
89
|
|
|
90
90
|
await this.loggingService.log(
|
|
@@ -137,7 +137,7 @@ export class FlatjsonFilterService {
|
|
|
137
137
|
const tabMeta = attributeMetaMap[tabs.columnName];
|
|
138
138
|
if (tabMeta) {
|
|
139
139
|
const flatJsonKey =
|
|
140
|
-
tabMeta.
|
|
140
|
+
tabMeta.attribute_key ||
|
|
141
141
|
`${entity_type}__${tabs.columnName}`;
|
|
142
142
|
qb.andWhere(`json_data->>'${flatJsonKey}' = :tabValue`, {
|
|
143
143
|
tabValue: tabs.value,
|
|
@@ -151,7 +151,7 @@ export class FlatjsonFilterService {
|
|
|
151
151
|
const tabMeta = attributeMetaMap[tabs.columnName];
|
|
152
152
|
if (tabMeta) {
|
|
153
153
|
const flatJsonKey =
|
|
154
|
-
tabMeta.
|
|
154
|
+
tabMeta.attribute_key ||
|
|
155
155
|
`${entity_type}__${tabs.columnName}`;
|
|
156
156
|
tabCounts = await this.getJsonbTabCounts(
|
|
157
157
|
entity_type,
|
|
@@ -275,7 +275,7 @@ export class FlatjsonFilterService {
|
|
|
275
275
|
if (!meta) return null;
|
|
276
276
|
|
|
277
277
|
const flatJsonKey =
|
|
278
|
-
meta.
|
|
278
|
+
meta.attribute_key ||
|
|
279
279
|
`${meta.mapped_entity_type}__${filter.filter_attribute}`;
|
|
280
280
|
const op = filter.filter_operator;
|
|
281
281
|
const val = filter.filter_value;
|
|
@@ -865,7 +865,7 @@ export class FlatjsonFilterService {
|
|
|
865
865
|
}
|
|
866
866
|
|
|
867
867
|
const flatJsonKey =
|
|
868
|
-
meta.
|
|
868
|
+
meta.attribute_key || `${meta.mapped_entity_type}__${sort.sortColum}`;
|
|
869
869
|
const direction = sort.sortType === 'ASC' ? 'ASC' : 'DESC';
|
|
870
870
|
|
|
871
871
|
// Apply type-specific casting for proper sorting
|