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.

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-5645] Property Panel Feature #3477

Merged
merged 77 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
a090ec6
[ACS-5540] changes for edit aspect button
Yasa-Nataliya Aug 31, 2023
dda6a60
added aspect edit button
Yasa-Nataliya Sep 1, 2023
87f8209
[ACS-5540]fixed unit test cases and added unit test cases
Yasa-Nataliya Sep 1, 2023
3a0f1a8
[ACS-5540] Modified changes
Yasa-Nataliya Sep 5, 2023
5ca9a6f
[ACS-5540] fixed file lock issue
Yasa-Nataliya Sep 7, 2023
8216160
[ACS-5645]Implemented changes as per review comments
Yasa-Nataliya Sep 7, 2023
14db0cb
[ACS-5540]Modified the test case title
Yasa-Nataliya Sep 7, 2023
f3f0254
[ACS-5645] changes for aspect icon
Yasa-Nataliya Sep 11, 2023
54ff1d4
[ACS-5645] fixed aspect lock issue in small screen
Yasa-Nataliya Sep 11, 2023
de3a47f
[ACS-5540] modified the aspect button changes
Yasa-Nataliya Sep 13, 2023
cd6ba5e
[ACS-5540] modified the changes
Yasa-Nataliya Sep 13, 2023
d01d092
[ACS-5645] added unit test cases
Yasa-Nataliya Sep 18, 2023
2fa75bc
[ACS-5540] removed unwanted code
Yasa-Nataliya Sep 19, 2023
b9f0d15
[ACS-5540] fixed lock-file bug
Yasa-Nataliya Sep 20, 2023
120acac
[ACS-5540] revert the unwanted changes
Yasa-Nataliya Sep 21, 2023
1dbc7b3
[ACS-5540] modified changes
Yasa-Nataliya Sep 21, 2023
a5ac1bc
[ACS-5540]Implemented the changes as per the review comments
Yasa-Nataliya Sep 22, 2023
ea331b5
[ACS-5540] added group lock changes
Yasa-Nataliya Sep 22, 2023
94b7c43
[ACS-5540] added tooltip
Yasa-Nataliya Sep 25, 2023
a8a63da
[ACS-5540] Implemented the review comments
Yasa-Nataliya Sep 28, 2023
9c39aa8
[ACS-5540] added tooltips
Yasa-Nataliya Sep 28, 2023
09ae125
[ACS-5540] Added styles
Yasa-Nataliya Oct 3, 2023
786ca1a
[ACS-5540]Added focus
Yasa-Nataliya Oct 4, 2023
0738c7e
[ACS-5551]updated property panel design
AnukritiGL Sep 6, 2023
ed59607
[ACS-5551]added null checks
pkunduGL Sep 9, 2023
4d86d0c
[ACS-5551] update style
AnukritiGL Oct 12, 2023
8ff22ac
[ACS-5540] changes for edit aspect button
Yasa-Nataliya Aug 31, 2023
bfcc78a
added aspect edit button
Yasa-Nataliya Sep 1, 2023
7e9b497
[ACS-5540]fixed unit test cases and added unit test cases
Yasa-Nataliya Sep 1, 2023
189cd29
[ACS-5540] Modified changes
Yasa-Nataliya Sep 5, 2023
da06fae
[ACS-5645]Implemented changes as per review comments
Yasa-Nataliya Sep 7, 2023
eb98605
[ACS-5645] changes for aspect icon
Yasa-Nataliya Sep 11, 2023
614ea36
[ACS-5540] modified the aspect button changes
Yasa-Nataliya Sep 13, 2023
457f7f8
[ACS-5540] modified the changes
Yasa-Nataliya Sep 13, 2023
8b3e445
[ACS-5540] revert the unwanted changes
Yasa-Nataliya Sep 21, 2023
093fe86
[ACS-5540] added group lock changes
Yasa-Nataliya Sep 22, 2023
d43bad1
[ACS-5551]updated property panel design
AnukritiGL Sep 6, 2023
ec8d1ad
[ACS-5551]added null checks
pkunduGL Sep 9, 2023
3906418
[ACS-5551] update style
AnukritiGL Oct 12, 2023
cfc54dc
[ACS-5551] name updated
AnukritiGL Oct 12, 2023
f8cb6dd
[ACS-5551] unit test fix
AnukritiGL Oct 12, 2023
87a4f82
[ACS-5551] header issue fixed
AnukritiGL Oct 12, 2023
861d690
[ACS-5645] style updated
AnukritiGL Oct 16, 2023
42cbde6
[ACS-5645] border updated
AnukritiGL Oct 16, 2023
588c226
[ACS-6117] fixed aspect dispaly issue
Yasa-Nataliya Oct 16, 2023
143494a
[ACS-5645] different node open issu fixed
AnukritiGL Oct 16, 2023
1847fce
[ACS-5645] unit test issue fix
AnukritiGL Oct 17, 2023
f4c0925
[ACS-5645] unit test fix
AnukritiGL Oct 17, 2023
86a156e
[ACS-5645] tabs design modify
AnukritiGL Oct 18, 2023
322752a
[ACS-5645] dependency updated
AnukritiGL Oct 19, 2023
1c72d99
[link-adf:ACS-564
AnukritiGL Oct 20, 2023
08cad4b
"[link-adf:ACS-5645-property-panel-feature]"
AnukritiGL Oct 20, 2023
cf68d26
[ACS-5645] revert adf linking changes
AnukritiGL Oct 20, 2023
07aaf76
add adf configs to libs
DenysVuika Oct 20, 2023
d9834e6
fix issue with empty paths
DenysVuika Oct 20, 2023
5603e97
try using adf target
DenysVuika Oct 20, 2023
f50e557
[link-adf:ACS-5645-property-panel-feature] fix core mapping
DenysVuika Oct 20, 2023
082522c
[link-adf:ACS-5645-property-panel-feature] revert target changes
DenysVuika Oct 20, 2023
586af02
remove useless styles
DenysVuika Oct 20, 2023
81353af
remove css hacks
DenysVuika Oct 21, 2023
11be762
cleanup useless properties
DenysVuika Oct 21, 2023
39740c4
remove useless properties
DenysVuika Oct 21, 2023
db34d68
remove useless code
DenysVuika Oct 21, 2023
22b2c62
[ACS-5645] added missing code
AnukritiGL Nov 16, 2023
3e91864
[ACS-5654] add icon for full screen
AnukritiGL Nov 28, 2023
06fe00b
[ACS-5654] nodei con methods moved to thumbnail
AnukritiGL Nov 29, 2023
d6e0bae
[ACS-5654] unit test added and code refactor
AnukritiGL Nov 29, 2023
a9051dc
[ACS-5645] unit test added
AnukritiGL Nov 30, 2023
d982f13
[ACS-5645] panel issue fix
AnukritiGL Nov 30, 2023
d341cb0
[ACS-5645] removed unit test for editable property
AnukritiGL Dec 1, 2023
6cdb8e9
[ACS-5645] removed unused unit test
AnukritiGL Dec 4, 2023
d4bedf0
[ACS-5645] unit test updated
AnukritiGL Dec 12, 2023
8631ee7
[ACS-5645] updated the unit test
AnukritiGL Dec 13, 2023
f25ca03
Modified the unit test cases for getNodeIcon
rbahirsheth Dec 18, 2023
e9e6b20
Upsteam ADF-6.6.0-7287333895, Js-api-7.5.0-7287333895 version
rbahirsheth Dec 21, 2023
c3f3db3
Fix failing test cases
rbahirsheth Dec 22, 2023
a31664e
Fix failing e2e
rbahirsheth Dec 22, 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
2 changes: 1 addition & 1 deletion .github/actions/adf-linking/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ runs:
shell: bash
run: |
if [[ $COMMIT_MESSAGE == *"[link-adf:"* ]]; then
echo "BUILD_OPTS=--configuration=adfprod,e2e" >> $GITHUB_ENV
echo "BUILD_OPTS=--configuration=adf,e2e" >> $GITHUB_ENV
echo "TEST_OPTS=--configuration=adfprod" >> $GITHUB_ENV
echo "E2E_PROTRACTOR_OPTS=--with-local-adf" >> $GITHUB_ENV
echo "E2E_TSCONFIG=tsconfig.e2e.adf.json" >> $GITHUB_ENV
Expand Down
1 change: 0 additions & 1 deletion e2e/protractor/suites/extensions/ext-metadata.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ describe('Extensions - Metadata presets', () => {
await infoDrawer.waitForInfoDrawerToOpen();

await infoDrawer.clickTab(PROPERTIES_TAB.title);
await BrowserActions.click(metadataCard.expandButton);
await metadataCard.waitForFirstExpansionPanel();
});

Expand Down
2 changes: 1 addition & 1 deletion e2e/protractor/suites/info-drawer/comments.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ describe('Comments', () => {
await infoDrawer.waitForInfoDrawerToOpen();
await infoDrawer.clickCommentsTab();

expect(await infoDrawer.getActiveTabTitle()).toBe('COMMENTS');
expect(await infoDrawer.getActiveTabTitle()).toBe('Comments');
expect(await commentsTab.getCommentsTabHeaderText()).toBe('Comments (0)');
expect(await commentsTab.isCommentTextAreaDisplayed()).toBe(true, 'Comment field not present');
expect(await commentsTab.isAddCommentButtonEnabled()).toBe(false, 'Add comment button not disabled');
Expand Down
24 changes: 1 addition & 23 deletions e2e/protractor/suites/info-drawer/file-folder-properties.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ describe('File / Folder properties', () => {
};

const infoDrawer = new InfoDrawer();
const { propertiesTab } = infoDrawer;

const loginPage = new LoginPage();
const page = new BrowsingPage();
Expand Down Expand Up @@ -91,33 +90,12 @@ describe('File / Folder properties', () => {
await BrowserActions.click(page.toolbar.viewDetailsButton);
await infoDrawer.waitForInfoDrawerToOpen();

expect(await infoDrawer.getHeaderTitle()).toEqual('Details');
expect(await infoDrawer.getHeaderTitle()).toEqual(file1.name);
expect(await infoDrawer.isPropertiesTabDisplayed()).toBe(true, 'Properties tab is not displayed');
expect(await infoDrawer.isCommentsTabDisplayed()).toBe(true, 'Comments tab is not displayed');
expect(await infoDrawer.getTabsCount()).toBe(2, 'Incorrect number of tabs');
});

it('[C269004] Less / More information buttons', async () => {
await dataTable.selectItem(file1.name);
await BrowserActions.click(page.toolbar.viewDetailsButton);
await infoDrawer.waitForInfoDrawerToOpen();

expect(await propertiesTab.isMoreInfoButtonEnabled()).toBe(true, 'More information button not enabled');
expect(await propertiesTab.isPropertiesListExpanded()).toBe(true, 'Properties list not expanded');

await BrowserActions.click(propertiesTab.moreInfoButton);

expect(await propertiesTab.isMoreInfoButtonDisplayed()).toBe(false, 'More information button displayed');
expect(await propertiesTab.isLessInfoButtonEnabled()).toBe(true, 'Less information button not enabled');
expect(await propertiesTab.isPropertiesListExpanded()).toBe(false, 'Properties list expanded');

await BrowserActions.click(propertiesTab.lessInfoButton);

expect(await propertiesTab.isMoreInfoButtonDisplayed()).toBe(true, 'More information button not displayed');
expect(await propertiesTab.isLessInfoButtonEnabled()).toBe(false, 'Less information button enabled');
expect(await propertiesTab.isPropertiesListExpanded()).toBe(true, 'Properties list not expanded');
});

it('[C599174] Should be able to make the files/folders info drawer expandable as for Sites', async () => {
await dataTable.selectItem(file1.name);
await BrowserActions.click(page.toolbar.viewDetailsButton);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ describe('Library properties', () => {
await BrowserActions.click(page.toolbar.viewDetailsButton);
await infoDrawer.waitForInfoDrawerToOpen();

expect(await infoDrawer.getHeaderTitle()).toEqual('Details');
expect(await infoDrawer.getHeaderTitle()).toEqual(site.name);
expect(await infoDrawer.isPropertiesTabDisplayed()).toBe(true, 'Properties tab is not displayed');
expect(await aboutTab.isNameDisplayed()).toBe(true, 'Name field not displayed');
expect(await aboutTab.isLibraryIdDisplayed()).toBe(true, 'Library ID field not displayed');
Expand Down
72 changes: 36 additions & 36 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "6.6.0-7146652899",
"@alfresco/adf-core": "6.6.0-7146652899",
"@alfresco/adf-extensions": "6.6.0-7146652899",
"@alfresco/eslint-plugin-eslint-angular": "6.6.0-7146652899",
"@alfresco/js-api": "7.5.0-7146652899",
"@alfresco/adf-content-services": "6.6.0-7287333895",
"@alfresco/adf-core": "6.6.0-7287333895",
"@alfresco/adf-extensions": "6.6.0-7287333895",
"@alfresco/eslint-plugin-eslint-angular": "6.6.0-7287333895",
"@alfresco/js-api": "7.5.0-7287333895",
"@angular/animations": "14.1.3",
"@angular/cdk": "14.1.3",
"@angular/common": "14.1.3",
Expand Down Expand Up @@ -65,8 +65,8 @@
"zone.js": "0.11.8"
},
"devDependencies": {
"@alfresco/adf-cli": "6.6.0-7146652899",
"@alfresco/adf-testing": "6.6.0-7146652899",
"@alfresco/adf-cli": "6.6.0-7287333895",
"@alfresco/adf-testing": "6.6.0-7287333895",
"@angular-devkit/build-angular": "14.2.11",
"@angular-devkit/core": "14.1.2",
"@angular-devkit/schematics": "14.1.2",
Expand Down
14 changes: 13 additions & 1 deletion projects/aca-content/assets/app.extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -1243,6 +1243,18 @@
"visible": "showInfoSelectionButton"
}
},
{
"id": "app.toolbar.aspects",
"order": 160,
"title": "APP.ACTIONS.ADD_ASPECTS",
"icon": "playlist_add",
"actions": {
"click": "ASPECT_LIST"
},
"rules": {
"visible": "editAspects"
}
},
{
"id": "app.sidebar.expand",
"order": 200,
Expand All @@ -1252,7 +1264,7 @@
"click": "EXPAND_INFO_DRAWER"
},
"rules": {
"visible": "app.navigation.isNotLibraries"
"visible": "canShowExpand"
}
}
],
Expand Down
8 changes: 5 additions & 3 deletions projects/aca-content/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@
"LEAVE": "Leave Library",
"EDIT_OFFLINE": "Edit Offline",
"EDIT_OFFLINE_CANCEL": "Cancel Editing",
"CHANGE_ASPECT": "Edit Aspects"
"CHANGE_ASPECT": "Edit Aspects",
"ADD_ASPECTS": "Add Aspects"
},
"DIALOGS": {
"CONFIRM_PURGE": {
Expand Down Expand Up @@ -394,15 +395,16 @@
},
"INFO_DRAWER": {
"TITLE": "Details",
"CLOSE": "Close",
"REDUCE_PANEL": "Reduce panel",
"DATA_LOADING": "Data is loading",
"ICON": "Node Icon",
"TABS": {
"PROPERTIES": "Properties",
"LIBRARY_PROPERTIES": "About",
"VERSIONS": "Versions",
"COMMENTS": "Comments",
"PERMISSIONS": "Permissions",
"EXPAND": "Expand"
"EXPAND": "Expand panel"
}
},
"TOOLTIPS": {
Expand Down
2 changes: 2 additions & 0 deletions projects/aca-content/src/lib/aca-content.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ export class ContentServiceExtensionModule {
canToggleFavorite: rules.canToggleFavorite,
isLibraryManager: rules.isLibraryManager,
canEditAspects: rules.canEditAspects,
editAspects: rules.editAspects,
canShowExpand: rules.canShowExpand,
canInfoPreview: rules.canInfoPreview,
showInfoSelectionButton: rules.showInfoSelectionButton,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@
<div class="aca-details-container">
<div class="aca-details-title">
<div class="aca-details-breadcrumb" role="heading" aria-level="2" *ngIf="node">
<span class="aca-details-breadcrumb-library"> {{ node.name }} </span>
-
<span class="aca-details-breadcrumb-item">{{ 'APP.INFO_DRAWER.TITLE' | translate }}</span>
<span class="aca-details-breadcrumb-library">
<img class="aca-details-breadcrumb-icon" alt="{{ 'APP.INFO_DRAWER.ICON' | translate }}" src="{{ nodeIcon }}">
{{ node.name }} </span>
rbahirsheth marked this conversation as resolved.
Show resolved Hide resolved
</div>
<div class="acs-details-buttons">
<aca-toolbar [items]="aspectActions" info-drawer-buttons></aca-toolbar>
<button
class="aca-close-details-button"
mat-icon-button
data-automation-id="close-library"
title="{{ 'APP.INFO_DRAWER.REDUCE_PANEL' | translate }}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure that this button title should say reduce panel? In fact it's closing the panel so it sounds misleading

Copy link
Contributor

@rbahirsheth rbahirsheth Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MichalKinas
Shane suggested the title should be 'Reduce Panel' so that we use the key with the same name.
Either we can change the key and keep the value same as Shane suggested. What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that title is fine with Shane it's okay for me as well

(click)="goBack()">
<mat-icon>fullscreen_exit</mat-icon>
</button>
</div>
<button
class="aca-close-details-button"
mat-icon-button
data-automation-id="close-library"
title="{{ 'APP.INFO_DRAWER.CLOSE' | translate }}"
(click)="goBack()">
<mat-icon>fullscreen_exit</mat-icon>
</button>
</div>

<mat-tab-group [selectedIndex]="activeTab" class="aca-details-tabs" animationDuration="0">
Expand Down
Loading
Loading