Merge pull request #13 from BluemediaDev/fix/filter-overall-status

Only consider statuses in the summary that are not hidden

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
         id: release
         uses: mikepenz/release-changelog-builder-action@v5
         with:
-          configuration: ".github/changelog-configuration.json"
+          configuration: '.github/changelog-configuration.json'
           failOnError: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

src/routes/+page.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
   import axios from 'axios'
+  import type { AxiosError } from 'axios'
   import { onMount } from 'svelte'
   import type { Config } from '$lib/types/config'
   import type { Status } from '$lib/types/api'
@@ -15,41 +16,42 @@
   let config: Config = $state({})
   let apiData: Status[] = $state([])
 
-  function getConfig() {
+  async function getConfig() {
-    axios
+    try {
-      .get('config.json', { baseURL: '/' })
+      const response = await axios.get('config.json', { baseURL: '/' })
-      .then((response) => {
+
       config = response.data
       // Set title if defined in config
       if (config.title) {
         document.title = config.title
       }
-        getApiData()
+    } catch (err) {
-      })
+      const error = err as AxiosError
-      .catch((error) => {
+      if (error.response && error.response.status === 404) {
-        if (error.response.status === 404) {
         console.warn('No config.json file found. Using default values.')
-          getApiData()
+      }
-        } else {
       console.log('Error getting config: ' + error)
     }
-      })
   }
 
-  function getApiData() {
+  async function getApiData() {
     // Set base URL for API calls if defined in config
     if (config.gatusBaseUrl && axios.defaults.baseURL !== config.gatusBaseUrl) {
       axios.defaults.baseURL = config.gatusBaseUrl
     }
-    axios
+
-      .get('/api/v1/endpoints/statuses')
+    try {
-      .then((response) => {
+      const response = await axios.get('/api/v1/endpoints/statuses')
       apiData = response.data
       loading = false
-      })
+    } catch (error) {
-      .catch((error) => {
       console.log(error)
-      })
+    }
+  }
+
+  async function refresh() {
+    await getConfig()
+    await getApiData()
   }
 
   // Group statuses by their group name
@@ -93,13 +95,14 @@
 
   // Array of statuses where the last result has success = false
   let failedStatuses = $derived.by(() => {
-    return apiData.filter((status) => {
+    const filteredStatuses = groups.flatMap((item) => item.statuses)
+    return filteredStatuses.filter((status) => {
       return !status.results[status.results.length - 1].success
     })
   })
 
   onMount(() => {
-    getConfig()
+    refresh()
   })
 </script>
 
@@ -118,6 +121,6 @@
       expandByDefault={config.defaultExpandGroups}
     />
   {/each}
-  <RefreshSettings defaultRefreshInterval={config.defaultRefreshInterval} onRefresh={getConfig} />
+  <RefreshSettings defaultRefreshInterval={config.defaultRefreshInterval} onRefresh={refresh} />
   <Footer />
 {/if}