Skip to content

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

UX: Add copy link button to /invites list ellipsis menu (#42652)

Jordan Vidrinebe189f25405c
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 1f53c6df3f2..ffb86086bc9 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -1306,6 +1306,10 @@
.d-table.user-invite-list {
margin-top: var(--space-4);
+ .invite-link-target {
+ display: none;
+ }
+
.d-table__cell {
&.--overview {
.d-icon {
diff --git a/frontend/discourse/app/templates/user-invited/show.gjs b/frontend/discourse/app/templates/user-invited/show.gjs
index ad105c46d1c..98e97048fff 100644
--- a/frontend/discourse/app/templates/user-invited/show.gjs
+++ b/frontend/discourse/app/templates/user-invited/show.gjs
@@ -1,4 +1,4 @@
-import { fn } from "@ember/helper";
+import { concat, fn } from "@ember/helper";
import { LinkTo } from "@ember/routing";
import { trustHTML } from "@ember/template";
import SvgEnvelopeZero from "discourse/components/svg/envelope-zero";
@@ -7,6 +7,7 @@ import bodyClass from "discourse/helpers/body-class";
import rawDate from "discourse/helpers/raw-date";
import DButton from "discourse/ui-kit/d-button";
import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";
+import DCopyButton from "discourse/ui-kit/d-copy-button";
import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";
import DEmptyState from "discourse/ui-kit/d-empty-state";
import DLoadMore from "discourse/ui-kit/d-load-more";
@@ -219,6 +220,15 @@ export default <template>
<tr class="d-table__row">
<td class="d-table__cell --overview invite-type">
<div class="invite-shortkey">
+ {{#if invite.link}}
+ <input
+ type="text"
+ id={{concat "invite-link-" invite.id}}
+ class="invite-link-target"
+ value={{invite.link}}
+ disabled={{true}}
+ />
+ {{/if}}
{{#if invite.email}}
{{dIcon "envelope"}}
{{invite.email}}
@@ -324,6 +334,24 @@ export default <template>
}}
/>
</dropdown.item>
+ {{#if invite.link}}
+ <dropdown.item>
+ <DCopyButton
+ @selector={{concat
+ "#invite-link-"
+ invite.id
+ }}
+ @icon="copy"
+ @copyClass="btn-transparent"
+ @translatedLabel={{i18n
+ "user.invited.invite.copy_link"
+ }}
+ @translatedLabelAfterCopy={{i18n
+ "user.invited.invite.link_copied"
+ }}
+ />
+ </dropdown.item>
+ {{/if}}
</DDropdownMenu>
</:content>
</DMenu>
diff --git a/frontend/discourse/app/ui-kit/d-copy-button.gjs b/frontend/discourse/app/ui-kit/d-copy-button.gjs
index 60dd0a6f163..cabf74bb07a 100644
--- a/frontend/discourse/app/ui-kit/d-copy-button.gjs
+++ b/frontend/discourse/app/ui-kit/d-copy-button.gjs
@@ -1,38 +1,44 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
import { action } from "@ember/object";
-import { tagName } from "@ember-decorators/component";
+import { modifier } from "ember-modifier";
import discourseDebounce from "discourse/lib/debounce";
import { bind } from "discourse/lib/decorators";
+import { clipboardCopy } from "discourse/lib/utilities";
import DButton from "discourse/ui-kit/d-button";
-@tagName("")
export default class DCopyButton extends Component {
- copyIcon = "copy";
- copyClass = "btn-primary";
- announcement = "";
+ @tracked showCopied = false;
- init() {
- super.init(...arguments);
+ watchExternalCopy = modifier((_, [isCopied]) => {
+ if (isCopied && !this._wasCopied) {
+ this._showCopied();
+ }
+
+ this._wasCopied = isCopied;
+ });
- this.copyTranslatedLabel = this.translatedLabel;
+ get copyIcon() {
+ return this.showCopied ? "check" : this.args.icon || "copy";
}
- didReceiveAttrs() {
- super.didReceiveAttrs(...arguments);
+ get copyClass() {
+ const baseClass = this.args.copyClass || "btn-primary";
+ return this.showCopied ? `${baseClass} ok` : baseClass;
+ }
- if (this.isCopied && !this._wasCopied) {
- this._showCopied();
- }
+ get copyTranslatedLabel() {
+ return this.showCopied
+ ? this.args.translatedLabelAfterCopy
+ : this.args.translatedLabel;
+ }
- this._wasCopied = this.isCopied;
+ get announcement() {
+ return this.showCopied ? this.args.translatedLabelAfterCopy : "";
}
_showCopied() {
- this.set("copyIcon", "check");
- this.set("copyClass", "btn-primary ok");
- this.set("copyTranslatedLabel", this.translatedLabelAfterCopy);
- this.set("announcement", this.translatedLabelAfterCopy);
+ this.showCopied = true;
discourseDebounce(this._restoreButton, 3000);
}
@@ -43,25 +49,20 @@ export default class DCopyButton extends Component {
return;
}
- this.set("copyIcon", "copy");
- this.set("copyClass", "btn-primary");
- this.set("copyTranslatedLabel", this.translatedLabel);
- this.set("announcement", "");
+ this.showCopied = false;
}
@action
- copy() {
- const target = document.querySelector(this.selector);
- target.select();
- target.setSelectionRange(0, target.value.length);
-
- try {
- document.execCommand("copy");
+ async copy() {
+ const target = document.querySelector(this.args.selector);
- if (this.copied) {
- this.copied();
- }
+ if (!target) {
+ return;
+ }
+ try {
+ await clipboardCopy(target.value ?? target.textContent);
+ this.args.copied?.();
this._showCopied();
} catch {}
}
@@ -71,9 +72,13 @@ export default class DCopyButton extends Component {
@icon={{this.copyIcon}}
@action={{this.copy}}
class="copy-button {{this.copyClass}}"
- @ariaLabel={{this.ariaLabel}}
+ @ariaLabel={{@ariaLabel}}
@translatedLabel={{this.copyTranslatedLabel}}
/>
- <span class="sr-only" aria-live="polite">{{this.announcement}}</span>
+ <span
+ class="sr-only"
+ aria-live="polite"
+ {{this.watchExternalCopy @isCopied}}
+ >{{this.announcement}}</span>
</template>
}
diff --git a/spec/system/page_objects/pages/user_invited_pending.rb b/spec/system/page_objects/pages/user_invited_pending.rb
index 43895a3f34d..b53c31cf0e9 100644
--- a/spec/system/page_objects/pages/user_invited_pending.rb
+++ b/spec/system/page_objects/pages/user_invited_pending.rb
@@ -49,11 +49,28 @@ module PageObjects
Time.parse(tr_element.find(".invite-expires-at").text).utc
end
+ def copy_link
+ actions_menu.expand
+ actions_menu.option(".copy-button").click
+ end
+
+ def has_link_copied?
+ actions_menu.has_option?(".copy-button.ok")
+ end
+
private
def invite_type_col
tr_element.find(".invite-type")
end
+
+ def actions_menu
+ @actions_menu ||=
+ PageObjects::Components::DMenu.new(
+ tr_element.find(".invite-actions [data-trigger][data-identifier='invites-menu']"),
+ "invites-menu",
+ )
+ end
end
def visit(user)
@@ -77,6 +94,10 @@ module PageObjects
def latest_invite
Invite.new(find(".user-content .user-invite-list tbody tr:first-of-type"))
end
+
+ def invite_row(invite)
+ Invite.new(find(".user-content .user-invite-list tbody tr", text: invite.email))
+ end
end
end
end
diff --git a/spec/system/user_page/user_invites_spec.rb b/spec/system/user_page/user_invites_spec.rb
index e05ea905003..0556b9e40a0 100644
--- a/spec/system/user_page/user_invites_spec.rb
+++ b/spec/system/user_page/user_invites_spec.rb
@@ -15,6 +15,7 @@ describe "User invites" do
describe "pending invites" do
let(:user_invite_pending_page) { PageObjects::Pages::UserInvitedPending.new }
+ let(:cdp) { PageObjects::CDP.new }
it "can load more invites" do
SiteSetting.invites_per_page = 3
@@ -23,6 +24,18 @@ describe "User invites" do
expect(user_invite_pending_page).to have_invite_count(invites_pending.size)
end
+
+ it "lets the user copy an invite's link from its actions menu" do
+ invite = Fabricate(:invite, invited_by: user, email: "[email protected]")
+ cdp.allow_clipboard
+
+ user_invite_pending_page.visit(user)
+ invite_row = user_invite_pending_page.invite_row(invite)
+ invite_row.copy_link
+
+ expect(invite_row).to have_link_copied
+ cdp.clipboard_has_text?(invite.link)
+ end
end
describe "expired invites" do