Tidy schedule, enum, and integration cleanups

resources/lang/de/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => 'Admin',
-        'user' => 'Benutzer',
-    ],
     'resource_label' => 'Benutzer|Benutzer',
     'list' => [
         'headers' => [

resources/lang/de_AT/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => 'Admin',
-        'user' => 'Benutzer',
-    ],
     'resource_label' => 'Benutzer|Benutzer',
     'list' => [
         'headers' => [

resources/lang/de_CH/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => 'Admin',
-        'user' => 'Benutzer',
-    ],
     'resource_label' => 'Benutzer|Benutzer',
     'list' => [
         'headers' => [

resources/lang/en/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => 'Admin',
-        'user' => 'User',
-    ],
     'resource_label' => 'User|Users',
     'list' => [
         'headers' => [

resources/lang/es_ES/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => 'Administrador',
-        'user' => 'Usuario',
-    ],
     'resource_label' => 'Usuario|Usuarios',
     'list' => [
         'headers' => [

resources/lang/fr/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => 'Administrateur',
-        'user' => 'Utilisateur',
-    ],
     'resource_label' => 'Utilisateur|Utilisateurs',
     'list' => [
         'headers' => [

resources/lang/ko/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => '관리자',
-        'user' => '사용자',
-    ],
     'resource_label' => '사용자|사용자',
     'list' => [
         'headers' => [

resources/lang/nl/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => 'Beheerder',
-        'user' => 'Gebruiker',
-    ],
     'resource_label' => 'Gebruiker|Gebruikers',
     'list' => [
         'headers' => [

resources/lang/ph/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => 'Admin',
-        'user' => 'User',
-    ],
     'resource_label' => 'User|Users',
     'list' => [
         'headers' => [

resources/lang/pt_BR/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => 'Administrador',
-        'user' => 'Usuário',
-    ],
     'resource_label' => 'Usuário|Usuários',
     'list' => [
         'headers' => [

resources/lang/zh_CN/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => '管理员',
-        'user' => '用户',
-    ],
     'resource_label' => '用户|用户',
     'list' => [
         'headers' => [

resources/lang/zh_TW/user.php

@@ -1,10 +1,6 @@
 <?php
 
 return [
-    'level' => [
-        'admin' => '管理員',
-        'user' => '用戶',
-    ],
     'resource_label' => '用戶|用戶',
     'list' => [
         'headers' => [

src/Actions/Integrations/ImportOhDearFeed.php

@@ -3,7 +3,6 @@
 namespace Cachet\Actions\Integrations;
 
 use Cachet\Actions\Component\ChangeComponentStatus;
-use Cachet\Enums\ComponentStatusEnum;
 use Cachet\Enums\ComponentStatusSourceEnum;
 use Cachet\Enums\ExternalProviderEnum;
 use Cachet\Models\Component;
@@ -37,7 +36,7 @@ public function __invoke(array $data, bool $importSites, ?int $componentGroupId,
     private function importSites(array $sites, ?int $componentGroupId): void
     {
         foreach ($sites as $site) {
-            $status = $site['status'] === 'up' ? ComponentStatusEnum::operational : ComponentStatusEnum::partial_outage;
+            $status = ExternalProviderEnum::OhDear->componentStatus($site['status']);
             $attributes = ['name' => $site['label'], 'component_group_id' => $componentGroupId];
 
             $component = Component::firstOrNew(['link' => $site['url']]);

src/Data/Requests/Schedule/CreateScheduleRequestData.php

@@ -5,7 +5,6 @@
 use Cachet\Data\BaseData;
 use Cachet\Data\Casts\FlexibleDateTimeCast;
 use Cachet\Enums\ComponentStatusEnum;
-use Cachet\Enums\ScheduleStatusEnum;
 use Carbon\Carbon;
 use Illuminate\Validation\Rule;
 use Spatie\LaravelData\Attributes\DataCollectionOf;
@@ -23,7 +22,6 @@ public function __construct(
         public readonly ?Carbon $completedAt = null,
         #[WithCast(FlexibleDateTimeCast::class)]
         public readonly ?Carbon $publishedAt = null,
-        public readonly ?ScheduleStatusEnum $status = null,
         public readonly bool $notifications = false,
         #[DataCollectionOf(ScheduleComponentRequestData::class)]
         public readonly ?array $components = null,

src/Data/Requests/Schedule/UpdateScheduleRequestData.php

@@ -5,7 +5,6 @@
 use Cachet\Data\BaseData;
 use Cachet\Data\Casts\FlexibleDateTimeCast;
 use Cachet\Enums\ComponentStatusEnum;
-use Cachet\Enums\ScheduleStatusEnum;
 use Carbon\Carbon;
 use Illuminate\Validation\Rule;
 use Spatie\LaravelData\Attributes\DataCollectionOf;
@@ -17,7 +16,6 @@ final class UpdateScheduleRequestData extends BaseData
     public function __construct(
         public readonly ?string $name = null,
         public readonly ?string $message = null,
-        public readonly ?ScheduleStatusEnum $status = null,
         #[WithCast(FlexibleDateTimeCast::class)]
         public readonly ?Carbon $scheduledAt = null,
         #[WithCast(FlexibleDateTimeCast::class)]

src/Enums/ExternalProviderEnum.php

@@ -19,4 +19,17 @@ public function status(mixed $status): IncidentStatusEnum
             },
         };
     }
+
+    /**
+     * Match the status to the Cachet component status.
+     */
+    public function componentStatus(mixed $status): ComponentStatusEnum
+    {
+        return match ($this) {
+            self::OhDear => match ($status) {
+                'up' => ComponentStatusEnum::operational,
+                default => ComponentStatusEnum::partial_outage,
+            },
+        };
+    }
 }

src/Enums/ScheduleStatusEnum.php

@@ -25,13 +25,12 @@ public static function incomplete(): array
     }
 
     /**
-     * Get the statuses that are in upcoming.
+     * Get the statuses that are upcoming.
      */
     public static function upcoming(): array
     {
         return [
             self::upcoming->value,
-            self::in_progress->value,
         ];
     }
 

src/Status.php

@@ -18,6 +18,10 @@ class Status
 
     /**
      * Get the current system status as an enum.
+     *
+     * There is deliberately no dedicated system status for performance issues:
+     * components in a performance_issues (or partial_outage) state roll up to
+     * SystemStatusEnum::partial_outage, which is returned as the default below.
      */
     public function current(): SystemStatusEnum
     {