@boarteam/boar-pack-common-frontend 2.6.0-alpha.5 → 2.6.0-alpha.6
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@boarteam/boar-pack-common-frontend",
|
|
3
|
-
"version": "2.6.0-alpha.
|
|
3
|
+
"version": "2.6.0-alpha.6",
|
|
4
4
|
"description": "Common frontend package for Boar Pack",
|
|
5
5
|
"repository": "git@github.com:boarteam/boar-pack.git",
|
|
6
6
|
"author": "Andrew Balakirev <balakirev.andrey@gmail.com>",
|
|
@@ -26,7 +26,8 @@
|
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
28
|
"@nestjsx/crud-request": "^5.0.0-alpha.3",
|
|
29
|
-
"lodash": "^4.17.21"
|
|
29
|
+
"lodash": "^4.17.21",
|
|
30
|
+
"uuid": "^11.1.0"
|
|
30
31
|
},
|
|
31
32
|
"devDependencies": {
|
|
32
33
|
"@ant-design/icons": "^4.8.3",
|
|
@@ -46,5 +47,5 @@
|
|
|
46
47
|
"scripts": {
|
|
47
48
|
"yalc:push": "yalc push"
|
|
48
49
|
},
|
|
49
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "66eb6a7fdf64efc00aba0e65762919d878cd7762"
|
|
50
51
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CondOperator, QueryJoin, SCondition } from "@nestjsx/crud-request";
|
|
2
|
+
import { validate as uuidValidate } from 'uuid';
|
|
2
3
|
import { IWithId, TFilters, TSearchableColumn } from "./tableTypes";
|
|
3
4
|
import React, { Key } from "react";
|
|
4
5
|
import { TColumnsStates } from "./useColumnsSets";
|
|
@@ -20,7 +21,12 @@ export function getFiltersSearch({
|
|
|
20
21
|
let operator = col.filterOperator || col.operator;
|
|
21
22
|
let value = filters[colDataIndex] || baseFilters[colDataIndex];
|
|
22
23
|
filterKeys.delete(colDataIndex);
|
|
23
|
-
if (
|
|
24
|
+
if (
|
|
25
|
+
value === '' ||
|
|
26
|
+
value === undefined ||
|
|
27
|
+
col.numeric && !Number.isFinite(Number(value)) ||
|
|
28
|
+
col.uuid && (typeof value !== 'string' || !uuidValidate(value))
|
|
29
|
+
) {
|
|
24
30
|
return;
|
|
25
31
|
}
|
|
26
32
|
|
|
@@ -126,7 +132,10 @@ export function applyKeywordToSearch(
|
|
|
126
132
|
const field = col.searchField || (Array.isArray(col.field) ? col.field.join('.') : col.field);
|
|
127
133
|
const operator = col.operator;
|
|
128
134
|
|
|
129
|
-
|
|
135
|
+
const wrongNumeric = col.numeric && !Number.isFinite(Number(word));
|
|
136
|
+
const wrongUuid = col.uuid && (typeof word !== 'string' || !uuidValidate(word));
|
|
137
|
+
|
|
138
|
+
if (!wrongNumeric && !wrongUuid) {
|
|
130
139
|
keywordSearch.$or.push({ [field]: { [operator]: word } });
|
|
131
140
|
}
|
|
132
141
|
});
|