@gooddata/sdk-ui-dashboard 10.0.0-alpha.2 → 10.0.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/__version.d.ts +1 -1
- package/esm/__version.js +1 -1
- package/esm/model/commandHandlers/widgets/addDrillDownForInsightWidgetHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/widgets/addDrillDownForInsightWidgetHandler.js +10 -3
- package/esm/model/commandHandlers/widgets/addDrillDownForInsightWidgetHandler.js.map +1 -1
- package/esm/model/commandHandlers/widgets/modifyDrillDownForInsightWidgetHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/widgets/modifyDrillDownForInsightWidgetHandler.js +10 -3
- package/esm/model/commandHandlers/widgets/modifyDrillDownForInsightWidgetHandler.js.map +1 -1
- package/esm/model/store/catalog/catalogSelectors.d.ts.map +1 -1
- package/esm/model/store/catalog/catalogSelectors.js +6 -5
- package/esm/model/store/catalog/catalogSelectors.js.map +1 -1
- package/esm/model/store/widgetDrills/widgetDrillSelectors.d.ts.map +1 -1
- package/esm/model/store/widgetDrills/widgetDrillSelectors.js +11 -22
- package/esm/model/store/widgetDrills/widgetDrillSelectors.js.map +1 -1
- package/esm/model/utils/attributeHierarchyUtils.d.ts +2 -2
- package/esm/model/utils/attributeHierarchyUtils.d.ts.map +1 -1
- package/esm/model/utils/attributeHierarchyUtils.js +10 -8
- package/esm/model/utils/attributeHierarchyUtils.js.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.d.ts.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.js +11 -15
- package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.js.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.d.ts.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.js +4 -6
- package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.js.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargetAttributeHierarchyItem.d.ts.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargetAttributeHierarchyItem.js +3 -5
- package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargetAttributeHierarchyItem.js.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargets.d.ts.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargets.js +2 -4
- package/esm/presentation/widget/insight/configuration/DrillTargets/DrillTargets.js.map +1 -1
- package/esm/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.d.ts +2 -2
- package/esm/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.d.ts.map +1 -1
- package/esm/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.js +23 -10
- package/esm/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.js.map +1 -1
- package/esm/sdk-ui-dashboard.d.ts +1 -1
- package/package.json +15 -15
package/esm/__version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "10.0.0-alpha.
|
|
1
|
+
export declare const LIB_VERSION = "10.0.0-alpha.3";
|
|
2
2
|
//# sourceMappingURL=__version.d.ts.map
|
package/esm/__version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addDrillDownForInsightWidgetHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/addDrillDownForInsightWidgetHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,oCAAoC,EAA+B,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"addDrillDownForInsightWidgetHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/addDrillDownForInsightWidgetHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,oCAAoC,EAA+B,MAAM,yBAAyB,CAAC;AAQ5G,wBAAiB,mCAAmC,CAChD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,4BAA4B,GAClC,YAAY,CAAC,oCAAoC,CAAC,CAwDpD"}
|
|
@@ -1,15 +1,22 @@
|
|
|
1
|
-
// (C) 2023 GoodData Corporation
|
|
1
|
+
// (C) 2023-2024 GoodData Corporation
|
|
2
2
|
import { put, select } from "redux-saga/effects";
|
|
3
3
|
import { insightWidgetDrillDownAdded } from "../../events/insight.js";
|
|
4
4
|
import { selectWidgetsMap } from "../../store/layout/layoutSelectors.js";
|
|
5
5
|
import { validateExistingInsightWidget } from "./validation/widgetValidations.js";
|
|
6
6
|
import { layoutActions } from "../../store/layout/index.js";
|
|
7
7
|
import { existBlacklistHierarchyPredicate } from "../../utils/attributeHierarchyUtils.js";
|
|
8
|
+
import { selectAllCatalogAttributeHierarchies } from "../../store/catalog/catalogSelectors.js";
|
|
9
|
+
import { getHierarchyRef } from "@gooddata/sdk-model";
|
|
8
10
|
export function* addDrillDownForInsightWidgetHandler(ctx, cmd) {
|
|
9
11
|
const { payload: { attributeIdentifier, drillDownIdentifier, drillDownAttributeHierarchyRef }, correlationId, } = cmd;
|
|
10
12
|
const widgets = yield select(selectWidgetsMap);
|
|
11
13
|
const insightWidget = validateExistingInsightWidget(widgets, cmd, ctx);
|
|
12
14
|
const { ref: widgetRef, ignoredDrillDownHierarchies: currentBlacklistHierarchies } = insightWidget;
|
|
15
|
+
const hierarchies = yield select(selectAllCatalogAttributeHierarchies);
|
|
16
|
+
const hierarchy = hierarchies.find((hierarchy) => {
|
|
17
|
+
const hierarchyRef = getHierarchyRef(hierarchy);
|
|
18
|
+
return hierarchyRef === drillDownAttributeHierarchyRef;
|
|
19
|
+
});
|
|
13
20
|
const updatedInsightDrills = insightWidget.drills.filter((drill) => drill.localIdentifier !== drillDownIdentifier);
|
|
14
21
|
yield put(layoutActions.replaceWidgetDrills({
|
|
15
22
|
ref: insightWidget.ref,
|
|
@@ -18,8 +25,8 @@ export function* addDrillDownForInsightWidgetHandler(ctx, cmd) {
|
|
|
18
25
|
cmd,
|
|
19
26
|
},
|
|
20
27
|
}));
|
|
21
|
-
const newBlacklistHierarchies = currentBlacklistHierarchies
|
|
22
|
-
? currentBlacklistHierarchies.filter((ref) => !existBlacklistHierarchyPredicate(ref,
|
|
28
|
+
const newBlacklistHierarchies = currentBlacklistHierarchies && hierarchy
|
|
29
|
+
? currentBlacklistHierarchies.filter((ref) => !existBlacklistHierarchyPredicate(ref, hierarchy, attributeIdentifier))
|
|
23
30
|
: [];
|
|
24
31
|
yield put(layoutActions.replaceWidgetBlacklistHierarchies({
|
|
25
32
|
ref: widgetRef,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addDrillDownForInsightWidgetHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/addDrillDownForInsightWidgetHandler.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"addDrillDownForInsightWidgetHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/addDrillDownForInsightWidgetHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAGrC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAIjD,OAAO,EAAwC,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAC5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAC1F,OAAO,EAAE,oCAAoC,EAAE,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,SAAS,CAAC,CAAC,mCAAmC,CAChD,GAAqB,EACrB,GAAiC;IAEjC,MAAM,EACF,OAAO,EAAE,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,8BAA8B,EAAE,EACrF,aAAa,GAChB,GAAG,GAAG,CAAC;IACR,MAAM,OAAO,GAAwC,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpF,MAAM,aAAa,GAAG,6BAA6B,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACvE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,2BAA2B,EAAE,2BAA2B,EAAE,GAAG,aAAa,CAAC;IAEnG,MAAM,WAAW,GAA4D,MAAM,MAAM,CACrF,oCAAoC,CACvC,CAAC;IAEF,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7C,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAChD,OAAO,YAAY,KAAK,8BAA8B,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,MAAM,oBAAoB,GAAG,aAAa,CAAC,MAAM,CAAC,MAAM,CACpD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,KAAK,mBAAmB,CAC3D,CAAC;IAEF,MAAM,GAAG,CACL,aAAa,CAAC,mBAAmB,CAAC;QAC9B,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,gBAAgB,EAAE,oBAAoB;QACtC,IAAI,EAAE;YACF,GAAG;SACN;KACJ,CAAC,CACL,CAAC;IAEF,MAAM,uBAAuB,GACzB,2BAA2B,IAAI,SAAS;QACpC,CAAC,CAAC,2BAA2B,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,gCAAgC,CAAC,GAAG,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAClF;QACH,CAAC,CAAC,EAAE,CAAC;IAEb,MAAM,GAAG,CACL,aAAa,CAAC,iCAAiC,CAAC;QAC5C,GAAG,EAAE,SAAS;QACd,oBAAoB,EAAE,uBAAuB;QAC7C,IAAI,EAAE;YACF,GAAG;SACN;KACJ,CAAC,CACL,CAAC;IAEF,OAAO,2BAA2B,CAC9B,GAAG,EACH,SAAS,EACT,8BAA8B,EAC9B,mBAAmB,EACnB,aAAa,CAChB,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifyDrillDownForInsightWidgetHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/modifyDrillDownForInsightWidgetHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EACH,uCAAuC,EAE1C,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"modifyDrillDownForInsightWidgetHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/modifyDrillDownForInsightWidgetHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EACH,uCAAuC,EAE1C,MAAM,yBAAyB,CAAC;AAQjC,wBAAiB,sCAAsC,CACnD,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,+BAA+B,GACrC,YAAY,CAAC,uCAAuC,CAAC,CAsCvD"}
|
|
@@ -1,17 +1,24 @@
|
|
|
1
|
-
// (C) 2023 GoodData Corporation
|
|
1
|
+
// (C) 2023-2024 GoodData Corporation
|
|
2
2
|
import { put, select } from "redux-saga/effects";
|
|
3
3
|
import { insightWidgetDrillDownModified, } from "../../events/insight.js";
|
|
4
4
|
import { selectWidgetsMap } from "../../store/layout/layoutSelectors.js";
|
|
5
5
|
import { validateExistingInsightWidget } from "./validation/widgetValidations.js";
|
|
6
6
|
import { layoutActions } from "../../store/layout/index.js";
|
|
7
7
|
import { existBlacklistHierarchyPredicate } from "../../utils/attributeHierarchyUtils.js";
|
|
8
|
+
import { selectAllCatalogAttributeHierarchies } from "../../store/catalog/catalogSelectors.js";
|
|
9
|
+
import { getHierarchyRef } from "@gooddata/sdk-model";
|
|
8
10
|
export function* modifyDrillDownForInsightWidgetHandler(ctx, cmd) {
|
|
9
11
|
const { payload: { attributeIdentifier, attributeHierarchyRef, blacklistHierarchies }, correlationId, } = cmd;
|
|
10
12
|
const widgets = yield select(selectWidgetsMap);
|
|
11
13
|
const insightWidget = validateExistingInsightWidget(widgets, cmd, ctx);
|
|
12
14
|
const { ref: widgetRef, ignoredDrillDownHierarchies: currentBlacklistHierarchies } = insightWidget;
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
+
const hierarchies = yield select(selectAllCatalogAttributeHierarchies);
|
|
16
|
+
const hierarchy = hierarchies.find((hierarchy) => {
|
|
17
|
+
const hierarchyRef = getHierarchyRef(hierarchy);
|
|
18
|
+
return hierarchyRef === attributeHierarchyRef;
|
|
19
|
+
});
|
|
20
|
+
const newBlacklistHierarchies = currentBlacklistHierarchies && hierarchy
|
|
21
|
+
? currentBlacklistHierarchies.filter((ref) => !existBlacklistHierarchyPredicate(ref, hierarchy, attributeIdentifier))
|
|
15
22
|
: [];
|
|
16
23
|
const mergedBlacklistHierarchies = [...newBlacklistHierarchies, ...blacklistHierarchies];
|
|
17
24
|
yield put(layoutActions.replaceWidgetBlacklistHierarchies({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifyDrillDownForInsightWidgetHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/modifyDrillDownForInsightWidgetHandler.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"modifyDrillDownForInsightWidgetHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/widgets/modifyDrillDownForInsightWidgetHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAGrC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAIjD,OAAO,EAEH,8BAA8B,GACjC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAC1F,OAAO,EAAE,oCAAoC,EAAE,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,SAAS,CAAC,CAAC,sCAAsC,CACnD,GAAqB,EACrB,GAAoC;IAEpC,MAAM,EACF,OAAO,EAAE,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,EAC7E,aAAa,GAChB,GAAG,GAAG,CAAC;IACR,MAAM,OAAO,GAAwC,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpF,MAAM,aAAa,GAAG,6BAA6B,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACvE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,2BAA2B,EAAE,2BAA2B,EAAE,GAAG,aAAa,CAAC;IAEnG,MAAM,WAAW,GAA4D,MAAM,MAAM,CACrF,oCAAoC,CACvC,CAAC;IAEF,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7C,MAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAChD,OAAO,YAAY,KAAK,qBAAqB,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,MAAM,uBAAuB,GACzB,2BAA2B,IAAI,SAAS;QACpC,CAAC,CAAC,2BAA2B,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,gCAAgC,CAAC,GAAG,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAClF;QACH,CAAC,CAAC,EAAE,CAAC;IAEb,MAAM,0BAA0B,GAAG,CAAC,GAAG,uBAAuB,EAAE,GAAG,oBAAoB,CAAC,CAAC;IAEzF,MAAM,GAAG,CACL,aAAa,CAAC,iCAAiC,CAAC;QAC5C,GAAG,EAAE,SAAS;QACd,oBAAoB,EAAE,0BAA0B;QAChD,IAAI,EAAE;YACF,GAAG;SACN;KACJ,CAAC,CACL,CAAC;IAEF,OAAO,8BAA8B,CAAC,GAAG,EAAE,SAAS,EAAE,oBAAoB,EAAE,aAAa,CAAC,CAAC;AAC/F,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalogSelectors.d.ts","sourceRoot":"","sources":["../../../../src/model/store/catalog/catalogSelectors.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,mCAAmC,EACnC,iBAAiB,EACjB,0BAA0B,EAC1B,qBAAqB,EACrB,mBAAmB,EACnB,YAAY,EACZ,eAAe,EACf,MAAM,EAGN,sBAAsB,EACtB,8BAA8B,
|
|
1
|
+
{"version":3,"file":"catalogSelectors.d.ts","sourceRoot":"","sources":["../../../../src/model/store/catalog/catalogSelectors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
// (C) 2021-
|
|
1
|
+
// (C) 2021-2024 GoodData Corporation
|
|
2
2
|
import { createSelector } from "@reduxjs/toolkit";
|
|
3
3
|
import flatMap from "lodash/flatMap.js";
|
|
4
|
-
import { areObjRefsEqual, objRefToString,
|
|
4
|
+
import { areObjRefsEqual, objRefToString, idRef, getHierarchyAttributes, } from "@gooddata/sdk-model";
|
|
5
5
|
import { newCatalogDateAttributeWithDatasetMap, } from "../../../_staging/catalog/dateAttributeWithDatasetMap.js";
|
|
6
6
|
import { newCatalogAttributeMap, newCatalogDateDatasetMap, newCatalogMeasureMap, } from "../../../_staging/metadata/objRefMap.js";
|
|
7
7
|
import { selectBackendCapabilities, selectSupportsAttributeHierarchies, } from "../backendCapabilities/backendCapabilitiesSelectors.js";
|
|
@@ -172,9 +172,7 @@ function getAttributesWithHierarchyDescendants(attributes, dateAttributes, attri
|
|
|
172
172
|
allCatalogAttributes.forEach((attribute) => {
|
|
173
173
|
const attributeRef = attribute.attribute.ref;
|
|
174
174
|
attributeHierarchies.forEach((hierarchy) => {
|
|
175
|
-
const attributes =
|
|
176
|
-
? hierarchy.attributeHierarchy.attributes
|
|
177
|
-
: hierarchy.attributes;
|
|
175
|
+
const attributes = getHierarchyAttributes(hierarchy);
|
|
178
176
|
const foundAttributeIndex = attributes.findIndex((ref) => areObjRefsEqual(ref, attributeRef));
|
|
179
177
|
if (foundAttributeIndex < 0) {
|
|
180
178
|
return;
|
|
@@ -218,6 +216,9 @@ function buildDateHierarchy(dateDataset, dateTemplate) {
|
|
|
218
216
|
if (!isEmpty(dateAttributesInHierarchy)) {
|
|
219
217
|
return {
|
|
220
218
|
type: "dateAttributeHierarchy",
|
|
219
|
+
// create ref of adhoc date hierarchy by combining date dataset id and date template id
|
|
220
|
+
// this ref should not be stored on MD server as it is not existing MD object
|
|
221
|
+
ref: idRef(`${dateTemplate.id}/${objRefToString(dateDataset.dataSet.ref)}`, "dateAttributeHierarchy"),
|
|
221
222
|
templateId: dateTemplate.id,
|
|
222
223
|
dateDatasetRef: dateDataset.dataSet.ref,
|
|
223
224
|
title: dateDataset.dataSet.title,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalogSelectors.js","sourceRoot":"","sources":["../../../../src/model/store/catalog/catalogSelectors.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,EASH,eAAe,EACf,cAAc,EAGd,
|
|
1
|
+
{"version":3,"file":"catalogSelectors.js","sourceRoot":"","sources":["../../../../src/model/store/catalog/catalogSelectors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"widgetDrillSelectors.d.ts","sourceRoot":"","sources":["../../../../src/model/store/widgetDrills/widgetDrillSelectors.ts"],"names":[],"mappings":"AAIA,OAAO,EAIH,MAAM,EAYN,mBAAmB,
|
|
1
|
+
{"version":3,"file":"widgetDrillSelectors.d.ts","sourceRoot":"","sources":["../../../../src/model/store/widgetDrills/widgetDrillSelectors.ts"],"names":[],"mappings":"AAIA,OAAO,EAIH,MAAM,EAYN,mBAAmB,EAKtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACH,aAAa,EAGb,sBAAsB,EACtB,gBAAgB,EACnB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,wBAAwB,EAAE,4CAA4C,EAAE,MAAM,mBAAmB,CAAC;AA4B3G,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAUhD;;GAEG;AACH,MAAM,WAAW,4BAA4B;IACzC,eAAe,EAAE,wBAAwB,CAAC;IAC1C,UAAU,EAAE,gBAAgB,EAAE,CAAC;CAClC;AAwND;;GAEG;AACH,eAAO,MAAM,mCAAmC,EAAE,CAC9C,GAAG,EAAE,MAAM,KACV,iBAAiB,CAAC,4BAA4B,EAAE,CAsCpD,CAAC;AAgEF;;GAEG;AACH,eAAO,MAAM,mDAAmD,EAAE,CAC9D,GAAG,EAAE,MAAM,KACV,iBAAiB,CAAC,4CAA4C,EAAE,CA6BpE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oCAAoC,EAAE,CAC/C,GAAG,EAAE,MAAM,KACV,iBAAiB,CAAC,4BAA4B,EAAE,CAepD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iCAAiC,EAAE,CAC5C,GAAG,EAAE,MAAM,KACV,iBAAiB,CAAC,4BAA4B,EAAE,CA2DpD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sCAAsC,EAAE,CACjD,GAAG,EAAE,MAAM,KACV,iBAAiB,CAAC,4BAA4B,EAAE,CA0CpD,CAAC;AA0BF;;GAEG;AACH,eAAO,MAAM,4CAA4C,EAAE,CACvD,GAAG,EAAE,MAAM,KACV,iBAAiB,CAAC,4BAA4B,EAAE,CAepD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,iBAAiB,CAAC,aAAa,EAAE,CA+B3F,CAAC;AAMN;;GAEG;AACH,eAAO,MAAM,2CAA2C,EAAE,CACtD,qBAAqB,EAAE,sBAAsB,GAAG,SAAS,EACzD,2BAA2B,EAAE,mBAAmB,EAAE,GAAG,SAAS,KAC7D,iBAAiB,CAAC,4BAA4B,EAAE,CAuCpD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2CAA2C,EAAE,CACtD,qBAAqB,EAAE,sBAAsB,GAAG,SAAS,EACzD,2BAA2B,EAAE,mBAAmB,EAAE,GAAG,SAAS,KAC7D,iBAAiB,CAAC,gBAAgB,EAAE,CAWxC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { createSelector } from "@reduxjs/toolkit";
|
|
3
3
|
import compact from "lodash/compact.js";
|
|
4
4
|
import { UnexpectedError } from "@gooddata/sdk-backend-spi";
|
|
5
|
-
import { isLocalIdRef, isIdentifierRef, isUriRef, areObjRefsEqual, localIdRef, isDrillFromAttribute, isDrillFromMeasure, objRefToString,
|
|
5
|
+
import { isLocalIdRef, isIdentifierRef, isUriRef, areObjRefsEqual, localIdRef, isDrillFromAttribute, isDrillFromMeasure, objRefToString, getHierarchyAttributes, getHierarchyRef, } from "@gooddata/sdk-model";
|
|
6
6
|
import { HeaderPredicates, } from "@gooddata/sdk-ui";
|
|
7
7
|
import { createMemoizedSelector } from "../_infra/selectors.js";
|
|
8
8
|
import { selectIgnoredDrillDownHierarchiesByWidgetRef, selectWidgetDrills, } from "../layout/layoutSelectors.js";
|
|
@@ -69,14 +69,9 @@ function getDrillDownDefinitionsWithPredicates(availableDrillAttributes, attribu
|
|
|
69
69
|
const attributeRef = drill.attribute.attributeHeader.formOf.ref;
|
|
70
70
|
const attributeDescendants = [];
|
|
71
71
|
allCatalogAttributeHierarchies.forEach((hierarchy) => {
|
|
72
|
-
const
|
|
73
|
-
? hierarchy.attributeHierarchy.ref
|
|
74
|
-
: hierarchy.dateDatasetRef;
|
|
75
|
-
const attributes = isCatalogAttributeHierarchy(hierarchy)
|
|
76
|
-
? hierarchy.attributeHierarchy.attributes
|
|
77
|
-
: hierarchy.attributes;
|
|
72
|
+
const attributes = getHierarchyAttributes(hierarchy);
|
|
78
73
|
const hierarchyAttributes = attributes.filter((attrRef) => {
|
|
79
|
-
const ignoredIndex = ignoredDrillDownHierarchies.findIndex((reference) => existBlacklistHierarchyPredicate(reference,
|
|
74
|
+
const ignoredIndex = ignoredDrillDownHierarchies.findIndex((reference) => existBlacklistHierarchyPredicate(reference, hierarchy, attrRef));
|
|
80
75
|
if (supportsAttributeHierarchies) {
|
|
81
76
|
const attribueHierarchyExist = allCatalogAttributesMap.get(attrRef);
|
|
82
77
|
return ignoredIndex < 0 && attribueHierarchyExist;
|
|
@@ -151,31 +146,25 @@ function getGlobalDrillDownAttributeHierarchyDefinitions(catalogAttributeHierarc
|
|
|
151
146
|
const globalDrillDowns = [];
|
|
152
147
|
catalogAttributeHierarchies
|
|
153
148
|
.map((it) => {
|
|
154
|
-
const
|
|
155
|
-
? it.attributeHierarchy.ref
|
|
156
|
-
: it.dateDatasetRef;
|
|
157
|
-
const attributes = isCatalogAttributeHierarchy(it)
|
|
158
|
-
? it.attributeHierarchy.attributes
|
|
159
|
-
: it.attributes;
|
|
149
|
+
const attributes = getHierarchyAttributes(it);
|
|
160
150
|
// we need to remove the last attribute from the hierarchy
|
|
161
151
|
// because it does not have any descendants so that the widget cannot drill down to it
|
|
162
152
|
return {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
.map((it) => objRefToString(it)),
|
|
166
|
-
ref: hierarchyRef,
|
|
153
|
+
attributeRefs: attributes.slice(0, attributes.length - 1),
|
|
154
|
+
hierarchy: it,
|
|
167
155
|
};
|
|
168
156
|
})
|
|
169
|
-
.forEach(({
|
|
157
|
+
.forEach(({ attributeRefs, hierarchy }) => {
|
|
170
158
|
availableAttributes.forEach((availableAttribute) => {
|
|
171
159
|
const attributeHeader = availableAttribute.attribute.attributeHeader;
|
|
172
|
-
const isAttributeInHierarchy =
|
|
173
|
-
const inBlacklistIndex = ignoredDrillDownHierarchies.findIndex((reference) => existBlacklistHierarchyPredicate(reference,
|
|
160
|
+
const isAttributeInHierarchy = attributeRefs.some((attrRef) => areObjRefsEqual(attrRef, attributeHeader.formOf.ref));
|
|
161
|
+
const inBlacklistIndex = ignoredDrillDownHierarchies.findIndex((reference) => existBlacklistHierarchyPredicate(reference, hierarchy, attributeHeader.formOf.ref));
|
|
174
162
|
if (isAttributeInHierarchy && inBlacklistIndex < 0) {
|
|
163
|
+
const hierarchyRef = getHierarchyRef(hierarchy);
|
|
175
164
|
globalDrillDowns.push({
|
|
176
165
|
type: "drillDown",
|
|
177
166
|
origin: localIdRef(attributeHeader.localIdentifier),
|
|
178
|
-
target:
|
|
167
|
+
target: hierarchyRef,
|
|
179
168
|
});
|
|
180
169
|
}
|
|
181
170
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"widgetDrillSelectors.js","sourceRoot":"","sources":["../../../../src/model/store/widgetDrills/widgetDrillSelectors.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"widgetDrillSelectors.js","sourceRoot":"","sources":["../../../../src/model/store/widgetDrills/widgetDrillSelectors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { IDrillDownReference, ObjRef } from "@gooddata/sdk-model";
|
|
1
|
+
import { ICatalogAttributeHierarchy, ICatalogDateAttributeHierarchy, IDrillDownReference, ObjRef } from "@gooddata/sdk-model";
|
|
2
2
|
/**
|
|
3
3
|
* @internal
|
|
4
4
|
*/
|
|
5
|
-
export declare function existBlacklistHierarchyPredicate(reference: IDrillDownReference,
|
|
5
|
+
export declare function existBlacklistHierarchyPredicate(reference: IDrillDownReference, attributeHierarchy: ICatalogAttributeHierarchy | ICatalogDateAttributeHierarchy, attributeIdentifier?: ObjRef): boolean;
|
|
6
6
|
//# sourceMappingURL=attributeHierarchyUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attributeHierarchyUtils.d.ts","sourceRoot":"","sources":["../../../src/model/utils/attributeHierarchyUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"attributeHierarchyUtils.d.ts","sourceRoot":"","sources":["../../../src/model/utils/attributeHierarchyUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEH,0BAA0B,EAC1B,8BAA8B,EAC9B,mBAAmB,EAKnB,MAAM,EAET,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,wBAAgB,gCAAgC,CAC5C,SAAS,EAAE,mBAAmB,EAC9B,kBAAkB,EAAE,0BAA0B,GAAG,8BAA8B,EAC/E,mBAAmB,CAAC,EAAE,MAAM,GAC7B,OAAO,CAcT"}
|
|
@@ -1,15 +1,17 @@
|
|
|
1
|
-
// (C) 2023 GoodData Corporation
|
|
2
|
-
import
|
|
3
|
-
import { areObjRefsEqual, isAttributeHierarchyReference, objRefToString, } from "@gooddata/sdk-model";
|
|
1
|
+
// (C) 2023-2024 GoodData Corporation
|
|
2
|
+
import { areObjRefsEqual, isAttributeHierarchyReference, isCatalogAttributeHierarchy, isCatalogDateAttributeHierarchy, isDateHierarchyReference, objRefToString, } from "@gooddata/sdk-model";
|
|
4
3
|
/**
|
|
5
4
|
* @internal
|
|
6
5
|
*/
|
|
7
|
-
export function existBlacklistHierarchyPredicate(reference,
|
|
8
|
-
if (isAttributeHierarchyReference(reference)) {
|
|
9
|
-
return (areObjRefsEqual(reference.attributeHierarchy,
|
|
6
|
+
export function existBlacklistHierarchyPredicate(reference, attributeHierarchy, attributeIdentifier) {
|
|
7
|
+
if (isAttributeHierarchyReference(reference) && isCatalogAttributeHierarchy(attributeHierarchy)) {
|
|
8
|
+
return (areObjRefsEqual(reference.attributeHierarchy, attributeHierarchy.attributeHierarchy.ref) &&
|
|
10
9
|
areObjRefsEqual(reference.attribute, attributeIdentifier));
|
|
11
10
|
}
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
if (isDateHierarchyReference(reference) && isCatalogDateAttributeHierarchy(attributeHierarchy)) {
|
|
12
|
+
return (objRefToString(reference.dateHierarchyTemplate) === attributeHierarchy.templateId &&
|
|
13
|
+
areObjRefsEqual(reference.dateDatasetAttribute, attributeIdentifier));
|
|
14
|
+
}
|
|
15
|
+
return false;
|
|
14
16
|
}
|
|
15
17
|
//# sourceMappingURL=attributeHierarchyUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attributeHierarchyUtils.js","sourceRoot":"","sources":["../../../src/model/utils/attributeHierarchyUtils.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"attributeHierarchyUtils.js","sourceRoot":"","sources":["../../../src/model/utils/attributeHierarchyUtils.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EACH,eAAe,EAIf,6BAA6B,EAC7B,2BAA2B,EAC3B,+BAA+B,EAC/B,wBAAwB,EAExB,cAAc,GACjB,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,MAAM,UAAU,gCAAgC,CAC5C,SAA8B,EAC9B,kBAA+E,EAC/E,mBAA4B;IAE5B,IAAI,6BAA6B,CAAC,SAAS,CAAC,IAAI,2BAA2B,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9F,OAAO,CACH,eAAe,CAAC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,kBAAkB,CAAC,GAAG,CAAC;YACxF,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAC5D,CAAC;IACN,CAAC;IACD,IAAI,wBAAwB,CAAC,SAAS,CAAC,IAAI,+BAA+B,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC7F,OAAO,CACH,cAAc,CAAC,SAAS,CAAC,qBAAqB,CAAC,KAAK,kBAAkB,CAAC,UAAU;YACjF,eAAe,CAAC,SAAS,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,CACvE,CAAC;IACN,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -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,
|
|
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,EAMjC,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"}
|
package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.js
CHANGED
|
@@ -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,
|
|
5
|
+
import { areObjRefsEqual, getHierarchyAttributes, getHierarchyRef, isAttributeHierarchyReference, 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,16 @@ const DROPDOWN_ALIGN_POINTS = [
|
|
|
22
22
|
},
|
|
23
23
|
},
|
|
24
24
|
];
|
|
25
|
+
const isHierarchyInBlackList = (ignoredDrillDownHierarchies, hierarchy, attributeRef) => {
|
|
26
|
+
return ignoredDrillDownHierarchies
|
|
27
|
+
.filter(isAttributeHierarchyReference)
|
|
28
|
+
.some((ref) => existBlacklistHierarchyPredicate(ref, hierarchy, attributeRef));
|
|
29
|
+
};
|
|
25
30
|
function buildHierarchyItemList(attributeDescriptor, catalogAttributeHierarchies, ignoredDrillDownHierarchies) {
|
|
26
31
|
const items = [];
|
|
27
32
|
catalogAttributeHierarchies.forEach((hierarchy) => {
|
|
28
|
-
const
|
|
29
|
-
|
|
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));
|
|
33
|
+
const attributesRef = getHierarchyAttributes(hierarchy);
|
|
34
|
+
const isInBlacklist = isHierarchyInBlackList(ignoredDrillDownHierarchies, hierarchy, attributeDescriptor?.attributeHeader.formOf.ref);
|
|
35
35
|
const indexInHierarchy = attributesRef.findIndex((ref) => objRefToString(ref) === attributeDescriptor?.attributeHeader.formOf.identifier);
|
|
36
36
|
if (indexInHierarchy >= 0 && indexInHierarchy < attributesRef.length - 1) {
|
|
37
37
|
items.push({
|
|
@@ -49,16 +49,12 @@ const AttributeHierarchyDropdown = ({ config, attributeDescriptor, onSelect, onO
|
|
|
49
49
|
const userInteraction = useDashboardUserInteraction();
|
|
50
50
|
const selectedCatalogAttributeHierarchy = config.complete
|
|
51
51
|
? catalogAttributeHierarchies.find((hierarchy) => {
|
|
52
|
-
const hierarchyRef =
|
|
53
|
-
? hierarchy.attributeHierarchy.ref
|
|
54
|
-
: hierarchy.dateDatasetRef;
|
|
52
|
+
const hierarchyRef = getHierarchyRef(hierarchy);
|
|
55
53
|
return areObjRefsEqual(hierarchyRef, config.attributeHierarchyRef);
|
|
56
54
|
})
|
|
57
55
|
: null;
|
|
58
56
|
const items = buildHierarchyItemList(attributeDescriptor, catalogAttributeHierarchies, ignoredDrillDownHierarchies);
|
|
59
|
-
const selectHierarchyTitle =
|
|
60
|
-
? selectedCatalogAttributeHierarchy?.attributeHierarchy.title
|
|
61
|
-
: selectedCatalogAttributeHierarchy?.title;
|
|
57
|
+
const selectHierarchyTitle = selectedCatalogAttributeHierarchy && getHierarchyTitle(selectedCatalogAttributeHierarchy);
|
|
62
58
|
const buttonText = selectHierarchyTitle ?? formatMessage(messages.drilldownSelectHierarchy);
|
|
63
59
|
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
60
|
return (React.createElement(AttributeHierarchyList, { hierarchies: items, closeDropdown: closeDropdown, onOpenAttributeHierarchyDialog: onOpenAttributeHierarchyDialog, onSelect: (hierarchy) => {
|
package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeHierarchyDropdown.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyDropdown.tsx"],"names":[],"mappings":"AAAA,
|
|
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,
|
|
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"}
|
package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.js
CHANGED
|
@@ -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 {
|
|
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 =
|
|
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 =
|
|
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
|
});
|
package/esm/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeHierarchyListItem.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/DrillTargets/AttributeHierarchyListItem.tsx"],"names":[],"mappings":"AAAA,
|
|
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,
|
|
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 =
|
|
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":"AAAA,
|
|
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,
|
|
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 {
|
|
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 =
|
|
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":"AAAA,qCAAqC;AACrC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,
|
|
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,
|
|
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,CA4BvB"}
|
|
@@ -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
|
-
}, [
|
|
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
|
|
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,17 +135,21 @@ 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) {
|
|
145
|
+
const dateHierarchy = attributeHierarchies
|
|
146
|
+
.filter(isCatalogDateAttributeHierarchy)
|
|
147
|
+
.find((hierarchy) => areObjRefsEqual(getHierarchyRef(hierarchy), item.attributeHierarchyRef));
|
|
136
148
|
return [
|
|
137
149
|
{
|
|
138
150
|
type: "dateHierarchyReference",
|
|
139
|
-
dateHierarchyTemplate
|
|
151
|
+
// dateHierarchyTemplate is ObjRef but templateId is string
|
|
152
|
+
dateHierarchyTemplate: idRef(dateHierarchy.templateId, "dateHierarchyTemplate"),
|
|
140
153
|
dateDatasetAttribute: attributeDescriptor.attributeHeader.formOf.ref,
|
|
141
154
|
},
|
|
142
155
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useInsightDrillConfigPanel.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,
|
|
1
|
+
{"version":3,"file":"useInsightDrillConfigPanel.js","sourceRoot":"","sources":["../../../../../../src/presentation/widget/insight/configuration/InsightDrillConfigPanel/useInsightDrillConfigPanel.ts"],"names":[],"mappings":"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"}
|
|
@@ -6478,7 +6478,7 @@ export declare interface EntitlementsState {
|
|
|
6478
6478
|
/**
|
|
6479
6479
|
* @internal
|
|
6480
6480
|
*/
|
|
6481
|
-
export declare function existBlacklistHierarchyPredicate(reference: IDrillDownReference,
|
|
6481
|
+
export declare function existBlacklistHierarchyPredicate(reference: IDrillDownReference, attributeHierarchy: ICatalogAttributeHierarchy | ICatalogDateAttributeHierarchy, attributeIdentifier?: ObjRef): boolean;
|
|
6482
6482
|
|
|
6483
6483
|
/**
|
|
6484
6484
|
* @beta
|
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.3",
|
|
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-
|
|
61
|
-
"@gooddata/sdk-
|
|
62
|
-
"@gooddata/sdk-
|
|
63
|
-
"@gooddata/sdk-ui-
|
|
64
|
-
"@gooddata/sdk-
|
|
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/sdk-ui-vis-commons": "10.0.0-alpha.
|
|
69
|
-
"@gooddata/util": "10.0.0-alpha.
|
|
59
|
+
"@gooddata/sdk-backend-base": "10.0.0-alpha.3",
|
|
60
|
+
"@gooddata/sdk-ui": "10.0.0-alpha.3",
|
|
61
|
+
"@gooddata/sdk-ui-ext": "10.0.0-alpha.3",
|
|
62
|
+
"@gooddata/sdk-model": "10.0.0-alpha.3",
|
|
63
|
+
"@gooddata/sdk-ui-filters": "10.0.0-alpha.3",
|
|
64
|
+
"@gooddata/sdk-backend-spi": "10.0.0-alpha.3",
|
|
65
|
+
"@gooddata/sdk-ui-geo": "10.0.0-alpha.3",
|
|
66
|
+
"@gooddata/sdk-ui-kit": "10.0.0-alpha.3",
|
|
67
|
+
"@gooddata/sdk-ui-theme-provider": "10.0.0-alpha.3",
|
|
68
|
+
"@gooddata/sdk-ui-vis-commons": "10.0.0-alpha.3",
|
|
69
|
+
"@gooddata/util": "10.0.0-alpha.3"
|
|
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/i18n-toolkit": "10.0.0-alpha.3",
|
|
123
|
+
"@gooddata/reference-workspace": "10.0.0-alpha.3",
|
|
124
|
+
"@gooddata/sdk-backend-mockingbird": "10.0.0-alpha.3"
|
|
125
125
|
},
|
|
126
126
|
"scripts": {
|
|
127
127
|
"clean": "rm -rf ci dist esm coverage *.log styles/css tsconfig.tsbuildinfo",
|