Add Canceled status to ScheduleStatus enum and update related logic in useSchedules and backupUtils

Author: bvdcode

src/Octockup.Server/Jobs/BackupRunner.cs

@@ -491,15 +491,15 @@ private async Task HandleCancellationAsync(Schedule schedule, ScheduleReport rep
         {
             logger.LogInformation("Schedule {ScheduleId} backup canceled", schedule.Id);
 
-            schedule.Status = ScheduleStatus.Canceled;
+            schedule.Status = ScheduleStatus.Failed;
             schedule.ErrorMessage = "Backup was canceled.";
             schedule.FinishedAt = DateTime.UtcNow;
             await dbContext.SaveChangesAsync(CancellationToken.None);
 
             await report.SendAsync(
                 report.Processed,
                 "Backup canceled.",
-                status: ScheduleStatus.Canceled,
+                status: ScheduleStatus.Failed,
                 cancellationToken: CancellationToken.None);
         }
 

src/Octockup.Server/Models/Enums/ScheduleStatus.cs

@@ -9,6 +9,5 @@ public enum ScheduleStatus
         Running = 1,
         Failed = 2,
         Completed = 3,
-        Canceled = 4
     }
 }

src/octockup.client/src/components/ScheduleCard.tsx

@@ -35,8 +35,6 @@ function getStatusIcon(status: BackupStatus) {
       return <CheckCircle sx={{ color: "success.main" }} />;
     case BackupStatus.Failed:
       return <ErrorOutline sx={{ color: "error.main" }} />;
-    case BackupStatus.Canceled:
-      return <StopCircle sx={{ color: "warning.main" }} />;
     case BackupStatus.Running:
       return <Pending sx={{ color: "info.main" }} />;
     case BackupStatus.Created:
@@ -98,8 +96,6 @@ export function ScheduleCard({
             ? theme.palette.success.main
             : item.status === BackupStatus.Failed
             ? theme.palette.error.main
-            : item.status === BackupStatus.Canceled
-            ? theme.palette.warning.main
             : item.status === BackupStatus.Running
             ? theme.palette.info.main
             : theme.palette.warning.main

src/octockup.client/src/components/backups/BackupStatusChip.tsx

@@ -36,9 +36,7 @@ export function BackupStatusChip({
   if (status === "failed") {
     const failedSchedule = (backup.schedules || []).find(
       (schedule) =>
-        (schedule.status === BackupStatus.Failed ||
-          schedule.status === BackupStatus.Canceled) &&
-        schedule.errorMessage,
+        schedule.status === BackupStatus.Failed && schedule.errorMessage,
     );
     errorMessage = failedSchedule?.errorMessage || t("backups.unknownError");
   }

src/octockup.client/src/locales/en.json

@@ -212,8 +212,7 @@
       "created": "Created",
       "running": "Running",
       "failed": "Failed",
-      "completed": "Completed",
-      "canceled": "Canceled"
+      "completed": "Completed"
     },
     "nextRun": {
       "label": "Next run",

src/octockup.client/src/locales/ru.json

@@ -233,11 +233,10 @@
     "intervalDays": "каждые {{count}} дн.",
     "intervalMinutes": "каждые {{count}} мин",
     "status": {
-      "created": "Создано",
+      "created": "Ожидает",
       "running": "Выполняется",
       "failed": "Ошибка",
-      "completed": "Завершено",
-      "canceled": "Отменено"
+      "completed": "Завершено"
     },
     "nextRun": {
       "label": "След. запуск",

src/octockup.client/src/types/api.ts

@@ -83,7 +83,6 @@ export enum BackupStatus {
   Running = 1,
   Failed = 2,
   Completed = 3,
-  Canceled = 4,
 }
 
 export interface ScheduleItem {

src/octockup.client/src/utils/backupUtils.ts

@@ -77,6 +77,7 @@ export function getBackupOverallStatus(
   }
 
   // Check schedules from backup.schedules (persistent data)
+  // Only consider Failed schedules that have actual errors
   const finishedSchedules = (backup.schedules || []).filter(
     (schedule) => schedule.finishedAt,
   );
@@ -90,12 +91,11 @@ export function getBackupOverallStatus(
     return scheduleFinishTime > snapshotTime;
   });
 
-  // Priority 4: Warning - has successful snapshot, but schedule failed after it
+  // Priority 4: Warning - has successful snapshot, but schedule failed after it WITH ERROR
+  // Failed without errorMessage don't indicate problems
   const hasFailedScheduleAfterSnapshot = schedulesAfterSnapshot.some(
     (schedule) =>
-      (schedule.status === BackupStatus.Failed ||
-        schedule.status === BackupStatus.Canceled) &&
-      schedule.errorMessage,
+      schedule.status === BackupStatus.Failed && schedule.errorMessage,
   );
 
   if (hasFailedScheduleAfterSnapshot) {

src/octockup.client/src/utils/scheduleUtils.ts

@@ -12,8 +12,6 @@ export function statusColor(
       return "info";
     case BackupStatus.Failed:
       return "error";
-    case BackupStatus.Canceled:
-      return "warning";
     case BackupStatus.Created:
     default:
       return "default";
@@ -97,8 +95,7 @@ export function calculateNextRunTime(
   if (
     item.finishedAt &&
     (item.status === BackupStatus.Completed ||
-      item.status === BackupStatus.Failed ||
-      item.status === BackupStatus.Canceled)
+      item.status === BackupStatus.Failed)
   ) {
     const finishedAt = parseUtcDate(item.finishedAt);
     if (finishedAt) {