sandcms 0.6.3 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -11
- package/dist/admin/Account.svelte +2 -0
- package/dist/admin/Admin.svelte +21 -6
- package/dist/admin/AssetAttachment.svelte +9 -6
- package/dist/admin/AssetAttachment.svelte.d.ts +3 -1
- package/dist/admin/BlueprintFields.svelte +0 -3
- package/dist/admin/BlueprintFields.svelte.d.ts +0 -1
- package/dist/admin/Editor.svelte +5 -10
- package/dist/admin/Fields.svelte +2 -8
- package/dist/admin/Fields.svelte.d.ts +0 -1
- package/dist/admin/Gallery.svelte +221 -80
- package/dist/admin/Gallery.svelte.d.ts +0 -1
- package/dist/admin/Inbox.svelte +3 -2
- package/dist/admin/LinkField.svelte +0 -3
- package/dist/admin/LinkField.svelte.d.ts +0 -1
- package/dist/admin/MediaLibrary.svelte +10 -7
- package/dist/admin/MediaPicker.svelte +43 -35
- package/dist/admin/MediaPicker.svelte.d.ts +0 -1
- package/dist/admin/Navigation.svelte +13 -2
- package/dist/admin/Pages.svelte +195 -0
- package/dist/admin/Pages.svelte.d.ts +7 -0
- package/dist/admin/Shell.svelte +27 -5
- package/dist/admin/SortableList.svelte +82 -61
- package/dist/admin/SortableList.svelte.d.ts +3 -1
- package/dist/admin/ThemePicker.svelte +72 -0
- package/dist/admin/ThemePicker.svelte.d.ts +18 -0
- package/dist/admin/UploadButton.svelte +2 -1
- package/dist/admin/UploadProgress.svelte +24 -0
- package/dist/admin/UploadProgress.svelte.d.ts +7 -0
- package/dist/admin/Users.svelte +8 -3
- package/dist/admin/client.d.ts +3 -670
- package/dist/admin/client.js +2 -1
- package/dist/admin/components/ui/alert/alert.svelte.d.ts +3 -13
- package/dist/admin/components/ui/attachment/attachment-media.svelte.d.ts +3 -13
- package/dist/admin/components/ui/attachment/attachment.svelte.d.ts +6 -26
- package/dist/admin/components/ui/badge/badge.svelte.d.ts +7 -25
- package/dist/admin/components/ui/button/button.svelte.d.ts +15 -53
- package/dist/admin/components/ui/toggle/toggle.svelte.d.ts +6 -26
- package/dist/admin/generated/admin.css +823 -115
- package/dist/admin/navigation.d.ts +9 -0
- package/dist/admin/navigation.js +20 -1
- package/dist/admin/theme-context.d.ts +7 -0
- package/dist/admin/theme-context.js +3 -0
- package/dist/admin/theme.d.ts +7 -0
- package/dist/admin/theme.js +14 -0
- package/dist/admin/types.d.ts +3 -1
- package/dist/admin/uploads.d.ts +8 -1
- package/dist/admin/uploads.js +94 -16
- package/dist/blueprints/files.js +1 -0
- package/dist/blueprints/labels.d.ts +6 -0
- package/dist/blueprints/labels.js +14 -0
- package/dist/blueprints/load.js +16 -2
- package/dist/blueprints/types.d.ts +4 -1
- package/dist/cli/admin.d.ts +39 -0
- package/dist/cli/admin.js +95 -0
- package/dist/cli/backup.js +4 -4
- package/dist/cli/doctor.d.ts +10 -1
- package/dist/cli/doctor.js +98 -33
- package/dist/cli/email-test.d.ts +3 -0
- package/dist/cli/email-test.js +20 -0
- package/dist/cli/files.d.ts +2 -6
- package/dist/cli/files.js +12 -2
- package/dist/cli/index.js +401 -95
- package/dist/cli/rebaseline.d.ts +10 -0
- package/dist/cli/rebaseline.js +117 -0
- package/dist/cli/scaffold.js +8 -8
- package/dist/cli/setup.js +16 -26
- package/dist/cli/upgrade.js +34 -7
- package/dist/env.d.ts +26 -2
- package/dist/env.js +48 -6
- package/dist/notification-fields.js +2 -1
- package/dist/server/admin-load.d.ts +85 -5
- package/dist/server/admin-load.js +26 -1
- package/dist/server/api-access.d.ts +4 -0
- package/dist/server/api-access.js +15 -2
- package/dist/server/api-keys.d.ts +96 -0
- package/dist/server/api-keys.js +115 -0
- package/dist/server/api-pagination.d.ts +3 -0
- package/dist/server/api.js +21 -63
- package/dist/server/auth.d.ts +10 -9
- package/dist/server/cms.d.ts +63 -21
- package/dist/server/cms.js +64 -7
- package/dist/server/db/auto-migrate.d.ts +0 -4
- package/dist/server/db/auto-migrate.js +12 -3
- package/dist/server/db/legacy.d.ts +13 -0
- package/dist/server/db/legacy.js +60 -0
- package/dist/server/db/migration-data.js +2 -34
- package/dist/server/db/migrations/{0000_foundation.sql → 0000_baseline.sql} +120 -4
- package/dist/server/db/migrations/meta/0000_snapshot.json +578 -3
- package/dist/server/db/migrations/meta/_journal.json +2 -58
- package/dist/server/db/schema.d.ts +119 -2
- package/dist/server/db/schema.js +23 -9
- package/dist/server/db/store.d.ts +25 -2
- package/dist/server/db/store.js +90 -26
- package/dist/server/forms.js +2 -1
- package/dist/server/hooks.js +155 -81
- package/dist/server/media/contracts.d.ts +115 -0
- package/dist/server/media/contracts.js +12 -0
- package/dist/server/media/deletions.d.ts +2 -1
- package/dist/server/media/deletions.js +3 -3
- package/dist/server/media/delivery.js +7 -11
- package/dist/server/media/processor-child.d.ts +2 -0
- package/dist/server/media/processor-child.js +236 -0
- package/dist/server/media/processor.d.ts +51 -0
- package/dist/server/media/processor.js +135 -0
- package/dist/server/media/render-math.d.ts +24 -0
- package/dist/server/media/render-math.js +50 -0
- package/dist/server/media/runner.d.ts +30 -1
- package/dist/server/media/runner.js +418 -165
- package/dist/server/media/service.d.ts +53 -11
- package/dist/server/media/service.js +307 -98
- package/dist/server/media/storage.d.ts +5 -0
- package/dist/server/media/storage.js +279 -0
- package/dist/server/media/upload-ticket.d.ts +12 -0
- package/dist/server/media/upload-ticket.js +35 -0
- package/dist/server/media/verify.d.ts +64 -0
- package/dist/server/media/verify.js +201 -0
- package/dist/server/platform/http.d.ts +27 -0
- package/dist/server/platform/http.js +77 -0
- package/dist/server/platform/index.d.ts +52 -0
- package/dist/server/platform/index.js +98 -0
- package/dist/server/platform/snapshots.d.ts +18 -0
- package/dist/server/platform/snapshots.js +110 -0
- package/dist/server/platform/volume.d.ts +20 -0
- package/dist/server/platform/volume.js +60 -0
- package/docs/acceptance.md +7 -5
- package/docs/api.md +56 -4
- package/docs/cloudflare.md +26 -152
- package/docs/content.md +20 -5
- package/docs/deployment.md +222 -57
- package/docs/email.md +6 -0
- package/docs/forms.md +2 -2
- package/docs/media.md +94 -21
- package/docs/package.md +21 -18
- package/docs/plans/0.7-self-hosted.md +264 -0
- package/docs/releases.md +37 -1
- package/docs/upgrades.md +72 -9
- package/package.json +37 -44
- package/templates/Dockerfile +32 -0
- package/templates/integration.ts +26 -5
- package/templates/openship.json +9 -0
- package/templates/railpack.json +1 -1
- package/templates/sandcms/blueprints/files/image.yaml +1 -1
- package/templates/sandcms/config.yaml +1 -1
- package/dist/cli/cloudflare.d.ts +0 -8
- package/dist/cli/cloudflare.js +0 -135
- package/dist/server/db/migrations/0001_independent_password_resets.sql +0 -3
- package/dist/server/db/migrations/0002_email_failure_reason.sql +0 -1
- package/dist/server/db/migrations/0003_direct_r2_uploads.sql +0 -10
- package/dist/server/db/migrations/0004_agent_api_keys.sql +0 -38
- package/dist/server/db/migrations/0005_api_retention_and_pagination.sql +0 -3
- package/dist/server/db/migrations/0006_durable_media_deletion.sql +0 -7
- package/dist/server/db/migrations/0007_content_and_job_indexes.sql +0 -2
- package/dist/server/db/migrations/0008_search_text_cache.sql +0 -45
- package/dist/server/db/migrations/meta/0001_snapshot.json +0 -1197
- package/dist/server/db/migrations/meta/0002_snapshot.json +0 -1204
- package/dist/server/db/migrations/meta/0003_snapshot.json +0 -1281
- package/dist/server/db/migrations/meta/0004_snapshot.json +0 -1546
- package/dist/server/db/migrations/meta/0005_snapshot.json +0 -1572
- package/dist/server/db/migrations/meta/0006_snapshot.json +0 -1627
- package/dist/server/db/migrations/meta/0007_snapshot.json +0 -1643
- package/dist/server/db/migrations/meta/0008_snapshot.json +0 -1711
- package/dist/worker/index.d.ts +0 -10
- package/dist/worker/index.js +0 -460
- package/dist/worker/local.d.ts +0 -5
- package/dist/worker/local.js +0 -57
- package/dist/worker/source.d.ts +0 -2
- package/dist/worker/source.js +0 -31
- package/dist/worker/uploads.d.ts +0 -22
- package/dist/worker/uploads.js +0 -48
- package/templates/sandcms/worker/index.ts +0 -1
- package/templates/sandcms/worker/local.ts +0 -1
- package/templates/sandcms/worker/wrangler.jsonc +0 -6
- /package/dist/{worker → server/media}/svg.d.ts +0 -0
- /package/dist/{worker → server/media}/svg.js +0 -0
|
@@ -3,20 +3,25 @@
|
|
|
3
3
|
import { selectGalleryImages } from '../blueprints/gallery.js';
|
|
4
4
|
import { fieldVisible } from '../blueprints/conditions.js';
|
|
5
5
|
import { effectiveMetadata } from '../blueprints/files.js';
|
|
6
|
+
import { fieldLabel } from '../blueprints/labels.js';
|
|
6
7
|
import type { Asset, Relations } from './types.js';
|
|
7
8
|
import { assetUrl } from './client.js';
|
|
8
9
|
import Fields from './Fields.svelte';
|
|
9
10
|
import MediaPicker from './MediaPicker.svelte';
|
|
10
11
|
import SortableList from './SortableList.svelte';
|
|
11
|
-
import
|
|
12
|
+
import * as Dialog from './components/ui/dialog/index.js';
|
|
12
13
|
import { Button } from './components/ui/button/index.js';
|
|
13
|
-
import
|
|
14
|
+
import X from '@lucide/svelte/icons/x';
|
|
15
|
+
import Pencil from '@lucide/svelte/icons/pencil';
|
|
16
|
+
import RotateCcw from '@lucide/svelte/icons/rotate-ccw';
|
|
17
|
+
import ImageOff from '@lucide/svelte/icons/image-off';
|
|
18
|
+
import Trash2 from '@lucide/svelte/icons/trash-2';
|
|
19
|
+
import TriangleAlert from '@lucide/svelte/icons/triangle-exclamation-point';
|
|
14
20
|
let {
|
|
15
21
|
value,
|
|
16
22
|
onchange,
|
|
17
23
|
assets,
|
|
18
24
|
relations,
|
|
19
|
-
workerUrl,
|
|
20
25
|
field,
|
|
21
26
|
fileBlueprints,
|
|
22
27
|
id,
|
|
@@ -26,7 +31,6 @@
|
|
|
26
31
|
onchange: (rows: Payload[]) => void;
|
|
27
32
|
assets: Asset[];
|
|
28
33
|
relations: Relations;
|
|
29
|
-
workerUrl: string;
|
|
30
34
|
field: Field;
|
|
31
35
|
fileBlueprints: FileBlueprint[];
|
|
32
36
|
id: string;
|
|
@@ -34,6 +38,8 @@
|
|
|
34
38
|
} = $props();
|
|
35
39
|
let extra = $state<Asset[]>([]);
|
|
36
40
|
let all = $derived([...assets, ...extra.filter((a) => !assets.some((x) => x.id === a.id))]);
|
|
41
|
+
let editing = $state<number | null>(null);
|
|
42
|
+
let fields = $derived(Object.entries(field.fields ?? {}));
|
|
37
43
|
function empty(field: Field): Json {
|
|
38
44
|
if (field.type === 'boolean') return false;
|
|
39
45
|
if (['repeatable', 'multiselect'].includes(field.type)) return [];
|
|
@@ -50,86 +56,221 @@
|
|
|
50
56
|
}
|
|
51
57
|
function inherited(field: Field, value: Json | undefined) {
|
|
52
58
|
if (field.type === 'relation')
|
|
53
|
-
return relations[field.collection!]?.find((p) => p.id === value)?.label ??
|
|
54
|
-
if (value === undefined || value === null || value === '') return
|
|
59
|
+
return relations[field.collection!]?.find((p) => p.id === value)?.label ?? null;
|
|
60
|
+
if (value === undefined || value === null || value === '') return null;
|
|
55
61
|
if (Array.isArray(value)) return `${value.length} items`;
|
|
62
|
+
if (typeof value === 'boolean') return value ? 'Yes' : 'No';
|
|
56
63
|
return typeof value === 'object' ? 'Using saved file details' : String(value);
|
|
57
64
|
}
|
|
65
|
+
function rowErrors(i: number) {
|
|
66
|
+
return Object.fromEntries(
|
|
67
|
+
Object.entries(errors)
|
|
68
|
+
.filter(([path]) => path.startsWith(`${i}.`))
|
|
69
|
+
.map(([path, error]) => [path.slice(String(i).length + 1), error])
|
|
70
|
+
);
|
|
71
|
+
}
|
|
72
|
+
/** A caption or other text detail, so each tile says something useful at a glance. */
|
|
73
|
+
function summary(effective: Payload) {
|
|
74
|
+
const text = fields.filter(([, definition]) => ['text', 'textarea'].includes(definition.type));
|
|
75
|
+
const preferred = [...text.filter(([key]) => ['caption', 'title'].includes(key)), ...text];
|
|
76
|
+
for (const [key] of preferred) {
|
|
77
|
+
const v = effective[key];
|
|
78
|
+
if (typeof v === 'string' && v.trim()) return v;
|
|
79
|
+
}
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
/** Screen readers and search engines rely on alt text, so flag images without it. */
|
|
83
|
+
function missingAlt(effective: Payload) {
|
|
84
|
+
if (!field.fields?.alt) return false;
|
|
85
|
+
const alt = effective.alt;
|
|
86
|
+
return typeof alt !== 'string' || !alt.trim();
|
|
87
|
+
}
|
|
88
|
+
function overrides(row: Payload) {
|
|
89
|
+
return fields.filter(([key]) => row[key] != null).length;
|
|
90
|
+
}
|
|
91
|
+
function remove(i: number) {
|
|
92
|
+
if (editing === i) editing = null;
|
|
93
|
+
onchange(value.filter((_, n) => n !== i));
|
|
94
|
+
}
|
|
95
|
+
let current = $derived(editing === null ? undefined : value[editing]);
|
|
96
|
+
let currentAsset = $derived(current && all.find((a) => a.id === current.image));
|
|
58
97
|
</script>
|
|
59
98
|
|
|
60
|
-
<
|
|
61
|
-
{
|
|
62
|
-
{
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
<
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
{assets}
|
|
105
|
-
{relations}
|
|
106
|
-
{workerUrl}
|
|
107
|
-
{fileBlueprints}
|
|
108
|
-
prefix={`${id}-${i}`}
|
|
109
|
-
errors={Object.fromEntries(
|
|
110
|
-
Object.entries(errors)
|
|
111
|
-
.filter(([path]) => path.startsWith(`${i}.`))
|
|
112
|
-
.map(([path, error]) => [path.slice(String(i).length + 1), error])
|
|
113
|
-
)}
|
|
114
|
-
onchange={(next) => set(i, key, next[key] ?? empty(definition))}
|
|
115
|
-
/>
|
|
116
|
-
{/if}
|
|
99
|
+
<div class="cms-gallery">
|
|
100
|
+
<SortableList items={value} {onchange} layout="grid">
|
|
101
|
+
{#snippet children(row, i, handle)}
|
|
102
|
+
{@const asset = all.find((a) => a.id === row.image)}
|
|
103
|
+
{@const metadata = asset ? asset.metadata : {}}
|
|
104
|
+
{@const effective = effectiveMetadata(metadata, row, field.fields ?? {})}
|
|
105
|
+
{@const text = summary(effective)}
|
|
106
|
+
{@const custom = overrides(row)}
|
|
107
|
+
{@const invalid = Object.keys(errors).some(
|
|
108
|
+
(path) => path.startsWith(`${i}.`) && path !== `${i}.image`
|
|
109
|
+
)}
|
|
110
|
+
<div class="cms-gallery-tile" data-invalid={invalid || undefined}>
|
|
111
|
+
<div class="cms-gallery-media">
|
|
112
|
+
{#if asset && assetUrl(asset)}<img
|
|
113
|
+
class="cms-gallery-backdrop"
|
|
114
|
+
src={assetUrl(asset)}
|
|
115
|
+
alt=""
|
|
116
|
+
aria-hidden="true"
|
|
117
|
+
draggable="false"
|
|
118
|
+
loading="lazy"
|
|
119
|
+
/><img
|
|
120
|
+
src={assetUrl(asset)}
|
|
121
|
+
alt={String(effective.alt ?? '')}
|
|
122
|
+
draggable="false"
|
|
123
|
+
loading="lazy"
|
|
124
|
+
/>{:else}<span class="cms-gallery-missing"><ImageOff size={22} />Unavailable</span>{/if}
|
|
125
|
+
<div class="cms-gallery-handle">{@render handle(i)}</div>
|
|
126
|
+
<div class="cms-gallery-corner">
|
|
127
|
+
<Button
|
|
128
|
+
variant="secondary"
|
|
129
|
+
size="icon-sm"
|
|
130
|
+
class="cms-gallery-remove"
|
|
131
|
+
aria-label={'Remove image ' + (i + 1)}
|
|
132
|
+
title="Remove from gallery"
|
|
133
|
+
onclick={() => remove(i)}><X /></Button
|
|
134
|
+
>
|
|
135
|
+
{#if asset && missingAlt(effective)}<Button
|
|
136
|
+
variant="secondary"
|
|
137
|
+
size="icon-sm"
|
|
138
|
+
class="cms-gallery-alt-warning"
|
|
139
|
+
aria-label={'Add alternative text for image ' + (i + 1)}
|
|
140
|
+
title="Alternative text is missing"
|
|
141
|
+
onclick={() => (editing = i)}><TriangleAlert /></Button
|
|
142
|
+
>{/if}
|
|
117
143
|
</div>
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
<
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
144
|
+
{#if asset && asset.status !== 'ready'}<span class="cms-gallery-status"
|
|
145
|
+
>{asset.status}</span
|
|
146
|
+
>{/if}
|
|
147
|
+
</div>
|
|
148
|
+
<div class="cms-gallery-meta">
|
|
149
|
+
<div class="min-w-0 flex-1">
|
|
150
|
+
<p class="cms-gallery-filename" title={asset?.filename}>
|
|
151
|
+
{asset?.filename ?? 'Unavailable image'}
|
|
152
|
+
</p>
|
|
153
|
+
{#if fields.length}<p class="cms-gallery-summary">
|
|
154
|
+
{#if invalid}<TriangleAlert size={12} />Needs attention{:else}{#if custom}<span
|
|
155
|
+
class="cms-gallery-dot"
|
|
156
|
+
title="{custom} customized for this gallery"
|
|
157
|
+
></span>{/if}<span class="cms-gallery-summary-text">{text ?? 'No details'}</span
|
|
158
|
+
>{#if custom}<span class="sr-only">, {custom} customized</span>{/if}{/if}
|
|
159
|
+
</p>{/if}
|
|
160
|
+
</div>
|
|
161
|
+
{#if fields.length}<Button
|
|
162
|
+
variant="ghost"
|
|
163
|
+
size="icon-sm"
|
|
164
|
+
aria-label={'Edit details for image ' + (i + 1)}
|
|
165
|
+
title={custom ? `Edit details (${custom} customized)` : 'Edit details'}
|
|
166
|
+
onclick={() => (editing = i)}><Pencil /></Button
|
|
167
|
+
>{/if}
|
|
168
|
+
</div>
|
|
169
|
+
{#if errors[i + '.image']}<p class="cms-error" role="alert">{errors[i + '.image']}</p>{/if}
|
|
170
|
+
</div>
|
|
171
|
+
{/snippet}
|
|
172
|
+
</SortableList>
|
|
173
|
+
<MediaPicker
|
|
174
|
+
{id}
|
|
175
|
+
assets={all}
|
|
176
|
+
multiple
|
|
177
|
+
hideSelection
|
|
178
|
+
fileBlueprint={fileBlueprints.find((b) => b.id === field.fileBlueprint)}
|
|
179
|
+
value={value.map((row) => row.image).filter((v): v is string => typeof v === 'string')}
|
|
180
|
+
onasset={(asset) => {
|
|
181
|
+
extra = [...extra, asset];
|
|
182
|
+
}}
|
|
183
|
+
onchange={(ids) => onchange(selectGalleryImages(value, Array.isArray(ids) ? ids : []))}
|
|
184
|
+
/>
|
|
185
|
+
</div>
|
|
186
|
+
|
|
187
|
+
<Dialog.Root
|
|
188
|
+
open={current !== undefined}
|
|
189
|
+
onOpenChange={(open) => {
|
|
190
|
+
if (!open) editing = null;
|
|
133
191
|
}}
|
|
134
|
-
|
|
135
|
-
|
|
192
|
+
>
|
|
193
|
+
<Dialog.Content portalProps={{ disabled: true }} class="cms-gallery-dialog">
|
|
194
|
+
{#if current !== undefined && editing !== null}
|
|
195
|
+
{@const i = editing}
|
|
196
|
+
{@const metadata = currentAsset ? currentAsset.metadata : {}}
|
|
197
|
+
{@const effective = effectiveMetadata(metadata, current, field.fields ?? {})}
|
|
198
|
+
<Dialog.Header>
|
|
199
|
+
<Dialog.Title class="cms-gallery-dialog-title"
|
|
200
|
+
>{currentAsset?.filename ?? 'Unavailable image'}</Dialog.Title
|
|
201
|
+
>
|
|
202
|
+
<Dialog.Description>
|
|
203
|
+
Image {i + 1} of {value.length}. Details come from the media library unless you customize
|
|
204
|
+
them here.
|
|
205
|
+
</Dialog.Description>
|
|
206
|
+
</Dialog.Header>
|
|
207
|
+
<div class="cms-gallery-dialog-body">
|
|
208
|
+
<div class="cms-gallery-preview">
|
|
209
|
+
{#if currentAsset && assetUrl(currentAsset)}<img
|
|
210
|
+
src={assetUrl(currentAsset)}
|
|
211
|
+
alt={String(effective.alt ?? '')}
|
|
212
|
+
/>{:else}<span class="cms-gallery-missing"><ImageOff size={22} />Unavailable</span>{/if}
|
|
213
|
+
</div>
|
|
214
|
+
<div class="cms-gallery-details">
|
|
215
|
+
{#each fields as [key, definition] (key)}
|
|
216
|
+
{#if fieldVisible(definition, effective)}
|
|
217
|
+
{@const label = fieldLabel(key, definition)}
|
|
218
|
+
{#if current[key] == null}
|
|
219
|
+
{@const shown = inherited(definition, metadata[key])}
|
|
220
|
+
<div class="cms-gallery-detail">
|
|
221
|
+
<div class="cms-gallery-detail-head">
|
|
222
|
+
<span class="cms-gallery-detail-label">{label}</span>
|
|
223
|
+
<Button
|
|
224
|
+
variant="ghost"
|
|
225
|
+
size="xs"
|
|
226
|
+
aria-label={'Customize ' + label.toLowerCase()}
|
|
227
|
+
onclick={() =>
|
|
228
|
+
set(i, key, structuredClone(metadata[key] ?? empty(definition)))}
|
|
229
|
+
><Pencil />Customize</Button
|
|
230
|
+
>
|
|
231
|
+
</div>
|
|
232
|
+
<p
|
|
233
|
+
class="cms-gallery-inherited"
|
|
234
|
+
class:cms-gallery-inherited-empty={!shown}
|
|
235
|
+
class:cms-gallery-inherited-warning={!shown && key === 'alt'}
|
|
236
|
+
>
|
|
237
|
+
{#if !shown && key === 'alt'}<TriangleAlert size={13} />Missing. Describe the
|
|
238
|
+
image for people using screen readers.{:else}{shown ??
|
|
239
|
+
'Not set in the media library'}{/if}
|
|
240
|
+
</p>
|
|
241
|
+
</div>
|
|
242
|
+
{:else}
|
|
243
|
+
<div class="cms-gallery-detail">
|
|
244
|
+
<Button
|
|
245
|
+
variant="ghost"
|
|
246
|
+
size="xs"
|
|
247
|
+
class="cms-gallery-reset"
|
|
248
|
+
aria-label={'Use media library ' + label.toLowerCase()}
|
|
249
|
+
title="Use the media library value"
|
|
250
|
+
onclick={() => set(i, key, undefined)}><RotateCcw />Reset</Button
|
|
251
|
+
>
|
|
252
|
+
<Fields
|
|
253
|
+
fields={{ [key]: definition }}
|
|
254
|
+
value={effective}
|
|
255
|
+
{assets}
|
|
256
|
+
{relations}
|
|
257
|
+
{fileBlueprints}
|
|
258
|
+
prefix={`${id}-${i}`}
|
|
259
|
+
errors={rowErrors(i)}
|
|
260
|
+
onchange={(next) => set(i, key, next[key] ?? empty(definition))}
|
|
261
|
+
/>
|
|
262
|
+
</div>
|
|
263
|
+
{/if}
|
|
264
|
+
{/if}
|
|
265
|
+
{/each}
|
|
266
|
+
</div>
|
|
267
|
+
</div>
|
|
268
|
+
<Dialog.Footer class="sm:justify-between">
|
|
269
|
+
<Button variant="ghost" class="text-destructive" onclick={() => remove(i)}
|
|
270
|
+
><Trash2 />Remove from gallery</Button
|
|
271
|
+
>
|
|
272
|
+
<Button onclick={() => (editing = null)}>Done</Button>
|
|
273
|
+
</Dialog.Footer>
|
|
274
|
+
{/if}
|
|
275
|
+
</Dialog.Content>
|
|
276
|
+
</Dialog.Root>
|
package/dist/admin/Inbox.svelte
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
<script lang="ts">
|
|
2
2
|
import { emailFailureMessage } from '../email-failure.js';
|
|
3
|
+
import { fieldLabel } from '../blueprints/labels.js';
|
|
3
4
|
import NotificationSettings from './NotificationSettings.svelte';
|
|
4
5
|
import { onMount } from 'svelte';
|
|
5
6
|
import * as Table from './components/ui/table/index.js';
|
|
@@ -67,7 +68,7 @@
|
|
|
67
68
|
<Table.Header
|
|
68
69
|
><Table.Row
|
|
69
70
|
><Table.Head>Received</Table.Head>{#each data.blueprint?.columns ?? [] as col}<Table.Head
|
|
70
|
-
>{data.blueprint?.fields[col]
|
|
71
|
+
>{fieldLabel(col, data.blueprint?.fields[col])}</Table.Head
|
|
71
72
|
>{/each}<Table.Head>State</Table.Head></Table.Row
|
|
72
73
|
></Table.Header
|
|
73
74
|
><Table.Body
|
|
@@ -100,7 +101,7 @@
|
|
|
100
101
|
></Dialog.Header
|
|
101
102
|
>{#if active}<dl class="cms-answers">
|
|
102
103
|
{#each Object.entries(active.schema.fields) as [key, field]}<div>
|
|
103
|
-
<dt>{field
|
|
104
|
+
<dt>{fieldLabel(key, field)}</dt>
|
|
104
105
|
<dd>{display(active.data[key])}</dd>
|
|
105
106
|
</div>{/each}
|
|
106
107
|
</dl>
|
|
@@ -22,7 +22,6 @@
|
|
|
22
22
|
value,
|
|
23
23
|
assets,
|
|
24
24
|
relations,
|
|
25
|
-
workerUrl,
|
|
26
25
|
fileBlueprints,
|
|
27
26
|
invalid = false,
|
|
28
27
|
onchange
|
|
@@ -32,7 +31,6 @@
|
|
|
32
31
|
value?: Json;
|
|
33
32
|
assets: Asset[];
|
|
34
33
|
relations: Relations;
|
|
35
|
-
workerUrl: string;
|
|
36
34
|
fileBlueprints: FileBlueprint[];
|
|
37
35
|
invalid?: boolean;
|
|
38
36
|
onchange: (value: LinkValue | null) => void;
|
|
@@ -135,7 +133,6 @@
|
|
|
135
133
|
id={id + '-value'}
|
|
136
134
|
value={draft.value || null}
|
|
137
135
|
{assets}
|
|
138
|
-
{workerUrl}
|
|
139
136
|
fileBlueprint={fileBlueprints.find((b) => b.id === field.fileBlueprint)}
|
|
140
137
|
onchange={(value) =>
|
|
141
138
|
(draft = { ...draft, value: typeof value === 'string' ? value : '' })}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import type { Payload } from '../blueprints/types.js';
|
|
7
7
|
import Fields from './Fields.svelte';
|
|
8
8
|
import type { AdminData, Asset } from './types.js';
|
|
9
|
-
import { api, assetUrl, message } from './client.js';
|
|
9
|
+
import { api, assetUrl, megabytes, message } from './client.js';
|
|
10
10
|
import { Button } from './components/ui/button/index.js';
|
|
11
11
|
import { Label } from './components/ui/label/index.js';
|
|
12
12
|
import { Badge } from './components/ui/badge/index.js';
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
import SelectField from './SelectField.svelte';
|
|
16
16
|
import { uploadImages, type UploadItem, type UploadFailure } from './uploads.js';
|
|
17
17
|
import UploadQueue from './UploadQueue.svelte';
|
|
18
|
+
import UploadProgress from './UploadProgress.svelte';
|
|
18
19
|
import AssetAttachment from './AssetAttachment.svelte';
|
|
19
20
|
import UploadButton from './UploadButton.svelte';
|
|
20
21
|
import Notice from './Notice.svelte';
|
|
@@ -109,6 +110,9 @@
|
|
|
109
110
|
batchBlueprint,
|
|
110
111
|
(index, state, error) => {
|
|
111
112
|
uploads[index] = { ...uploads[index], state, error };
|
|
113
|
+
},
|
|
114
|
+
(index, sent) => {
|
|
115
|
+
uploads[index] = { ...uploads[index], sent };
|
|
112
116
|
}
|
|
113
117
|
);
|
|
114
118
|
error = failures.map((failure) => failure.message).join('\n');
|
|
@@ -153,6 +157,7 @@
|
|
|
153
157
|
</div>
|
|
154
158
|
</div>
|
|
155
159
|
<UploadQueue items={uploads} />
|
|
160
|
+
<UploadProgress items={uploads} />
|
|
156
161
|
{#if failures.length}
|
|
157
162
|
<Button
|
|
158
163
|
variant="outline"
|
|
@@ -164,7 +169,7 @@
|
|
|
164
169
|
{#if error}<Notice error>{error}</Notice>{/if}
|
|
165
170
|
<div class="cms-list-meta">
|
|
166
171
|
<span class="cms-muted">{data.assets?.length ?? 0} assets</span><span class="cms-muted"
|
|
167
|
-
>Up to {(data.uploadLimit ?? 0)
|
|
172
|
+
>Up to {megabytes(data.uploadLimit ?? 0)} MB per image, including TIFF · SVG up to 1 MB</span
|
|
168
173
|
>
|
|
169
174
|
</div>
|
|
170
175
|
<SearchList
|
|
@@ -178,7 +183,6 @@
|
|
|
178
183
|
{#each assets as asset (asset.id)}
|
|
179
184
|
<AssetAttachment
|
|
180
185
|
{asset}
|
|
181
|
-
workerUrl={data.workerUrl!}
|
|
182
186
|
class="cms-media-card"
|
|
183
187
|
visibility={isPublic(asset.id) ? 'Public' : 'Private'}
|
|
184
188
|
onopen={() => {
|
|
@@ -206,16 +210,16 @@
|
|
|
206
210
|
>{/if}</Dialog.Header
|
|
207
211
|
>{#if active}{@const blueprint = data.fileBlueprints?.find((b) => b.id === active!.blueprint)}
|
|
208
212
|
<div class="cms-stack">
|
|
209
|
-
{#if !Object.values(blueprint?.fields ?? {}).some((field) => field.type === 'focus') && assetUrl(active
|
|
213
|
+
{#if !Object.values(blueprint?.fields ?? {}).some((field) => field.type === 'focus') && assetUrl(active)}<img
|
|
210
214
|
class="cms-asset-preview"
|
|
211
|
-
src={assetUrl(active
|
|
215
|
+
src={assetUrl(active)}
|
|
212
216
|
alt={String(active.metadata.alt ?? '')}
|
|
213
217
|
/>{/if}
|
|
214
218
|
{#if blueprint}<Fields
|
|
215
219
|
imageUrl={active.variants.some(
|
|
216
220
|
(v) => v.preset === 'sandcms-preview' || v.format === 'svg'
|
|
217
221
|
)
|
|
218
|
-
? assetUrl(active
|
|
222
|
+
? assetUrl(active)
|
|
219
223
|
: undefined}
|
|
220
224
|
fields={blueprint.fields}
|
|
221
225
|
value={metadata}
|
|
@@ -224,7 +228,6 @@
|
|
|
224
228
|
}}
|
|
225
229
|
assets={data.assets ?? []}
|
|
226
230
|
relations={data.relations ?? {}}
|
|
227
|
-
workerUrl={data.workerUrl!}
|
|
228
231
|
fileBlueprints={data.fileBlueprints}
|
|
229
232
|
prefix="media"
|
|
230
233
|
/>{/if}
|
|
@@ -1,20 +1,24 @@
|
|
|
1
1
|
<script lang="ts">
|
|
2
2
|
import SearchList from './SearchList.svelte';
|
|
3
|
+
import type { Snippet } from 'svelte';
|
|
3
4
|
import type { FileBlueprint } from '../blueprints/types.js';
|
|
4
5
|
import type { Asset } from './types.js';
|
|
5
6
|
import * as Dialog from './components/ui/dialog/index.js';
|
|
6
7
|
import { Button } from './components/ui/button/index.js';
|
|
7
8
|
import Image from '@lucide/svelte/icons/image';
|
|
8
9
|
import Upload from '@lucide/svelte/icons/upload';
|
|
10
|
+
import RefreshCw from '@lucide/svelte/icons/refresh-cw';
|
|
11
|
+
import * as Attachment from './components/ui/attachment/index.js';
|
|
9
12
|
import { uploadImages, type UploadItem, type UploadFailure } from './uploads.js';
|
|
10
13
|
import UploadQueue from './UploadQueue.svelte';
|
|
14
|
+
import UploadProgress from './UploadProgress.svelte';
|
|
15
|
+
import { imageMimeTypes } from '../blueprints/files.js';
|
|
11
16
|
import AssetAttachment from './AssetAttachment.svelte';
|
|
12
17
|
import SortableList from './SortableList.svelte';
|
|
13
18
|
import UploadButton from './UploadButton.svelte';
|
|
14
19
|
let {
|
|
15
20
|
value,
|
|
16
21
|
assets,
|
|
17
|
-
workerUrl,
|
|
18
22
|
onchange,
|
|
19
23
|
multiple = false,
|
|
20
24
|
hideSelection = false,
|
|
@@ -24,7 +28,6 @@
|
|
|
24
28
|
}: {
|
|
25
29
|
value: string | string[] | null;
|
|
26
30
|
assets: Asset[];
|
|
27
|
-
workerUrl: string;
|
|
28
31
|
onchange: (v: string | string[] | null) => void;
|
|
29
32
|
multiple?: boolean;
|
|
30
33
|
hideSelection?: boolean;
|
|
@@ -35,16 +38,7 @@
|
|
|
35
38
|
let uploads = $state<UploadItem[]>([]);
|
|
36
39
|
let dropArea = $state<HTMLDivElement | null>(null);
|
|
37
40
|
let dragging = $state(false);
|
|
38
|
-
const accept = $derived(
|
|
39
|
-
fileBlueprint?.accept ?? [
|
|
40
|
-
'image/jpeg',
|
|
41
|
-
'image/png',
|
|
42
|
-
'image/webp',
|
|
43
|
-
'image/avif',
|
|
44
|
-
'image/gif',
|
|
45
|
-
'image/svg+xml'
|
|
46
|
-
]
|
|
47
|
-
);
|
|
41
|
+
const accept = $derived(fileBlueprint?.accept ?? imageMimeTypes);
|
|
48
42
|
// Listen across the window so the grid responds as soon as files enter the app.
|
|
49
43
|
// The depth counter avoids flicker when crossing descendants of the grid.
|
|
50
44
|
$effect(() => {
|
|
@@ -172,6 +166,9 @@
|
|
|
172
166
|
batchBlueprint,
|
|
173
167
|
(index, state, error) => {
|
|
174
168
|
uploads[index] = { ...uploads[index], state, error };
|
|
169
|
+
},
|
|
170
|
+
(index, sent) => {
|
|
171
|
+
uploads[index] = { ...uploads[index], sent };
|
|
175
172
|
}
|
|
176
173
|
);
|
|
177
174
|
error = failures.map((failure) => failure.message).join('\n');
|
|
@@ -181,17 +178,17 @@
|
|
|
181
178
|
}
|
|
182
179
|
</script>
|
|
183
180
|
|
|
184
|
-
{#snippet selectedImage(asset: Asset)}
|
|
181
|
+
{#snippet selectedImage(asset: Asset, replace?: Snippet)}
|
|
185
182
|
<AssetAttachment
|
|
186
183
|
{asset}
|
|
187
|
-
{workerUrl}
|
|
188
184
|
orientation="horizontal"
|
|
189
185
|
class="w-full"
|
|
186
|
+
actions={replace}
|
|
190
187
|
onremove={() => onchange(multiple ? (value as string[]).filter((id) => id !== asset.id) : null)}
|
|
191
188
|
/>
|
|
192
189
|
{/snippet}
|
|
193
|
-
|
|
194
|
-
{#if multiple}
|
|
190
|
+
<Dialog.Root bind:open>
|
|
191
|
+
{#if !hideSelection && multiple}
|
|
195
192
|
<SortableList items={Array.isArray(value) ? value : []} onchange={(ids) => onchange(ids)}>
|
|
196
193
|
{#snippet children(assetId)}
|
|
197
194
|
{@const asset = all.find((a) => a.id === assetId)}
|
|
@@ -202,28 +199,40 @@
|
|
|
202
199
|
>{/if}
|
|
203
200
|
{/snippet}
|
|
204
201
|
</SortableList>
|
|
202
|
+
{/if}
|
|
203
|
+
{#if !hideSelection && !multiple && selected[0]}
|
|
204
|
+
<!-- A single selection replaces the image in place instead of adding a second wide row. -->
|
|
205
|
+
{#snippet replace()}
|
|
206
|
+
<Dialog.Trigger>
|
|
207
|
+
{#snippet child({ props })}<Attachment.Action
|
|
208
|
+
{...props}
|
|
209
|
+
{id}
|
|
210
|
+
aria-label={'Replace ' + selected[0].filename}
|
|
211
|
+
title="Replace image"><RefreshCw /></Attachment.Action
|
|
212
|
+
>{/snippet}
|
|
213
|
+
</Dialog.Trigger>
|
|
214
|
+
{/snippet}
|
|
215
|
+
{@render selectedImage(selected[0], replace)}
|
|
205
216
|
{:else}
|
|
206
|
-
|
|
217
|
+
<Dialog.Trigger>
|
|
218
|
+
{#snippet child({ props })}<Button
|
|
219
|
+
{...props}
|
|
220
|
+
{id}
|
|
221
|
+
variant="outline"
|
|
222
|
+
class="h-auto w-full border-dashed p-5"
|
|
223
|
+
>
|
|
224
|
+
<Image size={18} />{multiple
|
|
225
|
+
? 'Add images'
|
|
226
|
+
: selected.length
|
|
227
|
+
? 'Choose another image'
|
|
228
|
+
: 'Choose an image'}
|
|
229
|
+
</Button>{/snippet}
|
|
230
|
+
</Dialog.Trigger>
|
|
207
231
|
{/if}
|
|
208
|
-
{
|
|
209
|
-
<Dialog.Root bind:open
|
|
210
|
-
><Dialog.Trigger>
|
|
211
|
-
{#snippet child({ props })}<Button
|
|
212
|
-
{...props}
|
|
213
|
-
{id}
|
|
214
|
-
variant="outline"
|
|
215
|
-
class="h-auto w-full border-dashed p-5"
|
|
216
|
-
>
|
|
217
|
-
<Image size={18} />{multiple
|
|
218
|
-
? 'Add images'
|
|
219
|
-
: selected.length
|
|
220
|
-
? 'Choose another image'
|
|
221
|
-
: 'Choose an image'}
|
|
222
|
-
</Button>{/snippet}</Dialog.Trigger
|
|
223
|
-
><Dialog.Content portalProps={{ disabled: true }} class="cms-media-dialog"
|
|
232
|
+
<Dialog.Content portalProps={{ disabled: true }} class="cms-media-dialog"
|
|
224
233
|
><Dialog.Header><Dialog.Title>Media library</Dialog.Title></Dialog.Header><UploadQueue
|
|
225
234
|
items={uploads}
|
|
226
|
-
/>
|
|
235
|
+
/><UploadProgress items={uploads} />
|
|
227
236
|
{#if failures.length}
|
|
228
237
|
<Button
|
|
229
238
|
variant="outline"
|
|
@@ -260,7 +269,6 @@
|
|
|
260
269
|
{#each matches.filter((a) => a.status !== 'deleting') as asset (asset.id)}
|
|
261
270
|
<AssetAttachment
|
|
262
271
|
{asset}
|
|
263
|
-
{workerUrl}
|
|
264
272
|
class="cms-picker-item"
|
|
265
273
|
selected={selected.some((a) => a.id === asset.id)}
|
|
266
274
|
onopen={() => {
|