From b93ab40a2e27dedc54c1d1807fa526b55ab9c169 Mon Sep 17 00:00:00 2001
From: Karim El Jazzar <122301442+JazzarKarim@users.noreply.github.com>
Date: Thu, 2 Nov 2023 15:31:26 -0700
Subject: [PATCH] Make Certify block non-editable if non-staff user (AGM
 Filings) (#564)

Make certify block non-editable if non-staff user
---
 package-lock.json                    | 4 ++--
 package.json                         | 2 +-
 src/views/AgmExtension.vue           | 1 +
 src/views/AgmLocationChg.vue         | 3 ++-
 src/views/ConsentContinuationOut.vue | 4 +---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 205ccd6d0..54978702d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-filings-ui",
-  "version": "6.9.5",
+  "version": "6.9.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-filings-ui",
-      "version": "6.9.5",
+      "version": "6.9.6",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/base-address": "2.0.9",
diff --git a/package.json b/package.json
index 73458d9d0..de887d12d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-filings-ui",
-  "version": "6.9.5",
+  "version": "6.9.6",
   "private": true,
   "appName": "Filings UI",
   "sbcName": "SBC Common Components",
diff --git a/src/views/AgmExtension.vue b/src/views/AgmExtension.vue
index 3e8dd5e13..7aa302db5 100644
--- a/src/views/AgmExtension.vue
+++ b/src/views/AgmExtension.vue
@@ -97,6 +97,7 @@
                   :isCertified.sync="isCertified"
                   :certifiedBy.sync="certifiedBy"
                   :class="{ 'invalid-certify': !certifyFormValid && showErrors }"
+                  :disableEdit="!isRoleStaff"
                   :entityDisplay="displayName()"
                   :message="certifyText(FilingCodes.AGM_EXTENSION)"
                   @valid="certifyFormValid=$event"
diff --git a/src/views/AgmLocationChg.vue b/src/views/AgmLocationChg.vue
index a0f125243..603bc1ad5 100644
--- a/src/views/AgmLocationChg.vue
+++ b/src/views/AgmLocationChg.vue
@@ -192,6 +192,7 @@
                   :isCertified.sync="isCertified"
                   :certifiedBy.sync="certifiedBy"
                   :class="{ 'invalid-certify': !certifyFormValid && showErrors }"
+                  :disableEdit="!isRoleStaff"
                   :entityDisplay="displayName()"
                   :message="certifyText(FilingCodes.AGM_LOCATION_CHANGE)"
                   @valid="certifyFormValid=$event"
@@ -419,7 +420,7 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
   mounted (): void {
     // Pre-populate the certified block with the logged in user's name (if not staff)
     if (!this.isRoleStaff && this.getUserInfo) {
-      this.certifiedBy = this.getUserInfo.firstname + ' ' + this.getUserInfo.lastName
+      this.certifiedBy = this.getUserInfo.firstname + ' ' + this.getUserInfo.lastname
     }
 
     // always include agm location change code
diff --git a/src/views/ConsentContinuationOut.vue b/src/views/ConsentContinuationOut.vue
index 5f65d4c6a..ede34ef7f 100644
--- a/src/views/ConsentContinuationOut.vue
+++ b/src/views/ConsentContinuationOut.vue
@@ -507,9 +507,7 @@ export default class ConsentContinuationOut extends Mixins(CommonMixin, DateMixi
 
     // Pre-populate the certified block with the logged in user's name (if not staff)
     if (!this.isRoleStaff && this.getUserInfo) {
-      const firstName = this.getUserInfo?.firstname
-      const lastName = this.getUserInfo?.lastname
-      this.certifiedBy = firstName + ' ' + lastName
+      this.certifiedBy = this.getUserInfo.firstname + ' ' + this.getUserInfo.lastname
     }
 
     // always include consent continue out code