Merge remote-tracking branch 'upstream/main' into temp

Author: byq77

main.ts

@@ -28,7 +28,10 @@ import vaultScanner, {
 } from "src/managers/VaultScanner";
 import { TaskBoardIcon } from "src/interfaces/Icons";
 import { TaskBoardSettingTab } from "./src/settings/TaskBoardSettingTab";
-import { VIEW_TYPE_TASKBOARD } from "src/interfaces/Constants";
+import {
+	newReleaseVersion,
+	VIEW_TYPE_TASKBOARD,
+} from "src/interfaces/Constants";
 import { isReminderPluginInstalled } from "src/services/CommunityPlugins";
 import { loadTranslationsOnStartup, t } from "src/utils/lang/helper";
 import { TaskBoardApi } from "src/taskboardAPIs";
@@ -949,15 +952,18 @@ export default class TaskBoard extends Plugin {
 
 	private runOnPluginUpdate() {
 		// Check if the plugin version has changed
-		const currentVersion = "1.8.2"; // Change this whenever you will going to release a new version.
-		const runMandatoryScan = false; // Change this whenever you will release a major version which requires user to scan the whole vault again. And to enable the notification.
+		const currentVersion = newReleaseVersion; // Change this whenever you will going to release a new version.
+		const runMandatoryScan = true; // Change this whenever you will release a major version which requires user to scan the whole vault again. And to enable the notification.
 		const previousVersion = this.settings.version;
 
 		if (previousVersion == "" || currentVersion !== previousVersion) {
 			// make the localStorage flag, 'manadatoryScan' to True
 
 			if (previousVersion === "" || runMandatoryScan) {
 				localStorage.setItem("manadatoryScan", "true");
+				const smallMessage =
+					"Even being a minor release, this new version of Task Board requires a re-scan of your vault. Kindly re-scan using the top-right button in the task board tab.";
+				new Notice(smallMessage, 0);
 			}
 
 			this.settings.version = currentVersion;

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "task-board",
 	"name": "Task Board",
-	"version": "1.8.2",
+	"version": "1.8.3",
 	"minAppVersion": "1.4.13",
 	"description": "Manage all your tasks throughout your vault from a single board and much more...",
 	"author": "Atmanand Gauns",

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "task-board",
-	"version": "1.8.2",
+	"version": "1.8.3",
 	"description": "An Obsidian plugin to manage small to large projects using tasks from the whole vault on a centralized board using various kinds of views like Kanban, map, list, etc.",
 	"main": "main.js",
 	"type": "module",

package.json

@@ -2,7 +2,7 @@
 // React component for adding or editing tasks, usable in both modals and views
 
 import { Component, Keymap, Platform, TFile, UserEvent, debounce, normalizePath } from "obsidian";
-import { FaTimes } from 'react-icons/fa';
+import { FaTimes, FaTrash } from 'react-icons/fa';
 import React, { useEffect, useRef, useState } from "react";
 import { cursorLocation, taskItem } from "src/interfaces/TaskItem";
 
@@ -243,7 +243,11 @@ export const AddOrEditTaskRC: React.FC<{
 	// Automatically update end time if only start time is provided
 	const handleCompleteTimeChange = (updatedStartTime: string, updatedEndTime: string) => {
 		let newTime = '';
-		if (updatedStartTime && !updatedEndTime) {
+		if (!updatedStartTime) {
+			setStartTime("");
+			setEndTime("");
+			setNewTime("");
+		} else if (updatedStartTime && !updatedEndTime) {
 			const [hours, minutes] = updatedStartTime.split(':');
 			const newEndTime = `${String(Number(hours) + 1).padStart(2, '0')}:${minutes}`;
 			setEndTime(newEndTime);
@@ -527,7 +531,10 @@ export const AddOrEditTaskRC: React.FC<{
 	// ------------------ Tab Switching and other components ------------------
 
 	const [activeTab, setActiveTab] = useState<'liveEditor' | 'rawEditor'>('liveEditor');
-	const handleTabSwitch = (tab: 'liveEditor' | 'rawEditor') => setActiveTab(tab);
+	const handleTabSwitch = (tab: 'liveEditor' | 'rawEditor') => {
+		setActiveTab(tab);
+		// setIsEditorContentChanged(true);
+	};
 
 	const filePathRef = useRef<HTMLInputElement>(null);
 	const communityPlugins = new CommunityPlugins(plugin);
@@ -567,7 +574,7 @@ export const AddOrEditTaskRC: React.FC<{
 
 			plugin.realTimeScanning.processAllUpdatedFiles(filePath).then(() => {
 				onClose();
-				sleep(2000).then(() => {
+				sleep(1000).then(() => {
 					eventEmitter.emit("SWITCH_VIEW", 'map');
 				});
 			});
@@ -908,14 +915,14 @@ export const AddOrEditTaskRC: React.FC<{
 			}
 			applyIdToTaskInNote(plugin, selectedTask).then((newId) => {
 				const getUpdatedDependsOnIds = (prev: string[]) => {
-					if (!prev.includes(task.legacyId ? task.legacyId : String(task.id))) {
+					if (!prev.includes(task.legacyId ? task.legacyId : task.id)) {
 						if (newId === undefined && !selectedTask?.legacyId) {
 							bugReporter(plugin, "Both newId and legacyId are undefined", `Both newId and legacyId are undefined for the selected task titled ${selectedTask.title}.`, "AddOrEditTaskModal.tsx/EditTaskContent/childTaskInputRef useEffect/getUpdatedDependsOnIds");
 							return [...prev, String(plugin.settings.data.globalSettings.uniqueIdCounter)];
 						} else if (newId === undefined) {
 							return [...prev, selectedTask.legacyId];
 						} else if (newId) {
-							return [...prev, String(newId)];
+							return [...prev, newId];
 						}
 					}
 					return prev;
@@ -968,7 +975,7 @@ export const AddOrEditTaskRC: React.FC<{
 	// Render child task titles when childTasks changes
 	useEffect(() => {
 		childTasks.forEach((childTask, index) => {
-			const element = childTaskTitleRefs.current[childTask.legacyId ? childTask.legacyId : String(childTask.id)];
+			const element = childTaskTitleRefs.current[childTask.legacyId ? childTask.legacyId : childTask.id];
 			if (!element) return;
 
 			// Clear previous content before rendering
@@ -988,7 +995,7 @@ export const AddOrEditTaskRC: React.FC<{
 
 	const handleOpenChildTaskModal = async (event: React.MouseEvent, taskId: string) => {
 		event.stopPropagation();
-		const childTask = childTasks.find(t => String(t.legacyId) === taskId);
+		const childTask = childTasks.find(t => t.legacyId === taskId);
 		if (!childTask) {
 			bugReporter(plugin, "Child task not found", `The child task with ID ${taskId} was not found in pending tasks.`, "AddOrEditTaskModal.tsx/EditTaskContent/handleOpenChildTaskModal");
 			return;
@@ -1157,9 +1164,6 @@ export const AddOrEditTaskRC: React.FC<{
 									className="EditTaskModalBodyDescription"
 									value={formattedTaskContent}
 									onChange={handleTextareaChange}
-									onBlur={() => {
-										setIsEditorContentChanged(true);
-									}}
 									placeholder={t("body-content")}
 									style={{ display: activeTab === 'rawEditor' ? 'block' : 'none', width: '100%' }}
 								/>
@@ -1228,7 +1232,10 @@ export const AddOrEditTaskRC: React.FC<{
 
 						{/* Task Time Input */}
 						<div className="EditTaskModalHomeField">
-							<label className="EditTaskModalHomeFieldTitle">{t("start-time")}</label>
+							<div className="EditTaskModalHomeFieldTitleContainer">
+								<label className="EditTaskModalHomeFieldTitle">{t("start-time")}</label>
+								<FaTrash onClick={() => handleCompleteTimeChange("", "")} size={12} />
+							</div>
 							<input className="EditTaskModalHomeTimeInput" type="time" value={startTime} onChange={(e) => handleStartTimeChange(e.target.value)} />
 						</div>
 						<div className="EditTaskModalHomeField">

src/components/AddOrEditTaskRC.tsx

@@ -110,7 +110,7 @@ export class FilterConfigModal extends Modal {
 				text: t("no-saved-filter-configurations"),
 			});
 			new Setting(contentEl).addButton((btn) => {
-				btn.setButtonText(t("Close")).onClick(() => {
+				btn.setButtonText(t("close")).onClick(() => {
 					this.close();
 				});
 			});

src/components/BoardFilters/FilterConfigModal.ts

@@ -325,13 +325,12 @@ const Column: React.FC<ColumnProps> = ({
 					</div>
 					<div className={`tasksContainer${plugin.settings.data.globalSettings.showVerticalScroll ? '' : '-SH'}`}>
 						{tasks.length > 0 ? (
-							tasks.map((task, index = task.id) => {
+							tasks.map((task, index) => {
 								return (
 									<div key={index} className="taskItemFadeIn">
 										<TaskItem
 											key={index}
 											plugin={plugin}
-											taskKey={index}
 											task={task}
 											columnIndex={columnIndex}
 											activeBoardSettings={activeBoardData}

src/components/KanbanView/Column.tsx

@@ -36,7 +36,7 @@ const LazyColumn: React.FC<LazyColumnProps> = ({
 	columnData,
 	tasksForThisColumn,
 }) => {
-	if (activeBoardData?.hideEmptyColumns && (tasksForThisColumn === undefined || tasksForThisColumn.length === 0)) {
+	if (activeBoardData?.hideEmptyColumns && (tasksForThisColumn === undefined || tasksForThisColumn?.length === 0)) {
 		return null; // Don't render the column if it has no tasks and empty columns are hidden
 	}
 
@@ -54,7 +54,9 @@ const LazyColumn: React.FC<LazyColumnProps> = ({
 	const allTasks = useMemo(() => tasksForThisColumn, [tasksForThisColumn]);
 	// Memoize visible tasks based on count
 	const visibleTasks = useMemo(() => {
-		return allTasks.slice(0, visibleTaskCount);
+		if (allTasks && allTasks?.length < 1) return [];
+
+		return allTasks?.slice(0, visibleTaskCount) ?? [];
 	}, [allTasks, visibleTaskCount]);
 
 	// Reset visible count when tasks change (e.g., switching boards or filtering)
@@ -71,13 +73,13 @@ const LazyColumn: React.FC<LazyColumnProps> = ({
 		const scrollPercentage = ((scrollTop + clientHeight) / scrollHeight) * 100;
 
 		// Load more tasks when scroll threshold is reached and there are more tasks to load
-		if (scrollPercentage >= scrollThresholdPercent && visibleTaskCount < allTasks.length) {
+		if (scrollPercentage >= scrollThresholdPercent && visibleTaskCount < allTasks?.length) {
 			setVisibleTaskCount((prevCount) => {
-				const newCount = Math.min(prevCount + loadMoreCount, allTasks.length);
+				const newCount = Math.min(prevCount + loadMoreCount, allTasks?.length);
 				return newCount;
 			});
 		}
-	}, [scrollThresholdPercent, visibleTaskCount, allTasks.length, loadMoreCount]);
+	}, [scrollThresholdPercent, visibleTaskCount, allTasks?.length, loadMoreCount]);
 
 	// Attach scroll listener
 	useEffect(() => {
@@ -304,7 +306,7 @@ const LazyColumn: React.FC<LazyColumnProps> = ({
 				// Minimized view
 				<div className="taskBoardColumnMinimized">
 					<div className='taskBoardColumnSecHeaderTitleSecColumnCount' onClick={(evt) => openColumnMenu(evt)} aria-label={t("open-column-menu")}>
-						{allTasks.length}
+						{allTasks?.length ?? 0}
 					</div>
 					<div className="taskBoardColumnMinimizedTitle" onClick={async () => {
 						await handleMinimizeColumn();
@@ -319,32 +321,31 @@ const LazyColumn: React.FC<LazyColumnProps> = ({
 							<div className="taskBoardColumnSecHeaderTitleSecColumnTitle">{columnData.name}</div>
 						</div>
 						<div className='taskBoardColumnSecHeaderTitleSecColumnCount' onClick={(evt) => openColumnMenu(evt)} aria-label={t("open-column-menu")}>
-							{allTasks.length}
+							{allTasks?.length ?? 0}
 						</div>
 					</div>
 					<div
 						className={`tasksContainer${plugin.settings.data.globalSettings.showVerticalScroll ? '' : '-SH'}`}
 						ref={tasksContainerRef}
 					>
-						{visibleTasks.length > 0 ? (
+						{(visibleTasks && visibleTasks?.length > 0) ? (
 							<>
-								{visibleTasks.map((task, index = task.id) => {
+								{visibleTasks.map((task, index) => {
 									return (
 										<div key={index} className="taskItemFadeIn">
 											<TaskItem
 												key={index}
 												plugin={plugin}
-												taskKey={index}
 												task={task}
 												columnIndex={columnIndex}
 												activeBoardSettings={activeBoardData}
 											/>
 										</div>
 									);
 								})}
-								{visibleTaskCount < allTasks.length && (
+								{(allTasks && visibleTaskCount < allTasks?.length) && (
 									<div className="lazyLoadIndicator">
-										<p>{t("scroll-to-load-more")} ({visibleTaskCount} / {allTasks.length})</p>
+										<p>{t("scroll-to-load-more")} ({visibleTaskCount} / {allTasks?.length ?? 0})</p>
 									</div>
 								)}
 							</>