Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACS 5551] Property Panel Design #8877

Closed
wants to merge 20 commits into from
Closed

[ACS 5551] Property Panel Design #8877

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fd5bca7
[ACS-5645]Added edit functionality for each panel and updated test cases
Yasa-Nataliya Aug 10, 2023
1c4c508
metadata e2e fix
Yasa-Nataliya Aug 13, 2023
35791f6
[ACS-5725]fixed failing e2es
Yasa-Nataliya Aug 17, 2023
3b8ef0b
added unit test cases for new functionality
Yasa-Nataliya Aug 19, 2023
a7e20e3
minor fixes
Yasa-Nataliya Aug 19, 2023
ee4173c
minor fixes
Yasa-Nataliya Aug 21, 2023
3b6236b
minor fixes
Yasa-Nataliya Aug 21, 2023
5c7d2e5
[ACS-5645]code modification
Yasa-Nataliya Aug 25, 2023
ec005f5
[ACS-5645]removed unwanted code
Yasa-Nataliya Aug 25, 2023
7c112d8
[ACS-5645]modified the changes
Yasa-Nataliya Aug 25, 2023
4f0c156
[ACS-5645]removed unwanted space
Yasa-Nataliya Aug 25, 2023
309ff17
[ACS-5645]removed unwanted code
Yasa-Nataliya Aug 29, 2023
45b45ba
[ACS-5645]Implemented changes as per the review comments
Yasa-Nataliya Aug 31, 2023
495b900
linting fixes
Yasa-Nataliya Aug 31, 2023
1f98b37
[ACS-5645]minor fixes
Yasa-Nataliya Aug 31, 2023
13edcba
[ACS-5551]property panel updated
AnukritiGL Sep 1, 2023
37b8380
[ACS-5551]minor changes in design
AnukritiGL Sep 5, 2023
94ab169
[ACS-5551]added E2e test cases
AnukritiGL Sep 5, 2023
54c9859
[ACS-5551]minor change in code
AnukritiGL Sep 5, 2023
747df40
[ACS-5551] minor changes in code
AnukritiGL Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion demo-shell/src/app/components/files/files.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,8 @@
<adf-info-drawer-layout *ngIf="showVersions" class="app-manage-versions-sidebar">
<div info-drawer-content>

<adf-info-drawer [title]="'Details'" *ngIf="documentList.selection[0]">
<adf-info-drawer [drawerIcon]="documentList.selection[0].entry" [title]="'Details'" *ngIf="documentList.selection[0]">

<adf-info-drawer-tab label="Properties">
<adf-content-metadata-card
[node]="documentList.selection[0].entry"
Expand Down
21 changes: 0 additions & 21 deletions e2e/content-services/metadata/aspect-oriented-config.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand Down Expand Up @@ -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');

Expand Down Expand Up @@ -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');
});
Expand All @@ -286,9 +271,6 @@ describe('Aspect oriented config', () => {
await viewerPage.checkInfoSideBarIsDisplayed();
await metadataViewPage.clickOnPropertiesTab();

await metadataViewPage.informationButtonIsDisplayed();
await metadataViewPage.clickOnInformationButton();

await metadataViewPage.checkMetadataGroupIsNotPresent(emptyAspectName);
});

Expand All @@ -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();
Expand Down
16 changes: 8 additions & 8 deletions e2e/content-services/metadata/metadata-content-type.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,16 @@ describe('content type', () => {
await viewerPage.clickInfoButton();
await viewerPage.checkInfoSideBarIsDisplayed();
await metadataViewPage.clickOnPropertiesTab();
await metadataViewPage.editIconIsDisplayed();
await metadataViewPage.generalEditIconDisplayed();

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

Expand All @@ -139,7 +139,7 @@ describe('content type', () => {
await viewerPage.clickInfoButton();
await viewerPage.checkInfoSideBarIsDisplayed();
await metadataViewPage.clickOnPropertiesTab();
await metadataViewPage.editIconIsDisplayed();
await metadataViewPage.generalEditIconDisplayed();

await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES');
const customType = (await metadataViewPage.hasContentType(type.title)) || (await metadataViewPage.hasContentType(`${model.namespacePrefix}:${type.name}`));
Expand All @@ -155,16 +155,16 @@ describe('content type', () => {
await viewerPage.clickInfoButton();
await viewerPage.checkInfoSideBarIsDisplayed();
await metadataViewPage.clickOnPropertiesTab();
await metadataViewPage.editIconIsDisplayed();
await metadataViewPage.generalEditIconDisplayed();

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();
Expand All @@ -178,7 +178,7 @@ describe('content type', () => {
await viewerPage.clickInfoButton();
await viewerPage.checkInfoSideBarIsDisplayed();
await metadataViewPage.clickOnPropertiesTab();
await metadataViewPage.editIconIsDisplayed();
await metadataViewPage.generalEditIconDisplayed();

await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES');
defaultType = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content'));
Expand Down
6 changes: 0 additions & 6 deletions e2e/content-services/metadata/metadata-permissions.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ describe('permissions', () => {
COMMENTS_TAB: 'COMMENTS',
PROPERTY_TAB: 'PROPERTIES',
DEFAULT_ASPECT: 'Properties',
MORE_INFO_BUTTON: 'More information',
LESS_INFO_BUTTON: 'Less information',
ARROW_DOWN: 'keyboard_arrow_down',
ARROW_UP: 'keyboard_arrow_up',
EDIT_BUTTON_TOOLTIP: 'Edit'
};

Expand Down Expand Up @@ -132,7 +128,6 @@ describe('permissions', () => {

await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);

await metadataViewPage.clickOnInformationButton();

await metadataViewPage.clickMetadataGroup('EXIF');

Expand All @@ -152,7 +147,6 @@ describe('permissions', () => {

await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);

await metadataViewPage.clickOnInformationButton();

await metadataViewPage.clickMetadataGroup('EXIF');

Expand Down
14 changes: 2 additions & 12 deletions e2e/content-services/metadata/metadata-properties.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ describe('CardView Component - properties', () => {
COMMENTS_TAB: 'COMMENTS',
PROPERTY_TAB: 'PROPERTIES',
DEFAULT_ASPECT: 'Properties',
MORE_INFO_BUTTON: 'More information',
LESS_INFO_BUTTON: 'Less information',
ARROW_DOWN: 'keyboard_arrow_down',
ARROW_UP: 'keyboard_arrow_up',
EDIT_BUTTON_TOOLTIP: 'Edit'
};

Expand Down Expand Up @@ -90,7 +86,6 @@ describe('CardView Component - properties', () => {

await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);

await metadataViewPage.clickOnInformationButton();

await metadataViewPage.clickMetadataGroup('EXIF');

Expand All @@ -108,20 +103,17 @@ describe('CardView Component - properties', () => {
await viewerPage.clickInfoButton();
await viewerPage.checkInfoSideBarIsDisplayed();
await metadataViewPage.clickOnPropertiesTab();
await metadataViewPage.editIconIsDisplayed();
await metadataViewPage.generalEditIconDisplayed();

await CheckboxPage.check(metadataViewPage.readonlySwitch);

await metadataViewPage.editIconIsNotDisplayed();
});

it('[C268965] Should multi property allow expand multi accordion at the same time when set', async () => {
await viewerPage.viewFile(pngFileModel.name);
await viewerPage.clickInfoButton();
await viewerPage.checkInfoSideBarIsDisplayed();
await metadataViewPage.clickOnPropertiesTab();

await metadataViewPage.clickOnInformationButton();
await metadataViewPage.clickMetadataGroup('properties');

await metadataViewPage.checkMetadataGroupIsNotExpand('EXIF');
await metadataViewPage.checkMetadataGroupIsNotExpand('properties');
Expand Down Expand Up @@ -168,8 +160,6 @@ describe('CardView Component - properties', () => {
await viewerPage.checkInfoSideBarIsDisplayed();
await metadataViewPage.clickOnPropertiesTab();

await metadataViewPage.informationButtonIsDisplayed();

await CheckboxPage.uncheck(metadataViewPage.defaultPropertiesSwitch);

await metadataViewPage.informationButtonIsNotDisplayed();
Expand Down
Loading