From 0b81dfe4ad5272525290707fe9ef4cc0aff5b487 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 15 Oct 2025 13:50:28 +0200
Subject: [PATCH] Some improvements about Alarms management

---
 .../src/components/admin/alarms/AlarmList.vue     | 15 ++++++++++++++-
 .../src/components/admin/domains/DomainList.vue   |  3 ++-
 frontend/src/views/admin/alarms/AlarmsView.vue    | 10 ++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/admin/alarms/AlarmList.vue b/frontend/src/components/admin/alarms/AlarmList.vue
index c3114072a..91a3b0fda 100644
--- a/frontend/src/components/admin/alarms/AlarmList.vue
+++ b/frontend/src/components/admin/alarms/AlarmList.vue
@@ -2,6 +2,7 @@
   <v-card class="mt-6">
     <v-data-table-server
       v-model="selected"
+      v-model:sort-by="currentSort"
       :headers="headers"
       :items="alarms"
       :search="search"
@@ -71,19 +72,27 @@
   </v-card>
 </template>
 
-<script setup lang="js">
+<script setup>
 import { ref } from 'vue'
 import debounce from 'debounce'
 import { useGettext } from 'vue3-gettext'
+import { useRoute } from 'vue-router'
 import { useBusStore } from '@/stores'
 import alarmsApi from '@/api/alarms'
 import constants from '@/constants.json'
 import MenuItems from '@/components/tools/MenuItems'
 
 const { $gettext } = useGettext()
+const route = useRoute()
 
 const busStore = useBusStore()
 const alarms = ref([])
+const currentSort = ref([
+  {
+    key: 'status',
+    order: 'desc',
+  },
+])
 const loading = ref(false)
 const search = ref('')
 const selected = ref([])
@@ -205,6 +214,10 @@ async function openAlarm(alarm) {
     })
 }
 
+if (route.query.search) {
+  search.value = route.query.search
+}
+
 fetchAlarms = debounce(fetchAlarms, 500)
 </script>
 
diff --git a/frontend/src/components/admin/domains/DomainList.vue b/frontend/src/components/admin/domains/DomainList.vue
index a2bc77cca..5deb56e6d 100644
--- a/frontend/src/components/admin/domains/DomainList.vue
+++ b/frontend/src/components/admin/domains/DomainList.vue
@@ -330,7 +330,8 @@ function getDomainMenuItems(domain) {
       label: $gettext('Alarms'),
       icon: 'mdi-bell',
       color: 'red',
-      onClick: () => router.push({ name: 'Alarms' }),
+      onClick: () =>
+        router.push({ name: 'Alarms', query: { search: domain.name } }),
     })
   }
   return result
diff --git a/frontend/src/views/admin/alarms/AlarmsView.vue b/frontend/src/views/admin/alarms/AlarmsView.vue
index 4f471f8f0..9ceec8b7f 100644
--- a/frontend/src/views/admin/alarms/AlarmsView.vue
+++ b/frontend/src/views/admin/alarms/AlarmsView.vue
@@ -1,8 +1,10 @@
 <template>
-  <v-toolbar flat>
-    <v-toolbar-title>{{ $gettext('Opened alarms') }}</v-toolbar-title>
-  </v-toolbar>
-  <AlarmList />
+  <div>
+    <v-toolbar flat>
+      <v-toolbar-title>{{ $gettext('Opened alarms') }}</v-toolbar-title>
+    </v-toolbar>
+    <AlarmList />
+  </div>
 </template>
 
 <script setup lang="js">