diff --git a/app/assets/javascripts/discourse/app/components/invite-panel.hbs b/app/assets/javascripts/discourse/app/components/invite-panel.hbs index 5e78f0a5d7b..fabaf5cae26 100644 --- a/app/assets/javascripts/discourse/app/components/invite-panel.hbs +++ b/app/assets/javascripts/discourse/app/components/invite-panel.hbs @@ -93,11 +93,7 @@
{{#if this.inviteModel.finished}} - + {{else}} + <:body> + + + \ No newline at end of file diff --git a/app/assets/javascripts/discourse/app/controllers/share-and-invite.js b/app/assets/javascripts/discourse/app/controllers/share-and-invite.js deleted file mode 100644 index 06110e01130..00000000000 --- a/app/assets/javascripts/discourse/app/controllers/share-and-invite.js +++ /dev/null @@ -1,4 +0,0 @@ -import Controller from "@ember/controller"; -import ModalFunctionality from "discourse/mixins/modal-functionality"; - -export default Controller.extend(ModalFunctionality); diff --git a/app/assets/javascripts/discourse/app/routes/topic.js b/app/assets/javascripts/discourse/app/routes/topic.js index 7fda7c616a2..69c255f3d4d 100644 --- a/app/assets/javascripts/discourse/app/routes/topic.js +++ b/app/assets/javascripts/discourse/app/routes/topic.js @@ -20,6 +20,7 @@ import FlagModal from "discourse/components/modal/flag"; import GrantBadgeModal from "discourse/components/modal/grant-badge"; import MoveToTopicModal from "discourse/components/modal/move-to-topic"; import RawEmailModal from "discourse/components/modal/raw-email"; +import AddPmParticipants from "discourse/components/modal/add-pm-participants"; const SCROLL_DELAY = 500; @@ -81,27 +82,21 @@ const TopicRoute = DiscourseRoute.extend({ @action showInvite() { - let invitePanelTitle; + let modalTitle; if (this.isPM) { - invitePanelTitle = "topic.invite_private.title"; + modalTitle = "topic.invite_private.title"; } else if (this.invitingToTopic) { - invitePanelTitle = "topic.invite_reply.title"; + modalTitle = "topic.invite_reply.title"; } else { - invitePanelTitle = "user.invited.create"; + modalTitle = "user.invited.create"; } - showModal("share-and-invite", { - modalClass: "share-and-invite", - panels: [ - { - id: "invite", - title: invitePanelTitle, - model: { - inviteModel: this.modelFor("topic"), - }, - }, - ], + this.modal.show(AddPmParticipants, { + model: { + title: modalTitle, + inviteModel: this.modelFor("topic"), + }, }); }, diff --git a/app/assets/javascripts/discourse/app/services/modal.js b/app/assets/javascripts/discourse/app/services/modal.js index 607cc135623..c68107a5ad3 100644 --- a/app/assets/javascripts/discourse/app/services/modal.js +++ b/app/assets/javascripts/discourse/app/services/modal.js @@ -23,7 +23,6 @@ const KNOWN_LEGACY_MODALS = [ "reject-reason-reviewable", "reorder-categories", "request-group-membership-form", - "share-and-invite", "tag-upload", ]; diff --git a/app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs deleted file mode 100644 index 9f31d5cec96..00000000000 --- a/app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js b/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js index a5f9802fe2c..4179ec3eb93 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js @@ -82,7 +82,7 @@ acceptance("Personal Message - invite", function (needs) { await click(".private-message-map .controls .add-participant-btn"); assert - .dom(".d-modal.share-and-invite .invite-user-control") + .dom(".d-modal.add-pm-participants .invite-user-control") .exists("invite modal is displayed"); }); }); diff --git a/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js b/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js index bd9a15de80d..4411032e8dc 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js @@ -20,12 +20,9 @@ module("Integration | Component | invite-panel", function (hooks) { ); this.currentUser.set("details", { can_invite_via_email: true }); - this.set("panel", { - id: "invite", - model: { inviteModel: User.create(this.currentUser) }, - }); + this.set("inviteModel", User.create(this.currentUser)); - await render(hbs``); + await render(hbs``); const input = selectKit(".invite-user-input"); await input.expand(); diff --git a/app/assets/stylesheets/common/components/_index.scss b/app/assets/stylesheets/common/components/_index.scss index 847205aa6b0..1936591de3d 100644 --- a/app/assets/stylesheets/common/components/_index.scss +++ b/app/assets/stylesheets/common/components/_index.scss @@ -29,7 +29,7 @@ @import "offline-indicator"; @import "pick-files-button"; @import "relative-time-picker"; -@import "share-and-invite-modal"; +@import "add-pm-participants"; @import "download-calendar"; @import "sidebar/edit-navigation-menu/categories-modal"; @import "sidebar/edit-navigation-menu/modal"; diff --git a/app/assets/stylesheets/common/components/share-and-invite-modal.scss b/app/assets/stylesheets/common/components/add-pm-participants.scss similarity index 93% rename from app/assets/stylesheets/common/components/share-and-invite-modal.scss rename to app/assets/stylesheets/common/components/add-pm-participants.scss index 1ed7645fcf8..6e8ff3b1401 100644 --- a/app/assets/stylesheets/common/components/share-and-invite-modal.scss +++ b/app/assets/stylesheets/common/components/add-pm-participants.scss @@ -1,4 +1,4 @@ -.share-and-invite.modal { +.add-pm-participants.modal { .modal-body { max-width: 475px; min-width: 320px; @@ -11,7 +11,7 @@ } } -.share-and-invite.modal .share.modal-panel { +.add-pm-participants.modal .share.modal-panel { .header { display: flex; flex-direction: row; @@ -57,7 +57,7 @@ } } -.share-and-invite.modal .invite.modal-panel, +.add-pm-participants.modal .invite.modal-panel, .invite-link.modal-panel { .error-message, .success-message {