refactor: ui: Simplify key redirection to directly return key.

This commit:
* replaces user_view with right_column to make it
similar to left_column.keypress in SEARCH_STREAMS/TOPICS
* returns middle_column.keypress(), left_column.keypress() and
right_column.keypress() to directly return handled/unhandled keys.

Author: Rohitth007

tests/ui/test_ui.py

@@ -271,16 +271,14 @@ def test_keypress_STREAM_MESSAGE(self, view, mocker, key, widget_size):
         view.controller.is_in_editor_mode = lambda: False
         size = widget_size(view)
 
-        returned_key = view.keypress(size, key)
+        view.keypress(size, key)
 
-        view.middle_column.keypress.assert_called_once_with(size, key)
-        assert returned_key == key
         assert view.body.focus_col == 1
+        view.middle_column.keypress.assert_called_once_with(size, key)
 
     @pytest.mark.parametrize("key", keys_for_command("SEARCH_PEOPLE"))
     @pytest.mark.parametrize("autohide", [True, False], ids=["autohide", "no_autohide"])
     def test_keypress_autohide_users(self, view, mocker, autohide, key, widget_size):
-        view.users_view = mocker.Mock()
         view.body = mocker.Mock()
         view.controller.autohide = autohide
         view.body.contents = ["streams", "messages", mocker.Mock()]
@@ -292,7 +290,7 @@ def test_keypress_autohide_users(self, view, mocker, autohide, key, widget_size)
 
         view.keypress(size, key)
 
-        view.users_view.keypress.assert_called_once_with(size, key)
+        view.right_panel.keypress.assert_called_once_with(size, key)
         assert view.body.focus_position == 2
 
     @pytest.mark.parametrize("key", keys_for_command("SEARCH_STREAMS"))

zulipterminal/ui.py

@@ -208,8 +208,7 @@ def keypress(self, size: urwid_Box, key: str) -> Optional[str]:
             or is_command_key("PRIVATE_MESSAGE", key)
         ):
             self.body.focus_col = 1
-            self.middle_column.keypress(size, key)
-            return key
+            return self.middle_column.keypress(size, key)
         elif is_command_key("ALL_PM", key):
             self.model.controller.narrow_to_all_pm()
             self.body.focus_col = 1
@@ -222,19 +221,17 @@ def keypress(self, size: urwid_Box, key: str) -> Optional[str]:
         elif is_command_key("SEARCH_PEOPLE", key):
             # Start User Search if not in editor_mode
             self.body.focus_position = 2
-            self.users_view.keypress(size, key)
             self.show_left_panel(visible=False)
             self.show_right_panel(visible=True)
-            return key
+            return self.right_panel.keypress(size, key)
         elif is_command_key("SEARCH_STREAMS", key) or is_command_key(
             "SEARCH_TOPICS", key
         ):
             # jump stream search
             self.body.focus_position = 0
-            self.left_panel.keypress(size, key)
             self.show_right_panel(visible=False)
             self.show_left_panel(visible=True)
-            return key
+            return self.left_panel.keypress(size, key)
         elif is_command_key("OPEN_DRAFT", key):
             saved_draft = self.model.session_draft_message()
             if saved_draft: