From: Dominik Csapak <d.csapak@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Lorenz Stechauner <l.stechauner@proxmox.com>
Subject: Re: [pve-devel] [PATCH v4 manager 1/5] ui: move upload window into UploadToStorage.js
Date: Fri, 5 Nov 2021 09:12:49 +0100 [thread overview]
Message-ID: <0cf7b403-a322-35ee-286e-64e1e132b066@proxmox.com> (raw)
In-Reply-To: <20210831101637.3080902-7-l.stechauner@proxmox.com>
Looks mostly ok, some small nits (replied to the separate patches)
those could also be sent as follow ups
Aside from those things
Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>
Tested-by: Dominik Csapak <d.csapak@proxmox.com>
On 8/31/21 12:16, Lorenz Stechauner wrote:
> Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
> ---
> www/manager6/Makefile | 1 +
> www/manager6/storage/ContentView.js | 195 +------------------------
> www/manager6/window/UploadToStorage.js | 192 ++++++++++++++++++++++++
> 3 files changed, 194 insertions(+), 194 deletions(-)
> create mode 100644 www/manager6/window/UploadToStorage.js
>
> diff --git a/www/manager6/Makefile b/www/manager6/Makefile
> index 75d355a5..552e842b 100644
> --- a/www/manager6/Makefile
> +++ b/www/manager6/Makefile
> @@ -106,6 +106,7 @@ JSSRC= \
> window/Snapshot.js \
> window/StartupEdit.js \
> window/DownloadUrlToStorage.js \
> + window/UploadToStorage.js \
> window/Wizard.js \
> ha/Fencing.js \
> ha/GroupEdit.js \
> diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
> index 3f5b686b..ca0ad664 100644
> --- a/www/manager6/storage/ContentView.js
> +++ b/www/manager6/storage/ContentView.js
> @@ -1,196 +1,3 @@
> -Ext.define('PVE.storage.Upload', {
> - extend: 'Ext.window.Window',
> - alias: 'widget.pveStorageUpload',
> -
> - resizable: false,
> -
> - modal: true,
> -
> - initComponent: function() {
> - var me = this;
> -
> - if (!me.nodename) {
> - throw "no node name specified";
> - }
> - if (!me.storage) {
> - throw "no storage ID specified";
> - }
> -
> - let baseurl = `/nodes/${me.nodename}/storage/${me.storage}/upload`;
> -
> - let pbar = Ext.create('Ext.ProgressBar', {
> - text: 'Ready',
> - hidden: true,
> - });
> -
> - let acceptedExtensions = {
> - iso: ".img, .iso",
> - vztmpl: ".tar.gz, .tar.xz",
> - };
> -
> - let defaultContent = me.contents[0] || '';
> -
> - let fileField = Ext.create('Ext.form.field.File', {
> - name: 'filename',
> - buttonText: gettext('Select File...'),
> - allowBlank: false,
> - setAccept: function(content) {
> - let acceptString = acceptedExtensions[content] || '';
> - this.fileInputEl.set({
> - accept: acceptString,
> - });
> - },
> - listeners: {
> - afterrender: function(cmp) {
> - cmp.setAccept(defaultContent);
> - },
> - },
> - });
> -
> - me.formPanel = Ext.create('Ext.form.Panel', {
> - method: 'POST',
> - waitMsgTarget: true,
> - bodyPadding: 10,
> - border: false,
> - width: 300,
> - fieldDefaults: {
> - labelWidth: 100,
> - anchor: '100%',
> - },
> - items: [
> - {
> - xtype: 'pveContentTypeSelector',
> - cts: me.contents,
> - fieldLabel: gettext('Content'),
> - name: 'content',
> - value: defaultContent,
> - allowBlank: false,
> - listeners: {
> - change: function(cmp, newValue, oldValue) {
> - fileField.setAccept(newValue);
> - },
> - },
> - },
> - fileField,
> - pbar,
> - ],
> - });
> -
> - let form = me.formPanel.getForm();
> -
> - let doStandardSubmit = function() {
> - form.submit({
> - url: "/api2/htmljs" + baseurl,
> - waitMsg: gettext('Uploading file...'),
> - success: function(f, action) {
> - me.close();
> - },
> - failure: function(f, action) {
> - var msg = PVE.Utils.extractFormActionError(action);
> - Ext.Msg.alert(gettext('Error'), msg);
> - },
> - });
> - };
> -
> - let updateProgress = function(per, bytes) {
> - var text = (per * 100).toFixed(2) + '%';
> - if (bytes) {
> - text += " (" + Proxmox.Utils.format_size(bytes) + ')';
> - }
> - pbar.updateProgress(per, text);
> - };
> -
> - let abortBtn = Ext.create('Ext.Button', {
> - text: gettext('Abort'),
> - disabled: true,
> - handler: function() {
> - me.close();
> - },
> - });
> -
> - let submitBtn = Ext.create('Ext.Button', {
> - text: gettext('Upload'),
> - disabled: true,
> - handler: function(button) {
> - var fd;
> - try {
> - fd = new FormData();
> - } catch (err) {
> - doStandardSubmit();
> - return;
> - }
> -
> - button.setDisabled(true);
> - abortBtn.setDisabled(false);
> -
> - var field = form.findField('content');
> - fd.append("content", field.getValue());
> - field.setDisabled(true);
> -
> - field = form.findField('filename');
> - var file = field.fileInputEl.dom;
> - fd.append("filename", file.files[0]);
> - field.setDisabled(true);
> -
> - pbar.setVisible(true);
> - updateProgress(0);
> -
> - let xhr = new XMLHttpRequest();
> - me.xhr = xhr;
> -
> - xhr.addEventListener("load", function(e) {
> - if (xhr.status === 200) {
> - me.close();
> - return;
> - }
> - let err = Ext.htmlEncode(xhr.statusText);
> - let msg = `${gettext('Error')} ${xhr.status.toString()}: ${err}`;
> - if (xhr.responseText !== "") {
> - let result = Ext.decode(xhr.responseText);
> - result.message = msg;
> - msg = Proxmox.Utils.extractRequestError(result, true);
> - }
> - Ext.Msg.alert(gettext('Error'), msg, btn => me.close());
> - }, false);
> -
> - xhr.addEventListener("error", function(e) {
> - let err = e.target.status.toString();
> - let msg = `Error '${err}' occurred while receiving the document.`;
> - Ext.Msg.alert(gettext('Error'), msg, btn => me.close());
> - });
> -
> - xhr.upload.addEventListener("progress", function(evt) {
> - if (evt.lengthComputable) {
> - let percentComplete = evt.loaded / evt.total;
> - updateProgress(percentComplete, evt.loaded);
> - }
> - }, false);
> -
> - xhr.open("POST", `/api2/json${baseurl}`, true);
> - xhr.send(fd);
> - },
> - });
> -
> - form.on('validitychange', (f, valid) => submitBtn.setDisabled(!valid));
> -
> - Ext.apply(me, {
> - title: gettext('Upload'),
> - items: me.formPanel,
> - buttons: [abortBtn, submitBtn],
> - listeners: {
> - close: function() {
> - if (me.xhr) {
> - me.xhr.abort();
> - delete me.xhr;
> - }
> - },
> - },
> - });
> -
> - me.callParent();
> - },
> -});
> -
> Ext.define('PVE.storage.ContentView', {
> extend: 'Ext.grid.GridPanel',
>
> @@ -259,7 +66,7 @@ Ext.define('PVE.storage.ContentView', {
> text: gettext('Upload'),
> disabled: !me.enableUploadButton,
> handler: function() {
> - Ext.create('PVE.storage.Upload', {
> + Ext.create('PVE.window.UploadToStorage', {
> nodename: nodename,
> storage: storage,
> contents: [content],
> diff --git a/www/manager6/window/UploadToStorage.js b/www/manager6/window/UploadToStorage.js
> new file mode 100644
> index 00000000..3c35020a
> --- /dev/null
> +++ b/www/manager6/window/UploadToStorage.js
> @@ -0,0 +1,192 @@
> +Ext.define('PVE.window.UploadToStorage', {
> + extend: 'Ext.window.Window',
> + alias: 'widget.pveStorageUpload',
> +
> + resizable: false,
> +
> + modal: true,
> +
> + initComponent: function() {
> + var me = this;
> +
> + if (!me.nodename) {
> + throw "no node name specified";
> + }
> + if (!me.storage) {
> + throw "no storage ID specified";
> + }
> +
> + let baseurl = `/nodes/${me.nodename}/storage/${me.storage}/upload`;
> +
> + let pbar = Ext.create('Ext.ProgressBar', {
> + text: 'Ready',
> + hidden: true,
> + });
> +
> + let acceptedExtensions = {
> + iso: ".img, .iso",
> + vztmpl: ".tar.gz, .tar.xz",
> + };
> +
> + let defaultContent = me.contents[0] || '';
> +
> + let fileField = Ext.create('Ext.form.field.File', {
> + name: 'filename',
> + buttonText: gettext('Select File...'),
> + allowBlank: false,
> + setAccept: function(content) {
> + let acceptString = acceptedExtensions[content] || '';
> + this.fileInputEl.set({
> + accept: acceptString,
> + });
> + },
> + listeners: {
> + afterrender: function(cmp) {
> + cmp.setAccept(defaultContent);
> + },
> + },
> + });
> +
> + me.formPanel = Ext.create('Ext.form.Panel', {
> + method: 'POST',
> + waitMsgTarget: true,
> + bodyPadding: 10,
> + border: false,
> + width: 300,
> + fieldDefaults: {
> + labelWidth: 100,
> + anchor: '100%',
> + },
> + items: [
> + {
> + xtype: 'pveContentTypeSelector',
> + cts: me.contents,
> + fieldLabel: gettext('Content'),
> + name: 'content',
> + value: defaultContent,
> + allowBlank: false,
> + listeners: {
> + change: function(cmp, newValue, oldValue) {
> + fileField.setAccept(newValue);
> + },
> + },
> + },
> + fileField,
> + pbar,
> + ],
> + });
> +
> + let form = me.formPanel.getForm();
> +
> + let doStandardSubmit = function() {
> + form.submit({
> + url: "/api2/htmljs" + baseurl,
> + waitMsg: gettext('Uploading file...'),
> + success: function(f, action) {
> + me.close();
> + },
> + failure: function(f, action) {
> + var msg = PVE.Utils.extractFormActionError(action);
> + Ext.Msg.alert(gettext('Error'), msg);
> + },
> + });
> + };
> +
> + let updateProgress = function(per, bytes) {
> + var text = (per * 100).toFixed(2) + '%';
> + if (bytes) {
> + text += " (" + Proxmox.Utils.format_size(bytes) + ')';
> + }
> + pbar.updateProgress(per, text);
> + };
> +
> + let abortBtn = Ext.create('Ext.Button', {
> + text: gettext('Abort'),
> + disabled: true,
> + handler: function() {
> + me.close();
> + },
> + });
> +
> + let submitBtn = Ext.create('Ext.Button', {
> + text: gettext('Upload'),
> + disabled: true,
> + handler: function(button) {
> + var fd;
> + try {
> + fd = new FormData();
> + } catch (err) {
> + doStandardSubmit();
> + return;
> + }
> +
> + button.setDisabled(true);
> + abortBtn.setDisabled(false);
> +
> + var field = form.findField('content');
> + fd.append("content", field.getValue());
> + field.setDisabled(true);
> +
> + field = form.findField('filename');
> + var file = field.fileInputEl.dom;
> + fd.append("filename", file.files[0]);
> + field.setDisabled(true);
> +
> + pbar.setVisible(true);
> + updateProgress(0);
> +
> + let xhr = new XMLHttpRequest();
> + me.xhr = xhr;
> +
> + xhr.addEventListener("load", function(e) {
> + if (xhr.status === 200) {
> + me.close();
> + return;
> + }
> + let err = Ext.htmlEncode(xhr.statusText);
> + let msg = `${gettext('Error')} ${xhr.status.toString()}: ${err}`;
> + if (xhr.responseText !== "") {
> + let result = Ext.decode(xhr.responseText);
> + result.message = msg;
> + msg = Proxmox.Utils.extractRequestError(result, true);
> + }
> + Ext.Msg.alert(gettext('Error'), msg, btn => me.close());
> + }, false);
> +
> + xhr.addEventListener("error", function(e) {
> + let err = e.target.status.toString();
> + let msg = `Error '${err}' occurred while receiving the document.`;
> + Ext.Msg.alert(gettext('Error'), msg, btn => me.close());
> + });
> +
> + xhr.upload.addEventListener("progress", function(evt) {
> + if (evt.lengthComputable) {
> + let percentComplete = evt.loaded / evt.total;
> + updateProgress(percentComplete, evt.loaded);
> + }
> + }, false);
> +
> + xhr.open("POST", `/api2/json${baseurl}`, true);
> + xhr.send(fd);
> + },
> + });
> +
> + form.on('validitychange', (f, valid) => submitBtn.setDisabled(!valid));
> +
> + Ext.apply(me, {
> + title: gettext('Upload'),
> + items: me.formPanel,
> + buttons: [abortBtn, submitBtn],
> + listeners: {
> + close: function() {
> + if (me.xhr) {
> + me.xhr.abort();
> + delete me.xhr;
> + }
> + },
> + },
> + });
> +
> + me.callParent();
> + },
> +});
>
next prev parent reply other threads:[~2021-11-05 8:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 10:16 [pve-devel] [PATCH-SERIES v4 http-server/storage/manager] fix #3505: add checksum and algorithm to iso upload Lorenz Stechauner
2021-08-31 10:16 ` [pve-devel] [PATCH v4 http-server 1/1] anyevent: move unlink from http-server to endpoint Lorenz Stechauner
2021-10-04 8:16 ` [pve-devel] applied: " Thomas Lamprecht
2021-08-31 10:16 ` [pve-devel] [PATCH v4 storage 1/4] status: move unlink from http-server to enpoint Lorenz Stechauner
2021-09-06 7:04 ` [pve-devel] applied: " Thomas Lamprecht
2021-08-31 10:16 ` [pve-devel] [PATCH v4 storage 2/4] status: remove sleep(1) in file upload Lorenz Stechauner
2021-08-31 10:16 ` [pve-devel] [PATCH v4 storage 3/4] fix #3505: status: add checksum and algorithm to " Lorenz Stechauner
2021-08-31 10:16 ` [pve-devel] [PATCH v4 storage 4/4] status: fix tmpfile cleanup Lorenz Stechauner
2021-11-04 15:33 ` [pve-devel] partially applied: " Thomas Lamprecht
2021-08-31 10:16 ` [pve-devel] [PATCH v4 manager 1/5] ui: move upload window into UploadToStorage.js Lorenz Stechauner
2021-11-05 8:12 ` Dominik Csapak [this message]
2021-08-31 10:16 ` [pve-devel] [PATCH v4 manager 2/5] ui: refactor UploadToStorage.js Lorenz Stechauner
2021-11-05 8:12 ` Dominik Csapak
2021-08-31 10:16 ` [pve-devel] [PATCH v4 manager 3/5] fix #3505: ui/UploadToStorage: add checksum and algorithm Lorenz Stechauner
2021-08-31 10:16 ` [pve-devel] [PATCH v4 manager 4/5] ui/UploadToStorage: add TaskViewer Lorenz Stechauner
2021-08-31 10:16 ` [pve-devel] [PATCH v4 manager 5/5] ui/UplaodToStorage: check file extension Lorenz Stechauner
2021-11-05 8:12 ` Dominik Csapak
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=0cf7b403-a322-35ee-286e-64e1e132b066@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=l.stechauner@proxmox.com \
--cc=pve-devel@lists.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