A platform for community discussion. Free, open, simple.
UX: move gamification leaderboard delete action into a row actions menu (#44752)
David Battersbya004057f7001
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-gamification-leaderboards/index.js b/plugins/discourse-gamification/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-gamification-leaderboards/index.jsindex 328eb6c5ec5..1f0033334f3 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-gamification-leaderboards/index.js+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-gamification-leaderboards/index.js@@ -20,7 +20,9 @@ export default class AdminPluginsShowDiscourseGamificationLeaderboardsIndexContr}@action- destroyLeaderboard(leaderboard) {+ async destroyLeaderboard(leaderboard, closeMenu) {+ await closeMenu();+this.dialog.deleteConfirm({message: i18n("gamification.leaderboard.confirm_destroy"),didConfirm: () => {diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjsindex b581f9aedaf..b244a88966e 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs@@ -1,7 +1,9 @@import { concat, fn } from "@ember/helper";import { LinkTo } from "@ember/routing";+import DMenu from "discourse/float-kit/components/d-menu";import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import DPageSubheader from "discourse/ui-kit/d-page-subheader";import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";@@ -91,12 +93,30 @@ export default <template>@route="adminPlugins.show.discourse-gamification-leaderboards.show">{{i18n "gamification.edit"}} </LinkTo>- <DButton- class="btn-small leaderboard-admin__delete btn-danger"- @action={{fn @controller.destroyLeaderboard leaderboard}}- @icon="trash-can"- @title="gamification.delete"- />+ <DMenu+ @icon="ellipsis-vertical"+ @identifier="leaderboard-admin-menu"+ @placement="bottom-end"+ @title={{i18n "more_options"}}+ @triggerClass="btn-default btn-small"+ >+ <:content as |menu|>+ <DDropdownMenu as |dropdown|>+ <dropdown.item>+ <DButton+ class="btn-transparent --danger leaderboard-admin__delete"+ @action={{fn+ @controller.destroyLeaderboard+ leaderboard+ menu.close+ }}+ @icon="trash-can"+ @label="gamification.delete"+ />+ </dropdown.item>+ </DDropdownMenu>+ </:content>+ </DMenu></div></td></tr>diff --git a/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rb b/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rbindex 1f37b6cdfcc..bbe08488e44 100644--- a/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rb+++ b/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rb@@ -32,7 +32,13 @@ module PageObjectsenddef delete_leaderboard(leaderboard)- find("#leaderboard-admin__row-#{leaderboard.id} .leaderboard-admin__delete").click+ menu =+ PageObjects::Components::DMenu.new(+ "#leaderboard-admin__row-#{leaderboard.id} .leaderboard-admin-menu-trigger",+ "leaderboard-admin-menu",+ )+ menu.expand+ menu.option(".leaderboard-admin__delete").clickendendend