rez_core 5.0.286 → 5.0.287
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/service/view-master.service.d.ts +1 -1
- package/dist/module/meta/service/view-master.service.js +15 -12
- package/dist/module/meta/service/view-master.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/meta/service/view-master.service.ts +23 -32
|
@@ -23,7 +23,7 @@ export declare class ViewMasterService extends EntityServiceImpl {
|
|
|
23
23
|
formLayoutJson?: undefined;
|
|
24
24
|
formFieldJson?: undefined;
|
|
25
25
|
}>;
|
|
26
|
-
getEntityData(entityType: string, id: number,
|
|
26
|
+
getEntityData(entityType: string, id: number, loggedInUserData?: UserData | null): Promise<any>;
|
|
27
27
|
getViewMasterByEntityType(entityType: string, loggedInUser: UserData): Promise<{
|
|
28
28
|
label: string;
|
|
29
29
|
value: number;
|
|
@@ -18,7 +18,7 @@ const entity_service_impl_service_1 = require("./entity-service-impl.service");
|
|
|
18
18
|
const typeorm_1 = require("typeorm");
|
|
19
19
|
const view_master_repository_1 = require("../repository/view-master.repository");
|
|
20
20
|
const config_1 = require("@nestjs/config");
|
|
21
|
-
const
|
|
21
|
+
const axios_1 = require("axios");
|
|
22
22
|
let ViewMasterService = class ViewMasterService extends entity_service_impl_service_1.EntityServiceImpl {
|
|
23
23
|
constructor(viewMasterRepoService, dataSource, configService, factory) {
|
|
24
24
|
super();
|
|
@@ -52,21 +52,24 @@ let ViewMasterService = class ViewMasterService extends entity_service_impl_serv
|
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
-
async getEntityData(entityType, id,
|
|
55
|
+
async getEntityData(entityType, id, loggedInUserData) {
|
|
56
56
|
let getTheme = null;
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
try {
|
|
58
|
+
const baseUrl = this.configService.get('REDIRECT_BE_URL');
|
|
59
|
+
const response = await axios_1.default.get(`${baseUrl}/school/public/theme_json/${loggedInUserData?.level_id}`, {
|
|
60
|
+
headers: {
|
|
61
|
+
'Content-Type': 'application/json',
|
|
62
|
+
},
|
|
63
|
+
});
|
|
64
|
+
getTheme = response.data;
|
|
60
65
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}));
|
|
66
|
-
const viewMaster = await super.getEntityData(entityType, id, loggedInUser);
|
|
66
|
+
catch (error) {
|
|
67
|
+
console.error('Internal Entity API call failed:', error.message);
|
|
68
|
+
}
|
|
69
|
+
const viewMaster = await super.getEntityData(entityType, id, loggedInUserData);
|
|
67
70
|
return {
|
|
68
71
|
...viewMaster,
|
|
69
|
-
theme_json: getTheme && getTheme?.theme_json ? getTheme.theme_json : null,
|
|
72
|
+
theme_json: getTheme && getTheme[0]?.theme_json ? getTheme[0].theme_json : null,
|
|
70
73
|
};
|
|
71
74
|
}
|
|
72
75
|
async getViewMasterByEntityType(entityType, loggedInUser) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/view-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+EAAkE;AAGlE,qCAAoD;AAMpD,iFAA4E;AAE5E,2CAA+C;
|
|
1
|
+
{"version":3,"file":"view-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/view-master.service.ts"],"names":[],"mappings":"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"}
|