Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Dec 5, 2025

Issue

Fix UI bugs introduced by frappe-ui update

  1. Fix dropdown, where it was not appearing correctly
  2. Fix checkbox, where after clicking its labels the state was not updating
  3. Migrated Tabs component to refactored one
  4. Fixed assignment rule bugs
    1. Handle agent_group edge case when Restrict tickets by team is enabled
    2. Fixed popover UI bug

Before

image

After

image

Fixes #2780


This is an automatic backport of pull request #2794 done by Mergify.

(cherry picked from commit e2a2d29)

# Conflicts:
#	desk/src/components/SelectDropdown.vue
#	desk/src/components/Settings/General/components/TicketSettings.vue
#	desk/src/components/Settings/Sla/SlaPriorityListItem.vue
#	desk/src/components/Settings/Sla/SlaWorkDaysListItem.vue
(cherry picked from commit 4b43b6d)

# Conflicts:
#	desk/src/components/Settings/Assignment Rules/AssignmentRuleView.vue
(cherry picked from commit 2c2039f)

# Conflicts:
#	desk/src/components/Settings/Assignment Rules/AssignmentRuleView.vue
(cherry picked from commit 5171c3b)
@mergify mergify bot added the conflicts label Dec 5, 2025
@mergify
Copy link
Author

mergify bot commented Dec 5, 2025

Cherry-pick of e2a2d29 has failed:

On branch mergify/bp/main-hotfix/pr-2794
Your branch is up to date with 'origin/main-hotfix'.

You are currently cherry-picking commit e2a2d29b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   desk/src/components/Settings/Assignment Rules/AssignmentRuleListItem.vue
	modified:   desk/src/components/Settings/Assignment Rules/AssignmentRulesListView.vue

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   desk/src/components/SelectDropdown.vue
	deleted by us:   desk/src/components/Settings/General/components/TicketSettings.vue
	both modified:   desk/src/components/Settings/Sla/SlaPriorityListItem.vue
	both modified:   desk/src/components/Settings/Sla/SlaWorkDaysListItem.vue

Cherry-pick of 4b43b6d has failed:

On branch mergify/bp/main-hotfix/pr-2794
Your branch is ahead of 'origin/main-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 4b43b6d0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   desk/src/components/SelectDropdown.vue
	modified:   desk/src/components/conditions-filter/filterableFields.ts
	modified:   helpdesk/api/doc.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   desk/src/components/Settings/Assignment Rules/AssignmentRuleView.vue

Cherry-pick of 2c2039f has failed:

On branch mergify/bp/main-hotfix/pr-2794
Your branch is ahead of 'origin/main-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2c2039fa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   desk/src/components/Settings/Assignment Rules/AssigneeRules.vue

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   desk/src/components/Settings/Assignment Rules/AssignmentRuleView.vue

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants