[ACS-6565] ADW - Document List View Header - UX Bugs (Additional fixe…

…s) (#9404)
Alfresco · Mar 8, 2024 · 7ed1375 · 7ed1375
1 parent 5d545b5
commit 7ed1375
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 66 deletions.
diff --git a/...ent-services/src/lib/search/components/search-check-list/search-check-list.component.html b/...ent-services/src/lib/search/components/search-check-list/search-check-list.component.html
@@ -9,7 +9,7 @@
         (change)="changeHandler($event, option)"
         class="adf-facet-filter">
         <div matTooltip="{{ option.name | translate }}"
-            matTooltipPosition="right"
+            matTooltipPosition="before"
             class="adf-search-check-list-label">
             {{ option.name | translate }}
         </div>

diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.html b/lib/core/src/lib/datatable/components/datatable/datatable.component.html
@@ -27,25 +27,26 @@
                 <mat-checkbox [indeterminate]="isSelectAllIndeterminate" [checked]="isSelectAllChecked" (change)="onSelectAllClick($event)" class="adf-checkbox-sr-only">{{ 'ADF-DATATABLE.ACCESSIBILITY.SELECT_ALL' | translate }}</mat-checkbox>
             </div>
 
-            <div class="adf-datatable-cell--{{col.type || 'text'}} {{col.cssClass}} adf-datatable-cell-header"
+            <div
+                class="adf-datatable-cell--{{col.type || 'text'}} {{col.cssClass}} adf-datatable-cell-header adf-datatable-cell-data"
                  *ngFor="
                     let col of (data.getColumns() | filterOutEvery:'isHidden':true);
-                    let columnIndex = index"
+                    let columnIndex = index
+                    let lastColumn = last"
                  [attr.data-automation-id]="'auto_id_' + col.key"
                  [ngClass]="{
                     'adf-sortable': col.sortable,
                     'adf-datatable__cursor--pointer': !isResizing,
                     'adf-datatable__header--sorted-asc': isColumnSorted(col, 'asc'),
                     'adf-datatable__header--sorted-desc': isColumnSorted(col, 'desc')}"
-                 [ngStyle]="(col.width) && {'flex': getFlexValue(col)}"
+                 [ngStyle]="(col.width) && !lastColumn && {'flex-basis': getFlexBasisValue(col)}"
                  [attr.aria-label]="col.title | translate"
                  (click)="onColumnHeaderClick(col, $event)"
                  (keyup.enter)="onColumnHeaderClick(col, $event)"
                  role="columnheader"
                  [attr.tabindex]="isHeaderVisible() ? 0 : null"
                  [attr.aria-sort]="col.sortable ? (getAriaSort(col) | translate) : null"
                  cdkDrag
-                 cdkDragBoundary="adf-datatable-row"
                  cdkDragLockAxis="x"
                  (cdkDragStarted)="isDraggingHeaderColumn = true"
                  (cdkDragDropped)="onDropHeaderColumn($event)"
@@ -90,32 +91,26 @@
                     <ng-template *ngIf="allowFiltering" [ngTemplateOutlet]="headerFilterTemplate" [ngTemplateOutletContext]="{$implicit: col}"></ng-template>
 
                     <span
-                        *ngIf="hoveredHeaderColumnIndex === columnIndex && col.draggable && !isResizing"
-                        class="adf-datatable-cell-header-drag-icon-placeholder"
-                        [attr.data-automation-id]="'adf-datatable-cell-header-drag-icon-placeholder-'+col.key"
-                    ></span>
+                        *ngIf="col.draggable"
+                        cdkDragHandle
+                        [ngClass]="{ 'adf-datatable-cell-header-drag-icon': !isResizing }"
+                    >
+                        <adf-icon
+                            *ngIf="hoveredHeaderColumnIndex === columnIndex && !isResizing"
+                            value="adf:drag_indicator"
+                            [attr.data-automation-id]="'adf-datatable-cell-header-drag-icon-'+col.key">
+                        </adf-icon>
+                    </span>
                 </div>
                 <div
-                    *ngIf="isResizingEnabled && col.resizable"
+                    *ngIf="isResizingEnabled && col.resizable && !lastColumn"
                     [ngClass]="hoveredHeaderColumnIndex === columnIndex && !isResizing || resizingColumnIndex === columnIndex ? 'adf-datatable__resize-handle-visible' : 'adf-datatable__resize-handle-hidden'"
                     adf-resize-handle
                     (click)="$event.stopPropagation()"
                     class="adf-datatable__resize-handle"
                     [resizableContainer]="resizableElement">
                     <div class="adf-datatable__resize-handle--divider"></div>
                 </div>
-                <div
-                    *ngIf="col.draggable"
-                    cdkDragHandle
-                    [ngClass]="{ 'adf-datatable-cell-header-drag-icon': !isResizing }"
-                >
-                    <adf-icon
-                        *ngIf="hoveredHeaderColumnIndex === columnIndex && !isResizing"
-                        value="adf:drag_indicator"
-                        [attr.data-automation-id]="'adf-datatable-cell-header-drag-icon-'+col.key">
-                    </adf-icon>
-                </div>
-
                 <div class="adf-drop-header-cell-placeholder" *cdkDragPlaceholder></div>
             </div>
 
@@ -207,9 +202,11 @@
                         {{ 'ADF-DATATABLE.ACCESSIBILITY.SELECT_FILE' | translate }}
                     </mat-checkbox>
                 </label>
-                <div *ngFor="let col of (data.getColumns() | filterOutEvery:'isHidden':true);"
+                <div *ngFor="
+                let col of (data.getColumns() | filterOutEvery:'isHidden':true),
+                let lastColumn = last;"
                      role="gridcell"
-                     class="adf-datatable-cell adf-datatable-cell--{{col.type || 'text'}} {{col.cssClass}}"
+                     class="adf-datatable-cell adf-datatable-cell--{{col.type || 'text'}} {{col.cssClass}} adf-datatable-cell-data"
                      [attr.title]="col.title | translate"
                      [attr.data-automation-id]="getAutomationValue(row)"
                      [attr.aria-selected]="row.isSelected"
@@ -219,7 +216,7 @@
                      [adf-context-menu]="getContextMenuActions(row, col)"
                      [adf-context-menu-enabled]="contextMenu"
                      adf-drop-zone dropTarget="cell" [dropColumn]="col" [dropRow]="row"
-                     [ngStyle]="(col.width) && {'flex': getFlexValue(col)}">
+                     [ngStyle]="(col.width) && !lastColumn && {'flex-basis': getFlexBasisValue(col)}">
                     <div *ngIf="!col.template" class="adf-datatable-cell-container">
                         <ng-container [ngSwitch]="data.getColumnType(row, col)">
                             <div *ngSwitchCase="'image'" class="adf-cell-value">

diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
@@ -390,6 +390,17 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
         min-width: $data-table-cell-min-width-2;
     }
 
+    .adf-datatable-header, .adf-datatable-body {
+        .adf-datatable-cell-data {
+            flex-grow: 0;
+            flex-shrink: 1;
+
+            &:not(:has(~ .adf-datatable-cell-data)) {
+                flex-grow: 1;
+            }
+        }
+    }
+
     /* stylelint-disable-next-line no-duplicate-selectors */
     .adf-datatable-cell,
     .adf-datatable-cell-header {
@@ -404,11 +415,6 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
             box-sizing: content-box;
         }
 
-        &:last-child {
-            padding-right: 15px;
-            box-sizing: content-box;
-        }
-
         .adf-datatable-cell-container {
             overflow: hidden;
             min-height: inherit;
@@ -436,6 +442,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
     .adf-datatable-actions-menu {
         margin-left: auto;
         justify-content: end;
+        padding-right: 15px;
     }
 
     .adf-cell-value {
@@ -626,7 +633,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
     .adf-datatable__header--sorted-asc,
     .adf-datatable__header--sorted-desc {
         color: var(--adf-theme-foreground-text-color);
-        padding-right: 0.5rem;
+        padding-right: 0.25rem;
 
         &::after {
             @include typo-icon;
@@ -661,10 +668,10 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
         align-items: center;
         margin: 0 2px;
         padding: 0 8px;
-        column-gap: 5px;
 
         .adf-datatable-cell-header-drag-icon-placeholder {
-            min-width: 15px;
+            padding: 0;
+            margin: 0;
         }
 
         &--hovered {
@@ -674,19 +681,15 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
     }
 
     .adf-datatable-cell-header-drag-icon {
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        right: 10px;
-        margin: auto;
-        color: #ccc;
+        margin-left: auto;
         cursor: move;
-        width: 24px;
-        height: 24px;
+        margin-right: -0.5rem;
+        padding-left: -0.5rem;
     }
 
     .adf-datatable-cell-value {
-        padding: 10px 0 !important;
+        padding-top: 10px;
+        padding-bottom: 10px;
         line-height: 24px;
         word-break: break-word;
     }

diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts
@@ -1524,21 +1524,15 @@ describe('Drag&Drop column header', () => {
         fixture.detectChanges();
 
         let dragIcon = fixture.debugElement.nativeElement.querySelector('[data-automation-id="adf-datatable-cell-header-drag-icon-name"]');
-        let dragIconPlaceholder = fixture.debugElement.nativeElement.querySelector(
-            '[data-automation-id="adf-datatable-cell-header-drag-icon-placeholder-name"]'
-        );
+
         expect(dragIcon).toBeTruthy();
-        expect(dragIconPlaceholder).toBeTruthy();
 
         headerColumn.dispatchEvent(new MouseEvent('mouseleave'));
         fixture.detectChanges();
 
         dragIcon = fixture.debugElement.nativeElement.querySelector('[data-automation-id="adf-datatable-cell-header-drag-icon-name"]');
-        dragIconPlaceholder = fixture.debugElement.nativeElement.querySelector(
-            '[data-automation-id="adf-datatable-cell-header-drag-icon-placeholder-name"]'
-        );
+
         expect(dragIcon).toBeFalsy();
-        expect(dragIconPlaceholder).toBeFalsy();
     });
 
     it('should not show drag indicator icon, when drag and drop is disabled', () => {
@@ -1549,12 +1543,8 @@ describe('Drag&Drop column header', () => {
         fixture.detectChanges();
 
         const dragIcon = fixture.debugElement.nativeElement.querySelector('[data-automation-id="adf-datatable-cell-header-drag-icon-id"]');
-        const dragIconPlaceholder = fixture.debugElement.nativeElement.querySelector(
-            '[data-automation-id="adf-datatable-cell-header-drag-icon-placeholder-id"]'
-        );
 
         expect(dragIcon).toBeFalsy();
-        expect(dragIconPlaceholder).toBeFalsy();
     });
 
     it('should emit on change column order', () => {
@@ -1748,20 +1738,20 @@ describe('Column Resizing', () => {
         });
     });
 
-    it('should display resize handle for each column by default', () => {
+    it('should display resize handle for each column, but not for the last one, by default', () => {
         dataTable.isResizingEnabled = true;
         fixture.detectChanges();
 
-        expect(getResizeHandlersCount()).toBe(2);
+        expect(getResizeHandlersCount()).toBe(1);
     });
 
-    it('should NOT display resize handle for the column when the column has resizable param set to false', () => {
+    it('should NOT display resize handle for the column when the column has resizable param set to false and column is not the last one', () => {
         dataTable.isResizingEnabled = true;
         dataTableSchema[0].resizable = false;
         dataTable.data = new ObjectDataTableAdapter([...data], [...dataTableSchema]);
         fixture.detectChanges();
 
-        expect(getResizeHandlersCount()).toBe(1);
+        expect(getResizeHandlersCount()).toBe(0);
     });
 
     it('should display resize handle when the feature is Enabled [isResizingEnabled=true]', () => {
@@ -1895,7 +1885,7 @@ describe('Column Resizing', () => {
         fixture.detectChanges();
 
         const headerColumns: HTMLElement[] = fixture.debugElement.nativeElement.querySelectorAll('.adf-datatable-cell-header');
-        expect(headerColumns[0].style.flex).toBe('0 1 125px');
+        expect(headerColumns[0].style.flexBasis).toBe('125px');
     }));
 
     it('should set the column header to 100px on resizing when its width goes below 100', fakeAsync(() => {
@@ -1904,7 +1894,7 @@ describe('Column Resizing', () => {
         fixture.detectChanges();
 
         const headerColumns: HTMLElement[] = fixture.debugElement.nativeElement.querySelectorAll('.adf-datatable-cell-header');
-        expect(headerColumns[0].style.flex).toBe('0 1 100px');
+        expect(headerColumns[0].style.flexBasis).toBe('100px');
     }));
 
     it('should set the style of all the table cells under the resizing header on resizing', fakeAsync(() => {
@@ -1916,8 +1906,8 @@ describe('Column Resizing', () => {
         const firstCell: HTMLElement = tableBody.querySelector('[data-automation-id="name1"]');
         const secondCell: HTMLElement = tableBody.querySelector('[data-automation-id="name2"]');
 
-        expect(firstCell.style.flex).toBe('0 1 130px');
-        expect(secondCell.style.flex).toBe('0 1 130px');
+        expect(firstCell.style.flexBasis).toBe('130px');
+        expect(secondCell.style.flexBasis).toBe('130px');
     }));
 
     it('should set the style of all the table cells under the resizing header to 100px on resizing when its width goes below 100', fakeAsync(() => {
@@ -1929,8 +1919,8 @@ describe('Column Resizing', () => {
         const firstCell: HTMLElement = tableBody.querySelector('[data-automation-id="name1"]');
         const secondCell: HTMLElement = tableBody.querySelector('[data-automation-id="name2"]');
 
-        expect(firstCell.style.flex).toBe('0 1 100px');
-        expect(secondCell.style.flex).toBe('0 1 100px');
+        expect(firstCell.style.flexBasis).toBe('100px');
+        expect(secondCell.style.flexBasis).toBe('100px');
     }));
 
     it('should unblur the body and set the resizing to false upon resizing ends', () => {

diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.ts
@@ -971,8 +971,8 @@ export class DataTableComponent implements OnInit, AfterContentInit, OnChanges,
         this.updateColumnsWidths();
     }
 
-    getFlexValue({ width = 0 }: DataColumn): string {
-        return `0 1 ${width < DataTableComponent.MINIMUM_COLUMN_SIZE ? DataTableComponent.MINIMUM_COLUMN_SIZE : width}px`;
+    getFlexBasisValue({ width = 0 }: DataColumn): string {
+        return `${width < DataTableComponent.MINIMUM_COLUMN_SIZE ? DataTableComponent.MINIMUM_COLUMN_SIZE : width}px`;
     }
 
     filterDisabledColumns(index: number, _drag: CdkDrag, drop: CdkDropList): boolean {