Skip to content

[ZEPPELIN-6550] Fix trash detection in note view so trashed notes can be permanently deleted #5336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
voidmatcha merged 1 commit into from
Jul 26, 2026
+5 −2
Merged

[ZEPPELIN-6550] Fix trash detection in note view so trashed notes can be permanently deleted #5336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ export class NotebookActionBarComponent extends MessageListenersManager implemen

deleteNote() {
this.messageService.deleteNote(this.note.id);
this.router.navigate(['/']);
}

moveNoteToTrash() {
Expand Down
6 changes: 4 additions & 2 deletions zeppelin-web-angular/src/app/services/note-status.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ export class NoteStatusService {
}

isTrash(note: Exclude<Note['note'], undefined>) {
// TODO(hsuanxyz) https://github.com/apache/zeppelin/pull/3365/files
return note.name.split('/')[1] === this.TRASH_FOLDER_ID;
// Detect trash by note.path, not note.name: the trash folder is the second
// path segment (see apache/zeppelin#3365), and since ZEPPELIN-4041 note.name
// holds only the last path segment. Mirrors NoteListService.
return note.path.split('/')[1] === this.TRASH_FOLDER_ID;
}

viewOnly(note: Exclude<Note['note'], undefined>): boolean {
Expand Down
Loading