Merge pull request openshift#6322 from jcaianirh/mcp-paused

Bug 1868471: Add paused state to MachineConfigPool list view
christianaranda · Aug 22, 2020 · 9b74e90 · 9b74e90
2 parents 836c2b3 + 743600b
commit 9b74e90
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/frontend/public/components/machine-config-pool.tsx b/frontend/public/components/machine-config-pool.tsx
@@ -17,6 +17,7 @@ import {
 } from '../module/k8s';
 import { DetailsPage, ListPage, Table, TableRow, TableData, RowFunction } from './factory';
 import {
+ DetailsItem,
  Kebab,
  KebabAction,
  navFactory,
@@ -93,6 +94,9 @@ const MachineConfigPoolCharacteristics: React.SFC<MachineConfigPoolCharacteristi
  ))
  : '-'}
  </dd>
+ <DetailsItem label="Paused" obj={obj} path={'spec.paused'}>
+ {obj.spec?.paused ? 'True' : 'False'}
+ </DetailsItem>
  </>
  )}
  </dl>
@@ -214,11 +218,12 @@ export const MachineConfigPoolDetailsPage: React.SFC<any> = (props) => (
 );
 
 const tableColumnClasses = [
- classNames('col-lg-4', 'col-xs-6'),
+ classNames('col-lg-3', 'col-xs-6', 'col-sm-4'),
  classNames('col-lg-5', 'hidden-md', 'hidden-sm', 'hidden-xs'),
- classNames('col-lg-1', 'col-sm-2', 'col-xs-3'),
- classNames('col-lg-1', 'col-sm-2', 'hidden-xs'),
- classNames('col-lg-1', 'col-sm-2', 'col-xs-3'),
+ classNames('col-lg-1', 'col-sm-2', 'col-xs-3', 'pf-u-w-10-on-lg'),
+ classNames('col-lg-1', 'col-sm-2', 'hidden-xs', 'pf-u-w-10-on-lg'),
+ classNames('col-lg-1', 'hidden-sm', 'hidden-xs', 'pf-u-w-10-on-lg'),
+ classNames('col-lg-1', 'col-sm-2', 'col-xs-3', 'pf-u-w-10-on-lg'),
  Kebab.columnClass,
 ];
 
@@ -245,13 +250,17 @@ const MachineConfigPoolTableHeader = () => {
  props: { className: tableColumnClasses[3] },
  },
  {
- title: 'Degraded',
+ title: 'Paused',
  props: { className: tableColumnClasses[4] },
  },
  {
- title: '',
+ title: 'Degraded',
  props: { className: tableColumnClasses[5] },
  },
+ {
+ title: '',
+ props: { className: tableColumnClasses[6] },
+ },
  ];
 };
 MachineConfigPoolTableHeader.displayName = 'MachineConfigPoolTableHeader';
@@ -288,10 +297,11 @@ const MachineConfigPoolTableRow: RowFunction<MachineConfigPoolKind> = ({
  <TableData className={tableColumnClasses[3]}>
  {getConditionStatus(obj, MachineConfigPoolConditionType.Updating)}
  </TableData>
- <TableData className={classNames(tableColumnClasses[4], 'co-truncate')}>
+ <TableData className={tableColumnClasses[4]}>{obj.spec?.paused ? 'True' : 'False'}</TableData>
+ <TableData className={classNames(tableColumnClasses[5], 'co-truncate')}>
  {getConditionStatus(obj, MachineConfigPoolConditionType.Degraded)}
  </TableData>
- <TableData className={tableColumnClasses[5]}>
+ <TableData className={tableColumnClasses[6]}>
  <ResourceKebab
  actions={machineConfigPoolMenuActions}
  kind={machineConfigPoolReference}