Skip to content

Add feature to disable terminal tab. #50

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

Open
jkupferer wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Add feature to disable terminal tab. #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1381ad4
Add feature to disable terminal tab.
jkupferer Mar 17, 2020
338ada4
Set terminal_tab disabled based on ENABLE_TERMINAL value
jkupferer Mar 18, 2020
158fa0a
Fix issue with tab functionality
jkupferer Mar 19, 2020
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 dashboard/gateway/routes/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var path = require('path');
var fs = require('fs');

var enable_dashboard = process.env.ENABLE_DASHBOARD;
var enable_terminal = process.env.ENABLE_TERMINAL || 'true';

module.exports = function(app, prefix) {
var router = express();
Expand All @@ -13,7 +14,11 @@ module.exports = function(app, prefix) {

router.locals.project_namespace = process.env.PROJECT_NAMESPACE;

router.locals.terminal_tab = process.env.TERMINAL_TAB;
if( enable_terminal == 'true' ) {
router.locals.terminal_tab = process.env.TERMINAL_TAB;
} else {
router.locals.terminal_tab = 'disabled'
}

router.locals.console_url = process.env.CONSOLE_URL;
router.locals.restart_url = process.env.RESTART_URL;
Expand Down
40 changes: 23 additions & 17 deletions dashboard/gateway/views/dashboard.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,9 @@ html

div.split.split-horizontal.pane-content#workarea-div
ul.nav.nav-pills.mb-1#workarea-nav(role="tablist")
li.nav-item
a.nav-link.active#terminals-tab(data-toggle="tab" href="#terminals-pane" role="tab" aria-controls="terminals-pane" aria-selected=true) Terminal
if terminal_tab != 'disabled'
li.nav-item
a.nav-link.active#terminals-tab(data-toggle="tab" href="#terminals-pane" role="tab" aria-controls="terminals-pane" aria-selected=true) Terminal

if console_url
li.nav-item
Expand All @@ -349,8 +350,9 @@ html

li.dropdown-item
a(role="menuitem" onclick=`reload_workshop();`) Reload Workshop
li.dropdown-item
a(role="menuitem" onclick=`reload_terminal();`) Reload Terminal
if terminal_tab != 'disabled'
li.dropdown-item
a(role="menuitem" onclick=`reload_terminal();`) Reload Terminal
if console_url
li.dropdown-item
a(role="menuitem" onclick=`reload_console();`) Reload Console
Expand All @@ -359,8 +361,9 @@ html

li.dropdown-item
a(role="menuitem" onclick=`window.open("../workshop");`) Open Workshop
li.dropdown-item
a(role="menuitem" onclick=`window.open("../terminal/session/"+generate_terminal_session_id());`) Open Terminal
if terminal_tab != 'disabled'
li.dropdown-item
a(role="menuitem" onclick=`window.open("../terminal/session/"+generate_terminal_session_id());`) Open Terminal
if console_url
li.dropdown-item
a(role="menuitem" onclick=`window.open("../console");`) Open Console
Expand All @@ -373,17 +376,18 @@ html
a(role="menuitem", data-toggle="modal", data-target="#restart-confirmation") Restart Session

div.tab-content
div.tab-pane.fade.show.active#terminals-pane(role="tabpanel" aria-labelledby="terminals-tab")
div.split.iframe-div#terminal1-div
iframe#terminal1-iframe(src="../terminal/session/1")
if terminal_tab == 'split'
div.split.iframe-div#terminal2-div
iframe#terminal2-iframe(src="../terminal/session/2")
if terminal_tab == 'split/2'
div.split.iframe-div#terminal2-div
iframe#terminal2-iframe(src="../terminal/session/2")
div.split.iframe-div#terminal3-div
iframe#terminal3-iframe(src="../terminal/session/3")
if terminal_tab != 'disabled'
div.tab-pane.fade.show.active#terminals-pane(role="tabpanel" aria-labelledby="terminals-tab")
div.split.iframe-div#terminal1-div
iframe#terminal1-iframe(src="../terminal/session/1")
if terminal_tab == 'split'
div.split.iframe-div#terminal2-div
iframe#terminal2-iframe(src="../terminal/session/2")
if terminal_tab == 'split/2'
div.split.iframe-div#terminal2-div
iframe#terminal2-iframe(src="../terminal/session/2")
div.split.iframe-div#terminal3-div
iframe#terminal3-iframe(src="../terminal/session/3")

if console_url
div.tab-pane.fade.show.iframe-div#console-pane(role="tabpanel" aria-labelledby="console-tab")
Expand Down Expand Up @@ -446,3 +450,5 @@ html
var style = '<style>a { pointer-events: none }</style>';
$(this).contents().find('head').append(style);
});

$($('#workarea-nav>li>a')[0]).trigger("click");