From 155ae06f6229ca5cf8d0aabd96c19406c643d1d7 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 3 Feb 2021 17:42:12 +0100 Subject: [PATCH] DEV: Remove `group-members-dropdown` (#11948) It was introduced in c82b2dcc24c06634e64a6c388c18a815f039c608, but since b76731d722c099f64446f18fbf92026be7cfd225 and 58ee947b352fa7605ef8cc8560873b9abad541d4 it's a single-option dropdown, so there's no need to show it (and keep it) instead of a button. We use a button for non-admins already. --- .../app/templates/mobile/group-index.hbs | 19 ++++-------- .../components/group-members-dropdown.js | 30 ------------------- 2 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js diff --git a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs index 5ef942e30c..a0c6c8ce58 100644 --- a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs +++ b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs @@ -8,19 +8,12 @@
{{#if canManageGroup}} - {{#if currentUser.admin}} - {{group-members-dropdown - groupName=model.full_name - showAddMembersModal=(route-action "showAddMembersModal") - }} - {{else}} - {{d-button - icon="plus" - label="groups.manage.add_members" - class="group-members-add" - action=(route-action "showAddMembersModal") - }} - {{/if}} + {{d-button + icon="plus" + label="groups.manage.add_members" + class="group-members-add" + action=(route-action "showAddMembersModal") + }} {{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js b/app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js deleted file mode 100644 index d9d64832c3..0000000000 --- a/app/assets/javascripts/select-kit/addon/components/group-members-dropdown.js +++ /dev/null @@ -1,30 +0,0 @@ -import { action, computed } from "@ember/object"; -import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box"; -import I18n from "I18n"; - -export default DropdownSelectBoxComponent.extend({ - classNames: ["group-members-dropdown"], - - selectKitOptions: { - icon: "bars", - showFullTitle: false, - }, - - content: computed(function () { - const items = [ - { - id: "showAddMembersModal", - name: I18n.t("groups.add_members.title", { - group_name: this.groupName, - }), - icon: "user-plus", - }, - ]; - return items; - }), - - @action - onChange(id) { - this.attrs && this.attrs[id] && this.attrs[id](); - }, -});