Merge pull request #1605 from slntopp/dev

Dev
slntopp · Mar 26, 2024 · 2a2953d · 2a2953d
2 parents e117afa + 5217774
commit 2a2953d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 15 deletions.
diff --git a/admin-ui/src/components/accounts_table.vue b/admin-ui/src/components/accounts_table.vue
@@ -102,9 +102,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  notFiltered: { type: Boolean, default: false },
+  noSearch: { type: Boolean, default: false },
+  customSearchParam: { type: String, default: "" },
 });
-const { value, singleSelect } = toRefs(props);
+const { value, singleSelect, customSearchParam, noSearch } = toRefs(props);
 
 const emit = defineEmits(["input"]);
 
@@ -200,14 +201,17 @@ const accounts = computed(() => {
 const total = computed(() => store.getters["accounts/total"]);
 
 const requestOptions = computed(() => ({
-  filters: {
-    ...filter.value,
-    balance: filter.value?.balance && {
-      from: filter.value?.balance.from && +filter.value?.balance.from,
-      to: filter.value?.balance.to && +filter.value?.balance.to,
-    },
-    search_param: searchParam.value || filter.value.search_param || undefined,
-  },
+  filters: !noSearch.value
+    ? {
+        ...filter.value,
+        balance: filter.value?.balance && {
+          from: filter.value?.balance.from && +filter.value?.balance.from,
+          to: filter.value?.balance.to && +filter.value?.balance.to,
+        },
+        search_param:
+          searchParam.value || filter.value.search_param || undefined,
+      }
+    : { search_param: customSearchParam.value || undefined },
   page: options.value.page,
   limit: options.value.itemsPerPage,
   field: options.value.sortBy[0],
@@ -319,7 +323,9 @@ watch(accounts, () => {
 });
 
 watch(searchFields, () => {
-  store.commit("appSearch/setFields", searchFields.value);
+  if (!noSearch.value) {
+    store.commit("appSearch/setFields", searchFields.value);
+  }
 });
 
 watch(value, () => {
@@ -328,6 +334,7 @@ watch(value, () => {
 
 watch(filter, fetchAccountsDebounce, { deep: true });
 watch(options, fetchAccountsDebounce);
+watch(customSearchParam, fetchAccountsDebounce);
 </script>
 
 <script>

diff --git a/admin-ui/src/components/widgets/chats.vue b/admin-ui/src/components/widgets/chats.vue
@@ -53,7 +53,7 @@
               }"
             >
               {{
-                chat.topic.length > 15
+                chat.topic.length > 27
                   ? chat.topic.slice(0, 30) + "..."
                   : chat.topic
               }}
@@ -138,7 +138,7 @@ const lastActivityChats = computed(() => {
         (Number(a.meta?.lastMessage?.sent || a.created) || 0)
     );
 
-  return sorted.slice(0, 5);
+  return sorted.slice(0, 3);
 });
 
 const countForPeriod = computed(() => {

diff --git a/admin-ui/src/components/widgets/instances.vue b/admin-ui/src/components/widgets/instances.vue
@@ -50,6 +50,11 @@
                 }"
               >
                 {{ instance.title }}
+                {{
+                  instance.title.length > 20
+                    ? instance.title.slice(0, 17) + "..."
+                    : instance.title
+                }}
               </router-link>
               <instance-state small :template="instance" />
             </div>

diff --git a/admin-ui/src/views/Namespaces.vue b/admin-ui/src/views/Namespaces.vue
@@ -57,10 +57,12 @@
           <v-card-title class=""> Select Accounts (join) </v-card-title>
 
           <v-card-text style="max-height: 60vh">
+            <v-text-field v-model="joinAccount.search" label="search..." />
             <accounts-table
-              not-filtered
+              no-search
               v-model="joinAccount.selected"
               single-select
+              :custom-search-param="joinAccount.search"
             />
           </v-card-text>
           <v-row class="pa-5">
@@ -112,7 +114,13 @@
           <v-card-title class=""> Select Accounts (link) </v-card-title>
 
           <v-card-text style="max-height: 60vh">
-            <accounts-table not-filtered v-model="linkAccount.selected">
+            <v-text-field v-model="linkAccount.search" label="search..." />
+
+            <accounts-table
+              no-search
+              :custom-search-param="linkAccount.search"
+              v-model="linkAccount.selected"
+            >
             </accounts-table>
           </v-card-text>
 
@@ -187,6 +195,7 @@ export default {
           access: 0,
           role: "default",
         },
+        search: "",
       },
 
       accessLevels: [
@@ -205,6 +214,7 @@ export default {
           access: 0,
           role: "default",
         },
+        search: "",
       },
     };
   },