Update action control position.

elastic · Aug 2, 2018 · f4ed8bc · f4ed8bc
1 parent 9e2a38e
commit f4ed8bc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git a/x-pack/plugins/beats_management/common/constants/index.ts b/x-pack/plugins/beats_management/common/constants/index.ts
@@ -8,4 +8,4 @@ export { PLUGIN } from './plugin';
 export { INDEX_NAMES } from './index_names';
 export { UNIQUENESS_ENFORCING_TYPES, ConfigurationBlockTypes } from './configuration_blocks';
 export const BASE_PATH = '/management/beats_management/';
-export { TABLE_CONFIG } from './beats_table';
+export { TABLE_CONFIG } from './table';
diff --git a/...anagement/common/constants/beats_table.ts → ...eats_management/common/constants/table.ts b/...anagement/common/constants/beats_table.ts → ...eats_management/common/constants/table.ts
@@ -7,9 +7,4 @@
 export const TABLE_CONFIG = {
   INITIAL_ROW_SIZE: 5,
   PAGE_SIZE_OPTIONS: [3, 5, 10, 20],
-  ACTIONS: {
-    BULK_ASSIGN_TAG: 'BULK_ASSIGN_TAG',
-    BULK_DELETE: 'BULK_DELETE',
-    BULK_EDIT: 'BULK_EDIT',
-  },
 };
diff --git a/x-pack/plugins/beats_management/public/components/table/controls.tsx b/x-pack/plugins/beats_management/public/components/table/controls.tsx
@@ -50,11 +50,8 @@ export class ControlBar extends React.Component<ControlBarProps, ControlBarState
 
   private renderAssignmentOptions = () => (
     <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
-      <EuiFlexItem grow={false}>{this.renderActionButton()}</EuiFlexItem>
       <EuiFlexItem>{this.props.selectionCount} selected</EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <EuiButton color="danger">Disenroll Selected</EuiButton>
-      </EuiFlexItem>
+      <EuiFlexItem grow={false}>{this.renderActionButton()}</EuiFlexItem>
       <EuiFlexItem grow={false}>
         <EuiPopover
           button={
@@ -92,16 +89,11 @@ export class ControlBar extends React.Component<ControlBarProps, ControlBarState
   );
 
   private renderDefaultControls = () => (
-    <EuiFlexGroup>
-      <EuiFlexItem grow={false}>{this.renderActionButton()}</EuiFlexItem>
-      <EuiFlexItem>
-        <EuiSearchBar
-          box={{ incremental: true }}
-          filters={this.props.controlDefinitions.filters}
-          onChange={(query: any) => this.props.actionHandler('search', query)}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
+    <EuiSearchBar
+      box={{ incremental: true }}
+      filters={this.props.controlDefinitions.filters}
+      onChange={(query: any) => this.props.actionHandler('search', query)}
+    />
   );
 
   private renderActionButton = () => {

diff --git a/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx b/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx
@@ -90,14 +90,9 @@ export const BeatsTableType: TableType = {
   controlDefinitions: (data: any) => ({
     actions: [
       {
-        action: 'edit',
-        name: 'Bulk Edit',
-        icon: <EuiIcon type="indexEdit" size="m" />,
-      },
-      {
+        name: 'Disenroll Selected',
         action: 'delete',
-        name: 'Bulk Delete',
-        icon: <EuiIcon type="indexClose" size="m" />,
+        danger: true,
       },
     ],
     filters: [