From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0085364049 for ; Tue, 1 Mar 2022 11:42:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D096F1E3CC for ; Tue, 1 Mar 2022 11:41:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id A1CA11E397 for ; Tue, 1 Mar 2022 11:41:31 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7B46444810; Tue, 1 Mar 2022 11:41:31 +0100 (CET) Message-ID: Date: Tue, 1 Mar 2022 11:41:30 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:98.0) Gecko/20100101 Thunderbird/98.0 Content-Language: en-US To: Proxmox Backup Server development discussion , Stefan Sterz References: <20220224141854.3153101-1-s.sterz@proxmox.com> <20220224141854.3153101-6-s.sterz@proxmox.com> From: Dominik Csapak In-Reply-To: <20220224141854.3153101-6-s.sterz@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.156 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pbs-devel] [PATCH proxmox-backup v2 5/5] fix #3607: ui: add a separate notes view for longer markdown notes X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2022 10:42:03 -0000 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 > --- > 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? > } > }, > });