Use auth default namespace in namespace reducer (#1190)

* Use auth default namespace in namespace reducer * Fix test
vmware-tanzu · Sep 30, 2019 · dad7325 · dad7325
1 parent 3371873
commit dad7325
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/dashboard/src/reducers/namespace.test.ts b/dashboard/src/reducers/namespace.test.ts
@@ -54,11 +54,11 @@ describe("namespaceReducer", () => {
 
   context("when CLEAR_NAMESPACES", () => {
     const clearedState = {
-      current: "",
+      current: "default",
       namespaces: [],
     };
 
-    it("clears any namespaces state", () => {
+    it("returns to the default namespace", () => {
       expect(
         namespaceReducer(initialState, {
           type: getType(actions.namespace.clearNamespaces),

diff --git a/dashboard/src/reducers/namespace.ts b/dashboard/src/reducers/namespace.ts
@@ -3,17 +3,22 @@ import { getType } from "typesafe-actions";
 
 import actions from "../actions";
 import { NamespaceAction } from "../actions/namespace";
+import { Auth } from "../shared/Auth";
 
 export interface INamespaceState {
   current: string;
   namespaces: string[];
   errorMsg?: string;
 }
 
-const initialState: INamespaceState = {
-  current: "",
-  namespaces: [],
+const getInitialState: () => INamespaceState = (): INamespaceState => {
+  const token = Auth.getAuthToken() || "";
+  return {
+    current: Auth.defaultNamespaceFromToken(token),
+    namespaces: [],
+  };
 };
+const initialState: INamespaceState = getInitialState();
 
 const namespaceReducer = (
   state: INamespaceState = initialState,