fix: update drop state when dataTypes props changes

zimmerman-team · Nov 14, 2023 · 86876fb · 86876fb
1 parent 513d0a5
commit 86876fb
Showing 1 changed file with 52 additions and 48 deletions.
diff --git a/src/app/modules/chart-module/routes/mapping/index.tsx b/src/app/modules/chart-module/routes/mapping/index.tsx
@@ -213,55 +213,59 @@ function ChartBuilderMappingDimension(
 
   const dimensionMapping = get(mapping, dimension.id, {});
 
-  const [{ isOver }, drop] = useDrop(() => ({
-    accept: ["column", "card"],
-    collect: (monitor) => ({
-      isOver: monitor.isOver(),
+  const [{ isOver }, drop] = useDrop(
+    () => ({
+      accept: ["column", "card"],
+      collect: (monitor) => ({
+        isOver: monitor.isOver(),
+      }),
+      drop: (item: any) => {
+        const mappingFromStorage = get(
+          JSON.parse(
+            sessionStorage.getItem("[EasyPeasyStore][0][charts.mapping]") ?? ""
+          ),
+          "data.value",
+          {}
+        ) as { [key: string]: any };
+
+        const localDimensionMapping = get(mappingFromStorage, dimension.id, {});
+        if (item.type === "column") {
+          const defaulAggregation = dimension.aggregation
+            ? getDefaultDimensionAggregation(dimension, dataTypes[item.id])
+            : null;
+          const columnDataType = getTypeName(dataTypes[item.id]);
+          const isValid =
+            dimension.validTypes?.length === 0 ||
+            dimension.validTypes?.includes(columnDataType);
+          setMapping({
+            [dimension.id]: {
+              ids: (localDimensionMapping.ids || []).concat(uniqueId()),
+              value: [...(localDimensionMapping.value || []), item.id],
+              isValid: isValid,
+              mappedType: columnDataType,
+              config: dimension.aggregation
+                ? {
+                    aggregation: [
+                      ...(get(localDimensionMapping, "config.aggregation") ||
+                        []),
+                      defaulAggregation,
+                    ],
+                  }
+                : undefined,
+            },
+          });
+        } else if (item.dimensionId !== dimension.id) {
+          replaceDimension(
+            item.dimensionId,
+            dimension.id,
+            item.index,
+            localDimensionMapping.value ? localDimensionMapping.value.length : 0
+          );
+        }
+      },
     }),
-    drop: (item: any) => {
-      const mappingFromStorage = get(
-        JSON.parse(
-          sessionStorage.getItem("[EasyPeasyStore][0][charts.mapping]") ?? ""
-        ),
-        "data.value",
-        {}
-      ) as { [key: string]: any };
-
-      const localDimensionMapping = get(mappingFromStorage, dimension.id, {});
-      if (item.type === "column") {
-        const defaulAggregation = dimension.aggregation
-          ? getDefaultDimensionAggregation(dimension, dataTypes[item.id])
-          : null;
-        const columnDataType = getTypeName(dataTypes[item.id]);
-        const isValid =
-          dimension.validTypes?.length === 0 ||
-          dimension.validTypes?.includes(columnDataType);
-        setMapping({
-          [dimension.id]: {
-            ids: (localDimensionMapping.ids || []).concat(uniqueId()),
-            value: [...(localDimensionMapping.value || []), item.id],
-            isValid: isValid,
-            mappedType: columnDataType,
-            config: dimension.aggregation
-              ? {
-                  aggregation: [
-                    ...(get(localDimensionMapping, "config.aggregation") || []),
-                    defaulAggregation,
-                  ],
-                }
-              : undefined,
-          },
-        });
-      } else if (item.dimensionId !== dimension.id) {
-        replaceDimension(
-          item.dimensionId,
-          dimension.id,
-          item.index,
-          localDimensionMapping.value ? localDimensionMapping.value.length : 0
-        );
-      }
-    },
-  }));
+    [dataTypes]
+  );
 
   const setAggregation = React.useCallback(
     (newAggregations) => {