obsidian-plugin/heroblackink_ultimate-todoist-sync-for-obsidian
1
0
Fork 0
mirror of https://github.com/heroblackink/ultimate-todoist-sync-for-obsidian.git synced 2026-07-22 07:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ui): deferred sync, nonActive actions, safeSettings cleanup

Browse source 
Wave 3 changes for TaskManagerModal:
- T6: Remove incrementalSync from resolveConflict, keep only in loadAndRender, add refresh button
- T9: Add Re-enable and Delete buttons for nonActive tasks with reEnableTask method
- T13: Replace all saveSettings() with safeSettings.update({}, true)
This commit is contained in:
HeroBlackInk 2026-02-24 02:46:17 +08:00
parent 58dcb403c5
commit 521d8972e7
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/ui/modals.ts
View file

@ -384,6 +384,9 @@ export class TaskManagerModal extends Modal {
// Header with summary badges
const header = contentEl.createDiv({ cls: 'tm-header' });
header.createEl('h3', { text: 'Task Manager' });
const refreshBtn = header.createEl('button', { cls: 'tm-refresh-btn', text: '\ud83d\udd04' });
refreshBtn.title = 'Refresh from Todoist';
refreshBtn.addEventListener('click', () => this.loadAndRender());
const summary = header.createDiv({ cls: 'tm-summary' });
if (conflicted.length > 0) {
summary.createSpan({ cls: 'tm-badge tm-badge--conflict', text: `\u26a0\ufe0f ${conflicted.length} conflicted` });
@ -541,7 +544,7 @@ export class TaskManagerModal extends Modal {
const table = section.createEl('table', { cls: 'tm-table' });
const thead = table.createEl('thead');
const headerRow = thead.createEl('tr');
for (const h of ['Task ID', 'File', 'Content']) {
for (const h of ['Task ID', 'File', 'Content', 'Actions']) {
headerRow.createEl('th', { text: h });
}
const tbody = table.createEl('tbody');
@ -560,6 +563,17 @@ export class TaskManagerModal extends Modal {
const tdContent = tr.createEl('td');
const contentSpan = tdContent.createSpan({ cls: 'tm-content-preview', text: preview });
contentSpan.title = preview;
const tdActions = tr.createEl('td');
const reEnableBtn = tdActions.createEl('button', { cls: 'tm-btn tm-btn--primary', text: 'Re-enable' });
reEnableBtn.addEventListener('click', async () => {
reEnableBtn.disabled = true;
await this.reEnableTask(taskId, filePath);
});
const delBtn = tdActions.createEl('button', { cls: 'tm-btn tm-btn--danger', text: 'Delete' });
delBtn.addEventListener('click', async () => {
delBtn.disabled = true;
await this.deleteIssueTask(taskId);
});
}
}
private async resolveConflict(taskId: string, filePath: string, choice: 'obsidian' | 'todoist') {
@ -610,13 +624,12 @@ export class TaskManagerModal extends Modal {
}
}
if (this._closed) return;
await this.plugin.todoistSyncAPI.incrementalSync();
const refreshed = this.plugin.todoistSyncAPI.getTaskByIdLocal(taskId);
await this.plugin.cacheOperation.setTaskFileMapping(taskId, filePath, 'active', true);
if (refreshed?.updated_at) {
await this.plugin.cacheOperation.updateTaskMappingSyncMeta(taskId, { updated_at: refreshed.updated_at });
}
this.plugin.saveSettings();
this.plugin.safeSettings?.update({}, true);
new Notice(`Conflict resolved: kept Obsidian version`);
} else {
const task = this.plugin.todoistSyncAPI.getTaskByIdLocal(taskId);
@ -705,7 +718,7 @@ export class TaskManagerModal extends Modal {
if (this._closed) return;
await this.plugin.cacheOperation.setTaskFileMapping(taskId, filePath, 'active', true);
await this.plugin.cacheOperation.updateTaskMappingSyncMeta(taskId, { updated_at: task.updated_at });
this.plugin.saveSettings();
this.plugin.safeSettings?.update({}, true);
new Notice(`Conflict resolved: kept Todoist version`);
}
} catch (e) {
@ -731,7 +744,7 @@ export class TaskManagerModal extends Modal {
if (this._closed) return;
await this.plugin.fileOperation.unbindTaskInFile(taskId);
await this.plugin.cacheOperation.deleteTaskFileMapping(taskId);
this.plugin.saveSettings();
this.plugin.safeSettings?.update({}, true);
new Notice(`Issue task deleted`);
} catch (e) {
console.error(`[TaskManagerModal] deleteIssueTask error:`, e);
@ -740,6 +753,18 @@ export class TaskManagerModal extends Modal {
if (this._closed) return;
await this.loadAndRender();
}
private async reEnableTask(taskId: string, filePath: string) {
try {
await this.plugin.cacheOperation.setTaskFileMapping(taskId, filePath, 'active', true);
this.plugin.safeSettings?.update({}, true);
new Notice(`Task re-enabled`);
} catch (e) {
console.error(`[TaskManagerModal] reEnableTask error:`, e);
new Notice(`Error re-enabling task: ${e}`);
}
if (this._closed) return;
await this.loadAndRender();
}
private showConfirmDialog(message: string): Promise<boolean> {
return new Promise((resolve) => {
const overlay = document.createElement('div');