quick touchups for removing test code and unused imports

Author: SoLetsDev

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

@@ -153,7 +153,6 @@ import * as Rules from "@/utils/formRules";
 import { removeElementByIndex, replaceElementByIndex } from "@/utils/functions";
 
 import ECEHeader from "../ECEHeader.vue";
-import FileUploader from "../FileUploader.vue";
 import EceIcraWorkExperienceEligibilityCard from "../EceIcraWorkExperienceEligibilityCard.vue";
 import ProgressBar from "../ProgressBar.vue";
 import { useIcraStore } from "@/store/icra";
@@ -167,7 +166,7 @@ interface IcraWorkExperienceEligibilityData extends Components.Schemas.WorkExper
 
 export default defineComponent({
   name: "EceIcraWorkExperienceEligibility",
-  components: { ProgressBar, FileUploader, EceIcraWorkExperienceEligibilityCard, EceDateInput, EceTextField, Callout, ECEHeader },
+  components: { ProgressBar, EceIcraWorkExperienceEligibilityCard, EceDateInput, EceTextField, Callout, ECEHeader },
   props: {
     modelValue: {
       type: Object as () => Components.Schemas.WorkExperienceReference[],

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

@@ -9,6 +9,7 @@
         <v-col md="8" lg="6" xl="4">
           Country
           <v-select
+            id="certificateCountrySelect"
             class="pt-2"
             :items="configStore.countryList.filter((country) => country.isICRA === true)"
             variant="outlined"
@@ -142,17 +143,25 @@
       <div v-if="previousNameRadio === 'other'">
         <v-row>
           <v-col md="8" lg="6" xl="4">
-            <EceTextField v-model="otherFirstName" label="First name on transcript" variant="outlined" color="primary" maxlength="100"></EceTextField>
+            <EceTextField
+              id="txtOtherFirstName"
+              v-model="otherFirstName"
+              label="First name on transcript"
+              variant="outlined"
+              color="primary"
+              maxlength="100"
+            ></EceTextField>
           </v-col>
         </v-row>
         <v-row>
           <v-col md="8" lg="6" xl="4">
-            <EceTextField v-model="otherMiddleName" label="Middle name(s) on transcript (optional)" maxlength="100"></EceTextField>
+            <EceTextField id="txtOtherMiddleName" v-model="otherMiddleName" label="Middle name(s) on transcript (optional)" maxlength="100"></EceTextField>
           </v-col>
         </v-row>
         <v-row>
           <v-col md="8" lg="6" xl="4">
             <EceTextField
+              id="txtOtherLastName"
               v-model="otherLastName"
               :rules="[Rules.required('Enter your last name')]"
               label="Last name on transcript"
@@ -176,9 +185,9 @@
             :delete-file-from-temp-when-removed="false"
             @update:files="handleFileUpdate"
             @delete:file="handleFileDelete"
+            :rules="[Rules.atLeastOneOptionRequired('Upload a certificate or document that shows you completed the course or workshop')]"
           />
         </v-col>
-        <!-- :rules="[Rules.atLeastOneOptionRequired('Upload a certificate or document that shows you completed the course or workshop')]" -->
       </v-row>
     </v-form>
 
@@ -229,22 +238,6 @@
         />
       </v-col>
     </v-row>
-    <!-- this prevents form from proceeding if rules are not met -->
-    <v-input
-      class="mt-6"
-      :model-value="modelValue"
-      :rules="[
-        (v) =>
-          //if user has 4 certificates and they are all expired they cannot proceed
-          hasValidCertificate ||
-          v.length < MAX_NUM_CERTIFICATIONS ||
-          `You have entered the maximum number of certifications. You must replace one of your entries with a valid certificate to proceed.`,
-        (v) =>
-          (v && v.some((certificate: any) => certificate.certificateStatus === 'Valid')) ||
-          `You provided an expired certificate. To continue, you must also provide a valid certificate.`,
-      ]"
-      auto-hide="auto"
-    ></v-input>
     <v-row v-if="showAddInternationalCertificationButton">
       <v-col sm="12" md="10" lg="8" xl="6">
         <v-btn
@@ -259,6 +252,20 @@
         </v-btn>
       </v-col>
     </v-row>
+    <!-- this prevents form from proceeding if rules are not met -->
+    <v-input
+      class="mt-6"
+      :model-value="modelValue"
+      :rules="[
+        (v) =>
+          //if user has 4 certificates and they are all expired they cannot proceed
+          hasValidCertificate ||
+          v.length < MAX_NUM_CERTIFICATIONS ||
+          `You have entered the maximum number of certifications. You must replace one of your entries with a valid certificate to proceed.`,
+        (v) => hasValidCertificate || `You provided an expired certificate. To continue, you must also provide a valid certificate.`,
+      ]"
+      auto-hide="auto"
+    ></v-input>
     <!-- callouts and optional messages -->
     <v-row>
       <v-col>
@@ -315,10 +322,10 @@ interface RadioOptions {
 
 interface InternationalCertificationData {
   //name fields
-  previousNameRadio?: any; //TODO not supposed to be optional
+  previousNameRadio: any;
   newFilesWithData?: FileItem[];
   //other fields
-  internationalCertificationFormMode?: "add" | "edit" | undefined; //TODO not supposed to be optional
+  internationalCertificationFormMode: "add" | "edit" | undefined;
 }
 
 export interface InternationalCertificationExtended extends Components.Schemas.InternationalCertification {
@@ -335,7 +342,7 @@ export default defineComponent({
     },
   },
   emits: {
-    "update:model-value": (_internationalCertificationData: Components.Schemas.InternationalCertification[]) => true, //TODO change type to InternationalCertificationExtended[]
+    "update:model-value": (_internationalCertificationData: InternationalCertificationExtended[]) => true,
   },
   setup: () => {
     const alertStore = useAlertStore();
@@ -614,13 +621,13 @@ export default defineComponent({
       //international certification
       this.id = "";
       this.countryId = undefined;
-      this.nameOfRegulatoryAuthority = "test";
-      this.emailOfRegulatoryAuthority = "[email protected]";
-      this.phoneOfRegulatoryAuthority = "60464646846468";
+      this.nameOfRegulatoryAuthority = "";
+      this.emailOfRegulatoryAuthority = "";
+      this.phoneOfRegulatoryAuthority = "";
       this.websiteOfRegulatoryAuthority = "";
       this.onlineCertificateValidationToolOfRegulatoryAuthority = "";
-      this.certificateStatus = "Expired";
-      this.certificateTitle = "aweoigwaogi";
+      this.certificateStatus = undefined;
+      this.certificateTitle = "";
       this.issueDate = "";
       this.expiryDate = "";
       this.files = [];