External/portabase
1
0
Fork 0
mirror of https://github.com/Portabase/portabase.git synced 2026-07-14 11:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Finish migration prisma to drizzle.

Browse Source
This commit is contained in:
charlesgauthereau
2025-07-16 18:15:28 +02:00
parent 385777535f
commit de9fe33194
21 changed files with 278 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/(customer)/dashboard/(organization)/projects/[projectId]/edit/page.tsx
+1 -1
View File
@@ -22,7 +22,7 @@ export default async function RoutePage(props: PageParams<{ projectId: string }>
notFound();
}
//
const org = await db.query.organization.findFirst({
where: eq(drizzleDb.schemas.organization.slug, "default"),
});
app/(customer)/dashboard/(organization)/projects/[projectId]/page.tsx
+1 -1
View File
@@ -46,7 +46,7 @@ export default async function RoutePage(props: PageParams<{
<div className="justify-between gap-2 sm:flex">
<PageTitle className="flex items-center">
{proj.name}
<Link className={buttonVariants({ variant: "outline" })} href={`/dashboard/${organization.slug}/projects/${proj.id}/edit`}>
<Link className={buttonVariants({ variant: "outline" })} href={`/dashboard/projects/${proj.id}/edit`}>
<GearIcon className="w-7 h-7" />
</Link>
</PageTitle>
app/(customer)/dashboard/(organization)/settings/edit/page.tsx
+3 -10
View File
@@ -1,26 +1,19 @@
import {PageParams} from "@/types/next";
import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
import {getCurrentOrganizationSlug} from "@/features/dashboard/organization-cookie";
import {prisma} from "@/prisma";
import {requiredCurrentUser} from "@/auth/current-user";
import {notFound} from "next/navigation";
import {OrganizationForm} from "@/components/wrappers/dashboard/organization/OrganizationForm/OrganizationForm";
import {getOrganization} from "@/lib/auth/auth";
export default async function RoutePage(props: PageParams<{
slug: string;
}>) {
const {slug: organizationSlug} = await props.params;
const organization = await getOrganization({organizationSlug});
const organization = await getOrganization({});
if (!organization) {
notFound()
notFound();
}
return(
<Page>
<PageHeader>
app/(customer)/dashboard/(organization)/settings/page.tsx
+3 -43
View File
@@ -3,9 +3,6 @@ import {Page, PageActions, PageContent, PageDescription, PageHeader, PageTitle}
import {currentUser} from "@/lib/auth/current-user";
import {getOrganization} from "@/lib/auth/auth";
import {notFound} from "next/navigation";
import {requiredCurrentUser} from "@/auth/current-user";
import {SettingsTabs} from "@/components/wrappers/dashboard/settings/SettingsTabs/SettingsTabs";
import {getCurrentOrganizationSlug} from "@/features/dashboard/organization-cookie";
import {
DeleteOrganizationButton
} from "@/components/wrappers/dashboard/organization/DeleteOrganization/DeleteOrganizationButton";
@@ -13,50 +10,13 @@ import {EditButtonSettings} from "@/components/wrappers/dashboard/settings/EditB
export default async function RoutePage(props: PageParams<{ slug: string }>) {
const {slug: organizationSlug} = await props.params;
const organization = await getOrganization({});
const user = await currentUser();
const organization = await getOrganization({organizationSlug});
if (!organization || organization?.slug !== organizationSlug) {
if (!organization) {
notFound();
}
// const organization = await prisma.organization.findUnique({
// where: {
// slug: currentOrganizationSlug,
// },
// include: {
// users:{
// include:{
// user: {}
// }
// }
// }
// })
//
// const currentOrganizationUser = await prisma.userOrganization.findFirst({
// where:{
// userId: user.id,
// organization:{
// slug: currentOrganizationSlug != "" ? currentOrganizationSlug : "default",
// }
// }
// })
// if (currentOrganizationUser.role != "admin") {
// notFound()
// }
//
//
// const settings = await prisma.settings.findUnique({
// where: {
// name: "system"
// }
// })
return (
<Page>
<PageHeader>
@@ -76,7 +36,7 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
Manage your organization settings.
</PageDescription>
<PageContent>
{/*<SettingsTabs settings={settings} currentUser={user} users={organization.users}/>*/}
{/* TODO add the list of organisation members (add, remove, edit) */}
</PageContent>
</Page>
)
app/(customer)/dashboard/(organization)/statistics/page.tsx
+5 -5
View File
@@ -8,17 +8,17 @@ import { notFound } from "next/navigation";
import { db } from "@/db";
import { asc, count, eq, inArray } from "drizzle-orm";
import * as drizzleDb from "@/db";
import {getOrganization} from "@/lib/auth/auth";
export default async function RoutePage(props: PageParams<{ slug: string }>) {
const { slug: organizationSlug } = await props.params;
export default async function RoutePage(props: PageParams<{ }>) {
const organization = await getOrganization({});
const currentOrganizationSlug = await getCurrentOrganizationSlug();
if (currentOrganizationSlug !== organizationSlug) {
if (!organization) {
notFound();
}
const org = await db.query.organization.findFirst({
where: eq(drizzleDb.schemas.organization.slug, currentOrganizationSlug),
where: eq(drizzleDb.schemas.organization.slug, organization.slug),
});
if (!org) notFound();