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

[MNT-23433] Close Preview button position #3535

Merged
merged 11 commits into from
Jan 3, 2024
Merged

[MNT-23433] Close Preview button position #3535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8d5d742
[MNT-23433] preview button configure
AnukritiGL Nov 20, 2023
090d175
[MNT-23433] e2e fix
AnukritiGL Nov 21, 2023
d95f197
[MNT-23433] e2e fix for protractor
AnukritiGL Nov 23, 2023
dc8738e
[MNT-23433] default position set to right
AnukritiGL Nov 23, 2023
6d665f5
[MNT-23433] close button added for e2e
AnukritiGL Nov 23, 2023
2226259
[MNT-23433] documentation added
AnukritiGL Nov 24, 2023
4f8fa23
[MNT-23433] removed close button from toolbar
AnukritiGL Dec 7, 2023
93e8f95
[MNT-23433] passing close button position
AnukritiGL Dec 12, 2023
46565a2
[MNT-23433] hide info icon
AnukritiGL Dec 14, 2023
db141b6
[MNT-23433] add property for info button
AnukritiGL Dec 27, 2023
8b531a6
Upstream ADF-6.6.0-7386887320, Js-api-7.5.0-7386887320 version
AnukritiGL Jan 3, 2024
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 app/src/app.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,6 +1137,7 @@
"downloadPromptDelay": 50,
"downloadPromptReminderDelay": 30,
"enableFileAutoDownload": true,
"fileAutoDownloadSizeThresholdInMB": 15
"fileAutoDownloadSizeThresholdInMB": 15,
"closeButtonPosition": "right"
}
}
72 changes: 36 additions & 36 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
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-7307998972",
"@alfresco/adf-core": ">=6.6.0-7307998972",
"@alfresco/adf-extensions": ">=6.6.0-7307998972",
"@alfresco/eslint-plugin-eslint-angular": ">=6.6.0-7307998972",
"@alfresco/js-api": ">=7.5.0-7307998972",
"@alfresco/adf-content-services": ">=6.6.0-7386887320",
"@alfresco/adf-core": ">=6.6.0-7386887320",
"@alfresco/adf-extensions": ">=6.6.0-7386887320",
"@alfresco/eslint-plugin-eslint-angular": ">=6.6.0-7386887320",
"@alfresco/js-api": ">=7.5.0-7386887320",
"@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-7307998972",
"@alfresco/adf-testing": ">=6.6.0-7307998972",
"@alfresco/adf-cli": ">=6.6.0-7386887320",
"@alfresco/adf-testing": ">=6.6.0-7386887320",
"@angular-devkit/build-angular": "14.2.11",
"@angular-devkit/core": "14.1.2",
"@angular-devkit/schematics": "14.1.2",
Expand Down
2 changes: 2 additions & 0 deletions projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
[allowDownload]="false"
[allowFullScreen]="false"
[overlayMode]="true"
[hideInfoButton]="true"
[closeButtonPosition]="'viewer.closeButtonPosition' | adfAppConfig: 'right'"
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you check if that works with left as a default value in ADF? And also if that works if the param is not set in the config file

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I checked with default value as left as well working fine and also I try after removing the param from config file, it will come at right by default.

(showViewerChange)="onViewerVisibilityChanged()"
[canNavigateBefore]="!!previousNodeId"
[canNavigateNext]="!!nextNodeId"
Expand Down
5 changes: 0 additions & 5 deletions projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
}
}

// todo: remove this when viewer supports extensions
.adf-viewer-toolbar > * > button:last-child {
display: none;
}

.adf-alfresco-viewer.aca-right_side--hide .adf-viewer__sidebar__right {
width: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion projects/aca-testing-shared/src/components/viewer/viewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export class Viewer extends Component {
}

async clickCloseButton(): Promise<void> {
const closeButton: ElementFinder = element(by.css('button[data-automation-id="adf-toolbar-back"]'));
const closeButton: ElementFinder = element(by.css('button.adf-viewer-close-button'));
await BrowserActions.click(closeButton);
}
}
Loading