@antelopejs/dms-media 0.6.2 → 0.7.1
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 +17 -23
- package/dist/acl/entries.js +2 -1
- package/dist/acl/entries.js.map +1 -1
- package/dist/asset-lifecycle.js.map +1 -1
- package/dist/db/models/mediaAssets.model.d.ts +7 -5
- package/dist/db/models/mediaDeclarations.model.d.ts +7 -5
- package/dist/db/models/mediaEvents.model.d.ts +7 -5
- package/dist/db/models/mediaFavorites.model.d.ts +7 -5
- package/dist/db/models/mediaFolders.model.d.ts +7 -5
- package/dist/db/models/mediaUploads.model.d.ts +7 -5
- package/dist/declared/assets.js +2 -5
- package/dist/declared/assets.js.map +1 -1
- package/dist/declared/records.d.ts +2 -1
- package/dist/declared/records.js.map +1 -1
- package/dist/library/activity.js +2 -1
- package/dist/library/activity.js.map +1 -1
- package/dist/routes/media/manage.js +2 -2
- package/dist/routes/media/manage.js.map +1 -1
- package/dist/routes/media/storage-keys.js.map +1 -1
- package/dist/test/antelope.test.js +7 -5
- package/dist/test/antelope.test.js.map +1 -1
- package/dist/test/helpers/assets.d.ts +24 -5
- package/dist/test/helpers/assets.js +22 -7
- package/dist/test/helpers/assets.js.map +1 -1
- package/dist/test/helpers/bodies.d.ts +31 -0
- package/dist/test/helpers/bodies.js +16 -0
- package/dist/test/helpers/bodies.js.map +1 -0
- package/dist/test/helpers/folders.d.ts +50 -0
- package/dist/test/helpers/folders.js +4 -2
- package/dist/test/helpers/folders.js.map +1 -1
- package/dist/test/helpers/members.js +10 -3
- package/dist/test/helpers/members.js.map +1 -1
- package/dist/test/helpers/owner.js +6 -1
- package/dist/test/helpers/owner.js.map +1 -1
- package/dist/test/helpers/permissions-world.d.ts +132 -11
- package/dist/test/helpers/permissions-world.js +21 -2
- package/dist/test/helpers/permissions-world.js.map +1 -1
- package/dist/test/helpers/setup-token.d.ts +1 -0
- package/dist/test/helpers/setup-token.js +5 -0
- package/dist/test/helpers/setup-token.js.map +1 -0
- package/dist/test/integration/derivative-sweep-query.test.js +1 -2
- package/dist/test/integration/derivative-sweep-query.test.js.map +1 -1
- package/dist/test/integration/folder-cascade.test.js +3 -1
- package/dist/test/integration/folder-cascade.test.js.map +1 -1
- package/dist/test/integration/media-activity-overview.test.js +39 -12
- package/dist/test/integration/media-activity-overview.test.js.map +1 -1
- package/dist/test/integration/media-api.test.js +22 -21
- package/dist/test/integration/media-api.test.js.map +1 -1
- package/dist/test/integration/media-bindings.test.js +6 -5
- package/dist/test/integration/media-bindings.test.js.map +1 -1
- package/dist/test/integration/media-declared-content.test.js +2 -1
- package/dist/test/integration/media-declared-content.test.js.map +1 -1
- package/dist/test/integration/media-delivery-editing.test.js +12 -2
- package/dist/test/integration/media-delivery-editing.test.js.map +1 -1
- package/dist/test/integration/media-delivery.test.js +5 -3
- package/dist/test/integration/media-delivery.test.js.map +1 -1
- package/dist/test/integration/media-explorer-writes.test.js +6 -4
- package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
- package/dist/test/integration/media-guards.test.js +11 -16
- package/dist/test/integration/media-guards.test.js.map +1 -1
- package/dist/test/integration/media-library.test.js +73 -23
- package/dist/test/integration/media-library.test.js.map +1 -1
- package/dist/test/integration/media-linked-subfolders.test.js +3 -2
- package/dist/test/integration/media-linked-subfolders.test.js.map +1 -1
- package/dist/test/integration/media-member-access.test.js +18 -2
- package/dist/test/integration/media-member-access.test.js.map +1 -1
- package/dist/test/integration/media-permissions.test.js +7 -2
- package/dist/test/integration/media-permissions.test.js.map +1 -1
- package/dist/test/integration/media-project-field.test.js +17 -2
- package/dist/test/integration/media-project-field.test.js.map +1 -1
- package/dist/test/integration/media-search-views.test.js +24 -10
- package/dist/test/integration/media-search-views.test.js.map +1 -1
- package/dist/test/integration/media-storage-origin-unreachable.test.js +2 -1
- package/dist/test/integration/media-storage-origin-unreachable.test.js.map +1 -1
- package/dist/test/integration/media-transform.test.js +8 -9
- package/dist/test/integration/media-transform.test.js.map +1 -1
- package/dist/test/integration/media-upload-history-filters.test.d.ts +1 -0
- package/dist/test/integration/media-upload-history-filters.test.js +67 -0
- package/dist/test/integration/media-upload-history-filters.test.js.map +1 -0
- package/dist/test/integration/media-upload-policy.test.js +31 -14
- package/dist/test/integration/media-upload-policy.test.js.map +1 -1
- package/dist/test/integration/permissions-management.js +15 -4
- package/dist/test/integration/permissions-management.js.map +1 -1
- package/dist/test/unit/declared.test.js +1 -1
- package/dist/test/unit/declared.test.js.map +1 -1
- package/dist/test/unit/library/zip-names.test.js +22 -4
- package/dist/test/unit/library/zip-names.test.js.map +1 -1
- package/dist/test/unit/upload-rules.test.js +10 -0
- package/dist/test/unit/upload-rules.test.js.map +1 -1
- package/dist/transform-ops.js.map +1 -1
- package/dist/upload-policy.js +11 -11
- package/dist/upload-policy.js.map +1 -1
- package/dist/validation/declared.schema.d.ts +4 -4
- package/dist/validation/library.schema.d.ts +10 -10
- package/dist/validation/media.schema.d.ts +8 -9
- package/dist/validation/media.schema.js +4 -6
- package/dist/validation/media.schema.js.map +1 -1
- package/frontend-vue/app/build/imageEditor/useEditorSaving.ts +3 -2
- package/frontend-vue/app/build/library/libraryCore.ts +2 -1
- package/frontend-vue/app/components/FirstRun.vue +2 -1
- package/frontend-vue/app/components/dialogs/DestinationDialog.vue +3 -3
- package/frontend-vue/app/components/field/FieldAltPopover.vue +2 -1
- package/frontend-vue/app/composables/useAssetFieldUploads.ts +9 -1
- package/frontend-vue/app/composables/useAssetLink.ts +33 -13
- package/frontend-vue/app/composables/useFileDetails.ts +6 -5
- package/frontend-vue/app/composables/useUploadFailureText.ts +24 -5
- package/frontend-vue/app/composables/useUploadQueue.ts +178 -44
- package/frontend-vue/app/composables/useUploadToasts.ts +81 -19
- package/frontend-vue/package.json +3 -3
- package/frontend-vue/tests/api-error-presentation.test.ts +183 -0
- package/frontend-vue/tests/fixtures/serverRender.ts +1 -1
- package/package.json +12 -11
- package/skills/dms-media/SKILL.md +2 -2
- package/src/acl/entries.ts +5 -2
- package/src/asset-lifecycle.ts +2 -1
- package/src/declared/assets.ts +6 -6
- package/src/declared/records.ts +5 -1
- package/src/library/activity.ts +3 -1
- package/src/routes/media/manage.ts +2 -2
- package/src/routes/media/storage-keys.ts +1 -0
- package/src/test/antelope.test.ts +7 -5
- package/src/test/helpers/assets.ts +28 -15
- package/src/test/helpers/bodies.ts +22 -0
- package/src/test/helpers/folders.ts +6 -3
- package/src/test/helpers/members.ts +11 -3
- package/src/test/helpers/owner.ts +6 -1
- package/src/test/helpers/permissions-world.ts +23 -19
- package/src/test/helpers/setup-token.ts +6 -0
- package/src/test/integration/derivative-sweep-query.test.ts +4 -3
- package/src/test/integration/folder-cascade.test.ts +3 -1
- package/src/test/integration/media-activity-overview.test.ts +52 -37
- package/src/test/integration/media-api.test.ts +25 -27
- package/src/test/integration/media-bindings.test.ts +10 -16
- package/src/test/integration/media-declared-content.test.ts +2 -1
- package/src/test/integration/media-delivery-editing.test.ts +13 -2
- package/src/test/integration/media-delivery.test.ts +8 -3
- package/src/test/integration/media-explorer-writes.test.ts +6 -4
- package/src/test/integration/media-guards.test.ts +18 -13
- package/src/test/integration/media-library.test.ts +101 -47
- package/src/test/integration/media-linked-subfolders.test.ts +3 -2
- package/src/test/integration/media-member-access.test.ts +22 -24
- package/src/test/integration/media-permissions.test.ts +11 -5
- package/src/test/integration/media-project-field.test.ts +21 -9
- package/src/test/integration/media-search-views.test.ts +35 -31
- package/src/test/integration/media-storage-origin-unreachable.test.ts +2 -1
- package/src/test/integration/media-transform.test.ts +8 -9
- package/src/test/integration/media-upload-history-filters.test.ts +77 -0
- package/src/test/integration/media-upload-policy.test.ts +39 -20
- package/src/test/integration/permissions-management.ts +16 -4
- package/src/test/unit/declared.test.ts +4 -1
- package/src/test/unit/library/zip-names.test.ts +26 -7
- package/src/test/unit/upload-rules.test.ts +11 -0
- package/src/transform-ops.ts +1 -0
- package/src/upload-policy.ts +11 -11
- package/src/validation/media.schema.ts +8 -8
|
@@ -22,8 +22,8 @@ export declare const listingQuerySchema: z.ZodObject<{
|
|
|
22
22
|
direction: z.ZodDefault<z.ZodEnum<["asc", "desc"]>>;
|
|
23
23
|
type: z.ZodOptional<z.ZodEnum<["image", "video", "audio", "pdf", "document", "spreadsheet", "vector", "archive", "other"]>>;
|
|
24
24
|
}, "strip", z.ZodTypeAny, {
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
sort: "type" | "name" | "date" | "size";
|
|
26
|
+
modified: "any" | "year" | "7d" | "30d";
|
|
27
27
|
orientation: "any" | "landscape" | "portrait" | "square";
|
|
28
28
|
visibility: "public" | "private" | "any";
|
|
29
29
|
offset: number;
|
|
@@ -32,8 +32,8 @@ export declare const listingQuerySchema: z.ZodObject<{
|
|
|
32
32
|
type?: "image" | "archive" | "audio" | "document" | "video" | "pdf" | "spreadsheet" | "vector" | "other" | undefined;
|
|
33
33
|
folderId?: string | undefined;
|
|
34
34
|
}, {
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
sort?: "type" | "name" | "date" | "size" | undefined;
|
|
36
|
+
modified?: "any" | "year" | "7d" | "30d" | undefined;
|
|
37
37
|
type?: "image" | "archive" | "audio" | "document" | "video" | "pdf" | "spreadsheet" | "vector" | "other" | undefined;
|
|
38
38
|
orientation?: "any" | "landscape" | "portrait" | "square" | undefined;
|
|
39
39
|
visibility?: "public" | "private" | "any" | undefined;
|
|
@@ -62,8 +62,8 @@ export declare const searchQuerySchema: z.ZodObject<{
|
|
|
62
62
|
direction: z.ZodDefault<z.ZodEnum<["asc", "desc"]>>;
|
|
63
63
|
type: z.ZodOptional<z.ZodEnum<["image", "video", "audio", "pdf", "document", "spreadsheet", "vector", "archive", "other"]>>;
|
|
64
64
|
}, "strip", z.ZodTypeAny, {
|
|
65
|
-
|
|
66
|
-
|
|
65
|
+
sort: "type" | "name" | "date" | "size";
|
|
66
|
+
modified: "any" | "year" | "7d" | "30d";
|
|
67
67
|
orientation: "any" | "landscape" | "portrait" | "square";
|
|
68
68
|
visibility: "public" | "private" | "any";
|
|
69
69
|
q: string;
|
|
@@ -73,8 +73,8 @@ export declare const searchQuerySchema: z.ZodObject<{
|
|
|
73
73
|
type?: "image" | "archive" | "audio" | "document" | "video" | "pdf" | "spreadsheet" | "vector" | "other" | undefined;
|
|
74
74
|
folderId?: string | undefined;
|
|
75
75
|
}, {
|
|
76
|
-
|
|
77
|
-
|
|
76
|
+
sort?: "type" | "name" | "date" | "size" | undefined;
|
|
77
|
+
modified?: "any" | "year" | "7d" | "30d" | undefined;
|
|
78
78
|
type?: "image" | "archive" | "audio" | "document" | "video" | "pdf" | "spreadsheet" | "vector" | "other" | undefined;
|
|
79
79
|
orientation?: "any" | "landscape" | "portrait" | "square" | undefined;
|
|
80
80
|
visibility?: "public" | "private" | "any" | undefined;
|
|
@@ -143,8 +143,8 @@ export declare const batchSummarySchema: z.ZodObject<{
|
|
|
143
143
|
reason?: string | undefined;
|
|
144
144
|
}>, "many">>;
|
|
145
145
|
}, "strip", z.ZodTypeAny, {
|
|
146
|
-
size: number;
|
|
147
146
|
failed: number;
|
|
147
|
+
size: number;
|
|
148
148
|
folderId: string;
|
|
149
149
|
batchId: string;
|
|
150
150
|
uploaded: number;
|
|
@@ -154,8 +154,8 @@ export declare const batchSummarySchema: z.ZodObject<{
|
|
|
154
154
|
reason?: string | undefined;
|
|
155
155
|
}[] | undefined;
|
|
156
156
|
}, {
|
|
157
|
-
size: number;
|
|
158
157
|
failed: number;
|
|
158
|
+
size: number;
|
|
159
159
|
folderId: string;
|
|
160
160
|
batchId: string;
|
|
161
161
|
uploaded: number;
|
|
@@ -13,7 +13,6 @@ export declare const MEDIA_ERRORS: {
|
|
|
13
13
|
export declare const nameSchema: z.ZodEffects<z.ZodString, string, string>;
|
|
14
14
|
export declare const fileNameSchema: z.ZodEffects<z.ZodString, string, string>;
|
|
15
15
|
export declare function comparableName(name: string): string;
|
|
16
|
-
export declare function describeValidationError(error: unknown): string;
|
|
17
16
|
export declare function parseBody<Output>(body: unknown, schema: z.ZodType<Output, z.ZodTypeDef, unknown>): Output;
|
|
18
17
|
export declare const createFolderSchema: z.ZodObject<{
|
|
19
18
|
name: z.ZodEffects<z.ZodString, string, string>;
|
|
@@ -118,55 +117,55 @@ export declare const transformSchema: z.ZodEffects<z.ZodObject<{
|
|
|
118
117
|
width: z.ZodEffects<z.ZodNumber, number, number>;
|
|
119
118
|
height: z.ZodEffects<z.ZodNumber, number, number>;
|
|
120
119
|
}, "strip", z.ZodTypeAny, {
|
|
121
|
-
height: number;
|
|
122
120
|
width: number;
|
|
121
|
+
height: number;
|
|
123
122
|
x: number;
|
|
124
123
|
y: number;
|
|
125
124
|
}, {
|
|
126
|
-
height: number;
|
|
127
125
|
width: number;
|
|
126
|
+
height: number;
|
|
128
127
|
x: number;
|
|
129
128
|
y: number;
|
|
130
129
|
}>, {
|
|
131
|
-
height: number;
|
|
132
130
|
width: number;
|
|
131
|
+
height: number;
|
|
133
132
|
x: number;
|
|
134
133
|
y: number;
|
|
135
134
|
}, {
|
|
136
|
-
height: number;
|
|
137
135
|
width: number;
|
|
136
|
+
height: number;
|
|
138
137
|
x: number;
|
|
139
138
|
y: number;
|
|
140
139
|
}>>;
|
|
141
140
|
rotate: z.ZodOptional<z.ZodEffects<z.ZodNumber, number, number>>;
|
|
142
141
|
}, "strip", z.ZodTypeAny, {
|
|
143
142
|
crop?: {
|
|
144
|
-
height: number;
|
|
145
143
|
width: number;
|
|
144
|
+
height: number;
|
|
146
145
|
x: number;
|
|
147
146
|
y: number;
|
|
148
147
|
} | undefined;
|
|
149
148
|
rotate?: number | undefined;
|
|
150
149
|
}, {
|
|
151
150
|
crop?: {
|
|
152
|
-
height: number;
|
|
153
151
|
width: number;
|
|
152
|
+
height: number;
|
|
154
153
|
x: number;
|
|
155
154
|
y: number;
|
|
156
155
|
} | undefined;
|
|
157
156
|
rotate?: number | undefined;
|
|
158
157
|
}>, {
|
|
159
158
|
crop?: {
|
|
160
|
-
height: number;
|
|
161
159
|
width: number;
|
|
160
|
+
height: number;
|
|
162
161
|
x: number;
|
|
163
162
|
y: number;
|
|
164
163
|
} | undefined;
|
|
165
164
|
rotate?: number | undefined;
|
|
166
165
|
}, {
|
|
167
166
|
crop?: {
|
|
168
|
-
height: number;
|
|
169
167
|
width: number;
|
|
168
|
+
height: number;
|
|
170
169
|
x: number;
|
|
171
170
|
y: number;
|
|
172
171
|
} | undefined;
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.transformSchema = exports.previewIdsSchema = exports.assetVisibilitySchema = exports.moveAssetSchema = exports.updateAssetSchema = exports.altSchema = exports.confirmUploadSchema = exports.presignSchema = exports.MAX_UPLOAD_SIZE_BYTES = exports.folderVisibilitySchema = exports.moveFolderSchema = exports.renameFolderSchema = exports.createFolderSchema = exports.fileNameSchema = exports.nameSchema = exports.MEDIA_ERRORS = void 0;
|
|
4
4
|
exports.comparableName = comparableName;
|
|
5
|
-
exports.describeValidationError = describeValidationError;
|
|
6
5
|
exports.parseBody = parseBody;
|
|
7
6
|
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
8
7
|
const zod_1 = require("zod");
|
|
@@ -48,12 +47,11 @@ exports.fileNameSchema = boundedName().refine(isSafeFileName, {
|
|
|
48
47
|
function comparableName(name) {
|
|
49
48
|
return name.trim().normalize("NFC").toLocaleLowerCase();
|
|
50
49
|
}
|
|
51
|
-
function describeValidationError(error) {
|
|
52
|
-
const message = error instanceof zod_1.ZodError ? error.issues[0]?.message : "";
|
|
53
|
-
return message?.startsWith("$") ? message : exports.MEDIA_ERRORS.invalidRequest;
|
|
54
|
-
}
|
|
55
50
|
function parseBody(body, schema) {
|
|
56
|
-
return (0, interface_api_util_1.assertValidation)(body, (value) => schema.parse(value),
|
|
51
|
+
return (0, interface_api_util_1.assertValidation)(body, (value) => schema.parse(value), (error) => {
|
|
52
|
+
const message = error instanceof zod_1.ZodError ? error.issues[0]?.message : "";
|
|
53
|
+
return message?.startsWith("$") ? message : exports.MEDIA_ERRORS.invalidRequest;
|
|
54
|
+
});
|
|
57
55
|
}
|
|
58
56
|
exports.createFolderSchema = zod_1.z.object({
|
|
59
57
|
name: exports.nameSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.schema.js","sourceRoot":"","sources":["../../src/validation/media.schema.ts"],"names":[],"mappings":";;;AA0DA,wCAEC;
|
|
1
|
+
{"version":3,"file":"media.schema.js","sourceRoot":"","sources":["../../src/validation/media.schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ export interface EditorSaving {
|
|
|
20
20
|
*/
|
|
21
21
|
export function useEditorSaving({ asset, isSaving, hasChanges, operations, api, toast, t, confirm }: EditorSaving) {
|
|
22
22
|
const isLeavingSaved = ref(false)
|
|
23
|
+
const { presentError } = useApiErrorPresenter()
|
|
23
24
|
|
|
24
25
|
useUnsavedChanges({ dirty: () => hasChanges() && !isLeavingSaved.value })
|
|
25
26
|
|
|
@@ -34,7 +35,7 @@ export function useEditorSaving({ asset, isSaving, hasChanges, operations, api,
|
|
|
34
35
|
try {
|
|
35
36
|
await run()
|
|
36
37
|
} catch (error) {
|
|
37
|
-
|
|
38
|
+
presentError(error, { fallbackKey: 'dms_media.editor.save_failed' })
|
|
38
39
|
} finally {
|
|
39
40
|
isSaving.value = false
|
|
40
41
|
}
|
|
@@ -71,7 +72,7 @@ export function useEditorSaving({ asset, isSaving, hasChanges, operations, api,
|
|
|
71
72
|
toast.add({ title: t('dms_media.editor.reverted'), color: 'success', icon: 'i-ph-arrow-counter-clockwise' })
|
|
72
73
|
await leaveTo(fileLink(current.id))
|
|
73
74
|
}
|
|
74
|
-
if (skipConfirm) return run().catch((error) =>
|
|
75
|
+
if (skipConfirm) return run().catch((error) => presentError(error, { fallbackKey: 'dms_media.editor.revert_failed' }))
|
|
75
76
|
await confirm({
|
|
76
77
|
title: t('dms_media.editor.revert_title'),
|
|
77
78
|
description: t('dms_media.editor.revert_description'),
|
|
@@ -7,6 +7,7 @@ export function createMediaLibrary(options: MediaLibraryOptions) {
|
|
|
7
7
|
const api = useMediaApi()
|
|
8
8
|
const { t } = useI18n()
|
|
9
9
|
const toast = useToast()
|
|
10
|
+
const { presentError } = useApiErrorPresenter()
|
|
10
11
|
const previews = useMediaPreviews()
|
|
11
12
|
const uploads = useUploadQueue()
|
|
12
13
|
const tree = useLibraryTree({ scopeFolderId: options.scopeFolderId })
|
|
@@ -51,7 +52,7 @@ export function createMediaLibrary(options: MediaLibraryOptions) {
|
|
|
51
52
|
}
|
|
52
53
|
|
|
53
54
|
function notifyFailure(error: unknown, titleKey: string): void {
|
|
54
|
-
|
|
55
|
+
presentError(error, { fallbackKey: titleKey })
|
|
55
56
|
}
|
|
56
57
|
|
|
57
58
|
async function open(next: LibraryLocation, remember = true): Promise<void> {
|
|
@@ -17,6 +17,7 @@ const STARTERS: StarterFolder[] = [
|
|
|
17
17
|
const api = useMediaApi()
|
|
18
18
|
const { t } = useI18n()
|
|
19
19
|
const toast = useToast()
|
|
20
|
+
const { presentError } = useApiErrorPresenter()
|
|
20
21
|
const { tree, ready } = useLibraryTree()
|
|
21
22
|
const isCreating = ref(false)
|
|
22
23
|
// Read with the page: a client navigation waits for the folders, so the welcome shows with it rather than after.
|
|
@@ -36,7 +37,7 @@ async function createStarters(): Promise<void> {
|
|
|
36
37
|
toast.add({ title: t('dms_media.first_run.created'), color: 'success', icon: 'i-ph-folders' })
|
|
37
38
|
await navigateDms(MEDIA_ROUTES.files)
|
|
38
39
|
} catch (error) {
|
|
39
|
-
|
|
40
|
+
presentError(error, { fallbackKey: 'dms_media.toasts.folder_create_failed' })
|
|
40
41
|
} finally {
|
|
41
42
|
isCreating.value = false
|
|
42
43
|
}
|
|
@@ -16,7 +16,7 @@ const props = defineProps<{
|
|
|
16
16
|
const emit = defineEmits<{ close: [string | null] }>()
|
|
17
17
|
const { t } = useI18n()
|
|
18
18
|
const api = useMediaApi()
|
|
19
|
-
const
|
|
19
|
+
const { presentError } = useApiErrorPresenter()
|
|
20
20
|
const format = useMediaFormat()
|
|
21
21
|
const nameDialog = useOverlay().create(NameDialog)
|
|
22
22
|
const { tree, refresh: reload } = useLibraryTree()
|
|
@@ -70,8 +70,8 @@ async function createFolder(): Promise<void> {
|
|
|
70
70
|
const { id } = await api.createFolder(name, parent?.id)
|
|
71
71
|
await reload()
|
|
72
72
|
target.value = id
|
|
73
|
-
} catch {
|
|
74
|
-
|
|
73
|
+
} catch (error) {
|
|
74
|
+
presentError(error, { fallbackKey: 'dms_media.toasts.folder_create_failed' })
|
|
75
75
|
} finally {
|
|
76
76
|
isCreating.value = false
|
|
77
77
|
}
|
|
@@ -12,6 +12,7 @@ const emit = defineEmits<{ saved: [MediaAsset] }>()
|
|
|
12
12
|
const isOpen = defineModel<boolean>('open', { default: false })
|
|
13
13
|
const { t } = useI18n()
|
|
14
14
|
const api = useMediaApi()
|
|
15
|
+
const { presentError } = useApiErrorPresenter()
|
|
15
16
|
|
|
16
17
|
const hasAlt = computed(() => !needsAltText(props.asset))
|
|
17
18
|
|
|
@@ -21,7 +22,7 @@ async function save(alt: string): Promise<boolean> {
|
|
|
21
22
|
emit('saved', { ...props.asset, alt })
|
|
22
23
|
return true
|
|
23
24
|
} catch (error) {
|
|
24
|
-
|
|
25
|
+
presentError(error, { fallbackKey: 'dms_media.field_widget.alt.save_failed' })
|
|
25
26
|
return false
|
|
26
27
|
}
|
|
27
28
|
}
|
|
@@ -30,6 +30,7 @@ export function useAssetFieldUploads(options: AssetFieldUploadOptions) {
|
|
|
30
30
|
const uploadToasts = useUploadToasts()
|
|
31
31
|
const toast = useToast()
|
|
32
32
|
const { t } = useI18n()
|
|
33
|
+
const { presentError } = useApiErrorPresenter()
|
|
33
34
|
const batchIds = ref<string[]>([])
|
|
34
35
|
const reportedFailures = new Set<string>()
|
|
35
36
|
|
|
@@ -96,10 +97,17 @@ export function useAssetFieldUploads(options: AssetFieldUploadOptions) {
|
|
|
96
97
|
FAILED_STATUSES.has(entry.status) && !reportedFailures.has(entry.id),
|
|
97
98
|
)) {
|
|
98
99
|
reportedFailures.add(item.id)
|
|
100
|
+
if (item.requestError !== undefined) {
|
|
101
|
+
presentError(item.requestError, {
|
|
102
|
+
fallbackKey: 'dms_media.field_widget.upload.failed',
|
|
103
|
+
params: { name: item.name },
|
|
104
|
+
})
|
|
105
|
+
continue
|
|
106
|
+
}
|
|
99
107
|
toast.add({
|
|
100
108
|
title: t('dms_media.field_widget.upload.failed', { name: item.name }),
|
|
101
109
|
description: failureText(item),
|
|
102
|
-
color: '
|
|
110
|
+
color: 'warning',
|
|
103
111
|
icon: 'i-ph-warning-circle',
|
|
104
112
|
})
|
|
105
113
|
}
|
|
@@ -49,13 +49,16 @@ export function useAssetLink() {
|
|
|
49
49
|
const { t } = useI18n()
|
|
50
50
|
const toast = useToast()
|
|
51
51
|
const { confirm } = useConfirm()
|
|
52
|
+
const { presentError } = useApiErrorPresenter()
|
|
52
53
|
|
|
53
54
|
async function linkOf(asset: Pick<MediaAsset, 'url'>): Promise<string> {
|
|
54
55
|
return `${await resolveLinksOrigin(() => $authFetch<LinksOrigin>(LINKS_ORIGIN_API))}${asset.url}`
|
|
55
56
|
}
|
|
56
57
|
|
|
57
58
|
/** Asks before a file becomes reachable by anyone holding its link. */
|
|
58
|
-
function confirmMakePublic(
|
|
59
|
+
function confirmMakePublic(
|
|
60
|
+
asset: Pick<MediaAsset, 'name'>,
|
|
61
|
+
): Promise<boolean> {
|
|
59
62
|
return confirm({
|
|
60
63
|
title: t('dms_media.asset_link.make_public_title', { name: asset.name }),
|
|
61
64
|
description: t('dms_media.asset_link.make_public_description'),
|
|
@@ -68,11 +71,16 @@ export function useAssetLink() {
|
|
|
68
71
|
})
|
|
69
72
|
}
|
|
70
73
|
|
|
71
|
-
function warnPrivate(
|
|
74
|
+
function warnPrivate(
|
|
75
|
+
asset: LinkedAsset,
|
|
76
|
+
options: CopyAssetLinkOptions,
|
|
77
|
+
): void {
|
|
72
78
|
const makePublic = options.makePublic
|
|
73
79
|
toast.add({
|
|
74
80
|
title: t('dms_media.toasts.link_copied'),
|
|
75
|
-
description: t('dms_media.asset_link.private_warning', {
|
|
81
|
+
description: t('dms_media.asset_link.private_warning', {
|
|
82
|
+
name: asset.name,
|
|
83
|
+
}),
|
|
76
84
|
color: 'warning',
|
|
77
85
|
icon: 'i-ph-lock-simple',
|
|
78
86
|
actions: makePublic
|
|
@@ -88,23 +96,33 @@ export function useAssetLink() {
|
|
|
88
96
|
})
|
|
89
97
|
}
|
|
90
98
|
|
|
91
|
-
async function copyLink(
|
|
99
|
+
async function copyLink(
|
|
100
|
+
asset: LinkedAsset,
|
|
101
|
+
options: CopyAssetLinkOptions = {},
|
|
102
|
+
): Promise<void> {
|
|
92
103
|
const link = await linkOf(asset).catch(() => asset.url)
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
104
|
+
const copied = await navigator.clipboard.writeText(link).then(
|
|
105
|
+
() => true,
|
|
106
|
+
() => false,
|
|
107
|
+
)
|
|
108
|
+
if (!copied) {
|
|
96
109
|
toast.add({
|
|
97
110
|
title: t('dms_media.asset_link.copy_failed'),
|
|
98
111
|
description: link,
|
|
99
|
-
color: '
|
|
112
|
+
color: 'warning',
|
|
100
113
|
icon: 'i-ph-warning',
|
|
101
114
|
duration: MANUAL_COPY_TOAST_MS,
|
|
102
115
|
ui: { description: 'select-all break-all font-mono' },
|
|
103
116
|
})
|
|
104
117
|
return
|
|
105
118
|
}
|
|
106
|
-
if (asset.effectiveVisibility === 'private')
|
|
107
|
-
|
|
119
|
+
if (asset.effectiveVisibility === 'private')
|
|
120
|
+
return warnPrivate(asset, options)
|
|
121
|
+
toast.add({
|
|
122
|
+
title: t('dms_media.toasts.link_copied'),
|
|
123
|
+
color: 'success',
|
|
124
|
+
icon: 'i-ph-link',
|
|
125
|
+
})
|
|
108
126
|
}
|
|
109
127
|
|
|
110
128
|
/**
|
|
@@ -112,7 +130,9 @@ export function useAssetLink() {
|
|
|
112
130
|
* the storage's origin, where the browser ignores a link's `download`, so the
|
|
113
131
|
* file is fetched and saved from memory.
|
|
114
132
|
*/
|
|
115
|
-
async function download(
|
|
133
|
+
async function download(
|
|
134
|
+
asset: Pick<MediaAsset, 'id' | 'name'>,
|
|
135
|
+
): Promise<boolean> {
|
|
116
136
|
try {
|
|
117
137
|
const { url } = await api.readUrl(asset.id)
|
|
118
138
|
const response = await fetch(url)
|
|
@@ -122,7 +142,7 @@ export function useAssetLink() {
|
|
|
122
142
|
setTimeout(() => URL.revokeObjectURL(objectUrl), OBJECT_URL_LIFETIME_MS)
|
|
123
143
|
return true
|
|
124
144
|
} catch (cause) {
|
|
125
|
-
|
|
145
|
+
presentError(cause, { fallbackKey: 'dms_media.toasts.download_failed' })
|
|
126
146
|
return false
|
|
127
147
|
}
|
|
128
148
|
}
|
|
@@ -137,7 +157,7 @@ export function useAssetLink() {
|
|
|
137
157
|
opened.location.href = url
|
|
138
158
|
} catch (cause) {
|
|
139
159
|
opened?.close()
|
|
140
|
-
|
|
160
|
+
presentError(cause, { fallbackKey: 'dms_media.asset_link.open_failed' })
|
|
141
161
|
}
|
|
142
162
|
}
|
|
143
163
|
|
|
@@ -48,6 +48,7 @@ export function useFileDetails(assetId: Ref<string | undefined>, order: Ref<File
|
|
|
48
48
|
const api = useMediaApi()
|
|
49
49
|
const { t } = useI18n()
|
|
50
50
|
const toast = useToast()
|
|
51
|
+
const { presentError } = useApiErrorPresenter()
|
|
51
52
|
const { tree, refresh: refreshTree } = useLibraryTree()
|
|
52
53
|
|
|
53
54
|
async function readSiblings(fetch: ApiDataContext['$authFetch'], signal: AbortSignal, folderId: string, id: string): Promise<SiblingsWindow> {
|
|
@@ -153,7 +154,7 @@ export function useFileDetails(assetId: Ref<string | undefined>, order: Ref<File
|
|
|
153
154
|
return true
|
|
154
155
|
} catch (cause) {
|
|
155
156
|
patch({ name: current.name })
|
|
156
|
-
|
|
157
|
+
presentError(cause, { fallbackKey: 'dms_media.toasts.rename_failed' })
|
|
157
158
|
return false
|
|
158
159
|
}
|
|
159
160
|
}
|
|
@@ -166,7 +167,7 @@ export function useFileDetails(assetId: Ref<string | undefined>, order: Ref<File
|
|
|
166
167
|
patch({ alt })
|
|
167
168
|
return true
|
|
168
169
|
} catch (cause) {
|
|
169
|
-
|
|
170
|
+
presentError(cause, { fallbackKey: 'dms_media.toasts.alt_failed' })
|
|
170
171
|
return false
|
|
171
172
|
}
|
|
172
173
|
}
|
|
@@ -178,7 +179,7 @@ export function useFileDetails(assetId: Ref<string | undefined>, order: Ref<File
|
|
|
178
179
|
await load()
|
|
179
180
|
return true
|
|
180
181
|
} catch (cause) {
|
|
181
|
-
|
|
182
|
+
presentError(cause, { fallbackKey: 'dms_media.toasts.visibility_failed' })
|
|
182
183
|
return false
|
|
183
184
|
}
|
|
184
185
|
}
|
|
@@ -204,7 +205,7 @@ export function useFileDetails(assetId: Ref<string | undefined>, order: Ref<File
|
|
|
204
205
|
await load()
|
|
205
206
|
toast.add({ title: t('dms_media.toasts.moved', { count: 1 }, 1), color: 'success' })
|
|
206
207
|
} catch (cause) {
|
|
207
|
-
|
|
208
|
+
presentError(cause, { fallbackKey: 'dms_media.toasts.move_failed' })
|
|
208
209
|
}
|
|
209
210
|
}
|
|
210
211
|
|
|
@@ -217,7 +218,7 @@ export function useFileDetails(assetId: Ref<string | undefined>, order: Ref<File
|
|
|
217
218
|
toast.add({ title: t('dms_media.toasts.deleted', { count: 1 }, 1), color: 'success', icon: 'i-ph-trash' })
|
|
218
219
|
return true
|
|
219
220
|
} catch (cause) {
|
|
220
|
-
|
|
221
|
+
presentError(cause, { fallbackKey: 'dms_media.toasts.delete_failed' })
|
|
221
222
|
return false
|
|
222
223
|
}
|
|
223
224
|
}
|
|
@@ -2,27 +2,46 @@ import type { UploadFailure, UploadItem } from './useUploadQueue'
|
|
|
2
2
|
|
|
3
3
|
const TYPES_SEPARATOR = ', '
|
|
4
4
|
|
|
5
|
-
export type UploadFailureSource = Pick<
|
|
5
|
+
export type UploadFailureSource = Pick<
|
|
6
|
+
UploadItem,
|
|
7
|
+
'failure' | 'details' | 'folderName' | 'message' | 'requestError'
|
|
8
|
+
>
|
|
6
9
|
|
|
7
10
|
/** Why a file did not upload, in the member's language, the same wherever it shows. */
|
|
8
11
|
export function useUploadFailureText() {
|
|
9
12
|
const uploads = useUploadQueue()
|
|
10
13
|
const format = useMediaFormat()
|
|
11
14
|
const { t } = useI18n()
|
|
15
|
+
const { resolveError } = useApiErrorPresenter()
|
|
12
16
|
|
|
13
17
|
function typesLabel(accepted: readonly string[] | undefined): string {
|
|
14
18
|
if (!accepted?.length) return ''
|
|
15
19
|
return fieldTypesLabel(accepted, t) || accepted.join(TYPES_SEPARATOR)
|
|
16
20
|
}
|
|
17
21
|
|
|
18
|
-
return function failureText(
|
|
22
|
+
return function failureText(
|
|
23
|
+
item: UploadFailureSource,
|
|
24
|
+
failure: UploadFailure = item.failure ?? 'server',
|
|
25
|
+
): string {
|
|
19
26
|
const { details, folderName, message } = item
|
|
20
|
-
|
|
21
|
-
size: format.formatBytes(
|
|
27
|
+
const params = {
|
|
28
|
+
size: format.formatBytes(
|
|
29
|
+
failure === 'quota'
|
|
30
|
+
? (details?.remaining ?? 0)
|
|
31
|
+
: uploads.maxUploadBytes.value,
|
|
32
|
+
),
|
|
22
33
|
types: typesLabel(details?.accepted),
|
|
23
34
|
name: folderName,
|
|
24
35
|
message: message ?? '',
|
|
25
36
|
address: details?.address ?? '',
|
|
26
|
-
}
|
|
37
|
+
}
|
|
38
|
+
if (item.requestError !== undefined)
|
|
39
|
+
return (
|
|
40
|
+
resolveError(item.requestError, {
|
|
41
|
+
fallbackKey: `dms_media.queue.reason.${failure}`,
|
|
42
|
+
params,
|
|
43
|
+
})?.message ?? ''
|
|
44
|
+
)
|
|
45
|
+
return t(`dms_media.queue.reason.${failure}`, params)
|
|
27
46
|
}
|
|
28
47
|
}
|