Make DB timeout message more explicit

src/assets/locales/en/tdp.json

@@ -18,7 +18,7 @@
     "savedNotification": "{{type}} \"{{name}}\" successfully saved",
     "deletedNotification": "{{type}} \"{{name}}\" successfully deleted",
     "requestedUrl": "The requested URL was:",
-    "errorNotification": "<strong>Error {{status}} ({{statusText}})</strong>: {{body}}",
+    "errorNotification": "<strong>Error {{status}} ({{statusText}})</strong>: {{- body}}",
 
     "ViewWrapper": {
       "showHelp": "Show Help",

src/notifications.ts

@@ -48,6 +48,11 @@ let errorAlertHandler = (error: any) => {
   if (error instanceof Response || error.response instanceof Response) {
     const xhr: Response = error instanceof Response ? error : error.response;
     return xhr.text().then((body: string) => {
+      if (xhr.status === 408) {
+        body = `Your data request could not be completed. Therefore, it was cancelled.
+        This problem might have been caused by requesting too much data at once.
+        In case of any questions, please contact the administrator.`;
+      }
       if (xhr.status !== 400) {
         body = `${body}<hr>
         ${i18n.t('tdp:core.requestedUrl')}<br><a href="${xhr.url}" target="_blank" rel="noopener" class="alert-link">${(xhr.url.length > 100) ? xhr.url.substring(0, 100) + '...' : xhr.url}</a>`;

tdp_core/db.py

@@ -126,9 +126,13 @@ def execute(self, sql, **kwargs):
     :param kwargs: additional args to replace
     :return: the session result
     """
+    import sqlalchemy
     parsed = to_query(sql, self._supports_array_parameter, kwargs)
     _log.info('%s (%s)', parsed, kwargs)
-    return self._session.execute(parsed, kwargs)
+    try:
+      return self._session.execute(parsed, kwargs)
+    except sqlalchemy.exc.OperationalError as error:
+      abort(408, error)
 
   def run(self, sql, **kwargs):
     """
@@ -137,9 +141,7 @@ def run(self, sql, **kwargs):
     :param kwargs: args for this query
     :return: list of dicts
     """
-    parsed = to_query(sql, self._supports_array_parameter, kwargs)
-    _log.info('%s (%s)', parsed, kwargs)
-    result = self._session.execute(parsed, kwargs)
+    result = self.execute(sql, **kwargs)
     columns = result.keys()
     return [{c: r[c] for c in columns} for r in result]