public_git
/
freenas-proxmox
mirror of https://github.com/TheGrandWazoo/freenas-proxmox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up code. 

- Indent and whitespace cleanup.
This commit is contained in:
Kevin Scott Adams 2024-01-06 17:34:17 -05:00
parent b9dd1d6f89
commit 817433a393
2 changed files with 396 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

286
pve-manager/js/pvemanagerlib-8.0.5_1.js.patch Normal file
View File

@ -0,0 +1,286 @@
--- pvemanagerlib.js.orig 2024-01-06 14:50:39.890252726 -0500
+++ pvemanagerlib.js 2024-01-06 15:51:53.708260622 -0500
@@ -9228,6 +9228,7 @@
alias: ['widget.pveiScsiProviderSelector'],
comboItems: [
['comstar', 'Comstar'],
+ ['freenas', 'FreeNAS/TrueNAS API'],
['istgt', 'istgt'],
['iet', 'IET'],
['LIO', 'LIO'],
@@ -58017,16 +58018,23 @@
me.callParent();
},
});
+
Ext.define('PVE.storage.ZFSInputPanel', {
extend: 'PVE.panel.StorageBase',
-
viewModel: {
- parent: null,
- data: {
- isLIO: false,
- isComstar: true,
- hasWriteCacheOption: true,
- },
+ parent: null,
+ data: {
+ isComstar: true,
+ isFreeNAS: false,
+ isLIO: false,
+ isToken: false,
+ hasWriteCacheOption: true,
+ },
+ formulas: {
+ hideUsername: function(get) {
+ return (!get('isFreeNAS') || !(get('isFreeNAS') && !get('isToken')));
+ },
+ },
},
controller: {
@@ -58035,12 +58043,41 @@
'field[name=iscsiprovider]': {
change: 'changeISCSIProvider',
},
+ 'field[name=truenas_token_auth]': {
+ change: 'changeUsername',
+ },
},
changeISCSIProvider: function(f, newVal, oldVal) {
+ var me = this;
var vm = this.getViewModel();
vm.set('isLIO', newVal === 'LIO');
vm.set('isComstar', newVal === 'comstar');
- vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt');
+ vm.set('isFreeNAS', newVal === 'freenas');
+ vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt');
+ if (newVal !== 'freenas') {
+ me.lookupReference('freenas_use_ssl_field').setValue(false);
+ me.lookupReference('truenas_token_auth_field').setValue(false);
+ me.lookupReference('freenas_apiv4_host_field').setValue('');
+ me.lookupReference('freenas_user_field').setValue('');
+ me.lookupReference('freenas_user_field').allowBlank = true;
+ me.lookupReference('truenas_secret_field').setValue('');
+ me.lookupReference('truenas_secret_field').allowBlank = true;
+ me.lookupReference('truenas_confirm_secret_field').setValue('');
+ me.lookupReference('truenas_confirm_secret_field').allowBlank = true;
+ } else {
+ me.lookupReference('freenas_user_field').allowBlank = false;
+ me.lookupReference('truenas_secret_field').allowBlank = false;
+ me.lookupReference('truenas_confirm_secret_field').allowBlank = false;
+ }
+ },
+ changeUsername: function(f, newVal, oldVal) {
+ var me = this;
+ var vm = me.getViewModel();
+ vm.set('isToken', newVal);
+ me.lookupReference('freenas_user_field').allowBlank = newVal;
+ if (newVal) {
+ me.lookupReference('freenas_user_field').setValue('');
+ }
},
},
@@ -58053,18 +58090,68 @@
values.nowritecache = values.writecache ? 0 : 1;
delete values.writecache;
+ console.warn(values.freenas_password);
+ if (values.freenas_password) {
+ values.truenas_secret = values.freenas_password;
+ }
+ console.warn(values.truenas_secret);
return me.callParent([values]);
},
setValues: function(values) {
- values.writecache = values.nowritecache ? 0 : 1;
- this.callParent([values]);
+ if (values.freenas_password) {
+ values.truenas_secret = values.freenas_password;
+ }
+ values.truenas_confirm_secret = values.truenas_secret;
+ values.writecache = values.nowritecache ? 0 : 1;
+ this.callParent([values]);
},
initComponent: function() {
var me = this;
+ var tnsecret = Ext.create('Ext.form.TextField', {
+ xtype: 'proxmoxtextfield',
+ name: 'truenas_secret',
+ reference: 'truenas_secret_field',
+ inputType: me.isCreate ? '' : 'password',
+ value: '',
+ editable: true,
+ emptyText: Proxmox.Utils.noneText,
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ fieldLabel: gettext('API Password'),
+ change: function(f, value) {
+ if (f.rendered) {
+ f.up().down('field[name=truenas_confirm_secret]').validate();
+ }
+ },
+ });
+
+ var tnconfirmsecret = Ext.create('Ext.form.TextField', {
+ xtype: 'proxmoxtextfield',
+ name: 'truenas_confirm_secret',
+ reference: 'truenas_confirm_secret_field',
+ inputType: me.isCreate ? '' : 'password',
+ value: '',
+ editable: true,
+ submitValue: false,
+ emptyText: Proxmox.Utils.noneText,
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ fieldLabel: gettext('Confirm API Password'),
+ validator: function(value) {
+ var pw = me.up().down('field[name=truenas_secret]').getValue();
+ if (pw !== value) {
+ return "Secrets do not match!";
+ }
+ return true;
+ },
+ });
+
me.column1 = [
{
xtype: me.isCreate ? 'textfield' : 'displayfield',
@@ -58074,7 +58161,7 @@
allowBlank: false,
},
{
- xtype: me.isCreate ? 'textfield' : 'displayfield',
+ xtype: 'textfield',
name: 'pool',
value: '',
fieldLabel: gettext('Pool'),
@@ -58084,11 +58171,11 @@
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'blocksize',
value: '4k',
- fieldLabel: gettext('Block Size'),
+ fieldLabel: gettext('ZFS Block Size'),
allowBlank: false,
},
{
- xtype: me.isCreate ? 'textfield' : 'displayfield',
+ xtype: 'textfield',
name: 'target',
value: '',
fieldLabel: gettext('Target'),
@@ -58099,9 +58186,60 @@
name: 'comstar_tg',
value: '',
fieldLabel: gettext('Target group'),
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
+ bind: {
+ hidden: '{!isComstar}'
+ },
allowBlank: true,
},
+ {
+ xtype: 'proxmoxcheckbox',
+ name: 'freenas_use_ssl',
+ reference: 'freenas_use_ssl_field',
+ inputId: 'freenas_use_ssl_field',
+ checked: false,
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ uncheckedValue: 0,
+ fieldLabel: gettext('API use SSL'),
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ name: 'truenas_token_auth',
+ reference: 'truenas_token_auth_field',
+ inputId: 'truenas_use_token_auth_field',
+ checked: false,
+ listeners: {
+ change: function(field, newValue) {
+ if (newValue === true) {
+ tnsecret.labelEl.update('API Token');
+ tnconfirmsecret.labelEl.update('Confirm API Token');
+ me.lookupReference('freenas_user_field').setValue('');
+ me.lookupReference('freenas_user_field').allowBlank = true;
+ } else {
+ tnsecret.labelEl.update('API Password');
+ tnconfirmsecret.labelEl.update('Confirm API Password');
+ me.lookupReference('freenas_user_field').allowBlank = false;
+ }
+ },
+ },
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ uncheckedValue: 0,
+ fieldLabel: gettext('API Token Auth'),
+ },
+ {
+ xtype: 'textfield',
+ name: 'freenas_user',
+ reference: 'freenas_user_field',
+ inputId: 'freenas_user_field',
+ value: '',
+ fieldLabel: gettext('API Username'),
+ bind: {
+ hidden: '{hideUsername}'
+ },
+ },
];
me.column2 = [
@@ -58131,7 +58269,9 @@
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'comstar_hg',
value: '',
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
+ bind: {
+ hidden: '{!isComstar}'
+ },
fieldLabel: gettext('Host group'),
allowBlank: true,
},
@@ -58139,15 +58279,32 @@
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'lio_tpg',
value: '',
- bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
- allowBlank: false,
+ bind: {
+ hidden: '{!isLIO}'
+ },
fieldLabel: gettext('Target portal group'),
+ allowBlank: true
+ },
+ {
+ xtype: 'proxmoxtextfield',
+ name: 'freenas_apiv4_host',
+ reference: 'freenas_apiv4_host_field',
+ value: '',
+ editable: true,
+ emptyText: Proxmox.Utils.noneText,
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ fieldLabel: gettext('API IPv4 Host'),
},
+ tnsecret,
+ tnconfirmsecret,
];
me.callParent();
},
});
+
Ext.define('PVE.storage.ZFSPoolSelector', {
extend: 'PVE.form.ComboBoxSetStoreNode',
alias: 'widget.pveZFSPoolSelector',

223
pve-manager/js/pvemanagerlib.js.patch
View File

@ -1,88 +1,92 @@
--- pvemanagerlib.js.orig 2023-12-30 15:36:27.913505863 -0500 --- pvemanagerlib.js.orig 2024-01-06 14:50:39.890252726 -0500
+++ pvemanagerlib.js 2024-01-02 09:30:56.000000000 -0500 +++ pvemanagerlib.js 2024-01-06 15:51:53.708260622 -0500
@@ -9228,6 +9228,7 @@ @@ -9228,6 +9228,7 @@
alias: ['widget.pveiScsiProviderSelector'], alias: ['widget.pveiScsiProviderSelector'],
comboItems: [ comboItems: [
['comstar', 'Comstar'], ['comstar', 'Comstar'],
+ ['freenas', 'FreeNAS/TrueNAS API'], + ['freenas', 'FreeNAS/TrueNAS API'],
['istgt', 'istgt'], ['istgt', 'istgt'],
['iet', 'IET'], ['iet', 'IET'],
['LIO', 'LIO'], ['LIO', 'LIO'],
@@ -58017,16 +58018,24 @@ @@ -58017,16 +58018,23 @@
me.callParent(); me.callParent();
}, },
}); });
+ +
Ext.define('PVE.storage.ZFSInputPanel', { Ext.define('PVE.storage.ZFSInputPanel', {
extend: 'PVE.panel.StorageBase', extend: 'PVE.panel.StorageBase',
-
viewModel: { viewModel: {
parent: null, - parent: null,
data: { - data: {
+isComstar: true, - isLIO: false,
+ isFreeNAS: false,
isLIO: false,
- isComstar: true, - isComstar: true,
+ isToken: false, - hasWriteCacheOption: true,
hasWriteCacheOption: true, - },
}, + parent: null,
+formulas: { + data: {
+ hideUsername: function(get) { + isComstar: true,
+ return (!get('isFreeNAS') || !(get('isFreeNAS') && !get('isToken'))); + isFreeNAS: false,
+ }, + isLIO: false,
+ }, + isToken: false,
+ hasWriteCacheOption: true,
+ },
+ formulas: {
+ hideUsername: function(get) {
+ return (!get('isFreeNAS') || !(get('isFreeNAS') && !get('isToken')));
+ },
+ },
}, },
controller: { controller: {
@@ -58034,13 +58043,42 @@ @@ -58035,12 +58043,41 @@
control: {
'field[name=iscsiprovider]': { 'field[name=iscsiprovider]': {
change: 'changeISCSIProvider', change: 'changeISCSIProvider',
+}, },
+ 'field[name=truenas_token_auth]': { + 'field[name=truenas_token_auth]': {
+ change: 'changeUsername', + change: 'changeUsername',
}, + },
}, },
changeISCSIProvider: function(f, newVal, oldVal) { changeISCSIProvider: function(f, newVal, oldVal) {
+var me = this; + var me = this;
var vm = this.getViewModel(); var vm = this.getViewModel();
vm.set('isLIO', newVal === 'LIO'); vm.set('isLIO', newVal === 'LIO');
vm.set('isComstar', newVal === 'comstar'); vm.set('isComstar', newVal === 'comstar');
- vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt'); - vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt');
+ vm.set('isFreeNAS', newVal === 'freenas'); + vm.set('isFreeNAS', newVal === 'freenas');
+ vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt'); + vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt');
+ if (newVal !== 'freenas') { + if (newVal !== 'freenas') {
+ me.lookupReference('freenas_use_ssl_field').setValue(false); + me.lookupReference('freenas_use_ssl_field').setValue(false);
+ me.lookupReference('truenas_token_auth_field').setValue(false); + me.lookupReference('truenas_token_auth_field').setValue(false);
+ me.lookupReference('freenas_apiv4_host_field').setValue(''); + me.lookupReference('freenas_apiv4_host_field').setValue('');
+ me.lookupReference('freenas_user_field').setValue(''); + me.lookupReference('freenas_user_field').setValue('');
+ me.lookupReference('freenas_user_field').allowBlank = true; + me.lookupReference('freenas_user_field').allowBlank = true;
+ me.lookupReference('truenas_secret_field').setValue(''); + me.lookupReference('truenas_secret_field').setValue('');
+ me.lookupReference('truenas_secret_field').allowBlank = true; + me.lookupReference('truenas_secret_field').allowBlank = true;
+ me.lookupReference('truenas_confirm_secret_field').setValue(''); + me.lookupReference('truenas_confirm_secret_field').setValue('');
+ me.lookupReference('truenas_confirm_secret_field').allowBlank = true; + me.lookupReference('truenas_confirm_secret_field').allowBlank = true;
+ } else { + } else {
+ me.lookupReference('freenas_user_field').allowBlank = false; + me.lookupReference('freenas_user_field').allowBlank = false;
+ me.lookupReference('truenas_secret_field').allowBlank = false; + me.lookupReference('truenas_secret_field').allowBlank = false;
+ me.lookupReference('truenas_confirm_secret_field').allowBlank = false; + me.lookupReference('truenas_confirm_secret_field').allowBlank = false;
+ } + }
+ }, + },
+ changeUsername: function(f, newVal, oldVal) { + changeUsername: function(f, newVal, oldVal) {
+ var me = this; + var me = this;
+ var vm = me.getViewModel(); + var vm = me.getViewModel();
+ vm.set('isToken', newVal); + vm.set('isToken', newVal);
+ me.lookupReference('freenas_user_field').allowBlank = newVal; + me.lookupReference('freenas_user_field').allowBlank = newVal;
+ if (newVal) { + if (newVal) {
+ me.lookupReference('freenas_user_field').setValue(''); + me.lookupReference('freenas_user_field').setValue('');
+ } + }
}, },
}, },
@@ -58053,28 +58091,78 @@ @@ -58053,18 +58090,68 @@
values.nowritecache = values.writecache ? 0 : 1; values.nowritecache = values.writecache ? 0 : 1;
delete values.writecache; delete values.writecache;
+ console.warn(values.freenas_password); + console.warn(values.freenas_password);
+ if (values.freenas_password) { + if (values.freenas_password) {
+ values.truenas_secret = values.freenas_password; + values.truenas_secret = values.freenas_password;
+ } + }
@ -103,60 +107,53 @@
}, },
initComponent: function() { initComponent: function() {
- var me = this; var me = this;
+ var me = this;
+
+ var tnsecret = Ext.create('Ext.form.TextField', {
+ xtype: 'proxmoxtextfield',
+ name: 'truenas_secret',
+ reference: 'truenas_secret_field',
+ inputType: me.isCreate ? '' : 'password',
+ value: '',
+ editable: true,
+ emptyText: Proxmox.Utils.noneText,
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ fieldLabel: gettext('API Password'),
+ change: function(f, value) {
+ if (f.rendered) {
+ f.up().down('field[name=truenas_confirm_secret]').validate();
+ }
+ },
+ });
- me.column1 = [ + var tnsecret = Ext.create('Ext.form.TextField', {
- { + xtype: 'proxmoxtextfield',
- xtype: me.isCreate ? 'textfield' : 'displayfield', + name: 'truenas_secret',
- name: 'portal', + reference: 'truenas_secret_field',
+ var tnconfirmsecret = Ext.create('Ext.form.TextField', { + inputType: me.isCreate ? '' : 'password',
+ xtype: 'proxmoxtextfield', + value: '',
+ name: 'truenas_confirm_secret', + editable: true,
+ reference: 'truenas_confirm_secret_field', + emptyText: Proxmox.Utils.noneText,
+ inputType: me.isCreate ? '' : 'password', + bind: {
+ value: '', + hidden: '{!isFreeNAS}'
+ editable: true, + },
+ submitValue: false, + fieldLabel: gettext('API Password'),
+ emptyText: Proxmox.Utils.noneText, + change: function(f, value) {
+ bind: { + if (f.rendered) {
+ hidden: '{!isFreeNAS}' + f.up().down('field[name=truenas_confirm_secret]').validate();
+ }, + }
+ fieldLabel: gettext('Confirm API Password'), + },
+ validator: function(value) { + });
+ var pw = me.up().down('field[name=truenas_secret]').getValue();
+ if (pw !== value) {
+ return "Secrets do not match!";
+ }
+ return true;
+ },
+ });
+ +
+ me.column1 = [ + var tnconfirmsecret = Ext.create('Ext.form.TextField', {
+ { + xtype: 'proxmoxtextfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield', + name: 'truenas_confirm_secret',
+ name: 'portal', + reference: 'truenas_confirm_secret_field',
value: '', + inputType: me.isCreate ? '' : 'password',
fieldLabel: gettext('Portal'), + value: '',
+ editable: true,
+ submitValue: false,
+ emptyText: Proxmox.Utils.noneText,
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ fieldLabel: gettext('Confirm API Password'),
+ validator: function(value) {
+ var pw = me.up().down('field[name=truenas_secret]').getValue();
+ if (pw !== value) {
+ return "Secrets do not match!";
+ }
+ return true;
+ },
+ });
+
me.column1 = [
{
xtype: me.isCreate ? 'textfield' : 'displayfield',
@@ -58074,7 +58161,7 @@
allowBlank: false, allowBlank: false,
}, },
{ {
@ -165,7 +162,7 @@
name: 'pool', name: 'pool',
value: '', value: '',
fieldLabel: gettext('Pool'), fieldLabel: gettext('Pool'),
@@ -58084,11 +58172,11 @@ @@ -58084,11 +58171,11 @@
xtype: me.isCreate ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'blocksize', name: 'blocksize',
value: '4k', value: '4k',
@ -179,7 +176,7 @@
name: 'target', name: 'target',
value: '', value: '',
fieldLabel: gettext('Target'), fieldLabel: gettext('Target'),
@@ -58099,8 +58187,59 @@ @@ -58099,9 +58186,60 @@
name: 'comstar_tg', name: 'comstar_tg',
value: '', value: '',
fieldLabel: gettext('Target group'), fieldLabel: gettext('Target group'),
@ -188,7 +185,7 @@
+ hidden: '{!isComstar}' + hidden: '{!isComstar}'
+ }, + },
allowBlank: true, allowBlank: true,
+}, },
+ { + {
+ xtype: 'proxmoxcheckbox', + xtype: 'proxmoxcheckbox',
+ name: 'freenas_use_ssl', + name: 'freenas_use_ssl',
@ -237,10 +234,11 @@
+ bind: { + bind: {
+ hidden: '{hideUsername}' + hidden: '{hideUsername}'
+ }, + },
}, + },
]; ];
@@ -58131,7 +58270,9 @@ me.column2 = [
@@ -58131,7 +58269,9 @@
xtype: me.isCreate ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'comstar_hg', name: 'comstar_hg',
value: '', value: '',
@ -251,19 +249,18 @@
fieldLabel: gettext('Host group'), fieldLabel: gettext('Host group'),
allowBlank: true, allowBlank: true,
}, },
@@ -58139,15 +58280,32 @@ @@ -58139,15 +58279,32 @@
xtype: me.isCreate ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'lio_tpg', name: 'lio_tpg',
value: '', value: '',
- bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' }, - bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
- allowBlank: false, - allowBlank: false,
- fieldLabel: gettext('Target portal group'),
+ bind: { + bind: {
+ hidden: '{!isLIO}' + hidden: '{!isLIO}'
+ }, + },
+ fieldLabel: gettext('Target portal group'), fieldLabel: gettext('Target portal group'),
+ allowBlank: true + allowBlank: true
}, + },
+ { + {
+ xtype: 'proxmoxtextfield', + xtype: 'proxmoxtextfield',
+ name: 'freenas_apiv4_host', + name: 'freenas_apiv4_host',
@ -275,7 +272,7 @@
+ hidden: '{!isFreeNAS}' + hidden: '{!isFreeNAS}'
+ }, + },
+ fieldLabel: gettext('API IPv4 Host'), + fieldLabel: gettext('API IPv4 Host'),
+ }, },
+ tnsecret, + tnsecret,
+ tnconfirmsecret, + tnconfirmsecret,
]; ];