Skip to content

Commit a577127

Browse files
authored
WEB-108 Further actions refactor (#112)
2 parents 34d1277 + 1155451 commit a577127

22 files changed

Lines changed: 429 additions & 476 deletions

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ next-env.d.ts
3838

3939
# prisma generated client
4040
src/generated/
41+
42+
# ts build info output
43+
tsconfig.tsbuildinfo

src/app/[...puckPath]/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Client } from "./client";
22
import { notFound } from "next/navigation";
33
import { Metadata } from "next";
4-
import { getDocumentByPath } from "../../lib/get-document";
4+
import { getDocumentByPath } from "../../lib/documents/queries";
55

66
export async function generateMetadata({
77
params,

src/app/editor/DocumentList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import {
1010
duplicateDocumentAction,
1111
renameDocumentAction,
1212
unarchiveDocumentAction,
13-
} from "../../lib/actions";
13+
} from "../../lib/documents/actions";
1414
import { runAction } from "./runAction";
15-
import { getDocumentName } from "../../lib/documents";
15+
import { getDocumentName } from "../../lib/documents/utils";
1616
import { ResourceCard, NewResourceCard, formatRelativeTime } from "./ResourceCard";
1717
import { Button } from "@/components/ui/button";
1818
import { useDialogs } from "@/components/ui/dialog-provider";

src/app/editor/MediaLibrary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { useRef, useState, useTransition } from "react";
44
import { File as FileIcon, Trash2, Copy, Pencil } from "lucide-react";
55
import { toast } from "sonner";
6-
import { uploadMediaAction, deleteMediaAction, renameMediaAction } from "../../lib/actions";
6+
import { uploadMediaAction, deleteMediaAction, renameMediaAction } from "../../lib/media/actions";
77
import type { Media } from "../../generated/prisma/client";
88
import { runAction } from "./runAction";
99
import { ResourceCard, NewResourceCard, formatRelativeTime } from "./ResourceCard";

src/app/editor/RouteTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
createRouteAction,
88
updateRouteAction,
99
deleteRouteAction,
10-
} from "../../lib/actions";
10+
} from "../../lib/routes/actions";
1111
import { runAction } from "./runAction";
1212
import { useDialogs } from "@/components/ui/dialog-provider";
1313

src/app/editor/[id]/SaveButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { createUsePuck } from "@puckeditor/core";
44
import { useTransition } from "react";
55
import { toast } from "sonner";
66
import { useDocumentContext } from "./client";
7-
import { saveVersionAction } from "../../../lib/actions";
7+
import { saveVersionAction } from "../../../lib/documents/actions";
88
import { runAction } from "../runAction";
99
import { useDialogs } from "@/components/ui/dialog-provider";
1010

src/app/editor/[id]/VersionPluginContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { useTransition } from "react";
44
import { useRouter } from "next/navigation";
55
import { useDocumentContext } from "./client";
6-
import { publishVersionAction } from "../../../lib/actions";
6+
import { publishVersionAction } from "../../../lib/documents/actions";
77
import { runAction } from "../runAction";
88
import { VersionListPanel } from "./VersionListPanel";
99
import { useDialogs } from "@/components/ui/dialog-provider";

src/app/editor/[id]/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import "@puckeditor/core/puck.css";
22
import type { Data } from "@puckeditor/core";
33
import { Client } from "./client";
44
import { Metadata } from "next";
5-
import { getDocumentById, getVersionById } from "../../../lib/get-document";
5+
import { getDocumentById, getVersionById } from "../../../lib/documents/queries";
66

77
interface PageProps {
88
params: Promise<{ id: string }>;

src/app/editor/page.tsx

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,18 @@
1-
import { prisma } from "../../lib/prisma";
2-
import { getMediaUrl } from "../../lib/supabase";
3-
import { getDocumentName } from "../../lib/documents";
1+
import { getDocumentSummaries } from "../../lib/documents/queries";
2+
import { getDocumentName } from "../../lib/documents/utils";
3+
import { getMediaFiles } from "../../lib/media/queries";
4+
import { getRoutesWithDocuments } from "../../lib/routes/queries";
45
import { DocumentList, ArchivedDocumentList } from "./DocumentList";
56
import { MediaLibrary } from "./MediaLibrary";
67
import { RouteTable } from "./RouteTable";
78

89
export default async function EditorIndexPage() {
9-
const [routes, media, documents] = await Promise.all([
10-
prisma.route.findMany({
11-
include: { document: true },
12-
orderBy: { path: "asc" },
13-
}),
14-
prisma.media.findMany({ orderBy: { createdAt: "desc" } }),
15-
prisma.document.findMany({
16-
include: {
17-
versions: {
18-
orderBy: { createdAt: "desc" },
19-
take: 1,
20-
select: { createdAt: true },
21-
},
22-
},
23-
orderBy: { createdAt: "desc" },
24-
}),
10+
const [routes, mediaFiles, documents] = await Promise.all([
11+
getRoutesWithDocuments(),
12+
getMediaFiles(),
13+
getDocumentSummaries(),
2514
]);
2615

27-
const mediaFiles = media.map((m) => ({
28-
...m,
29-
url: getMediaUrl(m.storagePath),
30-
}));
31-
3216
const toDocumentItem = (doc: (typeof documents)[number]) => ({
3317
id: doc.id,
3418
name: doc.name,

src/app/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Client } from "./[...puckPath]/client";
22
import { notFound } from "next/navigation";
3-
import { getDocumentByPath } from "../lib/get-document";
3+
import { getDocumentByPath } from "../lib/documents/queries";
44

55

66
export default async function Page() {

0 commit comments

Comments
 (0)