Merge pull request #13076 from ryanml/non-sortable-tables-prop

Disables Action column header in ledger payments table
brave · Feb 9, 2018 · 7c7464c · 7c7464c
2 parents 1058a36 + 43eefe8
commit 7c7464c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/renderer/components/common/sortableTable.js b/app/renderer/components/common/sortableTable.js
@@ -479,7 +479,8 @@ class SortableTable extends React.Component {
               [css(styles.table__th, this.props.smallRow && styles.table__th_smallRow)]: true
             }
             const isString = typeof heading === 'string'
-            const sortMethod = this.sortingDisabled ? 'none' : (dataType === 'number' ? 'number' : undefined)
+            const nonSortableColumns = this.props.nonSortableColumns ? this.props.nonSortableColumns : []
+            const sortMethod = (this.sortingDisabled || nonSortableColumns.includes(heading)) ? 'none' : (dataType === 'number' ? 'number' : undefined)
             if (isString) headerClasses['heading-' + heading] = true
 
             return <th className={cx(headerClasses)}

diff --git a/app/renderer/components/preferences/payment/ledgerTable.js b/app/renderer/components/preferences/payment/ledgerTable.js
@@ -297,6 +297,7 @@ class LedgerTable extends ImmutableComponent {
         fillAvailable
         smallRow
         headings={['', 'publisher', 'include', 'views', 'timeSpent', 'percentage', 'actions']}
+        nonSortableColumns={['actions']}
         defaultHeading='percentage'
         defaultHeadingSortOrder='desc'
         headerStyles={styles.header}