@qrvey/filters 0.0.5 → 0.0.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/CHANGELOG.md +6 -0
- package/dist/cjs/helpers/filter-adapt.helpers.d.ts.map +1 -1
- package/dist/cjs/helpers/filter-adapt.helpers.js +31 -31
- package/dist/helpers/filter-adapt.helpers.d.ts.map +1 -1
- package/dist/helpers/filter-adapt.helpers.js +31 -31
- package/package.json +1 -1
- package/src/helpers/filter-adapt.helpers.ts +32 -33
package/CHANGELOG.md
CHANGED
|
@@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
|
|
|
4
4
|
|
|
5
5
|
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
6
6
|
|
|
7
|
+
#### [v0.0.6](https://bitbucket.org/qrvey/qrvey_filters/compare/v0.0.6..v0.0.5)
|
|
8
|
+
|
|
9
|
+
- bug: :bug: adjusted validations to adapt the legacy filters to filters [`f9d2dec`](https://bitbucket.org/qrvey/qrvey_filters/commits/f9d2deca17ddfd9831822dabaff146063355d445)
|
|
10
|
+
|
|
7
11
|
#### [v0.0.5](https://bitbucket.org/qrvey/qrvey_filters/compare/v0.0.5..v0.0.4)
|
|
8
12
|
|
|
13
|
+
> 19 April 2024
|
|
14
|
+
|
|
9
15
|
- feat: added adapter for converting legacy to filters [`b2d49ff`](https://bitbucket.org/qrvey/qrvey_filters/commits/b2d49ff538333fae25fda595342f359186648096)
|
|
10
16
|
- ci: upgraded Qrvey Utils and set to build commonjs [`23af6af`](https://bitbucket.org/qrvey/qrvey_filters/commits/23af6af7166111bdcc71beaf7d17d4206c1d00d6)
|
|
11
17
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-adapt.helpers.d.ts","sourceRoot":"","sources":["../../../src/helpers/filter-adapt.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,QAAQ,EACR,OAAO,EAMR,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"filter-adapt.helpers.d.ts","sourceRoot":"","sources":["../../../src/helpers/filter-adapt.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,QAAQ,EACR,OAAO,EAMR,MAAM,cAAc,CAAC;AAMtB,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAIpF,OAAO,EAGL,aAAa,EAGd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAkB,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzE;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAAE,EAClB,QAAQ,GAAE,QAAQ,EAAO,EACzB,gBAAgB,CAAC,EAAE,4BAA4B,GAC9C,aAAa,GAAG,SAAS,CAM3B;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAAE,EAClB,QAAQ,GAAE,QAAQ,EAAO,EACzB,gBAAgB,CAAC,EAAE,4BAA4B,GAC9C,OAAO,GAAG,SAAS,CASrB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,EAAE,CAyCnE"}
|
|
@@ -51,39 +51,39 @@ function legacyVisualToFilter(filterData) {
|
|
|
51
51
|
return [];
|
|
52
52
|
const filters = [];
|
|
53
53
|
filterData.scopes.forEach((scope) => {
|
|
54
|
-
if (scope.datasets.length
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
filters.push(fFilter);
|
|
54
|
+
if (scope.datasets.length === 0)
|
|
55
|
+
return;
|
|
56
|
+
scope.datasets.forEach((dataset) => {
|
|
57
|
+
if (dataset.filters.length === 0)
|
|
58
|
+
return;
|
|
59
|
+
dataset.filters.forEach((filter) => {
|
|
60
|
+
const fFilter = FilterBuilder_1.FilterBuilder.createFilter({
|
|
61
|
+
aggregateType: filter.column.aggregate,
|
|
62
|
+
collapsed: filter.collapsed,
|
|
63
|
+
columnId: filter.column.id,
|
|
64
|
+
columnType: filter.column.type,
|
|
65
|
+
customLabel: filter.extras.filterLabel,
|
|
66
|
+
datasetId: dataset.qrveyid,
|
|
67
|
+
deletable: filter.deletable,
|
|
68
|
+
displayed: filter.displayed,
|
|
69
|
+
editable: filter.editable,
|
|
70
|
+
enableable: filter.enableable,
|
|
71
|
+
enabled: filter.enabled,
|
|
72
|
+
extras: filter.extras,
|
|
73
|
+
grouping: filter.property,
|
|
74
|
+
id: "",
|
|
75
|
+
lookupDisplayIndex: filter.lookupDisplayIndex,
|
|
76
|
+
operator: filter.operator,
|
|
77
|
+
scope: scope.scope,
|
|
78
|
+
scopeId: scope.scopeid,
|
|
79
|
+
section: filterData.section,
|
|
80
|
+
selectAll: filter.selectAll,
|
|
81
|
+
validator: filter.validator,
|
|
82
|
+
values: filter.values,
|
|
84
83
|
});
|
|
84
|
+
filters.push(fFilter);
|
|
85
85
|
});
|
|
86
|
-
}
|
|
86
|
+
});
|
|
87
87
|
});
|
|
88
88
|
return filters;
|
|
89
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-adapt.helpers.d.ts","sourceRoot":"","sources":["../../src/helpers/filter-adapt.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,QAAQ,EACR,OAAO,EAMR,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"filter-adapt.helpers.d.ts","sourceRoot":"","sources":["../../src/helpers/filter-adapt.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,QAAQ,EACR,OAAO,EAMR,MAAM,cAAc,CAAC;AAMtB,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAIpF,OAAO,EAGL,aAAa,EAGd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAkB,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzE;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAAE,EAClB,QAAQ,GAAE,QAAQ,EAAO,EACzB,gBAAgB,CAAC,EAAE,4BAA4B,GAC9C,aAAa,GAAG,SAAS,CAM3B;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAAE,EAClB,QAAQ,GAAE,QAAQ,EAAO,EACzB,gBAAgB,CAAC,EAAE,4BAA4B,GAC9C,OAAO,GAAG,SAAS,CASrB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,EAAE,CAyCnE"}
|
|
@@ -46,39 +46,39 @@ export function legacyVisualToFilter(filterData) {
|
|
|
46
46
|
return [];
|
|
47
47
|
const filters = [];
|
|
48
48
|
filterData.scopes.forEach((scope) => {
|
|
49
|
-
if (scope.datasets.length
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
filters.push(fFilter);
|
|
49
|
+
if (scope.datasets.length === 0)
|
|
50
|
+
return;
|
|
51
|
+
scope.datasets.forEach((dataset) => {
|
|
52
|
+
if (dataset.filters.length === 0)
|
|
53
|
+
return;
|
|
54
|
+
dataset.filters.forEach((filter) => {
|
|
55
|
+
const fFilter = FilterBuilder.createFilter({
|
|
56
|
+
aggregateType: filter.column.aggregate,
|
|
57
|
+
collapsed: filter.collapsed,
|
|
58
|
+
columnId: filter.column.id,
|
|
59
|
+
columnType: filter.column.type,
|
|
60
|
+
customLabel: filter.extras.filterLabel,
|
|
61
|
+
datasetId: dataset.qrveyid,
|
|
62
|
+
deletable: filter.deletable,
|
|
63
|
+
displayed: filter.displayed,
|
|
64
|
+
editable: filter.editable,
|
|
65
|
+
enableable: filter.enableable,
|
|
66
|
+
enabled: filter.enabled,
|
|
67
|
+
extras: filter.extras,
|
|
68
|
+
grouping: filter.property,
|
|
69
|
+
id: "",
|
|
70
|
+
lookupDisplayIndex: filter.lookupDisplayIndex,
|
|
71
|
+
operator: filter.operator,
|
|
72
|
+
scope: scope.scope,
|
|
73
|
+
scopeId: scope.scopeid,
|
|
74
|
+
section: filterData.section,
|
|
75
|
+
selectAll: filter.selectAll,
|
|
76
|
+
validator: filter.validator,
|
|
77
|
+
values: filter.values,
|
|
79
78
|
});
|
|
79
|
+
filters.push(fFilter);
|
|
80
80
|
});
|
|
81
|
-
}
|
|
81
|
+
});
|
|
82
82
|
});
|
|
83
83
|
return filters;
|
|
84
84
|
}
|
package/package.json
CHANGED
|
@@ -13,9 +13,11 @@ import {
|
|
|
13
13
|
import { getColumnInfo, getDatasetInfo } from "./utils.helpers";
|
|
14
14
|
|
|
15
15
|
import { FilterBuilder } from "../classes/FilterBuilder";
|
|
16
|
+
import { IFilterGrouping } from "../resources/filter-grouping.resources";
|
|
16
17
|
import { IFilterPanelInteractiveTable } from "../resources/filter-panel.interfaces";
|
|
17
18
|
import { FILTER_SCOPE } from "../resources/filter-scopes.resources";
|
|
18
19
|
import { FILTER_SECTION } from "../resources/filter-sections.resources";
|
|
20
|
+
import { IFilterValue } from "../resources/filter-values.resources";
|
|
19
21
|
import {
|
|
20
22
|
DEFAULT_UI_FILTER,
|
|
21
23
|
IFilterUI,
|
|
@@ -24,8 +26,6 @@ import {
|
|
|
24
26
|
IFilterVisualScope,
|
|
25
27
|
} from "../resources/filter-visual.resources";
|
|
26
28
|
import { DEFAULT_FILTER, IFilter } from "../resources/filters.resources";
|
|
27
|
-
import { IFilterGrouping } from "../resources/filter-grouping.resources";
|
|
28
|
-
import { IFilterValue } from "../resources/filter-values.resources";
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
31
|
* Generates a visual filter structure from the filter collection.
|
|
@@ -79,39 +79,38 @@ export function legacyVisualToFilter(filterData: IFUData): IFilter[] {
|
|
|
79
79
|
const filters: IFilter[] = [];
|
|
80
80
|
|
|
81
81
|
filterData.scopes.forEach((scope: IFUScope) => {
|
|
82
|
-
if (scope.datasets.length
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
});
|
|
110
|
-
|
|
111
|
-
filters.push(fFilter);
|
|
82
|
+
if (scope.datasets.length === 0) return;
|
|
83
|
+
scope.datasets.forEach((dataset: IFUDataset) => {
|
|
84
|
+
if (dataset.filters.length === 0) return;
|
|
85
|
+
dataset.filters.forEach((filter) => {
|
|
86
|
+
const fFilter = FilterBuilder.createFilter({
|
|
87
|
+
aggregateType: filter.column.aggregate,
|
|
88
|
+
collapsed: filter.collapsed,
|
|
89
|
+
columnId: filter.column.id,
|
|
90
|
+
columnType: filter.column.type,
|
|
91
|
+
customLabel: filter.extras.filterLabel,
|
|
92
|
+
datasetId: dataset.qrveyid,
|
|
93
|
+
deletable: filter.deletable,
|
|
94
|
+
displayed: filter.displayed,
|
|
95
|
+
editable: filter.editable,
|
|
96
|
+
enableable: filter.enableable,
|
|
97
|
+
enabled: filter.enabled,
|
|
98
|
+
extras: filter.extras,
|
|
99
|
+
grouping: filter.property as unknown as IFilterGrouping,
|
|
100
|
+
id: "",
|
|
101
|
+
lookupDisplayIndex: filter.lookupDisplayIndex,
|
|
102
|
+
operator: filter.operator,
|
|
103
|
+
scope: scope.scope,
|
|
104
|
+
scopeId: scope.scopeid,
|
|
105
|
+
section: filterData.section,
|
|
106
|
+
selectAll: filter.selectAll,
|
|
107
|
+
validator: filter.validator,
|
|
108
|
+
values: filter.values as unknown as IFilterValue[],
|
|
112
109
|
});
|
|
110
|
+
|
|
111
|
+
filters.push(fFilter);
|
|
113
112
|
});
|
|
114
|
-
}
|
|
113
|
+
});
|
|
115
114
|
});
|
|
116
115
|
|
|
117
116
|
return filters;
|