Frontend improvements (#400)

* no message * feat(fe): - First draft of the FE without JSON schema * feat(fe): - Draft of the FE without JSON schema #2 * feat(fe/be): - Draft of the FE without JSON schema #3 - Changed data model * feat(fe/be): - Draft of the FE without JSON schema #4 * feat(fe/be): - Draft of the FE without JSON schema #5 * feat(fe/be): - Draft of the FE without JSON schema #5 - Completed Autocomplete - Renamed some files * feat(fe/be): - Draft of the FE without JSON schema #6 * fix(fe/be): - Fixed some issues in the SQL scripts and the unit test * feat(fe/be): - Draft of the FE without JSON schema #7 - Added missing validation components * Dropped example * fix(fe): - Fixed some issues in the unit test * feat(fe): - Draft of the FE without JSON schema #8 - Improved code and made code reviews * fix: fixing tests * feat(fe): - Cleaned up code - Improved code and made code reviews * feat(fe): - Cleaned up code - Improved code and made code reviews - Changed some names as per naming conventions * no message * feat(be): - Dropped and added some columns * Fixed typo * feat(fe): - Added missing logic to add the incorporation number * fix(be): - Fixed unit tests after recent changes * fix: adding missing field to the database * feat(fe): - Aligned id names to dto keys for validations practicity * feat(fe): - Added the vue mask library * feat(fe): - Removed unneeded column - Added responsiveness in the table - Beautified code * fix(fe): - Fixed some issues in the unit test * fix(fe): - Fixed some issues in the unit test --------- Co-authored-by: Paulo Gomes da Cruz Junior <[email protected]>
bcgov · Mar 15, 2023 · 3e42c55 · 3e42c55
1 parent 2e4b455
commit 3e42c55
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 14 deletions.
diff --git a/backend/src/main/java/ca/bc/gov/app/dto/client/ClientAddressDto.java b/backend/src/main/java/ca/bc/gov/app/dto/client/ClientAddressDto.java
@@ -9,7 +9,6 @@ public record ClientAddressDto(
     String city,
     String postalCode,
     String businessPhone,
-    String email,
     int index,
     List<ClientContactDto> clientContactDtoList
 ) {

diff --git a/backend/src/main/java/ca/bc/gov/app/util/ClientMapper.java b/backend/src/main/java/ca/bc/gov/app/util/ClientMapper.java
@@ -40,8 +40,7 @@ public static SubmissionLocationEntity mapToSubmissionLocationEntity(
         .withCountryCode(clientAddressDto.country())
         .withProvinceCode(clientAddressDto.province())
         .withCityName(clientAddressDto.city())
-        .withPostalCode(clientAddressDto.postalCode())
-        .withEmailAddress(clientAddressDto.email());
+        .withPostalCode(clientAddressDto.postalCode());
   }
 
   public static SubmissionLocationContactEntity mapToSubmissionLocationContactEntity(

diff --git a/backend/src/main/resources/db/migration/V1__initializing_data.sql b/backend/src/main/resources/db/migration/V1__initializing_data.sql
@@ -126,7 +126,6 @@ create table if not exists nrfc.submission_location (
     city_name                   varchar(100)    not null,
     postal_code                 varchar(10)     not null,
     main_address_ind            varchar(1)      not null default 'N',
-    email_address               varchar(50)    	not null,
     constraint submission_location_id_pk primary key (submission_location_id),
     constraint submission_id_fk foreign key (submission_id) references nrfc.submission(submission_id),
     constraint submission_location_country_code_fk foreign key (country_code) references nrfc.country_code(country_code),

diff --git a/backend/src/test/java/ca/bc/gov/app/endpoints/client/ClientHandlerIntegrationTest.java b/backend/src/test/java/ca/bc/gov/app/endpoints/client/ClientHandlerIntegrationTest.java
@@ -198,7 +198,6 @@ void shouldSubmitClientData() {
                         "Las Vegas",
                         "89109",
                         "007",
-                        "[email protected]",
                         0,
                         List.of(
                             new ClientContactDto(

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -51,6 +51,7 @@
     "vite": "^2.8.6",
     "vue": "^3.2.47",
     "vue-axios": "^3.4.1",
+    "vue-the-mask": "^0.11.1",
     "vue-tsc": "^1.1.5"
   },
   "devDependencies": {

diff --git a/frontend/src/main.ts b/frontend/src/main.ts
@@ -1,4 +1,5 @@
 import { createApp } from "vue";
+import VueTheMask from 'vue-the-mask';
 import App from "./App.vue";
 import VueKeycloakJs from "@dsb-norge/vue-keycloak-js";
 import type { KeycloakInstance } from "keycloak-js";
@@ -10,6 +11,7 @@ import "bootstrap/dist/css/bootstrap.css";
 import "bootstrap-vue-3/dist/bootstrap-vue-3.css";
 
 const app = createApp(App);
+app.use(VueTheMask);
 
 if (nodeEnv && nodeEnv == "openshift-dev") {
   // disable the login authentication for the deployment in the openshift dev namespace

diff --git a/frontend/src/pages/applyclientnumber/ApplyClientNumberPage.vue b/frontend/src/pages/applyclientnumber/ApplyClientNumberPage.vue
@@ -154,8 +154,8 @@ const displayCommonSections = computed(() => {
     else { 
         if (null !== formData.value.businessType.clientType && 
             null !== formData.value.businessInformation && 
-            null !== formData.value.businessInformation.businessName &&
-            "" !== formData.value.businessInformation.businessName) {
+            null !== formData.value.businessInformation.incorporationNumber &&
+            "" !== formData.value.businessInformation.incorporationNumber) {
             return true;
         }
         else {

diff --git a/frontend/src/pages/applyclientnumber/ContactSectionComponent.vue b/frontend/src/pages/applyclientnumber/ContactSectionComponent.vue
@@ -1,4 +1,5 @@
 <template>
+  <div class="table-responsive">
     <table class="table">
         <thead>
             <tr>
@@ -36,7 +37,8 @@
                 </td>
                 <td>
                     <b-form-input :id="'contactPhoneNumberId' + itemIndex"
-                                v-model="item.contactPhoneNumber">
+                                  v-model="item.contactPhoneNumber"
+                                  v-mask="'##########'">
                     </b-form-input>
                     <ValidationMessages :fieldId = "'contactPhoneNumberId' + itemIndex"
                                         :validationMessages="validationMessages"  />
@@ -46,23 +48,24 @@
                                   v-model="item.contactEmail">
                     </b-form-input>
                     <ValidationMessages :fieldId = "'contactEmailId' + itemIndex"
-                                        :validationMessages="validationMessages"  />
+                                        :validationMessages="validationMessages" />
                 </td>
                 <td>
                     <b-button enabled="contacts.length > 1"
-                            @click="deleteContact(itemIndex)">
+                              @click="deleteContact(itemIndex)">
                         <bi-x-circle></bi-x-circle>
                     </b-button>
                 </td>
             </tr>
         </tbody>
     </table>
+  </div>
 
-    <b-button class="chefsBlue"
+  <b-button class="chefsBlue"
             @click="addContact()">
-        <bi-plus-lg></bi-plus-lg>
-        Add another person for this address
-    </b-button>
+    <bi-plus-lg></bi-plus-lg>
+    Add another person for this address
+  </b-button>
   </template>
 
   <script setup lang="ts">