refactor: extract ReportingFilterBar and migrate reporting to TanStack Query

Author: Onatcer

resources/js/Components/Common/Reporting/ReportingExportButton.vue

@@ -1,7 +1,12 @@
 <script setup lang="ts">
 import { SecondaryButton } from '@/packages/ui/src';
 import { ArrowDownTrayIcon, LockClosedIcon } from '@heroicons/vue/20/solid';
-import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/Components/ui/dropdown-menu';
 import type { ExportFormat } from '@/types/reporting';
 import { ref } from 'vue';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
@@ -25,32 +30,24 @@ function triggerDownload(format: ExportFormat) {
 </script>
 
 <template>
-    <Dropdown align="end">
-        <template #trigger>
+    <DropdownMenu>
+        <DropdownMenuTrigger as-child>
             <SecondaryButton :icon="ArrowDownTrayIcon" :loading> Export </SecondaryButton>
-        </template>
-        <template #content>
-            <div class="flex flex-col space-y-1 p-1.5">
-                <SecondaryButton class="border-0 px-2" @click="triggerDownload('pdf')">
-                    <div class="flex items-center space-x-2">
-                        <span> Export as PDF </span>
-                        <LockClosedIcon
-                            v-if="!isAllowedToPerformPremiumAction()"
-                            class="w-3.5 text-text-tertiary"></LockClosedIcon>
-                    </div>
-                </SecondaryButton>
-                <SecondaryButton class="border-0 px-2" @click="triggerDownload('xlsx')"
-                    >Export as Excel</SecondaryButton
-                >
-                <SecondaryButton class="border-0 px-2" @click="triggerDownload('csv')"
-                    >Export as CSV</SecondaryButton
-                >
-                <SecondaryButton class="border-0 px-2" @click="triggerDownload('ods')"
-                    >Export as ODS
-                </SecondaryButton>
-            </div>
-        </template>
-    </Dropdown>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end">
+            <DropdownMenuItem @click="triggerDownload('pdf')">
+                <div class="flex items-center space-x-2">
+                    <span>Export as PDF</span>
+                    <LockClosedIcon
+                        v-if="!isAllowedToPerformPremiumAction()"
+                        class="w-3.5 text-text-tertiary" />
+                </div>
+            </DropdownMenuItem>
+            <DropdownMenuItem @click="triggerDownload('xlsx')"> Export as Excel </DropdownMenuItem>
+            <DropdownMenuItem @click="triggerDownload('csv')"> Export as CSV </DropdownMenuItem>
+            <DropdownMenuItem @click="triggerDownload('ods')"> Export as ODS </DropdownMenuItem>
+        </DropdownMenuContent>
+    </DropdownMenu>
     <UpgradeModal v-model:show="showPremiumModal">
         <strong>PDF Reports</strong> are only available in solidtime Professional.
     </UpgradeModal>

resources/js/Components/Common/Reporting/ReportingGroupBySelect.vue

@@ -1,12 +1,20 @@
 <script setup lang="ts">
-import SelectDropdown from '@/packages/ui/src/Input/SelectDropdown.vue';
-import Badge from '@/packages/ui/src/Badge.vue';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
 import { type Component, computed } from 'vue';
 
 const model = defineModel<string | null>({ default: null });
 const props = defineProps<{
     groupByOptions: { value: string; label: string; icon: Component }[];
 }>();
+const emit = defineEmits<{
+    changed: [];
+}>();
 const icon = computed(() => {
     return props.groupByOptions.find((option) => option.value === model.value)?.icon;
 });
@@ -16,21 +24,19 @@ const title = computed(() => {
 </script>
 
 <template>
-    <SelectDropdown
-        v-model="model"
-        :get-key-from-item="(item) => item.value"
-        :get-name-for-item="(item) => item.label"
-        :items="groupByOptions">
-        <template #trigger>
-            <Badge
-                size="large"
-                tag="button"
-                class="cursor-pointer hover:bg-card-background transition space-x-5 flex">
-                <component :is="icon" class="h-4 text-text-secondary"></component>
-                <span> {{ title }} </span>
-            </Badge>
-        </template>
-    </SelectDropdown>
+    <Select v-model="model" @update:model-value="emit('changed')">
+        <SelectTrigger size="small" :show-chevron="false">
+            <SelectValue class="flex items-center gap-2">
+                <component :is="icon" class="h-4 text-icon-default" />
+                <span>{{ title }}</span>
+            </SelectValue>
+        </SelectTrigger>
+        <SelectContent>
+            <SelectItem v-for="option in groupByOptions" :key="option.value" :value="option.value">
+                {{ option.label }}
+            </SelectItem>
+        </SelectContent>
+    </Select>
 </template>
 
 <style scoped></style>