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.

Sign up for GitHub

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

FSADT1-1139: Adjust "possible matching record" message for all use cases #749

Merged
merged 4 commits into from
Jan 18, 2024
Merged

FSADT1-1139: Adjust "possible matching record" message for all use cases #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14925ec
FSADT1-1139
mamartinezmejia Jan 18, 2024
55a5068
Merge branch 'main' into fix/fe/FSADT1-1139
mamartinezmejia Jan 18, 2024
3ecd7a5
Merge branch 'main' into fix/fe/FSADT1-1139
mamartinezmejia Jan 18, 2024
101d056
Adjusted Cypress test to the new changes
mamartinezmejia Jan 18, 2024
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
6 changes: 3 additions & 3 deletions frontend/cypress/e2e/SubmissionReviewPage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,21 +136,21 @@ describe('Submission Review Page', () => {
cy.get('cds-actionable-notification')
.should('exist')
.should('contain', "Review their information in the Client Management System to determine if this submission should be approved or rejected:")
.should('contain', `Legal name: ${testCase.incorporationName}`);
.should('contain', `Partial match on business name - Client number: ${testCase.incorporationName}`);
}

if(testCase.incorporationNumber){
cy.get('cds-actionable-notification')
.should('exist')
.should('contain', "Review their information in the Client Management System to determine if this submission should be approved or rejected:")
.should('contain', `Incorporation number: ${testCase.incorporationNumber}`);
.should('contain', `Partial match on incorporation number - Client number: ${testCase.incorporationNumber}`);
}

if(testCase.contact){
cy.get('cds-actionable-notification')
.should('exist')
.should('contain', "Review their information in the Client Management System to determine if this submission should be approved or rejected:")
.should('contain', `Contact: ${testCase.contact}`);
.should('contain', `Matching one or more contacts - Client number: ${testCase.contact}`);
}

cy.get('.grouping-15 > [kind="primary"]')
Expand Down
24 changes: 13 additions & 11 deletions frontend/src/pages/SubmissionReviewPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ const matchingData = computed(() => {
<a href="https://www.bcregistry.gov.bc.ca/"
target="_blank"
rel="noopener noreferrer">BC Registries</a>
and update it below
to determine if this submission should be approved or rejected.
</p>
</div>
</cds-actionable-notification>
Expand All @@ -341,32 +341,34 @@ const matchingData = computed(() => {
hide-close-button="true"
open="true"
kind="warning"
title="Possible matching record found"
title="Possible matching records found"
>
<div>
<p v-if="matchingData.length === 1" class="body-compact-01">
{{ matchingData.length }} similar client record was found.
Review their information in the Client Management System to determine if this submission should be approved or rejected:
</p>
<p v-else class="body-compact-01">
{{ matchingData.length }} similar client records were found.
<p class="body-compact-01">
{{ matchingData.length }} similar client record
<span v-if="matchingData.length === 1">was</span>
<span v-else>were</span>
found.
Review their information in the Client Management System to determine if this submission should be approved or rejected:
</p>
<ul class="bulleted-list-disc body-compact-01">
<li
v-for="duplicatedClient in data.matchers.corporationName?.split(',')"
:key="duplicatedClient">
Legal name: <a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
Partial match on business name - Client number:
<a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
</li>
<li
v-for="duplicatedClient in data.matchers.incorporationNumber?.split(',')"
:key="duplicatedClient">
Incorporation number: <a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
Partial match on incorporation number - Client number:
<a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
</li>
<li
v-for="duplicatedClient in data.matchers.contact?.split(',')"
:key="duplicatedClient">
Contact: <a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
Matching one or more contacts - Client number:
<a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
</li>
</ul>
</div>
Expand Down
Loading