From 3a7ba530a28be3a52da2c2686700b1600355bfa7 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Wed, 3 May 2023 10:37:57 +0200
Subject: [PATCH] Fix: Form elements in thirdparty dashboard views get removed
 (#14152)

---
 .../src/views/common/dashboard.html           |  4 ++--
 .../tests/DefaultConfig/Tabs/tabs.spec.ts     | 22 +++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
index c3b60e2f0a..f7ca16500a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.DashboardController">
 
-    <form name="dashboardForm" val-form-manager>
+    <ng-form name="dashboardForm" val-form-manager>
 
         <umb-load-indicator ng-show="page.loading"></umb-load-indicator>
 
@@ -32,6 +32,6 @@
 
         </div>
 
-    </form>
+    </ng-form>
 
 </div>
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts
index 8ffeb6c685..873ae3bad6 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts
@@ -46,6 +46,14 @@ test.describe('Tabs', () => {
     await openDocTypeFolder(umbracoUi, page);
   }
 
+  test.only('Click dashboard tabs', async ({umbracoUi, page}) => {
+    await umbracoUi.goToSection('content');
+    await page.locator('[data-element="tab-contentRedirectManager"] > button').click();
+    expect(page.locator('.redirecturlsearch')).not.toBeNull();
+    await page.locator('[data-element="tab-contentIntro"] > button').click();
+    await expect(page.locator('[data-element="tab-contentIntro"]')).toHaveClass('umb-tab ng-scope umb-tab--active');
+  });
+
   test('Create tab', async ({umbracoUi, umbracoApi, page}) => {
     await umbracoApi.documentTypes.ensureNameNotExists(tabsDocTypeName);
     await umbracoApi.content.deleteAllContent();
@@ -67,7 +75,7 @@ test.describe('Tabs', () => {
     await umbracoUi.waitForTreeLoad('settings');
 
     await umbracoUi.clickElement(umbracoUi.getTreeItem("settings", ["Document Types", tabsDocTypeName]))
-    // Create a tab 
+    // Create a tab
     await page.locator('.umb-group-builder__tabs__add-tab').click();
     await page.locator('ng-form.ng-invalid > .umb-group-builder__group-title-input').fill('Tab 1');
     // Create a 2nd tab manually
@@ -178,7 +186,7 @@ test.describe('Tabs', () => {
     await expect(await page.locator('[title=urlPicker]')).toHaveCount(0);
   });
 
-  test('Reorders tab', async ({umbracoUi, umbracoApi, page}) => { 
+  test('Reorders tab', async ({umbracoUi, umbracoApi, page}) => {
     await umbracoApi.documentTypes.ensureNameNotExists(tabsDocTypeName);
 
     const tabsDocType = new DocumentTypeBuilder()
@@ -485,7 +493,7 @@ test.describe('Tabs', () => {
     await openDocTypeFolder(umbracoUi, page);
     await page.locator('[alias="reorder"]').click();
     await page.locator('.umb-group-builder__tab').last().click();
-    
+
     // Drag and drop property from tab 2 into tab 1
     await page.locator('.umb-group-builder__property-meta > .flex > .icon >> nth=1').last().hover();
     await page.mouse.down();
@@ -493,16 +501,16 @@ test.describe('Tabs', () => {
     await page.waitForTimeout(500);
     await page.locator('[data-element="group-Tab group"]').hover({force:true});
     await page.mouse.up();
-    
+
     // Stop reordering and save
     await page.locator('[alias="reorder"]').click();
     await umbracoUi.clickElement(umbracoUi.getButtonByLabelKey(ConstantHelper.buttons.save));
-    
+
     // Assert
     await umbracoUi.isSuccessNotificationVisible();
     await expect(await page.locator('[title="urlPickerTabTwo"]')).toBeVisible();
   });
-  
+
   test('Drags and drops a group and converts to tab', async ({umbracoUi, umbracoApi, page}) => {
     await umbracoApi.documentTypes.ensureNameNotExists(tabsDocTypeName);
     const tabsDocType = new DocumentTypeBuilder()
@@ -552,4 +560,4 @@ test.describe('Tabs', () => {
     await umbracoUi.isSuccessNotificationVisible();
     await expect(await page.locator('[title="tabGroup"]').first()).toBeVisible();
   });
-});
\ No newline at end of file
+});