2
0
Justin Rhee 3 жил өмнө
parent
commit
4d3de50747

+ 8 - 2
dashboard/src/main/home/cluster-dashboard/ClusterDashboard.tsx

@@ -112,8 +112,14 @@ class ClusterDashboard extends Component<PropsType, StateType> {
     // Reset namespace filter and close expanded chart on cluster change
     if (prevProps.currentCluster !== this.props.currentCluster) {
       let namespace = "default";
-      if (localStorage.getItem(`${this.context.currentProject.id}-${this.context.currentCluster.id}-namespace`)) {
-        namespace = localStorage.getItem(`${this.context.currentProject.id}-${this.context.currentCluster.id}-namespace`);
+      if (
+        localStorage.getItem(
+          `${this.context.currentProject.id}-${this.context.currentCluster.id}-namespace`
+        )
+      ) {
+        namespace = localStorage.getItem(
+          `${this.context.currentProject.id}-${this.context.currentCluster.id}-namespace`
+        );
       }
       this.setState(
         {

+ 22 - 5
dashboard/src/main/home/cluster-dashboard/NamespaceSelector.tsx

@@ -31,7 +31,9 @@ export const NamespaceSelector: React.FunctionComponent<Props> = ({
     }[]
   >([]);
   const [defaultNamespace, setDefaultNamespace] = useState<string>(
-    localStorage.getItem(`${context.currentProject.id}-${context.currentCluster.id}-namespace`)
+    localStorage.getItem(
+      `${context.currentProject.id}-${context.currentCluster.id}-namespace`
+    )
   );
 
   const updateOptions = () => {
@@ -63,8 +65,16 @@ export const NamespaceSelector: React.FunctionComponent<Props> = ({
           const availableNamespaces = res.data.filter((namespace: any) => {
             return namespace.status !== "Terminating";
           });
-          if (localStorage.getItem(`${context.currentProject.id}-${context.currentCluster.id}-namespace`)) {
-            setDefaultNamespace(localStorage.getItem(`${context.currentProject.id}-${context.currentCluster.id}-namespace`));
+          if (
+            localStorage.getItem(
+              `${context.currentProject.id}-${context.currentCluster.id}-namespace`
+            )
+          ) {
+            setDefaultNamespace(
+              localStorage.getItem(
+                `${context.currentProject.id}-${context.currentCluster.id}-namespace`
+              )
+            );
           } else {
             setDefaultNamespace("default");
           }
@@ -106,11 +116,18 @@ export const NamespaceSelector: React.FunctionComponent<Props> = ({
   }, [namespace, context.currentCluster]);
 
   useEffect(() => {
-    setNamespace(localStorage.getItem(`${context.currentProject.id}-${context.currentCluster.id}-namespace`));
+    setNamespace(
+      localStorage.getItem(
+        `${context.currentProject.id}-${context.currentCluster.id}-namespace`
+      )
+    );
   }, [context.currentCluster]);
 
   const handleSetActive = (namespace: any) => {
-    localStorage.setItem(`${context.currentProject.id}-${context.currentCluster.id}-namespace`, namespace);
+    localStorage.setItem(
+      `${context.currentProject.id}-${context.currentCluster.id}-namespace`,
+      namespace
+    );
     setNamespace(namespace);
   };