Merge pull request #81 from jordiwes/7358-left-over-changes

left over fixes
bcgov · Jun 2, 2021 · 0d379c5 · 0d379c5
2 parents 7c3556f + 639ac1e
commit 0d379c5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/ppr-ui/src/assets/styles/overrides.scss b/ppr-ui/src/assets/styles/overrides.scss
@@ -206,3 +206,7 @@ td {
 .v-list-item .v-list-item__title {
   font-size: 14px;
 }
+
+.theme--light.v-application .v-input--selection-controls__ripple {
+  color: $gray7;
+}
diff --git a/ppr-ui/src/components/registration/RegistrationLengthTrust.vue b/ppr-ui/src/components/registration/RegistrationLengthTrust.vue
@@ -38,7 +38,7 @@
       </v-container>
     </v-card>
   </v-container>
-  <v-container fluid no-gutters class="white pa-6" :class="{'invalid-message': showErrorComponent}" v-else>
+  <v-container fluid no-gutters class="white pa-6 rounded" :class="{'invalid-message': showErrorComponent}" v-else>
     <v-row no-gutters>
       <v-col cols="3" class="generic-label">
         <span :class="{'invalid-message': showErrorComponent}">Registration Length</span>
@@ -200,10 +200,10 @@ export default defineComponent({
         var life = parseInt(val)
         if (isNaN(life)) {
           localState.lifeYearsMessage = 'Registration length must be a number between 1 and ' +
-                                        localState.maxYears + '.'
+                                        localState.maxYears
           lengthTrust.valid = false
         } else if (life < 1 || life > feeInfoYears.quantityMax) {
-          localState.lifeYearsMessage = 'Registration length must be between 1 and ' + localState.maxYears + '.'
+          localState.lifeYearsMessage = 'Registration length must be between 1 and ' + localState.maxYears
           lengthTrust.valid = false
         } else {
           lengthTrust.lifeYears = life

diff --git a/ppr-ui/src/resources/breadcrumbs.ts b/ppr-ui/src/resources/breadcrumbs.ts
@@ -21,7 +21,7 @@ export const tombstoneBreadcrumbSearch: Array<BreadcrumbIF> = [
   },
   {
     disabled: false,
-    href: sessionStorage.getItem('BASE_URL') + '/dashboard',
+    href: sessionStorage.getItem('BASE_URL') + 'dashboard',
     text: 'My PPR Dashboard'
   },
   {
@@ -38,7 +38,7 @@ export const tombstoneBreadcrumbRegistration: Array<BreadcrumbIF> = [
   },
   {
     disabled: false,
-    href: sessionStorage.getItem('BASE_URL') + '/dashboard',
+    href: sessionStorage.getItem('BASE_URL') + 'dashboard',
     text: 'My PPR Dashboard'
   },
   {

diff --git a/ppr-ui/tests/unit/RegistrationLengthTrust.spec.ts b/ppr-ui/tests/unit/RegistrationLengthTrust.spec.ts
@@ -86,7 +86,7 @@ describe('RegistrationLengthTrust SA tests', () => {
     await Vue.nextTick()
     wrapper.vm.$data.lifeYearsEdit = 'XX'
     await Vue.nextTick()
-    expect(wrapper.vm.lifeYearsMessage).toBe('Registration length must be a number between 1 and 25.')
+    expect(wrapper.vm.lifeYearsMessage).toBe('Registration length must be a number between 1 and 25')
   })
   it('renders lifeInfinite', async () => {
     wrapper.vm.$data.lifeInfinite = 'true'