change subpackage to selected download when selected

quiltdata · Oct 16, 2024 · 0a4e7d3 · 0a4e7d3
1 parent 8cf98bd
commit 0a4e7d3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/.github/workflows/deploy-catalog.yaml b/.github/workflows/deploy-catalog.yaml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - selective-package-download
     paths:
       - '.github/workflows/deploy-catalog.yaml'
       - 'catalog/**'

diff --git a/catalog/app/containers/Bucket/Download.tsx b/catalog/app/containers/Bucket/Download.tsx
@@ -6,15 +6,23 @@ import mkStorage from 'utils/storage'
 import * as Buttons from 'components/Buttons'
 
 import * as FileView from './FileView'
+import * as Selection from './Selection'
 
 interface DownloadButtonProps {
   className: string
   label: string
   onClick: () => void
   path?: string
+  selection: Selection.ListingSelection
 }
 
-export function DownloadButton({ className, label, onClick, path }: DownloadButtonProps) {
+export function DownloadButton({
+  className,
+  selection,
+  label,
+  onClick,
+  path,
+}: DownloadButtonProps) {
   if (cfg.noDownload) return null
 
   if (cfg.desktop) {
@@ -30,7 +38,10 @@ export function DownloadButton({ className, label, onClick, path }: DownloadButt
   }
 
   return (
-    <FileView.ZipDownloadForm suffix={path}>
+    <FileView.ZipDownloadForm
+      suffix={path}
+      files={Selection.toHandlesList(selection).map(({ key }) => key)}
+    >
       <Buttons.Iconized
         className={className}
         label={label}

diff --git a/catalog/app/containers/Bucket/PackageTree/PackageTree.tsx b/catalog/app/containers/Bucket/PackageTree/PackageTree.tsx
@@ -387,9 +387,15 @@ function DirDisplay({
             )
             .filter(Boolean)
 
-          const downloadPath = path
-            ? `package/${bucket}/${name}/${hash}/${path}`
-            : `package/${bucket}/${name}/${hash}`
+          const downloadLabel = !slt.isEmpty // eslint-disable-line no-nested-ternary
+            ? 'Download selected'
+            : path
+            ? 'Download sub-package'
+            : 'Download package'
+          const downloadPath =
+            path && slt.isEmpty
+              ? `package/${bucket}/${name}/${hash}/${path}`
+              : `package/${bucket}/${name}/${hash}`
 
           return (
             <>
@@ -430,9 +436,10 @@ function DirDisplay({
                         {actions.downloadPackage && (
                           <Download.DownloadButton
                             className={classes.button}
-                            label={path ? 'Download sub-package' : 'Download package'}
+                            label={downloadLabel}
                             onClick={openInDesktopState.confirm}
                             path={downloadPath}
+                            selection={slt.selection}
                           />
                         )}
                         <RevisionMenu