Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Disable cycling while editing a PM #1280

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

[WIP] Disable cycling while editing a PM #1280

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b45eb77
boxes: Create _setup_common_private_compose.
Apr 16, 2023
7cfffe0
tests: boxes: Add tests for _setup_common_private_compose.
Apr 16, 2023
cdb0fad
boxes: Create update_recipients_from_user_ids function.
Apr 16, 2023
415f31f
tests: boxes: Add tests for update_recipients_from_user_ids.
Apr 16, 2023
2a66b5d
tests: boxes: Add tests for private_box_view.
Apr 16, 2023
691296d
boxes: Add private_box_edit_view function for edit compose box.
Apr 16, 2023
f1590cb
tests: boxes: Add tests for private_box_edit_view.
Apr 16, 2023
ba32129
messages: Call private_box_edit_view when editing private message.
Apr 16, 2023
40e6067
boxes: Disable cycling while editing a Private Message.
Apr 25, 2023
ac20ad7
boxes: Footer message if tab key pessed while editing a private message.
Apr 25, 2023
2bd5228
refactor: Change name of update_recipients function.
Subhasish-Behera Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions zulipterminal/ui_tools/boxes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,18 +207,16 @@ def _setup_common_private_compose(self) -> None:
]
self.focus_position = self.FOCUS_CONTAINER_MESSAGE

def private_box_view(
self,
*,
recipient_user_ids: Optional[List[int]] = None,
) -> None:
def update_recipients_from_user_ids(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re this commit (and others)

  • if it only moves code around, use a refactor: area in the title, with the files you modify (could the README be clearer?)
  • I'd suggest reading about types of refactor in general, but this is an 'Extract (method/function)', so using that phrasing helps communicate what you're doing and why

self, recipient_user_ids: Optional[List[int]] = None
) -> str:
if recipient_user_ids:
self._set_regular_and_typing_recipient_user_ids(recipient_user_ids)
self.recipient_emails = [
self.model.user_id_email_dict[user_id]
for user_id in self.recipient_user_ids
]
recipient_info = ", ".join(
return ", ".join(
[
f"{self.model.user_dict[email]['full_name']} <{email}>"
for email in self.recipient_emails
Expand All @@ -227,10 +225,16 @@ def private_box_view(
else:
self._set_regular_and_typing_recipient_user_ids(None)
self.recipient_emails = []
recipient_info = ""
return ""

def private_box_view(
self,
*,
recipient_user_ids: Optional[List[int]] = None,
) -> None:
self.recipient_info = self.update_recipients_from_user_ids(recipient_user_ids)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self.recipient_info doesn't appear to be used by any of your later commits, outside of the setup functions (this and the edit equivalent), so it seems like you can continue to use recipient_info instead?

self.send_next_typing_update = datetime.now()
self.to_write_box = ReadlineEdit("To: ", edit_text=recipient_info)
self.to_write_box = ReadlineEdit("To: ", edit_text=self.recipient_info)
self.to_write_box.enable_autocomplete(
func=self._to_box_autocomplete,
key=primary_key_for_command("AUTOCOMPLETE"),
Expand Down