diff --git a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts index 4b1cdc92a5..eb6a429454 100644 --- a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts +++ b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts @@ -122,8 +122,6 @@ describe('Aspect oriented config', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.informationButtonIsDisplayed(); - await metadataViewPage.clickOnInformationButton(); await metadataViewPage.clickMetadataGroup('IMAGE'); await metadataViewPage.checkPropertyIsVisible('properties.exif:pixelXDimension', 'textitem'); @@ -152,8 +150,6 @@ describe('Aspect oriented config', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.informationButtonIsDisplayed(); - await metadataViewPage.clickOnInformationButton(); await metadataViewPage.checkMetadataGroupIsPresent('EXIF'); await metadataViewPage.checkMetadataGroupIsPresent('properties'); @@ -170,8 +166,6 @@ describe('Aspect oriented config', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.informationButtonIsDisplayed(); - await metadataViewPage.clickOnInformationButton(); await metadataViewPage.checkMetadataGroupIsPresent('EXIF'); await metadataViewPage.checkMetadataGroupIsPresent('properties'); @@ -191,8 +185,6 @@ describe('Aspect oriented config', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.informationButtonIsDisplayed(); - await metadataViewPage.clickOnInformationButton(); await metadataViewPage.checkMetadataGroupIsPresent('EXIF'); await metadataViewPage.checkMetadataGroupIsPresent('properties'); @@ -232,9 +224,6 @@ describe('Aspect oriented config', () => { await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.informationButtonIsDisplayed(); - await metadataViewPage.clickOnInformationButton(); - await metadataViewPage.checkMetadataGroupIsPresent('GROUP-TITLE1-TRANSLATION-KEY'); await metadataViewPage.checkMetadataGroupIsPresent('GROUP-TITLE2-TRANSLATION-KEY'); @@ -242,7 +231,7 @@ describe('Aspect oriented config', () => { await expect(await metadataViewPage.getMetadataGroupTitle('GROUP-TITLE2-TRANSLATION-KEY')).toBe('CUSTOM TITLE TRANSLATION TWO'); }); - it('[C279968] Should be possible use a custom preset', async () => { + fit('[C279968] Should be possible use a custom preset', async () => { await LocalStorageUtil.setConfigField('content-metadata', '{' + ' "presets": {' + ' "custom-preset": {' + @@ -262,10 +251,6 @@ describe('Aspect oriented config', () => { await CheckboxPage.check(metadataViewPage.presetSwitch); await metadataViewPage.enterPresetText('custom-preset'); - - await metadataViewPage.informationButtonIsDisplayed(); - await metadataViewPage.clickOnInformationButton(); - await metadataViewPage.checkMetadataGroupIsPresent('properties'); await metadataViewPage.checkMetadataGroupIsPresent('Versionable'); }); @@ -286,9 +271,6 @@ describe('Aspect oriented config', () => { await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.informationButtonIsDisplayed(); - await metadataViewPage.clickOnInformationButton(); - await metadataViewPage.checkMetadataGroupIsNotPresent(emptyAspectName); }); @@ -308,9 +290,6 @@ describe('Aspect oriented config', () => { await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.informationButtonIsDisplayed(); - await metadataViewPage.clickOnInformationButton(); - await metadataViewPage.checkMetadataGroupIsNotPresent(aspectName); await metadataViewPage.editIconClick(); diff --git a/e2e/content-services/metadata/metadata-content-type.e2e.ts b/e2e/content-services/metadata/metadata-content-type.e2e.ts index c3647fc851..5120550163 100644 --- a/e2e/content-services/metadata/metadata-content-type.e2e.ts +++ b/e2e/content-services/metadata/metadata-content-type.e2e.ts @@ -114,16 +114,15 @@ describe('content type', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.editIconIsDisplayed(); await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES'); const defaultType = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content')); await expect(defaultType).toBe(true, 'Content type not found'); - await metadataViewPage.editIconClick(); + await metadataViewPage.editIconGeneralClick(); await expect(await metadataViewPage.changeContentType(type.title)).toBe(true, 'Failed to update node type.'); - await metadataViewPage.clickSaveMetadata(); + await metadataViewPage.clickSaveGeneralMetadata(); await metadataViewPage.checkConfirmDialogDisplayed(); await metadataViewPage.applyNodeProperties(); @@ -139,7 +138,6 @@ describe('content type', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.editIconIsDisplayed(); await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES'); const customType = (await metadataViewPage.hasContentType(type.title)) || (await metadataViewPage.hasContentType(`${model.namespacePrefix}:${type.name}`)); @@ -155,16 +153,15 @@ describe('content type', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.editIconIsDisplayed(); await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES'); let defaultType = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content')); await expect(defaultType).toBe(true, 'Content type not found'); - await metadataViewPage.editIconClick(); + await metadataViewPage.editIconGeneralClick(); await expect(await metadataViewPage.changeContentType(type.title)).toBe(true, 'Failed to update node type.'); - await metadataViewPage.clickSaveMetadata(); + await metadataViewPage.clickSaveGeneralMetadata(); await metadataViewPage.checkConfirmDialogDisplayed(); await metadataViewPage.cancelNodeProperties(); @@ -178,7 +175,6 @@ describe('content type', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.editIconIsDisplayed(); 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-permissions.e2e.ts b/e2e/content-services/metadata/metadata-permissions.e2e.ts index 6884b1b8b0..55b51e64dd 100644 --- a/e2e/content-services/metadata/metadata-permissions.e2e.ts +++ b/e2e/content-services/metadata/metadata-permissions.e2e.ts @@ -132,7 +132,6 @@ describe('permissions', () => { await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB); - await metadataViewPage.clickOnInformationButton(); await metadataViewPage.clickMetadataGroup('EXIF'); @@ -152,7 +151,6 @@ describe('permissions', () => { await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB); - await metadataViewPage.clickOnInformationButton(); await metadataViewPage.clickMetadataGroup('EXIF'); diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts index 502e7721a8..c3c82cd42b 100644 --- a/e2e/content-services/metadata/metadata-properties.e2e.ts +++ b/e2e/content-services/metadata/metadata-properties.e2e.ts @@ -90,7 +90,6 @@ describe('CardView Component - properties', () => { await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB); - await metadataViewPage.clickOnInformationButton(); await metadataViewPage.clickMetadataGroup('EXIF'); @@ -108,11 +107,8 @@ describe('CardView Component - properties', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.editIconIsDisplayed(); await CheckboxPage.check(metadataViewPage.readonlySwitch); - - await metadataViewPage.editIconIsNotDisplayed(); }); it('[C268965] Should multi property allow expand multi accordion at the same time when set', async () => { @@ -120,8 +116,7 @@ describe('CardView Component - properties', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - - await metadataViewPage.clickOnInformationButton(); + await metadataViewPage.clickMetadataGroup('properties'); await metadataViewPage.checkMetadataGroupIsNotExpand('EXIF'); await metadataViewPage.checkMetadataGroupIsNotExpand('properties'); @@ -168,8 +163,6 @@ describe('CardView Component - properties', () => { await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.informationButtonIsDisplayed(); - await CheckboxPage.uncheck(metadataViewPage.defaultPropertiesSwitch); await metadataViewPage.informationButtonIsNotDisplayed(); diff --git a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts index b94c3c894b..1d3cd66f79 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -140,11 +140,11 @@ describe('Metadata component', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.editIconIsDisplayed(); + await metadataViewPage.generalEditIconDisplayed(); await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB); - await metadataViewPage.editIconClick(); + await metadataViewPage.editIconGeneralClick(); await metadataViewPage.editPropertyIconIsDisplayed('properties.cm:name'); await metadataViewPage.editPropertyIconIsDisplayed('properties.cm:title'); await metadataViewPage.editPropertyIconIsDisplayed('properties.cm:description'); @@ -156,7 +156,7 @@ describe('Metadata component', () => { await metadataViewPage.enterPropertyText('properties.cm:name', 'exampleText'); await metadataViewPage.clickResetMetadata(); await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual(browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name); - + await metadataViewPage.editIconGeneralClick(); await metadataViewPage.enterPropertyText('properties.cm:name', 'exampleText.png'); await metadataViewPage.enterPropertyText('properties.cm:title', 'example title'); await metadataViewPage.enterDescriptionText('example description'); @@ -164,7 +164,7 @@ 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.clickSaveMetadata(); + await metadataViewPage.clickSaveGeneralMetadata(); await viewerPage.clickCloseButton(); await contentServicesPage.waitForTableBody(); @@ -173,17 +173,18 @@ describe('Metadata component', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - // await metadataViewPage.editIconIsDisplayed(); + await metadataViewPage.generalEditIconDisplayed(); 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.editIconClick(); + await metadataViewPage.editIconGeneralClick(); await metadataViewPage.enterPropertyText('properties.cm:name', browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name); await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual(browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name); - await metadataViewPage.clickSaveMetadata(); + await metadataViewPage.clickSaveGeneralMetadata(); }); + it('[C260181] Should be possible edit all the metadata aspect', async () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); @@ -230,18 +231,20 @@ describe('Metadata component', () => { await BrowserActions.closeMenuAndDialogs(); }); - fit('[C261158] Should be possible edit the metadata When the node is a Folder', async () => { + it('[C261158] Should be possible edit the metadata When the node is a Folder', async () => { await contentServicesPage.metadataContent(folderName); await metadataViewPage.editIconGeneralClick(); await metadataViewPage.enterPropertyText('properties.cm:name', 'newnameFolder'); - await metadataViewPage.generaleditIconDisplayed(); + await metadataViewPage.clickResetButton(); await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual(folderName); + await metadataViewPage.editIconGeneralClick(); await metadataViewPage.enterPropertyText('properties.cm:name', 'newnameFolder'); await metadataViewPage.clickSaveGeneralMetadata(); await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual('newnameFolder'); + await metadataViewPage.editIconGeneralClick(); await metadataViewPage.enterPropertyText('properties.cm:name', folderName); await metadataViewPage.clickSaveGeneralMetadata(); @@ -257,7 +260,7 @@ describe('Metadata component', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.generaleditIconDisplayed(); + await metadataViewPage.generalEditIconDisplayed(); await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB); diff --git a/e2e/core/pages/metadata-view.page.ts b/e2e/core/pages/metadata-view.page.ts index f8929672a9..3a0096d79c 100644 --- a/e2e/core/pages/metadata-view.page.ts +++ b/e2e/core/pages/metadata-view.page.ts @@ -34,7 +34,7 @@ export class MetadataViewPage { author = $(`[data-automation-id='card-textitem-value-properties.cm:author']`); titleProperty = $(`span[data-automation-id='card-textitem-value-properties.cm:title'] span`); editIcon = $(`button[data-automation-id='meta-data-card-toggle-edit']`); - editIconGeneral = $(`button[data-automation-id='meta-data-card-toggle-generalInfo-edit']`); + editIconGeneral = $(`button[data-automation-id='meta-data-generalInfo-edit']`); informationButton = $(`button[data-automation-id='meta-data-card-toggle-expand']`); informationSpan = $(`span[data-automation-id='meta-data-card-toggle-expand-label']`); informationIcon = $(`span[data-automation-id='meta-data-card-toggle-expand-label'] ~ mat-icon`); @@ -110,7 +110,11 @@ export class MetadataViewPage { await BrowserVisibility.waitUntilElementIsNotVisible(this.editIcon); } - async generaleditIconDisplayed(): Promise { + async generalEditIconDisplayed(): Promise { + await BrowserVisibility.waitUntilElementIsVisible(this.editIconGeneral); + } + + async generaleditIconNotDisplayed(): Promise { await BrowserVisibility.waitUntilElementIsNotVisible(this.editIconGeneral); } @@ -119,7 +123,7 @@ export class MetadataViewPage { } async editIconGeneralClick(): Promise { - await BrowserActions.clickExecuteScript('button[data-automation-id="meta-data-card-toggle-generalInfo-edit"]'); + await BrowserActions.clickExecuteScript('button[data-automation-id="meta-data-generalInfo-edit"]'); } async informationButtonIsDisplayed(): Promise { @@ -219,7 +223,7 @@ export class MetadataViewPage { } async getMetadataGroupTitle(groupName: string): Promise { - const group = $('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header > span > mat-panel-title'); + const group = $('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header > span > div > mat-panel-title'); return BrowserActions.getText(group); } 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 0300c239dc..3f468ec421 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 @@ -16,12 +16,12 @@ {{ 'CORE.METADATA.BASIC.HEADER' | translate }} - @@ -29,7 +29,7 @@ class="adf-metadata-action-buttons">