Frontend typing and component work for ATS integration

bcgov · Feb 4, 2025 · 30a10cd · 30a10cd
1 parent cd5c46a
commit 30a10cd
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 19 deletions.
diff --git a/app/src/db/models/enquiry.ts b/app/src/db/models/enquiry.ts
@@ -45,7 +45,7 @@ export default {
     return {
       enquiry_id: input.enquiryId,
       activity_id: input.activityId,
-      added_to_ats: input.addedToAts,
+      added_to_ats: input.addedToATS,
       assigned_user_id: input.assignedUserId,
       ats_client_number: input.atsClientNumber,
       enquiry_type: input.enquiryType,
@@ -67,7 +67,7 @@ export default {
     return {
       enquiryId: input.enquiry_id,
       activityId: input.activity_id,
-      addedToAts: input.added_to_ats,
+      addedToATS: input.added_to_ats,
       assignedUserId: input.assigned_user_id,
       atsClientNumber: input.ats_client_number,
       enquiryType: input.enquiry_type,

diff --git a/app/src/types/Enquiry.ts b/app/src/types/Enquiry.ts
@@ -5,7 +5,7 @@ import type { User } from './User';
 export type Enquiry = {
   enquiryId: string; // Primary key
   activityId: string;
-  addedToAts: boolean;
+  addedToATS: boolean;
   assignedUserId: string | null;
   atsClientNumber: string | null;
   enquiryType: string | null;

diff --git a/frontend/src/components/housing/enquiry/EnquiryForm.vue b/frontend/src/components/housing/enquiry/EnquiryForm.vue
@@ -236,7 +236,8 @@ onMounted(async () => {
     contactApplicantRelationship: enquiry?.contacts[0]?.contactApplicantRelationship,
     contactPreference: enquiry?.contacts[0]?.contactPreference,
     submittedAt: new Date(enquiry?.submittedAt),
-    addedToATS: '',
+    addedToATS: enquiry?.addedToATS,
+    atsClientNumber: enquiry?.atsClientNumber,
     user: assigneeOptions.value[0] ?? null
   };
   projectActivityIds.value = filteredProjectActivityIds.value = (await submissionService.getActivityIds()).data;
@@ -343,7 +344,7 @@ onMounted(async () => {
       <SectionHeader title="ATS" />
       <div class="grid grid-cols-subgrid gap-4 col-span-12">
         <div
-          v-if="true || values.atsClientNumber"
+          v-if="values.atsClientNumber"
           class="col-start-1 col-span-12"
         >
           <div class="flex items-center">
@@ -361,7 +362,7 @@ onMounted(async () => {
           name="atsClientNumber"
         />
         <Button
-          v-if="true || !values.atsClientNumber"
+          v-if="!values.atsClientNumber"
           class="col-start-1 col-span-2"
           aria-label="Link to ATS"
           :disabled="!editable"
@@ -370,7 +371,7 @@ onMounted(async () => {
           Search ATS
         </Button>
         <Button
-          v-if="true || !values.atsClientNumber"
+          v-if="!values.atsClientNumber"
           class="grid-col-start-3 col-span-2"
           aria-label="New ATS client"
           :disabled="!editable"
@@ -442,7 +443,7 @@ onMounted(async () => {
     </div>
     <ATSUserLinkModal
       v-model:visible="atsUserLinkModalVisible"
-      :submission="enquiry"
+      :submission-or-enquiry="enquiry"
       @ats-user-link:link="
         (atsClientResource: ATSClientResource) => {
           atsUserLinkModalVisible = false;

diff --git a/frontend/src/components/housing/submission/SubmissionForm.vue b/frontend/src/components/housing/submission/SubmissionForm.vue
@@ -801,7 +801,7 @@ onMounted(async () => {
     </div>
     <ATSUserLinkModal
       v-model:visible="atsUserLinkModalVisible"
-      :submission="submission"
+      :submission-or-enquiry="submission"
       @ats-user-link:link="
         (atsClientResource: ATSClientResource) => {
           atsUserLinkModalVisible = false;

diff --git a/frontend/src/components/user/ATSUserLinkModal.vue b/frontend/src/components/user/ATSUserLinkModal.vue
@@ -6,11 +6,11 @@ import { Button, Column, DataTable, Dialog, InputText, useToast } from '@/lib/pr
 import { atsService } from '@/services';
 
 import type { Ref } from 'vue';
-import type { ATSClientResource, Submission } from '@/types';
+import type { ATSClientResource, Enquiry, Submission } from '@/types';
 
 // Props
-const { submission } = defineProps<{
-  submission: Submission;
+const { submissionOrEnquiry } = defineProps<{
+  submissionOrEnquiry: Enquiry | Submission;
 }>();
 
 // Emits
@@ -57,9 +57,9 @@ async function searchATSUsers() {
 }
 
 onMounted(() => {
-  if (submission.contacts[0]?.firstName && submission.contacts[0]?.lastName) {
-    firstName.value = submission.contacts[0]?.firstName;
-    lastName.value = submission.contacts[0]?.lastName;
+  if (submissionOrEnquiry.contacts[0]?.firstName && submissionOrEnquiry.contacts[0]?.lastName) {
+    firstName.value = submissionOrEnquiry.contacts[0]?.firstName;
+    lastName.value = submissionOrEnquiry.contacts[0]?.lastName;
   }
 });
 </script>

diff --git a/frontend/src/types/Enquiry.ts b/frontend/src/types/Enquiry.ts
@@ -6,7 +6,9 @@ import { ApplicationStatus } from '@/utils/enums/housing';
 export type Enquiry = {
   enquiryId: string;
   activityId: string;
+  addedToATS: boolean;
   assignedUserId?: string;
+  atsClientNumber: string | null;
   enquiryType: string;
   submittedAt: string;
   submittedBy: string;

diff --git a/frontend/tests/unit/components/housing/enquiry/EnquiryCard.spec.ts b/frontend/tests/unit/components/housing/enquiry/EnquiryCard.spec.ts
@@ -32,7 +32,9 @@ const testEnquiry = {
   createdBy: 'testCreatedBy',
   createdAt: currentDate,
   updatedBy: 'testUpdatedAt',
-  updatedAt: currentDate
+  updatedAt: currentDate,
+  addedToATS: false,
+  atsClientNumber: 'atsClientNumber123'
 };
 
 useUserService.mockResolvedValue({ data: [{ fullName: 'dummyName' }] } as AxiosResponse);

diff --git a/frontend/tests/unit/components/housing/enquiry/EnquiryListNavigator.spec.ts b/frontend/tests/unit/components/housing/enquiry/EnquiryListNavigator.spec.ts
@@ -43,7 +43,9 @@ const testEnquiry = {
   createdBy: 'testCreatedBy',
   createdAt: currentDate,
   updatedBy: 'testUpdatedAt',
-  updatedAt: currentDate
+  updatedAt: currentDate,
+  addedToATS: false,
+  atsClientNumber: 'atsClientNumber123'
 };
 
 const testEnquiries = [testEnquiry];

diff --git a/frontend/tests/unit/components/housing/enquiry/EnquiryListProponent.spec.ts b/frontend/tests/unit/components/housing/enquiry/EnquiryListProponent.spec.ts
@@ -50,7 +50,9 @@ const testEnquiry = {
   createdBy: 'testCreatedBy',
   createdAt: currentDate,
   updatedBy: 'testUpdatedAt',
-  updatedAt: currentDate
+  updatedAt: currentDate,
+  addedToATS: false,
+  atsClientNumber: 'atsClientNumber123'
 };
 
 const testEnquiries = [testEnquiry];

diff --git a/frontend/tests/unit/components/user/ATSUserLinkModal.spec.ts b/frontend/tests/unit/components/user/ATSUserLinkModal.spec.ts
@@ -115,7 +115,7 @@ const testSubmission: Submission = {
 
 const wrapperSettings = (testSubmissionProp = testSubmission) => ({
   props: {
-    submission: testSubmissionProp
+    submissionOrEnquiry: testSubmissionProp
   },
   global: {
     plugins: [