This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch branch-0.12
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/branch-0.12 by this push:
     new d4cfd6a2f8 [ZEPPELIN-6105] add 'reload note' button to the new 
interface
d4cfd6a2f8 is described below

commit d4cfd6a2f857eac734695fc78ef55e359225f31b
Author: Charlie91 <aleksan...@yandex.ru>
AuthorDate: Sun Sep 29 10:56:04 2024 +0300

    [ZEPPELIN-6105] add 'reload note' button to the new interface
    
    ### What is this PR for?
    Add missing button to action bar to reload note. This button exists in the 
old interface, but is missing in /next
    
    ### What type of PR is it?
    Bug Fix
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/ZEPPELIN-6105
    
    ### Screenshots (if appropriate)
    
![image](https://github.com/user-attachments/assets/199b69f5-c19d-497e-aa33-1ab29d22ad50)
    
    Closes #4845 from Charlie91/add-reload-note-button.
    
    Signed-off-by: Cheng Pan <cheng...@apache.org>
    (cherry picked from commit b9ff26f0fa9848913c505fbdc284b0a4a1bc2d56)
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 .../src/interfaces/message-data-type-map.interface.ts             | 2 ++
 .../zeppelin-sdk/src/interfaces/message-notebook.interface.ts     | 1 +
 .../zeppelin-sdk/src/interfaces/message-operator.interface.ts     | 7 +++++++
 zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts         | 4 ++++
 .../pages/workspace/notebook/action-bar/action-bar.component.html | 8 ++++++++
 .../pages/workspace/notebook/action-bar/action-bar.component.ts   | 4 ++++
 zeppelin-web-angular/src/app/services/message.service.ts          | 4 ++++
 7 files changed, 30 insertions(+)

diff --git 
a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-data-type-map.interface.ts
 
b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-data-type-map.interface.ts
index 78af79b556..273b6a7144 100644
--- 
a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-data-type-map.interface.ts
+++ 
b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-data-type-map.interface.ts
@@ -39,6 +39,7 @@ import {
   ParagraphMoved,
   RemoveFolder,
   RemoveNoteForms,
+  ReloadNote,
   RestoreFolder,
   RestoreNote,
   SaveNoteFormsReceived,
@@ -121,6 +122,7 @@ export interface MessageSendDataTypeMap {
   [OP.RESTORE_ALL]: undefined;
   [OP.EMPTY_TRASH]: undefined;
   [OP.RELOAD_NOTES_FROM_REPO]: undefined;
+  [OP.RELOAD_NOTE]: ReloadNote;
   [OP.GET_NOTE]: GetNode;
   [OP.NEW_NOTE]: NewNote;
   [OP.MOVE_NOTE_TO_TRASH]: MoveNoteToTrash;
diff --git 
a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-notebook.interface.ts
 
b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-notebook.interface.ts
index d115e0ffdf..ed9afebbaa 100644
--- 
a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-notebook.interface.ts
+++ 
b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-notebook.interface.ts
@@ -23,6 +23,7 @@ interface Name {
 export type GetNode = ID;
 export type MoveNoteToTrash = ID;
 export type MoveFolderToTrash = ID;
+export type ReloadNote = ID;
 export type RestoreNote = ID;
 export type RestoreFolder = ID;
 export type DeleteNote = ID;
diff --git 
a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
 
b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
index c0fd3ba0ec..f9dc73f060 100644
--- 
a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
+++ 
b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
@@ -195,6 +195,13 @@ export enum OP {
    */
   RELOAD_NOTES_FROM_REPO = 'RELOAD_NOTES_FROM_REPO',
 
+  /**
+   * [c-s]
+   * reload note
+   * @param id note id
+   */
+  RELOAD_NOTE = 'RELOAD_NOTE',
+
   /**
    * [s-c]
    * list of note infos
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts 
b/zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts
index 5332a436f9..31f7b3da03 100644
--- a/zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts
+++ b/zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts
@@ -261,6 +261,10 @@ export class Message {
     this.send<OP.RELOAD_NOTES_FROM_REPO>(OP.RELOAD_NOTES_FROM_REPO);
   }
 
+  reloadNote(noteId: string): void {
+    this.send<OP.RELOAD_NOTE>(OP.RELOAD_NOTE, { id: noteId })
+  }
+
   getNote(noteId: string): void {
     this.send<OP.GET_NOTE>(OP.GET_NOTE, { id: noteId });
   }
diff --git 
a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.html
 
b/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.html
index bba8226028..1972a1e7dc 100644
--- 
a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.html
+++ 
b/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.html
@@ -67,6 +67,14 @@
               [disabled]="revisionView">
         <i nz-icon nzType="download" nzTheme="outline"></i>
       </button>
+      <button nz-button
+              nz-tooltip
+              nzTitle="Reload from note file"
+              (click)="reloadNote()"
+              *ngIf="!viewOnly"
+              [disabled]="revisionView">
+        <i nz-icon nzType="reload" nzTheme="outline"></i>
+      </button>
       <ng-container *ngIf="principal && principal !== 'anonymous' && 
!viewOnly">
         <ng-container [ngSwitch]="note.config.personalizedMode">
           <button *ngSwitchCase="'true'"
diff --git 
a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts
 
b/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts
index f76b5ffeab..08c7d59bd5 100644
--- 
a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts
+++ 
b/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts
@@ -198,6 +198,10 @@ export class NotebookActionBarComponent extends 
MessageListenersManager implemen
     }
   }
 
+  reloadNote() {
+    this.messageService.reloadNote(this.note.id);
+  }
+
   toggleAllEditor() {
     this.editorHide = !this.editorHide;
     this.editorHideChange.emit(this.editorHide);
diff --git a/zeppelin-web-angular/src/app/services/message.service.ts 
b/zeppelin-web-angular/src/app/services/message.service.ts
index fd47803749..8e829f6de6 100644
--- a/zeppelin-web-angular/src/app/services/message.service.ts
+++ b/zeppelin-web-angular/src/app/services/message.service.ts
@@ -137,6 +137,10 @@ export class MessageService extends Message implements 
OnDestroy {
     super.reloadAllNotesFromRepo();
   }
 
+  reloadNote(noteId: string): void {
+    super.reloadNote(noteId);
+  }
+
   getNote(noteId: string): void {
     super.getNote(noteId);
   }

Reply via email to