Quellcode durchsuchen

Sort namespaces alphabetically

jnfrati vor 5 Jahren
Ursprung
Commit
f89ca23765
1 geänderte Dateien mit 12 neuen und 18 gelöschten Zeilen
  1. 12 18
      dashboard/src/main/home/cluster-dashboard/dashboard/NamespaceList.tsx

+ 12 - 18
dashboard/src/main/home/cluster-dashboard/dashboard/NamespaceList.tsx

@@ -115,25 +115,19 @@ export const NamespaceList: React.FunctionComponent = () => {
     };
   }, [websocket]);
 
+  const sortAlphabetically = (prev: any, current: any) => {
+    return prev.metadata.name > current.metadata.name ? 1 : -1;
+  };
+
   const sortedNamespaces = useMemo<any[]>(() => {
-    return [...namespaces].sort((prev, current) => {
-      const prevName = prev.metadata.name;
-      const currentName = current.metadata.name;
-
-      if (
-        isAvailableForDeletion(prevName) &&
-        !isAvailableForDeletion(currentName)
-      ) {
-        return -1;
-      } else if (
-        !isAvailableForDeletion(prevName) &&
-        isAvailableForDeletion(currentName)
-      ) {
-        return 1;
-      } else {
-        return 0;
-      }
-    });
+    const nonDeletableNamespaces = namespaces
+      .filter((namespace) => !isAvailableForDeletion(namespace.metadata.name))
+      .sort(sortAlphabetically);
+    const deletableNamespaces = namespaces
+      .filter((namespace) => isAvailableForDeletion(namespace.metadata.name))
+      .sort(sortAlphabetically);
+
+    return [...deletableNamespaces, ...nonDeletableNamespaces];
   }, [namespaces]);
 
   return (