From 612222f24ce575d09e4a3044d592f1bbe258b8dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus=20N=C3=A4veke?= <github@naeveke.de>
Date: Thu, 15 Aug 2024 08:03:03 +0200
Subject: [PATCH 1/2] Update Card.tsx

Unify punctuation
---
 src/card/Card.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/card/Card.tsx b/src/card/Card.tsx
index fe6ffe0d9..ae89d2eee 100644
--- a/src/card/Card.tsx
+++ b/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.
 }) => {
   // Will be used to fetch the list of current databases

From ee8f6587ad490eccc71deec4567f7484580977d4 Mon Sep 17 00:00:00 2001
From: Monish Nandakumaran <monish.nandakumaran@mercedes-benz.com>
Date: Thu, 19 Sep 2024 14:42:16 +0530
Subject: [PATCH 2/2] inactive or access token failure

---
 src/report/Report.tsx           | 2 ++
 src/report/ReportQueryRunner.ts | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/report/Report.tsx b/src/report/Report.tsx
index 29523a13f..2101858a8 100644
--- a/src/report/Report.tsx
+++ b/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
diff --git a/src/report/ReportQueryRunner.ts b/src/report/ReportQueryRunner.ts
index 5bf8afb82..403bbc2ba 100644
--- a/src/report/ReportQueryRunner.ts
+++ b/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) {