Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Psp 7614, 7657, 7626, 7610 assorted text corrections. #3737

Merged
merged 5 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/backend/api/Services/DispositionFileService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public PimsDispositionFile Update(long id, PimsDispositionFile dispositionFile,
var doNotAddToStatuses = new List<string>() { EnumDispositionFileStatusTypeCode.COMPLETE.ToString(), EnumDispositionFileStatusTypeCode.ARCHIVED.ToString() };
if (doNotAddToStatuses.Contains(dispositionFile.DispositionFileStatusTypeCode))
{
throw new UserOverrideException(UserOverrideCode.DispositionFileFinalStatus, "You are changing this file to a non-editable state. Only system administrators can edit the file when set to Archived, Cancelled or Completed state). Do you wish to continue?");
throw new UserOverrideException(UserOverrideCode.DispositionFileFinalStatus, "You are changing this file to a non-editable state. (Only system administrators can edit the file when set to Archived, Cancelled or Completed state). Do you wish to continue?");
}
}
if (!userOverrides.Contains(UserOverrideCode.UpdateRegion))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
mockAcquisitionFileOwnersResponse,
mockAcquisitionFileResponse,
} from '@/mocks/acquisitionFiles.mock';
import { mockApiPerson } from '@/mocks/filterData.mock';
import { getMockApiInterestHolders } from '@/mocks/interestHolders.mock';
import { mockLastUpdatedBy } from '@/mocks/lastUpdatedBy.mock';
import { mockLookups } from '@/mocks/lookups.mock';
Expand All @@ -29,6 +30,17 @@ import AcquisitionView, { IAcquisitionViewProps } from './AcquisitionView';
jest.mock('@react-keycloak/web');

jest.mock('@/components/common/mapFSM/MapStateMachineContext');
jest.mock('@/hooks/repositories/useComposedProperties', () => {
return {
useComposedProperties: jest.fn().mockResolvedValue({ apiWrapper: { response: {} } }),
PROPERTY_TYPES: {},
};
});
jest.mock('@/features/mapSideBar/hooks/usePropertyDetails', () => {
return {
usePropertyDetails: jest.fn(),
};
});

const onClose = jest.fn();
const onSave = jest.fn();
Expand Down Expand Up @@ -129,6 +141,16 @@ describe('AcquisitionView component', () => {
rest.get('/api/acquisitionfiles/:id/owners', (req, res, ctx) =>
res(ctx.delay(500), ctx.status(200), ctx.json(mockAcquisitionFileOwnersResponse())),
),
rest.get('/api/persons/concept/:id', (req, res, ctx) =>
res(ctx.delay(500), ctx.status(200), ctx.json(mockApiPerson)),
),
rest.get('/api/acquisitionfiles/:id/properties', (req, res, ctx) =>
res(
ctx.delay(500),
ctx.status(200),
ctx.json(mockAcquisitionFileResponse().fileProperties),
),
),
rest.get('/api/acquisitionfiles/:id/interestholders', (req, res, ctx) =>
res(ctx.delay(500), ctx.status(200), ctx.json(getMockApiInterestHolders())),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ const DispositionTeamSubForm: React.FunctionComponent<
...getDeleteModalProps(),
title: 'Remove Team Member',
message: 'Do you wish to remove this team member?',
okButtonText: 'Remove',
okButtonText: 'Yes',
cancelButtonText: 'No',
handleOk: async () => {
arrayHelpers.remove(index);
setDisplayModal(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('Disposition Offer Detail View component', () => {
props: { dispositionFile: mockDisposition, dispositionOffers: [] },
});
expect(
getByText(/There are no value details indicated with this disposition file/i),
getByText(/There are no sale details indicated with this disposition file/i),
).toBeVisible();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const OffersAndSaleContainerView: React.FunctionComponent<IOffersAndSaleContaine
</SectionField>
</>
) : (
<p>There are no value details indicated with this disposition file.</p>
<p>There are no Appraisal and Assessment details indicated with this disposition file.</p>
)}
</Section>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ exports[`Disposition Offer Detail View component renders as expected 1`] = `
class="collapse show"
>
<p>
There are no value details indicated with this disposition file.
There are no Appraisal and Assessment details indicated with this disposition file.
</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const DispositionOfferDetails: React.FunctionComponent<IDispositionOfferDetailsP
onClick={() => history.push(`${match.url}/offers/${dispositionOffer.id}/update`)}
/>
<StyledRemoveLinkButton
title="Delete Form 8"
title="Delete Offer"
data-testid={`Offer[${index}].delete-btn`}
variant="light"
onClick={() => {
Expand Down
Loading