Remove duplicate type and refactor NodeRole to NodeDataRole

Also deleted unused component "AdvancedSection" for now
elastic · Sep 16, 2020 · d695e95 · d695e95
1 parent 8d0d46b
commit d695e95
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 53 deletions.
diff --git a/x-pack/plugins/index_lifecycle_management/common/types/api.ts b/x-pack/plugins/index_lifecycle_management/common/types/api.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export type NodeRole = 'data' | 'data_hot' | 'data_warm' | 'data_cold' | 'data_frozen';
+export type NodeDataRole = 'data' | 'data_hot' | 'data_warm' | 'data_cold' | 'data_frozen';
 
 export interface ListNodesRouteResponse {
  nodesByAttributes: { [attributePair: string]: string[] };
- nodesByRoles: { [role in NodeRole]?: string[] };
+ nodesByRoles: { [role in NodeDataRole]?: string[] };
 }
diff --git a/x-pack/plugins/index_lifecycle_management/common/types/index.ts b/x-pack/plugins/index_lifecycle_management/common/types/index.ts
@@ -6,8 +6,4 @@
 
 export * from './api';
 
-export type DataTierNodeRole = 'data' | 'data_hot' | 'data_warm' | 'data_cold' | 'data_frozen';
-
-export type PhaseWithAllocation = 'warm' | 'cold' | 'frozen';
-
 export * from './policies';
diff --git a/x-pack/plugins/index_lifecycle_management/common/types/policies.ts b/x-pack/plugins/index_lifecycle_management/common/types/policies.ts
@@ -6,6 +6,8 @@
 
 import { Index as IndexInterface } from '../../../index_management/common/types';
 
+export type PhaseWithAllocation = 'warm' | 'cold' | 'frozen';
+
 export interface SerializedPolicy {
  name: string;
  phases: Phases;

diff --git a/...index_lifecycle_management/public/application/lib/data_tiers/check_phase_compatibility.ts b/...index_lifecycle_management/public/application/lib/data_tiers/check_phase_compatibility.ts
@@ -4,7 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { NodeRole, ListNodesRouteResponse, PhaseWithAllocation } from '../../../../common/types';
+import {
+ NodeDataRole,
+ ListNodesRouteResponse,
+ PhaseWithAllocation,
+} from '../../../../common/types';
 
 /**
  * Given a phase and current node roles, determine whether the phase
@@ -23,7 +27,7 @@ export const isPhaseDefaultDataAllocationCompatible = (
  }
 
  // Otherwise we need to check whether a node role for the specific phase exists
- if (nodesByRoles[`data_${phase}` as NodeRole]?.length) {
+ if (nodesByRoles[`data_${phase}` as NodeDataRole]?.length) {
  return true;
  }
 

diff --git a/...management/public/application/sections/edit_policy/components/advanced_section_layout.tsx b/...management/public/application/sections/edit_policy/components/advanced_section_layout.tsx
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
@@ -6,7 +6,7 @@
 
 import { LegacyAPICaller } from 'src/core/server';
 
-import { ListNodesRouteResponse, NodeRole } from '../../../../common/types';
+import { ListNodesRouteResponse, NodeDataRole } from '../../../../common/types';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
@@ -36,10 +36,10 @@ function convertStatsIntoList(
  }
  }
 
- const dataRoles = nodeStats.roles.filter((r) => r.startsWith('data')) as NodeRole[];
+ const dataRoles = nodeStats.roles.filter((r) => r.startsWith('data')) as NodeDataRole[];
  for (const role of dataRoles) {
- accum.nodesByRoles[role as NodeRole] = accum.nodesByRoles[role] ?? [];
- accum.nodesByRoles[role as NodeRole]!.push(nodeId);
+ accum.nodesByRoles[role as NodeDataRole] = accum.nodesByRoles[role] ?? [];
+ accum.nodesByRoles[role as NodeDataRole]!.push(nodeId);
  }
  return accum;
  },