Merge branch 'nested-routes-for-admin-page-#1211' into nested-routes-…

…for-system-#1213

src/App.tsx

@@ -161,20 +161,15 @@ 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
 // because MSW needs to be running before the router is created to handle requests properly in the loader. In a production
 // environment, this is not needed.
 
 export default function App() {
-  if (isUsingMSW) {
-    router = createBrowserRouter(routeObject);
-    return <RouterProvider router={router} />;
-  }
+  if (isUsingMSW) router = createBrowserRouter(routeObject);
   return <RouterProvider router={router} />;
 }
 

src/api/manufacturers.tsx

@@ -76,12 +76,12 @@ const getManufacturer = async (id: string): Promise<Manufacturer> => {
     .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<Manufacturer, AxiosError>({
     queryKey: ['Manufacturer', id],
     queryFn: () => getManufacturer(id ?? ''),
     enabled: !!id,
-    retry: loader ? false : undefined,
+    retry: retry ? false : undefined,
   });
 
 export const useGetManufacturer = (

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 {

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(() => {