+
+
+
{t("view-id")}
+
{t("view-id-info")}
+
+
+
{view.viewId}
+
{
+ try {
+ void navigator.clipboard.writeText(view.viewId);
+ new Notice(t("copy-view-id-successful"));
+ } catch (error) {
+ bugReporterManagerInsatance.addToLogs(
+ 221,
+ String(error),
+ "BoardConfigModal.tsx/renderViewSettings/copy-view-id",
+ );
+ new Notice(t("copy-task-title-unsuccessful"));
+ }
+ }} />
+
+
{t("view-name")}
@@ -1282,7 +1308,7 @@ const ConfigModalContent: React.FC
= ({
-
+
@@ -1350,7 +1376,14 @@ const ConfigModalContent: React.FC = ({
-
+
@@ -1365,7 +1398,14 @@ const ConfigModalContent: React.FC
= ({
)}
-
+
);
};
diff --git a/src/modals/BoardsExplorer.ts b/src/modals/BoardsExplorer.ts
index 18449ed9..33a1b33c 100644
--- a/src/modals/BoardsExplorer.ts
+++ b/src/modals/BoardsExplorer.ts
@@ -58,9 +58,9 @@ export class BoardsExplorerModal extends Modal {
text: t("refresh-boards"),
cls: "boardsExplorerScanButton",
});
- scanButton.addEventListener("click", async () => {
+ scanButton.addEventListener("click", () => {
if (!this.isScanning) {
- await this.handleScanBoards(
+ void this.handleScanBoards(
mainContent,
headerSection,
scanButton,
@@ -121,8 +121,8 @@ export class BoardsExplorerModal extends Modal {
cls: "boardsExplorerCard",
});
- card.addEventListener("click", async () => {
- await this.openBoard(boardId, board.filePath);
+ card.addEventListener("click", () => {
+ void this.openBoard(boardId, board.filePath);
this.close();
});
@@ -170,7 +170,7 @@ export class BoardsExplorerModal extends Modal {
});
pathRow.createEl("span", {
- text: "File Path:",
+ text: t("file-path") + " : ",
cls: "boardsExplorerCardRowLabel",
});
@@ -231,57 +231,10 @@ export class BoardsExplorerModal extends Modal {
}
private createLoadingBar(): HTMLElement {
- const container = document.createElement("div");
- container.className = "boardsExplorerLoadingBarContainer";
-
- const style = document.createElement("style");
- style.textContent = `
- .boardsExplorerLoadingBarContainer {
- width: calc(100% + 40px);
- margin: 0 -20px 12px -20px;
- padding: 0 20px;
- overflow: hidden;
- }
-
- .boardsExplorerLoadingBar {
- width: 100%;
- height: 4px;
- background: linear-gradient(
- 90deg,
- #0066cc 0%,
- #0066cc 20%,
- transparent 20%,
- transparent 40%,
- #0066cc 40%,
- #0066cc 60%,
- transparent 60%,
- transparent 80%,
- #0066cc 80%,
- #0066cc 100%
- );
- background-size: 100px 4px;
- animation: boardsExplorerLoadingPendulum 2s ease-in-out infinite;
- border-radius: 2px;
- }
-
- @keyframes boardsExplorerLoadingPendulum {
- 0% {
- background-position: -100px 0;
- }
- 50% {
- background-position: calc(100% + 100px) 0;
- }
- 100% {
- background-position: -100px 0;
- }
- }
- `;
-
- container.appendChild(style);
-
- const bar = document.createElement("div");
- bar.className = "boardsExplorerLoadingBar";
-
+ const container = activeDocument.createElement("div");
+ container.addClass("boardsExplorerLoadingBarContainer");
+ const bar = activeDocument.createElement("div");
+ bar.addClass("boardsExplorerLoadingBar");
container.appendChild(bar);
return container;
diff --git a/src/modals/BugReporterModal.ts b/src/modals/BugReporterModal.ts
index d00dc232..67c85a46 100644
--- a/src/modals/BugReporterModal.ts
+++ b/src/modals/BugReporterModal.ts
@@ -120,9 +120,9 @@ export class BugReporterModal extends Modal {
}
async sanitizeBugReportContent(
- message: String,
- bugContent: String,
- context: String,
+ message: string,
+ bugContent: string,
+ context: string,
) {
// Sanitize the bug report content to prevent XSS attacks
let sanitizedErrorContent = bugContent;
@@ -189,7 +189,7 @@ export class BugReporterModal extends Modal {
handleCopyBtnEvent(bugReportContent: string) {
// Copy the bug report content to clipboard
- navigator.clipboard.writeText(bugReportContent).then(() => {
+ void navigator.clipboard.writeText(bugReportContent).then(() => {
new Notice(t("copied-to-clipboard"));
});
}
diff --git a/src/modals/ConfigureColumnSortingModal.ts b/src/modals/ConfigureColumnSortingModal.ts
index 6789aa0f..7899df8b 100644
--- a/src/modals/ConfigureColumnSortingModal.ts
+++ b/src/modals/ConfigureColumnSortingModal.ts
@@ -31,9 +31,10 @@ export class ConfigureColumnSortingModal extends Modal {
// Deep-copy columnConfiguration to avoid mutating caller's object (avoid stale/unsaved changes)
// This ensures that edits in the modal don't affect the original object until Save is clicked
try {
- this.columnConfiguration = JSON.parse(
+ const parsedData: unknown = JSON.parse(
JSON.stringify(columnConfiguration),
);
+ this.columnConfiguration = parsedData as ColumnData;
} catch (e) {
// Fallback to shallow copy if stringify fails
this.columnConfiguration = { ...columnConfiguration };
@@ -95,7 +96,7 @@ export class ConfigureColumnSortingModal extends Modal {
forceFallback: true,
fallbackClass: "task-board-sortable-fallback",
easing: "cubic-bezier(1, 0, 0, 1)",
- onSort: async () => {
+ onSort: () => {
// Use stable uid attributes on DOM rows to determine new order
const uidsInDom = Array.from(sortingCriteriaList.children).map(
(child) => child.getAttribute("data-uid"),
@@ -104,7 +105,7 @@ export class ConfigureColumnSortingModal extends Modal {
const newOrder: ColumnData["sortCriteria"] = [];
uidsInDom.forEach((uid, idx) => {
if (!uid) return;
- const found = existing.find((c) => (c as any).uid === uid);
+ const found = existing.find((c) => c.uid === uid);
if (found) {
found.priority = idx + 1;
newOrder.push(found);
@@ -129,7 +130,7 @@ export class ConfigureColumnSortingModal extends Modal {
cls: "configureColumnSortingModalHomeSortingCriteriaListItemRow",
attr: {
"data-criteria-name": sortCriteria.criteria,
- "data-uid": (sortCriteria as any).uid,
+ "data-uid": sortCriteria.uid,
},
});
@@ -257,7 +258,7 @@ export class ConfigureColumnSortingModal extends Modal {
})
.addButton((del) =>
del
- .setButtonText("delete")
+ .setButtonText(t("delete"))
.setIcon("trash")
.setClass(
"configureColumnSortingModalHomeSortingCriteriaListItemDeleteCriterion",
@@ -301,7 +302,7 @@ export class ConfigureColumnSortingModal extends Modal {
text: t("add-new-sorting-criterion"),
cls: "configureColumnSortingModalHomeAddSortingBtn",
});
- addNewSortingButton.addEventListener("click", async () => {
+ addNewSortingButton.addEventListener("click", () => {
if (
this.columnConfiguration.sortCriteria?.some(
(c) => c.criteria === "manualOrder",
diff --git a/src/modals/CustomStatusConfigurator.ts b/src/modals/CustomStatusConfigurator.ts
index 51b93409..e9d46241 100644
--- a/src/modals/CustomStatusConfigurator.ts
+++ b/src/modals/CustomStatusConfigurator.ts
@@ -3,14 +3,14 @@ import { Modal, Setting, TextComponent } from "obsidian";
import type { Plugin } from "obsidian";
import { statusTypeNames } from "../interfaces/Enums.js";
import { CustomStatus } from "../interfaces/GlobalSettings.js";
-import { StatusType, StatusConfiguration } from "../interfaces/StatusConfiguration.js";
+import { StatusConfiguration } from "../interfaces/StatusConfiguration.js";
export class CustomStatusModal extends Modal {
statusSymbol: string;
statusName: string;
statusNextSymbol: string;
statusAvailableAsCommand: boolean;
- type: StatusType;
+ type: statusTypeNames;
saved: boolean = false;
error: boolean = false;
@@ -21,14 +21,14 @@ export class CustomStatusModal extends Modal {
isCoreStatus: boolean,
) {
super(plugin.app);
- const status = statusType as any;
+ let status = statusType;
this.statusSymbol = status.symbol;
this.statusName = status.name;
this.statusNextSymbol = status.nextStatusSymbol;
this.statusAvailableAsCommand = status.availableAsCommand;
- // Ensure type is a valid StatusType enum value
+ // Ensure type is a valid statusTypeNames enum value
if (typeof status.type === "string") {
- this.type = status.type as StatusType;
+ this.type = status.type;
} else {
this.type = status.type;
}
@@ -57,12 +57,10 @@ export class CustomStatusModal extends Modal {
const settingDiv = contentEl.createDiv();
//const title = this.title ?? '...';
- let statusSymbolText: TextComponent;
new Setting(settingDiv)
.setName(t("task-status-symbol"))
.setDesc(t("task-status-symbol-info"))
.addText((text) => {
- statusSymbolText = text;
text.setValue(this.statusSymbol).onChange((v) => {
this.statusSymbol = v;
});
@@ -72,12 +70,10 @@ export class CustomStatusModal extends Modal {
// Show any error if the initial value loaded is incorrect.
});
- let statusNameText: TextComponent;
new Setting(settingDiv)
.setName(t("task-status-name"))
.setDesc(t("task-status-name-info"))
.addText((text) => {
- statusNameText = text;
text.setValue(this.statusName).onChange((v) => {
this.statusName = v;
});
@@ -100,17 +96,15 @@ export class CustomStatusModal extends Modal {
dropdown.addOption(s, s);
});
dropdown.setValue(this.type).onChange((v) => {
- this.type = v as StatusType;
+ this.type = v as statusTypeNames;
});
});
- let statusNextSymbolText: TextComponent;
new Setting(settingDiv)
.setName(t("cycle-to-following-status"))
.setDesc(t("cycle-to-following-status-info"))
.addText((text) => {
- text.setPlaceholder("eg.: /");
- statusNextSymbolText = text;
+ text.setPlaceholder("Eg.: /");
text.setValue(this.statusNextSymbol).onChange((v) => {
this.statusNextSymbol = v;
});
@@ -145,7 +139,7 @@ export class CustomStatusModal extends Modal {
// titleSpan.prepend(iconEl);
// }
onOpen() {
- this.display();
+ void this.display();
}
static setValidationError(textInput: TextComponent) {
diff --git a/src/modals/DiffContentCompareModal.ts b/src/modals/DiffContentCompareModal.ts
index d8a56ca5..3e2ab307 100644
--- a/src/modals/DiffContentCompareModal.ts
+++ b/src/modals/DiffContentCompareModal.ts
@@ -2,6 +2,7 @@
import { Modal, ButtonComponent } from "obsidian";
import TaskBoard from "../../main.js";
+import { t } from "i18next";
export type DiffSelection = "old" | "new";
@@ -33,13 +34,13 @@ export class DiffContentCompareModal extends Modal {
"data-type",
"task-board-diff-content-compare",
);
- this.setTitle("Task Board Safe Guard");
+ this.setTitle(t("task-board-safe-guard"));
contentEl.classList.add("taskboard-diff-content-compare-modal");
contentEl.createEl("h2", { text: "Content mismatch detected" });
contentEl.createEl("p", {
- text: "Looks like the task content in your file is a little different from the content you just edited through Task Board. Choose which version of content you would like to keep:",
+ text: "Looks like the task content in your file is a little different from the content you just edited through task board. Choose which version of content you would like to keep:",
});
const comparisonContainer = contentEl.createDiv({
@@ -53,13 +54,18 @@ export class DiffContentCompareModal extends Modal {
const newContentDiv = rightDiv.createDiv({
cls: "taskboard-diff-content-compare-modal-content",
});
- newContentDiv.insertAdjacentHTML(
- "beforeend",
- this.getHighlightedDiff(
- this.cachedTaskContent,
- this.taskContentFromFile,
- "left",
- ),
+ // newContentDiv.insertAdjacentHTML(
+ // "beforeend",
+ // this.getHighlightedDiff(
+ // this.cachedTaskContent,
+ // this.taskContentFromFile,
+ // "left",
+ // ),
+ // );
+ newContentDiv.textContent = this.getHighlightedDiff(
+ this.cachedTaskContent,
+ this.taskContentFromFile,
+ "left",
);
new ButtonComponent(rightDiv)
.setButtonText("Keep this as it is")
@@ -76,13 +82,18 @@ export class DiffContentCompareModal extends Modal {
const oldContentDiv = leftDiv.createDiv({
cls: "taskboard-diff-content-compare-modal-content",
});
- oldContentDiv.insertAdjacentHTML(
- "beforeend",
- this.getHighlightedDiff(
- this.cachedTaskContent,
- this.EditedTaskContent,
- "right",
- ),
+ // oldContentDiv.insertAdjacentHTML(
+ // "beforeend",
+ // this.getHighlightedDiff(
+ // this.cachedTaskContent,
+ // this.EditedTaskContent,
+ // "right",
+ // ),
+ // );
+ oldContentDiv.textContent = this.getHighlightedDiff(
+ this.cachedTaskContent,
+ this.EditedTaskContent,
+ "right",
);
new ButtonComponent(leftDiv)
.setButtonText("Use this")
@@ -93,9 +104,10 @@ export class DiffContentCompareModal extends Modal {
});
const noteOnSetting = contentEl.createEl("p", {
+ // eslint-disable-next-line obsidianmd/ui/sentence-case
text: "NOTE : If you think this safe guard modal shown is irrelevant and its also popping-up too many times, you can by-pass it and disable this from the settings under the 'general' tab.",
});
- noteOnSetting.style.color = "red";
+ noteOnSetting.addClass("tb_color_white");
const infoDiv = contentEl.createDiv({
cls: "taskboard-diff-content-compare-modal-info",
@@ -108,10 +120,10 @@ export class DiffContentCompareModal extends Modal {
text: "Green highlighted content indicates the characters which are different by comparing the content you just now edited and the content from the task-board-cache..",
});
ul.createEl("li", {
- text: "Select the version of content you want Task Board to write in your note.",
+ text: "Select the version of content you want task board to write in your note.",
});
ul.createEl("li", {
- text: "If the content shown on left-side is completely different from the content of the task you just edited. This probably means that, Task Board couldnt able to find the task you just edited through its cache inside the current file at the particular line. Either some other plugin updated the content or during sync the content was tempered. Use the abort button below to close this modal, to avoid updating any data. And scan the file using file-menu option or update the task manually.",
+ text: "If the content shown on left-side is completely different from the content of the task you just edited. This probably means that, task board couldnt able to find the task you just edited through its cache inside the current file at the particular line. Either some other plugin updated the content or during sync the content was tempered. Use the abort button below to close this modal, to avoid updating any data. And scan the file using file-menu option or update the task manually.",
});
});
@@ -127,7 +139,7 @@ export class DiffContentCompareModal extends Modal {
contentEl.createEl("hr");
- contentEl.createEl("h2", { text: "Debug Info" });
+ contentEl.createEl("h2", { text: "Debug info" });
contentEl.createEl("p", {
text: "Here is why this modal was shown in the first place. If you think this modal shown was unnecessary and if possible kindly share this information with the developer to improve the plugin.",
});
@@ -146,37 +158,48 @@ export class DiffContentCompareModal extends Modal {
debuInfoComparisonContainerLefttDiv.createDiv({
cls: "taskboard-diff-content-compare-modal-content",
});
- debuInfoComparisonContainerLefttDivContent.insertAdjacentHTML(
- "beforeend",
+ // debuInfoComparisonContainerLefttDivContent.insertAdjacentHTML(
+ // "beforeend",
+ // this.getHighlightedDiff(
+ // this.cachedTaskContent,
+ // this.taskContentFromFile,
+ // "left",
+ // ),
+ // );
+ debuInfoComparisonContainerLefttDivContent.textContent =
this.getHighlightedDiff(
this.cachedTaskContent,
this.taskContentFromFile,
"left",
- ),
- );
-
+ );
const debuInfoComparisonContainerRightDiv =
debuInfoComparisonContainer.createDiv({
cls: "taskboard-diff-content-compare-modal-side",
});
debuInfoComparisonContainerRightDiv.createEl("h3", {
- text: "Task Board Cache",
+ text: t("task-board-cache"),
});
const debuInfoComparisonContainerRightDivContent =
debuInfoComparisonContainerRightDiv.createDiv({
cls: "taskboard-diff-content-compare-modal-content",
});
- debuInfoComparisonContainerRightDivContent.insertAdjacentHTML(
- "beforeend",
+ // debuInfoComparisonContainerRightDivContent.insertAdjacentHTML(
+ // "beforeend",
+ // this.getHighlightedDiff(
+ // this.taskContentFromFile,
+ // this.cachedTaskContent,
+ // "right",
+ // ),
+ // );
+ debuInfoComparisonContainerRightDivContent.textContent =
this.getHighlightedDiff(
this.taskContentFromFile,
this.cachedTaskContent,
"right",
- ),
- );
+ );
contentEl.createEl("p", {
- text: "This 'Debug info' section is just provided to find out whether the Safe Guard genuinely captured the difference correctly or whether this was a false alarm. Will remove this section in the future, if this safe guard feature is working as expected.",
+ text: "This 'debug info' section is just provided to find out whether the safe guard genuinely captured the difference correctly or whether this was a false alarm. Will remove this section in the future, if this safe guard feature is working as expected.",
});
}
@@ -264,7 +287,7 @@ export class DiffContentCompareModal extends Modal {
.replace(/&/g, "&")
.replace(//g, ">")
- .replace(/\"/g, """)
+ .replace(/"/g, """)
.replace(/'/g, "'");
}
}
diff --git a/src/modals/EditTagsModal.ts b/src/modals/EditTagsModal.ts
index 96519682..fc761a3c 100644
--- a/src/modals/EditTagsModal.ts
+++ b/src/modals/EditTagsModal.ts
@@ -1,93 +1,112 @@
-import { Modal } from 'obsidian';
-import TaskBoard from '../../main.js';
+import { Modal } from "obsidian";
+import TaskBoard from "../../main.js";
+import { MultiSuggest } from "../services/MultiSuggest.js";
export default class EditTagsModal extends Modal {
- plugin: TaskBoard;
- initialTags: string[];
- onSave: (tags: string[]) => void;
-
- private tagsContainer: HTMLElement | null = null;
- private inputEl: HTMLInputElement | null = null;
-
- constructor(plugin: TaskBoard, initialTags: string[], onSave: (tags: string[]) => void) {
- super(plugin.app);
- this.plugin = plugin;
- this.initialTags = initialTags || [];
- this.onSave = onSave;
- }
-
- onOpen() {
- const { contentEl } = this;
- contentEl.empty();
- contentEl.addClass('task-board-edit-tags-modal');
-
- const title = contentEl.createEl('h3', { text: 'Edit tags' });
- this.tagsContainer = contentEl.createDiv({ cls: 'tags-container' });
-
- const inputWrap = contentEl.createDiv({ cls: 'tag-input-wrap' });
- this.inputEl = inputWrap.createEl('input', { type: 'text' }) as HTMLInputElement;
- this.inputEl.placeholder = 'Type to add tag and press Enter (use #prefix optional)';
-
- const info = contentEl.createEl('div', { text: 'Existing tags:' });
-
- // Render initial tags as capsules
- this.initialTags.forEach(t => this.addTagPill(t));
-
- // MultiSuggest for tag suggestions (best-effort)
- try {
- // @ts-ignore - MultiSuggest is available globally in project
- const suggestionContent = this.plugin.settings.data.tagColors?.map(tc => tc.name) || [];
- // @ts-ignore
- new (window as any).MultiSuggest(this.inputEl, new Set(suggestionContent), (choice: string) => {
- this.handleAddTag(choice);
- }, this.plugin.app);
- } catch (error) {
- // ignore if MultiSuggest not available in this scope
- }
-
- this.inputEl.addEventListener('keydown', (ev) => {
- if (ev.key === 'Enter') {
- ev.preventDefault();
- const v = this.inputEl!.value.trim();
- if (v) this.handleAddTag(v);
- this.inputEl!.value = '';
- }
- });
-
- const footer = contentEl.createDiv({ cls: 'modal-footer' });
- const saveBtn = footer.createEl('button', { text: 'Save' });
- saveBtn.addEventListener('click', () => {
- const tags = Array.from(this.tagsContainer!.querySelectorAll('.tag-pill')).map((el: any) => el.getAttribute('data-tag'));
- this.onSave(tags);
- this.close();
- });
-
- const cancelBtn = footer.createEl('button', { text: 'Cancel' });
- cancelBtn.addEventListener('click', () => this.close());
- }
-
- addTagPill(tag: string) {
- if (!this.tagsContainer) return;
- const normalized = tag.startsWith('#') ? tag : `#${tag}`;
- // avoid duplicates
- const exists = Array.from(this.tagsContainer.querySelectorAll('.tag-pill')).some((el: any) => el.getAttribute('data-tag') === normalized);
- if (exists) return;
- const pill = this.tagsContainer.createDiv({ cls: 'tag-pill' });
- pill.setAttr('data-tag', normalized);
- pill.createSpan({ text: normalized });
- const removeBtn = pill.createEl('button', { text: '✕' });
- removeBtn.addEventListener('click', () => pill.remove());
- }
-
- handleAddTag(tag: string) {
- if (!this.tagsContainer) return;
- const t = tag.trim();
- if (!t) return;
- this.addTagPill(t);
- }
-
- onClose() {
- const { contentEl } = this;
- contentEl.empty();
- }
+ plugin: TaskBoard;
+ initialTags: string[];
+ onSave: (tags: string[]) => void;
+
+ private tagsContainer: HTMLElement | null = null;
+ private inputEl: HTMLInputElement | null = null;
+
+ constructor(
+ plugin: TaskBoard,
+ initialTags: string[],
+ onSave: (tags: string[]) => void,
+ ) {
+ super(plugin.app);
+ this.plugin = plugin;
+ this.initialTags = initialTags || [];
+ this.onSave = onSave;
+ }
+
+ onOpen() {
+ const { contentEl } = this;
+ contentEl.empty();
+ contentEl.addClass("task-board-edit-tags-modal");
+
+ const title = contentEl.createEl("h3", { text: "Edit tags" });
+ this.tagsContainer = contentEl.createDiv({ cls: "tags-container" });
+
+ const inputWrap = contentEl.createDiv({ cls: "tag-input-wrap" });
+ this.inputEl = inputWrap.createEl("input", { type: "text" });
+ this.inputEl.placeholder = "Hit enter key after typing the tag";
+
+ const info = contentEl.createEl("div", { text: "Existing tags:" });
+
+ // Render initial tags as capsules
+ this.initialTags.forEach((t) => this.addTagPill(t));
+
+ // MultiSuggest for tag suggestions (best-effort)
+ try {
+ // @ts-ignore - MultiSuggest is available globally in project
+ const suggestionContent =
+ this.plugin.settings.data.tagColors?.map((tc) => tc.name) || [];
+ // @ts-ignore
+ new MultiSuggest(
+ this.inputEl,
+ new Set(suggestionContent),
+ (choice: string) => {
+ this.handleAddTag(choice);
+ },
+ this.plugin.app,
+ );
+ } catch (error) {
+ // ignore if MultiSuggest not available in this scope
+ }
+
+ this.inputEl.addEventListener("keydown", (ev) => {
+ if (ev.key === "Enter") {
+ ev.preventDefault();
+ const v = this.inputEl!.value.trim();
+ if (v) this.handleAddTag(v);
+ this.inputEl!.value = "";
+ }
+ });
+
+ const footer = contentEl.createDiv({ cls: "modal-footer" });
+ const saveBtn = footer.createEl("button", { text: "Save" });
+ saveBtn.addEventListener("click", () => {
+ const tags = Array.from(
+ this.tagsContainer!.querySelectorAll(".tag-pill"),
+ ).map((el: Element) => el.getAttribute("data-tag"));
+
+ const validTags = tags.filter(
+ (tag: unknown) => typeof tag === "string",
+ );
+ this.onSave(validTags);
+ this.close();
+ });
+
+ const cancelBtn = footer.createEl("button", { text: "Cancel" });
+ cancelBtn.addEventListener("click", () => this.close());
+ }
+
+ addTagPill(tag: string) {
+ if (!this.tagsContainer) return;
+ const normalized = tag.startsWith("#") ? tag : `#${tag}`;
+ // avoid duplicates
+ const exists = Array.from(
+ this.tagsContainer.querySelectorAll(".tag-pill"),
+ ).some((el: Element) => el.getAttribute("data-tag") === normalized);
+ if (exists) return;
+ const pill = this.tagsContainer.createDiv({ cls: "tag-pill" });
+ pill.setAttr("data-tag", normalized);
+ pill.createSpan({ text: normalized });
+ const removeBtn = pill.createEl("button", { text: "✕" });
+ removeBtn.addEventListener("click", () => pill.remove());
+ }
+
+ handleAddTag(tag: string) {
+ if (!this.tagsContainer) return;
+ const t = tag.trim();
+ if (!t) return;
+ this.addTagPill(t);
+ }
+
+ onClose() {
+ const { contentEl } = this;
+ contentEl.empty();
+ }
}
diff --git a/src/modals/MergeBoardsModal.ts b/src/modals/MergeBoardsModal.ts
index c4692819..c4861648 100644
--- a/src/modals/MergeBoardsModal.ts
+++ b/src/modals/MergeBoardsModal.ts
@@ -1,6 +1,6 @@
import { App, Modal, Setting, Notice, TFile, setIcon } from "obsidian";
import TaskBoard from "../../main.js";
-import { Board } from "../interfaces/BoardConfigs.js";
+import { AdvancedFilter, Board } from "../interfaces/BoardConfigs.js";
import TaskBoardFileManager from "../managers/TaskBoardFileManager.js";
import { MultiSuggest } from "../services/MultiSuggest.js";
import { generateRandomStringId } from "../utils/TaskItemUtils.js";
@@ -141,9 +141,11 @@ export class MergeBoardsModal extends Modal {
const actions = modalContent.createDiv({
cls: "mergeBoardsModalActions",
});
- this.mergeButton = actions.createEl("button", { text: "Merge Boards" });
+ this.mergeButton = actions.createEl("button", {
+ text: t("merge-boards"),
+ });
this.mergeButton.addEventListener("click", () => {
- this.handleMerge();
+ void this.handleMerge();
});
// Cancel Button
@@ -227,7 +229,7 @@ export class MergeBoardsModal extends Modal {
// Re-enable button
if (this.mergeButton) {
this.mergeButton.disabled = false;
- this.mergeButton.textContent = "Merge Boards";
+ this.mergeButton.textContent = t("merge-boards");
}
}
}
@@ -236,18 +238,6 @@ export class MergeBoardsModal extends Modal {
// Generate new ID
const newId = generateRandomStringId("board");
- // Combine filterConfig
- const combinedFilterConfig = {
- enableSavedFilters:
- board1.filterConfig?.enableSavedFilters ||
- board2.filterConfig?.enableSavedFilters ||
- false,
- savedConfigs: [
- ...(board1.filterConfig?.savedConfigs || []),
- ...(board2.filterConfig?.savedConfigs || []),
- ],
- };
-
// Combine views
const combinedViews = [...board1.views, ...board2.views];
@@ -257,7 +247,6 @@ export class MergeBoardsModal extends Modal {
revision: board1?.revision ?? CURRENT_REVISION,
name: this.newBoardName,
description: board1.description,
- filterConfig: combinedFilterConfig,
views: combinedViews,
// lastViewId: board1.lastViewId, // Use from first board
lastViewIndex: 0,
diff --git a/src/modals/ModifiedFilesModal.ts b/src/modals/ModifiedFilesModal.ts
index 5c3de16b..0fcf4c21 100644
--- a/src/modals/ModifiedFilesModal.ts
+++ b/src/modals/ModifiedFilesModal.ts
@@ -109,6 +109,7 @@ export class ModifiedFilesModal extends Modal {
cls: "deletedFilesSectionHeader",
});
sectionContainer.createEl("p", {
+ // eslint-disable-next-line obsidianmd/ui/sentence-case
text: "NOTE : Renamed files are little difficult to find. So if you see a lot of files here, it will be good idea to run the vault scan to re-build the cache.",
});
diff --git a/src/modals/ScanFilterModal.ts b/src/modals/ScanFilterModal.ts
index 84feebd3..3938bc3f 100644
--- a/src/modals/ScanFilterModal.ts
+++ b/src/modals/ScanFilterModal.ts
@@ -115,7 +115,7 @@ export class ScanFilterModal extends Modal {
}
this.selectedValues.forEach((value) => {
- const itemEl = listEl!.createDiv("scan-filter-item");
+ const itemEl = listEl.createDiv("scan-filter-item");
itemEl.setText(value);
const removeBtn = itemEl.createEl("button", {
text: "Remove",
diff --git a/src/modals/ScanVaultModal.tsx b/src/modals/ScanVaultModal.tsx
index 8884037b..e859abb6 100644
--- a/src/modals/ScanVaultModal.tsx
+++ b/src/modals/ScanVaultModal.tsx
@@ -21,7 +21,7 @@ export const findMaxIdCounterAndUpdateSettings = (plugin: TaskBoard) => {
// Check Pending tasks
Object.values(plugin.vaultScanner.tasksCache.Pending).forEach((tasks) => {
tasks.forEach((task) => {
- const taskIdNum = task.legacyId ? parseInt(task.legacyId as unknown as string, 10) : 0;
+ const taskIdNum = task.legacyId ? parseInt(task.legacyId, 10) : 0;
if (!isNaN(taskIdNum) && taskIdNum > maxId) {
maxId = taskIdNum;
}
@@ -31,7 +31,7 @@ export const findMaxIdCounterAndUpdateSettings = (plugin: TaskBoard) => {
// Check Completed tasks
Object.values(plugin.vaultScanner.tasksCache.Completed).forEach((tasks) => {
tasks.forEach((task) => {
- const taskIdNum = task.legacyId ? parseInt(task.legacyId as unknown as string, 10) : 0;
+ const taskIdNum = task.legacyId ? parseInt(task.legacyId, 10) : 0;
if (!isNaN(taskIdNum) && taskIdNum > maxId) {
maxId = taskIdNum;
}
@@ -40,7 +40,7 @@ export const findMaxIdCounterAndUpdateSettings = (plugin: TaskBoard) => {
// Update the uniqueIdCounter in settings to be one more than the max found ID
plugin.settings.data.uniqueIdCounter = maxId + 1;
- plugin.saveSettings();
+ void plugin.saveSettings();
}
const ScanVaultModalContent: React.FC<{ app: App, plugin: TaskBoard, vaultScanner: VaultScanner }> = ({ app, plugin, vaultScanner }) => {
@@ -97,8 +97,8 @@ const ScanVaultModalContent: React.FC<{ app: App, plugin: TaskBoard, vaultScanne
findMaxIdCounterAndUpdateSettings(plugin);
// If mandatory scan, close all existing Task Board views to force re-opening with the newly scanned data. Else, just emit REFRESH_BOARD event to update the existing board(s) with the newly scanned data.
- if (localStorage.getItem(MANDATORY_SCAN_KEY) === "true") {
- localStorage.setItem(MANDATORY_SCAN_KEY, "false");
+ if (plugin.app.loadLocalStorage(MANDATORY_SCAN_KEY) === "true") {
+ plugin.app.saveLocalStorage(MANDATORY_SCAN_KEY, "false");
plugin.app.workspace.getLeavesOfType(VIEW_TYPE_TASKBOARD).forEach((leaf) => {
leaf.detach();
});
@@ -115,7 +115,8 @@ const ScanVaultModalContent: React.FC<{ app: App, plugin: TaskBoard, vaultScanne
const componentRef = useRef
(null);
useEffect(() => {
// Initialize Obsidian Component on mount
- componentRef.current = plugin.view;
+ // componentRef.current = plugin.view;
+ componentRef.current = new Component();
}, []);
const taskRendererRef = useRef<{ [key: string]: HTMLDivElement | null }>({});
@@ -135,7 +136,7 @@ const ScanVaultModalContent: React.FC<{ app: App, plugin: TaskBoard, vaultScanne
priority: task.priority,
};
- getFormattedTaskContent(newTaskContent).then((formatedContent) => {
+ void getFormattedTaskContent(newTaskContent).then((formatedContent) => {
const uniqueKey = `${filePath}-task-${taskIndex}`;
const descElement = taskRendererRef.current[uniqueKey];
@@ -143,7 +144,7 @@ const ScanVaultModalContent: React.FC<{ app: App, plugin: TaskBoard, vaultScanne
if (descElement && formatedContent !== "") {
descElement.empty();
// Render task description using MarkdownUIRenderer
- MarkdownUIRenderer.renderTaskDisc(
+ void MarkdownUIRenderer.strictRender(
app,
formatedContent,
descElement,
@@ -160,7 +161,7 @@ const ScanVaultModalContent: React.FC<{ app: App, plugin: TaskBoard, vaultScanne
return (
{t("vault-scanner")}
- {localStorage.getItem(MANDATORY_SCAN_KEY) === "true" ?
+ {plugin.app.loadLocalStorage(MANDATORY_SCAN_KEY) === "true" ?
(<>
{t("scan-vault-from-the-vault-upgrade-message-1")} {CURRENT_PLUGIN_VERSION}
{t("scan-vault-from-the-vault-upgrade-message-2")}
@@ -178,7 +179,7 @@ const ScanVaultModalContent: React.FC<{ app: App, plugin: TaskBoard, vaultScanne
-
@@ -200,7 +201,7 @@ const ScanVaultModalContent: React.FC<{ app: App, plugin: TaskBoard, vaultScanne
{filePath}
- {collectedTasks.Pending[filePath].map((task: any, taskIndex: number) => {
+ {collectedTasks.Pending[filePath].map((task: unknown, taskIndex: number) => {
const uniqueKey = `${filePath}-task-${taskIndex}`;
return (
diff --git a/src/modals/SwimlanesConfigModal.tsx b/src/modals/SwimlanesConfigModal.tsx
index beae984a..2f651f1d 100644
--- a/src/modals/SwimlanesConfigModal.tsx
+++ b/src/modals/SwimlanesConfigModal.tsx
@@ -32,7 +32,7 @@ export class SwimlanesConfigModal extends Modal {
private customSortOrder: { value: string; index: number }[];
private maxHeight: string;
private groupAllRest: boolean;
- private headerUIType: string;
+ private headerUIType: HeaderUITypeOptions;
private sortableInstance: Sortable | null = null;
private sortableListEl: HTMLElement | null = null;
@@ -498,7 +498,7 @@ export class SwimlanesConfigModal extends Modal {
.addToggle((toggle) =>
toggle
.setValue(this.hideEmptySwimlanes)
- .onChange(async (value) => {
+ .onChange((value) => {
this.hideEmptySwimlanes = value;
this.edited = true;
}),)
@@ -519,9 +519,9 @@ export class SwimlanesConfigModal extends Modal {
});
dropdown
.setValue(this.headerUIType)
- .onChange(async (value) => {
+ .onChange((value) => {
this.headerUIType =
- value;
+ value as HeaderUITypeOptions;
this.edited = true;
})
});
diff --git a/src/modals/TaskBoardActionsModal.ts b/src/modals/TaskBoardActionsModal.ts
index 19b073ff..3b692b69 100644
--- a/src/modals/TaskBoardActionsModal.ts
+++ b/src/modals/TaskBoardActionsModal.ts
@@ -18,7 +18,7 @@ export class TaskBoardActionsModal extends Modal {
super(plugin.app);
this.plugin = plugin;
this.columns = columns;
- this.setTitle("Task Board Actions");
+ this.setTitle("Task board actions");
}
onOpen() {
@@ -30,7 +30,7 @@ export class TaskBoardActionsModal extends Modal {
// Header
const header = contentEl.createDiv({ cls: "taskboard-actions-header" });
- header.createEl("h2", { text: "Active Actions" });
+ header.createEl("h2", { text: "Active actions" });
const addBtn = header.createEl("button", {
text: "Add action",
@@ -44,7 +44,7 @@ export class TaskBoardActionsModal extends Modal {
targetColumn: this.columns[0].name || "",
};
this.plugin.settings.data.actions.push(newAction);
- this.plugin.saveSettings();
+ void this.plugin.saveSettings();
this.refresh();
};
@@ -54,7 +54,7 @@ export class TaskBoardActionsModal extends Modal {
});
const inactiveSection = contentEl.createDiv();
inactiveSection.createEl("h2", {
- text: "Inactive Actions",
+ text: "Inactive actions",
cls: "taskboard-inactive-actions-section",
});
@@ -62,8 +62,7 @@ export class TaskBoardActionsModal extends Modal {
cls: "taskboard-actions-modal-list",
});
- const actions: TaskBoardAction[] =
- this.plugin.settings.data.actions;
+ const actions: TaskBoardAction[] = this.plugin.settings.data.actions;
for (let i = 0; i < actions.length; i++) {
const action = actions[i];
@@ -79,7 +78,7 @@ export class TaskBoardActionsModal extends Modal {
toggle.setValue(action.enabled);
toggle.onChange((val) => {
action.enabled = val;
- this.plugin.saveSettings();
+ void this.plugin.saveSettings();
this.refresh();
});
@@ -90,7 +89,7 @@ export class TaskBoardActionsModal extends Modal {
.setValue(action.trigger)
.onChange((val) => {
action.trigger = val as "Complete" | "Incomplete";
- this.plugin.saveSettings();
+ void this.plugin.saveSettings();
});
new DropdownComponent(container)
@@ -98,7 +97,7 @@ export class TaskBoardActionsModal extends Modal {
.setValue(action.type)
.onChange((val) => {
action.type = val as "move" | "copy";
- this.plugin.saveSettings();
+ void this.plugin.saveSettings();
});
container.createSpan({ text: "the card to" });
@@ -106,24 +105,21 @@ export class TaskBoardActionsModal extends Modal {
new DropdownComponent(container)
.addOptions(
Object.fromEntries(
- this.columns.map((c) => [c.index, c.name || ""])
- )
+ this.columns.map((c) => [c.index, c.name || ""]),
+ ),
)
.setValue(action.targetColumn)
.onChange((val) => {
action.targetColumn = val;
- this.plugin.saveSettings();
+ void this.plugin.saveSettings();
});
new ButtonComponent(container)
.setIcon("trash")
- .setTooltip("Delete Action")
+ .setTooltip("Delete action")
.onClick(() => {
- this.plugin.settings.data.actions.splice(
- i,
- 1
- );
- this.plugin.saveSettings();
+ this.plugin.settings.data.actions.splice(i, 1);
+ void this.plugin.saveSettings();
this.refresh();
});
}
diff --git a/src/modals/TaskEditorModal.tsx b/src/modals/TaskEditorModal.tsx
index 34709d41..44ae2fa1 100644
--- a/src/modals/TaskEditorModal.tsx
+++ b/src/modals/TaskEditorModal.tsx
@@ -25,13 +25,13 @@ export class TaskEditorModal extends Modal {
isEdited: boolean;
isTaskNote: boolean;
activeNote: boolean;
- saveTask: (updatedTask: taskItem, quickAddPluginChoice: string, updatedNoteContent?: string) => void;
+ saveTask: (updatedTask: taskItem, quickAddPluginChoice: string, updatedNoteContent?: string) => Promise
;
public waitForClose: Promise;
private resolvePromise: (input: string) => void = (input: string) => { };
private rejectPromise: (reason?: unknown) => void = (reason?: unknown) => { };
- constructor(plugin: TaskBoard, saveTask: (updatedTask: taskItem, quickAddPluginChoice: string, updatedNoteContent?: string) => void, isTaskNote: boolean, activeNote: boolean, taskExists: boolean, task?: taskItem, filePath?: string) {
+ constructor(plugin: TaskBoard, saveTask: (updatedTask: taskItem, quickAddPluginChoice: string, updatedNoteContent?: string) => Promise, isTaskNote: boolean, activeNote: boolean, taskExists: boolean, task?: taskItem, filePath?: string) {
super(plugin.app);
this.plugin = plugin;
this.filePath = filePath ? filePath : "";
@@ -106,7 +106,7 @@ export class TaskEditorModal extends Modal {
this.isEdited = false;
const formattedContent = await getFormattedTaskContent(updatedTask);
this.resolvePromise(formattedContent);
- this.saveTask(updatedTask, quickAddPluginChoice, updatedNoteContent);
+ void this.saveTask(updatedTask, quickAddPluginChoice, updatedNoteContent);
this.close();
}}
onClose={() => this.close()}
@@ -142,7 +142,6 @@ export class TaskEditorModal extends Modal {
this.handleCloseAttempt();
} else {
this.modalEl.addClass("slide-out");
- sleep(300);
this.resolvePromise("");
this.onClose();
super.close();
diff --git a/src/modals/TextInputModal.ts b/src/modals/TextInputModal.ts
index d8edc03d..81041024 100644
--- a/src/modals/TextInputModal.ts
+++ b/src/modals/TextInputModal.ts
@@ -47,7 +47,7 @@ export class TextInputModal extends Modal {
});
// Focus the input
- setTimeout(() => {
+ window.setTimeout(() => {
this.inputEl.focus();
this.inputEl.select();
}, 100);
diff --git a/src/modals/date_picker/DatePickerComponent.ts b/src/modals/date_picker/DatePickerComponent.ts
index 1649ae4c..93d5092e 100644
--- a/src/modals/date_picker/DatePickerComponent.ts
+++ b/src/modals/date_picker/DatePickerComponent.ts
@@ -221,7 +221,7 @@ export class DatePickerComponent extends Component {
});
// Month/Year display
- const monthYear = header.createDiv({
+ header.createDiv({
cls: "calendar-month-year",
text: format(currentDate, "MMMM yyyy"),
});
diff --git a/src/obsidian_views/Archived_TaskBoardView_TextFileView.tsx b/src/obsidian_views/Archived_TaskBoardView_TextFileView.tsx
deleted file mode 100644
index 933cb12d..00000000
--- a/src/obsidian_views/Archived_TaskBoardView_TextFileView.tsx
+++ /dev/null
@@ -1,421 +0,0 @@
-// src/views/TaskBoardView.tsx
-
-import { TextFileView, Platform, WorkspaceLeaf, ViewStateResult, Notice, Menu } from "obsidian";
-import { Root, createRoot } from "react-dom/client";
-import { StrictMode } from "react";
-import { t } from "i18next";
-import TaskBoard from "../../main.js";
-import TaskBoardViewContainer from "../components/TaskBoardViewContainer.js";
-import { Board, DEFAULT_BOARD } from "../interfaces/BoardConfigs.js";
-import { VIEW_TYPE_TASKBOARD, PENDING_SCAN_FILE_STACK, MANDATORY_SCAN_KEY } from "../interfaces/Constants.js";
-import { TaskBoardIcon, funnelIcon, ScanVaultIcon, RefreshIcon } from "../interfaces/Icons.js";
-import { bugReporterManagerInsatance } from "../managers/BugReporter.js";
-import { eventEmitter } from "../services/EventEmitter.js";
-import { openScanVaultModal, openBoardsExplorerModal } from "../services/OpenModals.js";
-import { generateRandomStringId } from "../utils/TaskItemUtils.js";
-
-export class TaskBoardView extends TextFileView {
- plugin: TaskBoard;
- leaf: WorkspaceLeaf;
- root: Root | null = null;
- private currentFilePath: string = "";
- boardName: string = "No Board Loaded";
- private currentBoard: Board | null = null;
-
- constructor(plugin: TaskBoard, leaf: WorkspaceLeaf) {
- super(leaf);
- this.leaf = leaf;
- this.app = plugin.app;
- this.plugin = plugin;
- // this.boards = [];
- this.icon = TaskBoardIcon;
- }
-
- getViewType() {
- return VIEW_TYPE_TASKBOARD;
- }
-
- getDisplayText() {
- return this.boardName;
- }
-
- setViewData(data: string): void {
- try {
- const board = JSON.parse(data) as Board;
- this.boardName = board.name || "Unnamed Board";
- this.currentBoard = board;
- if (this.file) {
- this.currentFilePath = this.file.path;
- }
- this.renderBoard(board);
- } catch (error) {
- bugReporterManagerInsatance.showNotice(
- 183,
- `Failed to load board from file: ${this.file?.path}`,
- String(error),
- "TaskBoardView.tsx/setViewData"
- );
- this.renderNoBoard();
- }
- }
-
- getViewData(): string {
- return this.currentBoard ? JSON.stringify(this.currentBoard, null, "\t") : "{}";
- }
-
- clear(): void {
- this.root?.unmount();
- this.root = null;
- const container = this.containerEl.children[1] as HTMLElement;
- if (container) {
- container.empty();
- }
- this.currentBoard = null;
- this.boardName = "No Board Loaded";
- }
-
- onPaneMenu(menu: Menu, source: "more-options" | "tab-header" | string): void {
- if (source === "more-options") {
- menu.addItem((item) => {
- item.setTitle(t("quick-actions"));
- item.setIsLabel(true);
- });
- menu.addItem((item) => {
- item.setTitle(t("refresh-the-board"));
- item.setIcon("rotate-cw");
- item.onClick(async () => {
- // refreshBoardButton();
- });
- });
- menu.addItem((item) => {
- item.setTitle(t("show-hide-properties"));
- item.setIcon("list");
- item.onClick(async () => {
- // handlePropertiesBtnClick(event);
- });
- });
- menu.addItem((item) => {
- item.setTitle(t("open-board-filters-modal"));
- item.setIcon(funnelIcon);
- item.onClick(async () => {
- // handleFilterButtonClick(event);
- });
- });
- menu.addItem((item) => {
- item.setTitle(t("open-board-configuration-modal"));
- item.setIcon("settings");
- item.onClick(async () => {
- // openBoardConfigModal(plugin, currentBoardData, (updatedBoard: Board) => {
- // // handleUpdateBoards(plugin, updatedBoards, setCurrentBoardData)
- // // setCurrentBoardData(updatedBoard);
- // this.plugin.taskBoardFileManager.saveBoard(updatedBoard);
- // })
- });
- });
- menu.addItem((item) => {
- item.setTitle(t("scan-vault-modal"));
- item.setIcon(ScanVaultIcon);
- item.onClick(async () => {
- openScanVaultModal(this.plugin);
- });
- });
-
-
- // DEPRECATED : As we are moving the view switching options to the ribbon menu, we will remove these options from the pane menu to avoid confusion for users.
- // menu.addItem((item) => {
- // item.setTitle(t("view-type"));
- // item.setIsLabel(true);
- // });
- // menu.addItem((item) => {
- // item.setTitle(t("kanban-view"));
- // item.setIcon("square-kanban");
- // item.onClick(async () => {
- // eventEmitter.emit("SWITCH_VIEW", 'kanban');
- // });
- // });
- // menu.addItem((item) => {
- // item.setTitle(t("map-view"));
- // item.setIcon("network");
- // item.onClick(async () => {
- // eventEmitter.emit("SWITCH_VIEW", 'map');
- // });
- // });
- }
- }
-
- /**
- * This is called by Obsidian when Obsidian is about to save its state/layout.
- *
- * @returns The state data to be stored inside the workspace.json file inside the
- * Obsidian's config folder. (.obsidian/workspace.json)
- */
- getState() {
- // console.log("Value of currentFilePath : ", this.currentFilePath);
- // Save the current filePath to the workspace state
- return {
- ...super.getState(),
- filePath: this.currentFilePath ?? "",
- };
- }
-
- /**
- * This setState is always called after the onOpen function has finished its work by Obsidian.
- * If the leaf was saved by Obsidian in its workspace.json file previosly,
- * we can get the data in this function through the state param.
- * @param state
- * @param result
- */
- async setState(state: any, result: ViewStateResult): Promise {
- const { filePath } = state;
-
- // Check if a specific .taskboard file was clicked from File Navigator
- const clickedFilePath = (this.leaf as any).taskboardFilePath as string | undefined;
- if (clickedFilePath && typeof clickedFilePath === 'string' && clickedFilePath.endsWith('.taskboard')) {
- // Load and render the clicked file
- const clickedFileData = await this.plugin.taskBoardFileManager.loadBoardUsingPath(clickedFilePath);
- if (clickedFileData) {
- this.currentFilePath = clickedFilePath;
- state = {
- ...state,
- filePath: this.currentFilePath
- };
- this.renderBoard(clickedFileData);
- } else {
- bugReporterManagerInsatance.showNotice(183, `There was an issue with opening the task board file : ${clickedFilePath}`, "clickedFileData is undefined", "TaskBoardView.tsx/onOpen");
- }
- } else {
- if (filePath && typeof filePath === "string") {
- // This will run when an in-active (deffered) leaf will come in focus. Specially happen when Obsidian is opened again and the Task Board leaf was brought in focus.
- const boardData = await this.plugin.taskBoardFileManager.loadBoardUsingPath(
- filePath
- );
- if (boardData) {
- this.currentFilePath = filePath;
- state = {
- ...state,
- filePath: this.currentFilePath
- };
- this.renderBoard(boardData);
- } else {
- bugReporterManagerInsatance.showNotice(
- 183,
- `There was an issue with opening the task board file : ${filePath}`,
- "boardData is undefined",
- "TaskBoardView.tsx/setState"
- );
- }
- }
- else {
- // This will run when user has clicked on the Ribbon icon or running the "Open task board" command.
- // We need to get the last opened board.
- const lastViewedBoardData = await this.plugin.taskBoardFileManager.getLastOpenedBoard();
- if (lastViewedBoardData) {
- // Get the filePath from the registry
- const taskBoardFilesRegistry = this.plugin.settings.data.taskBoardFilesRegistry || {};
- const registryEntries = Object.values(taskBoardFilesRegistry);
-
- if (registryEntries.length > 0) {
- const firstItemFromRegistry = registryEntries[0];
- if (firstItemFromRegistry.filePath) {
- this.currentFilePath = firstItemFromRegistry.filePath;
- state = {
- ...state,
- filePath: this.currentFilePath,
- };
- }
- }
-
- this.renderBoard(lastViewedBoardData);
- } else {
- this.renderNoBoard();
- bugReporterManagerInsatance.addToLogs(185, "There was an issue with opening the last viewed board. lastViewedBoardData is undefined", "TaskBoardView.tsx/onOpen");
- }
-
- }
- }
-
- await super.setState(state, result);
- }
-
- /**
- * This function is ran by Obsidian, whenever a new leaf is created or
- * an in-active leaf is brough to life.
- */
- async onOpen() {
- if (Platform.isMobile) {
- this.addAction(RefreshIcon, t("refresh-board-button"), async () => {
- const fileStackString = localStorage.getItem(PENDING_SCAN_FILE_STACK);
- const fileStack = fileStackString ? JSON.parse(fileStackString) : null;
-
- if (fileStack && fileStack.length > 0) {
- await this.plugin.realTimeScanner.processAllUpdatedFiles();
- }
- eventEmitter.emit("REFRESH_BOARD");
- }).addClass("taskboardRefreshBtn");
- }
-
- const mandatoryScanSignal = localStorage.getItem(MANDATORY_SCAN_KEY) === "true";
-
- if (!Platform.isMobile || mandatoryScanSignal) {
- this.addAction(ScanVaultIcon, t("scan-vault-modal"), () => {
- openScanVaultModal(this.plugin);
- }).addClass("taskboardScanVaultBtn");
- }
-
- if (mandatoryScanSignal) this.highlighgtScanvaultIcon();
- }
-
- async highlighgtScanvaultIcon() {
- const scanVaultIcon = this.containerEl.querySelector(
- ".taskboardScanVaultBtn"
- ) as HTMLElement;
- if (scanVaultIcon) {
- scanVaultIcon.classList.add("highlight");
- setInterval(() => {
- scanVaultIcon.classList.toggle("highlight");
- }, 800); // Toggle highlight class every 500ms for blinking effect
- }
- }
-
- // private async loadBoards() {
- // try {
- // this.boards = await loadBoardsData(this.plugin);
- // } catch (err) {
- // bugReporterManagerInsatance.showNotice(
- // 89,
- // "Failed to load board configurations from data.json",
- // String(err),
- // "TaskBoardView.tsx/loadBoards"
- // );
- // }
- // }
-
- private renderBoard(currentBoardData: Board) {
- this.boardName = currentBoardData.name || "Unnamed Board";
- this.currentBoard = currentBoardData;
- this.root = createRoot(this.containerEl.children[1]);
- this.root.render(
-
-
-
- );
-
- // Signal the workspace to save the updated layout state
- this.app.workspace.requestSaveLayout();
- }
-
- /**
- * This function will render a message to the user when there is no board to show in the view. This can happen when user opens the view for the first time and there is no board created, or when there is an issue with loading the board data.
- * Will show a button to create a new board and to scan the vault when there is no board found.
- **/
- private renderNoBoard() {
- const container = this.containerEl.children[1] as HTMLElement;
- container.empty(); // Clear any previous content
-
- const wrapper = container.createDiv({ cls: "taskboard-no-board-wrapper" });
-
- const content = wrapper.createDiv({ cls: "taskboard-no-board-container" });
-
- // Main message
- content.createEl("h2", {
- text: t("no-board-found"),
- cls: "taskboard-no-board-title",
- });
-
- // Detailed description
- const description = content.createEl("p", {
- cls: "taskboard-no-board-description",
- text: t("no-boards-found-description")
- });
-
- // Action buttons
- const buttonContainer = content.createDiv({
- cls: "taskboard-no-board-buttons",
- });
-
- // Create template board button
- const createBtn = buttonContainer.createEl("button", {
- text: t("create-template-board") || "Create Template Board",
- cls: "taskboard-no-board-create-btn",
- attr: {
- "aria-label": t("create-template-board"),
- },
- });
- createBtn.addEventListener("click", () => {
- this.handleCreateTemplateBoard();
- });
-
- // Scan vault button
- const scanBtn = buttonContainer.createEl("button", {
- text: t("scan-vault-modal") || "Scan Vault",
- cls: "taskboard-no-board-scan-btn",
- attr: {
- "aria-label": t("scan-vault-modal"),
- },
- });
- scanBtn.addEventListener("click", () => {
- openBoardsExplorerModal(this.plugin);
- });
- }
-
- /**
- * Creates a new template board from DEFAULT_BOARD, saves it to disk, and renders it in the current view.
- * Generates a unique ID and file path for the new board.
- */
- private async handleCreateTemplateBoard() {
- try {
- // Generate unique ID and filename for the new template board
- const boardId = generateRandomStringId('board');
- const timestamp = new Date().getTime();
- const filePath = `TaskBoard-Template-${timestamp}.taskboard`;
-
- // Create a deep copy of DEFAULT_BOARD and update its properties
- const newBoard: Board = JSON.parse(JSON.stringify(DEFAULT_BOARD));
- newBoard.id = boardId;
-
- // Save the board to disk
- const saveSuccess = await this.plugin.taskBoardFileManager.createNewBoardFile(
- filePath,
- newBoard,
- );
-
- if (!saveSuccess) {
- bugReporterManagerInsatance.showNotice(
- 187,
- "Failed to create template board",
- "saveBoardToDisk returned false",
- "TaskBoardView.tsx/handleCreateTemplateBoard",
- );
- return;
- }
-
- // Update current file path
- this.currentFilePath = filePath;
-
- // Show success notice
- new Notice(t("board-created-successfully"));
-
- // Render the newly created board
- this.renderBoard(newBoard);
-
- } catch (error) {
- bugReporterManagerInsatance.showNotice(
- 187,
- "Error creating template board",
- String(error),
- "TaskBoardView.tsx/handleCreateTemplateBoard",
- );
- }
- }
-
- async onClose() {
- // Clean up when view is closed
- this.root?.unmount();
- this.plugin.leafIsActive = false;
- // onUnloadSave(this.plugin);
- }
-}
diff --git a/src/obsidian_views/TaskBoardView.tsx b/src/obsidian_views/TaskBoardView.tsx
index b4a6afde..ac9dcb82 100644
--- a/src/obsidian_views/TaskBoardView.tsx
+++ b/src/obsidian_views/TaskBoardView.tsx
@@ -40,7 +40,7 @@ export class TaskBoardView extends ItemView {
return this.boardName;
}
- onPaneMenu(menu: Menu, source: "more-options" | "tab-header" | string): void {
+ onPaneMenu(menu: Menu, source: "more-options" | "tab-header"): void {
if (source === "more-options") {
menu.addItem((item) => {
item.setTitle(t("quick-actions"));
@@ -130,18 +130,18 @@ export class TaskBoardView extends ItemView {
* @param state
* @param result
*/
- async setState(state: any, result: ViewStateResult): Promise {
- const { filePath } = state;
+ async setState(state: unknown, result: ViewStateResult): Promise {
+ const filePath = (state as Record).filePath as string | undefined;
// Check if a specific .taskboard file was clicked from File Navigator
- const clickedFilePath = (this.leaf as any).taskboardFilePath as string | undefined;
+ const clickedFilePath = this.leaf.taskboardFilePath as string | undefined;
if (clickedFilePath && typeof clickedFilePath === 'string' && clickedFilePath.endsWith('.taskboard')) {
// Load and render the clicked file
const clickedFileData = await this.plugin.taskBoardFileManager.loadBoardUsingPath(clickedFilePath);
if (clickedFileData) {
this.currentFilePath = clickedFilePath;
state = {
- ...state,
+ ...(state as Record),
filePath: this.currentFilePath
};
this.renderBoard(clickedFileData);
@@ -157,7 +157,7 @@ export class TaskBoardView extends ItemView {
if (boardData) {
this.currentFilePath = filePath;
state = {
- ...state,
+ ...(state as Record),
filePath: this.currentFilePath
};
this.renderBoard(boardData);
@@ -184,7 +184,7 @@ export class TaskBoardView extends ItemView {
if (firstItemFromRegistry.filePath) {
this.currentFilePath = firstItemFromRegistry.filePath;
state = {
- ...state,
+ ...(state as Record),
filePath: this.currentFilePath,
};
}
@@ -209,8 +209,9 @@ export class TaskBoardView extends ItemView {
async onOpen() {
if (Platform.isMobile) {
this.addAction(RefreshIcon, t("refresh-board-button"), async () => {
- const fileStackString = localStorage.getItem(PENDING_SCAN_FILE_STACK);
- const fileStack = fileStackString ? JSON.parse(fileStackString) : null;
+ const fileStackString = this.app.loadLocalStorage(PENDING_SCAN_FILE_STACK);
+ const parsedData: unknown = JSON.parse(fileStackString as string);
+ const fileStack = fileStackString ? parsedData as string[] : null;
if (fileStack && fileStack.length > 0) {
await this.plugin.realTimeScanner.processAllUpdatedFiles();
@@ -219,7 +220,7 @@ export class TaskBoardView extends ItemView {
}).addClass("taskboardRefreshBtn");
}
- const mandatoryScanSignal = localStorage.getItem(MANDATORY_SCAN_KEY) === "true";
+ const mandatoryScanSignal = this.app.loadLocalStorage(MANDATORY_SCAN_KEY) === "true";
if (!Platform.isMobile || mandatoryScanSignal) {
this.addAction(ScanVaultIcon, t("scan-vault-modal"), () => {
@@ -227,7 +228,7 @@ export class TaskBoardView extends ItemView {
}).addClass("taskboardScanVaultBtn");
}
- if (mandatoryScanSignal) this.highlighgtScanvaultIcon();
+ if (mandatoryScanSignal) void this.highlighgtScanvaultIcon();
}
async highlighgtScanvaultIcon() {
@@ -236,7 +237,7 @@ export class TaskBoardView extends ItemView {
) as HTMLElement;
if (scanVaultIcon) {
scanVaultIcon.classList.add("highlight");
- setInterval(() => {
+ window.setInterval(() => {
scanVaultIcon.classList.toggle("highlight");
}, 800); // Toggle highlight class every 500ms for blinking effect
}
@@ -264,6 +265,7 @@ export class TaskBoardView extends ItemView {
plugin={this.plugin}
currentBoardData={currentBoardData}
currentLeaf={this.leaf}
+ viewId=""
/>
);
@@ -306,26 +308,29 @@ export class TaskBoardView extends ItemView {
// Create path elements
let currentPath = '';
- // Add folder parts
- folderParts.forEach((part, index) => {
- if (part) {
- currentPath += part;
- const folderPath = currentPath;
- const folderSpan = titleContainer.createSpan({ text: part, cls: 'taskboard-path-folder' });
- folderSpan.addEventListener('click', () => {
- const folder = this.app.vault.getAbstractFileByPath(folderPath);
- if (folder instanceof TFolder) {
- revealFileFolderInExplorer(this.plugin, folder);
- }
- });
+ // Add folder parts - Only show if the screen width is sufficiently large
+ // Else will only show the fileName
+ if (this.leaf.width > 500) {
+ folderParts.forEach((part, index) => {
+ if (part) {
+ currentPath += part;
+ const folderPath = currentPath;
+ const folderSpan = titleContainer.createSpan({ text: part, cls: 'taskboard-path-folder' });
+ folderSpan.addEventListener('click', () => {
+ const folder = this.app.vault.getAbstractFileByPath(folderPath);
+ if (folder instanceof TFolder) {
+ revealFileFolderInExplorer(this.plugin, folder);
+ }
+ });
- // Add separator
- if (index < folderParts.length - 1 || fileName) {
- titleContainer.createSpan({ text: '/', cls: 'taskboard-path-separator' });
+ // Add separator
+ if (index < folderParts.length - 1 || fileName) {
+ titleContainer.createSpan({ text: '/', cls: 'taskboard-path-separator' });
+ }
+ currentPath += '/';
}
- currentPath += '/';
- }
- });
+ });
+ }
// Add file name
if (fileName) {
@@ -381,7 +386,7 @@ export class TaskBoardView extends ItemView {
},
});
createBtn.addEventListener("click", () => {
- this.handleCreateTemplateBoard();
+ void this.handleCreateTemplateBoard();
});
// Scan vault button
@@ -409,7 +414,7 @@ export class TaskBoardView extends ItemView {
const filePath = `TaskBoard-Template-${timestamp}.taskboard`;
// Create a deep copy of DEFAULT_BOARD and update its properties
- const newBoard: Board = JSON.parse(JSON.stringify(DEFAULT_BOARD));
+ let newBoard: Board = DEFAULT_BOARD;
newBoard.id = boardId;
// Save the board to disk
@@ -447,6 +452,10 @@ export class TaskBoardView extends ItemView {
}
}
+ onResize(): void {
+ this.renderCustomViewHeader();
+ }
+
async onClose() {
// Clean up when view is closed
this.root?.unmount();
diff --git a/src/obsidian_views/TaskEditorView.tsx b/src/obsidian_views/TaskEditorView.tsx
index 4c1ae452..69c46def 100644
--- a/src/obsidian_views/TaskEditorView.tsx
+++ b/src/obsidian_views/TaskEditorView.tsx
@@ -13,7 +13,6 @@ import { allowedFileExtensionsRegEx } from "../regularExpressions/MiscelleneousR
import { getCurrentLocalDateTimeString } from "../utils/DateTimeCalculations.js";
import { readDataOfVaultFile } from "../utils/MarkdownFileOperations.js";
import { generateTaskId } from "../utils/TaskItemUtils.js";
-import { getFormattedTaskContent } from "../utils/taskLine/TaskContentFormatter.js";
export class TaskEditorView extends ItemView {
@@ -26,13 +25,13 @@ export class TaskEditorView extends ItemView {
isEdited: boolean;
isTaskNote: boolean;
activeNote: boolean;
- saveTask: (updatedTask: taskItem, quickAddPluginChoice: string, updatedNoteContent?: string) => void;
+ saveTask: (updatedTask: taskItem, quickAddPluginChoice: string, updatedNoteContent?: string) => Promise;
constructor(
plugin: TaskBoard,
leaf: WorkspaceLeaf,
viewTypeId: string,
- saveTask: (updatedTask: taskItem, quickAddPluginChoice: string, updatedNoteContent?: string) => void,
+ saveTask: (updatedTask: taskItem, quickAddPluginChoice: string, updatedNoteContent?: string) => Promise,
isTaskNote: boolean,
activeNote: boolean,
taskExists: boolean,
@@ -78,7 +77,7 @@ export class TaskEditorView extends ItemView {
if (this.taskExists) {
const data = await readDataOfVaultFile(this.plugin, this.filePath, true);
- if (data == null) this.onClose();
+ if (data == null) await this.onClose();
else noteContent = data;
if (!this.task.title) this.task.title = this.filePath.split('/').pop()?.replace(allowedFileExtensionsRegEx, "") ?? "";
@@ -112,8 +111,8 @@ export class TaskEditorView extends ItemView {
filePath={this.filePath}
onSave={async (updatedTask: taskItem, quickAddPluginChoice: string, updatedNoteContent?: string) => {
this.isEdited = false;
- const formattedContent = await getFormattedTaskContent(updatedTask);
- this.saveTask(updatedTask, quickAddPluginChoice, updatedNoteContent);
+ // const formattedContent = await getFormattedTaskContent(updatedTask);
+ await this.saveTask(updatedTask, quickAddPluginChoice, updatedNoteContent);
// Close the view leaf
this.app.workspace.detachLeavesOfType(this.viewTypeId);
}}
diff --git a/src/services/CommunityPlugins.ts b/src/services/CommunityPlugins.ts
index e152fa81..7a6d79a4 100644
--- a/src/services/CommunityPlugins.ts
+++ b/src/services/CommunityPlugins.ts
@@ -1,7 +1,17 @@
-import { TFile, TFolder } from "obsidian";
+import { App, Plugin, TFile, TFolder } from "obsidian";
import { TaskBoardSubmodule } from "./subModules.js";
import type TaskBoard from "../../main.js";
+export interface QuickAddPlugin extends Plugin {
+ app: App;
+ api: {
+ executeChoice(
+ choiceName: string,
+ variables?: { [key: string]: unknown },
+ ): Promise;
+ };
+}
+
export class CommunityPlugins extends TaskBoardSubmodule {
get fileExplorerPlugin() {
return this.app.internalPlugins.getEnabledPluginById("file-explorer");
@@ -19,8 +29,8 @@ export class CommunityPlugins extends TaskBoardSubmodule {
return !!this.reminderPlugin;
}
- get quickAddPlugin() {
- return this.app.plugins.plugins["quickadd"] ?? null;
+ get quickAddPlugin(): QuickAddPlugin {
+ return (this.app.plugins.plugins.quickAdd as QuickAddPlugin) ?? null;
}
isQuickAddPluginEnabled() {
@@ -48,10 +58,13 @@ export function isReminderPluginInstalled(plugin: TaskBoard) {
reminderPlugin.isReminderPluginEnabled();
}
-export function revealFileFolderInExplorer(plugin: TaskBoard, abstractFile: TFile | TFolder) {
+export function revealFileFolderInExplorer(
+ plugin: TaskBoard,
+ abstractFile: TFile | TFolder,
+) {
const communityPlugins = new CommunityPlugins(plugin);
- if(communityPlugins.isFileExplorerPluginEnabled()) {
+ if (communityPlugins.isFileExplorerPluginEnabled()) {
communityPlugins.fileExplorerPlugin?.revealInFolder(abstractFile);
}
}
diff --git a/src/services/EventEmitter.ts b/src/services/EventEmitter.ts
index 9041d865..39fe2e0f 100644
--- a/src/services/EventEmitter.ts
+++ b/src/services/EventEmitter.ts
@@ -1,15 +1,19 @@
// /src/services/ EventEmitter.ts
+type EventListener = (data: T) => void;
+
class EventEmitter {
- private events: { [key: string]: Function[] } = Object.create(null);
+ private events: Record>> = {};
private readonly blockedEvents = new Set([
"__proto__",
"constructor",
"prototype",
]);
- // Add an event listener
- on(event: string, listener: Function) {
+ // Keep the listener payload generic at the call site, but store the handler
+ // internally as `unknown` so the event bus remains compatible with the
+ // existing callback signatures used across the plugin.
+ on(event: string, listener: EventListener) {
if (this.blockedEvents.has(event)) {
console.warn(
"[Task Board] [Event Emitter] : Blocked event is registered : ",
@@ -20,11 +24,11 @@ class EventEmitter {
if (!this.events[event]) {
this.events[event] = [];
}
- this.events[event].push(listener);
+ this.events[event].push(listener as EventListener);
}
// Emit an event, calling all listeners
- emit(event: string, data?: any) {
+ emit(event: string, data?: T) {
if (this.blockedEvents.has(event)) {
console.warn(
"[Task Board] [Event Emitter] : Blocked event is emitted : ",
@@ -38,7 +42,7 @@ class EventEmitter {
}
// Remove an event listener
- off(event: string, listener: Function) {
+ off(event: string, listener: EventListener) {
if (this.blockedEvents.has(event)) {
console.warn(
"[Task Board] [Event Emitter] : Blocked event is un-registered : ",
@@ -48,7 +52,8 @@ class EventEmitter {
}
if (this.events[event]) {
this.events[event] = this.events[event].filter(
- (registeredListener) => registeredListener !== listener,
+ (registeredListener) =>
+ registeredListener !== (listener as EventListener),
);
}
}
diff --git a/src/services/FileSystem.ts b/src/services/FileSystem.ts
index c83fdf52..f66774f3 100644
--- a/src/services/FileSystem.ts
+++ b/src/services/FileSystem.ts
@@ -1,13 +1,14 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable import/no-nodejs-modules */
// import { BlobReader, configure, Reader, ZipReader } from '@zip.js/zip.js';
import type * as NodeFS from "node:fs";
import type * as NodeOS from "node:os";
import type * as NodePath from "node:path";
import type * as NodeUrl from "node:url";
import type * as NodeZlib from "node:zlib";
-import { App, Platform } from "obsidian";
+import { App, Platform, TFile } from "obsidian";
+import { Buffer } from "node:buffer";
-
-import TaskBoard from "../../main.js";
import { bugReporterManagerInsatance } from "../managers/BugReporter.js";
// import { configureWebWorker } from './z-worker-inline';
@@ -73,7 +74,7 @@ export function nodeBufferToArrayBuffer(
}
export class NodePickedFile implements PickedFile {
- readonly type: "file" = "file";
+ readonly type = "file";
readonly filepath: string;
readonly fullpath: string;
@@ -124,7 +125,7 @@ export class NodePickedFile implements PickedFile {
}
export class NodePickedFolder implements PickedFolder {
- readonly type: "folder" = "folder";
+ readonly type = "folder";
readonly filepath: string;
readonly name: string;
@@ -162,7 +163,7 @@ export class NodePickedFolder implements PickedFolder {
}
export class WebPickedFile implements PickedFile {
- readonly type: "file" = "file";
+ readonly type = "file";
readonly file: File;
readonly fullpath: string;
@@ -215,8 +216,9 @@ export class WebPickedFile implements PickedFile {
// return callback(new ZipReader(new BlobReader(this.file)));
// }
+ // Use file.name instead of this.file.toString() to avoid [object Object] default stringification
toString(): string {
- return this.file.toString();
+ return this.file.name;
}
}
@@ -302,7 +304,7 @@ export function splitext(name: string) {
/**
* Checks and creates folders if they are not present.
* Recursively checks each child folder if it exists of not.
- *
+ *
* @param plugin - The plugin's app instance
* @param folderPath - Only the folder path. (Filename should not be present)
* @returns - Void
@@ -328,7 +330,7 @@ export async function createFolderRecursively(
// If a file exists where a folder is expected, report and abort
// (this is unlikely but safer to surface)
// existing.type may not be available in all builds, so just check truthiness and skip create
- if ((existing as any).path && !(existing as any).children) {
+ if (existing.path && existing instanceof TFile) {
bugReporterManagerInsatance.showNotice(
58,
`A file exists where a folder is expected: ${currentPath}`,
diff --git a/src/services/FrontmatterRenderer.ts b/src/services/FrontmatterRenderer.ts
index 4ee4b111..0df2fb30 100644
--- a/src/services/FrontmatterRenderer.ts
+++ b/src/services/FrontmatterRenderer.ts
@@ -10,7 +10,7 @@
* In the current version, this FrontmatterRenderer is using a simple custom styling method to render the properties.
*/
-import { App, Component, Notice, TFile } from "obsidian";
+import { App, Component, Notice, setIcon, TFile } from "obsidian";
import TaskBoard from "../../main.js";
import { extractFrontmatterFromContent } from "../utils/taskNote/FrontmatterOperations.js";
@@ -148,9 +148,17 @@ export class FrontmatterRenderer {
const collapseIcon = header.createSpan({
cls: "taskboard-frontmatter-collapse-icon",
});
- collapseIcon.replaceChildren();
- const collapseIconSVG = ``;
- collapseIcon.insertAdjacentHTML("beforeend", collapseIconSVG);
+ // collapseIcon.replaceChildren();
+ // const collapseIconSVG = ``;
+ // // collapseIcon.insertAdjacentHTML("beforeend", collapseIconSVG);
+ // collapseIcon.appendChild(
+ // createSvg("svg", {
+ // cls: "taskboard-frontmatter-collapse-icon",
+
+ // }),
+ // );
+
+ setIcon(collapseIcon, "chevron-down"); // or 'chevron-up' for expanded state
// Add "Properties" text
header.createSpan({
@@ -174,8 +182,10 @@ export class FrontmatterRenderer {
if (this.isFrontmatterContainerCollapsed) {
propertiesContainer.hide();
collapseIcon.replaceChildren();
- const collapseIconSVG = ``;
- collapseIcon.insertAdjacentHTML("beforeend", collapseIconSVG);
+ // const collapseIconSVG = ``;
+ // // collapseIcon.insertAdjacentHTML("beforeend", collapseIconSVG);
+ // collapseIcon.textContent = collapseIconSVG;
+ setIcon(collapseIcon, "chevron-right");
}
// Render each property using PropertyWidget
@@ -188,14 +198,18 @@ export class FrontmatterRenderer {
if (this.isFrontmatterContainerCollapsed) {
propertiesContainer.hide();
- collapseIcon.replaceChildren();
- const collapseIconSVG = ``;
- collapseIcon.insertAdjacentHTML("beforeend", collapseIconSVG);
+ // collapseIcon.replaceChildren();
+ // const collapseIconSVG = ``;
+ // // collapseIcon.insertAdjacentHTML("beforeend", collapseIconSVG);
+ // collapseIcon.textContent = collapseIconSVG;
+ setIcon(collapseIcon, "chevron-down");
} else {
propertiesContainer.show();
- collapseIcon.replaceChildren();
- const collapseIconSVG = ``;
- collapseIcon.insertAdjacentHTML("beforeend", collapseIconSVG);
+ // collapseIcon.replaceChildren();
+ // const collapseIconSVG = ``;
+ // // collapseIcon.insertAdjacentHTML("beforeend", collapseIconSVG);
+ // collapseIcon.textContent = collapseIconSVG;
+ setIcon(collapseIcon, "chevron-down");
}
frontmatterSection.toggleClass(
@@ -218,7 +232,7 @@ export class FrontmatterRenderer {
*/
private renderProperties(
containerEl: HTMLElement,
- frontmatter: Record,
+ frontmatter: Record,
file?: TFile,
): void {
this.renderPropertiesSimple(containerEl, frontmatter);
@@ -336,7 +350,7 @@ export class FrontmatterRenderer {
*/
private renderPropertiesSimple(
containerEl: HTMLElement,
- frontmatter: Record,
+ frontmatter: Record,
): void {
const propertiesToRender = Object.entries(frontmatter).filter(
([key]) => key !== "position",
@@ -373,7 +387,7 @@ export class FrontmatterRenderer {
*/
private renderPropertyValueSimple(
containerEl: HTMLElement,
- value: any,
+ value: unknown,
): void {
if (Array.isArray(value)) {
const list = containerEl.createEl("ul", {
diff --git a/src/services/MarkdownEditor.ts b/src/services/MarkdownEditor.ts
index 877303e6..00594686 100644
--- a/src/services/MarkdownEditor.ts
+++ b/src/services/MarkdownEditor.ts
@@ -8,14 +8,15 @@
import {
App,
Editor,
+ MarkdownFileInfo,
MarkdownScrollableEditView,
Scope,
TFile,
- WidgetEditorView,
+ Workspace,
WorkspaceLeaf,
} from "obsidian";
-import { EditorSelection, Prec } from "@codemirror/state";
+import { EditorSelection, Prec, Range } from "@codemirror/state";
import {
EditorView,
keymap,
@@ -40,7 +41,7 @@ import { FrontmatterRenderer } from "./FrontmatterRenderer.js";
export function createEmbeddableMarkdownEditor(
plugin: TaskBoard,
container: HTMLElement,
- options: Partial
+ options: Partial,
): EmbeddableMarkdownEditor {
// Get the editor class
const EditorClass = resolveEditorPrototype(plugin.app);
@@ -51,32 +52,35 @@ export function createEmbeddableMarkdownEditor(
plugin.app,
EditorClass,
container,
- options
+ options,
);
}
/**
* Resolves the markdown editor prototype from the app
*/
-function resolveEditorPrototype(app: App): any {
+function resolveEditorPrototype(app: App): unknown {
// Create a temporary editor to resolve the prototype of ScrollableMarkdownEditor
const widgetEditorView = app.embedRegistry.embedByExtension.md(
{ app, containerEl: createDiv() },
+ // eslint-disable-next-line obsidianmd/no-tfile-tfolder-cast -- null TFile needed for API
null as unknown as TFile,
- ""
- ) as WidgetEditorView;
+ "",
+ );
// Mark as editable to instantiate the editor
widgetEditorView.editable = true;
widgetEditorView.showEditor();
+ // Navigate prototype chain to resolve the ScrollableMarkdownEditor constructor
+ const editMode = widgetEditorView.editMode as object;
const MarkdownEditor = Object.getPrototypeOf(
- Object.getPrototypeOf(widgetEditorView.editMode!)
- );
+ Object.getPrototypeOf(editMode),
+ ) as { constructor: unknown };
// Unload to remove the temporary editor
widgetEditorView.unload();
- // Return the constructor, using 'any' type to bypass the abstract class check
+ // Return the constructor, bypassing the abstract class check
return MarkdownEditor.constructor;
}
@@ -87,13 +91,14 @@ interface MarkdownEditorProps {
placeholder?: string;
enableFrontmatterUI?: boolean; // Enable enhanced frontmatter UI
file?: TFile; // Optional file for context in property rendering
+ singleLine?: boolean;
onEnter: (
editor: EmbeddableMarkdownEditor,
mod: boolean,
- shift: boolean
+ shift: boolean,
) => boolean;
- // onEscape: (editor: EmbeddableMarkdownEditor) => void;
+ onEscape?: (editor: EmbeddableMarkdownEditor) => void;
onSubmit: (editor: EmbeddableMarkdownEditor) => void;
onBlur: (editor: EmbeddableMarkdownEditor) => void;
onPaste: (e: ClipboardEvent, editor: EmbeddableMarkdownEditor) => void;
@@ -145,7 +150,7 @@ export class EmbeddableMarkdownEditor {
get app(): App {
return this.editor.app;
}
- get owner(): any {
+ get owner(): unknown {
return this.editor.owner;
}
get _loaded(): boolean {
@@ -162,13 +167,135 @@ export class EmbeddableMarkdownEditor {
constructor(
plugin: TaskBoard,
app: App,
- EditorClass: any,
+ EditorClass: unknown,
container: HTMLElement,
- options: Partial
+ options: Partial,
) {
this.plugin = plugin;
+
+ // Store user options first
+ this.options = { ...defaultProperties, ...options };
+ this.initial_value = this.options.value!;
+ this.scope = new Scope(app.scope);
+
+ // Prevent Mod+Enter default behavior
+ this.scope.register(["Mod"], "Enter", () => true);
+
+ // Store reference to self for the patched method BEFORE using it
+ // eslint-disable-next-line @typescript-eslint/no-this-alias -- needed for monkey-patching context
+ const self = this;
+
+ // Use monkey-around to safely patch the method
+ const uninstaller = around(
+ (EditorClass as { prototype: object }).prototype,
+ {
+ buildLocalExtensions: (originalMethod: unknown) =>
+ function (this: object) {
+ const extensions = (
+ originalMethod as (this: object) => unknown[]
+ ).call(this);
+
+ // Only add our custom extensions if this is our editor instance
+ if (this === self.editor) {
+ // Add placeholder if configured
+ if (self.options.placeholder) {
+ extensions.push(
+ placeholder(self.options.placeholder),
+ );
+ }
+
+ // Add paste, blur, and focus event handlers
+ extensions.push(
+ EditorView.domEventHandlers({
+ paste: (event) => {
+ self.options.onPaste(event, self);
+ },
+ blur: () => {
+ // Always trigger blur callback and let it handle the logic
+ app.keymap.popScope(self.scope);
+ if (self.options.onBlur) {
+ self.options.onBlur(self);
+ }
+ },
+ focusin: () => {
+ app.keymap.pushScope(self.scope);
+ app.workspace.activeEditor =
+ self.owner as MarkdownFileInfo | null;
+ },
+ }),
+ );
+
+ // Add keyboard handlers
+ const keyBindings = [
+ {
+ key: "Enter",
+ run: () => {
+ return self.options.onEnter(
+ self,
+ false,
+ false,
+ );
+ },
+ shift: () =>
+ self.options.onEnter(self, false, true),
+ },
+ {
+ key: "Mod-Enter",
+ run: () =>
+ self.options.onEnter(self, true, false),
+ shift: () =>
+ self.options.onEnter(self, true, true),
+ },
+ {
+ key: "Escape",
+ run: () => {
+ self.options.onEscape?.(self);
+ return true;
+ },
+ preventDefault: true,
+ },
+ ];
+
+ // For single line mode, prevent Enter key from creating new lines
+ if (self.options.singleLine) {
+ keyBindings[0] = {
+ key: "Enter",
+ run: () => {
+ // In single line mode, Enter should trigger onEnter
+ return self.options.onEnter(
+ self,
+ false,
+ false,
+ );
+ },
+ shift: () => {
+ // Even with shift, still call onEnter in single line mode
+ return self.options.onEnter(
+ self,
+ false,
+ true,
+ );
+ },
+ };
+ }
+
+ extensions.push(
+ Prec.highest(keymap.of(keyBindings)),
+ );
+ }
+
+ return extensions;
+ },
+ },
+ );
+ plugin.register(uninstaller);
+
// Create the editor with the app instance
- this.editor = new EditorClass(app, container, {
+ this.editor = new (EditorClass as new (
+ app: App,
+ container: HTMLElement,
+ opts: Record,
+ ) => MarkdownScrollableEditView)(app, container, {
app,
// This mocks the MarkdownView functions, required for proper scrolling
onMarkdownScroll: () => {},
@@ -177,18 +304,14 @@ export class EmbeddableMarkdownEditor {
this.frontmatterRenderer = new FrontmatterRenderer(plugin, this.editor);
- // Store user options
- this.options = { ...defaultProperties, ...options };
- this.initial_value = this.options.value!;
- this.scope = new Scope(app.scope);
-
// Prevent Mod+Enter default behavior
this.scope.register(["Mod"], "Enter", () => true);
// Set up the editor relationship for commands to work
- if (this.owner) {
- this.owner.editMode = this;
- this.owner.editor = this.editor.editor;
+ const ownerRecord = this.owner as Record | undefined;
+ if (ownerRecord) {
+ ownerRecord.editMode = this;
+ ownerRecord.editor = this.editor.editor;
}
// Set initial content
@@ -198,32 +321,48 @@ export class EmbeddableMarkdownEditor {
this.register(
around(app.workspace, {
setActiveLeaf:
- (oldMethod: any) =>
- (leaf: WorkspaceLeaf, ...args: any[]) => {
+ (oldMethod: unknown) =>
+ (leaf: WorkspaceLeaf, ...args: unknown[]) => {
if (!this.activeCM?.hasFocus) {
- oldMethod.call(app.workspace, leaf, ...args);
+ (
+ oldMethod as (
+ this: Workspace,
+ leaf: WorkspaceLeaf,
+ ...args: unknown[]
+ ) => void
+ ).call(app.workspace, leaf, ...args);
}
},
- })
+ }),
);
// Set up blur event handler
+ const contentDOM = (
+ this.editor.editor as unknown as Record
+ )?.cm as Record | undefined;
if (
this.options.onBlur !== defaultProperties.onBlur &&
- this.editor.editor?.cm?.contentDOM
+ contentDOM?.contentDOM
) {
- this.editor.editor.cm.contentDOM.addEventListener("blur", () => {
- app.keymap.popScope(this.scope);
- if (this._loaded) this.options.onBlur(this);
- });
+ (contentDOM.contentDOM as HTMLElement).addEventListener(
+ "blur",
+ () => {
+ app.keymap.popScope(this.scope);
+ if (this._loaded) this.options.onBlur(this);
+ },
+ );
}
// Set up focus event handler
- if (this.editor.editor?.cm?.contentDOM) {
- this.editor.editor.cm.contentDOM.addEventListener("focusin", () => {
- app.keymap.pushScope(this.scope);
- app.workspace.activeEditor = this.owner;
- });
+ if (contentDOM?.contentDOM) {
+ (contentDOM.contentDOM as HTMLElement).addEventListener(
+ "focusin",
+ () => {
+ app.keymap.pushScope(this.scope);
+ app.workspace.activeEditor = this
+ .owner as MarkdownFileInfo | null;
+ },
+ );
}
// Apply custom class if provided
@@ -236,7 +375,7 @@ export class EmbeddableMarkdownEditor {
this.editor.editor.cm.dispatch({
selection: EditorSelection.range(
options.cursorLocation.anchor,
- options.cursorLocation.head
+ options.cursorLocation.head,
),
});
}
@@ -261,7 +400,7 @@ export class EmbeddableMarkdownEditor {
paste: (event) => {
this.options.onPaste(event, this);
},
- })
+ }),
);
// Add keyboard handlers
@@ -287,8 +426,8 @@ export class EmbeddableMarkdownEditor {
// },
// preventDefault: true,
// },
- ])
- )
+ ]),
+ ),
);
return extensions;
@@ -311,15 +450,16 @@ export class EmbeddableMarkdownEditor {
*/
private createFrontmatterHidingExtension() {
// Helper function to build decorations for frontmatter
- const buildDecorations = (state: any): DecorationSet => {
- const decorations: any[] = [];
- const doc = state.doc;
+ const buildDecorations = (state: unknown): DecorationSet => {
+ const decorations: Range[] = [];
+ const editorState = state as { doc: { toString: () => string } };
+ const doc = editorState.doc;
const text = doc.toString();
// Regular expression to match frontmatter blocks
// Matches content that starts with '---' and ends with '---'
const frontmatterRegex = /^---\s*\n([\s\S]*?)\n---\s*$/gm;
- let match;
+ let match: RegExpExecArray | null;
while ((match = frontmatterRegex.exec(text)) !== null) {
const start = match.index;
@@ -332,7 +472,7 @@ export class EmbeddableMarkdownEditor {
attributes: {
style: "display: none;",
},
- }).range(start, end)
+ }).range(start, end),
);
}
@@ -368,7 +508,7 @@ export class EmbeddableMarkdownEditor {
const contentWithoutFrontmatter =
this.frontmatterRenderer.extractContentWithoutFrontmatter(
content,
- frontmatterContent
+ frontmatterContent,
);
this.editor.set(contentWithoutFrontmatter, focus);
@@ -399,7 +539,7 @@ export class EmbeddableMarkdownEditor {
// Find or create a wrapper in the container
// We'll prepend the frontmatter UI to the container
const wrapper = this.containerEl.querySelector(
- ".taskboard-frontmatter-wrapper"
+ ".taskboard-frontmatter-wrapper",
) as HTMLElement;
if (!wrapper) {
@@ -411,7 +551,7 @@ export class EmbeddableMarkdownEditor {
// Insert at the beginning of the container
this.containerEl.insertBefore(
this.frontmatterUIContainer,
- this.containerEl.firstChild
+ this.containerEl.firstChild,
);
} else {
this.frontmatterUIContainer = wrapper;
@@ -422,7 +562,7 @@ export class EmbeddableMarkdownEditor {
const result = this.frontmatterRenderer.renderCollapsibleFrontmatter(
this.frontmatterUIContainer,
content,
- this.options.file
+ this.options.file,
);
// If no frontmatter was rendered, remove the container
@@ -433,8 +573,8 @@ export class EmbeddableMarkdownEditor {
}
// Register cleanup callback
- register(cb: any): void {
- this.editor.register(cb);
+ register(cb: unknown): void {
+ this.editor.register(cb as () => unknown);
}
// Clean up method that ensures proper destruction
diff --git a/src/services/MarkdownHoverPreview.ts b/src/services/MarkdownHoverPreview.ts
index 2cbbf33f..a4b7aad5 100644
--- a/src/services/MarkdownHoverPreview.ts
+++ b/src/services/MarkdownHoverPreview.ts
@@ -8,7 +8,7 @@ export function hookMarkdownLinkMouseEventHandlers(
plugin: TaskBoard,
containerEl: HTMLElement,
sourcePath: string,
- filePath: string
+ filePath: string,
) {
containerEl
.querySelectorAll("a.internal-link")
@@ -18,10 +18,10 @@ export function hookMarkdownLinkMouseEventHandlers(
evt.preventDefault();
const linktext = el.getAttribute("href");
if (linktext) {
- app.workspace.openLinkText(
+ void app.workspace.openLinkText(
linktext,
sourcePath,
- Keymap.isModEvent(evt)
+ Keymap.isModEvent(evt),
);
}
});
@@ -47,7 +47,7 @@ export function hookMarkdownLinkMouseEventHandlers(
export function markdownButtonHoverPreviewEvent(
app: App,
event: React.MouseEvent,
- filePath: string
+ filePath: string,
) {
app.workspace.trigger("hover-link", {
event,
diff --git a/src/services/MarkdownUIRenderer.ts b/src/services/MarkdownUIRenderer.ts
index 0a1610fe..a526c8bb 100644
--- a/src/services/MarkdownUIRenderer.ts
+++ b/src/services/MarkdownUIRenderer.ts
@@ -33,13 +33,12 @@ export function createAndAppendElement(
// so had to convert all of these to the equivalent but more elaborate document.createElement() and
// appendChild() calls.
- const el: HTMLElementTagNameMap[K] = document.createElement(tagName);
+ const el: HTMLElementTagNameMap[K] = activeDocument.createElement(tagName);
parentElement.appendChild(el);
return el;
}
export class MarkdownUIRenderer {
- private readonly textRenderer: TextRenderer;
private readonly obsidianComponent: Component | null;
private readonly parentUlElement: HTMLElement;
// private readonly taskLayoutOptions: TaskLayoutOptions;
@@ -55,6 +54,7 @@ export class MarkdownUIRenderer {
if (!obsidianComponent) {
return;
}
+
await MarkdownRenderer.render(
app,
text,
@@ -76,7 +76,6 @@ export class MarkdownUIRenderer {
* @param parentUlElement HTML element where the task shall be rendered.
*/
constructor({
- textRenderer = MarkdownUIRenderer.obsidianMarkdownRenderer,
obsidianComponent,
parentUlElement,
}: {
@@ -84,12 +83,11 @@ export class MarkdownUIRenderer {
obsidianComponent: Component | null;
parentUlElement: HTMLElement;
}) {
- this.textRenderer = textRenderer;
this.obsidianComponent = obsidianComponent;
this.parentUlElement = parentUlElement;
}
- public static async renderTaskDisc(
+ public static async strictRender(
app: App,
taskDescText: string,
element: HTMLDivElement,
@@ -111,7 +109,7 @@ export class MarkdownUIRenderer {
);
}
- static async renderSubtaskText(
+ public static async safeRender(
app: App,
subtaskText: string,
el: HTMLElement,
@@ -119,11 +117,11 @@ export class MarkdownUIRenderer {
taskItemComponent: Component | null,
) {
try {
- // console.log("renderSubtaskText : Received following text : ", subtaskText);
+ // console.log("safeRender : Received following text : ", subtaskText);
let componentEl = taskItemComponent ?? new Component();
- if (!componentEl) {
- return;
- }
+ // if (!componentEl) {
+ // return;
+ // }
el.replaceChildren();
@@ -139,7 +137,7 @@ export class MarkdownUIRenderer {
bugReporterManagerInsatance.addToLogs(
102,
String(error),
- "MarkdownUIRenderer.ts/MarkdownUIRenderer.renderSubtaskText",
+ "MarkdownUIRenderer.ts/MarkdownUIRenderer.safeRender",
);
}
}
diff --git a/src/services/MultiSuggest.ts b/src/services/MultiSuggest.ts
index 708a67ed..31a448de 100644
--- a/src/services/MultiSuggest.ts
+++ b/src/services/MultiSuggest.ts
@@ -85,9 +85,15 @@ export function getTagSuggestions(app: App): string[] {
return tagsArray;
}
+// Define expected shape of QuickAdd plugin choices for type safety
+interface QuickAddChoice {
+ type: string;
+ name: string;
+}
+
export function getQuickAddPluginChoices(
app: App,
- quickAddPluginObj: any,
+ quickAddPluginObj: unknown,
): string[] {
try {
if (!quickAddPluginObj) {
@@ -96,7 +102,8 @@ export function getQuickAddPluginChoices(
const quickAddPlugin = app.plugins.getPlugin("quickadd");
if (!quickAddPlugin) return [];
- const choices = quickAddPluginObj.settings.choices;
+ const settings = (quickAddPluginObj as Record).settings as Record;
+ const choices = settings.choices as Record;
return Object.keys(choices)
.filter((key) => choices[key].type === "Capture")
@@ -141,18 +148,15 @@ export function getYAMLPropertySuggestions(app: App): string[] {
const metadata = app.metadataCache.getFileCache(file);
if (metadata && metadata.frontmatter) {
// console.log("Frontmatter:", metadata.frontmatter, "\nFile:", file.path);
- Object.keys(metadata.frontmatter).forEach((key) => {
- const value = metadata.frontmatter
- ? metadata.frontmatter[key]
- : null;
- if (Array.isArray(value)) {
- value.forEach((val) => {
- yamlPropertiesSet.add(`["${key}": ${val}]`);
- });
- } else {
- yamlPropertiesSet.add(`["${key}": ${value}]`);
- }
+ // metadata.frontmatter values are unknown; cast safely for template literals
+ Object.keys(metadata.frontmatter).forEach((key) => {
+ // Cast frontmatter to avoid any-typed access from Obsidian's API
+ const raw = (metadata.frontmatter as Record)?.[key];
+ const values = Array.isArray(raw) ? raw : [raw];
+ values.forEach((val) => {
+ yamlPropertiesSet.add(`["${key}": ${String(val)}]`);
});
+ });
}
}
});
diff --git a/src/services/ObsidianDebugInfo.ts b/src/services/ObsidianDebugInfo.ts
index a9f71cc0..1b8e82f6 100644
--- a/src/services/ObsidianDebugInfo.ts
+++ b/src/services/ObsidianDebugInfo.ts
@@ -16,8 +16,8 @@ export async function getObsidianDebugInfo(app: App) {
// This is an empty string if it's the default theme
const themeName = app.customCss.theme;
const themeManifest = app.customCss.themes[themeName];
- const numSnippets = app.customCss.snippets.filter((snippet: any) =>
- app.customCss.enabledSnippets.has(snippet)
+ const numSnippets = app.customCss.snippets.filter((snippet: unknown) =>
+ app.customCss.enabledSnippets.has(String(snippet)),
).length;
const plugins = app.plugins.plugins;
@@ -27,7 +27,7 @@ export async function getObsidianDebugInfo(app: App) {
"Use [[Wikilinks]]": !app.vault.getConfig("useMarkdownLinks"),
// This entry is not in Obsidian's built-in "Show debug info" command.
// It replaces the "Base theme" entry for identifying the color scheme even if it's set to be "adapt to system"
- "Base color scheme": document.body.hasClass("theme-dark")
+ "Base color scheme": activeDocument.body.hasClass("theme-dark")
? "dark"
: "light",
// This entry is not in Obsidian's built-in "Show debug info" command
@@ -38,39 +38,66 @@ export async function getObsidianDebugInfo(app: App) {
"Snippets enabled": numSnippets,
"Plugins installed": Object.keys(app.plugins.manifests).length,
"Plugins enabled": Object.values(plugins).map(
- (plugin) => `${plugin!.manifest.name} v${plugin!.manifest.version}`
+ (plugin) => `${plugin.manifest.name} v${plugin.manifest.version}`,
),
};
}
-export async function getWebViewVersion() {
+// Capacitor plugins return untyped results; use a concise interface for the shape we access
+interface CapacitorDeviceInfo {
+ webViewVersion?: string;
+ platform?: string;
+ osVersion?: string;
+ manufacturer?: string;
+ model?: string;
+}
+interface CapacitorAppInfo {
+ version?: string;
+ build?: string;
+}
+
+export async function getWebViewVersion(): Promise {
if (!Platform.isMobileApp) {
return null;
}
- const deviceInfo = await window.Capacitor.Plugins.Device.getInfo();
- return deviceInfo.webViewVersion;
+ const plugins = (window.Capacitor as Record)
+ .Plugins as Record;
+ const deviceInfo = await (
+ plugins.Device as { getInfo: () => Promise }
+ ).getInfo();
+ return deviceInfo.webViewVersion ?? null;
}
/**
* Get the information about the Obsidian app and the system.
* This is the same as the "SYSTEM INFO" section in the result of the "Show debug info" command.
*/
-export async function getSystemInfo(): Promise {
+export async function getSystemInfo(): Promise> {
if (window.electron) {
- // eslint-disable-next-line @typescript-eslint/no-require-imports
+ // eslint-disable-next-line @typescript-eslint/no-require-imports, import/no-nodejs-modules, no-undef
const os = require("os") as typeof import("os");
+ const electron = window.electron;
+ const ipcRenderer = electron.ipcRenderer as {
+ sendSync: (channel: string) => string;
+ };
+ const remote = electron.remote as { app: { getVersion: () => string } };
return {
- "Obsidian version": window.electron.ipcRenderer.sendSync("version"),
- // @ts-ignore
- "Installer version": window.electron.remote.app.getVersion(),
+ "Obsidian version": ipcRenderer.sendSync("version"),
+ "Installer version": remote.app.getVersion(),
"Operating system": os.version() + " " + os.release(),
};
}
- const appInfo = await window.Capacitor.Plugins.App.getInfo();
- const deviceInfo = await window.Capacitor.Plugins.Device.getInfo();
- const info: any = {
+ const apps = (window.Capacitor as Record)
+ .Plugins as Record;
+ const appInfo = await (
+ apps.App as { getInfo: () => Promise }
+ ).getInfo();
+ const deviceInfo = await (
+ apps.Device as { getInfo: () => Promise }
+ ).getInfo();
+ const info: Record = {
"Obsidian version": `${appInfo.version} (${appInfo.build})`,
"API version": apiVersion,
"Operating system": `${deviceInfo.platform} ${deviceInfo.osVersion} (${deviceInfo.manufacturer} ${deviceInfo.model})`,
diff --git a/src/services/OpenModals.ts b/src/services/OpenModals.ts
index 2a1d658a..6b301273 100644
--- a/src/services/OpenModals.ts
+++ b/src/services/OpenModals.ts
@@ -71,16 +71,22 @@ export const openAddNewTaskInCurrentFileModal = (
app: App,
plugin: TaskBoard,
activeFile: TFile,
- cursorPosition?: { line: number; ch: number } | undefined,
+ cursorPosition?: { line: number; ch: number },
) => {
const AddTaskModal = new TaskEditorModal(
plugin,
- (newTask: taskItem, quickAddPluginChoice: string) => {
- addTaskInNote(plugin, newTask, true, cursorPosition).then(
+ async (newTask: taskItem, quickAddPluginChoice: string) => {
+ void addTaskInNote(plugin, newTask, true, cursorPosition).then(
(newId) => {
- plugin.realTimeScanner.processAllUpdatedFiles(
- newTask.filePath,
- );
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(newTask.filePath)
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openAddNewTaskInCurrentFileModal",
+ );
+ });
},
);
@@ -96,7 +102,6 @@ export const openAddNewTaskInCurrentFileModal = (
// @todo - I dont think I need to emit this here, since the processAllUpdatedFiles function will refresh the file and then it will emit this same signal anyways. And, until that, we dont have to refresh the view at all.
eventEmitter.emit("SOFT_REFRESH");
cursorPosition = undefined;
- return true;
},
false,
true,
@@ -120,11 +125,13 @@ export const openAddNewTaskModal = (plugin: TaskBoard, activeFile?: TFile) => {
if (communityPlugins.isQuickAddPluginIntegrationEnabled()) {
// Call the API of QuickAdd plugin and pass the formatted content.
let completeTask = await getFormattedTaskContent(newTask);
- const { formattedTaskContent, newId } =
- await addIdToTaskContent(plugin, completeTask);
+ const { formattedTaskContent } = await addIdToTaskContent(
+ plugin,
+ completeTask,
+ );
completeTask = formattedTaskContent;
- (communityPlugins.quickAddPlugin as any)?.api.executeChoice(
+ await communityPlugins.quickAddPlugin?.api.executeChoice(
quickAddPluginChoice,
{
value: completeTask + "\n",
@@ -132,9 +139,15 @@ export const openAddNewTaskModal = (plugin: TaskBoard, activeFile?: TFile) => {
);
} else {
await addTaskInNote(plugin, newTask, false).then((newId) => {
- plugin.realTimeScanner.processAllUpdatedFiles(
- newTask.filePath,
- );
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(newTask.filePath)
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openAddNewTaskModal",
+ );
+ });
});
}
@@ -167,7 +180,7 @@ export const openAddNewTaskNoteModal = (app: App, plugin: TaskBoard) => {
async (
newTask: taskItem,
quickAddPluginChoice: string,
- noteContent: string | undefined,
+ noteContent?: string,
) => {
if (!noteContent) {
bugReporterManagerInsatance.showNotice(
@@ -201,7 +214,7 @@ export const openAddNewTaskNoteModal = (app: App, plugin: TaskBoard) => {
}
// Required for Obsidian to create the folder and index it.
- sleep(200);
+ await sleep(200);
}
await plugin.app.vault
@@ -211,10 +224,18 @@ export const openAddNewTaskNoteModal = (app: App, plugin: TaskBoard) => {
plugin.realTimeScanner.onFileModified(
newTask.filePath,
);
- sleep(1000).then(() => {
+ window.setTimeout(() => {
// TODO : Is 1 seconds really required ?
- plugin.realTimeScanner.processAllUpdatedFiles();
- });
+ plugin.realTimeScanner
+ .processAllUpdatedFiles()
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openAddNewTaskNoteModal",
+ );
+ });
+ }, 1000);
});
} else {
const newName = getCurrentLocalDateTimeString();
@@ -238,9 +259,18 @@ export const openAddNewTaskNoteModal = (app: App, plugin: TaskBoard) => {
plugin.realTimeScanner.onFileModified(
`Copy-${newTask.filePath}`,
);
- sleep(1000).then(() => {
- plugin.realTimeScanner.processAllUpdatedFiles();
- });
+
+ window.setTimeout(() => {
+ plugin.realTimeScanner
+ .processAllUpdatedFiles()
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openAddNewTaskNoteModal",
+ );
+ });
+ }, 1000);
});
}
} catch (error) {
@@ -250,7 +280,6 @@ export const openAddNewTaskNoteModal = (app: App, plugin: TaskBoard) => {
"OpenModals.ts/openAddNewTaskNoteModal/callback()",
);
new Notice(t("error-creating-task-note"), 5000);
- return false;
}
}
@@ -266,13 +295,13 @@ export const openAddNewTaskNoteModal = (app: App, plugin: TaskBoard) => {
AddTaskModal.open();
};
-export const openEditTaskModal = async (
+export const openEditTaskModal = (
plugin: TaskBoard,
existingTask: taskItem,
) => {
const EditTaskModal = new TaskEditorModal(
plugin,
- (updatedTask: taskItem) => {
+ async (updatedTask: taskItem) => {
let eventData: UpdateTaskEventData = {
taskID: existingTask.id,
state: true,
@@ -281,14 +310,24 @@ export const openEditTaskModal = async (
updatedTask.filePath = existingTask.filePath;
// Update the task in the file and JSON
- updateTaskInFile(plugin, updatedTask, existingTask).then(
- (newId) => {
- plugin.realTimeScanner.processAllUpdatedFiles(
- updatedTask.filePath,
- existingTask.id,
- );
- },
- );
+ updateTaskInFile(plugin, updatedTask, existingTask)
+ .then((newId) => {
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(
+ updatedTask.filePath,
+ existingTask.id,
+ )
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openEditTaskModal",
+ );
+ });
+ })
+ .catch((error) => {
+ // No need to handle here, the function already handles this.
+ });
// DEPRECATED : See notes from //src/utils/TaskItemCacheOperations.ts file
// updateTaskInJson(plugin, updatedTask);
@@ -332,29 +371,45 @@ export const openEditTaskNoteModal = (
plugin,
updatedTask,
).then(() => {
- sleep(1000).then(() => {
+ window.setTimeout(() => {
// TODO : Is 1 sec really required ?
// This is required to rescan the updated file and refresh the board.
- plugin.realTimeScanner.processAllUpdatedFiles(
- updatedTask.filePath,
- existingTask.id,
- );
- });
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(
+ updatedTask.filePath,
+ existingTask.id,
+ )
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openEditTaskNoteModal",
+ );
+ });
+ }, 1000);
});
} else {
- writeDataToVaultFile(
+ await writeDataToVaultFile(
plugin,
updatedTask.filePath,
newTaskContent,
).then(() => {
- sleep(1000).then(() => {
+ window.setTimeout(() => {
// TODO : Is 1 sec really required ?
// This is required to rescan the updated file and refresh the board.
- plugin.realTimeScanner.processAllUpdatedFiles(
- updatedTask.filePath,
- existingTask.id,
- );
- });
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(
+ updatedTask.filePath,
+ existingTask.id,
+ )
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openEditTaskNoteModal",
+ );
+ });
+ }, 1000);
});
}
@@ -561,7 +616,7 @@ export const openScanFiltersModal = (
filterType: keyof ScanFilters,
onSave: (scanFilters: string[]) => void,
) => {
- new ScanFilterModal(plugin, filterType, async (newValues) => {
+ new ScanFilterModal(plugin, filterType, (newValues) => {
onSave(newValues);
}).open();
};
@@ -654,7 +709,7 @@ export const openEditTaskView = async (
matchLeaf.setEphemeralState({ viewTaskId: taskId });
// Reveal the leaf
- workspace.revealLeaf(matchLeaf);
+ await workspace.revealLeaf(matchLeaf);
return leaves[0];
} else {
@@ -695,14 +750,22 @@ export const openEditTaskView = async (
) => {
if (!isTaskNote) {
// Update the task in the file and JSON
- updateTaskInFile(
+ await updateTaskInFile(
plugin,
updatedTask,
task,
).then((newId) => {
- plugin.realTimeScanner.processAllUpdatedFiles(
- updatedTask.filePath,
- );
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(
+ updatedTask.filePath,
+ )
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openEditTaskView",
+ );
+ });
});
} else {
if (!updatedNoteContent) {
@@ -711,28 +774,43 @@ export const openEditTaskView = async (
plugin,
updatedTask,
).then(() => {
- // This is required to rescan the updated file and refresh the board.
- sleep(1000).then(() => {
+ window.setTimeout(() => {
// TODO : Is 1 sec really required ?
// This is required to rescan the updated file and refresh the board.
- plugin.realTimeScanner.processAllUpdatedFiles(
- updatedTask.filePath,
- );
- });
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(
+ updatedTask.filePath,
+ )
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openEditTaskView",
+ );
+ });
+ }, 1000);
});
} else {
- writeDataToVaultFile(
+ await writeDataToVaultFile(
plugin,
updatedTask.filePath,
updatedNoteContent,
).then(() => {
- sleep(1000).then(() => {
+ window.setTimeout(() => {
// TODO : Is 1 sec really required ?
// This is required to rescan the updated file and refresh the board.
- plugin.realTimeScanner.processAllUpdatedFiles(
- updatedTask.filePath,
- );
- });
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(
+ updatedTask.filePath,
+ )
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openEditTaskView",
+ );
+ });
+ }, 1000);
});
}
}
@@ -756,13 +834,23 @@ export const openEditTaskView = async (
) => {
if (!isTaskNote) {
// Update the task in the file and JSON
- updateTaskInFile(plugin, updatedTask, task).then(
- (newId) => {
- plugin.realTimeScanner.processAllUpdatedFiles(
+ void updateTaskInFile(
+ plugin,
+ updatedTask,
+ task,
+ ).then((newId) => {
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(
updatedTask.filePath,
- );
- },
- );
+ )
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openEditTaskView",
+ );
+ });
+ });
} else {
if (!updatedNoteContent) {
// Update frontmatter with task properties
@@ -770,27 +858,41 @@ export const openEditTaskView = async (
plugin,
updatedTask,
).then(() => {
- // This is required to rescan the updated file and refresh the board.
- sleep(1000).then(() => {
- // This is required to rescan the updated file and refresh the board.
- plugin.realTimeScanner.processAllUpdatedFiles(
- updatedTask.filePath,
- );
- });
+ window.setTimeout(() => {
+ // This delay is required to rescan the updated file and refresh the board.
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(
+ updatedTask.filePath,
+ )
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openEditTaskView",
+ );
+ });
+ }, 1000);
});
} else {
- writeDataToVaultFile(
+ void writeDataToVaultFile(
plugin,
updatedTask.filePath,
updatedNoteContent,
).then(() => {
- sleep(1000).then(() => {
- // TODO : Is 1 sec really required ?
- // This is required to rescan the updated file and refresh the board.
- plugin.realTimeScanner.processAllUpdatedFiles(
- updatedTask.filePath,
- );
- });
+ window.setTimeout(() => {
+ // This delay is required to rescan the updated file and refresh the board.
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(
+ updatedTask.filePath,
+ )
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "OpenModals.ts/openEditTaskView",
+ );
+ });
+ }, 1000);
});
}
}
@@ -818,7 +920,7 @@ export const openEditTaskView = async (
});
// Reveal the leaf
- workspace.revealLeaf(leaf);
+ await workspace.revealLeaf(leaf);
}
return leaf;
}
@@ -831,7 +933,7 @@ export const openDateInputModal = async (
initialValue?: string,
) => {
const datePicker = new DatePickerModal(plugin, dateName, initialValue);
- datePicker.onDateSelected = async (date: string) => {
+ datePicker.onDateSelected = (date: string) => {
// newTask[dateType] = date;
// updateTaskItemDate(plugin, newTask, dateType, date);
onSelect(date);
diff --git a/src/services/TaskSelectorWithCreateModal.ts b/src/services/TaskSelectorWithCreateModal.ts
index bbb4778a..e171fb52 100644
--- a/src/services/TaskSelectorWithCreateModal.ts
+++ b/src/services/TaskSelectorWithCreateModal.ts
@@ -212,7 +212,7 @@ export class TaskSelectorWithCreateModal extends SuggestModal {
taskData["id"] = generateRandomStringId();
let completeTask: taskItem = taskData as taskItem;
// Create the task
- const result = await createNewInlineTask(this.plugin, completeTask);
+ await createNewInlineTask(this.plugin, completeTask);
new Notice(
t("A new task created successfully : ", {
diff --git a/src/services/editor_extensions/GutterMarker.ts b/src/services/editor_extensions/GutterMarker.ts
index 4b93aee3..6a2a07d1 100644
--- a/src/services/editor_extensions/GutterMarker.ts
+++ b/src/services/editor_extensions/GutterMarker.ts
@@ -10,6 +10,7 @@ import { syntaxTree, tokenClassNodeProp } from "@codemirror/language";
import TaskBoard from "../../../main.js";
import { TaskEditorModal } from "../../modals/TaskEditorModal.js";
import { isTaskLine } from "../../utils/CheckBoxUtils.js";
+import { t } from "i18next";
// Task icon marker
class TaskGutterMarker extends GutterMarker {
@@ -22,7 +23,7 @@ class TaskGutterMarker extends GutterMarker {
text: string,
lineNum: number,
view: EditorView,
- plugin: TaskBoard
+ plugin: TaskBoard,
) {
super();
this.text = text;
@@ -37,12 +38,12 @@ class TaskGutterMarker extends GutterMarker {
// ".cm-scroller"
// ) as HTMLDivElement;
const scroller = this.view.scrollDOM;
- if (scroller) scroller.style.paddingLeft = "0";
+ if (scroller) scroller.addClass("tb_padding_left_0");
const markerEl = createEl("div");
const button = new ExtraButtonComponent(markerEl)
.setIcon("edit")
- .setTooltip("Edit Task")
+ .setTooltip(t("edit-task"))
.onClick(() => {
const lineText = this.view.state.doc.line(this.lineNum).text;
const file = this.plugin.app.workspace.getActiveFile();
@@ -52,7 +53,7 @@ class TaskGutterMarker extends GutterMarker {
// Check if the line is in a codeblock or frontmatter
const line = this.view.state.doc.line(this.lineNum);
const syntaxNode = syntaxTree(this.view.state).resolveInner(
- line.from + 1
+ line.from + 1,
);
const nodeProps = syntaxNode.type.prop(tokenClassNodeProp);
@@ -67,9 +68,9 @@ class TaskGutterMarker extends GutterMarker {
}
// Create a save callback for the modal
- const saveTask = (
- updatedTask: any,
- quickAddPluginChoice: string
+ const saveTask = async (
+ updatedTask: unknown,
+ quickAddPluginChoice: string,
) => {
// This will be handled by the existing task saving logic
// The modal will update the file content automatically
@@ -84,7 +85,7 @@ class TaskGutterMarker extends GutterMarker {
true, // activeNote
true, // taskExists (we're editing an existing task)
undefined, // task - let the modal parse it from the line
- file.path // filePath
+ file.path, // filePath
);
modal.open();
return true;
@@ -114,7 +115,7 @@ export function taskGutterExtension(app: App, plugin: TaskBoard): Extension {
// Check if the line is in a codeblock or frontmatter
const syntaxNode = syntaxTree(view.state).resolveInner(
- line.from + 1
+ line.from + 1,
);
const nodeProps = syntaxNode.type.prop(tokenClassNodeProp);
diff --git a/src/services/editor_extensions/PropertiesHiding.ts b/src/services/editor_extensions/PropertiesHiding.ts
index 018e3494..eaeaf852 100644
--- a/src/services/editor_extensions/PropertiesHiding.ts
+++ b/src/services/editor_extensions/PropertiesHiding.ts
@@ -32,7 +32,7 @@ class HiddenPropertyWidget extends WidgetType {
}
toDOM() {
- const span = document.createElement("span");
+ const span = activeDocument.createElement("span");
span.className = "taskboard-hidden-property-placeholder";
span.textContent = "...";
span.title = `Hidden: ${this.content}`;
@@ -101,7 +101,7 @@ export function getTaskPropertyRegexPatterns(
.TaskFormatRegularExpWithGlobal.dependsOnRegex;
case taskPropertiesNames.Reminder:
- return /\(\@(\d{4}-\d{2}-\d{2}( \d{2}:\d{2})?)\)/g;
+ return /\(@(\d{4}-\d{2}-\d{2}( \d{2}:\d{2})?)\)/g;
default:
return /(?:)/g;
diff --git a/src/services/subModules.ts b/src/services/subModules.ts
index 3b553edb..c29b1711 100644
--- a/src/services/subModules.ts
+++ b/src/services/subModules.ts
@@ -14,4 +14,6 @@ export class TaskBoardSubmodule {
get settings(): PluginDataJson {
return this.plugin.settings;
}
+
+ api: unknown;
}
diff --git a/src/services/tasks-plugin/helpers.ts b/src/services/tasks-plugin/helpers.ts
index 3cad0c40..2f7a92f5 100644
--- a/src/services/tasks-plugin/helpers.ts
+++ b/src/services/tasks-plugin/helpers.ts
@@ -4,11 +4,21 @@ import TaskBoard from "../../../main.js";
import { CustomStatus } from "../../interfaces/GlobalSettings.js";
import { taskItem } from "../../interfaces/TaskItem.js";
import { bugReporterManagerInsatance } from "../../managers/BugReporter.js";
-import { getFormattedTaskContent, addIdToTaskContent } from "../../utils/taskLine/TaskContentFormatter.js";
+import {
+ getFormattedTaskContent,
+ addIdToTaskContent,
+} from "../../utils/taskLine/TaskContentFormatter.js";
import { replaceOldTaskWithNewTask } from "../../utils/taskLine/TaskLineUtils.js";
import { eventEmitter } from "../EventEmitter.js";
import { TasksPluginApi } from "./api.js";
+type TasksPluginStatusSettings = {
+ statusSettings?: {
+ coreStatuses?: CustomStatus[];
+ customStatuses?: CustomStatus[];
+ };
+};
+
export async function isTasksPluginEnabled(plugin: TaskBoard) {
try {
const tasksPluginO = new TasksPluginApi(plugin);
@@ -37,17 +47,21 @@ export async function fetchTasksPluginCustomStatuses(
// Read the file content
const data: string = await plugin.app.vault.adapter.read(path);
- const parsedData = JSON.parse(data);
+ // Treat the plugin data as an explicit structure instead of relying on
+ // the implicit `any` that JSON.parse() introduces.
+ const parsedData = JSON.parse(data) as unknown;
+ const statusSettings = (parsedData as Partial)
+ .statusSettings;
// Extract coreStatuses from the JSON
const coreStatuses: CustomStatus[] =
- parsedData?.statusSettings?.coreStatuses || [];
+ statusSettings?.coreStatuses ?? [];
// Extract customStatuses from the JSON
const customStatuses: CustomStatus[] =
- parsedData?.statusSettings?.customStatuses || [];
+ statusSettings?.customStatuses ?? [];
- const statusMap = new Map();
+ const statusMap = new Map();
coreStatuses.forEach((status: CustomStatus) =>
statusMap.set(status.symbol, status),
);
@@ -99,7 +113,7 @@ export async function openTasksPluginEditModal(
// Prepare the updated task block
const completeOldTaskContent = await getFormattedTaskContent(oldTask);
if (completeOldTaskContent === "")
- throw "getSanitizedTaskContent returned empty string";
+ throw new Error("getSanitizedTaskContent returned empty string");
if (tasksPlugin.isTasksPluginEnabled()) {
const tasksPluginApiOutput = await tasksPlugin.editTaskLineModal(
@@ -135,7 +149,7 @@ export async function openTasksPluginEditModal(
completeOldTaskContent,
newContent,
);
- } else if ((twoTaskTitles.length = 1)) {
+ } else if (twoTaskTitles.length === 1) {
const { formattedTaskContent, newId } =
await addIdToTaskContent(plugin, tasksPluginApiOutput);
const tasksPluginApiOutputWithId = formattedTaskContent;
@@ -150,7 +164,7 @@ export async function openTasksPluginEditModal(
completeOldTaskContent,
newContent,
);
- } else if ((twoTaskTitles.length = 2)) {
+ } else if (twoTaskTitles.length === 2) {
newContent = `${twoTaskTitles[0]}${
oldTask.body.length > 0
? `\n${oldTask.body.join("\n")}`
@@ -177,8 +191,16 @@ export async function openTasksPluginEditModal(
return;
}
- plugin.realTimeScanner.processAllUpdatedFiles(oldTask.filePath);
- setTimeout(() => {
+ plugin.realTimeScanner
+ .processAllUpdatedFiles(oldTask.filePath)
+ .catch((error) => {
+ bugReporterManagerInsatance.addToLogs(
+ 217,
+ String(error),
+ "helpers.ts/openTasksPluginEditModal",
+ );
+ });
+ window.setTimeout(() => {
// This event emmitter will stop any loading animation of ongoing task-card.
eventEmitter.emit("UPDATE_TASK", {
taskID: oldTask.id,
diff --git a/src/settings/2_x_x_Migrations/LegacyInterfacesAndTypings.ts b/src/settings/2_x_x_Migrations/LegacyInterfacesAndTypings.ts
index be6b87f8..9d988f19 100644
--- a/src/settings/2_x_x_Migrations/LegacyInterfacesAndTypings.ts
+++ b/src/settings/2_x_x_Migrations/LegacyInterfacesAndTypings.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-deprecated */
import {
ColumnData,
Filter,
@@ -12,6 +13,14 @@ import {
mapViewArrowDirection,
mapViewScrollAction,
mapViewEdgeType,
+ RibbonIconActions,
+ taskPropertyFormatOptions,
+ scanModeOptions,
+ taskCardStyleNames,
+ mapViewBackgrounVariantTypes,
+ mapViewNodeMapOrientation,
+ NotificationService,
+ UniversalDateOptions,
} from "../../interfaces/Enums.js";
import {
ScanFilters,
@@ -19,6 +28,7 @@ import {
CustomStatus,
FrontmatterFormattingInterface,
TaskBoardAction,
+ taskBoardFilesRegistryType,
} from "../../interfaces/GlobalSettings.js";
export type BoardLegacy = {
@@ -49,7 +59,7 @@ export interface globalSettingsDataLegacy {
scanFilters: ScanFilters;
firstDayOfWeek?: string;
ignoreFileNameDates: boolean;
- taskPropertyFormat: string;
+ taskPropertyFormat: taskPropertyFormatOptions;
dateFormat: string;
dateTimeFormat: string;
dailyNotesPluginComp: boolean;
@@ -62,16 +72,16 @@ export interface globalSettingsDataLegacy {
autoAddCancelledDate: boolean;
// scanVaultAtStartup: boolean; -- @deprecated v1.9.0 - A better approach has been used using showModifiedFilesNotice feature.
showModifiedFilesNotice: boolean;
- scanMode: string;
+ scanMode: scanModeOptions;
columnWidth: string;
visiblePropertiesList: string[];
- taskCardStyle: string;
+ taskCardStyle: taskCardStyleNames;
showVerticalScroll: boolean;
dragAutoScrollEdgePercent: number;
tagColors: TagColor[];
editButtonAction: EditButtonMode;
doubleClickCardToEdit: EditButtonMode;
- universalDate: string;
+ universalDate: UniversalDateOptions;
customStatuses: CustomStatus[];
showTaskWithoutMetadata: boolean;
tagColorsType: TagColorType;
@@ -91,7 +101,7 @@ export interface globalSettingsDataLegacy {
frontmatterFormatting: FrontmatterFormattingInterface[];
showFrontmatterTagsOnCards: boolean;
tasksCacheFilePath: string;
- notificationService: string;
+ notificationService: NotificationService;
actions: TaskBoardAction[];
searchQuery?: string;
hiddenTaskProperties: taskPropertiesNames[];
@@ -100,15 +110,17 @@ export interface globalSettingsDataLegacy {
experimentalFeatures: boolean;
safeGuardFeature: boolean;
lastViewHistory: {
- viewedType: string;
- boardIndex: number;
+ viewedType?: string;
+ boardIndex?: number;
settingTab: number;
taskId?: string;
+ // New setting introduced in 2.x.x series
+ boardFilePath: string;
};
boundTaskCompletionToChildTasks: boolean;
mapView: {
- background: string;
- mapOrientation: string;
+ background: mapViewBackgrounVariantTypes;
+ mapOrientation: mapViewNodeMapOrientation;
optimizedRender: boolean;
arrowDirection: mapViewArrowDirection;
animatedEdges: boolean;
@@ -117,6 +129,12 @@ export interface globalSettingsDataLegacy {
renderVisibleNodes: boolean;
edgeType: mapViewEdgeType;
};
+
+ // These are new settings introduced in v2.x.x, hence adding here for the setting synchronization utility to work properly.
+ taskBoardFilesRegistry: taskBoardFilesRegistryType;
+ enableDragnDropTouch: boolean;
+ filtersWarehouse: Filter[];
+ ribbonIconAction: RibbonIconActions;
}
export interface PluginDataJsonLegacy {
diff --git a/src/settings/2_x_x_Migrations/MigrationModal.tsx b/src/settings/2_x_x_Migrations/MigrationModal.tsx
index cf529809..67a04c10 100644
--- a/src/settings/2_x_x_Migrations/MigrationModal.tsx
+++ b/src/settings/2_x_x_Migrations/MigrationModal.tsx
@@ -40,7 +40,7 @@ const MigrationModalContent: React.FC<{
setLogs((prev) => [...prev, logEntry]);
// Auto-scroll to bottom
- setTimeout(() => {
+ window.setTimeout(() => {
if (terminalRef.current) {
terminalRef.current.scrollTop = terminalRef.current.scrollHeight;
}
@@ -130,7 +130,7 @@ const MigrationModalContent: React.FC<{
}
// Show Notice to reload Obsidian and make the "Reload Obsidian" button visible
- showReloadObsidianNotice(plugin);
+ void showReloadObsidianNotice(plugin);
// Capture all logs after migration completes and all logs are added
result.logs = [...logsRef.current];
@@ -213,7 +213,7 @@ const MigrationModalContent: React.FC<{