mcc: Keep seq no in default process name when changing process type

Author: ssorumgard

storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js

@@ -111,8 +111,8 @@ function autoConfigure() {
 
             var typeIds = [];
             var names = [];
-            var familyHead = [];
-            var typeHead = [];
+            var familyHead = [];    // Ptype hashed on family name
+            var typeHead = [];      // Ptype hashed on type name
             var dataNodeId = 1; 
             var otherNodeId = 49; 
 
@@ -135,7 +135,8 @@ function autoConfigure() {
                         host: host.getId(),
                         processtype: typeIds[pname],
                         NodeId: (pname == "ndbd" || pname == "ndbmtd") ? 
-                                dataNodeId++ : otherNodeId++
+                                dataNodeId++ : otherNodeId++,
+                        seqno: typeHead[pname].getValue("currSeq")
                     });
                 }
 

storage/ndb/mcc/frontend/js/mcc/gui/hosttree.js

@@ -376,7 +376,8 @@ function addProcess(event) {
                             name: dijit.byId("processname").get("value"),
                             processtype: +processType,
                             host: hostTreeItem.treeItem.getId(),
-                            NodeId: nodeId
+                            NodeId: nodeId,
+                            seqno: dijit.byId("seqno").get("value")
                         })
                         dijit.byId("addProcessDlg").hide();
                     }
@@ -391,20 +392,17 @@ function addProcess(event) {
 
 // Setup a dialog for adding new proesses
 function addProcessDlgSetup() {
-    var addProcessDlg; 
     var subtypes; 
-    var pnamebox;
-    var addButton;
-    var cancelButton; 
 
     if (!dijit.byId("addProcessDlg")) {
-        addProcessDlg= new dijit.Dialog({
+        new dijit.Dialog({
             id: "addProcessDlg",
             title: "Add new process",
             content: "\
             <form id='addProcessForm' data-dojo-type='dijit.form.Form'>\
                 <p>Select process type: <span id=\"processtype\"></span></p>\
                 <p>Enter process name:  <span id=\"processname\"></span></p>\
+                <span id=\"seqno\"></span>\
                 <div id=cancelProcDlgButton data-dojo-type='dijit.form.Button'\
                         data-dojo-props=\"onClick:\
                             function() {\
@@ -438,13 +436,17 @@ function addProcessDlgSetup() {
                         var pseq = pfam[0].getValue("currSeq");
                         dijit.byId("processname").set("value", pname + 
                                 " " + pseq);
-                                        });
+                        dijit.byId("seqno").set("value", pseq);
+                    });
                 });
             }
         }, "processtype");
 
-        pnamebox= new dijit.form.TextBox(
-                {style: "width: 150px"}, "processname");
+        new dijit.form.TextBox(
+            {style: "width: 150px"}, "processname");
+
+        new dijit.form.TextBox(
+            {style: "width: 150px", type: "hidden"}, "seqno");
 
         mcc.storage.processTypeStorage().getItems({}).then(function (items) {
             dijit.byId("processtype").set("value",
@@ -477,6 +479,7 @@ function showAddProcessDialog() {
             var pname = ptype.getValue("nodeLabel");
             var pseq = pfam[0].getValue("currSeq");
             dijit.byId("processname").set("value", pname + " " + pseq);                    
+            dijit.byId("seqno").set("value", pseq);                    
         });
     });
     dijit.byId("addProcessDlg").show();

storage/ndb/mcc/frontend/js/mcc/gui/hosttreedetails.js

@@ -195,28 +195,17 @@ function processSelectionDetailsSetup() {
         mcc.storage.processTypeStorage().getItem
                 (pd_types.getValue()).then(
             function (ptype) {
+                var pname = ptype.getValue("nodeLabel");
+                var pseq = hostTreeItem.storageItem.getValue("seqno");
 
-                // Get the prototypical type to get seq no
-                mcc.storage.processTypeStorage().getItems(
-                        {family: ptype.getValue("family")}).then(
-                        function (pfam) {
+                // Reset process name widget
+                dijit.byId("pd_name").set("value", pname + 
+                        " " + pseq);
 
-                    var pname = ptype.getValue("nodeLabel");
-                    var pseq = pfam[0].getValue("currSeq");
-
-                    // Reset process name widget
-                    dijit.byId("pd_name").set("value", pname + 
-                            " " + pseq);
-
-                    // Take care to store the type as integer
-                    hostTreeItem.storageItem.setValue("processtype",
-                            +ptype.getId());
-                    mcc.storage.processStorage().save();
-
-                    // Increment currSeq since we have used it
-                    pfam[0].setValue("currSeq", pseq + 1);
-                    mcc.storage.processTypeStorage().save();
-                });
+                // Take care to store the type as integer
+                hostTreeItem.storageItem.setValue("processtype",
+                        +ptype.getId());
+                mcc.storage.processStorage().save();
             }
         );
     });