drapcode-utility 1.2.7 → 1.2.9
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/build/utils/query-parser.js +20 -14
- package/build/utils/query-paser-new.js +17 -11
- package/package.json +3 -3
|
@@ -488,20 +488,26 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
|
|
|
488
488
|
if (fieldType &&
|
|
489
489
|
!requiredExternal &&
|
|
490
490
|
["dynamic_option", "reference", "static_option", "belongsTo"].includes(fieldType)) {
|
|
491
|
-
|
|
492
|
-
//
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
491
|
+
//Todo: Remove if filter is working properly
|
|
492
|
+
// return value === CURRENT_USER ? currentUser["uuid"] : value;
|
|
493
|
+
var refCollection = query.refCollection, refField = query.refField;
|
|
494
|
+
var finalValue = "";
|
|
495
|
+
if (["dynamic_option", "static_option"].includes(fieldType)) {
|
|
496
|
+
if (!value) {
|
|
497
|
+
if (refCollection === drapcode_constant_1.CURRENT_USER) {
|
|
498
|
+
finalValue = currentUser[refField];
|
|
499
|
+
}
|
|
500
|
+
if (refCollection === drapcode_constant_1.CURRENT_TENANT) {
|
|
501
|
+
finalValue = currentTenant[refField];
|
|
502
|
+
}
|
|
503
|
+
}
|
|
504
|
+
}
|
|
505
|
+
if (value === drapcode_constant_1.CURRENT_USER) {
|
|
506
|
+
finalValue = currentUser["uuid"];
|
|
507
|
+
}
|
|
508
|
+
if (!finalValue)
|
|
509
|
+
finalValue = value;
|
|
510
|
+
return finalValue;
|
|
505
511
|
}
|
|
506
512
|
if (fieldType &&
|
|
507
513
|
fieldType === "boolean" &&
|
|
@@ -550,17 +550,23 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
|
|
|
550
550
|
if (fieldType &&
|
|
551
551
|
!requiredExternal &&
|
|
552
552
|
["dynamic_option", "static_option", "reference"].includes(fieldType)) {
|
|
553
|
-
|
|
554
|
-
//
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
553
|
+
//Todo: Remove if filter is working properly
|
|
554
|
+
// return value === CURRENT_USER ? currentUser["uuid"] : value;
|
|
555
|
+
var refCollection = query.refCollection, refField = query.refField;
|
|
556
|
+
var finalValue = "";
|
|
557
|
+
if (["dynamic_option", "static_option"].includes(fieldType)) {
|
|
558
|
+
if (!value) {
|
|
559
|
+
if (refCollection === drapcode_constant_1.CURRENT_USER) {
|
|
560
|
+
finalValue = currentUser[refField];
|
|
561
|
+
}
|
|
562
|
+
}
|
|
563
|
+
}
|
|
564
|
+
if (value === drapcode_constant_1.CURRENT_USER) {
|
|
565
|
+
finalValue = currentUser["uuid"];
|
|
566
|
+
}
|
|
567
|
+
if (!finalValue)
|
|
568
|
+
finalValue = value;
|
|
569
|
+
return finalValue;
|
|
564
570
|
}
|
|
565
571
|
if (fieldType &&
|
|
566
572
|
fieldType === "boolean" &&
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "drapcode-utility",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.9",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
"@types/express": "^4.17.7",
|
|
33
33
|
"@types/voca": "^1.4.2",
|
|
34
34
|
"axios": "^1.1.2",
|
|
35
|
-
"drapcode-constant": "^1.2.
|
|
36
|
-
"drapcode-logger": "^1.0.
|
|
35
|
+
"drapcode-constant": "^1.2.9",
|
|
36
|
+
"drapcode-logger": "^1.0.7",
|
|
37
37
|
"drapcode-redis": "^1.0.4",
|
|
38
38
|
"express": "^4.17.1",
|
|
39
39
|
"lodash": "^4.17.21",
|