added PR review fix

Alfresco · Apr 9, 2021 · f97cd5b · f97cd5b
1 parent 41cd969
commit f97cd5b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.html b/lib/content-services/src/lib/aspect-list/aspect-list.component.html
@@ -1,18 +1,18 @@
 <div id="aspect-list-container" class="adf-aspect-list-container" *ngIf="aspects$ | async as aspects; else loading">
     <mat-accordion class="adf-accordion-aspect-list">
-        <mat-expansion-panel *ngFor="let aspect of aspects; let colIndex = index" [id]="'aspect-list-'+(aspect?.entry?.title ? aspect?.entry?.title : aspect?.entry?.id.replace(':', '-'))">
-            <mat-expansion-panel-header [id]="'aspect-list-'+(aspect?.entry?.title ? aspect?.entry?.title : aspect?.entry?.id.replace(':', '-'))+'header'">
+        <mat-expansion-panel *ngFor="let aspect of aspects; let colIndex = index" [id]="'aspect-list-'+getId(aspect)">
+            <mat-expansion-panel-header [id]="'aspect-list-'+(getId(aspect))+'header'">
                 <mat-panel-title>
                     <mat-checkbox class="adf-aspect-list-check-button" [id]="'aspect-list-'+colIndex+'-check'"
                                   [checked]="nodeAspects?.includes(aspect?.entry?.id)"
                                   (click)="onCheckBoxClick($event)"
                                   (change)="onChange($event, aspect?.entry?.id)">
                     </mat-checkbox>
-                    <p class="adf-aspect-list-element-title">{{aspect?.entry?.title ? aspect?.entry?.title : aspect?.entry?.id}}</p>
+                    <p class="adf-aspect-list-element-title">{{getTitle(aspect)}}</p>
                 </mat-panel-title>
                 <mat-panel-description [id]="'aspect-list-'+colIndex+'-title'"
-                                        [matTooltip]="(aspect?.entry?.title ? aspect?.entry?.title : aspect?.entry?.id)">
-                    {{aspect?.entry?.title ? aspect?.entry?.title : aspect?.entry?.id}}
+                                        [matTooltip]="getTitle(aspect)">
+                    {{getTitle(aspect)}}
                 </mat-panel-description>
             </mat-expansion-panel-header>
             <p class="adf-property-paragraph" [id]="'aspect-list-'+colIndex+'-description'"> {{aspect?.entry?.description}}</p>

diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.spec.ts b/lib/content-services/src/lib/aspect-list/aspect-list.component.spec.ts
@@ -68,7 +68,7 @@ const aspectListMock: AspectEntry[] = [{
 
 const customAspectListMock: AspectEntry[] = [{
     entry: {
-        parentId: 'cst:customAspect',
+        parentId: 'cst:parentAspect',
         id: 'cst:customAspect',
         description: 'Custom Aspect with random description',
         title: 'CustomAspect',
@@ -88,7 +88,7 @@ const customAspectListMock: AspectEntry[] = [{
 },
 {
     entry: {
-        parentId: 'cst:nonamedAspect',
+        parentId: 'cst:commonaspect',
         id: 'cst:nonamedAspect',
         description: '',
         title: '',

diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.ts b/lib/content-services/src/lib/aspect-list/aspect-list.component.ts
@@ -101,4 +101,12 @@ export class AspectListComponent implements OnInit, OnDestroy {
         this.nodeAspects = [];
         this.valueChanged.emit(this.nodeAspects);
     }
+
+    getId(aspect: any): string {
+        return aspect?.entry?.title ? aspect?.entry?.title : aspect?.entry?.id.replace(':', '-');
+    }
+
+    getTitle(aspect: any): string {
+        return aspect?.entry?.title ? aspect?.entry?.title : aspect?.entry?.id;
+    }
 }