Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public static class Entity
public static string SubGridRows = "Entity_SubGridRows";
public static string SubGridHeaders = "Entity_SubGridHeaders";
public static string SubGridRecordCheckbox = "Entity_SubGridRecordCheckbox";
public static string SubGridAddButton = "Entity_SubGridAddButton";
public static string FieldLookupButton = "Entity_FieldLookupButton";
public static string SearchButtonIcon = "Entity_SearchButtonIcon";
public static string EntityHeader = "Entity_Header";
Expand Down Expand Up @@ -357,6 +358,7 @@ public static class AppElements
{ "Entity_SubGridRows",".//div[contains(@class,'wj-row')]"},
{ "Entity_SubGridHeaders",".//div[contains(@class,'grid-header-text')]"},
{ "Entity_SubGridRecordCheckbox","//div[contains(@data-id,'cell-[INDEX]-1') and contains(@data-lp-id,'[NAME]')]"},
{ "Entity_SubGridAddButton", "//button[contains(@data-id,'[NAME].AddNewStandard')]/parent::li/parent::ul[contains(@data-lp-id, 'commandbar-SubGridStandard:[NAME]')]" },
{ "Entity_FieldLookupButton","//button[contains(@data-id,'[NAME]_search')]" },
{ "Entity_SearchButtonIcon", "//span[contains(@data-id,'microsoftIcon_searchButton')]" },
{ "Entity_Header", "//div[contains(@data-id,'form-header')]"},
Expand Down
5 changes: 5 additions & 0 deletions Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,11 @@ public void OpenSubGridRecord(string subgridName, int index = 0)
_client.OpenSubGridRecord(subgridName, index);
}

public void AddSubgridItem(string subgridName)
{
_client.ClickSubgridAddButton(subgridName);
}

/// <summary>
/// Saves the entity
/// </summary>
Expand Down
28 changes: 26 additions & 2 deletions Microsoft.Dynamics365.UIAutomation.Api.UCI/WebClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1257,8 +1257,16 @@ internal BrowserCommandResult<bool> OpenRecord(int index, int thinkTime = Consta
{
if (currentindex == index)
{
var tag = checkRecord ? "div" : "a";
row.FindElement(By.TagName(tag)).Click();
var tag = "div";
if (checkRecord)
{
row.FindElement(By.TagName(tag)).Click();
}
else
{
driver.DoubleClick(row.FindElement(By.TagName(tag)));
Copy link
Contributor

@AngelRodriguez8008 AngelRodriguez8008 Feb 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This double click is not working for me. Tested in Chrome v9.1 online.
test sample: UCITestAccountAddAppointment -> xrmApp.Grid.OpenRecord(0);

I understand the intention but I will roll it back, until a better approach is found.

}

break;
}

Expand Down Expand Up @@ -1627,6 +1635,22 @@ public BrowserCommandResult<bool> ClickRelatedCommand(string name, string subNam
}
#endregion

#region Subgrid

public BrowserCommandResult<bool> ClickSubgridAddButton(string subgridName, int thinkTime = Constants.DefaultThinkTime)
{
Browser.ThinkTime(thinkTime);

return this.Execute(GetOptions($"Click add button of subgrid: {subgridName}"), driver =>
{
driver.FindElement(By.XPath(AppElements.Xpath[AppReference.Entity.SubGridAddButton].Replace("[NAME]", subgridName)))?.Click();

return true;
});
}

#endregion

#region Entity

internal BrowserCommandResult<bool> CancelQuickCreate(int thinkTime = Constants.DefaultThinkTime)
Expand Down