should switching ctx before ns (derailed#2750)

uozalp · Sep 2, 2024 · c73b97c · c73b97c
1 parent cb4a84e
commit c73b97c
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/internal/view/command.go b/internal/view/command.go
@@ -160,14 +160,6 @@ func (c *Command) run(p *cmd.Interpreter, fqn string, clearStack bool) error {
 		return err
 	}
 
-	ns := c.app.Config.ActiveNamespace()
-	if cns, ok := p.NSArg(); ok {
-		ns = cns
-	}
-	if err := c.app.switchNS(ns); err != nil {
-		return err
-	}
-
 	if context, ok := p.HasContext(); ok {
 		if context != c.app.Config.ActiveContextName() {
 			if err := c.app.Config.Save(true); err != nil {
@@ -193,6 +185,14 @@ func (c *Command) run(p *cmd.Interpreter, fqn string, clearStack bool) error {
 		}
 	}
 
+	ns := c.app.Config.ActiveNamespace()
+	if cns, ok := p.NSArg(); ok {
+		ns = cns
+	}
+	if err := c.app.switchNS(ns); err != nil {
+		return err
+	}
+
 	co := c.componentFor(gvr, fqn, v)
 	co.SetFilter("")
 	co.SetLabelFilter(nil)