mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-05-26 17:24:56 +00:00
[ACS-7982] ACC - fix categories tree (#9715)
This commit is contained in:
parent
e444c0fc45
commit
5f497ea8bd
@ -17,7 +17,7 @@
|
||||
*matTreeNodeDef="let node when isLoadMoreNode"
|
||||
matTreeNodePadding>
|
||||
<div class="adf-tree-expand-collapse-container">
|
||||
<button class="adf-tree-load-more-button" mat-icon-button>
|
||||
<button class="adf-tree-load-more-button" mat-icon-button (click)="loadMoreSubnodes(node)">
|
||||
<mat-progress-spinner
|
||||
color="primary"
|
||||
mode="indeterminate"
|
||||
@ -25,10 +25,7 @@
|
||||
*ngIf="node.isLoading; else loadMoreIcon">
|
||||
</mat-progress-spinner>
|
||||
<ng-template #loadMoreIcon>
|
||||
<adf-icon
|
||||
[value]="'chevron_right'"
|
||||
(click)="loadMoreSubnodes(node)">
|
||||
</adf-icon>
|
||||
<adf-icon [value]="'chevron_right'"></adf-icon>
|
||||
</ng-template>
|
||||
</button>
|
||||
</div>
|
||||
@ -54,6 +51,7 @@
|
||||
<div class="adf-tree-expand-collapse-container">
|
||||
<button *ngIf="node.hasChildren"
|
||||
class="adf-tree-expand-collapse-button"
|
||||
(click)="expandCollapseNode(node)"
|
||||
mat-icon-button>
|
||||
<mat-progress-spinner
|
||||
color="primary"
|
||||
@ -62,10 +60,7 @@
|
||||
*ngIf="node.isLoading; else expandCollapseIcon">
|
||||
</mat-progress-spinner>
|
||||
<ng-template #expandCollapseIcon>
|
||||
<adf-icon
|
||||
[value]="expandCollapseIconValue(node)"
|
||||
(click)="expandCollapseNode(node)">
|
||||
</adf-icon>
|
||||
<adf-icon [value]="expandCollapseIconValue(node)"></adf-icon>
|
||||
</ng-template>
|
||||
</button>
|
||||
</div>
|
||||
|
@ -58,7 +58,8 @@ describe('TreeComponent', () => {
|
||||
const getNodeSpinner = async (nodeId: string) =>
|
||||
loader.getHarnessOrNull(MatProgressSpinnerHarness.with({ ancestor: composeNodeSelector(nodeId) }));
|
||||
|
||||
const getExpandCollapseBtn = (nodeId: string) => fixture.nativeElement.querySelector(`${composeNodeSelector(nodeId)} .adf-icon`);
|
||||
const getExpandCollapseBtn = (nodeId: string) =>
|
||||
fixture.nativeElement.querySelector(`${composeNodeSelector(nodeId)} .adf-tree-expand-collapse-button`);
|
||||
|
||||
const tickCheckbox = (index: number) => {
|
||||
const selector = `[data-automation-id="${index === 0 ? 'has-children-node-checkbox' : 'no-children-node-checkbox'}"]`;
|
||||
@ -289,7 +290,7 @@ describe('TreeComponent', () => {
|
||||
component.refreshTree();
|
||||
fixture.detectChanges();
|
||||
spyOn(component.treeService, 'getSubNodes').and.returnValue(of({ pagination: {}, entries: Array.from(singleNode) }));
|
||||
const loadMoreBtn = fixture.debugElement.query(By.css('.adf-tree-load-more-button adf-icon')).nativeElement;
|
||||
const loadMoreBtn = fixture.debugElement.query(By.css('.adf-tree-load-more-button')).nativeElement;
|
||||
const appendSpy = spyOn(component.treeService, 'appendNodes').and.callThrough();
|
||||
loadMoreBtn.dispatchEvent(new Event('click'));
|
||||
fixture.whenStable();
|
||||
|
Loading…
x
Reference in New Issue
Block a user