@gooddata/sdk-ui-dashboard 10.0.0-alpha.1 → 10.0.0-alpha.2
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/locales.js +1 -1
- package/esm/locales.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/dateFilter/removeDateFiltersHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/dateFilter/removeDateFiltersHandler.js +3 -2
- package/esm/model/commandHandlers/filterContext/dateFilter/removeDateFiltersHandler.js.map +1 -1
- package/esm/model/types/dateFilterTypes.d.ts +5 -3
- package/esm/model/types/dateFilterTypes.d.ts.map +1 -1
- package/esm/model/types/dateFilterTypes.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/AttributeFilterParentFilteringContext.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/AttributeFilterParentFilteringContext.js +2 -1
- package/esm/presentation/filterBar/attributeFilter/AttributeFilterParentFilteringContext.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/AttributeFilterConfiguration.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/AttributeFilterConfiguration.js +2 -2
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/AttributeFilterConfiguration.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFilterConfigurationState.d.ts +1 -0
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFilterConfigurationState.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFilterConfigurationState.js +37 -7
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFilterConfigurationState.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFiltersConfiguration.d.ts +3 -2
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFiltersConfiguration.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFiltersConfiguration.js +32 -20
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFiltersConfiguration.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/LimitValuesConfiguration.d.ts +3 -2
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/LimitValuesConfiguration.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/LimitValuesConfiguration.js +8 -5
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/LimitValuesConfiguration.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/AddLimitingItemDialog.d.ts +2 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/AddLimitingItemDialog.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/AddLimitingItemDialog.js +3 -3
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/AddLimitingItemDialog.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.d.ts +7 -4
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.js +14 -10
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.d.ts +2 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.js +3 -2
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.d.ts +4 -3
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.js +66 -12
- package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.js.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.d.ts +3 -3
- package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.d.ts.map +1 -1
- package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.js +40 -7
- package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.js.map +1 -1
- package/esm/presentation/localization/bundles/en-US.json +3 -3
- package/esm/sdk-ui-dashboard.d.ts +4 -2
- package/package.json +15 -15
|
@@ -15,12 +15,12 @@ const ALIGN_POINTS = [
|
|
|
15
15
|
offset: { x: -3, y: -63 },
|
|
16
16
|
},
|
|
17
17
|
];
|
|
18
|
-
export const AddLimitingItemDialog = ({ attributeTitle, currentlySelectedItems, parentFilters, validParentFilters, dependentDateFilters, availableDatasets, onSelect, onClose, }) => {
|
|
18
|
+
export const AddLimitingItemDialog = ({ attributeTitle, currentlySelectedItems, parentFilters, validParentFilters, dependentDateFilters, dependentCommonDateFilter, availableDatasets, onSelect, onClose, }) => {
|
|
19
19
|
const [page, setPage] = useState("options");
|
|
20
20
|
return (React.createElement(ConfigurationBubble, { alignTo: ".attribute-filter__limit__add-button", alignPoints: ALIGN_POINTS, onClose: onClose, classNames: "attribute-filter__limit__popup" },
|
|
21
21
|
page === "options" ? (React.createElement(ActionSelectionPage, { onAddFilters: () => setPage("filters"), onAddLimitingItems: () => setPage("items"), onClose: onClose })) : null,
|
|
22
|
-
page === "filters" ? (React.createElement(ParentFiltersPage, { attributeTitle: attributeTitle, parentFilters: parentFilters, validParentFilters: validParentFilters, onSelect: onSelect, onGoBack: () => setPage("options"), onClose: onClose, dependentDateFilters: dependentDateFilters, availableDatasets: availableDatasets, onCommonDateSelect: () => setPage("dates") })) : null,
|
|
22
|
+
page === "filters" ? (React.createElement(ParentFiltersPage, { attributeTitle: attributeTitle, parentFilters: parentFilters, validParentFilters: validParentFilters, onSelect: onSelect, onGoBack: () => setPage("options"), onClose: onClose, dependentDateFilters: dependentDateFilters, availableDatasets: availableDatasets, dependentCommonDateFilter: dependentCommonDateFilter, onCommonDateSelect: () => setPage("dates") })) : null,
|
|
23
23
|
page === "items" ? (React.createElement(LimitingItemsPage, { currentlySelectedItems: currentlySelectedItems, onSelect: onSelect, onGoBack: () => setPage("options"), onClose: onClose })) : null,
|
|
24
|
-
page === "dates" ? (React.createElement(DateFiltersPage, { onSelect: onSelect, onGoBack: () => setPage("options"), onClose: onClose, availableDatasets: availableDatasets, dependentDateFilters: dependentDateFilters })) : null));
|
|
24
|
+
page === "dates" ? (React.createElement(DateFiltersPage, { onSelect: onSelect, onGoBack: () => setPage("options"), onClose: onClose, availableDatasets: availableDatasets, dependentCommonDateFilter: dependentCommonDateFilter, dependentDateFilters: dependentDateFilters })) : null));
|
|
25
25
|
};
|
|
26
26
|
//# sourceMappingURL=AddLimitingItemDialog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddLimitingItemDialog.js","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/AddLimitingItemDialog.tsx"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAIxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,sEAAsE,CAAC;AAO3G,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,YAAY,GAAkB;IAChC;QACI,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;KAC3B;IACD;QACI,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;KAC5B;CACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"AddLimitingItemDialog.js","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/AddLimitingItemDialog.tsx"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAIxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,sEAAsE,CAAC;AAO3G,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,YAAY,GAAkB;IAChC;QACI,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;KAC3B;IACD;QACI,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;KAC5B;CACJ,CAAC;AAgBF,MAAM,CAAC,MAAM,qBAAqB,GAA0C,CAAC,EACzE,cAAc,EACd,sBAAsB,EACtB,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,EACzB,iBAAiB,EACjB,QAAQ,EACR,OAAO,GACV,EAAE,EAAE;IACD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAO,SAAS,CAAC,CAAC;IAElD,OAAO,CACH,oBAAC,mBAAmB,IAChB,OAAO,EAAC,sCAAsC,EAC9C,WAAW,EAAE,YAAY,EACzB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAC,gCAAgC;QAE1C,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAClB,oBAAC,mBAAmB,IAChB,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EACtC,kBAAkB,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAC1C,OAAO,EAAE,OAAO,GAClB,CACL,CAAC,CAAC,CAAC,IAAI;QACP,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAClB,oBAAC,iBAAiB,IACd,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAClC,OAAO,EAAE,OAAO,EAChB,oBAAoB,EAAE,oBAAoB,EAC1C,iBAAiB,EAAE,iBAAiB,EACpC,yBAAyB,EAAE,yBAAyB,EACpD,kBAAkB,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAC5C,CACL,CAAC,CAAC,CAAC,IAAI;QACP,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAChB,oBAAC,iBAAiB,IACd,sBAAsB,EAAE,sBAAsB,EAC9C,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAClC,OAAO,EAAE,OAAO,GAClB,CACL,CAAC,CAAC,CAAC,IAAI;QACP,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAChB,oBAAC,eAAe,IACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAClC,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,iBAAiB,EACpC,yBAAyB,EAAE,yBAAyB,EACpD,oBAAoB,EAAE,oBAAoB,GAC5C,CACL,CAAC,CAAC,CAAC,IAAI,CACU,CACzB,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -1,17 +1,20 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import { ICatalogDateDataset } from "@gooddata/sdk-model";
|
|
3
|
-
import { IDashboardDependentDateFilter } from "../../../../../../../model/index.js";
|
|
2
|
+
import { ICatalogDateDataset, IDashboardDateFilter } from "@gooddata/sdk-model";
|
|
4
3
|
import { ValuesLimitingItem } from "../../../../types.js";
|
|
4
|
+
import { IValuesLimitingItemWithTitle } from "../shared/limitingItemsHook.js";
|
|
5
|
+
import { IDashboardDependentDateFilter } from "../../../../../../../model/index.js";
|
|
5
6
|
export interface IDateFiltersPageProps {
|
|
6
7
|
availableDatasets: ICatalogDateDataset[];
|
|
8
|
+
dependentCommonDateFilter: IDashboardDateFilter;
|
|
7
9
|
dependentDateFilters: IDashboardDependentDateFilter[];
|
|
8
10
|
onSelect: (item: ValuesLimitingItem) => void;
|
|
9
11
|
onGoBack: () => void;
|
|
10
12
|
onClose: () => void;
|
|
11
13
|
}
|
|
12
14
|
interface IAttributeListItemProps {
|
|
13
|
-
item:
|
|
14
|
-
|
|
15
|
+
item: IValuesLimitingItemWithTitle;
|
|
16
|
+
onSelect: (item: ValuesLimitingItem) => void;
|
|
17
|
+
onClose: () => void;
|
|
15
18
|
}
|
|
16
19
|
declare const DateAttributeListItem: React.FC<IAttributeListItemProps>;
|
|
17
20
|
export default DateAttributeListItem;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateFiltersPage.d.ts","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"DateFiltersPage.d.ts","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAmB,MAAM,qBAAqB,CAAC;AAKjG,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,EAAE,4BAA4B,EAAsB,MAAM,gCAAgC,CAAC;AAClG,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAEpF,MAAM,WAAW,qBAAqB;IAClC,iBAAiB,EAAE,mBAAmB,EAAE,CAAC;IACzC,yBAAyB,EAAE,oBAAoB,CAAC;IAChD,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;IACtD,QAAQ,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC7C,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,UAAU,uBAAuB;IAC7B,IAAI,EAAE,4BAA4B,CAAC;IACnC,QAAQ,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC7C,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAQD,QAAA,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAkB5D,CAAC;AAEF,eAAe,qBAAqB,CAAC;AAErC,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAoC3D,CAAC"}
|
|
@@ -2,31 +2,35 @@
|
|
|
2
2
|
import React, { useMemo } from "react";
|
|
3
3
|
import cx from "classnames";
|
|
4
4
|
import { useIntl } from "react-intl";
|
|
5
|
+
import { serializeObjRef } from "@gooddata/sdk-model";
|
|
5
6
|
import { DropdownList, ShortenedText } from "@gooddata/sdk-ui-kit";
|
|
6
7
|
import { stringUtils } from "@gooddata/util";
|
|
7
8
|
import { messages } from "../../../../../../../locales.js";
|
|
8
9
|
import { PopupHeader } from "./PopupHeader.js";
|
|
10
|
+
import { useCommonDateItems } from "../shared/limitingItemsHook.js";
|
|
9
11
|
const TOOLTIP_ALIGN_POINT = [
|
|
10
12
|
{ align: "cr cl", offset: { x: 10, y: 0 } },
|
|
11
13
|
{ align: "cl cr", offset: { x: -10, y: 0 } },
|
|
12
14
|
];
|
|
13
|
-
|
|
15
|
+
// TODO: LX-160
|
|
16
|
+
const DateAttributeListItem = ({ item, onSelect, onClose }) => {
|
|
14
17
|
const classNames = useMemo(() => {
|
|
15
|
-
return cx("gd-list-item date-filter__limit__popup__item", `s-${stringUtils.simplifyText(item.
|
|
18
|
+
return cx("gd-list-item date-filter__limit__popup__item", `s-${stringUtils.simplifyText(item.title ?? "unknown")}`);
|
|
16
19
|
}, [item]);
|
|
17
|
-
|
|
18
|
-
|
|
20
|
+
const onClick = () => {
|
|
21
|
+
onSelect(item.item);
|
|
22
|
+
onClose();
|
|
23
|
+
};
|
|
24
|
+
return (React.createElement("div", { key: serializeObjRef(item.item), className: classNames, onClick: onClick },
|
|
25
|
+
React.createElement(ShortenedText, { tooltipAlignPoints: TOOLTIP_ALIGN_POINT }, item.title)));
|
|
19
26
|
};
|
|
20
27
|
export default DateAttributeListItem;
|
|
21
|
-
export const DateFiltersPage = ({ availableDatasets, onSelect, onGoBack, onClose, }) => {
|
|
28
|
+
export const DateFiltersPage = ({ availableDatasets, dependentCommonDateFilter, dependentDateFilters, onSelect, onGoBack, onClose, }) => {
|
|
22
29
|
const intl = useIntl();
|
|
23
|
-
|
|
30
|
+
const commonDateItems = useCommonDateItems(availableDatasets, dependentCommonDateFilter, dependentDateFilters);
|
|
24
31
|
return (React.createElement(React.Fragment, null,
|
|
25
32
|
React.createElement(PopupHeader, { title: intl.formatMessage(messages.filterAddDateTitle), onGoBack: onGoBack, onClose: onClose }),
|
|
26
33
|
React.createElement("div", { className: "attribute-filter__limit__popup__list--dates" },
|
|
27
|
-
React.createElement(DropdownList, { width: 250, isMobile: false, showSearch: false, items:
|
|
28
|
-
onSelect(item.dataSet.ref);
|
|
29
|
-
onClose();
|
|
30
|
-
} })) }))));
|
|
34
|
+
React.createElement(DropdownList, { width: 250, isMobile: false, showSearch: false, items: commonDateItems, renderItem: ({ item }) => (React.createElement(DateAttributeListItem, { item: item, onSelect: onSelect, onClose: onClose })) }))));
|
|
31
35
|
};
|
|
32
36
|
//# sourceMappingURL=DateFiltersPage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateFiltersPage.js","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.tsx"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"DateFiltersPage.js","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.tsx"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAA6C,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAG3D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAgC,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAkBlG,MAAM,mBAAmB,GAAG;IACxB,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;IAC3C,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;CAC/C,CAAC;AAEF,eAAe;AACf,MAAM,qBAAqB,GAAsC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;IAC7F,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC5B,OAAO,EAAE,CACL,8CAA8C,EAC9C,KAAK,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC,EAAE,CAC3D,CAAC;IACN,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,OAAO,GAAG,GAAG,EAAE;QACjB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,EAAE,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,CACH,6BAAK,GAAG,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;QACzE,oBAAC,aAAa,IAAC,kBAAkB,EAAE,mBAAmB,IAAG,IAAI,CAAC,KAAM,CAAiB,CACnF,CACT,CAAC;AACN,CAAC,CAAC;AAEF,eAAe,qBAAqB,CAAC;AAErC,MAAM,CAAC,MAAM,eAAe,GAAoC,CAAC,EAC7D,iBAAiB,EACjB,yBAAyB,EACzB,oBAAoB,EACpB,QAAQ,EACR,QAAQ,EACR,OAAO,GACV,EAAE,EAAE;IACD,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IAEvB,MAAM,eAAe,GAAG,kBAAkB,CACtC,iBAAiB,EACjB,yBAAyB,EACzB,oBAAoB,CACvB,CAAC;IAEF,OAAO,CACH;QACI,oBAAC,WAAW,IACR,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EACtD,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,GAClB;QACF,6BAAK,SAAS,EAAC,6CAA6C;YACxD,oBAAC,YAAY,IACT,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,KAAK,EACf,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE,eAAe,EACtB,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CACtB,oBAAC,qBAAqB,IAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,GAAI,CAC9E,GACH,CACA,CACP,CACN,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import { ICatalogDateDataset, ObjRef } from "@gooddata/sdk-model";
|
|
2
|
+
import { ICatalogDateDataset, IDashboardDateFilter, ObjRef } from "@gooddata/sdk-model";
|
|
3
3
|
import { ValuesLimitingItem } from "../../../../types.js";
|
|
4
4
|
import { IDashboardAttributeFilterParentItem, IDashboardDependentDateFilter } from "../../../../../../../model/index.js";
|
|
5
5
|
export interface IParentFiltersPageProps {
|
|
@@ -8,6 +8,7 @@ export interface IParentFiltersPageProps {
|
|
|
8
8
|
validParentFilters: ObjRef[];
|
|
9
9
|
dependentDateFilters: IDashboardDependentDateFilter[];
|
|
10
10
|
availableDatasets: ICatalogDateDataset[];
|
|
11
|
+
dependentCommonDateFilter: IDashboardDateFilter;
|
|
11
12
|
onSelect: (item: ValuesLimitingItem) => void;
|
|
12
13
|
onGoBack: () => void;
|
|
13
14
|
onClose: () => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParentFiltersPage.d.ts","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAGzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAmB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"ParentFiltersPage.d.ts","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAGzC,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,EAAmB,MAAM,qBAAqB,CAAC;AAIzG,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EACH,mCAAmC,EACnC,6BAA6B,EAIhC,MAAM,qCAAqC,CAAC;AAc7C,MAAM,WAAW,uBAAuB;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,mCAAmC,EAAE,CAAC;IACrD,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;IACtD,iBAAiB,EAAE,mBAAmB,EAAE,CAAC;IACzC,yBAAyB,EAAE,oBAAoB,CAAC;IAChD,QAAQ,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC7C,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,kBAAkB,EAAE,MAAM,IAAI,CAAC;CAClC;AAsGD,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAuD/D,CAAC"}
|
|
@@ -15,6 +15,7 @@ const ARROW_OFFSET = {
|
|
|
15
15
|
"bc tl": [-60, 10],
|
|
16
16
|
"tc bl": [-60, -10],
|
|
17
17
|
};
|
|
18
|
+
// TODO: LX-160
|
|
18
19
|
const WithDisabledParentFilterTooltip = ({ children, isDisabled, attributeFilterTitle, parentFilterTitle, }) => {
|
|
19
20
|
if (!isDisabled) {
|
|
20
21
|
return React.createElement(React.Fragment, null, children);
|
|
@@ -53,10 +54,10 @@ const ParentFilter = ({ item: { title, item, isDisabled, type }, attributeTitle,
|
|
|
53
54
|
React.createElement(WithDisabledParentFilterTooltip, { attributeFilterTitle: attributeTitle ?? React.createElement(UnknownItemTitle, null), parentFilterTitle: title ?? React.createElement(UnknownItemTitle, null), isDisabled: !!isDisabled },
|
|
54
55
|
React.createElement(LimitingItemTitle, { item: item, title: title }))));
|
|
55
56
|
};
|
|
56
|
-
export const ParentFiltersPage = ({ attributeTitle, parentFilters, validParentFilters, dependentDateFilters, availableDatasets, onSelect, onGoBack, onClose, onCommonDateSelect, }) => {
|
|
57
|
+
export const ParentFiltersPage = ({ attributeTitle, parentFilters, validParentFilters, dependentDateFilters, dependentCommonDateFilter, availableDatasets, onSelect, onGoBack, onClose, onCommonDateSelect, }) => {
|
|
57
58
|
const intl = useIntl();
|
|
58
59
|
const isEnabledKDAttributeFilterDatesValidation = useDashboardSelector(selectEnableKDAttributeFilterDatesValidation);
|
|
59
|
-
const items = useFilterItems(parentFilters, validParentFilters, dependentDateFilters, availableDatasets, isEnabledKDAttributeFilterDatesValidation, false, intl);
|
|
60
|
+
const items = useFilterItems(parentFilters, validParentFilters, dependentDateFilters, availableDatasets, dependentCommonDateFilter, isEnabledKDAttributeFilterDatesValidation, false, intl);
|
|
60
61
|
return (React.createElement(React.Fragment, null,
|
|
61
62
|
React.createElement(PopupHeader, { title: intl.formatMessage(messages.filterAddFilterTitle), onGoBack: onGoBack, onClose: onClose }),
|
|
62
63
|
React.createElement("div", { className: "attribute-filter__limit__popup__list" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParentFiltersPage.js","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.tsx"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,
|
|
1
|
+
{"version":3,"file":"ParentFiltersPage.js","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { IntlShape } from "react-intl";
|
|
2
|
+
import { ObjRef, ICatalogDateDataset, IDashboardDateFilter } from "@gooddata/sdk-model";
|
|
2
3
|
import { ValuesLimitingItem } from "../../../../types.js";
|
|
3
4
|
import { IDashboardAttributeFilterParentItem, IMetricsAndFacts, IDashboardDependentDateFilter } from "../../../../../../../model/index.js";
|
|
4
|
-
import { IntlShape } from "react-intl";
|
|
5
5
|
export interface IValuesLimitingItemWithTitle {
|
|
6
6
|
title?: string;
|
|
7
7
|
item: ValuesLimitingItem;
|
|
@@ -11,5 +11,6 @@ export interface IValuesLimitingItemWithTitle {
|
|
|
11
11
|
export declare const sortByTypeAndTitle: (a: IValuesLimitingItemWithTitle, b: IValuesLimitingItemWithTitle) => number;
|
|
12
12
|
export declare const useLimitingItems: (parentFilters: IDashboardAttributeFilterParentItem[], validParentFilters: ObjRef[], validateElementsBy: ObjRef[], metricsAndFacts: IMetricsAndFacts, dependentDateFilters: IDashboardDependentDateFilter[], availableDatasets: ICatalogDateDataset[], isEnabledKDAttributeFilterDatesValidation: boolean, isSelected: boolean, intl: IntlShape) => IValuesLimitingItemWithTitle[];
|
|
13
13
|
export declare const useSearchableLimitingItems: (currentlySelectedItems: ObjRef[]) => IValuesLimitingItemWithTitle[];
|
|
14
|
-
export declare const useFilterItems: (parentFilters: IDashboardAttributeFilterParentItem[], validParentFilters: ObjRef[], dependentDateFilters: IDashboardDependentDateFilter[], availableDatasets: ICatalogDateDataset[], isEnabledKDAttributeFilterDatesValidation: boolean, isSelected: boolean, intl: IntlShape) => IValuesLimitingItemWithTitle[];
|
|
14
|
+
export declare const useFilterItems: (parentFilters: IDashboardAttributeFilterParentItem[], validParentFilters: ObjRef[], dependentDateFilters: IDashboardDependentDateFilter[], availableDatasets: ICatalogDateDataset[], dependentCommonDateFilter: IDashboardDateFilter, isEnabledKDAttributeFilterDatesValidation: boolean, isSelected: boolean, intl: IntlShape) => IValuesLimitingItemWithTitle[];
|
|
15
|
+
export declare const useCommonDateItems: (availableDatasets: ICatalogDateDataset[], dependentCommonDateFilter: IDashboardDateFilter, dependentDateFilters?: IDashboardDependentDateFilter[]) => IValuesLimitingItemWithTitle[];
|
|
15
16
|
//# sourceMappingURL=limitingItemsHook.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limitingItemsHook.d.ts","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,MAAM,EAKN,mBAAmB,
|
|
1
|
+
{"version":3,"file":"limitingItemsHook.d.ts","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EACH,MAAM,EAKN,mBAAmB,EAGnB,oBAAoB,EAEvB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAIH,mCAAmC,EACnC,gBAAgB,EAGhB,6BAA6B,EAIhC,MAAM,qCAAqC,CAAC;AAG7C,MAAM,WAAW,4BAA4B;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,kBAAkB,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAkED,eAAO,MAAM,kBAAkB,MACxB,4BAA4B,KAC5B,4BAA4B,KAChC,MAMF,CAAC;AAsBF,eAAO,MAAM,gBAAgB,kBACV,mCAAmC,EAAE,sBAChC,MAAM,EAAE,sBACR,MAAM,EAAE,mBACX,gBAAgB,wBACX,6BAA6B,EAAE,qBAClC,mBAAmB,EAAE,6CACG,OAAO,cACtC,OAAO,QACb,SAAS,KAChB,4BAA4B,EAoD9B,CAAC;AAEF,eAAO,MAAM,0BAA0B,2BACX,MAAM,EAAE,KACjC,4BAA4B,EAsB9B,CAAC;AAEF,eAAO,MAAM,cAAc,kBACR,mCAAmC,EAAE,sBAChC,MAAM,EAAE,wBACN,6BAA6B,EAAE,qBAClC,mBAAmB,EAAE,6BACb,oBAAoB,6CACJ,OAAO,cACtC,OAAO,QACb,SAAS,KAChB,4BAA4B,EAsD9B,CAAC;AA2DF,eAAO,MAAM,kBAAkB,sBACR,mBAAmB,EAAE,6BACb,oBAAoB,yBACxB,6BAA6B,EAAE,KACvD,4BAA4B,EAqB9B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// (C) 2024 GoodData Corporation
|
|
2
2
|
import { useMemo } from "react";
|
|
3
|
-
import {
|
|
3
|
+
import { invariant } from "ts-invariant";
|
|
4
|
+
import { isIdentifierRef, areObjRefsEqual, isUriRef, } from "@gooddata/sdk-model";
|
|
4
5
|
import { useDashboardSelector, selectCatalogAttributes, selectAllCatalogDisplayFormsMap, selectCatalogMeasures, selectCatalogFacts, selectAllCatalogDateDatasetsMap, selectDateFilterConfigOverrides, selectDateFilterConfigsOverrides, } from "../../../../../../../model/index.js";
|
|
5
6
|
const findAttributeByLabel = (labelRef, labels, attributes) => {
|
|
6
7
|
const attributeRef = labels.get(labelRef)?.attribute;
|
|
@@ -82,7 +83,22 @@ export const useLimitingItems = (parentFilters, validParentFilters, validateElem
|
|
|
82
83
|
dependentDateFilterItems = mapDependentDateFilters(dateDataSetsMap, dependentDateFilters, availableDatasets, filterConfigByDimension, isSelected, intl, filterConfig);
|
|
83
84
|
}
|
|
84
85
|
return [...selectedParentFilterItems, ...validationItems, ...dependentDateFilterItems].sort(sortByTypeAndTitle);
|
|
85
|
-
}, [
|
|
86
|
+
}, [
|
|
87
|
+
parentFilters,
|
|
88
|
+
dateDataSetsMap,
|
|
89
|
+
validParentFilters,
|
|
90
|
+
validateElementsBy,
|
|
91
|
+
attributes,
|
|
92
|
+
labels,
|
|
93
|
+
metricsAndFacts,
|
|
94
|
+
isEnabledKDAttributeFilterDatesValidation,
|
|
95
|
+
dependentDateFilters,
|
|
96
|
+
filterConfigByDimension,
|
|
97
|
+
intl,
|
|
98
|
+
filterConfig,
|
|
99
|
+
availableDatasets,
|
|
100
|
+
isSelected,
|
|
101
|
+
]);
|
|
86
102
|
};
|
|
87
103
|
export const useSearchableLimitingItems = (currentlySelectedItems) => {
|
|
88
104
|
const attributes = useDashboardSelector(selectCatalogAttributes);
|
|
@@ -106,7 +122,7 @@ export const useSearchableLimitingItems = (currentlySelectedItems) => {
|
|
|
106
122
|
.sort(sortByTypeAndTitle);
|
|
107
123
|
}, [currentlySelectedItems, measures, facts, attributes]);
|
|
108
124
|
};
|
|
109
|
-
export const useFilterItems = (parentFilters, validParentFilters, dependentDateFilters, availableDatasets, isEnabledKDAttributeFilterDatesValidation, isSelected, intl) => {
|
|
125
|
+
export const useFilterItems = (parentFilters, validParentFilters, dependentDateFilters, availableDatasets, dependentCommonDateFilter, isEnabledKDAttributeFilterDatesValidation, isSelected, intl) => {
|
|
110
126
|
const labels = useDashboardSelector(selectAllCatalogDisplayFormsMap);
|
|
111
127
|
const attributes = useDashboardSelector(selectCatalogAttributes);
|
|
112
128
|
const dateDataSetsMap = useDashboardSelector(selectAllCatalogDateDatasetsMap);
|
|
@@ -116,7 +132,15 @@ export const useFilterItems = (parentFilters, validParentFilters, dependentDateF
|
|
|
116
132
|
let parentFilterItems = mapParentFilters(parentFilters, validParentFilters, labels, attributes, false).sort(sortByTypeAndTitle);
|
|
117
133
|
if (isEnabledKDAttributeFilterDatesValidation) {
|
|
118
134
|
const dependentDateFilterItems = mapDependentDateFilters(dateDataSetsMap, dependentDateFilters, availableDatasets, filterConfigByDimension, isSelected, intl, filterConfig);
|
|
119
|
-
|
|
135
|
+
const commonDateFilter = [
|
|
136
|
+
{
|
|
137
|
+
title: filterConfig?.filterName ?? intl.formatMessage({ id: "dateFilterDropdown.title" }),
|
|
138
|
+
item: parseCommonDateFilter(dependentCommonDateFilter),
|
|
139
|
+
isDisabled: false,
|
|
140
|
+
type: "commonDate",
|
|
141
|
+
},
|
|
142
|
+
];
|
|
143
|
+
parentFilterItems = [...parentFilterItems, ...dependentDateFilterItems, ...commonDateFilter];
|
|
120
144
|
}
|
|
121
145
|
return parentFilterItems;
|
|
122
146
|
}, [
|
|
@@ -137,17 +161,19 @@ export const useFilterItems = (parentFilters, validParentFilters, dependentDateF
|
|
|
137
161
|
const mapDependentDateFilters = (dateDataSetsMap, dependentDateFilters, availableDatasets, filterConfigByDimension, isSelected, intl, filterConfig) => dependentDateFilters
|
|
138
162
|
.filter((item) => item.isSelected === isSelected)
|
|
139
163
|
.map((item) => {
|
|
140
|
-
|
|
164
|
+
const dateDataSet = item.dataSet ? dateDataSetsMap.get(item.dataSet) : "";
|
|
165
|
+
const dataSetTitle = dateDataSet ? dateDataSet.dataSet.title : "";
|
|
166
|
+
const title = getDatasetTitle(item.dataSet, dataSetTitle, filterConfigByDimension, filterConfig);
|
|
167
|
+
if (item.isCommonDate) {
|
|
168
|
+
const dateFilterTitle = filterConfig?.filterName ?? intl.formatMessage({ id: "dateFilterDropdown.title" });
|
|
141
169
|
return {
|
|
142
|
-
title: intl.formatMessage({ id: "
|
|
170
|
+
title: intl.formatMessage({ id: "attributesDropdown.valuesLimiting.commonDateFilterTitle" }, { dateFilterTitle, dataSetTitle }),
|
|
143
171
|
item,
|
|
144
172
|
isDisabled: false,
|
|
145
173
|
type: "commonDate",
|
|
146
174
|
};
|
|
147
175
|
}
|
|
148
|
-
|
|
149
|
-
const dataSetTitle = dateDataSet ? dateDataSet.dataSet.title : "";
|
|
150
|
-
const title = getDatasetTitle(item.dataSet, dataSetTitle, filterConfigByDimension, intl, filterConfig);
|
|
176
|
+
// TODO: LX-160
|
|
151
177
|
const isDisabled = !availableDatasets.some((availableDataset) => areObjRefsEqual(availableDataset.dataSet.ref, item.dataSet));
|
|
152
178
|
return {
|
|
153
179
|
title,
|
|
@@ -155,11 +181,39 @@ const mapDependentDateFilters = (dateDataSetsMap, dependentDateFilters, availabl
|
|
|
155
181
|
isDisabled,
|
|
156
182
|
};
|
|
157
183
|
});
|
|
158
|
-
const getDatasetTitle = (dateDataSet, defaultDateFilterTitle, filterConfigByDimension,
|
|
184
|
+
const getDatasetTitle = (dateDataSet, defaultDateFilterTitle, filterConfigByDimension, filterConfig) => {
|
|
159
185
|
const usedConfig = dateDataSet
|
|
160
186
|
? filterConfigByDimension.find((config) => areObjRefsEqual(config.dateDataSet, dateDataSet))?.config
|
|
161
187
|
: filterConfig;
|
|
162
|
-
|
|
163
|
-
|
|
188
|
+
return !usedConfig || usedConfig?.filterName === "" ? defaultDateFilterTitle : usedConfig?.filterName;
|
|
189
|
+
};
|
|
190
|
+
export const useCommonDateItems = (availableDatasets, dependentCommonDateFilter, dependentDateFilters) => {
|
|
191
|
+
return useMemo(() => {
|
|
192
|
+
return availableDatasets
|
|
193
|
+
.filter((availableDataset) => !dependentDateFilters?.some((item) => areObjRefsEqual(availableDataset.dataSet.ref, item.dataSet) &&
|
|
194
|
+
!!item.isCommonDate))
|
|
195
|
+
.map((dateDataSet) => {
|
|
196
|
+
return {
|
|
197
|
+
title: dateDataSet.dataSet.title,
|
|
198
|
+
item: parseCommonDateFilter(dependentCommonDateFilter, dateDataSet.dataSet.ref),
|
|
199
|
+
// TODO: LX-160
|
|
200
|
+
isDisabled: false,
|
|
201
|
+
type: "commonDate",
|
|
202
|
+
};
|
|
203
|
+
});
|
|
204
|
+
}, [availableDatasets, dependentCommonDateFilter, dependentDateFilters]);
|
|
205
|
+
};
|
|
206
|
+
const parseCommonDateFilter = (commonDate, dataSet) => {
|
|
207
|
+
invariant(!isUriRef(dataSet));
|
|
208
|
+
return {
|
|
209
|
+
from: commonDate.dateFilter.from,
|
|
210
|
+
to: commonDate.dateFilter.to,
|
|
211
|
+
granularity: commonDate.dateFilter.granularity,
|
|
212
|
+
type: commonDate.dateFilter.type,
|
|
213
|
+
localIdentifier: dataSet?.identifier ?? "commonDate",
|
|
214
|
+
isSelected: true,
|
|
215
|
+
dataSet: dataSet,
|
|
216
|
+
isCommonDate: true,
|
|
217
|
+
};
|
|
164
218
|
};
|
|
165
219
|
//# sourceMappingURL=limitingItemsHook.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limitingItemsHook.js","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"limitingItemsHook.js","sourceRoot":"","sources":["../../../../../../../../src/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,13 @@ import { IAttributeFilterBaseProps } from "@gooddata/sdk-ui-filters";
|
|
|
5
5
|
*
|
|
6
6
|
* @beta
|
|
7
7
|
*/
|
|
8
|
-
export type
|
|
8
|
+
export type UseParentFiltersResult = Pick<IAttributeFilterBaseProps, "dependentDateFilters">;
|
|
9
9
|
/**
|
|
10
10
|
* Returns depdent date filtering input props for {@link @gooddata/sdk-ui-filters#AttributeFilter} for particular dashboard attribute filter.
|
|
11
11
|
*
|
|
12
|
-
* @param filter - dashboard filter to get the
|
|
12
|
+
* @param filter - dashboard filter to get the depdendent date filter-related data
|
|
13
13
|
*
|
|
14
14
|
* @beta
|
|
15
15
|
*/
|
|
16
|
-
export declare const useDependentDateFilters: (filter: IDashboardAttributeFilter) =>
|
|
16
|
+
export declare const useDependentDateFilters: (filter: IDashboardAttributeFilter) => UseParentFiltersResult;
|
|
17
17
|
//# sourceMappingURL=useDependentDateFilters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDependentDateFilters.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/attributeFilter/useDependentDateFilters.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,
|
|
1
|
+
{"version":3,"file":"useDependentDateFilters.d.ts","sourceRoot":"","sources":["../../../../src/presentation/filterBar/attributeFilter/useDependentDateFilters.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAwC,MAAM,qBAAqB,CAAC;AAOtG,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAErE;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,yBAAyB,EAAE,sBAAsB,CAAC,CAAC;AAE7F;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,WAAY,yBAAyB,KAAG,sBAuC3E,CAAC"}
|
|
@@ -2,25 +2,58 @@
|
|
|
2
2
|
import { useMemo } from "react";
|
|
3
3
|
import { invariant } from "ts-invariant";
|
|
4
4
|
import { objRefToString } from "@gooddata/sdk-model";
|
|
5
|
-
import { selectFilterContextDateFiltersWithDimension, useDashboardSelector } from "../../../model/index.js";
|
|
5
|
+
import { selectFilterContextDateFilter, selectFilterContextDateFiltersWithDimension, useDashboardSelector, } from "../../../model/index.js";
|
|
6
6
|
/**
|
|
7
7
|
* Returns depdent date filtering input props for {@link @gooddata/sdk-ui-filters#AttributeFilter} for particular dashboard attribute filter.
|
|
8
8
|
*
|
|
9
|
-
* @param filter - dashboard filter to get the
|
|
9
|
+
* @param filter - dashboard filter to get the depdendent date filter-related data
|
|
10
10
|
*
|
|
11
11
|
* @beta
|
|
12
12
|
*/
|
|
13
13
|
export const useDependentDateFilters = (filter) => {
|
|
14
14
|
const allDateFilters = useDashboardSelector(selectFilterContextDateFiltersWithDimension);
|
|
15
|
+
const commonDateFilter = useDashboardSelector(selectFilterContextDateFilter);
|
|
16
|
+
const commonDateFilterWithAllTime = getCommonDateFilterWithAllTime(commonDateFilter);
|
|
15
17
|
const dependentDateFilters = useMemo(() => {
|
|
16
|
-
return filter.attributeFilter.filterElementsByDate?.map((
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
return filter.attributeFilter.filterElementsByDate?.map((dependentDateFilter) => {
|
|
19
|
+
if (dependentDateFilter.isCommonDate) {
|
|
20
|
+
const commonDashboardDateFilter = {
|
|
21
|
+
dateFilter: {
|
|
22
|
+
type: commonDateFilterWithAllTime?.dateFilter.type,
|
|
23
|
+
granularity: commonDateFilterWithAllTime?.dateFilter.granularity,
|
|
24
|
+
from: commonDateFilterWithAllTime?.dateFilter.from,
|
|
25
|
+
to: commonDateFilterWithAllTime?.dateFilter.from,
|
|
26
|
+
dataSet: {
|
|
27
|
+
identifier: dependentDateFilter.filterLocalIdentifier,
|
|
28
|
+
type: "dataSet",
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
return commonDashboardDateFilter;
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
const matchingFilter = allDateFilters.find((filter) => objRefToString(filter.dateFilter.dataSet) ===
|
|
36
|
+
dependentDateFilter.filterLocalIdentifier);
|
|
37
|
+
invariant(matchingFilter); // if this blows up, the state is inconsistent
|
|
38
|
+
return matchingFilter;
|
|
39
|
+
}
|
|
20
40
|
});
|
|
21
|
-
}, [allDateFilters, filter.attributeFilter.filterElementsByDate]);
|
|
41
|
+
}, [allDateFilters, commonDateFilterWithAllTime, filter.attributeFilter.filterElementsByDate]);
|
|
22
42
|
return {
|
|
23
43
|
dependentDateFilters,
|
|
24
44
|
};
|
|
25
45
|
};
|
|
46
|
+
const getCommonDateFilterWithAllTime = (commonDate) => {
|
|
47
|
+
if (commonDate) {
|
|
48
|
+
return commonDate;
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
return {
|
|
52
|
+
dateFilter: {
|
|
53
|
+
granularity: "GDC.time.date",
|
|
54
|
+
type: "relative",
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
};
|
|
26
59
|
//# sourceMappingURL=useDependentDateFilters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDependentDateFilters.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/attributeFilter/useDependentDateFilters.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"useDependentDateFilters.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/attributeFilter/useDependentDateFilters.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAmD,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEtG,OAAO,EACH,6BAA6B,EAC7B,2CAA2C,EAC3C,oBAAoB,GACvB,MAAM,yBAAyB,CAAC;AAUjC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,MAAiC,EAA0B,EAAE;IACjG,MAAM,cAAc,GAAG,oBAAoB,CAAC,2CAA2C,CAAC,CAAC;IACzF,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,6BAA6B,CAAC,CAAC;IAC7E,MAAM,2BAA2B,GAAG,8BAA8B,CAAC,gBAAgB,CAAC,CAAC;IAErF,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,EAAE;QACtC,OAAO,MAAM,CAAC,eAAe,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC,mBAAmB,EAAE,EAAE;YAC5E,IAAI,mBAAmB,CAAC,YAAY,EAAE,CAAC;gBACnC,MAAM,yBAAyB,GAAyB;oBACpD,UAAU,EAAE;wBACR,IAAI,EAAE,2BAA2B,EAAE,UAAU,CAAC,IAAI;wBAClD,WAAW,EAAE,2BAA2B,EAAE,UAAU,CAAC,WAAW;wBAChE,IAAI,EAAE,2BAA2B,EAAE,UAAU,CAAC,IAAI;wBAClD,EAAE,EAAE,2BAA2B,EAAE,UAAU,CAAC,IAAI;wBAChD,OAAO,EAAE;4BACL,UAAU,EAAE,mBAAmB,CAAC,qBAAqB;4BACrD,IAAI,EAAE,SAAS;yBAClB;qBACJ;iBACJ,CAAC;gBAEF,OAAO,yBAAyB,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACJ,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,CACtC,CAAC,MAAM,EAAE,EAAE,CACP,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,OAAQ,CAAC;oBAC1C,mBAAmB,CAAC,qBAAqB,CAChD,CAAC;gBAEF,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,8CAA8C;gBAEzE,OAAO,cAAc,CAAC;YAC1B,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,cAAc,EAAE,2BAA2B,EAAE,MAAM,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE/F,OAAO;QACH,oBAAoB;KACvB,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,CAAC,UAAiC,EAAwB,EAAE;IAC/F,IAAI,UAAU,EAAE,CAAC;QACb,OAAO,UAAU,CAAC;IACtB,CAAC;SAAM,CAAC;QACJ,OAAO;YACH,UAAU,EAAE;gBACR,WAAW,EAAE,eAAe;gBAC5B,IAAI,EAAE,UAAU;aACnB;SACJ,CAAC;IACN,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -2408,9 +2408,9 @@
|
|
|
2408
2408
|
"comment": "Description of section that describe the action user can choose. The action selects an existing dashboard filter to be used as a validation items to hide attribute filter elements. Do not translate <a> and </a> placeholders. They will be replaced with HTML tags in the runtime.",
|
|
2409
2409
|
"limit": 0
|
|
2410
2410
|
},
|
|
2411
|
-
"attributesDropdown.valuesLimiting.
|
|
2412
|
-
"value": "
|
|
2413
|
-
"comment": "Do not translate
|
|
2411
|
+
"attributesDropdown.valuesLimiting.commonDateFilterTitle": {
|
|
2412
|
+
"value": "{dateFilterTitle} as {dataSetTitle}",
|
|
2413
|
+
"comment": "Do not translate variables enclosed in {}.",
|
|
2414
2414
|
"limit": 0
|
|
2415
2415
|
},
|
|
2416
2416
|
"attributesDropdown.valuesLimiting.addDateTitle": {
|
|
@@ -7952,13 +7952,15 @@ export declare interface IDashboardDateFilterProps {
|
|
|
7952
7952
|
*/
|
|
7953
7953
|
export declare interface IDashboardDependentDateFilter {
|
|
7954
7954
|
localIdentifier: string;
|
|
7955
|
-
|
|
7955
|
+
isCommonDate: boolean;
|
|
7956
7956
|
type: string;
|
|
7957
7957
|
title?: string;
|
|
7958
|
+
isSelected?: boolean;
|
|
7958
7959
|
dataSet?: ObjRef;
|
|
7959
7960
|
from?: DateString | number;
|
|
7960
7961
|
to?: DateString | number;
|
|
7961
|
-
granularity?:
|
|
7962
|
+
granularity?: DateFilterGranularity;
|
|
7963
|
+
isDisabled?: boolean;
|
|
7962
7964
|
}
|
|
7963
7965
|
|
|
7964
7966
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gooddata/sdk-ui-dashboard",
|
|
3
|
-
"version": "10.0.0-alpha.
|
|
3
|
+
"version": "10.0.0-alpha.2",
|
|
4
4
|
"description": "GoodData SDK - Dashboard Component",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -56,17 +56,17 @@
|
|
|
56
56
|
"ts-invariant": "^0.7.5",
|
|
57
57
|
"tslib": "^2.5.0",
|
|
58
58
|
"uuid": "^8.3.2",
|
|
59
|
-
"@gooddata/sdk-backend-base": "10.0.0-alpha.
|
|
60
|
-
"@gooddata/sdk-backend-spi": "10.0.0-alpha.
|
|
61
|
-
"@gooddata/sdk-
|
|
62
|
-
"@gooddata/sdk-ui
|
|
63
|
-
"@gooddata/sdk-
|
|
64
|
-
"@gooddata/sdk-ui-filters": "10.0.0-alpha.
|
|
65
|
-
"@gooddata/sdk-ui-geo": "10.0.0-alpha.
|
|
66
|
-
"@gooddata/sdk-ui-kit": "10.0.0-alpha.
|
|
67
|
-
"@gooddata/sdk-ui-theme-provider": "10.0.0-alpha.
|
|
68
|
-
"@gooddata/
|
|
69
|
-
"@gooddata/
|
|
59
|
+
"@gooddata/sdk-backend-base": "10.0.0-alpha.2",
|
|
60
|
+
"@gooddata/sdk-backend-spi": "10.0.0-alpha.2",
|
|
61
|
+
"@gooddata/sdk-model": "10.0.0-alpha.2",
|
|
62
|
+
"@gooddata/sdk-ui": "10.0.0-alpha.2",
|
|
63
|
+
"@gooddata/sdk-ui-ext": "10.0.0-alpha.2",
|
|
64
|
+
"@gooddata/sdk-ui-filters": "10.0.0-alpha.2",
|
|
65
|
+
"@gooddata/sdk-ui-geo": "10.0.0-alpha.2",
|
|
66
|
+
"@gooddata/sdk-ui-kit": "10.0.0-alpha.2",
|
|
67
|
+
"@gooddata/sdk-ui-theme-provider": "10.0.0-alpha.2",
|
|
68
|
+
"@gooddata/sdk-ui-vis-commons": "10.0.0-alpha.2",
|
|
69
|
+
"@gooddata/util": "10.0.0-alpha.2"
|
|
70
70
|
},
|
|
71
71
|
"peerDependencies": {
|
|
72
72
|
"react": "^16.10.0 || ^17.0.0 || ^18.0.0",
|
|
@@ -119,9 +119,9 @@
|
|
|
119
119
|
"typescript": "5.3.3",
|
|
120
120
|
"vitest": "1.0.4",
|
|
121
121
|
"vitest-dom": "0.1.1",
|
|
122
|
-
"@gooddata/
|
|
123
|
-
"@gooddata/
|
|
124
|
-
"@gooddata/sdk-backend-mockingbird": "10.0.0-alpha.
|
|
122
|
+
"@gooddata/reference-workspace": "10.0.0-alpha.2",
|
|
123
|
+
"@gooddata/i18n-toolkit": "10.0.0-alpha.2",
|
|
124
|
+
"@gooddata/sdk-backend-mockingbird": "10.0.0-alpha.2"
|
|
125
125
|
},
|
|
126
126
|
"scripts": {
|
|
127
127
|
"clean": "rm -rf ci dist esm coverage *.log styles/css tsconfig.tsbuildinfo",
|