Skip to content

A platform for community discussion. Free, open, simple.

UX: Convert the event invite modal to FormKit and toast on success (#40522)

Régis Hanolab46b58be97a
diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/event-field.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/event-field.gjs
deleted file mode 100644
index 6262dccfe4b..00000000000
--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/event-field.gjs
+++ /dev/null
@@ -1,20 +0,0 @@
-import { notEq } from "discourse/truth-helpers";
-import { i18n } from "discourse-i18n";
-
-const EventField = <template>
- {{#if (notEq @enabled false)}}
- <div class="event-field" ...attributes>
- {{#if @label}}
- <div class="event-field-label">
- <span class="label">{{i18n @label}}</span>
- </div>
- {{/if}}
-
- <div class="event-field-control">
- {{yield}}
- </div>
- </div>
- {{/if}}
-</template>;
-
-export default EventField;
diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs
index c12ca71fd43..dc2c801f561 100644
--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs
+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs
@@ -2,29 +2,51 @@ import Component from "@glimmer/component";
import { tracked } from "@glimmer/tracking";
import { hash } from "@ember/helper";
import { action } from "@ember/object";
+import { service } from "@ember/service";
+import Form from "discourse/components/form";
import { ajax } from "discourse/lib/ajax";
import { extractError } from "discourse/lib/ajax-error";
import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";
import DButton from "discourse/ui-kit/d-button";
import DModal from "discourse/ui-kit/d-modal";
import { i18n } from "discourse-i18n";
-import EventField from "../event-field";
export default class PostEventInviteUserOrGroup extends Component {
- @tracked invitedNames = [];
+ @service toasts;
+
@tracked flash = null;
+ formApi;
+
+ data = { invitedNames: [] };
+
+ @action
+ registerApi(api) {
+ this.formApi = api;
+ }
+
+ @action
+ submit() {
+ this.formApi.submit();
+ }
+
@action
- async invite() {
+ async invite(data) {
try {
await ajax(
`/discourse-post-event/events/${this.args.model.event.id}/invite.json`,
{
- data: { invites: this.invitedNames },
+ data: { invites: data.invitedNames },
type: "POST",
}
);
this.args.closeModal();
+ this.toasts.success({
+ duration: "short",
+ data: {
+ message: i18n("discourse_post_event.invite_user_or_group.success"),
+ },
+ });
} catch (e) {
this.flash = extractError(e);
}
@@ -35,28 +57,42 @@ export default class PostEventInviteUserOrGroup extends Component {
@title={{i18n "discourse_post_event.invite_user_or_group.title"}}
@closeModal={{@closeModal}}
@flash={{this.flash}}
+ class="post-event-invite-user-or-group"
>
<:body>
- <form>
- <EventField>
- <EmailGroupUserChooser
- @value={{this.invitedNames}}
- @options={{hash
- fullWidthWrap=true
- includeMessageableGroups=true
- filterPlaceholder="composer.users_placeholder"
- excludeCurrentUser=true
- }}
- />
- </EventField>
- </form>
+ <Form
+ @data={{this.data}}
+ @onSubmit={{this.invite}}
+ @onRegisterApi={{this.registerApi}}
+ as |form|
+ >
+ <form.Field
+ @name="invitedNames"
+ @title={{i18n "discourse_post_event.invite_user_or_group.title"}}
+ @showTitle={{false}}
+ @type="custom"
+ @format="full"
+ as |field|
+ >
+ <field.Control>
+ <EmailGroupUserChooser
+ @value={{field.value}}
+ @onChange={{field.set}}
+ @options={{hash
+ includeMessageableGroups=true
+ filterPlaceholder="composer.users_placeholder"
+ excludeCurrentUser=true
+ }}
+ />
+ </field.Control>
+ </form.Field>
+ </Form>
</:body>
<:footer>
<DButton
- @type="button"
class="btn-primary"
@label="discourse_post_event.invite_user_or_group.invite"
- @action={{this.invite}}
+ @action={{this.submit}}
/>
</:footer>
</DModal>
diff --git a/plugins/discourse-calendar/config/locales/client.en.yml b/plugins/discourse-calendar/config/locales/client.en.yml
index 209c42b7d64..0e26f53ea6d 100644
--- a/plugins/discourse-calendar/config/locales/client.en.yml
+++ b/plugins/discourse-calendar/config/locales/client.en.yml
@@ -579,3 +579,4 @@ en:
invite_user_or_group:
title: "Notify user(s) or group(s)"
invite: "Send"
+ success: "Invitation sent"
diff --git a/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/post_event.rb b/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/post_event.rb
index c061d897f4c..ba392a40aed 100644
--- a/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/post_event.rb
+++ b/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/post_event.rb
@@ -80,6 +80,11 @@ module PageObjects
has_css?(".event-info .name a[href='#{href}']")
end
+ def open_invite_user_or_group_modal
+ open_more_menu { locator(".dropdown-menu__item.invite-user-or-group").click }
+ self
+ end
+
def has_location?(text)
has_css?(".event-location", text:)
end
diff --git a/plugins/discourse-calendar/spec/system/post_event_spec.rb b/plugins/discourse-calendar/spec/system/post_event_spec.rb
index 43d19be4f07..26c6e7fde3e 100644
--- a/plugins/discourse-calendar/spec/system/post_event_spec.rb
+++ b/plugins/discourse-calendar/spec/system/post_event_spec.rb
@@ -501,6 +501,45 @@ describe "Post event" do
end
end
+ context "when inviting a user or group" do
+ let!(:post) do
+ PostCreator.create(
+ admin,
+ title: "My test meetup event",
+ raw: "[event name='cool-event' status='public' start='2222-02-22 00:00' ]\n[/event]",
+ )
+ end
+
+ fab!(:invitable_user, :user)
+
+ it "notifies the invited user and closes the modal" do
+ visit(post.topic.url)
+
+ post_event_page.open_invite_user_or_group_modal
+
+ chooser =
+ PageObjects::Components::SelectKit.new(
+ ".post-event-invite-user-or-group .email-group-user-chooser",
+ )
+ chooser.expand
+ chooser.search(invitable_user.username)
+ chooser.select_row_by_value(invitable_user.username)
+ chooser.collapse
+
+ find(".post-event-invite-user-or-group .d-modal__footer .btn-primary").click
+
+ expect(page).to have_no_css(".post-event-invite-user-or-group")
+ expect(PageObjects::Components::Toasts.new).to have_success(
+ I18n.t("js.discourse_post_event.invite_user_or_group.success"),
+ )
+ expect(
+ invitable_user.notifications.where(
+ notification_type: Notification.types[:event_invitation],
+ ),
+ ).to be_present
+ end
+ end
+
context "with add to calendar from more menu" do
it "includes rrule for recurring events" do
admin.user_option.update!(default_calendar: "ics")