Some refactoring

elastic · Apr 23, 2020 · 078d346 · 078d346
1 parent 69a01ba
commit 078d346
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 39 deletions.
diff --git a/...s/kibana/public/management/sections/index_patterns/edit_index_pattern/field_controls.html b/...s/kibana/public/management/sections/index_patterns/edit_index_pattern/field_controls.html
diff --git a/...ublic/management/sections/index_patterns/edit_index_pattern/index_header/index_header.tsx b/...ublic/management/sections/index_patterns/edit_index_pattern/index_header/index_header.tsx
@@ -92,7 +92,7 @@ export function IndexHeader({
                 <EuiButtonIcon
                   color="text"
                   onClick={setDefault}
-                  iconType="starFilledSpace"
+                  iconType="starFilled"
                   aria-label={setDefaultAriaLabel}
                   data-test-subj="setDefaultIndexPatternButton"
                 />

diff --git a/...plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/tabs.tsx b/...plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/tabs.tsx
@@ -34,7 +34,7 @@ import { fieldWildcardMatcher } from '../../../../../../../../../plugins/kibana_
 import { IndexPatternManagementStart } from '../../../../../../../../../plugins/index_pattern_management/public';
 import { IndexPattern, IndexPatternField } from '../../../../../../../../../plugins/data/public';
 import { createEditIndexPatternPageStateContainer } from '../edit_index_pattern_state_container';
-import { TAB_INDEXED_FIELDS } from '../constants';
+import { TAB_INDEXED_FIELDS, TAB_SCRIPTED_FIELDS, TAB_SOURCE_FILTERS } from '../constants';
 import { SourceFiltersTable } from '../source_filters_table';
 import { IndexedFieldsTable } from '../indexed_fields_table';
 import { ScriptedFieldsTable } from '../scripted_fields_table';
@@ -111,7 +111,7 @@ export function Tabs({ config, indexPattern, fields, services, history, location
               aria-label={filterAriaLabel}
             />
           </EuiFlexItem>
-          {type === 'indexedFields' && indexedFieldTypes.length > 0 && (
+          {type === TAB_INDEXED_FIELDS && indexedFieldTypes.length > 0 && (
             <EuiFlexItem grow={false}>
               <EuiSelect
                 options={indexedFieldTypes}
@@ -121,7 +121,7 @@ export function Tabs({ config, indexPattern, fields, services, history, location
               />
             </EuiFlexItem>
           )}
-          {type === 'scriptedFields' && scriptedFieldLanguages.length > 0 && (
+          {type === TAB_SCRIPTED_FIELDS && scriptedFieldLanguages.length > 0 && (
             <EuiFlexItem grow={false}>
               <EuiSelect
                 options={scriptedFieldLanguages}
@@ -146,7 +146,7 @@ export function Tabs({ config, indexPattern, fields, services, history, location
   const getContent = useCallback(
     (type: string) => {
       switch (type) {
-        case 'indexedFields':
+        case TAB_INDEXED_FIELDS:
           return (
             <Fragment>
               <EuiSpacer size="m" />
@@ -167,7 +167,7 @@ export function Tabs({ config, indexPattern, fields, services, history, location
               />
             </Fragment>
           );
-        case 'scriptedFields':
+        case TAB_SCRIPTED_FIELDS:
           return (
             <Fragment>
               <EuiSpacer size="m" />
@@ -186,7 +186,7 @@ export function Tabs({ config, indexPattern, fields, services, history, location
               />
             </Fragment>
           );
-        case 'sourceFilters':
+        case TAB_SOURCE_FILTERS:
           return (
             <Fragment>
               <EuiSpacer size="m" />

diff --git a/...plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/utils.ts b/...plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/utils.ts
@@ -18,10 +18,10 @@
  */
 
 import { Dictionary, countBy, defaults, unique } from 'lodash';
-import { parse } from 'query-string';
 import { i18n } from '@kbn/i18n';
 import { IndexPattern, IndexPatternField } from '../../../../../../../../../plugins/data/public';
 import { IndexPatternManagementStart } from '../../../../../../../../../plugins/index_pattern_management/public';
+import { TAB_INDEXED_FIELDS, TAB_SCRIPTED_FIELDS, TAB_SOURCE_FILTERS } from '../constants';
 
 function filterByName(items: IndexPatternField[], filter: string) {
   const lowercaseFilter = (filter || '').toLowerCase();
@@ -95,33 +95,24 @@ export function getTabs(
 
   tabs.push({
     name: getTitle('indexed', filteredCount, totalCount),
-    id: 'indexedFields',
+    id: TAB_INDEXED_FIELDS,
   });
 
   if (indexPatternListProvider.areScriptedFieldsEnabled(indexPattern)) {
     tabs.push({
       name: getTitle('scripted', filteredCount, totalCount),
-      id: 'scriptedFields',
+      id: TAB_SCRIPTED_FIELDS,
     });
   }
 
   tabs.push({
     name: getTitle('sourceFilters', filteredCount, totalCount),
-    id: 'sourceFilters',
+    id: TAB_SOURCE_FILTERS,
   });
 
   return tabs;
 }
 
-export function getTabIdFromURL(search: string) {
-  const params = parse(search);
-  let tabId = 'indexedFields';
-  if (params._a) {
-    tabId = (Array.isArray(params._a) ? params._a[0] : params._a).split(/[:)]/)[1];
-  }
-  return tabId;
-}
-
 export function getPath(field: IndexPatternField) {
   return `/management/kibana/index_patterns/${field.indexPattern?.id}/field/${field.name}`;
 }