[pve-devel] [PATCH widget-toolkit/manager/pmg-gui/proxmox-backup] move task descriptions

[pve-devel] [PATCH widget-toolkit/manager/pmg-gui/proxmox-backup] move task descriptions

[Dominik Csapak]

these patches moves the task descriptions to their product specific
Utils.js file (and add some that are missing)

we want this, because we want a list of relevant tasks for each product
in the ui (e.g. to filter by them)

the widget-toolkit update does not really 'break' the other (old) packages,
but without the relevant updates, the task description translations will be
missing in the respective UIs, so we probably want some breaks/depends?
(the overrides should work with the old widget-toolkit)

(btw. sending it only to pve-devel to avoid spamming everyone multiple
times with the same messages)

proxmox-widget-toolkit:

Dominik Csapak (1):
  Utils: remove product specific task descriptions

 src/Utils.js | 89 +++-------------------------------------------------
 1 file changed, 5 insertions(+), 84 deletions(-)

pve-manager:

Dominik Csapak (1):
  ui: Utils: add product specific task descriptions

 www/manager6/Utils.js | 85 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

pmg-gui:

Dominik Csapak (1):
  Utils: add product specific task descriptions

 js/Utils.js | 9 +++++++++
 1 file changed, 9 insertions(+)

proxmox-backup:

Dominik Csapak (1):
  ui: Utils: add product specific task descriptions

 www/Utils.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

-- 
2.20.1

[pve-devel] [PATCH widget-toolkit 1/1] Utils: remove product specific task descriptions

[Dominik Csapak]

we use 'override_task_descriptions' in the specific products to
add the ones that are not used everywhere

took the chance and sorted the remaining alphabetically

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/Utils.js | 89 +++-------------------------------------------------
 1 file changed, 5 insertions(+), 84 deletions(-)

diff --git a/src/Utils.js b/src/Utils.js
index abbad36..d80d703 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -562,94 +562,15 @@ utilities: {
     },
 
     task_desc_table: {
-	acmenewcert: ['SRV', gettext('Order Certificate')],
-	acmeregister: ['ACME Account', gettext('Register')],
-	acmedeactivate: ['ACME Account', gettext('Deactivate')],
-	acmeupdate: ['ACME Account', gettext('Update')],
-	acmerefresh: ['ACME Account', gettext('Refresh')],
-	acmerenew: ['SRV', gettext('Renew Certificate')],
-	acmerevoke: ['SRV', gettext('Revoke Certificate')],
-	'auth-realm-sync': [gettext('Realm'), gettext('Sync')],
-	'auth-realm-sync-test': [gettext('Realm'), gettext('Sync Preview')],
-	'move_volume': ['CT', gettext('Move Volume')],
-	clustercreate: ['', gettext('Create Cluster')],
-	clusterjoin: ['', gettext('Join Cluster')],
+	aptupdate: ['', gettext('Update package database')],
 	diskinit: ['Disk', gettext('Initialize Disk with GPT')],
-	vncproxy: ['VM/CT', gettext('Console')],
-	spiceproxy: ['VM/CT', gettext('Console') + ' (Spice)'],
-	vncshell: ['', gettext('Shell')],
 	spiceshell: ['', gettext('Shell') + ' (Spice)'],
-	qmsnapshot: ['VM', gettext('Snapshot')],
-	qmrollback: ['VM', gettext('Rollback')],
-	qmdelsnapshot: ['VM', gettext('Delete Snapshot')],
-	qmcreate: ['VM', gettext('Create')],
-	qmrestore: ['VM', gettext('Restore')],
-	qmdestroy: ['VM', gettext('Destroy')],
-	qmigrate: ['VM', gettext('Migrate')],
-	qmclone: ['VM', gettext('Clone')],
-	qmmove: ['VM', gettext('Move disk')],
-	qmtemplate: ['VM', gettext('Convert to template')],
-	qmstart: ['VM', gettext('Start')],
-	qmstop: ['VM', gettext('Stop')],
-	qmreset: ['VM', gettext('Reset')],
-	qmshutdown: ['VM', gettext('Shutdown')],
-	qmreboot: ['VM', gettext('Reboot')],
-	qmsuspend: ['VM', gettext('Hibernate')],
-	qmpause: ['VM', gettext('Pause')],
-	qmresume: ['VM', gettext('Resume')],
-	qmconfig: ['VM', gettext('Configure')],
-	vzsnapshot: ['CT', gettext('Snapshot')],
-	vzrollback: ['CT', gettext('Rollback')],
-	vzdelsnapshot: ['CT', gettext('Delete Snapshot')],
-	vzcreate: ['CT', gettext('Create')],
-	vzrestore: ['CT', gettext('Restore')],
-	vzdestroy: ['CT', gettext('Destroy')],
-	vzmigrate: ['CT', gettext('Migrate')],
-	vzclone: ['CT', gettext('Clone')],
-	vztemplate: ['CT', gettext('Convert to template')],
-	vzstart: ['CT', gettext('Start')],
-	vzstop: ['CT', gettext('Stop')],
-	vzmount: ['CT', gettext('Mount')],
-	vzumount: ['CT', gettext('Unmount')],
-	vzshutdown: ['CT', gettext('Shutdown')],
-	vzreboot: ['CT', gettext('Reboot')],
-	vzsuspend: ['CT', gettext('Suspend')],
-	vzresume: ['CT', gettext('Resume')],
-	push_file: ['CT', gettext('Push file')],
-	pull_file: ['CT', gettext('Pull file')],
-	hamigrate: ['HA', gettext('Migrate')],
-	hastart: ['HA', gettext('Start')],
-	hastop: ['HA', gettext('Stop')],
-	hashutdown: ['HA', gettext('Shutdown')],
+	srvreload: ['SRV', gettext('Reload')],
+	srvrestart: ['SRV', gettext('Restart')],
 	srvstart: ['SRV', gettext('Start')],
 	srvstop: ['SRV', gettext('Stop')],
-	srvrestart: ['SRV', gettext('Restart')],
-	srvreload: ['SRV', gettext('Reload')],
-	cephcreatemgr: ['Ceph Manager', gettext('Create')],
-	cephdestroymgr: ['Ceph Manager', gettext('Destroy')],
-	cephcreatemon: ['Ceph Monitor', gettext('Create')],
-	cephdestroymon: ['Ceph Monitor', gettext('Destroy')],
-	cephcreateosd: ['Ceph OSD', gettext('Create')],
-	cephdestroyosd: ['Ceph OSD', gettext('Destroy')],
-	cephcreatepool: ['Ceph Pool', gettext('Create')],
-	cephdestroypool: ['Ceph Pool', gettext('Destroy')],
-	cephfscreate: ['CephFS', gettext('Create')],
-	cephcreatemds: ['Ceph Metadata Server', gettext('Create')],
-	cephdestroymds: ['Ceph Metadata Server', gettext('Destroy')],
-	imgcopy: ['', gettext('Copy data')],
-	imgdel: ['', gettext('Erase data')],
-	unknownimgdel: ['', gettext('Destroy image from unknown guest')],
-	download: ['', gettext('Download')],
-	vzdump: (type, id) => id ? `VM/CT ${id} - ${gettext('Backup')}` : gettext('Backup Job'),
-	aptupdate: ['', gettext('Update package database')],
-	startall: ['', gettext('Start all VMs and Containers')],
-	stopall: ['', gettext('Stop all VMs and Containers')],
-	migrateall: ['', gettext('Migrate all VMs and Containers')],
-	dircreate: [gettext('Directory Storage'), gettext('Create')],
-	dirremove: [gettext('Directory'), gettext('Remove')],
-	lvmcreate: [gettext('LVM Storage'), gettext('Create')],
-	lvmthincreate: [gettext('LVM-Thin Storage'), gettext('Create')],
-	zfscreate: [gettext('ZFS Storage'), gettext('Create')],
+	termproxy: ['', gettext('Console') + ' (xterm.js)'],
+	vncshell: ['', gettext('Shell')],
     },
 
     // to add or change existing for product specific ones
-- 
2.20.1

[pve-devel] applied: [PATCH widget-toolkit 1/1] Utils: remove product specific task descriptions

[Thomas Lamprecht]

On 30.10.20 14:02, Dominik Csapak wrote:
> we use 'override_task_descriptions' in the specific products to
> add the ones that are not used everywhere
> 
> took the chance and sorted the remaining alphabetically
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  src/Utils.js | 89 +++-------------------------------------------------
>  1 file changed, 5 insertions(+), 84 deletions(-)
> 
>

applied, thanks!

"vncshell" is only used in PVE though, may want to move that over there
too sometimes

[pve-devel] [PATCH pmg-gui 1/1] Utils: add product specific task descriptions

[Dominik Csapak]

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 js/Utils.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/js/Utils.js b/js/Utils.js
index e730a3e..90637ca 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -822,5 +822,14 @@ Ext.define('PMG.Utils', {
 	var me = this;
 
 	// do whatever you want here
+	Proxmox.Utils.override_task_descriptions({
+	    applycustomscores: ['', gettext('Apply custom SpamAssassin scores')],
+	    avupdate: ['', gettext('ClamAV update')],
+	    backup: ['', gettext('Backup')],
+	    clustercreate: ['', gettext('Create Cluster')],
+	    clusterjoin: ['', gettext('Join Cluster')],
+	    restore: ['', gettext('Restore')],
+	    saupdate: ['', gettext('SpamAssassin update')],
+	});
     },
 });
-- 
2.20.1

[pve-devel] applied: [PATCH pmg-gui 1/1] Utils: add product specific task descriptions

[Thomas Lamprecht]

On 30.10.20 14:02, Dominik Csapak wrote:
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  js/Utils.js | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
>

applied, thanks!

[pve-devel] [PATCH manager 1/1] ui: Utils: add product specific task descriptions

[Dominik Csapak]

move them from widget-toolkit to here
i took the chance, and sorted them alphabetically

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Utils.js | 85 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index bf9ceda9..b70592b4 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1566,6 +1566,91 @@ Ext.define('PVE.Utils', { utilities: {
     constructor: function() {
 	var me = this;
 	Ext.apply(me, me.utilities);
+
+	Proxmox.Utils.override_task_descriptions({
+	    acmedeactivate: ['ACME Account', gettext('Deactivate')],
+	    acmenewcert: ['SRV', gettext('Order Certificate')],
+	    acmerefresh: ['ACME Account', gettext('Refresh')],
+	    acmeregister: ['ACME Account', gettext('Register')],
+	    acmerenew: ['SRV', gettext('Renew Certificate')],
+	    acmerevoke: ['SRV', gettext('Revoke Certificate')],
+	    acmeupdate: ['ACME Account', gettext('Update')],
+	    'auth-realm-sync': [gettext('Realm'), gettext('Sync')],
+	    'auth-realm-sync-test': [gettext('Realm'), gettext('Sync Preview')],
+	    cephcreatemds: ['Ceph Metadata Server', gettext('Create')],
+	    cephcreatemgr: ['Ceph Manager', gettext('Create')],
+	    cephcreatemon: ['Ceph Monitor', gettext('Create')],
+	    cephcreateosd: ['Ceph OSD', gettext('Create')],
+	    cephcreatepool: ['Ceph Pool', gettext('Create')],
+	    cephdestroymds: ['Ceph Metadata Server', gettext('Destroy')],
+	    cephdestroymgr: ['Ceph Manager', gettext('Destroy')],
+	    cephdestroymon: ['Ceph Monitor', gettext('Destroy')],
+	    cephdestroyosd: ['Ceph OSD', gettext('Destroy')],
+	    cephdestroypool: ['Ceph Pool', gettext('Destroy')],
+	    cephfscreate: ['CephFS', gettext('Create')],
+	    clustercreate: ['', gettext('Create Cluster')],
+	    clusterjoin: ['', gettext('Join Cluster')],
+	    dircreate: [gettext('Directory Storage'), gettext('Create')],
+	    dirremove: [gettext('Directory'), gettext('Remove')],
+	    download: ['', gettext('Download')],
+	    hamigrate: ['HA', gettext('Migrate')],
+	    hashutdown: ['HA', gettext('Shutdown')],
+	    hastart: ['HA', gettext('Start')],
+	    hastop: ['HA', gettext('Stop')],
+	    imgcopy: ['', gettext('Copy data')],
+	    imgdel: ['', gettext('Erase data')],
+	    lvmcreate: [gettext('LVM Storage'), gettext('Create')],
+	    lvmthincreate: [gettext('LVM-Thin Storage'), gettext('Create')],
+	    migrateall: ['', gettext('Migrate all VMs and Containers')],
+	    'move_volume': ['CT', gettext('Move Volume')],
+	    pull_file: ['CT', gettext('Pull file')],
+	    push_file: ['CT', gettext('Push file')],
+	    qmclone: ['VM', gettext('Clone')],
+	    qmconfig: ['VM', gettext('Configure')],
+	    qmcreate: ['VM', gettext('Create')],
+	    qmdelsnapshot: ['VM', gettext('Delete Snapshot')],
+	    qmdestroy: ['VM', gettext('Destroy')],
+	    qmigrate: ['VM', gettext('Migrate')],
+	    qmmove: ['VM', gettext('Move disk')],
+	    qmpause: ['VM', gettext('Pause')],
+	    qmreboot: ['VM', gettext('Reboot')],
+	    qmreset: ['VM', gettext('Reset')],
+	    qmrestore: ['VM', gettext('Restore')],
+	    qmresume: ['VM', gettext('Resume')],
+	    qmrollback: ['VM', gettext('Rollback')],
+	    qmshutdown: ['VM', gettext('Shutdown')],
+	    qmsnapshot: ['VM', gettext('Snapshot')],
+	    qmstart: ['VM', gettext('Start')],
+	    qmstop: ['VM', gettext('Stop')],
+	    qmsuspend: ['VM', gettext('Hibernate')],
+	    qmtemplate: ['VM', gettext('Convert to template')],
+	    spiceproxy: ['VM/CT', gettext('Console') + ' (Spice)'],
+	    spiceshell: ['', gettext('Shell') + ' (Spice)'],
+	    startall: ['', gettext('Start all VMs and Containers')],
+	    stopall: ['', gettext('Stop all VMs and Containers')],
+	    unknownimgdel: ['', gettext('Destroy image from unknown guest')],
+	    vncproxy: ['VM/CT', gettext('Console')],
+	    vncshell: ['', gettext('Shell')],
+	    vzclone: ['CT', gettext('Clone')],
+	    vzcreate: ['CT', gettext('Create')],
+	    vzdelsnapshot: ['CT', gettext('Delete Snapshot')],
+	    vzdestroy: ['CT', gettext('Destroy')],
+	    vzdump: (type, id) => id ? `VM/CT ${id} - ${gettext('Backup')}` : gettext('Backup Job'),
+	    vzmigrate: ['CT', gettext('Migrate')],
+	    vzmount: ['CT', gettext('Mount')],
+	    vzreboot: ['CT', gettext('Reboot')],
+	    vzrestore: ['CT', gettext('Restore')],
+	    vzresume: ['CT', gettext('Resume')],
+	    vzrollback: ['CT', gettext('Rollback')],
+	    vzshutdown: ['CT', gettext('Shutdown')],
+	    vzsnapshot: ['CT', gettext('Snapshot')],
+	    vzstart: ['CT', gettext('Start')],
+	    vzstop: ['CT', gettext('Stop')],
+	    vzsuspend: ['CT', gettext('Suspend')],
+	    vztemplate: ['CT', gettext('Convert to template')],
+	    vzumount: ['CT', gettext('Unmount')],
+	    zfscreate: [gettext('ZFS Storage'), gettext('Create')],
+	});
     }
 
 });
-- 
2.20.1

[pve-devel] applied: [PATCH manager 1/1] ui: Utils: add product specific task descriptions

[Thomas Lamprecht]

On 30.10.20 14:02, Dominik Csapak wrote:
> move them from widget-toolkit to here
> i took the chance, and sorted them alphabetically
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  www/manager6/Utils.js | 85 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 85 insertions(+)
> 
>

applied, thanks!

[pve-devel] [PATCH proxmox-backup 1/1] ui: Utils: add product specific task descriptions

[Dominik Csapak]

and sort them alphabetically

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/Utils.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/www/Utils.js b/www/Utils.js
index 58319345..6c890659 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -97,17 +97,20 @@ Ext.define('PBS.Utils', {
 
 	// do whatever you want here
 	Proxmox.Utils.override_task_descriptions({
+	    backup: (type, id) => PBS.Utils.render_datastore_worker_id(id, gettext('Backup')),
+	    dircreate: [gettext('Directory Storage'), gettext('Create')],
+	    dirremove: [gettext('Directory'), gettext('Remove')],
 	    garbage_collection: ['Datastore', gettext('Garbage collect')],
+	    logrotate: [gettext('Log'), gettext('Rotation')],
+	    prune: (type, id) => PBS.Utils.render_datastore_worker_id(id, gettext('Prune')),
+	    reader: (type, id) => PBS.Utils.render_datastore_worker_id(id, gettext('Read objects')),
 	    sync: ['Datastore', gettext('Remote Sync')],
+	    syncjob: [gettext('Sync Job'), gettext('Remote Sync')],
 	    verify: ['Datastore', gettext('Verification')],
 	    verify_group: ['Group', gettext('Verification')],
 	    verify_snapshot: ['Snapshot', gettext('Verification')],
-	    syncjob: [gettext('Sync Job'), gettext('Remote Sync')],
 	    verifyjob: [gettext('Verify Job'), gettext('Scheduled Verification')],
-	    prune: (type, id) => PBS.Utils.render_datastore_worker_id(id, gettext('Prune')),
-	    backup: (type, id) => PBS.Utils.render_datastore_worker_id(id, gettext('Backup')),
-	    reader: (type, id) => PBS.Utils.render_datastore_worker_id(id, gettext('Read objects')),
-	    logrotate: [gettext('Log'), gettext('Rotation')],
+	    zfscreate: [gettext('ZFS Storage'), gettext('Create')],
 	});
     },
 });
-- 
2.20.1

[pve-devel] applied: [PATCH proxmox-backup 1/1] ui: Utils: add product specific task descriptions

[Thomas Lamprecht]

On 30.10.20 14:02, Dominik Csapak wrote:
> and sort them alphabetically
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  www/Utils.js | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
>

applied, thanks!