From 8e12e86f0b644511bcb756a6397b247953af7bdf Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Wed, 4 Nov 2020 15:35:08 +0100 Subject: [PATCH] ui: add shell panel under administration some users prefer an inline console we still have the pop-out console in 'Administration' Signed-off-by: Dominik Csapak --- www/Makefile | 1 + www/NavigationTree.js | 6 ++++++ www/panel/XtermJsConsole.js | 25 +++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 www/panel/XtermJsConsole.js diff --git a/www/Makefile b/www/Makefile index affeb6a9..dc23e602 100644 --- a/www/Makefile +++ b/www/Makefile @@ -37,6 +37,7 @@ JSSRC= \ dashboard/RunningTasks.js \ dashboard/TaskSummary.js \ panel/Tasks.js \ + panel/XtermJsConsole.js \ Utils.js \ AccessControlPanel.js \ ZFSList.js \ diff --git a/www/NavigationTree.js b/www/NavigationTree.js index f0f48c0a..09c58938 100644 --- a/www/NavigationTree.js +++ b/www/NavigationTree.js @@ -55,6 +55,12 @@ Ext.define('PBS.store.NavigationStore', { expanded: true, leaf: false, children: [ + { + text: gettext('Shell'), + iconCls: 'fa fa-terminal', + path: 'pbsXtermJsConsole', + leaf: true, + }, { text: gettext('Disks'), iconCls: 'fa fa-hdd-o', diff --git a/www/panel/XtermJsConsole.js b/www/panel/XtermJsConsole.js new file mode 100644 index 00000000..dd83251f --- /dev/null +++ b/www/panel/XtermJsConsole.js @@ -0,0 +1,25 @@ +Ext.define('PBS.panel.XtermJsConsole', { + extend: 'Ext.panel.Panel', + alias: 'widget.pbsXtermJsConsole', + + layout: 'fit', + + items: [ + { + xtype: 'uxiframe', + itemId: 'iframe', + }, + ], + + listeners: { + 'afterrender': function() { + let me = this; + let params = { + console: 'shell', + node: 'localhost', + xtermjs: 1, + }; + me.getComponent('iframe').load('/?' + Ext.Object.toQueryString(params)); + }, + }, +});