From b4e7c5f3fe1fe912e2fd6a612271c9b772cc33ca Mon Sep 17 00:00:00 2001
From: testa113 <aliharriss1995@gmail.com>
Date: Mon, 16 Oct 2023 20:16:53 +0100
Subject: [PATCH] use portainer errors for mapped functions

---
 app/react/kubernetes/cluster/getIsRBACEnabled.ts       |  5 ++---
 .../ingressClass/useIngressControllerClassMap.ts       | 10 +++-------
 app/react/kubernetes/configs/configmap.service.ts      |  3 ++-
 app/react/kubernetes/configs/secret.service.ts         |  6 ++----
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/react/kubernetes/cluster/getIsRBACEnabled.ts b/app/react/kubernetes/cluster/getIsRBACEnabled.ts
index 67751786d..c36783a67 100644
--- a/app/react/kubernetes/cluster/getIsRBACEnabled.ts
+++ b/app/react/kubernetes/cluster/getIsRBACEnabled.ts
@@ -1,7 +1,6 @@
 import { useQuery } from 'react-query';
 
-import PortainerError from '@/portainer/error';
-import axios from '@/portainer/services/axios';
+import axios, { parseAxiosError } from '@/portainer/services/axios';
 import { EnvironmentId } from '@/react/portainer/environments/types';
 import { withError } from '@/react-tools/react-query';
 
@@ -23,6 +22,6 @@ export async function getIsRBACEnabled(environmentId: EnvironmentId) {
     );
     return data;
   } catch (e) {
-    throw new PortainerError('Unable to check if RBAC is enabled.', e as Error);
+    throw parseAxiosError(e, 'Unable to check if RBAC is enabled.');
   }
 }
diff --git a/app/react/kubernetes/cluster/ingressClass/useIngressControllerClassMap.ts b/app/react/kubernetes/cluster/ingressClass/useIngressControllerClassMap.ts
index 64fe37394..145b5c422 100644
--- a/app/react/kubernetes/cluster/ingressClass/useIngressControllerClassMap.ts
+++ b/app/react/kubernetes/cluster/ingressClass/useIngressControllerClassMap.ts
@@ -1,8 +1,7 @@
 import { useQuery } from 'react-query';
 
 import { EnvironmentId } from '@/react/portainer/environments/types';
-import PortainerError from '@/portainer/error';
-import axios from '@/portainer/services/axios';
+import axios, { parseAxiosError } from '@/portainer/services/axios';
 import { withError } from '@/react-tools/react-query';
 
 import { IngressControllerClassMap } from './types';
@@ -61,7 +60,7 @@ export async function getIngressControllerClassMap({
     );
     return controllerMaps;
   } catch (e) {
-    throw new PortainerError('Unable to get ingress controllers.', e as Error);
+    throw parseAxiosError(e, 'Unable to get ingress controllers.');
   }
 }
 
@@ -77,10 +76,7 @@ export async function updateIngressControllerClassMap(
     >(buildUrl(environmentId, namespace), ingressControllerClassMap);
     return controllerMaps;
   } catch (e) {
-    throw new PortainerError(
-      'Unable to update ingress controllers.',
-      e as Error
-    );
+    throw parseAxiosError(e, 'Unable to update ingress controllers.');
   }
 }
 
diff --git a/app/react/kubernetes/configs/configmap.service.ts b/app/react/kubernetes/configs/configmap.service.ts
index 961adc55b..0d4ff73b3 100644
--- a/app/react/kubernetes/configs/configmap.service.ts
+++ b/app/react/kubernetes/configs/configmap.service.ts
@@ -10,6 +10,7 @@ import {
 } from '@/portainer/services/notifications';
 import { isFulfilled, isRejected } from '@/portainer/helpers/promise-utils';
 import { pluralize } from '@/portainer/helpers/strings';
+import PortainerError from '@/portainer/error';
 
 import { parseKubernetesAxiosError } from '../axiosError';
 
@@ -127,7 +128,7 @@ async function getConfigMapsForCluster(
     );
     return configMaps.flat();
   } catch (e) {
-    throw parseKubernetesAxiosError(e, 'Unable to retrieve ConfigMaps');
+    throw new PortainerError('Unable to retrieve ConfigMaps', e);
   }
 }
 
diff --git a/app/react/kubernetes/configs/secret.service.ts b/app/react/kubernetes/configs/secret.service.ts
index 162288e25..f808366a2 100644
--- a/app/react/kubernetes/configs/secret.service.ts
+++ b/app/react/kubernetes/configs/secret.service.ts
@@ -10,6 +10,7 @@ import {
 } from '@/portainer/services/notifications';
 import { isFulfilled, isRejected } from '@/portainer/helpers/promise-utils';
 import { pluralize } from '@/portainer/helpers/strings';
+import PortainerError from '@/portainer/error';
 
 import { parseKubernetesAxiosError } from '../axiosError';
 
@@ -123,10 +124,7 @@ async function getSecretsForCluster(
     );
     return secrets.flat();
   } catch (e) {
-    throw parseKubernetesAxiosError(
-      e as Error,
-      'Unable to retrieve secrets for cluster'
-    );
+    throw new PortainerError('Unable to retrieve secrets for cluster', e);
   }
 }