From 55dcde9d8b2a5a2ae36921cf137fac1e3ebd0037 Mon Sep 17 00:00:00 2001
From: Craig Stephenson <crstephenson@alaska.edu>
Date: Mon, 27 Jan 2025 13:24:35 -0900
Subject: [PATCH] Report Data API HTTP timeout errors as dataset server errors
 on report pages.

---
 store/beetle.js     |  8 +++++++-
 store/climate.js    |  8 +++++++-
 store/elevation.js  |  8 ++++++--
 store/hydrology.js  |  8 +++++++-
 store/indicators.js |  8 +++++++-
 store/permafrost.js |  8 +++++++-
 store/wildfire.js   | 14 ++++++++++++--
 7 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/store/beetle.js b/store/beetle.js
index b43bf41..9aeb7b7 100644
--- a/store/beetle.js
+++ b/store/beetle.js
@@ -85,7 +85,13 @@ export const actions = {
       context.rootGetters['place/urlFragment']()
     let expectedDataKeys = ['1988-2017', '2010-2039', '2040-2069', '2070-2099']
 
-    let returnedData = await $axios.get(queryUrl, { timeout: 60000 })
+    let returnedData = await $axios
+      .get(queryUrl, { timeout: 60000 })
+      .catch(err => {
+        console.error(err)
+        context.commit('setHttpError', 'server_error')
+      })
+
     let partialData = false
     expectedDataKeys.forEach(key => {
       if (returnedData.data[key] == null) {
diff --git a/store/climate.js b/store/climate.js
index 7350926..2ab5479 100644
--- a/store/climate.js
+++ b/store/climate.js
@@ -92,7 +92,13 @@ export const actions = {
       '2090_2099',
     ]
 
-    let returnedData = await $axios.get(queryUrl, { timeout: 60000 })
+    let returnedData = await $axios
+      .get(queryUrl, { timeout: 60000 })
+      .catch(err => {
+        console.error(err)
+        context.commit('setHttpError', 'server_error')
+      })
+
     let partialData = false
     expectedDataKeys.forEach(key => {
       if (returnedData.data[key] == null) {
diff --git a/store/elevation.js b/store/elevation.js
index 41e276b..87e2f42 100644
--- a/store/elevation.js
+++ b/store/elevation.js
@@ -62,8 +62,12 @@ export const actions = {
       process.env.apiUrl +
       '/elevation/' +
       context.rootGetters['place/urlFragment']()
-    let returnedData = await $axios.get(queryUrl, { timeout: 60000 })
-
+    let returnedData = await $axios
+      .get(queryUrl, { timeout: 60000 })
+      .catch(err => {
+        console.error(err)
+        context.commit('setHttpError', 'server_error')
+      })
     if (returnedData) {
       context.commit('setElevation', returnedData.data)
     } else {
diff --git a/store/hydrology.js b/store/hydrology.js
index ae58c7c..206e283 100644
--- a/store/hydrology.js
+++ b/store/hydrology.js
@@ -208,7 +208,13 @@ export const actions = {
       process.env.apiUrl +
       '/eds/hydrology/' +
       context.rootGetters['place/urlFragment']()
-    let returnedData = await $axios.get(queryUrl, { timeout: 60000 })
+
+    let returnedData = await $axios
+      .get(queryUrl, { timeout: 60000 })
+      .catch(err => {
+        console.error(err)
+        context.commit('setHttpError', 'server_error')
+      })
 
     if (returnedData) {
       context.commit('setHydrologyData', returnedData.data.summary)
diff --git a/store/indicators.js b/store/indicators.js
index bc1a36f..6d778a4 100644
--- a/store/indicators.js
+++ b/store/indicators.js
@@ -86,7 +86,13 @@ export const actions = {
       process.env.apiUrl +
       '/indicators/base/' +
       context.rootGetters['place/urlFragment']()
-    let returnedData = await $axios.get(queryUrl, { timeout: 60000 })
+
+    let returnedData = await $axios
+      .get(queryUrl, { timeout: 60000 })
+      .catch(err => {
+        console.error(err)
+        context.commit('setHttpError', 'server_error')
+      })
 
     if (returnedData) {
       context.commit('setIndicatorData', returnedData.data)
diff --git a/store/permafrost.js b/store/permafrost.js
index 16752d5..cc39398 100644
--- a/store/permafrost.js
+++ b/store/permafrost.js
@@ -142,7 +142,13 @@ export const actions = {
 
     let expectedDataKeys = ['2021-2039', '2040-2069', '2070-2099']
 
-    let returnedData = await $axios.get(queryUrl, { timeout: 60000 })
+    let returnedData = await $axios
+      .get(queryUrl, { timeout: 60000 })
+      .catch(err => {
+        console.error(err)
+        context.commit('setHttpError', 'server_error')
+      })
+
     let partialData = false
     expectedDataKeys.forEach(key => {
       if (returnedData.data[key] == null) {
diff --git a/store/wildfire.js b/store/wildfire.js
index e93f40c..3e860fc 100644
--- a/store/wildfire.js
+++ b/store/wildfire.js
@@ -210,7 +210,13 @@ export const actions = {
       '2070-2099',
     ]
 
-    let returnedData = await $axios.get(queryUrl, { timeout: 60000 })
+    let returnedData = await $axios
+      .get(queryUrl, { timeout: 60000 })
+      .catch(err => {
+        console.error(err)
+        context.commit('setFlammabilityHttpError', 'server_error')
+      })
+
     let partialData = false
     expectedFlamKeys.forEach(key => {
       if (returnedData.data[key] == null) {
@@ -234,7 +240,11 @@ export const actions = {
 
     let expectedVegKeys = ['1950-2008', '2010-2039', '2040-2069', '2070-2099']
 
-    returnedData = await $axios.get(queryUrl, { timeout: 60000 })
+    returnedData = await $axios.get(queryUrl, { timeout: 60000 }).catch(err => {
+      console.error(err)
+      context.commit('setHttpError', 'server_error')
+    })
+
     partialData = false
     expectedVegKeys.forEach(key => {
       if (returnedData.data[key] == null) {