diff --git a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js index 1477239f..d08bf4c4 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js +++ b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js @@ -121,62 +121,62 @@ let AccordionListItemTableEditions = React.createClass({ }); const columnList = [ - new ColumnModel( - (item) => { + new ColumnModel({ + transformFn: (item) => { return { 'editionId': item.id, 'pieceId': parentId, 'selectItem': this.selectItem, 'selected': item.selected - }; }, - '', + }; + }, + displayName: ( , - TableItemCheckbox, - 1, - false - ), - new ColumnModel( - (item) => { + numOfAllEditions={allEditionsCount}/> + ), + displayType: TableItemCheckbox, + rowWidth: 1 + }), + new ColumnModel({ + transition, + transformFn: (item) => { return { 'content': item.edition_number + ' ' + getLangText('of') + ' ' + item.num_editions - }; }, - 'edition_number', - getLangText('Edition'), - TableItemText, - 1, - false, - transition - ), - new ColumnModel( - (item) => { + }; + }, + columnName: 'edition_number', + displayName: getLangText('Edition'), + displayType: TableItemText, + rowWidth: 1 + }), + new ColumnModel({ + transition, + transformFn: (item) => { return { 'content': item.bitcoin_id - }; }, - 'bitcoin_id', - getLangText('ID'), - TableItemText, - 5, - false, - transition, - 'hidden-xs visible-sm visible-md visible-lg' - ), - new ColumnModel( - (item) => { - let content = item.acl; + }; + }, + columnName: 'bitcoin_id', + displayName: getLangText('ID'), + displayType: TableItemText, + rowWidth: 5, + className: 'hidden-xs visible-sm visible-md visible-lg' + }), + new ColumnModel({ + transition, + transformFn: (item) => { return { - 'content': content, + 'content': item.acl, 'notifications': item.notifications - }; }, - 'acl', - getLangText('Actions'), - TableItemAclFiltered, - 4, - false, - transition - ) + }; + }, + columnName: 'acl', + displayName: getLangText('Actions'), + displayType: TableItemAclFiltered, + rowWidth: 4, + }) ]; if (show && editionsForPiece && editionsForPiece.length) { diff --git a/js/components/ascribe_table/models/table_models.js b/js/components/ascribe_table/models/table_models.js index 9083b911..d01f0d34 100644 --- a/js/components/ascribe_table/models/table_models.js +++ b/js/components/ascribe_table/models/table_models.js @@ -2,7 +2,7 @@ export class ColumnModel { // ToDo: Add validation for all passed-in parameters - constructor(transformFn, columnName, displayName, displayType, rowWidth, canBeOrdered, transition, className) { + constructor({ transformFn, columnName = '', displayName, displayType, rowWidth, canBeOrdered, transition, className = '' }) { this.transformFn = transformFn; this.columnName = columnName; this.displayName = displayName; @@ -10,7 +10,7 @@ export class ColumnModel { this.rowWidth = rowWidth; this.canBeOrdered = canBeOrdered; this.transition = transition; - this.className = className ? className : ''; + this.className = className; } }