diff --git a/src/App.tsx b/src/App.tsx index 7559d9155..ccacb0e2f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -161,9 +161,7 @@ let router: Router; const isUsingMSW = import.meta.env.DEV || import.meta.env.VITE_APP_INCLUDE_MSW === 'true'; -if (!isUsingMSW) { - router = createBrowserRouter(routeObject); -} +if (!isUsingMSW) router = createBrowserRouter(routeObject); // If the application is using MSW (Mock Service Worker), // it creates the router using `createBrowserRouter` within the App so it can wait for MSW to load. This is necessary @@ -171,10 +169,7 @@ if (!isUsingMSW) { // environment, this is not needed. export default function App() { - if (isUsingMSW) { - router = createBrowserRouter(routeObject); - return ; - } + if (isUsingMSW) router = createBrowserRouter(routeObject); return ; } diff --git a/src/api/manufacturers.tsx b/src/api/manufacturers.tsx index 67ed65002..b862826bc 100644 --- a/src/api/manufacturers.tsx +++ b/src/api/manufacturers.tsx @@ -76,12 +76,12 @@ const getManufacturer = async (id: string): Promise => { .get(`/v1/manufacturers/${id}`) .then((response) => response.data); }; -export const getManufacturerQuery = (id?: string | null, loader?: boolean) => +export const getManufacturerQuery = (id?: string | null, retry?: boolean) => queryOptions({ queryKey: ['Manufacturer', id], queryFn: () => getManufacturer(id ?? ''), enabled: !!id, - retry: loader ? false : undefined, + retry: retry ? false : undefined, }); export const useGetManufacturer = ( diff --git a/src/app.types.tsx b/src/app.types.tsx index 385ffe788..64087fc00 100644 --- a/src/app.types.tsx +++ b/src/app.types.tsx @@ -41,6 +41,9 @@ export interface AllowedValuesList { values: { av_placement_id: string; value: any }[]; }; } + +// ------------------------------------ CATALOGUE CATEGORIES ------------------------------------ + export type AllowedValues = AllowedValuesList; export interface AddCatalogueCategoryProperty { diff --git a/src/manufacturer/manufacturerLayout.component.test.tsx b/src/manufacturer/manufacturerLayout.component.test.tsx index d2ace0be0..f45a56ec2 100644 --- a/src/manufacturer/manufacturerLayout.component.test.tsx +++ b/src/manufacturer/manufacturerLayout.component.test.tsx @@ -48,7 +48,7 @@ describe('Manufacturer Layout', () => { expect(mockedUseNavigate).toHaveBeenCalledTimes(1); expect(mockedUseNavigate).toHaveBeenCalledWith('/manufacturers'); }); - it('navigates back to the root directory from landing page', async () => { + it('navigates back to the root directory from landing page', async () => { createView('/manufacturers/1', true); await waitFor(() => {