From: Dominik Csapak <d.csapak@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>, Stefan Sterz <s.sterz@proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup v2 5/5] fix #3607: ui: add a separate notes view for longer markdown notes
Date: Tue, 1 Mar 2022 11:41:30 +0100 [thread overview]
Message-ID: <ce4bdf50-0b6a-741e-2e5d-f6898b6810e6@proxmox.com> (raw)
In-Reply-To: <20220224141854.3153101-6-s.sterz@proxmox.com>
comment inline
On 2/24/22 15:18, Stefan Sterz wrote:
> since markdown notes might be rather long having only the small panel
> in the dashboard might not be sufficient. this commit adds a tab
> similar to pve's datacenter or node notes.
>
> Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
> ---
> www/Makefile | 1 +
> www/NavigationTree.js | 6 ++++++
> www/NodeNotes.js | 22 ++++++++++++++++++++++
> www/panel/MarkdownNotes.js | 33 +++++++++++++++++++++++++--------
> 4 files changed, 54 insertions(+), 8 deletions(-)
> create mode 100644 www/NodeNotes.js
>
> diff --git a/www/Makefile b/www/Makefile
> index 2d55d39d..f1c0f8bb 100644
> --- a/www/Makefile
> +++ b/www/Makefile
> @@ -99,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..9a0fa00c
> --- /dev/null
> +++ b/www/NodeNotes.js
> @@ -0,0 +1,22 @@
> +Ext.define('PBS.NodeNotes', {
> + extend: 'Ext.panel.Panel',
> + xtype: 'pbsNodeNotes',
i don't think this warrants it's own class. AFAICS this
is only used once and could be simply be wrapped there
> +
> + scrollable: true,
> + layout: 'fit',
> +
> + items: [
> + {
> + xtype: 'container',
> + layout: 'fit',
> + items: [{
> + xtype: 'pbsMarkdownNotes',
> + tools: false,
> + border: false,
> + node: 'localhost',
> + loadOnInit: true,
> + enableTbar: true,
> + }],
> + },
> + ],
> +});
> diff --git a/www/panel/MarkdownNotes.js b/www/panel/MarkdownNotes.js
> index 83119d36..f522cdfd 100644
> --- a/www/panel/MarkdownNotes.js
> +++ b/www/panel/MarkdownNotes.js
> @@ -112,23 +112,40 @@ Ext.define('PBS.panel.MarkdownNotes', {
> },
> }],
>
> - collapsible: true,
> - collapseDirection: 'right',
> + tbar: {
> + itemId: 'tbar',
> + hidden: true,
> + items: [
> + {
> + text: gettext('Edit'),
> + handler: function() {
> + this.up('panel').run_editor();
> + },
> + },
> + ],
> + },
>
> initComponent: function() {
> var me = this;
>
> me.callParent();
>
> - let sp = Ext.state.Manager.getProvider();
> - me.collapseMode = sp.get('notes-collapse', 'never');
> + if (me.enableTbar === true) {
> + me.down('#tbar').setVisible(true);
> + } else {
> + me.setCollapsible(true);
> + me.collapseDirection = 'right';
>
> - if (me.loadOnInit === true) {
> - me.load();
> + let sp = Ext.state.Manager.getProvider();
> + me.collapseMode = sp.get('notes-collapse', 'never');
> +
> + if (me.collapseMode === 'auto') {
> + me.setCollapsed(true);
> + }
> }
>
> - if (me.collapseMode === 'auto') {
> - me.setCollapsed(true);
> + if (me.loadOnInit === true) {
> + me.load();
wouldn't these hunks better fit into the previous commit
where you add the MarkDown panel?
> }
> },
> });
prev parent reply other threads:[~2022-03-01 10:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-24 14:18 [pbs-devel] [PATCH proxmox-backup v2 0/5] fix #3067: add notes functionality to webui Stefan Sterz
2022-02-24 14:18 ` [pbs-devel] [PATCH proxmox-backup v2 1/5] fix #3067: api: add support for a comment field in node.cfg Stefan Sterz
2022-02-24 14:18 ` [pbs-devel] [PATCH proxmox-backup v2 2/5] fix #3067: pbs ui: add support for a notes field in the dashboard Stefan Sterz
2022-03-01 10:41 ` Dominik Csapak
2022-03-01 11:42 ` Thomas Lamprecht
2022-02-24 14:18 ` [pbs-devel] [PATCH proxmox-backup v2 3/5] fix #3067: api: add multi-line comments to node.cfg Stefan Sterz
2022-02-24 14:18 ` [pbs-devel] [PATCH proxmox-backup v2 4/5] fix #3607: ui: make dashboard notes markdown capable Stefan Sterz
2022-03-01 10:41 ` Dominik Csapak
2022-03-01 11:09 ` Dominik Csapak
2022-02-24 14:18 ` [pbs-devel] [PATCH proxmox-backup v2 5/5] fix #3607: ui: add a separate notes view for longer markdown notes Stefan Sterz
2022-03-01 10:41 ` Dominik Csapak [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ce4bdf50-0b6a-741e-2e5d-f6898b6810e6@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
--cc=s.sterz@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox