HPCC-1835 Confimgr - Enable deletion of components with same names

- Components that return an ambigous xpath error can be now be deleted
- Error message pop-up now shows multiple unique error messages

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>

esp/files/scripts/configmgr/navtree.js

@@ -775,6 +775,14 @@ function createNavigationTree(navTreeData) {
               getWaitDlg().hide();
               if (status1[0] !== 'true') {
                 alert(status1[0]);
+
+                var temp = o.responseText.split(/<CompName>/g);
+                var temp1 = temp[1].split(/<\/CompName>/g);
+                getWaitDlg().hide();
+                navDS.flushCache();
+                form.isChanged.value = "true";
+                refreshNavTree(navDS, navDT, temp1[0])
+
                 return;
               }
               else {

esp/services/WsDeploy/WsDeployService.cpp

@@ -4333,33 +4333,48 @@ bool CWsDeployFileInfo::handleComponent(IEspContext &context, IEspHandleComponen
   }
   else if (!strcmp(operation, "Delete"))
   {
+    StringBuffer xpath;
+    StringBuffer xpathSoftware;
+    StringBuffer xpathFull;
+    StringBuffer errMsg;
+
     Owned<IPropertyTreeIterator> iterComp = pComponents->getElements("*");
+
+    xpathSoftware.appendf("./%s", XML_TAG_SOFTWARE);
+
     ForEach(*iterComp)
     {
       IPropertyTree& pComp = iterComp->query();
+
       const char* compName = pComp.queryProp(XML_ATTR_NAME);
-      const char* compType = pComp.queryProp("@compType");
-      StringBuffer xpath;
-      xpath.clear().appendf("./Software/%s[@name=\"%s\"]", compType, compName);
-      IPropertyTree* pCompTree = pEnvRoot->queryPropTree(xpath.str());
-      StringBuffer sbMsg;
+      const char* compType = pComp.queryProp(XML_ATTR_COMPTYPE);
+
+      xpath.clear().appendf("%s/%s", xpathSoftware.str(), compType);
+
+      Owned<IPropertyTreeIterator> iterComp2 = pEnvRoot->getElements(xpath.str());
 
-      if(pCompTree)
+      ForEach(*iterComp2)
       {
-        bool ret = checkComponentReferences(pEnvRoot, pCompTree, compName, sbMsg);
+        xpathFull.clear().appendf("%s[%s=\"%s\"]", xpath.str(), XML_ATTR_NAME, compName);
+        unsigned short numElements = pEnvRoot->getCount(xpathFull.str());
 
-        if (ret)
-        {
-          pEnvRoot->queryPropTree("./Software")->removeTree(pCompTree);
-          resp.setStatus("true");
-          resp.setCompName(XML_TAG_SOFTWARE);
-        }
-        else
+        if (strcmp(iterComp2->query().queryProp(XML_ATTR_NAME), compName) == 0)
         {
-          resp.setStatus(sbMsg.str());
-          resp.setCompName(compName);
+          IPropertyTree* pCompTree = pEnvRoot->queryPropTree(xpathSoftware.str());
+          StringBuffer sbMsg;
+
+          // only check for component dependencies if the componenet to be deleted is the last instance with the same name
+          if (pCompTree != NULL && (pEnvRoot->getCount(xpathFull.str()) > 1 ? true : checkComponentReferences(pEnvRoot, pEnvRoot->queryPropTree(xpathFull.str()), compName, sbMsg)))
+            pEnvRoot->queryPropTree(xpathSoftware.str())->removeTree(&(iterComp2->query()));
+
+          if (sbMsg.length() > 0)
+             errMsg.appendf("\n%s", sbMsg.str());
+
+          break;
         }
       }
+      resp.setStatus(errMsg.length() > 1 ? errMsg.str() : "true");
+      resp.setCompName(compName);
     }
   }
   else if (!strcmp(operation, "Duplicate"))