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

Working on the Portabase debug.

Browse Source
This commit is contained in:
charlesgauthereau
2025-05-18 20:46:59 +02:00
parent 6f2523e524
commit 405de7b323
13 changed files with 240 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/(customer)/dashboard/[slug]/settings/edit/page.tsx
+8 -34
View File
@@ -5,47 +5,21 @@ 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 currentOrganizationSlug = await getCurrentOrganizationSlug()
const user = await requiredCurrentUser()
if(currentOrganizationSlug != organizationSlug) {
const {slug: organizationSlug} = await props.params;
const organization = await getOrganization({organizationSlug});
if (!organization) {
notFound()
}
const organization = await prisma.organization.findUnique({
where:{
slug: currentOrganizationSlug,
},
include:{
users:{
include:{
user:{
}
},
where: {
user: {
id: {
not: user.id, // Exclude user with id: 1
},
},
},
}
}
})
const users = await prisma.user.findMany({
where: {
deleted: {not: true},
id: {not: user.id}
}
})
return(
<Page>
@@ -55,7 +29,7 @@ export default async function RoutePage(props: PageParams<{
</PageTitle>
</PageHeader>
<PageContent>
<OrganizationForm users={users} defaultValues={organization}/>
<OrganizationForm members={organization.members} defaultValues={organization}/>
</PageContent>
</Page>
)
app/(customer)/dashboard/[slug]/settings/page.tsx
+43 -34
View File
@@ -1,6 +1,8 @@
import {prisma} from "@/prisma";
import {PageParams} from "@/types/next";
import {Page, PageActions, PageContent, PageDescription, PageHeader, PageTitle} from "@/features/layout/page";
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";
@@ -8,45 +10,52 @@ import {
DeleteOrganizationButton
} from "@/components/wrappers/dashboard/organization/DeleteOrganization/DeleteOrganizationButton";
import {EditButtonSettings} from "@/components/wrappers/dashboard/settings/EditButtonSettings/EditButtonSettings";
import {notFound} from "next/navigation";
export default async function RoutePage(props: PageParams<{}>) {
const user = await requiredCurrentUser()
export default async function RoutePage(props: PageParams<{ slug: string }>) {
const {slug: organizationSlug} = await props.params;
const currentOrganizationSlug = await getCurrentOrganizationSlug()
const user = await currentUser();
const organization = await prisma.organization.findUnique({
where: {
slug: currentOrganizationSlug,
},
include: {
users:{
include:{
user: {}
}
}
}
})
const organization = await getOrganization({organizationSlug});
const currentOrganizationUser = await prisma.userOrganization.findFirst({
where:{
userId: user.id,
organization:{
slug: currentOrganizationSlug != "" ? currentOrganizationSlug : "default",
}
}
})
if (currentOrganizationUser.role != "admin") {
notFound()
if (!organization || organization?.slug !== organizationSlug) {
notFound();
}
const settings = await prisma.settings.findUnique({
where: {
name: "system"
}
})
// 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>
@@ -59,7 +68,7 @@ export default async function RoutePage(props: PageParams<{}>) {
</PageTitle>
<PageActions>
{organization.slug != "default" ?
<DeleteOrganizationButton organizationSlug={currentOrganizationSlug}/>
<DeleteOrganizationButton organizationSlug={organization.slug}/>
: null}
</PageActions>
</PageHeader>
@@ -67,7 +76,7 @@ export default async function RoutePage(props: PageParams<{}>) {
Manage your organization settings.
</PageDescription>
<PageContent>
<SettingsTabs settings={settings} currentUser={user} users={organization.users}/>
{/*<SettingsTabs settings={settings} currentUser={user} users={organization.users}/>*/}
</PageContent>
</Page>
)