- app version = 5.0.24

- updated search tab icon - updated search tab intro - implemented Nested Select component - added optional icon to group header - styled group headers and group items - used new component for testing Home Jurisdictions - used new component for Request Actions - updated logic for showing dummy input box - updated logic for showing entity type menu - added icons to request action headers - misc cleanup - used variables for font sizes - deleted unused computed, etc - renamed isBcCcCrUl -> isColinRequestType - added MrasEntities mapping - cleaned up fetchCorpNum action - cleaned up getShowCorpNum getter - added isXproColinRequestType - added isMrasRequestType - added isMrasJurisdiction - misc cleanup - deleted obsolete getter getShowXproJurisdiction - replaced two old Jurisdiction menus with new one - now hide Entity Type menu instead of disable - added isChangeName - added isRestoration - updated showJurisdiction logic - updated showEntityType logic - updated showBusinessLookup logic - added isCanadian - added event handler for jurisdiction menu
bcgov · Aug 18, 2023 · 7d11f2a · 7d11f2a
1 parent e8588ad
commit 7d11f2a
Show file tree

Hide file tree

Showing 49 changed files with 493 additions and 406 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "name-request",
- "version": "5.0.23",
+ "version": "5.0.24",
  "private": true,
  "appName": "Name Request UI",
  "sbcName": "SBC Common Components",

diff --git a/src/App.vue b/src/App.vue
@@ -342,6 +342,7 @@ export default class App extends Mixins(
 
 <style lang="scss">
 @import '@/assets/styles/theme.scss';
+
 #main-column {
  display: flex;
  flex-flow: column nowrap;
@@ -355,7 +356,7 @@ export default class App extends Mixins(
  text-transform: none !important;
  font-weight: normal !important;
  letter-spacing: normal !important;
- font-size: .875rem !important;
+ font-size: $px-14 !important;
  }
 }
 

diff --git a/src/assets/styles/base.scss b/src/assets/styles/base.scss
@@ -44,7 +44,7 @@ html {
  */
 .h6, h6 {
  color: $dk-text;
- font-size: 1rem;
+ font-size: $px-16;
  line-height: 20px;
  font-weight: bold;
 }
@@ -120,25 +120,25 @@ html {
 
 .copy-large {
  @extend .copy-normal;
- font-size: 18px !important;
+ font-size: $px-18 !important;
  line-height: 26px !important;
 }
 
 .copy-normal {
  color: $text;
  font-weight: normal;
- font-size: 1rem;
+ font-size: $px-16;
  line-height: 24px;
 }
 
 .copy-small {
  @extend .copy-normal;
- font-size: 0.875rem !important;
+ font-size: $px-14 !important;
  line-height: 1.25rem !important;
 }
 
 .fs-24 {
- font-size: 24px;
+ font-size: $px-24;
 }
 
 .h1, h1 {
@@ -150,7 +150,7 @@ html {
 
 .h2, h2 {
  color: $dk-text;
- font-size: 32px;
+ font-size: $px-32;
  line-height: 42px;
  font-weight: bold;
 }
@@ -162,7 +162,7 @@ html {
 
 .h3, h3 {
  color: $dk-text;
- font-size: 24px;
+ font-size: $px-24;
  line-height: 34px;
  font-weight: bold;
 }
@@ -174,7 +174,7 @@ html {
 
 .h4, h4 {
  color: $dk-text;
- font-size: 18px;
+ font-size: $px-18;
  line-height: 26px;
  font-weight: bold;
 }
@@ -186,7 +186,7 @@ html {
 
 .h5, h5 {
  color: $dk-text;
- font-size: 18px;
+ font-size: $px-18;
  line-height: 24px;
  font-weight: bold;
  letter-spacing: 0;
@@ -199,25 +199,25 @@ html {
 
 .h6, h6 {
  color: $dk-text;
- font-size: 1rem;
+ font-size: $px-16;
  line-height: 20px;
  font-weight: bold;
 }
 
 .link-lg {
  @extend .link-std;
- font-size: 18px;
+ font-size: $px-18;
  line-height: 20px;
 }
 
 .link-sm {
  @extend .link-std;
- font-size: 0.875rem;
+ font-size: $px-14;
  line-height: 20px;
 }
 
 .link-sm-dk-text {
- font-size: 0.875rem !important;
+ font-size: $px-14 !important;
  color: $dk-text !important;
  text-decoration: none !important;
 }
@@ -228,7 +228,7 @@ html {
 }
 
 .link-std {
- font-size: 0.875rem;
+ font-size: $px-14;
  font-weight: normal;
  color: $app-blue;
  text-decoration: underline;
@@ -243,7 +243,7 @@ html {
 
 .link-xsm {
  @extend .link-std;
- font-size: 0.75rem;
+ font-size: $px-12;
  line-height: 16px;
 }
 
@@ -355,7 +355,7 @@ button.reserve-submit-btn {
 }
 
 #Country2 {
- font-size: 0.875rem !important;
+ font-size: $px-14 !important;
 }
 
 .name-search-icon {
@@ -381,7 +381,7 @@ button.reserve-submit-btn {
 
 .title-bold-16 {
  font-weight: bold;
- font-size: 1rem;
+ font-size: $px-16;
  color: $dk-text;
 }
 
@@ -427,3 +427,11 @@ button.reserve-submit-btn {
 .general-error {
  font-size: 0.9rem;
 }
+
+.font-size-14 {
+ font-size: $px-14;
+}
+
+.font-size-16 {
+ font-size: $px-16;
+}
diff --git a/src/assets/styles/overrides.scss b/src/assets/styles/overrides.scss
@@ -5,7 +5,7 @@
 @import "theme.scss";
 
 .v-application {
- font-size: 1rem;
+ font-size: $px-16;
  line-height: 1.5rem;
  font-family: 'BCSans', Verdana, Arial, sans-serif !important;
  padding: 0;
@@ -24,20 +24,20 @@
 
  .text-body-3 {
  font-family: inherit;
- font-size: 0.875rem;
+ font-size: $px-14;
  line-height: 1.375rem;
  }
 
  .text-body-4 {
  font-family: inherit;
- font-size: 0.875rem;
+ font-size: $px-14;
  line-height: 1.375rem;
  color: $text;
  }
 
  .text-name {
  font-family: inherit;
- font-size: 1.125rem;
+ font-size: $px-18;
  line-height: 1.875rem;
  text-transform: capitalize;
  color: $text;
@@ -50,7 +50,7 @@
 
  .v-card__title {
  padding: 0;
- font-size: 1.5rem;
+ font-size: $px-24;
  font-weight: bold;
  color: $dk-text;
  letter-spacing: normal;
@@ -60,7 +60,7 @@
 
  .v-card__text {
  padding: 2rem 0 0 0;
- font-size: 1rem;
+ font-size: $px-16;
  color: $text;
  line-height: 1.5rem;
  }
@@ -94,13 +94,13 @@
 }
 
 .grey-box-checkbox-button label {
- font-size: 14px;
+ font-size: $px-14;
  color: $non-clickable-blue !important;
 }
 
 .v-btn {
  font-family: inherit !important;
- font-size: 0.875rem !important;
+ font-size: $px-14 !important;
  text-transform: none !important;
  letter-spacing: normal !important;
  height: 2.5rem !important;
@@ -176,7 +176,7 @@
 }
 
 .v-select__selections {
- font-size: 16px;
+ font-size: $px-16;
  color: $text !important;
 }
 
@@ -186,14 +186,14 @@
 
 .v-tab {
  text-transform: none !important;
- font-size: 18px !important;
+ font-size: $px-18 !important;
  font-weight: bold !important;
  color: white !important;
 }
 
 .v-tab.active-tab {
  text-transform: none !important;
- font-size: 18px !important;
+ font-size: $px-18 !important;
  font-weight: bold !important;
  color: $dk-text !important;
 }
@@ -216,7 +216,7 @@
  background-color: RGB(73,80,87) !important;
  color: white !important;
  border-radius: 4px;
- font-size: 12px !important;
+ font-size: $px-12 !important;
  line-height: 18px !important;
  padding: 20px !important;
  letter-spacing: 0;
@@ -294,7 +294,7 @@ input#name-generator-1, input#name-generator-2 {
 
 .ql-container {
  font-family: inherit !important;
- font-size: 16px !important;
+ font-size: $px-16 !important;
  border-left: none !important;
  border-right: none !important;
  border-top: none !important;

diff --git a/src/components/advanced-search/advanced-search-form.vue b/src/components/advanced-search/advanced-search-form.vue
@@ -208,7 +208,7 @@ export default class AdvancedSearchForm extends Vue {
 
 #find-nr-btn {
  color: $app-blue;
- font-size: .875rem;
+ font-size: $px-14;
 }
 
 #clear-date-btn {

diff --git a/src/components/advanced-search/advanced-search-retrieve.vue b/src/components/advanced-search/advanced-search-retrieve.vue
@@ -166,7 +166,7 @@ export default class AdvancedSearchRetrieve extends Vue {
 
 #find-nr-btn {
  color: $app-blue;
- font-size: .875rem;
+ font-size: $px-14;
 }
 
 #clear-date-btn {

diff --git a/src/components/advanced-search/advanced-search-table.vue b/src/components/advanced-search/advanced-search-table.vue
@@ -126,7 +126,7 @@ export default class AdvancedSearchTable extends Mixins(DateMixin) {
 
 #advanced-search-results-table {
  ::v-deep th {
- font-size: .875rem;
+ font-size: $px-14;
  font-weight: bold;
  color: $dk-text;
  }
@@ -175,7 +175,7 @@ export default class AdvancedSearchTable extends Mixins(DateMixin) {
 }
 
 ::v-deep .v-data-table > .v-data-table__wrapper > table > tbody > tr > td {
- font-size: 1rem;
+ font-size: $px-16;
  color: $text;
  line-height: 1.375rem;
 }

diff --git a/src/components/common/app-title-cols.vue b/src/components/common/app-title-cols.vue
@@ -49,7 +49,7 @@ export default class AppTitleCols extends Vue {
 
 #app-subtitle {
  font-weight: normal;
- font-size: 18px;
+ font-size: $px-18;
 }
 
 </style>
diff --git a/src/components/common/applicant-info-1.vue b/src/components/common/applicant-info-1.vue
@@ -350,7 +350,7 @@
  </v-row>
 
  <!--BUSINESS JURISDICTION-->
- <v-row v-if="getShowXproJurisdiction && showAllFields && getEditMode" class="mt-2 mb-0">
+ <v-row v-if="(getLocation !== Location.BC) && showAllFields && getEditMode" class="mt-2 mb-0">
  <v-col cols="12" md="6" lg="6" class="py-0 my-0">
  <label for="xprojurisdiction" class="hidden">Business Jurisdiction</label>
  <v-select
@@ -427,7 +427,6 @@ export default class ApplicantInfo1 extends Mixins(ActionMixin) {
  @Getter getNrData!: any
  @Getter getNrState!: string
  @Getter getSubmissionTabNumber!: number
- @Getter getShowXproJurisdiction!: boolean
  @Getter getKeycloakRoles!: string[]
  @Getter isMobile!: boolean
  @Getter isRoleStaff!: boolean

diff --git a/src/components/common/applicant-info-2.vue b/src/components/common/applicant-info-2.vue
@@ -210,8 +210,8 @@
 
 <script lang="ts">
 import { Component, Vue, Watch } from 'vue-property-decorator'
-import ApplicantInfoNav from '@/components/common/applicant-info-nav.vue'
 import { Action, Getter } from 'vuex-class'
+import ApplicantInfoNav from '@/components/common/applicant-info-nav.vue'
 import { ApplicantI } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import { CorpNumRequests, NrRequestActionCodes, NrState } from '@/enums'
@@ -390,6 +390,7 @@ export default class ApplicantInfo2 extends Vue {
  async nextAction () {
  this.setIsLoadingSubmission(true)
  this.validate()
+ // validate corp num in COLIN
  if (this.getShowCorpNum === CorpNumRequests.COLIN) {
  this.$root.$emit('showSpinner', true)
  await this.validateCorpNum(this.getCorpNum)
@@ -410,7 +411,7 @@ export default class ApplicantInfo2 extends Vue {
 
 ::v-deep .v-textarea textarea {
  line-height: 1.375rem !important;
- font-size: 0.875rem !important;
+ font-size: $px-14 !important;
 }
 
 // disabled checkbox label