diff --git a/frontend/src/lib/components/S3FilePicker.svelte b/frontend/src/lib/components/S3FilePicker.svelte
index 55bb25c5ef..8829660ea3 100644
--- a/frontend/src/lib/components/S3FilePicker.svelte
+++ b/frontend/src/lib/components/S3FilePicker.svelte
@@ -18,6 +18,9 @@
selectedFileKey?: { s3: string; storage?: string } | undefined
folderOnly?: boolean
regexFilter?: RegExp | undefined
+ /** Workspace to browse S3 storage in — the acting workspace of the editor that
+ * opened the picker, else the nav workspace. */
+ workspace?: string | undefined
onClose?: () => void
onSelectAndClose?: (selected: { s3: string; storage: string | undefined }) => void
}
@@ -30,10 +33,13 @@
selectedFileKey = $bindable(undefined),
folderOnly = false,
regexFilter = undefined,
+ workspace = undefined,
onClose,
onSelectAndClose
}: Props = $props()
+ let ws = $derived(workspace ?? $workspaceStore)
+
let drawer: Drawer | undefined = $state()
let s3FilePickerInner: S3FilePickerInner | undefined = $state()
@@ -55,8 +61,8 @@
> = $state({})
let secondaryStorageNames = resource(
- () => $workspaceStore,
- () => SettingService.getSecondaryStorageNames({ workspace: $workspaceStore! }),
+ () => ws,
+ () => SettingService.getSecondaryStorageNames({ workspace: ws! }),
{ lazy: true }
)
@@ -105,6 +111,7 @@
bind:uploadModalOpen
{folderOnly}
{regexFilter}
+ {workspace}
/>
{#snippet actions()}
diff --git a/frontend/src/lib/components/S3FilePickerInner.svelte b/frontend/src/lib/components/S3FilePickerInner.svelte
index 333857b7eb..9475c0041a 100644
--- a/frontend/src/lib/components/S3FilePickerInner.svelte
+++ b/frontend/src/lib/components/S3FilePickerInner.svelte
@@ -65,6 +65,8 @@
regexFilter?: RegExp | undefined
hideS3SpecificDetails?: boolean
rootPath?: string
+ /** Workspace to browse S3 storage in — defaults to the nav workspace. */
+ workspace?: string | undefined
workspaceSettingsInitialized?: boolean
storage?: string | undefined
uploadModalOpen?: boolean
@@ -103,6 +105,7 @@
regexFilter = undefined,
hideS3SpecificDetails = false,
rootPath: initialRootPath = '',
+ workspace = undefined,
workspaceSettingsInitialized = $bindable(true),
storage = $bindable(undefined),
uploadModalOpen = $bindable(false),
@@ -117,6 +120,8 @@
testConnectionRequest = HelpersService.datasetStorageTestConnection
}: Props = $props()
+ let ws = $derived(workspace ?? $workspaceStore)
+
let rootPath = $state(initialRootPath)
let rootPathNestingLevel = $derived(1 * (rootPath.split('/').length - 1))
@@ -183,7 +188,7 @@
async function loadFiles() {
fileListLoading = true
let availableFiles = await listStoredFilesRequest({
- workspace: $workspaceStore!,
+ workspace: ws!,
maxKeys: maxKeys, // fixed pages of 1000 files for now
marker: page == 0 ? undefined : listMarkers[page - 1],
prefix: rootPath ?? (filter.trim() != '' ? filter : undefined),
@@ -280,7 +285,7 @@
}
fileInfoLoading = true
let fileMetadataRaw = await loadFileMetadataRequest({
- workspace: $workspaceStore!,
+ workspace: ws!,
fileKey: fileKey,
storage: storage
})
@@ -300,7 +305,7 @@
async function loadFilePreview(fileKey: string, fileSizeInBytes?: number, fileMimeType?: string) {
let filePreviewRaw = await loadFilePreviewRequest({
- workspace: $workspaceStore!,
+ workspace: ws!,
fileKey: fileKey,
fileSizeInBytes: fileSizeInBytes,
fileMimeType: fileMimeType,
@@ -349,7 +354,7 @@
}
try {
await deleteS3FileRequest({
- workspace: $workspaceStore!,
+ workspace: ws!,
fileKey: fileKey,
storage: storage
})
@@ -409,7 +414,7 @@
}
try {
await moveS3FileRequest({
- workspace: $workspaceStore!,
+ workspace: ws!,
srcFileKey: srcFileKey,
destFileKey: destFileKey!,
storage: storage
@@ -457,7 +462,7 @@
fileListLoading = true
try {
await testConnectionRequest({
- workspace: $workspaceStore!,
+ workspace: ws!,
storage: storage
})
workspaceSettingsInitialized = true
@@ -716,7 +721,7 @@
{#if filePreview !== undefined && (!hideS3SpecificDetails || !readOnlyMode || allowDelete)}
{#if !hideS3SpecificDetails}
- {@const downloadApiPath = `/w/${$workspaceStore}/job_helpers/download_s3_file?file_key=${encodeURIComponent(fileMetadata?.fileKey ?? '')}${storage ? `&storage=${storage}` : ''}`}
+ {@const downloadApiPath = `/w/${ws}/job_helpers/download_s3_file?file_key=${encodeURIComponent(fileMetadata?.fileKey ?? '')}${storage ? `&storage=${storage}` : ''}`}
{@const downloadName =
fileMetadata?.fileKey.split('/').pop() ?? 'unnamed_download.file'}
{#if shouldDownloadViaClient()}
diff --git a/frontend/src/lib/components/S3ObjectPicker.svelte b/frontend/src/lib/components/S3ObjectPicker.svelte
index 1c461708cd..bb3e19599e 100644
--- a/frontend/src/lib/components/S3ObjectPicker.svelte
+++ b/frontend/src/lib/components/S3ObjectPicker.svelte
@@ -14,9 +14,15 @@
interface Props {
value: any
editor?: SimpleEditor | undefined
+ /** Workspace to browse/upload S3 objects in; defaults to the nav workspace. */
+ workspace?: string | undefined
}
- let { value = $bindable(), editor = $bindable(undefined) }: Props = $props()
+ let {
+ value = $bindable(),
+ editor = $bindable(undefined),
+ workspace = undefined
+ }: Props = $props()
const dispatch = createEventDispatcher()
@@ -48,6 +54,7 @@
editor?.setCode(rawValue)
}}
readOnlyMode={false}
+ {workspace}
/>
@@ -85,6 +92,7 @@
}
}}
defaultValue={value?.s3}
+ {workspace}
/>
{/if}