rez_core 4.0.292 → 4.0.293
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/.vscode/extensions.json +5 -0
- package/dist/module/listmaster/service/list-master.service.js +13 -2
- package/dist/module/listmaster/service/list-master.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/listmaster/service/list-master.service.ts +41 -18
- package/.idea/250218_nodejs_core.iml +0 -12
- package/.idea/codeStyles/Project.xml +0 -59
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/inspectionProfiles/Project_Default.xml +0 -6
- package/.idea/modules.xml +0 -8
- package/.idea/prettier.xml +0 -6
- package/.idea/vcs.xml +0 -6
package/package.json
CHANGED
|
@@ -87,6 +87,20 @@ export class ListMasterService {
|
|
|
87
87
|
config.appcode != loggedInUser?.appcode &&
|
|
88
88
|
!publicCall
|
|
89
89
|
) {
|
|
90
|
+
const client = this.factory.getClient(config.appcode);
|
|
91
|
+
|
|
92
|
+
if (!client) {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
const res = await firstValueFrom(
|
|
97
|
+
client.send('listmaster.getDropdownData', {
|
|
98
|
+
type,
|
|
99
|
+
loggedInUser,
|
|
100
|
+
}),
|
|
101
|
+
);
|
|
102
|
+
|
|
103
|
+
console.log(res, '-------------------');
|
|
90
104
|
// Call internal API for appcode mismatch
|
|
91
105
|
try {
|
|
92
106
|
const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
|
|
@@ -443,12 +457,16 @@ export class ListMasterService {
|
|
|
443
457
|
return await this.listMasterRepo.findAllItems(organizationId, search);
|
|
444
458
|
}
|
|
445
459
|
|
|
446
|
-
async getDropDownData(
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
460
|
+
async getDropDownData(
|
|
461
|
+
entity_type: string,
|
|
462
|
+
attribute_key: string,
|
|
463
|
+
loggedInUser: UserData,
|
|
464
|
+
body: Record<string, string>,
|
|
465
|
+
) {
|
|
466
|
+
let entityMaster = await this.entityMasterService.getEntityData(
|
|
467
|
+
entity_type,
|
|
468
|
+
loggedInUser,
|
|
469
|
+
);
|
|
452
470
|
let appCode = entityMaster.appcode;
|
|
453
471
|
|
|
454
472
|
const { inactiveIds, ...params } = body;
|
|
@@ -460,11 +478,12 @@ export class ListMasterService {
|
|
|
460
478
|
const currentAppCode = this.configService.get<string>('appcode');
|
|
461
479
|
|
|
462
480
|
if (currentAppCode === appCode || !currentAppCode) {
|
|
463
|
-
const entityAttribute =
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
481
|
+
const entityAttribute =
|
|
482
|
+
await this.attributeMasterService.findByMappedEntityTypeAndAttributeKey(
|
|
483
|
+
entity_type,
|
|
484
|
+
attribute_key,
|
|
485
|
+
loggedInUser,
|
|
486
|
+
);
|
|
468
487
|
|
|
469
488
|
if (entityAttribute && entityAttribute.data_source_type) {
|
|
470
489
|
const listMaster = await this.listMasterRepo.findByType(
|
|
@@ -514,7 +533,9 @@ export class ListMasterService {
|
|
|
514
533
|
}
|
|
515
534
|
|
|
516
535
|
default:
|
|
517
|
-
throw new BadRequestException(
|
|
536
|
+
throw new BadRequestException(
|
|
537
|
+
`Unknown source: ${listMaster.source}`,
|
|
538
|
+
);
|
|
518
539
|
}
|
|
519
540
|
}
|
|
520
541
|
} else {
|
|
@@ -524,12 +545,14 @@ export class ListMasterService {
|
|
|
524
545
|
return;
|
|
525
546
|
}
|
|
526
547
|
|
|
527
|
-
return client
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
548
|
+
return client
|
|
549
|
+
.send('getDropdownData', {
|
|
550
|
+
entity_type,
|
|
551
|
+
attribute_key,
|
|
552
|
+
loggedInUser,
|
|
553
|
+
body,
|
|
554
|
+
})
|
|
555
|
+
.toPromise();
|
|
533
556
|
}
|
|
534
557
|
}
|
|
535
558
|
}
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<module type="WEB_MODULE" version="4">
|
|
3
|
-
<component name="NewModuleRootManager">
|
|
4
|
-
<content url="file://$MODULE_DIR$">
|
|
5
|
-
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
|
6
|
-
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
|
7
|
-
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
|
8
|
-
</content>
|
|
9
|
-
<orderEntry type="inheritedJdk" />
|
|
10
|
-
<orderEntry type="sourceFolder" forTests="false" />
|
|
11
|
-
</component>
|
|
12
|
-
</module>
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
<component name="ProjectCodeStyleConfiguration">
|
|
2
|
-
<code_scheme name="Project" version="173">
|
|
3
|
-
<HTMLCodeStyleSettings>
|
|
4
|
-
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
|
|
5
|
-
</HTMLCodeStyleSettings>
|
|
6
|
-
<JSCodeStyleSettings version="0">
|
|
7
|
-
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
8
|
-
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
9
|
-
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
10
|
-
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
11
|
-
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
|
12
|
-
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
13
|
-
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
14
|
-
</JSCodeStyleSettings>
|
|
15
|
-
<TypeScriptCodeStyleSettings version="0">
|
|
16
|
-
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
17
|
-
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
18
|
-
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
19
|
-
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
20
|
-
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
|
21
|
-
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
22
|
-
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
23
|
-
</TypeScriptCodeStyleSettings>
|
|
24
|
-
<VueCodeStyleSettings>
|
|
25
|
-
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
|
|
26
|
-
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
|
|
27
|
-
</VueCodeStyleSettings>
|
|
28
|
-
<codeStyleSettings language="HTML">
|
|
29
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
30
|
-
<indentOptions>
|
|
31
|
-
<option name="INDENT_SIZE" value="2" />
|
|
32
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
33
|
-
<option name="TAB_SIZE" value="2" />
|
|
34
|
-
</indentOptions>
|
|
35
|
-
</codeStyleSettings>
|
|
36
|
-
<codeStyleSettings language="JavaScript">
|
|
37
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
38
|
-
<indentOptions>
|
|
39
|
-
<option name="INDENT_SIZE" value="2" />
|
|
40
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
41
|
-
<option name="TAB_SIZE" value="2" />
|
|
42
|
-
</indentOptions>
|
|
43
|
-
</codeStyleSettings>
|
|
44
|
-
<codeStyleSettings language="TypeScript">
|
|
45
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
46
|
-
<indentOptions>
|
|
47
|
-
<option name="INDENT_SIZE" value="2" />
|
|
48
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
49
|
-
<option name="TAB_SIZE" value="2" />
|
|
50
|
-
</indentOptions>
|
|
51
|
-
</codeStyleSettings>
|
|
52
|
-
<codeStyleSettings language="Vue">
|
|
53
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
54
|
-
<indentOptions>
|
|
55
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
56
|
-
</indentOptions>
|
|
57
|
-
</codeStyleSettings>
|
|
58
|
-
</code_scheme>
|
|
59
|
-
</component>
|
package/.idea/modules.xml
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<project version="4">
|
|
3
|
-
<component name="ProjectModuleManager">
|
|
4
|
-
<modules>
|
|
5
|
-
<module fileurl="file://$PROJECT_DIR$/.idea/250218_nodejs_core.iml" filepath="$PROJECT_DIR$/.idea/250218_nodejs_core.iml" />
|
|
6
|
-
</modules>
|
|
7
|
-
</component>
|
|
8
|
-
</project>
|
package/.idea/prettier.xml
DELETED