A platform for community discussion. Free, open, simple.
UX: Move admin user upcoming changes to a modal (#40240)
Martin Brennanafd00bbed4c9
diff --git a/app/assets/stylesheets/common/modal/modal-overrides.scss b/app/assets/stylesheets/common/modal/modal-overrides.scssindex 4ce0f6fe695..d35c9ad67f4 100644--- a/app/assets/stylesheets/common/modal/modal-overrides.scss+++ b/app/assets/stylesheets/common/modal/modal-overrides.scss@@ -602,3 +602,11 @@}}}++.d-modal.admin-user-upcoming-changes-modal {+ .d-modal {+ &__container {+ max-width: calc(var(--modal-max-width) * 2);+ }+ }+}diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex aacf666e97b..b0d122eddb2 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -8870,6 +8870,7 @@ en:post_edits_count: "Post Edits"upcoming_changes:title: "User upcoming changes"+ view_modal: "View enabled changes"description: "To modify groups or to enable or disable upcoming changes, please visit the <a href='%{basePath}/admin/config/upcoming-changes'>upcoming changes config page</a>."filter_placeholder: "Filter upcoming changes by name or description"filter_no_results: "No upcoming changes found"diff --git a/frontend/discourse/admin/components/admin-user-upcoming-changes.gjs b/frontend/discourse/admin/components/admin-user-upcoming-changes.gjsindex 6acddfbf611..73952cdc605 100644--- a/frontend/discourse/admin/components/admin-user-upcoming-changes.gjs+++ b/frontend/discourse/admin/components/admin-user-upcoming-changes.gjs@@ -7,6 +7,8 @@ import { bind } from "discourse/lib/decorators";import getUrl from "discourse/lib/get-url";import { escapeExpression } from "discourse/lib/utilities";import { and, eq } from "discourse/truth-helpers";+import DModal from "discourse/ui-kit/d-modal";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";import { i18n } from "discourse-i18n";export default class AdminUserUpcomingChanges extends Component {@@ -15,6 +17,14 @@ export default class AdminUserUpcomingChanges extends Component {return `user.upcoming_changes.why_reasons.${reason}`;}+ get description() {+ return trustHTML(+ i18n("admin.user.upcoming_changes.description", {+ basePath: getUrl(""),+ })+ );+ }+@bindgetGroupLinks(groups) {return (@@ -29,82 +39,98 @@ export default class AdminUserUpcomingChanges extends Component {}<template>- <AdminFilterControls- @array={{@user.upcoming_changes_stats}}- @searchableProps={{array "humanized_name" "description"}}- @inputPlaceholder={{i18n- "admin.user.upcoming_changes.filter_placeholder"- }}- @noResultsMessage={{i18n "admin.user.upcoming_changes.filter_no_results"}}+ <DModal+ class="admin-user-upcoming-changes-modal"+ @closeModal={{@closeModal}}+ @title={{i18n "admin.user.upcoming_changes.title"}}>- <:content as |filteredChanges|>- <table class="d-table user-upcoming-changes-table">- <thead class="d-table__header">- <th>{{i18n "user.upcoming_changes.for_user.upcoming_change"}}</th>- <th>{{i18n "user.upcoming_changes.for_user.enabled"}}</th>- <th>{{i18n "user.upcoming_changes.for_user.why"}}</th>- </thead>- <tbody class="d-table__body">- {{#each filteredChanges as |upcomingChange|}}- <tr- class="d-table__row"- data-upcoming-change-name={{upcomingChange.name}}- >- <td class="d-table__cell --overview">- <div class="d-table__overview-name">- {{upcomingChange.humanized_name}}- </div>- {{#if upcomingChange.description}}- <div class="d-table__overview-about">- {{upcomingChange.description}}- </div>- {{/if}}- </td>- <td class="d-table__cell">- <div class="d-table__mobile-label">- {{i18n "user.upcoming_changes.for_user.enabled"}}- </div>+ <:body>+ <p+ class="admin-user-upcoming-changes-modal__description"+ >{{this.description}}</p>++ <AdminFilterControls+ @array={{@model.user.upcoming_changes_stats}}+ @searchableProps={{array "humanized_name" "description"}}+ @inputPlaceholder={{i18n+ "admin.user.upcoming_changes.filter_placeholder"+ }}+ @noResultsMessage={{i18n+ "admin.user.upcoming_changes.filter_no_results"+ }}+ >+ <:content as |filteredChanges|>+ <table class="d-table user-upcoming-changes-table">+ <thead class="d-table__header">+ <th>{{i18n+ "user.upcoming_changes.for_user.upcoming_change"+ }}</th>+ <th>{{i18n "user.upcoming_changes.for_user.enabled"}}</th>+ <th>{{i18n "user.upcoming_changes.for_user.why"}}</th>+ </thead>+ <tbody class="d-table__body">+ {{#each filteredChanges as |upcomingChange|}}+ <tr+ class="d-table__row"+ data-upcoming-change-name={{upcomingChange.name}}+ >+ <td class="d-table__cell --overview">+ <div class="d-table__overview-name">+ {{upcomingChange.humanized_name}}+ </div>+ {{#if upcomingChange.description}}+ <div class="d-table__overview-about">+ {{upcomingChange.description}}+ </div>+ {{/if}}+ </td>+ <td class="d-table__cell">+ <div class="d-table__mobile-label">+ {{i18n "user.upcoming_changes.for_user.enabled"}}+ </div>- <span class="upcoming-change-enabled-status">- {{if- upcomingChange.enabled- (i18n "yes_value")- (i18n "no_value")- }}- </span>- </td>- <td class="d-table__cell">- <div class="d-table__mobile-label">- {{i18n "user.upcoming_changes.for_user.why"}}- </div>+ <span class="upcoming-change-enabled-status">+ {{#if upcomingChange.enabled}}+ {{dEmoji "white_check_mark"}}+ {{else}}+ {{dEmoji "cross_mark"}}+ {{/if}}+ </span>+ </td>+ <td class="d-table__cell">+ <div class="d-table__mobile-label">+ {{i18n "user.upcoming_changes.for_user.why"}}+ </div>- <span class="upcoming-change-reason">- {{i18n- (this.reasonKey upcomingChange.reason)- }}- </span>- {{#if- (and- (eq- upcomingChange.reason- UPCOMING_CHANGES_USER_ENABLED_REASONS.in_specific_groups- )- upcomingChange.specific_groups.length- )- }}- <span class="upcoming-change-groups">- {{trustHTML- (this.getGroupLinks upcomingChange.specific_groups)+ <span class="upcoming-change-reason">+ {{i18n+ (this.reasonKey upcomingChange.reason)+ }}+ </span>+ {{#if+ (and+ (eq+ upcomingChange.reason+ UPCOMING_CHANGES_USER_ENABLED_REASONS.in_specific_groups+ )+ upcomingChange.specific_groups.length+ )}}- </span>- {{/if}}- </td>- </tr>- {{/each}}- </tbody>- </table>- </:content>- </AdminFilterControls>+ <span class="upcoming-change-groups">+ {{trustHTML+ (this.getGroupLinks upcomingChange.specific_groups)+ }}+ </span>+ {{/if}}+ </td>+ </tr>+ {{/each}}+ </tbody>+ </table>+ </:content>+ </AdminFilterControls>+ </:body>+ </DModal></template>}diff --git a/frontend/discourse/admin/controllers/admin-user/index.js b/frontend/discourse/admin/controllers/admin-user/index.jsindex ec2d967bc99..09bc0ce97ab 100644--- a/frontend/discourse/admin/controllers/admin-user/index.js+++ b/frontend/discourse/admin/controllers/admin-user/index.js@@ -4,6 +4,7 @@ import { action, computed } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";+import AdminUserUpcomingChanges from "discourse/admin/components/admin-user-upcoming-changes";import AdminUser from "discourse/admin/models/admin-user";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -185,6 +186,15 @@ export default class AdminUserIndexController extends Controller {return this.ssoLastPayload.split("&");}+ @action+ openUserUpcomingChanges() {+ this.modal.show(AdminUserUpcomingChanges, {+ model: {+ user: this.model,+ },+ });+ }+@actionimpersonate() {this.set("isLoading", true);diff --git a/frontend/discourse/admin/templates/admin-user/index.gjs b/frontend/discourse/admin/templates/admin-user/index.gjsindex 81876069d8d..e0ead0f74b9 100644--- a/frontend/discourse/admin/templates/admin-user/index.gjs+++ b/frontend/discourse/admin/templates/admin-user/index.gjs@@ -3,7 +3,6 @@ import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";import AdminEditableField from "discourse/admin/components/admin-editable-field";import AdminUserExportsTable from "discourse/admin/components/admin-user-exports-table";-import AdminUserUpcomingChanges from "discourse/admin/components/admin-user-upcoming-changes";import IpLookup from "discourse/admin/components/ip-lookup";import PluginOutlet from "discourse/components/plugin-outlet";import i18nYesNo from "discourse/helpers/i18n-yes-no";@@ -16,7 +15,6 @@ import { and, gt, not } from "discourse/truth-helpers";import DButton from "discourse/ui-kit/d-button";import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import dAvatar from "discourse/ui-kit/helpers/d-avatar";-import dBasePath from "discourse/ui-kit/helpers/d-base-path";import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import dFormatDuration from "discourse/ui-kit/helpers/d-format-duration";import dIcon from "discourse/ui-kit/helpers/d-icon";@@ -668,6 +666,27 @@ export default <template></div>{{/if}}+ {{#if+ (and+ @controller.currentUser.staff @controller.model.upcoming_changes_stats+ )+ }}+ <div class="display-row upcoming-changes-info">+ <div class="field">{{i18n "admin.user.upcoming_changes.title"}}</div>+ <div class="value">+ <DButton+ @action={{@controller.openUserUpcomingChanges}}+ @icon="eye"+ @label="admin.user.upcoming_changes.view_modal"+ class="btn-default"+ />+ </div>+ <div class="controls">+ + </div>+ </div>+ {{/if}}+</section>{{#if @controller.currentUser.admin}}@@ -936,18 +955,6 @@ export default <template></section>{{/if}}- {{#if- (and @controller.currentUser.staff @controller.model.upcoming_changes_stats)- }}- <section class="details">- <h1>{{i18n "admin.user.upcoming_changes.title"}}</h1>- <p>{{trustHTML- (i18n "admin.user.upcoming_changes.description" basePath=dBasePath)- }}</p>- <AdminUserUpcomingChanges @user={{@controller.model}} />- </section>- {{/if}}-{{#if @controller.currentUser.admin}}<AdminUserExportsTable @model={{@controller.model}} />{{/if}}diff --git a/spec/system/admin_user_spec.rb b/spec/system/admin_user_spec.rbindex a93c74744ba..c29923603c6 100644--- a/spec/system/admin_user_spec.rb+++ b/spec/system/admin_user_spec.rb@@ -78,11 +78,16 @@ describe "Admin User Page" do)end+ def open_upcoming_changes+ admin_user_page.open_upcoming_changes_modal+ end+context "when the change is enabled for everyone" dobefore { SiteSetting.enable_upload_debug_mode = true }it "displays the upcoming change with enabled status and correct reason" doadmin_user_page.visit(user)+ open_upcoming_changesexpect(admin_user_page).to have_upcoming_change("enable_upload_debug_mode")expect(admin_user_page.upcoming_change("enable_upload_debug_mode")).to be_enabledexpect(admin_user_page.upcoming_change("enable_upload_debug_mode")).to have_reason(@@ -99,6 +104,7 @@ describe "Admin User Page" doit "displays the upcoming change with disabled status and correct reason" doadmin_user_page.visit(user)+ open_upcoming_changesexpect(admin_user_page).to have_upcoming_change("enable_upload_debug_mode")expect(admin_user_page.upcoming_change("enable_upload_debug_mode")).to be_disabledexpect(admin_user_page.upcoming_change("enable_upload_debug_mode")).to have_reason(@@ -125,6 +131,7 @@ describe "Admin User Page" doit "displays the upcoming change with enabled status, correct reason, and specific groups" doadmin_user_page.visit(user)+ open_upcoming_changesexpect(admin_user_page).to have_upcoming_change("enable_upload_debug_mode")expect(admin_user_page.upcoming_change("enable_upload_debug_mode")).to be_enabledexpect(admin_user_page.upcoming_change("enable_upload_debug_mode")).to have_reason(@@ -144,6 +151,7 @@ describe "Admin User Page" doit "displays the upcoming change with all groups" doadmin_user_page.visit(user)+ open_upcoming_changesexpect(admin_user_page).to have_upcoming_change("enable_upload_debug_mode")expect(admin_user_page.upcoming_change("enable_upload_debug_mode")).to be_enabledexpect(admin_user_page.upcoming_change("enable_upload_debug_mode")).to have_reason(@@ -158,6 +166,7 @@ describe "Admin User Page" docontext "when the user does not belong to any of those groups" doit "displays the upcoming change with disabled status, correct reason, and no specific groups" doadmin_user_page.visit(user)+ open_upcoming_changesexpect(admin_user_page).to have_upcoming_change("enable_upload_debug_mode")expect(admin_user_page.upcoming_change("enable_upload_debug_mode")).to be_disabledexpect(admin_user_page.upcoming_change("enable_upload_debug_mode")).to have_reason(@@ -189,6 +198,7 @@ describe "Admin User Page" do)admin_user_page.visit(user)+ open_upcoming_changesexpect(admin_user_page).to have_upcoming_change("enable_upload_debug_mode")expect(admin_user_page).to have_no_upcoming_change("about_page_extra_groups_show_description",diff --git a/spec/system/page_objects/pages/admin_user.rb b/spec/system/page_objects/pages/admin_user.rbindex 3610b97fb7f..e61aadddfb5 100644--- a/spec/system/page_objects/pages/admin_user.rb+++ b/spec/system/page_objects/pages/admin_user.rb@@ -80,6 +80,10 @@ module PageObjectsfind(".penalty-similar-users .alert-warning")["innerHTML"]end+ def open_upcoming_changes_modal+ find(".upcoming-changes-info .btn-default").click+ end+class UpcomingChangeRow < PageObjects::Components::Baseattr_reader :element@@ -88,14 +92,14 @@ module PageObjectsenddef enabled?- expect(element.find(".upcoming-change-enabled-status")).to have_content(- I18n.t("js.yes_value"),+ expect(element.find(".upcoming-change-enabled-status")).to have_css(+ ".emoji[alt='white_check_mark']",)enddef disabled?- expect(element.find(".upcoming-change-enabled-status")).to have_content(- I18n.t("js.no_value"),+ expect(element.find(".upcoming-change-enabled-status")).to have_css(+ ".emoji[alt='cross_mark']",)end@@ -121,20 +125,20 @@ module PageObjectsdef has_upcoming_change?(change_name)has_css?(- ".user-upcoming-changes-table .d-table__row[data-upcoming-change-name='#{change_name}']",+ ".admin-user-upcoming-changes-modal .user-upcoming-changes-table .d-table__row[data-upcoming-change-name='#{change_name}']",)enddef has_no_upcoming_change?(change_name)has_no_css?(- ".user-upcoming-changes-table .d-table__row[data-upcoming-change-name='#{change_name}']",+ ".admin-user-upcoming-changes-modal .user-upcoming-changes-table .d-table__row[data-upcoming-change-name='#{change_name}']",)enddef upcoming_change(change_name)row =find(- ".user-upcoming-changes-table .d-table__row[data-upcoming-change-name='#{change_name}']",+ ".admin-user-upcoming-changes-modal .user-upcoming-changes-table .d-table__row[data-upcoming-change-name='#{change_name}']",)UpcomingChangeRow.new(row)end