rez_core 5.0.142 → 5.0.145
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/config/bull.config.js +4 -4
- package/dist/config/bull.config.js.map +1 -1
- package/dist/module/filter/repository/saved-filter.repository.d.ts +1 -5
- package/dist/module/filter/repository/saved-filter.repository.js +1 -7
- package/dist/module/filter/repository/saved-filter.repository.js.map +1 -1
- package/dist/module/meta/dto/entity-table.dto.d.ts +1 -4
- package/dist/module/meta/dto/entity-table.dto.js.map +1 -1
- package/dist/module/meta/service/media-data.service.js +0 -5
- package/dist/module/meta/service/media-data.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/config/bull.config.ts +4 -4
- package/src/module/filter/repository/saved-filter.repository.ts +8 -7
- package/src/module/meta/dto/entity-table.dto.ts +2 -1
- package/src/module/meta/service/media-data.service.ts +5 -52
package/package.json
CHANGED
|
@@ -13,10 +13,10 @@ export class BullConfigService implements SharedBullConfigurationFactory {
|
|
|
13
13
|
createSharedConfiguration(): BullModuleOptions {
|
|
14
14
|
return {
|
|
15
15
|
redis: {
|
|
16
|
-
host:
|
|
17
|
-
port:
|
|
18
|
-
password:
|
|
19
|
-
db:
|
|
16
|
+
host: '43.205.35.45',
|
|
17
|
+
port: 6379,
|
|
18
|
+
password: 'Rezolut123',
|
|
19
|
+
db: 0,
|
|
20
20
|
// Enable offline queue to handle Redis disconnections
|
|
21
21
|
enableOfflineQueue: true,
|
|
22
22
|
// Retry strategy for Redis connection
|
|
@@ -127,11 +127,14 @@ export class SavedFilterRepositoryService {
|
|
|
127
127
|
},
|
|
128
128
|
});
|
|
129
129
|
|
|
130
|
-
return filters
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
130
|
+
return filters;
|
|
131
|
+
|
|
132
|
+
// return filters.map((filter) => ({
|
|
133
|
+
// label: filter.name,
|
|
134
|
+
// value: filter.id,
|
|
135
|
+
// code: filter.code,
|
|
136
|
+
|
|
137
|
+
// }));
|
|
135
138
|
}
|
|
136
139
|
|
|
137
140
|
async getFilterById(id: number): Promise<
|
|
@@ -159,8 +162,6 @@ export class SavedFilterRepositoryService {
|
|
|
159
162
|
filter_entity_name: detail.filter_entity_name,
|
|
160
163
|
filter_entity_type: detail.filter_entity_type,
|
|
161
164
|
datasource_list: detail.datasource_list,
|
|
162
|
-
is_shared: saveFilterMasterData.is_shared,
|
|
163
|
-
is_editable: saveFilterMasterData.is_editable,
|
|
164
165
|
filter_value:
|
|
165
166
|
detail.data_type === 'multiselect'
|
|
166
167
|
? detail.filter_value?.trim() === ''
|
|
@@ -6,5 +6,6 @@ export class EntityTableDto extends EntityTable {
|
|
|
6
6
|
operation_list: {};
|
|
7
7
|
default_filter: {} | null;
|
|
8
8
|
saved_filter: { label: string; value: number }[] | null;
|
|
9
|
-
shared_filter: { label: string; value: number }[] | null;
|
|
9
|
+
// shared_filter: { label: string; value: number }[] | null;
|
|
10
|
+
shared_filter: any[] | null;
|
|
10
11
|
}
|
|
@@ -182,53 +182,6 @@ export class MediaDataService extends EntityServiceImpl {
|
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
184
|
|
|
185
|
-
// media-data.service.ts
|
|
186
|
-
// async getMediaInlineUrl(id: number, loggedInUser, expiresIn?: number) {
|
|
187
|
-
// try {
|
|
188
|
-
// const entityData = await this.getEntityData(
|
|
189
|
-
// ENTITYTYPE_MEDIA,
|
|
190
|
-
// id,
|
|
191
|
-
// loggedInUser,
|
|
192
|
-
// );
|
|
193
|
-
// const mediaData = entityData as MediaData;
|
|
194
|
-
// let fileSize: number | undefined;
|
|
195
|
-
// if (this.bucketName) {
|
|
196
|
-
// const head = await this.s3
|
|
197
|
-
// .headObject({
|
|
198
|
-
// Bucket: this.bucketName,
|
|
199
|
-
// Key: mediaData.media_url,
|
|
200
|
-
// })
|
|
201
|
-
// .promise();
|
|
202
|
-
// fileSize = head.ContentLength;
|
|
203
|
-
// }
|
|
204
|
-
|
|
205
|
-
// if (!mediaData) {
|
|
206
|
-
// throw new Error('Media not found');
|
|
207
|
-
// }
|
|
208
|
-
|
|
209
|
-
// const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
|
|
210
|
-
// Bucket: this.bucketName,
|
|
211
|
-
// Key: mediaData.media_url,
|
|
212
|
-
// Expires: Number(expiresIn) || 60 * 5,
|
|
213
|
-
// ResponseContentDisposition: 'inline',
|
|
214
|
-
// ResponseContentType: this.getContentType(
|
|
215
|
-
// mediaData.file_name.split('.').pop() || '',
|
|
216
|
-
// ),
|
|
217
|
-
// });
|
|
218
|
-
|
|
219
|
-
// return {
|
|
220
|
-
// signedUrl,
|
|
221
|
-
// fileName: mediaData.file_name,
|
|
222
|
-
// id: mediaData.id,
|
|
223
|
-
// size: fileSize,
|
|
224
|
-
// uploadedDate: mediaData.created_date,
|
|
225
|
-
// };
|
|
226
|
-
// } catch (error) {
|
|
227
|
-
// console.error('Error generating inline URL:', error);
|
|
228
|
-
// throw new Error('Failed to generate inline URL');
|
|
229
|
-
// }
|
|
230
|
-
// }
|
|
231
|
-
|
|
232
185
|
async getMediaInlineUrl(id: number, loggedInUser, expiresIn?: number) {
|
|
233
186
|
try {
|
|
234
187
|
const entityData = await this.getEntityData(
|
|
@@ -264,11 +217,11 @@ export class MediaDataService extends EntityServiceImpl {
|
|
|
264
217
|
});
|
|
265
218
|
|
|
266
219
|
let previewUrl = signedUrl;
|
|
267
|
-
if (ext === 'doc' || ext === 'docx') {
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
}
|
|
220
|
+
// if (ext === 'doc' || ext === 'docx') {
|
|
221
|
+
// previewUrl =
|
|
222
|
+
// `https://view.officeapps.live.com/op/embed.aspx?src=` +
|
|
223
|
+
// encodeURIComponent(signedUrl);
|
|
224
|
+
// }
|
|
272
225
|
|
|
273
226
|
return {
|
|
274
227
|
signedUrl: previewUrl,
|