inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-1752] disable completely sidebar when allowSidebar option is false (#2753)

Browse Source 
* [ADF-1752] disable completely sidebar when allowSidebar option is false

* [ADF-1752] improved condition for showing toolbar
This commit is contained in:
Vito
2017-12-04 09:45:14 +00:00
committed by Eugenio Romano
parent 68d6092118
commit dc213adf55
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/viewer/components/viewer.component.html
View File

@@ -103,7 +103,7 @@
<div *ngIf="!isLoading" fxLayout="row" fxFlex="1 1 auto">
<ng-container *ngIf="showSidebar">
<ng-container *ngIf="allowSidebar && showSidebar">
<div class="adf-viewer__sidebar" fxFlexOrder="{{sidebarPosition === 'left'? 1: 2 }}">
<ng-container *ngIf="sidebarTemplate">
<ng-container *ngTemplateOutlet="sidebarTemplate;context:sidebarTemplateContext"></ng-container>

14
lib/core/viewer/components/viewer.component.spec.ts
View File

@@ -112,7 +112,7 @@ class ViewerWithCustomOpenWithComponent {}
})
class ViewerWithCustomMoreActionsComponent {}
describe('ViewerComponent', () => {
fdescribe('ViewerComponent', () => {
let component: ViewerComponent;
let fixture: ComponentFixture<ViewerComponent>;
@@ -208,8 +208,18 @@ describe('ViewerComponent', () => {
expect(customElement.querySelector('.adf-viewer-container-more-actions')).toBeDefined();
});
it('should NOT display sidebar if is not allowed', () => {
component.showSidebar = true;
component.allowSidebar = false;
component.sidebarPosition = 'left';
fixture.detectChanges();
let sidebar = element.querySelector('.adf-viewer__sidebar');
expect(sidebar).toBeNull();
});
it('should display sidebar on the left side', () => {
component.showSidebar = true;
component.allowSidebar = true;
component.sidebarPosition = 'left';
fixture.detectChanges();
let sidebar = element.querySelector('.adf-viewer__sidebar');
@@ -218,6 +228,7 @@ describe('ViewerComponent', () => {
it('should display sidebar on the right side', () => {
component.showSidebar = true;
component.allowSidebar = true;
component.sidebarPosition = 'right';
fixture.detectChanges();
let sidebar = element.querySelector('.adf-viewer__sidebar');
@@ -226,6 +237,7 @@ describe('ViewerComponent', () => {
it('should display sidebar on the right side as fallback', () => {
component.showSidebar = true;
component.allowSidebar = true;
component.sidebarPosition = 'unknown-value';
fixture.detectChanges();
let sidebar = element.querySelector('.adf-viewer__sidebar');