Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

chore(views/board): delete values when deleting column

Browse Source
This commit is contained in:
Elian Doran
2025-07-20 19:51:03 +03:00
parent 9e936cb57b
commit 2b5029cc38
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/client/src/services/bulk_action.ts
View File

@@ -91,10 +91,10 @@ function parseActions(note: FNote) {
.filter((action) => !!action);
}
export async function executeBulkActions(parentNoteId: string, actions: BulkAction[]) {
export async function executeBulkActions(targetNoteIds: string[], actions: BulkAction[], includeDescendants = false) {
await server.post("bulk-action/execute", {
noteIds: [ parentNoteId ],
includeDescendants: true,
noteIds: targetNoteIds,
includeDescendants,
actions
});

2
apps/client/src/translations/en/translation.json
View File

@@ -1975,6 +1975,6 @@
"insert-above": "Insert above",
"insert-below": "Insert below",
"delete-column": "Delete column",
"delete-column-confirmation": "Are you sure you want to delete this column? All notes in this column will be deleted as well."
"delete-column-confirmation": "Are you sure you want to delete this column? The corresponding attribute will be deleted in the notes under this column as well."
}
}

10
apps/client/src/widgets/view_widgets/board_view/api.ts
View File

@@ -1,6 +1,7 @@
import appContext from "../../../components/app_context";
import FNote from "../../../entities/fnote";
import attributes from "../../../services/attributes";
import bulk_action, { executeBulkActions } from "../../../services/bulk_action";
import note_create from "../../../services/note_create";
import ViewModeStorage from "../view_mode_storage";
import { BoardData } from "./config";
@@ -69,6 +70,15 @@ export default class BoardApi {
}
async removeColumn(column: string) {
// Remove the value from the notes.
const noteIds = this.byColumn.get(column)?.map(item => item.note.noteId) || [];
await executeBulkActions(noteIds, [
{
name: "deleteLabel",
labelName: "status"
}
]);
this.persistedData.columns = (this.persistedData.columns ?? []).filter(col => col.value !== column);
this.viewStorage.store(this.persistedData);
}

16
apps/client/src/widgets/view_widgets/table_view/bulk_actions.ts
View File

@@ -2,30 +2,30 @@ import { executeBulkActions } from "../../../services/bulk_action.js";
export async function renameColumn(parentNoteId: string, type: "label" | "relation", originalName: string, newName: string) {
if (type === "label") {
return executeBulkActions(parentNoteId, [{
return executeBulkActions([parentNoteId], [{
name: "renameLabel",
oldLabelName: originalName,
newLabelName: newName
}]);
}], true);
} else {
return executeBulkActions(parentNoteId, [{
return executeBulkActions([parentNoteId], [{
name: "renameRelation",
oldRelationName: originalName,
newRelationName: newName
}]);
}], true);
}
}
export async function deleteColumn(parentNoteId: string, type: "label" | "relation", columnName: string) {
if (type === "label") {
return executeBulkActions(parentNoteId, [{
return executeBulkActions([parentNoteId], [{
name: "deleteLabel",
labelName: columnName
}]);
}], true);
} else {
return executeBulkActions(parentNoteId, [{
return executeBulkActions([parentNoteId], [{
name: "deleteRelation",
relationName: columnName
}]);
}], true);
}
}