fix: checkbox checked when all selectable items selected (#598)

Co-authored-by: SchettlerKoehler <[email protected]>
onecx · Nov 13, 2024 · cef84ce · cef84ce
1 parent ec220dc
commit cef84ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/libs/angular-accelerator/src/lib/components/data-table/data-table.component.html b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.html
@@ -122,6 +122,7 @@
     scrollHeight="flex"
     [style]="tableStyle"
     paginatorDropdownAppendTo="body"
+    [rowSelectable]="rowSelectable"
     tableStyleClass="h-full"
   >
     <ng-template pTemplate="header">
@@ -233,7 +234,7 @@
       <tr>
         <td *ngIf="selectionChangedObserved">
           <p-checkbox
-            *ngIf="(!!selectionEnabledField && !fieldIsTruthy(rowObject, selectionEnabledField)) && isSelected(rowObject); else defaultCheckbox"
+            *ngIf="isRowSelectionDisabled(rowObject) && isSelected(rowObject); else defaultCheckbox"
             [(ngModel)]="checked"
             [binary]="true"
             [disabled]="true"
@@ -242,7 +243,7 @@
           <ng-template #defaultCheckbox>
             <p-tableCheckbox
               [value]="rowObject"
-              [disabled]="!!selectionEnabledField && !fieldIsTruthy(rowObject, selectionEnabledField)"
+              [disabled]="isRowSelectionDisabled(rowObject)"
               [ariaLabel]="'OCX_DATA_TABLE.SELECT_ARIA_LABEL' | translate: { key: rowObject.id}"
             ></p-tableCheckbox>
           </ng-template>

diff --git a/libs/angular-accelerator/src/lib/components/data-table/data-table.component.ts b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.ts
@@ -422,6 +422,7 @@ export class DataTableComponent extends DataSortBase implements OnInit, AfterCon
         )
       )
     )
+    this.rowSelectable = this.rowSelectable.bind(this)
   }
 
   ngOnInit(): void {
@@ -670,6 +671,14 @@ export class DataTableComponent extends DataSortBase implements OnInit, AfterCon
     )
   }
 
+  isRowSelectionDisabled(rowObject: Row) {
+    return !!this.selectionEnabledField && !this.fieldIsTruthy(rowObject, this.selectionEnabledField)
+  }
+
+  rowSelectable(event: any) {
+    return !this.isRowSelectionDisabled(event.data)
+  }
+
   onSelectionChange(selection: Row[]) {
     let newSelectionIds = selection.map((row) => row.id)
     const rows = this._rows$.getValue()