Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Let merchants pick a provider-backed asset source

Damian Legawiec74feba9c72f1
diff --git a/packages/dashboard/src/components/spree/products/digital-assets-card.tsx b/packages/dashboard/src/components/spree/products/digital-assets-card.tsx
index 046bff577c..eb5f5ab4b6 100644
--- a/packages/dashboard/src/components/spree/products/digital-assets-card.tsx
+++ b/packages/dashboard/src/components/spree/products/digital-assets-card.tsx
@@ -7,6 +7,10 @@ import {
CardContent,
CardHeader,
CardTitle,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
FileTypeIcon,
Pagination,
RowActions,
@@ -19,12 +23,13 @@ import {
TableRow,
useConfirm,
} from '@spree/dashboard-ui'
-import { DownloadIcon, FileIcon, UploadIcon } from 'lucide-react'
+import { ChevronDownIcon, DownloadIcon, FileIcon, PlusIcon, UploadIcon } from 'lucide-react'
import { useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import {
useCreateDigitalAsset,
useDeleteDigitalAsset,
+ useDigitalAssetProviders,
useDigitalAssets,
} from '../../../hooks/use-digital-assets'
import { DigitalAssetEditSheet } from './digital-asset-edit-sheet'
@@ -47,12 +52,18 @@ export function DigitalAssetsCard({
// authorized, signed link, never from the public bucket.
const directUpload = useDirectUpload({ private: true })
const { data, isLoading } = useDigitalAssets(productId ?? '', page, Boolean(productId))
+ const { data: providersData } = useDigitalAssetProviders(productId ?? '', Boolean(productId))
const createAsset = useCreateDigitalAsset(productId ?? '')
const deleteAsset = useDeleteDigitalAsset(productId ?? '')
const assets: DigitalAsset[] = data?.data ?? []
const meta = data?.meta
const hasVariants = (variants?.length ?? 0) > 1
+ const providers = providersData?.data ?? []
+ // Only providers that resolve their own deliverable go in the source menu;
+ // the file default is the plain upload button. With none of these, the card
+ // keeps its today behaviour — a single "Add file" button.
+ const sourceProviders = providers.filter((p) => !p.requires_attachment)
async function handleFileSelected(event: React.ChangeEvent<HTMLInputElement>) {
const file = event.target.files?.[0]
@@ -69,6 +80,11 @@ export function DigitalAssetsCard({
}
}
+ async function handleAddProvider(providerType: string) {
+ await createAsset.mutateAsync({ provider_type: providerType })
+ setPage(1)
+ }
+
async function handleDelete(asset: DigitalAsset) {
const confirmed = await confirm({
title: t('admin.digital_assets.delete_title'),
@@ -93,18 +109,46 @@ export function DigitalAssetsCard({
<CardHeader>
<CardTitle>{t('admin.digital_assets.title')}</CardTitle>
<CardAction>
- <Button
- type="button"
- variant="outline"
- size="sm"
- disabled={uploading}
- onClick={() => fileInputRef.current?.click()}
- >
- <UploadIcon className="mr-2 size-4" />
- {uploading
- ? t('admin.digital_assets.uploading_short')
- : t('admin.digital_assets.upload')}
- </Button>
+ {sourceProviders.length === 0 ? (
+ <Button
+ type="button"
+ variant="outline"
+ size="sm"
+ disabled={uploading}
+ onClick={() => fileInputRef.current?.click()}
+ >
+ <UploadIcon className="mr-2 size-4" />
+ {uploading
+ ? t('admin.digital_assets.uploading_short')
+ : t('admin.digital_assets.upload')}
+ </Button>
+ ) : (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button type="button" variant="outline" size="sm" disabled={uploading}>
+ <PlusIcon className="mr-2 size-4" />
+ {uploading
+ ? t('admin.digital_assets.uploading_short')
+ : t('admin.digital_assets.add')}
+ <ChevronDownIcon className="ml-2 size-4" />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem onClick={() => fileInputRef.current?.click()}>
+ <UploadIcon className="mr-2 size-4" />
+ {t('admin.digital_assets.source.upload')}
+ </DropdownMenuItem>
+ {sourceProviders.map((provider) => (
+ <DropdownMenuItem
+ key={provider.type}
+ onClick={() => handleAddProvider(provider.type)}
+ >
+ {provider.name}
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ )}
<input ref={fileInputRef} type="file" className="hidden" onChange={handleFileSelected} />
</CardAction>
</CardHeader>
diff --git a/packages/dashboard/src/hooks/use-digital-assets.ts b/packages/dashboard/src/hooks/use-digital-assets.ts
index 5e166cfc1d..193ee91ada 100644
--- a/packages/dashboard/src/hooks/use-digital-assets.ts
+++ b/packages/dashboard/src/hooks/use-digital-assets.ts
@@ -14,6 +14,20 @@ export function useDigitalAssets(productId: string, page = 1, enabled = true) {
})
}
+// The selectable sources for a new asset. Almost always just the File default,
+// so a host with no extra provider gets a one-entry list and the card keeps its
+// plain "Add file" button.
+export function useDigitalAssetProviders(productId: string, enabled = true) {
+ const { storeId } = useStore()
+
+ return useQuery({
+ queryKey: [storeId, 'products', productId, 'digital-asset-providers'],
+ queryFn: () => adminClient.products.digitalAssets.providers(productId),
+ enabled: enabled && Boolean(productId),
+ staleTime: Number.POSITIVE_INFINITY, // the registry doesn't change at runtime
+ })
+}
+
export function useCreateDigitalAsset(productId: string) {
const { storeId } = useStore()
diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.json
index f4e7481d88..e34a80a149 100644
--- a/packages/dashboard/src/locales/ar.json
+++ b/packages/dashboard/src/locales/ar.json
@@ -843,6 +843,7 @@
"toggle_states": "عرض مناطق {{country}}"
},
"digital_assets": {
+ "add": "إضافة",
"all_variants": "كل المتغيرات",
"columns": {
"file": "الملف",
@@ -858,6 +859,9 @@
"empty": "لا توجد ملفات بعد",
"limit_invalid": "يجب أن تكون الحدود أعدادًا صحيحة من 1 فأكثر، أو فارغة.",
"limits_help": "اترك حدود التنزيل والأيام فارغة لاستخدام إعدادات المتجر.",
+ "source": {
+ "upload": "رفع ملف"
+ },
"store_default": "{{count}} (افتراضي المتجر)",
"title": "الملفات الرقمية",
"untitled": "ملف بدون اسم",
diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.json
index 7eb7a2bb04..9e8e01a320 100644
--- a/packages/dashboard/src/locales/de.json
+++ b/packages/dashboard/src/locales/de.json
@@ -826,6 +826,7 @@
"toggle_states": "Bundesländer von {{country}} anzeigen"
},
"digital_assets": {
+ "add": "Hinzufügen",
"all_variants": "Alle Varianten",
"columns": {
"file": "Datei",
@@ -841,6 +842,9 @@
"empty": "Noch keine Dateien",
"limit_invalid": "Limits müssen ganze Zahlen ab 1 sein oder leer bleiben.",
"limits_help": "Lassen Sie die Download- und Tageslimits leer, um die Einstellungen des Shops zu verwenden.",
+ "source": {
+ "upload": "Datei hochladen"
+ },
"store_default": "{{count}} (Shop-Standard)",
"title": "Digitale Dateien",
"untitled": "Unbenannte Datei",
diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.json
index 25183e3956..6ba803fe73 100644
--- a/packages/dashboard/src/locales/en.json
+++ b/packages/dashboard/src/locales/en.json
@@ -826,6 +826,7 @@
"toggle_states": "Show states of {{country}}"
},
"digital_assets": {
+ "add": "Add",
"all_variants": "All variants",
"columns": {
"file": "File",
@@ -841,6 +842,9 @@
"empty": "No files yet",
"limit_invalid": "Limits must be whole numbers of 1 or more, or blank.",
"limits_help": "Leave the download and day limits blank to use the store's settings.",
+ "source": {
+ "upload": "Upload a file"
+ },
"store_default": "{{count}} (store default)",
"title": "Digital files",
"untitled": "Untitled file",
diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.json
index a5953e731e..d5bbfc1017 100644
--- a/packages/dashboard/src/locales/fr.json
+++ b/packages/dashboard/src/locales/fr.json
@@ -826,6 +826,7 @@
"toggle_states": "Afficher les régions de {{country}}"
},
"digital_assets": {
+ "add": "Ajouter",
"all_variants": "Toutes les variantes",
"columns": {
"file": "Fichier",
@@ -841,6 +842,9 @@
"empty": "Aucun fichier pour le moment",
"limit_invalid": "Les limites doivent être des entiers supérieurs ou égaux à 1, ou vides.",
"limits_help": "Laissez les limites de téléchargements et de jours vides pour utiliser les paramètres de la boutique.",
+ "source": {
+ "upload": "Téléverser un fichier"
+ },
"store_default": "{{count}} (par défaut)",
"title": "Fichiers numériques",
"untitled": "Fichier sans nom",
diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.json
index 8c3675d2ef..923fb28271 100644
--- a/packages/dashboard/src/locales/pl.json
+++ b/packages/dashboard/src/locales/pl.json
@@ -844,6 +844,7 @@
"toggle_states": "Pokaż regiony kraju {{country}}"
},
"digital_assets": {
+ "add": "Dodaj",
"all_variants": "Wszystkie warianty",
"columns": {
"file": "Plik",
@@ -859,6 +860,9 @@
"empty": "Brak plików",
"limit_invalid": "Limity muszą być liczbami całkowitymi od 1 lub puste.",
"limits_help": "Pozostaw limity pobrań i dni puste, aby użyć ustawień sklepu.",
+ "source": {
+ "upload": "Prześlij plik"
+ },
"store_default": "{{count}} (domyślne sklepu)",
"title": "Pliki cyfrowe",
"untitled": "Plik bez nazwy",
diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.json
index 72bdc6c004..2d21a9e967 100644
--- a/packages/dashboard/src/locales/zh-CN.json
+++ b/packages/dashboard/src/locales/zh-CN.json
@@ -821,6 +821,7 @@
"toggle_states": "显示 {{country}} 的省/州"
},
"digital_assets": {
+ "add": "添加",
"all_variants": "所有变体",
"columns": {
"file": "文件",
@@ -836,6 +837,9 @@
"empty": "暂无文件",
"limit_invalid": "限制必须是不小于 1 的整数,或留空。",
"limits_help": "将下载次数和天数限制留空即可使用商店设置。",
+ "source": {
+ "upload": "上传文件"
+ },
"store_default": "{{count}}(商店默认)",
"title": "数字文件",
"untitled": "未命名文件",