Site services clean up

client/src/components/Manifest/GeneralInfo/ManifestStatusSelect.spec.tsx

@@ -7,11 +7,11 @@ import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
 import { createMockHandler, createMockSite } from 'test-utils/fixtures';
 import { createMockProfileResponse } from 'test-utils/fixtures/mockUser';
-import { userApiMocks } from 'test-utils/mock';
-import { API_BASE_URL } from 'test-utils/mock/htApiMocks';
+import { mockUserEndpoints } from 'test-utils/mock';
+import { API_BASE_URL } from 'test-utils/mock/mockSiteEndpoints';
 import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
 
-const server = setupServer(...userApiMocks);
+const server = setupServer(...mockUserEndpoints);
 afterEach(() => cleanup());
 beforeAll(() => server.listen());
 afterAll(() => server.close()); // Disable API mocking after the tests are done.

client/src/components/Manifest/GeneralInfo/ManifestTypeField.spec.tsx

@@ -5,10 +5,10 @@ import { setupServer } from 'msw/node';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
 import { createMockHandler } from 'test-utils/fixtures';
-import { userApiMocks } from 'test-utils/mock';
+import { mockUserEndpoints } from 'test-utils/mock';
 import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
 
-const server = setupServer(...userApiMocks);
+const server = setupServer(...mockUserEndpoints);
 afterEach(() => cleanup());
 beforeAll(() => server.listen());
 afterAll(() => server.close()); // Disable API mocking after the tests are done.

client/src/components/Manifest/Handler/Search/HandlerSearchForm.spec.tsx

@@ -6,8 +6,8 @@ import '@testing-library/jest-dom';
 import { HaztrakProfileResponse } from 'store/userSlice/user.slice';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
 import { createMockRcrainfoSite } from 'test-utils/fixtures';
-import { userApiMocks } from 'test-utils/mock';
-import { API_BASE_URL } from 'test-utils/mock/htApiMocks';
+import { mockUserEndpoints } from 'test-utils/mock';
+import { API_BASE_URL } from 'test-utils/mock/mockSiteEndpoints';
 import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
 import { HandlerSearchForm } from './HandlerSearchForm';
 
@@ -45,7 +45,7 @@ export const mockHandlerSearches = [
   }),
 ];
 
-const server = setupServer(...userApiMocks, ...mockHandlerSearches);
+const server = setupServer(...mockUserEndpoints, ...mockHandlerSearches);
 afterEach(() => {
   cleanup();
 });

client/src/components/Manifest/ManifestForm.spec.tsx

@@ -2,13 +2,13 @@ import '@testing-library/jest-dom';
 import { fireEvent, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ManifestForm } from 'components/Manifest';
+import { setupServer } from 'msw/node';
 import React from 'react';
 import { cleanup, renderWithProviders } from 'test-utils';
+import { mockUserEndpoints, mockWasteEndpoints } from 'test-utils/mock';
 import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
-import { setupServer } from 'msw/node';
-import { userApiMocks, wasteApiMocks } from 'test-utils/mock';
 
-const server = setupServer(...userApiMocks, ...wasteApiMocks);
+const server = setupServer(...mockUserEndpoints, ...mockWasteEndpoints);
 afterEach(() => cleanup());
 beforeAll(() => server.listen());
 afterAll(() => server.close());

client/src/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx

@@ -7,7 +7,7 @@ import React from 'react';
 import { HaztrakProfileResponse } from 'store/userSlice/user.slice';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
 import { createMockMTNHandler } from 'test-utils/fixtures';
-import { userApiMocks } from 'test-utils/mock';
+import { mockUserEndpoints } from 'test-utils/mock';
 import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
 import { undefined } from 'zod';
 
@@ -21,7 +21,7 @@ const mockProfile: HaztrakProfileResponse = {
   },
 };
 
-const server = setupServer(...userApiMocks);
+const server = setupServer(...mockUserEndpoints);
 afterEach(() => cleanup());
 beforeAll(() => server.listen());
 afterAll(() => server.close()); // Disable API mocking after the tests are done.

client/src/components/Manifest/Transporter/TransporterTable.spec.tsx

@@ -5,7 +5,7 @@ import { setupServer } from 'msw/node';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
 import { createMockTransporter } from 'test-utils/fixtures';
-import { userApiMocks } from 'test-utils/mock';
+import { mockUserEndpoints } from 'test-utils/mock';
 import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
 import { TransporterTable } from './index';
 
@@ -24,7 +24,7 @@ const TRAN_ARRAY: Array<Transporter> = [
     ...createMockTransporter({ epaSiteId: HANDLER_ID_2, name: HANDLER_NAME_2, order: 2 }),
   },
 ];
-const server = setupServer(...userApiMocks);
+const server = setupServer(...mockUserEndpoints);
 afterEach(() => cleanup());
 beforeAll(() => server.listen());
 afterAll(() => server.close());

client/src/components/Manifest/WasteLine/WasteLineForm.spec.tsx

@@ -1,13 +1,13 @@
 import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
+import { setupServer } from 'msw/node';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
+import { mockUserEndpoints, mockWasteEndpoints } from 'test-utils/mock';
 import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
 import { WasteLineForm } from './WasteLineForm';
-import { setupServer } from 'msw/node';
-import { userApiMocks, wasteApiMocks } from 'test-utils/mock';
 
-const server = setupServer(...userApiMocks, ...wasteApiMocks);
+const server = setupServer(...mockUserEndpoints, ...mockWasteEndpoints);
 afterEach(() => {
   cleanup();
 });

client/src/components/Rcrainfo/buttons/SyncManifestBtn/SyncManifestBtn.spec.tsx

@@ -4,13 +4,13 @@ import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import React from 'react';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
-import { userApiMocks } from 'test-utils/mock';
-import { API_BASE_URL } from 'test-utils/mock/htApiMocks';
+import { mockUserEndpoints } from 'test-utils/mock';
+import { API_BASE_URL } from 'test-utils/mock/mockSiteEndpoints';
 import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest';
 
 const testTaskID = 'testTaskId';
 
-const server = setupServer(...userApiMocks);
+const server = setupServer(...mockUserEndpoints);
 server.use(
   http.post(`${API_BASE_URL}rcra/manifest/emanifest/sync`, () => {
     // Mock Sync Site Manifests response

client/src/components/User/UserInfoForm.spec.tsx

@@ -7,10 +7,10 @@ import React from 'react';
 import { HaztrakUser, ProfileSlice } from 'store';
 import { renderWithProviders, screen } from 'test-utils';
 import { createMockHaztrakUser } from 'test-utils/fixtures';
-import { userApiMocks } from 'test-utils/mock';
+import { mockUserEndpoints } from 'test-utils/mock';
 import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest';
 
-const server = setupServer(...userApiMocks);
+const server = setupServer(...mockUserEndpoints);
 
 // pre-/post-test hooks
 beforeAll(() => server.listen());

client/src/features/Dashboard/Dashboard.spec.tsx

@@ -3,13 +3,13 @@ import { Dashboard } from 'features/Dashboard/Dashboard';
 import { setupServer } from 'msw/node';
 import React, { createElement } from 'react';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
-import { userApiMocks } from 'test-utils/mock';
-import { htApiMocks } from 'test-utils/mock/htApiMocks';
+import { mockUserEndpoints } from 'test-utils/mock';
+import { mockSiteEndpoints } from 'test-utils/mock/mockSiteEndpoints';
 import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest';
 
 const USERNAME = 'testuser1';
 
-const server = setupServer(...htApiMocks, ...userApiMocks);
+const server = setupServer(...mockSiteEndpoints, ...mockUserEndpoints);
 
 beforeAll(() => {
   vi.mock('recharts', async (importOriginal) => {

client/src/features/NewManifest/NewManifest.spec.tsx

@@ -7,8 +7,8 @@ import React from 'react';
 import { HaztrakProfileResponse } from 'store/userSlice/user.slice';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
 import { createMockSite } from 'test-utils/fixtures';
-import { userApiMocks } from 'test-utils/mock';
-import { API_BASE_URL } from 'test-utils/mock/htApiMocks';
+import { mockUserEndpoints } from 'test-utils/mock';
+import { API_BASE_URL } from 'test-utils/mock/mockSiteEndpoints';
 import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
 
 const mySiteId = 'VATESTGEN001';
@@ -29,7 +29,7 @@ const mockProfile: HaztrakProfileResponse = {
   },
 };
 
-const server = setupServer(...userApiMocks);
+const server = setupServer(...mockUserEndpoints);
 server.use(
   http.get(`${API_BASE_URL}/api/user/profile`, () => {
     return HttpResponse.json({ ...mockProfile }, { status: 200 });

client/src/features/SiteList/SiteList.spec.tsx

@@ -3,7 +3,7 @@ import { setupServer } from 'msw/node';
 import React from 'react';
 import { renderWithProviders, screen } from 'test-utils';
 import { createMockHandler, createMockSite } from 'test-utils/fixtures/mockHandler';
-import { htApiMocks, userApiMocks } from 'test-utils/mock';
+import { mockSiteEndpoints, mockUserEndpoints } from 'test-utils/mock';
 import { afterAll, beforeAll, describe, expect, test } from 'vitest';
 import { SiteList } from './SiteList';
 
@@ -13,7 +13,7 @@ const mockSites = [
   createMockSite({ handler: mockHandler1 }),
   createMockSite({ handler: mockHandler2 }),
 ];
-const server = setupServer(...userApiMocks, ...htApiMocks);
+const server = setupServer(...mockUserEndpoints, ...mockSiteEndpoints);
 
 // pre-/post-test hooks
 beforeAll(() => server.listen());

client/src/hooks/manifest/useSaveManifest/useSaveManifest.spec.tsx

@@ -1,14 +1,14 @@
 import '@testing-library/jest-dom';
 import { cleanup, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { Manifest } from 'components/Manifest';
+import { setupServer } from 'msw/node';
 import React from 'react';
 import { renderWithProviders, screen } from 'test-utils';
+import { createMockManifest } from 'test-utils/fixtures';
+import { mockManifestEndpoints } from 'test-utils/mock';
 import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
 import { useSaveManifest } from './useSaveManifest';
-import { Manifest } from 'components/Manifest';
-import userEvent from '@testing-library/user-event';
-import { createMockManifest } from 'test-utils/fixtures';
-import { setupServer } from 'msw/node';
-import { manifestMocks } from 'test-utils/mock';
 
 const TestComponent = ({ manifest }: { manifest?: Manifest }) => {
   const { data, isLoading, error, taskId, saveManifest } = useSaveManifest();
@@ -24,7 +24,7 @@ const TestComponent = ({ manifest }: { manifest?: Manifest }) => {
   );
 };
 
-const server = setupServer(...manifestMocks);
+const server = setupServer(...mockManifestEndpoints);
 beforeAll(() => server.listen());
 afterAll(() => server.close());
 afterEach(() => cleanup());

client/src/hooks/useUserSiteIds/useUserSiteIds.spec.tsx

@@ -7,8 +7,8 @@ import React from 'react';
 import { renderWithProviders, screen } from 'test-utils';
 import { createMockHandler, createMockSite } from 'test-utils/fixtures';
 import { createMockProfileResponse } from 'test-utils/fixtures/mockUser';
-import { userApiMocks, wasteApiMocks } from 'test-utils/mock';
-import { API_BASE_URL } from 'test-utils/mock/htApiMocks';
+import { mockUserEndpoints, mockWasteEndpoints } from 'test-utils/mock';
+import { API_BASE_URL } from 'test-utils/mock/mockSiteEndpoints';
 import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
 
 function TestComponent() {
@@ -23,7 +23,7 @@ function TestComponent() {
   );
 }
 
-const server = setupServer(...userApiMocks, ...wasteApiMocks);
+const server = setupServer(...mockUserEndpoints, ...mockWasteEndpoints);
 beforeAll(() => server.listen());
 afterAll(() => server.close());
 afterEach(() => cleanup());

client/src/store/htApi.slice.ts

@@ -127,7 +127,10 @@ export const haztrakApi = createApi({
       providesTags: ['site'],
     }),
     getMTN: build.query<Array<MtnDetails>, string | undefined>({
-      query: (siteId) => ({ url: siteId ? `rcra/mtn/${siteId}` : 'rcra/mtn', method: 'get' }),
+      query: (siteId) => ({
+        url: siteId ? `rcra/manifest/mtn/${siteId}` : 'rcra/manifest/mtn',
+        method: 'get',
+      }),
       providesTags: ['manifest'],
     }),
     getManifest: build.query<Manifest, string>({

client/src/store/userSlice/user.slice.spec.tsx

@@ -4,10 +4,10 @@ import { setupServer } from 'msw/node';
 import { useEffect, useState } from 'react';
 import { useGetUserQuery, useUpdateUserMutation } from 'store';
 import { cleanup, renderWithProviders, screen } from 'test-utils';
-import { userApiMocks } from 'test-utils/mock';
+import { mockUserEndpoints } from 'test-utils/mock';
 import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
 
-const server = setupServer(...userApiMocks);
+const server = setupServer(...mockUserEndpoints);
 afterEach(() => {
   cleanup();
 });

client/src/test-utils/mock/index.ts

@@ -1,4 +1,4 @@
-export { userApiMocks } from './userApiMocks';
-export { htApiMocks } from './htApiMocks';
-export { wasteApiMocks } from './wasteApiMocks';
-export { manifestMocks } from './manifestMocks';
+export { mockUserEndpoints } from 'test-utils/mock/mockUserEndpoints';
+export { mockSiteEndpoints } from 'test-utils/mock/mockSiteEndpoints';
+export { mockWasteEndpoints } from 'test-utils/mock/mockWasteEndpoints';
+export { mockManifestEndpoints } from 'test-utils/mock/mockManifestEndpoints';

client/src/test-utils/mock/manifestMocks.ts → client/src/test-utils/mock/mockManifestEndpoints.ts

@@ -1,11 +1,15 @@
+import { Manifest } from 'components/Manifest';
 import { http, HttpResponse } from 'msw';
 import { createMockManifest } from '../fixtures';
-import { Manifest } from 'components/Manifest';
 
 export const API_BASE_URL = import.meta.env.VITE_HT_API_URL;
 const mockMTN = createMockManifest().manifestTrackingNumber;
 
-export const manifestMocks = [
+const generateRandomMTN = (): string => {
+  return Math.floor(100000000 + Math.random() * 900000000).toString();
+};
+
+export const mockManifestEndpoints = [
   /** mock GET Manifest*/
   http.get(`${API_BASE_URL}/api/rcra/manifest/${mockMTN}`, (info) => {
     return HttpResponse.json(createMockManifest(), { status: 200 });
@@ -14,10 +18,7 @@ export const manifestMocks = [
   http.post(`${API_BASE_URL}/api/rcra/manifest`, async (info) => {
     let bodyManifest = (await info.request.json()) as Manifest;
     if (!bodyManifest.manifestTrackingNumber)
-      bodyManifest.manifestTrackingNumber = `${Math.floor(Math.random() * 1000000000)}DFT`.padEnd(
-        9,
-        '0'
-      );
+      bodyManifest.manifestTrackingNumber = `${generateRandomMTN()}DFT`.padEnd(9, '0');
     return HttpResponse.json(bodyManifest, { status: 200 });
   }),
   /** Mock update local Manifests*/

client/src/test-utils/mock/mockSiteEndpoints.ts

@@ -0,0 +1,17 @@
+import { http, HttpResponse } from 'msw';
+import { createMockHandler, createMockSite } from '../fixtures';
+
+export const API_BASE_URL = import.meta.env.VITE_HT_API_URL;
+const mockEpaId = createMockHandler().epaSiteId;
+const mockSites = [createMockSite(), createMockSite()];
+
+export const mockSiteEndpoints = [
+  /** List user sites*/
+  http.get(`${API_BASE_URL}/api/site`, (info) => {
+    return HttpResponse.json(mockSites, { status: 200 });
+  }),
+  /** Site Details*/
+  http.get(`${API_BASE_URL}/api/site/${mockEpaId}`, (info) => {
+    return HttpResponse.json(mockSites[0], { status: 200 });
+  }),
+];

client/src/test-utils/mock/userApiMocks.ts → client/src/test-utils/mock/mockUserEndpoints.ts

@@ -9,7 +9,7 @@ import {
 
 /** mock Rest API*/
 const API_BASE_URL = import.meta.env.VITE_HT_API_URL;
-export const userApiMocks = [
+export const mockUserEndpoints = [
   /** GET User */
   http.get(`${API_BASE_URL}/api/user`, () => {
     return HttpResponse.json({ ...createMockHaztrakUser() }, { status: 200 });

client/src/test-utils/mock/wasteApiMocks.ts → client/src/test-utils/mock/mockWasteEndpoints.ts

@@ -3,7 +3,7 @@ import { mockDotIdNumbers, mockFederalWasteCodes } from 'test-utils/fixtures/moc
 
 /** mock Rest API*/
 const API_BASE_URL = import.meta.env.VITE_HT_API_URL;
-export const wasteApiMocks = [
+export const mockWasteEndpoints = [
   /** GET User */
   http.get(`${API_BASE_URL}/api/rcra/waste/code/federal`, (info) => {
     return HttpResponse.json(mockFederalWasteCodes, { status: 200 });