18137 Name Examination UI to reflect NR number in the URL

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "namex",
-  "version": "2.1.26",
+  "version": "2.1.27",
   "description": "Webpack 5, Vue.js",
   "main": "main.js",
   "author": "BC Public Services",

client/src/components/application/Examine/RequestInfoHeader.vue

@@ -733,7 +733,7 @@
       async setNewExaminer() {
         console.log('Calling the set new examiner function-->setNewExaminer')
         this.examinerDisplay = this.$store.getters.examiner
-        if (this.examinerDisplay.includes('account')) { 
+        if (this.examinerDisplay && this.examinerDisplay.includes('account')) { 
           // fetch transactions
           this.$store.commit('setPendingTransactionsRequest', true)
           await this.$store.dispatch('getTransactionsHistory', this.nrNumber)

client/src/components/application/NameExamination.vue

@@ -123,11 +123,6 @@
           $("#exact-history-match-banner").addClass("alert alert-danger");
         else if (val == 'APPROVED')
           $("#exact-history-match-banner").addClass("alert alert-warning");
-      },
-      auth: {
-        handler(selection) {
-          if (auth != true) { this.$router.push("/Signin") }
-        }
       }
     }
   }

client/src/components/application/sections/StdHeader.vue

@@ -89,6 +89,9 @@
 
 <script>
 /* eslint-disable */
+
+  import { formatNrNum } from '@/utils/utils.js'
+
   export default {
     name: "std-header",
     data () {
@@ -151,10 +154,7 @@
       },
       submit() {
         if (this.nrNum) {
-          let match = /(?:\s+|\s|)(\D|\D+|)(?:\s+|\s|)(\d+)(?:\s+|\s|)/
-          let rtnNR = () => ( 'NR ' )
-
-          let search = this.nrNum.replace(match, rtnNR('$1') + '$2')
+          let search = formatNrNum(this.nrNum)
           if (search) {
             let payload = {
               search,

client/src/components/auth/Signin.vue

@@ -22,16 +22,13 @@
       const ALLOWED_ROLES = [EXAMINER, STAFF, VIEWER]
 
       if (!authorized) {
-        //keycloak = Keycloak('static/keycloak/sbcKey.json');
         keycloak = Keycloak('static/keycloak/keycloak.json');
         this.$store.commit('saveKeyCloak', keycloak);
-
         var token
         const vm = this
 
         keycloak.init({token: token, onLoad: 'login-required'}).success(function (authenticated) {
           if (authenticated) {
-
             sessionStorage.setItem('KEYCLOAK_TOKEN', keycloak.token);
             sessionStorage.setItem('KEYCLOAK_REFRESH', keycloak.refreshToken);
             sessionStorage.setItem('KEYCLOAK_EXPIRES', keycloak.tokenParsed.exp * 1000);
@@ -53,7 +50,8 @@
 
               });
               // everthing is good, re-direct to home page
-                vm.$router.push('/home')
+              const redirect = vm.$router.currentRoute.query.redirect || '/home'
+              vm.$router.push(redirect)
             }
 
           } else {

client/src/router/index.js

@@ -3,6 +3,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import Vuex from 'vuex'
 import store from '@/store'
+import { formatNrNum } from '@/utils/utils.js'
 
 const LandingPage = () => import(/* webpackChunkName: "home" */'@/components/LandingPage')
 const Signin = () => import(/* webpackChunkName: "signin" */'@/components/auth/Signin')
@@ -35,9 +36,18 @@ let router = new Router({
     {
       name: 'nameexamination',
       component: NameExamination,
-      path: '/nameExamination',
+      path: '/nameExamination/:param',
       meta: {
         requiresAuth: true
+      },
+      beforeEnter: (to, from, next) => {
+        if (from.path == '/') {  // reload the page
+          next({
+            path: '/signin',
+            query: { redirect: to.fullPath},
+          })
+        }
+        next()
       }
     },
     {
@@ -75,10 +85,19 @@ router.beforeResolve((to, from, next) => {
     // if not Authenticated, redirect to login page.
     let auth = sessionStorage.getItem('AUTHORIZED')
     if (auth == 'true') {
-
+      if (to.name == 'nameexamination' && from.name == 'Signin' && to.params.param) {
+        const search = formatNrNum(to.params.param)
+        let payload = {
+          search,
+          router: to,
+          refresh: false
+        }
+        store.commit('nrNumber', search)
+        store.dispatch('getpostgrescompInfo', search)
+        store.dispatch('newNrNumber', payload)
+      }
       next()
     } else {
-
       store.dispatch("checkError",{"message": "Not Authorized please login."});
       next({
         path: '/'

client/src/store/index.js

@@ -341,8 +341,10 @@ export const actions = {
                   if (refresh) {
                     commit( 'showExaminationArea', false )
                   }
-                  if ( router && router.currentRoute.path !== '/nameExamination' ) {
-                    router.push( '/nameExamination' )
+                  if ( router && router.currentRoute.name !== 'nameexamination') {
+                    router.push( {name: 'nameexamination',
+                                  params: {param: search.replace(/\s/g, "")}
+                    } )
                   }
                   dispatch( 'resetValues' ).then( () => {
                     commit( 'nrNumber', search )

client/src/utils/utils.js

@@ -0,0 +1,6 @@
+export const formatNrNum = (nrNum) => {
+    const match = /(?:\s+|\s|)(\D|\D+|)(?:\s+|\s|)(\d+)(?:\s+|\s|)/;
+    const rtnNR = () => ('NR ');
+    return nrNum.replace(match, rtnNR('$1') + '$2');
+  };
+