webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js in katello-3.7.0.rc1 vs webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js in katello-3.7.0.rc2
- old
+ new
@@ -1,30 +1,33 @@
import React from 'react';
import { FormGroup, FormControl, ControlLabel } from 'react-bootstrap';
-import helpers, { selectionHeaderCellFormatter, selectionCellFormatter } from '../../../move_to_foreman/common/helpers';
+import helpers from '../../../move_to_foreman/common/helpers';
import {
- headerFormat,
- cellFormat,
+ headerFormatter,
+ cellFormatter,
+ selectionHeaderCellFormatter,
+ selectionCellFormatter,
} from '../../../move_to_foreman/components/common/table';
export const columns = (controller, selectionController) => [
{
property: 'select',
header: {
label: __('Select all rows'),
formatters: [label => selectionHeaderCellFormatter(selectionController, label)],
},
cell: {
- formatters: [(value, additionalData) =>
- selectionCellFormatter(selectionController, value, additionalData)],
+ formatters: [
+ (value, additionalData) => selectionCellFormatter(selectionController, additionalData),
+ ],
},
},
{
property: 'id',
header: {
label: __('Subscription Name'),
- formatters: [headerFormat],
+ formatters: [headerFormatter],
},
cell: {
formatters: [
(value, { rowData }) => (
<td>
@@ -38,42 +41,42 @@
},
{
property: 'contract_number',
header: {
label: __('Contract'),
- formatters: [headerFormat],
+ formatters: [headerFormatter],
},
cell: {
- formatters: [cellFormat],
+ formatters: [cellFormatter],
},
},
// TODO: use date formatter from tomas' PR
{
property: 'start_date',
header: {
label: __('Start Date'),
- formatters: [headerFormat],
+ formatters: [headerFormatter],
},
cell: {
- formatters: [cellFormat],
+ formatters: [cellFormatter],
},
},
{
property: 'end_date',
header: {
label: __('End Date'),
- formatters: [headerFormat],
+ formatters: [headerFormatter],
},
cell: {
- formatters: [cellFormat],
+ formatters: [cellFormatter],
},
},
{
property: 'quantity',
header: {
label: __('Available Entitlements'),
- formatters: [headerFormat],
+ formatters: [headerFormatter],
},
cell: {
formatters: [
value => (
<td>
@@ -85,10 +88,10 @@
},
{
property: 'consumed',
header: {
label: __('Quantity to Allocate'),
- formatters: [headerFormat],
+ formatters: [headerFormatter],
},
cell: {
formatters: [
(value, { rowData }) => (
<td>