Small fixes

bcgov · Nov 29, 2024 · d5644e1 · d5644e1
1 parent c9202a8
commit d5644e1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json
diff --git a/auth-web/package.json b/auth-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auth-web",
-  "version": "2.6.116",
+  "version": "2.6.117",
   "appName": "Auth Web",
   "sbcName": "SBC Common Components",
   "private": true,

diff --git a/auth-web/src/components/auth/account-settings/transaction/TransactionsDataTable.vue b/auth-web/src/components/auth/account-settings/transaction/TransactionsDataTable.vue
@@ -75,7 +75,7 @@
             filled
             hide-details
             :placeholder="'Date'"
-            :value="dateRangeSelected ? 'Custom' : '1 Year'"
+            :value="datePickerValue"
             @click:clear="dateRangeReset++"
           />
         </div>
@@ -183,7 +183,7 @@ export default defineComponent({
     }
 
     // date picker stuff
-    const dateRangeReset = ref(0)
+    const dateRangeReset = ref(1)
     const dateRangeSelected = ref(false)
     const showDatePicker = ref(false)
     const scrollToDatePicker = async () => {
@@ -259,6 +259,16 @@ export default defineComponent({
       return CommonUtils.formatDisplayDate(date, 'MMMM DD, YYYY')
     }
 
+    const datePickerValue = computed(() => {
+      if (dateRangeSelected.value) { 
+        return 'Custom'
+      }
+      if (transactions.filters.filterPayload.dateFilter.isDefault) {
+        return '1 Year'
+      }
+      return ''
+    })
+
     return {
       InvoiceStatus,
       clearFilters,
@@ -278,7 +288,8 @@ export default defineComponent({
       scrollToDatePicker,
       updateDateRange,
       loadTransactionList,
-      getInvoiceStatus
+      getInvoiceStatus,
+      datePickerValue
     }
   }
 })

diff --git a/auth-web/src/composables/transactions-factory.ts b/auth-web/src/composables/transactions-factory.ts
@@ -130,9 +130,11 @@ export const useTransactions = () => {
     transactions.filters.filterPayload = {
       dateFilter: {
         startDate: moment().subtract(1, 'year').format('YYYY-MM-DD'),
-        endDate: moment().add(1, 'day').format('YYYY-MM-DD')
+        endDate: moment().add(1, 'day').format('YYYY-MM-DD'),
+        isDefault: true
       }
     }
+    transactions.filters.isActive = true
   }
 
   return {

diff --git a/auth-web/src/models/transaction.ts b/auth-web/src/models/transaction.ts
@@ -33,6 +33,7 @@ export interface TransactionFilter {
   dateFilter?: {
     startDate: string
     endDate: string
+    isDefault: boolean
   },
   details?: string,
   folioNumber?: string,