fix(lesmis): RN-1335: Fix DataFetchingTable Action Label (#5755)

* Update DataFetchingTable.jsx * Update users.jsx
beyondessential · Jul 3, 2024 · 9f2506b · 9f2506b
1 parent 6db50d8
commit 9f2506b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/packages/admin-panel/src/routes/users/users.jsx b/packages/admin-panel/src/routes/users/users.jsx
@@ -134,9 +134,7 @@ const CREATE_CONFIG = {
           optionsEndpoint: 'countries',
           optionLabelKey: 'name',
           optionValueKey: 'name',
-          labelTooltip: 'Select the country to grant this user access to',
-          type: 'checkboxList',
-          pageSize: 'ALL',
+          secondaryLabel: 'Select the country to grant this user access to',
         },
       },
       {

diff --git a/packages/admin-panel/src/table/DataFetchingTable/DataFetchingTable.jsx b/packages/admin-panel/src/table/DataFetchingTable/DataFetchingTable.jsx
@@ -113,7 +113,7 @@ const DataFetchingTableComponent = memo(
     baseFilter,
     basePath,
     resourceName,
-    actionLabel = 'Action',
+    actionLabel,
   }) => {
     const formattedColumns = useMemo(() => {
       const cols = columns.map(column => formatColumnForReactTable(column));
@@ -143,7 +143,7 @@ const DataFetchingTableComponent = memo(
       const buttonWidths = buttonColumns.reduce((acc, { width }) => acc + (width || 60), 0);
       // Group all button columns into a single column so they can be displayed together under a single header
       const singleButtonColumn = {
-        Header: actionLabel,
+        Header: actionLabel || 'Action',
         maxWidth: buttonWidths,
         width: buttonWidths,
         // eslint-disable-next-line react/prop-types