diff --git a/backend/router/buckets.go b/backend/router/buckets.go index 7df76f6..b0c37eb 100644 --- a/backend/router/buckets.go +++ b/backend/router/buckets.go @@ -34,13 +34,14 @@ func (b *Buckets) GetAll(w http.ResponseWriter, r *http.Request) { return } - var bucket schema.Bucket - if err := json.Unmarshal(body, &bucket); err != nil { + var data schema.Bucket + if err := json.Unmarshal(body, &data); err != nil { ch <- schema.Bucket{ID: bucket.ID, GlobalAliases: bucket.GlobalAliases} return } - ch <- bucket + data.LocalAliases = bucket.LocalAliases + ch <- data }() } diff --git a/backend/schema/bucket.go b/backend/schema/bucket.go index 9ce8b6a..01316ec 100644 --- a/backend/schema/bucket.go +++ b/backend/schema/bucket.go @@ -1,14 +1,15 @@ package schema type GetBucketsRes struct { - ID string `json:"id"` - GlobalAliases []string `json:"globalAliases"` - LocalAliases []string `json:"localAliases"` + ID string `json:"id"` + GlobalAliases []string `json:"globalAliases"` + LocalAliases []LocalAlias `json:"localAliases"` } type Bucket struct { ID string `json:"id"` GlobalAliases []string `json:"globalAliases"` + LocalAliases []LocalAlias `json:"localAliases"` WebsiteAccess bool `json:"websiteAccess"` WebsiteConfig WebsiteConfig `json:"websiteConfig"` Keys []KeyElement `json:"keys"` @@ -21,12 +22,17 @@ type Bucket struct { Quotas Quotas `json:"quotas"` } +type LocalAlias struct { + AccessKeyID string `json:"accessKeyId"` + Alias string `json:"alias"` +} + type KeyElement struct { - AccessKeyID string `json:"accessKeyId"` - Name string `json:"name"` - Permissions Permissions `json:"permissions"` - BucketLocalAliases []interface{} `json:"bucketLocalAliases"` - SecretAccessKey string `json:"secretAccessKey"` + AccessKeyID string `json:"accessKeyId"` + Name string `json:"name"` + Permissions Permissions `json:"permissions"` + BucketLocalAliases []string `json:"bucketLocalAliases"` + SecretAccessKey string `json:"secretAccessKey"` } type Permissions struct { diff --git a/backend/schema/config.go b/backend/schema/config.go index fea2cd4..30dc0c6 100644 --- a/backend/schema/config.go +++ b/backend/schema/config.go @@ -1,18 +1,12 @@ package schema type Config struct { - CompressionLevel int64 `json:"compression_level" toml:"compression_level"` - DataDir string `json:"data_dir" toml:"data_dir"` - DBEngine string `json:"db_engine" toml:"db_engine"` - MetadataAutoSnapshotInterval string `json:"metadata_auto_snapshot_interval" toml:"metadata_auto_snapshot_interval"` - MetadataDir string `json:"metadata_dir" toml:"metadata_dir"` - ReplicationFactor int64 `json:"replication_factor" toml:"replication_factor"` - RPCBindAddr string `json:"rpc_bind_addr" toml:"rpc_bind_addr"` - RPCPublicAddr string `json:"rpc_public_addr" toml:"rpc_public_addr"` - RPCSecret string `json:"rpc_secret" toml:"rpc_secret"` - Admin Admin `json:"admin" toml:"admin"` - S3API S3API `json:"s3_api" toml:"s3_api"` - S3Web S3Web `json:"s3_web" toml:"s3_web"` + RPCBindAddr string `json:"rpc_bind_addr" toml:"rpc_bind_addr"` + RPCPublicAddr string `json:"rpc_public_addr" toml:"rpc_public_addr"` + RPCSecret string `json:"rpc_secret" toml:"rpc_secret"` + Admin Admin `json:"admin" toml:"admin"` + S3API S3API `json:"s3_api" toml:"s3_api"` + S3Web S3Web `json:"s3_web" toml:"s3_web"` } type Admin struct { diff --git a/src/pages/buckets/components/bucket-card.tsx b/src/pages/buckets/components/bucket-card.tsx index 7867226..6f5eee4 100644 --- a/src/pages/buckets/components/bucket-card.tsx +++ b/src/pages/buckets/components/bucket-card.tsx @@ -4,7 +4,7 @@ import { readableBytes } from "@/lib/utils"; import Button from "@/components/ui/button"; type Props = { - data: Bucket; + data: Bucket & { aliases: string[] }; }; const BucketCard = ({ data }: Props) => { @@ -15,7 +15,7 @@ const BucketCard = ({ data }: Props) => {

- {data.globalAliases?.join(", ")} + {data.aliases?.join(", ")}

diff --git a/src/pages/buckets/manage/permissions/allow-key-dialog.tsx b/src/pages/buckets/manage/permissions/allow-key-dialog.tsx index 62347fc..e149a3b 100644 --- a/src/pages/buckets/manage/permissions/allow-key-dialog.tsx +++ b/src/pages/buckets/manage/permissions/allow-key-dialog.tsx @@ -84,7 +84,7 @@ const AllowKeyDialog = ({ currentKeys }: Props) => { Allow Key - + Allow Key

Enter the key you want to allow access to.

@@ -100,6 +100,7 @@ const AllowKeyDialog = ({ currentKeys }: Props) => { /> Key +