@researchdatabox/redbox-core 5.0.1-beta.11285 → 5.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/dist/CoreController.d.ts +1 -0
  2. package/dist/CoreController.d.ts.map +1 -1
  3. package/dist/CoreController.js +39 -3
  4. package/dist/config/dompurify.config.d.ts +1 -0
  5. package/dist/config/dompurify.config.d.ts.map +1 -1
  6. package/dist/config/dompurify.config.js +6 -3
  7. package/dist/controllers/AsynchController.d.ts +1 -1
  8. package/dist/controllers/EmailController.d.ts +1 -1
  9. package/dist/controllers/RecordController.d.ts.map +1 -1
  10. package/dist/controllers/RecordController.js +12 -6
  11. package/dist/controllers/webservice/RecordController.d.ts +1 -1
  12. package/dist/responses/badRequest.d.ts +1 -1
  13. package/dist/responses/badRequest.d.ts.map +1 -1
  14. package/dist/responses/badRequest.js +3 -16
  15. package/dist/responses/forbidden.d.ts +1 -1
  16. package/dist/responses/forbidden.d.ts.map +1 -1
  17. package/dist/responses/forbidden.js +3 -16
  18. package/dist/responses/index.d.ts +1 -0
  19. package/dist/responses/index.d.ts.map +1 -1
  20. package/dist/responses/index.js +2 -1
  21. package/dist/responses/notFound.d.ts +22 -0
  22. package/dist/responses/notFound.d.ts.map +1 -0
  23. package/dist/responses/notFound.js +45 -0
  24. package/dist/responses/renderErrorView.d.ts +7 -0
  25. package/dist/responses/renderErrorView.d.ts.map +1 -0
  26. package/dist/responses/renderErrorView.js +15 -0
  27. package/dist/responses/serverError.d.ts +1 -1
  28. package/dist/responses/serverError.d.ts.map +1 -1
  29. package/dist/responses/serverError.js +3 -16
  30. package/dist/responses/terminalErrorFallback.d.ts +6 -0
  31. package/dist/responses/terminalErrorFallback.d.ts.map +1 -0
  32. package/dist/responses/terminalErrorFallback.js +16 -0
  33. package/dist/services/DomSanitizerService.d.ts.map +1 -1
  34. package/dist/services/DomSanitizerService.js +39 -64
  35. package/dist/services/figshare-v2/assets.d.ts.map +1 -1
  36. package/dist/services/figshare-v2/assets.js +39 -7
  37. package/package.json +6 -6
@@ -204,19 +204,32 @@ async function uploadAttachment(client, config, articleId, oid, attachment, logg
204
204
  }
205
205
  async function syncLinkOnlyFiles(client, articleId, selectedUrls, currentFiles) {
206
206
  const existingLinkFiles = currentFiles.filter(entry => entry.is_link_only === true);
207
+ const retainedLinkIds = new Set();
207
208
  const uploadedUrls = [];
208
209
  const creationErrors = [];
209
210
  for (const entry of selectedUrls) {
210
211
  if (entry.ignore === true) {
211
212
  continue;
212
213
  }
214
+ const link = entry.location ?? '';
215
+ // Both save phases (and later retries) can sync the same URL. Figshare
216
+ // rejects creating another linked file when the article already has one.
217
+ if (uploadedUrls.some(file => file.download_url === link)) {
218
+ continue;
219
+ }
220
+ const existingLink = existingLinkFiles.find(file => file.download_url === link);
221
+ if (existingLink != null) {
222
+ retainedLinkIds.add(String(existingLink.id));
223
+ uploadedUrls.push(existingLink);
224
+ continue;
225
+ }
213
226
  let responseLocation = null;
214
227
  let attempt = 0;
215
228
  while (attempt < LINK_FILE_CREATE_RETRY_COUNT) {
216
229
  attempt += 1;
217
230
  try {
218
231
  responseLocation = await client.createArticleFile(articleId, {
219
- link: entry.location ?? '',
232
+ link,
220
233
  });
221
234
  break;
222
235
  }
@@ -247,10 +260,27 @@ async function syncLinkOnlyFiles(client, articleId, selectedUrls, currentFiles)
247
260
  throw validationError(`Failed to create ${creationErrors.length} Figshare link file(s); existing link files were not deleted`);
248
261
  }
249
262
  for (const file of existingLinkFiles) {
263
+ if (retainedLinkIds.has(String(file.id))) {
264
+ continue;
265
+ }
250
266
  await client.deleteArticleFile(articleId, String(file.id));
251
267
  }
252
268
  return uploadedUrls;
253
269
  }
270
+ function getPublishableUrlEntries(selectedUrls) {
271
+ const seenUrls = new Set();
272
+ return selectedUrls.filter(entry => {
273
+ if (entry.ignore === true) {
274
+ return false;
275
+ }
276
+ const url = entry.location ?? '';
277
+ if (seenUrls.has(url)) {
278
+ return false;
279
+ }
280
+ seenUrls.add(url);
281
+ return true;
282
+ });
283
+ }
254
284
  function toFixtureFigshareFile(entry, articleId, index, isLinkOnly) {
255
285
  const derivedName = entry.name ?? entry.originalFileName ?? (isLinkOnly ? `link-${index + 1}` : `attachment-${index + 1}`);
256
286
  return {
@@ -271,6 +301,10 @@ async function syncAssetsPhase(client, config, record, article, syncState, logge
271
301
  const articleId = String(article.id);
272
302
  const attachmentCount = selectedAttachments.length;
273
303
  const urlCount = selectedUrls.length;
304
+ // Preserve the 4.x behaviour: hosted attachments take precedence over
305
+ // linked files. URL data locations remain available to metadata mappings.
306
+ const syncLinkedFiles = config.assets.enableLinkFiles && !(config.assets.enableHostedFiles && attachmentCount > 0);
307
+ const publishableUrls = syncLinkedFiles ? getPublishableUrlEntries(selectedUrls) : [];
274
308
  const currentFiles = await listArticleFiles(client, articleId);
275
309
  if (hasPendingUploads(currentFiles)) {
276
310
  throw validationError(`Figshare file uploads are already in progress for article '${articleId}'`);
@@ -287,7 +321,7 @@ async function syncAssetsPhase(client, config, record, article, syncState, logge
287
321
  urlCount,
288
322
  uploadsComplete,
289
323
  uploadedAttachmentCount: attachmentCount,
290
- uploadedUrlCount: urlCount,
324
+ uploadedUrlCount: publishableUrls.length,
291
325
  };
292
326
  (0, config_1.setSyncState)(config, record, syncState);
293
327
  return {
@@ -296,7 +330,7 @@ async function syncAssetsPhase(client, config, record, article, syncState, logge
296
330
  urlCount,
297
331
  uploadsComplete,
298
332
  uploadedAttachments: selectedAttachments.map((entry, index) => toFixtureFigshareFile(entry, articleId, index, false)),
299
- uploadedUrls: selectedUrls.map((entry, index) => toFixtureFigshareFile(entry, articleId, index, true)),
333
+ uploadedUrls: publishableUrls.map((entry, index) => toFixtureFigshareFile(entry, articleId, index, true)),
300
334
  dataLocations: selectedDataLocations,
301
335
  };
302
336
  }
@@ -316,9 +350,7 @@ async function syncAssetsPhase(client, config, record, article, syncState, logge
316
350
  uploadedAttachmentCountThisRun += 1;
317
351
  }
318
352
  }
319
- const uploadedUrls = config.assets.enableLinkFiles
320
- ? await syncLinkOnlyFiles(client, articleId, selectedUrls, currentFiles)
321
- : [];
353
+ const uploadedUrls = syncLinkedFiles ? await syncLinkOnlyFiles(client, articleId, publishableUrls, currentFiles) : [];
322
354
  const refreshedFiles = attachmentCount > 0 ? await listArticleFiles(client, articleId) : currentFiles;
323
355
  const uploadsComplete = attachmentCount === 0
324
356
  ? true
@@ -349,4 +381,4 @@ async function syncAssetsPhase(client, config, record, article, syncState, logge
349
381
  dataLocations: selectedDataLocations,
350
382
  };
351
383
  }
352
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/services/figshare-v2/assets.ts"],"names":[],"mappings":"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"}
384
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/services/figshare-v2/assets.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@researchdatabox/redbox-core",
3
- "version": "5.0.1-beta.11285",
3
+ "version": "5.0.1",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -27,10 +27,10 @@
27
27
  "@apidevtools/swagger-parser": "12.1.0",
28
28
  "@aws-sdk/s3-request-presigner": "3.1092.0",
29
29
  "@opentelemetry/api": "1.9.1",
30
- "@researchdatabox/agenda-sqs-backend": "5.0.1-beta.11285",
31
- "@researchdatabox/raido-openapi-generated-node": "5.0.1-beta.11285",
32
- "@researchdatabox/rva-registry-openapi-generated-node": "5.0.1-beta.11285",
33
- "@researchdatabox/sails-ng-common": "5.0.1-beta.11285",
30
+ "@researchdatabox/agenda-sqs-backend": "5.0.1",
31
+ "@researchdatabox/raido-openapi-generated-node": "5.0.1",
32
+ "@researchdatabox/rva-registry-openapi-generated-node": "5.0.1",
33
+ "@researchdatabox/sails-ng-common": "5.0.1",
34
34
  "@tus/file-store": "2.1.0",
35
35
  "@tus/s3-store": "2.0.4",
36
36
  "@tus/server": "2.4.1",
@@ -74,7 +74,7 @@
74
74
  "mongodb": "7.5.0",
75
75
  "node-cache": "5.1.2",
76
76
  "node-schedule": "2.1.1",
77
- "nodemailer": "9.0.3",
77
+ "nodemailer": "9.1.1",
78
78
  "numeral": "2.0.6",
79
79
  "oni-ocfl": "npm:@researchdatabox/oni-ocfl@1.4.0",
80
80
  "openid-client": "6.8.4",