Skip to content

[ZEPPELIN-6203] Connect shortcut modal for info button #4963

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
merged 5 commits into from
Sep 7, 2025
+358 −1
Merged

[ZEPPELIN-6203] Connect shortcut modal for info button #4963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8578ba3
[ZEPPELIN-6203] fix: connect shortcut for info button
dididy Jul 12, 2025
87c4d19
[ZEPPELIN-6203] fix: add variable for handling the isMac condition
dididy Sep 6, 2025
6e75ed6
[ZEPPELIN-6203] fix: remove auto comletion shortcut in modal
dididy Sep 6, 2025
79ca7fa
Revert "[ZEPPELIN-6203] fix: remove auto comletion shortcut in modal"
dididy Sep 6, 2025
2dd2a6c
[ZEPPELIN-6203] fix: remove auto comletion shortcut in modal
dididy Sep 6, 2025
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
7 changes: 6 additions & 1 deletion 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 @@ -31,6 +31,7 @@ import { MessageService, NoteStatusService, SaveAsService, TicketService } from

import { NotebookService } from '@zeppelin/services/notebook.service';
import { NoteCreateComponent } from '@zeppelin/share/note-create/note-create.component';
import { ShortcutComponent } from '@zeppelin/share/shortcut/shortcut.component';

@Component({
selector: 'zeppelin-notebook-action-bar',
Expand Down Expand Up @@ -246,7 +247,11 @@ export class NotebookActionBarComponent extends MessageListenersManager implemen
}

showShortCut() {
// TODO(hsuanxyz)
this.nzModalService.info({
nzTitle: `Shortcut Info`,
nzWidth: '600px',
nzContent: ShortcutComponent
});
}

togglePermissions() {
Expand Down
2 changes: 2 additions & 0 deletions zeppelin-web-angular/src/app/share/share.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ import { NoteTocComponent } from '@zeppelin/share/note-toc/note-toc.component';
import { PageHeaderComponent } from '@zeppelin/share/page-header/page-header.component';
import { HumanizeBytesPipe } from '@zeppelin/share/pipes';
import { RunScriptsDirective } from '@zeppelin/share/run-scripts/run-scripts.directive';
import { ShortcutComponent } from '@zeppelin/share/shortcut/shortcut.component';
import { SpinComponent } from '@zeppelin/share/spin/spin.component';
import { ResizeHandleComponent } from './resize-handle';

const MODAL_LIST = [
AboutZeppelinComponent,
NoteImportComponent,
NoteCreateComponent,
ShortcutComponent,
NoteRenameComponent,
FolderRenameComponent
];
Expand Down
328 changes: 328 additions & 0 deletions zeppelin-web-angular/src/app/share/shortcut/shortcut.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,328 @@
<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<div class="modal fade" id="shortcutModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="table-scroll">
<table class="table table-shortcut">
<tr>
<th style="width:70%">Note Keyboard Shortcuts</th>
<th></th>
</tr>
<tr>
<td>
<div class="col-md-8">Run paragraph</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Shift</kbd> + <kbd class="kbd-default">Enter</kbd>
</div>
</td>
</tr>
<tr>
<td>
<div class="col-md-8">Run all above paragraphs (exclusive)</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">Shift</kbd> + <kbd class="kbd-default">UP</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Run all below paragraphs (inclusive)</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">Shift</kbd> + <kbd class="kbd-default">DOWN</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Cancel</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">C</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Move cursor Up</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">P</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Move cursor Down</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">N</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Remove paragraph</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">D</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Insert new paragraph above</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">A</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Insert new paragraph below</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">B</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Insert copy of paragraph below</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">Shift</kbd> + <kbd class="kbd-default">C</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Move paragraph Up</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">K</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Move paragraph Down</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">J</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Enable/Disable run paragraph</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt' }}</kbd> + <kbd class="kbd-default">R</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Toggle output</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">O</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Toggle editor</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">E</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Toggle line number</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">M</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Toggle title</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">T</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Clear output</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">L</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Link this paragraph</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">W</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Reduce paragraph width</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">Shift</kbd> + <kbd class="kbd-default">-</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Increase paragraph width</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">Shift</kbd> + <kbd class="kbd-default">+</kbd>
</div>
</td>
</tr>
<br/>
<tr class="sub-title">
<th style="width:70%">Editor Keyboard Shortcuts</th>
<th></th>
</tr>

<tr>
<td>
<div class="col-md-8">Cut the line</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">K</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Paste the line</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">Y</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Search inside the code</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">S</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Move cursor to the beginning</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">A</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Move cursor at the end</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">E</kbd>
</div>
</td>
</tr>

<tr>
<td>
<div class="col-md-8">Find in code</div>
</td>
<td>
<div class="keys">
<kbd class="kbd-default">Ctrl</kbd> + <kbd class="kbd-default">{{ isMac ? 'Option' : 'Alt'}}</kbd> + <kbd class="kbd-default">F</kbd>
</div>
</td>
</tr>
</table>
</div>
</div>
</div>
</div>
22 changes: 22 additions & 0 deletions zeppelin-web-angular/src/app/share/shortcut/shortcut.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { Component, OnInit } from '@angular/core';

@Component({
selector: 'zeppelin-shortcut',
templateUrl: './shortcut.component.html'
})
export class ShortcutComponent implements OnInit {
isMac = navigator.appVersion.indexOf('Mac') !== -1;
ngOnInit() {}
}
Loading