A platform for community discussion. Free, open, simple.
UX: add link to room names in voice room list (#44535)
David Battersby6d7a9f12ba49
diff --git a/plugins/voice/admin/assets/javascripts/admin/components/voice-dashboard.gjs b/plugins/voice/admin/assets/javascripts/admin/components/voice-dashboard.gjsindex f8449d752cd..3886b6b3040 100644--- a/plugins/voice/admin/assets/javascripts/admin/components/voice-dashboard.gjs+++ b/plugins/voice/admin/assets/javascripts/admin/components/voice-dashboard.gjs@@ -78,28 +78,42 @@ export default class VoiceDashboard extends Component {{{#if this.rooms.length}}<h3>{{i18n "voice.admin.dashboard.top_rooms"}}</h3>- <table class="d-admin-table voice-dashboard__rooms-table">- <thead>+ <table class="d-table voice-dashboard__rooms-table">+ <thead class="d-table__header"><tr>- <th>{{i18n "voice.admin.dashboard.room_name"}}</th>- <th>{{i18n "voice.admin.dashboard.unique_users"}}</th>- <th>{{i18n "voice.admin.dashboard.total_time"}}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.dashboard.room_name"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.dashboard.unique_users"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.dashboard.total_time"+ }}</th></tr></thead><tbody>{{#each this.rooms as |room|}}- <tr class="d-admin-row__content">- <td class="d-admin-row__overview">+ <tr class="d-table__row">+ <td class="d-table__cell --overview">{{#if room.room_name}}{{room.room_name}}{{else}}{{i18n "voice.admin.dashboard.deleted_room"}}{{/if}}</td>- <td class="d-admin-row__detail">{{room.unique_users}}</td>- <td class="d-admin-row__detail">{{formatDuration- room.total_seconds- }}</td>+ <td class="d-table__cell --detail">+ <div class="d-table__mobile-label">+ {{i18n "voice.admin.dashboard.unique_users"}}+ </div>+ {{room.unique_users}}+ </td>+ <td class="d-table__cell --detail">+ <div class="d-table__mobile-label">+ {{i18n "voice.admin.dashboard.total_time"}}+ </div>+ {{formatDuration room.total_seconds}}+ </td></tr>{{/each}}</tbody>@@ -108,18 +122,24 @@ export default class VoiceDashboard extends Component {{{#if this.users.length}}<h3>{{i18n "voice.admin.dashboard.top_users"}}</h3>- <table class="d-admin-table voice-dashboard__users-table">- <thead>+ <table class="d-table voice-dashboard__users-table">+ <thead class="d-table__header"><tr>- <th>{{i18n "voice.admin.dashboard.user"}}</th>- <th>{{i18n "voice.admin.dashboard.sessions"}}</th>- <th>{{i18n "voice.admin.dashboard.total_time"}}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.dashboard.user"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.dashboard.sessions"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.dashboard.total_time"+ }}</th></tr></thead><tbody>{{#each this.users as |u|}}- <tr class="d-admin-row__content">- <td class="d-admin-row__overview">+ <tr class="d-table__row">+ <td class="d-table__cell --overview">{{#if u.username}}<aclass="voice-dashboard__user-cell"@@ -133,10 +153,18 @@ export default class VoiceDashboard extends Component {{{i18n "voice.admin.dashboard.deleted_user"}}{{/if}}</td>- <td class="d-admin-row__detail">{{u.session_count}}</td>- <td class="d-admin-row__detail">{{formatDuration- u.total_seconds- }}</td>+ <td class="d-table__cell --detail">+ <div class="d-table__mobile-label">+ {{i18n "voice.admin.dashboard.sessions"}}+ </div>+ {{u.session_count}}+ </td>+ <td class="d-table__cell --detail">+ <div class="d-table__mobile-label">+ {{i18n "voice.admin.dashboard.total_time"}}+ </div>+ {{formatDuration u.total_seconds}}+ </td></tr>{{/each}}</tbody>diff --git a/plugins/voice/admin/assets/javascripts/admin/components/voice-livekit-status.gjs b/plugins/voice/admin/assets/javascripts/admin/components/voice-livekit-status.gjsindex 41577ad7306..288c13a8e03 100644--- a/plugins/voice/admin/assets/javascripts/admin/components/voice-livekit-status.gjs+++ b/plugins/voice/admin/assets/javascripts/admin/components/voice-livekit-status.gjs@@ -254,34 +254,49 @@ export default class VoiceLivekitStatus extends Component {{{#if this.status.configured}}<h4>{{i18n "voice.admin.dashboard.livekit.rooms_title"}}</h4>{{#if this.roomRows.length}}- <table class="d-admin-table voice-livekit-status__rooms">- <thead>+ <table class="d-table voice-livekit-status__rooms">+ <thead class="d-table__header"><tr>- <th>{{i18n "voice.admin.dashboard.livekit.room"}}</th>- <th>{{i18n+ <th class="d-table__header-cell">{{i18n+ "voice.admin.dashboard.livekit.room"+ }}</th>+ <th class="d-table__header-cell">{{i18n"voice.admin.dashboard.livekit.discourse_participants"}}</th>- <th>{{i18n+ <th class="d-table__header-cell">{{i18n"voice.admin.dashboard.livekit.livekit_participants"}}</th>- <th>{{i18n+ <th class="d-table__header-cell">{{i18n"voice.admin.dashboard.livekit.room_status"}}</th></tr></thead><tbody>{{#each this.roomRows as |row|}}- <tr class="d-admin-row__content">- <td class="d-admin-row__overview">{{row.name}}</td>- <td class="d-admin-row__detail">+ <tr class="d-table__row">+ <td class="d-table__cell --overview">{{row.name}}</td>+ <td class="d-table__cell --detail">+ <div class="d-table__mobile-label">+ {{i18n+ "voice.admin.dashboard.livekit.discourse_participants"+ }}+ </div>{{row.presenceCount}}</td>- <td class="d-admin-row__detail">+ <td class="d-table__cell --detail">+ <div class="d-table__mobile-label">+ {{i18n+ "voice.admin.dashboard.livekit.livekit_participants"+ }}+ </div>{{if row.probed row.livekitCount "—"}}</td><td- class="d-admin-row__detail voice-livekit-status__room-diff"+ class="d-table__cell --detail voice-livekit-status__room-diff">+ <div class="d-table__mobile-label">+ {{i18n "voice.admin.dashboard.livekit.room_status"}}+ </div>{{#if row.error}}<span class="--error">{{dIcon "circle-xmark"}}diff --git a/plugins/voice/admin/assets/javascripts/admin/components/voice-recording-list.gjs b/plugins/voice/admin/assets/javascripts/admin/components/voice-recording-list.gjsindex 718a0b49e39..1e4160ab3c0 100644--- a/plugins/voice/admin/assets/javascripts/admin/components/voice-recording-list.gjs+++ b/plugins/voice/admin/assets/javascripts/admin/components/voice-recording-list.gjs@@ -86,25 +86,37 @@ export default class VoiceRecordingList extends Component {{{/unless}}{{#if this.recordings.length}}- <table class="d-admin-table voice-recordings__table">- <thead>+ <table class="d-table voice-recordings__table">+ <thead class="d-table__header"><tr>- <th>{{i18n "voice.admin.recordings.room"}}</th>- <th>{{i18n "voice.admin.recordings.requested_by"}}</th>- <th>{{i18n "voice.admin.recordings.status"}}</th>- <th>{{i18n "voice.admin.recordings.started_at"}}</th>- <th>{{i18n "voice.admin.recordings.duration"}}</th>- <th>{{i18n "voice.admin.recordings.file"}}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.recordings.room"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.recordings.requested_by"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.recordings.status"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.recordings.started_at"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.recordings.duration"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.recordings.file"+ }}</th></tr></thead><tbody>{{#each this.recordings as |recording|}}- <tr class="d-admin-row__content">- <td class="d-admin-row__overview voice-recordings__room">+ <tr class="d-table__row">+ <td class="d-table__cell --overview voice-recordings__room">{{recording.room_name}}</td>- <td class="d-admin-row__detail voice-recordings__requester">- <div class="d-admin-row__mobile-label">+ <td class="d-table__cell --detail voice-recordings__requester">+ <div class="d-table__mobile-label">{{i18n "voice.admin.recordings.requested_by"}}</div>{{#if recording.started_by}}@@ -114,8 +126,8 @@ export default class VoiceRecordingList extends Component {-{{/if}}</td>- <td class="d-admin-row__detail voice-recordings__status">- <div class="d-admin-row__mobile-label">+ <td class="d-table__cell --detail voice-recordings__status">+ <div class="d-table__mobile-label">{{i18n "voice.admin.recordings.status"}}</div><span@@ -124,20 +136,20 @@ export default class VoiceRecordingList extends Component {{{this.statusLabel recording.status}}</span></td>- <td class="d-admin-row__detail voice-recordings__started-at">- <div class="d-admin-row__mobile-label">+ <td class="d-table__cell --detail voice-recordings__started-at">+ <div class="d-table__mobile-label">{{i18n "voice.admin.recordings.started_at"}}</div>{{dFormatDate recording.started_at leaveAgo="true"}}</td>- <td class="d-admin-row__detail voice-recordings__duration">- <div class="d-admin-row__mobile-label">+ <td class="d-table__cell --detail voice-recordings__duration">+ <div class="d-table__mobile-label">{{i18n "voice.admin.recordings.duration"}}</div>{{this.formatDuration recording.duration_ms}}</td>- <td class="d-admin-row__detail voice-recordings__file">- <div class="d-admin-row__mobile-label">+ <td class="d-table__cell --detail voice-recordings__file">+ <div class="d-table__mobile-label">{{i18n "voice.admin.recordings.file"}}</div>{{#if (this.isDownloadUrl recording.location)}}diff --git a/plugins/voice/admin/assets/javascripts/admin/components/voice-room-list.gjs b/plugins/voice/admin/assets/javascripts/admin/components/voice-room-list.gjsindex 6053b777535..bd1903b78f7 100644--- a/plugins/voice/admin/assets/javascripts/admin/components/voice-room-list.gjs+++ b/plugins/voice/admin/assets/javascripts/admin/components/voice-room-list.gjs@@ -72,26 +72,46 @@ export default class VoiceRoomList extends Component {</DPageSubheader>{{#if @rooms.length}}- <table class="d-admin-table voice-rooms">- <thead>+ <table class="d-table voice-rooms">+ <thead class="d-table__header"><tr>- <th>{{i18n "voice.admin.room.name"}}</th>- <th>{{i18n "voice.admin.room.public"}}</th>- <th>{{i18n "voice.admin.room.max_participants"}}</th>- <th>{{i18n "voice.admin.room.member_count"}}</th>- <th>{{i18n "voice.admin.room.creator"}}</th>- <th>{{i18n "voice.admin.room.created_at"}}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.room.name"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.room.public"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.room.max_participants"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.room.member_count"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.room.creator"+ }}</th>+ <th class="d-table__header-cell">{{i18n+ "voice.admin.room.created_at"+ }}</th><th></th></tr></thead><tbody>{{#each @rooms as |room|}}- <tr class="d-admin-row__content">- <td class="d-admin-row__overview voice-rooms__name">- {{room.name}}+ <tr class="d-table__row">+ <td class="d-table__cell --overview voice-rooms__name">+ <LinkTo+ class="d-table__overview-link voice-rooms__name-link"+ @model={{room.id}}+ @route="adminPlugins.show.voice-rooms.edit"+ >+ <strong+ class="d-table__overview-name"+ >{{room.name}}</strong>+ </LinkTo></td>- <td class="d-admin-row__detail voice-rooms__public">- <div class="d-admin-row__mobile-label">+ <td class="d-table__cell --detail voice-rooms__public">+ <div class="d-table__mobile-label">{{i18n "voice.admin.room.public"}}</div>{{#if room.public}}@@ -100,8 +120,10 @@ export default class VoiceRoomList extends Component {{{i18n "no_value"}}{{/if}}</td>- <td class="d-admin-row__detail voice-rooms__max-participants">- <div class="d-admin-row__mobile-label">+ <td+ class="d-table__cell --detail voice-rooms__max-participants"+ >+ <div class="d-table__mobile-label">{{i18n "voice.admin.room.max_participants"}}</div>{{#if room.max_participants}}@@ -110,14 +132,14 @@ export default class VoiceRoomList extends Component {-{{/if}}</td>- <td class="d-admin-row__detail voice-rooms__member-count">- <div class="d-admin-row__mobile-label">+ <td class="d-table__cell --detail voice-rooms__member-count">+ <div class="d-table__mobile-label">{{i18n "voice.admin.room.member_count"}}</div>{{room.member_count}}</td>- <td class="d-admin-row__detail voice-rooms__creator">- <div class="d-admin-row__mobile-label">+ <td class="d-table__cell --detail voice-rooms__creator">+ <div class="d-table__mobile-label">{{i18n "voice.admin.room.creator"}}</div>{{#if room.creator}}@@ -129,13 +151,13 @@ export default class VoiceRoomList extends Component {</a>{{/if}}</td>- <td class="d-admin-row__detail voice-rooms__created-at">- <div class="d-admin-row__mobile-label">+ <td class="d-table__cell --detail voice-rooms__created-at">+ <div class="d-table__mobile-label">{{i18n "voice.admin.room.created_at"}}</div>{{dFormatDate room.created_at leaveAgo="true"}}</td>- <td class="d-admin-row__controls voice-rooms__controls">+ <td class="d-table__cell --controls voice-rooms__controls">{{#if room.live_participant_count}}<DButtonclass="btn-small btn-danger voice-rooms__end-call"diff --git a/plugins/voice/admin/assets/javascripts/discourse/controllers/admin-plugins/show/voice-rooms/edit.js b/plugins/voice/admin/assets/javascripts/discourse/controllers/admin-plugins/show/voice-rooms/edit.jsindex 3dcd470616e..0175ed88944 100644--- a/plugins/voice/admin/assets/javascripts/discourse/controllers/admin-plugins/show/voice-rooms/edit.js+++ b/plugins/voice/admin/assets/javascripts/discourse/controllers/admin-plugins/show/voice-rooms/edit.js@@ -11,7 +11,7 @@ export default class VoiceRoomsEditController extends Controller {saveRoom() {this.toasts.success({data: { message: i18n("voice.admin.room_updated") },- duration: 2000,+ duration: "short",});this.router.transitionTo("adminPlugins.show.voice-rooms.index");}diff --git a/plugins/voice/admin/assets/javascripts/discourse/controllers/admin-plugins/show/voice-rooms/new.js b/plugins/voice/admin/assets/javascripts/discourse/controllers/admin-plugins/show/voice-rooms/new.jsindex ea5ac2bcff1..5df05e18fa0 100644--- a/plugins/voice/admin/assets/javascripts/discourse/controllers/admin-plugins/show/voice-rooms/new.js+++ b/plugins/voice/admin/assets/javascripts/discourse/controllers/admin-plugins/show/voice-rooms/new.js@@ -11,7 +11,7 @@ export default class VoiceRoomsNewController extends Controller {saveRoom() {this.toasts.success({data: { message: i18n("voice.admin.room_created") },- duration: 2000,+ duration: "short",});this.router.transitionTo("adminPlugins.show.voice-rooms.index");}diff --git a/plugins/voice/assets/stylesheets/common/voice-admin.scss b/plugins/voice/assets/stylesheets/common/voice-admin.scssindex c1cb6ab7641..f1c1f4e006f 100644--- a/plugins/voice/assets/stylesheets/common/voice-admin.scss+++ b/plugins/voice/assets/stylesheets/common/voice-admin.scss@@ -2,10 +2,6 @@margin-top: 1.5em;.voice-rooms {- .voice-rooms__name {- font-weight: 600;- }-.voice-rooms__controls {display: flex;gap: 0.5em;diff --git a/plugins/voice/test/javascripts/acceptance/voice-admin-rooms-test.gjs b/plugins/voice/test/javascripts/acceptance/voice-admin-rooms-test.gjsnew file mode 100644index 00000000000..0943a1f108d--- /dev/null+++ b/plugins/voice/test/javascripts/acceptance/voice-admin-rooms-test.gjs@@ -0,0 +1,59 @@+import { click, fillIn, visit } from "@ember/test-helpers";+import { test } from "qunit";+import { acceptance } from "discourse/tests/helpers/qunit-helpers";++acceptance("Voice | Admin rooms", function (needs) {+ needs.user({ admin: true });+ needs.settings({ voice_enabled: true, chat_enabled: false });++ let rooms = [];++ needs.hooks.beforeEach(() => {+ rooms = [];+ });++ needs.pretender((server, helper) => {+ server.get("/admin/plugins/voice.json", () =>+ helper.response({+ id: "voice",+ name: "voice",+ enabled: true,+ has_settings: true,+ humanized_name: "Voice",+ admin_route: {+ label: "voice.admin.title",+ location: "voice",+ use_new_show_route: true,+ },+ })+ );++ server.get("/voice/rooms.json", () => helper.response({ rooms: [] }));++ server.get("/admin/plugins/voice/rooms.json", () =>+ helper.response({ rooms })+ );++ server.post("/admin/plugins/voice/rooms.json", (request) => {+ const room = {+ ...JSON.parse(request.requestBody).room,+ id: 42,+ member_count: 0,+ created_at: new Date().toISOString(),+ };+ rooms.push(room);+ return helper.response(201, { room });+ });+ });++ test("room name links to the edit page after creating a room", async function (assert) {+ await visit("/admin/plugins/voice/voice-rooms");+ await click(".voice-admin__create-btn");+ await fillIn("input[name='name']", "Lounge");+ await click(".form-kit__button.btn-primary");++ assert+ .dom(".voice-rooms__name-link")+ .hasAttribute("href", "/admin/plugins/voice/voice-rooms/42");+ });+});