@@ -3,14 +3,6 @@ import { htmlSafe } from "@ember/template";
33import { isEmpty } from "@ember/utils" ;
44import { hbs } from "ember-cli-htmlbars" ;
55import { h } from "virtual-dom" ;
6- import {
7- POST_MENU_ADMIN_BUTTON_KEY ,
8- POST_MENU_COPY_LINK_BUTTON_KEY ,
9- POST_MENU_DELETE_BUTTON_KEY ,
10- POST_MENU_LIKE_BUTTON_KEY ,
11- POST_MENU_SHARE_BUTTON_KEY ,
12- POST_MENU_SHOW_MORE_BUTTON_KEY ,
13- } from "discourse/components/post/menu" ;
146import SearchAdvancedOptions from "discourse/components/search-advanced-options" ;
157import { renderAvatar } from "discourse/helpers/user-avatar" ;
168import { withPluginApi } from "discourse/lib/plugin-api" ;
@@ -503,7 +495,9 @@ function initialize(api) {
503495 return new RenderGlimmer (
504496 this ,
505497 "p.assigned-to" ,
506- hbs `<AssignedToPost @assignedToUser={{@data.assignedToUser}} @assignedToGroup={{@data.assignedToGroup}} @href={{@data.href}} @post={{@data.post}} />` ,
498+ hbs `
499+ <AssignedToPost @assignedToUser={{@data.assignedToUser}} @assignedToGroup={{@data.assignedToGroup}}
500+ @href={{@data.href}} @post={{@data.post}} />` ,
507501 {
508502 assignedToUser : attrs . post . assigned_to_user ,
509503 assignedToGroup : attrs . post . assigned_to_group ,
@@ -733,25 +727,26 @@ function initialize(api) {
733727function customizePostMenu ( api ) {
734728 const transformerRegistered = api . registerValueTransformer (
735729 "post-menu-buttons" ,
736- ( { value : dag , context : { post, state } } ) => {
730+ ( {
731+ value : dag ,
732+ context : {
733+ post,
734+ state,
735+ firstButtonKey,
736+ lastHiddenButtonKey,
737+ secondLastHiddenButtonKey,
738+ } ,
739+ } ) => {
737740 dag . add (
738741 "assign" ,
739742 AssignButton ,
740743 post . assigned_to_user ?. id === state . currentUser . id
741744 ? {
742- before : [
743- POST_MENU_LIKE_BUTTON_KEY ,
744- POST_MENU_COPY_LINK_BUTTON_KEY ,
745- POST_MENU_SHARE_BUTTON_KEY ,
746- POST_MENU_SHOW_MORE_BUTTON_KEY ,
747- ] ,
745+ before : firstButtonKey ,
748746 }
749747 : {
750- before : [
751- POST_MENU_ADMIN_BUTTON_KEY ,
752- POST_MENU_SHOW_MORE_BUTTON_KEY ,
753- ] ,
754- after : POST_MENU_DELETE_BUTTON_KEY ,
748+ before : lastHiddenButtonKey ,
749+ after : secondLastHiddenButtonKey ,
755750 }
756751 ) ;
757752 }
0 commit comments