2025-04-28 14:59:31 +07:00
10 changed files with 48 additions and 73 deletions
--- a/README.md
+++ b/README.md
@ -31,7 +31,7 @@ If you install Garage using Docker, you can install this web UI alongside Garage
 ```yml
 services:
  garage:
-    image: dxflrs/garage:v1.0.1
+    image: dxflrs/garage:v1.0.0
    container_name: garage
    volumes:
      - ./garage.toml:/etc/garage.toml
@ -55,7 +55,7 @@ services:
 Get the latest binary from the [release page](https://github.com/khairul169/garage-webui/releases/latest) according to your OS architecture. For example:

 ```sh
-$ wget -O garage-webui https://github.com/khairul169/garage-webui/releases/download/1.0.4/garage-webui-v1.0.4-linux-amd64
+$ wget -O garage-webui https://github.com/khairul169/garage-webui/releases/download/1.0.3/garage-webui-v1.0.3-linux-amd64
 $ chmod +x garage-webui
 $ sudo cp garage-webui /usr/local/bin
 ```
--- a/backend/router/buckets.go
+++ b/backend/router/buckets.go
@ -34,14 +34,13 @@ func (b *Buckets) GetAll(w http.ResponseWriter, r *http.Request) {
 				return
 			}

-			var data schema.Bucket
-			if err := json.Unmarshal(body, &data); err != nil {
+			var bucket schema.Bucket
+			if err := json.Unmarshal(body, &bucket); err != nil {
 				ch <- schema.Bucket{ID: bucket.ID, GlobalAliases: bucket.GlobalAliases}
 				return
 			}

-			data.LocalAliases = bucket.LocalAliases
-			ch <- data
+			ch <- bucket
 		}()
 	}

--- a/backend/schema/bucket.go
+++ b/backend/schema/bucket.go
@ -1,15 +1,14 @@
 package schema

 type GetBucketsRes struct {
-	ID            string       `json:"id"`
-	GlobalAliases []string     `json:"globalAliases"`
-	LocalAliases  []LocalAlias `json:"localAliases"`
+	ID            string   `json:"id"`
+	GlobalAliases []string `json:"globalAliases"`
+	LocalAliases  []string `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"`
@ -22,17 +21,12 @@ 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 []string    `json:"bucketLocalAliases"`
-	SecretAccessKey    string      `json:"secretAccessKey"`
+	AccessKeyID        string        `json:"accessKeyId"`
+	Name               string        `json:"name"`
+	Permissions        Permissions   `json:"permissions"`
+	BucketLocalAliases []interface{} `json:"bucketLocalAliases"`
+	SecretAccessKey    string        `json:"secretAccessKey"`
 }

 type Permissions struct {
--- a/backend/schema/config.go
+++ b/backend/schema/config.go
@ -1,12 +1,18 @@
 package schema

 type Config struct {
-	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"`
+	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"`
 }

 type Admin struct {
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "garage-webui",
  "private": true,
-  "version": "1.0.4",
+  "version": "1.0.3",
  "type": "module",
  "scripts": {
    "dev:client": "vite",
--- 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 & { aliases: string[] };
+  data: Bucket;
 };

 const BucketCard = ({ data }: Props) => {
@ -15,7 +15,7 @@ const BucketCard = ({ data }: Props) => {
          <ArchiveIcon size={28} className="shrink-0" />

          <p className="text-xl font-medium truncate">
-            {data.aliases?.join(", ")}
+            {data.globalAliases?.join(", ")}
          </p>
        </div>

--- 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
      </Button>

-      <Modal ref={dialogRef} backdrop open={isOpen} className="max-w-2xl">
+      <Modal ref={dialogRef} backdrop open={isOpen}>
        <Modal.Header className="mb-1">Allow Key</Modal.Header>
        <Modal.Body>
          <p>Enter the key you want to allow access to.</p>
@ -100,7 +100,6 @@ const AllowKeyDialog = ({ currentKeys }: Props) => {
                  />
                  Key
                </label>
-                <label>Local Aliases</label>
                <label className="flex items-center gap-2 cursor-pointer">
                  <Checkbox
                    color="primary"
@ -130,31 +129,23 @@ const AllowKeyDialog = ({ currentKeys }: Props) => {
              <Table.Body>
                {!keyFields.length ? (
                  <tr>
-                    <td colSpan={5} className="text-center">
+                    <td colSpan={4} className="text-center">
                      No keys found
                    </td>
                  </tr>
                ) : null}
-                {keyFields.map((field, index) => {
-                  const curKey = bucket.keys.find(
-                    (key) => key.accessKeyId === field.keyId
-                  );
-                  return (
-                    <Table.Row key={field.id}>
-                      <CheckboxField
-                        form={form}
-                        name={`keys.${index}.checked`}
-                        label={field.name || field.keyId?.substring(0, 8)}
-                      />
-                      <span>
-                        {curKey?.bucketLocalAliases?.join(", ") || "-"}
-                      </span>
-                      <CheckboxField form={form} name={`keys.${index}.read`} />
-                      <CheckboxField form={form} name={`keys.${index}.write`} />
-                      <CheckboxField form={form} name={`keys.${index}.owner`} />
-                    </Table.Row>
-                  );
-                })}
+                {keyFields.map((field, index) => (
+                  <Table.Row key={field.id}>
+                    <CheckboxField
+                      form={form}
+                      name={`keys.${index}.checked`}
+                      label={field.name || field.keyId?.substring(0, 8)}
+                    />
+                    <CheckboxField form={form} name={`keys.${index}.read`} />
+                    <CheckboxField form={form} name={`keys.${index}.write`} />
+                    <CheckboxField form={form} name={`keys.${index}.owner`} />
+                  </Table.Row>
+                ))}
              </Table.Body>
            </Table>
          </div>
--- a/src/pages/buckets/manage/permissions/permissions-tab.tsx
+++ b/src/pages/buckets/manage/permissions/permissions-tab.tsx
@ -50,7 +50,6 @@ const PermissionsTab = () => {
            <Table.Head>
              <span>#</span>
              <span>Key</span>
-              <span>Aliases</span>
              <span>Read</span>
              <span>Write</span>
              <span>Owner</span>
@ -62,7 +61,6 @@ const PermissionsTab = () => {
                <Table.Row>
                  <span>{idx + 1}</span>
                  <span>{key.name || key.accessKeyId?.substring(0, 8)}</span>
-                  <span>{key.bucketLocalAliases?.join(", ") || "-"}</span>
                  <span>
                    <Checkbox
                      checked={key.permissions?.read}
--- a/src/pages/buckets/page.tsx
+++ b/src/pages/buckets/page.tsx
@ -10,27 +10,20 @@ const BucketsPage = () => {
  const [search, setSearch] = useState("");

  const items = useMemo(() => {
-    let buckets =
-      data?.map((bucket) => {
-        return {
-          ...bucket,
-          aliases: [
-            ...(bucket.globalAliases || []),
-            ...(bucket.localAliases?.map((l) => l.alias) || []),
-          ],
-        };
-      }) || [];
+    let buckets = data || [];

    if (search?.length > 0) {
      const q = search.toLowerCase();
      buckets = buckets.filter(
        (bucket) =>
          bucket.id.includes(q) ||
-          bucket.aliases.find((alias) => alias.includes(q))
+          bucket.globalAliases.find((alias) => alias.includes(q))
      );
    }

-    buckets = buckets.sort((a, b) => a.aliases[0].localeCompare(b.aliases[0]));
+    buckets = buckets.sort((a, b) =>
+      a.globalAliases[0].localeCompare(b.globalAliases[0])
+    );

    return buckets;
  }, [data, search]);
--- a/src/pages/buckets/types.ts
+++ b/src/pages/buckets/types.ts
@ -5,7 +5,6 @@ export type GetBucketRes = Bucket[];
 export type Bucket = {
  id: string;
  globalAliases: string[];
-  localAliases: LocalAlias[];
  websiteAccess: boolean;
  websiteConfig?: WebsiteConfig | null;
  keys: Key[];
@ -18,16 +17,11 @@ export type Bucket = {
  quotas: Quotas;
 };

-export type LocalAlias = {
-  accessKeyId: string;
-  alias: string;
-};
-
 export type Key = {
  accessKeyId: string;
  name: string;
  permissions: Permissions;
-  bucketLocalAliases: string[];
+  bucketLocalAliases: any[];
 };

 export type Permissions = {