Merge branch 'main' into release-v1.8.0

Author: tu2-atmanand

data.json

@@ -62,6 +62,23 @@
               "from": 0,
               "to": 0,
               "dateType": "scheduledDate"
+            },
+            "filters": {
+              "rootCondition": "any",
+              "filterGroups": [
+                {
+                  "id": "id-1759769822732-we6pfeqpi",
+                  "groupCondition": "all",
+                  "filters": [
+                    {
+                      "id": "id-1759769822734-2yqs1dyh5",
+                      "property": "content",
+                      "condition": "contains",
+                      "value": "this"
+                    }
+                  ]
+                }
+              ]
             }
           },
           {
@@ -75,6 +92,22 @@
               "dateType": "scheduledDate",
               "from": -300,
               "to": -1
+            },
+            "sortCriteria": [
+              {
+                "criteria": "scheduledDate",
+                "order": "asc",
+                "priority": 1
+              },
+              {
+                "criteria": "time",
+                "order": "asc",
+                "priority": 2
+              }
+            ],
+            "filters": {
+              "rootCondition": "any",
+              "filterGroups": []
             }
           },
           {
@@ -164,7 +197,35 @@
             "collapsed": false,
             "name": "Backlogs",
             "index": 1,
-            "id": 226119
+            "id": 226119,
+            "sortCriterias": [
+              {
+                "criteria": "status",
+                "order": "asc",
+                "priority": 1
+              },
+              {
+                "criteria": "scheduledDate",
+                "order": "asc",
+                "priority": 2
+              },
+              {
+                "criteria": "priority",
+                "order": "desc",
+                "priority": 3
+              }
+            ],
+            "filters": {
+              "rootCondition": "any",
+              "filterGroups": []
+            },
+            "sortCriteria": [
+              {
+                "criteria": "id",
+                "order": "asc",
+                "priority": 1
+              }
+            ]
           },
           {
             "colType": "namedTag",
@@ -173,7 +234,11 @@
             "name": "Can be implemented",
             "index": 2,
             "coltag": "#pending",
-            "id": 47626
+            "id": 47626,
+            "filters": {
+              "rootCondition": "any",
+              "filterGroups": []
+            }
           },
           {
             "colType": "namedTag",
@@ -235,24 +300,36 @@
         "hideEmptyColumns": false,
         "boardFilter": {
           "rootCondition": "any",
-          "filterGroups": [
-            {
-              "id": "id-1760029960520-z2a1g0ka4",
-              "groupCondition": "all",
-              "filters": [
-                {
-                  "id": "id-1760029960521-t33fwt542",
-                  "property": "filePath",
-                  "condition": "startsWith",
-                  "value": "Destinatio"
-                }
-              ]
-            }
-          ]
+          "filterGroups": []
         },
         "filterConfig": {
           "enableSavedFilters": true,
-          "savedConfigs": []
+          "savedConfigs": [
+            {
+              "id": "filter-config-1760103432145-fevybeh8j",
+              "name": "Destinatio",
+              "description": "Filtering all tasks from \"Destinatio\" folder",
+              "filterState": {
+                "rootCondition": "any",
+                "filterGroups": [
+                  {
+                    "id": "id-1760029960520-z2a1g0ka4",
+                    "groupCondition": "all",
+                    "filters": [
+                      {
+                        "id": "id-1760029960521-t33fwt542",
+                        "property": "filePath",
+                        "condition": "startsWith",
+                        "value": "Destinatio"
+                      }
+                    ]
+                  }
+                ]
+              },
+              "createdAt": "2025-10-10T13:37:12.145Z",
+              "updatedAt": "2025-10-10T13:37:12.145Z"
+            }
+          ]
         }
       }
     ],
@@ -266,7 +343,7 @@
           ]
         },
         "folders": {
-          "polarity": 1,
+          "polarity": 3,
           "values": [
             "Task Board/1.7.0"
           ]
@@ -707,13 +784,13 @@
       "taskPropertyFormat": "2",
       "taskNoteDefaultLocation": "TaskNotes",
       "autoAddUniqueID": true,
-      "uniqueIdCounter": 235,
+      "uniqueIdCounter": 238,
       "experimentalFeatures": true,
       "searchQuery": "",
       "lastViewedType": "map",
       "lastViewHistory": {
         "viewedType": "kanban",
-        "boardIndex": 2,
+        "boardIndex": 1,
         "taskId": ""
       },
       "taskNoteIdentifierTag": "taskNote",

main.ts

@@ -47,10 +47,6 @@ import {
 	getTaskPropertyRegexPatterns,
 	taskPropertyHidingExtension,
 } from "src/editor-extensions/task-operations/property-hiding";
-import {
-	allowedFileExtensionsRegEx,
-	notAllowedFileExtensionsRegEx,
-} from "src/regularExpressions/MiscelleneousRegExpr";
 import { fetchTasksPluginCustomStatuses } from "src/services/tasks-plugin/helpers";
 
 export default class TaskBoard extends Plugin {

src/components/AddOrEditTaskRC.tsx

@@ -239,35 +239,43 @@ export const AddOrEditTaskRC: React.FC<{
 	}
 
 	// Automatically update end time if only start time is provided
-	useEffect(() => {
+	const handleCompleteTimeChange = (updatedStartTime: string, updatedEndTime: string) => {
 		let newTime = '';
-		if (startTime && !endTime) {
-			const [hours, minutes] = startTime.split(':');
+		if (updatedStartTime && !updatedEndTime) {
+			const [hours, minutes] = updatedStartTime.split(':');
 			const newEndTime = `${String(Number(hours) + 1).padStart(2, '0')}:${minutes}`;
 			setEndTime(newEndTime);
-			newTime = `${startTime} - ${newEndTime}`;
+			newTime = `${updatedStartTime} - ${newEndTime}`;
 			setNewTime(newTime);
-		} else if (startTime && endTime) {
-			newTime = `${startTime} - ${endTime}`;
+		} else if (updatedStartTime && updatedEndTime) {
+			newTime = `${updatedStartTime} - ${updatedEndTime}`;
 			setNewTime(newTime);
 		}
 
 		if (!isTaskNote) {
 			const newTitle = sanitizeTime(plugin.settings.data.globalSettings, title, newTime, cursorLocationRef.current ?? undefined);
 			setTitle(newTitle);
 		}
-	}, [startTime, endTime]);
+		setIsEditorContentChanged(true);
+	}
 
-	const handleStartTimeChange = (startTime: string) => {
-		setStartTime(startTime);
+
+	const handleStartTimeChange = (updatedStartTime: string) => {
+		setStartTime(updatedStartTime);
 		setIsEdited(true);
-		setIsEditorContentChanged(true);
+
+		handleCompleteTimeChange(updatedStartTime, "");
+
+		// setIsEditorContentChanged(true);
 	}
 
-	const handleEndTimeChange = (endTime: string) => {
-		setEndTime(endTime);
+	const handleEndTimeChange = (updatedEndTime: string) => {
+		setEndTime(updatedEndTime);
 		setIsEdited(true);
-		setIsEditorContentChanged(true);
+
+		handleCompleteTimeChange(startTime, updatedEndTime);
+
+		// setIsEditorContentChanged(true);
 	}
 
 	// // Function to toggle subtask completion

src/components/BoardFilters/ViewTaskFilter.ts

@@ -64,7 +64,8 @@ export class TaskFilterComponent extends Component {
 		app: App,
 		private leafId?: string | undefined,
 		plugin?: TaskBoard,
-		activeBoardIndex?: number
+		activeBoardIndex?: number,
+		private initialFilterState?: RootFilterState
 	) {
 		super();
 		this.hostEl = hostEl;
@@ -74,32 +75,38 @@ export class TaskFilterComponent extends Component {
 	}
 
 	onload() {
-		const savedState = this.leafId
-			? this.app.loadLocalStorage(
-					`task-board-view-filter-${this.leafId}`
-			  )
-			: this.app.loadLocalStorage("task-board-view-filter");
-
-		console.log("savedState", savedState, this.leafId);
-		if (
-			savedState &&
-			typeof (savedState as any).rootCondition === "string" &&
-			Array.isArray((savedState as any).filterGroups)
-		) {
-			// Basic validation passed
-			this.rootFilterState = savedState as RootFilterState;
+		// If initial filter state is provided (for column filters), use it
+		if (this.initialFilterState) {
+			this.rootFilterState = this.initialFilterState;
 		} else {
-			if (savedState) {
-				// If it exists but failed validation
-				console.warn(
-					"Task Filter: Invalid data in local storage. Resetting to default state."
-				);
+			// Otherwise, load from localStorage (for board filters)
+			const savedState = this.leafId
+				? this.app.loadLocalStorage(
+						`task-board-view-filter-${this.leafId}`
+				  )
+				: this.app.loadLocalStorage("task-board-view-filter");
+
+			console.log("savedState", savedState, this.leafId);
+			if (
+				savedState &&
+				typeof (savedState as any).rootCondition === "string" &&
+				Array.isArray((savedState as any).filterGroups)
+			) {
+				// Basic validation passed
+				this.rootFilterState = savedState as RootFilterState;
+			} else {
+				if (savedState) {
+					// If it exists but failed validation
+					console.warn(
+						"Task Filter: Invalid data in local storage. Resetting to default state."
+					);
+				}
+				// Initialize with default state
+				this.rootFilterState = {
+					rootCondition: "any",
+					filterGroups: [],
+				};
 			}
-			// Initialize with default state
-			this.rootFilterState = {
-				rootCondition: "any",
-				filterGroups: [],
-			};
 		}
 
 		// Render first to initialize DOM elements
@@ -729,15 +736,17 @@ export class TaskFilterComponent extends Component {
 		if (propertySelect.selectEl.options.length === 0) {
 			propertySelect.addOptions({
 				content: t("content"),
+				id: t("id"),
 				status: t("status"),
 				priority: t("priority"),
-				dueDate: t("due-date"),
+				tags: t("tags"),
+				createdDate: t("created-date"),
 				startDate: t("start-date"),
 				scheduledDate: t("scheduled-date"),
-				tags: t("tags"),
+				dueDate: t("due-date"),
+				completed: t("completed-date"),
 				filePath: t("file-path"),
 				// project: t("project"),
-				completed: t("completed"),
 			});
 		}
 		propertySelect.setValue(property);
@@ -802,6 +811,8 @@ export class TaskFilterComponent extends Component {
 					},
 				];
 				break;
+			case "id":
+			case "createdDate":
 			case "dueDate":
 			case "startDate":
 			case "scheduledDate":

src/components/BoardFilters/ViewTaskFilterModal.ts

@@ -33,7 +33,6 @@ export class ViewTaskFilterModal extends Modal {
 	onClose() {
 		const { contentEl } = this;
 
-		// 获取过滤状态并触发回调
 		let filterState: RootFilterState | undefined = undefined;
 		if (this.taskFilterComponent) {
 			try {
@@ -49,7 +48,6 @@ export class ViewTaskFilterModal extends Modal {
 
 		contentEl.empty();
 
-		// 调用自定义关闭回调
 		if (this.filterCloseCallback) {
 			try {
 				this.filterCloseCallback(filterState);