Merge branch '2195-bexis2-entity-extensions-streamlining-the-workflow-and-data-linking' of https://github.com/BEXIS2/Core into 2195-bexis2-entity-extensions-streamlining-the-workflow-and-data-linking

Author: DavidBlaa

Components/App/BExIS.App.Bootstrap/Attributes/CustomValidateAntiForgeryToken.cs

@@ -24,7 +24,11 @@ public void OnAuthorization(AuthorizationContext filterContext)
                     formToken = request.Headers["__RequestVerificationToken"];
                 }
 
-                AntiForgery.Validate(cookieToken, formToken);
+                if (cookieToken != null)
+                {
+                    AntiForgery.Validate(cookieToken, formToken);
+                }
+
                 //AntiForgery.Validate();
             }
         }

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/FormController.cs

@@ -2767,7 +2767,6 @@ private string storeGeneratedFilePathToContentDiscriptor(long datasetId, Dataset
         /// Is called when the user write a letter in Autocomplete User Component
         /// </summary>
         [HttpPost]
-        [CustomValidateAntiForgeryToken]
         public ActionResult _AutoCompleteAjaxLoading(string text, long id, string type)
         {
             // if mapping with etities exits
@@ -3247,7 +3246,6 @@ private void validationAgainstJsonSchema()
 
         //XX number of index des values nötig
         [HttpPost]
-        [CustomValidateAntiForgeryToken]
         public ActionResult ValidateMetadataAttributeUsage(string value, int id, int parentid, string parentname, int number, int parentModelNumber, int parentStepId, long entityId)
         {
             //delete all white spaces from start and end
@@ -3337,7 +3335,6 @@ public ActionResult ValidateMetadataAttributeUsage(string value, int id, int par
         }
 
         [HttpPost]
-        [CustomValidateAntiForgeryToken]
         public ActionResult ValidateMetadataParameterUsage(string value, int id, long attrUsageId, int number, int parentModelNumber, int parentStepId, long entityId)
         {
             //delete all white spaces from start and end

Modules/DIM/BExIS.Dim.Helper/Mappings/MappingUtils.cs

@@ -1493,8 +1493,7 @@ public static XmlDocument GetConceptOutput(long metadataStructureId, long concep
                             //var simpleElements = metadata.SelectNodes(t);
                             if ((simpleElements == null || simpleElements.Count() == 0) && string.IsNullOrEmpty(complexMapping.Source.XPath) && complexMapping.Source.Name.ToLower().Equals("default"))  // DEFAULT
                             {
-                               
-                                string simpleTargetPath = complexTargetPath + "/"+ sTargetLinkElement.XPath + "[" + index + "]";
+                                string simpleTargetPath = mergeXPaths(complexTargetPath, cTargetLinkElement.XPath, sTargetLinkElement.XPath + "[" + index + "]");
 
                                 if (xTarget == null)
                                     xTarget = XmlUtility.GenerateNodeFromXPath(concept, concept.DocumentElement, complexTargetPath); // generate target
@@ -1593,6 +1592,23 @@ private static string mergeXPaths(string directParent,string defaultParentPath,
             return directParent + "/" + child.Replace(defaultParentPath, "").TrimStart('/');
 
         }
+        // check if two xpath start with the same path
+        private static bool startWithSameXPath(string path1, string path2)
+        {
+            if (string.IsNullOrEmpty(path1) || string.IsNullOrEmpty(path2)) return false;
+
+            List<string> levelOfPath1 = path1.Split('/').ToList();
+            List<string> levelOfPath2 = path2.Split('/').ToList();
+
+            int minLevel = Math.Min(levelOfPath1.Count(), levelOfPath2.Count());
+
+            for (int i = 0; i < minLevel; i++)
+            {
+                if (!levelOfPath1[i].Equals(levelOfPath2[i])) return false;
+            }
+
+            return true;
+        }
 
         private static string mergeXPaths(string directComplexSourceParent, string directSimpleSourcePath, string directTargetPath,string defaultTargetPath, string child, XmlDocument metadata)
         {
@@ -1604,7 +1620,8 @@ private static string mergeXPaths(string directComplexSourceParent, string direc
 
             if (directComplexSourceParent.Equals(directSimpleSourcePath)) // simple xpath need index
             {
-                return directTargetPath;
+                //merge directTargetPath with child to get the child path with index
+                return mergeXPaths(directTargetPath,defaultTargetPath,child);
             }
 
             List<string> levelOfSource = directSimpleSourcePath.Replace(directComplexSourceParent,"").Split('/').ToList(); // level 2