develop to master #1799
Merged
develop to master #1799
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AgentTicket Detail redesign
Agent communication area
fix: only show agents in ticket assignment modal
fix: show remaining history activities
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -14,6 +14,7 @@ def get_ticket_obj(): | |||
|
|
|||
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| @@ -14,6 +14,7 @@ def get_ticket_obj(): | |||
|
|
|||
| non_agent = "[email protected]" | |||
| agent = "[email protected]" | |||
| agent2 = "[email protected]" | |||
| class TestHDTicket(FrappeTestCase): | |||
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| class TestHDTicket(FrappeTestCase): | |
| class TestHDTicket(FrappeTestCase): |
Comment on lines
+39
to
+47
| frappe.get_doc({ | ||
| "doctype": "User", | ||
| "first_name": "Agent2", | ||
| "email": agent2 | ||
| }).insert() | ||
| frappe.get_doc({ | ||
| "doctype": "HD Agent", | ||
| "user": agent2 | ||
| }).insert() |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| frappe.get_doc({ | |
| "doctype": "User", | |
| "first_name": "Agent2", | |
| "email": agent2 | |
| }).insert() | |
| frappe.get_doc({ | |
| "doctype": "HD Agent", | |
| "user": agent2 | |
| }).insert() | |
| frappe.get_doc( | |
| {"doctype": "User", "first_name": "Agent2", "email": agent2} | |
| ).insert() | |
| frappe.get_doc({"doctype": "HD Agent", "user": agent2}).insert() |
| notification = frappe.get_all("HD Notification", filters={"reference_ticket": ticket.name, "notification_type": "Assignment", "user_to": agent, "user_from": "Administrator"}) | ||
| self.assertEqual(len(notification), 1) | ||
| ticket.assign_agent(agent2) | ||
| notification = frappe.get_all("HD Notification", filters={"reference_ticket": ticket.name, "notification_type": "Assignment", "user_to": ["in", [agent, agent2]], "user_from": "Administrator"}) |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| notification = frappe.get_all("HD Notification", filters={"reference_ticket": ticket.name, "notification_type": "Assignment", "user_to": ["in", [agent, agent2]], "user_from": "Administrator"}) | |
| notification = frappe.get_all( | |
| "HD Notification", | |
| filters={ | |
| "reference_ticket": ticket.name, | |
| "notification_type": "Assignment", | |
| "user_to": ["in", [agent, agent2]], | |
| "user_from": "Administrator", | |
| }, | |
| ) |
| self.assertEqual(len(notification), 1) | ||
| ticket.assign_agent(agent2) | ||
| notification = frappe.get_all("HD Notification", filters={"reference_ticket": ticket.name, "notification_type": "Assignment", "user_to": ["in", [agent, agent2]], "user_from": "Administrator"}) | ||
| self.assertEqual(len(notification), 2) | ||
|
|
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| @@ -193,9 +194,10 @@ def on_update(self): | |||
| if self.status == "Open": | |||
| if self.get_doc_before_save() and self.get_doc_before_save().status != "Open": | |||
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| if self.get_doc_before_save() and self.get_doc_before_save().status != "Open": | |
| if ( | |
| self.get_doc_before_save() | |
| and self.get_doc_before_save().status != "Open" | |
| ): |
| agents = self.get_assigned_agents() | ||
| if agents: | ||
| for agent in agents: | ||
| self.notify_agent(agent.name, "Reaction") | ||
|
|
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| # the agent is already set as an assignee | ||
| return | ||
|
|
||
| clear_all_assignments("HD Ticket", self.name) | ||
| assign({"assign_to": [agent], "doctype": "HD Ticket", "name": self.name}) | ||
|
|
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| # the agent is already set as an assignee | ||
| return | ||
|
|
||
| clear_all_assignments("HD Ticket", self.name) | ||
| assign({"assign_to": [agent], "doctype": "HD Ticket", "name": self.name}) | ||
|
|
||
| if frappe.session.user != agent: | ||
| self.notify_agent(agent, "Assignment") | ||
|
|
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| @@ -467,13 +463,13 @@ def new_comment(self, content: str): | |||
|
|
|||
| @frappe.whitelist() | |||
| def reply_via_agent( | |||
| self, message: str, cc: str = None, bcc: str = None, attachments: List[str] = [] | |||
| self, message: str, to: str = None, cc: str = None, bcc: str = None, attachments: List[str] = [] | |||
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| self, message: str, to: str = None, cc: str = None, bcc: str = None, attachments: List[str] = [] | |
| self, | |
| message: str, | |
| to: str = None, | |
| cc: str = None, | |
| bcc: str = None, | |
| attachments: List[str] = [], |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.