fix: Enhance error handling in the UI (#3158)

* Enhance error handling by including the message content from the response Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix tests Signed-off-by: at670475 <andrea.tabone@broadcom.com> --------- Signed-off-by: at670475 <andrea.tabone@broadcom.com>
zowe · Oct 23, 2023 · ee39a4b · ee39a4b
1 parent a071593
commit ee39a4b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/api-catalog-ui/frontend/src/components/Error/ErrorDialog.jsx b/api-catalog-ui/frontend/src/components/Error/ErrorDialog.jsx
@@ -26,8 +26,8 @@ export default class ErrorDialog extends Component {
         }
         // eslint-disable-next-line global-require
         const errorMessages = require('../../error-messages.json');
-        if (error && error.messageNumber && error.messageType) {
-            messageText = 'Unexpected error, please try again later';
+        if (error?.messageNumber && error?.messageType && error?.messageContent) {
+            messageText = `(${error.messageNumber} ${error.messageContent})`;
             const filter = errorMessages.messages.filter(
                 (x) => x.messageKey != null && x.messageKey === error.messageNumber
             );

diff --git a/api-catalog-ui/frontend/src/components/Login/Login.jsx b/api-catalog-ui/frontend/src/components/Login/Login.jsx
@@ -69,13 +69,8 @@ function Login(props) {
         let invalidCredentials;
         // eslint-disable-next-line global-require
         const errorMessages = require('../../error-messages.json');
-        if (
-            error.messageNumber !== undefined &&
-            error.messageNumber !== null &&
-            error.messageType !== undefined &&
-            error.messageType !== null
-        ) {
-            messageText = `Unexpected error, please try again later (${error.messageNumber})`;
+        if (error?.messageNumber && error?.messageType && error?.messageContent) {
+            messageText = `(${error.messageNumber}) ${error.messageContent}`;
             const filter = errorMessages.messages.filter(
                 (x) => x.messageKey != null && x.messageKey === error.messageNumber
             );

diff --git a/api-catalog-ui/frontend/src/components/Login/Login.test.jsx b/api-catalog-ui/frontend/src/components/Login/Login.test.jsx
@@ -21,6 +21,7 @@ describe('>>> Login page component tests', () => {
                     error: {
                         messageNumber: 'ZWEAT412E',
                         messageType: 'ERROR',
+                        messageContent: 'Some error',
                     },
                     expired: true,
                 }}
@@ -39,6 +40,7 @@ describe('>>> Login page component tests', () => {
                     error: {
                         messageNumber: 'ZWEAT604E',
                         messageType: 'ERROR',
+                        messageContent: 'Some error',
                     },
                     expired: true,
                 }}
@@ -55,6 +57,7 @@ describe('>>> Login page component tests', () => {
                     error: {
                         messageNumber: 'ZWEAT414E',
                         messageType: 'ERROR',
+                        messageContent: 'Some error',
                     },
                 }}
             />
@@ -72,6 +75,7 @@ describe('>>> Login page component tests', () => {
                     error: {
                         messageNumber: 'ZWEAT414E',
                         messageType: 'ERROR',
+                        messageContent: 'Some error',
                     },
                 }}
             />