remove label in cache, too, when deleting it in vikunja and reset now…

… operates directly

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "vikunja-sync",
 	"name": "Vikunja Sync",
-	"version": "1.0.10",
+	"version": "1.0.11",
 	"minAppVersion": "0.15.0",
 	"description": "Integrates Vikunja.",
 	"author": "Peter Heiss",

src/commands/index.ts

@@ -108,7 +108,7 @@ export default class Commands {
 
 				while (true) {
 					const tasks = await this.plugin.tasksApi.getAllTasks();
-					const labels = this.plugin.labelsApi.getLabels()
+					const labels = await this.plugin.labelsApi.labelsApi.labelsGet();
 
 					if (tasks.length === 0 && labels.length === 0) {
 						if (this.plugin.settings.debugging) console.log("No tasks and labels found in Vikunja");
@@ -123,8 +123,8 @@ export default class Commands {
 					await this.plugin.labelsApi.deleteLabels(labels);
 				}
 
-
 				if (this.plugin.settings.debugging) console.log("Resetting tasks in Vikunja done");
+				await this.plugin.labelsApi.loadLabels();
 				new Notice("Resetting tasks and labels in Vikunja done");
 			}
 		).open();

src/processing/syncLabels.ts

@@ -26,7 +26,7 @@ class SyncLabels implements IAutomatonSteps {
 		const allLabels = this.plugin.labelsApi.getLabels();
 		const dedupAllLabels = allLabels.filter((label, index, self) => self.findIndex(l => l.title === label.title) === index);
 		// remove all duplicated labels
-		await Promise.all(allLabels.filter(label => dedupAllLabels.find(l => l.id === label.id) === undefined).map(label => label.id && this.plugin.labelsApi.deleteLabel(label.id)));
+		await Promise.all(allLabels.filter(label => dedupAllLabels.find(l => l.id === label.id) === undefined).map(label => label.id && this.plugin.labelsApi.deleteLabel(label)));
 
 		if (!this.plugin.settings.removeLabelsIfInVaultNotUsed) {
 			if (this.plugin.settings.debugging) console.log("Step SyncLabels: Not deleting labels in vikunja if ID not found in vault");
@@ -37,7 +37,7 @@ class SyncLabels implements IAutomatonSteps {
 
 		if (this.plugin.settings.debugging) console.log("Step SyncLabels: Deleting labels in Vikunja", labelsToDelete);
 		// remove all labels not used in vault
-		await Promise.all(labelsToDelete.map(label => label.id && this.plugin.labelsApi.deleteLabel(label.id)));
+		await Promise.all(labelsToDelete.map(label => label.id && this.plugin.labelsApi.deleteLabel(label)));
 	}
 
 	private async createLabels(localTasks: PluginTask[]): Promise<PluginTask[]> {

src/vikunja/labels.ts

@@ -81,13 +81,17 @@ class Label {
 		return await this.createLabel(label);
 	}
 
-	async deleteLabel(labelId: number) {
-		if (this.plugin.settings.debugging) console.log("LabelsAPI: Deleting label", labelId);
+	async deleteLabel(label: ModelsLabel) {
+		if (!label.id) throw new Error("Label id is required to delete label");
+		if (!label.title) throw new Error("Label title is required to delete label");
+
+		if (this.plugin.settings.debugging) console.log("LabelsAPI: Deleting label", label);
 		const param: LabelsIdDeleteRequest = {
-			id: labelId,
+			id: label.id,
 		};
 		await this.labelsApi.labelsIdDelete(param);
-		if (this.plugin.settings.debugging) console.log("LabelsAPI: Deleted label", labelId);
+		if (this.plugin.settings.debugging) console.log("LabelsAPI: Deleted label", label);
+		this.labelsMap.delete(label.title);
 	}
 
 	async updateLabel(label: ModelsLabel): Promise<ModelsLabel> {
@@ -106,11 +110,12 @@ class Label {
 	async deleteLabels(labels: ModelsLabel[]) {
 		for (const label of labels) {
 			if (!label.id) throw new Error("Label id is required to delete label");
-			await this.deleteLabel(label.id);
+			await this.deleteLabel(label);
 		}
 	}
 
-	private async loadLabels(): Promise<ModelsLabel[]> {
+	//Use with caution!!! Only use it in a place, where no other operations are currently running
+	async loadLabels(): Promise<ModelsLabel[]> {
 		this.labelsMap.clear();
 		let allLabels: ModelsLabel[] = [];
 		try {