Skip to content

Commit e19da71

Browse files
AlessandroMarcAlessandroMarc
authored
fix: fixed duplicate export dynamics (#1399)
1 parent 0aaa18d commit e19da71

File tree

7 files changed

+132
-166
lines changed

7 files changed

+132
-166
lines changed

‎client/app/(ee)/settings/logs/page.tsx‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@ import React from "react";
22
import { GetLogs } from "@/services/logs";
33
import LogsCard from "./logs-card";
44

5-
export const dynamic = 'force-dynamic';
5+
export const dynamic = "force-dynamic";
66

77
export default async function Logs() {
8-
const data = await GetLogs();
8+
const data = await GetLogs();
99

10-
return (
11-
<div className="w-full h-full overflow-y-auto custom-scroll mt-5 px-2 md:px-4">
12-
<h1 className="text-2xl font-bold dark:text-white mb-10">Logs</h1>
13-
<LogsCard logs={data?.logs || []} logs_count={data?.logs_count} />
14-
</div>
15-
);
10+
return (
11+
<div className="w-full h-full overflow-y-auto custom-scroll mt-5 px-2 md:px-4">
12+
<h1 className="text-2xl font-bold dark:text-white mb-10">Logs</h1>
13+
<LogsCard logs={data?.logs || []} logs_count={data?.logs_count} />
14+
</div>
15+
);
1616
}
17-
export const dynamic='force-dynamic';
18-

‎client/app/settings/datasets/[id]/page.tsx‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,32 @@ import Link from "next/link";
33
import DatasetCard from "./DatasetCard";
44
import { GetDatasetDetails } from "@/services/datasets";
55

6-
export const dynamic = 'force-dynamic';
6+
export const dynamic = "force-dynamic";
77

88
interface PageProps {
9-
params: {
10-
id: string;
11-
};
9+
params: {
10+
id: string;
11+
};
1212
}
1313

1414
export default async function DatasetDetailsPage({ params }: PageProps) {
15-
const data = await GetDatasetDetails(params.id);
16-
const dataframe = data?.dataset;
15+
const data = await GetDatasetDetails(params.id);
16+
const dataframe = data?.dataset;
1717

18-
return (
19-
<>
20-
<div className="w-full h-full overflow-y-auto custom-scroll mt-5 px-2 md:px-4">
21-
<h1 className="text-2xl font-bold dark:text-white mb-10">
22-
<Link href="/settings/datasets">Datasets</Link>
23-
<small>{` › ${dataframe?.name || ""}`}</small>
24-
</h1>
18+
return (
19+
<>
20+
<div className="w-full h-full overflow-y-auto custom-scroll mt-5 px-2 md:px-4">
21+
<h1 className="text-2xl font-bold dark:text-white mb-10">
22+
<Link href="/settings/datasets">Datasets</Link>
23+
<small>{` › ${dataframe?.name || ""}`}</small>
24+
</h1>
2525

26-
<div className="flex flex-col p-2 md:p-4 font-montserrat">
27-
<div className="flex items-center justify-center w-[50%]">
28-
<DatasetCard dataframe={dataframe} />
29-
</div>
30-
</div>
31-
</div>
32-
</>
33-
);
26+
<div className="flex flex-col p-2 md:p-4 font-montserrat">
27+
<div className="flex items-center justify-center w-[50%]">
28+
<DatasetCard dataframe={dataframe} />
29+
</div>
30+
</div>
31+
</div>
32+
</>
33+
);
3434
}
35-
export const dynamic='force-dynamic';
36-

‎client/app/settings/datasets/page.tsx‎

Lines changed: 35 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,53 +7,43 @@ import { Button } from "@/components/ui/button";
77
import { GetAllDataSets } from "@/services/datasets";
88
import AddNewCard from "./AddNewCard";
99

10-
export const dynamic = 'force-dynamic';
10+
export const dynamic = "force-dynamic";
1111

1212
export default async function Datasets() {
13-
const data = await GetAllDataSets();
13+
const data = await GetAllDataSets();
1414

15-
return (
16-
<div className="w-full h-full overflow-y-auto custom-scroll mt-5 px-2 md:px-4">
17-
<h1 className="text-2xl font-bold dark:text-white mb-10">Datasets</h1>
18-
<div className="grid 2xl:grid-cols-4 xl:grid-cols-3 lg:grid-cols-2 gap-4">
19-
{data?.datasets?.map((item) => (
20-
<Card
21-
key={item.id}
22-
extra={
23-
"w-full pt-4 px-6 h-full border dark:border-none border-[#ccc] pb-8"
24-
}
25-
>
26-
<header className="relative flex items-center justify-between">
27-
<div className="w-full">
28-
<div className="flex justify-center h-24">
29-
<FaFileCsv size="4em" key={0} />
30-
</div>
31-
<div className="h-[65px] w-full overflow-hidden">
32-
<AppTooltip text={item.name}>
33-
<h1
34-
data-tooltip-id={`${item.id}`}
35-
className="dark:text-white font-bold font-montserrat text-[20px] text-center customellipsis"
36-
>
37-
{item.name}
38-
</h1>
39-
</AppTooltip>
40-
</div>
41-
</div>
42-
</header>
43-
<div className="w-full flex flex-wrap items-center justify-center mt-1">
44-
<Link href={`/settings/datasets/${item?.id}`}>
45-
<Button>Details</Button>
46-
</Link>
47-
</div>
48-
</Card>
49-
))}
15+
return (
16+
<div className="w-full h-full overflow-y-auto custom-scroll mt-5 px-2 md:px-4">
17+
<h1 className="text-2xl font-bold dark:text-white mb-10">Datasets</h1>
18+
<div className="grid 2xl:grid-cols-4 xl:grid-cols-3 lg:grid-cols-2 gap-4">
19+
{data?.datasets?.map(item => (
20+
<Card key={item.id} extra={"w-full pt-4 px-6 h-full border dark:border-none border-[#ccc] pb-8"}>
21+
<header className="relative flex items-center justify-between">
22+
<div className="w-full">
23+
<div className="flex justify-center h-24">
24+
<FaFileCsv size="4em" key={0} />
25+
</div>
26+
<div className="h-[65px] w-full overflow-hidden">
27+
<AppTooltip text={item.name}>
28+
<h1 data-tooltip-id={`${item.id}`} className="dark:text-white font-bold font-montserrat text-[20px] text-center customellipsis">
29+
{item.name}
30+
</h1>
31+
</AppTooltip>
32+
</div>
33+
</div>
34+
</header>
35+
<div className="w-full flex flex-wrap items-center justify-center mt-1">
36+
<Link href={`/settings/datasets/${item?.id}`}>
37+
<Button>Details</Button>
38+
</Link>
39+
</div>
40+
</Card>
41+
))}
5042

51-
<Link href={`/settings/datasets/add`}>
52-
<AddNewCard text="New dataset" />
53-
</Link>
54-
</div>
55-
</div>
56-
);
43+
<Link href={`/settings/datasets/add`}>
44+
<AddNewCard text="New dataset" />
45+
</Link>
46+
</div>
47+
</div>
48+
);
5749
}
58-
export const dynamic='force-dynamic';
59-

‎client/app/settings/page.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { redirect } from "next/navigation";
22

3-
export const dynamic = 'force-dynamic';
3+
export const dynamic = "force-dynamic";
44

55
export default function Home() {
6-
redirect("/settings/datasets");
6+
redirect("/settings/datasets");
77
}
8-
export const dynamic='force-dynamic';
9-

‎client/app/settings/workspaces/addspaces/page.tsx‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,28 @@ import { GetAllDataSets } from "@/services/datasets";
44
import AddSpaceCard from "./AddSpaceCard";
55
import { Button } from "@/components/ui/button";
66

7-
export const dynamic = 'force-dynamic';
7+
export const dynamic = "force-dynamic";
88

99
export default async function AddSpaces() {
10-
const data = await GetAllDataSets();
10+
const data = await GetAllDataSets();
1111

12-
return (
13-
<div className="w-full h-full overflow-y-auto custom-scroll mt-5 px-2 md:px-4">
14-
<h1 className="text-2xl font-bold dark:text-white mb-10">
15-
<Link href="/settings/workspaces">Workspaces</Link>
16-
<small> › New</small>
17-
</h1>
12+
return (
13+
<div className="w-full h-full overflow-y-auto custom-scroll mt-5 px-2 md:px-4">
14+
<h1 className="text-2xl font-bold dark:text-white mb-10">
15+
<Link href="/settings/workspaces">Workspaces</Link>
16+
<small> › New</small>
17+
</h1>
1818

19-
{data?.datasets?.length === 0 ? (
20-
<div className="flex flex-col items-center justify-center m-auto">
21-
<p className="dark:text-white font-montserrat text-lg mb-3">
22-
No datasets available, please add one
23-
</p>
19+
{data?.datasets?.length === 0 ? (
20+
<div className="flex flex-col items-center justify-center m-auto">
21+
<p className="dark:text-white font-montserrat text-lg mb-3">No datasets available, please add one</p>
2422

25-
<Link href={"/settings/datasets/add"}></Link>
26-
<Button>Add</Button>
27-
</div>
28-
) : (
29-
<AddSpaceCard datasets={data?.datasets} />
30-
)}
31-
</div>
32-
);
23+
<Link href={"/settings/datasets/add"}></Link>
24+
<Button>Add</Button>
25+
</div>
26+
) : (
27+
<AddSpaceCard datasets={data?.datasets} />
28+
)}
29+
</div>
30+
);
3331
}
34-
export const dynamic='force-dynamic';
35-

‎client/app/settings/workspaces/editspaces/page.tsx‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,24 @@ import { GetAllDataSets } from "@/services/datasets";
44
import EditSpaceCard from "./EditSpaceCard";
55
import { GetWorkspaceDetails } from "@/services/spaces";
66

7-
export const dynamic = 'force-dynamic';
7+
export const dynamic = "force-dynamic";
88

99
export default async function EditWorkSpaces({ searchParams }) {
10-
const data = await GetAllDataSets();
11-
const workspaceDetails = await GetWorkspaceDetails(searchParams.id);
10+
const data = await GetAllDataSets();
11+
const workspaceDetails = await GetWorkspaceDetails(searchParams.id);
1212

13-
return (
14-
<div className="w-full h-full overflow-y-auto custom-scroll mt-5 px-2 md:px-4">
15-
<h1 className="text-2xl font-bold dark:text-white mb-10">
16-
<Link href={`/settings/workspaces`}>Workspaces</Link>
17-
<small>
18-
<Link href={`/settings/workspaces/${searchParams.id}`}>
19-
<small>
20-
{workspaceDetails?.name && ` › ${workspaceDetails?.name}`}
21-
</small>
22-
</Link>{" "}
23-
› Edit
24-
</small>
25-
</h1>
26-
<EditSpaceCard datasets={data?.datasets} workspaceId={searchParams?.id} />
27-
</div>
28-
);
13+
return (
14+
<div className="w-full h-full overflow-y-auto custom-scroll mt-5 px-2 md:px-4">
15+
<h1 className="text-2xl font-bold dark:text-white mb-10">
16+
<Link href={`/settings/workspaces`}>Workspaces</Link>
17+
<small>
18+
<Link href={`/settings/workspaces/${searchParams.id}`}>
19+
<small>{workspaceDetails?.name && ` › ${workspaceDetails?.name}`}</small>
20+
</Link>{" "}
21+
› Edit
22+
</small>
23+
</h1>
24+
<EditSpaceCard datasets={data?.datasets} workspaceId={searchParams?.id} />
25+
</div>
26+
);
2927
}
30-
export const dynamic='force-dynamic';
31-

‎client/app/settings/workspaces/page.tsx‎

Lines changed: 30 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,39 @@ import AppTooltip from "@/components/AppTooltip";
66
import { Button } from "@/components/ui/button";
77
import { GetAllWorkspaces } from "@/services/spaces";
88

9-
export const dynamic = 'force-dynamic';
9+
export const dynamic = "force-dynamic";
1010

1111
export default async function WorkSpaces() {
12-
const data = await GetAllWorkspaces();
12+
const data = await GetAllWorkspaces();
1313

14-
return (
15-
<div className="w-full overflow-y-auto custom-scroll px-2 mt-5 md:px-4 h-full">
16-
<h1 className="text-2xl font-bold dark:text-white mb-10">Workspaces</h1>
14+
return (
15+
<div className="w-full overflow-y-auto custom-scroll px-2 mt-5 md:px-4 h-full">
16+
<h1 className="text-2xl font-bold dark:text-white mb-10">Workspaces</h1>
1717

18-
<div className="grid 2xl:grid-cols-4 xl:grid-cols-3 lg:grid-cols-2 gap-4">
19-
{data?.map((item, index) => (
20-
<Card
21-
key={index}
22-
extra={
23-
"w-full py-4 px-6 h-full border dark:border-none border-[#ccc]"
24-
}
25-
>
26-
<div className="flex flex-col justify-center items-center gap-6 py-[30px]">
27-
<div className="h-[65px] w-full overflow-hidden">
28-
<AppTooltip text={item.name}>
29-
<h1
30-
data-tooltip-id={item.id}
31-
className="dark:text-white font-bold font-montserrat text-[20px] text-center customellipsis"
32-
>
33-
{item.name}
34-
</h1>
35-
</AppTooltip>
36-
</div>
18+
<div className="grid 2xl:grid-cols-4 xl:grid-cols-3 lg:grid-cols-2 gap-4">
19+
{data?.map((item, index) => (
20+
<Card key={index} extra={"w-full py-4 px-6 h-full border dark:border-none border-[#ccc]"}>
21+
<div className="flex flex-col justify-center items-center gap-6 py-[30px]">
22+
<div className="h-[65px] w-full overflow-hidden">
23+
<AppTooltip text={item.name}>
24+
<h1 data-tooltip-id={item.id} className="dark:text-white font-bold font-montserrat text-[20px] text-center customellipsis">
25+
{item.name}
26+
</h1>
27+
</AppTooltip>
28+
</div>
3729

38-
<div className="w-full flex flex-wrap items-center justify-center mt-1">
39-
<Link href={`/settings/workspaces/${item?.id}`}>
40-
<Button>Details</Button>
41-
</Link>
42-
</div>
43-
</div>
44-
</Card>
45-
))}
46-
<Link href={"/settings/workspaces/addspaces"}>
47-
<AddNewCard text="New workspace" />
48-
</Link>
49-
</div>
50-
</div>
51-
);
30+
<div className="w-full flex flex-wrap items-center justify-center mt-1">
31+
<Link href={`/settings/workspaces/${item?.id}`}>
32+
<Button>Details</Button>
33+
</Link>
34+
</div>
35+
</div>
36+
</Card>
37+
))}
38+
<Link href={"/settings/workspaces/addspaces"}>
39+
<AddNewCard text="New workspace" />
40+
</Link>
41+
</div>
42+
</div>
43+
);
5244
}
53-
export const dynamic='force-dynamic';
54-

0 commit comments

Comments
 (0)