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

[MNT-23433] Close Preview button position #3535

Merged
merged 11 commits into from
Jan 3, 2024
3 changes: 2 additions & 1 deletion app/src/app.config.json
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

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-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
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
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
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