psp-7275 completing a disposition file.

# Conflicts: # source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.test.tsx # source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/update/UpdateDispositionForm.test.tsx # source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/update/__snapshots__/UpdateDispositionForm.test.tsx.snap # source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/OffersAndSaleView.test.tsx
bcgov · Feb 9, 2024 · 1002fdc · 1002fdc
1 parent c3fb4fe
commit 1002fdc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.test.tsx b/source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.test.tsx
@@ -1,6 +1,7 @@
 import { DispositionFileStatus } from '@/constants/dispositionFileStatus';
 import { Claims, Roles } from '@/constants/index';
 import { mockDispositionFileResponse } from '@/mocks/dispositionFiles.mock';
+import { Api_DispositionFile } from '@/models/api/DispositionFile';
 import { render, RenderOptions, userEvent } from '@/utils/test-utils';
 
 import DispositionMenu, { IDispositionMenuProps } from './DispositionMenu';
@@ -43,7 +44,7 @@ describe('DispositionMenu component', () => {
 
   it('matches snapshot', () => {
     const { asFragment } = setup({
-      dispositionFile: mockDispositionFileResponse(),
+      dispositionFile: mockDispositionFileResponse() as unknown as Api_DispositionFile,
       items: testData,
       selectedIndex: 0,
     });
@@ -52,7 +53,7 @@ describe('DispositionMenu component', () => {
 
   it('renders the items ', () => {
     const { getByText } = setup({
-      dispositionFile: mockDispositionFileResponse(),
+      dispositionFile: mockDispositionFileResponse() as unknown as Api_DispositionFile,
       items: testData,
       selectedIndex: 0,
     });
@@ -64,7 +65,7 @@ describe('DispositionMenu component', () => {
 
   it('renders selected item with different style', () => {
     const { getByTestId } = setup({
-      dispositionFile: mockDispositionFileResponse(),
+      dispositionFile: mockDispositionFileResponse() as unknown as Api_DispositionFile,
       items: testData,
       selectedIndex: 1,
     });
@@ -76,7 +77,7 @@ describe('DispositionMenu component', () => {
 
   it('allows the selected item to be changed', () => {
     const { getByText } = setup({
-      dispositionFile: mockDispositionFileResponse(),
+      dispositionFile: mockDispositionFileResponse() as unknown as Api_DispositionFile,
       items: testData,
       selectedIndex: 1,
     });
@@ -90,7 +91,7 @@ describe('DispositionMenu component', () => {
   it(`renders the edit button for users with property edit permissions`, () => {
     const { getByTitle, queryByTestId } = setup(
       {
-        dispositionFile: mockDispositionFileResponse(),
+        dispositionFile: mockDispositionFileResponse() as unknown as Api_DispositionFile,
         items: testData,
         selectedIndex: 1,
       },
@@ -110,7 +111,7 @@ describe('DispositionMenu component', () => {
   it(`doesn't render the edit button for users without edit permissions`, () => {
     const { queryByTitle, queryByTestId } = setup(
       {
-        dispositionFile: mockDispositionFileResponse(),
+        dispositionFile: mockDispositionFileResponse() as unknown as Api_DispositionFile,
         items: testData,
         selectedIndex: 1,
       },
@@ -127,7 +128,7 @@ describe('DispositionMenu component', () => {
     const { queryByTitle, queryByTestId } = setup(
       {
         dispositionFile: {
-          ...mockDispositionFileResponse(),
+          ...(mockDispositionFileResponse() as unknown as Api_DispositionFile),
           fileStatusTypeCode: { id: DispositionFileStatus.Complete },
         },
         items: testData,
@@ -146,7 +147,7 @@ describe('DispositionMenu component', () => {
     const { queryByTitle, queryByTestId } = setup(
       {
         dispositionFile: {
-          ...mockDispositionFileResponse(),
+          ...(mockDispositionFileResponse() as unknown as Api_DispositionFile),
           fileStatusTypeCode: { id: DispositionFileStatus.Complete },
         },
         items: testData,

diff --git a/...c/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.test.tsx b/...c/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.test.tsx
@@ -62,7 +62,7 @@ describe('DispositionSummaryView component', () => {
 
   it('does not render the edit button for users that do not have disposition edit permissions', async () => {
     const { queryByTitle, queryByTestId } = setup(
-      { dispositionFile: mockDispositionFileResponse() },
+      { dispositionFile: mockDispositionFileResponse() as unknown as Api_DispositionFile },
       { claims: [] },
     );
     await waitForEffects();
@@ -76,7 +76,7 @@ describe('DispositionSummaryView component', () => {
     const { queryByTitle, queryByTestId } = setup(
       {
         dispositionFile: {
-          ...mockDispositionFileResponse(),
+          ...(mockDispositionFileResponse() as unknown as Api_DispositionFile),
           fileStatusTypeCode: { id: DispositionFileStatus.Complete },
         },
       },
@@ -93,7 +93,7 @@ describe('DispositionSummaryView component', () => {
     const { queryByTitle, queryByTestId } = setup(
       {
         dispositionFile: {
-          ...mockDispositionFileResponse(),
+          ...(mockDispositionFileResponse() as unknown as Api_DispositionFile),
           fileStatusTypeCode: { id: DispositionFileStatus.Complete },
         },
       },

diff --git a/...s/offersAndSale/dispositionOffer/dispositionOfferDetails/DispositionOfferDetails.test.tsx b/...s/offersAndSale/dispositionOffer/dispositionOfferDetails/DispositionOfferDetails.test.tsx
@@ -7,6 +7,7 @@ import {
   mockDispositionFileOfferApi,
   mockDispositionFileResponse,
 } from '@/mocks/dispositionFiles.mock';
+import { Api_DispositionFile } from '@/models/api/DispositionFile';
 import { act, render, RenderOptions, userEvent, waitFor } from '@/utils/test-utils';
 
 import DispositionOfferDetails, { IDispositionOfferDetailsProps } from './DispositionOfferDetails';
@@ -28,7 +29,10 @@ describe('Disposition Offer Detail View component', () => {
         index={0}
         dispositionOffer={renderOptions.props?.dispositionOffer ?? mockDispositionOffer}
         onDelete={onDelete}
-        dispositionFile={renderOptions.props?.dispositionFile ?? mockDispositionFileResponse()}
+        dispositionFile={
+          renderOptions.props?.dispositionFile ??
+          (mockDispositionFileResponse() as unknown as Api_DispositionFile as unknown as Api_DispositionFile)
+        }
       />,
       {
         ...renderOptions,
@@ -85,7 +89,7 @@ describe('Disposition Offer Detail View component', () => {
       claims: [Claims.DISPOSITION_EDIT],
       props: {
         dispositionFile: {
-          ...mockDispositionFileResponse(),
+          ...(mockDispositionFileResponse() as unknown as Api_DispositionFile),
           fileStatusTypeCode: { id: DispositionFileStatus.Complete },
         },
       },
@@ -104,7 +108,7 @@ describe('Disposition Offer Detail View component', () => {
       roles: [Roles.SYSTEM_ADMINISTRATOR],
       props: {
         dispositionFile: {
-          ...mockDispositionFileResponse(),
+          ...(mockDispositionFileResponse() as unknown as Api_DispositionFile),
           fileStatusTypeCode: { id: DispositionFileStatus.Complete },
         },
       },