15951 - Special Resolution Correction - QA / UX fixes (#509)

* Small tweak * test permission * revert last commit, which for permission test * add a unit test to get rid of codecov issue * add unit test to fix codecov issue * rules styling fix * rules section button styling * Minor tweak for correction payload. * Minor UX fixes + changes to correction payload. * Minor unit test fixes * Make rules or memorandum addable by themselves. --------- Co-authored-by: Jia Xu <Jia.Xu@gov.bc.ca>
bcgov · Jul 6, 2023 · 2bfef59 · 2bfef59
1 parent 7e18d4a
commit 2bfef59
Show file tree

Hide file tree

Showing 11 changed files with 225 additions and 70 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-edit-ui",
-  "version": "4.4.6",
+  "version": "4.4.7",
   "private": true,
   "appName": "Edit UI",
   "sbcName": "SBC Common Components",

diff --git a/src/components/SpecialResolution/Resolution.vue b/src/components/SpecialResolution/Resolution.vue
@@ -102,13 +102,12 @@
             v-if="isEditing"
             id="resolution-confirmation-buttons"
             no-gutters
-            class="justify-end pr-8 pb-8 mt-8 d-flex"
+            class="justify-end pb-8 mt-8 d-flex"
           >
             <v-btn
               id="btn-resolution-done"
               large
               color="primary"
-              class="mr-2"
               @click="updateSpecialResolutionStore()"
             >
               <span>Done</span>
@@ -181,8 +180,8 @@ export default class Resolution extends Vue {
 
   /** For ok button, stores using setSpecialResolution. */
   async updateSpecialResolutionStore (): Promise<void> {
-    await this.$refs.resolutionEditor.onValidate()
-    await this.$refs.signingParty.onValidate()
+    await this.$refs.resolutionEditor.onValidate(false)
+    await this.$refs.signingParty.onValidate(false)
     if (this.getSpecialResolutionFormValid) {
       this.isEditing = false
       this.hasChanged = true

diff --git a/src/components/SpecialResolution/ResolutionEditor.vue b/src/components/SpecialResolution/ResolutionEditor.vue
@@ -319,15 +319,12 @@ export default class ResolutionEditor extends Vue {
 
   /** Used to trigger validate from outside of component. */
   @Watch('getComponentValidate')
-  async onValidate (): Promise<void> {
-    if (!this.isEditing) {
-      this.setSpecialResolutionValid(true)
-      return
-    }
+  async onValidate (includeIsEditing = true): Promise<void> {
     const hasData = !!this.resolutionDateText && !!this.resolution && this.resolution !== '<p></p>'
     this.$refs.resolutionDatePickerRef.validateForm()
     const isResolutionDateValid = this.$refs.resolutionDatePickerRef.isDateValid()
-    this.setSpecialResolutionValid(hasData && isResolutionDateValid)
+    const isValid = hasData && isResolutionDateValid && (!includeIsEditing || !this.isEditing)
+    this.setSpecialResolutionValid(isValid)
   }
 }
 </script>

diff --git a/src/components/SpecialResolution/Rules.vue b/src/components/SpecialResolution/Rules.vue
@@ -89,14 +89,14 @@
                 </div>
                 <div v-else>
                   <div
-                    class="px-4 pt-0 section-container info-text"
+                    class="pt-0 instructional-text section-container"
                     :class="{'error-text': rulesEditingInvalid}"
                   >
                     You can update the rules of association in one of the following ways:
                   </div>
-                  <v-divider class="mx-4" />
+                  <v-divider class="mx-8" />
                   <section
-                    class="px-4 py-4 section-container"
+                    class="py-4 section-container"
                   >
                     <v-btn
                       id="btn-describe-rules"
@@ -128,9 +128,9 @@
                       </template>
                     </v-checkbox>
                   </section>
-                  <v-divider class="mx-4" />
+                  <v-divider class="mx-8" />
                   <section
-                    class="pa-4 section-container"
+                    class="section-container"
                   >
                     <v-btn
                       id="btn-upload-rules"
@@ -189,7 +189,7 @@
                       </header>
                     </v-expand-transition>
                   </section>
-                  <v-divider class="mx-4" />
+                  <v-divider class="mx-8" />
 
                   <v-row
                     id="rules-confirmation-buttons"
@@ -519,7 +519,7 @@ header {
 }
 
 .black-bold-font {
-  color: black !important;
+  color: $gray9 !important;
   font-weight: bold !important
 }
 
@@ -575,5 +575,8 @@ a {
 :deep(.v-label) {
   font-weight: normal;
 }
+.instructional-text {
+  color: $gray7;
+}
 
 </style>
diff --git a/src/components/SpecialResolution/SigningParty.vue b/src/components/SpecialResolution/SigningParty.vue
@@ -272,15 +272,12 @@ export default class SigningParty extends Vue {
 
   /** Used to trigger validate from outside of component. */
   @Watch('getComponentValidate')
-  async onValidate (): Promise<void> {
-    if (!this.isEditing) {
-      await this.setSpecialResolutionSignatureValid(true)
-      return
-    }
+  async onValidate (includeIsEditing = true): Promise<void> {
     const hasSigningData = !!this.signingDate && !!this.signatory.givenName && !!this.signatory.familyName
     this.$refs.signatureDatePickerRef.validateForm()
     const isSignatureDateValid = this.$refs.signatureDatePickerRef.isDateValid()
-    await this.setSpecialResolutionSignatureValid(hasSigningData && isSignatureDateValid)
+    const isValid = hasSigningData && isSignatureDateValid && (!includeIsEditing || !this.isEditing)
+    await this.setSpecialResolutionSignatureValid(isValid)
   }
 }
 </script>

diff --git a/src/components/common/Actions.vue b/src/components/common/Actions.vue
@@ -10,6 +10,8 @@
         <v-btn
           id="save-btn"
           large
+          outlined
+          color="primary"
           :disabled="isSaveButtonDisabled"
           :loading="isSaving"
           @click="onClickSave()"
@@ -20,6 +22,8 @@
         <v-btn
           id="save-resume-btn"
           large
+          outlined
+          color="primary"
           :disabled="isSaveResumeButtonDisabled"
           :loading="isSavingResuming"
           @click="onClickSaveResume()"

diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
@@ -77,6 +77,7 @@ export default class FilingTemplateMixin extends DateMixin {
   @Getter(useStore) getSpecialResolutionRules!: RulesMemorandumIF
   @Getter(useStore) isCoopCorrectionFiling!: boolean
   @Getter(useStore) getLatestResolutionForBusiness!: SpecialResolutionIF
+  @Getter(useStore) hasSpecialResolutionResolutionChanged!: boolean
 
   // Global actions
   @Action(useStore) setBusinessContact!: ActionBindingIF
@@ -199,16 +200,8 @@ export default class FilingTemplateMixin extends DateMixin {
     }
 
     if (this.isCoopCorrectionFiling) {
-      // Parties and offices aren't required for Coop corrections.
-      delete filing.correction.parties
+      // Offices aren't required for Coop corrections.
       delete filing.correction.offices
-      filing.correction = {
-        ...filing.correction,
-        resolution: this.getSpecialResolution.resolution,
-        resolutionDate: this.getSpecialResolution.resolutionDate,
-        signingDate: this.getSpecialResolution.signingDate,
-        signatory: this.getSpecialResolution.signatory
-      }
 
       // Apply Court Order ONLY when it is required and applied
       if (this.getHasPlanOfArrangement || this.getFileNumber) {
@@ -219,31 +212,48 @@ export default class FilingTemplateMixin extends DateMixin {
         }
       }
 
-      if (
-        this.hasAssociationTypeChanged ||
-        this.hasSpecialResolutionMemorandumChanged ||
-        this.hasSpecialResolutionRulesChanged
-      ) {
-        filing.correction = {
-          ...filing.correction,
-          cooperativeAssociationType: this.getAssociationType,
-          rulesFileKey: this.getSpecialResolutionRules?.key,
-          rulesFileName: this.getSpecialResolutionRules?.name,
-          rulesUploadedOn: this.getSpecialResolutionRules?.uploaded,
-          memorandumFileKey: this.getSpecialResolutionMemorandum?.key,
-          memorandumFileName: this.getSpecialResolutionMemorandum?.name
-        }
-        // Ensures a key isn't passed when including the rules or memorandum in the resolution.
+      // Business rules are a bit different for corrections.
+      if (this.hasAssociationTypeChanged) {
+        filing.correction.cooperativeAssociationType = this.getAssociationType
+      }
+
+      if (this.hasSpecialResolutionRulesChanged) {
         if (this.getSpecialResolutionRules?.includedInResolution) {
-          delete filing.correction.rulesFileKey
-          delete filing.correction.rulesFileName
-          delete filing.correction.rulesUploadedOn
-          filing.correction.rulesInResolution = true
+          filing.correction = {
+            ...filing.correction,
+            rulesInResolution: true
+          }
+        } else {
+          filing.correction = {
+            ...filing.correction,
+            rulesFileKey: this.getSpecialResolutionRules?.key,
+            rulesFileName: this.getSpecialResolutionRules?.name
+          }
         }
+      }
+
+      if (this.hasSpecialResolutionMemorandumChanged) {
         if (this.getSpecialResolutionMemorandum?.includedInResolution) {
-          delete filing.correction.memorandumFileKey
-          delete filing.correction.memorandumFileName
-          filing.correction.memorandumInResolution = true
+          filing.correction = {
+            ...filing.correction,
+            memorandumInResolution: true
+          }
+        } else {
+          filing.correction = {
+            ...filing.correction,
+            memorandumFileKey: this.getSpecialResolutionMemorandum?.key,
+            memorandumFileName: this.getSpecialResolutionMemorandum?.name
+          }
+        }
+      }
+
+      if (this.hasSpecialResolutionResolutionChanged) {
+        filing.correction = {
+          ...filing.correction,
+          resolution: this.getSpecialResolution.resolution,
+          resolutionDate: this.getSpecialResolution.resolutionDate,
+          signingDate: this.getSpecialResolution.signingDate,
+          signatory: this.getSpecialResolution.signatory
         }
       }
     }
@@ -467,27 +477,36 @@ export default class FilingTemplateMixin extends DateMixin {
           legalType: this.getEntityType
         },
         contactPoint: this.getContactPoint,
-        cooperativeAssociationType: this.getAssociationType,
-        rulesFileKey: this.getSpecialResolutionRules?.key,
-        rulesFileName: this.getSpecialResolutionRules?.name,
-        rulesUploadedOn: this.getSpecialResolutionRules?.uploaded,
-        memorandumFileKey: this.getSpecialResolutionMemorandum?.key,
-        memorandumFileName: this.getSpecialResolutionMemorandum?.name
+        cooperativeAssociationType: this.getAssociationType
       }
+    }
+
+    if (this.hasSpecialResolutionRulesChanged) {
       /* Ensures a key isn't passed when including the rules or memorandum in the resolution.
         See validator here:
         https://github.com/bcgov/lear/blob/main/legal-api/src/legal_api/services/filings/validations/alteration.py#L177
       */
       if (this.getSpecialResolutionRules?.includedInResolution) {
-        delete filing.alteration.rulesFileKey
-        delete filing.alteration.rulesFileName
-        delete filing.alteration.rulesUploadedOn
         filing.alteration.rulesInResolution = true
+      } else {
+        filing.alteration = {
+          ...filing.alteration,
+          rulesFileKey: this.getSpecialResolutionRules?.key,
+          rulesFileName: this.getSpecialResolutionRules?.name,
+          rulesUploadedOn: this.getSpecialResolutionRules?.uploaded
+        }
       }
+    }
+
+    if (this.hasSpecialResolutionMemorandumChanged) {
       if (this.getSpecialResolutionMemorandum?.includedInResolution) {
-        delete filing.alteration.memorandumFileKey
-        delete filing.alteration.memorandumFileName
         filing.alteration.memorandumInResolution = true
+      } else {
+        filing.alteration = {
+          ...filing.alteration,
+          memorandumFileKey: this.getSpecialResolutionMemorandum?.key,
+          memorandumFileName: this.getSpecialResolutionMemorandum?.name
+        }
       }
     }
 
@@ -766,7 +785,17 @@ export default class FilingTemplateMixin extends DateMixin {
 
     if (this.isCoopCorrectionFiling) {
       this.storeSpecialResolutionRulesAndMemorandum(filing.correction, entitySnapshot)
-      const specialResolution = this.getLatestResolutionForBusiness
+      let specialResolution: SpecialResolutionIF = {}
+      if (filing.correction.resolution) {
+        specialResolution = {
+          resolution: filing.correction?.resolution,
+          resolutionDate: filing.correction?.resolutionDate,
+          signingDate: filing.correction?.signingDate,
+          signatory: filing.correction?.signatory
+        }
+      } else {
+        specialResolution = this.getLatestResolutionForBusiness
+      }
       this.setSpecialResolution(cloneDeep(specialResolution))
     }
 

diff --git a/tests/unit/Resolution.spec.ts b/tests/unit/Resolution.spec.ts
@@ -100,6 +100,8 @@ describe('Special Resolution Form component', () => {
   })
 
   it('validation - signatory date should be after or on resolution date', async () => {
+    wrapper.vm.isEditing = false
+    await Vue.nextTick()
     store.stateModel.validationFlags.componentValidate = true
     await Vue.nextTick()
     expect(store.stateModel.validationFlags.flagsCompanyInfo.isValidSpecialResolutionSignature).toBe(true)
@@ -111,6 +113,7 @@ describe('Special Resolution Form component', () => {
     }
     await Vue.nextTick()
     wrapper = mount(Resolution, { vuetify })
+    wrapper.vm.isEditing = false
     store.stateModel.validationFlags.componentValidate = true
     await flushPromises()
 

diff --git a/tests/unit/ResolutionEditor.spec.ts b/tests/unit/ResolutionEditor.spec.ts
@@ -44,16 +44,20 @@ describe('ResolutionEditor', () => {
     expect(store.getValidationFlags.flagsCompanyInfo.isValidSpecialResolution).toBe(true)
     await wrapper.findComponent(DatePickerShared).setData({ dateText: '2023-05-08' })
     await wrapper.setData({ resolutionDateText: '2023-05-08', resolution: '<p></p>' })
+    await wrapper.setProps({ isEditing: false })
     store.setComponentValidate(true)
     await Vue.nextTick()
     expect(store.getValidationFlags.flagsCompanyInfo.isValidSpecialResolution).toBe(false)
     await wrapper.findComponent(DatePickerShared).setData({ dateText: '' })
     await wrapper.setData({ resolutionDateText: '', resolution: '<p>Resolution text</p>' })
+    await wrapper.setProps({ isEditing: false })
     store.setComponentValidate(true)
     await Vue.nextTick()
     expect(store.getValidationFlags.flagsCompanyInfo.isValidSpecialResolution).toBe(false)
     await wrapper.findComponent(DatePickerShared).setData({ dateText: '2020-03-01' })
     await wrapper.setData({ resolutionDateText: '2020-03-01', resolution: '<p> Resolution tex </p>' })
+    await wrapper.setProps({ isEditing: false })
+    await Vue.nextTick()
     store.setComponentValidate(true)
     await Vue.nextTick()
     expect(store.getValidationFlags.flagsCompanyInfo.isValidSpecialResolution).toBe(true)