65600: Cleanup & indentation of shortDescription

src/app/community-list-page/community-list/community-list.component.html

@@ -6,7 +6,6 @@
         <div class="btn-group"
              (click)="getNextPage(node)">
             <button type="button" class="btn btn-default" cdkTreeNodeToggle
-                    [attr.aria-label]="'toggle ' + node.name"
                     (click)="getNextPage(node)">
                 <span class="fa fa-plus"
                       aria-hidden="true"></span>
@@ -15,24 +14,33 @@
                 {{ 'communityList.showMore' | translate }}
             </h5>
         </div>
+        <div class="text-muted" cdkTreeNodePadding>
+            <div class="d-flex" *ngIf="node.payload.shortDescription">
+                <button type="button" class="btn btn-default invisible">
+                </button>
+                <span>{{node.payload.shortDescription}}</span>
+            </div>
+        </div>
     </cdk-tree-node>
     <!-- This is the tree node template for leaf nodes -->
     <cdk-tree-node *cdkTreeNodeDef="let node; when: !(hasChild && isShowMore)" cdkTreeNodePadding
-                    class="example-tree-node">
+                   class="example-tree-node">
         <div class="btn-group">
-            <button type="button" class="btn btn-default" cdkTreeNodeToggle >
+            <button type="button" class="btn btn-default" cdkTreeNodeToggle>
                 <span class="fa fa-minus"
                       aria-hidden="true"></span>
             </button>
             <h6 class="align-middle pt-2">
                 <a [routerLink]="node.route" class="lead">
-                    {{node.name}} {{node.id}}
+                    {{node.name}}
                 </a>
             </h6>
         </div>
         <div class="text-muted" cdkTreeNodePadding>
-            <div class="d-flex" *ngIf="node.payload.shortDescription" >
+            <div class="d-flex" *ngIf="node.payload.shortDescription">
                 <button type="button" class="btn btn-default invisible">
+                <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
+                      aria-hidden="true"></span>
                 </button>
                 <span>{{node.payload.shortDescription}}</span>
             </div>
@@ -46,18 +54,18 @@
                     [attr.aria-label]="'toggle ' + node.name"
                     (click)="toggleExpanded(node)"
                     [ngClass]="node.isExpandable ? 'visible' : 'invisible'">
-                <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
+                <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}" aria-hidden="true"></span>
-                      aria-hidden="true"></span>
             </button>
             <h5 class="align-middle pt-2">
                 <a [routerLink]="node.route" class="lead">
-                    {{node.name}} {{node.id}}
+                    {{node.name}}
                 </a>
             </h5>
         </div>
         <div class="text-muted" cdkTreeNodePadding>
-            <div class="d-flex" *ngIf="node.payload.shortDescription" >
+            <div class="d-flex" *ngIf="node.payload.shortDescription">
                 <button type="button" class="btn btn-default invisible">
+                <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}" aria-hidden="true"></span>
                 </button>
                 <span>{{node.payload.shortDescription}}</span>
             </div>

src/app/community-list-page/community-list/community-list.component.ts

@@ -4,7 +4,7 @@ import {CommunityListDatasource} from '../community-list-datasource';
 import {FlatTreeControl} from '@angular/cdk/tree';
 import {Collection} from '../../core/shared/collection.model';
 import {Community} from '../../core/shared/community.model';
-import {isEmpty} from "../../shared/empty.util";
+import {isEmpty} from '../../shared/empty.util';
 
 @Component({
     selector: 'ds-community-list',
@@ -14,7 +14,6 @@ import {isEmpty} from "../../shared/empty.util";
 export class CommunityListComponent implements OnInit {
 
     private expandedNodes: FlatNode[] = [];
-    private Arr = Array;
 
     treeControl = new FlatTreeControl<FlatNode>(
         (node) => node.level, (node) => node.isExpandable

src/app/core/data/community-data.service.ts

@@ -59,7 +59,6 @@ export class CommunityDataService extends ComColDataService<Community> {
 
   findSubCommunitiesPerParentCommunity(parentCommunityUUID: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Community>>> {
     const hrefObs = this.getFindAllHref(options, this.subcommunitiesLinkPath + '?parent=' + parentCommunityUUID);
-    console.log('subcomurl', hrefObs.pipe(take(1)).subscribe((val) => console.log('subcomurl', val)));
 
     hrefObs.pipe(
         filter((href: string) => hasValue(href)),