rez_core 3.1.199 → 3.1.201
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/meta/controller/media.controller.d.ts +3 -0
- package/dist/module/meta/controller/media.controller.js +15 -0
- package/dist/module/meta/controller/media.controller.js.map +1 -1
- package/dist/module/meta/entity/entity-master.entity.d.ts +2 -0
- package/dist/module/meta/entity/entity-master.entity.js +8 -0
- package/dist/module/meta/entity/entity-master.entity.js.map +1 -1
- package/dist/module/meta/service/media-data.service.d.ts +5 -1
- package/dist/module/meta/service/media-data.service.js +59 -2
- package/dist/module/meta/service/media-data.service.js.map +1 -1
- package/dist/module/notification/service/notification.service.js +1 -1
- package/dist/module/workflow/repository/activity-log.repository.js +1 -1
- package/dist/module/workflow/service/stage-group.service.js +1 -1
- package/dist/module/workflow/service/task.service.js +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/meta/controller/media.controller.ts +10 -0
- package/src/module/meta/entity/entity-master.entity.ts +6 -0
- package/src/module/meta/service/media-data.service.ts +92 -1
- package/src/module/notification/service/notification.service.ts +1 -1
- package/src/module/workflow/repository/activity-log.repository.ts +1 -1
- package/src/module/workflow/service/stage-group.service.ts +1 -1
- package/src/module/workflow/service/task.service.ts +1 -1
|
@@ -14,4 +14,7 @@ export declare class MediaController {
|
|
|
14
14
|
getDownloadUrl(id: number, res: Response, req: Request & {
|
|
15
15
|
user: any;
|
|
16
16
|
}, expiresIn?: number): Promise<void>;
|
|
17
|
+
generateUploadPath(req: Request & {
|
|
18
|
+
user: any;
|
|
19
|
+
}, mapped_entity_type: string, mapped_entity_id?: number, parent_id?: number, parent_type?: string): Promise<string | null>;
|
|
17
20
|
}
|
|
@@ -51,6 +51,10 @@ let MediaController = class MediaController {
|
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
+
async generateUploadPath(req, mapped_entity_type, mapped_entity_id, parent_id, parent_type) {
|
|
55
|
+
const loggedInUser = req.user.userData;
|
|
56
|
+
return this.mediaDataService.buildUploadPathGeneric(mapped_entity_type, loggedInUser, mapped_entity_id, parent_id, parent_type);
|
|
57
|
+
}
|
|
54
58
|
};
|
|
55
59
|
exports.MediaController = MediaController;
|
|
56
60
|
__decorate([
|
|
@@ -72,6 +76,17 @@ __decorate([
|
|
|
72
76
|
__metadata("design:paramtypes", [Number, Object, Object, Number]),
|
|
73
77
|
__metadata("design:returntype", Promise)
|
|
74
78
|
], MediaController.prototype, "getDownloadUrl", null);
|
|
79
|
+
__decorate([
|
|
80
|
+
(0, common_1.Post)('generateUploadPath'),
|
|
81
|
+
__param(0, (0, common_1.Req)()),
|
|
82
|
+
__param(1, (0, common_1.Query)('mapped_entity_type')),
|
|
83
|
+
__param(2, (0, common_1.Query)('mapped_entity_id')),
|
|
84
|
+
__param(3, (0, common_1.Query)('parent_id')),
|
|
85
|
+
__param(4, (0, common_1.Query)('parent_type')),
|
|
86
|
+
__metadata("design:type", Function),
|
|
87
|
+
__metadata("design:paramtypes", [Object, String, Number, Number, String]),
|
|
88
|
+
__metadata("design:returntype", Promise)
|
|
89
|
+
], MediaController.prototype, "generateUploadPath", null);
|
|
75
90
|
exports.MediaController = MediaController = __decorate([
|
|
76
91
|
(0, common_1.Controller)('media'),
|
|
77
92
|
(0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/media.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AAExB,2DAA2D;AAC3D,sEAAiE;AAI1D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAI7D,AAAN,KAAK,CAAC,cAAc,CAElB,IAKC,EACM,GAA4B,EAC5B,GAAa;QAEpB,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAEvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CACnE,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,aAAa,EAClB,YAAY,EACZ,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,gBAAgB,CACtB,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC7B,OAAO,EAAE,+BAA+B;gBACxC,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAM;aACb,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACL,EAAU,EAChB,GAAa,EACb,GAA4B,EACf,SAAkB;QAEtC,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QACvC,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CACjE,EAAE,EACF,YAAY,EACZ,SAAS,CACV,CAAC;YACF,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC7B,OAAO,EAAE,mCAAmC;gBAC5C,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC;gBAChD,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,6BAA6B;gBACvD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"media.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/media.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AAExB,2DAA2D;AAC3D,sEAAiE;AAI1D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAI7D,AAAN,KAAK,CAAC,cAAc,CAElB,IAKC,EACM,GAA4B,EAC5B,GAAa;QAEpB,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAEvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CACnE,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,aAAa,EAClB,YAAY,EACZ,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,gBAAgB,CACtB,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC7B,OAAO,EAAE,+BAA+B;gBACxC,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAM;aACb,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACL,EAAU,EAChB,GAAa,EACb,GAA4B,EACf,SAAkB;QAEtC,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QACvC,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CACjE,EAAE,EACF,YAAY,EACZ,SAAS,CACV,CAAC;YACF,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC7B,OAAO,EAAE,mCAAmC;gBAC5C,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC;gBAChD,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,6BAA6B;gBACvD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAQ,GAA4B,EAA+B,kBAA0B,EACjE,gBAAyB,EAChC,SAAkB,EAChB,WAAoB;QAEjE,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QACvC,OAAO,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,kBAAkB,EAAE,YAAY,EAAE,gBAAgB,EAAC,SAAS,EAAE,WAAW,CAAC,CAAA;IAChI,CAAC;CACF,CAAA;AAzEY,0CAAe;AAKpB;IADL,IAAA,aAAI,EAAC,iBAAiB,CAAC;IAErB,WAAA,IAAA,aAAI,GAAE,CAAA;IAON,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;;;;qDAoBP;AAIK;IADL,IAAA,YAAG,EAAC,cAAc,CAAC;IAEjB,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;IACX,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;;;;qDAoBpB;AAGK;IADL,IAAA,aAAI,EAAC,oBAAoB,CAAC;IACD,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgC,WAAA,IAAA,cAAK,EAAC,oBAAoB,CAAC,CAAA;IAChE,WAAA,IAAA,cAAK,EAAC,kBAAkB,CAAC,CAAA;IACzB,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;IAClB,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;;;;yDAI7C;0BAxEU,eAAe;IAF3B,IAAA,mBAAU,EAAC,OAAO,CAAC;IACnB,IAAA,kBAAS,EAAC,wBAAY,CAAC;qCAEyB,qCAAgB;GADpD,eAAe,CAyE3B"}
|
|
@@ -101,6 +101,14 @@ __decorate([
|
|
|
101
101
|
(0, typeorm_1.Column)({ name: 'is_workflow', nullable: true }),
|
|
102
102
|
__metadata("design:type", Boolean)
|
|
103
103
|
], EntityMaster.prototype, "is_workflow", void 0);
|
|
104
|
+
__decorate([
|
|
105
|
+
(0, typeorm_1.Column)({ name: 'doc_upload_path', nullable: true, length: 50 }),
|
|
106
|
+
__metadata("design:type", String)
|
|
107
|
+
], EntityMaster.prototype, "doc_upload_path", void 0);
|
|
108
|
+
__decorate([
|
|
109
|
+
(0, typeorm_1.Column)({ name: 'overwrite_path', type: 'tinyint', nullable: true }),
|
|
110
|
+
__metadata("design:type", Number)
|
|
111
|
+
], EntityMaster.prototype, "overwrite_path", void 0);
|
|
104
112
|
exports.EntityMaster = EntityMaster = __decorate([
|
|
105
113
|
(0, typeorm_1.Entity)({ name: 'cr_entity_master' }),
|
|
106
114
|
__metadata("design:paramtypes", [])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-master.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAkD;AAClD,uEAA4E;AAC5E,qCAAyC;AAGlC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,+BAAU;IAC1C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,yCAAuB,CAAC;IAC7C,CAAC;
|
|
1
|
+
{"version":3,"file":"entity-master.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-master.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,12 @@ import { MediaDataRepository } from '../repository/media-data.repository';
|
|
|
3
3
|
import { ConfigService } from '@nestjs/config';
|
|
4
4
|
import { S3 } from 'aws-sdk';
|
|
5
5
|
import { MediaData } from '../entity/media-data.entity';
|
|
6
|
+
import { DataSource } from 'typeorm';
|
|
6
7
|
export declare class MediaDataService extends EntityServiceImpl {
|
|
7
8
|
private readonly configService;
|
|
8
9
|
private readonly mediaRepository;
|
|
9
|
-
|
|
10
|
+
private dataSource;
|
|
11
|
+
constructor(configService: ConfigService, mediaRepository: MediaDataRepository, dataSource: DataSource);
|
|
10
12
|
s3AccessKeyID: any;
|
|
11
13
|
s3AccessKeySecret: any;
|
|
12
14
|
s3Region: any;
|
|
@@ -27,4 +29,6 @@ export declare class MediaDataService extends EntityServiceImpl {
|
|
|
27
29
|
id: number;
|
|
28
30
|
size: number | undefined;
|
|
29
31
|
}>;
|
|
32
|
+
buildUploadPathGeneric(mappedEntityType: string, loggedInUser: any, mappedEntityId?: number, parentId?: number, parentType?: string): Promise<string | null>;
|
|
33
|
+
private resolveUploadPath;
|
|
30
34
|
}
|
|
@@ -18,11 +18,13 @@ const aws_sdk_1 = require("aws-sdk");
|
|
|
18
18
|
const media_data_entity_1 = require("../entity/media-data.entity");
|
|
19
19
|
const global_constant_1 = require("../../../constant/global.constant");
|
|
20
20
|
const uuid_1 = require("uuid");
|
|
21
|
+
const typeorm_1 = require("typeorm");
|
|
21
22
|
let MediaDataService = class MediaDataService extends entity_service_impl_service_1.EntityServiceImpl {
|
|
22
|
-
constructor(configService, mediaRepository) {
|
|
23
|
+
constructor(configService, mediaRepository, dataSource) {
|
|
23
24
|
super();
|
|
24
25
|
this.configService = configService;
|
|
25
26
|
this.mediaRepository = mediaRepository;
|
|
27
|
+
this.dataSource = dataSource;
|
|
26
28
|
this.s3AccessKeyID = this.configService.get('AWS.S3.AWS_ACCESS_KEY_ID');
|
|
27
29
|
this.s3AccessKeySecret = this.configService.get('AWS.S3.AWS_SECRET_KEY');
|
|
28
30
|
this.s3Region = this.configService.get('AWS.S3.AWS_REGION');
|
|
@@ -106,11 +108,66 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
|
|
|
106
108
|
throw new Error('Failed to generate signed URL');
|
|
107
109
|
}
|
|
108
110
|
}
|
|
111
|
+
async buildUploadPathGeneric(mappedEntityType, loggedInUser, mappedEntityId, parentId, parentType) {
|
|
112
|
+
const entityMaster = await this.entityMasterService.getEntityData(mappedEntityType, loggedInUser);
|
|
113
|
+
if (!entityMaster) {
|
|
114
|
+
throw new Error(`Entity master not found for ${mappedEntityType}`);
|
|
115
|
+
}
|
|
116
|
+
let pathTemplate = entityMaster.doc_upload_path ?? '';
|
|
117
|
+
const entityOverwrite = entityMaster.overwrite_path ?? 0;
|
|
118
|
+
if (!pathTemplate) {
|
|
119
|
+
throw new Error(`doc_upload_path not defined for ${mappedEntityType}`);
|
|
120
|
+
}
|
|
121
|
+
const replacements = {};
|
|
122
|
+
let organizationData = await this.dataSource.query('SELECT * FROM sso_organization WHERE id = ?', [loggedInUser.organization_id]);
|
|
123
|
+
replacements['org_code'] = organizationData[0].code;
|
|
124
|
+
const levelEntityId = entityOverwrite ? mappedEntityId : loggedInUser.level_id;
|
|
125
|
+
const levelEntityData = await super.getEntityData(loggedInUser.level_type, levelEntityId, loggedInUser);
|
|
126
|
+
if (levelEntityData?.code) {
|
|
127
|
+
replacements['level_code'] = levelEntityData.code;
|
|
128
|
+
}
|
|
129
|
+
const matches = pathTemplate.match(/\$\{(\w+)\}/g) || [];
|
|
130
|
+
for (const variable of matches) {
|
|
131
|
+
const key = variable.replace(/\$\{|\}/g, '');
|
|
132
|
+
if (replacements[key])
|
|
133
|
+
continue;
|
|
134
|
+
if (key === 'org_code')
|
|
135
|
+
continue;
|
|
136
|
+
if (key.endsWith('_code')) {
|
|
137
|
+
const entityType = key.replace('_code', '').toUpperCase();
|
|
138
|
+
let entityId;
|
|
139
|
+
if (parentType?.toUpperCase() === entityType && parentId) {
|
|
140
|
+
entityId = parentId;
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
entityId = mappedEntityId;
|
|
144
|
+
}
|
|
145
|
+
if (entityId) {
|
|
146
|
+
const entityData = await super.getEntityData(entityType, entityId, loggedInUser);
|
|
147
|
+
replacements[key] = entityData?.code ?? null;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
if (loggedInUser.level_type === 'ORG' && entityOverwrite === 0) {
|
|
152
|
+
replacements['level_code'] = null;
|
|
153
|
+
}
|
|
154
|
+
if (pathTemplate) {
|
|
155
|
+
const finalPath = this.resolveUploadPath(pathTemplate, replacements);
|
|
156
|
+
return finalPath;
|
|
157
|
+
}
|
|
158
|
+
return null;
|
|
159
|
+
}
|
|
160
|
+
resolveUploadPath(template, replacements) {
|
|
161
|
+
let path = template;
|
|
162
|
+
path = path.replace(/\$\{(\w+)\}/g, (_, key) => replacements[key] || '');
|
|
163
|
+
return path.replace(/\/+/g, '/').replace(/\/$/, '');
|
|
164
|
+
}
|
|
109
165
|
};
|
|
110
166
|
exports.MediaDataService = MediaDataService;
|
|
111
167
|
exports.MediaDataService = MediaDataService = __decorate([
|
|
112
168
|
(0, common_1.Injectable)(),
|
|
113
169
|
__metadata("design:paramtypes", [config_1.ConfigService,
|
|
114
|
-
media_data_repository_1.MediaDataRepository
|
|
170
|
+
media_data_repository_1.MediaDataRepository,
|
|
171
|
+
typeorm_1.DataSource])
|
|
115
172
|
], MediaDataService);
|
|
116
173
|
//# sourceMappingURL=media-data.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-data.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/media-data.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAAkE;AAClE,+EAA0E;AAC1E,2CAA+C;AAC/C,qCAA6B;AAC7B,mEAAwD;AACxD,uEAG2C;AAC3C,+BAAoC;
|
|
1
|
+
{"version":3,"file":"media-data.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/media-data.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,7 +87,7 @@ let NotificationsService = class NotificationsService {
|
|
|
87
87
|
const queryParams = new URLSearchParams({
|
|
88
88
|
loggedInUser: JSON.stringify(loggedInUser),
|
|
89
89
|
}).toString();
|
|
90
|
-
const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${notification?.user_id}?entity_type=
|
|
90
|
+
const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${notification?.user_id}?entity_type=USR&${queryParams}`, {
|
|
91
91
|
headers: {
|
|
92
92
|
'Content-Type': 'application/json',
|
|
93
93
|
},
|
|
@@ -63,7 +63,7 @@ let ActivityLogRepository = class ActivityLogRepository {
|
|
|
63
63
|
const queryParams = new URLSearchParams({
|
|
64
64
|
loggedInUser: JSON.stringify(loggedInUser),
|
|
65
65
|
}).toString();
|
|
66
|
-
const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${param?.created_by}?entity_type=
|
|
66
|
+
const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${param?.created_by}?entity_type=USR&${queryParams}`, {
|
|
67
67
|
headers: {
|
|
68
68
|
'Content-Type': 'application/json',
|
|
69
69
|
},
|
|
@@ -151,7 +151,7 @@ let StageGroupService = class StageGroupService extends entity_service_impl_serv
|
|
|
151
151
|
const queryParams = new URLSearchParams({
|
|
152
152
|
loggedInUser: JSON.stringify(loggedInUser),
|
|
153
153
|
}).toString();
|
|
154
|
-
const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${userId}?entity_type=
|
|
154
|
+
const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${userId}?entity_type=USR&${queryParams}`, {
|
|
155
155
|
headers: {
|
|
156
156
|
'Content-Type': 'application/json',
|
|
157
157
|
},
|
|
@@ -223,7 +223,7 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
|
|
|
223
223
|
const queryParams = new URLSearchParams({
|
|
224
224
|
loggedInUser: JSON.stringify(loggedInUser),
|
|
225
225
|
}).toString();
|
|
226
|
-
const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${param?.task_owner}?entity_type=
|
|
226
|
+
const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${param?.task_owner}?entity_type=USR&${queryParams}`, {
|
|
227
227
|
headers: {
|
|
228
228
|
'Content-Type': 'application/json',
|
|
229
229
|
},
|