Skip to content

Commit 9779492

Browse files
authored
Merge pull request #1295 from bcgov/stories/ecer-1563
ECER-1563: Add consent screen and refactor Breadcrumb component
2 parents fcf026a + 5b33edf commit 9779492

32 files changed

+499
-615
lines changed

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/AddProfessionalDevelopment.vue

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<template>
22
<v-container>
3-
<v-breadcrumbs class="pl-0" :items="items" color="primary">
4-
<template #divider>/</template>
5-
</v-breadcrumbs>
3+
<Breadcrumb />
64
<div class="d-flex flex-column ga-3">
75
<h1 class="mt-5">Professional development</h1>
86
<v-row>
@@ -270,7 +268,7 @@ import type { Components } from "@/types/openapi";
270268
import { formatDate } from "@/utils/format";
271269
import { isNumber } from "@/utils/formInput";
272270
import * as Rules from "@/utils/formRules";
273-
271+
import Breadcrumb from "@/components/Breadcrumb.vue";
274272
import type { FileItem } from "./UploadFileItem.vue";
275273
276274
interface ProfessionalDevelopmentData {
@@ -281,7 +279,7 @@ interface ProfessionalDevelopmentData {
281279
282280
export default defineComponent({
283281
name: "AddProfessionalDevelopment",
284-
components: { FileUploader, EceTextField, EceDateInput },
282+
components: { FileUploader, EceTextField, EceDateInput, Breadcrumb },
285283
props: {
286284
applicationId: {
287285
type: String,
@@ -309,36 +307,13 @@ export default defineComponent({
309307
};
310308
},
311309
data() {
312-
const items = [
313-
{
314-
title: "Home",
315-
disabled: false,
316-
href: "/",
317-
},
318-
{
319-
title: "Application",
320-
disabled: false,
321-
href: `/manage-application/${this.applicationId}`,
322-
},
323-
{
324-
title: "Professional development",
325-
disabled: false,
326-
href: `/manage-application/${this.applicationId}/professional-development`,
327-
},
328-
{
329-
title: "Add",
330-
disabled: true,
331-
href: `/manage-application/${this.applicationId}/professional-development/add`,
332-
},
333-
];
334-
335310
const professionalDevelopment: ProfessionalDevelopmentData & Components.Schemas.ProfessionalDevelopment = {
336311
selection: [],
337312
areAttachedFilesValid: true,
338313
isFileUploadInProgress: false,
339314
};
340315
341-
return { items, professionalDevelopment, Rules };
316+
return { professionalDevelopment, Rules };
342317
},
343318
computed: {
344319
applicationType() {

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ApplicationRequirements.vue

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<v-container>
3-
<Breadcrumb :items="items" />
3+
<Breadcrumb />
44

55
<!-- Renewal -->
66
<template v-if="applicationStore.isDraftApplicationRenewal">
@@ -107,53 +107,7 @@ export default defineComponent({
107107
return { applicationStore, certificationStore, userStore, router };
108108
},
109109
data() {
110-
const applicationStore = useApplicationStore();
111-
const userStore = useUserStore();
112-
113-
let items: { title: string; disabled: boolean; href: string }[] = [
114-
{
115-
title: "Home",
116-
disabled: false,
117-
href: "/",
118-
},
119-
];
120-
121-
if (applicationStore.isDraftApplicationLaborMobility) {
122-
items.push(
123-
{
124-
title: "Check your transfer eligibility",
125-
disabled: false,
126-
href: "/application/transfer",
127-
},
128-
{
129-
title: "Requirements",
130-
disabled: true,
131-
href: "/application/certification/requirements",
132-
},
133-
);
134-
} else if (applicationStore.isDraftApplicationRenewal || userStore.isRegistrant) {
135-
items.push({
136-
title: "Requirements",
137-
disabled: true,
138-
href: "/application/certification/requirements",
139-
});
140-
} else {
141-
items.push(
142-
{
143-
title: "Application types",
144-
disabled: false,
145-
href: "/application/certification",
146-
},
147-
{
148-
title: "Requirements",
149-
disabled: true,
150-
href: "/application/certification/requirements",
151-
},
152-
);
153-
}
154-
155110
return {
156-
items,
157111
specializationSelection: [] as Components.Schemas.CertificationType[],
158112
};
159113
},

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ApplicationSummary.vue

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<template>
22
<v-container>
3-
<v-breadcrumbs class="pl-0" :items="items" color="primary">
4-
<template #divider>/</template>
5-
</v-breadcrumbs>
6-
3+
<Breadcrumb />
74
<ApplicationCertificationTypeHeader :certification-types="applicationStore.applications?.[0]?.certificationTypes || []" class="pb-5" />
85
<h2>Status</h2>
96
<p class="pb-3">It is a 3-step process to apply.</p>
@@ -88,7 +85,7 @@
8885
:go-to="
8986
() =>
9087
router.push({
91-
name: 'viewCharacterReference',
88+
name: 'view-character-reference',
9289
params: { applicationId: route.params.applicationId, referenceId: reference.id?.toString() },
9390
})
9491
"
@@ -220,7 +217,7 @@
220217
:go-to="
221218
() =>
222219
router.push({
223-
name: 'viewCharacterReference',
220+
name: 'view-character-reference',
224221
params: { applicationId: route.params.applicationId, referenceId: reference.id?.toString() },
225222
})
226223
"
@@ -261,6 +258,7 @@ import ApplicationSummaryCharacterReferenceListItem from "./ApplicationSummaryCh
261258
import ApplicationSummaryTranscriptListItem from "./ApplicationSummaryTranscriptListItem.vue";
262259
import ApplicationSummaryHeader from "./ApplicationSummaryHeader.vue";
263260
import { useConfigStore } from "@/store/config";
261+
import Breadcrumb from "@/components/Breadcrumb.vue";
264262
265263
export default defineComponent({
266264
name: "ApplicationSummary",
@@ -270,6 +268,7 @@ export default defineComponent({
270268
ApplicationSummaryCharacterReferenceListItem,
271269
ApplicationSummaryActionListItem,
272270
ApplicationSummaryHeader,
271+
Breadcrumb,
273272
},
274273
setup: async () => {
275274
const { smAndUp } = useDisplay();
@@ -297,22 +296,7 @@ export default defineComponent({
297296
route,
298297
};
299298
},
300-
data() {
301-
return {
302-
items: [
303-
{
304-
title: "Home",
305-
disabled: false,
306-
href: "/",
307-
},
308-
{
309-
title: "Application",
310-
disabled: true,
311-
href: "application",
312-
},
313-
],
314-
};
315-
},
299+
316300
computed: {
317301
currentStep() {
318302
switch (this.applicationStatus?.status) {

0 commit comments

Comments
 (0)