Fix #1901 - Add class name in rows to identfy tag in DOM (#1917)

* Fix #1901 - Add class name in rows to identfy tag in DOM * Fix E2E test
CGI-FR · Mar 18, 2023 · ee40e2f · ee40e2f
1 parent e9fbb6c
commit ee40e2f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Settings/DeviceTagsPage.razor b/src/AzureIoTHub.Portal.Client/Pages/Settings/DeviceTagsPage.razor
@@ -6,7 +6,7 @@
 
 <MudGrid>
     <MudItem xs="12">
-        <MudTable Items="@Tags" Loading="isProcessing" Dense=true Hover=true Bordered=true Striped=true>
+        <MudTable Items="@Tags" Loading="isProcessing" Dense=true Hover=true Bordered=true Striped=true RowClassFunc="@((DeviceTagModel m, int index) => $"tag-{m.Name}")">
 
             <ToolBarContent>
                 <MudText Typo="Typo.h6">Tags</MudText>

diff --git a/src/AzureIoTHub.Portal.Tests.E2E/Pages/EdgeModelPage.cs b/src/AzureIoTHub.Portal.Tests.E2E/Pages/EdgeModelPage.cs
@@ -62,10 +62,22 @@ public void SearchEdgeModel(string description)
             WebDriverFactory.Default.FindElement(By.Id("edge-model-search-keyword")).SendKeys(description);
 
             _ = wait.Until(d => d.FindElement(By.Id("edge-model-search-button")).Displayed);
-            WebDriverFactory.Default.FindElement(By.Id("edge-model-search-button")).Click();
-        }
 
+            WebDriverFactory.Default.FindElement(By.Id("edge-model-search-button")).Click();
 
+            _ = wait.Until(d =>
+            {
+                try
+                {
+                    _ = WebDriverFactory.Default.FindElement(By.ClassName("mud-table-loading"));
+                    return false;
+                }
+                catch (NoSuchElementException)
+                {
+                    return true;
+                }
+            });
+        }
 
 
         public void RemoveEdgeModel(string name)