@antelopejs/dms-media 0.6.1 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +18 -3
- package/dist/acl/entries.js +1 -2
- package/dist/acl/entries.js.map +1 -1
- package/dist/bindings.js +1 -3
- package/dist/bindings.js.map +1 -1
- package/dist/declared/folders.js +3 -2
- package/dist/declared/folders.js.map +1 -1
- package/dist/declared/records.d.ts +2 -2
- package/dist/declared/records.js +3 -2
- package/dist/declared/records.js.map +1 -1
- package/dist/derivatives.js +9 -6
- package/dist/derivatives.js.map +1 -1
- package/dist/guards.d.ts +4 -0
- package/dist/guards.js +19 -0
- package/dist/guards.js.map +1 -0
- package/dist/library/activity.js +7 -5
- package/dist/library/activity.js.map +1 -1
- package/dist/library/batches.js +6 -3
- package/dist/library/batches.js.map +1 -1
- package/dist/library/events.js +4 -4
- package/dist/library/events.js.map +1 -1
- package/dist/library/module-readout.js +5 -2
- package/dist/library/module-readout.js.map +1 -1
- package/dist/library/realtime.js.map +1 -1
- package/dist/pages/activity.js +1 -1
- package/dist/pages/activity.js.map +1 -1
- package/dist/routes/media/assets.d.ts +1 -1
- package/dist/routes/media/assets.js +5 -5
- package/dist/routes/media/assets.js.map +1 -1
- package/dist/routes/media/bulk.js +17 -13
- package/dist/routes/media/bulk.js.map +1 -1
- package/dist/routes/media/delivery-headers.js +9 -9
- package/dist/routes/media/delivery-headers.js.map +1 -1
- package/dist/routes/media/delivery-stream.js.map +1 -1
- package/dist/routes/media/delivery.js.map +1 -1
- package/dist/routes/media/manage.js.map +1 -1
- package/dist/routes/media/transform.js +13 -8
- package/dist/routes/media/transform.js.map +1 -1
- package/dist/test/antelope.test.js +13 -12
- package/dist/test/antelope.test.js.map +1 -1
- package/dist/test/helpers/folders.d.ts +27 -0
- package/dist/test/helpers/folders.js +15 -0
- package/dist/test/helpers/folders.js.map +1 -1
- package/dist/test/helpers/pages.js +10 -6
- package/dist/test/helpers/pages.js.map +1 -1
- package/dist/test/helpers/permissions-world.d.ts +98 -0
- package/dist/test/helpers/permissions-world.js +205 -0
- package/dist/test/helpers/permissions-world.js.map +1 -0
- package/dist/test/helpers/prototype.d.ts +1 -0
- package/dist/test/helpers/prototype.js +11 -0
- package/dist/test/helpers/prototype.js.map +1 -0
- package/dist/test/integration/derivative-sweep-query.test.js +13 -16
- package/dist/test/integration/derivative-sweep-query.test.js.map +1 -1
- package/dist/test/integration/folder-query.test.js +5 -9
- package/dist/test/integration/folder-query.test.js.map +1 -1
- package/dist/test/integration/media-bindings.test.js +2 -2
- package/dist/test/integration/media-bindings.test.js.map +1 -1
- package/dist/test/integration/media-cleanup.test.js +14 -17
- package/dist/test/integration/media-cleanup.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 +7 -5
- package/dist/test/integration/media-delivery-editing.test.js.map +1 -1
- package/dist/test/integration/media-delivery.test.js +19 -5
- package/dist/test/integration/media-delivery.test.js.map +1 -1
- package/dist/test/integration/media-explorer-writes.test.js +2 -2
- package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
- package/dist/test/integration/media-guards.test.js +18 -7
- package/dist/test/integration/media-guards.test.js.map +1 -1
- package/dist/test/integration/media-library.test.js +1 -1
- package/dist/test/integration/media-library.test.js.map +1 -1
- package/dist/test/integration/media-linked-subfolders.test.js +5 -5
- package/dist/test/integration/media-linked-subfolders.test.js.map +1 -1
- package/dist/test/integration/media-member-access.test.js +2 -5
- package/dist/test/integration/media-member-access.test.js.map +1 -1
- package/dist/test/integration/media-permissions.test.js +142 -473
- package/dist/test/integration/media-permissions.test.js.map +1 -1
- package/dist/test/integration/media-project-field.test.js +3 -5
- package/dist/test/integration/media-project-field.test.js.map +1 -1
- package/dist/test/integration/media-search-query.test.js +11 -16
- package/dist/test/integration/media-search-query.test.js.map +1 -1
- package/dist/test/integration/media-storage-origin-unreachable.test.js +1 -0
- package/dist/test/integration/media-storage-origin-unreachable.test.js.map +1 -1
- package/dist/test/integration/media-upload-policy.test.js +2 -2
- package/dist/test/integration/media-upload-policy.test.js.map +1 -1
- package/dist/test/integration/permissions-management.d.ts +2 -0
- package/dist/test/integration/permissions-management.js +189 -0
- package/dist/test/integration/permissions-management.js.map +1 -0
- package/dist/test/unit/acl/entries.test.js +2 -1
- package/dist/test/unit/acl/entries.test.js.map +1 -1
- package/dist/test/unit/acl/resolver.test.js +10 -3
- package/dist/test/unit/acl/resolver.test.js.map +1 -1
- package/dist/test/unit/library/fixtures.d.ts +1 -1
- package/dist/test/unit/library/fixtures.js +6 -1
- package/dist/test/unit/library/fixtures.js.map +1 -1
- package/dist/test/unit/library/library.test.js +0 -1
- package/dist/test/unit/library/library.test.js.map +1 -1
- package/dist/test/unit/library/realtime.test.js.map +1 -1
- package/dist/test/unit/library/search-facets.test.js +2 -2
- package/dist/test/unit/library/search-facets.test.js.map +1 -1
- package/dist/test/unit/pages/toolbar.test.js +24 -7
- package/dist/test/unit/pages/toolbar.test.js.map +1 -1
- package/dist/test/unit/routes/dto.test.js +7 -6
- package/dist/test/unit/routes/dto.test.js.map +1 -1
- package/dist/test/unit/routes/file-page.test.js +5 -7
- package/dist/test/unit/routes/file-page.test.js.map +1 -1
- package/dist/test/unit/routes/preset-row.test.js +2 -1
- package/dist/test/unit/routes/preset-row.test.js.map +1 -1
- package/dist/transform.js +6 -6
- package/dist/transform.js.map +1 -1
- package/dist/upload-checks.d.ts +8 -2
- package/dist/upload-checks.js.map +1 -1
- package/dist/upload-policy.js +8 -8
- package/dist/upload-policy.js.map +1 -1
- package/dist/validation/declared.schema.js +14 -8
- package/dist/validation/declared.schema.js.map +1 -1
- package/dist/validation/media.schema.d.ts +1 -1
- package/dist/validation/media.schema.js +2 -2
- package/dist/validation/media.schema.js.map +1 -1
- package/frontend-vue/app/build/imageEditor/editorShapes.ts +118 -0
- package/frontend-vue/app/build/imageEditor/useEditorSaving.ts +87 -0
- package/frontend-vue/app/build/library/libraryActions.ts +444 -0
- package/frontend-vue/app/build/library/libraryCore.ts +137 -0
- package/frontend-vue/app/components/FirstRun.vue +2 -1
- package/frontend-vue/app/components/ImageEditor.vue +22 -179
- 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/library/useMediaLibrary.ts +3 -575
- 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/useMediaApi.ts +21 -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/build/backend-boundary.ts +122 -0
- package/frontend-vue/dms.frontend.build.ts +3 -0
- package/frontend-vue/eslint.config.mjs +13 -0
- package/frontend-vue/package.json +4 -2
- package/frontend-vue/pnpm-lock.yaml +217 -61
- package/frontend-vue/tests/api-error-presentation.test.ts +183 -0
- package/frontend-vue/tests/backend-boundary.test.ts +203 -0
- package/frontend-vue/tests/fixtures/serverRender.ts +1 -1
- package/frontend-vue/tests/mediaPreviews.test.ts +39 -0
- package/package.json +5 -11
- package/skills/dms-media/SKILL.md +3 -2
- package/skills/dms-media/cases.json +38 -0
- package/src/acl/entries.ts +6 -4
- package/src/bindings.ts +3 -3
- package/src/declared/folders.ts +3 -3
- package/src/declared/records.ts +9 -8
- package/src/derivatives.ts +10 -6
- package/src/guards.ts +19 -0
- package/src/library/activity.ts +17 -9
- package/src/library/batches.ts +12 -9
- package/src/library/events.ts +7 -4
- package/src/library/module-readout.ts +6 -2
- package/src/library/realtime.ts +5 -1
- package/src/library/zip.ts +1 -1
- package/src/pages/activity.ts +6 -2
- package/src/routes/media/assets.ts +4 -3
- package/src/routes/media/bulk.ts +16 -14
- package/src/routes/media/delivery-headers.ts +9 -12
- package/src/routes/media/delivery-stream.ts +3 -2
- package/src/routes/media/delivery.ts +4 -2
- package/src/routes/media/manage.ts +4 -6
- package/src/routes/media/transform.ts +27 -23
- package/src/test/antelope.test.ts +21 -17
- package/src/test/helpers/folders.ts +22 -0
- package/src/test/helpers/pages.ts +12 -5
- package/src/test/helpers/permissions-world.ts +326 -0
- package/src/test/helpers/prototype.ts +12 -0
- package/src/test/integration/derivative-sweep-query.test.ts +19 -21
- package/src/test/integration/folder-query.test.ts +11 -11
- package/src/test/integration/media-bindings.test.ts +7 -7
- package/src/test/integration/media-cleanup.test.ts +25 -37
- package/src/test/integration/media-declared-content.test.ts +18 -19
- package/src/test/integration/media-delivery-editing.test.ts +11 -7
- package/src/test/integration/media-delivery.test.ts +29 -8
- package/src/test/integration/media-explorer-writes.test.ts +2 -7
- package/src/test/integration/media-guards.test.ts +21 -7
- package/src/test/integration/media-library.test.ts +1 -1
- package/src/test/integration/media-linked-subfolders.test.ts +11 -20
- package/src/test/integration/media-member-access.test.ts +5 -9
- package/src/test/integration/media-permissions.test.ts +56 -570
- package/src/test/integration/media-project-field.test.ts +5 -7
- package/src/test/integration/media-search-query.test.ts +16 -20
- package/src/test/integration/media-storage-origin-unreachable.test.ts +3 -2
- package/src/test/integration/media-upload-policy.test.ts +2 -8
- package/src/test/integration/permissions-management.ts +292 -0
- package/src/test/unit/acl/entries.test.ts +2 -1
- package/src/test/unit/acl/resolver.test.ts +19 -7
- package/src/test/unit/library/fixtures.ts +9 -3
- package/src/test/unit/library/library.test.ts +1 -7
- package/src/test/unit/library/realtime.test.ts +1 -1
- package/src/test/unit/library/search-facets.test.ts +2 -2
- package/src/test/unit/pages/toolbar.test.ts +42 -17
- package/src/test/unit/routes/dto.test.ts +7 -6
- package/src/test/unit/routes/file-page.test.ts +10 -9
- package/src/test/unit/routes/preset-row.test.ts +2 -2
- package/src/transform.ts +6 -6
- package/src/upload-checks.ts +12 -3
- package/src/upload-policy.ts +8 -8
- package/src/validation/declared.schema.ts +17 -12
- package/src/validation/media.schema.ts +6 -6
- package/frontend-vue/tests/engines.test.ts +0 -20
- package/frontend-vue/tests/locales.test.ts +0 -61
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
2
2
|
import { DEFAULT_TENANT_ID } from "@antelopejs/interface-dms/constants";
|
|
3
|
+
import type { AxiosInstance } from "axios";
|
|
4
|
+
import { z } from "zod";
|
|
3
5
|
import { parseFolderAcl, serializeAcl } from "../../acl";
|
|
4
6
|
import { MediaFolderModel } from "../../db";
|
|
5
7
|
import type { AclEntry } from "../../types";
|
|
@@ -23,3 +25,23 @@ export async function writeFolderAcl(
|
|
|
23
25
|
json_acl: serializeAcl(entries ?? undefined) ?? "",
|
|
24
26
|
});
|
|
25
27
|
}
|
|
28
|
+
|
|
29
|
+
const folderNodeSchema = z.object({
|
|
30
|
+
id: z.string(),
|
|
31
|
+
name: z.string(),
|
|
32
|
+
parentId: z.string().nullable(),
|
|
33
|
+
binding: z.string().nullable(),
|
|
34
|
+
acceptsSubfolders: z.boolean(),
|
|
35
|
+
accepts: z.array(z.string()).nullable(),
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
export type FolderNode = z.infer<typeof folderNodeSchema>;
|
|
39
|
+
|
|
40
|
+
/** The folders `/api/media/tree` answers, checked against the fields the suites read. */
|
|
41
|
+
export async function fetchFolderNodes(
|
|
42
|
+
client: AxiosInstance,
|
|
43
|
+
): Promise<FolderNode[]> {
|
|
44
|
+
const response = await client.get("/api/media/tree");
|
|
45
|
+
return z.object({ folders: z.array(folderNodeSchema) }).parse(response.data)
|
|
46
|
+
.folders;
|
|
47
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { pageRoutePath } from "@antelopejs/interface-dms/page";
|
|
2
2
|
import type { AxiosInstance } from "axios";
|
|
3
|
+
import { z } from "zod";
|
|
3
4
|
|
|
4
5
|
const HTTP_OK = 200;
|
|
5
6
|
const PAGE_LAYOUT_ROUTE = "/pagelayout";
|
|
@@ -15,10 +16,16 @@ export interface PageAccess {
|
|
|
15
16
|
servedBlocks: number;
|
|
16
17
|
}
|
|
17
18
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
const layoutSchema = z.object({
|
|
20
|
+
components: z
|
|
21
|
+
.union([z.array(z.unknown()), z.record(z.unknown())])
|
|
22
|
+
.nullish()
|
|
23
|
+
.transform((components) =>
|
|
24
|
+
Array.isArray(components)
|
|
25
|
+
? components.length
|
|
26
|
+
: Object.keys(components ?? {}).length,
|
|
27
|
+
),
|
|
28
|
+
});
|
|
22
29
|
|
|
23
30
|
/** Reads a page through its guarded route, its page entry and its by-slug layout. */
|
|
24
31
|
export async function readPageAccess(
|
|
@@ -40,6 +47,6 @@ export async function readPageAccess(
|
|
|
40
47
|
return {
|
|
41
48
|
ownRouteStatus: ownRoute.status,
|
|
42
49
|
hasAccess: page.data.route?.hasAccess === true,
|
|
43
|
-
servedBlocks:
|
|
50
|
+
servedBlocks: layoutSchema.parse(layout.data).components,
|
|
44
51
|
};
|
|
45
52
|
}
|
|
@@ -0,0 +1,326 @@
|
|
|
1
|
+
import type { AxiosInstance } from "axios";
|
|
2
|
+
import { assert, expect } from "chai";
|
|
3
|
+
import { RegisterAssetBinding } from "@antelopejs/interface-dms-media";
|
|
4
|
+
import {
|
|
5
|
+
configureMediaModule,
|
|
6
|
+
type DmsMediaConfig,
|
|
7
|
+
getMediaConfig,
|
|
8
|
+
} from "../../config";
|
|
9
|
+
import { MEDIA_PAGE_PERMISSION } from "../../pages/files";
|
|
10
|
+
import type { AclEntry } from "../../types";
|
|
11
|
+
import {
|
|
12
|
+
type UploadedAsset,
|
|
13
|
+
uploadPixelPng,
|
|
14
|
+
uploadTextAsset,
|
|
15
|
+
} from "../helpers/assets";
|
|
16
|
+
import { writeFolderAcl } from "../helpers/folders";
|
|
17
|
+
import { authorizedClient } from "../helpers/http";
|
|
18
|
+
import {
|
|
19
|
+
createRole,
|
|
20
|
+
type MemberSession,
|
|
21
|
+
registerMember,
|
|
22
|
+
} from "../helpers/members";
|
|
23
|
+
import { ensureOwnerSession } from "../helpers/owner";
|
|
24
|
+
|
|
25
|
+
export const HTTP_OK = 200;
|
|
26
|
+
export const HTTP_FOUND = 302;
|
|
27
|
+
export const HTTP_FORBIDDEN = 403;
|
|
28
|
+
export const HTTP_NOT_FOUND = 404;
|
|
29
|
+
|
|
30
|
+
export const LIBRARY_VIEW_PERMISSION = "warehouse.library.view";
|
|
31
|
+
export const LIBRARY_UPLOAD_PERMISSION = "warehouse.library.upload";
|
|
32
|
+
export const LIBRARY_MANAGE_PERMISSION = "warehouse.library.manage";
|
|
33
|
+
export const WAREHOUSE_EDIT_PERMISSION = "warehouse.table.edit";
|
|
34
|
+
export const WAREHOUSE_VIEW_PERMISSION = "warehouse.page";
|
|
35
|
+
export const STOCK_BINDING_ID = "warehouse.stock";
|
|
36
|
+
export const STOCK_FOLDER_NAME = "Warehouse stock";
|
|
37
|
+
export const CONTENT_ROOT_NAME = "Content";
|
|
38
|
+
export const ROTATE_QUARTER_TURN = 90;
|
|
39
|
+
|
|
40
|
+
export interface TreeFolderNode {
|
|
41
|
+
id: string;
|
|
42
|
+
name: string;
|
|
43
|
+
parentId: string | null;
|
|
44
|
+
shell: boolean;
|
|
45
|
+
bound: boolean;
|
|
46
|
+
visibility: string;
|
|
47
|
+
rights: { read: boolean; write: boolean; manage: boolean };
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
export interface TreeRootRights {
|
|
51
|
+
write: boolean;
|
|
52
|
+
manage: boolean;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export interface TreeResponse {
|
|
56
|
+
folders: TreeFolderNode[];
|
|
57
|
+
root: TreeRootRights;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export interface WorldRoles {
|
|
61
|
+
pageHolder: string;
|
|
62
|
+
viewer: string;
|
|
63
|
+
uploader: string;
|
|
64
|
+
folderManager: string;
|
|
65
|
+
clerk: string;
|
|
66
|
+
secretTeam: string;
|
|
67
|
+
latecomer: string;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
export interface WorldSessions {
|
|
71
|
+
pageHolder: MemberSession;
|
|
72
|
+
viewer: MemberSession;
|
|
73
|
+
uploader: MemberSession;
|
|
74
|
+
folderManager: MemberSession;
|
|
75
|
+
clerk: MemberSession;
|
|
76
|
+
secretMember: MemberSession;
|
|
77
|
+
hybrid: MemberSession;
|
|
78
|
+
latecomer: MemberSession;
|
|
79
|
+
outsider: MemberSession;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
export interface WorldFolders {
|
|
83
|
+
library: string;
|
|
84
|
+
restricted: string;
|
|
85
|
+
deep: string;
|
|
86
|
+
vault: string;
|
|
87
|
+
pocket: string;
|
|
88
|
+
publicZone: string;
|
|
89
|
+
readOnlyCorner: string;
|
|
90
|
+
depot: string;
|
|
91
|
+
curtain: string;
|
|
92
|
+
stock: string;
|
|
93
|
+
contentRoot: string;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
export interface WorldAssets {
|
|
97
|
+
notes: UploadedAsset;
|
|
98
|
+
secretText: UploadedAsset;
|
|
99
|
+
secretPng: UploadedAsset;
|
|
100
|
+
libraryPng: UploadedAsset;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
export async function fetchTree(client: AxiosInstance): Promise<TreeResponse> {
|
|
104
|
+
const response = await client.get("/api/media/tree");
|
|
105
|
+
expect(response.status, "tree").to.equal(HTTP_OK);
|
|
106
|
+
return response.data;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
export function findByName(
|
|
110
|
+
tree: TreeResponse,
|
|
111
|
+
name: string,
|
|
112
|
+
): TreeFolderNode | undefined {
|
|
113
|
+
return tree.folders.find((folder) => folder.name === name);
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
export function findById(
|
|
117
|
+
tree: TreeResponse,
|
|
118
|
+
id: string,
|
|
119
|
+
): TreeFolderNode | undefined {
|
|
120
|
+
return tree.folders.find((folder) => folder.id === id);
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/** The folder `id` of the tree, failing the test when the tree does not show it. */
|
|
124
|
+
export function requireById(tree: TreeResponse, id: string): TreeFolderNode {
|
|
125
|
+
const folder = findById(tree, id);
|
|
126
|
+
assert.isDefined(folder, `folder ${id}`);
|
|
127
|
+
return folder;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
export async function createFolder(
|
|
131
|
+
owner: AxiosInstance,
|
|
132
|
+
name: string,
|
|
133
|
+
parentId?: string,
|
|
134
|
+
): Promise<string> {
|
|
135
|
+
const response = await owner.post("/api/media/folders", { name, parentId });
|
|
136
|
+
expect(response.status, `create folder ${name}`).to.equal(HTTP_OK);
|
|
137
|
+
return response.data.id;
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
export function roleEntry(
|
|
141
|
+
roleId: string,
|
|
142
|
+
rights: AclEntry["rights"],
|
|
143
|
+
): AclEntry {
|
|
144
|
+
return { subject: { kind: "role", id: roleId }, rights };
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
export function permissionEntry(
|
|
148
|
+
id: string,
|
|
149
|
+
rights: AclEntry["rights"],
|
|
150
|
+
): AclEntry {
|
|
151
|
+
return { subject: { kind: "permission", id }, rights };
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
export function snapshotMediaConfig(): DmsMediaConfig {
|
|
155
|
+
const config = getMediaConfig();
|
|
156
|
+
return {
|
|
157
|
+
rootAcl: config.rootAcl,
|
|
158
|
+
storage: config.storage,
|
|
159
|
+
presets: [...config.presets.values()],
|
|
160
|
+
storageQuotaBytes: config.storageQuotaBytes,
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
export function grantLibraryAtRoot(config: DmsMediaConfig): void {
|
|
165
|
+
configureMediaModule({
|
|
166
|
+
...config,
|
|
167
|
+
rootAcl: [
|
|
168
|
+
...(config.rootAcl ?? []),
|
|
169
|
+
permissionEntry(LIBRARY_VIEW_PERMISSION, ["read"]),
|
|
170
|
+
permissionEntry(LIBRARY_UPLOAD_PERMISSION, ["write"]),
|
|
171
|
+
permissionEntry(LIBRARY_MANAGE_PERMISSION, ["manage"]),
|
|
172
|
+
],
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
export async function createWorldRoles(): Promise<WorldRoles> {
|
|
177
|
+
const [
|
|
178
|
+
pageHolder,
|
|
179
|
+
viewer,
|
|
180
|
+
uploader,
|
|
181
|
+
folderManager,
|
|
182
|
+
clerk,
|
|
183
|
+
secretTeam,
|
|
184
|
+
latecomer,
|
|
185
|
+
] = await Promise.all([
|
|
186
|
+
createRole("media-page-holder", [MEDIA_PAGE_PERMISSION]),
|
|
187
|
+
createRole("media-viewer", [LIBRARY_VIEW_PERMISSION]),
|
|
188
|
+
createRole("media-uploader", [
|
|
189
|
+
LIBRARY_VIEW_PERMISSION,
|
|
190
|
+
LIBRARY_UPLOAD_PERMISSION,
|
|
191
|
+
]),
|
|
192
|
+
createRole("media-folder-manager", [
|
|
193
|
+
LIBRARY_VIEW_PERMISSION,
|
|
194
|
+
LIBRARY_MANAGE_PERMISSION,
|
|
195
|
+
]),
|
|
196
|
+
createRole("warehouse-clerk", [WAREHOUSE_EDIT_PERMISSION]),
|
|
197
|
+
createRole("secret-team", []),
|
|
198
|
+
createRole("latecomer", []),
|
|
199
|
+
]);
|
|
200
|
+
return {
|
|
201
|
+
pageHolder,
|
|
202
|
+
viewer,
|
|
203
|
+
uploader,
|
|
204
|
+
folderManager,
|
|
205
|
+
clerk,
|
|
206
|
+
secretTeam,
|
|
207
|
+
latecomer,
|
|
208
|
+
};
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
export async function registerWorldMembers(
|
|
212
|
+
roles: WorldRoles,
|
|
213
|
+
): Promise<WorldSessions> {
|
|
214
|
+
return {
|
|
215
|
+
pageHolder: await registerMember("PageHolder", [roles.pageHolder]),
|
|
216
|
+
viewer: await registerMember("Viewer", [roles.viewer]),
|
|
217
|
+
uploader: await registerMember("Uploader", [roles.uploader]),
|
|
218
|
+
folderManager: await registerMember("FolderManager", [roles.folderManager]),
|
|
219
|
+
clerk: await registerMember("Clerk", [roles.clerk]),
|
|
220
|
+
secretMember: await registerMember("SecretMember", [roles.secretTeam]),
|
|
221
|
+
hybrid: await registerMember("Hybrid", [roles.viewer, roles.secretTeam]),
|
|
222
|
+
latecomer: await registerMember("Latecomer", [roles.latecomer]),
|
|
223
|
+
outsider: await registerMember("Outsider", []),
|
|
224
|
+
};
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
export async function buildWorldFolders(
|
|
228
|
+
owner: AxiosInstance,
|
|
229
|
+
secretTeamRoleId: string,
|
|
230
|
+
): Promise<WorldFolders> {
|
|
231
|
+
const library = await createFolder(owner, "Library");
|
|
232
|
+
const restricted = await createFolder(owner, "Restricted");
|
|
233
|
+
const deep = await createFolder(owner, "Deep", restricted);
|
|
234
|
+
const vault = await createFolder(owner, "Vault");
|
|
235
|
+
const pocket = await createFolder(owner, "Pocket", vault);
|
|
236
|
+
const publicZone = await createFolder(owner, "PublicZone");
|
|
237
|
+
const readOnlyCorner = await createFolder(owner, "ReadOnlyCorner");
|
|
238
|
+
const depot = await createFolder(owner, "Depot");
|
|
239
|
+
const curtain = await createFolder(owner, "Curtain");
|
|
240
|
+
await writeFolderAcl(restricted, [roleEntry(secretTeamRoleId, ["write"])]);
|
|
241
|
+
await writeFolderAcl(vault, []);
|
|
242
|
+
await writeFolderAcl(pocket, [roleEntry(secretTeamRoleId, ["read"])]);
|
|
243
|
+
await writeFolderAcl(readOnlyCorner, [
|
|
244
|
+
permissionEntry(LIBRARY_VIEW_PERMISSION, ["read"]),
|
|
245
|
+
]);
|
|
246
|
+
const flip = await owner.post(`/api/media/folders/${publicZone}/visibility`, {
|
|
247
|
+
visibility: "public",
|
|
248
|
+
});
|
|
249
|
+
expect(flip.status, "flip PublicZone public").to.equal(HTTP_OK);
|
|
250
|
+
const tree = await fetchTree(owner);
|
|
251
|
+
const stock = findByName(tree, STOCK_FOLDER_NAME);
|
|
252
|
+
const contentRoot = findByName(tree, CONTENT_ROOT_NAME);
|
|
253
|
+
assert.isDefined(stock, "provisioned stock folder");
|
|
254
|
+
assert.isDefined(contentRoot, "provisioned content root");
|
|
255
|
+
return {
|
|
256
|
+
library,
|
|
257
|
+
restricted,
|
|
258
|
+
deep,
|
|
259
|
+
vault,
|
|
260
|
+
pocket,
|
|
261
|
+
publicZone,
|
|
262
|
+
readOnlyCorner,
|
|
263
|
+
depot,
|
|
264
|
+
curtain,
|
|
265
|
+
stock: stock.id,
|
|
266
|
+
contentRoot: contentRoot.id,
|
|
267
|
+
};
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
export async function seedWorldAssets(
|
|
271
|
+
owner: AxiosInstance,
|
|
272
|
+
folders: WorldFolders,
|
|
273
|
+
): Promise<WorldAssets> {
|
|
274
|
+
return {
|
|
275
|
+
notes: await uploadTextAsset(owner, folders.library, "notes.txt"),
|
|
276
|
+
secretText: await uploadTextAsset(owner, folders.restricted, "secret.txt"),
|
|
277
|
+
secretPng: await uploadPixelPng(owner, folders.restricted),
|
|
278
|
+
libraryPng: await uploadPixelPng(owner, folders.library),
|
|
279
|
+
};
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
/** The owner's client, once the world is set up. */
|
|
283
|
+
export let owner: AxiosInstance;
|
|
284
|
+
/** The roles of the world's members, by what they hold. */
|
|
285
|
+
export let roles: WorldRoles;
|
|
286
|
+
/** The world's members, signed in. */
|
|
287
|
+
export let sessions: WorldSessions;
|
|
288
|
+
/** The world's folders, by role in the tests. */
|
|
289
|
+
export let folders: WorldFolders;
|
|
290
|
+
/** The assets seeded into the world's folders. */
|
|
291
|
+
export let assets: WorldAssets;
|
|
292
|
+
let previousConfig: DmsMediaConfig;
|
|
293
|
+
|
|
294
|
+
/** Builds the world every permissions suite reads: root grant, binding, roles, members, folders and assets. */
|
|
295
|
+
export async function setUpPermissionsWorld(): Promise<void> {
|
|
296
|
+
previousConfig = snapshotMediaConfig();
|
|
297
|
+
grantLibraryAtRoot(previousConfig);
|
|
298
|
+
RegisterAssetBinding({
|
|
299
|
+
id: STOCK_BINDING_ID,
|
|
300
|
+
folderName: STOCK_FOLDER_NAME,
|
|
301
|
+
permissionMapping: { write: [WAREHOUSE_EDIT_PERMISSION] },
|
|
302
|
+
});
|
|
303
|
+
const session = await ensureOwnerSession();
|
|
304
|
+
owner = authorizedClient(session.accessToken);
|
|
305
|
+
roles = await createWorldRoles();
|
|
306
|
+
sessions = await registerWorldMembers(roles);
|
|
307
|
+
folders = await buildWorldFolders(owner, roles.secretTeam);
|
|
308
|
+
assets = await seedWorldAssets(owner, folders);
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
/** Deletes the world's top-level folders and puts the module's configuration back. */
|
|
312
|
+
export async function tearDownPermissionsWorld(): Promise<void> {
|
|
313
|
+
const roots = [
|
|
314
|
+
folders.library,
|
|
315
|
+
folders.restricted,
|
|
316
|
+
folders.vault,
|
|
317
|
+
folders.publicZone,
|
|
318
|
+
folders.readOnlyCorner,
|
|
319
|
+
folders.depot,
|
|
320
|
+
folders.curtain,
|
|
321
|
+
];
|
|
322
|
+
for (const folderId of roots) {
|
|
323
|
+
await owner.delete(`/api/media/folders/${folderId}`);
|
|
324
|
+
}
|
|
325
|
+
configureMediaModule(previousConfig);
|
|
326
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/** Replaces a prototype method with `wrap(original)` and returns the call that puts the original back. */
|
|
2
|
+
export function patchMethod<Owner extends object, Key extends keyof Owner>(
|
|
3
|
+
owner: Owner,
|
|
4
|
+
key: Key,
|
|
5
|
+
wrap: (original: Owner[Key]) => Owner[Key],
|
|
6
|
+
): () => void {
|
|
7
|
+
const original = owner[key];
|
|
8
|
+
owner[key] = wrap(original);
|
|
9
|
+
return () => {
|
|
10
|
+
owner[key] = original;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
@@ -3,9 +3,9 @@ import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
|
3
3
|
import { expect } from "chai";
|
|
4
4
|
import { runSweepStaleDerivatives } from "../../crons/sweep-derivatives";
|
|
5
5
|
import { type MediaAsset, MediaAssetModel } from "../../db";
|
|
6
|
+
import { patchMethod } from "../helpers/prototype";
|
|
6
7
|
|
|
7
8
|
const TENANTS = ["stream-sweep-a", "stream-sweep-b"];
|
|
8
|
-
type CursorFactory = (this: Query<unknown>) => AsyncIterable<unknown>;
|
|
9
9
|
|
|
10
10
|
describe("[integration] streaming derivative sweep", () => {
|
|
11
11
|
it("visits each scoped asset cursor and retains per-asset updates", async () => {
|
|
@@ -28,27 +28,25 @@ describe("[integration] streaming derivative sweep", () => {
|
|
|
28
28
|
for (const [index, model] of models.entries()) {
|
|
29
29
|
await model.insert([{ ...fixture, _id: TENANTS[index] }]);
|
|
30
30
|
}
|
|
31
|
-
const
|
|
31
|
+
const visits: string[] = [];
|
|
32
|
+
const restore = patchMethod<Query<unknown>, "cursor">(
|
|
32
33
|
Query.prototype,
|
|
33
34
|
"cursor",
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
yield* readCursor.call(this);
|
|
50
|
-
},
|
|
51
|
-
});
|
|
35
|
+
(readCursor) =>
|
|
36
|
+
async function* (this: Query<unknown>) {
|
|
37
|
+
const table = this.stages.find((stage) => stage.stage === "table")
|
|
38
|
+
?.options?.id;
|
|
39
|
+
if (table === "tenants") {
|
|
40
|
+
for (const _id of TENANTS) yield { _id };
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
visits.push(
|
|
44
|
+
this.stages.find((stage) => stage.stage === "instance")?.options
|
|
45
|
+
?.id,
|
|
46
|
+
);
|
|
47
|
+
yield* readCursor.call(this);
|
|
48
|
+
},
|
|
49
|
+
);
|
|
52
50
|
try {
|
|
53
51
|
await runSweepStaleDerivatives();
|
|
54
52
|
expect(visits).to.deep.equal(TENANTS);
|
|
@@ -58,7 +56,7 @@ describe("[integration] streaming derivative sweep", () => {
|
|
|
58
56
|
);
|
|
59
57
|
}
|
|
60
58
|
} finally {
|
|
61
|
-
|
|
59
|
+
restore();
|
|
62
60
|
for (const model of models) await model.table.delete().run();
|
|
63
61
|
}
|
|
64
62
|
});
|
|
@@ -2,8 +2,8 @@ import { Query } from "@antelopejs/interface-database";
|
|
|
2
2
|
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
3
3
|
import { expect } from "chai";
|
|
4
4
|
import { MediaFolder, MediaFolderModel } from "../../db";
|
|
5
|
+
import { patchMethod } from "../helpers/prototype";
|
|
5
6
|
|
|
6
|
-
type RunQuery = (this: Query<unknown>) => Promise<unknown>;
|
|
7
7
|
const TENANT = "folder-query-a";
|
|
8
8
|
const OTHER = "folder-query-b";
|
|
9
9
|
|
|
@@ -71,16 +71,16 @@ describe("[integration] folder query pushdown", () => {
|
|
|
71
71
|
|
|
72
72
|
it("limits a binding lookup before transfer and keeps the existing first match", async () => {
|
|
73
73
|
const expected = (await model.getBy("binding", "shared"))[0];
|
|
74
|
-
const original = Object.getOwnPropertyDescriptor(Query.prototype, "run")!;
|
|
75
|
-
const run = original.value as RunQuery;
|
|
76
74
|
const stages: string[][] = [];
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
75
|
+
const restore = patchMethod<Query<unknown>, "run">(
|
|
76
|
+
Query.prototype,
|
|
77
|
+
"run",
|
|
78
|
+
(run) =>
|
|
79
|
+
function (this: Query<unknown>) {
|
|
80
|
+
stages.push(this.stages.slice(3).map((stage) => stage.stage));
|
|
81
|
+
return run.call(this);
|
|
82
|
+
},
|
|
83
|
+
);
|
|
84
84
|
try {
|
|
85
85
|
expect(await model.getByBinding("shared")).to.deep.equal(expected);
|
|
86
86
|
expect(await model.getByBinding("missing")).to.equal(undefined);
|
|
@@ -89,7 +89,7 @@ describe("[integration] folder query pushdown", () => {
|
|
|
89
89
|
["getAll", "slice"],
|
|
90
90
|
]);
|
|
91
91
|
} finally {
|
|
92
|
-
|
|
92
|
+
restore();
|
|
93
93
|
}
|
|
94
94
|
});
|
|
95
95
|
});
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
} from "@antelopejs/interface-dms/page";
|
|
7
7
|
import { CustomComponent } from "@antelopejs/interface-dms/base/custom";
|
|
8
8
|
import type { AxiosInstance } from "axios";
|
|
9
|
-
import { expect } from "chai";
|
|
9
|
+
import { assert, expect } from "chai";
|
|
10
10
|
import { RegisterAssetBinding } from "@antelopejs/interface-dms-media";
|
|
11
11
|
import { readFolderAcl } from "../helpers/folders";
|
|
12
12
|
import { authorizedClient } from "../helpers/http";
|
|
@@ -66,13 +66,13 @@ describe("[integration] media bindings — linked folder provisioning", () => {
|
|
|
66
66
|
const contentRoot = folders.find(
|
|
67
67
|
(folder) => folder.name === "Content" && folder.parentId === null,
|
|
68
68
|
);
|
|
69
|
-
|
|
70
|
-
contentRootId =
|
|
69
|
+
assert.isDefined(contentRoot, "content root");
|
|
70
|
+
contentRootId = contentRoot.id;
|
|
71
71
|
const linked = folders.find((folder) => folder.name === "Article covers");
|
|
72
|
-
|
|
73
|
-
expect(
|
|
74
|
-
expect(
|
|
75
|
-
linkedFolderId =
|
|
72
|
+
assert.isDefined(linked, "linked folder");
|
|
73
|
+
expect(linked.parentId).to.equal(contentRootId);
|
|
74
|
+
expect(linked.bound).to.equal(true);
|
|
75
|
+
linkedFolderId = linked.id;
|
|
76
76
|
});
|
|
77
77
|
|
|
78
78
|
it("does not duplicate provisioned folders on later requests", async () => {
|
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import {
|
|
3
|
-
type AtomicMutation,
|
|
4
|
-
type AtomicMutationOutcome,
|
|
5
|
-
Query,
|
|
6
|
-
Table,
|
|
7
|
-
} from "@antelopejs/interface-database";
|
|
2
|
+
import { type AtomicMutation, Table } from "@antelopejs/interface-database";
|
|
8
3
|
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
9
4
|
import * as storage from "@antelopejs/interface-file-storage";
|
|
10
5
|
import { expect } from "chai";
|
|
@@ -22,15 +17,10 @@ import { commitDerivative, uploadStorageBytes } from "../../derivatives";
|
|
|
22
17
|
import { presetCacheKey } from "../../presets";
|
|
23
18
|
import { parseDerivatives } from "../../routes/media/storage-keys";
|
|
24
19
|
import { applyImageTransform } from "../../transform";
|
|
20
|
+
import { patchMethod } from "../helpers/prototype";
|
|
25
21
|
|
|
26
22
|
const TENANT = "media-cleanup-concurrency";
|
|
27
23
|
const OLD_DATE = new Date("2020-01-01T00:00:00Z");
|
|
28
|
-
type AtomicMediaMutation = (
|
|
29
|
-
this: Table<MediaAsset>,
|
|
30
|
-
key: string,
|
|
31
|
-
request: AtomicMutation<MediaAsset>,
|
|
32
|
-
) => Query<AtomicMutationOutcome>;
|
|
33
|
-
|
|
34
24
|
function upload(): Promise<string> {
|
|
35
25
|
return uploadStorageBytes(
|
|
36
26
|
Buffer.from("cleanup"),
|
|
@@ -78,21 +68,18 @@ describe("[integration] replayable media cleanup", () => {
|
|
|
78
68
|
let model: MediaAssetModel;
|
|
79
69
|
let asset: MediaAsset;
|
|
80
70
|
let compare: MediaAssetModel["compareMedia"];
|
|
81
|
-
let
|
|
71
|
+
let restoreMutation: () => void = () => undefined;
|
|
82
72
|
|
|
83
73
|
beforeEach(async () => {
|
|
84
74
|
model = GetModel(MediaAssetModel, TENANT);
|
|
85
75
|
asset = await insertAsset(model);
|
|
86
76
|
compare = model.compareMedia.bind(model);
|
|
87
|
-
|
|
88
|
-
Table.prototype,
|
|
89
|
-
"atomicMutation",
|
|
90
|
-
)!;
|
|
77
|
+
restoreMutation = () => undefined;
|
|
91
78
|
});
|
|
92
79
|
|
|
93
80
|
afterEach(async () => {
|
|
94
81
|
model.compareMedia = compare;
|
|
95
|
-
|
|
82
|
+
restoreMutation();
|
|
96
83
|
await deleteMediaAsset(model, asset._id);
|
|
97
84
|
});
|
|
98
85
|
|
|
@@ -160,24 +147,25 @@ describe("[integration] replayable media cleanup", () => {
|
|
|
160
147
|
const key = await upload();
|
|
161
148
|
await commitDerivative(model, asset, "obsolete", key);
|
|
162
149
|
let calls = 0;
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
150
|
+
restoreMutation = patchMethod<Table<unknown>, "atomicMutation">(
|
|
151
|
+
Table.prototype,
|
|
152
|
+
"atomicMutation",
|
|
153
|
+
(original) =>
|
|
154
|
+
function (
|
|
155
|
+
this: Table<unknown>,
|
|
156
|
+
id: string,
|
|
157
|
+
request: AtomicMutation<unknown>,
|
|
158
|
+
) {
|
|
159
|
+
const query = original.call(this, id, request);
|
|
160
|
+
const run = query.run.bind(query);
|
|
161
|
+
query.run = async () => {
|
|
162
|
+
calls++;
|
|
163
|
+
await run();
|
|
164
|
+
return "unknown";
|
|
165
|
+
};
|
|
166
|
+
return query;
|
|
167
|
+
},
|
|
168
|
+
);
|
|
181
169
|
const error = await sweepAssetDerivatives(model, asset).catch(
|
|
182
170
|
(failure: unknown) => failure,
|
|
183
171
|
);
|
|
@@ -185,7 +173,7 @@ describe("[integration] replayable media cleanup", () => {
|
|
|
185
173
|
expect(calls).to.equal(1);
|
|
186
174
|
expect(await storage.FileExists(key)).to.equal(true);
|
|
187
175
|
expect(retiredFiles((await model.get(asset._id))!)).to.deep.equal([key]);
|
|
188
|
-
|
|
176
|
+
restoreMutation();
|
|
189
177
|
await sweepAssetDerivatives(model, asset);
|
|
190
178
|
expect(await storage.FileExists(key)).to.equal(false);
|
|
191
179
|
});
|