Merge pull request #141 from mercedes-benz/develop

Spring Release 37

src/card/Card.tsx

@@ -39,8 +39,8 @@ const NeoCard = ({
   extensions, // A set of enabled extensions.
   globalParameters, // Query parameters that are globally set for the entire dashboard.
   dashboardSettings, // Dictionary of settings for the entire dashboard.
-  onRemovePressed, // action to take when the card is removed. (passed from parent)
-  onClonePressed, // action to take when user presses the clone button
+  onRemovePressed, // action to take when the card is removed. (passed from parent).
+  onClonePressed, // action to take when user presses the clone button.
   onReportHelpButtonPressed, // action to take when someone clicks the 'help' button in the report settings.
   onTitleUpdate, // action to take when the card title is updated.
   onTypeUpdate, // action to take when the card report type is updated.
@@ -51,8 +51,8 @@ const NeoCard = ({
   onGlobalParameterUpdate, // action to take when a report updates a dashboard parameter.
   onToggleCardSettings, // action to take when the card settings button is clicked.
   onToggleReportSettings, // action to take when the report settings (advanced settings) button is clicked.
-  onDatabaseChanged, // action to take when the user changes the database related to the card
-  loadDatabaseListFromNeo4j, // Thunk to get the list of databases
+  onDatabaseChanged, // action to take when the user changes the database related to the card.
+  loadDatabaseListFromNeo4j, // Thunk to get the list of databases.
   createNotification, // Thunk to create a global notification pop-up.
   onPutItem, // Method to remove report from ui and move it to toolbox
 }) => {

src/report/Report.tsx

@@ -405,6 +405,8 @@ export const NeoReport = ({
     );
   } else if (status == QueryStatus.OVER_LOAD) {
     return <NeoCodeViewerComponent value={`Loading took too long. Please reload report or complete page.`} />;
+  } else if (status == QueryStatus.INACTIVE) {
+    return <NeoCodeViewerComponent value={`Access token timed out. Please reload report or complete page.`} />;
   }
   return (
     <NeoCodeViewerComponent

src/report/ReportQueryRunner.ts

@@ -12,6 +12,7 @@ export enum QueryStatus {
   COMPLETE, // There is data returned, and we can visualize it all.
   COMPLETE_TRUNCATED, // There is data returned, but it's too much so we truncate it.
   ERROR, // Something broke, likely the cypher query is invalid.
+  INACTIVE, // If dashboard is inactive for too long and we use a custom message instead of error message from backend. (VULCAN-819)
 }
 
 // TODO: create a readOnly version of this method or inject a property
@@ -151,6 +152,13 @@ export async function runCypherQuery(
         return 'Loading took too long. Please reload page.';
       }
 
+      if (e.message.startsWith('WebSocket connection failure.')) {
+        setStatus(QueryStatus.INACTIVE);
+        setRecords([{ error: 'Access token timed out. Please reload report or complete page.' }]);
+        transaction.rollback();
+        return 'Access token timed out. Please reload report or complete page.';
+      }
+
       setStatus(QueryStatus.ERROR);
       // Process other errors.
       if (setRecords) {