From 4d66c3c521572db35482c1928a2d64cd211b4d9f Mon Sep 17 00:00:00 2001
From: Bassel Kanso <basselkanso82@gmail.com>
Date: Wed, 24 Apr 2024 09:25:54 +0300
Subject: [PATCH] chore: make packages build

---
 .../hooks/tests/useAPIErrorHandler.test.ts    | 42 ++++++++++---------
 .../admin/src/services/baseQuery.ts           |  5 +--
 .../review-workflows/admin/src/utils/api.ts   |  8 ++--
 .../plugins/i18n/admin/src/utils/baseQuery.ts |  8 ++--
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/packages/core/admin/admin/src/hooks/tests/useAPIErrorHandler.test.ts b/packages/core/admin/admin/src/hooks/tests/useAPIErrorHandler.test.ts
index 3de7d28cd9..6869ba3066 100644
--- a/packages/core/admin/admin/src/hooks/tests/useAPIErrorHandler.test.ts
+++ b/packages/core/admin/admin/src/hooks/tests/useAPIErrorHandler.test.ts
@@ -19,11 +19,12 @@ describe('useAPIErrorHandler', () => {
 
     const message = result.current.formatAPIError(
       new FetchError('Error occured', {
-        data: null,
-        error: {
-          name: 'ApplicationError',
-          message: 'Field contains errors',
-          details: {},
+        data: {
+          error: {
+            name: 'ApplicationError',
+            message: 'Field contains errors',
+            details: {},
+          },
         },
       })
     );
@@ -36,22 +37,23 @@ describe('useAPIErrorHandler', () => {
 
     const message = result.current.formatAPIError(
       new FetchError('Fetch Error Occured', {
-        data: null,
-        error: {
-          name: 'ValidationError',
-          message: '',
-          details: {
-            errors: [
-              {
-                path: ['field', '0', 'name'],
-                message: 'Field contains errors',
-              },
+        data: {
+          error: {
+            name: 'ValidationError',
+            message: '',
+            details: {
+              errors: [
+                {
+                  path: ['field', '0', 'name'],
+                  message: 'Field contains errors',
+                },
 
-              {
-                path: ['field'],
-                message: 'Field must be unique',
-              },
-            ],
+                {
+                  path: ['field'],
+                  message: 'Field must be unique',
+                },
+              ],
+            },
           },
         },
       })
diff --git a/packages/core/content-releases/admin/src/services/baseQuery.ts b/packages/core/content-releases/admin/src/services/baseQuery.ts
index 48bae28afa..f623f3c4c8 100644
--- a/packages/core/content-releases/admin/src/services/baseQuery.ts
+++ b/packages/core/content-releases/admin/src/services/baseQuery.ts
@@ -35,10 +35,9 @@ const fetchBaseQuery = async <TData = unknown, TSend = unknown>({
      * Default is GET.
      */
     const result = await get<TData>(url, config);
-    console.log('baseQuery', result);
+
     return { data: result.data };
   } catch (error) {
-    console.log('did we arrive here for some reason ?');
     const err = error as FetchError;
     /**
      * Handle error of type FetchError
@@ -51,7 +50,7 @@ const fetchBaseQuery = async <TData = unknown, TSend = unknown>({
      */
     return {
       error: {
-        status: err.response?.error.status,
+        status: err.status,
         code: err.code,
         response: {
           data: err.response?.data,
diff --git a/packages/core/review-workflows/admin/src/utils/api.ts b/packages/core/review-workflows/admin/src/utils/api.ts
index 0e03055348..a6dc52b9ba 100644
--- a/packages/core/review-workflows/admin/src/utils/api.ts
+++ b/packages/core/review-workflows/admin/src/utils/api.ts
@@ -21,7 +21,7 @@ export interface UnknownApiError {
   status?: number;
 }
 
-export type BaseQueryError = ApiError | UnknownApiError;
+export type BaseQueryError = ApiError | UnknownApiError | SerializedError;
 
 const fetchBaseQuery =
   (): BaseQueryFn<string | QueryArguments, unknown, BaseQueryError> =>
@@ -95,8 +95,8 @@ const fetchBaseQuery =
             error: {
               name: 'UnknownError',
               message: 'There was an unknown error response from the API',
-              details: err.response?.data,
-              status: err.response?.error.status,
+              details: err.response,
+              status: err.status,
             } as UnknownApiError,
           };
         }
@@ -114,7 +114,7 @@ const fetchBaseQuery =
     }
   };
 
-const isBaseQueryError = (error: BaseQueryError | SerializedError): error is BaseQueryError => {
+const isBaseQueryError = (error: BaseQueryError): error is ApiError | UnknownApiError => {
   return error.name !== undefined;
 };
 
diff --git a/packages/plugins/i18n/admin/src/utils/baseQuery.ts b/packages/plugins/i18n/admin/src/utils/baseQuery.ts
index a99f6bdee2..e332ae617b 100644
--- a/packages/plugins/i18n/admin/src/utils/baseQuery.ts
+++ b/packages/plugins/i18n/admin/src/utils/baseQuery.ts
@@ -21,7 +21,7 @@ export interface UnknownApiError {
   status?: number;
 }
 
-export type BaseQueryError = ApiError | UnknownApiError;
+export type BaseQueryError = ApiError | UnknownApiError | SerializedError;
 
 const fetchBaseQuery =
   (): BaseQueryFn<string | QueryArguments, unknown, BaseQueryError> =>
@@ -95,8 +95,8 @@ const fetchBaseQuery =
             error: {
               name: 'UnknownError',
               message: 'There was an unknown error response from the API',
-              details: err.response?.data,
-              status: err.response?.error.status,
+              details: err.response,
+              status: err.status,
             } as UnknownApiError,
           };
         }
@@ -114,7 +114,7 @@ const fetchBaseQuery =
     }
   };
 
-const isBaseQueryError = (error: BaseQueryError | SerializedError): error is BaseQueryError => {
+const isBaseQueryError = (error: BaseQueryError): error is ApiError | UnknownApiError => {
   return error.name !== undefined;
 };