Refactor BackupStatus model to include ID and update related componen…

…ts for improved backup job tracking
bvdcode · Dec 19, 2024 · 42c9bde · 42c9bde
1 parent 8c85dfb
commit 42c9bde
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 8 deletions.
diff --git a/Sources/Octockup.Server/Controllers/AuthController.cs b/Sources/Octockup.Server/Controllers/AuthController.cs
@@ -2,7 +2,6 @@
 using Octockup.Server.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using EasyExtensions;
 
 namespace Octockup.Server.Controllers
 {

diff --git a/Sources/Octockup.Server/Controllers/BackupController.cs b/Sources/Octockup.Server/Controllers/BackupController.cs
@@ -5,7 +5,7 @@
 namespace Octockup.Server.Controllers
 {
     [ApiController]
-    [Route("api/[controller]")]
+    [Route("/api/v1/[controller]")]
     public class BackupController : ControllerBase
     {
         [HttpGet(nameof(Status))]
@@ -14,9 +14,9 @@ public async Task<IEnumerable<BackupStatus>> Status()
             // mock data
             return new List<BackupStatus>
             {
-                new BackupStatus("Job1", DateTime.UtcNow, TimeSpan.FromMinutes(10), BackupStatusType.Completed),
-                new BackupStatus("Job2", DateTime.UtcNow.AddDays(-1), TimeSpan.FromMinutes(5), BackupStatusType.Running),
-                new BackupStatus("Job3", DateTime.Now, TimeSpan.FromMinutes(15), BackupStatusType.Failed),
+                new BackupStatus(51, "Job1", DateTime.UtcNow, TimeSpan.FromMinutes(10), BackupStatusType.Completed),
+                new BackupStatus(52, "Job2", DateTime.UtcNow.AddDays(-1), TimeSpan.FromMinutes(5), BackupStatusType.Running),
+                new BackupStatus(53, "Job3", DateTime.Now, TimeSpan.FromMinutes(15), BackupStatusType.Failed),
             };
         }
     }

diff --git a/Sources/Octockup.Server/Models/BackupStatus.cs b/Sources/Octockup.Server/Models/BackupStatus.cs
@@ -2,5 +2,5 @@
 
 namespace Octockup.Server.Models
 {
-    public record BackupStatus(string JobName, DateTime LastRun, TimeSpan Duration, BackupStatusType Status);
+    public record BackupStatus(int Id, string JobName, DateTime LastRun, TimeSpan Duration, BackupStatusType Status);
 }
diff --git a/Sources/octockup.client/src/api/types.ts b/Sources/octockup.client/src/api/types.ts
@@ -23,6 +23,7 @@ export enum UserRole {
 }
 
 export interface BackupStatus {
+  id: number;
   jobName: string;
   lastRun: string;
   duration: string;

diff --git a/Sources/octockup.client/src/components/Dashboard.tsx b/Sources/octockup.client/src/components/Dashboard.tsx
@@ -1,11 +1,25 @@
-import { User } from "../api/types";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Box, Typography } from "@mui/material";
+import { BackupStatus, User } from "../api/types";
 import useAuthUser from "react-auth-kit/hooks/useAuthUser";
+import { getBackupStatus } from "../api/api";
+import { toast } from "react-toastify";
 
 const Dashboard: React.FC = () => {
   const { t } = useTranslation();
   const authUser = useAuthUser<User>();
+  const [status, setStatus] = useState<BackupStatus[]>([]);
+
+  useEffect(() => {
+    getBackupStatus()
+      .then((response) => {
+        setStatus(response);
+      })
+      .catch((error) => {
+        toast.error(t("dataLoadError", { error: error.message }));
+      });
+  }, [t]);
 
   return (
     <Box
@@ -22,7 +36,15 @@ const Dashboard: React.FC = () => {
         </Typography>
       </Box>
       <Box mt={2} flexGrow={1}>
-        {/* Main content goes here */}
+        {status.map((backup, index) => (
+          <Box key={index} display="flex" justifyContent="space-between">
+            <Typography>{backup.id}</Typography>
+            <Typography>{backup.jobName}</Typography>
+            <Typography>{backup.lastRun}</Typography>
+            <Typography>{backup.duration}</Typography>
+            <Typography>{backup.status}</Typography>
+          </Box>
+        ))}
       </Box>
     </Box>
   );

diff --git a/Sources/octockup.client/src/locales/en.json b/Sources/octockup.client/src/locales/en.json
@@ -1,4 +1,5 @@
 {
+  "dataLoadError": "Error loading data: {{error}}",
   "profile": {
     "title": "Profile",
     "newPassword": "New Password",

diff --git a/Sources/octockup.client/src/locales/ru.json b/Sources/octockup.client/src/locales/ru.json
@@ -1,4 +1,5 @@
 {
+  "dataLoadError": "Ошибка загрузки данных: {{error}}",
   "profile": {
     "title": "Профиль",
     "newPassword": "Новый пароль",