since markdown notes might be rather long, this commit adds a tab similar to pve's datacenter or node notes.
Signed-off-by: Stefan Sterz <s.st...@proxmox.com> --- www/Makefile | 2 + www/NavigationTree.js | 6 ++ www/NodeNotes.js | 22 +++++++ www/panel/MarkdownNotes.js | 130 +++++++++++++++++++++++++++++++++++++ 4 files changed, 160 insertions(+) create mode 100644 www/NodeNotes.js create mode 100644 www/panel/MarkdownNotes.js diff --git a/www/Makefile b/www/Makefile index 455fbeec..aff0c901 100644 --- a/www/Makefile +++ b/www/Makefile @@ -81,6 +81,7 @@ JSSRC= \ panel/StorageAndDisks.js \ panel/UsageChart.js \ panel/NodeInfo.js \ + panel/MarkdownNotes.js \ ZFSList.js \ DirectoryList.js \ LoginView.js \ @@ -98,6 +99,7 @@ JSSRC= \ datastore/DataStoreList.js \ ServerStatus.js \ ServerAdministration.js \ + NodeNotes.js \ Dashboard.js \ ${TAPE_UI_FILES} \ NavigationTree.js \ diff --git a/www/NavigationTree.js b/www/NavigationTree.js index 576d05ab..916582ef 100644 --- a/www/NavigationTree.js +++ b/www/NavigationTree.js @@ -32,6 +32,12 @@ Ext.define('PBS.store.NavigationStore', { path: 'pbsDashboard', leaf: true, }, + { + text: gettext('Notes'), + iconCls: 'fa fa-sticky-note-o', + path: 'pbsNodeNotes', + leaf: true, + }, { text: gettext('Configuration'), iconCls: 'fa fa-gears', diff --git a/www/NodeNotes.js b/www/NodeNotes.js new file mode 100644 index 00000000..7fa3f2e6 --- /dev/null +++ b/www/NodeNotes.js @@ -0,0 +1,22 @@ +// Needs to be its own xtype for `path` to work in `NavigationTree` +Ext.define('PBS.NodeNotes', { + extend: 'Ext.panel.Panel', + xtype: 'pbsNodeNotes', + + scrollable: true, + layout: 'fit', + + items: [ + { + xtype: 'container', + layout: 'fit', + items: [{ + xtype: 'pbsMarkdownNotes', + tools: false, + border: false, + node: 'localhost', + enableTbar: true, + }], + }, + ], +}); diff --git a/www/panel/MarkdownNotes.js b/www/panel/MarkdownNotes.js new file mode 100644 index 00000000..6d601401 --- /dev/null +++ b/www/panel/MarkdownNotes.js @@ -0,0 +1,130 @@ +Ext.define('PBS.panel.MarkdownNotes', { + extend: 'Ext.panel.Panel', + xtype: 'pbsMarkdownNotes', + mixins: ['Proxmox.Mixin.CBind'], + + title: gettext("Notes"), + bodyPadding: 10, + scrollable: true, + animCollapse: false, + maxLength: 64*1022, + + cbindData: function(initalConfig) { + let me = this; + + if (!me.node) { + throw 'no node provided, cannot construct url'; + } + + me.url = `/api2/extjs/nodes/${me.node}/config`; + return {}; + }, + + run_editor: function() { + let me = this; + Ext.create('Proxmox.window.Edit', { + title: gettext('Notes'), + onlineHelp: 'markdown_basics', + width: 800, + height: 600, + resizable: true, + layout: 'fit', + defaultButton: undefined, + items: { + xtype: 'textarea', + maxLength: me.maxLength, + name: 'description', + height: '100%', + value: '', + hideLabel: true, + emptyText: gettext('You can use Markdown for rich text formatting.'), + fieldStyle: { + 'white-space': 'pre-wrap', + 'font-family': 'monospace', + }, + }, + url: me.url, + listeners: { + destroy: function() { + me.load(); + }, + }, + autoShow: true, + autoLoad: true, + }); + }, + + setNotes: function(value) { + let me = this; + var data = value || ''; + + let mdHtml = Proxmox.Markdown.parse(data); + me.update(mdHtml); + + if (me.collapsible && me.collapseMode === 'auto') { + me.setCollapsed(data === ''); + } + }, + + load: function() { + var me = this; + + Proxmox.Utils.API2Request({ + url: me.url, + waitMsgTarget: me, + failure: function(response, opts) { + Ext.Msg.alert(gettext('Error'), response.htmlStatus); + me.setCollapsed(false); + }, + success: function(response, opts) { + me.setNotes(response.result.data.description); + }, + }); + }, + + listeners: { + render: function(c) { + var me = this; + me.getEl().on('dblclick', me.run_editor, me); + }, + afterlayout: function() { + let me = this; + if (me.collapsible && !me.getCollapsed() && me.collapseMode === 'always') { + me.setCollapsed(true); + me.collapseMode = ''; // only once, on initial load! + } + }, + }, + + tools: [{ + type: 'gear', + handler: function() { + this.up('panel').run_editor(); + }, + }], + + tbar: { + itemId: 'tbar', + hidden: true, + items: [ + { + text: gettext('Edit'), + handler: function() { + this.up('panel').run_editor(); + }, + }, + ], + }, + + initComponent: function() { + var me = this; + + me.callParent(); + + if (me.enableTbar === true) { + me.down('#tbar').setVisible(true); + } + + me.load(); + }, +}); -- 2.30.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel