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

[ACS-7982] ACC - fix categories tree (#9715)

Browse Source
This commit is contained in:
Mykyta Maliarchuk 2024-05-23 09:16:43 +02:00 committed by VitoAlbano
parent e444c0fc45
commit 5f497ea8bd
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/content-services/src/lib/tree/components/tree.component.html
View File

@ -17,7 +17,7 @@
*matTreeNodeDef="let node when isLoadMoreNode" *matTreeNodeDef="let node when isLoadMoreNode"
matTreeNodePadding> matTreeNodePadding>
<div class="adf-tree-expand-collapse-container"> <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 <mat-progress-spinner
color="primary" color="primary"
mode="indeterminate" mode="indeterminate"
@ -25,10 +25,7 @@
*ngIf="node.isLoading; else loadMoreIcon"> *ngIf="node.isLoading; else loadMoreIcon">
</mat-progress-spinner> </mat-progress-spinner>
<ng-template #loadMoreIcon> <ng-template #loadMoreIcon>
<adf-icon <adf-icon [value]="'chevron_right'"></adf-icon>
[value]="'chevron_right'"
(click)="loadMoreSubnodes(node)">
</adf-icon>
</ng-template> </ng-template>
</button> </button>
</div> </div>
@ -54,6 +51,7 @@
<div class="adf-tree-expand-collapse-container"> <div class="adf-tree-expand-collapse-container">
<button *ngIf="node.hasChildren" <button *ngIf="node.hasChildren"
class="adf-tree-expand-collapse-button" class="adf-tree-expand-collapse-button"
(click)="expandCollapseNode(node)"
mat-icon-button> mat-icon-button>
<mat-progress-spinner <mat-progress-spinner
color="primary" color="primary"
@ -62,10 +60,7 @@
*ngIf="node.isLoading; else expandCollapseIcon"> *ngIf="node.isLoading; else expandCollapseIcon">
</mat-progress-spinner> </mat-progress-spinner>
<ng-template #expandCollapseIcon> <ng-template #expandCollapseIcon>
<adf-icon <adf-icon [value]="expandCollapseIconValue(node)"></adf-icon>
[value]="expandCollapseIconValue(node)"
(click)="expandCollapseNode(node)">
</adf-icon>
</ng-template> </ng-template>
</button> </button>
</div> </div>

5
lib/content-services/src/lib/tree/components/tree.component.spec.ts
View File

@ -58,7 +58,8 @@ describe('TreeComponent', () => {
const getNodeSpinner = async (nodeId: string) => const getNodeSpinner = async (nodeId: string) =>
loader.getHarnessOrNull(MatProgressSpinnerHarness.with({ ancestor: composeNodeSelector(nodeId) })); 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 tickCheckbox = (index: number) => {
const selector = `[data-automation-id="${index === 0 ? 'has-children-node-checkbox' : 'no-children-node-checkbox'}"]`; const selector = `[data-automation-id="${index === 0 ? 'has-children-node-checkbox' : 'no-children-node-checkbox'}"]`;
@ -289,7 +290,7 @@ describe('TreeComponent', () => {
component.refreshTree(); component.refreshTree();
fixture.detectChanges(); fixture.detectChanges();
spyOn(component.treeService, 'getSubNodes').and.returnValue(of({ pagination: {}, entries: Array.from(singleNode) })); 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(); const appendSpy = spyOn(component.treeService, 'appendNodes').and.callThrough();
loadMoreBtn.dispatchEvent(new Event('click')); loadMoreBtn.dispatchEvent(new Event('click'));
fixture.whenStable(); fixture.whenStable();