@recursyve/nice-data-filter-kit 14.1.4 → 14.1.5
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/esm2020/lib/utils/query-params.utils.mjs +16 -2
- package/fesm2015/recursyve-nice-data-filter-kit.mjs +15 -1
- package/fesm2015/recursyve-nice-data-filter-kit.mjs.map +1 -1
- package/fesm2020/recursyve-nice-data-filter-kit.mjs +15 -1
- package/fesm2020/recursyve-nice-data-filter-kit.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@ import { HttpParams } from "@angular/common/http";
|
|
|
2
2
|
import { isNullOrUndefined } from "@recursyve/nice-ui-kit.v2";
|
|
3
3
|
export class QueryParamsUtils {
|
|
4
4
|
static hasFilterParameters(params) {
|
|
5
|
-
const keys = ["start", "length", "order", "search", "rules"];
|
|
5
|
+
const keys = ["start", "length", "order", "fallbackOrder", "search", "rules"];
|
|
6
6
|
return Object.keys(params).some(key => keys.includes(key));
|
|
7
7
|
}
|
|
8
8
|
static extractFilterParameters(params) {
|
|
@@ -21,6 +21,14 @@ export class QueryParamsUtils {
|
|
|
21
21
|
delete filters.order;
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
+
if (!isNullOrUndefined(params.fallbackOrder)) {
|
|
25
|
+
try {
|
|
26
|
+
filters.fallbackOrder = JSON.parse(params.fallbackOrder);
|
|
27
|
+
}
|
|
28
|
+
catch (e) {
|
|
29
|
+
delete filters.fallbackOrder;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
24
32
|
if (!isNullOrUndefined(params.search)) {
|
|
25
33
|
filters.search = params.search;
|
|
26
34
|
}
|
|
@@ -48,6 +56,12 @@ export class QueryParamsUtils {
|
|
|
48
56
|
else {
|
|
49
57
|
params.order = null;
|
|
50
58
|
}
|
|
59
|
+
if (!isNullOrUndefined(filterParameters.fallbackOrder)) {
|
|
60
|
+
params.fallbackOrder = JSON.stringify(filterParameters.fallbackOrder);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
params.fallbackOrder = null;
|
|
64
|
+
}
|
|
51
65
|
if (!isNullOrUndefined(filterParameters.search)) {
|
|
52
66
|
params.search = filterParameters.search;
|
|
53
67
|
}
|
|
@@ -67,4 +81,4 @@ export class QueryParamsUtils {
|
|
|
67
81
|
}).toString();
|
|
68
82
|
}
|
|
69
83
|
}
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktcGFyYW1zLnV0aWxzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmljZS1kYXRhLWZpbHRlci1raXQvc3JjL2xpYi91dGlscy9xdWVyeS1wYXJhbXMudXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRzlELE1BQU0sT0FBTyxnQkFBZ0I7SUFDbEIsTUFBTSxDQUFDLG1CQUFtQixDQUFDLE1BQThCO1FBQzVELE1BQU0sSUFBSSxHQUFHLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUM5RSxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFTSxNQUFNLENBQUMsdUJBQXVCLENBQUMsTUFBOEI7UUFDaEUsTUFBTSxPQUFPLEdBQTBCLEVBQUUsQ0FBQztRQUMxQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ2xDLE9BQU8sQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztTQUN4QztRQUNELElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDbkMsT0FBTyxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1NBQzFDO1FBQ0QsSUFBSSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNs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QUMsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxJQUFJLFVBQVUsQ0FBQztZQUNsQixVQUFVLEVBQUUsR0FBRztTQUNsQixDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDbEIsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cFBhcmFtcyB9IGZyb20gXCJAYW5ndWxhci9jb21tb24vaHR0cFwiO1xuaW1wb3J0IHsgaXNOdWxsT3JVbmRlZmluZWQgfSBmcm9tIFwiQHJlY3Vyc3l2ZS9uaWNlLXVpLWtpdC52MlwiO1xuaW1wb3J0IHsgRmlsdGVyUGFyYW1ldGVyc01vZGVsIH0gZnJvbSBcIi4uL21vZGVscy9maWx0ZXIubW9kZWxcIjtcblxuZXhwb3J0IGNsYXNzIFF1ZXJ5UGFyYW1zVXRpbHMge1xuICAgIHB1YmxpYyBzdGF0aWMgaGFzRmlsdGVyUGFyYW1ldGVycyhwYXJhbXM6IHsgW2tleTogc3RyaW5nXTogYW55IH0pOiBib29sZWFuIHtcbiAgICAgICAgY29uc3Qga2V5cyA9IFtcInN0YXJ0XCIsIFwibGVuZ3RoXCIsIFwib3JkZXJcIiwgXCJmYWxsYmFja09yZGVyXCIsIFwic2VhcmNoXCIsIFwicnVsZXNcIl07XG4gICAgICAgIHJldHVybiBPYmplY3Qua2V5cyhwYXJhbXMpLnNvbWUoa2V5ID0+IGtleXMuaW5jbHVkZXMoa2V5KSk7XG4gICAgfVxuXG4gICAgcHVibGljIHN0YXRpYyBleHRyYWN0RmlsdGVyUGFyYW1ldGVycyhwYXJhbXM6IHsgW2tleTogc3RyaW5nXTogYW55IH0pOiBGaWx0ZXJQYXJhbWV0ZXJzTW9kZWwge1xuICAgICAgICBjb25zdCBmaWx0ZXJzOiBGaWx0ZXJQYXJhbWV0ZXJzTW9kZWwgPSB7fTtcbiAgICAgICAgaWYgKCFpc051bGxPclVuZGVmaW5lZChwYXJhbXMuc3RhcnQpKSB7XG4gICAgICAgICAgICBmaWx0ZXJzLnN0YXJ0ID0gTnVtYmVyKHBhcmFtcy5zdGFydCk7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKCFpc051bGxPclVuZGVmaW5lZChwYXJhbXMubGVuZ3RoKSkge1xuICAgICAgICAgICAgZmlsdGVycy5sZW5ndGggPSBOdW1iZXIocGFyYW1zLmxlbmd0aCk7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKCFpc051bGxPclVuZGVmaW5lZChwYXJhbXMub3JkZXIpKSB7XG4gICAgICAgICAgICB0cnkge1xuICAgICAgICAgICAgICAgIGZpbHRlcnMub3JkZXIgPSBKU09OLnBhcnNlKHBhcmFtcy5vcmRlcik7XG4gICAgICAgICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgICAgICAgICAgZGVsZXRlIGZpbHRlcnMub3JkZXI7XG4gICAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgICAgaWYgKCFpc051bGxPclVuZGVmaW5lZChwYXJhbXMuZmFsbGJhY2tPcmRlcikpIHtcbiAgICAgICAgICAgIHRyeSB7XG4gICAgICAgICAgICAgICAgZmlsdGVycy5mYWxsYmFja09yZGVyID0gSlNPTi5wYXJzZShwYXJhbXMuZmFsbGJhY2tPcmRlcik7XG4gICAgICAgICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgICAgICAgICAgZGVsZXRlIGZpbHRlcnMuZmFsbGJhY2tPcmRlcjtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgICAgICBpZiAoIWlzTnVsbE9yVW5kZWZpbmVkKHBhcmFtcy5zZWFyY2gpKSB7XG4gICAgICAgICAgICBmaWx0ZXJzLnNlYXJjaCA9IHBhcmFtcy5zZWFyY2g7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKCFpc051bGxPclVuZGVmaW5lZChwYXJhbXMucnVsZXMpKSB7XG4gICAgICAgICAgICB0cnkge1xuICAgICAgICAgICAgICAgIGZpbHRlcnMucnVsZXMgPSBKU09OLnBhcnNlKHBhcmFtcy5ydWxlcyk7XG4gICAgICAgICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgICAgICAgICAgZGVsZXRlIGZpbHRlcnMucnVsZXM7XG4gICAgICAgICAgICB9XG4gICAgICAgIH1cblxuICAgICAgICByZXR1cm4gZmlsdGVycztcbiAgICB9XG5cbiAgICBwdWJsaWMgc3RhdGljIGZpbHRlclBhcmFtZXRlcnNUb1BhcmFtc01hcChmaWx0ZXJQYXJhbWV0ZXJzOiBGaWx0ZXJQYXJhbWV0ZXJzTW9kZWwpOiB7IFtrZXk6IHN0cmluZ106IGFueSB9IHtcbiAgICAgICAgY29uc3QgcGFyYW1zOiB7IFtrZXk6IHN0cmluZ106IGFueSB9ID0ge307XG4gICAgICAgIGlmICghaXNOdWxsT3JVbmRlZmluZWQoZmlsdGVyUGFyYW1ldGVycy5zdGFydCkpIHtcbiAgICAgICAgICAgIHBhcmFtcy5zdGFydCA9IGZpbHRlclBhcmFtZXRlcnMuc3RhcnQ7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKCFpc051bGxPclVuZGVmaW5lZChmaWx0ZXJQYXJhbWV0ZXJzLmxlbmd0aCkpIHtcbiAgICAgICAgICAgIHBhcmFtcy5sZW5ndGggPSBmaWx0ZXJQYXJhbWV0ZXJzLmxlbmd0aDtcbiAgICAgICAgfVxuICAgICAgICBpZiAoIWlzTnVsbE9yVW5kZWZpbmVkKGZpbHRlclBhcmFtZXRlcnMub3JkZXIpKSB7XG4gICAgICAgICAgICBwYXJhbXMub3JkZXIgPSBKU09OLnN0cmluZ2lmeShmaWx0ZXJQYXJhbWV0ZXJzLm9yZGVyKTtcbiAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgIHBhcmFtcy5vcmRlciA9IG51bGw7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKCFpc051bGxPclVuZGVmaW5lZChmaWx0ZXJQYXJhbWV0ZXJzLmZhbGxiYWNrT3JkZXIpKSB7XG4gICAgICAgICAgICBwYXJhbXMuZmFsbGJhY2tPcmRlciA9IEpTT04uc3RyaW5naWZ5KGZpbHRlclBhcmFtZXRlcnMuZmFsbGJhY2tPcmRlcik7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICBwYXJhbXMuZmFsbGJhY2tPcmRlciA9IG51bGw7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKCFpc051bGxPclVuZGVmaW5lZChmaWx0ZXJQYXJhbWV0ZXJzLnNlYXJjaCkpIHtcbiAgICAgICAgICAgIHBhcmFtcy5zZWFyY2ggPSBmaWx0ZXJQYXJhbWV0ZXJzLnNlYXJjaDtcbiAgICAgICAgfVxuICAgICAgICBpZiAoIWlzTnVsbE9yVW5kZWZpbmVkKGZpbHRlclBhcmFtZXRlcnMucnVsZXMpKSB7XG4gICAgICAgICAgICBwYXJhbXMucnVsZXMgPSBKU09OLnN0cmluZ2lmeShmaWx0ZXJQYXJhbWV0ZXJzLnJ1bGVzKTtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiBwYXJhbXM7XG4gICAgfVxuXG4gICAgcHVibGljIHN0YXRpYyBmcm9tT2JqZWN0KG9iajogYW55KTogc3RyaW5nIHtcbiAgICAgICAgT2JqZWN0LmVudHJpZXMob2JqKS5mb3JFYWNoKChba2V5LCB2YWx1ZV0pID0+IHtcbiAgICAgICAgICAgIGlmICh2YWx1ZSA9PT0gdW5kZWZpbmVkKSB7XG4gICAgICAgICAgICAgICAgZGVsZXRlIG9ialtrZXldO1xuICAgICAgICAgICAgfVxuICAgICAgICB9KTtcbiAgICAgICAgcmV0dXJuIG5ldyBIdHRwUGFyYW1zKHtcbiAgICAgICAgICAgIGZyb21PYmplY3Q6IG9ialxuICAgICAgICB9KS50b1N0cmluZygpO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -58,7 +58,7 @@ import { MatBadgeModule } from '@angular/material/badge';
|
|
|
58
58
|
|
|
59
59
|
class QueryParamsUtils {
|
|
60
60
|
static hasFilterParameters(params) {
|
|
61
|
-
const keys = ["start", "length", "order", "search", "rules"];
|
|
61
|
+
const keys = ["start", "length", "order", "fallbackOrder", "search", "rules"];
|
|
62
62
|
return Object.keys(params).some(key => keys.includes(key));
|
|
63
63
|
}
|
|
64
64
|
static extractFilterParameters(params) {
|
|
@@ -77,6 +77,14 @@ class QueryParamsUtils {
|
|
|
77
77
|
delete filters.order;
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
|
+
if (!isNullOrUndefined(params.fallbackOrder)) {
|
|
81
|
+
try {
|
|
82
|
+
filters.fallbackOrder = JSON.parse(params.fallbackOrder);
|
|
83
|
+
}
|
|
84
|
+
catch (e) {
|
|
85
|
+
delete filters.fallbackOrder;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
80
88
|
if (!isNullOrUndefined(params.search)) {
|
|
81
89
|
filters.search = params.search;
|
|
82
90
|
}
|
|
@@ -104,6 +112,12 @@ class QueryParamsUtils {
|
|
|
104
112
|
else {
|
|
105
113
|
params.order = null;
|
|
106
114
|
}
|
|
115
|
+
if (!isNullOrUndefined(filterParameters.fallbackOrder)) {
|
|
116
|
+
params.fallbackOrder = JSON.stringify(filterParameters.fallbackOrder);
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
params.fallbackOrder = null;
|
|
120
|
+
}
|
|
107
121
|
if (!isNullOrUndefined(filterParameters.search)) {
|
|
108
122
|
params.search = filterParameters.search;
|
|
109
123
|
}
|