From 538eeb3d27c3a2bd42763216f3a09a4f0983ea57 Mon Sep 17 00:00:00 2001
From: Caroline Horn <549577+cchaos@users.noreply.github.com>
Date: Wed, 6 May 2020 15:58:56 -0400
Subject: [PATCH] [Doc-Table] Import styles into JS where possible (#65329)
 (#65518)

Fixes styles and overflow table vis
---
 src/plugins/discover/public/application/angular/_index.scss    | 1 -
 .../public/application/angular/doc_table/_doc_table.scss       | 1 +
 .../discover/public/application/angular/doc_table/doc_table.ts | 1 +
 .../application/angular/doc_table/{_index.scss => index.scss}  | 2 ++
 src/plugins/discover/public/application/components/_index.scss | 3 ---
 .../public/application/components/doc_viewer/_index.scss       | 1 -
 .../doc_viewer/{_doc_viewer.scss => doc_viewer.scss}           | 0
 .../public/application/components/doc_viewer/doc_viewer.tsx    | 1 +
 .../public/application/components/fetch_error/_index.scss      | 1 -
 .../fetch_error/{_fetch_error.scss => fetch_error.scss}        | 0
 .../public/application/components/fetch_error/fetch_error.tsx  | 1 +
 .../discover/public/application/components/sidebar/_index.scss | 1 -
 .../sidebar/{_sidebar.scss => discover_sidebar.scss}           | 0
 .../public/application/components/sidebar/discover_sidebar.tsx | 1 +
 src/plugins/discover/public/application/embeddable/_index.scss | 2 --
 .../embeddable/{_embeddables.scss => search_embeddable.scss}   | 0
 .../public/application/embeddable/search_embeddable.ts         | 1 +
 src/plugins/discover/public/application/index.scss             | 2 --
 18 files changed, 8 insertions(+), 11 deletions(-)
 rename src/plugins/discover/public/application/angular/doc_table/{_index.scss => index.scss} (66%)
 delete mode 100644 src/plugins/discover/public/application/components/_index.scss
 delete mode 100644 src/plugins/discover/public/application/components/doc_viewer/_index.scss
 rename src/plugins/discover/public/application/components/doc_viewer/{_doc_viewer.scss => doc_viewer.scss} (100%)
 delete mode 100644 src/plugins/discover/public/application/components/fetch_error/_index.scss
 rename src/plugins/discover/public/application/components/fetch_error/{_fetch_error.scss => fetch_error.scss} (100%)
 delete mode 100644 src/plugins/discover/public/application/components/sidebar/_index.scss
 rename src/plugins/discover/public/application/components/sidebar/{_sidebar.scss => discover_sidebar.scss} (100%)
 delete mode 100644 src/plugins/discover/public/application/embeddable/_index.scss
 rename src/plugins/discover/public/application/embeddable/{_embeddables.scss => search_embeddable.scss} (100%)

diff --git a/src/plugins/discover/public/application/angular/_index.scss b/src/plugins/discover/public/application/angular/_index.scss
index 9e00ade3d41f6d..b0e5b6e3edf7b3 100644
--- a/src/plugins/discover/public/application/angular/_index.scss
+++ b/src/plugins/discover/public/application/angular/_index.scss
@@ -1,3 +1,2 @@
 @import 'directives/index';
-@import 'doc_table/index';
 @import 'context/index';
diff --git a/src/plugins/discover/public/application/angular/doc_table/_doc_table.scss b/src/plugins/discover/public/application/angular/doc_table/_doc_table.scss
index 8b754d23f96044..3e30214acd2a9e 100644
--- a/src/plugins/discover/public/application/angular/doc_table/_doc_table.scss
+++ b/src/plugins/discover/public/application/angular/doc_table/_doc_table.scss
@@ -2,6 +2,7 @@
  * 1. Stack content vertically so the table can scroll when its constrained by a fixed container height.
  */
 doc-table {
+  @include euiScrollBar;
   overflow: auto;
   flex: 1 1 100%;
   flex-direction: column; /* 1 */
diff --git a/src/plugins/discover/public/application/angular/doc_table/doc_table.ts b/src/plugins/discover/public/application/angular/doc_table/doc_table.ts
index 66b162a4584a77..8af7380afcdc97 100644
--- a/src/plugins/discover/public/application/angular/doc_table/doc_table.ts
+++ b/src/plugins/discover/public/application/angular/doc_table/doc_table.ts
@@ -22,6 +22,7 @@ import { dispatchRenderComplete } from '../../../../../kibana_utils/public';
 // @ts-ignore
 import { getLimitedSearchResultsMessage } from './doc_table_strings';
 import { getServices } from '../../../kibana_services';
+import './index.scss';
 
 export interface LazyScope extends ng.IScope {
   [key: string]: any;
diff --git a/src/plugins/discover/public/application/angular/doc_table/_index.scss b/src/plugins/discover/public/application/angular/doc_table/index.scss
similarity index 66%
rename from src/plugins/discover/public/application/angular/doc_table/_index.scss
rename to src/plugins/discover/public/application/angular/doc_table/index.scss
index 3663d807851c48..4e6cb83c5fe5a5 100644
--- a/src/plugins/discover/public/application/angular/doc_table/_index.scss
+++ b/src/plugins/discover/public/application/angular/doc_table/index.scss
@@ -1,2 +1,4 @@
+@import '../../mixins';
+
 @import 'doc_table';
 @import 'components/index';
diff --git a/src/plugins/discover/public/application/components/_index.scss b/src/plugins/discover/public/application/components/_index.scss
deleted file mode 100644
index 91fb3df79b1777..00000000000000
--- a/src/plugins/discover/public/application/components/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import 'doc_viewer/index';
-@import 'fetch_error/index';
-@import 'sidebar/index';
diff --git a/src/plugins/discover/public/application/components/doc_viewer/_index.scss b/src/plugins/discover/public/application/components/doc_viewer/_index.scss
deleted file mode 100644
index aaf925f435d818..00000000000000
--- a/src/plugins/discover/public/application/components/doc_viewer/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'doc_viewer';
diff --git a/src/plugins/discover/public/application/components/doc_viewer/_doc_viewer.scss b/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/doc_viewer/_doc_viewer.scss
rename to src/plugins/discover/public/application/components/doc_viewer/doc_viewer.scss
diff --git a/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.tsx b/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.tsx
index dce6de150155c1..80c43db0166989 100644
--- a/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.tsx
+++ b/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.tsx
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import './doc_viewer.scss';
 import React from 'react';
 import { EuiTabbedContent } from '@elastic/eui';
 import { getDocViewsRegistry } from '../../../kibana_services';
diff --git a/src/plugins/discover/public/application/components/fetch_error/_index.scss b/src/plugins/discover/public/application/components/fetch_error/_index.scss
deleted file mode 100644
index 596f7b66866e3b..00000000000000
--- a/src/plugins/discover/public/application/components/fetch_error/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'fetch_error';
diff --git a/src/plugins/discover/public/application/components/fetch_error/_fetch_error.scss b/src/plugins/discover/public/application/components/fetch_error/fetch_error.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/fetch_error/_fetch_error.scss
rename to src/plugins/discover/public/application/components/fetch_error/fetch_error.scss
diff --git a/src/plugins/discover/public/application/components/fetch_error/fetch_error.tsx b/src/plugins/discover/public/application/components/fetch_error/fetch_error.tsx
index e16089500d3e5f..0bae2456f743c4 100644
--- a/src/plugins/discover/public/application/components/fetch_error/fetch_error.tsx
+++ b/src/plugins/discover/public/application/components/fetch_error/fetch_error.tsx
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import './fetch_error.scss';
 import React, { Fragment } from 'react';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiCallOut, EuiCodeBlock, EuiSpacer } from '@elastic/eui';
diff --git a/src/plugins/discover/public/application/components/sidebar/_index.scss b/src/plugins/discover/public/application/components/sidebar/_index.scss
deleted file mode 100644
index 17b0a6c9cfe4e6..00000000000000
--- a/src/plugins/discover/public/application/components/sidebar/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './_sidebar';
diff --git a/src/plugins/discover/public/application/components/sidebar/_sidebar.scss b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/_sidebar.scss
rename to src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
index 74d1347b1694cb..56597dd31e572c 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import './discover_sidebar.scss';
 import React, { useCallback, useEffect, useState, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonIcon, EuiTitle } from '@elastic/eui';
diff --git a/src/plugins/discover/public/application/embeddable/_index.scss b/src/plugins/discover/public/application/embeddable/_index.scss
deleted file mode 100644
index 6d64040e9e7a31..00000000000000
--- a/src/plugins/discover/public/application/embeddable/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-  
-@import 'embeddables';
diff --git a/src/plugins/discover/public/application/embeddable/_embeddables.scss b/src/plugins/discover/public/application/embeddable/search_embeddable.scss
similarity index 100%
rename from src/plugins/discover/public/application/embeddable/_embeddables.scss
rename to src/plugins/discover/public/application/embeddable/search_embeddable.scss
diff --git a/src/plugins/discover/public/application/embeddable/search_embeddable.ts b/src/plugins/discover/public/application/embeddable/search_embeddable.ts
index b650672ccaea71..2f8ac40bdf52c0 100644
--- a/src/plugins/discover/public/application/embeddable/search_embeddable.ts
+++ b/src/plugins/discover/public/application/embeddable/search_embeddable.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import './search_embeddable.scss';
 import angular from 'angular';
 import _ from 'lodash';
 import * as Rx from 'rxjs';
diff --git a/src/plugins/discover/public/application/index.scss b/src/plugins/discover/public/application/index.scss
index 0de036b1e17074..aaec7ab387e966 100644
--- a/src/plugins/discover/public/application/index.scss
+++ b/src/plugins/discover/public/application/index.scss
@@ -10,6 +10,4 @@
 //   monChart__legend--small
 //   monChart__legend-isLoading
 
-@import 'components/index';
 @import 'angular/index';
-@import 'embeddable/index';