fix(#2338): URI is not updated by search input (#2339)

closes #2338
codecentric · Mar 16, 2023 · ff8a5a9 · ff8a5a9
1 parent 41e9cfc
commit ff8a5a9
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 11 deletions.
diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/applications/i18n.de.json b/spring-boot-admin-server-ui/src/main/frontend/views/applications/i18n.de.json
@@ -41,5 +41,8 @@
   },
   "notification_filter_center": {
     "description": "Benachrichtigungen für folgende Applikationen / Instanzen werden unterdrückt."
+  },
+  "filter": {
+    "no_results": "Keine Ergebnisse für den eingestellten Filter."
   }
 }
diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/applications/i18n.en.json b/spring-boot-admin-server-ui/src/main/frontend/views/applications/i18n.en.json
@@ -47,5 +47,8 @@
   },
   "notification_filter_center": {
     "description": "Notifications on following applications or instances will be suppressed."
+  },
+  "filter": {
+    "no_results": "No results matching your filter."
   }
 }
diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/applications/index.vue b/spring-boot-admin-server-ui/src/main/frontend/views/applications/index.vue
@@ -60,8 +60,15 @@
 
         <template v-if="applicationsInitialized">
           <TransitionGroup>
+            <sba-panel
+              v-if="hasActiveFilter && statusGroups.length === 0"
+              class="text-center"
+            >
+              {{ t('filter.no_results') }}
+            </sba-panel>
             <sba-panel
               v-for="group in statusGroups"
+              v-else
               :key="group.status"
               :seamless="true"
               :title="t('term.applications_tc', group.applications.length)"
@@ -112,8 +119,9 @@
 
 <script>
 import { groupBy, sortBy, transform } from 'lodash-es';
-import { ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
 
 import SbaStickySubnav from '@/components/sba-sticky-subnav';
 import SbaWave from '@/components/sba-wave';
@@ -164,15 +172,40 @@ export default {
       default: null,
     },
   },
-  setup: function () {
+  setup: function (props) {
     const { t } = useI18n();
+    const router = useRouter();
+    const route = useRoute();
     const { applications, applicationsInitialized } = useApplicationStore();
+    const filter = ref(route.query.q);
+
+    watch(filter, (q) => {
+      let to = {
+        name: 'applications',
+        params: { selected: props.selected },
+      };
+
+      if (q?.length > 0) {
+        to = {
+          ...to,
+          query: { q },
+        };
+      }
+
+      router.replace(to);
+    });
+
+    const hasActiveFilter = computed(() => {
+      return filter.value?.length > 0;
+    });
 
     return {
       applications,
       applicationsInitialized,
       t,
-      filter: ref(null),
+      filter,
+      router,
+      hasActiveFilter,
       hasNotificationFiltersSupport: ref(false),
       showNotificationFilterSettingsObject: ref(null),
       notificationFilters: ref([]),
@@ -205,12 +238,6 @@ export default {
     },
   },
   watch: {
-    '$route.query': {
-      immediate: true,
-      handler() {
-        this.filter = this.$route.query.q || '';
-      },
-    },
     selected: {
       immediate: true,
       handler(newVal) {
@@ -223,7 +250,7 @@ export default {
   },
   methods: {
     select(name) {
-      this.$router.replace({
+      this.router.replace({
         name: 'applications',
         params: { selected: name },
       });
@@ -234,7 +261,7 @@ export default {
       }
       this.toggleNotificationFilterSettings(null);
       if (this.selected === expectedSelected || !expectedSelected) {
-        this.$router.replace({ name: 'applications' });
+        this.router.replace({ name: 'applications' });
       }
     },
     async scrollIntoView(id, behavior) {