@gooddata/sdk-ui-geo 11.17.0-alpha.2 → 11.17.0-alpha.4
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/next/hooks/layers/useLayerClickEvent.d.ts.map +1 -1
- package/esm/next/hooks/layers/useLayerClickEvent.js +98 -43
- package/esm/next/hooks/layers/useLayerClickEvent.js.map +1 -1
- package/esm/next/hooks/layers/useLayersData.d.ts.map +1 -1
- package/esm/next/hooks/layers/useLayersData.js +27 -6
- package/esm/next/hooks/layers/useLayersData.js.map +1 -1
- package/esm/next/hooks/layers/useLayersExecutions.d.ts.map +1 -1
- package/esm/next/hooks/layers/useLayersExecutions.js +8 -2
- package/esm/next/hooks/layers/useLayersExecutions.js.map +1 -1
- package/esm/next/hooks/pushData/useGeoPushData.d.ts.map +1 -1
- package/esm/next/hooks/pushData/useGeoPushData.js +14 -1
- package/esm/next/hooks/pushData/useGeoPushData.js.map +1 -1
- package/esm/next/index.d.ts +1 -0
- package/esm/next/index.d.ts.map +1 -1
- package/esm/next/index.js +3 -1
- package/esm/next/index.js.map +1 -1
- package/esm/next/layers/area/adapter.d.ts.map +1 -1
- package/esm/next/layers/area/adapter.js +24 -4
- package/esm/next/layers/area/adapter.js.map +1 -1
- package/esm/next/layers/area/data/transformation.d.ts.map +1 -1
- package/esm/next/layers/area/data/transformation.js +3 -2
- package/esm/next/layers/area/data/transformation.js.map +1 -1
- package/esm/next/layers/area/source.d.ts +4 -0
- package/esm/next/layers/area/source.d.ts.map +1 -1
- package/esm/next/layers/area/source.js +6 -2
- package/esm/next/layers/area/source.js.map +1 -1
- package/esm/next/layers/area/tooltip/tooltipManagement.d.ts.map +1 -1
- package/esm/next/layers/area/tooltip/tooltipManagement.js +14 -67
- package/esm/next/layers/area/tooltip/tooltipManagement.js.map +1 -1
- package/esm/next/layers/common/constants.d.ts +10 -0
- package/esm/next/layers/common/constants.d.ts.map +1 -1
- package/esm/next/layers/common/constants.js +10 -0
- package/esm/next/layers/common/constants.js.map +1 -1
- package/esm/next/layers/common/drillUtils.d.ts +3 -0
- package/esm/next/layers/common/drillUtils.d.ts.map +1 -0
- package/esm/next/layers/common/drillUtils.js +15 -0
- package/esm/next/layers/common/drillUtils.js.map +1 -0
- package/esm/next/layers/common/tooltipUtils.d.ts +21 -0
- package/esm/next/layers/common/tooltipUtils.d.ts.map +1 -0
- package/esm/next/layers/common/tooltipUtils.js +85 -0
- package/esm/next/layers/common/tooltipUtils.js.map +1 -0
- package/esm/next/layers/execution/prepareTooltipExecution.d.ts +5 -0
- package/esm/next/layers/execution/prepareTooltipExecution.d.ts.map +1 -0
- package/esm/next/layers/execution/prepareTooltipExecution.js +66 -0
- package/esm/next/layers/execution/prepareTooltipExecution.js.map +1 -0
- package/esm/next/layers/pushpin/adapter.d.ts.map +1 -1
- package/esm/next/layers/pushpin/adapter.js +25 -5
- package/esm/next/layers/pushpin/adapter.js.map +1 -1
- package/esm/next/layers/pushpin/data/transformation.d.ts.map +1 -1
- package/esm/next/layers/pushpin/data/transformation.js +16 -11
- package/esm/next/layers/pushpin/data/transformation.js.map +1 -1
- package/esm/next/layers/pushpin/source.d.ts +4 -0
- package/esm/next/layers/pushpin/source.d.ts.map +1 -1
- package/esm/next/layers/pushpin/source.js +26 -5
- package/esm/next/layers/pushpin/source.js.map +1 -1
- package/esm/next/layers/pushpin/tooltip/tooltipManagement.d.ts.map +1 -1
- package/esm/next/layers/pushpin/tooltip/tooltipManagement.js +26 -75
- package/esm/next/layers/pushpin/tooltip/tooltipManagement.js.map +1 -1
- package/esm/next/layers/registry/adapterTypes.d.ts +13 -0
- package/esm/next/layers/registry/adapterTypes.d.ts.map +1 -1
- package/esm/next/layers/registry/adapterTypes.js +1 -1
- package/esm/next/layers/registry/adapterTypes.js.map +1 -1
- package/esm/next/types/config/areaChart.d.ts +1 -2
- package/esm/next/types/config/areaChart.d.ts.map +1 -1
- package/esm/next/types/config/areaChart.js +1 -1
- package/esm/next/types/config/areaChart.js.map +1 -1
- package/esm/next/types/config/pushpinChart.d.ts +1 -2
- package/esm/next/types/config/pushpinChart.d.ts.map +1 -1
- package/esm/next/types/config/pushpinChart.js +1 -1
- package/esm/next/types/config/pushpinChart.js.map +1 -1
- package/esm/next/types/config/unified.d.ts +1 -5
- package/esm/next/types/config/unified.d.ts.map +1 -1
- package/esm/next/utils/layerConversion.d.ts.map +1 -1
- package/esm/next/utils/layerConversion.js +7 -20
- package/esm/next/utils/layerConversion.js.map +1 -1
- package/package.json +10 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLayerClickEvent.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayerClickEvent.ts"],"names":[],"mappings":"AAYA,OAAO,EAEH,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EAGzB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"useLayerClickEvent.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayerClickEvent.ts"],"names":[],"mappings":"AAYA,OAAO,EAEH,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EAGzB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC;AASvE,OAAO,KAAK,EAAE,UAAU,EAAiB,MAAM,kCAAkC,CAAC;AA0LlF;;GAEG;AACH,wBAAgB,kBAAkB,CAC9B,GAAG,EAAE,UAAU,GAAG,IAAI,EACtB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAClC,mBAAmB,EAAE,gBAAgB,EAAE,EACvC,kCAAkC,EAAE,OAAO,EAC3C,OAAO,CAAC,EAAE,iBAAiB,GAC5B,IAAI,CA2EN"}
|
|
@@ -2,7 +2,11 @@
|
|
|
2
2
|
import { useEffect } from "react";
|
|
3
3
|
import { isAttributeDescriptor, isResultAttributeHeader, objRefToString, } from "@gooddata/sdk-model";
|
|
4
4
|
import { getDrillIntersection, isSomeHeaderPredicateMatched, } from "@gooddata/sdk-ui";
|
|
5
|
-
import {
|
|
5
|
+
import { getAreaLayerIds } from "../../layers/area/operations.js";
|
|
6
|
+
import { COORDINATE_FORM_TYPES, GEO_LAYER_DRILL_ELEMENT, GEO_LAYER_DRILL_TYPE, TOOLTIP_TEXT_ATTRIBUTE_LOCAL_ID, } from "../../layers/common/constants.js";
|
|
7
|
+
import { normalizeAttributeDescriptorLocalIdentifier } from "../../layers/common/drillUtils.js";
|
|
8
|
+
import { getTooltipProperties } from "../../layers/common/tooltipUtils.js";
|
|
9
|
+
import { getPushpinLayerIds } from "../../layers/pushpin/operations.js";
|
|
6
10
|
/**
|
|
7
11
|
* Get the layer data by MapLibre layer ID.
|
|
8
12
|
*/
|
|
@@ -11,18 +15,32 @@ function getClickedLayerByMapLibreLayerId(layers, mapLibreLayerId) {
|
|
|
11
15
|
return undefined;
|
|
12
16
|
}
|
|
13
17
|
const clickedLayerEntry = Array.from(layers.entries()).find(([key, layer]) => {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
18
|
+
if (layer.layerType === "pushpin") {
|
|
19
|
+
const ids = getPushpinLayerIds(key);
|
|
20
|
+
return (mapLibreLayerId === ids.pointLayerId ||
|
|
21
|
+
mapLibreLayerId === ids.unclusterLayerId ||
|
|
22
|
+
mapLibreLayerId === ids.clusterLayerId ||
|
|
23
|
+
mapLibreLayerId === ids.clusterLabelsLayerId);
|
|
24
|
+
}
|
|
25
|
+
const ids = getAreaLayerIds(key);
|
|
26
|
+
return mapLibreLayerId === ids.fillLayerId || mapLibreLayerId === ids.outlineLayerId;
|
|
17
27
|
});
|
|
18
28
|
return clickedLayerEntry?.[1];
|
|
19
29
|
}
|
|
30
|
+
function getLocationIndexFromProperties(properties) {
|
|
31
|
+
const props = getTooltipProperties(properties);
|
|
32
|
+
const value = props["locationIndex"];
|
|
33
|
+
return typeof value === "number" && Number.isFinite(value) ? value : undefined;
|
|
34
|
+
}
|
|
20
35
|
/**
|
|
21
36
|
* Check if a display form type is a geo coordinate type.
|
|
22
37
|
*/
|
|
23
38
|
function isCoordinateFormType(labelType) {
|
|
24
39
|
return labelType !== undefined && COORDINATE_FORM_TYPES.includes(labelType);
|
|
25
40
|
}
|
|
41
|
+
function isGeoDisplayFormType(labelType) {
|
|
42
|
+
return typeof labelType === "string" && labelType.startsWith("GDC.geo.");
|
|
43
|
+
}
|
|
26
44
|
/**
|
|
27
45
|
* Extract parent attribute info from a coordinate display form descriptor.
|
|
28
46
|
* Uses primaryLabel as ref if available, otherwise falls back to the descriptor's ref.
|
|
@@ -53,6 +71,18 @@ function normalizeCoordinateAttribute(descriptor, rowHeader, parentInfo) {
|
|
|
53
71
|
},
|
|
54
72
|
};
|
|
55
73
|
}
|
|
74
|
+
function normalizeGeoDisplayFormAttribute(descriptor) {
|
|
75
|
+
const parentInfo = getParentAttributeInfo(descriptor);
|
|
76
|
+
return {
|
|
77
|
+
...descriptor,
|
|
78
|
+
attributeHeader: {
|
|
79
|
+
...descriptor.attributeHeader,
|
|
80
|
+
// Use primary label (default display form) for cross-filter labeling and filter identity
|
|
81
|
+
ref: parentInfo.ref,
|
|
82
|
+
name: parentInfo.name,
|
|
83
|
+
},
|
|
84
|
+
};
|
|
85
|
+
}
|
|
56
86
|
/**
|
|
57
87
|
* Build drill headers for a clicked location.
|
|
58
88
|
* Includes attribute headers (excluding auxiliary geo attributes) and measure descriptors.
|
|
@@ -62,6 +92,14 @@ function getDrillHeaders(dataView, locationIndex, tooltipIndex) {
|
|
|
62
92
|
const geoAttributesDimensionIndex = dataView.meta().dimensions().length - 1;
|
|
63
93
|
const descriptors = dataView.meta().dimensionItemDescriptors(geoAttributesDimensionIndex);
|
|
64
94
|
const drillHeaders = [];
|
|
95
|
+
const tooltipDescriptor = typeof tooltipIndex === "number" ? descriptors[tooltipIndex] : undefined;
|
|
96
|
+
const useTooltipValue = typeof tooltipIndex === "number" &&
|
|
97
|
+
isAttributeDescriptor(tooltipDescriptor) &&
|
|
98
|
+
tooltipDescriptor.attributeHeader.localIdentifier === TOOLTIP_TEXT_ATTRIBUTE_LOCAL_ID;
|
|
99
|
+
const tooltipRowHeader = useTooltipValue
|
|
100
|
+
? headerItems[geoAttributesDimensionIndex]?.[tooltipIndex]?.[locationIndex]
|
|
101
|
+
: undefined;
|
|
102
|
+
const resolvedTooltipRowHeader = tooltipRowHeader && isResultAttributeHeader(tooltipRowHeader) ? tooltipRowHeader : undefined;
|
|
65
103
|
// Track processed coordinate attributes by their parent attribute key
|
|
66
104
|
// This ensures we only include one coordinate attribute per parent (e.g., City, not City lat + City lon)
|
|
67
105
|
const processedCoordinateParents = new Set();
|
|
@@ -75,6 +113,9 @@ function getDrillHeaders(dataView, locationIndex, tooltipIndex) {
|
|
|
75
113
|
return;
|
|
76
114
|
}
|
|
77
115
|
const labelType = descriptor.attributeHeader.labelType;
|
|
116
|
+
const resolvedRowHeader = resolvedTooltipRowHeader && isGeoDisplayFormType(labelType)
|
|
117
|
+
? resolvedTooltipRowHeader
|
|
118
|
+
: rowHeader;
|
|
78
119
|
// Handle coordinate display forms (lat/lon/pin) - deduplicate by parent attribute
|
|
79
120
|
if (isCoordinateFormType(labelType)) {
|
|
80
121
|
const parentInfo = getParentAttributeInfo(descriptor);
|
|
@@ -84,14 +125,18 @@ function getDrillHeaders(dataView, locationIndex, tooltipIndex) {
|
|
|
84
125
|
}
|
|
85
126
|
processedCoordinateParents.add(parentInfo.key);
|
|
86
127
|
// Normalize to use parent attribute's name and primary display form
|
|
87
|
-
const normalized = normalizeCoordinateAttribute(descriptor,
|
|
128
|
+
const normalized = normalizeCoordinateAttribute(descriptor, resolvedRowHeader, parentInfo);
|
|
129
|
+
const normalizedDescriptor = normalizeAttributeDescriptorLocalIdentifier(normalized.descriptor);
|
|
88
130
|
drillHeaders.push(normalized.rowHeader);
|
|
89
|
-
drillHeaders.push(
|
|
131
|
+
drillHeaders.push(normalizedDescriptor);
|
|
90
132
|
}
|
|
91
133
|
else {
|
|
92
134
|
// Regular attributes - include as-is
|
|
93
|
-
drillHeaders.push(
|
|
94
|
-
|
|
135
|
+
drillHeaders.push(resolvedRowHeader);
|
|
136
|
+
const descriptorForDrill = isGeoDisplayFormType(labelType) && descriptor.attributeHeader.primaryLabel
|
|
137
|
+
? normalizeGeoDisplayFormAttribute(descriptor)
|
|
138
|
+
: descriptor;
|
|
139
|
+
drillHeaders.push(normalizeAttributeDescriptorLocalIdentifier(descriptorForDrill));
|
|
95
140
|
}
|
|
96
141
|
}
|
|
97
142
|
});
|
|
@@ -114,43 +159,53 @@ export function useLayerClickEvent(map, isMapReady, layers, drillablePredicates,
|
|
|
114
159
|
}
|
|
115
160
|
const handleClick = (e) => {
|
|
116
161
|
const features = map.queryRenderedFeatures(e.point);
|
|
117
|
-
if (features
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
const isDrillable = drillHeaders.some((header) => isSomeHeaderPredicateMatched(drillablePredicates, header, dataView));
|
|
132
|
-
if (!isDrillable) {
|
|
133
|
-
return;
|
|
162
|
+
if (!features || features.length === 0) {
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
// Find the first feature that belongs to one of our layers
|
|
166
|
+
let layerData;
|
|
167
|
+
let locationIndex;
|
|
168
|
+
for (const feature of features) {
|
|
169
|
+
const mapLibreLayerId = feature.layer?.id;
|
|
170
|
+
layerData = getClickedLayerByMapLibreLayerId(layers, mapLibreLayerId);
|
|
171
|
+
if (layerData?.dataView) {
|
|
172
|
+
locationIndex = getLocationIndexFromProperties(feature.properties);
|
|
173
|
+
if (locationIndex !== undefined) {
|
|
174
|
+
break;
|
|
175
|
+
}
|
|
134
176
|
}
|
|
135
|
-
const intersection = getDrillIntersection(drillHeaders);
|
|
136
|
-
const drillEvent = {
|
|
137
|
-
dataView: dataView.dataView,
|
|
138
|
-
drillContext: {
|
|
139
|
-
type: GEO_LAYER_DRILL_TYPE[layerType],
|
|
140
|
-
element: GEO_LAYER_DRILL_ELEMENT[layerType],
|
|
141
|
-
intersection,
|
|
142
|
-
},
|
|
143
|
-
...(enableDrillMenuPositioningAtCursor
|
|
144
|
-
? {
|
|
145
|
-
// Click coordinates relative to the map container
|
|
146
|
-
chartX: e.point.x,
|
|
147
|
-
chartY: e.point.y,
|
|
148
|
-
enableDrillMenuPositioningAtCursor: true,
|
|
149
|
-
}
|
|
150
|
-
: {}),
|
|
151
|
-
};
|
|
152
|
-
onDrill(drillEvent);
|
|
153
177
|
}
|
|
178
|
+
if (!layerData?.dataView || locationIndex === undefined) {
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
const { dataView, geoData, layerType } = layerData;
|
|
182
|
+
const tooltipIndex = geoData?.tooltipText?.index;
|
|
183
|
+
const drillHeaders = getDrillHeaders(dataView, locationIndex, tooltipIndex);
|
|
184
|
+
if (drillHeaders.length === 0) {
|
|
185
|
+
return;
|
|
186
|
+
}
|
|
187
|
+
const isDrillable = drillHeaders.some((header) => isSomeHeaderPredicateMatched(drillablePredicates, header, dataView));
|
|
188
|
+
if (!isDrillable) {
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
const intersection = getDrillIntersection(drillHeaders);
|
|
192
|
+
const drillEvent = {
|
|
193
|
+
dataView: dataView.dataView,
|
|
194
|
+
drillContext: {
|
|
195
|
+
type: GEO_LAYER_DRILL_TYPE[layerType],
|
|
196
|
+
element: GEO_LAYER_DRILL_ELEMENT[layerType],
|
|
197
|
+
intersection,
|
|
198
|
+
},
|
|
199
|
+
...(enableDrillMenuPositioningAtCursor
|
|
200
|
+
? {
|
|
201
|
+
// Click coordinates relative to the map container
|
|
202
|
+
chartX: e.point.x,
|
|
203
|
+
chartY: e.point.y,
|
|
204
|
+
enableDrillMenuPositioningAtCursor: true,
|
|
205
|
+
}
|
|
206
|
+
: {}),
|
|
207
|
+
};
|
|
208
|
+
onDrill(drillEvent);
|
|
154
209
|
};
|
|
155
210
|
map.on("click", handleClick);
|
|
156
211
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLayerClickEvent.js","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayerClickEvent.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,EAIH,qBAAqB,EACrB,uBAAuB,EACvB,cAAc,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAKH,oBAAoB,EACpB,4BAA4B,GAC/B,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACH,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,
|
|
1
|
+
{"version":3,"file":"useLayerClickEvent.js","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayerClickEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLayersData.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayersData.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"useLayersData.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayersData.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAsB,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACH,cAAc,EACd,KAAK,gBAAgB,EACrB,KAAK,0BAA0B,EAKlC,MAAM,kBAAkB,CAAC;AAI1B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAGxF;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAC9B;;;OAGG;IACH,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,MAAM,EAAE,0BAA0B,CAAC;IAEnC;;OAEG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAwED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CACzB,eAAe,EAAE,qBAAqB,EAAE,EACxC,OAAO,CAAC,EAAE,kBAAkB,EAC5B,SAAS,CAAC,EAAE,MAAM,GACnB,iBAAiB,CA2CnB"}
|
|
@@ -1,15 +1,34 @@
|
|
|
1
|
-
// (C) 2025 GoodData Corporation
|
|
1
|
+
// (C) 2025-2026 GoodData Corporation
|
|
2
2
|
import { useMemo } from "react";
|
|
3
3
|
import { DataViewFacade, convertError, useBackendStrict, useCancelablePromise, useWorkspaceStrict, } from "@gooddata/sdk-ui";
|
|
4
|
+
import { getLayerAdapter } from "../../layers/registry/adapterRegistry.js";
|
|
4
5
|
import { createExecutionsFingerprint, createLayersStructureFingerprint } from "../../utils/fingerprint.js";
|
|
6
|
+
async function prepareExecution(layerExecution, backend, workspace) {
|
|
7
|
+
const adapter = getLayerAdapter(layerExecution.layer.type);
|
|
8
|
+
if (!adapter.prepareExecution) {
|
|
9
|
+
return layerExecution.execution;
|
|
10
|
+
}
|
|
11
|
+
const context = {
|
|
12
|
+
backend,
|
|
13
|
+
workspace,
|
|
14
|
+
};
|
|
15
|
+
try {
|
|
16
|
+
const preparedExecution = await adapter.prepareExecution(layerExecution.layer, context, layerExecution.execution);
|
|
17
|
+
return preparedExecution;
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
return layerExecution.execution;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
5
23
|
/**
|
|
6
24
|
* Executes a single layer and returns its data view.
|
|
7
25
|
*
|
|
8
26
|
* @internal
|
|
9
27
|
*/
|
|
10
|
-
async function executeLayerData(layerExecution) {
|
|
28
|
+
async function executeLayerData(layerExecution, backend, workspace) {
|
|
11
29
|
try {
|
|
12
|
-
const
|
|
30
|
+
const execution = await prepareExecution(layerExecution, backend, workspace);
|
|
31
|
+
const executionResult = await execution.execute();
|
|
13
32
|
const dataView = await executionResult.readAll();
|
|
14
33
|
return {
|
|
15
34
|
layerId: layerExecution.layerId,
|
|
@@ -25,8 +44,8 @@ async function executeLayerData(layerExecution) {
|
|
|
25
44
|
*
|
|
26
45
|
* @internal
|
|
27
46
|
*/
|
|
28
|
-
async function executeAllLayers(layerExecutions) {
|
|
29
|
-
return Promise.all(layerExecutions.map(executeLayerData));
|
|
47
|
+
async function executeAllLayers(layerExecutions, backend, workspace) {
|
|
48
|
+
return Promise.all(layerExecutions.map((layerExecution) => executeLayerData(layerExecution, backend, workspace)));
|
|
30
49
|
}
|
|
31
50
|
/**
|
|
32
51
|
* Hook that executes all layer executions in parallel and returns combined results.
|
|
@@ -54,7 +73,9 @@ export function useLayersData(layerExecutions, backend, workspace) {
|
|
|
54
73
|
// When bucket structure changes, we need to re-execute to get a dataView with correct buckets.
|
|
55
74
|
const layersStructureFingerprint = useMemo(() => createLayersStructureFingerprint(layerExecutions), [layerExecutions]);
|
|
56
75
|
const { result, status, error } = useCancelablePromise({
|
|
57
|
-
promise: layerExecutions.length > 0
|
|
76
|
+
promise: layerExecutions.length > 0
|
|
77
|
+
? () => executeAllLayers(layerExecutions, resolvedBackend, resolvedWorkspace)
|
|
78
|
+
: undefined,
|
|
58
79
|
}, [resolvedBackend, resolvedWorkspace, executionsFingerprint, layersStructureFingerprint]);
|
|
59
80
|
const layerDataViews = useMemo(() => {
|
|
60
81
|
const map = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLayersData.js","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayersData.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"useLayersData.js","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayersData.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLayersExecutions.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayersExecutions.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAI7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D;;;;;;;;;GASG;AACH,UAAU,sBAAsB;IAC5B,gBAAgB,CAAC,EAAE,kBAAkB,CAAC;IACtC,oBAAoB,EAAE,kBAAkB,EAAE,CAAC;CAC9C;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE;IACvC,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;CAC/B,GAAG,sBAAsB,
|
|
1
|
+
{"version":3,"file":"useLayersExecutions.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayersExecutions.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAI7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D;;;;;;;;;GASG;AACH,UAAU,sBAAsB;IAC5B,gBAAgB,CAAC,EAAE,kBAAkB,CAAC;IACtC,oBAAoB,EAAE,kBAAkB,EAAE,CAAC;CAC9C;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE;IACvC,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;CAC/B,GAAG,sBAAsB,CAmBzB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// (C) 2025 GoodData Corporation
|
|
1
|
+
// (C) 2025-2026 GoodData Corporation
|
|
2
2
|
import { useMemo } from "react";
|
|
3
3
|
import { useBackendStrict, useWorkspaceStrict } from "@gooddata/sdk-ui";
|
|
4
4
|
import { buildLayerExecution } from "../../layers/execution/buildLayerExecution.js";
|
|
@@ -7,7 +7,13 @@ export function useLayersExecutions(props) {
|
|
|
7
7
|
const backend = useBackendStrict(props.backend, "useLayersExecutions");
|
|
8
8
|
const workspace = useWorkspaceStrict(props.workspace, "useLayersExecutions");
|
|
9
9
|
return useMemo(() => {
|
|
10
|
-
const executions = layers.map((layer) => buildLayerExecution(layer, {
|
|
10
|
+
const executions = layers.map((layer) => buildLayerExecution(layer, {
|
|
11
|
+
backend,
|
|
12
|
+
workspace,
|
|
13
|
+
config,
|
|
14
|
+
execConfig,
|
|
15
|
+
globalFilters: filters,
|
|
16
|
+
}));
|
|
11
17
|
const [primaryExecution, ...additionalExecutions] = executions;
|
|
12
18
|
return { primaryExecution, additionalExecutions };
|
|
13
19
|
}, [layers, backend, workspace, config, execConfig, filters]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLayersExecutions.js","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayersExecutions.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"useLayersExecutions.js","sourceRoot":"","sources":["../../../../src/next/hooks/layers/useLayersExecutions.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAIhC,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAExE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAmBpF,MAAM,UAAU,mBAAmB,CAAC,KAOnC;IACG,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACtD,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;IACvE,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;IAE7E,OAAO,OAAO,CAAC,GAAG,EAAE;QAChB,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACpC,mBAAmB,CAAC,KAAK,EAAE;YACvB,OAAO;YACP,SAAS;YACT,MAAM;YACN,UAAU;YACV,aAAa,EAAE,OAAO;SACzB,CAAC,CACL,CAAC;QACF,MAAM,CAAC,gBAAgB,EAAE,GAAG,oBAAoB,CAAC,GAAG,UAAU,CAAC;QAE/D,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,CAAC;IACtD,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;AAClE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGeoPushData.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/pushData/useGeoPushData.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAA+B,KAAK,SAAS,EAA6B,MAAM,kBAAkB,CAAC;AAC1G,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"useGeoPushData.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/pushData/useGeoPushData.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAA+B,KAAK,SAAS,EAA6B,MAAM,kBAAkB,CAAC;AAC1G,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAKnE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,UAAU,cAAc;IACpB,gBAAgB,EAAE,iBAAiB,CAAC;CACvC;AAED;;;;GAIG;AACH,UAAU,cAAc;IACpB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;CACxC;AAED,UAAU,qBAAqB,CAAC,MAAM,SAAS,cAAc,EAAE,cAAc,SAAS,cAAc;IAChG,QAAQ,EAAE,MAAM,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,cAAc,CAAC;IACvC,mBAAmB,CAAC,EAAE,CAAC,gBAAgB,EAAE,iBAAiB,KAAK,OAAO,CAAC;IACvE,YAAY,EAAE,YAAY,CAAC;CAC9B;AAoCD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,SAAS,cAAc,EAAE,cAAc,SAAS,cAAc,EAC/F,aAAa,EAAE,cAAc,GAAG,IAAI,EACpC,YAAY,EAAE,aAAa,EAC3B,EACI,QAAQ,EACR,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,GACf,EAAE,qBAAqB,CAAC,MAAM,EAAE,cAAc,CAAC,GACjD,IAAI,CA0DN"}
|
|
@@ -3,6 +3,7 @@ import { useEffect, useMemo } from "react";
|
|
|
3
3
|
import { getMultiLayerDrillTargets } from "@gooddata/sdk-ui";
|
|
4
4
|
import { useGeoLayers } from "../../context/GeoLayersContext.js";
|
|
5
5
|
import { useInitialExecution } from "../../context/InitialExecutionContext.js";
|
|
6
|
+
import { normalizeAttributeDescriptorLocalIdentifier } from "../../layers/common/drillUtils.js";
|
|
6
7
|
const defaultLegendVisibility = (availableLegends) => {
|
|
7
8
|
const hasSizeLegend = availableLegends.hasSizeLegend ?? false;
|
|
8
9
|
return Boolean(availableLegends.hasCategoryLegend || availableLegends.hasColorLegend || hasSizeLegend);
|
|
@@ -49,8 +50,20 @@ export function useGeoPushData(colorStrategy, colorPalette, { useProps, useLegen
|
|
|
49
50
|
// We can't use layers as dependency because they are not stable across renders resulting in infinite loop
|
|
50
51
|
const availableDrillTargets = useMemo(() => {
|
|
51
52
|
const baseDrillTargets = getMultiLayerDrillTargets(layerDataViews, initialDataView);
|
|
53
|
+
if (!baseDrillTargets) {
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
56
|
+
const normalizedAttributes = baseDrillTargets.attributes?.map((attributeTarget) => ({
|
|
57
|
+
...attributeTarget,
|
|
58
|
+
attribute: normalizeAttributeDescriptorLocalIdentifier(attributeTarget.attribute),
|
|
59
|
+
intersectionAttributes: attributeTarget.intersectionAttributes.map(normalizeAttributeDescriptorLocalIdentifier),
|
|
60
|
+
})) ?? [];
|
|
61
|
+
const normalizedDrillTargets = {
|
|
62
|
+
...baseDrillTargets,
|
|
63
|
+
attributes: normalizedAttributes,
|
|
64
|
+
};
|
|
52
65
|
// Enhance drill targets with geo-specific display form preference
|
|
53
|
-
return enhanceDrillTargetsWithGeoDisplayForm(
|
|
66
|
+
return enhanceDrillTargetsWithGeoDisplayForm(normalizedDrillTargets, geoLayerType);
|
|
54
67
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
55
68
|
}, [fingerprintsKey, initialDataView, geoLayerType]);
|
|
56
69
|
useEffect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGeoPushData.js","sourceRoot":"","sources":["../../../../src/next/hooks/pushData/useGeoPushData.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAG3C,OAAO,EAA+C,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAG1G,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"useGeoPushData.js","sourceRoot":"","sources":["../../../../src/next/hooks/pushData/useGeoPushData.ts"],"names":[],"mappings":"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"}
|
package/esm/next/index.d.ts
CHANGED
|
@@ -25,5 +25,6 @@ export { createPushpinLayer } from "./layers/pushpin/layerFactory.js";
|
|
|
25
25
|
export { createAreaLayer } from "./layers/area/layerFactory.js";
|
|
26
26
|
export { GEO_CHART_DEFAULTS } from "./constants/defaults.js";
|
|
27
27
|
export type { IGeoChartDefaults } from "./constants/defaults.js";
|
|
28
|
+
export { TOOLTIP_TEXT_ATTRIBUTE_LOCAL_ID } from "./layers/common/constants.js";
|
|
28
29
|
export type { CenterPositionChangedCallback, ZoomChangedCallback } from "./types/common/callbacks.js";
|
|
29
30
|
//# sourceMappingURL=index.d.ts.map
|
package/esm/next/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/next/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,YAAY,EACR,6BAA6B,EAC7B,yBAAyB,GAC5B,MAAM,sCAAsC,CAAC;AAC9C,YAAY,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAC5F,YAAY,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AACjF,YAAY,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACrG,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvF,YAAY,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAC5F,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAChG,YAAY,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACpG,YAAY,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,YAAY,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACvE,YAAY,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,YAAY,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACxG,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE5E,OAAO,EACH,sBAAsB,EACtB,wBAAwB,EACxB,eAAe,GAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAEhF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/next/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,YAAY,EACR,6BAA6B,EAC7B,yBAAyB,GAC5B,MAAM,sCAAsC,CAAC;AAC9C,YAAY,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAC5F,YAAY,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AACjF,YAAY,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACrG,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvF,YAAY,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAC5F,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAChG,YAAY,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACpG,YAAY,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,YAAY,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACvE,YAAY,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,YAAY,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACxG,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE5E,OAAO,EACH,sBAAsB,EACtB,wBAAwB,EACxB,eAAe,GAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAEhF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,OAAO,EAAE,+BAA+B,EAAE,MAAM,8BAA8B,CAAC;AAE/E,YAAY,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC"}
|
package/esm/next/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// (C) 2025 GoodData Corporation
|
|
1
|
+
// (C) 2025-2026 GoodData Corporation
|
|
2
2
|
export { GeoPushpinChartNext } from "./GeoPushpinChartNext.js";
|
|
3
3
|
export { PUSHPIN_LAYER_ID } from "./GeoPushpinChartNext.js";
|
|
4
4
|
export { isValidViewportArea, VALID_VIEWPORT_AREAS } from "./types/config/viewport.js";
|
|
@@ -12,4 +12,6 @@ export { buildLayerExecution } from "./layers/execution/buildLayerExecution.js";
|
|
|
12
12
|
export { createPushpinLayer } from "./layers/pushpin/layerFactory.js";
|
|
13
13
|
export { createAreaLayer } from "./layers/area/layerFactory.js";
|
|
14
14
|
export { GEO_CHART_DEFAULTS } from "./constants/defaults.js";
|
|
15
|
+
// Constants
|
|
16
|
+
export { TOOLTIP_TEXT_ATTRIBUTE_LOCAL_ID } from "./layers/common/constants.js";
|
|
15
17
|
//# sourceMappingURL=index.js.map
|
package/esm/next/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/next/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/next/index.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAQ5D,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvF,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAGhG,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMlD,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAIvE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE5E,OAAO,EACH,sBAAsB,EACtB,wBAAwB,EACxB,eAAe,GAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAEhF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,YAAY;AACZ,OAAO,EAAE,+BAA+B,EAAE,MAAM,8BAA8B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/area/adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/area/adapter.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAOjE,OAAO,EACH,KAAK,gBAAgB,EAErB,KAAK,gBAAgB,EACxB,MAAM,6BAA6B,CAAC;AAyFrC,eAAO,MAAM,WAAW,EAAE,gBAAgB,CAAC,aAAa,EAAE,gBAAgB,CAiHzE,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// (C) 2025-2026 GoodData Corporation
|
|
2
|
-
import { newBucket } from "@gooddata/sdk-model";
|
|
2
|
+
import { attributeDisplayFormRef, isIdentifierRef, isUriRef, newBucket, } from "@gooddata/sdk-model";
|
|
3
3
|
import { BucketNames } from "@gooddata/sdk-ui";
|
|
4
4
|
import { deriveCollectionBoundingBox } from "./boundingBox.js";
|
|
5
5
|
import { getAreaColorStrategy } from "./coloring/colorStrategy.js";
|
|
@@ -13,16 +13,29 @@ import { getGeoHeaderStrings } from "../../utils/geoHeaders.js";
|
|
|
13
13
|
import { computeLegend } from "../common/computeLegend.js";
|
|
14
14
|
import { getGeoChartDimensions } from "../common/dimensions.js";
|
|
15
15
|
import { createLayerInsight, sanitizeGlobalFilters } from "../execution/layerInsightFactory.js";
|
|
16
|
+
import { prepareExecutionWithTooltipText } from "../execution/prepareTooltipExecution.js";
|
|
16
17
|
const COLLECTION_OVERRIDES = {
|
|
17
18
|
region: { collectionId: "regions" },
|
|
18
19
|
};
|
|
20
|
+
function getDisplayFormId(attribute) {
|
|
21
|
+
if (!attribute) {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
const ref = attributeDisplayFormRef(attribute);
|
|
25
|
+
if (isIdentifierRef(ref)) {
|
|
26
|
+
return ref.identifier;
|
|
27
|
+
}
|
|
28
|
+
if (isUriRef(ref)) {
|
|
29
|
+
return ref.uri;
|
|
30
|
+
}
|
|
31
|
+
return undefined;
|
|
32
|
+
}
|
|
19
33
|
function normalizeCollectionId(collectionId) {
|
|
20
34
|
return COLLECTION_OVERRIDES[collectionId]?.collectionId ?? collectionId;
|
|
21
35
|
}
|
|
22
36
|
function createExecution(layer, context) {
|
|
23
|
-
const { backend, workspace,
|
|
24
|
-
const { area, color, segmentBy, filters = [], sortBy = [], tooltipText
|
|
25
|
-
const tooltipText = layerTooltipText ?? config?.tooltipText;
|
|
37
|
+
const { backend, workspace, execConfig, globalFilters, executionFactory } = context;
|
|
38
|
+
const { area, color, segmentBy, filters = [], sortBy = [], tooltipText } = layer;
|
|
26
39
|
const buckets = [];
|
|
27
40
|
if (area) {
|
|
28
41
|
buckets.push(newBucket(BucketNames.AREA, area));
|
|
@@ -79,6 +92,9 @@ export const areaAdapter = {
|
|
|
79
92
|
buildExecution(layer, context) {
|
|
80
93
|
return createExecution(layer, context);
|
|
81
94
|
},
|
|
95
|
+
async prepareExecution(layer, context, execution) {
|
|
96
|
+
return prepareExecutionWithTooltipText(context, execution, layer.area);
|
|
97
|
+
},
|
|
82
98
|
async prepareLayer(layer, dataView, context) {
|
|
83
99
|
if (!context.intl) {
|
|
84
100
|
throw new Error("prepareLayer requires intl in adapter context");
|
|
@@ -108,6 +124,10 @@ export const areaAdapter = {
|
|
|
108
124
|
colorStrategy,
|
|
109
125
|
config: areaConfig,
|
|
110
126
|
features: boundaryFeatures,
|
|
127
|
+
tooltipAttrIds: {
|
|
128
|
+
locationName: getDisplayFormId(layer.area),
|
|
129
|
+
segment: getDisplayFormId(layer.segmentBy),
|
|
130
|
+
},
|
|
111
131
|
});
|
|
112
132
|
const legend = computeLegend(geoData, colorStrategy, {
|
|
113
133
|
layerType: "area",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/next/layers/area/adapter.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAGrC,OAAO,
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/next/layers/area/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformation.d.ts","sourceRoot":"","sources":["../../../../../src/next/layers/area/data/transformation.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,oBAAoB,EAGzB,KAAK,aAAa,EAOrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGpE,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"transformation.d.ts","sourceRoot":"","sources":["../../../../../src/next/layers/area/data/transformation.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,oBAAoB,EAGzB,KAAK,aAAa,EAOrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGpE,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,gCAAgC,CAAC;AAqUtF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC7B,EAAE,EAAE,cAAc,EAClB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,GACzB,YAAY,CAmCd;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACnC,aAAa,EAAE,cAAc,EAAE,EAC/B,OAAO,EAAE,YAAY,GACtB,iBAAiB,CAWnB;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,GAAG;IACvE,KAAK,EAAE,aAAa,EAAE,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACvC,aAAa,EAAE,kBAAkB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACnD,oBAAoB,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CACzC,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,YAAY,GACtB,0BAA0B,CAkC5B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// (C) 2025 GoodData Corporation
|
|
1
|
+
// (C) 2025-2026 GoodData Corporation
|
|
2
2
|
import { attributeLocalId, isAttribute, isMeasure, isResultAttributeHeader, measureLocalId, resultHeaderName, } from "@gooddata/sdk-model";
|
|
3
3
|
import { BucketNames } from "@gooddata/sdk-ui";
|
|
4
4
|
import { dataValueAsFloat } from "../../../map/style/dataTransformation.js";
|
|
@@ -183,10 +183,11 @@ function processTooltipTextBucket(ctx) {
|
|
|
183
183
|
if (tooltipTextIndex === undefined || !tooltipTextBucket) {
|
|
184
184
|
return undefined;
|
|
185
185
|
}
|
|
186
|
+
const data = getAttributeData(attributeHeaderItems, tooltipTextIndex, emptyHeaderString, nullHeaderString);
|
|
186
187
|
return {
|
|
187
188
|
index: tooltipTextBucket.index,
|
|
188
189
|
name: tooltipTextBucket.name,
|
|
189
|
-
data
|
|
190
|
+
data,
|
|
190
191
|
};
|
|
191
192
|
}
|
|
192
193
|
/**
|