Changeset 15511

Timestamp:

11/06/2026 11:05:15 PM (4 days ago)

Author:

obenland

Message:

FreeScout: Filter the Users page by role and status

Closes ​https://github.com/WordPress/wordpress.org/pull/1204.

Location:

sites/trunk/freescout.wordpress.net/Modules/WPOrgSite

Files:

• Providers/WPOrgSiteServiceProvider.php (modified) (1 diff)
• Public/css/site.css (modified) (1 diff)
• Public/js/users.js (added)
• README.md (modified) (1 diff)
• module.json (modified) (1 diff)
• tests/AssetsTest.php (modified) (1 diff)

sites/trunk/freescout.wordpress.net/Modules/WPOrgSite/Providers/WPOrgSiteServiceProvider.php

@@ -121 +121 @@
                                 $javascripts[] = \Module::getPublicPath( self::ALIAS ) . '/js/discard.js';
                                 $javascripts[] = \Module::getPublicPath( self::ALIAS ) . '/js/settings.js';
+                                $javascripts[] = \Module::getPublicPath( self::ALIAS ) . '/js/users.js';
 
                                 return $javascripts;

sites/trunk/freescout.wordpress.net/Modules/WPOrgSite/Public/css/site.css

@@ -38 +38 @@
         top: 6px;
         margin-left: 0;
+}
+
+/* The Users page's filters, from users.js, left of the search and as tall as it. */
+.wporgsite-users-filters {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 10px;
+        margin-right: 10px;
+}
+
+.wporgsite-users-filters .btn {
+        height: 30px;
+        padding: 0 10px;
+        font-size: 13px;
+        line-height: 28px;
+}
+
+/* As light as the search's border, with gray text, in every state Bootstrap darkens them. */
+.wporgsite-users-filters .btn,
+.wporgsite-users-filters .btn:hover,
+.wporgsite-users-filters .btn:focus,
+.wporgsite-users-filters .btn.active,
+.wporgsite-users-filters .btn.active:hover,
+.wporgsite-users-filters .btn.active:focus {
+        border-color: #d5dbe0;
+        color: #666;
+}
+
+/* Bootstrap's focus border, which is its only focus indicator, for keyboard focus. */
+.wporgsite-users-filters .btn:focus-visible,
+.wporgsite-users-filters .btn.active:focus-visible {
+        border-color: #a5a9ac;
+}
+
+/* Bootstrap's pressed shadow, lighter. */
+.wporgsite-users-filters .btn.active {
+        box-shadow: inset 0 1px 2px rgba( 0, 0, 0, 0.075 );
+}
+
+/* Core's search shows and hides cards inline, so the filters' hiding needs !important. */
+#users-list > .card.wporgsite-users-filtered {
+        display: none !important;
 }
 

sites/trunk/freescout.wordpress.net/Modules/WPOrgSite/README.md

@@ -8 +8 @@
 - **Modules page layout:** the module cards are laid out in columns, as many as the window fits.
 - **Settings kept in `.env`:** FreeScout saves some of Manage » Settings to `.env`, like the time zone, the language, conversation numbers, and the fetching interval, and so do modules for some of theirs. The server's `.env` is read-only, so saving one failed, and with it the rest of its section. They show read-only, with their value and a note to ask the systems team, and saving a section leaves them out, so the rest of it saves. It's in `Services/EnvSettings.php` and `Public/js/settings.js`.
+- **Users page:** the users can be filtered by role, admins or users, and by status, active or inactive: users who haven’t accepted their invite or logged in yet, which core grays out, and disabled users. The heading counts the users shown, after the search too. The filters are kept in the URL, like `?role=admin&status=active`, so going back from a profile, or a shared link, shows the same users. Agents who aren't admins don't see admins, so they only get the status filter. It's in `Public/js/users.js`.
 - **Missing scripts and stylesheets:** a module's file in core's script or style bundle that isn't on the server is left out, and logged. Otherwise core's Minify throws, and core leaves the whole bundle out of the page, jQuery and all, so nothing that needs JavaScript works. It's in `Services/Assets.php`.
 - **Recipients:** a reply, forward, or new conversation to more than 100 people, in To, Cc, Bcc, and the mailbox's Auto Bcc together, from a mailbox that sends through Gmail (`smtp.gmail.com`), isn't sent, and the form says why, naming the Auto Bcc when it's what puts the email over. Gmail refuses more than 100 people in To and Cc over SMTP, and counts every recipient, Bcc included, towards the mailbox's daily limits ([Google's limits](https://support.google.com/a/answer/166852)). Notes aren't emailed, so they aren't limited. It's in `Http/Middleware/LimitRecipients.php`.

sites/trunk/freescout.wordpress.net/Modules/WPOrgSite/module.json

@@ -4 +4 @@
     "img": "/modules/wporgsite/img/icon.svg",
     "description": "Adapts FreeScout to how WordPress.org runs it, e.g. modules come from deploys, not from updates here.",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "detailsUrl": "https://github.com/WordPress/wordpress.org/tree/trunk/freescout.wordpress.net/Modules/WPOrgSite",
     "author": "WordPress.org",

sites/trunk/freescout.wordpress.net/Modules/WPOrgSite/tests/AssetsTest.php

@@ -38 +38 @@
                 $assets = array(
                         'stylesheets' => array( '/css/style.css', '/css/site.css' ),
-                        'javascripts' => array( '/js/main.js', '/js/modules.js', '/js/alt-conversation.js', '/js/conversation.js', '/js/saved-replies.js', '/js/sidebar.js', '/js/header.js', '/js/discard.js', '/js/settings.js' ),
+                        'javascripts' => array( '/js/main.js', '/js/modules.js', '/js/alt-conversation.js', '/js/conversation.js', '/js/saved-replies.js', '/js/sidebar.js', '/js/header.js', '/js/discard.js', '/js/settings.js', '/js/users.js' ),
                 );