From d0744cce23fbee66955cf094c50cce1edf5b130a Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Sun, 11 Aug 2024 19:42:23 +0300
Subject: [PATCH] Fixed actions column width for import list exclusions

---
 frontend/src/Components/Table/Table.js                     | 5 ++++-
 .../ImportListExclusions/ImportListExclusion.css.d.ts      | 7 -------
 .../ImportListExclusions/ImportListExclusions.css          | 6 ++++++
 .../ImportListExclusions/ImportListExclusions.css.d.ts     | 3 +--
 .../ImportListExclusions/ImportListExclusions.tsx          | 6 +++++-
 5 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 100644 frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css.d.ts
 create mode 100644 frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css

diff --git a/frontend/src/Components/Table/Table.js b/frontend/src/Components/Table/Table.js
index 8afbf9ea0..4c970e469 100644
--- a/frontend/src/Components/Table/Table.js
+++ b/frontend/src/Components/Table/Table.js
@@ -66,7 +66,9 @@ function Table(props) {
             columns.map((column) => {
               const {
                 name,
-                isVisible
+                isVisible,
+                isSortable,
+                ...otherColumnProps
               } = column;
 
               if (!isVisible) {
@@ -84,6 +86,7 @@ function Table(props) {
                     name={name}
                     isSortable={false}
                     {...otherProps}
+                    {...otherColumnProps}
                   >
                     <TableOptionsModalWrapper
                       columns={columns}
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css.d.ts b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css.d.ts
deleted file mode 100644
index d8ea83dc1..000000000
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'actions': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css
new file mode 100644
index 000000000..e213a1c11
--- /dev/null
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css
@@ -0,0 +1,6 @@
+.actions {
+  composes: headerCell from '~Components/Table/TableHeaderCell.css';
+
+  width: 35px;
+  white-space: nowrap;
+}
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css.d.ts b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css.d.ts
index 626717e71..d8ea83dc1 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css.d.ts
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css.d.ts
@@ -1,8 +1,7 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
-  'addButton': string;
-  'addImportListExclusion': string;
+  'actions': string;
 }
 export const cssExports: CssExports;
 export default cssExports;
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx
index 414d03807..a93ecda3c 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx
@@ -8,6 +8,7 @@ import SpinnerButton from 'Components/Link/SpinnerButton';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageSectionContent from 'Components/Page/PageSectionContent';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import Column from 'Components/Table/Column';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TablePager from 'Components/Table/TablePager';
@@ -37,8 +38,9 @@ import translate from 'Utilities/String/translate';
 import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import EditImportListExclusionModal from './EditImportListExclusionModal';
 import ImportListExclusionRow from './ImportListExclusionRow';
+import styles from './ImportListExclusions.css';
 
-const COLUMNS = [
+const COLUMNS: Column[] = [
   {
     name: 'title',
     label: () => translate('Title'),
@@ -52,7 +54,9 @@ const COLUMNS = [
     isSortable: true,
   },
   {
+    className: styles.actions,
     name: 'actions',
+    label: '',
     isVisible: true,
     isSortable: false,
   },