Merge pull request #47 from data-exp-lab/fe-gexf

Fix Explore Config

Author: yilinxia

src/lib/data.ts

@@ -576,7 +576,7 @@ export function getFilterableFields(
   { filterable, colorable, sizeable }: Pick<NavState, "filterable" | "colorable" | "sizeable">,
 ): Field[] {
   const { fields, fieldsIndex } = data;
-  const filterableSet = new Set<string>([...(filterable || []), ...(colorable || []), ...(sizeable || [])]);
+  const filterableSet = new Set<string>(filterable || []);
 
   return fields.filter((f) => filterableSet.has(f)).map((f) => fieldsIndex[f]);
 }

src/lib/navState.ts

@@ -156,7 +156,7 @@ export function cleanNavState(state: NavState, data: Data): NavState {
   const cleanedColorable = uniq((colorable || []).filter((f) => fieldsIndex[f]));
   const cleanedSizeable = uniq((sizeable || []).filter((f) => fieldsIndex[f]?.type === "quanti"));
   const cleanedFilterable = uniq(
-    (filterable || []).filter((f) => fieldsIndex[f] && !cleanedSizeable.includes(f) && !cleanedColorable.includes(f)),
+    (filterable || []).filter((f) => fieldsIndex[f]),
   );
   const cleanedSizeableIndex = keyBy(cleanedSizeable);
   const cleanedColorableIndex = keyBy(cleanedColorable);

src/views/EditionPanel.tsx

@@ -200,10 +200,9 @@ const EditionPanel: FC<{ isExpanded: boolean }> = ({ isExpanded }) => {
                         {["filterable", "colorable", "sizeable"].map((key) => {
                           const colorOrSize = sizeableSet.has(f) || colorableSet.has(f);
                           const disabled =
-                            (key === "filterable" && colorOrSize) ||
                             (key === "sizeable" && field.type !== "quanti") ||
                             (key === "colorable" && field.type !== "quali" && field.type !== "quanti");
-                          const checked = sets[key].has(f) || (key === "filterable" && colorOrSize);
+                          const checked = sets[key].has(f);
                           const keyToUpdate = {
                             sizeable: "size",
                             colorable: "color",
@@ -265,7 +264,7 @@ const EditionPanel: FC<{ isExpanded: boolean }> = ({ isExpanded }) => {
                         </td>
                       );
                     })}
-                    <td className="line-height-1 text-muted">Allow using default graph file colors and/or sizes</td>
+                    <td className="line-height-1 text-white">Allow using default graph file colors and/or sizes</td>
                   </tr>
                 </tbody>
               </table>

src/views/GraphView.tsx

@@ -248,14 +248,22 @@ const GraphView: FC<{ embed?: boolean }> = ({ embed = false }) => {
     const { filterable, sizeable } = navState;
     // Filter out createdAt_year from sizeable fields
     const sizeableFields = allFields.filter(field => field !== 'createdAt_year');
-    if (
-      !filterable || filterable.length !== allFields.length ||
-      !sizeable || sizeable.length !== sizeableFields.length
-    ) {
+
+    // Set default values only if they haven't been initialized yet
+    const updates: Partial<NavState> = {};
+
+    if (!filterable || filterable.length === 0) {
+      updates.filterable = allFields;
+    }
+
+    if (!sizeable || sizeable.length === 0) {
+      updates.sizeable = sizeableFields;
+    }
+
+    if (Object.keys(updates).length > 0) {
       setNavState({
         ...navState,
-        filterable: allFields,
-        sizeable: sizeableFields,
+        ...updates,
       });
     }
   }, [data, navState, setNavState]);