From 791d276f9d46ffc16cdb312282d34e590e6aef0f Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 21 Dec 2021 11:38:31 +0530
Subject: [PATCH] fix: add grouped dropdown for export, add reset filter in
 Report.vue

---
 src/components/DropdownWithActions.vue | 20 +++++++---
 src/pages/Report.vue                   | 51 +++++++++++++++++++++-----
 2 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/src/components/DropdownWithActions.vue b/src/components/DropdownWithActions.vue
index 299bbbe1..2858370b 100644
--- a/src/components/DropdownWithActions.vue
+++ b/src/components/DropdownWithActions.vue
@@ -6,8 +6,15 @@
     right
   >
     <template v-slot="{ toggleDropdown }">
-      <Button class="text-gray-900" :icon="true" @click="toggleDropdown()">
-        <feather-icon name="more-horizontal" class="w-4 h-4" />
+      <Button
+        class="text-gray-900"
+        :type="type"
+        :icon="true"
+        @click="toggleDropdown()"
+      >
+        <slot>
+          <feather-icon name="more-horizontal" class="w-4 h-4" />
+        </slot>
       </Button>
     </template>
   </Dropdown>
@@ -19,10 +26,13 @@ import Button from '@/components/Button';
 
 export default {
   name: 'DropdownWithActions',
-  props: ['actions'],
+  props: {
+    actions: { default: [] },
+    type: { type: String, default: 'secondary' },
+  },
   components: {
     Dropdown,
-    Button
-  }
+    Button,
+  },
 };
 </script>
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index eb08ddb2..895d934c 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -2,16 +2,18 @@
   <div class="flex flex-col max-w-full">
     <PageHeader>
       <h1 slot="title" class="text-2xl font-bold">{{ report.title }}</h1>
-      <template slot="actions">        
-        <Button
-          @click="link.action(reportData, filters)"
-          v-for="link of report.linkFields"
-          :key="link.label"
-          :type="link.type"
+      <template slot="actions">
+        <DropdownWithActions
+          v-for="group of actionGroups"
+          @click="group.action(reportData, filters)"
+          :key="group.label"
+          :type="group.type"
+          :actions="group.actions"
           class="ml-2 text-xs"
         >
-          {{ link.label }}
-        </Button>
+          {{ group.label }}
+        </DropdownWithActions>
+        <DropdownWithActions class="ml-2" :actions="actions" />
         <SearchBar class="ml-2" />
       </template>
     </PageHeader>
@@ -25,7 +27,7 @@
         v-for="df in report.filterFields"
         :key="df.fieldname"
       >
-        <div v-if="df.fieldtype === 'Check'" class="text-gray-900 text-sm">
+        <div v-if="df.fieldtype === 'Check'" class="text-sm">
           {{ df.label }}
         </div>
         <FormControl
@@ -34,7 +36,6 @@
           :df="df"
           :value="filters[df.fieldname]"
           @change="(value) => onFilterChange(df, value)"
-          :show-label="df.fieldtype === 'Check'"
         />
       </div>
     </div>
@@ -101,6 +102,7 @@ import SearchBar from '@/components/SearchBar';
 import Row from '@/components/Row';
 import WithScroll from '@/components/WithScroll';
 import FormControl from '@/components/Controls/FormControl';
+import DropdownWithActions from '../components/DropdownWithActions.vue';
 import reportViewConfig from '@/../reports/view';
 
 export default {
@@ -113,6 +115,7 @@ export default {
     Row,
     FormControl,
     WithScroll,
+    DropdownWithActions,
   },
   provide() {
     return {
@@ -210,6 +213,11 @@ export default {
       this.fetchReportData();
     },
 
+    async resetFilters() {
+      await this.setDefaultFilters();
+      await this.fetchReportData();
+    },
+
     async setDefaultFilters() {
       for (let df of this.report.filterFields) {
         let defaultValue = null;
@@ -273,6 +281,29 @@ export default {
     },
   },
   computed: {
+    actions() {
+      return [
+        ...(this.report.actions?.filter((action) => !action.group)??[]),
+        {
+          label: this._('Reset Filters'),
+          action: this.resetFilters,
+        },
+      ];
+    },
+    actionGroups() {
+      const groups =
+        this.report.actions
+          ?.filter((action) => action.group)
+          .reduce((acc, action) => {
+            acc[action.group] ??= { type: action.type, actions: [] };
+            const actionWithoutGroup = Object.assign({}, action);
+            delete actionWithoutGroup.group;
+            acc[action.group].actions.push(actionWithoutGroup);
+            return acc;
+          }, {}) ?? {};
+
+      return Object.keys(groups).map((label) => ({ label, ...groups[label] }));
+    },
     columns() {
       return this.loading
         ? this.blankStateData.columns