Merge pull request #754 from AngelRodriguez8008/users/angel/fixSamples

Fix Double Click on OpenRecord from Grid
microsoft · Feb 18, 2020 · 2cbf460 · 2cbf460
2 parents 55dc430 + fe441e8
commit 2cbf460
Show file tree

Hide file tree

Showing 48 changed files with 1,020 additions and 697 deletions.
diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/DTO/AppElementReference.cs b/Microsoft.Dynamics365.UIAutomation.Api.UCI/DTO/AppElementReference.cs
@@ -277,12 +277,12 @@ public static class AppElements
             { "Nav_WebAppMenuButton"       , "//*[@id=\"TabArrowDivider\"]/a"},
             { "Nav_UCIAppMenuButton"       , "//button[@data-id=\"navbar-switch-app\"]"},
             { "Nav_SiteMapLauncherButton", "//button[@data-lp-id=\"sitemap-launcher\"]" },
-            { "Nav_SiteMapLauncherCloseButton", "//button[@aria-label=\"Close Site Map\"]" },
+            { "Nav_SiteMapLauncherCloseButton", "//button[@data-id='navbutton']" },
             { "Nav_SiteMapAreaMoreButton", "//button[@data-lp-id=\"sitemap-areaBar-more-btn\"]" },
             { "Nav_SiteMapSingleArea", "//li[translate(@data-text,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz') = '[NAME]']" },
             { "Nav_AppMenuContainer"       , "//*[@id=\"taskpane-scroll-container\"]"},
-            { "Nav_SettingsLauncherBar"       , "//*[@data-id='[NAME]Launcher']"},
-            { "Nav_SettingsLauncher"       , "//*[@data-id='[NAME]']"},
+            { "Nav_SettingsLauncherBar"       , "//button[@data-id='[NAME]Launcher']"},
+            { "Nav_SettingsLauncher"       , "//div[@id='[NAME]Launcher']"},
             { "Nav_GuidedHelp"       , "//*[@id=\"helpLauncher\"]/button"},
             //{ "Nav_AdminPortal"       , "//*[@id=(\"id-5\")]"},
             { "Nav_AdminPortal"       , "//*[contains(@data-id,'officewaffle')]"},
@@ -329,7 +329,7 @@ public static class AppElements
             { "Entity_CloseOpportunityWin"       , "//button[contains(@data-id,'MarkAsWon')]"},
             { "Entity_CloseOpportunityLoss"       , "//button[contains(@data-id,'MarkAsLost')]"},
             { "Entity_Delete"       , "//button[contains(@data-id,'Delete')]"},
-            { "Entity_FormContainer"       , "//*[@id=\"tab-section\"]"},
+            { "Entity_FormContainer"       , "//*[@data-id='editFormRoot']"},
             { "Entity_Process"       , "//button[contains(@data-id,'MBPF.ConvertTo')]"},
             { "Entity_Save"       , "//button[contains(@data-id, 'form-save-btn')]"},
             { "Entity_SwitchProcess"       , "//button[contains(@data-id,'SwitchProcess')]"},
@@ -392,7 +392,7 @@ public static class AppElements
             { "Entity_Header_FlyoutButton","//button[contains(@id,'headerFieldsExpandButton')]" },
             { "Entity_Header_LookupFieldContainer", "//div[@data-id='header_[NAME].fieldControl-Lookup_[NAME]']" },
             { "Entity_Header_TextFieldContainer", "//div[@data-id='header_[NAME].fieldControl-text-box-container']" },
-            { "Entity_Header_OptionSetFieldContainer", "//div[@data-id='header_[NAME].fieldControl-option-set-container']" },
+            { "Entity_Header_OptionSetFieldContainer", "//div[@data-id='header_[NAME]']" },
             { "Entity_Header_DateTimeFieldContainer","//div[@data-id='header_[NAME]-FieldSectionItemContainer']" },
 
             //CommandBar

diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/BusinessProcessFlow.cs b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/BusinessProcessFlow.cs
@@ -101,9 +101,9 @@ public void SetValue(BooleanItem optionSet)
         /// Sets the value of a LookupItem field
         /// </summary>
         /// <param name="field">LookupItem with the schema name of the field to retrieve</param>
-        public void SetValue(LookupItem control, int index = 0)
+        public void SetValue(LookupItem control)
         {
-            _client.SetValue(control, index);
+            _client.SetValue(control);
         }
 
         /// <summary>

diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs
@@ -434,19 +434,19 @@ public void SetValue(string field, string value)
         /// Sets the value of a Lookup.
         /// </summary>
         /// <param name="control">The lookup field name, value or index of the lookup.</param>
-        public void SetValue(LookupItem control, int index = 0)
+        public void SetValue(LookupItem control)
         {
-            _client.SetValue(control, index);
+            _client.SetValue(control);
         }
 
         /// <summary>
         /// Sets the value of an ActivityParty Lookup.
         /// </summary>
         /// <param name="controls">The activityparty lookup field name, value or index of the lookup.</param>
         /// <example>xrmApp.Entity.SetValue(new LookupItem[] { new LookupItem { Name = "to", Value = "A. Datum Corporation (sample)" } });</example>
-        public void SetValue(LookupItem[] controls, int index = 0)
+        public void SetValue(LookupItem[] controls)
         {
-            _client.SetValue(controls, index);
+            _client.SetValue(controls);
         }
 
         /// <summary>
@@ -523,9 +523,9 @@ public void SelectForm(string formName)
         /// </summary>
         /// <param name="controls">The activityparty lookup field name, value or index of the lookup.</param>
         /// <example>xrmApp.Entity.AddValues(new LookupItem[] { new LookupItem { Name = "to", Value = "A. Datum Corporation (sample)" } });</example>
-        public void AddValues(LookupItem[] controls, int index = 0)
+        public void AddValues(LookupItem[] controls)
         {
-            _client.AddValues(controls, index);
+            _client.AddValues(controls);
         }
 
         /// <summary>