yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Form elements in thirdparty dashboard views get removed (#14152)

Browse Source
This commit is contained in:
Jacob Overgaard
2023-05-03 10:37:57 +02:00
parent f4073c1dc7
commit 3a7ba530a2
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
View File

@@ -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>

22
tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts
View File

@@ -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();
});
});
});