Skip to content

Commit aa74255

Browse files
committed
fix(*): added the loading in the dataset list
1 parent 7955fad commit aa74255

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

app/(routes)/evaluations/page.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ function SimplifiedEvalContent() {
5353

5454
// Stored datasets
5555
const [storedDatasets, setStoredDatasets] = useState<Dataset[]>([]);
56+
const [isDatasetsLoading, setIsDatasetsLoading] = useState(false);
5657

5758
// Evaluation config state
5859
const [selectedDatasetId, setSelectedDatasetId] = useState<string>(() => {
@@ -86,6 +87,7 @@ function SimplifiedEvalContent() {
8687
console.error("No selected API key found for loading datasets");
8788
return;
8889
}
90+
setIsDatasetsLoading(true);
8991
try {
9092
const response = await fetch("/api/evaluations/datasets", {
9193
method: "GET",
@@ -96,6 +98,8 @@ function SimplifiedEvalContent() {
9698
setStoredDatasets(Array.isArray(data) ? data : data.data || []);
9799
} catch (e) {
98100
console.error("Failed to load datasets:", e);
101+
} finally {
102+
setIsDatasetsLoading(false);
99103
}
100104
}, [apiKeys, selectedKeyId]);
101105

@@ -426,6 +430,7 @@ function SimplifiedEvalContent() {
426430
setUploadedFile(null);
427431
}}
428432
storedDatasets={storedDatasets}
433+
isDatasetsLoading={isDatasetsLoading}
429434
apiKeys={apiKeys}
430435
selectedKeyId={selectedKeyId}
431436
loadStoredDatasets={loadStoredDatasets}

app/components/evaluations/DatasetsTab.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { APIKey } from "@/app/lib/types/credentials";
66
import { Dataset } from "@/app/(routes)/datasets/page";
77
import { useToast } from "@/app/components/Toast";
88
import EvalDatasetDescription from "./EvalDatasetDescription";
9+
import Loader from "@/app/components/Loader";
910

1011
export interface DatasetsTabProps {
1112
leftPanelWidth: number;
@@ -22,6 +23,7 @@ export interface DatasetsTabProps {
2223
handleCreateDataset: () => void;
2324
resetForm: () => void;
2425
storedDatasets: Dataset[];
26+
isDatasetsLoading: boolean;
2527
apiKeys: APIKey[];
2628
selectedKeyId: string;
2729
loadStoredDatasets: () => void;
@@ -43,6 +45,7 @@ export default function DatasetsTab({
4345
handleCreateDataset,
4446
resetForm,
4547
storedDatasets,
48+
isDatasetsLoading,
4649
apiKeys,
4750
selectedKeyId,
4851
loadStoredDatasets,
@@ -559,7 +562,11 @@ export default function DatasetsTab({
559562
</h3>
560563
</div>
561564

562-
{storedDatasets.length === 0 ? (
565+
{isDatasetsLoading ? (
566+
<div className="p-16 flex justify-center">
567+
<Loader size="md" message="Loading datasets..." />
568+
</div>
569+
) : storedDatasets.length === 0 ? (
563570
<div className="p-16 text-center">
564571
<svg
565572
className="w-12 h-12 mx-auto mb-3"

0 commit comments

Comments
 (0)