[pve-devel] [PATCH manager v3 1/3] ui: ha: rules: add ha resource affinity rules

[Daniel Kral <d.kral@proxmox.com>]

Add HA resource affinity rules as a second rule type to the HA Rules'
tab page as a separate grid so that the columns match the content of
these rules better.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 www/manager6/Makefile                         |  2 ++
 www/manager6/ha/Rules.js                      | 12 +++++++
 .../ha/rules/ResourceAffinityRuleEdit.js      | 24 ++++++++++++++
 .../ha/rules/ResourceAffinityRules.js         | 31 +++++++++++++++++++
 4 files changed, 69 insertions(+)
 create mode 100644 www/manager6/ha/rules/ResourceAffinityRuleEdit.js
 create mode 100644 www/manager6/ha/rules/ResourceAffinityRules.js

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 3d3450c7..8c9c8610 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -151,6 +151,8 @@ JSSRC= 							\
 	ha/StatusView.js				\
 	ha/rules/NodeAffinityRuleEdit.js		\
 	ha/rules/NodeAffinityRules.js			\
+	ha/rules/ResourceAffinityRuleEdit.js		\
+	ha/rules/ResourceAffinityRules.js		\
 	dc/ACLView.js					\
 	dc/ACMEClusterView.js				\
 	dc/AuthEditBase.js				\
diff --git a/www/manager6/ha/Rules.js b/www/manager6/ha/Rules.js
index 8f487465..1799d25f 100644
--- a/www/manager6/ha/Rules.js
+++ b/www/manager6/ha/Rules.js
@@ -167,6 +167,17 @@ Ext.define(
                 flex: 1,
                 border: 0,
             },
+            {
+                xtype: 'splitter',
+                collapsible: false,
+                performCollapse: false,
+            },
+            {
+                title: gettext('HA Resource Affinity Rules'),
+                xtype: 'pveHAResourceAffinityRulesView',
+                flex: 1,
+                border: 0,
+            },
         ],
     },
     function () {
@@ -180,6 +191,7 @@ Ext.define(
                 'errors',
                 'disable',
                 'comment',
+                'affinity',
                 'resources',
                 {
                     name: 'strict',
diff --git a/www/manager6/ha/rules/ResourceAffinityRuleEdit.js b/www/manager6/ha/rules/ResourceAffinityRuleEdit.js
new file mode 100644
index 00000000..3bfb2c49
--- /dev/null
+++ b/www/manager6/ha/rules/ResourceAffinityRuleEdit.js
@@ -0,0 +1,24 @@
+Ext.define('PVE.ha.rules.ResourceAffinityInputPanel', {
+    extend: 'PVE.ha.RuleInputPanel',
+
+    initComponent: function () {
+        let me = this;
+
+        me.column1 = [];
+
+        me.column2 = [
+            {
+                xtype: 'proxmoxKVComboBox',
+                name: 'affinity',
+                fieldLabel: gettext('Affinity'),
+                allowBlank: false,
+                comboItems: [
+                    ['positive', gettext('Keep together')],
+                    ['negative', gettext('Keep separate')],
+                ],
+            },
+        ];
+
+        me.callParent();
+    },
+});
diff --git a/www/manager6/ha/rules/ResourceAffinityRules.js b/www/manager6/ha/rules/ResourceAffinityRules.js
new file mode 100644
index 00000000..6205881e
--- /dev/null
+++ b/www/manager6/ha/rules/ResourceAffinityRules.js
@@ -0,0 +1,31 @@
+Ext.define('PVE.ha.ResourceAffinityRulesView', {
+    extend: 'PVE.ha.RulesBaseView',
+    alias: 'widget.pveHAResourceAffinityRulesView',
+
+    ruleType: 'resource-affinity',
+    ruleTitle: gettext('HA Resource Affinity'),
+    inputPanel: 'ResourceAffinityInputPanel',
+    faIcon: 'link',
+
+    stateful: true,
+    stateId: 'grid-ha-resource-affinity-rules',
+
+    initComponent: function () {
+        let me = this;
+
+        me.columns = [
+            {
+                header: gettext('Affinity'),
+                width: 100,
+                dataIndex: 'affinity',
+            },
+            {
+                header: gettext('HA Resources'),
+                flex: 1,
+                dataIndex: 'resources',
+            },
+        ];
+
+        me.callParent();
+    },
+});
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel