Merge pull request #200 from helsenorge/rubenr/bugfix-table-hn2-sorting

helsenorge · Jul 1, 2024 · d931fd8 · d931fd8
2 parents cf27c9a + d579158
commit d931fd8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,10 @@
+## 15.0.8
+
+---
+
+- Bugfix:
+  - fix a bug in the table-hn2. Not being able to sort on the first column in the table
+
 ## 15.0.7
 
 ---

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helsenorge/refero",
-  "version": "15.0.7",
+  "version": "15.0.8",
   "engines": {
     "node": "^18.0.0",
     "npm": ">=9.0.0"

diff --git a/src/components/formcomponents/table/tables/table-hn2/TableHn2.tsx b/src/components/formcomponents/table/tables/table-hn2/TableHn2.tsx
@@ -26,7 +26,7 @@ const TableHn2 = ({ tableCodesCoding, items, questionnaireResponse }: Props): JS
   }, [sortDir, items, questionnaireResponse]);
   return rows.length ? (
     <HnTable className="page_refero__table_hn2">
-      <TableHeadHn2 sortable={!!sortIndex} setSortDir={setSortDir} sortDir={sortDir} tableCodesCoding={tableCodesCoding} />
+      <TableHeadHn2 sortable={sortIndex !== undefined} setSortDir={setSortDir} sortDir={sortDir} tableCodesCoding={tableCodesCoding} />
       <TableBody className='className="page_refero__table_hn2__body'>
         {rows.map((item, index) => {
           return (

diff --git a/src/components/formcomponents/table/tables/table-hn2/utils.ts b/src/components/formcomponents/table/tables/table-hn2/utils.ts
@@ -87,7 +87,7 @@ export const getTableHN2bodyObject = (
   const structure = createTableStructure(items, itemsToShow);
   const tableWithRemovedEmptyRows = structure.filter(row => row.columns.some(column => column.text !== ''));
 
-  if (!!sortColumnIndex && !!sortOrder) {
+  if (sortColumnIndex !== undefined && !!sortOrder) {
     return sortTableRows(tableWithRemovedEmptyRows, sortColumnIndex, sortOrder);
   }
   return tableWithRemovedEmptyRows;