From 53537e194f1bbfbf5e9a7b45642488459ccd3daa Mon Sep 17 00:00:00 2001
From: luce <lucy@cirno.systems>
Date: Fri, 12 Sep 2025 15:20:27 +0200
Subject: [PATCH] filter and sorting options, fix status width in admin_dash

---
 .../confirm_modal/generic_confirm.js          |  3 +
 .../confirm_modal/generic_confirm.vue         |  6 +-
 src/components/list/list.vue                  |  1 +
 src/components/page_list/page_list.js         |  1 +
 .../selectable_list/selectable_list.vue       |  3 +
 .../settings_modal/admin_tabs/admin_card.js   | 19 ++++-
 .../settings_modal/admin_tabs/admin_card.vue  | 77 ++++++++++++++++++-
 .../settings_modal/admin_tabs/users_tab.vue   |  9 ++-
 src/i18n/en.json                              | 28 ++++++-
 9 files changed, 135 insertions(+), 12 deletions(-)

diff --git a/src/components/confirm_modal/generic_confirm.js b/src/components/confirm_modal/generic_confirm.js
index a964a9805..53b41e83e 100644
--- a/src/components/confirm_modal/generic_confirm.js
+++ b/src/components/confirm_modal/generic_confirm.js
@@ -6,6 +6,9 @@ export default {
     title: {
       type: String
     },
+    message: {
+      type: String
+    },
     cancelText: {
       type: String
     },
diff --git a/src/components/confirm_modal/generic_confirm.vue b/src/components/confirm_modal/generic_confirm.vue
index 794a15490..d223d6ea9 100644
--- a/src/components/confirm_modal/generic_confirm.vue
+++ b/src/components/confirm_modal/generic_confirm.vue
@@ -6,7 +6,11 @@
     :confirm-text="confirmText"
     @accepted="doGeneric"
     @cancelled="hide"
-  />
+  >
+    <template #default>
+      <span v-text="message" />
+    </template>
+  </ConfirmModal>
 </template>
 
 <script src="./generic_confirm.js" />
diff --git a/src/components/list/list.vue b/src/components/list/list.vue
index 5d2c49b3c..48686babb 100644
--- a/src/components/list/list.vue
+++ b/src/components/list/list.vue
@@ -20,6 +20,7 @@
       class="list-empty-content faint"
     >
       <slot name="empty" />
+      <slot name="load" />
     </div>
   </div>
 </template>
diff --git a/src/components/page_list/page_list.js b/src/components/page_list/page_list.js
index 5a28a847d..4e1184844 100644
--- a/src/components/page_list/page_list.js
+++ b/src/components/page_list/page_list.js
@@ -59,6 +59,7 @@ const PageList = {
     loadMore () {
       if (!this.isLoading && this.canLoadMore) {
         this.isLoading = true
+        console.log("is loading = true")
         this.fetchPage(this.$store, {
           page: this.pageIndex++,
           pageSize: this.pageSize
diff --git a/src/components/selectable_list/selectable_list.vue b/src/components/selectable_list/selectable_list.vue
index 5c239d8d6..c3f97782c 100644
--- a/src/components/selectable_list/selectable_list.vue
+++ b/src/components/selectable_list/selectable_list.vue
@@ -68,6 +68,9 @@
       <template #empty>
         <slot name="empty" />
       </template>
+      <template #load>
+        <slot name="load" />
+      </template>
     </List>
   </div>
 </template>
diff --git a/src/components/settings_modal/admin_tabs/admin_card.js b/src/components/settings_modal/admin_tabs/admin_card.js
index a773b7bb4..c733223f5 100644
--- a/src/components/settings_modal/admin_tabs/admin_card.js
+++ b/src/components/settings_modal/admin_tabs/admin_card.js
@@ -5,6 +5,7 @@ import AdminStatusCard from 'src/components/settings_modal/admin_tabs/admin_stat
 import Modal from 'src/components/modal/modal.vue'
 import Popover from 'src/components/popover/popover.vue'
 import GenericConfirm from 'src/components/confirm_modal/generic_confirm.vue'
+import Select from 'src/components/select/select.vue'
 
 const AdminCard = {
   props: {
@@ -45,6 +46,9 @@ const AdminCard = {
       justApproved: false,
       justConfirmed: false,
       justDeleted: false,
+      showDirect: false,
+      showReblogs: false,
+      timelineSorting: "des"
     }
   },
   computed: {
@@ -128,7 +132,8 @@ const AdminCard = {
     AdminStatusCard,
     Modal,
     Popover,
-    GenericConfirm
+    GenericConfirm,
+    Select
   },
   methods: {
     /**
@@ -219,8 +224,16 @@ const AdminCard = {
      */
     async fetchStatuses (store, opts) {
       const u = this.$store.getters.findUser(this.userDetails.id)
-      const res = store.dispatch('adminListStatuses', { user: u,  opts: { pageSize: opts.pageSize, godmode: true, withReblogs: true}})
-      return res.then(r => r.activities)
+      const res = store.dispatch('adminListStatuses', { user: u,  opts: { pageSize: opts.pageSize, godmode: this.showDirect, withReblogs: this.showReblogs}})
+      return res.then(r => {
+        const a = r.activities
+        console.log(this.timelineSorting)
+        if (this.timelineSorting === 'des') {
+          return [...a].sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
+        } else if (this.timelineSorting === 'asc') {
+          return [...a].sort((a, b) => new Date(a.created_at) - new Date(b.created_at));
+        } else return []
+      })
     },
     confirmAction (box) {
       this.$refs[box].show()
diff --git a/src/components/settings_modal/admin_tabs/admin_card.vue b/src/components/settings_modal/admin_tabs/admin_card.vue
index cab2d2bec..37e00a1be 100644
--- a/src/components/settings_modal/admin_tabs/admin_card.vue
+++ b/src/components/settings_modal/admin_tabs/admin_card.vue
@@ -211,6 +211,48 @@
           @backdrop-clicked="() => { detailsExpanded = false }"
         >
           <div style="background-color: rgb(80 80 80 / 100%); width: 80%; height: 60%; overflow-y: auto;">
+            <ul class="setting-list" style="columns: 2;">
+              <li>
+                {{ $t('admin_dash.users.details.id') }}
+              </li>
+              <li>
+                {{ $t('admin_dash.users.details.actor_type') }}
+              </li>
+              <li>
+                {{ $t('admin_dash.users.details.tags') }}
+              </li>
+              <li>
+                {{ $t('admin_dash.users.details.roles') }}
+              </li>
+              <li>
+                {{ $t('admin_dash.users.details.account_type') }}
+              </li>
+              <li>
+                {{ $t('admin_dash.users.details.status') }}
+              </li>
+              <li>
+                {{ user.id }}
+              </li>
+              <li>
+                {{ $t('admin_dash.users.details.actor_types.' + user.actor_type.toLowerCase()) }}
+              </li>
+              <li>
+                {{ user.tags }}
+              </li>
+              <li>
+                <span v-if="user.rights.admin === true"> {{ $t('admin_dash.users.details.admin') }} </span>
+                <span v-if="user.rights.admin === true && user.rights.moderator === true"> ,&nbsp; </span>
+                <span v-if="user.rights.moderator === true"> {{ $t('admin_dash.users.details.moderator') }} </span>
+              </li>
+              <li>
+                <span v-if="user.is_local"> {{ $t('admin_dash.users.details.local') }} </span>
+                <span v-else> {{ $t('admin_dash.users.details.remote') }} </span>
+              </li>
+              <li>
+                <span v-if="user.deactivated === false"> {{ $t('admin_dash.users.details.active') }} </span>
+                <span v-else> {{ $t('admin_dash.users.details.inactive') }} </span>
+              </li>
+            </ul>
             <PageList
               ref="timelineList"
               :refresh="true"
@@ -221,7 +263,29 @@
               :fetch-page="(store, opts) => fetchStatuses(store, opts)"
             >
               <template #header>
-                <p> add options to sort statuses </p>
+                <Checkbox
+                  v-model="showDirect"
+                  @update:model-value="() => this.$refs.timelineList.reset()"
+                >
+                  {{ $t('admin_dash.users.filters.show_direct') }}
+                </Checkbox>
+                <Checkbox
+                  v-model="showReblogs"
+                  @update:model-value="() => this.$refs.timelineList.reset()"
+                >
+                  {{ $t('admin_dash.users.filters.show_reblogs') }}
+                </Checkbox>
+                <Select
+                  v-model="timelineSorting"
+                  @update:model-value="() => this.$refs.timelineList.reset()"
+                >
+                  <option value="asc">
+                    {{ $t('admin_dash.users.filters.ascending') }}
+                  </option>
+                  <option value="des">
+                    {{ $t('admin_dash.users.filters.descending') }}
+                  </option>
+                </Select>
                 <Popover
                   ref="dropdownstatus"
                   trigger="click"
@@ -231,9 +295,10 @@
                     <button
                       class="button button-default btn"
                     >
-                      {{ $t('admin_dash.user.title_actions') }}
+                      {{ $t('admin_dash.users.actions.button.title') }}
                     </button>
                   </template>
+                  <p> wrap </p>
                   <template #content>
                     <div class="dropdown-menu">
                       <div class="menu-item dropdown-item">
@@ -255,13 +320,17 @@
                 </Popover>
               </template>
               <template #item="{item}">
-                <AdminStatusCard :status-details="item" />
+                <AdminStatusCard :status-details="item" style="width: 100%"/>
               </template>
               <template #empty>
                 <p> {{ $t('admin_dash.users.user_has_no_posts') }} </p>
               </template>
               <template #load>
-                <p> {{ $t('admin_dash.users.loading') }} </p>
+                <FAIcon
+                  icon="circle-notch"
+                  spin
+                  size="lg"
+                />
               </template>
             </PageList>
           </div>
diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue
index 6a021d3c2..56a0d62a2 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.vue
+++ b/src/components/settings_modal/admin_tabs/users_tab.vue
@@ -236,6 +236,12 @@
         <template #item="{item}">
           <AdminCard :user-details="item" />
         </template>
+        <template #load>
+          <span> loading </span>
+        </template>
+        <template #empty>
+          <span> no users </span>
+        </template>
       </PageList>
     </div>
     <GenericConfirm
@@ -317,7 +323,8 @@
     />
     <GenericConfirm
       ref="confirmDisableMFA"
-      :title="$t('admin_dash.users.bulk_actions.disable_mfa')"
+      :title="$t('admin_dash.users.title_confirm')"
+      :message="$t('admin_dash.users.bulk_actions.disable_mfa')"
       :cancel-text="$t('admin_dash.users.bulk_actions.no')"
       :confirm-text="$t('admin_dash.users.bulk_actions.yes')"
       @action="selectionConfirmed('adminDisableMFA')"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8f9bf1ff1..c55deae6a 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1154,7 +1154,6 @@
     "users": {
       "management": "Management",
       "search_users": "Search for users...",
-      "loading": "Loading...",
       "label_query": "Query",
       "label_name": "Name",
       "label_email": "Email",
@@ -1172,7 +1171,12 @@
       "only_unapproved": "Unapproved Only",
       "only_unconfirmed": "Unconfirmed Only",
       "refresh": "Refresh",
-
+      "filters": {
+        "show_direct": "Show Direct Posts",
+        "show_reblogs": "Show Reblogs",
+        "ascending": "Oldest First",
+        "descending": "Newest First"
+      },
       "actions": {
         "button": {
           "title": "Actions",
@@ -1224,7 +1228,25 @@
 
         }
       },
-
+      "details": {
+        "id": "ID",
+        "actor_type": "Actor Type",
+        "actor_types": {
+          "person": "Person",
+          "service": "Service",
+          "application": "Application"
+        },
+        "admin": "Admin",
+        "moderator": "Moderator",
+        "local": "Local",
+        "active": "Active",
+        "inactive": "Inactive",
+        "tags": "Tags",
+        "roles": "Roles",
+        "status": "Status",
+        "remote": "Remote",
+        "account_type": "Account Type"
+      },
       "bulk_actions": {
         "title": "Bulk Actions",
         "yes": "Yes",