Merge branch 'main' into laravel-12

* main: (38 commits)
  Fixes
  Fix date order for past incidents in history (#237) (#255)
  Add Koren translation to config
  Add ko translation (#265)
  Add Edit Profile page (#276)
  Bump vite from 5.4.18 to 5.4.19 (#277)
  Add coverage testing (#260)
  Add trusted proxies to Cachet config
  Add comment
  Bump vite from 5.4.14 to 5.4.18 (#273)
  Bump minor larastan version (#271)
  Compile Assets
  Tests for MakeUserCommand (#268)
  Fix code styling
  Fix PHPStan errors
  Complete french translations (#269)
  Added spanish (Spain) translations (#266)
  Set `NIGHTWATCH_ENABLED` to `false` in CI
  Use parallel testing and lint as part of testing (#259)
  Remove unused metric points update route
  ...

Author: jbrooksuk

.github/workflows/build-api-docs.yml

@@ -30,7 +30,7 @@ jobs:
         run: |
           composer config repositories.scramble-pro '{"type": "composer", "url": "https://satis.dedoc.co"}'
           composer config http-basic.satis.dedoc.co ${{ secrets.SCRAMBLE_USERNAME }} ${{ secrets.SCRAMBLE_KEY }}
-          composer require dedoc/scramble-pro:0.7.0-alpha.1 --dev
+          composer require dedoc/scramble-pro:^0.7.4 --dev
 
       - name: Checkout documentation repository
         uses: actions/checkout@v4

.github/workflows/run-tests.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-          coverage: none
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
@@ -73,7 +73,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-          coverage: none
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
@@ -130,7 +130,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-          coverage: none
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
@@ -187,7 +187,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-          coverage: none
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
@@ -244,7 +244,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-          coverage: none
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
@@ -289,7 +289,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-          coverage: none
+          coverage: xdebug
 
       - name: Install dependencies
         run: |

README.md

@@ -33,9 +33,7 @@ Cachet 3.x is currently in development and is not yet completely ready for produ
 - [x] Scheduled Maintenance
 - [x] Scheduled Maintenance Updates
 - [x] Components
-- [ ] Metrics
-  - API and dashboard are working.
-  - Frontend is in progress.
+- [x] Metrics
 - [ ] Subscribers
 - [x] API
   - Complete but may need some tweaks as we progress.

composer.json

@@ -25,12 +25,12 @@
         "filament/filament": "^3.2.57",
         "filament/spatie-laravel-settings-plugin": "^3.2",
         "guzzlehttp/guzzle": "^7.8",
-        "illuminate/cache": "^11.23.0|^12.0",
-        "illuminate/console": "^11.23.0|^12.0",
-        "illuminate/database": "^11.23.0|^12.0",
-        "illuminate/events": "^11.23.0|^12.0",
-        "illuminate/queue": "^11.23.0|^12.0",
-        "illuminate/support": "^11.23.0|^12.0",
+        "illuminate/cache": "^11.35.0|^12.0",
+        "illuminate/console": "^11.35.0|^12.0",
+        "illuminate/database": "^11.35.0|^12.0",
+        "illuminate/events": "^11.35.0|^12.0",
+        "illuminate/queue": "^11.35.0|^12.0",
+        "illuminate/support": "^11.35.0|^12.0",
         "laravel/sanctum": "^4.0",
         "nesbot/carbon": "^2.70|^3.0",
         "spatie/laravel-data": "^4.11",
@@ -41,13 +41,15 @@
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "dedoc/scramble": "0.12.0-alpha.1",
-        "larastan/larastan": "^3.0",
+        "dedoc/scramble": "^0.12.11",
+        "larastan/larastan": "^3.4",
         "laravel/pail": "^1.1",
+        "laravel/pint": "^1.21",
         "orchestra/testbench": "^9.5.1|^10.0",
         "pestphp/pest": "^3.2",
         "pestphp/pest-plugin-laravel": "^3.0",
-        "pestphp/pest-plugin-livewire": "*"
+        "pestphp/pest-plugin-livewire": "*",
+        "pestphp/pest-plugin-type-coverage": "^3.3"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -102,6 +104,13 @@
         "start": [
             "@dev"
         ],
-        "test": "vendor/bin/pest"
+        "test:lint": [
+            "pint --test"
+        ],
+        "test:unit": "pest --parallel --processes=10 --ci --coverage --compact",
+        "test": [
+            "@test:lint",
+            "@test:unit"
+        ]
     }
 }

config/cachet.php

@@ -77,6 +77,8 @@
         'api',
     ],
 
+    'trusted_proxies' => env('CACHET_TRUSTED_PROXIES', ''),
+
     /*
      |--------------------------------------------------------------------------
      | Cachet API Rate Limit (attempts per minute)
@@ -142,11 +144,13 @@
         'de_CH' => 'Deutsch (CH)',
         'en' => 'English',
         'en_GB' => 'English (UK)',
+        'es_ES' => 'Spanish (ES)',
+        'ko' => '한국어',
         'nl' => 'Nederlands',
+        'ph' => 'Filipino',
         'pt_BR' => 'Português (BR)',
         'zh_CN' => '简体中文',
         'zh_TW' => '繁體中文',
-        'ph' => 'Filipino',
     ],
 
     /*
@@ -160,6 +164,16 @@
      */
     'demo_mode' => env('CACHET_DEMO_MODE', false),
 
+    /*
+     |--------------------------------------------------------------------------
+     | Cachet Blog Feed
+     |--------------------------------------------------------------------------
+     |
+     | This is the URI to the Cachet blog feed. This is used to display
+     | the latest blog posts on the status page. By default, this is
+     | set to the public Cachet blog feed.
+     |
+     */
     'feed' => [
         'uri' => env('CACHET_FEED_URI', 'https://blog.cachethq.io/rss'),
         'cache' => env('CACHET_FEED_CACHE', 3600),

database/migrations/2024_10_13_214300_drop_schedule_status.php

@@ -25,7 +25,7 @@ public function up()
      */
     public function down()
     {
-        Schema::table('incidents', function (Blueprint $table) {
+        Schema::table('schedules', function (Blueprint $table) {
             $table->unsignedInteger('status')->unsigned()->default(0);
         });
     }

database/migrations/2025_03_02_172736_add_default_to_preferred_locale_column_in_users_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('preferred_locale')->nullable()->default('en')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('preferred_locale')->nullable()->default(null)->change();
+        });
+    }
+};

database/seeders/DatabaseSeeder.php

@@ -60,11 +60,13 @@ public function run(): void
             'completed_at' => now()->subHours(12),
         ]);
 
+        /** @phpstan-ignore-next-line  argument.type */
         tap(Schedule::create([
             'name' => 'Documentation Maintenance',
             'message' => 'We will be conducting maintenance on our documentation servers. You may experience degraded performance during this time.',
             'scheduled_at' => now()->addHours(24),
             'completed_at' => null,
+        /** @phpstan-ignore-next-line argument.type */
         ]), function (Schedule $schedule) use ($user) {
             $update = new Update([
                 'message' => <<<'EOF'

package-lock.json

@@ -23,5 +23,9 @@
         "prettier-plugin-tailwindcss": "^0.5.11",
         "tailwindcss": "^3.4.13",
         "vite": "^5.4"
+    },
+    "dependencies": {
+        "chart.js": "^4.4.7",
+        "chartjs-adapter-moment": "^1.0.1"
     }
 }