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

Testing in local validated.

Browse Source
This commit is contained in:
charlesgauthereau
2025-07-16 20:16:18 +02:00
parent de9fe33194
commit 5e704ec18a
21 changed files with 598 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/page.tsx
+18 -18
View File
@@ -1,18 +1,18 @@
import { PageParams } from "@/types/next";
import { notFound } from "next/navigation";
import { Page, PageActions, PageContent, PageDescription, PageTitle } from "@/features/layout/page";
import { BackupButton } from "@/components/wrappers/dashboard/backup/backup-button/backup-button";
import { DatabaseTabs } from "@/components/wrappers/dashboard/projects/Database/DatabaseTabs";
import { DatabaseKpi } from "@/components/wrappers/dashboard/projects/Database/DatabaseKpi";
import { EditButton } from "@/components/wrappers/dashboard/database/EditButton/EditButton";
import { CronButton } from "@/components/wrappers/dashboard/database/CronButton/CronButton";
import {PageParams} from "@/types/next";
import {notFound} from "next/navigation";
import {Page, PageActions, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
import {BackupButton} from "@/components/wrappers/dashboard/backup/backup-button/backup-button";
import {DatabaseTabs} from "@/components/wrappers/dashboard/projects/Database/DatabaseTabs";
import {DatabaseKpi} from "@/components/wrappers/dashboard/projects/Database/DatabaseKpi";
import {EditButton} from "@/components/wrappers/dashboard/database/EditButton/EditButton";
import {CronButton} from "@/components/wrappers/dashboard/database/CronButton/CronButton";
import { db } from "@/db";
import { eq, and } from "drizzle-orm";
import {db} from "@/db";
import {eq, and} from "drizzle-orm";
import * as drizzleDb from "@/db";
export default async function RoutePage(props: PageParams<{ databaseId: string }>) {
const { databaseId } = await props.params;
const {databaseId} = await props.params;
const dbItem = await db.query.database.findFirst({
where: eq(drizzleDb.schemas.database.id, databaseId),
@@ -27,12 +27,12 @@ export default async function RoutePage(props: PageParams<{ databaseId: string }
with: {
restorations: true,
},
orderBy: (b, { desc }) => [desc(b.createdAt)],
orderBy: (b, {desc}) => [desc(b.createdAt)],
});
const restorations = await db.query.restoration.findMany({
where: eq(drizzleDb.schemas.restoration.databaseId, dbItem.id),
orderBy: (r, { desc }) => [desc(r.createdAt)],
orderBy: (r, {desc}) => [desc(r.createdAt)],
});
const isAlreadyBackup = backups.some((b) => b.status === "waiting");
@@ -40,12 +40,12 @@ export default async function RoutePage(props: PageParams<{ databaseId: string }
const [totalBackups, successfulBackups] = await Promise.all([
db
.select({ count: drizzleDb.schemas.backup.id })
.select({count: drizzleDb.schemas.backup.id})
.from(drizzleDb.schemas.backup)
.where(eq(drizzleDb.schemas.backup.databaseId, dbItem.id))
.then((rows) => rows.length),
db
.select({ count: drizzleDb.schemas.backup.id })
.select({count: drizzleDb.schemas.backup.id})
.from(drizzleDb.schemas.backup)
.where(and(eq(drizzleDb.schemas.backup.databaseId, dbItem.id), eq(drizzleDb.schemas.backup.status, "success")))
.then((rows) => rows.length),
@@ -58,11 +58,11 @@ export default async function RoutePage(props: PageParams<{ databaseId: string }
<div className="justify-between gap-2 sm:flex">
<PageTitle className="flex items-center">
{dbItem.name}
<EditButton />
<CronButton database={dbItem} />
<EditButton/>
<CronButton database={dbItem}/>
</PageTitle>
<PageActions className="justify-between">
<BackupButton disable={isAlreadyBackup} databaseId={databaseId} />
<BackupButton disable={isAlreadyBackup} databaseId={databaseId}/>
</PageActions>
</div>
<PageDescription className="mt-5 sm:mt-0">{dbItem.description}</PageDescription>
app/(customer)/dashboard/(organization)/projects/[projectId]/edit/page.tsx
+6 -2
View File
@@ -42,7 +42,11 @@ export default async function RoutePage(props: PageParams<{ projectId: string }>
},
orderBy: (db, {desc}) => [desc(db.createdAt)],
})
).filter((db): db is DatabaseWith => db.project !== null);
);
// .filter((db): db is DatabaseWith => db.project !== null);
console.log("ici34",availableDatabases);
return (
<Page>
@@ -52,7 +56,7 @@ export default async function RoutePage(props: PageParams<{ projectId: string }>
<PageContent>
<ProjectForm
organization={org}
databases={availableDatabases}
databases={availableDatabases as DatabaseWith[]}
defaultValues={{name: proj.name, slug: proj.slug, databases: proj.databases.map((db) => db.id)}}
projectId={proj.id}
/>
app/api/agent/[agentId]/status/helpers.ts
+4 -2
View File
@@ -7,6 +7,7 @@ import {Database} from "@/db/schema/06_database";
import * as drizzleDb from "@/db";
import {db as dbClient} from "@/db";
import {and, eq} from "drizzle-orm";
import {dbmsEnumSchema, EDbmsSchema} from "@/db/schema/types";
export async function handleDatabases(body: Body, agent: Agent, lastContact: Date) {
const databasesResponse = [];
@@ -43,13 +44,14 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
{ status: 500 }
);
}
console.log(db)
console.log(dbmsEnumSchema.parse(db.dbms))
const [databaseCreated] = await dbClient
.insert(drizzleDb.schemas.database)
.values({
agentId: agent.id,
name: db.name,
dbms: db.dbms,
dbms: db.dbms as EDbmsSchema,
agentDatabaseId: db.generatedId,
lastContact: lastContact,
})