fix: rebase

Author: SaboniAmine

webapp/src/api/experiments.ts

@@ -19,17 +19,10 @@ export async function createExperiment(
 
 export async function getExperiments(projectId: string): Promise<Experiment[]> {
     try {
-        const result = await fetchApi(
+        return await fetchApi(
             `/projects/${projectId}/experiments`,
             ExperimentSchema.array(),
         );
-        // Drop experiments that somehow lack a usable id — they cannot be
-        // selected, fetched, or rendered downstream. Keeping them would
-        // surface as unselectable rows whose click silently clears the
-        // selection.
-        return result.filter(
-            (e) => typeof e.id === "string" && e.id.length > 0,
-        );
     } catch (error) {
         console.error("[getExperiments] failed", error);
         return [];
@@ -54,12 +47,7 @@ export async function getProjectEmissionsByExperiment(
     }
 
     try {
-        const result = await fetchApi(url, ExperimentReportSchema.array());
-        return result.filter(
-            (r) =>
-                typeof r.experiment_id === "string" &&
-                r.experiment_id.length > 0,
-        );
+        return await fetchApi(url, ExperimentReportSchema.array());
     } catch (error) {
         console.error("[getProjectEmissionsByExperiment] failed", error);
         return [];

webapp/src/api/mock/index.ts

@@ -14,7 +14,7 @@ export function installMockFetch(): void {
 
     const apiBase = (import.meta.env.VITE_API_URL ?? "").replace(/\/$/, "");
     const apiPathPrefix = apiBase
-        ? new URL(apiBase).pathname.replace(/\/$/, "")
+        ? (safeUrl(apiBase)?.pathname.replace(/\/$/, "") ?? "")
         : "";
     const realFetch = window.fetch.bind(window);
 
@@ -29,16 +29,26 @@ export function installMockFetch(): void {
                   ? input.toString()
                   : input.url;
 
-        const isApiCall = apiBase ? rawUrl.startsWith(apiBase) : false;
+        // With an explicit VITE_API_URL we only intercept requests aimed at
+        // it. With no VITE_API_URL (the default dev/mock setup), every
+        // same-origin fetch is treated as an API call — Vite's static
+        // assets are loaded via <script>/<link>/<img>, not fetch(), so
+        // this interception is safe.
+        const absoluteUrl = new URL(rawUrl, window.location.origin);
+        const isApiCall = apiBase
+            ? rawUrl.startsWith(apiBase)
+            : absoluteUrl.origin === window.location.origin;
 
         if (!isApiCall) return realFetch(input, init);
 
-        const url = new URL(rawUrl);
         const relPath =
-            apiPathPrefix && url.pathname.startsWith(apiPathPrefix)
-                ? url.pathname.slice(apiPathPrefix.length) || "/"
-                : url.pathname;
-        const relUrl = new URL(relPath + url.search, "http://mock.local");
+            apiPathPrefix && absoluteUrl.pathname.startsWith(apiPathPrefix)
+                ? absoluteUrl.pathname.slice(apiPathPrefix.length) || "/"
+                : absoluteUrl.pathname;
+        const relUrl = new URL(
+            relPath + absoluteUrl.search,
+            "http://mock.local",
+        );
         const method = (init?.method ?? "GET").toUpperCase();
         const parsedBody = parseBody(init?.body);
         const result = resolveMock(relUrl, method, parsedBody);
@@ -61,6 +71,14 @@ export function installMockFetch(): void {
     );
 }
 
+function safeUrl(value: string): URL | null {
+    try {
+        return new URL(value);
+    } catch {
+        return null;
+    }
+}
+
 function parseBody(body: BodyInit | null | undefined): unknown {
     if (typeof body !== "string") return undefined;
     try {

webapp/src/api/runs.ts

@@ -2,12 +2,10 @@ import { z } from "zod";
 import { fetchApi } from "./client";
 import {
     Emission,
-    EmissionSchema,
     EmissionsTimeSeries,
     RunMetadata,
     RunMetadataSchema,
     RunReport,
-    RunReportSchema,
 } from "./schemas";
 
 export async function getRunMetadata(
@@ -85,39 +83,12 @@ export async function getEmissionsTimeSeries(
             ),
         ]);
 
-        const metadata: RunMetadata = {
-            timestamp: runMetadataData.timestamp,
-            experiment_id: runMetadataData.experiment_id,
-            os: runMetadataData.os,
-            python_version: runMetadataData.python_version,
-            codecarbon_version: runMetadataData.codecarbon_version,
-            cpu_count: runMetadataData.cpu_count,
-            cpu_model: runMetadataData.cpu_model,
-            gpu_count: runMetadataData.gpu_count,
-            gpu_model: runMetadataData.gpu_model,
-            longitude: runMetadataData.longitude,
-            latitude: runMetadataData.latitude,
-            region: runMetadataData.region,
-            provider: runMetadataData.provider,
-            ram_total_size: runMetadataData.ram_total_size,
-            tracking_mode: runMetadataData.tracking_mode,
-        };
-
         const emissions: Emission[] = emissionsData.items.map((item) => ({
+            ...item,
             emission_id: item.run_id,
-            timestamp: item.timestamp,
-            emissions_sum: item.emissions_sum,
-            emissions_rate: item.emissions_rate,
-            cpu_power: item.cpu_power,
-            gpu_power: item.gpu_power,
-            ram_power: item.ram_power,
-            cpu_energy: item.cpu_energy,
-            gpu_energy: item.gpu_energy,
-            ram_energy: item.ram_energy,
-            energy_consumed: item.energy_consumed,
         }));
 
-        return { runId, emissions, metadata };
+        return { runId, emissions, metadata: runMetadataData };
     } catch (error) {
         console.error("[getEmissionsTimeSeries] failed", error);
         return { runId, emissions: [], metadata: null };

webapp/src/api/schemas.ts

@@ -57,21 +57,22 @@ export const ProjectTokenSchema = z.object({
 });
 export type IProjectToken = z.infer<typeof ProjectTokenSchema>;
 
-// `id` is required when reading from the API (the backend never returns
-// experiments without one). It is allowed to be absent only on the
-// create path — see `ExperimentInputSchema` below.
+// Backend's `Optional[...]` fields are serialized as JSON `null` (Pydantic
+// default, no `exclude_none`). Zod's `.optional()` accepts `undefined`
+// only — `.nullish()` accepts `null | undefined`, which is what we need
+// for every column the backend marks as nullable.
 export const ExperimentSchema = z.object({
     id: z.string().min(1),
-    timestamp: z.string().optional(),
+    timestamp: z.string().nullish(),
     name: z.string(),
     description: z.string(),
-    on_cloud: z.boolean().optional(),
+    on_cloud: z.boolean().nullish(),
     project_id: z.string(),
-    country_name: z.string().optional(),
-    country_iso_code: z.string().optional(),
-    region: z.string().optional(),
-    cloud_provider: z.string().optional(),
-    cloud_region: z.string().optional(),
+    country_name: z.string().nullish(),
+    country_iso_code: z.string().nullish(),
+    region: z.string().nullish(),
+    cloud_provider: z.string().nullish(),
+    cloud_region: z.string().nullish(),
 });
 export type Experiment = z.infer<typeof ExperimentSchema>;
 
@@ -86,7 +87,7 @@ export const ExperimentReportSchema = z.object({
     emissions: z.number(),
     energy_consumed: z.number(),
     duration: z.number(),
-    description: z.string().optional(),
+    description: z.string().nullish(),
 });
 export type ExperimentReport = z.infer<typeof ExperimentReportSchema>;
 
@@ -117,19 +118,19 @@ export type Emission = z.infer<typeof EmissionSchema>;
 export const RunMetadataSchema = z.object({
     timestamp: z.string(),
     experiment_id: z.string(),
-    os: z.string(),
-    python_version: z.string(),
-    codecarbon_version: z.string(),
-    cpu_count: z.number(),
-    cpu_model: z.string(),
-    gpu_count: z.number(),
-    gpu_model: z.string(),
-    longitude: z.number(),
-    latitude: z.number(),
-    region: z.string(),
-    provider: z.string(),
-    ram_total_size: z.number(),
-    tracking_mode: z.string(),
+    os: z.string().nullish(),
+    python_version: z.string().nullish(),
+    codecarbon_version: z.string().nullish(),
+    cpu_count: z.number().nullish(),
+    cpu_model: z.string().nullish(),
+    gpu_count: z.number().nullish(),
+    gpu_model: z.string().nullish(),
+    longitude: z.number().nullish(),
+    latitude: z.number().nullish(),
+    region: z.string().nullish(),
+    provider: z.string().nullish(),
+    ram_total_size: z.number().nullish(),
+    tracking_mode: z.string().nullish(),
 });
 export type RunMetadata = z.infer<typeof RunMetadataSchema>;
 

webapp/src/components/createOrganizationModal.tsx

@@ -106,7 +106,7 @@ const CreateOrganizationModal: React.FC<ModalProps> = ({
                         <Label htmlFor="org-description">
                             Organization Description
                         </Label>
-                        </div>
+                    </div>
                     <div className="space-y-2">
                         <Label htmlFor="org-description">
                             Organization Description

webapp/src/components/createProjectModal.tsx

@@ -102,7 +102,7 @@ const CreateProjectModal: React.FC<ModalProps> = ({
                         <Label htmlFor="project-description">
                             Project Description
                         </Label>
-                        </div>
+                    </div>
                     <div className="space-y-2">
                         <Label htmlFor="project-description">
                             Project Description

webapp/src/components/navbar.tsx

@@ -36,7 +36,13 @@ export default function NavBar({
     const [selected, setSelected] = useState<string | null>(null);
     const navigate = useNavigate();
     const [isCollapsed, setIsCollapsed] = useState(false);
-    const [selectedOrg, setSelectedOrg] = useState<string | null>(null);
+    const [selectedOrg, setSelectedOrg] = useState<string | null>(() => {
+        try {
+            return localStorage.getItem("organizationId");
+        } catch {
+            return null;
+        }
+    });
     const iconStyles = "h-4 w-4 flex-shrink-0 text-muted-foreground";
     const { pathname } = useLocation();
     const newOrgModal = useModal();
@@ -156,6 +162,7 @@ export default function NavBar({
                             <NavItem
                                 isSelected={selected === "projects"}
                                 onClick={() => {
+                                    if (!selectedOrg) return;
                                     setSelected("projects");
                                     setSheetOpened?.(false);
                                     navigate(`/${selectedOrg}/projects`);
@@ -168,6 +175,7 @@ export default function NavBar({
                             <NavItem
                                 isSelected={selected === "members"}
                                 onClick={() => {
+                                    if (!selectedOrg) return;
                                     setSelected("members");
                                     setSheetOpened?.(false);
                                     navigate(`/${selectedOrg}/members`);