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

[ADF-2912] group everyone is always visible even for no search result (#3316)

Browse Source
This commit is contained in:
Vito
2018-05-14 10:26:47 +01:00
committed by Eugenio Romano
parent 7fdd43f339
commit 9749a3837e
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.html
View File

@@ -29,7 +29,19 @@
class="adf-permission-result-list" class="adf-permission-result-list"
*ngIf="searchedWord.length !== 0"> *ngIf="searchedWord.length !== 0">
<ng-template let-data> <ng-template let-data>
<mat-selection-list [class.adf-permission-result-list-elements]="data?.list?.entries.length !== 0"> <mat-selection-list class="adf-permission-result-list-elements">
<mat-list-option
id="adf-add-permission-group-everyone"
class="adf-list-option-item"
(click)="elementClicked(EVERYONE)">
<mat-icon mat-list-icon id="add-group-icon">
group_add
</mat-icon>
<p>
{{'PERMISSION_MANAGER.ADD-PERMISSION.EVERYONE' | translate}}
</p>
</mat-list-option>
<mat-list-option *ngFor="let item of data?.list?.entries; let idx = index" <mat-list-option *ngFor="let item of data?.list?.entries; let idx = index"
(click)="elementClicked(item)" (click)="elementClicked(item)"
class="adf-list-option-item" class="adf-list-option-item"
@@ -46,20 +58,6 @@
item.entry?.properties['cm:authorityName'] : item.entry?.properties['cm:authorityName'] :
item.entry?.properties['cm:firstName']}}</p> item.entry?.properties['cm:firstName']}}</p>
</mat-list-option> </mat-list-option>
<mat-list-option *ngIf="data?.list?.entries.length !== 0"
id="adf-add-permission-group-everyone"
class="adf-list-option-item"
(click)="elementClicked(EVERYONE)">
<mat-icon mat-list-icon id="add-group-icon">
group_add
</mat-icon>
<p>
{{'PERMISSION_MANAGER.ADD-PERMISSION.EVERYONE' | translate}}
</p>
</mat-list-option>
</mat-selection-list> </mat-selection-list>
<div *ngIf="data?.list?.entries.length === 0" class="adf-permission-no-result" id="adf-add-permission-no-results">
<span>{{'PERMISSION_MANAGER.ADD-PERMISSION.NO-RESULT' | translate}}</span>
</div>
</ng-template> </ng-template>
</adf-search> </adf-search>

15
lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
View File

@@ -172,4 +172,19 @@ describe('AddPermissionPanelComponent', () => {
}); });
})); }));
it('should show everyone group when search return no result', async(() => {
searchApiService = fixture.componentRef.injector.get(SearchService);
spyOn(searchApiService, 'search').and.returnValue(Observable.of({ list: { entries: [] } }));
component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
typeWordIntoSearchInput('a');
fixture.detectChanges();
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(element.querySelector('#adf-add-permission-authority-results')).not.toBeNull();
expect(element.querySelector('#adf-add-permission-group-everyone')).toBeDefined();
expect(element.querySelector('#adf-add-permission-group-everyone')).not.toBeNull();
});
}));
}); });