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

Jump to bottom

fix(fe): Added missing masks #1083

Merged
merged 1 commit into from
Aug 15, 2024
Merged

fix(fe): Added missing masks #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 58 additions & 42 deletions frontend/src/pages/staffform/BcRegisteredClientInformationWizardStep.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,15 @@ const emit = defineEmits<{
}>();

//Defining the event bus to send notifications up
const progressIndicatorBus = useEventBus<ProgressNotification>("progress-indicator-bus");
const exitBus = useEventBus<Record<string, boolean | null>>("exit-notification");
const progressIndicatorBus = useEventBus<ProgressNotification>(
"progress-indicator-bus"
);
const exitBus =
useEventBus<Record<string, boolean | null>>("exit-notification");
const fuzzyBus = useEventBus<FuzzyMatcherEvent>("fuzzy-error-notification");
const errorBus = useEventBus<ValidationMessageType[]>("submission-error-notification");

const errorBus = useEventBus<ValidationMessageType[]>(
"submission-error-notification"
);

// Set the prop as a ref, and then emit when it changes
const formData = ref<FormDataDto>(props.data);
Expand All @@ -67,7 +71,6 @@ const soleProprietorOwner = ref<string>("");
const bcRegistryError = ref<boolean>(false);
const showOnError = ref<boolean>(false);


const showFields = computed(() => {
return (
formData.value.businessInformation.clientType &&
Expand All @@ -77,10 +80,12 @@ const showFields = computed(() => {
);
});

const standingMessage = computed(() =>{
if(formData.value.businessInformation.goodStandingInd === 'Y') return 'Good standing'
if(formData.value.businessInformation.goodStandingInd === 'N') return 'Not in good standing'
return 'Unknown'
const standingMessage = computed(() => {
if (formData.value.businessInformation.goodStandingInd === "Y")
return "Good standing";
if (formData.value.businessInformation.goodStandingInd === "N")
return "Not in good standing";
return "Unknown";
});

//TODO: Either load from BE or add to DataConversors.ts
Expand Down Expand Up @@ -109,33 +114,34 @@ const standingValue = (goodStanding: boolean | null | undefined) => {
};

const autoCompleteResult = ref<BusinessSearchResult>();
watch([autoCompleteResult], () => {
watch([autoCompleteResult], () => {
// reset business validation state
validation.business = false;
detailsData.value = null;
bcRegistryError.value = false;
showOnError.value = false;

if (autoCompleteResult.value && autoCompleteResult.value.code) {

formData.value.businessInformation.registrationNumber =
autoCompleteResult.value.code;
formData.value.businessInformation.legalType =
autoCompleteResult.value.legalType;
formData.value.businessInformation.registrationNumber = autoCompleteResult.value.code;
formData.value.businessInformation.legalType = autoCompleteResult.value.legalType;
formData.value.businessInformation.clientType = retrieveClientType(
autoCompleteResult.value.legalType
);

emit("update:data", formData.value);

//Also, we will load the backend data to fill all the other information as well
const {
error,
loading: detailsLoading,
handleErrorDefault,
} = useFetchTo(`/api/clients/${autoCompleteResult.value.code}`, detailsData, {
skipDefaultErrorHandling: true,
});
} = useFetchTo(
`/api/clients/${autoCompleteResult.value.code}`,
detailsData,
{
skipDefaultErrorHandling: true,
}
);

showDetailsLoading.value = true;
watch(error, () => {
Expand All @@ -153,22 +159,29 @@ const autoCompleteResult = ref<BusinessSearchResult>();
],
{
skipNotification: true,
},
}
);

fuzzyBus.emit({
id: 'global',
matches:[{
field: "businessInformation.clientName",
match: (error.value.response.data as string).split('client number')[1],
fuzzy: false
}]
id: "global",
matches: [
{
field: "businessInformation.clientName",
match: (error.value.response.data as string).split(
"client number"
)[1],
fuzzy: false,
},
],
});
return;
}

//Here we only care for 5xx and 408 errors
if (error.value.response?.status >= 500 || error.value.response?.status === 408) {
if (
error.value.response?.status >= 500 ||
error.value.response?.status === 408
) {
handleErrorDefault();
bcRegistryError.value = true;
return;
Expand All @@ -183,20 +196,23 @@ const autoCompleteResult = ref<BusinessSearchResult>();
[detailsLoading],
() => (showDetailsLoading.value = detailsLoading.value)
);
}
}
});

watch([detailsData], () => {
if (detailsData.value) {
fuzzyBus.emit({id:'',matches:[]});
fuzzyBus.emit({ id: "", matches: [] });
const forestClientDetails: ForestClientDetailsDto = detailsData.value;

if(formData.value.businessInformation.clientType === 'RSP'){
formData.value.businessInformation.doingBusinessAs = forestClientDetails.name;
formData.value.businessInformation.firstName = forestClientDetails.contacts[0]?.firstName;
formData.value.businessInformation.lastName = forestClientDetails.contacts[0]?.lastName;
if (formData.value.businessInformation.clientType === "RSP") {
formData.value.businessInformation.doingBusinessAs =
forestClientDetails.name;
formData.value.businessInformation.firstName =
forestClientDetails.contacts[0]?.firstName;
formData.value.businessInformation.lastName =
forestClientDetails.contacts[0]?.lastName;
}

const receivedContacts = forestClientDetails.contacts ?? [];
receivedContacts.forEach((contact) => {
contact.locationNames = [];
Expand All @@ -216,8 +232,10 @@ watch([detailsData], () => {
});
formData.value.location.addresses = exportAddress(receivedAddresses);

formData.value.businessInformation.goodStandingInd = standingValue(forestClientDetails.goodStanding);

formData.value.businessInformation.goodStandingInd = standingValue(
forestClientDetails.goodStanding
);

//FSADT1-1388 standing is not a factor that prevents a submission
validation.business = true;

Expand All @@ -228,7 +246,7 @@ watch([detailsData], () => {

if (forestClientDetails.contacts.length > 0) {
soleProprietorOwner.value = forestClientDetails.contacts[0].lastName;
}
}
}
});

Expand All @@ -242,7 +260,7 @@ const checkValid = () =>
watch([validation], () => emit("valid", checkValid()));
emit("valid", checkValid());

if(formData.value.businessInformation.businessName){
if (formData.value.businessInformation.businessName) {
validation.business = true;
}

Expand All @@ -252,8 +270,8 @@ onMounted(() => {
setFocusedComponent("focus-0", 0);
}
});

</script>

<template>
<div class="frame-01">
<data-fetcher
Expand Down Expand Up @@ -296,8 +314,6 @@ onMounted(() => {
title="BC Registries is down">
<span class="body-compact-01"> You'll need to try again later.</span>
</cds-inline-notification>


</data-fetcher>

<cds-inline-notification
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/staffform/CombinedClientInformationWizardStep.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ onMounted(() => {
label="WorkSafeBC Number"
placeholder=""
autocomplete="off"
mask="######"
v-model="formData.businessInformation.workSafeBcNumber"
:validations="[
...getValidations('businessInformation.workSafeBcNumber'),
Expand All @@ -103,6 +104,7 @@ onMounted(() => {
label="Acronym"
placeholder=""
autocomplete="off"
mask="NNNNNNNN"
v-model="formData.businessInformation.clientAcronym"
:validations="[
...getValidations('businessInformation.clientAcronym'),
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/staffform/FirstNationClientInformationWizardStep.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ const mapFirstNationInfo = (firstNations: ForestClientDetailsDto[] = []) => {
label="WorkSafeBC Number"
placeholder=""
autocomplete="off"
mask="######"
v-model="formData.businessInformation.workSafeBcNumber"
:validations="[
...getValidations('businessInformation.workSafeBcNumber'),
Expand All @@ -154,6 +155,7 @@ const mapFirstNationInfo = (firstNations: ForestClientDetailsDto[] = []) => {
label="Acronym"
placeholder=""
autocomplete="off"
mask="NNNNNNNN"
v-model="formData.businessInformation.clientAcronym"
:validations="[
...getValidations('businessInformation.clientAcronym'),
Expand Down
Loading