From c24b17f334fed777f65d34ddae104c80be3ec9c9 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Wed, 5 Aug 2020 10:49:36 +0200
Subject: [PATCH] [Discover] Inline noWhiteSpace function (#74331)

* Inline noWhiteSpace function

* Fix TypeScript

* Remove unused function file
---
 .../kibana/common/utils/no_white_space.js     | 37 -------------------
 .../angular/doc_table/components/table_row.ts | 21 +++++++----
 2 files changed, 14 insertions(+), 44 deletions(-)
 delete mode 100644 src/legacy/core_plugins/kibana/common/utils/no_white_space.js

diff --git a/src/legacy/core_plugins/kibana/common/utils/no_white_space.js b/src/legacy/core_plugins/kibana/common/utils/no_white_space.js
deleted file mode 100644
index 580418eb3423f..0000000000000
--- a/src/legacy/core_plugins/kibana/common/utils/no_white_space.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-const TAGS_WITH_WS = />\s+</g;
-
-/**
- * Remove all of the whitespace between html tags
- * so that inline elements don't have extra spaces.
- *
- * If you have inline elements (span, a, em, etc.) and any
- * amount of whitespace around them in your markup, then the
- * browser will push them apart. This is ugly in certain
- * scenarios and is only fixed by removing the whitespace
- * from the html in the first place (or ugly css hacks).
- *
- * @param  {string} html - the html to modify
- * @return {string} - modified html
- */
-export function noWhiteSpace(html) {
-  return html.replace(TAGS_WITH_WS, '><');
-}
diff --git a/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts b/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
index 7b862ec518a04..e7fafde2e68d0 100644
--- a/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
+++ b/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
@@ -17,13 +17,10 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import { find, template } from 'lodash';
 import $ from 'jquery';
-// @ts-ignore
 import rison from 'rison-node';
 import '../../doc_viewer';
-// @ts-ignore
-import { noWhiteSpace } from '../../../../../../../legacy/core_plugins/kibana/common/utils/no_white_space';
 
 import openRowHtml from './table_row/open.html';
 import detailsHtml from './table_row/details.html';
@@ -35,6 +32,16 @@ import truncateByHeightTemplateHtml from '../components/table_row/truncate_by_he
 import { esFilters } from '../../../../../../data/public';
 import { getServices } from '../../../../kibana_services';
 
+const TAGS_WITH_WS = />\s+</g;
+
+/**
+ * Remove all of the whitespace between html tags
+ * so that inline elements don't have extra spaces.
+ */
+export function noWhiteSpace(html: string): string {
+  return html.replace(TAGS_WITH_WS, '><');
+}
+
 // guesstimate at the minimum number of chars wide cells in the table should be
 const MIN_LINE_LENGTH = 20;
 
@@ -43,8 +50,8 @@ interface LazyScope extends ng.IScope {
 }
 
 export function createTableRowDirective($compile: ng.ICompileService, $httpParamSerializer: any) {
-  const cellTemplate = _.template(noWhiteSpace(cellTemplateHtml));
-  const truncateByHeightTemplate = _.template(noWhiteSpace(truncateByHeightTemplateHtml));
+  const cellTemplate = template(noWhiteSpace(cellTemplateHtml));
+  const truncateByHeightTemplate = template(noWhiteSpace(truncateByHeightTemplateHtml));
 
   return {
     restrict: 'A',
@@ -169,7 +176,7 @@ export function createTableRowDirective($compile: ng.ICompileService, $httpParam
           const $cell = $cells.eq(i);
           if ($cell.data('discover:html') === html) return;
 
-          const reuse = _.find($cells.slice(i + 1), function (cell: any) {
+          const reuse = find($cells.slice(i + 1), function (cell: any) {
             return $.data(cell, 'discover:html') === html;
           });