REFACTOR: user directories without <table>, second attempt (#20515)

discourse · Mar 2, 2023 · fac7841 · fac7841
1 parent 435761e
commit fac7841
Show file tree

Hide file tree

Showing 30 changed files with 963 additions and 735 deletions.
diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -15,7 +15,7 @@ module.exports = {
         "directory-item-value",
         "directory-table-header-title",
         "loading-spinner",
-        "mobile-directory-item-label",
+        "directory-item-label",
       ],
     },
     "no-implicit-this": {

diff --git a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js
@@ -31,6 +31,21 @@ export default Controller.extend(CanCheckEmails, {
     return I18n.t("admin.users.titles." + query);
   },
 
+  @discourseComputed("showEmails")
+  columnCount(showEmails) {
+    let colCount = 7; // note that the first column is hardcoded in the template
+
+    if (showEmails) {
+      colCount += 1;
+    }
+
+    if (this.siteSettings.must_approve_users) {
+      colCount += 1;
+    }
+
+    return colCount;
+  },
+
   @observes("listFilter")
   _filterUsers() {
     discourseDebounce(this, this.resetFilters, INPUT_DELAY);