From 416203fcc3deed2437b21aa6f8cd7860cddcd5a1 Mon Sep 17 00:00:00 2001
From: swarnadipa-dev <swarnadipa.choudhury@globallogic.com>
Date: Tue, 17 Dec 2024 13:27:31 +0530
Subject: [PATCH 1/3] ELEMENTS-1776: Backward port: fix column sort arrow and
 sequence number overlap

---
 ui/nuxeo-data-table/data-table-cell.js        |  3 ++-
 ui/nuxeo-data-table/data-table-column-sort.js |  2 +-
 ui/nuxeo-data-table/data-table-column.js      | 10 +++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ui/nuxeo-data-table/data-table-cell.js b/ui/nuxeo-data-table/data-table-cell.js
index b3e93fee6..8c61f3448 100644
--- a/ui/nuxeo-data-table/data-table-cell.js
+++ b/ui/nuxeo-data-table/data-table-cell.js
@@ -12,7 +12,8 @@ import './data-table-templatizer-behavior.js';
       return html`
         <style>
           :host {
-            flex: 1 0 100px;
+            flex: 1 0 120px;
+            flex-basis: 120px;
             padding: 0 24px;
             min-height: 48px;
             display: flex;
diff --git a/ui/nuxeo-data-table/data-table-column-sort.js b/ui/nuxeo-data-table/data-table-column-sort.js
index d90dc1fdc..0ffc1996b 100644
--- a/ui/nuxeo-data-table/data-table-column-sort.js
+++ b/ui/nuxeo-data-table/data-table-column-sort.js
@@ -51,7 +51,7 @@ import { I18nBehavior } from '../nuxeo-i18n-behavior.js';
           }
         </style>
 
-        <div style="position: relative">
+        <div style="position: relative; width: 40px;">
           <paper-icon-button
             id="sortIcon"
             on-click="_sort"
diff --git a/ui/nuxeo-data-table/data-table-column.js b/ui/nuxeo-data-table/data-table-column.js
index 2286e3813..345bcdd30 100644
--- a/ui/nuxeo-data-table/data-table-column.js
+++ b/ui/nuxeo-data-table/data-table-column.js
@@ -16,7 +16,15 @@ import './data-table-column-filter.js';
             role="columnheader"
           >
           </nuxeo-data-table-column-filter>
-          <div hidden$="[[column.filterBy]]" role="columnheader">[[column.name]]</div>
+          <div
+            title="[[column.name]]"
+            hidden$="[[column.filterBy]]"
+            role="columnheader"
+            style="flex: 1 1 70px; min-width: 70px;
+          max-width: 120px; overflow: hidden; text-overflow: ellipsis; text-align: start;"
+          >
+            [[column.name]]
+          </div>
         </template>
       `;
     }

From efb9cb41c4d135a567ccc8d33a06589539dee98b Mon Sep 17 00:00:00 2001
From: swarnadipa-dev <swarnadipa.choudhury@globallogic.com>
Date: Tue, 17 Dec 2024 15:58:46 +0530
Subject: [PATCH 2/3] moved inline styles to internal styles

---
 ui/nuxeo-data-table/data-table-cell.js        | 9 +++++++++
 ui/nuxeo-data-table/data-table-column-sort.js | 7 ++++++-
 ui/nuxeo-data-table/data-table-column.js      | 8 +-------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ui/nuxeo-data-table/data-table-cell.js b/ui/nuxeo-data-table/data-table-cell.js
index 8c61f3448..05cbf1d4e 100644
--- a/ui/nuxeo-data-table/data-table-cell.js
+++ b/ui/nuxeo-data-table/data-table-cell.js
@@ -35,6 +35,15 @@ import './data-table-templatizer-behavior.js';
           :host([header]) ::slotted(*) {
             min-width: 0;
           }
+
+          :host([header]) ::slotted(#columnHeader) {
+            flex: 1 1 70px;
+            min-width: 70px;
+            max-width: 120px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            text-align: start;
+          }
         </style>
         <slot></slot>
       `;
diff --git a/ui/nuxeo-data-table/data-table-column-sort.js b/ui/nuxeo-data-table/data-table-column-sort.js
index 0ffc1996b..84139c4b1 100644
--- a/ui/nuxeo-data-table/data-table-column-sort.js
+++ b/ui/nuxeo-data-table/data-table-column-sort.js
@@ -49,9 +49,14 @@ import { I18nBehavior } from '../nuxeo-i18n-behavior.js';
             right: 4px;
             bottom: 8px;
           }
+
+          #sortContainer {
+            position: relative; 
+            width: 40px;
+          }
         </style>
 
-        <div style="position: relative; width: 40px;">
+        <div id="sortContainer">
           <paper-icon-button
             id="sortIcon"
             on-click="_sort"
diff --git a/ui/nuxeo-data-table/data-table-column.js b/ui/nuxeo-data-table/data-table-column.js
index 345bcdd30..f927c091e 100644
--- a/ui/nuxeo-data-table/data-table-column.js
+++ b/ui/nuxeo-data-table/data-table-column.js
@@ -16,13 +16,7 @@ import './data-table-column-filter.js';
             role="columnheader"
           >
           </nuxeo-data-table-column-filter>
-          <div
-            title="[[column.name]]"
-            hidden$="[[column.filterBy]]"
-            role="columnheader"
-            style="flex: 1 1 70px; min-width: 70px;
-          max-width: 120px; overflow: hidden; text-overflow: ellipsis; text-align: start;"
-          >
+          <div id="columnHeader" title="[[column.name]]" hidden$="[[column.filterBy]]" role="columnheader">
             [[column.name]]
           </div>
         </template>

From 1fbada1a62ea889137860180a895a9c711dc920c Mon Sep 17 00:00:00 2001
From: swarnadipa-dev <swarnadipa.choudhury@globallogic.com>
Date: Tue, 17 Dec 2024 16:05:55 +0530
Subject: [PATCH 3/3] moved inline styles to internal styles

---
 ui/nuxeo-data-table/data-table-column-sort.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/nuxeo-data-table/data-table-column-sort.js b/ui/nuxeo-data-table/data-table-column-sort.js
index 84139c4b1..34a2a5eb5 100644
--- a/ui/nuxeo-data-table/data-table-column-sort.js
+++ b/ui/nuxeo-data-table/data-table-column-sort.js
@@ -51,7 +51,7 @@ import { I18nBehavior } from '../nuxeo-i18n-behavior.js';
           }
 
           #sortContainer {
-            position: relative; 
+            position: relative;
             width: 40px;
           }
         </style>