Merge pull request #136 from bcgov/feature/change-related-enquiry

Change Related Enquiry

app/src/controllers/submission.ts

@@ -294,6 +294,16 @@ const controller = {
     return submissionData;
   },
 
+  getActivityIds: async (req: Request<never, { self?: string }>, res: Response, next: NextFunction) => {
+    try {
+      const response = await submissionService.getActivityIds();
+
+      res.status(200).json(response);
+    } catch (e: unknown) {
+      next(e);
+    }
+  },
+
   createDraft: async (req: Request, res: Response, next: NextFunction) => {
     try {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any

app/src/routes/v1/submission.ts

@@ -13,6 +13,11 @@ router.get('/', (req: Request, res: Response, next: NextFunction): void => {
   submissionController.getSubmissions(req, res, next);
 });
 
+/** Get a list of all the activityIds */
+router.get('/activityIds', (req: Request, res: Response, next: NextFunction): void => {
+  submissionController.getActivityIds(req, res, next);
+});
+
 /** Search submissions */
 router.get(
   '/search',

app/src/services/submission.ts

@@ -27,6 +27,20 @@ function chefsAxios(formId: string, options: AxiosRequestConfig = {}): AxiosInst
 }
 
 const service = {
+  /**
+   * @function getActivityIds
+   * Gets a list of activity IDs
+   * @returns {Promise<string[]>} The result of running the findMany operation
+   */
+  getActivityIds: async () => {
+    try {
+      const result = await prisma.submission.findMany({ select: { activity_id: true } });
+      return result.map((x) => x.activity_id);
+    } catch (e: unknown) {
+      throw e;
+    }
+  },
+
   /**
    * @function createSubmission
    * Creates a new submission

frontend/src/components/housing/enquiry/EnquiryForm.vue

@@ -15,9 +15,9 @@ import {
   TextArea
 } from '@/components/form';
 import { Button, Message, useToast } from '@/lib/primevue';
-import { enquiryService, userService } from '@/services';
+import { enquiryService, submissionService, userService } from '@/services';
 import { useEnquiryStore } from '@/store';
-import { Regex } from '@/utils/enums/application';
+import { BasicResponse, Regex } from '@/utils/enums/application';
 import { IntakeStatus } from '@/utils/enums/housing';
 import {
   APPLICATION_STATUS_LIST,
@@ -47,10 +47,15 @@ const props = withDefaults(defineProps<Props>(), {
   editable: true
 });
 
+// Emit
+const emit = defineEmits(['enquiryForm:saved']);
+
 // State
 const assigneeOptions: Ref<Array<User>> = ref([]);
 const editable: Ref<boolean> = ref(props.editable);
+const filteredProjectActivityIds: Ref<Array<string>> = ref([]);
 const formRef: Ref<InstanceType<typeof Form> | null> = ref(null);
+const projectActivityIds: Ref<Array<string>> = ref([]);
 const initialFormValues: Ref<any | undefined> = ref(undefined);
 const showCancelMessage: Ref<boolean> = ref(false);
 
@@ -140,12 +145,19 @@ function onInvalidSubmit(e: any) {
   first?.scrollIntoView({ behavior: 'smooth' });
 }
 
+function onRelatedActivityInput(e: IInputEvent) {
+  filteredProjectActivityIds.value = projectActivityIds.value.filter((id) =>
+    id.toUpperCase().includes(e.target.value.toUpperCase())
+  );
+}
+
 const onSubmit = async (values: any) => {
   try {
     editable.value = false;
 
     const submitData: Enquiry = omit(setEmptyStringsToNull(values) as EnquiryForm, ['user']);
     submitData.assignedUserId = values.user?.userId ?? undefined;
+    submitData.isRelated = submitData.relatedActivityId ? BasicResponse.YES : BasicResponse.NO;
 
     const result = await enquiryService.updateEnquiry(values.enquiryId, submitData);
     enquiryStore.setEnquiry(result.data);
@@ -156,6 +168,7 @@ const onSubmit = async (values: any) => {
         user: values.user
       }
     });
+    emit('enquiryForm:saved');
 
     toast.success('Form saved');
   } catch (e: any) {
@@ -174,6 +187,7 @@ onMounted(async () => {
     submittedAt: new Date(props.enquiry?.submittedAt),
     user: assigneeOptions.value[0] ?? null
   };
+  projectActivityIds.value = filteredProjectActivityIds.value = (await submissionService.getActivityIds()).data;
 });
 </script>
 
@@ -211,11 +225,14 @@ onMounted(async () => {
         label="Submission date"
         :disabled="!editable"
       />
-      <InputText
+      <EditableDropdown
         class="col-3"
         name="relatedActivityId"
         label="Related submission"
         :disabled="!editable"
+        :options="filteredProjectActivityIds"
+        :get-option-label="(e: string) => e"
+        @on-input="onRelatedActivityInput"
       />
       <div class="col-3" />
 

frontend/src/services/submissionService.ts

@@ -4,6 +4,14 @@ import { delimitEmails } from '@/utils/utils';
 import type { Email } from '@/types';
 
 export default {
+  /**
+   * @function getActivityIds
+   * @returns {Promise} An axios response
+   */
+  getActivityIds() {
+    return appAxios().get('submission/activityIds');
+  },
+
   /**
    * @function createDraft
    * @returns {Promise} An axios response

frontend/src/views/housing/enquiry/EnquiryView.vue

@@ -42,13 +42,7 @@ onMounted(async () => {
     enquiryStore.setEnquiry(enquiry);
     enquiryStore.setNotes(notes);
 
-    if (enquiry?.relatedActivityId) {
-      relatedSubmission.value = (
-        await submissionService.searchSubmissions({
-          activityId: [enquiry.relatedActivityId]
-        })
-      ).data[0];
-    }
+    updateRelatedEnquiry();
   }
 
   loading.value = false;
@@ -63,6 +57,20 @@ const onUpdateNote = (oldNote: Note, newNote: Note) => {
 const onDeleteNote = (note: Note) => {
   enquiryStore.removeNote(note);
 };
+
+async function updateRelatedEnquiry() {
+  if (getEnquiry?.value?.relatedActivityId) {
+    relatedSubmission.value = (
+      await submissionService.searchSubmissions({
+        activityId: [getEnquiry?.value?.relatedActivityId]
+      })
+    ).data[0];
+  } else relatedSubmission.value = undefined;
+}
+
+function onEnquiryFormSaved() {
+  updateRelatedEnquiry();
+}
 </script>
 
 <template>
@@ -98,8 +106,20 @@ const onDeleteNote = (note: Note) => {
           {{ getEnquiry?.relatedActivityId }}
         </router-link>
       </Message>
+
+      <Message
+        v-if="getEnquiry?.relatedActivityId && !relatedSubmission"
+        severity="error"
+        class="text-center"
+        :closable="false"
+      >
+        This activity is linked to an invalid Activity
+      </Message>
       <span v-if="!loading && getEnquiry">
-        <EnquiryForm :enquiry="getEnquiry" />
+        <EnquiryForm
+          :enquiry="getEnquiry"
+          @enquiry-form:saved="onEnquiryFormSaved"
+        />
       </span>
     </TabPanel>
     <TabPanel header="Notes">