18024 Finish AGM Extension UI implementation (bcgov#594)

* Fix AGM extension api payload * Update version to 7.0.21 * Fix unit test
JazzarKarim · Nov 28, 2023 · eaf2445 · eaf2445
1 parent b20dc57
commit eaf2445
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 24 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-filings-ui",
-  "version": "7.0.20",
+  "version": "7.0.21",
   "private": true,
   "appName": "Filings UI",
   "sbcName": "SBC Common Components",
@@ -19,7 +19,7 @@
     "@bcrs-shared-components/confirm-dialog": "1.2.1",
     "@bcrs-shared-components/corp-type-module": "1.0.14",
     "@bcrs-shared-components/court-order-poa": "2.1.4",
-    "@bcrs-shared-components/date-picker": "1.2.38",
+    "@bcrs-shared-components/date-picker": "1.2.39",
     "@bcrs-shared-components/document-delivery": "1.2.1",
     "@bcrs-shared-components/enums": "1.1.2",
     "@bcrs-shared-components/expandable-help": "1.0.1",

diff --git a/src/components/AgmExtension/ExtensionRequest.vue b/src/components/AgmExtension/ExtensionRequest.vue
@@ -95,6 +95,7 @@
                 nudge-right="40"
                 :minDate="incorporationDateText"
                 :maxDate="data.currentDate"
+                :inputRules="dateRules"
                 @emitDate="data.prevAgmDate = $event"
                 @emitCancel="data.prevAgmDate = ''"
               />
@@ -132,6 +133,7 @@
                   :showCurrent="prevExpiryDateMin"
                   :minDate="prevExpiryDateMin"
                   :maxDate="prevExpiryDateMax"
+                  :inputRules="dateRules"
                   @emitDate="data.prevExpiryDate = $event"
                   @emitCancel="data.prevExpiryDate = ''"
                 />
@@ -169,6 +171,7 @@
               title="Intended date this AGM will be held"
               nudge-right="40"
               :minDate="data.currentDate"
+              :inputRules="dateRules"
               @emitDate="data.intendedAgmDate = $event"
               @emitCancel="data.intendedAgmDate = ''"
             />
@@ -234,6 +237,13 @@ export default class ExtensionRequest extends Vue {
     ]
   }
 
+  /** The array of validations rule(s) for the  date fields. */
+  get dateRules (): Array<(v) => boolean | string> {
+    return [
+      v => !!v || 'A date is required.'
+    ]
+  }
+
   /** Whether to disable the editing of AGM Year field. */
   get isFirstAgm (): boolean {
     // Field disabled on first load when value is null

diff --git a/src/components/EntityInfo/EntityMenu.vue b/src/components/EntityInfo/EntityMenu.vue
@@ -168,17 +168,21 @@
                 content-class="right-tooltip"
               >
                 <template #activator="{ on }">
-                  <v-list-item
+                  <div
                     v-if="enableAgmExtension"
-                    id="agm-ext-list-item"
-                    :disabled="!isAllowed(AllowableActions.AGM_EXTENSION)"
                     v-on="on"
-                    @click="goToAgmExtensionFiling()"
                   >
-                    <v-list-item-title>
-                      <span class="app-blue">Request AGM Extension</span>
-                    </v-list-item-title>
-                  </v-list-item>
+                    <v-list-item
+                      id="agm-ext-list-item"
+                      :disabled="!isAllowed(AllowableActions.AGM_EXTENSION)"
+                      v-on="on"
+                      @click="goToAgmExtensionFiling()"
+                    >
+                      <v-list-item-title>
+                        <span class="app-blue">Request AGM Extension</span>
+                      </v-list-item-title>
+                    </v-list-item>
+                  </div>
                 </template>
                 <span>{{ agmExtensionToolTipText }}</span>
               </v-tooltip>
@@ -191,7 +195,6 @@
                 <template #activator="{ on }">
                   <div
                     v-if="enableAgmLocationChg"
-                    class="d-inline-block"
                     v-on="on"
                   >
                     <v-list-item

diff --git a/src/views/AgmExtension.vue b/src/views/AgmExtension.vue
@@ -65,9 +65,6 @@
               :evaluateResult="extensionRequestValid"
             />
 
-            <!-- delete this debugging code -->
-            <pre class="mt-8">data: {{ data }}</pre>
-
             <!-- Certify -->
             <section class="mt-8">
               <header>
@@ -431,12 +428,15 @@ export default class AgmExtension extends Mixins(CommonMixin, DateMixin,
         // convert local properties into API/schema properties
         year: this.data.agmYear,
         isFirstAgm: this.data.isFirstAgm,
-        prevAgmRefDate: this.data.prevAgmDate,
         extReqForAgmYear: this.data.isPrevExtension,
-        expireDateCurrExt: this.data.prevExpiryDate,
         intendedAgmDate: this.data.intendedAgmDate,
         totalApprovedExt: this.data.extensionDuration,
         expireDateApprovedExt: this.data.agmDueDate,
+        // conditionally add properties if not null
+        ...(this.data.prevAgmDate && { prevAgmRefDate: this.data.prevAgmDate }),
+        ...(this.data.prevExpiryDate && {
+          expireDateCurrExt: this.data.prevExpiryDate
+        }),
         // add in remaining local properties for future auditing
         ...this.data
       }

diff --git a/tests/unit/AgmExtension.spec.ts b/tests/unit/AgmExtension.spec.ts
@@ -199,7 +199,6 @@ describe('AGM Extension view', () => {
         alreadyExtended: null,
         currentDate: '2023-11-06',
         expireDateApprovedExt: null,
-        expireDateCurrExt: null,
         extReqForAgmYear: null,
         extensionDuration: NaN,
         incorporationDate: new Date('2000-01-01T08:00:00.000Z'),
@@ -209,7 +208,6 @@ describe('AGM Extension view', () => {
         isGoodStanding: true,
         isPrevExtension: null,
         prevAgmDate: null,
-        prevAgmRefDate: null,
         prevExpiryDate: null,
         requestExpired: null,
         totalApprovedExt: NaN,