Extract and share common table helpers

ManageIQ · Jun 14, 2018 · c7ffb58 · c7ffb58
1 parent 490828c
commit c7ffb58
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/...sStep/components/PlanWizardAdvancedOptionsStepTable/PlanWizardAdvancedOptionsStepTable.js b/...sStep/components/PlanWizardAdvancedOptionsStepTable/PlanWizardAdvancedOptionsStepTable.js
@@ -15,9 +15,9 @@ import {
  PAGINATION_VIEW
 } from 'patternfly-react';
 
-import rowFilter from './rowFilter';
-import searchFilter from './searchFilter';
-import CustomToolbarFind from './CustomToolbarFind';
+import rowFilter from '../../../common/rowFilter';
+import searchFilter from '../../../common/searchFilter';
+import CustomToolbarFind from '../../../common/CustomToolbarFind';
 import vmSelectionHeaderCellFormatter from './vmSelectionHeaderCellFormatter';
 import vmSelectionCellFormatter from './vmSelectionCellFormatter';
 
@@ -499,7 +499,6 @@ class PlanWizardAdvancedOptionsStepTable extends React.Component {
  onRemove={this.removeFilter}
  filterData={item}
  >
- {__('label=')}
  {item.label}
  </Filter.Item>
  ))}

diff --git a/...erview/screens/PlanWizard/components/PlanWizardVMStep/components/PlanWizardVMStepTable.js b/...erview/screens/PlanWizard/components/PlanWizardVMStep/components/PlanWizardVMStepTable.js
@@ -21,9 +21,9 @@ import {
  PAGINATION_VIEW
 } from 'patternfly-react';
 
-import rowFilter from './rowFilter';
-import searchFilter from './searchFilter';
-import CustomToolbarFind from './CustomToolbarFind';
+import rowFilter from '../../common/rowFilter';
+import searchFilter from '../../common/searchFilter';
+import CustomToolbarFind from '../../common/CustomToolbarFind';
 import vmSelectionHeaderCellFormatter from './vmSelectionHeaderCellFormatter';
 import vmSelectionCellFormatter from './vmSelectionCellFormatter';
 

diff --git a/...ncedOptionsStepTable/CustomToolbarFind.js → ...rd/components/common/CustomToolbarFind.js b/...ncedOptionsStepTable/CustomToolbarFind.js → ...rd/components/common/CustomToolbarFind.js
diff --git a/...zardAdvancedOptionsStepTable/rowFilter.js → ...PlanWizard/components/common/rowFilter.js b/...zardAdvancedOptionsStepTable/rowFilter.js → ...PlanWizard/components/common/rowFilter.js
diff --git a/...dAdvancedOptionsStepTable/searchFilter.js → ...nWizard/components/common/searchFilter.js b/...dAdvancedOptionsStepTable/searchFilter.js → ...nWizard/components/common/searchFilter.js