From a7e20e3a4b82fe77c9d3bd3f5548fc6a371bf4f1 Mon Sep 17 00:00:00 2001 From: Yasa-Nataliya Date: Sat, 19 Aug 2023 16:53:03 +0530 Subject: [PATCH] minor fixes --- .../metadata/aspect-oriented-config.e2e.ts | 2 +- .../metadata/metadata-content-type.e2e.ts | 4 ++++ e2e/content-services/metadata/metadata-properties.e2e.ts | 1 + e2e/content-services/metadata/metadata-smoke-tests.e2e.ts | 5 ++--- e2e/core/pages/metadata-view.page.ts | 4 ---- .../content-metadata/content-metadata.component.html | 8 ++++---- .../content-metadata/content-metadata.component.scss | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts index eb6a429454..9a42f5a917 100644 --- a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts +++ b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts @@ -231,7 +231,7 @@ describe('Aspect oriented config', () => { await expect(await metadataViewPage.getMetadataGroupTitle('GROUP-TITLE2-TRANSLATION-KEY')).toBe('CUSTOM TITLE TRANSLATION TWO'); }); - fit('[C279968] Should be possible use a custom preset', async () => { + it('[C279968] Should be possible use a custom preset', async () => { await LocalStorageUtil.setConfigField('content-metadata', '{' + ' "presets": {' + ' "custom-preset": {' + diff --git a/e2e/content-services/metadata/metadata-content-type.e2e.ts b/e2e/content-services/metadata/metadata-content-type.e2e.ts index 5120550163..9e2e0bb3ba 100644 --- a/e2e/content-services/metadata/metadata-content-type.e2e.ts +++ b/e2e/content-services/metadata/metadata-content-type.e2e.ts @@ -114,6 +114,7 @@ describe('content type', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); + await metadataViewPage.generalEditIconDisplayed(); await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES'); const defaultType = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content')); @@ -138,6 +139,7 @@ describe('content type', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); + await metadataViewPage.generalEditIconDisplayed(); await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES'); const customType = (await metadataViewPage.hasContentType(type.title)) || (await metadataViewPage.hasContentType(`${model.namespacePrefix}:${type.name}`)); @@ -153,6 +155,7 @@ describe('content type', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); + await metadataViewPage.generalEditIconDisplayed(); await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES'); let defaultType = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content')); @@ -175,6 +178,7 @@ describe('content type', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); + await metadataViewPage.generalEditIconDisplayed(); await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES'); defaultType = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content')); diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts index c3c82cd42b..4cfa09181c 100644 --- a/e2e/content-services/metadata/metadata-properties.e2e.ts +++ b/e2e/content-services/metadata/metadata-properties.e2e.ts @@ -107,6 +107,7 @@ describe('CardView Component - properties', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); + await metadataViewPage.generalEditIconDisplayed(); await CheckboxPage.check(metadataViewPage.readonlySwitch); }); diff --git a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts index 1d3cd66f79..fb4185b0c6 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -136,7 +136,7 @@ describe('Metadata component', () => { await expect(await metadataViewPage.getEditIconTooltip()).toEqual(METADATA.EDIT_BUTTON_TOOLTIP); }); - fit('[C245654] Should be possible edit the basic Metadata Info of a Document', async () => { + it('[C245654] Should be possible edit the basic Metadata Info of a Document', async () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); @@ -160,11 +160,11 @@ describe('Metadata component', () => { await metadataViewPage.enterPropertyText('properties.cm:name', 'exampleText.png'); await metadataViewPage.enterPropertyText('properties.cm:title', 'example title'); await metadataViewPage.enterDescriptionText('example description'); + await metadataViewPage.clickSaveGeneralMetadata(); await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual('exampleText.png'); await expect(await metadataViewPage.getPropertyText('properties.cm:title')).toEqual('example title'); await expect(await metadataViewPage.getPropertyText('properties.cm:description')).toEqual('example description'); - await metadataViewPage.clickSaveGeneralMetadata(); await viewerPage.clickCloseButton(); await contentServicesPage.waitForTableBody(); @@ -177,7 +177,6 @@ describe('Metadata component', () => { await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual('exampleText.png'); await expect(await metadataViewPage.getPropertyText('properties.cm:title')).toEqual('example title'); - await expect(await metadataViewPage.getPropertyText('properties.cm:description')).toEqual('example description'); await metadataViewPage.editIconGeneralClick(); await metadataViewPage.enterPropertyText('properties.cm:name', browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name); diff --git a/e2e/core/pages/metadata-view.page.ts b/e2e/core/pages/metadata-view.page.ts index 3a0096d79c..21538804b2 100644 --- a/e2e/core/pages/metadata-view.page.ts +++ b/e2e/core/pages/metadata-view.page.ts @@ -114,10 +114,6 @@ export class MetadataViewPage { await BrowserVisibility.waitUntilElementIsVisible(this.editIconGeneral); } - async generaleditIconNotDisplayed(): Promise { - await BrowserVisibility.waitUntilElementIsNotVisible(this.editIconGeneral); - } - async editIconClick(): Promise { await BrowserActions.clickExecuteScript('button[data-automation-id="meta-data-card-toggle-edit"]'); } diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html index bf34755074..62299f12c1 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html @@ -8,7 +8,7 @@ (opened)="generalTogglePanelState()" (closed)="generalTogglePanelState()"> -
+
{{ generalInfoPanelState ? 'expand_more' : 'chevron_right'}} @@ -58,7 +58,7 @@ (closed)="handleTagPanelClose()" hideToggle [expanded]="tagsPanelState"> -
+
{{ tagsPanelState ? 'expand_more' : 'chevron_right'}} @@ -118,7 +118,7 @@ hideToggle [expanded]="categoriesPanelState"> -
+
{{ categoriesPanelState ? 'expand_more' : 'chevron_right'}} {{ @@ -179,7 +179,7 @@ (closed)="group.expanded= false" hideToggle> -
+
{{ group.expanded ? 'expand_more' : 'chevron_right'}} diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss index b090c83c02..6e96dacb51 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss @@ -30,7 +30,7 @@ color: var(--adf-theme-foreground-text-color-054); } - .adf-toggle-icons { + .adf-metadata-properties-panel-content { display: flex; align-items: center; flex: 1;