From 48c60f13958353894239bdb5716837fda693325f Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Tue, 16 Jul 2024 10:53:45 -0700 Subject: [PATCH] Correcting error messages to the user when max sessions reached. This will print proper error messages for other potential problems as well. --- public/dev/js/science_portal_core.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/public/dev/js/science_portal_core.js b/public/dev/js/science_portal_core.js index 8bc0840..50f6808 100644 --- a/public/dev/js/science_portal_core.js +++ b/public/dev/js/science_portal_core.js @@ -208,8 +208,9 @@ } _rApp.setNotAuthenticated(userState) } else { - var alertMsg = message.status + ": " + getRcDisplayText(message) - setPageState(pageSection,"danger", false, alertMsg) + const errorMessage = getRcDisplayText(message) + console.error(`${message.status}: ${errorMessage}`) + setPageState(pageSection, "danger", false, errorMessage) hideModal() } } @@ -308,17 +309,11 @@ displayText = "You are not authorised to use Skaha resources. Contact CANFAR admin" + " for information on how to get set up with a resource allocation and permission to access the service." break - case 400: - // Do as good a test for max number of sessions reached message from Skaha as possible: - if (request.responseText.includes("session already running")) { - displayText = "Limit of number of sessions of selected type reached" - break - } case 501: displayText = 'The Skaha web service is not configured in the Registry.' break; default: - displayText = request.responseText + displayText = request.responseText ? request.responseText.trim() : "Unknown error" break }