fix: fix dialog filter input

elfgzp · elfgzp · commit 256f386a23ef · 2020-12-05T22:18:24.000+08:00
diff --git a/go.sum b/go.sum
@@ -45,6 +45,7 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/TNK-Studio/gocui v0.4.1-0.20201118030412-21fac610f2e0 h1:MjkmJCU22bjYIWcD9IPYYAQ6YkXazeQ53nTx4tT/CJ8=
 github.com/TNK-Studio/gocui v0.4.1-0.20201118030412-21fac610f2e0/go.mod h1:fS7N+M2ibR/4EHbj2mvOpe/UTxbpuXPl1ZcYGI+8M80=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -87,8 +88,6 @@ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZ
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/elfgzp/gocui v0.4.1-0.20201118030412-21fac610f2e0 h1:EftbBb8ZVdoT+yW+xU/lDqBZu41blKJlU4+HFbaNdc0=
-github.com/elfgzp/gocui v0.4.1-0.20201118030412-21fac610f2e0/go.mod h1:1T9sKFyEfxmqNFj5KQhbIVFmcdDa8cMMUSO0kI++Y1s=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
diff --git a/pkg/app/dialog.go b/pkg/app/dialog.go
@@ -171,7 +171,7 @@ func showInputDialog(gui *guilib.Gui, title string, zIndex int, confirmHandler f
 	if err := gui.AddView(inputDialog); err != nil {
 		return err
 	}
-	if err := gui.FocusView(inputDialogViewName, true); err != nil {
+	if err := gui.FocusView(inputDialogViewName, false); err != nil {
 		return err
 	}
 	return nil
@@ -218,16 +218,6 @@ func newFilterDialog(
 				value = view.ViewBufferLines()[0]
 			}
 
-			//valueRune := []rune(value)
-			//length := len(valueRune)
-
-			//if (key == gocui.KeyBackspace || key == gocui.KeyBackspace2) && value != "" {
-			//	valueRune = valueRune[:length-1]
-			//} else {
-			//	valueRune = append(valueRune, ch)
-			//}
-
-			//value = string(valueRune)
 			if err := view.SetState(filterInputValueStateKey, value, false); err != nil {
 				log.Logger.Warningf("OnEditedChange - view.SetState(filterInputValueStateKey,%s) error %s", value, err)
 				return err
@@ -291,18 +281,6 @@ func newFilterDialog(
 				return err
 			}
 
-			if showInputValueInFiltered && value != "" {
-				data = append([]string{value}, data...)
-			}
-
-			if len(data) == 0 {
-				_, err := fmt.Fprint(view, noResultMsg)
-				if err != nil {
-					return err
-				}
-				return nil
-			}
-
 			if value == "" {
 				_, err := fmt.Fprint(view, strings.Join(data, "\n"))
 				if err != nil {
@@ -320,6 +298,10 @@ func newFilterDialog(
 				}
 			}
 
+			if showInputValueInFiltered && value != "" && len(filtered) == 0 {
+				filtered = append([]string{value}, filtered...)
+			}
+
 			if len(filtered) == 0 {
 				_, err := fmt.Fprint(view, noResultMsg)
 				if err != nil {
diff --git a/pkg/app/handler.go b/pkg/app/handler.go
@@ -589,6 +589,7 @@ func runPodImageOptions(gui *guilib.Gui, namespace, podName string) error {
 	}
 	return nil
 }
+
 func runPodCommandInput(gui *guilib.Gui, namespace, podName, image string) error {
 	if err := showFilterDialog(
 		gui,
@@ -628,16 +629,14 @@ func runPodCommandInput(gui *guilib.Gui, namespace, podName, image string) error
 			gui.Config.Mouse = true
 			gui.Config.Cursor = false
 			gui.Configure()
-			gui.Configure()
-			if err := gui.ReturnPreviousView(); err != nil {
-				return err
-			}
-
 			gui.ReRenderAll()
 			config.Conf.UserConfig.History.AddPodNameHistory(podName)
 			config.Conf.UserConfig.History.AddImageHistory(image)
 			config.Conf.UserConfig.History.AddCommandHistory(command)
 			config.Save()
+			if err := gui.ReturnPreviousView(); err != nil {
+				return err
+			}
 			return nil
 		},
 		func(inputted string) ([]string, error) {
