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

fix(FSADT1-1023|FSADT1-1024): updating ui style #664

Merged
merged 5 commits into from
Dec 8, 2023
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
8 changes: 4 additions & 4 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ const openToast = (event: ModalNotification) => {
const deleteContentModal = () => {
openToast({
// message: `“${modalContent.value.message}” additional ${modalContent.value.kind} was deleted successfully`,
message: "",
kind: 'Success',
toastTitle: modalContent.value.toastTitle,
message: modalContent.value.message,
kind: "Success",
toastTitle: "Success",
active: true,
handler: () => {}
})
Expand Down Expand Up @@ -78,7 +78,7 @@ toastBus.on(openToast)
<cds-modal-header>
<cds-modal-close-button></cds-modal-close-button>
<cds-modal-heading
>Are you sure you want to delete "{{ modalContent.message }}" additional
>Are you sure you want to delete "{{ modalContent.name }}" additional
{{ modalContent.kind }}?
</cds-modal-heading>
</cds-modal-header>
Expand Down
1 change: 1 addition & 0 deletions frontend/src/dto/CommonTypesDto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export interface Submitter {
}

export interface ModalNotification {
name?: string;
message: string;
kind: string;
toastTitle: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/FormBCeIDPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ const scrollToNewContact = () => {
</li>
<li>
You must be able to receive email at
{{ submitterContact.email }}
<b>{{ submitterContact.email }}</b>
</li>
</ol>
</div>
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/pages/bceidform/AddressWizardStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ const handleRemove = (index: number) => {
? formData.location.addresses[index].locationName
: "Address #" + index;
bus.emit({
message: selectedAddress,
name: selectedAddress,
toastTitle: "Success",
kind: "address",
toastTitle: "The additional address was deleted",
message: `“${selectedAddress}” additional address was deleted`,
handler: removeAddress(index),
active: true,
});
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/pages/bceidform/ContactWizardStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,10 @@ const handleRemove = (index: number) => {
? `${formData.location.contacts[index].firstName} ${formData.location.contacts[index].lastName}`
: "Contact #" + index;
bus.emit({
message: selectedContact,
name: selectedContact,
toastTitle: "Success",
kind: "contact",
toastTitle: "The additional contact was deleted",
message: `“${selectedContact}” additional contact was deleted`,
handler: removeContact(index),
active: true,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ describe("ContactWizardStep.vue", () => {
await wrapper.find("#deleteContact_1").trigger("click");

expect(payload!).toMatchObject({
message: "Contact #1",
name: "Contact #1",
message: "“Contact #1” additional contact was deleted",
kind: "contact",
});
});
Expand Down
Loading