@gooddata/sdk-ui-dashboard 10.35.0-alpha.22 → 10.35.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/presentation/filterBar/filterBar/hooks/useResetFiltersButton.d.ts.map +1 -1
- package/esm/presentation/filterBar/filterBar/hooks/useResetFiltersButton.js +20 -4
- package/esm/presentation/filterBar/filterBar/hooks/useResetFiltersButton.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.35.0-alpha.
|
|
1
|
+
export declare const LIB_VERSION = "10.35.0-alpha.23";
|
|
2
2
|
//# sourceMappingURL=__version.d.ts.map
|
package/esm/__version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useResetFiltersButton.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/filterBar/filterBar/hooks/useResetFiltersButton.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useResetFiltersButton.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/filterBar/filterBar/hooks/useResetFiltersButton.ts"],"names":[],"mappings":"AAkDA;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,QAAO;IACrC,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,KAAK,GAAG,aAAa,CAAC;IACjC,YAAY,EAAE,MAAM,IAAI,CAAC;CAmJ5B,CAAC"}
|
|
@@ -3,9 +3,18 @@ import React from "react";
|
|
|
3
3
|
import isEqual from "lodash/isEqual.js";
|
|
4
4
|
import partition from "lodash/partition.js";
|
|
5
5
|
import difference from "lodash/difference.js";
|
|
6
|
-
import { dashboardFilterLocalIdentifier, isDashboardAttributeFilter, isDashboardCommonDateFilter, isDashboardDateFilter, newAllTimeDashboardDateFilter, } from "@gooddata/sdk-model";
|
|
6
|
+
import { dashboardFilterLocalIdentifier, isDashboardAttributeFilter, isDashboardCommonDateFilter, isDashboardDateFilter, newAllTimeDashboardDateFilter, isAllTimeDashboardDateFilter, } from "@gooddata/sdk-model";
|
|
7
7
|
import { changeFilterContextSelection, removeAttributeFilters, selectEnableKDCrossFiltering, selectFilterContextFilters, selectIsInEditMode, selectOriginalFilterContextFilters, selectSupportsCrossFiltering, drillActions, useDashboardDispatch, useDashboardSelector, useDashboardUserInteraction, selectDisableDashboardCrossFiltering, selectDisableDashboardUserFilterReset, selectIsDisabledCrossFiltering, selectIsDisableUserFilterReset, selectIsWorkingFilterContextChanged, resetFilterContextWorkingSelection, selectEnableDateFilterIdentifiers, selectIsApplyFiltersAllAtOnceEnabledAndSet, } from "../../../../model/index.js";
|
|
8
8
|
import { generateDateFilterLocalIdentifier } from "@gooddata/sdk-backend-base";
|
|
9
|
+
const normalizeFiltersForComparison = (filters) => {
|
|
10
|
+
// Remove any "all time" common date filters to normalize the comparison
|
|
11
|
+
return filters.filter((filter) => {
|
|
12
|
+
if (isDashboardCommonDateFilter(filter)) {
|
|
13
|
+
return !isDashboardDateFilter(filter) || !isAllTimeDashboardDateFilter(filter);
|
|
14
|
+
}
|
|
15
|
+
return true;
|
|
16
|
+
});
|
|
17
|
+
};
|
|
9
18
|
/**
|
|
10
19
|
* @returns tuple with two items:
|
|
11
20
|
* - a boolean specifying if the reset option makes sense for a given state (i.e. if the button should be visible)
|
|
@@ -58,17 +67,24 @@ export const useResetFiltersButton = () => {
|
|
|
58
67
|
})
|
|
59
68
|
: currentFilters;
|
|
60
69
|
}, [enableDateFilterIdentifiers, originalFilters, currentFilters]);
|
|
70
|
+
// Normalize filters for comparison to handle "all time" common date filters consistently
|
|
71
|
+
const normalizedCurrentFilters = React.useMemo(() => {
|
|
72
|
+
return normalizeFiltersForComparison(sanitizedCurrentFilters);
|
|
73
|
+
}, [sanitizedCurrentFilters]);
|
|
74
|
+
const normalizedOriginalFilters = React.useMemo(() => {
|
|
75
|
+
return normalizeFiltersForComparison(originalFilters);
|
|
76
|
+
}, [originalFilters]);
|
|
61
77
|
const canReset = React.useMemo(() => {
|
|
62
78
|
return (!isEditMode &&
|
|
63
|
-
((!isEqual(
|
|
79
|
+
((!isEqual(normalizedCurrentFilters, normalizedOriginalFilters) &&
|
|
64
80
|
// If the cross filter add some filters, we should allow the reset
|
|
65
81
|
((!disableUserFilterReset && !disableUserFilterResetByConfig) ||
|
|
66
82
|
newlyAddedFiltersLocalIds.length > 0)) ||
|
|
67
83
|
(!!isWorkingFilterContextChanged && isApplyAllAtOnceEnabledAndSet)));
|
|
68
84
|
}, [
|
|
69
85
|
isEditMode,
|
|
70
|
-
|
|
71
|
-
|
|
86
|
+
normalizedCurrentFilters,
|
|
87
|
+
normalizedOriginalFilters,
|
|
72
88
|
disableUserFilterReset,
|
|
73
89
|
disableUserFilterResetByConfig,
|
|
74
90
|
newlyAddedFiltersLocalIds.length,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useResetFiltersButton.js","sourceRoot":"","sources":["../../../../../src/presentation/filterBar/filterBar/hooks/useResetFiltersButton.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,UAAU,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EACH,8BAA8B,EAG9B,0BAA0B,EAC1B,2BAA2B,EAC3B,qBAAqB,EACrB,6BAA6B,
|
|
1
|
+
{"version":3,"file":"useResetFiltersButton.js","sourceRoot":"","sources":["../../../../../src/presentation/filterBar/filterBar/hooks/useResetFiltersButton.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.35.0-alpha.
|
|
3
|
+
"version": "10.35.0-alpha.23",
|
|
4
4
|
"description": "GoodData SDK - Dashboard Component",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -60,17 +60,17 @@
|
|
|
60
60
|
"@codemirror/language": "~6.11.0",
|
|
61
61
|
"@lezer/highlight": "~1.2.1",
|
|
62
62
|
"@react-aria/interactions": "^3",
|
|
63
|
-
"@gooddata/sdk-backend-base": "10.35.0-alpha.
|
|
64
|
-
"@gooddata/sdk-backend-spi": "10.35.0-alpha.
|
|
65
|
-
"@gooddata/sdk-
|
|
66
|
-
"@gooddata/sdk-ui": "10.35.0-alpha.
|
|
67
|
-
"@gooddata/sdk-
|
|
68
|
-
"@gooddata/sdk-ui-
|
|
69
|
-
"@gooddata/sdk-ui-
|
|
70
|
-
"@gooddata/sdk-ui-kit": "10.35.0-alpha.
|
|
71
|
-
"@gooddata/
|
|
72
|
-
"@gooddata/sdk-ui-
|
|
73
|
-
"@gooddata/
|
|
63
|
+
"@gooddata/sdk-backend-base": "10.35.0-alpha.23",
|
|
64
|
+
"@gooddata/sdk-backend-spi": "10.35.0-alpha.23",
|
|
65
|
+
"@gooddata/sdk-model": "10.35.0-alpha.23",
|
|
66
|
+
"@gooddata/sdk-ui": "10.35.0-alpha.23",
|
|
67
|
+
"@gooddata/sdk-ui-ext": "10.35.0-alpha.23",
|
|
68
|
+
"@gooddata/sdk-ui-geo": "10.35.0-alpha.23",
|
|
69
|
+
"@gooddata/sdk-ui-filters": "10.35.0-alpha.23",
|
|
70
|
+
"@gooddata/sdk-ui-kit": "10.35.0-alpha.23",
|
|
71
|
+
"@gooddata/sdk-ui-theme-provider": "10.35.0-alpha.23",
|
|
72
|
+
"@gooddata/sdk-ui-vis-commons": "10.35.0-alpha.23",
|
|
73
|
+
"@gooddata/util": "10.35.0-alpha.23"
|
|
74
74
|
},
|
|
75
75
|
"peerDependencies": {
|
|
76
76
|
"react": "^16.10.0 || ^17.0.0 || ^18.0.0",
|
|
@@ -122,9 +122,9 @@
|
|
|
122
122
|
"typescript": "5.8.3",
|
|
123
123
|
"vitest": "3.0.8",
|
|
124
124
|
"vitest-dom": "0.1.1",
|
|
125
|
-
"@gooddata/i18n-toolkit": "10.35.0-alpha.
|
|
126
|
-
"@gooddata/reference-workspace": "10.35.0-alpha.
|
|
127
|
-
"@gooddata/sdk-backend-mockingbird": "10.35.0-alpha.
|
|
125
|
+
"@gooddata/i18n-toolkit": "10.35.0-alpha.23",
|
|
126
|
+
"@gooddata/reference-workspace": "10.35.0-alpha.23",
|
|
127
|
+
"@gooddata/sdk-backend-mockingbird": "10.35.0-alpha.23"
|
|
128
128
|
},
|
|
129
129
|
"scripts": {
|
|
130
130
|
"clean": "rm -rf ci dist esm coverage *.log styles/css tsconfig.tsbuildinfo",
|