kgabryje commented on code in PR #36062:
URL: https://github.com/apache/superset/pull/36062#discussion_r2542553738
##########
superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.tsx:
##########
@@ -277,44 +297,94 @@ const DeckMulti = (props: DeckMultiProps) => {
(
formData: QueryFormData,
payload: JsonObject,
- viewport?: Viewport,
+ visibleLayers?: number[],
): void => {
setViewport(getAdjustedViewport());
setSubSlicesLayers({});
+ let visibleDeckLayers = visibleLayers;
+
+ if (!visibleDeckLayers) {
+ visibleDeckLayers = (
+ formData.extra_form_data as ExtraFormData & {
+ visible_deckgl_layers?: number[];
+ }
+ )?.visible_deckgl_layers;
+ }
+
+ const deckSlicesOrder = formData.deck_slices || [];
+
payload.data.slices.forEach(
(subslice: { slice_id: number } & JsonObject, payloadIndex: number) =>
{
+ if (visibleDeckLayers && Array.isArray(visibleDeckLayers)) {
+ if (!visibleDeckLayers.includes(subslice.slice_id)) {
+ return;
+ }
+ }
+
loadSingleLayer(subslice, formData, payloadIndex);
},
);
+
+ const orderedSliceIds = deckSlicesOrder.filter((sliceId: number) => {
+ const subslice = payload.data.slices.find(
+ (s: { slice_id: number }) => s.slice_id === sliceId,
+ );
+ if (!subslice) return false;
+ if (visibleDeckLayers && Array.isArray(visibleDeckLayers)) {
+ return visibleDeckLayers.includes(sliceId);
+ }
+ return true;
+ });
+
+ setLayerOrder(orderedSliceIds);
},
[getAdjustedViewport, loadSingleLayer],
);
const prevDeckSlices = usePrevious(props.formData.deck_slices);
+ const prevVisibleLayersRedux = usePrevious(visibleDeckLayersFromRedux);
+
useEffect(() => {
const { formData, payload } = props;
- const hasChanges = !isEqual(prevDeckSlices, formData.deck_slices);
- if (hasChanges) {
- loadLayers(formData, payload);
+
+ const deckSlicesChanged = !isEqual(prevDeckSlices, formData.deck_slices);
+ const visibilityFilterChanged = !isEqual(
+ prevVisibleLayersRedux,
+ visibleDeckLayersFromRedux,
+ );
+
+ if (deckSlicesChanged || visibilityFilterChanged) {
+ loadLayers(formData, payload, undefined);
}
- }, [loadLayers, prevDeckSlices, props]);
+ }, [
+ loadLayers,
+ prevDeckSlices,
+ prevVisibleLayersRedux,
+ visibleDeckLayersFromRedux,
+ props,
+ ]);
const { payload, formData, setControlValue, height, width } = props;
- const layers = Object.values(subSlicesLayers);
+
+ const layers = layerOrder
Review Comment:
```suggestion
const layers = useMemo(() => layerOrder
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
