Skip to content

feat: move bucket modules to top-level lists #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
overtrue merged 1 commit into from
May 13, 2026
Merged

feat: move bucket modules to top-level lists #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 1 addition & 55 deletions app/(dashboard)/buckets/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,14 @@ import { useSearchParams } from "next/navigation"
import { useTranslation } from "react-i18next"
import { Page } from "@/components/page"
import { PageHeader } from "@/components/page-header"
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
import { BucketInfo } from "@/components/buckets/info"
import { usePermissions } from "@/hooks/use-permissions"
import { CONSOLE_SCOPES } from "@/lib/console-permissions"
import { BucketLifecycleTab } from "@/components/buckets/lifecycle-tab"
import { BucketReplicationTab } from "@/components/buckets/replication-tab"
import { BucketEventsTab } from "@/components/buckets/events-tab"

export default function BucketSettingsPage() {
const { t } = useTranslation()
const searchParams = useSearchParams()
const { hasPermission } = usePermissions()

const bucketName = searchParams.get("bucket") ?? ""

const canViewLifecycle = hasPermission(CONSOLE_SCOPES.VIEW_BUCKET_LIFECYCLE)
const canViewReplication = hasPermission(CONSOLE_SCOPES.VIEW_BUCKET_REPLICATION)
const canViewEvents = hasPermission(CONSOLE_SCOPES.VIEW_BUCKET_EVENTS)

return (
<Page>
<PageHeader>
Expand All @@ -31,50 +20,7 @@ export default function BucketSettingsPage() {
</h1>
</PageHeader>

<Tabs defaultValue="overview" className="w-full space-y-6">
<TabsList className="inline-flex h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground">
<TabsTrigger value="overview" className="px-4">
{t("Overview")}
</TabsTrigger>
{canViewLifecycle && (
<TabsTrigger value="lifecycle" className="px-4">
{t("Lifecycle")}
</TabsTrigger>
)}
{canViewReplication && (
<TabsTrigger value="replication" className="px-4">
{t("Replication")}
</TabsTrigger>
)}
{canViewEvents && (
<TabsTrigger value="events" className="px-4">
{t("Events")}
</TabsTrigger>
)}
</TabsList>

<TabsContent value="overview" className="space-y-4 outline-none">
{bucketName ? <BucketInfo bucketName={bucketName} /> : null}
</TabsContent>

{canViewLifecycle && (
<TabsContent value="lifecycle" className="space-y-4 outline-none">
{bucketName ? <BucketLifecycleTab bucketName={bucketName} /> : null}
</TabsContent>
)}

{canViewReplication && (
<TabsContent value="replication" className="space-y-4 outline-none">
{bucketName ? <BucketReplicationTab bucketName={bucketName} /> : null}
</TabsContent>
)}

{canViewEvents && (
<TabsContent value="events" className="space-y-4 outline-none">
{bucketName ? <BucketEventsTab bucketName={bucketName} /> : null}
</TabsContent>
)}
</Tabs>
{bucketName ? <BucketInfo bucketName={bucketName} /> : null}
</Page>
)
}
207 changes: 28 additions & 179 deletions app/(dashboard)/events/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,200 +1,49 @@
"use client"

import { useState, useEffect, useCallback, useMemo } from "react"
import Link from "next/link"
import { useSearchParams } from "next/navigation"
import { useTranslation } from "react-i18next"
import { RiAddLine, RiRefreshLine } from "@remixicon/react"
import { RiArrowLeftLine } from "@remixicon/react"
import { Button } from "@/components/ui/button"
import { Page } from "@/components/page"
import { PageHeader } from "@/components/page-header"
import { BucketSelector } from "@/components/buckets/selector"
import { DataTable } from "@/components/data-table/data-table"
import { useDataTable } from "@/hooks/use-data-table"
import { EventsNewForm } from "@/components/events/new-form"
import { getEventsColumns } from "@/components/events/columns"
import { useBucket } from "@/hooks/use-bucket"
import { usePermissions } from "@/hooks/use-permissions"
import { useDialog } from "@/lib/feedback/dialog"
import { useMessage } from "@/lib/feedback/message"
import type { NotificationItem } from "@/lib/events"
import { BucketList } from "@/components/buckets/list"
import { BucketEventsTab } from "@/components/buckets/events-tab"
import { buildModuleBucketPath } from "@/lib/module-bucket-route"

export default function EventsPage() {
const { t } = useTranslation()
const message = useMessage()
const dialog = useDialog()
const { listBucketNotifications, putBucketNotifications } = useBucket()
const { canCapability } = usePermissions()

const [bucketName, setBucketName] = useState<string | null>(null)
const [data, setData] = useState<NotificationItem[]>([])
const [loading, setLoading] = useState(false)
const [newFormOpen, setNewFormOpen] = useState(false)

const canEditEvents = bucketName ? canCapability("bucket.events.edit", { bucket: bucketName }) : false

const loadData = useCallback(async () => {
if (!bucketName) {
setData([])
return
}
setLoading(true)
try {
const response = await listBucketNotifications(bucketName)
const notifications: NotificationItem[] = []

const addFromConfig = (
configs: Array<{
Id?: string
LambdaFunctionArn?: string
QueueArn?: string
TopicArn?: string
Events?: string[]
Filter?: { Key?: { FilterRules?: Array<{ Name: string; Value: string }> } }
}>,
type: NotificationItem["type"],
arnKey: "LambdaFunctionArn" | "QueueArn" | "TopicArn",
) => {
;(configs ?? []).forEach(
(config: {
Id?: string
Filter?: { Key?: { FilterRules?: Array<{ Name: string; Value: string }> } }
Events?: string[]
}) => {
const prefix = config.Filter?.Key?.FilterRules?.find((r) => r.Name === "Prefix")?.Value
const suffix = config.Filter?.Key?.FilterRules?.find((r) => r.Name === "Suffix")?.Value
const arn = (config as Record<string, string>)[arnKey]
notifications.push({
id: config.Id ?? "",
type,
arn: arn ?? "",
events: config.Events ?? [],
prefix,
suffix,
filterRules: config.Filter?.Key?.FilterRules ?? [],
})
},
)
}

const r = response as {
LambdaFunctionConfigurations?: unknown[]
QueueConfigurations?: unknown[]
TopicConfigurations?: unknown[]
}

addFromConfig((r?.LambdaFunctionConfigurations ?? []) as never[], "Lambda", "LambdaFunctionArn")
addFromConfig((r?.QueueConfigurations ?? []) as never[], "SQS", "QueueArn")
addFromConfig((r?.TopicConfigurations ?? []) as never[], "SNS", "TopicArn")

setData(notifications)
} catch (error) {
console.error(t("Get Notification Config Failed"), error)
setData([])
} finally {
setLoading(false)
}
}, [bucketName, listBucketNotifications, t])

useEffect(() => {
loadData()
}, [loadData])

const handleRowDelete = useCallback(
async (row: NotificationItem) => {
const confirmed = await new Promise<boolean>((resolve) => {
dialog.warning({
title: t("Confirm Delete"),
content: t("Are you sure you want to delete this notification configuration?"),
positiveText: t("Delete"),
negativeText: t("Cancel"),
onPositiveClick: () => resolve(true),
onNegativeClick: () => resolve(false),
})
})

if (!confirmed || !bucketName) return

try {
setLoading(true)
const currentResponse = await listBucketNotifications(bucketName)
const currentNotifications = (currentResponse ?? {}) as unknown as Record<string, unknown[]>

const configKey =
row.type === "Lambda"
? "LambdaFunctionConfigurations"
: row.type === "SQS"
? "QueueConfigurations"
: "TopicConfigurations"
const configs = (currentNotifications as Record<string, Array<{ Id?: string }>>)[configKey]
const updated = configs?.filter((c) => c.Id !== row.id) ?? []

const newConfig = {
...currentNotifications,
...(row.type === "Lambda"
? { LambdaFunctionConfigurations: updated }
: row.type === "SQS"
? { QueueConfigurations: updated }
: { TopicConfigurations: updated }),
}

await putBucketNotifications(bucketName, newConfig)
message.success(t("Delete Success"))
loadData()
} catch (error) {
console.error(t("Delete Failed"), error)
message.error(`${t("Delete Failed")}: ${(error as Error).message ?? error}`)
} finally {
setLoading(false)
}
},
[bucketName, dialog, listBucketNotifications, loadData, message, putBucketNotifications, t],
)

const columns = useMemo(
() => getEventsColumns(t, handleRowDelete, canEditEvents),
[t, handleRowDelete, canEditEvents],
)

const { table } = useDataTable<NotificationItem>({
data,
columns,
getRowId: (row) => row.id,
})
const searchParams = useSearchParams()
const bucketName = searchParams.get("bucket") ?? ""

if (!bucketName) {
return (
<Page>
<BucketList
title={<h1 className="text-2xl font-bold">{t("Events")}</h1>}
emptyDescription={t("Create a bucket to start storing objects.")}
getBucketHref={(name) => buildModuleBucketPath("/events", name)}
/>
</Page>
)
}

return (
<Page>
<PageHeader
actions={
<>
<BucketSelector
value={bucketName}
onChange={setBucketName}
placeholder={t("Please select bucket")}
selectorClass="w-full"
/>
<Button type="button" variant="outline" onClick={() => setNewFormOpen(true)} disabled={!bucketName}>
<RiAddLine className="size-4" aria-hidden />
<span>{t("Add Event Subscription")}</span>
</Button>
<Button type="button" variant="outline" onClick={loadData} disabled={loading}>
<RiRefreshLine className="size-4" aria-hidden />
<span>{t("Refresh")}</span>
</Button>
</>
<Button variant="outline" nativeButton={false} render={<Link href="/events" />}>
<RiArrowLeftLine className="size-4" />
<span>{t("Buckets")}</span>
</Button>
}
>
<h1 className="text-2xl font-bold">{t("Events")}</h1>
<h1 className="text-2xl font-bold">
{t("Events")}: {bucketName}
</h1>
</PageHeader>

<DataTable
table={table}
isLoading={loading}
emptyTitle={t("No Data")}
emptyDescription={t("Add Event Subscription to get started")}
/>

{bucketName && (
<EventsNewForm open={newFormOpen} onOpenChange={setNewFormOpen} bucketName={bucketName} onSuccess={loadData} />
)}
<BucketEventsTab bucketName={bucketName} hideTitle />
</Page>
)
}
Loading
Loading