Upstream sync

Merge upstream main into fork main

Author: SergioLangaritaBenitez

package.json

@@ -29,13 +29,16 @@
     "@radix-ui/react-tabs": "^1.1.1",
     "@radix-ui/react-tooltip": "^1.1.4",
     "axios": "^1.7.2",
+    "chart.js": "^4.5.1",
+    "chartjs-plugin-zoom": "^2.2.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "framer-motion": "^11.3.31",
     "jszip": "^3.10.1",
     "lucide-react": "^0.509.0",
     "next-themes": "^0.3.0",
     "react": "^18.3.1",
+    "react-chartjs-2": "^5.3.1",
     "react-dom": "^18.3.1",
     "react-responsive": "^10.0.0",
     "react-router-dom": "^6.25.1",

public/callback.html

@@ -36,6 +36,34 @@
   </div>
 
   <script>
+        function normalizeLoopbackAPIEndpoint(endpoint, currentOrigin) {
+          try {
+            const endpointURL = new URL(endpoint);
+            const originURL = new URL(currentOrigin);
+            const isLoopbackHostname = (hostname) =>
+              hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '[::1]' || hostname === '::1';
+
+            const isLoopbackUpgrade =
+              endpointURL.protocol === 'http:' &&
+              originURL.protocol === 'https:' &&
+              isLoopbackHostname(endpointURL.hostname) &&
+              isLoopbackHostname(originURL.hostname) &&
+              endpointURL.hostname === originURL.hostname &&
+              (endpointURL.port === '' || endpointURL.port === '80') &&
+              (originURL.port === '' || originURL.port === '443');
+
+            if (isLoopbackUpgrade) {
+              return originURL.origin;
+            }
+          } catch (error) {
+            return endpoint;
+          }
+
+          return endpoint;
+        }
+
+        const apiEndpoint = normalizeLoopbackAPIEndpoint(localStorage.getItem('api'), location.origin);
+        localStorage.setItem('api', apiEndpoint);
         const baseUrl = localStorage.getItem('provider_url');
         const client_id = localStorage.getItem('client_id');
         const client_secret = localStorage.getItem('client_secret');
@@ -116,7 +144,7 @@
                     "password": "tokens['access_token']",
                     "token": tokens['access_token'],
                     "refresh_token": tokens['refresh_token'],
-                    "endpoint": localStorage.getItem('api'),
+                    "endpoint": apiEndpoint,
                     "egiSession": users
                   })                  
                   localStorage.setItem("authData",authData); 

src/api/buckets/createPresignedObjectUrlApi.ts

@@ -0,0 +1,9 @@
+import { PresignedURIRequest, PresignedURIResponse } from "@/models/presignedURI";
+import axios from "axios";
+
+async function createPresignedObjectUrlApi(bucketName: string, request: PresignedURIRequest): Promise<PresignedURIResponse> {
+  const response  = await axios.post(`/system/buckets/${bucketName}/presign`, request)
+  return response.data as PresignedURIResponse;
+}
+
+export default createPresignedObjectUrlApi;

src/api/deployment/getDeploymentLogsApi.ts

@@ -0,0 +1,26 @@
+import axios from "axios";
+import { DeploymentLogStream } from "@/pages/ui/services/models/deployment";
+
+interface DeploymentLogsOptions {
+  timestamps?: boolean;
+  tailLines?: number;
+}
+
+async function getDeploymentLogsApi(
+  serviceName: string,
+  options: DeploymentLogsOptions = {}
+) {
+  const response = await axios.get(
+    `/system/services/${serviceName}/deployment/logs`,
+    {
+      params: {
+        timestamps: options.timestamps ?? false,
+        tailLines: options.tailLines ?? 200,
+      },
+    }
+  );
+
+  return response.data as DeploymentLogStream;
+}
+
+export default getDeploymentLogsApi;

src/api/deployment/getDeploymentStatusApi.ts

@@ -0,0 +1,10 @@
+import axios from "axios";
+import { DeploymentStatus } from "@/pages/ui/services/models/deployment";
+
+async function getDeploymentStatusApi(serviceName: string) {
+  const response = await axios.get(`/system/services/${serviceName}/deployment`);
+
+  return response.data as DeploymentStatus;
+}
+
+export default getDeploymentStatusApi;

src/api/logs/getClusterServiceLogs.ts

@@ -0,0 +1,8 @@
+import { ClusterLog } from "@/models/clusterLogs";
+import axios from "axios";
+
+export async function getClusterServiceLogsApi() {
+  const response = await axios.get(`/system/logs`);
+
+  return response.data.logs as Array<ClusterLog>;
+}

src/api/quotas/getQuotaApi.ts

@@ -0,0 +1,28 @@
+
+import { parseCpuToMillicores, parseMemoryToBytes } from "@/lib/utils";
+import { ClusterUserQuota } from "@/models/clusterUserQuota";
+import axios from "axios";
+
+function parseQuotaResources(data: ClusterUserQuota): ClusterUserQuota {
+  const { cpu, memory } = data.resources;
+  return {
+    ...data,
+    resources: {
+      cpu: {
+        max: typeof cpu.max === "string" ? parseCpuToMillicores(cpu.max) : cpu.max,
+        used: typeof cpu.used === "string" ? parseCpuToMillicores(cpu.used) : cpu.used,
+      },
+      memory: {
+        max: typeof memory.max === "string" ? parseMemoryToBytes(memory.max) : memory.max,
+        used: typeof memory.used === "string" ? parseMemoryToBytes(memory.used) : memory.used,
+      },
+    },
+  };
+}
+
+async function getUserQuotaApi(user?: string): Promise<ClusterUserQuota> {
+  const response = await axios.get(`/system/quotas/user${user ? "/" + user : ""}`);
+  return parseQuotaResources(response.data);
+}
+
+export default getUserQuotaApi;

src/api/quotas/putQuotaApi.ts

@@ -0,0 +1,10 @@
+
+import { ClusterUserQuota, QuotaUpdateRequest } from "@/models/clusterUserQuota";
+import axios from "axios";
+
+async function putUserQuotaApi(uid: string, userQuota: QuotaUpdateRequest): Promise<ClusterUserQuota> {
+  const response = await axios.put(`/system/quotas/user/${uid}`, userQuota);
+  return response.data as ClusterUserQuota;
+}
+
+export default putUserQuotaApi;

src/api/services/getServicesApi.ts

@@ -1,8 +1,14 @@
 import { Service } from "@/pages/ui/services/models/service";
 import axios from "axios";
 
-async function getServicesApi() {
-  const response = await axios.get("/system/services");
+interface GetServicesApiOptions {
+  includeDeployment?: boolean;
+}
+
+async function getServicesApi(options: GetServicesApiOptions = {}): Promise<Service[]> {
+  const response = await axios.get("/system/services", {
+    params: options.includeDeployment ? { include: "deployment" } : undefined,
+  });
 
   return response.data as Service[];
 }

src/api/volumes/createVolumesApi.ts

@@ -0,0 +1,9 @@
+import { ManagedVolumeCreateRequest } from "@/pages/ui/services/models/service";
+import axios from "axios";
+
+async function createVolumesApi(volume: ManagedVolumeCreateRequest) {
+  const response = await axios.post("/system/volumes", volume);
+  return response.data;
+}
+
+export default createVolumesApi;