From c798c22288d6e387c8f53eced4e911469c5ddf28 Mon Sep 17 00:00:00 2001
From: Kirill Gaevskii <kgaevski@redhat.com>
Date: Thu, 18 Jan 2024 14:56:51 +0100
Subject: [PATCH] AAP-19344: add data types for errors in catch block (#786)

* AAP-19344: add data types for errors in catch block
---
 ansible_wisdom_console_react/src/ModelSettingsKey.tsx      | 7 ++++---
 ansible_wisdom_console_react/src/ModelSettingsModelId.tsx  | 7 ++++---
 ansible_wisdom_console_react/src/ModelSettingsOverview.tsx | 4 ++--
 ansible_wisdom_console_react/src/TelemetrySettings.tsx     | 6 ++++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ansible_wisdom_console_react/src/ModelSettingsKey.tsx b/ansible_wisdom_console_react/src/ModelSettingsKey.tsx
index 8d095fa7b..c6746e0c3 100644
--- a/ansible_wisdom_console_react/src/ModelSettingsKey.tsx
+++ b/ansible_wisdom_console_react/src/ModelSettingsKey.tsx
@@ -1,6 +1,7 @@
+import { AxiosError } from "axios";
 import React, { useCallback, useMemo, useState } from "react";
 import "./ModelSettings.css";
-import { WcaKey, WcaKeyRequest } from "./api/types";
+import { APIException, WcaKey, WcaKeyRequest } from "./api/types";
 import { saveWcaKey } from "./api/api";
 import { HasError, NO_ERROR } from "./ErrorModal";
 import { DELAY } from "./api/globals";
@@ -29,14 +30,14 @@ export const ModelSettingsKey = (props: ModelSettingsKeyProps) => {
         .then((_) => {
           reload();
         })
-        .catch((error) => {
+        .catch((error: AxiosError<APIException, any>) => {
           if (error.response?.status === 400) {
             setIsKeyInvalid(true);
           } else {
             setKeyError({
               inError: true,
               message: error.message,
-              detail: error.response?.data?.detail,
+              detail: error.response?.data?.detail ?? "",
             });
           }
         })
diff --git a/ansible_wisdom_console_react/src/ModelSettingsModelId.tsx b/ansible_wisdom_console_react/src/ModelSettingsModelId.tsx
index dadd0cdb0..2cf690539 100644
--- a/ansible_wisdom_console_react/src/ModelSettingsModelId.tsx
+++ b/ansible_wisdom_console_react/src/ModelSettingsModelId.tsx
@@ -1,6 +1,7 @@
+import { AxiosError } from "axios";
 import React, { useCallback, useMemo, useState } from "react";
 import "./ModelSettings.css";
-import { WcaModelId, WcaModelIdRequest } from "./api/types";
+import { APIException, WcaModelId, WcaModelIdRequest } from "./api/types";
 import { saveWcaModelId } from "./api/api";
 import { HasError, NO_ERROR } from "./ErrorModal";
 import { DELAY } from "./api/globals";
@@ -32,14 +33,14 @@ export const ModelSettingsModelId = (props: ModelSettingsModelIdProps) => {
         .then((_) => {
           reload();
         })
-        .catch((error) => {
+        .catch((error: AxiosError<APIException, any>) => {
           if (error.response?.status === 400) {
             setIsModelIdInvalid(true);
           } else {
             setModelIdError({
               inError: true,
               message: error.message,
-              detail: error.response?.data?.detail,
+              detail: error.response?.data?.detail ?? "",
             });
           }
         })
diff --git a/ansible_wisdom_console_react/src/ModelSettingsOverview.tsx b/ansible_wisdom_console_react/src/ModelSettingsOverview.tsx
index 90621de07..f831f858f 100644
--- a/ansible_wisdom_console_react/src/ModelSettingsOverview.tsx
+++ b/ansible_wisdom_console_react/src/ModelSettingsOverview.tsx
@@ -93,14 +93,14 @@ export const ModelSettingsOverview = (props: ModelSettingsOverviewProps) => {
       .then((_) => {
         alertsRef.current?.addAlert(t("KeyValidationSuccess"));
       })
-      .catch((error) => {
+      .catch((error: AxiosError<APIException, any>) => {
         if (error.response?.status === 400) {
           setIsKeyInvalid(true);
         } else {
           setKeyError({
             inError: true,
             message: error.message,
-            detail: error.response?.data?.detail,
+            detail: error.response?.data?.detail ?? "",
           });
         }
       })
diff --git a/ansible_wisdom_console_react/src/TelemetrySettings.tsx b/ansible_wisdom_console_react/src/TelemetrySettings.tsx
index 2f1abc840..604864b45 100644
--- a/ansible_wisdom_console_react/src/TelemetrySettings.tsx
+++ b/ansible_wisdom_console_react/src/TelemetrySettings.tsx
@@ -1,3 +1,4 @@
+import { AxiosError } from "axios";
 import React, {
   useCallback,
   useEffect,
@@ -25,6 +26,7 @@ import {
 } from "@patternfly/react-core";
 import "./ModelSettings.css";
 import {
+  APIException,
   Success,
   Telemetry,
   TelemetryRequest,
@@ -94,11 +96,11 @@ export function TelemetrySettings() {
           alertsRef.current?.addAlert(t("TelemetryOptInSaveSuccessAlert"));
         }
       })
-      .catch((error) => {
+      .catch((error: AxiosError<APIException, any>) => {
         setTelemetrySettingsError({
           inError: true,
           message: error.message,
-          detail: error.response?.data?.detail,
+          detail: error.response?.data?.detail ?? "",
         });
       })
       .finally(() => {