[NP] Use local helper shortenDottedString for discover (#60271)

* Move shortenDottedString into kibana_utils * Move helper back to data utils * Use local helper for discover * Clean up
elastic · Mar 18, 2020 · 2fbf38b · 2fbf38b
1 parent fae9317
commit 2fbf38b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -53,8 +53,6 @@ export { wrapInI18nContext } from 'ui/i18n';
 import { search } from '../../../../../plugins/data/public';
 export const { getRequestInspectorStats, getResponseInspectorStats, tabifyAggResponse } = search;
 // @ts-ignore
-export { shortenDottedString } from '../../common/utils/shorten_dotted_string';
-// @ts-ignore
 export { intervalOptions } from 'ui/agg_types';
 export { subscribeWithScope } from '../../../../../plugins/kibana_legacy/public';
 // @ts-ignore

diff --git a/...core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx b/...core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
@@ -21,7 +21,7 @@ import classNames from 'classnames';
 import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 
 import { FieldIcon, FieldIconProps } from '../../../../../../../../../plugins/kibana_react/public';
-import { shortenDottedString } from '../../../../kibana_services';
+import { shortenDottedString } from '../../../helpers';
 import { getFieldTypeName } from './field_type_name';
 
 // property field is provided at discover's field chooser

diff --git a/...ins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx b/...ins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IndexPattern, shortenDottedString } from '../../../../../kibana_services';
+import { IndexPattern } from '../../../../../kibana_services';
+import { shortenDottedString } from '../../../../helpers';
 
 export type SortOrder = [string, string];
 export interface ColumnProps {

diff --git a/.../utils/__tests__/shorten_dotted_string.js → ...public/discover/np_ready/helpers/index.ts b/.../utils/__tests__/shorten_dotted_string.js → ...public/discover/np_ready/helpers/index.ts
@@ -17,18 +17,4 @@
  * under the License.
  */
 
-import expect from '@kbn/expect';
-import { shortenDottedString } from '../shorten_dotted_string';
-
-describe('shortenDottedString', () => {
-  it('Convert a dot.notated.string into a short string', () => {
-    expect(shortenDottedString('dot.notated.string')).to.equal('d.n.string');
-  });
-
-  it('Ignores non-string values', () => {
-    expect(shortenDottedString(true)).to.equal(true);
-    expect(shortenDottedString(123)).to.equal(123);
-    const obj = { key: 'val' };
-    expect(shortenDottedString(obj)).to.equal(obj);
-  });
-});
+export { shortenDottedString } from './shorten_dotted_string';
diff --git a/...ana/common/utils/shorten_dotted_string.js → ...np_ready/helpers/shorten_dotted_string.ts b/...ana/common/utils/shorten_dotted_string.js → ...np_ready/helpers/shorten_dotted_string.ts
@@ -22,10 +22,5 @@ const DOT_PREFIX_RE = /(.).+?\./g;
 /**
  * Convert a dot.notated.string into a short
  * version (d.n.string)
- *
- * @param {string} str - the long string to convert
- * @return {string}
  */
-export function shortenDottedString(input) {
-  return typeof input !== 'string' ? input : input.replace(DOT_PREFIX_RE, '$1.');
-}
+export const shortenDottedString = (input: string) => input.replace(DOT_PREFIX_RE, '$1.');