@gooddata/sdk-ui-dashboard 10.0.0-alpha.1 → 10.0.0-alpha.11

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.
Files changed (97) hide show
  1. package/NOTICE +3 -3
  2. package/esm/__version.d.ts +1 -1
  3. package/esm/__version.d.ts.map +1 -1
  4. package/esm/__version.js +1 -1
  5. package/esm/__version.js.map +1 -1
  6. package/esm/locales.js +1 -1
  7. package/esm/locales.js.map +1 -1
  8. package/esm/model/commandHandlers/filterContext/dateFilter/removeDateFiltersHandler.d.ts.map +1 -1
  9. package/esm/model/commandHandlers/filterContext/dateFilter/removeDateFiltersHandler.js +3 -2
  10. package/esm/model/commandHandlers/filterContext/dateFilter/removeDateFiltersHandler.js.map +1 -1
  11. package/esm/model/commandHandlers/widgets/addDrillDownForInsightWidgetHandler.d.ts.map +1 -1
  12. package/esm/model/commandHandlers/widgets/addDrillDownForInsightWidgetHandler.js +10 -3
  13. package/esm/model/commandHandlers/widgets/addDrillDownForInsightWidgetHandler.js.map +1 -1
  14. package/esm/model/commandHandlers/widgets/modifyDrillDownForInsightWidgetHandler.d.ts.map +1 -1
  15. package/esm/model/commandHandlers/widgets/modifyDrillDownForInsightWidgetHandler.js +10 -3
  16. package/esm/model/commandHandlers/widgets/modifyDrillDownForInsightWidgetHandler.js.map +1 -1
  17. package/esm/model/events/userInteraction.d.ts +1 -1
  18. package/esm/model/events/userInteraction.d.ts.map +1 -1
  19. package/esm/model/events/userInteraction.js.map +1 -1
  20. package/esm/model/store/catalog/catalogSelectors.d.ts.map +1 -1
  21. package/esm/model/store/catalog/catalogSelectors.js +6 -5
  22. package/esm/model/store/catalog/catalogSelectors.js.map +1 -1
  23. package/esm/model/store/widgetDrills/widgetDrillSelectors.d.ts.map +1 -1
  24. package/esm/model/store/widgetDrills/widgetDrillSelectors.js +11 -22
  25. package/esm/model/store/widgetDrills/widgetDrillSelectors.js.map +1 -1
  26. package/esm/model/types/dateFilterTypes.d.ts +5 -3
  27. package/esm/model/types/dateFilterTypes.d.ts.map +1 -1
  28. package/esm/model/types/dateFilterTypes.js.map +1 -1
  29. package/esm/model/utils/attributeHierarchyUtils.d.ts +2 -2
  30. package/esm/model/utils/attributeHierarchyUtils.d.ts.map +1 -1
  31. package/esm/model/utils/attributeHierarchyUtils.js +10 -8
  32. package/esm/model/utils/attributeHierarchyUtils.js.map +1 -1
  33. package/esm/presentation/filterBar/attributeFilter/AttributeFilterParentFilteringContext.d.ts.map +1 -1
  34. package/esm/presentation/filterBar/attributeFilter/AttributeFilterParentFilteringContext.js +2 -1
  35. package/esm/presentation/filterBar/attributeFilter/AttributeFilterParentFilteringContext.js.map +1 -1
  36. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/AttributeFilterConfiguration.d.ts.map +1 -1
  37. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/AttributeFilterConfiguration.js +2 -2
  38. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/AttributeFilterConfiguration.js.map +1 -1
  39. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFilterConfigurationState.d.ts +1 -0
  40. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFilterConfigurationState.d.ts.map +1 -1
  41. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFilterConfigurationState.js +37 -7
  42. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFilterConfigurationState.js.map +1 -1
  43. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFiltersConfiguration.d.ts +3 -2
  44. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFiltersConfiguration.d.ts.map +1 -1
  45. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFiltersConfiguration.js +32 -20
  46. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/hooks/useDependentDateFiltersConfiguration.js.map +1 -1
  47. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/LimitValuesConfiguration.d.ts +3 -2
  48. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/LimitValuesConfiguration.d.ts.map +1 -1
  49. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/LimitValuesConfiguration.js +11 -5
  50. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/LimitValuesConfiguration.js.map +1 -1
  51. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/AddLimitingItemDialog.d.ts +3 -1
  52. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/AddLimitingItemDialog.d.ts.map +1 -1
  53. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/AddLimitingItemDialog.js +3 -3
  54. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/AddLimitingItemDialog.js.map +1 -1
  55. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.d.ts +8 -4
  56. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.d.ts.map +1 -1
  57. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.js +30 -15
  58. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/DateFiltersPage.js.map +1 -1
  59. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.d.ts +3 -1
  60. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.d.ts.map +1 -1
  61. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.js +33 -28
  62. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/ParentFiltersPage.js.map +1 -1
  63. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/WithDisabledParentFilterTooltip.d.ts +9 -0
  64. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/WithDisabledParentFilterTooltip.d.ts.map +1 -0
  65. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/WithDisabledParentFilterTooltip.js +17 -0
  66. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/dialog/WithDisabledParentFilterTooltip.js.map +1 -0
  67. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.d.ts +6 -3
  68. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.d.ts.map +1 -1
  69. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.js +81 -13
  70. package/esm/presentation/filterBar/attributeFilter/dashboardDropdownBody/configuration/limitValues/shared/limitingItemsHook.js.map +1 -1
  71. package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.d.ts +3 -3
  72. package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.d.ts.map +1 -1
  73. package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.js +40 -7
  74. package/esm/presentation/filterBar/attributeFilter/useDependentDateFilters.js.map +1 -1
  75. package/esm/presentation/filterBar/dateFilter/useCommonDateFilterTitle.d.ts +3 -0
  76. package/esm/presentation/filterBar/dateFilter/useCommonDateFilterTitle.d.ts.map +1 -0
  77. package/esm/presentation/filterBar/dateFilter/useCommonDateFilterTitle.js +7 -0
  78. package/esm/presentation/filterBar/dateFilter/useCommonDateFilterTitle.js.map +1 -0
  79. package/esm/presentation/localization/bundles/en-US.json +13 -3
  80. package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.d.ts.map +1 -1
  81. package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.js +9 -15
  82. package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.js.map +1 -1
  83. package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.d.ts.map +1 -1
  84. package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.js +4 -6
  85. package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.js.map +1 -1
  86. package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargetAttributeHierarchyItem.d.ts.map +1 -1
  87. package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargetAttributeHierarchyItem.js +3 -5
  88. package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargetAttributeHierarchyItem.js.map +1 -1
  89. package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargets.d.ts.map +1 -1
  90. package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargets.js +2 -4
  91. package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargets.js.map +1 -1
  92. package/esm/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.d.ts +2 -2
  93. package/esm/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.d.ts.map +1 -1
  94. package/esm/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.js +38 -16
  95. package/esm/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.js.map +1 -1
  96. package/esm/sdk-ui-dashboard.d.ts +6 -4
  97. package/package.json +15 -15
@@ -0,0 +1 @@
1
+ {"version":3,"file":"useCommonDateFilterTitle.js","sourceRoot":"","sources":["../../../../src/presentation/filterBar/dateFilter/useCommonDateFilterTitle.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAIhC,OAAO,EAAE,+BAA+B,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAEhG,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,IAAe,EAAE,EAAE;IACxD,MAAM,YAAY,GAAG,oBAAoB,CAAC,+BAA+B,CAAC,CAAC;IAE3E,OAAO,YAAY,EAAE,UAAU,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,0BAA0B,EAAE,CAAC,CAAC;AAC9F,CAAC,CAAC"}
@@ -2408,14 +2408,24 @@
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.depedentDateFilterTitle": {
2412
- "value": "Date ({dataSetTitle})",
2413
- "comment": "Do not translate variable enclosed in {}.",
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": {
2417
2417
  "value": "Choose date",
2418
2418
  "comment": "Title of popup with selection of date filters will available date datasets values.",
2419
2419
  "limit": 0
2420
+ },
2421
+ "attributesDropdown.valuesLimiting.disableDateFilter": {
2422
+ "value": "Filter not available: The <strong>{dateFilterTitle}</strong> filter is already using this date dataset.",
2423
+ "comment": "Do not translate variable enclosed in {}.",
2424
+ "limit": 0
2425
+ },
2426
+ "attributesDropdown.valuesLimiting.disableDataSet": {
2427
+ "value": "Date dataset not available: The <strong>{dateFilterTitle}</strong> filter is already using this date dataset.",
2428
+ "comment": "Do not translate variable enclosed in {}.",
2429
+ "limit": 0
2420
2430
  }
2421
2431
  }
@@ -1 +1 @@
1
- {"version":3,"file":"AttributeHierarchyDropdown.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAEH,oBAAoB,EACpB,0BAA0B,EAC1B,8BAA8B,EAIjC,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,kCAAkC,EAAE,MAAM,4BAA4B,CAAC;AAShF,UAAU,gCAAgC;IACtC,MAAM,EAAE,kCAAkC,CAAC;IAC3C,mBAAmB,CAAC,EAAE,oBAAoB,CAAC;IAC3C,QAAQ,EAAE,CAAC,UAAU,EAAE,0BAA0B,GAAG,8BAA8B,KAAK,IAAI,CAAC;IAC5F,8BAA8B,EAAE,CAC5B,kBAAkB,CAAC,EAAE,0BAA0B,GAAG,8BAA8B,KAC/E,IAAI,CAAC;CACb;AAoDD,QAAA,MAAM,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC,gCAAgC,CAqE1E,CAAC;AAEF,eAAe,0BAA0B,CAAC"}
1
+ {"version":3,"file":"AttributeHierarchyDropdown.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAIH,oBAAoB,EACpB,0BAA0B,EAC1B,8BAA8B,EAKjC,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,kCAAkC,EAAE,MAAM,4BAA4B,CAAC;AAShF,UAAU,gCAAgC;IACtC,MAAM,EAAE,kCAAkC,CAAC;IAC3C,mBAAmB,CAAC,EAAE,oBAAoB,CAAC;IAC3C,QAAQ,EAAE,CAAC,UAAU,EAAE,0BAA0B,GAAG,8BAA8B,KAAK,IAAI,CAAC;IAC5F,8BAA8B,EAAE,CAC5B,kBAAkB,CAAC,EAAE,0BAA0B,GAAG,8BAA8B,KAC/E,IAAI,CAAC;CACb;AAuDD,QAAA,MAAM,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC,gCAAgC,CAkE1E,CAAC;AAEF,eAAe,0BAA0B,CAAC"}
@@ -1,8 +1,8 @@
1
- // (C) 2023 GoodData Corporation
1
+ // (C) 2023-2024 GoodData Corporation
2
2
  import React from "react";
3
3
  import { useIntl } from "react-intl";
4
4
  import { Dropdown, DropdownButton } from "@gooddata/sdk-ui-kit";
5
- import { areObjRefsEqual, isCatalogAttributeHierarchy, objRefToString, } from "@gooddata/sdk-model";
5
+ import { areObjRefsEqual, getHierarchyAttributes, getHierarchyRef, getHierarchyTitle, objRefToString, } from "@gooddata/sdk-model";
6
6
  import { messages } from "@gooddata/sdk-ui";
7
7
  import { AttributeHierarchyList } from "./AttributeHierarchyList.js";
8
8
  import { existBlacklistHierarchyPredicate, selectAllCatalogAttributeHierarchies, selectIgnoredDrillDownHierarchiesByWidgetRef, useDashboardSelector, useDashboardUserInteraction, } from "../../../../../model/index.js";
@@ -22,16 +22,14 @@ const DROPDOWN_ALIGN_POINTS = [
22
22
  },
23
23
  },
24
24
  ];
25
+ const isHierarchyInBlackList = (ignoredDrillDownHierarchies, hierarchy, attributeRef) => {
26
+ return ignoredDrillDownHierarchies.some((ref) => existBlacklistHierarchyPredicate(ref, hierarchy, attributeRef));
27
+ };
25
28
  function buildHierarchyItemList(attributeDescriptor, catalogAttributeHierarchies, ignoredDrillDownHierarchies) {
26
29
  const items = [];
27
30
  catalogAttributeHierarchies.forEach((hierarchy) => {
28
- const hierarchyRef = isCatalogAttributeHierarchy(hierarchy)
29
- ? hierarchy.attributeHierarchy.ref
30
- : hierarchy.dateDatasetRef;
31
- const attributesRef = isCatalogAttributeHierarchy(hierarchy)
32
- ? hierarchy.attributeHierarchy.attributes
33
- : hierarchy.attributes;
34
- const isInBlacklist = ignoredDrillDownHierarchies.some((ref) => existBlacklistHierarchyPredicate(ref, hierarchyRef, attributeDescriptor?.attributeHeader.formOf.ref));
31
+ const attributesRef = getHierarchyAttributes(hierarchy);
32
+ const isInBlacklist = isHierarchyInBlackList(ignoredDrillDownHierarchies, hierarchy, attributeDescriptor?.attributeHeader.formOf.ref);
35
33
  const indexInHierarchy = attributesRef.findIndex((ref) => objRefToString(ref) === attributeDescriptor?.attributeHeader.formOf.identifier);
36
34
  if (indexInHierarchy >= 0 && indexInHierarchy < attributesRef.length - 1) {
37
35
  items.push({
@@ -49,16 +47,12 @@ const AttributeHierarchyDropdown = ({ config, attributeDescriptor, onSelect, onO
49
47
  const userInteraction = useDashboardUserInteraction();
50
48
  const selectedCatalogAttributeHierarchy = config.complete
51
49
  ? catalogAttributeHierarchies.find((hierarchy) => {
52
- const hierarchyRef = isCatalogAttributeHierarchy(hierarchy)
53
- ? hierarchy.attributeHierarchy.ref
54
- : hierarchy.dateDatasetRef;
50
+ const hierarchyRef = getHierarchyRef(hierarchy);
55
51
  return areObjRefsEqual(hierarchyRef, config.attributeHierarchyRef);
56
52
  })
57
53
  : null;
58
54
  const items = buildHierarchyItemList(attributeDescriptor, catalogAttributeHierarchies, ignoredDrillDownHierarchies);
59
- const selectHierarchyTitle = isCatalogAttributeHierarchy(selectedCatalogAttributeHierarchy)
60
- ? selectedCatalogAttributeHierarchy?.attributeHierarchy.title
61
- : selectedCatalogAttributeHierarchy?.title;
55
+ const selectHierarchyTitle = selectedCatalogAttributeHierarchy && getHierarchyTitle(selectedCatalogAttributeHierarchy);
62
56
  const buttonText = selectHierarchyTitle ?? formatMessage(messages.drilldownSelectHierarchy);
63
57
  return (React.createElement(Dropdown, { className: "drill-config-hierarchy-target-select s-drill-config-hierarchy-target-select", closeOnMouseDrag: false, closeOnParentScroll: true, closeOnOutsideClick: true, alignPoints: DROPDOWN_ALIGN_POINTS, renderButton: ({ isOpen, toggleDropdown }) => (React.createElement(DropdownButton, { value: buttonText, onClick: toggleDropdown, isOpen: isOpen, isSmall: false, iconLeft: config.complete ? "gd-icon-attribute-hierarchy" : "", className: "gd-button-small s-visualization-button-target-hierarchy" })), renderBody: ({ closeDropdown }) => {
64
58
  return (React.createElement(AttributeHierarchyList, { hierarchies: items, closeDropdown: closeDropdown, onOpenAttributeHierarchyDialog: onOpenAttributeHierarchyDialog, onSelect: (hierarchy) => {
@@ -1 +1 @@
1
- {"version":3,"file":"AttributeHierarchyDropdown.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AttributeHierarchyDropdown.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"AttributeHierarchyListItem.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAK1C,OAAO,EAEH,0BAA0B,EAE1B,8BAA8B,EAIjC,MAAM,qBAAqB,CAAC;AAgB7B;;GAEG;AACH,MAAM,WAAW,gCAAgC;IAC7C,IAAI,EAAE,0BAA0B,GAAG,8BAA8B,CAAC;IAClE,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,CAAC,kBAAkB,EAAE,0BAA0B,GAAG,8BAA8B,KAAK,IAAI,CAAC;CACrG;AAwBD,eAAO,MAAM,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC,gCAAgC,CA6DjF,CAAC"}
1
+ {"version":3,"file":"AttributeHierarchyListItem.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAK1C,OAAO,EAEH,0BAA0B,EAE1B,8BAA8B,EAKjC,MAAM,qBAAqB,CAAC;AAgB7B;;GAEG;AACH,MAAM,WAAW,gCAAgC;IAC7C,IAAI,EAAE,0BAA0B,GAAG,8BAA8B,CAAC;IAClE,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,CAAC,kBAAkB,EAAE,0BAA0B,GAAG,8BAA8B,KAAK,IAAI,CAAC;CACrG;AAsBD,eAAO,MAAM,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC,gCAAgC,CA6DjF,CAAC"}
@@ -1,18 +1,16 @@
1
- // (C) 2023 GoodData Corporation
1
+ // (C) 2023-2024 GoodData Corporation
2
2
  import React from "react";
3
3
  import cx from "classnames";
4
4
  import { stringUtils } from "@gooddata/util";
5
5
  import { ShortenedText } from "@gooddata/sdk-ui-kit";
6
- import { isCatalogAttribute, isCatalogAttributeHierarchy, isCatalogDateAttributeHierarchy, } from "@gooddata/sdk-model";
6
+ import { getHierarchyAttributes, getHierarchyTitle, isCatalogAttribute, isCatalogDateAttributeHierarchy, } from "@gooddata/sdk-model";
7
7
  import { AttributeHierarchyDetailBubble, AttributeHierarchyDetailPanel, } from "@gooddata/sdk-ui-ext";
8
8
  import { selectAllCatalogAttributesMap, useDashboardSelector, selectCanManageAttributeHierarchy, } from "../../../../../model/index.js";
9
9
  import { useIntl } from "react-intl";
10
10
  import { messages } from "@gooddata/sdk-ui";
11
11
  const TOOLTIP_ALIGN_POINTS = [{ align: "cr cl", offset: { x: 56, y: 0 } }];
12
12
  function buildAttributeHierarchyDetailItems(hierarchy, allCatalogAttributes) {
13
- const attributeRefs = isCatalogAttributeHierarchy(hierarchy)
14
- ? hierarchy.attributeHierarchy.attributes
15
- : hierarchy.attributes;
13
+ const attributeRefs = getHierarchyAttributes(hierarchy);
16
14
  const items = [];
17
15
  attributeRefs.forEach((ref) => {
18
16
  const attribute = allCatalogAttributes.get(ref);
@@ -37,7 +35,7 @@ export const AttributeHierarchyListItem = (props) => {
37
35
  }
38
36
  props.onEdit(item);
39
37
  };
40
- const hierarchyTitle = isCatalogAttributeHierarchy(item) ? item.attributeHierarchy.title : item.title;
38
+ const hierarchyTitle = getHierarchyTitle(item);
41
39
  const hierarchyListItemClassname = cx("attribute-hierarchy-list-item s-attribute-hierarchy-list-item", `s-${stringUtils.simplifyText(hierarchyTitle)}`, {
42
40
  "is-disabled s-is-disable": isDisabled,
43
41
  });
@@ -1 +1 @@
1
- {"version":3,"file":"AttributeHierarchyListItem.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AttributeHierarchyListItem.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"DrillTargetAttributeHierarchyItem.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/DrillTargetAttributeHierarchyItem.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAEH,0BAA0B,EAC1B,8BAA8B,EAEjC,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,kCAAkC,EAAE,MAAM,4BAA4B,CAAC;AAUhF,UAAU,8BAA8B;IACpC,MAAM,EAAE,kCAAkC,CAAC;IAC3C,QAAQ,EAAE,CAAC,UAAU,EAAE,0BAA0B,GAAG,8BAA8B,KAAK,IAAI,CAAC;IAC5F,mBAAmB,EAAE,MAAM,IAAI,CAAC;CACnC;AAED,QAAA,MAAM,iCAAiC,EAAE,KAAK,CAAC,EAAE,CAAC,8BAA8B,CAuE/E,CAAC;AAEF,eAAe,iCAAiC,CAAC"}
1
+ {"version":3,"file":"DrillTargetAttributeHierarchyItem.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/DrillTargetAttributeHierarchyItem.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAGH,0BAA0B,EAC1B,8BAA8B,EAEjC,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,kCAAkC,EAAE,MAAM,4BAA4B,CAAC;AAUhF,UAAU,8BAA8B;IACpC,MAAM,EAAE,kCAAkC,CAAC;IAC3C,QAAQ,EAAE,CAAC,UAAU,EAAE,0BAA0B,GAAG,8BAA8B,KAAK,IAAI,CAAC;IAC5F,mBAAmB,EAAE,MAAM,IAAI,CAAC;CACnC;AAED,QAAA,MAAM,iCAAiC,EAAE,KAAK,CAAC,EAAE,CAAC,8BAA8B,CAqE/E,CAAC;AAEF,eAAe,iCAAiC,CAAC"}
@@ -1,7 +1,7 @@
1
- // (C) 2023 GoodData Corporation
1
+ // (C) 2023-2024 GoodData Corporation
2
2
  import React from "react";
3
3
  import isEmpty from "lodash/isEmpty.js";
4
- import { areObjRefsEqual, isCatalogAttributeHierarchy, } from "@gooddata/sdk-model";
4
+ import { areObjRefsEqual, getHierarchyAttributes, isCatalogAttributeHierarchy, } from "@gooddata/sdk-model";
5
5
  import { AttributeHierarchyDialog } from "@gooddata/sdk-ui-ext";
6
6
  import { selectAllCatalogAttributeHierarchies, useDashboardSelector, useDashboardUserInteraction, } from "../../../../../model/index.js";
7
7
  import EmptyAttributeHierarchyInfo from "./EmptyAttributeHierarchyInfo.js";
@@ -13,9 +13,7 @@ const DrillTargetAttributeHierarchyItem = ({ config, onSelect, onDeleteInteracti
13
13
  const { editingAttributeHierarchyRef, shouldDisplayAttributeHierarchyDialog, onDeleteAttributeHierarchy, onSaveAttributeHierarchy, onOpenAttributeHierarchyDialog, onCloseAttributeHierarchyDialog, } = useAttributeHierarchy({ onDeleteInteraction });
14
14
  const attributeDescriptor = config.attributes.find((attr) => attr.attributeHeader.localIdentifier === config.originLocalIdentifier);
15
15
  const existInHierarchies = catalogAttributeHierarchies.filter((hierarchy) => {
16
- const attributesRef = isCatalogAttributeHierarchy(hierarchy)
17
- ? hierarchy.attributeHierarchy.attributes
18
- : hierarchy.attributes;
16
+ const attributesRef = getHierarchyAttributes(hierarchy);
19
17
  return attributesRef.some((ref) => areObjRefsEqual(ref, attributeDescriptor?.attributeHeader.formOf.ref));
20
18
  });
21
19
  const shouldShowEmptyMessage = isEmpty(existInHierarchies) && !config.complete;
@@ -1 +1 @@
1
- {"version":3,"file":"DrillTargetAttributeHierarchyItem.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/DrillTargetAttributeHierarchyItem.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DrillTargetAttributeHierarchyItem.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/DrillTargetAttributeHierarchyItem.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"DrillTargets.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/DrillTargets.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAUH,sBAAsB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEH,gBAAgB,EAEhB,sCAAsC,EAMzC,MAAM,4BAA4B,CAAC;AAOpC,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,EAAE,CACL,KAAK,EAAE,sBAAsB,GAAG,sCAAsC,EACtE,WAAW,EAAE,gBAAgB,KAC5B,IAAI,CAAC;IACV,mBAAmB,EAAE,MAAM,IAAI,CAAC;CACnC;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,CA2GpE,CAAC"}
1
+ {"version":3,"file":"DrillTargets.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/DrillTargets.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAWH,sBAAsB,EACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEH,gBAAgB,EAEhB,sCAAsC,EAMzC,MAAM,4BAA4B,CAAC;AAOpC,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,EAAE,CACL,KAAK,EAAE,sBAAsB,GAAG,sCAAsC,EACtE,WAAW,EAAE,gBAAgB,KAC5B,IAAI,CAAC;IACV,mBAAmB,EAAE,MAAM,IAAI,CAAC;CACnC;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,CAyGpE,CAAC"}
@@ -1,6 +1,6 @@
1
1
  // (C) 2020-2024 GoodData Corporation
2
2
  import React from "react";
3
- import { idRef, isCatalogAttributeHierarchy, } from "@gooddata/sdk-model";
3
+ import { getHierarchyRef, idRef, } from "@gooddata/sdk-model";
4
4
  import { DRILL_TARGET_TYPE, isDrillToAttributeUrlConfig, isDrillToCustomUrlConfig, isDrillToDashboardConfig, isDrillToUrlConfig, } from "../../../../drill/types.js";
5
5
  import { DrillTargetInsightItem } from "./DrillTargetInsightItem.js";
6
6
  import { DrillTargetUrlItem } from "./DrillTargetUrlItem.js";
@@ -9,9 +9,7 @@ import DrillTargetAttributeHierarchyItem from "./DrillTargetAttributeHierarchyIt
9
9
  export const DrillTargets = (props) => {
10
10
  const { item, onDeleteInteraction } = props;
11
11
  const onDrillDownTargetSelect = (targetItem) => {
12
- const hierarchyRef = isCatalogAttributeHierarchy(targetItem)
13
- ? targetItem.attributeHierarchy.ref
14
- : targetItem.dateDatasetRef;
12
+ const hierarchyRef = getHierarchyRef(targetItem);
15
13
  const drillDownItem = {
16
14
  attributeHierarchyRef: item.attributeHierarchyRef,
17
15
  type: "drillDownAttributeHierarchy",
@@ -1 +1 @@
1
- {"version":3,"file":"DrillTargets.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/DrillTargets.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DrillTargets.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/DrillTargets.tsx"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { IDrillDownReference, InsightDrillDefinition, ObjRef } from "@gooddata/sdk-model";
1
+ import { ICatalogAttributeHierarchy, ICatalogDateAttributeHierarchy, IDrillDownReference, InsightDrillDefinition, ObjRef } from "@gooddata/sdk-model";
2
2
  import { IDrillConfigItem, IDrillDownAttributeHierarchyConfig, IDrillDownAttributeHierarchyDefinition } from "../../../../drill/types.js";
3
3
  /**
4
4
  * @internal
@@ -26,5 +26,5 @@ export declare const useInsightDrillConfigPanel: (props: IUseDrillConfigPanelPro
26
26
  onSetupItem: (drill: InsightDrillDefinition | IDrillDownAttributeHierarchyDefinition, changedItem: IDrillConfigItem) => void;
27
27
  onDeleteItem: (item: IDrillConfigItem) => void;
28
28
  };
29
- export declare function buildBlacklistHierarchies(item: IDrillDownAttributeHierarchyDefinition | IDrillDownAttributeHierarchyConfig): IDrillDownReference[];
29
+ export declare function buildBlacklistHierarchies(item: IDrillDownAttributeHierarchyDefinition | IDrillDownAttributeHierarchyConfig, attributeHierarchies: (ICatalogAttributeHierarchy | ICatalogDateAttributeHierarchy)[]): IDrillDownReference[];
30
30
  //# sourceMappingURL=useInsightDrillConfigPanel.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useInsightDrillConfigPanel.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.ts"],"names":[],"mappings":"AAMA,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EAGtB,MAAM,EACT,MAAM,qBAAqB,CAAC;AAoB7B,OAAO,EAEH,gBAAgB,EAChB,kCAAkC,EAClC,sCAAsC,EAGzC,MAAM,4BAA4B,CAAC;AAiEpC;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,UAAW,yBAAyB;;;;;;;;;;;;;yBAyExD,sBAAsB,GAAG,sCAAsC,eACzD,gBAAgB;yBAiD1B,gBAAgB;CA6B9B,CAAC;AAEF,wBAAgB,yBAAyB,CACrC,IAAI,EAAE,sCAAsC,GAAG,kCAAkC,GAClF,mBAAmB,EAAE,CAwBvB"}
1
+ {"version":3,"file":"useInsightDrillConfigPanel.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.ts"],"names":[],"mappings":"AAMA,OAAO,EAGH,0BAA0B,EAC1B,8BAA8B,EAE9B,mBAAmB,EACnB,sBAAsB,EAItB,MAAM,EACT,MAAM,qBAAqB,CAAC;AAqB7B,OAAO,EAEH,gBAAgB,EAChB,kCAAkC,EAClC,sCAAsC,EAGzC,MAAM,4BAA4B,CAAC;AAiEpC;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,UAAW,yBAAyB;;;;;;;;;;;;;yBA2ExD,sBAAsB,GAAG,sCAAsC,eACzD,gBAAgB;yBA4D1B,gBAAgB;CA6B9B,CAAC;AAEF,wBAAgB,yBAAyB,CACrC,IAAI,EAAE,sCAAsC,GAAG,kCAAkC,EACjF,oBAAoB,EAAE,CAAC,0BAA0B,GAAG,8BAA8B,CAAC,EAAE,GACtF,mBAAmB,EAAE,CAsCvB"}
@@ -3,8 +3,8 @@ import { useCallback, useMemo } from "react";
3
3
  import { defineMessages } from "react-intl";
4
4
  import { invariant } from "ts-invariant";
5
5
  import { useToastMessage } from "@gooddata/sdk-ui-kit";
6
- import { isInsightWidget, localIdRef, } from "@gooddata/sdk-model";
7
- import { modifyDrillsForInsightWidget, removeDrillDownForInsightWidget, removeDrillsForInsightWidget, selectAllowMultipleInteractionsPerAttributeAndMeasure, selectDrillTargetsByWidgetRef, selectGlobalDrillsDownAttributeHierarchyByWidgetRef, selectInvalidUrlDrillParameterDrillLocalIdsByWidgetRef, selectSettings, selectWidgetByRef, useDashboardDispatch, useDashboardSelector, selectInsightByRef, addDrillDownForInsightWidget, modifyDrillDownForInsightWidget, selectSupportsAttributeHierarchies, } from "../../../../../model/index.js";
6
+ import { areObjRefsEqual, getHierarchyRef, idRef, isCatalogDateAttributeHierarchy, isInsightWidget, localIdRef, } from "@gooddata/sdk-model";
7
+ import { modifyDrillsForInsightWidget, removeDrillDownForInsightWidget, removeDrillsForInsightWidget, selectAllowMultipleInteractionsPerAttributeAndMeasure, selectDrillTargetsByWidgetRef, selectGlobalDrillsDownAttributeHierarchyByWidgetRef, selectInvalidUrlDrillParameterDrillLocalIdsByWidgetRef, selectSettings, selectWidgetByRef, useDashboardDispatch, useDashboardSelector, selectInsightByRef, addDrillDownForInsightWidget, modifyDrillDownForInsightWidget, selectSupportsAttributeHierarchies, selectAllCatalogAttributeHierarchies, } from "../../../../../model/index.js";
8
8
  import { getGlobalDrillDownMappedConfigForWidget, getMappedConfigForWidget } from "./drillConfigMapper.js";
9
9
  import { DRILL_TARGET_TYPE, isDrillDownToAttributeHierarchyConfig, isDrillDownToAttributeHierarchyDefinition, } from "../../../../drill/types.js";
10
10
  import { useIncompleteItems } from "./useDrillConfigIncompleteItems.js";
@@ -63,6 +63,7 @@ export const useInsightDrillConfigPanel = (props) => {
63
63
  const settings = useDashboardSelector(selectSettings);
64
64
  const { enableKDZooming } = settings;
65
65
  const availableDrillTargets = configItems?.availableDrillTargets;
66
+ const attributeHierarchies = useDashboardSelector(selectAllCatalogAttributeHierarchies);
66
67
  const drillItems = useMemo(() => {
67
68
  return availableDrillTargets
68
69
  ? getMappedConfigForWidget(widgetDrills, availableDrillTargets, invalidCustomUrlDrillLocalIds, widgetRef)
@@ -84,7 +85,7 @@ export const useInsightDrillConfigPanel = (props) => {
84
85
  const isNew = isItemNew(changedItem);
85
86
  if (!isDrillDownToAttributeHierarchyDefinition(drill)) {
86
87
  const blacklistHierarchiesToUpdate = isDrillDownToAttributeHierarchyConfig(changedItem)
87
- ? buildBlacklistHierarchies(changedItem)
88
+ ? buildBlacklistHierarchies(changedItem, attributeHierarchies)
88
89
  : [];
89
90
  dispatch(modifyDrillsForInsightWidget(widgetRef, [drill], blacklistHierarchiesToUpdate));
90
91
  }
@@ -95,7 +96,7 @@ export const useInsightDrillConfigPanel = (props) => {
95
96
  if (changedItem.drillTargetType === DRILL_TARGET_TYPE.DRILL_DOWN) {
96
97
  const attributeDescriptor = changedItem.attributes.find((attr) => attr.attributeHeader.localIdentifier === changedItem.originLocalIdentifier);
97
98
  if (changedItem.complete) {
98
- dispatch(modifyDrillDownForInsightWidget(widgetRef, attributeDescriptor.attributeHeader.formOf.ref, changedItem.attributeHierarchyRef, buildBlacklistHierarchies(drill)));
99
+ dispatch(modifyDrillDownForInsightWidget(widgetRef, attributeDescriptor.attributeHeader.formOf.ref, changedItem.attributeHierarchyRef, buildBlacklistHierarchies(drill, attributeHierarchies)));
99
100
  }
100
101
  else {
101
102
  dispatch(addDrillDownForInsightWidget(widgetRef, attributeDescriptor.attributeHeader.formOf.ref, changedItem.localIdentifier, changedItem.attributeHierarchyRef));
@@ -103,15 +104,23 @@ export const useInsightDrillConfigPanel = (props) => {
103
104
  deleteIncompleteItem(changedItem);
104
105
  }
105
106
  addSuccess(isNew ? messages.added : messages.modified, { duration: 3000 });
106
- }, [widgetRef, completeItem, addSuccess, isItemNew, dispatch]);
107
+ }, [
108
+ widgetRef,
109
+ completeItem,
110
+ addSuccess,
111
+ isItemNew,
112
+ dispatch,
113
+ attributeHierarchies,
114
+ deleteIncompleteItem,
115
+ ]);
107
116
  const onDeleteItem = useCallback((item) => {
108
117
  if (item.complete) {
109
- item.drillTargetType === DRILL_TARGET_TYPE.DRILL_DOWN
110
- ? dispatch(removeDrillDownForInsightWidget(widgetRef, buildBlacklistHierarchies(item)))
118
+ isDrillDownToAttributeHierarchyConfig(item)
119
+ ? dispatch(removeDrillDownForInsightWidget(widgetRef, buildBlacklistHierarchies(item, attributeHierarchies)))
111
120
  : dispatch(removeDrillsForInsightWidget(widgetRef, [localIdRef(item.localIdentifier)]));
112
121
  }
113
122
  deleteIncompleteItem(item);
114
- }, [widgetRef, dispatch, deleteIncompleteItem]);
123
+ }, [widgetRef, dispatch, deleteIncompleteItem, attributeHierarchies]);
115
124
  return {
116
125
  widget,
117
126
  insight,
@@ -126,20 +135,33 @@ export const useInsightDrillConfigPanel = (props) => {
126
135
  onDeleteItem,
127
136
  };
128
137
  };
129
- export function buildBlacklistHierarchies(item) {
138
+ export function buildBlacklistHierarchies(item, attributeHierarchies) {
130
139
  const attributeDescriptor = item.attributes.find((attr) => attr.attributeHeader.localIdentifier === item.originLocalIdentifier);
131
140
  if (!attributeDescriptor) {
132
141
  return [];
133
142
  }
134
143
  const isDateAttribute = !!attributeDescriptor.attributeHeader.granularity;
135
144
  if (isDateAttribute) {
136
- return [
137
- {
138
- type: "dateHierarchyReference",
139
- dateHierarchyTemplate: item.attributeHierarchyRef,
140
- dateDatasetAttribute: attributeDescriptor.attributeHeader.formOf.ref,
141
- },
142
- ];
145
+ const dateHierarchy = attributeHierarchies.find((hierarchy) => areObjRefsEqual(getHierarchyRef(hierarchy), item.attributeHierarchyRef));
146
+ // date attribute may reference either adhoc date hierarchy or std attribute hierarchy
147
+ if (isCatalogDateAttributeHierarchy(dateHierarchy)) {
148
+ return [
149
+ {
150
+ type: "dateHierarchyReference",
151
+ dateHierarchyTemplate: idRef(dateHierarchy.templateId, "dateHierarchyTemplate"),
152
+ dateDatasetAttribute: attributeDescriptor.attributeHeader.formOf.ref,
153
+ },
154
+ ];
155
+ }
156
+ else {
157
+ return [
158
+ {
159
+ type: "attributeHierarchyReference",
160
+ attributeHierarchy: item.attributeHierarchyRef,
161
+ attribute: attributeDescriptor.attributeHeader.formOf.ref,
162
+ },
163
+ ];
164
+ }
143
165
  }
144
166
  return [
145
167
  {
@@ -1 +1 @@
1
- {"version":3,"file":"useInsightDrillConfigPanel.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useInsightDrillConfigPanel.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.ts"],"names":[],"mappings":"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"}
@@ -766,7 +766,7 @@ export declare type AttributeFilterDraggingComponent = ComponentType<IAttributeF
766
766
  /**
767
767
  * @beta
768
768
  */
769
- export declare type AttributeFilterInteractionType = "attributeFilterTitleResetClicked" | "attributeFilterConfigurationOpened" | "attributeFilterClearIrrelevantValuesClicked" | "attributeFilterShowAllValuesClicked" | "attributeFilterLimitAddButtonClicked" | "attributeFilterLimitAddParentFilterOptionClicked" | "attributeFilterLimitAddMetricOptionClicked" | "attributeFilterLimitParentFilterClicked" | "attributeFilterLimitMetricClicked" | "attributeFilterLimitFactMetricClicked" | "attributeFilterLimitAttributeMetricClicked" | "attributeFilterLimitRemoveParentFilterClicked" | "attributeFilterLimitRemoveMetricClicked";
769
+ export declare type AttributeFilterInteractionType = "attributeFilterTitleResetClicked" | "attributeFilterConfigurationOpened" | "attributeFilterClearIrrelevantValuesClicked" | "attributeFilterShowAllValuesClicked" | "attributeFilterLimitAddButtonClicked" | "attributeFilterLimitAddParentFilterOptionClicked" | "attributeFilterLimitAddMetricOptionClicked" | "attributeFilterLimitParentFilterClicked" | "attributeFilterLimitDependentDateFilterClicked" | "attributeFilterLimitMetricClicked" | "attributeFilterLimitFactMetricClicked" | "attributeFilterLimitAttributeMetricClicked" | "attributeFilterLimitRemoveParentFilterClicked" | "attributeFilterLimitRemoveDependentDateFilterClicked" | "attributeFilterLimitRemoveMetricClicked";
770
770
 
771
771
  /**
772
772
  * @internal
@@ -6478,7 +6478,7 @@ export declare interface EntitlementsState {
6478
6478
  /**
6479
6479
  * @internal
6480
6480
  */
6481
- export declare function existBlacklistHierarchyPredicate(reference: IDrillDownReference, attributeHierarchyRef: ObjRef, attributeIdentifier?: ObjRef): boolean;
6481
+ export declare function existBlacklistHierarchyPredicate(reference: IDrillDownReference, attributeHierarchy: ICatalogAttributeHierarchy | ICatalogDateAttributeHierarchy, attributeIdentifier?: ObjRef): boolean;
6482
6482
 
6483
6483
  /**
6484
6484
  * @beta
@@ -7952,13 +7952,15 @@ export declare interface IDashboardDateFilterProps {
7952
7952
  */
7953
7953
  export declare interface IDashboardDependentDateFilter {
7954
7954
  localIdentifier: string;
7955
- isSelected: boolean;
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?: string;
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.1",
3
+ "version": "10.0.0-alpha.11",
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.1",
60
- "@gooddata/sdk-backend-spi": "10.0.0-alpha.1",
61
- "@gooddata/sdk-ui": "10.0.0-alpha.1",
62
- "@gooddata/sdk-ui-ext": "10.0.0-alpha.1",
63
- "@gooddata/sdk-model": "10.0.0-alpha.1",
64
- "@gooddata/sdk-ui-filters": "10.0.0-alpha.1",
65
- "@gooddata/sdk-ui-geo": "10.0.0-alpha.1",
66
- "@gooddata/sdk-ui-kit": "10.0.0-alpha.1",
67
- "@gooddata/sdk-ui-theme-provider": "10.0.0-alpha.1",
68
- "@gooddata/util": "10.0.0-alpha.1",
69
- "@gooddata/sdk-ui-vis-commons": "10.0.0-alpha.1"
59
+ "@gooddata/sdk-backend-base": "10.0.0-alpha.11",
60
+ "@gooddata/sdk-backend-spi": "10.0.0-alpha.11",
61
+ "@gooddata/sdk-ui": "10.0.0-alpha.11",
62
+ "@gooddata/sdk-ui-ext": "10.0.0-alpha.11",
63
+ "@gooddata/sdk-model": "10.0.0-alpha.11",
64
+ "@gooddata/sdk-ui-filters": "10.0.0-alpha.11",
65
+ "@gooddata/sdk-ui-geo": "10.0.0-alpha.11",
66
+ "@gooddata/sdk-ui-kit": "10.0.0-alpha.11",
67
+ "@gooddata/sdk-ui-theme-provider": "10.0.0-alpha.11",
68
+ "@gooddata/util": "10.0.0-alpha.11",
69
+ "@gooddata/sdk-ui-vis-commons": "10.0.0-alpha.11"
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/i18n-toolkit": "10.0.0-alpha.1",
123
- "@gooddata/reference-workspace": "10.0.0-alpha.1",
124
- "@gooddata/sdk-backend-mockingbird": "10.0.0-alpha.1"
122
+ "@gooddata/i18n-toolkit": "10.0.0-alpha.11",
123
+ "@gooddata/reference-workspace": "10.0.0-alpha.11",
124
+ "@gooddata/sdk-backend-mockingbird": "10.0.0-alpha.11"
125
125
  },
126
126
  "scripts": {
127
127
  "clean": "rm -rf ci dist esm coverage *.log styles/css tsconfig.tsbuildinfo",