@antelopejs/dms-media 0.6.0 → 0.6.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.
Files changed (238) hide show
  1. package/README.md +18 -3
  2. package/dist/acl/entries.js +1 -2
  3. package/dist/acl/entries.js.map +1 -1
  4. package/dist/bindings.js +1 -3
  5. package/dist/bindings.js.map +1 -1
  6. package/dist/db/models/mediaFolders.model.d.ts +0 -3
  7. package/dist/db/models/mediaFolders.model.js +0 -29
  8. package/dist/db/models/mediaFolders.model.js.map +1 -1
  9. package/dist/db/tables/mediaDeclarations.table.d.ts +0 -4
  10. package/dist/db/tables/mediaDeclarations.table.js +0 -16
  11. package/dist/db/tables/mediaDeclarations.table.js.map +1 -1
  12. package/dist/declared/assets.d.ts +0 -2
  13. package/dist/declared/assets.js +12 -140
  14. package/dist/declared/assets.js.map +1 -1
  15. package/dist/declared/folders.d.ts +1 -5
  16. package/dist/declared/folders.js +17 -82
  17. package/dist/declared/folders.js.map +1 -1
  18. package/dist/declared/index.d.ts +0 -2
  19. package/dist/declared/index.js +0 -2
  20. package/dist/declared/index.js.map +1 -1
  21. package/dist/declared/records.d.ts +4 -32
  22. package/dist/declared/records.js +6 -35
  23. package/dist/declared/records.js.map +1 -1
  24. package/dist/derivatives.js +14 -23
  25. package/dist/derivatives.js.map +1 -1
  26. package/dist/guards.d.ts +4 -0
  27. package/dist/guards.js +19 -0
  28. package/dist/guards.js.map +1 -0
  29. package/dist/implementations/interface-dms-media/index.d.ts +1 -3
  30. package/dist/implementations/interface-dms-media/index.js +0 -2
  31. package/dist/implementations/interface-dms-media/index.js.map +1 -1
  32. package/dist/library/activity.js +7 -5
  33. package/dist/library/activity.js.map +1 -1
  34. package/dist/library/batches.js +6 -3
  35. package/dist/library/batches.js.map +1 -1
  36. package/dist/library/events.js +4 -4
  37. package/dist/library/events.js.map +1 -1
  38. package/dist/library/module-readout.js +5 -2
  39. package/dist/library/module-readout.js.map +1 -1
  40. package/dist/library/realtime.js.map +1 -1
  41. package/dist/pages/activity.js +1 -1
  42. package/dist/pages/activity.js.map +1 -1
  43. package/dist/routes/media/assets.d.ts +1 -1
  44. package/dist/routes/media/assets.js +5 -5
  45. package/dist/routes/media/assets.js.map +1 -1
  46. package/dist/routes/media/bulk.js +17 -13
  47. package/dist/routes/media/bulk.js.map +1 -1
  48. package/dist/routes/media/delivery-headers.js +9 -9
  49. package/dist/routes/media/delivery-headers.js.map +1 -1
  50. package/dist/routes/media/delivery-stream.js +7 -21
  51. package/dist/routes/media/delivery-stream.js.map +1 -1
  52. package/dist/routes/media/delivery.js.map +1 -1
  53. package/dist/routes/media/manage.js.map +1 -1
  54. package/dist/routes/media/transform.js +13 -8
  55. package/dist/routes/media/transform.js.map +1 -1
  56. package/dist/routes/media/upload.js +2 -5
  57. package/dist/routes/media/upload.js.map +1 -1
  58. package/dist/test/antelope.test.js +17 -16
  59. package/dist/test/antelope.test.js.map +1 -1
  60. package/dist/test/helpers/folders.d.ts +27 -0
  61. package/dist/test/helpers/folders.js +15 -0
  62. package/dist/test/helpers/folders.js.map +1 -1
  63. package/dist/test/helpers/pages.js +10 -6
  64. package/dist/test/helpers/pages.js.map +1 -1
  65. package/dist/test/helpers/permissions-world.d.ts +98 -0
  66. package/dist/test/helpers/permissions-world.js +205 -0
  67. package/dist/test/helpers/permissions-world.js.map +1 -0
  68. package/dist/test/helpers/prototype.d.ts +1 -0
  69. package/dist/test/helpers/prototype.js +11 -0
  70. package/dist/test/helpers/prototype.js.map +1 -0
  71. package/dist/test/integration/derivative-sweep-query.test.js +13 -16
  72. package/dist/test/integration/derivative-sweep-query.test.js.map +1 -1
  73. package/dist/test/integration/folder-query.test.js +5 -9
  74. package/dist/test/integration/folder-query.test.js.map +1 -1
  75. package/dist/test/integration/media-bindings.test.js +2 -2
  76. package/dist/test/integration/media-bindings.test.js.map +1 -1
  77. package/dist/test/integration/media-cleanup.test.js +14 -17
  78. package/dist/test/integration/media-cleanup.test.js.map +1 -1
  79. package/dist/test/integration/media-declared-content.test.js +19 -318
  80. package/dist/test/integration/media-declared-content.test.js.map +1 -1
  81. package/dist/test/integration/media-delivery-editing.test.js +7 -5
  82. package/dist/test/integration/media-delivery-editing.test.js.map +1 -1
  83. package/dist/test/integration/media-delivery.test.js +19 -5
  84. package/dist/test/integration/media-delivery.test.js.map +1 -1
  85. package/dist/test/integration/media-explorer-writes.test.js +2 -2
  86. package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
  87. package/dist/test/integration/media-guards.test.js +18 -7
  88. package/dist/test/integration/media-guards.test.js.map +1 -1
  89. package/dist/test/integration/media-library.test.js +1 -1
  90. package/dist/test/integration/media-library.test.js.map +1 -1
  91. package/dist/test/integration/media-linked-subfolders.test.js +6 -6
  92. package/dist/test/integration/media-linked-subfolders.test.js.map +1 -1
  93. package/dist/test/integration/media-member-access.test.js +2 -5
  94. package/dist/test/integration/media-member-access.test.js.map +1 -1
  95. package/dist/test/integration/media-permissions.test.js +142 -473
  96. package/dist/test/integration/media-permissions.test.js.map +1 -1
  97. package/dist/test/integration/media-project-field.test.js +3 -5
  98. package/dist/test/integration/media-project-field.test.js.map +1 -1
  99. package/dist/test/integration/media-search-query.test.js +11 -16
  100. package/dist/test/integration/media-search-query.test.js.map +1 -1
  101. package/dist/test/integration/media-storage-origin-unreachable.test.js +80 -0
  102. package/dist/test/integration/media-storage-origin-unreachable.test.js.map +1 -0
  103. package/dist/test/integration/media-upload-policy.test.js +2 -2
  104. package/dist/test/integration/media-upload-policy.test.js.map +1 -1
  105. package/dist/test/integration/permissions-management.d.ts +2 -0
  106. package/dist/test/integration/permissions-management.js +189 -0
  107. package/dist/test/integration/permissions-management.js.map +1 -0
  108. package/dist/test/unit/acl/entries.test.js +2 -1
  109. package/dist/test/unit/acl/entries.test.js.map +1 -1
  110. package/dist/test/unit/acl/resolver.test.js +10 -3
  111. package/dist/test/unit/acl/resolver.test.js.map +1 -1
  112. package/dist/test/unit/declared.test.js +0 -66
  113. package/dist/test/unit/declared.test.js.map +1 -1
  114. package/dist/test/unit/library/fixtures.d.ts +1 -1
  115. package/dist/test/unit/library/fixtures.js +6 -1
  116. package/dist/test/unit/library/fixtures.js.map +1 -1
  117. package/dist/test/unit/library/library.test.js +0 -1
  118. package/dist/test/unit/library/library.test.js.map +1 -1
  119. package/dist/test/unit/library/realtime.test.js +1 -0
  120. package/dist/test/unit/library/realtime.test.js.map +1 -1
  121. package/dist/test/unit/library/search-facets.test.js +2 -2
  122. package/dist/test/unit/library/search-facets.test.js.map +1 -1
  123. package/dist/test/unit/pages/toolbar.test.js +24 -7
  124. package/dist/test/unit/pages/toolbar.test.js.map +1 -1
  125. package/dist/test/unit/routes/dto.test.js +7 -6
  126. package/dist/test/unit/routes/dto.test.js.map +1 -1
  127. package/dist/test/unit/routes/file-page.test.js +5 -7
  128. package/dist/test/unit/routes/file-page.test.js.map +1 -1
  129. package/dist/test/unit/routes/preset-row.test.js +2 -1
  130. package/dist/test/unit/routes/preset-row.test.js.map +1 -1
  131. package/dist/transform.js +6 -6
  132. package/dist/transform.js.map +1 -1
  133. package/dist/upload-checks.d.ts +8 -2
  134. package/dist/upload-checks.js.map +1 -1
  135. package/dist/upload-policy.js +8 -8
  136. package/dist/upload-policy.js.map +1 -1
  137. package/dist/validation/declared.schema.d.ts +7 -36
  138. package/dist/validation/declared.schema.js +15 -20
  139. package/dist/validation/declared.schema.js.map +1 -1
  140. package/dist/validation/media.schema.d.ts +1 -1
  141. package/dist/validation/media.schema.js +2 -2
  142. package/dist/validation/media.schema.js.map +1 -1
  143. package/frontend-vue/app/build/imageEditor/editorShapes.ts +118 -0
  144. package/frontend-vue/app/build/imageEditor/useEditorSaving.ts +86 -0
  145. package/frontend-vue/app/build/library/libraryActions.ts +444 -0
  146. package/frontend-vue/app/build/library/libraryCore.ts +136 -0
  147. package/frontend-vue/app/components/ImageEditor.vue +22 -179
  148. package/frontend-vue/app/composables/library/useMediaLibrary.ts +3 -575
  149. package/frontend-vue/app/composables/useMediaApi.ts +21 -5
  150. package/frontend-vue/build/backend-boundary.ts +122 -0
  151. package/frontend-vue/dms.frontend.build.ts +3 -0
  152. package/frontend-vue/eslint.config.mjs +13 -0
  153. package/frontend-vue/package.json +3 -1
  154. package/frontend-vue/pnpm-lock.yaml +217 -61
  155. package/frontend-vue/tests/backend-boundary.test.ts +203 -0
  156. package/frontend-vue/tests/mediaPreviews.test.ts +39 -0
  157. package/package.json +10 -16
  158. package/skills/dms-media/SKILL.md +12 -24
  159. package/skills/dms-media/cases.json +38 -0
  160. package/src/acl/entries.ts +6 -4
  161. package/src/bindings.ts +3 -3
  162. package/src/db/models/mediaFolders.model.ts +0 -44
  163. package/src/db/tables/mediaDeclarations.table.ts +3 -19
  164. package/src/declared/assets.ts +19 -210
  165. package/src/declared/folders.ts +25 -138
  166. package/src/declared/index.ts +0 -2
  167. package/src/declared/records.ts +17 -90
  168. package/src/derivatives.ts +17 -23
  169. package/src/guards.ts +19 -0
  170. package/src/implementations/interface-dms-media/index.ts +1 -8
  171. package/src/library/activity.ts +17 -9
  172. package/src/library/batches.ts +12 -9
  173. package/src/library/events.ts +7 -4
  174. package/src/library/module-readout.ts +6 -2
  175. package/src/library/realtime.ts +5 -1
  176. package/src/library/zip.ts +1 -1
  177. package/src/pages/activity.ts +6 -2
  178. package/src/routes/media/assets.ts +4 -3
  179. package/src/routes/media/bulk.ts +16 -14
  180. package/src/routes/media/delivery-headers.ts +9 -12
  181. package/src/routes/media/delivery-stream.ts +13 -28
  182. package/src/routes/media/delivery.ts +4 -2
  183. package/src/routes/media/manage.ts +4 -6
  184. package/src/routes/media/transform.ts +27 -23
  185. package/src/routes/media/upload.ts +4 -6
  186. package/src/test/antelope.test.ts +25 -21
  187. package/src/test/helpers/folders.ts +22 -0
  188. package/src/test/helpers/pages.ts +12 -5
  189. package/src/test/helpers/permissions-world.ts +326 -0
  190. package/src/test/helpers/prototype.ts +12 -0
  191. package/src/test/integration/derivative-sweep-query.test.ts +19 -21
  192. package/src/test/integration/folder-query.test.ts +11 -11
  193. package/src/test/integration/media-bindings.test.ts +7 -7
  194. package/src/test/integration/media-cleanup.test.ts +25 -37
  195. package/src/test/integration/media-declared-content.test.ts +35 -379
  196. package/src/test/integration/media-delivery-editing.test.ts +11 -7
  197. package/src/test/integration/media-delivery.test.ts +29 -8
  198. package/src/test/integration/media-explorer-writes.test.ts +2 -7
  199. package/src/test/integration/media-guards.test.ts +21 -7
  200. package/src/test/integration/media-library.test.ts +1 -1
  201. package/src/test/integration/media-linked-subfolders.test.ts +12 -21
  202. package/src/test/integration/media-member-access.test.ts +5 -9
  203. package/src/test/integration/media-permissions.test.ts +56 -570
  204. package/src/test/integration/media-project-field.test.ts +5 -7
  205. package/src/test/integration/media-search-query.test.ts +16 -20
  206. package/src/test/integration/media-storage-origin-unreachable.test.ts +111 -0
  207. package/src/test/integration/media-upload-policy.test.ts +2 -8
  208. package/src/test/integration/permissions-management.ts +292 -0
  209. package/src/test/unit/acl/entries.test.ts +2 -1
  210. package/src/test/unit/acl/resolver.test.ts +19 -7
  211. package/src/test/unit/declared.test.ts +0 -87
  212. package/src/test/unit/library/fixtures.ts +9 -3
  213. package/src/test/unit/library/library.test.ts +1 -7
  214. package/src/test/unit/library/realtime.test.ts +2 -0
  215. package/src/test/unit/library/search-facets.test.ts +2 -2
  216. package/src/test/unit/pages/toolbar.test.ts +42 -17
  217. package/src/test/unit/routes/dto.test.ts +7 -6
  218. package/src/test/unit/routes/file-page.test.ts +10 -9
  219. package/src/test/unit/routes/preset-row.test.ts +2 -2
  220. package/src/transform.ts +6 -6
  221. package/src/upload-checks.ts +12 -3
  222. package/src/upload-policy.ts +8 -8
  223. package/src/validation/declared.schema.ts +17 -25
  224. package/src/validation/media.schema.ts +6 -6
  225. package/dist/declared/readiness.d.ts +0 -2
  226. package/dist/declared/readiness.js +0 -52
  227. package/dist/declared/readiness.js.map +0 -1
  228. package/dist/declared/retire.d.ts +0 -3
  229. package/dist/declared/retire.js +0 -118
  230. package/dist/declared/retire.js.map +0 -1
  231. package/dist/test/integration/media-declared-retire.test.js +0 -186
  232. package/dist/test/integration/media-declared-retire.test.js.map +0 -1
  233. package/frontend-vue/tests/engines.test.ts +0 -20
  234. package/frontend-vue/tests/locales.test.ts +0 -61
  235. package/src/declared/readiness.ts +0 -64
  236. package/src/declared/retire.ts +0 -206
  237. package/src/test/integration/media-declared-retire.test.ts +0 -257
  238. /package/dist/test/integration/{media-declared-retire.test.d.ts → media-storage-origin-unreachable.test.d.ts} +0 -0
@@ -1,5 +1,5 @@
1
1
  import type { AxiosInstance } from "axios";
2
- import { expect } from "chai";
2
+ import { assert, expect } from "chai";
3
3
  import {
4
4
  ONE_PIXEL_PNG,
5
5
  PNG_NAME,
@@ -14,6 +14,10 @@ const HTTP_FOUND = 302;
14
14
  const HTTP_UNAUTHORIZED = 401;
15
15
  const HTTP_NOT_FOUND = 404;
16
16
 
17
+ interface PreviewResponse {
18
+ previews: Record<string, string>;
19
+ }
20
+
17
21
  async function fetchBytes(url: string): Promise<Buffer> {
18
22
  const response = await fetch(url);
19
23
  expect(response.status).to.equal(HTTP_OK);
@@ -56,12 +60,19 @@ describe("[integration] media delivery — visibility and derivatives", () => {
56
60
  expect(response.status).to.equal(HTTP_UNAUTHORIZED);
57
61
  });
58
62
 
63
+ it("refuses an anonymous caller before telling whether a preset exists", async () => {
64
+ const known = await rawGet(`/media/${assetId}/thumb/${PNG_NAME}`);
65
+ const unknown = await rawGet(`/media/${assetId}/nosuchpreset/${PNG_NAME}`);
66
+ expect(known.status).to.equal(HTTP_UNAUTHORIZED);
67
+ expect(unknown.status).to.equal(HTTP_UNAUTHORIZED);
68
+ });
69
+
59
70
  it("redirects an authorized user to a short-lived signed URL", async () => {
60
71
  const response = await rawGet(`/media/${assetId}/${PNG_NAME}`, token);
61
72
  expect(response.status).to.equal(HTTP_FOUND);
62
- expect(response.location).to.be.a("string");
73
+ assert.isNotNull(response.location);
63
74
  expect(response.cacheControl).to.equal("no-store");
64
- const bytes = await fetchBytes(response.location as string);
75
+ const bytes = await fetchBytes(response.location);
65
76
  expect(bytes.equals(ONE_PIXEL_PNG)).to.equal(true);
66
77
  });
67
78
 
@@ -81,7 +92,8 @@ describe("[integration] media delivery — visibility and derivatives", () => {
81
92
  it("generates a derivative lazily and serves it through the preset route", async () => {
82
93
  const response = await rawGet(`/media/${assetId}/thumb/${PNG_NAME}`);
83
94
  expect(response.status).to.equal(HTTP_FOUND);
84
- const bytes = await fetchBytes(response.location as string);
95
+ assert.isNotNull(response.location);
96
+ const bytes = await fetchBytes(response.location);
85
97
  expect(bytes.byteLength).to.be.greaterThan(0);
86
98
  expect(bytes.equals(ONE_PIXEL_PNG)).to.equal(false);
87
99
 
@@ -114,12 +126,21 @@ describe("[integration] media delivery — visibility and derivatives", () => {
114
126
  const ids = listing.data.assets.map((asset: { id: string }) => asset.id);
115
127
  expect(ids).to.include(assetId);
116
128
 
117
- const previews = await client.post("/api/media/previews", {
118
- ids: [assetId, "unknown-asset"],
119
- });
129
+ const secondAsset = await uploadPixelPng(client, folderId);
130
+ const previews = await client.get<PreviewResponse>(
131
+ `/api/media/previews?ids=${assetId}&ids=${secondAsset.id}`,
132
+ );
120
133
  expect(previews.status).to.equal(HTTP_OK);
134
+ expect(Object.keys(previews.data.previews)).to.have.members([
135
+ assetId,
136
+ secondAsset.id,
137
+ ]);
121
138
  expect(previews.data.previews[assetId]).to.be.a("string");
122
- expect(previews.data.previews["unknown-asset"]).to.equal(undefined);
139
+ expect(previews.data.previews[secondAsset.id]).to.be.a("string");
140
+ const legacy = await client.post("/api/media/previews", {
141
+ ids: [assetId, secondAsset.id],
142
+ });
143
+ expect(legacy.status).to.equal(HTTP_NOT_FOUND);
123
144
  });
124
145
 
125
146
  it("returns to private after flipping the folder back", async () => {
@@ -9,6 +9,7 @@ import {
9
9
  import { CONTENT_ROOT_BINDING } from "../../bindings";
10
10
  import { MediaEventModel, MediaFolderModel } from "../../db";
11
11
  import { uploadPixelPng, uploadTextAsset } from "../helpers/assets";
12
+ import { fetchFolderNodes } from "../helpers/folders";
12
13
  import { authorizedClient } from "../helpers/http";
13
14
  import { ensureOwnerSession } from "../helpers/owner";
14
15
 
@@ -26,11 +27,6 @@ const CENTRAL_COMMENT_LENGTH_OFFSET = 32;
26
27
  const CENTRAL_HEADER_SIZE = 46;
27
28
  const ALT_LIMIT = 255;
28
29
 
29
- interface FolderNode {
30
- id: string;
31
- binding: string | null;
32
- }
33
-
34
30
  /** The entry names of a zip, read from its central directory. */
35
31
  function zipEntryNames(zip: Buffer): string[] {
36
32
  const names: string[] = [];
@@ -125,8 +121,7 @@ describe("[integration] media explorer writes — names, linked folders, zips",
125
121
  });
126
122
 
127
123
  it("puts no subfolder inside a linked folder, by creation or by move", async () => {
128
- const tree = await client.get("/api/media/tree");
129
- const linked = (tree.data.folders as FolderNode[]).find(
124
+ const linked = (await fetchFolderNodes(client)).find(
130
125
  (folder) => folder.binding === BINDING_ID,
131
126
  );
132
127
  expect(linked, "linked folder").to.not.equal(undefined);
@@ -1,3 +1,4 @@
1
+ import { randomUUID } from "node:crypto";
1
2
  import axios, { type AxiosInstance } from "axios";
2
3
  import { expect } from "chai";
3
4
  import { authorizedClient, createClient } from "../helpers/http";
@@ -52,7 +53,7 @@ describe("[integration] media guards — every endpoint requires auth and rights
52
53
  resourceKey: "media/any/key.txt",
53
54
  filename: "x.txt",
54
55
  }),
55
- anonymous.post("/api/media/previews", { ids: ["any"] }),
56
+ anonymous.get(`/api/media/previews?ids=${randomUUID()}`),
56
57
  ];
57
58
  const responses = await Promise.all(attempts);
58
59
  for (const [index, response] of responses.entries()) {
@@ -60,10 +61,23 @@ describe("[integration] media guards — every endpoint requires auth and rights
60
61
  }
61
62
  });
62
63
 
63
- it("rejects oversized preview batches", async () => {
64
- const ids = Array.from({ length: 201 }, (_, index) => `ghost-${index}`);
65
- const previews = await owner.post("/api/media/previews", { ids });
64
+ it("accepts 200 preview IDs and rejects 201", async () => {
65
+ const ids = Array.from({ length: 201 }, () => randomUUID());
66
+ const query = new URLSearchParams(ids.map((id) => ["ids", id]));
67
+ const previews = await owner.get(`/api/media/previews?${query}`);
66
68
  expect(previews.status).to.equal(HTTP_BAD_REQUEST);
69
+ ids.pop();
70
+ const allowedQuery = new URLSearchParams(ids.map((id) => ["ids", id]));
71
+ const allowed = await owner.get(`/api/media/previews?${allowedQuery}`);
72
+ expect(allowed.status).to.equal(HTTP_OK);
73
+ expect(allowed.data.previews).to.deep.equal({});
74
+ });
75
+
76
+ it("requires a nonempty list of UUIDs for previews", async () => {
77
+ for (const query of ["", "?ids=not-a-uuid"]) {
78
+ const response = await owner.get(`/api/media/previews${query}`);
79
+ expect(response.status).to.equal(HTTP_BAD_REQUEST);
80
+ }
67
81
  });
68
82
 
69
83
  it("hides unknown folders behind 404 for authorized users", async () => {
@@ -94,9 +108,9 @@ describe("[integration] media guards — every endpoint requires auth and rights
94
108
  });
95
109
 
96
110
  it("filters unreadable assets out of previews instead of failing", async () => {
97
- const previews = await owner.post("/api/media/previews", {
98
- ids: ["ghost-1", "ghost-2"],
99
- });
111
+ const previews = await owner.get(
112
+ `/api/media/previews?ids=${randomUUID()}&ids=${randomUUID()}`,
113
+ );
100
114
  expect(previews.status).to.equal(HTTP_OK);
101
115
  expect(previews.data.previews).to.deep.equal({});
102
116
  });
@@ -343,7 +343,7 @@ describe("[integration] media library — listings, search, bulk and overview",
343
343
  });
344
344
 
345
345
  it("lists delivery presets with their cache keys", async () => {
346
- await client.post("/api/media/previews", { ids: [ids["oak-a.png"]] });
346
+ await client.get(`/api/media/previews?ids=${ids["oak-a.png"]}`);
347
347
  const response = await client.get("/api/media/presets");
348
348
  expect(response.status).to.equal(HTTP_OK);
349
349
  const thumb = response.data.presets.find(
@@ -1,5 +1,5 @@
1
1
  import type { AxiosInstance } from "axios";
2
- import { expect } from "chai";
2
+ import { assert, expect } from "chai";
3
3
  import { GetModel } from "@antelopejs/interface-database-decorators";
4
4
  import { DEFAULT_TENANT_ID } from "@antelopejs/interface-dms/constants";
5
5
  import {
@@ -15,6 +15,7 @@ import {
15
15
  MediaFolderModel,
16
16
  } from "../../db";
17
17
  import { ONE_PIXEL_PNG, PNG_MIMETYPE } from "../helpers/assets";
18
+ import { type FolderNode, fetchFolderNodes } from "../helpers/folders";
18
19
  import { authorizedClient } from "../helpers/http";
19
20
  import { ensureOwnerSession } from "../helpers/owner";
20
21
 
@@ -26,15 +27,6 @@ const LOCKED_BINDING_ID = "subfolders.locked";
26
27
  const KEY_PREFIX = "subfolders.";
27
28
  const ERRORS = "$dms_media.errors";
28
29
 
29
- interface FolderNode {
30
- id: string;
31
- name: string;
32
- parentId: string | null;
33
- binding: string | null;
34
- acceptsSubfolders: boolean;
35
- accepts: string[] | null;
36
- }
37
-
38
30
  function folders() {
39
31
  return GetModel(MediaFolderModel, DEFAULT_TENANT_ID);
40
32
  }
@@ -43,7 +35,8 @@ async function rejectionOf(promise: Promise<unknown>): Promise<Error> {
43
35
  try {
44
36
  await promise;
45
37
  } catch (error) {
46
- return error as Error;
38
+ assert.instanceOf(error, Error);
39
+ return error;
47
40
  }
48
41
  throw new Error("Expected the declaration to be refused");
49
42
  }
@@ -89,8 +82,7 @@ describe("[integration] media linked subfolders — bindings that allow them", (
89
82
  let client: AxiosInstance;
90
83
 
91
84
  async function treeFolder(binding: string): Promise<FolderNode> {
92
- const tree = await client.get("/api/media/tree");
93
- const folder = (tree.data.folders as FolderNode[]).find(
85
+ const folder = (await fetchFolderNodes(client)).find(
94
86
  (entry) => entry.binding === binding,
95
87
  );
96
88
  if (!folder) throw new Error(`No folder linked to ${binding}`);
@@ -144,8 +136,7 @@ describe("[integration] media linked subfolders — bindings that allow them", (
144
136
  name: "Renamed",
145
137
  });
146
138
  expect(rename.status).to.equal(HTTP_FORBIDDEN);
147
- const tree = await client.get("/api/media/tree");
148
- const subfolder = (tree.data.folders as FolderNode[]).find(
139
+ const subfolder = (await fetchFolderNodes(client)).find(
149
140
  (folder) => folder.id === created.data.id,
150
141
  );
151
142
  expect(subfolder?.acceptsSubfolders).to.equal(true);
@@ -184,16 +175,14 @@ describe("[integration] media linked subfolders — bindings that allow them", (
184
175
  parent: { binding: OPEN_BINDING_ID },
185
176
  });
186
177
  expect(project.status).to.equal("created");
187
- expect((await folders().get(project.id as string))?.parentId).to.equal(
188
- linked.id,
189
- );
178
+ expect((await folders().get(project.id))?.parentId).to.equal(linked.id);
190
179
  const again = await EnsureMediaFolder({
191
180
  tenantId: DEFAULT_TENANT_ID,
192
181
  key: "subfolders.project-c",
193
182
  name: "Project C",
194
183
  parent: { binding: OPEN_BINDING_ID },
195
184
  });
196
- expect(again).to.deep.equal({ status: "unchanged", id: project.id });
185
+ expect(again).to.deep.equal({ status: "kept", id: project.id });
197
186
  const nested = await EnsureMediaFolder({
198
187
  tenantId: DEFAULT_TENANT_ID,
199
188
  key: "subfolders.project-c.roof",
@@ -201,14 +190,16 @@ describe("[integration] media linked subfolders — bindings that allow them", (
201
190
  parent: { key: "subfolders.project-c" },
202
191
  });
203
192
  expect(nested.status).to.equal("created");
204
- // A declared parent named by its key alone is the same declaration.
205
193
  const sameParent = await EnsureMediaFolder({
206
194
  tenantId: DEFAULT_TENANT_ID,
207
195
  key: "subfolders.project-c.roof",
208
196
  name: "Roof",
209
197
  parent: "subfolders.project-c",
210
198
  });
211
- expect(sameParent).to.deep.equal({ status: "unchanged", id: nested.id });
199
+ expect(
200
+ sameParent,
201
+ "a declared parent named by its key alone is the same declaration",
202
+ ).to.deep.equal({ status: "kept", id: nested.id });
212
203
  const photo = await ImportMediaAsset({
213
204
  tenantId: DEFAULT_TENANT_ID,
214
205
  key: "subfolders.project-c.roof.photo",
@@ -10,9 +10,8 @@ import {
10
10
  type PermissionTree,
11
11
  } from "@antelopejs/interface-dms/permissions";
12
12
  import type { AxiosInstance } from "axios";
13
- import { expect } from "chai";
13
+ import { assert, expect } from "chai";
14
14
  import { RegisterAssetBinding } from "@antelopejs/interface-dms-media";
15
- import { DEFAULT_ROOT_ACL } from "../../acl/defaults";
16
15
  import { MEDIA_PAGE_PERMISSION } from "../../pages/files";
17
16
  import { type UploadedAsset, uploadTextAsset } from "../helpers/assets";
18
17
  import { readFolderAcl } from "../helpers/folders";
@@ -106,7 +105,8 @@ function presignInto(client: AxiosInstance, folderId: string) {
106
105
  async function buildWorld(): Promise<MemberAccessWorld> {
107
106
  const session = await ensureOwnerSession();
108
107
  const owner = authorizedClient(session.accessToken);
109
- const pagePermission = GetPermissionId(MemberAccessProbePage) as string;
108
+ const pagePermission = GetPermissionId(MemberAccessProbePage);
109
+ assert.isDefined(pagePermission, "probe page permission");
110
110
  const [pageRole, modulePageRole] = await Promise.all([
111
111
  createRole("member-access-page", [pagePermission]),
112
112
  createRole("member-access-module-page", [MEDIA_PAGE_PERMISSION]),
@@ -116,8 +116,8 @@ async function buildWorld(): Promise<MemberAccessWorld> {
116
116
  });
117
117
  expect(shelf.status, "create shelf").to.equal(HTTP_OK);
118
118
  const linked = findFolder(await fetchTree(owner), LINKED_FOLDER_NAME);
119
- expect(linked, "provisioned linked folder").to.not.equal(undefined);
120
- const linkedFolderId = (linked as TreeFolder).id;
119
+ assert.isDefined(linked, "provisioned linked folder");
120
+ const linkedFolderId = linked.id;
121
121
  return {
122
122
  owner,
123
123
  pageMember: await registerMember("PageMember", [pageRole]),
@@ -155,10 +155,6 @@ describe("[integration] media member access — roles, root ACL and linked folde
155
155
  });
156
156
 
157
157
  describe("library root", () => {
158
- it("grants nothing at the root by default", () => {
159
- expect(DEFAULT_ROOT_ACL).to.deep.equal([]);
160
- });
161
-
162
158
  it("opens nothing to a role holding the All files page", async () => {
163
159
  const tree = await fetchTree(world.modulePageMember.client);
164
160
  expect(tree.folders).to.deep.equal([]);