From d123c2ab999c25b35e4d6ccda2e250352a98a633 Mon Sep 17 00:00:00 2001 From: Alex Lambert <60455392+lambert-alex@users.noreply.github.com> Date: Thu, 2 Jun 2022 09:09:13 -0700 Subject: [PATCH] 12169 Prefill Certify component for non-staff user. Updated certify component to latest version. (#287) * Updated change componenet version, prefilled and disabled edit for non staff user. * Removing code that I added that is uneeded. * Fixes as requested * Requested fixes. * Remove unnecessary getter * change to default disableEdit --- package-lock.json | 138 +++++++++-------------- package.json | 4 +- src/components/common/CertifySection.vue | 54 ++++----- src/views/Change.vue | 19 +++- 4 files changed, 94 insertions(+), 121 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6069bfe04..57d887fba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "business-edit-ui", - "version": "3.1.13", + "version": "3.1.14", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "business-edit-ui", - "version": "3.1.13", + "version": "3.1.14", "dependencies": { "@babel/compat-data": "^7.11.0", "@bcrs-shared-components/action-chip": "1.0.6", "@bcrs-shared-components/breadcrumb": "2.0.1", - "@bcrs-shared-components/certify": "1.0.18", + "@bcrs-shared-components/certify": "2.0.4", "@bcrs-shared-components/completing-party": "2.0.0", "@bcrs-shared-components/confirm-dialog": "1.1.0", "@bcrs-shared-components/contact-info": "1.1.2", @@ -1848,11 +1848,11 @@ } }, "node_modules/@bcrs-shared-components/certify": { - "version": "1.0.18", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/certify/-/certify-1.0.18.tgz", - "integrity": "sha512-+qqWffUUVnPSUHdR8h2Q0kJsbUZ6PmDHVIsqy2JbDoZaEySO4qizkgfpqdQ1Thtyz802td2eb0SLKk0wvaSrfg==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/certify/-/certify-2.0.4.tgz", + "integrity": "sha512-pyVoQ3Mel5kqlviZOgoWjig0G7DeWw+Lo6N7PyTQnWYJExv1buqBggy/TJ4X2bL93/JLHXgjxT2M/hKbE0mJGQ==", "dependencies": { - "@bcrs-shared-components/interfaces": "^1.0.19", + "@bcrs-shared-components/interfaces": "^1.0.36", "vue-property-decorator": "^8.4.0" } }, @@ -7680,7 +7680,7 @@ "node_modules/copy-webpack-plugin/node_modules/glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "dev": true, "dependencies": { "is-glob": "^3.1.0", @@ -10129,15 +10129,12 @@ } }, "node_modules/eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz", + "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==", "dev": true, - "dependencies": { - "original": "^1.0.0" - }, "engines": { - "node": ">=0.12.0" + "node": ">=12.0.0" } }, "node_modules/evp_bytestokey": { @@ -10542,7 +10539,7 @@ "node_modules/fast-glob/node_modules/glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "dev": true, "dependencies": { "is-glob": "^3.1.0", @@ -10574,9 +10571,9 @@ "dev": true }, "node_modules/faye-websocket": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", - "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, "dependencies": { "websocket-driver": ">=0.5.1" @@ -15321,12 +15318,6 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, - "node_modules/json3": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz", - "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==", - "dev": true - }, "node_modules/json5": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", @@ -17095,15 +17086,6 @@ "node": ">=4" } }, - "node_modules/original": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", - "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true, - "dependencies": { - "url-parse": "^1.4.3" - } - }, "node_modules/os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", @@ -19921,17 +19903,22 @@ } }, "node_modules/sockjs-client": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.0.tgz", - "integrity": "sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.1.tgz", + "integrity": "sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw==", "dev": true, "dependencies": { - "debug": "^3.2.6", - "eventsource": "^1.0.7", - "faye-websocket": "^0.11.3", + "debug": "^3.2.7", + "eventsource": "^2.0.2", + "faye-websocket": "^0.11.4", "inherits": "^2.0.4", - "json3": "^3.3.3", - "url-parse": "^1.4.7" + "url-parse": "^1.5.10" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://tidelift.com/funding/github/npm/sockjs-client" } }, "node_modules/sockjs-client/node_modules/debug": { @@ -22370,7 +22357,7 @@ "node_modules/watchpack-chokidar2/node_modules/glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "dev": true, "optional": true, "dependencies": { @@ -22792,7 +22779,7 @@ "node_modules/webpack-dev-server/node_modules/glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "dev": true, "dependencies": { "is-glob": "^3.1.0", @@ -24672,11 +24659,11 @@ } }, "@bcrs-shared-components/certify": { - "version": "1.0.18", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/certify/-/certify-1.0.18.tgz", - "integrity": "sha512-+qqWffUUVnPSUHdR8h2Q0kJsbUZ6PmDHVIsqy2JbDoZaEySO4qizkgfpqdQ1Thtyz802td2eb0SLKk0wvaSrfg==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/certify/-/certify-2.0.4.tgz", + "integrity": "sha512-pyVoQ3Mel5kqlviZOgoWjig0G7DeWw+Lo6N7PyTQnWYJExv1buqBggy/TJ4X2bL93/JLHXgjxT2M/hKbE0mJGQ==", "requires": { - "@bcrs-shared-components/interfaces": "^1.0.19", + "@bcrs-shared-components/interfaces": "^1.0.36", "vue-property-decorator": "^8.4.0" } }, @@ -29537,7 +29524,7 @@ "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "dev": true, "requires": { "is-glob": "^3.1.0", @@ -31507,13 +31494,10 @@ "dev": true }, "eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "dev": true, - "requires": { - "original": "^1.0.0" - } + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz", + "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==", + "dev": true }, "evp_bytestokey": { "version": "1.0.3", @@ -31857,7 +31841,7 @@ "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "dev": true, "requires": { "is-glob": "^3.1.0", @@ -31890,9 +31874,9 @@ "dev": true }, "faye-websocket": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", - "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, "requires": { "websocket-driver": ">=0.5.1" @@ -35718,12 +35702,6 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, - "json3": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz", - "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==", - "dev": true - }, "json5": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", @@ -37201,15 +37179,6 @@ } } }, - "original": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", - "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true, - "requires": { - "url-parse": "^1.4.3" - } - }, "os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", @@ -39562,17 +39531,16 @@ } }, "sockjs-client": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.0.tgz", - "integrity": "sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.1.tgz", + "integrity": "sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw==", "dev": true, "requires": { - "debug": "^3.2.6", - "eventsource": "^1.0.7", - "faye-websocket": "^0.11.3", + "debug": "^3.2.7", + "eventsource": "^2.0.2", + "faye-websocket": "^0.11.4", "inherits": "^2.0.4", - "json3": "^3.3.3", - "url-parse": "^1.4.7" + "url-parse": "^1.5.10" }, "dependencies": { "debug": { @@ -41556,7 +41524,7 @@ "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "dev": true, "optional": true, "requires": { @@ -41911,7 +41879,7 @@ "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "dev": true, "requires": { "is-glob": "^3.1.0", diff --git a/package.json b/package.json index 07a0e2832..83cacffe4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "business-edit-ui", - "version": "3.1.13", + "version": "3.1.14", "private": true, "appName": "Edit UI", "sbcName": "SBC Common Components", @@ -16,7 +16,7 @@ "@babel/compat-data": "^7.11.0", "@bcrs-shared-components/action-chip": "1.0.6", "@bcrs-shared-components/breadcrumb": "2.0.1", - "@bcrs-shared-components/certify": "1.0.18", + "@bcrs-shared-components/certify": "2.0.4", "@bcrs-shared-components/completing-party": "2.0.0", "@bcrs-shared-components/confirm-dialog": "1.1.0", "@bcrs-shared-components/contact-info": "1.1.2", diff --git a/src/components/common/CertifySection.vue b/src/components/common/CertifySection.vue index 020f439ab..c2bc319a7 100644 --- a/src/components/common/CertifySection.vue +++ b/src/components/common/CertifySection.vue @@ -7,20 +7,23 @@
- + + +
@@ -52,6 +55,9 @@ export default class CertifySection extends Mixins(DateMixin, SharedMixin) { /** Whether to perform validation. */ @Prop({ default: false }) readonly validate: boolean + /** To determine whether user input is enabled. */ + @Prop({ default: false }) readonly disableEdit: boolean + /** Called when component is mounted. */ mounted (): void { this.setCertifyState( @@ -73,7 +79,7 @@ export default class CertifySection extends Mixins(DateMixin, SharedMixin) { } /** Handler for Valid change event. */ - private onIsCertified (val: boolean): void { + protected onIsCertified (val: boolean): void { this.setCertifyState( { valid: val, @@ -84,7 +90,7 @@ export default class CertifySection extends Mixins(DateMixin, SharedMixin) { } /** Handler for CertifiedBy change event. */ - private onCertifiedBy (val: string): void { + protected onCertifiedBy (val: string): void { this.setCertifyState( { valid: this.getCertifyState.valid, @@ -112,20 +118,4 @@ export default class CertifySection extends Mixins(DateMixin, SharedMixin) { .invalid-label { color: $BCgovInputError; } - -// fix hard-coded whitespace inside shared component -// we want the same padding as "section-container py-6" -::v-deep { - #AR-step-4-container { - margin-top: 0 !important; - padding-top: 0.75rem !important; - padding-right: 1.125rem !important; - padding-bottom: 0 !important; - padding-left: 0.625rem !important; - } - - #certify-form { - margin-top: 0 !important; - } -} diff --git a/src/views/Change.vue b/src/views/Change.vue index c15f0bbdc..2df047af9 100644 --- a/src/views/Change.vue +++ b/src/views/Change.vue @@ -54,6 +54,7 @@ class="mt-10" sectionNumber="3." :validate="getAppValidate" + :disableEdit="!isRoleStaff" />