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

feat: org agent management (#259)

Browse Source 
* feat: org agent management

* feat: org agent management

* fix: adding migrations for legacy and refactoring.

* fix: refactoring

* fix: delete agent

* fix: refactoring

---------

Co-authored-by: charles-gauthereau <charles.gauthereau@soluce-technologies.com>
This commit is contained in:
Charles GTE
2026-04-10 18:37:35 +02:00
committed by GitHub
co-authored by charles-gauthereau
parent a620d7a9f7
commit e38519aec2
57 changed files with 13273 additions and 2089 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/wrappers/auth/login/forgot-password-form/forgot-password.actions.ts
+1 -1
View File
@@ -6,7 +6,7 @@ import z from "zod";
import { db } from "@/db";
import {action} from "@/lib/safe-actions/actions";
//todo: to be continued...
//TODO: to be continued...
export const forgotPasswordAction = action
.schema(
z.object({
src/components/wrappers/common/bread-crumbs/bread-crumbs.tsx
+1 -1
View File
@@ -44,7 +44,7 @@ export function BreadCrumbsWrapper() {
)
}
const FORBIDDEN_LINKS = ["organization", "dashboard", "database", "admin", "settings", "notifications", "storages"];
const FORBIDDEN_LINKS = ["organization", "dashboard", "database", "admin", "notifications", "storages"];
export function BreadCrumbs({}: BreadCrumbsProps) {
src/components/wrappers/common/empty-state-placeholder.tsx
+16 -9
View File
@@ -1,6 +1,6 @@
import Link from "next/link";
import {cn} from "@/lib/utils";
import {Plus} from "lucide-react";
import {CircleSlash2, Plus} from "lucide-react";
import {forwardRef, HTMLAttributes} from "react";
type EmptyStatePlaceholderProps = {
@@ -8,25 +8,32 @@ type EmptyStatePlaceholderProps = {
onClick?: () => void;
text: string;
className?: string;
state?: string
} & HTMLAttributes<HTMLDivElement>;
export const EmptyStatePlaceholder = forwardRef<HTMLDivElement, EmptyStatePlaceholderProps>(({
url,
onClick,
text,
className,
...props
}, ref) => {
url,
onClick,
text,
state,
className,
...props
}, ref) => {
const Container = (
<div
className={cn(
"flex h-full flex-col items-center justify-center w-full rounded-2xl border border-dashed border-muted p-6 lg:p-10",
"hover:bg-muted/50 transition-colors text-muted-foreground hover:text-primary text-center space-y-4",
"transition-colors text-muted-foreground text-center space-y-4",
state != "empty" && "hover:bg-muted/50 hover:text-primary",
(onClick || url) && "cursor-pointer"
)}
onClick={onClick}
>
<Plus className="w-5 h-5 lg:w-6 lg:h-6" />
{state == "empty" ?
<CircleSlash2 className="w-5 h-5 lg:w-6 lg:h-6"/>
:
<Plus className="w-5 h-5 lg:w-6 lg:h-6"/>
}
<p className="text-sm">{text}</p>
</div>
);
src/components/wrappers/dashboard/admin/channels/organization/channels-organization.schema.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import {z} from "zod";
export const ChannelsOrganizationSchema = z.object({
organizations: z.array(z.string())
organizations: z.array(z.string().uuid())
});
export type ChannelsOrganizationType = z.infer<typeof ChannelsOrganizationSchema>;
src/components/wrappers/dashboard/admin/settings/email/email-form/email-form.action.ts
+3 -2
View File
@@ -5,6 +5,7 @@ import { eq } from "drizzle-orm";
import { db } from "@/db";
import * as drizzleDb from "@/db";
import {userAction} from "@/lib/safe-actions/actions";
import {withUpdatedAt} from "@/db/utils";
export const updateEmailSettingsAction = userAction
.schema(
@@ -18,9 +19,9 @@ export const updateEmailSettingsAction = userAction
const [updatedSettings] = await db
.update(drizzleDb.schemas.setting)
.set({
.set(withUpdatedAt({
...data,
})
}))
.where(eq(drizzleDb.schemas.setting.name, name))
.returning();
src/components/wrappers/dashboard/admin/settings/notification/settings-notification.action.ts
+3 -2
View File
@@ -10,6 +10,7 @@ import {z} from "zod";
import {
DefaultNotificationSchema
} from "@/components/wrappers/dashboard/admin/settings/notification/settings-notification.schema";
import {withUpdatedAt} from "@/db/utils";
export const updateNotificationSettingsAction = userAction
.schema(
@@ -24,9 +25,9 @@ export const updateNotificationSettingsAction = userAction
try {
const [updatedSettings] = await db
.update(drizzleDb.schemas.setting)
.set({
.set(withUpdatedAt({
defaultNotificationChannelId: data.notificationChannelId ?? null,
})
}))
.where(eq(drizzleDb.schemas.setting.name, name))
.returning();
return {
src/components/wrappers/dashboard/admin/settings/storage/settings-storage.action.ts
+3 -2
View File
@@ -8,6 +8,7 @@ import {ServerActionResult} from "@/types/action-type";
import {Setting} from "@/db/schema/01_setting";
import {z} from "zod";
import {DefaultStorageSchema} from "@/components/wrappers/dashboard/admin/settings/storage/settings-storage.schema";
import {withUpdatedAt} from "@/db/utils";
export const updateStorageSettingsAction = userAction
.schema(
@@ -22,10 +23,10 @@ export const updateStorageSettingsAction = userAction
try {
const [updatedSettings] = await db
.update(drizzleDb.schemas.setting)
.set({
.set(withUpdatedAt({
defaultStorageChannelId: data.storageChannelId,
encryption: data.encryption,
})
}))
.where(eq(drizzleDb.schemas.setting.name, name))
.returning();
return {
src/components/wrappers/dashboard/admin/settings/storage/storage-s3/s3-form.action.ts
+3 -1
View File
@@ -6,6 +6,7 @@ import { S3FormSchema, StorageSwitchSchema } from "@/components/wrappers/dashboa
import { eq } from "drizzle-orm";
import * as drizzleDb from "@/db";
import {userAction} from "@/lib/safe-actions/actions";
import {withUpdatedAt} from "@/db/utils";
export const updateS3SettingsAction = userAction
.schema(
@@ -19,7 +20,7 @@ export const updateS3SettingsAction = userAction
const [updatedSettings] = await db
.update(drizzleDb.schemas.setting)
.set({ ...data })
.set(withUpdatedAt({ ...data }))
.where(eq(drizzleDb.schemas.setting.name, name))
.returning();
@@ -40,6 +41,7 @@ export const updateStorageSettingsAction = userAction
const [updatedSettings] = await db
.update(drizzleDb.schemas.setting)
// @ts-ignore
.set({ ...data })
.where(eq(drizzleDb.schemas.setting.name, name))
.returning();
src/components/wrappers/dashboard/agent/agent-card/agent-card.tsx
+2 -1
View File
@@ -15,6 +15,7 @@ import {useAgentUpdateCheck} from "@/features/agents/hooks/use-agent-update-chec
export type agentCardProps = {
data: AgentWith;
organizationView?: boolean;
};
export const AgentCard = (props: agentCardProps) => {
@@ -34,7 +35,7 @@ export const AgentCard = (props: agentCardProps) => {
return (
<Link
href={`/dashboard/agents/${agent.id}`}
href={props.organizationView ? `/dashboard/settings/agents/${agent.id}`: `/dashboard/agents/${agent.id}`}
className="group block transition-all duration-200 outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 rounded-xl"
>
<Card className="flex flex-row items-center p-4 gap-5 transition-all border-border/50 bg-card hover:bg-accent/50 hover:border-primary/50 group-hover:shadow-md overflow-hidden">
src/components/wrappers/dashboard/agent/button-delete-agent/button-delete-agent.tsx
+7 -5
View File
@@ -9,8 +9,10 @@ import {deleteAgentAction} from "@/components/wrappers/dashboard/agent/button-de
import {useIsMobile} from "@/hooks/use-mobile";
export type ButtonDeleteAgentProps = {
text?: string;
agentId: string;
text?: string,
agentId: string,
organizationId?: string
organizationIds?: string[]
};
export const ButtonDeleteAgent = (props: ButtonDeleteAgentProps) => {
@@ -18,11 +20,11 @@ export const ButtonDeleteAgent = (props: ButtonDeleteAgentProps) => {
const isMobile = useIsMobile();
const mutation = useMutation({
mutationFn: () => deleteAgentAction(props.agentId),
mutationFn: () => deleteAgentAction({agentId: props.agentId, organizationId: props.organizationId, organizationIds: props.organizationIds}),
onSuccess: async (result: any) => {
if (result.data?.success) {
toast.success(result.data.actionSuccess.message);
router.push("/dashboard/agents");
router.push(props.organizationId ? "/dashboard/settings?tab=agents" : "/dashboard/agents");
} else {
toast.error(result.data.actionError.message || "Unknown error occurred.");
}
@@ -35,7 +37,7 @@ export const ButtonDeleteAgent = (props: ButtonDeleteAgentProps) => {
description="Are you sure you want to remove this agent? This action cannot be undone."
button={{
main: {
text: props.text ? !isMobile ? props.text: "" : "",
text: props.text ? !isMobile ? props.text : "" : "",
variant: "outline",
icon: <Trash2 color="red"/>,
},
src/components/wrappers/dashboard/agent/button-delete-agent/delete-agent.action.ts
+121 -37
View File
@@ -3,51 +3,135 @@
import {z} from "zod";
import {v4 as uuidv4} from "uuid";
import {ServerActionResult} from "@/types/action-type";
import {eq} from "drizzle-orm";
import {and, eq, inArray} from "drizzle-orm";
import {db} from "@/db";
import * as drizzleDb from "@/db";
import {Agent} from "@/db/schema/08_agent";
import {userAction} from "@/lib/safe-actions/actions";
import {zString} from "@/lib/zod";
import {withUpdatedAt} from "@/db/utils";
export const deleteAgentAction = userAction.schema(z.string()).action(async ({parsedInput}): Promise<ServerActionResult<Agent>> => {
try {
export const deleteAgentAction = userAction
.schema(
z.object({
agentId: zString(),
organizationId: zString().optional(),
organizationIds: z.array(z.string()).optional()
})
)
.action(async ({parsedInput}): Promise<ServerActionResult<Agent>> => {
const {agentId, organizationId, organizationIds} = parsedInput;
// const deletedAgent: Agent[] = await db.delete(drizzleDb.schemas.agent).where(eq(drizzleDb.schemas.agent.id, parsedInput)).returning();
try {
let projectIds: string[] = [];
const uuid = uuidv4();
const uuid = uuidv4();
if (organizationId) {
await db
.delete(drizzleDb.schemas.organizationAgent)
.where(
and(
eq(drizzleDb.schemas.organizationAgent.organizationId, organizationId),
eq(drizzleDb.schemas.organizationAgent.agentId, agentId)
)
);
const updatedAgent = await db
.update(drizzleDb.schemas.agent)
.set({
isArchived: true,
slug: uuid,
})
.where(eq(drizzleDb.schemas.agent.id, parsedInput))
.returning();
const organization = await db.query.organization.findFirst({
where: eq(drizzleDb.schemas.organization.id, organizationId),
with: {
projects: true,
}
});
projectIds = organization?.projects?.map(project => project.id) ?? [];
if (!updatedAgent[0]) {
throw new Error("Agent not found or update failed");
} else if (organizationIds) {
const organizationsToRemoveDetails = await db.query.organization.findMany({
where: inArray(drizzleDb.schemas.organization.id, organizationIds),
with: {
projects: true
}
});
projectIds = organizationsToRemoveDetails.flatMap(org =>
org.projects.map(project => project.id)
);
}
if (projectIds?.length > 0) {
const databases = await db.query.database.findMany({
where: (db, {inArray}) => inArray(db.projectId, projectIds),
columns: {id: true}
});
const databaseIds = databases.map(d => d.id);
await db
.update(drizzleDb.schemas.database)
.set(withUpdatedAt({
backupPolicy: null,
projectId: null
}))
.where(inArray(drizzleDb.schemas.database.projectId, projectIds))
.execute();
await db.delete(drizzleDb.schemas.retentionPolicy)
.where(inArray(drizzleDb.schemas.retentionPolicy.databaseId, databaseIds))
.execute();
await db.delete(drizzleDb.schemas.alertPolicy)
.where(inArray(drizzleDb.schemas.alertPolicy.databaseId, databaseIds))
.execute();
await db.delete(drizzleDb.schemas.storagePolicy)
.where(inArray(drizzleDb.schemas.storagePolicy.databaseId, databaseIds))
.execute();
}
const updatedAgent = await db
.update(drizzleDb.schemas.agent)
.set(withUpdatedAt({
isArchived: true,
slug: uuid,
deletedAt: new Date()
}))
.where(eq(drizzleDb.schemas.agent.id, agentId))
.returning();
if (!updatedAgent[0]) {
return {
success: false,
actionError: {
message: "Agent not found or update failed",
status: 404,
messageParams: {agentId: agentId},
},
};
}
return {
success: true,
value: updatedAgent[0],
actionSuccess: {
message: "Agent has been successfully deleted.",
messageParams: {projectId: agentId},
},
};
} catch (error) {
return {
success: false,
actionError: {
message: "Failed to delete agent.",
status: 500,
cause: error instanceof Error ? error.message : "Unknown error",
messageParams: {agentId: agentId},
},
};
}
return {
success: true,
value: updatedAgent[0],
actionSuccess: {
message: "Agent has been successfully deleted.",
messageParams: {projectId: parsedInput},
},
};
} catch (error) {
return {
success: false,
actionError: {
message: "Failed to delete agent.",
status: 500,
cause: error instanceof Error ? error.message : "Unknown error",
messageParams: {projectId: parsedInput},
},
};
}
});
});
src/components/wrappers/dashboard/database/import/upload-backup-zone.tsx
-2
View File
@@ -55,9 +55,7 @@ export const UploadBackupZone = ({onSuccessAction, database}: UploadRetentionZon
},
});
const acceptDbImportFiles = getFileHeadersBasedOnDbms(database.dbms)
console.log(acceptDbImportFiles)
const fileKindDescription = Object.values(acceptDbImportFiles)
.flat()
src/components/wrappers/dashboard/organization/delete-organization-button.tsx
+2
View File
@@ -10,6 +10,7 @@ import {useIsMobile} from "@/hooks/use-mobile";
export type DeleteOrganizationButtonProps = {
organizationSlug: string;
disabled?: boolean
};
export const DeleteOrganizationButton = (props: DeleteOrganizationButtonProps) => {
@@ -51,6 +52,7 @@ export const DeleteOrganizationButton = (props: DeleteOrganizationButtonProps) =
main: {
text: !isMobile ? "Delete Organization" : "",
variant: "outline",
disabled: props.disabled,
icon: <Trash2 color="red"/>,
},
confirm: {
src/components/wrappers/dashboard/organization/tabs/organization-channels-tab/organization-agents-tab.tsx
+38
View File
@@ -0,0 +1,38 @@
import {OrganizationWithMembers} from "@/db/schema/03_organization";
import {cn} from "@/lib/utils";
import {Agent} from "@/db/schema/08_agent";
import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
import {AgentCard} from "@/components/wrappers/dashboard/agent/agent-card/agent-card";
import {AgentDialog} from "@/features/agents/components/agent.dialog";
export type OrganizationAgentsTabProps = {
organization: OrganizationWithMembers;
agents: Agent[];
};
export const OrganizationAgentsTab = ({
organization,
agents,
}: OrganizationAgentsTabProps) => {
const hasAgent = agents.length > 0;
return (
<div className="flex flex-col gap-y-6 h-full py-4">
<div className="h-full flex flex-col gap-y-6">
<div className={cn("hidden flex-row justify-between items-start", hasAgent && "flex")}>
<div className="max-w-2xl ">
<h3 className="text-xl font-semibold text-balance mb-1">
Agent Settings
</h3>
</div>
<AgentDialog organization={organization} typeTrigger="create"/>
</div>
{hasAgent ? (
<CardsWithPagination data={agents} organizationView={true} cardItem={AgentCard} cardsPerPage={4} numberOfColumns={1}/>
) : (
<AgentDialog organization={organization} typeTrigger="empty"/>
)}
</div>
</div>
);
};
src/components/wrappers/dashboard/organization/tabs/organization-channels-tab/organization-notifiers-tab.tsx
-5
View File
@@ -29,11 +29,6 @@ export const OrganizationNotifiersTab = ({
Notification Settings
</h3>
</div>
{/*<NotifierAddEditModal*/}
{/* organization={organization}*/}
{/* open={isAddModalOpen}*/}
{/* onOpenChangeAction={setIsAddModalOpen}*/}
{/*/>*/}
<ChannelAddEditModal
kind={kind}
organization={organization}
src/components/wrappers/dashboard/organization/tabs/organization-tabs.tsx
+25 -3
View File
@@ -16,22 +16,32 @@ import {
import {
OrganizationStoragesTab
} from "@/components/wrappers/dashboard/organization/tabs/organization-channels-tab/organization-storages-tab";
import {
OrganizationAgentsTab
} from "@/components/wrappers/dashboard/organization/tabs/organization-channels-tab/organization-agents-tab";
import {Agent} from "@/db/schema/08_agent";
export type OrganizationTabsProps = {
organization: OrganizationWithMembers;
notificationChannels: NotificationChannel[];
storageChannels: StorageChannel[];
activeMember: MemberWithUser
activeMember: MemberWithUser;
agents: Agent[]
};
export const OrganizationTabs = ({activeMember, organization, notificationChannels, storageChannels}: OrganizationTabsProps) => {
export const OrganizationTabs = ({
activeMember,
organization,
notificationChannels,
storageChannels,
agents
}: OrganizationTabsProps) => {
const router = useRouter();
const searchParams = useSearchParams();
const [tab, setTab] = useState<string>(() => searchParams.get("tab") ?? "users");
const {
canManageUsers,
canManageNotifications,
canManageStorages
} = useOrganizationPermissions(activeMember);
@@ -71,6 +81,12 @@ export const OrganizationTabs = ({activeMember, organization, notificationChanne
>
Storages
</TabsTrigger>
<TabsTrigger
className="w-full"
value="agents"
>
Agents
</TabsTrigger>
</TabsList>
<TabsContent className="h-full" value="users">
<SettingsOrganizationMembersTable organization={organization}/>
@@ -87,6 +103,12 @@ export const OrganizationTabs = ({activeMember, organization, notificationChanne
storageChannels={storageChannels}
/>
</TabsContent>
<TabsContent className="h-full" value="agents">
<OrganizationAgentsTab
organization={organization}
agents={agents}
/>
</TabsContent>
</Tabs>
:
<SettingsOrganizationMembersTable organization={organization}/>
src/db/migrations/0049_chief_terrax.sql
+10
View File
@@ -0,0 +1,10 @@
CREATE TABLE "organization_agents" (
"organization_id" uuid NOT NULL,
"agent_id" uuid NOT NULL,
CONSTRAINT "organization_agents_organization_id_agent_id_unique" UNIQUE("organization_id","agent_id")
);
--> statement-breakpoint
ALTER TABLE "agents" ADD COLUMN "organization_id" uuid;--> statement-breakpoint
ALTER TABLE "organization_agents" ADD CONSTRAINT "organization_agents_organization_id_organization_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organization"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "organization_agents" ADD CONSTRAINT "organization_agents_agent_id_agents_id_fk" FOREIGN KEY ("agent_id") REFERENCES "public"."agents"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
ALTER TABLE "agents" ADD CONSTRAINT "agents_organization_id_organization_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organization"("id") ON DELETE cascade ON UPDATE no action;
src/db/migrations/0050_dark_saracen.sql
+31
View File
@@ -0,0 +1,31 @@
-- Custom SQL migration file, put your code below! --
DO $$
DECLARE
org RECORD;
proj RECORD;
db RECORD;
BEGIN
FOR org IN SELECT id FROM organization LOOP
FOR proj IN
SELECT id FROM projects WHERE organization_id = org.id
LOOP
FOR db IN
SELECT agent_id FROM databases WHERE project_id = proj.id
LOOP
IF db.agent_id IS NOT NULL THEN
INSERT INTO organization_agents (
organization_id,
agent_id
)
VALUES (
org.id,
db.agent_id
)
ON CONFLICT (organization_id, agent_id) DO NOTHING;
END IF;
END LOOP;
END LOOP;
END LOOP;
END $$;
src/db/migrations/0051_young_senator_kelly.sql
+3
View File
@@ -0,0 +1,3 @@
ALTER TABLE "organization_agents" ADD COLUMN "updated_at" timestamp;--> statement-breakpoint
ALTER TABLE "organization_agents" ADD COLUMN "created_at" timestamp DEFAULT now() NOT NULL;--> statement-breakpoint
ALTER TABLE "organization_agents" ADD COLUMN "deleted_at" timestamp;
src/db/migrations/0052_cute_punisher.sql
+1
View File
@@ -0,0 +1 @@
ALTER TABLE "two_factor" ADD COLUMN "verified" boolean NOT NULL;
src/db/migrations/meta/0049_snapshot.json
+2629
View File
File diff suppressed because it is too large Load Diff
src/db/migrations/meta/0050_snapshot.json
+2629
View File
File diff suppressed because it is too large Load Diff
src/db/migrations/meta/0051_snapshot.json
+2648
View File
File diff suppressed because it is too large Load Diff
src/db/migrations/meta/0052_snapshot.json
+2654
View File
File diff suppressed because it is too large Load Diff
src/db/migrations/meta/_journal.json
+28
View File
@@ -344,6 +344,34 @@
"when": 1774886139855,
"tag": "0048_yellow_eddie_brock",
"breakpoints": true
},
{
"idx": 49,
"version": "7",
"when": 1775585355435,
"tag": "0049_chief_terrax",
"breakpoints": true
},
{
"idx": 50,
"version": "7",
"when": 1775761395545,
"tag": "0050_dark_saracen",
"breakpoints": true
},
{
"idx": 51,
"version": "7",
"when": 1775762288699,
"tag": "0051_young_senator_kelly",
"breakpoints": true
},
{
"idx": 52,
"version": "7",
"when": 1775803959723,
"tag": "0052_cute_punisher",
"breakpoints": true
}
]
}
src/db/schema/02_user.ts
+1
View File
@@ -97,6 +97,7 @@ export const twoFactor = pgTable("two_factor", {
id: uuid().defaultRandom().primaryKey(),
secret: text("secret").notNull(),
backupCodes: text("backup_codes").notNull(),
verified: boolean("verified").notNull(),
userId: uuid("user_id")
.notNull()
.references(() => user.id, { onDelete: "cascade" }),
src/db/schema/07_database.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import {pgTable, text, boolean, timestamp, uuid, integer, pgEnum} from "drizzle-orm/pg-core";
import {Agent, agent} from "./08_agent";
import {Agent, agent, AgentWith} from "./08_agent";
import {Project, project} from "./06_project";
import {relations} from "drizzle-orm";
import {dbmsEnum, statusEnum} from "./types";
@@ -123,7 +123,7 @@ export type RetentionPolicy = z.infer<typeof retentionPolicySchema>;
export type DatabaseWith = Database & {
agent?: Agent | null;
agent?: Agent | AgentWith | null;
project?: Project | null;
backups?: Backup[] | null;
restorations?: Restoration[] | null;
src/db/schema/08_agent.ts
+36 -1
View File
@@ -1,9 +1,10 @@
import {boolean, pgTable, text, timestamp, uuid, integer} from "drizzle-orm/pg-core";
import {boolean, pgTable, text, timestamp, uuid, integer, unique} from "drizzle-orm/pg-core";
import {createSelectSchema} from "drizzle-zod";
import {z} from "zod";
import {Database, database} from "@/db/schema/07_database";
import {relations} from "drizzle-orm";
import {timestamps} from "@/db/schema/00_common";
import {organization} from "@/db/schema/03_organization";
export const agent = pgTable("agents", {
id: uuid("id").primaryKey().defaultRandom(),
@@ -14,22 +15,56 @@ export const agent = pgTable("agents", {
description: text("description").notNull(),
isArchived: boolean("is_archived").default(false),
lastContact: timestamp("last_contact"),
organizationId: uuid("organization_id").references(() => organization.id, {onDelete: "cascade"}),
...timestamps
});
export const organizationAgent = pgTable(
"organization_agents",
{
organizationId: uuid('organization_id')
.notNull()
.references(() => organization.id, {onDelete: 'cascade'}),
agentId: uuid('agent_id')
.notNull()
.references(() => agent.id, {onDelete: 'cascade'}),
...timestamps
},
(t) => [unique().on(t.organizationId, t.agentId)]
);
export const agentSchema = createSelectSchema(agent);
export type Agent = z.infer<typeof agentSchema>;
export const agentRelations = relations(agent, ({many}) => ({
databases: many(database),
organizations: many(organizationAgent),
}));
export const organizationAgentRelations = relations(organizationAgent, ({one}) => ({
organization: one(organization, {
fields: [organizationAgent.organizationId],
references: [organization.id],
}),
agent: one(agent, {
fields: [organizationAgent.agentId],
references: [agent.id],
}),
}));
export type AgentWith = Agent & {
databases?: Database[] | null;
organizations: {
organizationId: string;
agentId: string;
}[];
};
export type AgentWithDatabases = Agent & {
databases: Database[] | [];
};
src/db/schema/12_storage-channel.ts
-3
View File
@@ -4,8 +4,6 @@ import {organization} from "@/db/schema/03_organization";
import {relations} from "drizzle-orm";
import {createSelectSchema} from "drizzle-zod";
import {z} from "zod";
import {database} from "@/db/schema/07_database";
export const providerStorageKindEnum = pgEnum('provider_storage_kind', ['local', 's3', 'google-drive']);
@@ -32,7 +30,6 @@ export const organizationStorageChannel = pgTable(
(t) => [unique().on(t.organizationId, t.storageChannelId)]
);
export const storageChannelRelations = relations(storageChannel, ({many}) => ({
organizations: many(organizationStorageChannel),
}));
src/db/schema/13_storage-policy.ts
+1 -4
View File
@@ -1,13 +1,10 @@
import {boolean, pgTable, uuid} from "drizzle-orm/pg-core";
import {timestamps} from "@/db/schema/00_common";
import {relations} from "drizzle-orm";
import {Backup, Database, database, Restoration, RetentionPolicy} from "@/db/schema/07_database";
import {database} from "@/db/schema/07_database";
import {createSelectSchema} from "drizzle-zod";
import {z} from "zod";
import {StorageChannel, storageChannel} from "@/db/schema/12_storage-channel";
import {Agent} from "@/db/schema/08_agent";
import {Project} from "@/db/schema/06_project";
import {AlertPolicy} from "@/db/schema/10_alert-policy";
export const storagePolicy = pgTable('storage_policy', {
id: uuid('id').defaultRandom().primaryKey(),
src/db/services/agent.ts
+43
View File
@@ -0,0 +1,43 @@
import {and, desc, eq, sql} from "drizzle-orm";
import {db} from "@/db";
import {Agent, agent, organizationAgent} from "@/db/schema/08_agent";
import {Database, database} from "@/db/schema/07_database";
export async function getOrganizationAgents(organizationId: string) {
return await db
.select({
id: agent.id,
name: agent.name,
organizationId: agent.organizationId,
slug: agent.slug,
healthErrorCount: agent.healthErrorCount,
description: agent.description,
isArchived: agent.isArchived,
lastContact: agent.lastContact,
version: agent.version,
updatedAt: agent.updatedAt,
createdAt: agent.createdAt,
deletedAt: agent.deletedAt,
databases: sql<Database[]>`
COALESCE(
json_agg(${database}.*) FILTER (WHERE ${database}.id IS NOT NULL),
'[]'
)
`,
})
.from(organizationAgent)
.innerJoin(
agent,
eq(organizationAgent.agentId, agent.id)
)
.leftJoin(database, eq(database.agentId, agent.id))
.groupBy(agent.id)
.orderBy(desc(agent.createdAt))
.where(
and(
eq(organizationAgent.organizationId, organizationId),
eq(agent.isArchived, false)
)
) as unknown as Agent[];
}
src/db/services/database.ts
+39
View File
@@ -0,0 +1,39 @@
"use server"
import {db} from "@/db";
import {DatabaseWith} from "@/db/schema/07_database";
import {AgentWith} from "@/db/schema/08_agent";
export async function getOrganizationAvailableDatabases(
organizationId: string,
projectId?: string
) {
const availableDatabases = (
await db.query.database.findMany({
where: (db, { eq, or, isNull }) =>
projectId
? or(isNull(db.projectId), eq(db.projectId, projectId))
: isNull(db.projectId),
with: {
agent: {
with: {
organizations: true
}
},
project: true,
backups: true,
restorations: true,
},
orderBy: (db, {desc}) => [desc(db.createdAt)],
})
) as DatabaseWith[];
return availableDatabases.filter(db => {
const agent = db.agent as AgentWith;
if (agent?.isArchived) return false;
return (
agent?.organizationId === organizationId ||
agent?.organizations?.some(org => org.organizationId === organizationId)
);
})
}
src/features/agents/agents.action.ts
+17 -5
View File
@@ -10,18 +10,30 @@ import {getHealthLast12hLogs} from "@/db/services/healthcheck";
const verifySlugUniqueness = async (slug: string, agentId?: string) => {
const conditions = agentId ? and(eq(drizzleDb.schemas.agent.slug, slug), ne(drizzleDb.schemas.agent.id, agentId)) : eq(drizzleDb.schemas.agent.slug, slug);
const [countResult] = await db.select({count: count()}).from(drizzleDb.schemas.agent).where(conditions);
if (countResult.count > 0) {
throw new ActionError("Slug already exists");
}
};
export const createAgentAction = userAction.schema(AgentSchema).action(async ({parsedInput}) => {
const slug = slugify(parsedInput.name);
export const createAgentAction = userAction.schema(
z.object({
organizationId: z.string().optional(),
data: AgentSchema,
})
).action(async ({parsedInput}) => {
const slug = slugify(parsedInput.data.name);
await verifySlugUniqueness(slug);
const [createdAgent] = await db.insert(drizzleDb.schemas.agent).values({...parsedInput, slug: slug}).returning();
const [createdAgent] = await db.insert(drizzleDb.schemas.agent).values({...parsedInput.data, slug: slug, organizationId: parsedInput.organizationId}).returning();
if (createdAgent && parsedInput.organizationId){
await db.insert(drizzleDb.schemas.organizationAgent).values({
organizationId: parsedInput.organizationId,
agentId: createdAgent.id,
});
}
return {
data: createdAgent,
};
src/features/agents/agents.schema.ts
+1
View File
@@ -3,6 +3,7 @@ import { z } from "zod";
export const AgentSchema = z.object({
name: z.string().nonempty("Name is required"),
description: z.string(),
});
export type AgentType = z.infer<typeof AgentSchema>;
src/features/agents/components/agent-organizations.action.ts
+129
View File
@@ -0,0 +1,129 @@
"use server"
import {userAction} from "@/lib/safe-actions/actions";
import {z} from "zod";
import {ServerActionResult} from "@/types/action-type";
import {db} from "@/db";
import {and, eq, inArray} from "drizzle-orm";
import * as drizzleDb from "@/db";
import {AgentWith} from "@/db/schema/08_agent";
import {withUpdatedAt} from "@/db/utils";
export const updateAgentOrganizationsAction = userAction
.schema(
z.object({
data: z.array(z.string()),
id: z.string(),
})
)
.action(async ({parsedInput , ctx}): Promise<ServerActionResult<null>> => {
try {
const organizationsIds = parsedInput.data;
const agentId = parsedInput.id;
const agent = await db.query.agent.findFirst({
where: eq(drizzleDb.schemas.agent.id, agentId),
with: {
organizations: true,
databases: true
}
}) as AgentWith;
if (!agent) {
return {
success: false,
actionError: {
message: "Agent not found.",
status: 404,
cause: "not_found",
},
};
}
const existingItemIds = agent.organizations.map((organization) => organization.organizationId);
const organizationsToAdd = organizationsIds.filter((id) => !existingItemIds.includes(id));
const organizationsToRemove = existingItemIds.filter((id) => !organizationsIds.includes(id));
if (organizationsToAdd.length > 0) {
for (const organizationToAdd of organizationsToAdd) {
await db.insert(drizzleDb.schemas.organizationAgent).values({
organizationId: organizationToAdd,
agentId: agentId
});
}
}
if (organizationsToRemove.length > 0) {
await db.delete(drizzleDb.schemas.organizationAgent).where(and(inArray(drizzleDb.schemas.organizationAgent.organizationId, organizationsToRemove), eq(drizzleDb.schemas.organizationAgent.agentId,agentId))).execute();
const organizationsToRemoveDetails = await db.query.organization.findMany({
where: inArray(drizzleDb.schemas.organization.id, organizationsToRemove),
with: {
projects: true
}
});
const projectIds = organizationsToRemoveDetails.flatMap(org =>
org.projects.map(project => project.id)
);
if (projectIds.length > 0) {
const databases = await db.query.database.findMany({
where: (db, { inArray }) => inArray(db.projectId, projectIds),
columns: { id: true }
});
const databaseIds = databases.map(d => d.id);
await db
.update(drizzleDb.schemas.database)
.set(withUpdatedAt({
backupPolicy: null,
projectId: null
}))
.where(inArray(drizzleDb.schemas.database.projectId, projectIds))
.execute();
await db.delete(drizzleDb.schemas.retentionPolicy)
.where(inArray(drizzleDb.schemas.retentionPolicy.databaseId, databaseIds))
.execute();
await db.delete(drizzleDb.schemas.alertPolicy)
.where(inArray(drizzleDb.schemas.alertPolicy.databaseId, databaseIds))
.execute();
await db.delete(drizzleDb.schemas.storagePolicy)
.where(inArray(drizzleDb.schemas.storagePolicy.databaseId, databaseIds))
.execute();
}
}
return {
success: true,
value: null,
actionSuccess: {
message: "Agent organizations has been successfully updated.",
messageParams: {agentId: agentId},
},
};
} catch (error) {
console.error("Error updating agent organizations:", error);
return {
success: false,
actionError: {
message: "Failed to update agent organizations.",
status: 500,
cause: "server_error",
messageParams: {message: "Error updating the agent organizations"},
},
};
}
});
src/features/agents/components/agent-organizations.form.tsx
+106
View File
@@ -0,0 +1,106 @@
"use client";
import {useRouter} from "next/navigation";
import {useMutation} from "@tanstack/react-query";
import {Form, FormControl, FormField, FormItem, useZodForm} from "@/components/ui/form";
import {ButtonWithLoading} from "@/components/wrappers/common/button/button-with-loading";
import {OrganizationWithMembers} from "@/db/schema/03_organization";
import {MultiSelect} from "@/components/wrappers/common/multiselect/multi-select";
import {toast} from "sonner";
import {AgentWith} from "@/db/schema/08_agent";
import {AgentOrganizationSchema, AgentOrganizationType} from "@/features/agents/components/agent-organizations.schema";
import {updateAgentOrganizationsAction} from "@/features/agents/components/agent-organizations.action";
type AgentOrganisationFormProps = {
organizations?: OrganizationWithMembers[];
defaultValues?: AgentWith
};
export const AgentOrganisationForm = ({
organizations,
defaultValues,
}: AgentOrganisationFormProps) => {
const router = useRouter();
const defaultOrganizationIds = defaultValues?.organizations?.map(organization => organization.organizationId) ?? []
const form = useZodForm({
schema: AgentOrganizationSchema,
// @ts-ignore
defaultValues: {
organizations: defaultOrganizationIds
},
});
const formatOrganizationsList = (organizations: OrganizationWithMembers[]) => {
return organizations
.map((organization) => ({
value: organization.id,
label: `${organization.name}`,
}));
};
const mutation = useMutation({
mutationFn: async (values: AgentOrganizationType) => {
const payload = {
data: values.organizations,
id: defaultValues?.id ?? ""
};
const result = await updateAgentOrganizationsAction(payload)
const inner = result?.data;
if (inner?.success) {
toast.success(inner.actionSuccess?.message);
router.refresh();
} else {
toast.error(inner?.actionError?.message);
}
}
});
return (
<Form
form={form}
className="flex flex-col gap-4"
onSubmit={async (values) => {
await mutation.mutateAsync(values);
}}
>
<FormField
control={form.control}
name={`organizations`}
render={({field}) => (
<FormItem>
<FormControl>
<MultiSelect
options={formatOrganizationsList(organizations ?? [])}
onValueChange={field.onChange}
defaultValue={field.value ?? []}
placeholder="Select organization(s)"
variant="inverted"
animation={0}
/>
</FormControl>
</FormItem>
)}
/>
<div className="flex justify-end">
<div className="flex gap-2 justify-end">
<ButtonWithLoading isPending={mutation.isPending}>
Save
</ButtonWithLoading>
</div>
</div>
</Form>
);
};
src/features/agents/components/agent-organizations.schema.ts
+7
View File
@@ -0,0 +1,7 @@
import {z} from "zod";
export const AgentOrganizationSchema = z.object({
organizations: z.array(z.string().uuid())
});
export type AgentOrganizationType = z.infer<typeof AgentOrganizationSchema>;
src/features/agents/components/agent.dialog.tsx
+49 -13
View File
@@ -10,19 +10,24 @@ import {
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";
import {useRouter} from "next/navigation";
import {OrganizationWithMembers} from "@/db/schema/03_organization";
import {Tabs, TabsContent, TabsList, TabsTrigger} from "@/components/ui/tabs";
import {AgentOrganisationForm} from "@/features/agents/components/agent-organizations.form";
import {AgentWith} from "@/db/schema/08_agent";
type AgentDialogProps = {
agent?: AgentType & { id: string };
agent?: AgentWith;
typeTrigger: "edit" | "empty" | "create";
organization?: OrganizationWithMembers;
adminView?: boolean,
organizations?: OrganizationWithMembers[];
};
export const AgentDialog = ({agent, typeTrigger}: AgentDialogProps) => {
export const AgentDialog = ({agent, typeTrigger, organization, adminView, organizations}: AgentDialogProps) => {
const [open, setOpen] = useState(false);
const isEdit = !!agent;
const router = useRouter();
@@ -36,7 +41,7 @@ export const AgentDialog = ({agent, typeTrigger}: AgentDialogProps) => {
</div>
);
case "empty":
return <EmptyStatePlaceholder text="Create new Agent"/>;
return <EmptyStatePlaceholder className="h-full" text="Create new Agent"/>;
case "create":
return <Button><Plus className="mr-2 h-4 w-4"/> Create Agent</Button>;
default:
@@ -53,14 +58,45 @@ export const AgentDialog = ({agent, typeTrigger}: AgentDialogProps) => {
<DialogHeader>
<DialogTitle>{isEdit ? `Edit ${agent.name}` : "Create new agent"}</DialogTitle>
</DialogHeader>
<AgentForm
onSuccess={() => {
setOpen(false)
router.refresh()
}}
defaultValues={agent}
agentId={agent?.id}
/>
<>
{adminView ?
<Tabs className="flex flex-col flex-1" defaultValue="configuration">
<TabsList className="grid w-full grid-cols-2">
<TabsTrigger value="configuration">Configuration</TabsTrigger>
<TabsTrigger value="organizations">Organizations</TabsTrigger>
</TabsList>
<TabsContent className="h-full justify-between" value="configuration">
<AgentForm
organization={organization}
onSuccess={() => {
setOpen(false)
router.refresh()
}}
defaultValues={agent}
agentId={agent?.id}
/>
</TabsContent>
<TabsContent className="h-full justify-between" value="organizations">
<AgentOrganisationForm
defaultValues={agent}
organizations={organizations}
/>
</TabsContent>
</Tabs>
:
<>
<AgentForm
organization={organization}
onSuccess={() => {
setOpen(false)
router.refresh()
}}
defaultValues={agent}
agentId={agent?.id}
/>
</>
}
</>
</DialogContent>
</Dialog>
);
src/features/agents/components/agent.form.tsx
+8 -2
View File
@@ -18,11 +18,14 @@ import {TooltipProvider} from "@/components/ui/tooltip";
import {AgentSchema, AgentType} from "@/features/agents/agents.schema";
import {toast} from "sonner";
import {createAgentAction, updateAgentAction} from "@/features/agents/agents.action";
import {OrganizationWithMembers} from "@/db/schema/03_organization";
export type agentFormProps = {
defaultValues?: AgentType;
agentId?: string;
onSuccess?: (data: any) => void;
organization?: OrganizationWithMembers;
};
export const AgentForm = (props: agentFormProps) => {
@@ -40,7 +43,10 @@ export const AgentForm = (props: agentFormProps) => {
mutationFn: async (values: AgentType) => {
const createAgent = isCreate
? await createAgentAction(values)
? await createAgentAction({
organizationId: props.organization?.id ?? undefined,
data: values
})
: await updateAgentAction({
id: props.agentId ?? "-",
data: values,
@@ -61,7 +67,7 @@ export const AgentForm = (props: agentFormProps) => {
if (props.onSuccess) {
props.onSuccess(data);
} else {
router.push(`/dashboard/agents/${data.id}`);
router.push(props.organization ?`/dashboard/settings/agents/${data.id}` : `/dashboard/agents/${data.id}`);
}
},
});
src/lib/acl/organization-acl.ts
+2
View File
@@ -7,6 +7,7 @@ export type OrganizationPermissions = {
isAdmin: boolean;
isMember: boolean;
canManageAgents: boolean;
canManageSettings: boolean;
canManageUsers: boolean;
canManageNotifications: boolean;
@@ -31,6 +32,7 @@ export const computeOrganizationPermissions = (
isMember,
canManageSettings: isOwner || isAdmin,
canManageAgents: isOwner || isAdmin,
canManageUsers: isOwner || isAdmin,
canManageNotifications: isOwner || isAdmin,
canManageStorages: isOwner || isAdmin,
src/lib/auth/auth.ts
+1 -1
View File
@@ -30,7 +30,7 @@ export const auth = betterAuth({
onAPIError: {
errorURL: "/error",
onError: (error, ctx) => {
//todo: capture errors in a monitoring service
//TODO: capture errors in a monitoring service
},
},
database: drizzleAdapter(db, {
src/utils/init.ts
+2 -1
View File
@@ -6,6 +6,7 @@ import {cleaningHealthcheckLogsJob, cleaningJob, healthcheckAgentAndDatabaseJob,
import { generateRSAKeys, getOrCreateMasterKey } from "@/utils/rsa-keys";
import { StorageProviderKind } from "@/features/storages/types";
import {logger} from "@/lib/logger";
import {withUpdatedAt} from "@/db/utils";
const log = logger.child({module: "init"});
@@ -103,7 +104,7 @@ async function createSettingsIfNotExist() {
if (!finalSystemSetting.defaultStorageChannelId) {
await tx
.update(drizzleDb.schemas.setting)
.set({ defaultStorageChannelId: localStorage.id })
.set(withUpdatedAt({ defaultStorageChannelId: localStorage.id }))
.where(eq(drizzleDb.schemas.setting.id, finalSystemSetting.id));
}
});