From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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 B66A964101
for <pbs-devel@lists.proxmox.com>; Tue, 1 Mar 2022 12:10:22 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id A55241E97B
for <pbs-devel@lists.proxmox.com>; Tue, 1 Mar 2022 12:09:52 +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 E08591E96F
for <pbs-devel@lists.proxmox.com>; Tue, 1 Mar 2022 12:09:51 +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 AF15A438B3;
Tue, 1 Mar 2022 12:09:51 +0100 (CET)
Message-ID: <1d16e15e-b0c4-a8c4-2815-436667062cce@proxmox.com>
Date: Tue, 1 Mar 2022 12:09:50 +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
<pbs-devel@lists.proxmox.com>, Stefan Sterz <s.sterz@proxmox.com>
References: <20220224141854.3153101-1-s.sterz@proxmox.com>
<20220224141854.3153101-5-s.sterz@proxmox.com>
From: Dominik Csapak <d.csapak@proxmox.com>
In-Reply-To: <20220224141854.3153101-5-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.155 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 4/5] fix #3607: ui: make
dashboard notes markdown capable
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 01 Mar 2022 11:10:22 -0000
i forgot one thing in my mail before (comment inline)
On 2/24/22 15:18, Stefan Sterz wrote:
> Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
> ---
> www/Dashboard.js | 2 +-
> www/Makefile | 3 +-
> www/panel/MarkdownNotes.js | 134 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 137 insertions(+), 2 deletions(-)
> create mode 100644 www/panel/MarkdownNotes.js
>
> diff --git a/www/Dashboard.js b/www/Dashboard.js
> index a78ad375..a76660ff 100644
> --- a/www/Dashboard.js
> +++ b/www/Dashboard.js
> @@ -230,7 +230,7 @@ Ext.define('PBS.Dashboard', {
> margin: '0 20 0 0',
> },
> {
> - xtype: 'pbsNotes',
> + xtype: 'pbsMarkdownNotes',
> reference: 'nodeNotes',
> node: 'localhost',
> loadOnInit: true,
> diff --git a/www/Makefile b/www/Makefile
> index 636d4a57..2d55d39d 100644
> --- a/www/Makefile
> +++ b/www/Makefile
> @@ -81,7 +81,8 @@ JSSRC= \
> panel/StorageAndDisks.js \
> panel/UsageChart.js \
> panel/NodeInfo.js \
> - panel/Notes.js \
> + panel/Notes.js \
> + panel/MarkdownNotes.js \
> ZFSList.js \
> DirectoryList.js \
> LoginView.js \
> diff --git a/www/panel/MarkdownNotes.js b/www/panel/MarkdownNotes.js
> new file mode 100644
> index 00000000..83119d36
> --- /dev/null
> +++ b/www/panel/MarkdownNotes.js
> @@ -0,0 +1,134 @@
> +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 (('node' in me && 'datastore' in me) ||
> + (!('node' in me) && !('datastore' in me))) {
> + throw 'either both a node and a datastore were given or neither. please provide one.';
> + } else if ('node' in me) {
> + me.url = `/api2/extjs/nodes/${me.node}/config`;
> + } else {
> + me.url = `/api2/extjs/config/datastore/${me.datastore}`;
> + }
> +
> + return {};
> + },
> +
> + run_editor: function() {
> + let me = this;
> + let win = Ext.create('Proxmox.window.Edit', {
> + title: gettext('Notes'),
> + width: 800,
> + height: 600,
> + resizable: true,
> + layout: 'fit',
> + defaultButton: undefined,
> + setMaxLength: function(maxLength) {
> + let area = win.down('textarea[name="comment"]');
> + area.maxLength = maxLength;
> + area.validate();
> +
> + return me;
> + },
> + items: {
> + xtype: 'textarea',
> + name: 'comment',
> + 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();
> + },
> + },
> + }).show();
> + win.setMaxLength(me.maxLength);
> + win.load();
> + },
> +
> + 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.comment);
> + },
> + });
> + },
> +
> + 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();
> + },
> + }],
> +
> + collapsible: true,
> + collapseDirection: 'right',
> +
> + initComponent: function() {
> + var me = this;
> +
> + me.callParent();
> +
> + let sp = Ext.state.Manager.getProvider();
> + me.collapseMode = sp.get('notes-collapse', 'never');
this is never set in pbs, so it has no use here
(though it would probably a nice addition for pbs)
> +
> + if (me.loadOnInit === true) {
> + me.load();
> + }
> +
> + if (me.collapseMode === 'auto') {
> + me.setCollapsed(true);
> + }
> + },
> +});