Add "Week" grouping option to reporting

.github/VOUCHED.td

@@ -18,7 +18,6 @@ bufferhead-code
 candideu
 kasparrosin
 korridor
-nikbucher tasks table sorting
 onatcer
 shrootbuck
 smilebeda

app/Providers/RouteServiceProvider.php

@@ -33,8 +33,8 @@ class RouteServiceProvider extends ServiceProvider
             }
 
             return $request->user()
-                ? Limit::perMinute(config('app.api_rate_limit_authenticated_per_minute'))->by($request->user()->id)
-                : Limit::perMinute(config('app.api_rate_limit_guest_per_minute'))->by($request->ip());
+                ? Limit::perMinute(200)->by($request->user()->id)
+                : Limit::perMinute(60)->by($request->ip());
         });
 
         $this->routes(function (): void {

app/Service/LocalizationService.php

@@ -155,10 +155,9 @@ class LocalizationService
     }
 
     /**
-     * Time group types have no server-side descriptor; their keys are ISO dates and are
+     * Time group types have no server-side descriptor; Day and Week keys are ISO dates and
      * formatted here instead. A Week key is the first day of that week, so it renders as the
-     * range it covers. A Year key is already a bare year, so it is returned unchanged - it must
-     * not be parsed, Carbon reads a four digit string as a time of day.
+     * range it covers.
      */
     public function formatTimeGroupKey(?string $key, TimeEntryAggregationType $groupType): ?string
     {
@@ -176,13 +175,6 @@ class LocalizationService
             return $this->formatDate($weekStart).' - '.$this->formatDate($weekStart->copy()->addDays(6));
         }
 
-        if ($groupType === TimeEntryAggregationType::Month) {
-            // Note: the leading "!" resets all fields the format does not name. Without it the
-            // day of the month is taken from today, and a day that the parsed month does not
-            // have overflows the date into the next month.
-            return Carbon::createFromFormat('!Y-m', $key)->format('F Y');
-        }
-
         return $key;
     }
 

config/app.php

@@ -158,21 +158,6 @@ return [
 
     'pagination_per_page_default' => (int) env('PAGINATION_PER_PAGE_DEFAULT', 15),
 
-    /*
-    |--------------------------------------------------------------------------
-    | API Rate Limiting
-    |--------------------------------------------------------------------------
-    |
-    | The number of API requests allowed per minute, counted per user for
-    | authenticated requests and per IP address for guest requests. These
-    | limits are only enforced when the application runs in production.
-    |
-    */
-
-    'api_rate_limit_authenticated_per_minute' => (int) (env('API_RATE_LIMIT_AUTH_PER_MINUTE') ?: 200),
-
-    'api_rate_limit_guest_per_minute' => (int) (env('API_RATE_LIMIT_GUEST_PER_MINUTE') ?: 60),
-
     /*
     |--------------------------------------------------------------------------
     | Encryption Key

package.json

@@ -26,13 +26,13 @@
     },
     "devDependencies": {
         "@eslint/eslintrc": "^3.3.5",
-        "@eslint/js": "^10.0.1",
-        "@inertiajs/vue3": "^3.6.1",
+        "@eslint/js": "^9.39.4",
+        "@inertiajs/vue3": "^2.3.23",
         "@playwright/test": "^1.60.0",
         "@tailwindcss/forms": "^0.5.11",
         "@tailwindcss/typography": "^0.5.19",
         "@types/chroma-js": "^3.1.2",
-        "@types/node": "^26.2.0",
+        "@types/node": "^22.19.19",
         "@vitejs/plugin-vue": "^6.0.6",
         "@vue/test-utils": "^2.4.6",
         "@vue/tsconfig": "^0.8.1",
@@ -40,14 +40,14 @@
         "axios": "^1.16.0",
         "eslint-plugin-unused-imports": "^4.4.1",
         "happy-dom": "^20.8.9",
-        "laravel-vite-plugin": "^3.2.0",
+        "laravel-vite-plugin": "^2.1.0",
         "openapi-zod-client": "^1.18.3",
         "postcss": "^8.5.14",
-        "postcss-import": "^17.0.0",
-        "postcss-nesting": "^14.0.1",
-        "tailwindcss": "^4.3.3",
-        "typescript": "^7.0.2",
-        "vite": "^8.2.1",
+        "postcss-import": "^15.1.0",
+        "postcss-nesting": "^12.1.5",
+        "tailwindcss": "^3.4.19",
+        "typescript": "^5.9.3",
+        "vite": "^7.3.3",
         "vite-plugin-checker": "^0.12.0",
         "vitest": "^4.1.4",
         "vue": "^3.5.34",
@@ -55,15 +55,15 @@
     },
     "dependencies": {
         "@floating-ui/core": "^1.7.5",
-        "@floating-ui/vue": "^2.0.1",
+        "@floating-ui/vue": "^1.1.11",
         "@heroicons/vue": "^2.2.0",
         "@lucide/vue": "^1.14.0",
         "@rushstack/eslint-patch": "^1.16.1",
         "@tailwindcss/container-queries": "^0.1.1",
         "@tanstack/vue-form": "^1.32.0",
         "@tanstack/vue-query": "^5.100.10",
-        "@tanstack/vue-query-devtools": "^6.1.38",
-        "@tanstack/vue-table": "^9.1.2",
+        "@tanstack/vue-query-devtools": "^5.91.0",
+        "@tanstack/vue-table": "^8.21.3",
         "@tanstack/vue-virtual": "^3.13.24",
         "@vue/eslint-config-prettier": "^10.2.0",
         "@vue/eslint-config-typescript": "^14.7.0",
@@ -77,10 +77,10 @@
         "echarts": "^6.0.0",
         "focus-trap": "^8.2.0",
         "parse-duration": "^2.1.6",
-        "pinia": "^4.0.3",
+        "pinia": "^3.0.4",
         "radix-vue": "^1.9.17",
         "reka-ui": "^2.9.7",
-        "tailwind-merge": "^3.6.0",
+        "tailwind-merge": "^2.6.1",
         "tailwindcss-animate": "^1.0.7",
         "vue-draggable-plus": "^0.6.1",
         "vue-echarts": "^8.0.1",

resources/js/packages/api/package.json

@@ -29,7 +29,7 @@
     "author": "solidtime",
     "license": "AGPL-3.0",
     "devDependencies": {
-        "vite-plugin-dts": "^5.0.3"
+        "vite-plugin-dts": "^4.5.4"
     },
     "peerDependencies": {
         "@zodios/core": "^10.9.6",

resources/js/packages/ui/package.json

@@ -50,7 +50,7 @@
     "devDependencies": {
         "@types/chroma-js": "^3.1.2",
         "@zodios/core": "^10.9.6",
-        "vite-plugin-dts": "^5.0.3",
+        "vite-plugin-dts": "^4.5.4",
         "zod": "^3.25.76"
     },
     "peerDependencies": {

resources/js/packages/ui/src/dialog/DialogContent.vue

@@ -31,7 +31,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
         <div
             :class="
                 cn(
-                    'fixed top-0 left-0 z-50 pointer-events-none w-screen h-screen [height:100dvh] flex items-start px-2 py-3 md:py-14 xl:py-24 justify-center overflow-y-auto overscroll-contain'
+                    'fixed top-0 left-0 z-50 pointer-events-none w-screen h-screen flex items-start px-2 pt-3 md:pt-14 xl:pt-24 justify-center overflow-auto'
                 )
             ">
             <DialogContent

resources/js/packages/ui/src/utils/time.test.ts

@@ -1,10 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import {
-    formatHumanReadableDuration,
-    formatMonth,
-    formatReportingDuration,
-    formatWeekRange,
-} from './time';
+import { formatHumanReadableDuration, formatReportingDuration, formatWeekRange } from './time';
 
 const seconds = 14 * 3600 + 45 * 60 + 6; // 14h 45m 06s
 
@@ -65,9 +60,3 @@ describe('formatWeekRange', () => {
         );
     });
 });
-
-describe('formatMonth', () => {
-    test('renders the name of the month that the key covers', () => {
-        expect(formatMonth('2001-02')).toBe('February 2001');
-    });
-});

resources/js/packages/ui/src/utils/time.ts

@@ -245,15 +245,6 @@ export function formatWeekRange(date: string, format?: DateFormat): string {
     return `${formatDate(date, format)} - ${formatDate(end, format)}`;
 }
 
-/*
- * Returns the month that the given key falls in. There is no `DateFormat` variant for a
- * month, so this is not affected by the organization date format.
- * @param date - a month, in the format of 'YYYY-MM'
- */
-export function formatMonth(date: string): string {
-    return getDayJsInstance()(date).format('MMMM YYYY');
-}
-
 /*
  * Returns a human readable date format.
  * @param date - date in the format of 'YYYY-MM-DD'

resources/js/utils/useReporting.ts

@@ -15,12 +15,7 @@ import {
 } from '@heroicons/vue/16/solid';
 import { Coffee } from '@lucide/vue';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
-import {
-    type DateFormat,
-    formatDate,
-    formatMonth,
-    formatWeekRange,
-} from '@/packages/ui/src/utils/time';
+import { type DateFormat, formatDate, formatWeekRange } from '@/packages/ui/src/utils/time';
 
 export type GroupingOption =
     | 'project'
@@ -32,9 +27,7 @@ export type GroupingOption =
     | 'tag'
     | 'type'
     | 'day'
-    | 'week'
-    | 'month'
-    | 'year';
+    | 'week';
 
 export const useReportingStore = defineStore('reporting', () => {
     // Cache query composables to avoid creating new subscriptions on every call
@@ -101,10 +94,6 @@ export const useReportingStore = defineStore('reporting', () => {
         if (type === 'week') {
             return formatWeekRange(key, dateFormat);
         }
-        if (type === 'month') {
-            return formatMonth(key);
-        }
-        // A `year` key is already a bare year, so it falls through unchanged.
         return key;
     }
 

tests/Unit/Service/LocalizationServiceTest.php

@@ -364,27 +364,14 @@ class LocalizationServiceTest extends TestCaseWithDatabase
         $this->assertSame('29/12/2025 - 04/01/2026', $formatted);
     }
 
-    public function test_format_time_group_key_formats_a_month_key_and_does_not_change_year_and_entity_group_types(): void
+    public function test_format_time_group_key_does_not_change_month_year_and_entity_group_types(): void
     {
         // Arrange
         $this->localizationService->setDateFormat(DateFormat::SlashSeparatedDDMMYYYY);
 
         // Act & Assert
-        $this->assertSame('February 2001', $this->localizationService->formatTimeGroupKey('2001-02', TimeEntryAggregationType::Month));
+        $this->assertSame('2001-02', $this->localizationService->formatTimeGroupKey('2001-02', TimeEntryAggregationType::Month));
         $this->assertSame('2001', $this->localizationService->formatTimeGroupKey('2001', TimeEntryAggregationType::Year));
         $this->assertSame('some-uuid', $this->localizationService->formatTimeGroupKey('some-uuid', TimeEntryAggregationType::Project));
     }
-
-    public function test_format_time_group_key_formats_a_month_key_independently_of_the_current_day_of_month(): void
-    {
-        // Arrange
-        // Note: the current day of the month must not leak into the parsed month. The 31st does
-        // not exist in April, so a leaked day overflows the date into the following month.
-        $this->travelTo(Carbon::create(2026, 8, 31, 12, 0, 0, 'UTC'));
-
-        // Act & Assert
-        $this->assertSame('February 2001', $this->localizationService->formatTimeGroupKey('2001-02', TimeEntryAggregationType::Month));
-        $this->assertSame('April 2026', $this->localizationService->formatTimeGroupKey('2026-04', TimeEntryAggregationType::Month));
-        $this->assertSame('December 2026', $this->localizationService->formatTimeGroupKey('2026-12', TimeEntryAggregationType::Month));
-    }
 }