Rename tag_filter parameter to tag_match_type

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

@@ -14,7 +14,7 @@ import DateRangePicker from '@/packages/ui/src/Input/DateRangePicker.vue';
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import { useTagsQuery } from '@/utils/useTagsQuery';
 import { useTagsStore } from '@/utils/useTags';
-import type { TagFilter } from '@/types/reporting';
+import type { TagMatchType } from '@/types/reporting';
 
 type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
 
@@ -23,7 +23,7 @@ const selectedProjects = defineModel<string[]>('selectedProjects', { required: t
 const selectedTasks = defineModel<string[]>('selectedTasks', { required: true });
 const selectedClients = defineModel<string[]>('selectedClients', { required: true });
 const selectedTags = defineModel<string[]>('selectedTags', { required: true });
-const tagFilter = defineModel<TagFilter>('tagFilter', { required: true });
+const tagMatchType = defineModel<TagMatchType>('tagMatchType', { required: true });
 const billable = defineModel<'true' | 'false' | null>('billable', { required: true });
 const roundingEnabled = defineModel<boolean>('roundingEnabled', { required: true });
 const roundingType = defineModel<TimeEntryRoundingType>('roundingType', { required: true });
@@ -106,12 +106,12 @@ async function createTag(name: string) {
                                     type="button"
                                     class="w-full rounded-md px-2 py-1.5 text-left text-sm font-medium"
                                     :class="
-                                        tagFilter === 'contains'
+                                        tagMatchType === 'contains'
                                             ? 'bg-card-background-active text-text-primary'
                                             : 'text-text-secondary hover:bg-card-background-active'
                                     "
                                     @click="
-                                        tagFilter = 'contains';
+                                        tagMatchType = 'contains';
                                         emit('submit');
                                     ">
                                     Contains
@@ -120,12 +120,12 @@ async function createTag(name: string) {
                                     type="button"
                                     class="w-full rounded-md px-2 py-1.5 text-left text-sm font-medium"
                                     :class="
-                                        tagFilter === 'not_contains'
+                                        tagMatchType === 'not_contains'
                                             ? 'bg-card-background-active text-text-primary'
                                             : 'text-text-secondary hover:bg-card-background-active'
                                     "
                                     @click="
-                                        tagFilter = 'not_contains';
+                                        tagMatchType = 'not_contains';
                                         emit('submit');
                                     ">
                                     Does Not Contain

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

@@ -49,7 +49,7 @@ import type { ExportFormat } from '@/types/reporting';
 import { getRandomColorWithSeed } from '@/packages/ui/src/utils/color';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import { useAggregatedTimeEntriesQuery } from '@/utils/useAggregatedTimeEntriesQuery';
-import type { TagFilter } from '@/types/reporting';
+import type { TagMatchType } from '@/types/reporting';
 
 type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
 
@@ -68,7 +68,7 @@ const selectedProjects = ref<string[]>([]);
 const selectedMembers = ref<string[]>([]);
 const selectedTasks = ref<string[]>([]);
 const selectedClients = ref<string[]>([]);
-const tagFilter = ref<TagFilter>('contains');
+const tagMatchType = ref<TagMatchType>('contains');
 
 const billable = ref<'true' | 'false' | null>(null);
 const roundingEnabled = ref<boolean>(false);
@@ -124,7 +124,7 @@ const filterParams = computed<AggregatedTimeEntriesQueryParams>(() => {
         task_ids: selectedTasks.value.length > 0 ? selectedTasks.value : undefined,
         client_ids: selectedClients.value.length > 0 ? selectedClients.value : undefined,
         tag_ids: selectedTags.value.length > 0 ? selectedTags.value : undefined,
-        tag_filter: selectedTags.value.length > 0 ? tagFilter.value : undefined,
+        tag_match_type: selectedTags.value.length > 0 ? tagMatchType.value : undefined,
         billable: billable.value !== null ? billable.value : undefined,
         member_id: getCurrentRole() === 'employee' ? getCurrentMembershipId() : undefined,
         rounding_type: roundingEnabled.value ? roundingType.value : undefined,
@@ -369,7 +369,7 @@ const tableData = computed(() => {
         v-model:selected-tasks="selectedTasks"
         v-model:selected-clients="selectedClients"
         v-model:selected-tags="selectedTags"
-        v-model:tag-filter="tagFilter"
+        v-model:tag-match-type="tagMatchType"
         v-model:billable="billable"
         v-model:rounding-enabled="roundingEnabled"
         v-model:rounding-type="roundingType"

resources/js/Pages/ReportingDetailed.vue

@@ -67,7 +67,7 @@ import ReportingFilterBar from '@/Components/Common/Reporting/ReportingFilterBar
 import { useTimeEntriesReportQuery } from '@/utils/useTimeEntriesReportQuery';
 import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
 import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
-import type { TagFilter } from '@/types/reporting';
+import type { TagMatchType } from '@/types/reporting';
 
 // TimeEntryRoundingType is now defined in ReportingRoundingControls component
 type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
@@ -85,7 +85,7 @@ const selectedProjects = ref<string[]>([]);
 const selectedMembers = ref<string[]>([]);
 const selectedTasks = ref<string[]>([]);
 const selectedClients = ref<string[]>([]);
-const tagFilter = ref<TagFilter>('contains');
+const tagMatchType = ref<TagMatchType>('contains');
 const billable = ref<'true' | 'false' | null>(null);
 const roundingEnabled = ref<boolean>(false);
 const roundingType = ref<TimeEntryRoundingType>('nearest');
@@ -117,7 +117,7 @@ function getFilterAttributes() {
         task_ids: selectedTasks.value.length > 0 ? selectedTasks.value : undefined,
         client_ids: selectedClients.value.length > 0 ? selectedClients.value : undefined,
         tag_ids: selectedTags.value.length > 0 ? selectedTags.value : undefined,
-        tag_filter: selectedTags.value.length > 0 ? tagFilter.value : undefined,
+        tag_match_type: selectedTags.value.length > 0 ? tagMatchType.value : undefined,
         billable: billable.value !== null ? billable.value : undefined,
         rounding_type: roundingEnabled.value ? roundingType.value : undefined,
         rounding_minutes: roundingEnabled.value ? roundingMinutes.value : undefined,
@@ -340,7 +340,7 @@ async function downloadExport(format: ExportFormat) {
             v-model:selected-tasks="selectedTasks"
             v-model:selected-clients="selectedClients"
             v-model:selected-tags="selectedTags"
-            v-model:tag-filter="tagFilter"
+            v-model:tag-match-type="tagMatchType"
             v-model:billable="billable"
             v-model:rounding-enabled="roundingEnabled"
             v-model:rounding-type="roundingType"

resources/js/packages/api/src/openapi.json.client.ts

@@ -448,7 +448,7 @@ const ReportStoreRequest = z
                 client_ids: z.union([z.array(z.string()), z.null()]).optional(),
                 project_ids: z.union([z.array(z.string()), z.null()]).optional(),
                 tag_ids: z.union([z.array(z.string()), z.null()]).optional(),
-                tag_filter: z.enum(['contains', 'not_contains']).optional(),
+                tag_match_type: z.enum(['contains', 'not_contains']).optional(),
                 task_ids: z.union([z.array(z.string()), z.null()]).optional(),
                 group: TimeEntryAggregationType,
                 sub_group: TimeEntryAggregationType,
@@ -482,7 +482,7 @@ const DetailedReportResource = z
                 client_ids: z.union([z.array(z.string()), z.null()]),
                 project_ids: z.union([z.array(z.string()), z.null()]),
                 tag_ids: z.union([z.array(z.string()), z.null()]),
-                tag_filter: z.union([z.enum(['contains', 'not_contains']), z.null()]),
+                tag_match_type: z.union([z.enum(['contains', 'not_contains']), z.null()]),
                 task_ids: z.union([z.array(z.string()), z.null()]),
                 rounding_type: z.union([z.string(), z.null()]),
                 rounding_minutes: z.union([z.number(), z.null()]),
@@ -3787,7 +3787,7 @@ Users with the permission `time-entries:view:own` can only use this en
                 schema: z.array(z.string()).min(1).optional(),
             },
             {
-                name: 'tag_filter',
+                name: 'tag_match_type',
                 type: 'Query',
                 schema: z.enum(['contains', 'not_contains']).optional(),
             },
@@ -4173,7 +4173,7 @@ If the group parameters are all set to `null` or are all missing, the
                 schema: z.array(z.string()).min(1).optional(),
             },
             {
-                name: 'tag_filter',
+                name: 'tag_match_type',
                 type: 'Query',
                 schema: z.enum(['contains', 'not_contains']).optional(),
             },
@@ -4372,7 +4372,7 @@ If the group parameters are all set to `null` or are all missing, the
                 schema: z.array(z.string()).min(1).optional(),
             },
             {
-                name: 'tag_filter',
+                name: 'tag_match_type',
                 type: 'Query',
                 schema: z.enum(['contains', 'not_contains']).optional(),
             },
@@ -4505,7 +4505,7 @@ If the group parameters are all set to `null` or are all missing, the
                 schema: z.array(z.string()).min(1).optional(),
             },
             {
-                name: 'tag_filter',
+                name: 'tag_match_type',
                 type: 'Query',
                 schema: z.enum(['contains', 'not_contains']).optional(),
             },

resources/js/types/reporting.ts

@@ -1,2 +1,2 @@
 export type ExportFormat = 'xlsx' | 'csv' | 'ods' | 'pdf';
-export type TagFilter = 'contains' | 'not_contains';
+export type TagMatchType = 'contains' | 'not_contains';