chore(release): 1.2.5-rc.6

# Conflicts:
#	CITATION.cff
#	package.json

.env.example

@@ -28,3 +28,4 @@ AUTH_GOOGLE_METHOD=
 
 # Retention
 RETENTION_CRON="* * * * *"
+

CITATION.cff

@@ -26,5 +26,5 @@ keywords:
   - web-ui
   - agent
 license: Apache-2.0
-version: 1.2.4-rc.1
-date-released: "2026-01-24"
+version: 1.2.5-rc.6
+date-released: "2026-02-01"

app/(customer)/dashboard/(admin)/agents/[agentId]/edit/page.tsx

@@ -1,32 +0,0 @@
-import { PageParams } from "@/types/next";
-import { Page, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
-import { AgentForm } from "@/components/wrappers/dashboard/agent/agent-form/agent-form";
-import { notFound } from "next/navigation";
-import { db } from "@/db";
-
-export default async function RoutePage(
-    props: PageParams<{
-        agentId: string;
-    }>
-) {
-    const { agentId } = await props.params;
-
-    const agent = await db.query.agent.findFirst({
-        where: (fields, { eq }) => eq(fields.id, agentId),
-    });
-
-    if (!agent) {
-        notFound();
-    }
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Edit {agent.name}</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <AgentForm defaultValues={agent} agentId={agent.id} />
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(admin)/agents/[agentId]/page.tsx

@@ -1,8 +1,5 @@
-import Link from "next/link";
-import {GearIcon} from "@radix-ui/react-icons";
 import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
-import {buttonVariants} from "@/components/ui/button";
+import {Page, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
 import {db} from "@/db";
 import * as drizzleDb from "@/db";
 import {eq} from "drizzle-orm";
@@ -12,6 +9,8 @@ import {capitalizeFirstLetter} from "@/utils/text";
 import {generateEdgeKey} from "@/utils/edge_key";
 import {getServerUrl} from "@/utils/get-server-url";
 import {AgentContentPage} from "@/components/wrappers/dashboard/agent/agent-content";
+import {AgentDialog} from "@/features/agents/components/agent.dialog";
+import {AgentType} from "@/features/agents/agents.schema";
 
 export default async function RoutePage(props: PageParams<{ agentId: string }>) {
 
@@ -37,17 +36,14 @@ export default async function RoutePage(props: PageParams<{ agentId: string }>)
                     <div className="min-w-full md:min-w-fit ">
                         {capitalizeFirstLetter(agent.name)}
                     </div>
-                        <div className="flex items-center gap-2 md:justify-between w-full ">
-                            <div className="flex items-center gap-2">
-                                <Link className={buttonVariants({variant: "outline"})}
-                                      href={`/dashboard/agents/${agent.id}/edit`}>
-                                    <GearIcon className="w-7 h-7"/>
-                                </Link>
-                            </div>
-                            <div className="flex items-center gap-2">
-                                <ButtonDeleteAgent agentId={agentId} text={"Delete Agent"}/>
-                            </div>
+                    <div className="flex items-center gap-2 md:justify-between w-full ">
+                        <div className="flex items-center gap-2">
+                            <AgentDialog agent={agent as AgentType & { id: string }} typeTrigger={"edit"}/>
                         </div>
+                        <div className="flex items-center gap-2">
+                            <ButtonDeleteAgent agentId={agentId} text={"Delete Agent"}/>
+                        </div>
+                    </div>
                 </PageTitle>
             </div>
 

app/(customer)/dashboard/(admin)/agents/new/page.tsx

@@ -1,21 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {AgentForm} from "@/components/wrappers/dashboard/agent/agent-form/agent-form";
-import {Metadata} from "next";
-
-export const metadata: Metadata = {
-    title: "Create Agent",
-};
-
-export default async function RoutePage(props: PageParams<{}>) {
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Create new agent</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <AgentForm/>
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(admin)/agents/page.tsx

@@ -1,15 +1,13 @@
 import {PageParams} from "@/types/next";
 import {AgentCard} from "@/components/wrappers/dashboard/agent/agent-card/agent-card";
 import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {Button} from "@/components/ui/button";
-import Link from "next/link";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
 import * as drizzleDb from "@/db";
 import {desc, eq, not} from "drizzle-orm";
-import {EmptyStatePlaceholder} from "@/components/wrappers/common/empty-state-placeholder";
 import {Metadata} from "next";
+import {AgentDialog} from "@/features/agents/components/agent.dialog";
 
 export const metadata: Metadata = {
     title: "Agents",
@@ -25,7 +23,6 @@ export default async function RoutePage(props: PageParams<{}>) {
         orderBy: (fields) => desc(fields.lastContact),
     });
 
-
     if (!agents) {
         notFound();
     }
@@ -36,9 +33,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                 <PageTitle>Agents</PageTitle>
                 {agents.length > 0 && (
                     <PageActions>
-                        <Link href={"/dashboard/agents/new"}>
-                            <Button>+ Create Agent</Button>
-                        </Link>
+                         <AgentDialog typeTrigger={"create"} />
                     </PageActions>
                 )}
             </PageHeader>
@@ -46,12 +41,9 @@ export default async function RoutePage(props: PageParams<{}>) {
                 {agents.length > 0 ? (
                     <CardsWithPagination data={agents} cardItem={AgentCard} cardsPerPage={4} numberOfColumns={1}/>
                 ) : (
-                    <EmptyStatePlaceholder
-                        url={"/dashboard/agents/new"}
-                        text={"Create new Agent"}
-                    />
+                     <AgentDialog typeTrigger="empty"/>
                 )}
             </PageContent>
         </Page>
     );
-}
+}

app/(customer)/dashboard/(organization)/projects/[projectId]/edit/page.tsx

@@ -1,65 +0,0 @@
-import {notFound} from "next/navigation";
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectForm} from "@/components/wrappers/dashboard/projects/project-form/project-form";
-import * as drizzleDb from "@/db";
-
-import {db} from "@/db";
-import {eq} from "drizzle-orm";
-import {DatabaseWith} from "@/db/schema/07_database";
-
-export default async function RoutePage(props: PageParams<{ projectId: string }>) {
-    const {projectId} = await props.params;
-
-    const proj = await db.query.project.findFirst({
-        where: eq(drizzleDb.schemas.project.id, projectId),
-        with: {
-            databases: true,
-        },
-    });
-
-    if (!proj) {
-        notFound();
-    }
-
-
-    const org = await db.query.organization.findFirst({
-        where: eq(drizzleDb.schemas.organization.slug, "default"),
-    });
-
-    if (!org) {
-        notFound();
-    }
-
-    const availableDatabases = (
-        await db.query.database.findMany({
-            where: (db, {or, eq, isNull}) => or(isNull(db.projectId), eq(db.projectId, proj.id)),
-            with: {
-                agent: true,
-                project: true,
-                backups: true,
-                restorations: true,
-            },
-            orderBy: (db, {desc}) => [desc(db.createdAt)],
-        })
-    )
-        // .filter((db) => db.project !== null) as DatabaseWith[];
-
-
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Edit {proj.name}</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <ProjectForm
-                    organization={org}
-                    databases={availableDatabases as DatabaseWith[]}
-                    defaultValues={{...proj, databases: proj.databases.map((db) => db.id)}}
-                    projectId={proj.id}
-                />
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(organization)/projects/[projectId]/page.tsx

@@ -1,8 +1,5 @@
 import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
-import {buttonVariants} from "@/components/ui/button";
-import {GearIcon} from "@radix-ui/react-icons";
-import Link from "next/link";
+import {Page, PageContent, PageTitle} from "@/features/layout/page";
 import {
     ButtonDeleteProject
 } from "@/components/wrappers/dashboard/projects/button-delete-project/button-delete-project";
@@ -15,6 +12,10 @@ import {eq} from "drizzle-orm";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
 import * as drizzleDb from "@/db";
 import {capitalizeFirstLetter} from "@/utils/text";
+import {ProjectDialog} from "@/features/projects/components/project.dialog";
+import {DatabaseWith} from "@/db/schema/07_database";
+import {ProjectWith} from "@/db/schema/06_project";
+import {isUuidv4} from "@/utils/verify-uuid";
 
 
 export default async function RoutePage(props: PageParams<{
@@ -24,6 +25,10 @@ export default async function RoutePage(props: PageParams<{
         projectId
     } = await props.params;
 
+    if (!isUuidv4(projectId)) {
+        notFound()
+    }
+
     const organization = await getOrganization({});
     const activeMember = await getActiveMember()
 
@@ -51,6 +56,19 @@ export default async function RoutePage(props: PageParams<{
         redirect("/dashboard/projects");
     }
 
+    const availableDatabases = (
+        await db.query.database.findMany({
+            where: (db, {or, eq, isNull}) => or(isNull(db.projectId), eq(db.projectId, proj.id)),
+            with: {
+                agent: true,
+                project: true,
+                backups: true,
+                restorations: true,
+            },
+            orderBy: (db, {desc}) => [desc(db.createdAt)],
+        })
+    ) as DatabaseWith[];
+
     const isMember = activeMember?.role === "member";
 
     return (
@@ -63,10 +81,12 @@ export default async function RoutePage(props: PageParams<{
                     {!isMember && (
                         <div className="flex items-center gap-2 md:justify-between w-full ">
                             <div className="flex items-center gap-2">
-                                <Link className={buttonVariants({variant: "outline"})}
-                                      href={`/dashboard/projects/${proj.id}/edit`}>
-                                    <GearIcon className="w-7 h-7"/>
-                                </Link>
+                                <ProjectDialog
+                                    databases={availableDatabases}
+                                    organization={org}
+                                    project={proj as ProjectWith}
+                                    isEdit={true}
+                                />
                             </div>
                             <div className="flex items-center gap-2">
                                 <ButtonDeleteProject projectId={projectId} text={"Delete Project"}/>
@@ -95,4 +115,4 @@ export default async function RoutePage(props: PageParams<{
             </PageContent>
         </Page>
     );
-}
+}

app/(customer)/dashboard/(organization)/projects/new/page.tsx

@@ -1,50 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectForm} from "@/components/wrappers/dashboard/projects/project-form/project-form";
-import {notFound} from "next/navigation";
-import {db} from "@/db";
-import {eq} from "drizzle-orm";
-import {getOrganization} from "@/lib/auth/auth";
-import * as drizzleDb from "@/db";
-import {DatabaseWith} from "@/db/schema/07_database";
-
-
-export default async function RoutePage(props: PageParams<{}>) {
-
-    const organization = await getOrganization({});
-
-    if (!organization) {
-        notFound();
-    }
-
-    const availableDatabases = (
-        await db.query.database.findMany({
-            where: (db, {isNull}) => isNull(db.projectId),
-            with: {
-                agent: true,
-                project: true,
-                backups: true,
-                restorations: true,
-            },
-            orderBy: (db, {desc}) => [desc(db.createdAt)],
-        })
-    ).filter((db) => db.project == null) as DatabaseWith[];
-
-    const org = await db.query.organization.findFirst({
-        where: eq(drizzleDb.schemas.organization.slug, organization.slug),
-    });
-
-    if (!org) notFound();
-
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Create new project</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <ProjectForm databases={availableDatabases} organization={org}/>
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(organization)/projects/page.tsx

@@ -1,8 +1,5 @@
-import Link from "next/link";
-
 import {PageParams} from "@/types/next";
 import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {Button} from "@/components/ui/button";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {ProjectCard} from "@/components/wrappers/dashboard/projects/project-card/project-card";
 import {db} from "@/db";
@@ -10,6 +7,8 @@ import {notFound} from "next/navigation";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
 import {EmptyStatePlaceholder} from "@/components/wrappers/common/empty-state-placeholder";
 import {Metadata} from "next";
+import {ProjectDialog} from "@/features/projects/components/project.dialog";
+import {DatabaseWith} from "@/db/schema/07_database";
 
 export const metadata: Metadata = {
     title: "Projects",
@@ -36,6 +35,19 @@ export default async function RoutePage(props: PageParams<{}>) {
     });
     const isMember = activeMember?.role === "member";
 
+    const availableDatabases = (
+        await db.query.database.findMany({
+            where: (db, {isNull}) => isNull(db.projectId),
+            with: {
+                agent: true,
+                project: true,
+                backups: true,
+                restorations: true,
+            },
+            orderBy: (db, {desc}) => [desc(db.createdAt)],
+        })
+    ).filter((db) => db.project == null) as DatabaseWith[];
+
 
     return (
         <Page>
@@ -43,9 +55,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                 <PageTitle>Projects</PageTitle>
                 {(projects.length > 0 && !isMember) && (
                     <PageActions>
-                        <Link href={`/dashboard/projects/new`}>
-                            <Button>+ Create Project</Button>
-                        </Link>
+                        <ProjectDialog databases={availableDatabases} organization={organization}/>
                     </PageActions>
                 )}
             </PageHeader>
@@ -62,9 +72,9 @@ export default async function RoutePage(props: PageParams<{}>) {
                 ) : isMember ? (
                     <EmptyStatePlaceholder text="No project available"/>
                 ) : (
-                    <EmptyStatePlaceholder url="/dashboard/projects/new" text="Create new Project"/>
+                    <ProjectDialog databases={availableDatabases} organization={organization} isEmpty={true}/>
                 )}
             </PageContent>
         </Page>
     );
-}
+}

app/(customer)/dashboard/(organization)/settings/edit/page.tsx

@@ -1,37 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {notFound} from "next/navigation";
-import {OrganizationForm} from "@/components/wrappers/dashboard/organization/organization-form/organization-form";
-import {getOrganization} from "@/lib/auth/auth";
-import {db} from "@/db";
-import {isNull} from "drizzle-orm";
-import {currentUser} from "@/lib/auth/current-user";
-
-export default async function RoutePage(props: PageParams<{
-
-}>) {
-    const user = await currentUser();
-
-    const organization = await getOrganization({});
-
-    const users = await db.query.user.findMany({
-        where: (fields) => isNull(fields.deletedAt)
-    });
-
-    if (!user || !users || !organization || organization.slug == "default") {
-        notFound();
-    }
-
-    return(
-        <Page>
-            <PageHeader>
-                <PageTitle>
-                    Edit {organization.name}
-                </PageTitle>
-            </PageHeader>
-            <PageContent>
-                <OrganizationForm currentUser={user} users={users} defaultValues={organization}/>
-            </PageContent>
-        </Page>
-    )
-}

app/(customer)/dashboard/(organization)/settings/page.tsx

@@ -9,9 +9,13 @@ import {getOrganizationChannels} from "@/db/services/notification-channel";
 import {computeOrganizationPermissions} from "@/lib/acl/organization-acl";
 import {getOrganizationStorageChannels} from "@/db/services/storage-channel";
 import {DeleteOrganizationButton} from "@/components/wrappers/dashboard/organization/delete-organization-button";
-import {
-    EditButtonSettings
-} from "@/components/wrappers/dashboard/organization/settings/edit-button-settings/edit-button-settings";
+import {EditOrganizationDialog} from "@/features/organization/components/edit-organization.dialog";
+import {Button} from "@/components/ui/button";
+import {GearIcon} from "@radix-ui/react-icons";
+import {db} from "@/db";
+import {isNull} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {eq} from "drizzle-orm";
 
 export const metadata: Metadata = {
     title: "Settings",
@@ -22,7 +26,7 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
     const user = await currentUser();
     const activeMember = await getActiveMember()
 
-    if (!organization || !activeMember) {
+    if (!organization || !activeMember || !user) {
         notFound();
     }
 
@@ -30,6 +34,22 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
     const storageChannels = await getOrganizationStorageChannels(organization.id)
     const permissions = computeOrganizationPermissions(activeMember);
 
+    const users = await db.query.user.findMany({
+        where: (fields) => isNull(fields.deletedAt)
+    });
+
+    const organizationWithMembers = await db.query.organization.findFirst({
+        where: eq(drizzleDb.schemas.organization.id, organization.id),
+        with: {
+            members: {
+                with: {
+                    user: true
+                }
+            }
+        }
+    });
+
+    if (!organizationWithMembers) notFound();
 
     return (
         <Page>
@@ -41,7 +61,11 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
                         <div className="flex items-center gap-2 md:justify-between w-full ">
                             <div className="flex items-center gap-2">
                                 {permissions.canManageSettings && organization.slug !== "default" && (
-                                    <EditButtonSettings/>
+                                    <EditOrganizationDialog 
+                                        organization={organizationWithMembers} 
+                                        users={users} 
+                                        currentUser={user}
+                                    />
                                 )}
                             </div>
                             <div className="flex items-center gap-2">
@@ -62,4 +86,4 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
             </PageContent>
         </Page>
     )
-}
+}

app/api/agent/[agentId]/backup/route.ts

@@ -1,7 +1,6 @@
 import {NextResponse} from "next/server";
 import {isUuidv4} from "@/utils/verify-uuid";
 import {v4 as uuidv4} from "uuid";
-import {eventEmitter} from "../../../events/route";
 import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {Backup} from "@/db/schema/07_database";
@@ -10,6 +9,7 @@ import {withUpdatedAt} from "@/db/utils";
 import {decryptedDump, getFileExtension} from "./helpers";
 import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
 import {storeBackupFiles} from "@/features/storages/helpers";
+import {eventEmitter} from "@/features/shared/event";
 
 export async function POST(
     request: Request,
@@ -35,8 +35,6 @@ export async function POST(
         const method = formData.get("method") as string | null;
 
 
-
-
         if (!generatedId || !isUuidv4(generatedId)) {
             return NextResponse.json(
                 {error: "generatedId is not a valid UUID"},
@@ -116,7 +114,6 @@ export async function POST(
             }
 
 
-
             if (!file) {
                 return NextResponse.json(
                     {error: "File is required for successful backup"},
@@ -132,9 +129,6 @@ export async function POST(
             const buffer = Buffer.from(await decryptedFile.arrayBuffer());
 
 
-            console.log(extension)
-
-
             const storageResults = await storeBackupFiles(backup, database, buffer, fileName)
             eventEmitter.emit('modification', {update: true});
 
@@ -173,4 +167,3 @@ export async function POST(
         );
     }
 }
-

app/api/agent/[agentId]/restore/route.ts

@@ -1,10 +1,10 @@
 import {NextResponse} from "next/server";
 import {isUuidv4} from "@/utils/verify-uuid";
-import {eventEmitter} from "../../../events/route";
 import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {and, eq} from "drizzle-orm";
 import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
+import {eventEmitter} from "@/features/shared/event";
 
 export type BodyResultRestore = {
     generatedId: string

app/api/agent/[agentId]/status/route.ts

@@ -1,12 +1,12 @@
 import {NextResponse} from "next/server";
 import {handleDatabases} from "./helpers";
-import {eventEmitter} from "../../../events/route";
 import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {EDbmsSchema} from "@/db/schema/types";
 import {eq} from "drizzle-orm";
 import {isUuidv4} from "@/utils/verify-uuid";
 import {withUpdatedAt} from "@/db/utils";
+import {eventEmitter} from "@/features/shared/event";
 
 export type databaseAgent = {
     name: string,

app/api/events/route.ts

@@ -2,8 +2,9 @@ import {EventEmitter} from 'events';
 import {auth} from "@/lib/auth/auth";
 import {headers} from "next/headers";
 import {NextResponse} from "next/server";
+import {eventEmitter} from "@/features/shared/event";
 
-export const eventEmitter = new EventEmitter();
+// export const eventEmitter = new EventEmitter();
 
 export async function GET(request: Request) {
 

app/api/files/backups/route.ts

@@ -35,10 +35,9 @@ export async function GET(
     const result = await dispatchStorage(input, undefined, storageId);
 
     if (!result.success) {
-        return NextResponse.json({error: "Enable to get file from privided storage channel, an error occurred !"})
+        return NextResponse.json({error: "Enable to get file from provided storage channel, an error occurred !"})
     }
 
-
     const fileName = path.basename(pathFromUrl);
 
     const crypto = require('crypto');
@@ -58,14 +57,14 @@ export async function GET(
         );
     }
 
-    if (!result.file || !Buffer.isBuffer(result.file)) {
+    if (!result.file || !(result.file instanceof Readable)) {
         return NextResponse.json(
             {error: "Invalid file payload"},
             {status: 500}
         );
     }
 
-    const fileStream = Readable.from(result.file);
+    const fileStream = Readable.from(result.file as Readable);
 
     const stream = new ReadableStream({
         start(controller) {

app/api/files/images/[fileName]/route.ts

@@ -26,20 +26,6 @@ export async function GET(
         return NextResponse.json({error: "Missing storageId in search params"}, {status: 404})
     }
 
-
-
-    // const settings = await db.query.setting.findFirst({
-    //     where: eq(drizzleDb.schemas.setting.name, "system"),
-    //     with: {
-    //         storageChannel: true
-    //     }
-    // });
-    //
-    // if (!settings || !settings.storageChannel) {
-    //     return NextResponse.json({error: "Unable to get settings or no default storage channel"});
-    // }
-
-
     const ext = fileName.split(".").pop()?.toLowerCase();
     const contentType =
         ext === "png"
@@ -69,7 +55,7 @@ export async function GET(
 
         const result = await dispatchStorage(input, undefined, storageId);
 
-        if (!result.file || !Buffer.isBuffer(result.file)) {
+        if (!result.file || !(result.file instanceof Readable)) {
             console.error(`An error occurred while getting file :`, result);
             return NextResponse.json(
                 {error: "Invalid file payload"},
@@ -77,7 +63,7 @@ export async function GET(
             );
         }
 
-        const fileStream = Readable.from(result.file);
+        const fileStream = Readable.from(result.file as Readable);
 
         const stream = new ReadableStream({
             start(controller) {

docker-compose.prod.yml

@@ -3,11 +3,11 @@ name: portabase-prod
 services:
 
   app:
-#    build:
-#      context: .
-#      dockerfile: docker/dockerfile/Dockerfile
-#      target: prod
-    image: solucetechnologies/portabase:latest
+    build:
+      context: .
+      dockerfile: docker/dockerfile/Dockerfile
+      target: prod
+#    image: solucetechnologies/portabase:latest
     ports:
       - '8887:80'
     environment:

docker/dockerfile/Dockerfile

@@ -62,7 +62,6 @@ RUN pnpm run build
 
 
 
-
 FROM base AS prod
 
 WORKDIR /app
@@ -70,6 +69,9 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
 
+RUN corepack enable && corepack prepare pnpm@latest --activate
+
+
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
@@ -81,14 +83,18 @@ RUN mkdir -p /app/private/uploads
 RUN chown -R nextjs:nodejs /app/private
 RUN chown -R nextjs:nodejs /app/public
 
-
 COPY --from=builder /app/next.config.ts ./
+COPY --from=builder /app/server ./server
+COPY --from=builder /app/src ./src
+
 COPY --from=builder /app/portabase.config.ts ./
 COPY --from=builder /app/drizzle.config.ts ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 COPY --chown=nextjs:nodejs src/db ./src/db
 
+COPY --from=deps /app/node_modules ./node_modules
+
 USER root
 
 COPY ./docker/entrypoints/app-prod-entrypoint.sh /app/app-prod-entrypoint.sh

docker/entrypoints/app-prod-entrypoint.sh

@@ -7,8 +7,8 @@ else
     echo "[WARN] No TZ provided, using default container timezone"
 fi
 
-
-node server.js
+pnpm run start
+#node server.js
 
 exec "$@"
 

next.config.ts

@@ -46,7 +46,6 @@ const nextConfig: NextConfig = {
             bodySizeLimit: "10gb",
         },
         proxyClientMaxBodySize: '10gb',
-
     },
     async headers() {
         return [

package.json

@@ -1,11 +1,12 @@
 {
   "name": "portabase",
-  "version": "1.2.4-rc.1",
+  "version": "1.2.5-rc.6",
   "private": true,
   "scripts": {
-    "dev": "next dev --turbopack -p 8887",
+    "dev": "NODE_ENV=development tsx watch server/server.ts",
     "build": "next build --experimental-build-mode compile",
-    "start": "next start",
+    "start": "NODE_ENV=production tsx server/server.ts",
+
     "lint": "next lint",
     "email": "email dev --dir ./src/components/emails",
     "db:generate": "drizzle-kit generate",
@@ -47,6 +48,7 @@
     "@t3-oss/env-nextjs": "^0.13.4",
     "@tanstack/react-query": "^5.76.1",
     "@tanstack/react-table": "^8.21.3",
+    "@types/express": "^5.0.6",
     "@types/nodemailer": "^6.4.17",
     "@types/ws": "^8.18.1",
     "@zenstackhq/runtime": "2.14.2",
@@ -62,12 +64,13 @@
     "drizzle-orm": "^0.43.1",
     "drizzle-zod": "^0.7.1",
     "embla-carousel-react": "^8.6.0",
+    "express": "^5.2.1",
     "googleapis": "^170.1.0",
     "input-otp": "^1.4.2",
     "lucide-react": "^0.553.0",
     "minio": "^8.0.5",
     "motion": "^12.23.24",
-    "next": "16.0.10",
+    "next": "16.1.5",
     "next-safe-action": "^7.10.8",
     "next-themes": "^0.4.6",
     "node-cron": "^4.2.1",
@@ -111,8 +114,9 @@
     "@types/react-dom": "^19.1.5",
     "@zenstackhq/openapi": "^2.14.2",
     "@zenstackhq/tanstack-query": "^2.14.2",
-    "baseline-browser-mapping": "^2.8.32",
+    "baseline-browser-mapping": "^2.9.19",
     "drizzle-kit": "^0.31.1",
+    "esbuild": "^0.27.2",
     "eslint": "^9.39.0",
     "eslint-config-next": "^16.0.1",
     "eslint-plugin-tailwindcss": "^3.18.0",

server/api.ts

@@ -0,0 +1,6 @@
+import express from "express";
+import router from "../src/features/api/router";
+
+export function mountApi(app: express.Express) {
+    app.use("/services/v1", router);
+}

server/server.ts

@@ -0,0 +1,42 @@
+import next from "next";
+import express from "express";
+import {mountApi} from "./api";
+
+const port = Number(process.env.PORT) || 8887;
+const dev = process.env.NODE_ENV !== "production";
+
+async function start() {
+    const nextApp = next({
+        dev,
+        hostname: "0.0.0.0",
+        turbopack: dev,
+        port
+    });
+
+    const handle = nextApp.getRequestHandler();
+
+    await nextApp.prepare();
+
+    const server = express();
+
+    mountApi(server);
+
+    server.use((req, res, next) => {
+        if (req.path.startsWith('/services/v1')) return next();
+        handle(req, res).catch((err) => {
+            console.error('Next.js App Router error:', err);
+            res.status(500).send('Internal Server Error');
+        });
+    });
+
+    server.listen(port, "0.0.0.0", () => {
+        console.log(
+            `NEXT APP → http://localhost:${port}`
+        );
+        console.log(
+            `API → http://localhost:${port}/services/v1`
+        );
+    });
+}
+
+start();

src/components/ui/dialog.tsx

@@ -58,7 +58,7 @@ function DialogContent({
             data-slot="dialog-content"
             className={cn(
                 "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",
-                "max-h-[90vh] overflow-y-auto",
+                "max-h-[90vh] overflow-y-auto overflow-x-hidden",
                 className
             )}
             {...props}

src/components/wrappers/common/empty-state-placeholder.tsx

@@ -1,20 +1,22 @@
 import Link from "next/link";
 import {cn} from "@/lib/utils";
 import {Plus} from "lucide-react";
+import {forwardRef, HTMLAttributes} from "react";
 
 type EmptyStatePlaceholderProps = {
     url?: string;
     onClick?: () => void;
     text: string;
     className?: string;
-};
+} & HTMLAttributes<HTMLDivElement>;
 
-export const EmptyStatePlaceholder = ({
+export const EmptyStatePlaceholder = forwardRef<HTMLDivElement, EmptyStatePlaceholderProps>(({
                                           url,
                                           onClick,
                                           text,
                                           className,
-                                      }: EmptyStatePlaceholderProps) => {
+                                          ...props
+                                      }, ref) => {
     const Container = (
         <div
             className={cn(
@@ -37,5 +39,7 @@ export const EmptyStatePlaceholder = ({
         );
     }
 
-    return <div className={cn(className)}>{Container}</div>;
-};
+    return <div className={cn(className)} ref={ref} {...props}>{Container}</div>;
+});
+
+EmptyStatePlaceholder.displayName = "EmptyStatePlaceholder";

src/components/wrappers/common/multiselect/multi-select.tsx

@@ -15,7 +15,7 @@ import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, Command
  * Variants for the multi-select component to handle different styles.
  * Uses class-variance-authority (cva) to define different styles based on "variant" prop.
  */
-const multiSelectVariants = cva("m-1 transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-110 duration-300", {
+const multiSelectVariants = cva("m-1 transition ease-in-out duration-300", {
     variants: {
         variant: {
             default: "border-foreground/10 text-foreground bg-card hover:bg-card/80",
@@ -177,13 +177,13 @@ export const MultiSelect = React.forwardRef<HTMLButtonElement, MultiSelectProps>
                                         return (
                                             <Badge
                                                 key={value}
-                                                className={cn(isAnimating ? "animate-bounce" : "", multiSelectVariants({ variant }))}
+                                                className={cn(isAnimating ? "animate-bounce" : "", "max-w-full", multiSelectVariants({ variant }))}
                                                 style={{ animationDuration: `${animation}s` }}
                                             >
                                                 {IconComponent && <IconComponent className="h-4 w-4 mr-2" />}
-                                                {option?.label}
+                                                <span className="truncate">{option?.label}</span>
                                                 <XCircle
-                                                    className="ml-2 h-4 w-4 cursor-pointer"
+                                                    className="ml-2 h-4 w-4 cursor-pointer shrink-0"
                                                     onClick={(event) => {
                                                         event.stopPropagation();
                                                         toggleOption(value);
@@ -196,6 +196,7 @@ export const MultiSelect = React.forwardRef<HTMLButtonElement, MultiSelectProps>
                                         <Badge
                                             className={cn(
                                                 "bg-transparent text-foreground border-foreground/1 hover:bg-transparent",
+                                                "max-w-full",
                                                 isAnimating ? "animate-bounce" : "",
                                                 multiSelectVariants({ variant })
                                             )}
@@ -203,7 +204,7 @@ export const MultiSelect = React.forwardRef<HTMLButtonElement, MultiSelectProps>
                                         >
                                             {`+ ${selectedValues.length - maxCount} more`}
                                             <XCircle
-                                                className="ml-2 h-4 w-4 cursor-pointer"
+                                                className="ml-2 h-4 w-4 cursor-pointer shrink-0"
                                                 onClick={(event) => {
                                                     event.stopPropagation();
                                                     clearExtraOptions();

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/forms/ntfy.form.tsx

@@ -3,7 +3,6 @@ import {FormControl, FormField, FormItem, FormLabel, FormMessage} from "@/compon
 import {Input} from "@/components/ui/input";
 import {Separator} from "@/components/ui/separator";
 
-
 type NotifierNtfyFormProps = {
     form: UseFormReturn<any, any, any>
 }
@@ -12,6 +11,7 @@ export const NotifierNtfyForm = ({form}: NotifierNtfyFormProps) => {
     return (
         <>
             <Separator className="my-1"/>
+
             <FormField
                 control={form.control}
                 name="config.ntfyTopic"
@@ -25,6 +25,7 @@ export const NotifierNtfyForm = ({form}: NotifierNtfyFormProps) => {
                     </FormItem>
                 )}
             />
+
             <FormField
                 control={form.control}
                 name="config.ntfyServerUrl"
@@ -39,6 +40,7 @@ export const NotifierNtfyForm = ({form}: NotifierNtfyFormProps) => {
                     </FormItem>
                 )}
             />
+
             <FormField
                 control={form.control}
                 name="config.ntfyToken"
@@ -53,6 +55,36 @@ export const NotifierNtfyForm = ({form}: NotifierNtfyFormProps) => {
                     </FormItem>
                 )}
             />
+
+            <Separator className="my-1"/>
+
+            <FormField
+                control={form.control}
+                name="config.ntfyUsername"
+                render={({field}) => (
+                    <FormItem>
+                        <FormLabel>Basic Auth Username (Optional)</FormLabel>
+                        <FormControl>
+                            <Input {...field} placeholder="username"/>
+                        </FormControl>
+                        <FormMessage/>
+                    </FormItem>
+                )}
+            />
+
+            <FormField
+                control={form.control}
+                name="config.ntfyPassword"
+                render={({field}) => (
+                    <FormItem>
+                        <FormLabel>Basic Auth Password (Optional)</FormLabel>
+                        <FormControl>
+                            <Input {...field} type="password" placeholder="password"/>
+                        </FormControl>
+                        <FormMessage/>
+                    </FormItem>
+                )}
+            />
         </>
     )
 }

src/components/wrappers/dashboard/admin/organizations/organization/button-delete-organization.tsx

@@ -6,7 +6,7 @@ import {Trash2} from "lucide-react";
 import {toast} from "sonner";
 import {ButtonWithConfirm} from "@/components/wrappers/common/button/button-with-confirm";
 import {authClient} from "@/lib/auth/auth-client";
-import {deleteOrganizationAction} from "@/components/wrappers/dashboard/organization/organization.action";
+import {deleteOrganizationAction} from "@/features/organization/organization.action";
 
 export type ButtonDeleteFleetProps = {
     text?: string;

src/components/wrappers/dashboard/admin/organizations/organization/details/update-organization-form.tsx

@@ -13,7 +13,7 @@ import {Input} from "@/components/ui/input";
 import {authClient} from "@/lib/auth/auth-client";
 import {toast} from "sonner";
 import {OrganizationWithMembersAndUsers} from "@/db/schema/03_organization";
-import {updateOrganizationAction} from "@/components/wrappers/dashboard/organization/organization.action";
+import {updateOrganizationAction} from "@/features/organization/organization.action";
 
 type UpdateOrganizationFormProps = {
     onSuccessAction?: () => void;

src/components/wrappers/dashboard/admin/settings/settings-tabs.tsx

@@ -7,6 +7,7 @@ import {Setting} from "@/db/schema/01_setting";
 import {SettingsEmailSection} from "@/components/wrappers/dashboard/admin/settings/email/settings-email-section";
 import {SettingsStorageSection} from "@/components/wrappers/dashboard/admin/settings/storage/settings-storage-section";
 import {StorageChannelWith} from "@/db/schema/12_storage-channel";
+import {MailboxIcon, Save} from "lucide-react";
 
 export type SettingsTabsProps = {
     settings: Setting
@@ -30,29 +31,44 @@ export const SettingsTabs = ({settings, storageChannels}: SettingsTabsProps) =>
     };
 
 
+    const tabs = [
+        {
+            name: 'System Email',
+            value: 'email',
+            icon: MailboxIcon,
+            content: (
+                <SettingsEmailSection settings={settings}/>
+            )
+        },
+        {
+            name: 'Default Storage',
+            value: 'storage',
+            icon: Save,
+            content: (
+                <SettingsStorageSection storageChannels={storageChannels} settings={settings}/>
+
+            )
+        }
+    ]
+
+
     return (
         <div className="h-full mt-3">
-            <Tabs className="h-full" value={tab} onValueChange={handleChangeTab}>
-                <TabsList className='bg-background rounded-none border-b p-0 min-w-48'>
-                    <TabsTrigger
-                        value="email"
-                        className='bg-background data-[state=active]:border-primary dark:data-[state=active]:border-primary h-full rounded-none border-0 border-b-2 border-transparent data-[state=active]:shadow-none'
-                    >
-                        Email
-                    </TabsTrigger>
-                    <TabsTrigger
-                        value="storage"
-                        className='bg-background data-[state=active]:border-primary dark:data-[state=active]:border-primary h-full rounded-none border-0 border-b-2 border-transparent data-[state=active]:shadow-none'
-                    >
-                        Default storage
-                    </TabsTrigger>
+            <Tabs className="h-full gap-4" value={tab} onValueChange={handleChangeTab}>
+                <TabsList>
+                    {tabs.map(({icon: Icon, name, value}) => (
+                        <TabsTrigger key={value} value={value} className='flex items-center gap-1 px-2.5 sm:px-3'>
+                            <Icon/>
+                            {name}
+                        </TabsTrigger>
+                    ))}
                 </TabsList>
-                <TabsContent className="h-full" value="email">
-                    <SettingsEmailSection settings={settings}/>
-                </TabsContent>
-                <TabsContent className="h-full" value="storage">
-                    <SettingsStorageSection storageChannels={storageChannels} settings={settings}/>
-                </TabsContent>
+
+                {tabs.map(tab => (
+                    <TabsContent key={tab.value} value={tab.value} className="h-full">
+                        {tab.content}
+                    </TabsContent>
+                ))}
             </Tabs>
         </div>
 

src/components/wrappers/dashboard/admin/settings/storage/settings-storage-section.tsx

@@ -64,15 +64,15 @@ export const SettingsStorageSection = ({settings, storageChannels}: SettingsStor
                         await mutation.mutateAsync(values);
                     }}
                 >
-                    <div className="flex items-center gap-3">
+                    <div className="flex flex-wrap items-center gap-3">
                         <FormField
                             control={form.control}
                             name="storageChannelId"
-                            render={({field}) => (
-                                <FormItem className="flex items-center  justify-center">
+                            render={({ field }) => (
+                                <FormItem className="flex-grow min-w-[200px] sm:flex-grow-0 sm:w-64">
                                     <Select value={field.value} onValueChange={field.onChange}>
-                                        <SelectTrigger className="w-90 h-full  mb-0">
-                                            <SelectValue placeholder="Select a default storage channel"/>
+                                        <SelectTrigger className="w-full h-full mb-0">
+                                            <SelectValue placeholder="Select a default storage channel" />
                                         </SelectTrigger>
                                         <SelectContent>
                                             {storageChannels.map((channel) => (
@@ -80,10 +80,9 @@ export const SettingsStorageSection = ({settings, storageChannels}: SettingsStor
                                                     <div className="flex items-center gap-2">
                                                         {getChannelIcon(channel.provider)}
                                                         <span className="font-medium">{channel.name}</span>
-                                                        <span
-                                                            className="text-[9px] uppercase bg-secondary px-1.5 py-0.5 rounded">
-                                                            {channel.provider}
-                                                        </span>
+                                                        <span className="text-[9px] uppercase bg-secondary px-1.5 py-0.5 rounded">
+                    {channel.provider}
+                  </span>
                                                     </div>
                                                 </SelectItem>
                                             ))}
@@ -92,10 +91,11 @@ export const SettingsStorageSection = ({settings, storageChannels}: SettingsStor
                                 </FormItem>
                             )}
                         />
-                        <ButtonWithLoading type="submit">
+                        <ButtonWithLoading className="flex-shrink-0 w-full sm:w-auto" type="submit">
                             Confirm
                         </ButtonWithLoading>
                     </div>
+
                 </Form>
             </div>
         </div>

src/components/wrappers/dashboard/common/logged-in/logged-in-button.server.tsx

@@ -3,6 +3,7 @@ import {getAccounts, getSession, getSessions} from "@/lib/auth/auth";
 import {LoggedInButtonClient} from "./logged-in-button";
 import {SUPPORTED_PROVIDERS} from "../../../../../../portabase.config";
 
+
 export const LoggedInButton = async () => {
     const user = await currentUser();
     const sessions = await getSessions();
@@ -16,7 +17,7 @@ export const LoggedInButton = async () => {
         <LoggedInButtonClient
             user={user}
             sessions={sessions}
-             // @ts-ignore
+            // @ts-ignore
             currentSession={currentSession.session}
             accounts={accounts}
             providers={SUPPORTED_PROVIDERS.filter((p) => p.isActive)}

src/components/wrappers/dashboard/common/logged-in/logged-in-button.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import {ChevronsUpDown, ChevronUp} from "lucide-react";
+import {ChevronsUpDown} from "lucide-react";
 import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar";
 import {SidebarMenuButton} from "@/components/ui/sidebar";
 import {LoggedInDropdown} from "./logged-in-dropdown";
@@ -15,6 +15,7 @@ type LoggedInButtonClientProps = {
     providers: AuthProviderConfig[]
 }
 
+
 export const LoggedInButtonClient = ({
                                          user,
                                          sessions,
@@ -35,14 +36,15 @@ export const LoggedInButtonClient = ({
             accounts={accounts}
             providers={providers}
         >
-            <SidebarMenuButton type="button" className="h-auto  justify-between py-2" >
+            <SidebarMenuButton type="button" className="h-auto  justify-between py-2">
                 <div className="flex items-center gap-2">
                     <Avatar className="size-6">
                         <AvatarFallback>{user.name[0].toUpperCase()}</AvatarFallback>
                         {user.image && <AvatarImage src={user.image}/>}
                     </Avatar>
                     <div className="flex flex-col items-start">
-                        <span className="text-sm font-medium first-letter:capitalize max-w-[170px] truncate">{user.name}</span>
+                        <span
+                            className="text-sm font-medium first-letter:capitalize max-w-[170px] truncate">{user.name}</span>
                         <span
                             className="text-xs text-muted-foreground max-w-[170px] truncate"
                             title={user.email}

src/components/wrappers/dashboard/common/sidebar/app-sidebar.tsx

@@ -11,6 +11,7 @@ import {SideBarFooterCredit} from "@/components/wrappers/dashboard/common/sideba
 import {OrganizationCombobox} from "@/components/wrappers/dashboard/organization/organization-combobox";
 import {env} from "@/env.mjs";
 import {LoggedInButton} from "@/components/wrappers/dashboard/common/logged-in/logged-in-button.server";
+import {UpdateNotification} from "@/features/updates/components/update-notification";
 
 export function AppSidebar() {
     const projectName = env.PROJECT_NAME;
@@ -31,6 +32,8 @@ export function AppSidebar() {
                 <SidebarMenuCustomMain/>
             </SidebarContent>
 
+            <UpdateNotification />
+            
             <SidebarMenu className="mb-2">
                 <SidebarMenuItem className="p-2">
                     <LoggedInButton/>

src/components/wrappers/dashboard/database/backup/actions/backup-actions-form.tsx

@@ -75,7 +75,7 @@ export const BackupActionsForm = ({backup, action}: BackupActionsFormProps) => {
             if (inner?.success) {
                 toast.success(inner.actionSuccess?.message);
                 if (action === "download") {
-                    console.log(inner.value)
+
                     const url = inner.value
                     if (typeof url === "string") {
                         window.open(url, "_self");

src/components/wrappers/dashboard/database/backup/actions/backup-actions.action.ts

@@ -57,7 +57,7 @@ export const downloadBackupAction = userAction.schema(
             }
         };
 
-        console.log(input)
+
 
         const result = await dispatchStorage(input, undefined, backupStorage.storageChannelId);
         console.log(result);

src/components/wrappers/dashboard/database/channels-policy/policy-form.tsx

@@ -106,8 +106,7 @@ export const ChannelPoliciesForm = ({
             });
 
 
-            console.log(policiesToUpdate);
-            console.log(policiesToAdd);
+
 
             const promises = kind === "notification"
                 ? [

src/components/wrappers/dashboard/organization/create-organisation-modal.tsx

@@ -6,8 +6,8 @@ import {Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle} from "@/
 import {Button} from "@/components/ui/button";
 import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage, useZodForm} from "@/components/ui/form";
 import {Input} from "@/components/ui/input";
-import {OrganizationSchema} from "@/components/wrappers/dashboard/organization/organization.schema";
-import {createOrganizationAction} from "@/components/wrappers/dashboard/organization/organization.action";
+import {CreateOrganizationSchema, CreateOrganizationType} from "@/features/organization/organization.schema";
+import {createOrganizationAction} from "@/features/organization/organization.action";
 import {useRouter} from "next/navigation";
 import {useState} from "react";
 import {authClient} from "@/lib/auth/auth-client";
@@ -32,12 +32,12 @@ export function CreateOrganizationModal({
     const router = useRouter();
 
     const form = useZodForm({
-        schema: OrganizationSchema,
+        schema: CreateOrganizationSchema,
     });
 
 
     const mutation = useMutation({
-        mutationFn: async (values: OrganizationSchema) => {
+        mutationFn: async (values: CreateOrganizationType) => {
 
             const result = await createOrganizationAction(values);
 

src/components/wrappers/dashboard/organization/delete-organization-button.tsx

@@ -1,6 +1,6 @@
 "use client";
 import {ButtonWithConfirm} from "@/components/wrappers/common/button/button-with-confirm";
-import {deleteOrganizationAction} from "@/components/wrappers/dashboard/organization/organization.action";
+import {deleteOrganizationAction} from "@/features/organization/organization.action";
 import {useMutation} from "@tanstack/react-query";
 import {useRouter} from "next/navigation";
 import {toast} from "sonner";

src/components/wrappers/dashboard/organization/organization-combobox.tsx

@@ -1,29 +1,39 @@
 "use client"
-import {ComboBox} from "@/components/wrappers/common/combobox";
-import {useSidebar} from "@/components/ui/sidebar";
-import {useRouter} from "next/navigation";
-import {authClient} from "@/lib/auth/auth-client";
-import {CreateOrganizationModal} from "@/components/wrappers/dashboard/organization/create-organisation-modal";
-import {useState} from "react";
+
+import * as React from "react"
+import {Building2, Check, ChevronsUpDown, Plus} from "lucide-react"
+import {useRouter} from "next/navigation"
+import {authClient} from "@/lib/auth/auth-client"
+import {cn} from "@/lib/utils"
+
+import {
+    DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import {
+    SidebarMenuButton, useSidebar,
+} from "@/components/ui/sidebar"
+import {CreateOrganizationModal} from "@/components/wrappers/dashboard/organization/create-organisation-modal"
+import {Skeleton} from "@/components/ui/skeleton"
+
 
 export function OrganizationCombobox() {
-    const router = useRouter();
-    const {state} = useSidebar();
-    const {data: organizations, refetch} = authClient.useListOrganizations();
-    const {data: activeOrganization, refetch: refetchActiveOrga} = authClient.useActiveOrganization();
-    const [openModal, setOpenModal] = useState(false);
+    const router = useRouter()
+    const {isMobile, state} = useSidebar()
+    const {data: organizations, isPending: isPendingList, refetch} = authClient.useListOrganizations()
+    const {
+        data: activeOrganization,
+        isPending: isPendingActive,
+        refetch: refetchActiveOrga
+    } = authClient.useActiveOrganization()
+    const [openModal, setOpenModal] = React.useState(false)
+    const [isOpen, setIsOpen] = React.useState(false)
 
-    // if (!organizations) return null;
-
-    // const values = organizations.map(org => ({ value: org.slug, label: org.name }));
-    const values = organizations?.map(org => ({ value: org.slug, label: org.name })) ?? [];
-
-
-
-    const onValueChange = async (slug: string) => {
-        await authClient.organization.setActive({ organizationSlug: slug });
-        router.refresh();
-    };
+    const handleSelect = async (slug: string) => {
+        if (activeOrganization?.slug === slug) return
+        await authClient.organization.setActive({organizationSlug: slug})
+        router.refresh()
+        setIsOpen(false)
+    }
 
     const handleReload = () => {
         refetch();
@@ -31,6 +41,22 @@ export function OrganizationCombobox() {
         router.refresh();
     };
 
+    const orgs = organizations || []
+
+    if (isPendingList || isPendingActive) {
+        return (
+            <SidebarMenuButton size="lg" className="pointer-events-none">
+                <Skeleton className="size-8 rounded-lg shrink-0"/>
+                <div className="flex flex-col gap-1.5 flex-1 overflow-hidden">
+                    <Skeleton className="h-4 w-24"/>
+                    <Skeleton className="h-3 w-16"/>
+                </div>
+                <Skeleton className="size-4 shrink-0"/>
+            </SidebarMenuButton>
+        )
+    }
+
+
     return (
         <>
             <CreateOrganizationModal
@@ -38,16 +64,96 @@ export function OrganizationCombobox() {
                 onSuccess={handleReload}
                 onOpenChange={setOpenModal}
             />
-            {state === "expanded" && (
-                <ComboBox
-                    sideBar
-                    values={values}
-                    defaultValue={activeOrganization?.slug}
-                    onValueChangeAction={onValueChange}
-                    onAddItemAction={() => setOpenModal(true)}
-                    addItemLabel="Create new organization"
-                />
-            )}
+            <DropdownMenu open={isOpen} onOpenChange={setIsOpen}>
+                <DropdownMenuTrigger asChild>
+                    <SidebarMenuButton
+                        size="lg"
+                        className={cn(
+                            "data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground transition-all duration-200 ease-in-out",
+                            state === "collapsed" && "justify-center p-0"
+                        )}
+                    >
+                        <div className={cn(
+                            "flex aspect-square size-8 items-center justify-center rounded-lg text-white shadow-sm transition-transform duration-200",
+                            activeOrganization?.logo ? "bg-transparent" : "bg-orange-500",
+                            isOpen && "scale-105"
+                        )}>
+                            {activeOrganization?.logo ? (
+                                <img src={activeOrganization.logo} alt={activeOrganization.name}
+                                     className="size-8 rounded-lg object-cover"/>
+                            ) : (
+                                <Building2 className="size-5"/>
+                            )}
+                        </div>
+                        <div
+                            className="grid flex-1 text-left text-sm leading-tight group-data-[collapsible=icon]:hidden">
+                                <span className="truncate font-semibold tracking-tight">
+                                    {activeOrganization?.name || "Select Organization"}
+                                </span>
+                        </div>
+                        <ChevronsUpDown className="ml-auto size-4 opacity-50 group-data-[collapsible=icon]:hidden"/>
+                    </SidebarMenuButton>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent
+                    className="min-w-[var(--radix-popper-anchor-width)] rounded-xl border-2 border-border bg-popover shadow-none"
+                    align="start"
+                    side="bottom"
+                    sideOffset={4}
+                >
+                    {orgs.map((org) => {
+                        const isActive = activeOrganization?.id === org.id;
+                        return (
+                            <DropdownMenuItem
+                                key={org.id}
+                                onClick={() => handleSelect(org.slug)}
+                                className={cn(
+                                    "group gap-2 p-1 cursor-pointer rounded-lg mb-1 last:mb-0 transition-colors",
+                                    isActive
+                                        ? "bg-orange-500/10 text-orange-600 dark:text-orange-400 border border-orange-500/20"
+                                        : "focus:bg-accent hover:bg-accent/50 border border-transparent"
+                                )}>
+                                <div className={cn(
+                                    "flex size-9 items-center justify-center rounded-md border shadow-sm transition-all group-hover:shadow-md",
+                                    org.logo ? "bg-transparent border-transparent" : "",
+                                    isActive && !org.logo ? "bg-orange-500 text-white border-orange-500/30" : "bg-muted/50 border-border"
+                                )}>
+                                    {org.logo ? (
+                                        <img src={org.logo} alt={org.name} className="size-9 rounded-md object-cover"/>
+                                    ) : (
+                                        <Building2 className={cn(
+                                            "size-5",
+                                            isActive ? "text-white" : "text-muted-foreground"
+                                        )}/>
+                                    )}
+                                </div>
+                                <div className="flex flex-col gap-0.5">
+                                    <span className={cn(
+                                        "text-sm max-w-42.5 truncate font-medium leading-none",
+                                        isActive ? "text-orange-600 dark:text-orange-400" : ""
+                                    )}>{org.name}</span>
+                                </div>
+                                {isActive && (
+                                    <div
+                                        className="ml-auto flex size-5 items-center justify-center rounded-full bg-orange-500 shadow-sm">
+                                        <Check className="size-3 text-white" strokeWidth={3}/>
+                                    </div>
+                                )}
+                            </DropdownMenuItem>
+                        )
+                    })}
+                    <DropdownMenuSeparator className="my-2 bg-border/50"/>
+                    <DropdownMenuItem
+                        className="gap-3 p-2.5 cursor-pointer text-muted-foreground focus:text-foreground group rounded-lg"
+                        onClick={() => setOpenModal(true)}
+                    >
+                        <div
+                            className="flex size-9 items-center justify-center rounded-md border border-dashed border-muted-foreground/30 bg-background transition-colors group-hover:border-primary/50 group-hover:bg-primary/5">
+                            <Plus className="size-4"/>
+                        </div>
+                        <div className="font-medium">Create new organization</div>
+                    </DropdownMenuItem>
+                </DropdownMenuContent>
+            </DropdownMenu>
         </>
-    );
-}
+    )
+}

src/components/wrappers/dashboard/organization/organization-form/organization-form.schema.ts

@@ -1,14 +0,0 @@
-import {z} from "zod";
-
-
-export const OrganizationFormSchema = z.object({
-    name: z.string().min(5, 'Name must be at least 5 characters long').max(40, 'Name must be at most 40 characters long'),
-    slug: z.string()
-        .regex(/^[a-zA-Z0-9_-]*$/, 'Slug can only contain letters, numbers, underscores, and hyphens')
-        .min(5, 'Slug must be at least 5 characters long')
-        .max(20, 'Slug must be at most 20 characters long'),
-    users: z.array(z.string()),
-
-});
-
-export type OrganizationFormType = z.infer<typeof OrganizationFormSchema>;

src/components/wrappers/dashboard/organization/organization.schema.ts

@@ -1,12 +0,0 @@
-import { z } from "zod";
-
-export const OrganizationSchema = z.object({
-    name: z.string().min(5, "Name must be at least 5 characters long").max(40, "Name must be at most 40 characters long"),
-    // slug: z
-    //     .string()
-    //     .regex(/^[a-zA-Z0-9_-]*$/, "Slug can only contain letters, numbers, underscores, and hyphens")
-    //     .min(5, "Slug must be at least 5 characters long")
-    //     .max(20, "Slug must be at most 20 characters long"),
-});
-
-export type OrganizationSchema = z.infer<typeof OrganizationSchema>;

src/components/wrappers/dashboard/organization/settings/edit-button-settings/edit-button-settings.tsx

@@ -1,20 +0,0 @@
-"use client"
-import {buttonVariants} from "@/components/ui/button";
-import {GearIcon} from "@radix-ui/react-icons";
-import Link from "next/link";
-import {usePathname} from "next/navigation";
-
-export type EditButtonSettings = {}
-
-export const EditButtonSettings= (props:EditButtonSettings) => {
-
-    const pathname = usePathname();
-
-    return(
-        <Link className={buttonVariants({variant: "outline"})}
-              href={`${pathname}/edit/`}
-        >
-            <GearIcon className="w-7 h-7"/>
-        </Link>
-    )
-}

src/components/wrappers/dashboard/projects/button-delete-project/button-delete-project.tsx

@@ -24,7 +24,7 @@ export const ButtonDeleteProject = (props: ButtonDeleteProjectProps) => {
         onSuccess: async (result: any) => {
             if (result.data?.success) {
                 toast.success(result.data.actionSuccess.message);
-                router.push("/");
+                router.push("/dashboard/projects");
             } else {
                 toast.error(result.data.actionError.message || "Unknown error occurred.");
             }

src/env.mjs

@@ -44,7 +44,6 @@ export const env = createEnv({
     },
     client: {
         NEXT_PUBLIC_PROJECT_VERSION: z.string().optional(),
-
     },
     runtimeEnv: {
         NEXT_PUBLIC_PROJECT_VERSION: version || "Unknown Version",

src/features/agents/agents.action.ts

@@ -1,6 +1,6 @@
 "use server";
 import {ActionError, userAction} from "@/lib/safe-actions/actions";
-import {AgentSchema} from "@/components/wrappers/dashboard/agent/agent-form/agent-form.schema";
+import {AgentSchema} from "@/features/agents/agents.schema";
 import {z} from "zod";
 import {eq, and, ne, count} from "drizzle-orm";
 import {db} from "@/db";

src/features/agents/agents.schema.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 
 export const AgentSchema = z.object({
-    name: z.string(),
+    name: z.string().nonempty("Name is required"),
     description: z.string(),
 });
 

src/features/agents/components/agent.dialog.tsx

@@ -0,0 +1,62 @@
+"use client";
+
+import {
+    Dialog,
+    DialogContent,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from "@/components/ui/dialog";
+import {AgentForm} from "@/features/agents/components/agent.form";
+import {Button, buttonVariants} from "@/components/ui/button";
+import {Plus} from "lucide-react";
+import {AgentType} from "@/features/agents/agents.schema";
+import {GearIcon} from "@radix-ui/react-icons";
+import {EmptyStatePlaceholder} from "@/components/wrappers/common/empty-state-placeholder";
+import {useState} from "react";
+
+type AgentDialogProps = {
+    agent?: AgentType & { id: string };
+    typeTrigger: "edit" | "empty" | "create";
+};
+
+
+export const AgentDialog = ({agent, typeTrigger}: AgentDialogProps) => {
+    const [open, setOpen] = useState(false);
+    const isEdit = !!agent;
+
+    const getTrigger = () => {
+        switch (typeTrigger) {
+            case "edit":
+                return (
+                    <div className={buttonVariants({variant: "outline", className: "cursor-pointer"})}>
+                        <GearIcon className="w-7 h-7"/>
+                    </div>
+                );
+            case "empty":
+                return <EmptyStatePlaceholder text="Create new Agent"/>;
+            case "create":
+                return <Button><Plus className="mr-2 h-4 w-4"/> Create Agent</Button>;
+            default:
+                return <Button><Plus className="mr-2 h-4 w-4"/> Create Agent</Button>;
+        }
+    };
+
+    return (
+        <Dialog open={open} onOpenChange={setOpen}>
+            <DialogTrigger asChild>{getTrigger()}</DialogTrigger>
+            <DialogContent
+                onOpenAutoFocus={(e) => e.preventDefault()}
+            >
+                <DialogHeader>
+                    <DialogTitle>{isEdit ? `Edit ${agent.name}` : "Create new agent"}</DialogTitle>
+                </DialogHeader>
+                <AgentForm
+                    onSuccess={() => setOpen(false)}
+                    defaultValues={agent}
+                    agentId={agent?.id}
+                />
+            </DialogContent>
+        </Dialog>
+    );
+};

src/features/agents/components/agent.form.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import {Card, CardContent} from "@/components/ui/card";
 import {
     FormControl,
     FormDescription,
@@ -16,13 +15,14 @@ import {Button} from "@/components/ui/button";
 import {useRouter} from "next/navigation";
 import {useMutation} from "@tanstack/react-query";
 import {TooltipProvider} from "@/components/ui/tooltip";
-import {AgentSchema, AgentType} from "@/components/wrappers/dashboard/agent/agent-form/agent-form.schema";
+import {AgentSchema, AgentType} from "@/features/agents/agents.schema";
 import {toast} from "sonner";
-import {createAgentAction, updateAgentAction} from "@/components/wrappers/dashboard/agent/agent-form/agent-form.action";
+import {createAgentAction, updateAgentAction} from "@/features/agents/agents.action";
 
 export type agentFormProps = {
     defaultValues?: AgentType;
     agentId?: string;
+    onSuccess?: (data: any) => void;
 };
 
 export const AgentForm = (props: agentFormProps) => {
@@ -52,7 +52,12 @@ export const AgentForm = (props: agentFormProps) => {
             }
             toast.success(`Success ${isCreate ? "creating" : "updating"} agent`);
             router.refresh();
-            router.push(`/dashboard/agents/${data.id}`);
+            
+            if (props.onSuccess) {
+                props.onSuccess(data);
+            } else {
+                router.push(`/dashboard/agents/${data.id}`);
+            }
         },
     });
 

src/features/api/middleware.ts

@@ -0,0 +1,6 @@
+import {Request, Response, NextFunction} from "express";
+
+export function loggingMiddleware(req: Request, res: Response, next: NextFunction) {
+    console.log(`[API - SERVICES - V1] Received ${req.method} request : ${req.url} at ${new Date().toISOString()}`);
+    next();
+}

src/features/api/router.ts

@@ -0,0 +1,10 @@
+import express, { Router } from "express";
+import uploadRouter from "./upload";
+import { loggingMiddleware } from "@/features/api/middleware";
+
+const router: Router = express.Router();
+
+router.use(loggingMiddleware);
+router.use("/upload", uploadRouter);
+
+export default router;

src/features/api/upload/helpers/common.ts

@@ -0,0 +1,133 @@
+import fs from "fs";
+import {Backup, DatabaseWith} from "@/db/schema/07_database";
+import {dispatchStorage} from "@/features/storages/dispatch";
+import type {StorageInput, StorageResult} from "@/features/storages/types";
+import {db} from "@/db";
+import * as drizzleDb from "@/db";
+import {eq} from "drizzle-orm";
+import {withUpdatedAt} from "@/db/utils";
+import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
+import {eventEmitter} from "@/features/shared/event";
+import forge from "node-forge";
+import crypto from "node:crypto";
+
+/**
+ * Save stream to a temporary file and upload to all storage providers in parallel.
+ */
+export default async function uploadTempFileToProviders(
+    backup: Backup,
+    database: DatabaseWith,
+    // inputStream: NodeJS.ReadableStream,
+    tmpPath: string,
+    fileName: string
+): Promise<StorageResult[]> {
+
+    const stats = fs.statSync(tmpPath);
+    const fileSize = stats.size;
+    console.log(tmpPath);
+
+    const settings = await db.query.setting.findFirst({
+        where: eq(drizzleDb.schemas.setting.name, "system"),
+        with: {storageChannel: true},
+    });
+
+    const defaultPolicy = settings?.storageChannel
+        ? [{
+            id: null,
+            storageChannelId: settings.storageChannel.id,
+            enabled: settings.storageChannel.enabled,
+        }]
+        : [];
+
+    const enabledPolicies = database.storagePolicies?.filter(p => p.enabled) ?? [];
+    const policies = enabledPolicies.length ? enabledPolicies : defaultPolicy;
+
+    if (!policies.length) {
+        await db.update(drizzleDb.schemas.backup)
+            .set(withUpdatedAt({status: "failed"}))
+            .where(eq(drizzleDb.schemas.backup.id, backup.id));
+        fs.existsSync(tmpPath) && fs.unlinkSync(tmpPath);
+        return [];
+    }
+
+    const storagePath = `backups/${database.project?.slug}/${fileName}`;
+
+    const results = await Promise.all(
+        policies.map(async (policy) => {
+            const fileStream = fs.createReadStream(tmpPath);
+
+            const [backupStorage] = await db.insert(drizzleDb.schemas.backupStorage)
+                .values({
+                    backupId: backup.id,
+                    storageChannelId: policy.storageChannelId,
+                    status: "pending",
+                    path: storagePath,
+                })
+                .returning();
+
+            const input: StorageInput = {
+                action: "upload",
+                data: {path: storagePath, file: fileStream, size: fileSize},
+            };
+
+            let result: StorageResult;
+
+            try {
+                result = policy.id
+                    ? await dispatchStorage(input, policy.id)
+                    : await dispatchStorage(input, undefined, policy.storageChannelId);
+            } catch (err: any) {
+                result = {success: false, provider: null, error: err.message};
+            }
+            await db.update(drizzleDb.schemas.backupStorage)
+                .set(withUpdatedAt({status: result.success ? "success" : "failed"}))
+                .where(eq(drizzleDb.schemas.backupStorage.id, backupStorage.id));
+
+            return result;
+        })
+    );
+
+    const backupStatus = results.some(r => r.success) ? "success" : "failed";
+    await db.update(drizzleDb.schemas.backup)
+        .set(withUpdatedAt({
+            fileSize: fileSize,
+            status: backupStatus
+        }))
+        .where(eq(drizzleDb.schemas.backup.id, backup.id));
+
+    fs.existsSync(tmpPath) && fs.unlinkSync(tmpPath);
+
+    console.log(results);
+    eventEmitter.emit('modification', {update: true});
+
+    if (!backupStatus) {
+        await sendNotificationsBackupRestore(database, "error_backup");
+    }
+    await sendNotificationsBackupRestore(database, "success_backup");
+
+    return results;
+}
+
+
+export function createDecryptionStream(
+    encryptedAesKeyHex: string,
+    ivHex: string
+) {
+    const privateKeyPem = fs.readFileSync(
+        "private/keys/server_private.pem",
+        "utf8"
+    );
+
+    const privateKey = forge.pki.privateKeyFromPem(privateKeyPem);
+
+    const encryptedBytes = forge.util.hexToBytes(encryptedAesKeyHex);
+    const aesKeyBytes = privateKey.decrypt(encryptedBytes, "RSA-OAEP", {
+        md: forge.md.sha256.create(),
+        mgf1: {md: forge.md.sha256.create()},
+    });
+
+    const aesKey = Buffer.from(aesKeyBytes, "binary");
+    const iv = Buffer.from(ivHex, "hex");
+
+    return crypto.createDecipheriv("aes-256-cbc", aesKey, iv);
+}

src/features/api/upload/helpers/file.ts

@@ -0,0 +1,27 @@
+import fs from "fs";
+import path from "path";
+import {promisify} from "util";
+import {pipeline} from "stream";
+
+const pipelineAsync = promisify(pipeline);
+const TMP_DIR = path.join(process.cwd(), "private/uploads/tmp");
+fs.mkdirSync(TMP_DIR, { recursive: true });
+
+export async function saveStreamToTempFile(stream: NodeJS.ReadableStream, fileName: string): Promise<string> {
+    const tmpPath = path.join(TMP_DIR, fileName);
+    const writeStream = fs.createWriteStream(tmpPath);
+    await pipelineAsync(stream, writeStream);
+    return tmpPath;
+}
+
+
+export function getFileExtension(dbType: string) {
+    switch (dbType) {
+        case "postgresql":
+            return ".dump";
+        case "mysql":
+            return ".sql";
+        default:
+            return ".dump";
+    }
+}

src/features/api/upload/index.ts

@@ -0,0 +1,129 @@
+import express, {Request, Response, Router} from "express";
+import {v4 as uuidv4} from "uuid";
+import {and, eq} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {db} from "@/db";
+import {isUuidv4} from "@/utils/verify-uuid";
+import uploadTempFileToProviders, {createDecryptionStream} from "@/features/api/upload/helpers/common";
+import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
+import {Backup} from "@/db/schema/07_database";
+import {withUpdatedAt} from "@/db/utils";
+import {eventEmitter} from "@/features/shared/event";
+import {getFileExtension, saveStreamToTempFile} from "@/features/api/upload/helpers/file";
+
+const router: Router = express.Router();
+
+router.post("/:agentId", async (req: Request, res: Response) => {
+    try {
+        const agentId = req.params.agentId as string | undefined;
+        const generatedId = req.headers["x-generated-id"] as string | undefined;
+        const status = req.headers["x-status"] as string | undefined;
+        const encryptedAesKeyHex = req.headers["x-aes-key"] as string | undefined;
+        const ivHex = req.headers["x-iv"] as string | undefined;
+        const method = (req.headers["x-method"] as string) ?? "manual";
+        const extension = req.headers["x-extension"] as string | undefined;
+
+
+        if (!generatedId || !encryptedAesKeyHex || !ivHex || !agentId || !status) {
+            return res.status(400).json({error: "Missing required headers/params"});
+        }
+
+        if (!isUuidv4(generatedId)) {
+            return res.status(400).json({error: "generatedId is not a valid UUID"});
+        }
+
+        const agent = await db.query.agent.findFirst({
+            where: eq(drizzleDb.schemas.agent.id, agentId),
+        });
+
+        if (!agent) {
+            return res.status(404).json({error: "Agent not found"});
+        }
+
+
+        const database = await db.query.database.findFirst({
+            where: eq(drizzleDb.schemas.database.agentDatabaseId, generatedId),
+            with: {
+                project: true,
+                storagePolicies: true,
+            },
+        });
+
+        if (!database) {
+            return res.status(404).json({error: "Database not found"});
+        }
+
+        let backup: Backup | null | undefined = null;
+
+        if (method === "automatic") {
+            [backup] = await db
+                .insert(drizzleDb.schemas.backup)
+                .values({
+                    status: "ongoing",
+                    databaseId: database.id,
+                })
+                .returning();
+        } else {
+            backup = await db.query.backup.findFirst({
+                where: and(
+                    eq(drizzleDb.schemas.backup.databaseId, database.id),
+                    eq(drizzleDb.schemas.backup.status, "ongoing")
+                ),
+            });
+        }
+
+        if (!backup) {
+            return res.status(404).json({error: "Backup not found"});
+        }
+
+
+        if (status === "success") {
+
+            const decipher = createDecryptionStream(encryptedAesKeyHex, ivHex);
+
+            const fileExt = extension || getFileExtension(database.dbms);
+            const fileName = `${uuidv4()}${fileExt}`;
+
+            const decryptedStream = req.pipe(decipher);
+
+            const tmpPath = await saveStreamToTempFile(decryptedStream, fileName);
+
+
+
+
+            if (!tmpPath) {
+                return res.status(500).json({
+                    error: "Unable to save tmp backup file",
+                });
+            }
+
+            uploadTempFileToProviders(backup, database, tmpPath, fileName);
+
+            return res.json({success: true});
+        } else {
+            await db
+                .update(drizzleDb.schemas.backup)
+                .set(withUpdatedAt({status: 'failed'}))
+                .where(eq(drizzleDb.schemas.backup.id, backup.id));
+
+            eventEmitter.emit('modification', {update: true});
+
+            await sendNotificationsBackupRestore(database, "error_backup");
+
+            return res.status(200).json({
+                error: "Backup successfully updated with status failed",
+            });
+        }
+    } catch (err: any) {
+        console.error("Upload error:", err);
+        return res.status(500).json({
+            error: "Upload failed",
+            detail: err.message,
+        });
+    }
+});
+
+
+export default router;
+
+

src/features/notifications/providers/ntfy.ts

@@ -1,10 +1,10 @@
 import type {EventPayload, DispatchResult} from '../types';
 
 export async function sendNtfy(
-    config: { ntfyServerUrl?: string; ntfyTopic: string; ntfyToken?: string },
+    config: { ntfyServerUrl?: string; ntfyTopic: string; ntfyToken?: string, ntfyUsername?: string, ntfyPassword?: string },
     payload: EventPayload
 ): Promise<DispatchResult> {
-    const {ntfyServerUrl, ntfyTopic, ntfyToken} = config;
+    const {ntfyServerUrl, ntfyTopic, ntfyToken, ntfyUsername, ntfyPassword} = config;
 
     const baseUrl = (ntfyServerUrl || "https://ntfy.sh").replace(/\/$/, "");
 
@@ -24,6 +24,11 @@ export async function sendNtfy(
         headers['Authorization'] = `Bearer ${ntfyToken}`;
     }
 
+    if (ntfyUsername && ntfyPassword) {
+        const credentials = btoa(`${ntfyUsername}:${ntfyPassword}`);
+        headers['Authorization'] = `Basic ${credentials}`;
+    }
+
     const res = await fetch(`${baseUrl}`, {
         method: 'POST',
         body: JSON.stringify(body),

src/features/organization/components/edit-organization.dialog.tsx

@@ -0,0 +1,58 @@
+"use client";
+
+import {
+    Dialog,
+    DialogContent,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from "@/components/ui/dialog";
+import {OrganizationForm} from "@/features/organization/components/organization.form";
+import {ReactNode, useState} from "react";
+import {Button, buttonVariants} from "@/components/ui/button";
+import {GearIcon} from "@radix-ui/react-icons";
+import {OrganizationWithMembers} from "@/db/schema/03_organization";
+import {User} from "@/db/schema/02_user";
+import {User as BetterAuthUser} from "better-auth";
+import {useRouter} from "next/navigation";
+
+type EditOrganizationDialogProps = {
+    organization: OrganizationWithMembers;
+    users: User[];
+    currentUser: BetterAuthUser;
+};
+
+export const EditOrganizationDialog = ({
+                                           organization,
+                                           users,
+                                           currentUser,
+                                       }: EditOrganizationDialogProps) => {
+    const [open, setOpen] = useState(false);
+    const router = useRouter();
+
+    return (
+        <Dialog open={open} onOpenChange={setOpen}>
+            <DialogTrigger asChild>
+                <div className={buttonVariants({variant: "outline", className: "cursor-pointer"})}>
+                    <GearIcon className="w-7 h-7"/>
+                </div>
+            </DialogTrigger>
+            <DialogContent
+                onOpenAutoFocus={(e) => e.preventDefault()}
+            >
+                <DialogHeader>
+                    <DialogTitle>Edit {organization.name}</DialogTitle>
+                </DialogHeader>
+                <OrganizationForm
+                    onSuccess={() => {
+                        setOpen(false)
+                        router.refresh()
+                    }}
+                    defaultValues={organization}
+                    users={users}
+                    currentUser={currentUser}
+                />
+            </DialogContent>
+        </Dialog>
+    );
+};

src/features/organization/components/organization.form.tsx

@@ -16,13 +16,13 @@ import {useMutation} from "@tanstack/react-query";
 import {useRouter} from "next/navigation";
 import {MultiSelect} from "@/components/wrappers/common/multiselect/multi-select";
 import {
-    OrganizationFormSchema,
-    OrganizationFormType
-} from "@/components/wrappers/dashboard/organization/organization-form/organization-form.schema";
+    UpdateOrganizationSchema,
+    UpdateOrganizationType
+} from "@/features/organization/organization.schema";
 import {MemberWithUser, OrganizationWithMembers} from "@/db/schema/03_organization";
 import {
     updateOrganizationAction
-} from "@/components/wrappers/dashboard/organization/organization.action";
+} from "@/features/organization/organization.action";
 import {toast} from "sonner";
 import {User as BetterAuthUser} from "better-auth";
 import {User} from "@/db/schema/02_user";
@@ -32,6 +32,7 @@ export type organizationFormProps = {
     defaultValues?: OrganizationWithMembers;
     users: User[];
     currentUser: BetterAuthUser;
+    onSuccess?: (data: any) => void;
 };
 
 export const OrganizationForm = (props: organizationFormProps) => {
@@ -64,12 +65,12 @@ export const OrganizationForm = (props: organizationFormProps) => {
     };
 
     const form = useZodForm({
-        schema: OrganizationFormSchema,
+        schema: UpdateOrganizationSchema,
         defaultValues: formattedDefaultValues,
     });
 
     const mutation = useMutation({
-        mutationFn: (values: OrganizationFormType) => updateOrganizationAction({
+        mutationFn: (values: UpdateOrganizationType) => updateOrganizationAction({
             data: values,
             organizationId: props.defaultValues?.id ?? ""
         }),
@@ -78,7 +79,11 @@ export const OrganizationForm = (props: organizationFormProps) => {
                 toast.success(result.data.actionSuccess?.message || "Organization updated successfully.");
                 refetch()
                 refetchActiveOrga()
-                router.push("/dashboard/settings");
+                if (props.onSuccess) {
+                    props.onSuccess(result.data.value);
+                } else {
+                    router.push("/dashboard/settings");
+                }
             } else {
                 // @ts-ignore
                 const errorMsg = result?.data?.actionError?.message || result?.data?.actionError?.messageParams?.message || "Failed to update the organization.";

src/features/organization/organization.action.ts

@@ -1,12 +1,9 @@
 "use server";
 
 import {userAction} from "@/lib/safe-actions/actions";
-import {OrganizationSchema} from "@/components/wrappers/dashboard/organization/organization.schema";
+import {CreateOrganizationSchema, UpdateOrganizationSchema} from "@/features/organization/organization.schema";
 import {ServerActionResult} from "@/types/action-type";
 import {z} from "zod";
-import {
-    OrganizationFormSchema
-} from "@/components/wrappers/dashboard/organization/organization-form/organization-form.schema";
 import {db} from "@/db";
 import {and, eq, inArray, or} from "drizzle-orm";
 import {auth, checkSlugOrganization, createOrganization} from "@/lib/auth/auth";
@@ -14,7 +11,7 @@ import {slugify} from "@/utils/slugify";
 import {Organization} from "@/db/schema/03_organization";
 import * as drizzleDb from "@/db";
 
-export const createOrganizationAction = userAction.schema(OrganizationSchema).action(async ({parsedInput}): Promise<ServerActionResult<Organization>> => {
+export const createOrganizationAction = userAction.schema(CreateOrganizationSchema).action(async ({parsedInput}): Promise<ServerActionResult<Organization>> => {
     try {
         const slug = slugify(parsedInput.name);
         if (!await checkSlugOrganization(slug)) {
@@ -69,7 +66,7 @@ export const createOrganizationAction = userAction.schema(OrganizationSchema).ac
 export const updateOrganizationAction = userAction
     .schema(
         z.object({
-            data: OrganizationFormSchema,
+            data: UpdateOrganizationSchema,
             organizationId: z.string(),
         })
     )

src/features/organization/organization.schema.ts

@@ -0,0 +1,17 @@
+import { z } from "zod";
+
+export const CreateOrganizationSchema = z.object({
+    name: z.string().min(5, "Name must be at least 5 characters long").max(40, "Name must be at most 40 characters long"),
+});
+
+export const UpdateOrganizationSchema = z.object({
+    name: z.string().min(5, 'Name must be at least 5 characters long').max(40, 'Name must be at most 40 characters long'),
+    slug: z.string()
+        .regex(/^[a-zA-Z0-9_-]*$/, 'Slug can only contain letters, numbers, underscores, and hyphens')
+        .min(5, 'Slug must be at least 5 characters long')
+        .max(20, 'Slug must be at most 20 characters long'),
+    users: z.array(z.string()),
+});
+
+export type CreateOrganizationType = z.infer<typeof CreateOrganizationSchema>;
+export type UpdateOrganizationType = z.infer<typeof UpdateOrganizationSchema>;

src/features/projects/components/project.dialog.tsx

@@ -0,0 +1,75 @@
+"use client";
+
+import {
+    Dialog,
+    DialogContent,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from "@/components/ui/dialog";
+import {ProjectForm} from "@/features/projects/components/project.form";
+import {ReactNode, useState} from "react";
+import {Button, buttonVariants} from "@/components/ui/button";
+import {Plus} from "lucide-react";
+import {DatabaseWith} from "@/db/schema/07_database";
+import {Organization} from "@/db/schema/03_organization";
+import {ProjectWith} from "@/db/schema/06_project";
+import {GearIcon} from "@radix-ui/react-icons";
+import {EmptyStatePlaceholder} from "@/components/wrappers/common/empty-state-placeholder";
+
+type ProjectDialogProps = {
+    databases: DatabaseWith[];
+    organization: Organization;
+    project?: ProjectWith;
+    isEdit?: boolean;
+    isEmpty?: boolean;
+};
+
+export const ProjectDialog = ({
+                                  databases,
+                                  organization,
+                                  project,
+                                  isEdit = false,
+                                  isEmpty = false
+                              }: ProjectDialogProps) => {
+    const [open, setOpen] = useState(false);
+
+    return (
+        <Dialog open={open} onOpenChange={setOpen}>
+            <DialogTrigger asChild>
+                <div>
+                    {isEdit ?
+                        <div className={buttonVariants({variant: "outline", className: "cursor-pointer"})}>
+                            <GearIcon className="w-7 h-7"/>
+                        </div>
+                        :
+                        <>
+                            {isEmpty ?
+                                <EmptyStatePlaceholder text="Create new Project"/>
+                                :
+                                <Button><Plus className="mr-2 h-4 w-4"/> Create Project</Button>
+                            }
+                        </>
+                    }
+                </div>
+            </DialogTrigger>
+            <DialogContent
+                onOpenAutoFocus={(e) => e.preventDefault()}
+            >
+                <DialogHeader>
+                    <DialogTitle>{isEdit ? `Edit ${project?.name}` : "Create new project"}</DialogTitle>
+                </DialogHeader>
+                <ProjectForm
+                    onSuccess={() => setOpen(false)}
+                    databases={databases}
+                    organization={organization}
+                    defaultValues={project ? {
+                        ...project,
+                        databases: project.databases.map(db => db.id)
+                    } : undefined}
+                    projectId={project?.id}
+                />
+            </DialogContent>
+        </Dialog>
+    );
+};

src/features/projects/components/project.form.tsx

@@ -1,13 +1,12 @@
 "use client";
 
-import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage, useZodForm } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Form } from "@/components/ui/form";
 import { Button } from "@/components/ui/button";
 import { useMutation } from "@tanstack/react-query";
-import { ProjectSchema, ProjectType } from "@/components/wrappers/dashboard/projects/project-form/project-form.schema";
-import { createProjectAction, updateProjectAction } from "@/components/wrappers/dashboard/projects/project-form/project-form.action";
+import { ProjectSchema, ProjectType } from "@/features/projects/projects.schema";
+import { createProjectAction, updateProjectAction } from "@/features/projects/projects.action";
 import { useRouter } from "next/navigation";
 import { MultiSelect } from "@/components/wrappers/common/multiselect/multi-select";
 import { toast } from "sonner";
@@ -19,15 +18,22 @@ export type projectFormProps = {
     databases: DatabaseWith[];
     organization: Organization;
     projectId?: string;
+    onSuccess?: (data: any) => void;
 };
 
+
+
+
+
+
+
 export const ProjectForm = (props: projectFormProps) => {
     const router = useRouter();
     const isCreate = !Boolean(props.defaultValues);
     const formatDatabasesList = (databases: DatabaseWith[]) => {
         return databases.map((database) => ({
             value: database.id,
-            label: `${database.name} (${database.agentDatabaseId}) | ${database.agent?.name}`,
+            label: `${database.name} | ${database.agent?.name}`,
         }));
     };
 
@@ -65,7 +71,11 @@ export const ProjectForm = (props: projectFormProps) => {
                 if (project.data.success) {
                     project.data.actionSuccess && toast.success(project.data.actionSuccess.message);
                     router.refresh();
-                    router.push(`/dashboard/projects/${project.data.value!.id}`);
+                    if (props.onSuccess) {
+                        props.onSuccess(project.data.value);
+                    } else {
+                        router.push(`/dashboard/projects/${project.data.value!.id}`);
+                    }
                 } else {
                     project.data.actionError && toast.error(project.data.actionError.message || "Unknown error occurred.");
                     router.refresh();

src/features/projects/projects.action.ts

@@ -1,7 +1,7 @@
 "use server";
 
 import {userAction} from "@/lib/safe-actions/actions";
-import {ProjectSchema} from "@/components/wrappers/dashboard/projects/project-form/project-form.schema";
+import {ProjectSchema} from "@/features/projects/projects.schema";
 import {z} from "zod";
 import {ServerActionResult} from "@/types/action-type";
 import {db} from "@/db";
@@ -119,13 +119,11 @@ export const updateProjectAction = userAction
                     .where(inArray(drizzleDb.schemas.alertPolicy.databaseId, databasesToRemove)).execute();
 
             }
-            // const slug = slugify(parsedInput.data.name);
 
             const [updatedProject] = await db
                 .update(drizzleDb.schemas.project)
                 .set({
                     name: parsedInput.data.name,
-                    // slug: slug,
                 })
                 .where(eq(drizzleDb.schemas.project.id, parsedInput.projectId))
                 .returning();

src/features/projects/projects.schema.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 
 export const ProjectSchema = z.object({
-    name: z.string(),
+    name: z.string().nonempty("Name is required"),
     databases: z.array(z.string()),
 });
 

src/features/shared/event.ts

@@ -0,0 +1,3 @@
+import { EventEmitter } from "events";
+
+export const eventEmitter = new EventEmitter();

src/features/storages/helpers.ts

@@ -11,7 +11,7 @@ import * as drizzleDb from "@/db";
 import {withUpdatedAt} from "@/db/utils";
 import {eq} from "drizzle-orm";
 import {db} from "@/db";
-import crypto, {createHash} from "crypto";
+import {createHash} from "crypto";
 import {getServerUrl} from "@/utils/get-server-url";
 import path from "path";
 

src/features/storages/providers/google-drive/helpers.ts

@@ -1,36 +1,3 @@
-// import {drive_v3, google} from "googleapis";
-// import Drive = drive_v3.Drive;
-// import {GoogleDriveConfig} from "@/features/storages/providers/google-drive/types";
-//
-//
-// export async function getGoogleDriveClient(config: GoogleDriveConfig): Promise<Drive> {
-//     const auth = new google.auth.JWT({
-//         email: config.clientEmail,
-//         key: config.privateKey?.replace(/\\n/g, "\n"),
-//         scopes: ["https://www.googleapis.com/auth/drive"],
-//     });
-//
-//     return google.drive({
-//         version: "v3",
-//         auth,
-//     });
-// }
-//
-//
-// export async function findFileByName(
-//     drive: any,
-//     name: string,
-//     folderId: string
-// ): Promise<string | null> {
-//     const res = await drive.files.list({
-//         q: `name='${name}' and '${folderId}' in parents and trashed=false`,
-//         fields: "files(id)",
-//         pageSize: 1,
-//     });
-//
-//     return res.data.files?.[0]?.id ?? null;
-// }
-
 import {drive_v3, google} from "googleapis";
 import {GoogleDriveConfig} from "@/features/storages/providers/google-drive/types";
 import Drive = drive_v3.Drive;
@@ -42,7 +9,6 @@ export async function getGoogleDriveClient(config: GoogleDriveConfig): Promise<D
     const oauth2Client = new google.auth.OAuth2(
         config.clientId,
         config.clientSecret,
-        // config.redirectUri
         baseUrl
     );
 

src/features/storages/providers/google-drive/index.ts

@@ -24,18 +24,27 @@ export async function uploadGoogleDrive(
         ? await ensureFolderPath(client, folderPath, config.folderId)
         : config.folderId;
 
-
     const existing = await findFileByName(client, fileName, folderId);
     if (existing) return {success: false, provider: "google-drive", error: "File already exists"};
 
+    let fileStream: Readable;
+    const file = input.data.file;
+    if (Buffer.isBuffer(file) || file instanceof Uint8Array) {
+        fileStream = Readable.from(file);
+    } else if ((file as any).pipe) {
+        fileStream = file as Readable;
+    } else {
+        throw new Error("Unsupported file type for streaming upload");
+    }
 
     await client.files.create({
         requestBody: {name: fileName, parents: [folderId]},
-        media: {body: Readable.from(input.data.file as Buffer)},
+        media: {body: fileStream},
         fields: "id",
         supportsAllDrives: true,
     });
 
+
     if (input.data.url) {
         const url = await generateFileUrl(input);
         if (!url) {
@@ -70,9 +79,11 @@ export async function getGoogleDrive(
 
     const res = await client.files.get(
         {fileId, alt: "media", supportsAllDrives: true},
-        {responseType: "arraybuffer"}
+        {responseType: "stream"}
     );
 
+    const stream = res.data as Readable;
+
 
     if (input.data.signedUrl) {
         const url = await generateFileUrl(input);
@@ -88,7 +99,7 @@ export async function getGoogleDrive(
         return {
             success: true,
             provider: "google-drive",
-            file: Buffer.from(res.data as ArrayBuffer),
+            file: stream,
             url: url,
         };
     }
@@ -96,7 +107,7 @@ export async function getGoogleDrive(
     return {
         success: true,
         provider: "google-drive",
-        file: Buffer.from(res.data as ArrayBuffer),
+        file: stream,
     };
 }
 

src/features/storages/providers/google-drive/types.ts

@@ -1,9 +1,3 @@
-// export type GoogleDriveConfig = {
-//     clientEmail: string;
-//     privateKey: string;
-//     folderId: string;
-// };
-
 
 export type GoogleDriveConfig = {
     clientId: string;

src/features/storages/providers/index.ts

@@ -1,7 +1,7 @@
 import {
     StorageProviderKind,
     StorageInput,
-    StorageResult, StorageMetaData,
+    StorageResult,
 } from '../types';
 
 import {uploadLocal, getLocal, deleteLocal, pingLocal} from './local';
@@ -39,8 +39,6 @@ const handlers: Record<StorageProviderKind, ProviderHandler> = {
         delete: deleteGoogleDrive,
         ping: pingGoogleDrive,
     }
-    // gcs: null as any,
-    // azure: null as any,
 };
 
 export async function dispatchViaProvider(

src/features/storages/providers/local.ts

@@ -1,95 +1,109 @@
 "use server"
-import {mkdir, writeFile, unlink, readFile} from 'fs/promises';
+import {mkdir, unlink} from 'fs/promises';
 import path from 'path';
 import {StorageDeleteInput, StorageGetInput, StorageMetaData, StorageResult, StorageUploadInput} from '../types';
 import fs from "node:fs";
-import {getServerUrl} from "@/utils/get-server-url";
 import {generateFileUrl} from "@/features/storages/helpers";
+import {Readable} from "node:stream";
 
 const BASE_DIR = "/private/uploads/";
 
 export async function uploadLocal(
     config: { baseDir?: string },
-    input: { data: StorageUploadInput, metadata?: StorageMetaData }
+    input: { data: StorageUploadInput; metadata?: StorageMetaData }
 ): Promise<StorageResult> {
     const base = config.baseDir || BASE_DIR;
     const fullPath = path.join(process.cwd(), base, input.data.path);
-
     const dir = path.dirname(fullPath);
 
-    await mkdir(dir, {recursive: true});
-    await writeFile(fullPath, input.data.file);
+    await mkdir(dir, { recursive: true });
 
-
-    if (input.data.url) {
-        const url = await generateFileUrl(input);
-        if (!url) {
-            return {
-                success: false,
-                provider: "local",
-                response: "Unable to get url file"
-            };
+    try {
+        const file = input.data.file;
+        if (Buffer.isBuffer(file)) {
+            await fs.promises.writeFile(fullPath, input.data.file);
+        } else if (file instanceof Readable) {
+            await new Promise<void>((resolve, reject) => {
+                const writable = fs.createWriteStream(fullPath);
+                file.pipe(writable);
+                writable.on("finish", resolve);
+                writable.on("error", reject);
+            });
+        } else {
+            return { success: false, provider: "local", error: "Unsupported file type. Must be Buffer or ReadableStream" };
         }
-        return {
-            success: true,
-            provider: 'local',
-            url: url
-        };
+
+        if (input.data.url) {
+            const url = await generateFileUrl(input);
+            if (!url) {
+                return { success: false, provider: "local", response: "Unable to get URL" };
+            }
+            return { success: true, provider: "local", url };
+        }
+
+        return { success: true, provider: "local" };
+    } catch (err: any) {
+        try { await unlink(fullPath); } catch {}
+        return { success: false, provider: "local", error: err.message || "Upload failed" };
     }
-    return {
-        success: true,
-        provider: 'local',
-    };
-
-
-
 }
 
 export async function getLocal(
     config: { baseDir?: string },
-    input: { data: StorageGetInput, metadata: StorageMetaData }
+    input: { data: StorageGetInput; metadata: StorageMetaData }
 ): Promise<StorageResult> {
     const base = config.baseDir || BASE_DIR;
-    const filePath = path.join(process.cwd(), base, input.data.path)
-    const fileName = path.basename(input.data.path);
-
-    const file = await readFile(filePath);
+    const filePath = path.join(process.cwd(), base, input.data.path);
 
     if (!fs.existsSync(filePath)) {
         console.error("File not found at:", filePath);
-        return ({
+        return {
             success: false,
-            provider: 'local',
-        });
+            provider: "local",
+            error: "File not found",
+        };
+    }
+
+    let fileStream: fs.ReadStream | undefined;
+
+    try {
+        fileStream = fs.createReadStream(filePath);
+    } catch (err: any) {
+        console.error("Error creating read stream:", err);
+        return {
+            success: false,
+            provider: "local",
+            error: err.message,
+        };
     }
 
     if (input.data.signedUrl) {
         const url = await generateFileUrl(input);
-
         if (!url) {
             return {
                 success: false,
                 provider: "local",
-                response: "Unable to get url file"
+                error: "Unable to generate signed URL",
             };
         }
 
         return {
             success: true,
             provider: "local",
-            file: file,
-            url: url,
+            file: fileStream,
+            url,
         };
     }
 
     return {
         success: true,
         provider: "local",
-        file: file,
+        file: fileStream,
     };
-
 }
 
+
+
 export async function deleteLocal(
     config: { baseDir?: string },
     input: { data: StorageDeleteInput, metadata?: StorageMetaData }

src/features/storages/providers/s3.ts

@@ -1,6 +1,6 @@
 import * as Minio from "minio";
 import {StorageDeleteInput, StorageGetInput, StorageMetaData, StorageResult, StorageUploadInput} from "../types";
-import {generateFileUrl} from "@/features/storages/helpers";
+import {Readable} from "node:stream";
 
 type S3Config = {
     endPointUrl: string;
@@ -32,72 +32,66 @@ async function ensureBucket(config: S3Config) {
 
 export async function uploadS3(
     config: S3Config,
-    input: { data: StorageUploadInput, metadata?: StorageMetaData  }
+    input: { data: StorageUploadInput, metadata?: StorageMetaData }
 ): Promise<StorageResult> {
     const client = await getS3Client(config);
     await ensureBucket(config);
 
     const key = `${BASE_DIR}${input.data.path}`;
+    const file = input.data.file;
+
+    let uploadStream: Readable;
+    if (Buffer.isBuffer(file) || file instanceof Uint8Array) {
+        uploadStream = Readable.from(file);
+    } else if ((file as any).pipe) {
+        uploadStream = file;
+    } else {
+        return {success: false, provider: "s3", error: "Unsupported file type for streaming upload"};
+    }
 
     try {
-        await client.statObject(config.bucketName, key);
-        return {success: false, provider: "s3", error: "File already exists"};
-    } catch {
-        // continue if not found
+        const result = await client.putObject(config.bucketName, key, uploadStream, input.data.size);
+    } catch (err: any) {
+        return {success: false, provider: "s3", error: err.message};
     }
 
-    await client.putObject(config.bucketName, key, input.data.file as Buffer);
-
-
-    if (input.data.url) {
-        const url = await generateFileUrl(input);
-        if (!url) {
-            return {
-                success: false,
-                provider: "s3",
-                response: "Unable to get url file"
-            };
-        }
-        return {
-            success: true,
-            provider: 's3',
-            url: url
-        };
-    }
-    return {
-        success: true,
-        provider: 's3',
-    };
-
-
+    return {success: true, provider: "s3"};
 }
 
-export async function getS3(config: S3Config, input: { data: StorageGetInput, metadata: StorageMetaData  }): Promise<StorageResult> {
-    const client = await getS3Client(config);
 
+export async function getS3(
+    config: S3Config,
+    input: { data: StorageGetInput, metadata: StorageMetaData }
+): Promise<StorageResult> {
+    const client = await getS3Client(config);
     const key = `${BASE_DIR}${input.data.path}`;
+
     try {
         await client.statObject(config.bucketName, key);
     } catch {
         return {success: false, provider: "s3", error: "File not found"};
     }
 
-    const presignedUrl = await client.presignedGetObject(config.bucketName, key, 60);
-
     const fileStream = await client.getObject(config.bucketName, key);
-    const chunks: Buffer[] = [];
-    for await (const chunk of fileStream) chunks.push(chunk as Buffer);
-    const buffer = Buffer.concat(chunks);
+
+    let presignedUrl: string | undefined;
+    if (input.data.signedUrl) {
+        presignedUrl = await client.presignedGetObject(config.bucketName, key, input.data.expiresInSeconds ?? 60);
+    }
 
     return {
         success: true,
         provider: "s3",
-        file: buffer,
+        file: fileStream as unknown as Buffer | Readable,
         url: presignedUrl,
     };
 }
 
-export async function deleteS3(config: S3Config, input: { data: StorageDeleteInput, metadata?: StorageMetaData  }): Promise<StorageResult> {
+
+export async function deleteS3(config: S3Config, input: {
+    data: StorageDeleteInput,
+    metadata?: StorageMetaData
+}): Promise<StorageResult> {
     const client = await getS3Client(config);
     const key = `${BASE_DIR}${input.data.path}`;
 

src/features/storages/types.ts

@@ -1,3 +1,5 @@
+import {Readable} from "node:stream";
+
 export type StorageProviderKind =
     | 'local'
     | 's3'
@@ -20,9 +22,10 @@ export type StorageMetaData = {
 
 export interface StorageUploadInput {
     path: string;
-    file: Buffer | Uint8Array;
+    file: Readable | Buffer | Uint8Array;
     url?: boolean;
     contentType?: string;
+    size?: number;
 }
 
 export interface StorageGetInput {
@@ -37,7 +40,7 @@ export interface StorageDeleteInput {
 
 export type StorageInput =
     | { action: 'upload'; data: StorageUploadInput, metadata?: StorageMetaData }
-    | { action: 'get'; data: StorageGetInput, metadata: StorageMetaData}
+    | { action: 'get'; data: StorageGetInput, metadata: StorageMetaData }
     | { action: 'delete'; data: StorageDeleteInput, metadata?: StorageMetaData }
     | { action: 'ping'; };
 
@@ -45,7 +48,7 @@ export interface StorageResult {
     success: boolean;
     provider: StorageProviderKind | null;
     url?: string;
-    file?: Buffer;
+    file?: Buffer | Readable;
     error?: string;
     response?: any;
 }

src/features/updates/components/update-notification.tsx

@@ -0,0 +1,61 @@
+"use client";
+
+import {useUpdateCheck} from "../hooks/use-update-check";
+import {useSidebar, SidebarGroup, SidebarGroupContent, SidebarMenu, SidebarMenuItem} from "@/components/ui/sidebar";
+import {X, ArrowUpCircle, MoveRight} from "lucide-react";
+import Link from "next/link";
+
+
+export const UpdateNotification = () => {
+    const {isUpdateAvailable, newRelease, dismissUpdate} = useUpdateCheck();
+    const {state} = useSidebar();
+
+    if (!isUpdateAvailable || !newRelease || state !== "expanded") {
+        return null;
+    }
+
+    return (
+        <SidebarGroup className="py-0">
+            <SidebarGroupContent>
+                <SidebarMenu>
+                    <SidebarMenuItem className="px-2">
+                        <div
+                            className="relative flex flex-col gap-2 rounded-lg border bg-primary/5 p-3 text-sidebar-foreground border-primary/20">
+                            <button
+                                onClick={dismissUpdate}
+                                className="absolute right-2 top-2 rounded-md p-0.5 text-muted-foreground/50 hover:bg-sidebar-accent hover:text-foreground transition-colors"
+                            >
+                                <X className="size-3"/>
+                                <span className="sr-only">Dismiss</span>
+                            </button>
+
+                            <div className="flex items-center gap-2">
+                                <div
+                                    className="flex size-7 shrink-0 items-center justify-center rounded-full bg-primary/10 text-primary">
+                                    <ArrowUpCircle className="size-4"/>
+                                </div>
+                                <div className="flex flex-col min-w-0">
+                                    <div className="flex items-center gap-1">
+                                        <span className="text-[10px] font-semibold leading-none">Update available</span>
+                                        <span
+                                            className="text-[10px] text-muted-foreground font-medium px-1 py-0.5 bg-primary/10 rounded-full">
+                                            v{newRelease.tag_name.replace(/^v/, "")}
+                                        </span>
+                                    </div>
+                                    <Link
+                                        href={newRelease.html_url}
+                                        target="_blank"
+                                        className="group inline-flex items-center gap-1 text-[11px] text-primary hover:underline font-medium mt-1"
+                                    >
+                                        See what's new
+                                        <MoveRight className="size-3 transition-transform group-hover:translate-x-0.5"/>
+                                    </Link>
+                                </div>
+                            </div>
+                        </div>
+                    </SidebarMenuItem>
+                </SidebarMenu>
+            </SidebarGroupContent>
+        </SidebarGroup>
+    );
+};

src/features/updates/hooks/use-update-check.ts

@@ -0,0 +1,59 @@
+"use client";
+
+import {useQuery} from "@tanstack/react-query";
+import {getNewRelease} from "../services/github";
+import {env} from "@/env.mjs";
+import {useEffect, useState} from "react";
+
+const DISMISS_KEY = "portabase-update-dismissed";
+const DISMISS_DURATION = 1000 * 60 * 60 * 24;
+
+export const useUpdateCheck = () => {
+        const [isDismissed, setIsDismissed] = useState(true);
+
+        const currentVersion = env.NEXT_PUBLIC_PROJECT_VERSION!;
+
+        const {data: newRelease, isLoading} = useQuery({
+            queryKey: ["new-release"],
+            queryFn: () => getNewRelease(currentVersion),
+            staleTime: 1000 * 60 * 60,
+        });
+
+        console.log("newRelease", newRelease);
+
+
+        useEffect(() => {
+            if (!newRelease) return;
+
+            const dismissedData = localStorage.getItem(DISMISS_KEY);
+            if (dismissedData) {
+                const {version, timestamp} = JSON.parse(dismissedData);
+                const now = Date.now();
+                if (version === newRelease.name && now - timestamp < DISMISS_DURATION) {
+                    setIsDismissed(true);
+                    return;
+                }
+            }
+            setIsDismissed(false);
+
+        }, [newRelease])
+
+
+        const dismissUpdate = () => {
+            if (newRelease) {
+                localStorage.setItem(DISMISS_KEY, JSON.stringify({
+                    version: newRelease.name,
+                    timestamp: Date.now()
+                }));
+                setIsDismissed(true);
+            }
+        };
+
+        return {
+            newRelease,
+            isLoading,
+            isUpdateAvailable: !isDismissed && newRelease,
+            dismissUpdate
+        };
+    }
+;

src/features/updates/services/github.ts

@@ -0,0 +1,86 @@
+export interface GitHubRelease {
+    tag_name: string;
+    html_url: string;
+    prerelease: boolean;
+    name: string;
+    body: string;
+}
+
+type ParsedVersion = {
+    major: number;
+    minor: number;
+    patch: number;
+    rc?: number;
+};
+
+function parseVersion(version: string): ParsedVersion {
+    const match = version.match(/^(\d+)\.(\d+)\.(\d+)(?:-rc\.(\d+))?$/);
+    if (!match) return {
+        major: 0,
+        minor: 0,
+        patch: 0,
+        rc: undefined,
+    };
+
+    return {
+        major: Number(match[1]),
+        minor: Number(match[2]),
+        patch: Number(match[3]),
+        rc: match[4] ? Number(match[4]) : undefined,
+    };
+}
+
+export const getNewRelease = async (currentVersion: string): Promise<GitHubRelease | null> => {
+    try {
+        const response = await fetch("https://api.github.com/repos/Portabase/portabase/releases");
+        if (!response.ok) {
+            return null;
+        }
+
+        const releases: GitHubRelease[] = await response.json();
+
+        const isStable = /^\d+\.\d+\.\d+$/.test(currentVersion);
+        const isRc = /^\d+\.\d+\.\d+-rc\.\d+$/.test(currentVersion);
+
+        console.log("isStable", isStable)
+        console.log("isRc", isRc)
+
+
+        const currentParsedVersion = parseVersion(currentVersion)
+
+        const latestStableVersion = releases.find(r => !r.prerelease)
+        const latestRcVersion = releases.find(r => r.name.includes("rc"))!
+
+        if (isRc) {
+            if (!latestRcVersion) return null
+            const latestRcParsedVersion = parseVersion(latestRcVersion.name)
+            if (currentParsedVersion.major < latestRcParsedVersion.major) return latestRcVersion;
+            if (currentParsedVersion.minor < latestRcParsedVersion.minor) return latestRcVersion;
+            if (currentParsedVersion.patch < latestRcParsedVersion.patch) return latestRcVersion;
+            if (currentParsedVersion.rc! < latestRcParsedVersion.rc!) return latestRcVersion;
+
+            if (!latestStableVersion) return null
+            const latestStableParsedVersion = parseVersion(latestStableVersion.name)
+            if (currentParsedVersion.major < latestStableParsedVersion.major) return latestStableVersion;
+            if (currentParsedVersion.minor < latestStableParsedVersion.minor) return latestStableVersion;
+            if (currentParsedVersion.patch < latestStableParsedVersion.patch) return latestStableVersion;
+
+            return null;
+
+        } else if (isStable) {
+            if (!latestStableVersion) return null
+            const latestStableParsedVersion = parseVersion(latestStableVersion.name)
+            if (currentParsedVersion.major < latestStableParsedVersion.major) return latestStableVersion;
+            if (currentParsedVersion.minor < latestStableParsedVersion.minor) return latestStableVersion;
+            if (currentParsedVersion.patch < latestStableParsedVersion.patch) return latestStableVersion;
+
+            return null;
+        }
+
+        return null;
+
+    } catch (error) {
+        console.error("Failed to fetch latest release", error);
+        return null;
+    }
+};

src/lib/auth/auth.ts

@@ -517,7 +517,6 @@ export const getActiveMember = async () => {
         const member = await auth.api.getActiveMember({
             headers: await headers(),
         });
-        console.log(member);
 
         return member as MemberWithUser;
     } catch (e) {

src/lib/email/helpers.ts

@@ -1,4 +1,5 @@
 import nodemailer from "nodemailer";
+import {Server} from "./types"
 
 export const createTransporter = (server: Server) => {
     const portNumber = Number(server.port);

src/lib/email/index.ts

@@ -3,6 +3,7 @@ import {db} from "@/db";
 import {eq} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {createTransporter} from "@/lib/email/helpers";
+import {Payload} from "@/lib/email/types";
 
 export const sendEmail = async (data: Payload) => {
     const settings = await db

src/lib/email/types.ts

@@ -1,14 +1,14 @@
 "use server";
 
 
-type Payload = {
+export type Payload = {
     to: string;
     from?: string;
     subject: string;
     html: any;
 };
 
-type Server = {
+export type Server = {
     host: string;
     port: number;
     user: string;

src/lib/tasks/database/index.ts

@@ -5,7 +5,7 @@ import {enforceRetentionGFS} from "@/lib/tasks/database/retention-gsf";
 import {retentionPolicy} from "@/db/schema/07_database";
 import {isNull} from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import {eventEmitter} from "../../../../app/api/events/route";
+import {eventEmitter} from "@/features/shared/event";
 
 
 export const retentionCleanTask = async () => {

src/utils/s3-file-management.ts

@@ -19,9 +19,9 @@ async function getS3Client() {
     }
 
     const baseConfig = {
-        endPoint: settings.s3EndPointUrl ?? "",
-        accessKey: settings.s3AccessKeyId ?? "",
-        secretKey: settings.s3SecretAccessKey ?? "",
+        endPoint: settings?.s3EndPointUrl ?? "",
+        accessKey: settings?.s3AccessKeyId ?? "",
+        secretKey: settings?.s3SecretAccessKey ?? "",
     };
 
     return new Minio.Client({