");
@@ -208,7 +209,7 @@ function renderFile(entity: FNote | FAttachment, type: string, $renderedContent:
$renderedContent.append($content);
}
-async function renderMermaid(note: FNote, $renderedContent: JQuery) {
+async function renderMermaid(note: FNote | FAttachment, $renderedContent: JQuery) {
await libraryLoader.requireLibrary(libraryLoader.MERMAID);
const blob = await note.getBlob();
diff --git a/src/public/app/services/link.ts b/src/public/app/services/link.ts
index 472f7d37a..9b3c779bb 100644
--- a/src/public/app/services/link.ts
+++ b/src/public/app/services/link.ts
@@ -70,7 +70,7 @@ interface CreateLinkOptions {
viewScope?: ViewScope;
}
-async function createLink(notePath: string, options: CreateLinkOptions = {}) {
+async function createLink(notePath: string | undefined, options: CreateLinkOptions = {}) {
if (!notePath || !notePath.trim()) {
logError("Missing note path");
diff --git a/src/public/app/services/load_results.ts b/src/public/app/services/load_results.ts
index 25f3b30ec..eabbcfc74 100644
--- a/src/public/app/services/load_results.ts
+++ b/src/public/app/services/load_results.ts
@@ -1,4 +1,4 @@
-import type { TaskRow } from "../../../becca/entities/rows.js";
+import type { TaskRow, AttachmentRow } from "../../../becca/entities/rows.js";
import type { AttributeType } from "../entities/fattribute.js";
import type { EntityChange } from "../server_types.js";
@@ -37,8 +37,6 @@ interface ContentNoteIdToComponentIdRow {
componentId: string;
}
-interface AttachmentRow {}
-
interface OptionRow {}
interface NoteReorderingRow {}
diff --git a/src/public/app/widgets/attachment_detail.js b/src/public/app/widgets/attachment_detail.ts
similarity index 92%
rename from src/public/app/widgets/attachment_detail.js
rename to src/public/app/widgets/attachment_detail.ts
index 8aa6b5824..a66ae95a1 100644
--- a/src/public/app/widgets/attachment_detail.js
+++ b/src/public/app/widgets/attachment_detail.ts
@@ -7,6 +7,8 @@ import imageService from "../services/image.js";
import linkService from "../services/link.js";
import contentRenderer from "../services/content_renderer.js";
import toastService from "../services/toast.js";
+import type FAttachment from "../entities/fattachment.js";
+import type { EventData } from "../components/app_context.js";
const TPL = `
`;
export default class AttachmentDetailWidget extends BasicWidget {
- constructor(attachment, isFullDetail) {
+ attachment: FAttachment;
+ attachmentActionsWidget: AttachmentActionsWidget;
+ isFullDetail: boolean;
+ $wrapper!: JQuery;
+
+ constructor(attachment: FAttachment, isFullDetail: boolean) {
super();
this.contentSized();
@@ -140,7 +147,8 @@ export default class AttachmentDetailWidget extends BasicWidget {
this.$wrapper.addClass("scheduled-for-deletion");
const scheduledSinceTimestamp = utils.parseDate(utcDateScheduledForErasureSince)?.getTime();
- const intervalMs = options.getInt("eraseUnusedAttachmentsAfterSeconds") * 1000;
+ // use default value (30 days in seconds) from options_init as fallback, in case getInt returns null
+ const intervalMs = options.getInt("eraseUnusedAttachmentsAfterSeconds") || 2592000 * 1000;
const deletionTimestamp = scheduledSinceTimestamp + intervalMs;
const willBeDeletedInMs = deletionTimestamp - Date.now();
@@ -185,7 +193,7 @@ export default class AttachmentDetailWidget extends BasicWidget {
}
}
- async entitiesReloadedEvent({ loadResults }) {
+ async entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {
const attachmentRow = loadResults.getAttachmentRows().find((att) => att.attachmentId === this.attachment.attachmentId);
if (attachmentRow) {
diff --git a/src/public/app/widgets/buttons/attachments_actions.js b/src/public/app/widgets/buttons/attachments_actions.ts
similarity index 85%
rename from src/public/app/widgets/buttons/attachments_actions.js
rename to src/public/app/widgets/buttons/attachments_actions.ts
index 5ee51b9d9..efacf48fe 100644
--- a/src/public/app/widgets/buttons/attachments_actions.js
+++ b/src/public/app/widgets/buttons/attachments_actions.ts
@@ -8,6 +8,9 @@ import appContext from "../../components/app_context.js";
import openService from "../../services/open.js";
import utils from "../../services/utils.js";
import { Dropdown } from "bootstrap";
+import type attachmentsApiRoute from "../../../../routes/api/attachments.js"
+import type FAttachment from "../../entities/fattachment.js";
+import type AttachmentDetailWidget from "../attachment_detail.js";
const TPL = `
-
+