@gooddata/sdk-ui-dashboard 10.11.0-alpha.22 → 10.11.0-alpha.23
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/esm/__version.d.ts +1 -1
- package/esm/__version.js +1 -1
- package/esm/model/commandHandlers/dashboard/common/filterViews.d.ts.map +1 -1
- package/esm/model/commandHandlers/dashboard/common/filterViews.js +67 -27
- package/esm/model/commandHandlers/dashboard/common/filterViews.js.map +1 -1
- package/package.json +15 -15
package/esm/__version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "10.11.0-alpha.
|
|
1
|
+
export declare const LIB_VERSION = "10.11.0-alpha.23";
|
|
2
2
|
//# sourceMappingURL=__version.d.ts.map
|
package/esm/__version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterViews.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/common/filterViews.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,UAAU,EACV,oBAAoB,EAEpB,SAAS,EAGT,iBAAiB,EAIjB,cAAc,EACjB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"filterViews.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/common/filterViews.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,UAAU,EACV,oBAAoB,EAEpB,SAAS,EAGT,iBAAiB,EAIjB,cAAc,EACjB,MAAM,qBAAqB,CAAC;AAiE7B,eAAO,MAAM,4BAA4B,kBACtB,cAAc,qBACV,iBAAiB,EAAE,KACvC,cAuDF,CAAC;AAEF,wBAAgB,sBAAsB,CAClC,SAAS,EAAE,UAAU,EACrB,WAAW,EAAE,oBAAoB,EAAE,EACnC,QAAQ,EAAE,SAAS,GACpB,UAAU,CAcZ"}
|
|
@@ -15,38 +15,78 @@ const OMITTED_ATTRIBUTE_FILTER_PATHS = [
|
|
|
15
15
|
const hasSameAttributeFilterConfiguration = (filterA, filterB) => {
|
|
16
16
|
return isEqual(omit(filterA, OMITTED_ATTRIBUTE_FILTER_PATHS), omit(filterB, OMITTED_ATTRIBUTE_FILTER_PATHS));
|
|
17
17
|
};
|
|
18
|
+
const isCommonDateFilter = (filter) => isDashboardDateFilter(filter) && filter.dateFilter.dataSet === undefined;
|
|
19
|
+
const handleCommonDateFilter = (filterContextFilters, filterViewFilters, mergedFilters) => {
|
|
20
|
+
// If common date is set to All, it is not included in filter context filters.
|
|
21
|
+
// Common filter differs from date filters by not having date dataset (it is provided by widget).
|
|
22
|
+
const isCommonDateOriginallyOnAll = !filterContextFilters.some(isCommonDateFilter);
|
|
23
|
+
const nonAllCommonDateFilterFromView = filterViewFilters.find(isCommonDateFilter);
|
|
24
|
+
if (isCommonDateOriginallyOnAll && nonAllCommonDateFilterFromView) {
|
|
25
|
+
// inject value of common date from view to filter context to override filter context's All value
|
|
26
|
+
return [nonAllCommonDateFilterFromView, ...mergedFilters];
|
|
27
|
+
}
|
|
28
|
+
else if (!nonAllCommonDateFilterFromView) {
|
|
29
|
+
// set common date to All based on filter view
|
|
30
|
+
return mergedFilters.filter((filter) => !isCommonDateFilter(filter));
|
|
31
|
+
}
|
|
32
|
+
return mergedFilters;
|
|
33
|
+
};
|
|
18
34
|
export const changeFilterContextSelection = (filterContext, filterViewFilters) => {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
if (
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
},
|
|
31
|
-
};
|
|
32
|
-
}
|
|
35
|
+
const mergedFilters = filterContext.filters.map((filter) => {
|
|
36
|
+
if (isDashboardAttributeFilter(filter)) {
|
|
37
|
+
const viewFilter = findMatchingAttributeFilterByLocalIdentifier(filter, filterViewFilters);
|
|
38
|
+
if (viewFilter !== undefined && hasSameAttributeFilterConfiguration(filter, viewFilter)) {
|
|
39
|
+
return {
|
|
40
|
+
attributeFilter: {
|
|
41
|
+
...filter.attributeFilter,
|
|
42
|
+
attributeElements: viewFilter.attributeFilter.attributeElements,
|
|
43
|
+
negativeSelection: viewFilter.attributeFilter.negativeSelection,
|
|
44
|
+
},
|
|
45
|
+
};
|
|
33
46
|
}
|
|
34
47
|
else {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
to: viewFilter.dateFilter.to,
|
|
42
|
-
granularity: viewFilter.dateFilter.granularity,
|
|
43
|
-
type: viewFilter.dateFilter.type,
|
|
48
|
+
return {
|
|
49
|
+
// reset filter that has not been found in the view
|
|
50
|
+
attributeFilter: {
|
|
51
|
+
...filter.attributeFilter,
|
|
52
|
+
attributeElements: {
|
|
53
|
+
uris: [],
|
|
44
54
|
},
|
|
45
|
-
|
|
46
|
-
|
|
55
|
+
negativeSelection: true,
|
|
56
|
+
},
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
const viewFilter = findMatchingDateFilterByDataSet(filter, filterViewFilters);
|
|
62
|
+
if (viewFilter) {
|
|
63
|
+
return {
|
|
64
|
+
dateFilter: {
|
|
65
|
+
...filter.dateFilter,
|
|
66
|
+
from: viewFilter.dateFilter.from,
|
|
67
|
+
to: viewFilter.dateFilter.to,
|
|
68
|
+
granularity: viewFilter.dateFilter.granularity,
|
|
69
|
+
type: viewFilter.dateFilter.type,
|
|
70
|
+
},
|
|
71
|
+
};
|
|
47
72
|
}
|
|
48
|
-
|
|
49
|
-
|
|
73
|
+
else {
|
|
74
|
+
return {
|
|
75
|
+
// reset filter that has not been found in the view
|
|
76
|
+
dateFilter: {
|
|
77
|
+
...filter.dateFilter,
|
|
78
|
+
from: undefined,
|
|
79
|
+
to: undefined,
|
|
80
|
+
granularity: "GDC.time.date",
|
|
81
|
+
type: "relative",
|
|
82
|
+
},
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
return {
|
|
88
|
+
...filterContext,
|
|
89
|
+
filters: handleCommonDateFilter(filterContext.filters, filterViewFilters, mergedFilters),
|
|
50
90
|
};
|
|
51
91
|
};
|
|
52
92
|
export function applyDefaultFilterView(dashboard, filterViews, settings) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterViews.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/common/filterViews.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,EAGH,eAAe,EAEf,0BAA0B,EAI1B,qBAAqB,EACrB,eAAe,GAElB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,IAAI,MAAM,gBAAgB,CAAC;AAClC,OAAO,OAAO,MAAM,mBAAmB,CAAC;AAExC,MAAM,4CAA4C,GAAG,CACjD,MAAiC,EACjC,WAAgC,EACK,EAAE,CACvC,WAAW,CAAC,IAAI,CACZ,CAAC,IAAI,EAAE,EAAE,CACL,0BAA0B,CAAC,IAAI,CAAC;IAChC,IAAI,CAAC,eAAe,CAAC,eAAe,KAAK,MAAM,CAAC,eAAe,CAAC,eAAe,CACzD,CAAC;AAEnC,gFAAgF;AAChF,MAAM,+BAA+B,GAAG,CACpC,MAA4B,EAC5B,WAAgC,EACA,EAAE,CAClC,WAAW,CAAC,IAAI,CACZ,CAAC,IAAI,EAAE,EAAE,CACL,qBAAqB,CAAC,IAAI,CAAC;IAC3B,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,KAAK,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,KAAK,SAAS,CAAC;QAC/E,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CACvD,CAAC;AAE9B,MAAM,8BAA8B,GAAG;IACnC,mCAAmC;IACnC,mCAAmC;CACtC,CAAC;AAEF,MAAM,mCAAmC,GAAG,CACxC,OAAkC,EAClC,OAAmC,EACrC,EAAE;IACA,OAAO,OAAO,CACV,IAAI,CAAC,OAAO,EAAE,8BAA8B,CAAC,EAC7C,IAAI,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAChD,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"filterViews.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/dashboard/common/filterViews.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gooddata/sdk-ui-dashboard",
|
|
3
|
-
"version": "10.11.0-alpha.
|
|
3
|
+
"version": "10.11.0-alpha.23",
|
|
4
4
|
"description": "GoodData SDK - Dashboard Component",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -57,17 +57,17 @@
|
|
|
57
57
|
"ts-invariant": "^0.7.5",
|
|
58
58
|
"tslib": "^2.5.0",
|
|
59
59
|
"uuid": "^8.3.2",
|
|
60
|
-
"@gooddata/sdk-backend-base": "10.11.0-alpha.
|
|
61
|
-
"@gooddata/sdk-
|
|
62
|
-
"@gooddata/sdk-
|
|
63
|
-
"@gooddata/sdk-
|
|
64
|
-
"@gooddata/sdk-ui-filters": "10.11.0-alpha.
|
|
65
|
-
"@gooddata/sdk-
|
|
66
|
-
"@gooddata/sdk-ui-geo": "10.11.0-alpha.
|
|
67
|
-
"@gooddata/sdk-ui-kit": "10.11.0-alpha.
|
|
68
|
-
"@gooddata/
|
|
69
|
-
"@gooddata/
|
|
70
|
-
"@gooddata/sdk-ui-
|
|
60
|
+
"@gooddata/sdk-backend-base": "10.11.0-alpha.23",
|
|
61
|
+
"@gooddata/sdk-backend-spi": "10.11.0-alpha.23",
|
|
62
|
+
"@gooddata/sdk-model": "10.11.0-alpha.23",
|
|
63
|
+
"@gooddata/sdk-ui": "10.11.0-alpha.23",
|
|
64
|
+
"@gooddata/sdk-ui-filters": "10.11.0-alpha.23",
|
|
65
|
+
"@gooddata/sdk-ui-ext": "10.11.0-alpha.23",
|
|
66
|
+
"@gooddata/sdk-ui-geo": "10.11.0-alpha.23",
|
|
67
|
+
"@gooddata/sdk-ui-kit": "10.11.0-alpha.23",
|
|
68
|
+
"@gooddata/util": "10.11.0-alpha.23",
|
|
69
|
+
"@gooddata/sdk-ui-theme-provider": "10.11.0-alpha.23",
|
|
70
|
+
"@gooddata/sdk-ui-vis-commons": "10.11.0-alpha.23"
|
|
71
71
|
},
|
|
72
72
|
"peerDependencies": {
|
|
73
73
|
"react": "^16.10.0 || ^17.0.0 || ^18.0.0",
|
|
@@ -120,9 +120,9 @@
|
|
|
120
120
|
"typescript": "5.3.3",
|
|
121
121
|
"vitest": "1.0.4",
|
|
122
122
|
"vitest-dom": "0.1.1",
|
|
123
|
-
"@gooddata/i18n-toolkit": "10.11.0-alpha.
|
|
124
|
-
"@gooddata/reference-workspace": "10.11.0-alpha.
|
|
125
|
-
"@gooddata/sdk-backend-mockingbird": "10.11.0-alpha.
|
|
123
|
+
"@gooddata/i18n-toolkit": "10.11.0-alpha.23",
|
|
124
|
+
"@gooddata/reference-workspace": "10.11.0-alpha.23",
|
|
125
|
+
"@gooddata/sdk-backend-mockingbird": "10.11.0-alpha.23"
|
|
126
126
|
},
|
|
127
127
|
"scripts": {
|
|
128
128
|
"clean": "rm -rf ci dist esm coverage *.log styles/css tsconfig.tsbuildinfo",
|