@antelopejs/dms-media 0.7.0 → 0.7.2
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 +18 -24
- 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/config.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 +3 -7
- 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.d.ts +1 -1
- package/dist/library/activity.js +2 -1
- package/dist/library/activity.js.map +1 -1
- package/dist/pages/uploads.js +1 -1
- package/dist/pages/uploads.js.map +1 -1
- package/dist/routes/media/asset-actions.js +12 -4
- package/dist/routes/media/asset-actions.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/overview.js +5 -1
- package/dist/routes/media/overview.js.map +1 -1
- package/dist/routes/media/storage-keys.js.map +1 -1
- package/dist/routes/media/upload.js +1 -3
- package/dist/routes/media/upload.js.map +1 -1
- package/dist/test/antelope.test.js +13 -6
- 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 +27 -4
- package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
- package/dist/test/integration/media-file-history.test.d.ts +1 -0
- package/dist/test/integration/media-file-history.test.js +33 -0
- package/dist/test/integration/media-file-history.test.js.map +1 -0
- 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 +38 -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 +70 -20
- 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/stack-modules.json +7 -0
- package/dist/test/unit/declared.test.js +1 -1
- package/dist/test/unit/declared.test.js.map +1 -1
- package/dist/test/unit/library/activity-overview.test.js +9 -0
- package/dist/test/unit/library/activity-overview.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/pages/toolbar.test.js +4 -4
- package/dist/test/unit/pages/toolbar.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-checks.d.ts +1 -3
- package/dist/upload-checks.js +12 -14
- package/dist/upload-checks.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 +9 -9
- package/dist/validation/media.schema.js +5 -6
- package/dist/validation/media.schema.js.map +1 -1
- package/frontend-vue/app/components/explorer/ExplorerShell.vue +11 -7
- package/frontend-vue/i18n/locales/media-en-GB.json +1 -0
- package/frontend-vue/i18n/locales/media-fr-FR.json +1 -0
- package/frontend-vue/package.json +39 -39
- package/package.json +14 -12
- package/skills/dms-media/SKILL.md +3 -3
- package/src/acl/entries.ts +5 -2
- package/src/asset-lifecycle.ts +2 -1
- package/src/config.ts +4 -3
- package/src/declared/assets.ts +8 -10
- package/src/declared/records.ts +5 -1
- package/src/library/activity.ts +9 -3
- package/src/pages/uploads.ts +1 -1
- package/src/routes/media/asset-actions.ts +24 -3
- package/src/routes/media/manage.ts +2 -2
- package/src/routes/media/overview.ts +5 -4
- package/src/routes/media/storage-keys.ts +1 -0
- package/src/routes/media/upload.ts +2 -5
- package/src/test/antelope.test.ts +10 -6
- 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 +28 -4
- package/src/test/integration/media-file-history.test.ts +38 -0
- 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 +48 -3
- 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 +84 -30
- package/src/test/integration/permissions-management.ts +16 -4
- package/src/test/stack-modules.json +7 -0
- package/src/test/unit/declared.test.ts +4 -1
- package/src/test/unit/library/activity-overview.test.ts +15 -0
- package/src/test/unit/library/zip-names.test.ts +26 -7
- package/src/test/unit/pages/toolbar.test.ts +4 -4
- package/src/test/unit/upload-rules.test.ts +11 -0
- package/src/transform-ops.ts +1 -0
- package/src/upload-checks.ts +22 -18
- package/src/upload-policy.ts +11 -11
- package/src/validation/media.schema.ts +9 -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;
|
|
@@ -8,12 +8,12 @@ export declare const MEDIA_ERRORS: {
|
|
|
8
8
|
readonly nameTaken: "$dms_media.errors.name_taken";
|
|
9
9
|
readonly folderNameTaken: "$dms_media.errors.folder_name_taken";
|
|
10
10
|
readonly boundParent: "$dms_media.errors.bound_parent";
|
|
11
|
+
readonly fieldType: "$dms_media.errors.field_type";
|
|
11
12
|
readonly altTooLong: "$dms_media.errors.alt_too_long";
|
|
12
13
|
};
|
|
13
14
|
export declare const nameSchema: z.ZodEffects<z.ZodString, string, string>;
|
|
14
15
|
export declare const fileNameSchema: z.ZodEffects<z.ZodString, string, string>;
|
|
15
16
|
export declare function comparableName(name: string): string;
|
|
16
|
-
export declare function describeValidationError(error: unknown): string;
|
|
17
17
|
export declare function parseBody<Output>(body: unknown, schema: z.ZodType<Output, z.ZodTypeDef, unknown>): Output;
|
|
18
18
|
export declare const createFolderSchema: z.ZodObject<{
|
|
19
19
|
name: z.ZodEffects<z.ZodString, string, string>;
|
|
@@ -118,55 +118,55 @@ export declare const transformSchema: z.ZodEffects<z.ZodObject<{
|
|
|
118
118
|
width: z.ZodEffects<z.ZodNumber, number, number>;
|
|
119
119
|
height: z.ZodEffects<z.ZodNumber, number, number>;
|
|
120
120
|
}, "strip", z.ZodTypeAny, {
|
|
121
|
-
height: number;
|
|
122
121
|
width: number;
|
|
122
|
+
height: number;
|
|
123
123
|
x: number;
|
|
124
124
|
y: number;
|
|
125
125
|
}, {
|
|
126
|
-
height: number;
|
|
127
126
|
width: number;
|
|
127
|
+
height: number;
|
|
128
128
|
x: number;
|
|
129
129
|
y: number;
|
|
130
130
|
}>, {
|
|
131
|
-
height: number;
|
|
132
131
|
width: number;
|
|
132
|
+
height: number;
|
|
133
133
|
x: number;
|
|
134
134
|
y: number;
|
|
135
135
|
}, {
|
|
136
|
-
height: number;
|
|
137
136
|
width: number;
|
|
137
|
+
height: number;
|
|
138
138
|
x: number;
|
|
139
139
|
y: number;
|
|
140
140
|
}>>;
|
|
141
141
|
rotate: z.ZodOptional<z.ZodEffects<z.ZodNumber, number, number>>;
|
|
142
142
|
}, "strip", z.ZodTypeAny, {
|
|
143
143
|
crop?: {
|
|
144
|
-
height: number;
|
|
145
144
|
width: number;
|
|
145
|
+
height: number;
|
|
146
146
|
x: number;
|
|
147
147
|
y: number;
|
|
148
148
|
} | undefined;
|
|
149
149
|
rotate?: number | undefined;
|
|
150
150
|
}, {
|
|
151
151
|
crop?: {
|
|
152
|
-
height: number;
|
|
153
152
|
width: number;
|
|
153
|
+
height: number;
|
|
154
154
|
x: number;
|
|
155
155
|
y: number;
|
|
156
156
|
} | undefined;
|
|
157
157
|
rotate?: number | undefined;
|
|
158
158
|
}>, {
|
|
159
159
|
crop?: {
|
|
160
|
-
height: number;
|
|
161
160
|
width: number;
|
|
161
|
+
height: number;
|
|
162
162
|
x: number;
|
|
163
163
|
y: number;
|
|
164
164
|
} | undefined;
|
|
165
165
|
rotate?: number | undefined;
|
|
166
166
|
}, {
|
|
167
167
|
crop?: {
|
|
168
|
-
height: number;
|
|
169
168
|
width: number;
|
|
169
|
+
height: number;
|
|
170
170
|
x: number;
|
|
171
171
|
y: number;
|
|
172
172
|
} | 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");
|
|
@@ -20,6 +19,7 @@ exports.MEDIA_ERRORS = {
|
|
|
20
19
|
nameTaken: `${ERRORS}.name_taken`,
|
|
21
20
|
folderNameTaken: `${ERRORS}.folder_name_taken`,
|
|
22
21
|
boundParent: `${ERRORS}.bound_parent`,
|
|
22
|
+
fieldType: `${ERRORS}.field_type`,
|
|
23
23
|
altTooLong: `${ERRORS}.alt_too_long`,
|
|
24
24
|
};
|
|
25
25
|
function isPrintable(char) {
|
|
@@ -48,12 +48,11 @@ exports.fileNameSchema = boundedName().refine(isSafeFileName, {
|
|
|
48
48
|
function comparableName(name) {
|
|
49
49
|
return name.trim().normalize("NFC").toLocaleLowerCase();
|
|
50
50
|
}
|
|
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
51
|
function parseBody(body, schema) {
|
|
56
|
-
return (0, interface_api_util_1.assertValidation)(body, (value) => schema.parse(value),
|
|
52
|
+
return (0, interface_api_util_1.assertValidation)(body, (value) => schema.parse(value), (error) => {
|
|
53
|
+
const message = error instanceof zod_1.ZodError ? error.issues[0]?.message : "";
|
|
54
|
+
return message?.startsWith("$") ? message : exports.MEDIA_ERRORS.invalidRequest;
|
|
55
|
+
});
|
|
57
56
|
}
|
|
58
57
|
exports.createFolderSchema = zod_1.z.object({
|
|
59
58
|
name: exports.nameSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.schema.js","sourceRoot":"","sources":["../../src/validation/media.schema.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"media.schema.js","sourceRoot":"","sources":["../../src/validation/media.schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,6 +82,10 @@ const { uploads, enqueue } = useExplorerUploads(library, { accept: props.accept,
|
|
|
82
82
|
const drop = createExplorerDrop(library, (files, folder: MediaFolder) => enqueue(files, folder))
|
|
83
83
|
provideExplorerDrop(drop)
|
|
84
84
|
const uploadLimit = computed(() => format.formatBytes(uploads.maxUploadBytes.value))
|
|
85
|
+
const uploadFolder = computed(() => {
|
|
86
|
+
const linked = props.scopeFolderId ? library.tree.foldersById.value.get(props.scopeFolderId) : undefined
|
|
87
|
+
return linked?.rights.write ? linked : library.currentFolder.value
|
|
88
|
+
})
|
|
85
89
|
|
|
86
90
|
function onFilesChosen(event: Event): void {
|
|
87
91
|
const input = event.target as HTMLInputElement
|
|
@@ -96,7 +100,7 @@ function onContentDrop(event: DragEvent): void {
|
|
|
96
100
|
const files = Array.from(event.dataTransfer?.files ?? [])
|
|
97
101
|
if (files.length === 0) return
|
|
98
102
|
event.preventDefault()
|
|
99
|
-
const folder =
|
|
103
|
+
const folder = uploadFolder.value
|
|
100
104
|
if (folder?.rights.write) return enqueue(files, folder)
|
|
101
105
|
void chooseDropDestination(files)
|
|
102
106
|
}
|
|
@@ -207,7 +211,7 @@ definePageShortcuts(
|
|
|
207
211
|
defineExpose({
|
|
208
212
|
library,
|
|
209
213
|
navigate,
|
|
210
|
-
upload: () => commands.upload(),
|
|
214
|
+
upload: () => commands.upload(uploadFolder.value?.id),
|
|
211
215
|
focusSearch: () => toolbar.value?.focusSearch(),
|
|
212
216
|
})
|
|
213
217
|
</script>
|
|
@@ -256,14 +260,14 @@ defineExpose({
|
|
|
256
260
|
<DmsIconWell icon="i-ph-cloud-arrow-up" tone="primary" size="lg" />
|
|
257
261
|
<p class="text-highlighted text-base font-semibold">
|
|
258
262
|
{{
|
|
259
|
-
|
|
260
|
-
? t('dms_media.drop.title', { count: drop.fileCount.value, name:
|
|
263
|
+
uploadFolder?.rights.write
|
|
264
|
+
? t('dms_media.drop.title', { count: drop.fileCount.value, name: uploadFolder.name }, drop.fileCount.value)
|
|
261
265
|
: t('dms_media.drop.pick_folder')
|
|
262
266
|
}}
|
|
263
267
|
</p>
|
|
264
|
-
<p v-if="
|
|
265
|
-
{{ folderPathLabel(
|
|
266
|
-
{{ t(`dms_media.visibility.${
|
|
268
|
+
<p v-if="uploadFolder?.rights.write" class="text-muted text-sm">
|
|
269
|
+
{{ folderPathLabel(uploadFolder, library.tree.foldersById.value) }} ·
|
|
270
|
+
{{ t(`dms_media.visibility.${uploadFolder.visibility}`) }}
|
|
267
271
|
</p>
|
|
268
272
|
<p class="text-dimmed font-mono text-xs">{{ t('dms_media.drop.limit', { size: uploadLimit }) }}</p>
|
|
269
273
|
</div>
|
|
@@ -1086,6 +1086,7 @@
|
|
|
1086
1086
|
"alt_too_long": "The alt text is limited to 255 characters",
|
|
1087
1087
|
"asset_not_found": "This file no longer exists: someone may have deleted it",
|
|
1088
1088
|
"bound_parent": "A linked folder can't hold subfolders",
|
|
1089
|
+
"field_type": "This folder feeds a field that doesn't take this type of file",
|
|
1089
1090
|
"folder_name_taken": "A folder already has this name here",
|
|
1090
1091
|
"invalid_request": "The request couldn't be understood. Reload the page and try again.",
|
|
1091
1092
|
"name_forbidden": "A name can't contain / \\ < > : \" {'|'} ? or *",
|
|
@@ -1086,6 +1086,7 @@
|
|
|
1086
1086
|
"alt_too_long": "Le texte alternatif est limité à 255 caractères",
|
|
1087
1087
|
"asset_not_found": "Ce fichier n'existe plus : quelqu'un l'a peut-être supprimé",
|
|
1088
1088
|
"bound_parent": "Un dossier lié ne peut pas contenir de sous-dossiers",
|
|
1089
|
+
"field_type": "Ce dossier alimente un champ qui n'accepte pas ce type de fichier",
|
|
1089
1090
|
"folder_name_taken": "Un dossier porte déjà ce nom ici",
|
|
1090
1091
|
"invalid_request": "La demande n'a pas pu être comprise. Rechargez la page et réessayez.",
|
|
1091
1092
|
"name_forbidden": "Un nom ne peut pas contenir / \\ < > : \" {'|'} ? ou *",
|
|
@@ -1,41 +1,41 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
2
|
+
"name": "@antelopejs/dms-media-frontend-vue",
|
|
3
|
+
"version": "0.0.1",
|
|
4
|
+
"private": true,
|
|
5
|
+
"type": "module",
|
|
6
|
+
"main": "./dms.frontend.ts",
|
|
7
|
+
"packageManager": "pnpm@10.6.5",
|
|
8
|
+
"engines": {
|
|
9
|
+
"@antelopejs/dms-frontend": ">=0.10.0 <0.11.0"
|
|
10
|
+
},
|
|
11
|
+
"scripts": {
|
|
12
|
+
"dev": "pnpm --dir ../playground frontend:dev",
|
|
13
|
+
"build": "pnpm --dir ../playground exec ajs dms build",
|
|
14
|
+
"typecheck": "pnpm --dir \"${DMS_FRONTEND_WORKSPACE:?Set DMS_FRONTEND_WORKSPACE to the generated Inertia workspace}\" typecheck",
|
|
15
|
+
"format": "prettier --write .",
|
|
16
|
+
"lint": "eslint . && node ../node_modules/@antelopejs/dms/frontend-vue/scripts/check-api-error-presentation.mjs app",
|
|
17
|
+
"lint:fix": "eslint . --fix",
|
|
18
|
+
"test": "vitest run"
|
|
19
|
+
},
|
|
20
|
+
"dependencies": {
|
|
21
|
+
"@vueuse/core": "^14.3.0",
|
|
22
|
+
"hookable": "^5.5.3",
|
|
23
|
+
"tailwind-variants": "^3.1.1",
|
|
24
|
+
"vue": "^3.5.18",
|
|
25
|
+
"vue-advanced-cropper": "^2.8.9",
|
|
26
|
+
"zod": "^3.24.2"
|
|
27
|
+
},
|
|
28
|
+
"devDependencies": {
|
|
29
|
+
"@antelopejs/tooling-configs": "^0.3.3",
|
|
30
|
+
"@nuxt/ui": "4.10.0",
|
|
31
|
+
"@typescript-eslint/parser": "^8.0.0",
|
|
32
|
+
"@vitejs/plugin-vue": "^6.0.10",
|
|
33
|
+
"eslint": "^9.0.0",
|
|
34
|
+
"eslint-plugin-vue": "^10.0.0",
|
|
35
|
+
"prettier": "^3.5.3",
|
|
36
|
+
"prettier-plugin-tailwindcss": "^0.6.11",
|
|
37
|
+
"typescript": "^6.0.3",
|
|
38
|
+
"vite": "^7.3.6",
|
|
39
|
+
"vitest": "^3.2.4"
|
|
40
|
+
}
|
|
41
41
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antelopejs/dms-media",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.2",
|
|
4
4
|
"description": "Media library for the AntelopeJS DMS: uploads, folders with per-folder permissions, image sizes and light editing, with a Finder-style explorer.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"antelopejs",
|
|
@@ -57,15 +57,16 @@
|
|
|
57
57
|
"prepack": "pnpm run build",
|
|
58
58
|
"knip": "knip --dependencies",
|
|
59
59
|
"knip:all": "knip",
|
|
60
|
-
"test:exports": "node --test tests/package-exports.test.mjs"
|
|
60
|
+
"test:exports": "node --test tests/package-exports.test.mjs",
|
|
61
|
+
"test:playground": "[ -n \"$DMS_PREBUILT\" ] || pnpm run build && pnpm --dir playground install --frozen-lockfile --ignore-workspace && pnpm --dir playground build"
|
|
61
62
|
},
|
|
62
63
|
"dependencies": {
|
|
63
|
-
"@antelopejs/interface-api": ">=0.0
|
|
64
|
-
"@antelopejs/interface-api-util": ">=0.
|
|
65
|
-
"@antelopejs/interface-core": ">=0.
|
|
66
|
-
"@antelopejs/interface-database": ">=0.
|
|
67
|
-
"@antelopejs/interface-database-decorators": ">=0.
|
|
68
|
-
"@antelopejs/interface-dms": ">=0.
|
|
64
|
+
"@antelopejs/interface-api": ">=0.3.0 <1.0.0",
|
|
65
|
+
"@antelopejs/interface-api-util": ">=0.3.0 <1.0.0",
|
|
66
|
+
"@antelopejs/interface-core": ">=0.4.0 <1.0.0",
|
|
67
|
+
"@antelopejs/interface-database": ">=0.3.0 <1.0.0",
|
|
68
|
+
"@antelopejs/interface-database-decorators": ">=0.2.0 <1.0.0",
|
|
69
|
+
"@antelopejs/interface-dms": ">=0.13.0 <1.0.0",
|
|
69
70
|
"@antelopejs/interface-dms-media": ">=0.3.0 <0.4.0",
|
|
70
71
|
"@antelopejs/interface-file-storage": ">=0.1.6 <1.0.0",
|
|
71
72
|
"node-cron": "^4.2.1",
|
|
@@ -73,10 +74,11 @@
|
|
|
73
74
|
"zod": "~3.24.2"
|
|
74
75
|
},
|
|
75
76
|
"devDependencies": {
|
|
76
|
-
"@antelopejs/core": "
|
|
77
|
-
"@antelopejs/dms": ">=0.
|
|
78
|
-
"@antelopejs/dms-frontend": "0.
|
|
79
|
-
"@antelopejs/
|
|
77
|
+
"@antelopejs/core": "^1.21.0",
|
|
78
|
+
"@antelopejs/dms": ">=0.19.0 <1.0.0",
|
|
79
|
+
"@antelopejs/dms-frontend": "0.10.0",
|
|
80
|
+
"@antelopejs/interface-data-api": ">=0.6.1 <1.0.0",
|
|
81
|
+
"@antelopejs/tooling-configs": "^0.3.3",
|
|
80
82
|
"@types/chai": "^4.3.20",
|
|
81
83
|
"@types/mocha": "^10",
|
|
82
84
|
"@types/node": "^24.0.0",
|
|
@@ -13,14 +13,14 @@ Owner pages under `/modules/media` (overview, files, uploads, file, editor, acti
|
|
|
13
13
|
they reach media through `AssetType` fields on project pages. User docs: `docs/` of this package, published at
|
|
14
14
|
https://dms.antelopejs.com/docs/modules/media.
|
|
15
15
|
Overview, uploads and activity are `live` pages (shared `rememberKey: "media"`) opening on the DMS `pageToolbar({ period: false })`
|
|
16
|
-
(last read + Direct / Pause, block id `toolbar`); the upload history table is `liveHold
|
|
16
|
+
(last read + Direct / Pause, block id `toolbar`); the upload history table is `liveHold` with `whileOnScreen: false`: it holds only while the page is paused. Needs interface-dms with `base/page-toolbar`.
|
|
17
17
|
Every data block carries `realtimeTopic: MEDIA_LIBRARY_TOPIC`; custom components refresh through `onLibraryChange` (DMS
|
|
18
18
|
`usePageLiveRefresh`, so Pause holds them). Announcements are coalesced and carry `payload.count` (changes they stand for).
|
|
19
19
|
|
|
20
20
|
## Setup
|
|
21
21
|
|
|
22
|
-
-
|
|
23
|
-
and
|
|
22
|
+
- The DMS backend, renderer and `@antelopejs/interface-dms-media` releases the module runs on are in the README compatibility block
|
|
23
|
+
and, for the renderer, in `engines["@antelopejs/dms-frontend"]` of `frontend-vue/package.json`. Media 0.4 uses media interface 0.2; Media 0.3 is the DMS 0.8 line.
|
|
24
24
|
- `ajs project modules add @antelopejs/dms-media`, plus an `interface-file-storage` module (`file-storage-local`).
|
|
25
25
|
- Set the storage's `baseUrl` and the module's `publicBaseUrl` to `${@api.API_PUBLIC_BASE_URL}`, and list every
|
|
26
26
|
dashboard origin in the api module's `cors.allowedOrigins`: the browser `PUT`s files straight to the storage.
|
package/src/acl/entries.ts
CHANGED
|
@@ -10,8 +10,11 @@ import type { AclEntry } from "../types";
|
|
|
10
10
|
export function parseFolderAcl(folder: MediaFolder): AclEntry[] | undefined {
|
|
11
11
|
if (!folder.json_acl) return undefined;
|
|
12
12
|
try {
|
|
13
|
-
const parsed = JSON.parse(folder.json_acl);
|
|
14
|
-
if (Array.isArray(parsed))
|
|
13
|
+
const parsed: unknown = JSON.parse(folder.json_acl);
|
|
14
|
+
if (Array.isArray(parsed)) {
|
|
15
|
+
// SAFETY: json_acl is written only as serializeAcl of an AclEntry[] (bindings.ts, declared/folders.ts) or as the literal "[]" (bindings.ts EMPTY_ACL), so an array read back holds AclEntry values; a schema parse of a stored row on read is excluded by ruling.
|
|
16
|
+
return parsed as AclEntry[];
|
|
17
|
+
}
|
|
15
18
|
} catch {}
|
|
16
19
|
Logging.Warn(
|
|
17
20
|
`Media folder '${folder._id}' has an unreadable ACL; treating it as empty.`,
|
package/src/asset-lifecycle.ts
CHANGED
|
@@ -11,7 +11,8 @@ export const TECHNICAL_MUTATION: MediaMutationOptions = { touchesAsset: false };
|
|
|
11
11
|
|
|
12
12
|
/** Reads the durable, retryable file deletion queue for an asset. */
|
|
13
13
|
export function retiredFiles(asset: MediaAsset): string[] {
|
|
14
|
-
|
|
14
|
+
// SAFETY: json_retiredFiles is written only as "[]" at creation (upload.ts, declared/assets.ts, routes/media/transform.ts) or the JSON.stringify of storage-key strings (this file), so it parses to a string[]; a schema parse of a stored row on read is excluded by ruling.
|
|
15
|
+
return JSON.parse(asset.json_retiredFiles) as string[];
|
|
15
16
|
}
|
|
16
17
|
|
|
17
18
|
/** Detaches references and records their cleanup in the same media transition. */
|
package/src/config.ts
CHANGED
|
@@ -30,13 +30,14 @@ export interface DmsMediaConfig {
|
|
|
30
30
|
storageQuotaBytes?: number;
|
|
31
31
|
/**
|
|
32
32
|
* File types members may upload, as mimetypes (`image/*` matches a prefix).
|
|
33
|
-
* HTML and
|
|
33
|
+
* HTML, XHTML and PHP stay refused, by type or by extension, whatever this
|
|
34
|
+
* list says.
|
|
34
35
|
*/
|
|
35
36
|
allowedMimetypes?: string[];
|
|
36
37
|
/**
|
|
37
38
|
* Public URL of the API, the origin serving `/media`: copied links and the
|
|
38
|
-
* file page's delivery tab start with it. Defaults to the
|
|
39
|
-
*
|
|
39
|
+
* file page's delivery tab start with it. Defaults to the DMS `apiBaseUrl`.
|
|
40
|
+
* With neither set, links stay relative.
|
|
40
41
|
*/
|
|
41
42
|
publicBaseUrl?: string;
|
|
42
43
|
}
|
package/src/declared/assets.ts
CHANGED
|
@@ -11,11 +11,10 @@ import type { MediaAsset, MediaFolder } from "../db";
|
|
|
11
11
|
import { uploadStorageBytes } from "../derivatives";
|
|
12
12
|
import { recordMediaEvent } from "../library/events";
|
|
13
13
|
import {
|
|
14
|
-
assertReadableImage,
|
|
15
14
|
assertUploadTypeAllowed,
|
|
16
15
|
assertWithinQuota,
|
|
17
16
|
type ImageProbe,
|
|
18
|
-
|
|
17
|
+
probeImage,
|
|
19
18
|
UploadRefusedError,
|
|
20
19
|
} from "../upload-checks";
|
|
21
20
|
import { mimetypeOfFormat } from "../upload-policy";
|
|
@@ -53,10 +52,6 @@ interface PreparedFile {
|
|
|
53
52
|
|
|
54
53
|
type Fail = (reason: string) => never;
|
|
55
54
|
|
|
56
|
-
function describeError(error: unknown): string {
|
|
57
|
-
return error instanceof Error ? error.message : String(error);
|
|
58
|
-
}
|
|
59
|
-
|
|
60
55
|
async function loadBytes(
|
|
61
56
|
load: () => Uint8Array | Promise<Uint8Array>,
|
|
62
57
|
fail: Fail,
|
|
@@ -64,7 +59,9 @@ async function loadBytes(
|
|
|
64
59
|
const loaded: unknown = await Promise.resolve()
|
|
65
60
|
.then(load)
|
|
66
61
|
.catch((error: unknown) =>
|
|
67
|
-
fail(
|
|
62
|
+
fail(
|
|
63
|
+
`the source failed to load: ${error instanceof Error ? error.message : String(error)}`,
|
|
64
|
+
),
|
|
68
65
|
);
|
|
69
66
|
if (!(loaded instanceof Uint8Array))
|
|
70
67
|
fail("source.load must return a Uint8Array");
|
|
@@ -80,7 +77,9 @@ async function readSource(
|
|
|
80
77
|
if ("bytes" in source) bytes = Buffer.from(source.bytes);
|
|
81
78
|
else if ("filePath" in source)
|
|
82
79
|
bytes = await readFile(source.filePath).catch((error: unknown) =>
|
|
83
|
-
fail(
|
|
80
|
+
fail(
|
|
81
|
+
`cannot read '${source.filePath}': ${error instanceof Error ? error.message : String(error)}`,
|
|
82
|
+
),
|
|
84
83
|
);
|
|
85
84
|
else bytes = await loadBytes(source.load, fail);
|
|
86
85
|
const size = declaredFileSizeSchema.safeParse(bytes.byteLength);
|
|
@@ -122,12 +121,11 @@ async function prepareFile(
|
|
|
122
121
|
): Promise<PreparedFile> {
|
|
123
122
|
assertUploadTypeAllowed(fieldBinding, declaration.name, declaration.mimetype);
|
|
124
123
|
await assertWithinQuota(models.assetModel, bytes.byteLength);
|
|
125
|
-
const image = await
|
|
124
|
+
const image = await probeImage(
|
|
126
125
|
async () => bytes,
|
|
127
126
|
declaration.mimetype,
|
|
128
127
|
bytes.byteLength,
|
|
129
128
|
);
|
|
130
|
-
assertReadableImage(image, declaration.mimetype);
|
|
131
129
|
return {
|
|
132
130
|
bytes,
|
|
133
131
|
mimetype: mimetypeOfFormat(image.format) ?? declaration.mimetype,
|
package/src/declared/records.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
2
|
+
import type {
|
|
3
|
+
MediaAssetDeclaration,
|
|
4
|
+
MediaFolderDeclaration,
|
|
5
|
+
} from "@antelopejs/interface-dms-media";
|
|
2
6
|
import type { ZodType, ZodTypeDef } from "zod";
|
|
3
7
|
import { isObjectLike, isString } from "../guards";
|
|
4
8
|
import {
|
|
@@ -48,7 +52,7 @@ export function declaredModels(tenantId: string): DeclaredModels {
|
|
|
48
52
|
/** Validates a declaration, naming every refused field. */
|
|
49
53
|
export function parseDeclaration<Output>(
|
|
50
54
|
kind: MediaDeclarationKind,
|
|
51
|
-
input:
|
|
55
|
+
input: MediaFolderDeclaration | MediaAssetDeclaration,
|
|
52
56
|
schema: ZodType<Output, ZodTypeDef, unknown>,
|
|
53
57
|
): Output {
|
|
54
58
|
const parsed = schema.safeParse(input);
|
package/src/library/activity.ts
CHANGED
|
@@ -101,6 +101,8 @@ export const ACTIVITY_FILTERS = {
|
|
|
101
101
|
|
|
102
102
|
export type ActivityFilter = keyof typeof ACTIVITY_FILTERS;
|
|
103
103
|
|
|
104
|
+
const ACTIVITY_FILTER_KINDS = new Map(Object.entries(ACTIVITY_FILTERS));
|
|
105
|
+
|
|
104
106
|
export function isActivityFilter(value: unknown): value is ActivityFilter {
|
|
105
107
|
return typeof value === "string" && Object.hasOwn(ACTIVITY_FILTERS, value);
|
|
106
108
|
}
|
|
@@ -314,17 +316,21 @@ function deletedAssets(events: MediaEvent[]): Set<string> {
|
|
|
314
316
|
);
|
|
315
317
|
}
|
|
316
318
|
|
|
317
|
-
/**
|
|
319
|
+
/**
|
|
320
|
+
* Newest first, with one entry per upload batch and per bulk action.
|
|
321
|
+
*
|
|
322
|
+
* @param limit The most entries to keep; every entry when left out.
|
|
323
|
+
*/
|
|
318
324
|
export function buildActivityItems(
|
|
319
325
|
source: ActivitySource,
|
|
320
|
-
limit
|
|
326
|
+
limit?: number,
|
|
321
327
|
): ActivityFeedItem[] {
|
|
322
328
|
const context: ActivityContext = {
|
|
323
329
|
...source,
|
|
324
330
|
deletedAssetIds: deletedAssets(source.events),
|
|
325
331
|
};
|
|
326
332
|
const kinds: ReadonlySet<string> | undefined = source.filter
|
|
327
|
-
? new Set(
|
|
333
|
+
? new Set(ACTIVITY_FILTER_KINDS.get(source.filter))
|
|
328
334
|
: undefined;
|
|
329
335
|
const events = kinds
|
|
330
336
|
? source.events.filter((event) => kinds.has(event.kind))
|
package/src/pages/uploads.ts
CHANGED
|
@@ -20,7 +20,7 @@ const history = TableView.fromSource({
|
|
|
20
20
|
caption: `${TEXTS}.history.title`,
|
|
21
21
|
fetchUrl: "/api/media/upload/batches",
|
|
22
22
|
realtimeTopic: MEDIA_LIBRARY_TOPIC,
|
|
23
|
-
liveHold:
|
|
23
|
+
liveHold: { whileOnScreen: false },
|
|
24
24
|
layout: "full",
|
|
25
25
|
density: "compact",
|
|
26
26
|
pageSize: HISTORY_PAGE_SIZE,
|