[ADF-1856] Document List - location fails for granular permissions (#2583)

* check if path has data

* updated docs

* check for required properties

* simplied condition
This commit is contained in:
Cilibiu Bogdan
2017-11-02 16:25:39 +02:00
committed by Eugenio Romano
parent 7ddd3f1a8f
commit 3478b06716
3 changed files with 140 additions and 1 deletions

View File

@@ -508,6 +508,10 @@ That triggers the date values to be rendered using popular ["Time from now"](htt
This column is used to display a clickable location link pointing to the parent path of the node. This column is used to display a clickable location link pointing to the parent path of the node.
**Important note**:
_For granular permissions, the Location Column may or may not render link location_
You are going to use it with custom navigation or when displaying content from the sources like: You are going to use it with custom navigation or when displaying content from the sources like:
- Sites - Sites

View File

@@ -0,0 +1,134 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { CoreModule } from 'ng2-alfresco-core';
import {
ObjectDataColumn,
ObjectDataTableAdapter
} from './../../data/index';
import { LocationCellComponent } from './location-cell.component';
describe('LocationCellComponent', () => {
let component: LocationCellComponent;
let fixture: ComponentFixture<LocationCellComponent>;
let dataTableAdapter: ObjectDataTableAdapter;
let rowData;
let columnData;
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
CoreModule,
RouterTestingModule
],
declarations: [
LocationCellComponent
]
}).compileComponents();
fixture = TestBed.createComponent(LocationCellComponent);
component = fixture.componentInstance;
}));
beforeEach(() => {
rowData = {
name: '1',
path: {
elements: [
{ id: '1', name: 'path' },
{ id: '2', name: 'to' },
{ id: '3', name: 'location' }
],
name: '/path/to/location'
}
};
columnData = { format: '/somewhere', type: 'location', key: 'path'};
dataTableAdapter = new ObjectDataTableAdapter(
[rowData],
[ new ObjectDataColumn(columnData) ]
);
component.link = [];
component.column = dataTableAdapter.getColumns()[0];
component.data = dataTableAdapter;
component.row = dataTableAdapter.getRows()[0];
});
it('should set displayText', () => {
fixture.detectChanges();
expect(component.displayText).toBe('location');
});
it('should set tooltip', () => {
fixture.detectChanges();
expect(component.tooltip).toEqual(rowData.path.name);
});
it('should set router link', () => {
fixture.detectChanges();
expect(component.link).toEqual([ columnData.format , rowData.path.elements[2].id ]);
});
it('should not setup cell when path has no data', () => {
rowData.path = {};
fixture.detectChanges();
expect(component.displayText).toBe('');
expect(component.tooltip).toBeUndefined();
expect(component.link).toEqual([]);
});
it('should not setup cell when path is missing required properties', () => {
rowData.path = { someProp: '' };
fixture.detectChanges();
expect(component.displayText).toBe('');
expect(component.tooltip).toBeUndefined();
expect(component.link).toEqual([]);
});
it('should not setup cell when path data is missing one of the property', () => {
rowData.path = {
name: 'some-name'
};
fixture.detectChanges();
expect(component.displayText).toBe('');
expect(component.tooltip).toBeUndefined();
expect(component.link).toEqual([]);
rowData.path = {
elements: []
};
fixture.detectChanges();
expect(component.displayText).toBe('');
expect(component.tooltip).toBeUndefined();
expect(component.link).toEqual([]);
});
});

View File

@@ -44,7 +44,8 @@ export class LocationCellComponent extends DataTableCellComponent implements OnI
ngOnInit() { ngOnInit() {
if (!this.value && this.column && this.column.key && this.row && this.data) { if (!this.value && this.column && this.column.key && this.row && this.data) {
const path: PathInfoEntity = this.data.getValue(this.row, this.column); const path: PathInfoEntity = this.data.getValue(this.row, this.column);
if (path) {
if (path && path.name && path.elements) {
this.value = path; this.value = path;
this.displayText = path.name.split('/').pop(); this.displayText = path.name.split('/').pop();