Move bucket settings to a separate page (#4122)

Co-authored-by: Alexei Mochalov <[email protected]>
quiltdata · Sep 13, 2024 · 22455cd · 22455cd
1 parent e05f3d9
commit 22455cd
Show file tree

Hide file tree

Showing 8 changed files with 1,564 additions and 788 deletions.
diff --git a/catalog/CHANGELOG.md b/catalog/CHANGELOG.md
@@ -17,6 +17,7 @@ where verb is one of
 
 ## Changes
 
+- [Changed] Admin: Move bucket settings to a separate page ([#4122](https://github.com/quiltdata/quilt/pull/4122))
 - [Changed] Athena: always show catalog name, simplify setting execution context ([#4123](https://github.com/quiltdata/quilt/pull/4123))
 - [Added] Support `ui.actions.downloadObject` and `ui.actions.downloadPackage` options for configuring visibility of download buttons under "Bucket" and "Packages" respectively ([#4111](https://github.com/quiltdata/quilt/pull/4111))
 - [Added] Bootstrap the change log ([#4112](https://github.com/quiltdata/quilt/pull/4112))
diff --git a/catalog/app/constants/routes.ts b/catalog/app/constants/routes.ts
@@ -262,11 +262,23 @@ export const admin: Route = {
 
 export const adminUsers = admin
 
-export type AdminBucketsArgs = [bucket: string]
+export type AdminBucketsArgs = [
+  options?: {
+    add?: boolean
+    bucket?: string /* @deprecated legacy param   */
+  },
+]
 
 export const adminBuckets: Route<AdminBucketsArgs> = {
   path: '/admin/buckets',
-  url: (bucket) => `/admin/buckets${mkSearch({ bucket })}`,
+  url: ({ add, bucket } = {}) => `/admin/buckets${mkSearch({ add, bucket })}`,
+}
+
+export type AdminBucketEditArgs = [bucket: string]
+
+export const adminBucketEdit: Route<AdminBucketEditArgs> = {
+  path: '/admin/buckets/:bucketName',
+  url: (bucketName) => `/admin/buckets/${bucketName}`,
 }
 
 export const adminSettings: Route = {

diff --git a/catalog/app/containers/Admin/Admin.tsx b/catalog/app/containers/Admin/Admin.tsx
@@ -82,7 +82,7 @@ export default function Admin() {
 
   const sections = {
     users: { path: paths.adminUsers, exact: true },
-    buckets: { path: paths.adminBuckets, exact: true },
+    buckets: { path: paths.adminBuckets },
     sync: { path: paths.adminSync, exact: true },
     settings: { path: paths.adminSettings, exact: true },
     status: { path: paths.adminStatus, exact: true },
@@ -105,9 +105,6 @@ export default function Admin() {
           <RR.Route path={paths.adminUsers} exact strict>
             <UsersAndRoles />
           </RR.Route>
-          <RR.Route path={paths.adminBuckets} exact>
-            <Buckets />
-          </RR.Route>
           {cfg.desktop && (
             <RR.Route path={paths.adminSync} exact>
               <Sync />
@@ -119,6 +116,9 @@ export default function Admin() {
           <RR.Route path={paths.adminStatus} exact>
             <Status />
           </RR.Route>
+          <RR.Route path={paths.adminBuckets}>
+            <Buckets />
+          </RR.Route>
           <RR.Route>
             <ThrowNotFound />
           </RR.Route>