@antelopejs/dms-media 0.1.1 → 0.1.3
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/dist/acl/entries.js +5 -2
- package/dist/acl/entries.js.map +1 -1
- package/dist/acl/resolver.js +1 -2
- package/dist/acl/resolver.js.map +1 -1
- package/dist/db/tables/mediaAssets.table.js +0 -4
- package/dist/db/tables/mediaAssets.table.js.map +1 -1
- package/dist/db/tables/mediaFolders.table.js +0 -3
- package/dist/db/tables/mediaFolders.table.js.map +1 -1
- package/dist/pages/media.js +1 -1
- package/dist/pages/media.js.map +1 -1
- package/dist/routes/media/folders.d.ts +3 -0
- package/dist/routes/media/folders.js +13 -4
- package/dist/routes/media/folders.js.map +1 -1
- package/dist/test/antelope.test.js +1 -1
- package/dist/test/integration/folder-cascade.test.d.ts +1 -0
- package/dist/test/integration/folder-cascade.test.js +62 -0
- package/dist/test/integration/folder-cascade.test.js.map +1 -0
- package/dist/test/unit/acl/entries.test.js +4 -4
- package/dist/test/unit/acl/entries.test.js.map +1 -1
- package/dist/test/unit/acl/resolver.test.js +13 -6
- package/dist/test/unit/acl/resolver.test.js.map +1 -1
- package/frontend-vue/app/components/Library.vue +6 -28
- package/frontend-vue/package.json +1 -1
- package/frontend-vue/pnpm-lock.yaml +2 -28
- package/package.json +7 -7
- package/src/acl/entries.ts +8 -2
- package/src/acl/resolver.ts +2 -4
- package/src/db/tables/mediaAssets.table.ts +0 -4
- package/src/db/tables/mediaFolders.table.ts +0 -3
- package/src/pages/media.ts +1 -1
- package/src/routes/media/folders.ts +24 -4
- package/src/test/antelope.test.ts +1 -1
- package/src/test/integration/folder-cascade.test.ts +81 -0
- package/src/test/unit/acl/entries.test.ts +4 -6
- package/src/test/unit/acl/resolver.test.ts +13 -6
package/dist/acl/entries.js
CHANGED
|
@@ -2,16 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseFolderAcl = parseFolderAcl;
|
|
4
4
|
exports.serializeAcl = serializeAcl;
|
|
5
|
+
const logging_1 = require("@antelopejs/interface-core/logging");
|
|
5
6
|
function parseFolderAcl(folder) {
|
|
6
7
|
if (!folder.json_acl)
|
|
7
8
|
return undefined;
|
|
8
9
|
try {
|
|
9
10
|
const parsed = JSON.parse(folder.json_acl);
|
|
10
|
-
|
|
11
|
+
if (Array.isArray(parsed))
|
|
12
|
+
return parsed;
|
|
11
13
|
}
|
|
12
14
|
catch {
|
|
13
|
-
return undefined;
|
|
14
15
|
}
|
|
16
|
+
logging_1.Logging.Warn(`Media folder '${folder._id}' has an unreadable ACL; treating it as empty.`);
|
|
17
|
+
return [];
|
|
15
18
|
}
|
|
16
19
|
function serializeAcl(entries) {
|
|
17
20
|
if (!entries)
|
package/dist/acl/entries.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entries.js","sourceRoot":"","sources":["../../src/acl/entries.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"entries.js","sourceRoot":"","sources":["../../src/acl/entries.ts"],"names":[],"mappings":";;AAKA,wCAYC;AAED,oCAKC;AAxBD,gEAA6D;AAK7D,SAAgB,cAAc,CAAC,MAAmB;IAChD,IAAI,CAAC,MAAM,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,MAAoB,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IACD,iBAAO,CAAC,IAAI,CACV,iBAAiB,MAAM,CAAC,GAAG,gDAAgD,CAC5E,CAAC;IACF,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,YAAY,CAC1B,OAA+B;IAE/B,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC"}
|
package/dist/acl/resolver.js
CHANGED
|
@@ -87,8 +87,7 @@ function groupChildrenByParent(folders) {
|
|
|
87
87
|
return childrenByParent;
|
|
88
88
|
}
|
|
89
89
|
function collectRoots(folders) {
|
|
90
|
-
|
|
91
|
-
return folders.filter((folder) => !folder.parentId || !knownIds.has(folder.parentId));
|
|
90
|
+
return folders.filter((folder) => !folder.parentId);
|
|
92
91
|
}
|
|
93
92
|
function collectFolderRights(access, folderId, rights) {
|
|
94
93
|
if (rights.has("read"))
|
package/dist/acl/resolver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/acl/resolver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/acl/resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,13 +21,11 @@ __decorate([
|
|
|
21
21
|
__metadata("design:type", String)
|
|
22
22
|
], MediaAsset.prototype, "_id", void 0);
|
|
23
23
|
__decorate([
|
|
24
|
-
(0, interface_database_decorators_1.Index)(),
|
|
25
24
|
(0, interface_database_decorators_1.CreationTime)(),
|
|
26
25
|
(0, interface_database_decorators_1.Field)("date"),
|
|
27
26
|
__metadata("design:type", Date)
|
|
28
27
|
], MediaAsset.prototype, "createdAt", void 0);
|
|
29
28
|
__decorate([
|
|
30
|
-
(0, interface_database_decorators_1.Index)(),
|
|
31
29
|
(0, interface_database_decorators_1.UpdateTime)(),
|
|
32
30
|
(0, interface_database_decorators_1.Field)("date"),
|
|
33
31
|
__metadata("design:type", Date)
|
|
@@ -38,7 +36,6 @@ __decorate([
|
|
|
38
36
|
__metadata("design:type", String)
|
|
39
37
|
], MediaAsset.prototype, "folderId", void 0);
|
|
40
38
|
__decorate([
|
|
41
|
-
(0, interface_database_decorators_1.Index)(),
|
|
42
39
|
(0, interface_database_decorators_1.Field)("string"),
|
|
43
40
|
__metadata("design:type", String)
|
|
44
41
|
], MediaAsset.prototype, "name", void 0);
|
|
@@ -95,7 +92,6 @@ __decorate([
|
|
|
95
92
|
__metadata("design:type", String)
|
|
96
93
|
], MediaAsset.prototype, "originalKey", void 0);
|
|
97
94
|
__decorate([
|
|
98
|
-
(0, interface_database_decorators_1.Index)(),
|
|
99
95
|
(0, interface_database_decorators_1.Field)("string"),
|
|
100
96
|
__metadata("design:type", String)
|
|
101
97
|
], MediaAsset.prototype, "createdBy", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mediaAssets.table.js","sourceRoot":"","sources":["../../../src/db/tables/mediaAssets.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAOmD;AACnD,mEAAyE;AAG5D,QAAA,uBAAuB,GAAG,cAAc,CAAC;AAG/C,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,qCAAK;
|
|
1
|
+
{"version":3,"file":"mediaAssets.table.js","sourceRoot":"","sources":["../../../src/db/tables/mediaAssets.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAOmD;AACnD,mEAAyE;AAG5D,QAAA,uBAAuB,GAAG,cAAc,CAAC;AAG/C,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,qCAAK;CAgEpC,CAAA;AAhEY,gCAAU;AAEb;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;uCACI;AAIZ;IAFP,IAAA,4CAAY,GAAE;IACd,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;6CAAC;AAIhB;IAFP,IAAA,0CAAU,GAAE;IACZ,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;6CAAC;AAIhB;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;4CACS;AAGjB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;wCACK;AAGb;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;4CACS;AAGjB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;wCACK;AAGb;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;8CACW;AAInB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;2CACS;AAGjB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;yCACO;AAGf;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;0CACQ;AAGhB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;uCACK;AAGb;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;8CACoB;AAI5B;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;oDACkB;AAG1B;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;iDACc;AAItB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;qDACkB;AAG1B;IADP,IAAA,qCAAK,EAAC,SAAS,CAAC;;8CACY;AAIrB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;+CACa;AAGrB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;6CACU;qBA/Df,UAAU;IADtB,IAAA,6CAAa,EAAC,+BAAuB,EAAE,8BAAkB,CAAC;GAC9C,UAAU,CAgEtB"}
|
|
@@ -21,19 +21,16 @@ __decorate([
|
|
|
21
21
|
__metadata("design:type", String)
|
|
22
22
|
], MediaFolder.prototype, "_id", void 0);
|
|
23
23
|
__decorate([
|
|
24
|
-
(0, interface_database_decorators_1.Index)(),
|
|
25
24
|
(0, interface_database_decorators_1.CreationTime)(),
|
|
26
25
|
(0, interface_database_decorators_1.Field)("date"),
|
|
27
26
|
__metadata("design:type", Date)
|
|
28
27
|
], MediaFolder.prototype, "createdAt", void 0);
|
|
29
28
|
__decorate([
|
|
30
|
-
(0, interface_database_decorators_1.Index)(),
|
|
31
29
|
(0, interface_database_decorators_1.UpdateTime)(),
|
|
32
30
|
(0, interface_database_decorators_1.Field)("date"),
|
|
33
31
|
__metadata("design:type", Date)
|
|
34
32
|
], MediaFolder.prototype, "updatedAt", void 0);
|
|
35
33
|
__decorate([
|
|
36
|
-
(0, interface_database_decorators_1.Index)(),
|
|
37
34
|
(0, interface_database_decorators_1.Field)("string"),
|
|
38
35
|
__metadata("design:type", String)
|
|
39
36
|
], MediaFolder.prototype, "name", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mediaFolders.table.js","sourceRoot":"","sources":["../../../src/db/tables/mediaFolders.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAOmD;AACnD,mEAAyE;AAG5D,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAGjD,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,qCAAK;
|
|
1
|
+
{"version":3,"file":"mediaFolders.table.js","sourceRoot":"","sources":["../../../src/db/tables/mediaFolders.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAOmD;AACnD,mEAAyE;AAG5D,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAGjD,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,qCAAK;CAkCrC,CAAA;AAlCY,kCAAW;AAEd;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;wCACI;AAIZ;IAFP,IAAA,4CAAY,GAAE;IACd,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;8CAAC;AAIhB;IAFP,IAAA,0CAAU,GAAE;IACZ,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;8CAAC;AAGhB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;yCACK;AAIb;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;6CACU;AAIlB;IADP,IAAA,qCAAK,EAAC,CAAC,QAAQ,CAAC,CAAC;;yCACK;AAIf;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;6CACU;AAKlB;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;4CACS;AAGjB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;+CACqB;sBAjC1B,WAAW;IADvB,IAAA,6CAAa,EAAC,gCAAwB,EAAE,8BAAkB,CAAC;GAC/C,WAAW,CAkCvB"}
|
package/dist/pages/media.js
CHANGED
|
@@ -22,7 +22,7 @@ let SettingsAssetsPage = class SettingsAssetsPage extends (0, page_1.PageControl
|
|
|
22
22
|
icon: "i-ph-images",
|
|
23
23
|
category: exports.mediaSettingsCategory,
|
|
24
24
|
description: "Browse and manage the media library",
|
|
25
|
-
}, (0, base_1.DefaultLayout)({ fullWidth: true })) {
|
|
25
|
+
}, (0, base_1.DefaultLayout)({ fullWidth: true, fillHeight: true })) {
|
|
26
26
|
static content = (0, custom_1.CustomComponent)(MEDIA_LIBRARY_COMPONENT);
|
|
27
27
|
};
|
|
28
28
|
exports.SettingsAssetsPage = SettingsAssetsPage;
|
package/dist/pages/media.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/pages/media.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yDAMwC;AACxC,yDAA+D;AAC/D,kEAAwE;AAExE,MAAM,uBAAuB,GAAG,mBAAmB,CAAC;AAKvC,QAAA,qBAAqB,GAAG,IAAA,eAAQ,EAAC,OAAO,EAAE;IACrD,QAAQ,EAAE,uBAAgB;IAC1B,WAAW,EAAE,OAAO;IACpB,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE,CAAC;CACT,CAAC,CAAC;AAII,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,IAAA,qBAAc,EACpD,QAAQ,EACR;IACE,WAAW,EAAE,QAAQ;IACrB,IAAI,EAAE,aAAa;IACnB,QAAQ,EAAE,6BAAqB;IAC/B,WAAW,EAAE,qCAAqC;CACnD,EACD,IAAA,oBAAa,EAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/pages/media.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yDAMwC;AACxC,yDAA+D;AAC/D,kEAAwE;AAExE,MAAM,uBAAuB,GAAG,mBAAmB,CAAC;AAKvC,QAAA,qBAAqB,GAAG,IAAA,eAAQ,EAAC,OAAO,EAAE;IACrD,QAAQ,EAAE,uBAAgB;IAC1B,WAAW,EAAE,OAAO;IACpB,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE,CAAC;CACT,CAAC,CAAC;AAII,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,IAAA,qBAAc,EACpD,QAAQ,EACR;IACE,WAAW,EAAE,QAAQ;IACrB,IAAI,EAAE,aAAa;IACnB,QAAQ,EAAE,6BAAqB;IAC/B,WAAW,EAAE,qCAAqC;CACnD,EACD,IAAA,oBAAa,EAAC,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CACrD;IACC,MAAM,CAAC,OAAO,GAAG,IAAA,wBAAe,EAAC,uBAAuB,CAAC,CAAC;;AAV/C,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAY,GAAE;GACF,kBAAkB,CAW9B;AAED,SAAS,uBAAuB,CAAC,IAA+B;IAC9D,MAAM,YAAY,GAAG,IAAA,sBAAe,EAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,IAAI,+BAA+B,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAEY,QAAA,qBAAqB,GAChC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC"}
|
|
@@ -2,6 +2,9 @@ import { type RequestContext } from "@antelopejs/interface-api";
|
|
|
2
2
|
import { RoleModel, TenantMemberModel } from "@antelopejs/interface-dms/db";
|
|
3
3
|
import type { User } from "@antelopejs/interface-dms/auth/db";
|
|
4
4
|
import { MediaAssetModel, MediaFolderModel } from "../../db";
|
|
5
|
+
import { type MediaRequestContext } from "./context";
|
|
6
|
+
type FolderTreeModels = Pick<MediaRequestContext, "folderModel" | "assetModel">;
|
|
7
|
+
export declare function deleteFolderTree(context: FolderTreeModels, folderIds: string[]): Promise<void>;
|
|
5
8
|
declare const MediaFoldersController_base: import("@antelopejs/interface-api").ControllerClass<object>;
|
|
6
9
|
export declare class MediaFoldersController extends MediaFoldersController_base {
|
|
7
10
|
ctx: RequestContext;
|
|
@@ -13,6 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.MediaFoldersController = void 0;
|
|
16
|
+
exports.deleteFolderTree = deleteFolderTree;
|
|
16
17
|
const interface_api_1 = require("@antelopejs/interface-api");
|
|
17
18
|
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
18
19
|
const db_1 = require("@antelopejs/interface-dms/db");
|
|
@@ -44,11 +45,20 @@ function buildChildPath(parent) {
|
|
|
44
45
|
return parent ? [...parent.path, parent._id] : [];
|
|
45
46
|
}
|
|
46
47
|
async function deleteFolderAssets(context, folderIds) {
|
|
47
|
-
if (folderIds.length === 0)
|
|
48
|
-
return;
|
|
49
48
|
const assets = await context.assetModel.getBy("folderId", ...folderIds);
|
|
50
49
|
await Promise.all(assets.map((asset) => (0, asset_lifecycle_1.deleteMediaAsset)(context.assetModel, asset._id)));
|
|
51
50
|
}
|
|
51
|
+
async function deleteFolderTree(context, folderIds) {
|
|
52
|
+
let pending = folderIds;
|
|
53
|
+
while (pending.length > 0) {
|
|
54
|
+
await Promise.all(pending.map((id) => context.folderModel.delete(id)));
|
|
55
|
+
const [lateChildren] = await Promise.all([
|
|
56
|
+
context.folderModel.getBy("parentId", ...pending),
|
|
57
|
+
deleteFolderAssets(context, pending),
|
|
58
|
+
]);
|
|
59
|
+
pending = lateChildren.map((child) => child._id);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
52
62
|
async function applyFolderMove(context, folder, newParent) {
|
|
53
63
|
const newPaths = new Map();
|
|
54
64
|
newPaths.set(folder._id, buildChildPath(newParent));
|
|
@@ -160,8 +170,7 @@ class MediaFoldersController extends (0, interface_api_1.Controller)("/api/media
|
|
|
160
170
|
(0, interface_api_util_1.assert)(context.access.manageable.has(descendant._id), HTTP_FORBIDDEN, "Missing 'manage' right on a subfolder");
|
|
161
171
|
}
|
|
162
172
|
const folderIds = [folderId, ...descendants.map((child) => child._id)];
|
|
163
|
-
await
|
|
164
|
-
await Promise.all(folderIds.map((id) => context.folderModel.delete(id)));
|
|
173
|
+
await deleteFolderTree(context, folderIds);
|
|
165
174
|
return { ok: true };
|
|
166
175
|
}
|
|
167
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folders.js","sourceRoot":"","sources":["../../../src/routes/media/folders.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"folders.js","sourceRoot":"","sources":["../../../src/routes/media/folders.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const node_crypto_1 = require("node:crypto");
|
|
4
|
+
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
5
|
+
const chai_1 = require("chai");
|
|
6
|
+
const db_1 = require("../../db");
|
|
7
|
+
const derivatives_1 = require("../../derivatives");
|
|
8
|
+
const folders_1 = require("../../routes/media/folders");
|
|
9
|
+
const TENANT = "folder-cascade";
|
|
10
|
+
async function insertFolder(model, _id, parentId) {
|
|
11
|
+
await model.insert({
|
|
12
|
+
_id,
|
|
13
|
+
name: _id,
|
|
14
|
+
parentId,
|
|
15
|
+
path: [],
|
|
16
|
+
visibility: "private",
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
async function insertAsset(model, folderId) {
|
|
20
|
+
const _id = (0, node_crypto_1.randomUUID)();
|
|
21
|
+
await model.insert({
|
|
22
|
+
_id,
|
|
23
|
+
folderId,
|
|
24
|
+
name: "asset.txt",
|
|
25
|
+
mimetype: "text/plain",
|
|
26
|
+
size: 7,
|
|
27
|
+
storageKey: await (0, derivatives_1.uploadStorageBytes)(Buffer.from("cascade"), "asset.txt", "text/plain", (0, node_crypto_1.randomUUID)(), undefined),
|
|
28
|
+
createdBy: "test",
|
|
29
|
+
visibility: "inherit",
|
|
30
|
+
mediaRevision: (0, node_crypto_1.randomUUID)(),
|
|
31
|
+
json_retiredFiles: "[]",
|
|
32
|
+
});
|
|
33
|
+
return _id;
|
|
34
|
+
}
|
|
35
|
+
describe("[integration] folder deletion cascade", () => {
|
|
36
|
+
let folderModel;
|
|
37
|
+
let assetModel;
|
|
38
|
+
before(() => {
|
|
39
|
+
folderModel = (0, interface_database_decorators_1.GetModel)(db_1.MediaFolderModel, TENANT);
|
|
40
|
+
assetModel = (0, interface_database_decorators_1.GetModel)(db_1.MediaAssetModel, TENANT);
|
|
41
|
+
});
|
|
42
|
+
afterEach(async () => {
|
|
43
|
+
await folderModel.table.delete().run();
|
|
44
|
+
await assetModel.table.delete().run();
|
|
45
|
+
});
|
|
46
|
+
it("removes children and assets written after the request snapshot", async () => {
|
|
47
|
+
await insertFolder(folderModel, "root");
|
|
48
|
+
await insertFolder(folderModel, "known", "root");
|
|
49
|
+
await insertFolder(folderModel, "late", "known");
|
|
50
|
+
await insertFolder(folderModel, "late-grandchild", "late");
|
|
51
|
+
await insertFolder(folderModel, "kept");
|
|
52
|
+
await insertAsset(assetModel, "root");
|
|
53
|
+
await insertAsset(assetModel, "late-grandchild");
|
|
54
|
+
const keptAsset = await insertAsset(assetModel, "kept");
|
|
55
|
+
await (0, folders_1.deleteFolderTree)({ folderModel, assetModel }, ["root", "known"]);
|
|
56
|
+
const folders = await folderModel.getAll();
|
|
57
|
+
(0, chai_1.expect)(folders.map((folder) => folder._id)).to.deep.equal(["kept"]);
|
|
58
|
+
const assets = await assetModel.getAll();
|
|
59
|
+
(0, chai_1.expect)(assets.map((asset) => asset._id)).to.deep.equal([keptAsset]);
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
//# sourceMappingURL=folder-cascade.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"folder-cascade.test.js","sourceRoot":"","sources":["../../../src/test/integration/folder-cascade.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,11 +23,11 @@ describe("[unit] acl/entries — parseFolderAcl", () => {
|
|
|
23
23
|
const folder = folderWithAcl(JSON.stringify([READ_ENTRY]));
|
|
24
24
|
(0, chai_1.expect)((0, entries_1.parseFolderAcl)(folder)).to.deep.equal([READ_ENTRY]);
|
|
25
25
|
});
|
|
26
|
-
it("
|
|
27
|
-
(0, chai_1.expect)((0, entries_1.parseFolderAcl)(folderWithAcl("{not json"))).to.equal(
|
|
26
|
+
it("fails closed on malformed JSON", () => {
|
|
27
|
+
(0, chai_1.expect)((0, entries_1.parseFolderAcl)(folderWithAcl("{not json"))).to.deep.equal([]);
|
|
28
28
|
});
|
|
29
|
-
it("
|
|
30
|
-
(0, chai_1.expect)((0, entries_1.parseFolderAcl)(folderWithAcl('{"subject":"x"}'))).to.equal(
|
|
29
|
+
it("fails closed on JSON that is not an array", () => {
|
|
30
|
+
(0, chai_1.expect)((0, entries_1.parseFolderAcl)(folderWithAcl('{"subject":"x"}'))).to.deep.equal([]);
|
|
31
31
|
});
|
|
32
32
|
});
|
|
33
33
|
describe("[unit] acl/entries — serializeAcl", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entries.test.js","sourceRoot":"","sources":["../../../../src/test/unit/acl/entries.test.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,kDAAoE;AAIpE,MAAM,UAAU,GAAa;IAC3B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE;IACxC,MAAM,EAAE,CAAC,MAAM,CAAC;CACjB,CAAC;AAEF,SAAS,aAAa,CAAC,QAA4B;IACjD,OAAO,EAAE,QAAQ,EAAiB,CAAC;AACrC,CAAC;AAED,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;IACnD,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,IAAA,aAAM,EAAC,IAAA,wBAAc,EAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,IAAA,aAAM,EAAC,IAAA,wBAAc,EAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,IAAA,aAAM,EAAC,IAAA,wBAAc,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC3D,IAAA,aAAM,EAAC,IAAA,wBAAc,EAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"entries.test.js","sourceRoot":"","sources":["../../../../src/test/unit/acl/entries.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -117,10 +117,16 @@ describe("[unit] acl/resolver — resolveFolderAccess", () => {
|
|
|
117
117
|
(0, chai_1.expect)(actor.manageable.size).to.equal(0);
|
|
118
118
|
(0, chai_1.expect)(actor.shells.size).to.equal(0);
|
|
119
119
|
});
|
|
120
|
-
it("
|
|
121
|
-
const folders = [
|
|
122
|
-
|
|
123
|
-
|
|
120
|
+
it("grants no rights to folders whose parent is missing", () => {
|
|
121
|
+
const folders = [
|
|
122
|
+
buildFolder({ id: "orphan", parentId: "gone" }),
|
|
123
|
+
buildFolder({ id: "orphan-child", parentId: "orphan" }),
|
|
124
|
+
];
|
|
125
|
+
const reader = (0, resolver_1.resolveFolderAccess)(folders, buildActor([media_1.MEDIA_PAGE_PERMISSION, constants_1.MEDIA_FOLDERS_MANAGE_PERMISSION]), defaults_1.DEFAULT_ROOT_ACL);
|
|
126
|
+
(0, chai_1.expect)(reader.readable.size).to.equal(0);
|
|
127
|
+
(0, chai_1.expect)(reader.writable.size).to.equal(0);
|
|
128
|
+
(0, chai_1.expect)(reader.manageable.size).to.equal(0);
|
|
129
|
+
(0, chai_1.expect)(reader.shells.size).to.equal(0);
|
|
124
130
|
});
|
|
125
131
|
it("grants every root right to the owner wildcard", () => {
|
|
126
132
|
const rights = (0, resolver_1.resolveRootRights)(buildActor(["*"]), []);
|
|
@@ -140,13 +146,14 @@ describe("[unit] acl/resolver — resolveFolderAccess", () => {
|
|
|
140
146
|
(0, chai_1.expect)(rights.has("write")).to.equal(true);
|
|
141
147
|
(0, chai_1.expect)(rights.has("manage")).to.equal(false);
|
|
142
148
|
});
|
|
143
|
-
it("
|
|
149
|
+
it("fails closed instead of inheriting when a stored ACL is malformed", () => {
|
|
144
150
|
const folders = [
|
|
145
151
|
buildFolder({ id: "root", acl: editorsRoleAcl }),
|
|
146
152
|
buildFolder({ id: "broken", parentId: "root", rawAcl: "{not json" }),
|
|
147
153
|
];
|
|
148
154
|
const editor = (0, resolver_1.resolveFolderAccess)(folders, buildActor([], ["editors"]), []);
|
|
149
|
-
(0, chai_1.expect)(editor.writable.has("
|
|
155
|
+
(0, chai_1.expect)(editor.writable.has("root")).to.equal(true);
|
|
156
|
+
(0, chai_1.expect)(editor.readable.has("broken")).to.equal(false);
|
|
150
157
|
});
|
|
151
158
|
it("locks down a child with an explicit empty ACL under a permissive parent", () => {
|
|
152
159
|
const folders = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.test.js","sourceRoot":"","sources":["../../../../src/test/unit/acl/resolver.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resolver.test.js","sourceRoot":"","sources":["../../../../src/test/unit/acl/resolver.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,41 +1,19 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
|
-
import { useElementBounding, useResizeObserver } from "@vueuse/core";
|
|
3
|
-
|
|
4
2
|
const { t } = useI18n();
|
|
5
|
-
|
|
6
|
-
// The files card fills the rest of the viewport, so the page itself does not
|
|
7
|
-
// scroll. The DMS layout drops page components into plain block containers,
|
|
8
|
-
// so there is no flex parent to fill: the height comes from the viewport,
|
|
9
|
-
// minus where the card actually starts (dashboard header, page header and the
|
|
10
|
-
// storage card above it all vary). Before the first measurement (SSR,
|
|
11
|
-
// pre-mount) no height is applied and the min-h floor takes over.
|
|
12
|
-
const filesCard = ref<HTMLElement | null>(null);
|
|
13
|
-
const { top: filesCardTop, update: measureFilesCard } =
|
|
14
|
-
useElementBounding(filesCard);
|
|
15
|
-
// The storage card grows once its stats load and pushes the files card down;
|
|
16
|
-
// the bounding above only reacts to the files card's own size, so re-measure
|
|
17
|
-
// when the library (which grows with the storage card) resizes.
|
|
18
|
-
const libraryRoot = ref<HTMLElement | null>(null);
|
|
19
|
-
useResizeObserver(libraryRoot, () => measureFilesCard());
|
|
20
|
-
// Room left below the card, matching the layout panel's bottom padding.
|
|
21
|
-
const FILES_CARD_BOTTOM_GAP_PX = 24;
|
|
22
|
-
const filesCardHeight = computed(() =>
|
|
23
|
-
filesCardTop.value > 0
|
|
24
|
-
? `calc(100dvh - ${Math.round(filesCardTop.value)}px - ${FILES_CARD_BOTTOM_GAP_PX}px)`
|
|
25
|
-
: undefined,
|
|
26
|
-
);
|
|
27
3
|
</script>
|
|
28
4
|
|
|
29
5
|
<template>
|
|
30
|
-
|
|
6
|
+
<!-- The page fills the panel (`fillHeight` in src/pages/media.ts): the files
|
|
7
|
+
card takes the height the storage card leaves, and the explorer scrolls
|
|
8
|
+
inside it. The card keeps a usable height of its own: on a short screen
|
|
9
|
+
the panel scrolls rather than squeeze the explorer. -->
|
|
10
|
+
<div class="flex min-h-0 flex-1 flex-col gap-4">
|
|
31
11
|
<DmsCard>
|
|
32
12
|
<DmsMediaStorageOverview />
|
|
33
13
|
</DmsCard>
|
|
34
14
|
<DmsCard
|
|
35
|
-
ref="filesCard"
|
|
36
15
|
:padded="false"
|
|
37
|
-
class="flex min-h-96 flex-col overflow-hidden"
|
|
38
|
-
:style="{ height: filesCardHeight }"
|
|
16
|
+
class="flex min-h-96 flex-1 flex-col overflow-hidden"
|
|
39
17
|
>
|
|
40
18
|
<DmsMediaPickerExplorer
|
|
41
19
|
browse
|
|
@@ -9,8 +9,8 @@ importers:
|
|
|
9
9
|
.:
|
|
10
10
|
dependencies:
|
|
11
11
|
'@vueuse/core':
|
|
12
|
-
specifier: ^
|
|
13
|
-
version:
|
|
12
|
+
specifier: ^14.3.0
|
|
13
|
+
version: 14.3.0(vue@3.5.40(typescript@6.0.3))
|
|
14
14
|
hookable:
|
|
15
15
|
specifier: ^5.5.3
|
|
16
16
|
version: 5.5.3
|
|
@@ -1460,11 +1460,6 @@ packages:
|
|
|
1460
1460
|
'@vueuse/core@10.11.1':
|
|
1461
1461
|
resolution: {integrity: sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==}
|
|
1462
1462
|
|
|
1463
|
-
'@vueuse/core@13.9.0':
|
|
1464
|
-
resolution: {integrity: sha512-ts3regBQyURfCE2BcytLqzm8+MmLlo5Ln/KLoxDVcsZ2gzIwVNnQpQOL/UKV8alUqjSZOlpFZcRNsLRqj+OzyA==}
|
|
1465
|
-
peerDependencies:
|
|
1466
|
-
vue: ^3.5.0
|
|
1467
|
-
|
|
1468
1463
|
'@vueuse/core@14.3.0':
|
|
1469
1464
|
resolution: {integrity: sha512-aHfz47g0ZhMtTVHmIzMVpJy8ePhhOy68GY5bv110+5DVtZ+W7BsOx+m61UNQqfrWyPztIHIanWa3E2tib3NFIw==}
|
|
1470
1465
|
peerDependencies:
|
|
@@ -1515,20 +1510,12 @@ packages:
|
|
|
1515
1510
|
'@vueuse/metadata@10.11.1':
|
|
1516
1511
|
resolution: {integrity: sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==}
|
|
1517
1512
|
|
|
1518
|
-
'@vueuse/metadata@13.9.0':
|
|
1519
|
-
resolution: {integrity: sha512-1AFRvuiGphfF7yWixZa0KwjYH8ulyjDCC0aFgrGRz8+P4kvDFSdXLVfTk5xAN9wEuD1J6z4/myMoYbnHoX07zg==}
|
|
1520
|
-
|
|
1521
1513
|
'@vueuse/metadata@14.3.0':
|
|
1522
1514
|
resolution: {integrity: sha512-BwxmbAzwAVF50+MW57GXOUEV61nFBGnlBvrTqj49PqWJu3uw7hdu72ztXeZ33RdZtDY6kO+bfCAE1PCn88Tktw==}
|
|
1523
1515
|
|
|
1524
1516
|
'@vueuse/shared@10.11.1':
|
|
1525
1517
|
resolution: {integrity: sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==}
|
|
1526
1518
|
|
|
1527
|
-
'@vueuse/shared@13.9.0':
|
|
1528
|
-
resolution: {integrity: sha512-e89uuTLMh0U5cZ9iDpEI2senqPGfbPRTHM/0AaQkcxnpqjkZqDYP8rpfm7edOz8s+pOCOROEy1PIveSW8+fL5g==}
|
|
1529
|
-
peerDependencies:
|
|
1530
|
-
vue: ^3.5.0
|
|
1531
|
-
|
|
1532
1519
|
'@vueuse/shared@14.3.0':
|
|
1533
1520
|
resolution: {integrity: sha512-bZpge9eSXwa4ToSiqJ7j6KRwhAsneMFoSz3LMWKQDkqimm3D/tbFlrklrs/IOqC8tEcYmXQZJ6N0UrjhBirVCg==}
|
|
1534
1521
|
peerDependencies:
|
|
@@ -4501,13 +4488,6 @@ snapshots:
|
|
|
4501
4488
|
- '@vue/composition-api'
|
|
4502
4489
|
- vue
|
|
4503
4490
|
|
|
4504
|
-
'@vueuse/core@13.9.0(vue@3.5.40(typescript@6.0.3))':
|
|
4505
|
-
dependencies:
|
|
4506
|
-
'@types/web-bluetooth': 0.0.21
|
|
4507
|
-
'@vueuse/metadata': 13.9.0
|
|
4508
|
-
'@vueuse/shared': 13.9.0(vue@3.5.40(typescript@6.0.3))
|
|
4509
|
-
vue: 3.5.40(typescript@6.0.3)
|
|
4510
|
-
|
|
4511
4491
|
'@vueuse/core@14.3.0(vue@3.5.40(typescript@6.0.3))':
|
|
4512
4492
|
dependencies:
|
|
4513
4493
|
'@types/web-bluetooth': 0.0.21
|
|
@@ -4525,8 +4505,6 @@ snapshots:
|
|
|
4525
4505
|
|
|
4526
4506
|
'@vueuse/metadata@10.11.1': {}
|
|
4527
4507
|
|
|
4528
|
-
'@vueuse/metadata@13.9.0': {}
|
|
4529
|
-
|
|
4530
4508
|
'@vueuse/metadata@14.3.0': {}
|
|
4531
4509
|
|
|
4532
4510
|
'@vueuse/shared@10.11.1(vue@3.5.40(typescript@6.0.3))':
|
|
@@ -4536,10 +4514,6 @@ snapshots:
|
|
|
4536
4514
|
- '@vue/composition-api'
|
|
4537
4515
|
- vue
|
|
4538
4516
|
|
|
4539
|
-
'@vueuse/shared@13.9.0(vue@3.5.40(typescript@6.0.3))':
|
|
4540
|
-
dependencies:
|
|
4541
|
-
vue: 3.5.40(typescript@6.0.3)
|
|
4542
|
-
|
|
4543
4517
|
'@vueuse/shared@14.3.0(vue@3.5.40(typescript@6.0.3))':
|
|
4544
4518
|
dependencies:
|
|
4545
4519
|
vue: 3.5.40(typescript@6.0.3)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antelopejs/dms-media",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.3",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"frontend:dev": "cd playground && pnpm frontend:dev",
|
|
34
34
|
"dev": "ajs project run -w -p playground",
|
|
35
35
|
"lint:fix": "oxlint --fix --max-warnings=1000000 && oxfmt . && pnpm --dir frontend-vue lint:fix",
|
|
36
|
-
"lint": "oxlint && oxfmt --check . && pnpm --dir frontend-vue lint",
|
|
36
|
+
"lint": "oxlint && oxfmt --check . && pnpm --dir frontend-vue lint && antelopejs-check-interface-ranges",
|
|
37
37
|
"typecheck": "tsc --noEmit",
|
|
38
38
|
"format": "oxfmt . && pnpm --dir frontend-vue format",
|
|
39
39
|
"test": "pnpm run build && ajs module test .",
|
|
@@ -48,17 +48,17 @@
|
|
|
48
48
|
"@antelopejs/interface-api": ">=0.0.13 <1.0.0",
|
|
49
49
|
"@antelopejs/interface-api-util": ">=0.1.2 <1.0.0",
|
|
50
50
|
"@antelopejs/interface-core": ">=0.1.1 <1.0.0",
|
|
51
|
-
"@antelopejs/interface-database": ">=0.1.
|
|
52
|
-
"@antelopejs/interface-database-decorators": ">=0.1.
|
|
53
|
-
"@antelopejs/interface-dms": ">=0.2.
|
|
51
|
+
"@antelopejs/interface-database": ">=0.1.8 <1.0.0",
|
|
52
|
+
"@antelopejs/interface-database-decorators": ">=0.1.7 <1.0.0",
|
|
53
|
+
"@antelopejs/interface-dms": ">=0.2.8 <1.0.0",
|
|
54
54
|
"@antelopejs/interface-file-storage": ">=0.1.3 <1.0.0",
|
|
55
55
|
"node-cron": "^4.2.1",
|
|
56
56
|
"sharp": "^0.34.4",
|
|
57
57
|
"zod": "~3.24.2"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
|
-
"@antelopejs/core": ">=1.
|
|
61
|
-
"@antelopejs/tooling-configs": ">=0.0.
|
|
60
|
+
"@antelopejs/core": ">=1.10.1 <2",
|
|
61
|
+
"@antelopejs/tooling-configs": ">=0.0.7 <1.0.0",
|
|
62
62
|
"@types/chai": "^4.3.20",
|
|
63
63
|
"@types/mocha": "^10",
|
|
64
64
|
"@types/node": "^24.0.0",
|
package/src/acl/entries.ts
CHANGED
|
@@ -1,14 +1,20 @@
|
|
|
1
|
+
import { Logging } from "@antelopejs/interface-core/logging";
|
|
1
2
|
import type { MediaFolder } from "../db/tables";
|
|
2
3
|
import type { AclEntry } from "../types";
|
|
3
4
|
|
|
5
|
+
/** Fails closed: an unreadable stored ACL grants nothing instead of inheriting. */
|
|
4
6
|
export function parseFolderAcl(folder: MediaFolder): AclEntry[] | undefined {
|
|
5
7
|
if (!folder.json_acl) return undefined;
|
|
6
8
|
try {
|
|
7
9
|
const parsed = JSON.parse(folder.json_acl);
|
|
8
|
-
|
|
10
|
+
if (Array.isArray(parsed)) return parsed as AclEntry[];
|
|
9
11
|
} catch {
|
|
10
|
-
|
|
12
|
+
// Handled below with the non-array case.
|
|
11
13
|
}
|
|
14
|
+
Logging.Warn(
|
|
15
|
+
`Media folder '${folder._id}' has an unreadable ACL; treating it as empty.`,
|
|
16
|
+
);
|
|
17
|
+
return [];
|
|
12
18
|
}
|
|
13
19
|
|
|
14
20
|
export function serializeAcl(
|
package/src/acl/resolver.ts
CHANGED
|
@@ -125,11 +125,9 @@ function groupChildrenByParent(
|
|
|
125
125
|
return childrenByParent;
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
+
/** Orphans (parent row missing) are not roots: they fail closed with no rights. */
|
|
128
129
|
function collectRoots(folders: readonly MediaFolder[]): MediaFolder[] {
|
|
129
|
-
|
|
130
|
-
return folders.filter(
|
|
131
|
-
(folder) => !folder.parentId || !knownIds.has(folder.parentId),
|
|
132
|
-
);
|
|
130
|
+
return folders.filter((folder) => !folder.parentId);
|
|
133
131
|
}
|
|
134
132
|
|
|
135
133
|
function collectFolderRights(
|
|
@@ -16,12 +16,10 @@ export class MediaAsset extends Table {
|
|
|
16
16
|
@Field("string")
|
|
17
17
|
declare _id: string;
|
|
18
18
|
|
|
19
|
-
@Index()
|
|
20
19
|
@CreationTime()
|
|
21
20
|
@Field("date")
|
|
22
21
|
declare createdAt: Date;
|
|
23
22
|
|
|
24
|
-
@Index()
|
|
25
23
|
@UpdateTime()
|
|
26
24
|
@Field("date")
|
|
27
25
|
declare updatedAt: Date;
|
|
@@ -30,7 +28,6 @@ export class MediaAsset extends Table {
|
|
|
30
28
|
@Field("string")
|
|
31
29
|
declare folderId: string;
|
|
32
30
|
|
|
33
|
-
@Index()
|
|
34
31
|
@Field("string")
|
|
35
32
|
declare name: string;
|
|
36
33
|
|
|
@@ -77,7 +74,6 @@ export class MediaAsset extends Table {
|
|
|
77
74
|
@Field("string")
|
|
78
75
|
declare originalKey?: string;
|
|
79
76
|
|
|
80
|
-
@Index()
|
|
81
77
|
@Field("string")
|
|
82
78
|
declare createdBy: string;
|
|
83
79
|
}
|
|
@@ -16,17 +16,14 @@ export class MediaFolder extends Table {
|
|
|
16
16
|
@Field("string")
|
|
17
17
|
declare _id: string;
|
|
18
18
|
|
|
19
|
-
@Index()
|
|
20
19
|
@CreationTime()
|
|
21
20
|
@Field("date")
|
|
22
21
|
declare createdAt: Date;
|
|
23
22
|
|
|
24
|
-
@Index()
|
|
25
23
|
@UpdateTime()
|
|
26
24
|
@Field("date")
|
|
27
25
|
declare updatedAt: Date;
|
|
28
26
|
|
|
29
|
-
@Index()
|
|
30
27
|
@Field("string")
|
|
31
28
|
declare name: string;
|
|
32
29
|
|
package/src/pages/media.ts
CHANGED
|
@@ -30,7 +30,7 @@ export class SettingsAssetsPage extends PageController(
|
|
|
30
30
|
category: mediaSettingsCategory,
|
|
31
31
|
description: "Browse and manage the media library",
|
|
32
32
|
},
|
|
33
|
-
DefaultLayout({ fullWidth: true }),
|
|
33
|
+
DefaultLayout({ fullWidth: true, fillHeight: true }),
|
|
34
34
|
) {
|
|
35
35
|
static content = CustomComponent(MEDIA_LIBRARY_COMPONENT);
|
|
36
36
|
}
|
|
@@ -72,17 +72,38 @@ function buildChildPath(parent: MediaFolder | undefined): string[] {
|
|
|
72
72
|
return parent ? [...parent.path, parent._id] : [];
|
|
73
73
|
}
|
|
74
74
|
|
|
75
|
+
type FolderTreeModels = Pick<MediaRequestContext, "folderModel" | "assetModel">;
|
|
76
|
+
|
|
75
77
|
async function deleteFolderAssets(
|
|
76
|
-
context:
|
|
78
|
+
context: FolderTreeModels,
|
|
77
79
|
folderIds: string[],
|
|
78
80
|
): Promise<void> {
|
|
79
|
-
if (folderIds.length === 0) return;
|
|
80
81
|
const assets = await context.assetModel.getBy("folderId", ...folderIds);
|
|
81
82
|
await Promise.all(
|
|
82
83
|
assets.map((asset) => deleteMediaAsset(context.assetModel, asset._id)),
|
|
83
84
|
);
|
|
84
85
|
}
|
|
85
86
|
|
|
87
|
+
/**
|
|
88
|
+
* Deletes folder rows first, then cascades from the database rather than the
|
|
89
|
+
* request snapshot, so children and assets written concurrently under a
|
|
90
|
+
* deleted folder are removed instead of left orphaned.
|
|
91
|
+
*/
|
|
92
|
+
export async function deleteFolderTree(
|
|
93
|
+
context: FolderTreeModels,
|
|
94
|
+
folderIds: string[],
|
|
95
|
+
): Promise<void> {
|
|
96
|
+
let pending = folderIds;
|
|
97
|
+
while (pending.length > 0) {
|
|
98
|
+
await Promise.all(pending.map((id) => context.folderModel.delete(id)));
|
|
99
|
+
const [lateChildren] = await Promise.all([
|
|
100
|
+
context.folderModel.getBy("parentId", ...pending),
|
|
101
|
+
deleteFolderAssets(context, pending),
|
|
102
|
+
]);
|
|
103
|
+
pending = lateChildren.map((child) => child._id);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
|
|
86
107
|
async function applyFolderMove(
|
|
87
108
|
context: MediaRequestContext,
|
|
88
109
|
folder: MediaFolder,
|
|
@@ -272,8 +293,7 @@ export class MediaFoldersController extends Controller("/api/media") {
|
|
|
272
293
|
);
|
|
273
294
|
}
|
|
274
295
|
const folderIds = [folderId, ...descendants.map((child) => child._id)];
|
|
275
|
-
await
|
|
276
|
-
await Promise.all(folderIds.map((id) => context.folderModel.delete(id)));
|
|
296
|
+
await deleteFolderTree(context, folderIds);
|
|
277
297
|
return { ok: true };
|
|
278
298
|
}
|
|
279
299
|
}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
3
|
+
import { expect } from "chai";
|
|
4
|
+
import { MediaAssetModel, MediaFolderModel } from "../../db";
|
|
5
|
+
import { uploadStorageBytes } from "../../derivatives";
|
|
6
|
+
import { deleteFolderTree } from "../../routes/media/folders";
|
|
7
|
+
|
|
8
|
+
const TENANT = "folder-cascade";
|
|
9
|
+
|
|
10
|
+
async function insertFolder(
|
|
11
|
+
model: MediaFolderModel,
|
|
12
|
+
_id: string,
|
|
13
|
+
parentId?: string,
|
|
14
|
+
): Promise<void> {
|
|
15
|
+
await model.insert({
|
|
16
|
+
_id,
|
|
17
|
+
name: _id,
|
|
18
|
+
parentId,
|
|
19
|
+
path: [],
|
|
20
|
+
visibility: "private",
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
async function insertAsset(
|
|
25
|
+
model: MediaAssetModel,
|
|
26
|
+
folderId: string,
|
|
27
|
+
): Promise<string> {
|
|
28
|
+
const _id = randomUUID();
|
|
29
|
+
await model.insert({
|
|
30
|
+
_id,
|
|
31
|
+
folderId,
|
|
32
|
+
name: "asset.txt",
|
|
33
|
+
mimetype: "text/plain",
|
|
34
|
+
size: 7,
|
|
35
|
+
storageKey: await uploadStorageBytes(
|
|
36
|
+
Buffer.from("cascade"),
|
|
37
|
+
"asset.txt",
|
|
38
|
+
"text/plain",
|
|
39
|
+
randomUUID(),
|
|
40
|
+
undefined,
|
|
41
|
+
),
|
|
42
|
+
createdBy: "test",
|
|
43
|
+
visibility: "inherit",
|
|
44
|
+
mediaRevision: randomUUID(),
|
|
45
|
+
json_retiredFiles: "[]",
|
|
46
|
+
});
|
|
47
|
+
return _id;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
describe("[integration] folder deletion cascade", () => {
|
|
51
|
+
let folderModel: MediaFolderModel;
|
|
52
|
+
let assetModel: MediaAssetModel;
|
|
53
|
+
|
|
54
|
+
before(() => {
|
|
55
|
+
folderModel = GetModel(MediaFolderModel, TENANT);
|
|
56
|
+
assetModel = GetModel(MediaAssetModel, TENANT);
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
afterEach(async () => {
|
|
60
|
+
await folderModel.table.delete().run();
|
|
61
|
+
await assetModel.table.delete().run();
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
it("removes children and assets written after the request snapshot", async () => {
|
|
65
|
+
await insertFolder(folderModel, "root");
|
|
66
|
+
await insertFolder(folderModel, "known", "root");
|
|
67
|
+
await insertFolder(folderModel, "late", "known");
|
|
68
|
+
await insertFolder(folderModel, "late-grandchild", "late");
|
|
69
|
+
await insertFolder(folderModel, "kept");
|
|
70
|
+
await insertAsset(assetModel, "root");
|
|
71
|
+
await insertAsset(assetModel, "late-grandchild");
|
|
72
|
+
const keptAsset = await insertAsset(assetModel, "kept");
|
|
73
|
+
|
|
74
|
+
await deleteFolderTree({ folderModel, assetModel }, ["root", "known"]);
|
|
75
|
+
|
|
76
|
+
const folders = await folderModel.getAll();
|
|
77
|
+
expect(folders.map((folder) => folder._id)).to.deep.equal(["kept"]);
|
|
78
|
+
const assets = await assetModel.getAll();
|
|
79
|
+
expect(assets.map((asset) => asset._id)).to.deep.equal([keptAsset]);
|
|
80
|
+
});
|
|
81
|
+
});
|
|
@@ -30,14 +30,12 @@ describe("[unit] acl/entries — parseFolderAcl", () => {
|
|
|
30
30
|
expect(parseFolderAcl(folder)).to.deep.equal([READ_ENTRY]);
|
|
31
31
|
});
|
|
32
32
|
|
|
33
|
-
it("
|
|
34
|
-
expect(parseFolderAcl(folderWithAcl("{not json"))).to.equal(
|
|
33
|
+
it("fails closed on malformed JSON", () => {
|
|
34
|
+
expect(parseFolderAcl(folderWithAcl("{not json"))).to.deep.equal([]);
|
|
35
35
|
});
|
|
36
36
|
|
|
37
|
-
it("
|
|
38
|
-
expect(parseFolderAcl(folderWithAcl('{"subject":"x"}'))).to.equal(
|
|
39
|
-
undefined,
|
|
40
|
-
);
|
|
37
|
+
it("fails closed on JSON that is not an array", () => {
|
|
38
|
+
expect(parseFolderAcl(folderWithAcl('{"subject":"x"}'))).to.deep.equal([]);
|
|
41
39
|
});
|
|
42
40
|
});
|
|
43
41
|
|
|
@@ -184,14 +184,20 @@ describe("[unit] acl/resolver — resolveFolderAccess", () => {
|
|
|
184
184
|
expect(actor.shells.size).to.equal(0);
|
|
185
185
|
});
|
|
186
186
|
|
|
187
|
-
it("
|
|
188
|
-
const folders = [
|
|
187
|
+
it("grants no rights to folders whose parent is missing", () => {
|
|
188
|
+
const folders = [
|
|
189
|
+
buildFolder({ id: "orphan", parentId: "gone" }),
|
|
190
|
+
buildFolder({ id: "orphan-child", parentId: "orphan" }),
|
|
191
|
+
];
|
|
189
192
|
const reader = resolveFolderAccess(
|
|
190
193
|
folders,
|
|
191
|
-
buildActor([MEDIA_PAGE_PERMISSION]),
|
|
194
|
+
buildActor([MEDIA_PAGE_PERMISSION, MEDIA_FOLDERS_MANAGE_PERMISSION]),
|
|
192
195
|
DEFAULT_ROOT_ACL,
|
|
193
196
|
);
|
|
194
|
-
expect(reader.readable.
|
|
197
|
+
expect(reader.readable.size).to.equal(0);
|
|
198
|
+
expect(reader.writable.size).to.equal(0);
|
|
199
|
+
expect(reader.manageable.size).to.equal(0);
|
|
200
|
+
expect(reader.shells.size).to.equal(0);
|
|
195
201
|
});
|
|
196
202
|
|
|
197
203
|
it("grants every root right to the owner wildcard", () => {
|
|
@@ -218,7 +224,7 @@ describe("[unit] acl/resolver — resolveFolderAccess", () => {
|
|
|
218
224
|
expect(rights.has("manage")).to.equal(false);
|
|
219
225
|
});
|
|
220
226
|
|
|
221
|
-
it("
|
|
227
|
+
it("fails closed instead of inheriting when a stored ACL is malformed", () => {
|
|
222
228
|
const folders = [
|
|
223
229
|
buildFolder({ id: "root", acl: editorsRoleAcl }),
|
|
224
230
|
buildFolder({ id: "broken", parentId: "root", rawAcl: "{not json" }),
|
|
@@ -228,7 +234,8 @@ describe("[unit] acl/resolver — resolveFolderAccess", () => {
|
|
|
228
234
|
buildActor([], ["editors"]),
|
|
229
235
|
[],
|
|
230
236
|
);
|
|
231
|
-
expect(editor.writable.has("
|
|
237
|
+
expect(editor.writable.has("root")).to.equal(true);
|
|
238
|
+
expect(editor.readable.has("broken")).to.equal(false);
|
|
232
239
|
});
|
|
233
240
|
|
|
234
241
|
it("locks down a child with an explicit empty ACL under a permissive parent", () => {
|