fix(my-projects-table): fixed comments

Author: nsemets

src/app/features/my-projects/my-projects.component.html

@@ -63,7 +63,6 @@
               [sortColumn]="sortColumn()"
               [sortOrder]="sortOrder()"
               [isLoading]="isLoading()"
-              [showDownloadColumn]="true"
               [downloadCellTemplate]="projectDownloadCell"
               [emptyMessageKey]="projectsEmptyMessageKey()"
               (pageChange)="onPageChange($event)"

src/app/shared/components/my-projects-table/my-projects-table.component.html

@@ -31,8 +31,8 @@
         <p-sortIcon field="dateModified" />
       </th>
 
-      @if (showDownloadColumn()) {
-        <th aria-hidden="true"></th>
+      @if (downloadCellTemplate()) {
+        <th [attr.aria-label]="'common.buttons.download' | translate"></th>
       }
     </tr>
   </ng-template>
@@ -53,9 +53,9 @@
 
         <td>{{ item.dateModified | date: 'MMM d, y, h:mm a' }}</td>
 
-        @if (showDownloadColumn()) {
+        @if (downloadCellTemplate(); as downloadTemplate) {
           <td class="text-center">
-            <ng-container *ngTemplateOutlet="downloadCellTemplate(); context: { $implicit: item }" />
+            <ng-container *ngTemplateOutlet="downloadTemplate; context: { $implicit: item }" />
           </td>
         }
       </tr>

src/app/shared/components/my-projects-table/my-projects-table.component.spec.ts

@@ -3,6 +3,7 @@ import { MockComponents } from 'ng-mocks';
 import { SortEvent } from 'primeng/api';
 import { TablePageEvent } from 'primeng/table';
 
+import { TemplateRef } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { SortOrder } from '@osf/shared/enums/sort-order.enum';
@@ -87,17 +88,14 @@ describe('MyProjectsTableComponent', () => {
     expect(component.sortOrder()).toBe(SortOrder.Desc);
   });
 
-  it('should default isLoading and showDownloadColumn to false', () => {
+  it('should default isLoading to false', () => {
     expect(component.isLoading()).toBe(false);
-    expect(component.showDownloadColumn()).toBe(false);
   });
 
-  it('should accept isLoading and showDownloadColumn inputs', () => {
+  it('should accept isLoading input', () => {
     fixture.componentRef.setInput('isLoading', true);
-    fixture.componentRef.setInput('showDownloadColumn', true);
 
     expect(component.isLoading()).toBe(true);
-    expect(component.showDownloadColumn()).toBe(true);
   });
 
   it('should default emptyMessageKey to common.search.noResultsFound', () => {
@@ -118,8 +116,8 @@ describe('MyProjectsTableComponent', () => {
     expect(component.columnCount()).toBe(3);
   });
 
-  it('should return columnCount of 4 when download column is shown', () => {
-    fixture.componentRef.setInput('showDownloadColumn', true);
+  it('should return columnCount of 4 when downloadCellTemplate is provided', () => {
+    fixture.componentRef.setInput('downloadCellTemplate', {} as TemplateRef<{ $implicit: MyResourcesItem }>);
 
     expect(component.columnCount()).toBe(4);
   });

src/app/shared/components/my-projects-table/my-projects-table.component.ts

@@ -30,12 +30,13 @@ import { IconComponent } from '../icon/icon.component';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MyProjectsTableComponent {
+  private readonly BASE_COLUMN_COUNT = 3;
+
   readonly items = input<MyResourcesItem[]>([]);
   readonly tableParams = input.required<TableParameters>();
   readonly sortColumn = input<string | undefined>(undefined);
   readonly sortOrder = input<SortOrder>(SortOrder.Asc);
   readonly isLoading = input<boolean>(false);
-  readonly showDownloadColumn = input<boolean>(false);
   readonly emptyMessageKey = input<string>('common.search.noResultsFound');
   readonly downloadCellTemplate = input<TemplateRef<{ $implicit: MyResourcesItem }>>();
 
@@ -45,7 +46,7 @@ export class MyProjectsTableComponent {
 
   readonly skeletonData = Array.from({ length: 10 }, () => ({}) as MyResourcesItem);
 
-  readonly columnCount = computed(() => (this.showDownloadColumn() ? 4 : 3));
+  readonly columnCount = computed(() => this.BASE_COLUMN_COUNT + Number(!!this.downloadCellTemplate()));
 
   onPageChange(event: TablePageEvent): void {
     this.pageChange.emit(event);