Merge branch 'master' into IS-51910_share-lens-change-index-pattern-i…

…n-discover
mbondyra · Dec 19, 2019 · 1b42770 · 1b42770
2 parents 1112ad5 + e9ac373
commit 1b42770
Show file tree

Hide file tree

Showing 38 changed files with 300 additions and 704 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html
@@ -13,64 +13,6 @@
         types="fieldTypes"
       >
       </discover-field-search>
-      <div data-test-subj="discoverFieldFilter" class="dscFieldFilter" ng-show="showFilter">
-        <div class="form-group" >
-          <label
-            for="discoverFieldChooserFilterAggregatable"
-            i18n-id="kbn.discover.fieldChooser.filter.aggregatableLabel"
-            i18n-default-message="Aggregatable"
-          ></label>
-          <select
-            id="discoverFieldChooserFilterAggregatable"
-            ng-options="opt.value as opt.label for opt in filter.boolOpts"
-            ng-model="filter.vals.aggregatable"
-            class="form-control">
-          </select>
-        </div>
-        <div class="form-group" ng-show="showFilter">
-          <label
-            for="discoverFieldChooserFilterSearchable"
-            i18n-id="kbn.discover.fieldChooser.filter.searchableLabel"
-            i18n-default-message="Searchable"
-          ></label>
-          <select
-            id="discoverFieldChooserFilterSearchable"
-            ng-options="opt.value as opt.label for opt in filter.boolOpts"
-            ng-model="filter.vals.searchable"
-            class="form-control">
-          </select>
-        </div>
-        <div class="form-group" ng-show="showFilter">
-          <label
-            for="discoverFieldChooserFilterType"
-            i18n-id="kbn.discover.fieldChooser.filter.typeLabel"
-            i18n-default-message="Type"
-          ></label>
-          <select
-            id="discoverFieldChooserFilterType"
-            ng-options="field as field for field in fieldTypes"
-            ng-model="filter.vals.type"
-            class="form-control">
-          </select>
-        </div>
-        <div class="form-group"  ng-show="showFilter">
-          <label for="discoverFieldChooserHideMissingFields">
-            <input id="discoverFieldChooserHideMissingFields" type="checkbox" ng-model="filter.vals.missing">
-            <span
-              i18n-id="kbn.discover.fieldChooser.filter.hideMissingFieldsLabel"
-              i18n-default-message="Hide missing fields"
-            ></span>
-          </label>
-        </div>
-        <button
-          ng-show="showFilter"
-          ng-click="filter.reset()"
-          ng-disabled="!filter.active"
-          class="kuiButton kuiButton--danger kuiButton--fullWidth"
-          i18n-id="kbn.discover.fieldChooser.filter.resetFiltersButtonLabel"
-          i18n-default-message="Reset filters"
-        ></button>
-      </div>
     </form>
   </div>
 

diff --git a/test/plugin_functional/config.js b/test/plugin_functional/config.js
@@ -57,12 +57,11 @@ export default async function({ readConfigFile }) {
       ...functionalConfig.get('kbnTestServer'),
       serverArgs: [
         ...functionalConfig.get('kbnTestServer.serverArgs'),
-
-        // Required to load new platform plugins via `--plugin-path` flag.
-        '--env.name=development',
         ...plugins.map(
           pluginDir => `--plugin-path=${path.resolve(__dirname, 'plugins', pluginDir)}`
         ),
+        // Required to load new platform plugins via `--plugin-path` flag.
+        '--env.name=development',
       ],
     },
   };

diff --git a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
@@ -22,6 +22,9 @@ import { CorePluginAPluginSetup } from '../../core_plugin_a/public/plugin';
 
 declare global {
   interface Window {
+    corePluginB?: string;
+    hasAccessToInjectedMetadata?: boolean;
+    receivedStartServices?: boolean;
     env?: PluginInitializerContext['env'];
   }
 }
@@ -36,6 +39,12 @@ export class CorePluginBPlugin
     window.env = pluginContext.env;
   }
   public setup(core: CoreSetup, deps: CorePluginBDeps) {
+    window.corePluginB = `Plugin A said: ${deps.core_plugin_a.getGreeting()}`;
+    window.hasAccessToInjectedMetadata = 'getInjectedVar' in core.injectedMetadata;
+    core.getStartServices().then(([coreStart, plugins]) => {
+      window.receivedStartServices = 'overlays' in coreStart;
+    });
+
     core.application.register({
       id: 'bar',
       title: 'Bar',
@@ -44,12 +53,6 @@ export class CorePluginBPlugin
         return renderApp(context, params);
       },
     });
-
-    return {
-      sayHi() {
-        return `Plugin A said: ${deps.core_plugin_a.getGreeting()}`;
-      },
-    };
   }
 
   public start() {}

diff --git a/test/plugin_functional/plugins/core_provider_plugin/index.ts b/test/plugin_functional/plugins/core_provider_plugin/index.ts
diff --git a/test/plugin_functional/plugins/core_provider_plugin/package.json b/test/plugin_functional/plugins/core_provider_plugin/package.json
diff --git a/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json b/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/kibana.json b/test/plugin_functional/plugins/ui_settings_plugin/kibana.json
@@ -4,5 +4,5 @@
   "kibanaVersion": "kibana",
   "configPath": ["ui_settings_plugin"],
   "server": true,
-  "ui": false
+  "ui": true
 }
diff --git a/...gins/core_provider_plugin/public/index.ts → ...lugins/ui_settings_plugin/public/index.ts b/...gins/core_provider_plugin/public/index.ts → ...lugins/ui_settings_plugin/public/index.ts
@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { npSetup, npStart } from 'ui/new_platform';
-import '../types';
+import { UiSettingsPlugin } from './plugin';
 
-window.__coreProvider = {
-  setup: npSetup,
-  start: npStart,
-  testUtils: {
-    delay: (ms: number) => new Promise(res => setTimeout(res, ms)),
-  },
-};
+export const plugin = () => new UiSettingsPlugin();
diff --git a/...nal/plugins/core_provider_plugin/types.ts → ...gins/ui_settings_plugin/public/plugin.tsx b/...nal/plugins/core_provider_plugin/types.ts → ...gins/ui_settings_plugin/public/plugin.tsx
@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { LegacyCoreSetup, LegacyCoreStart } from 'kibana/public';
+
+import { CoreSetup, Plugin } from 'kibana/public';
 
 declare global {
   interface Window {
-    __coreProvider: {
-      setup: {
-        core: LegacyCoreSetup;
-        plugins: Record<string, any>;
-      };
-      start: {
-        core: LegacyCoreStart;
-        plugins: Record<string, any>;
-      };
-      testUtils: {
-        delay: (ms: number) => Promise<void>;
-      };
-    };
+    uiSettingsPlugin?: Record<string, any>;
+    uiSettingsPluginValue?: string;
   }
 }
+
+export class UiSettingsPlugin implements Plugin {
+  public setup(core: CoreSetup) {
+    window.uiSettingsPlugin = core.uiSettings.getAll().ui_settings_plugin;
+    window.uiSettingsPluginValue = core.uiSettings.get('ui_settings_plugin');
+  }
+
+  public start() {}
+  public stop() {}
+}
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json b/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json
@@ -5,6 +5,9 @@
     "skipLibCheck": true
   },
   "include": [
+    "index.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
     "server/**/*.ts",
     "../../../../typings/**/*",
   ],

diff --git a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
@@ -19,7 +19,6 @@
 
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function({ getService, getPageObjects }: PluginFunctionalProviderContext) {
@@ -32,35 +31,22 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
         await PageObjects.common.navigateToApp('settings');
       });
 
-      it('should run the new platform plugins', async () => {
-        expect(
-          await browser.execute(() => {
-            return window.__coreProvider.setup.plugins.core_plugin_b.sayHi();
-          })
-        ).to.be('Plugin A said: Hello from Plugin A!');
+      it('should attach string to window.corePluginB', async () => {
+        const corePluginB = await browser.execute('return window.corePluginB');
+        expect(corePluginB).to.equal(`Plugin A said: Hello from Plugin A!`);
       });
     });
 
-    describe('should have access to the core services', function describeIndexTests() {
+    describe('have injectedMetadata service provided', function describeIndexTests() {
       before(async () => {
-        await PageObjects.common.navigateToApp('settings');
-      });
-
-      it('to injectedMetadata service', async () => {
-        expect(
-          await browser.execute(() => {
-            return window.__coreProvider.setup.core.injectedMetadata.getKibanaBuildNumber();
-          })
-        ).to.be.a('number');
+        await PageObjects.common.navigateToApp('bar');
       });
 
-      it('to start services via coreSetup.getStartServices', async () => {
-        expect(
-          await browser.executeAsync(async cb => {
-            const [coreStart] = await window.__coreProvider.setup.core.getStartServices();
-            cb(Boolean(coreStart.overlays));
-          })
-        ).to.be(true);
+      it('should attach boolean to window.hasAccessToInjectedMetadata', async () => {
+        const hasAccessToInjectedMetadata = await browser.execute(
+          'return window.hasAccessToInjectedMetadata'
+        );
+        expect(hasAccessToInjectedMetadata).to.equal(true);
       });
     });
 
@@ -75,5 +61,16 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
         expect(envData.packageInfo.version).to.be.a('string');
       });
     });
+
+    describe('have access to start services via coreSetup.getStartServices', function describeIndexTests() {
+      before(async () => {
+        await PageObjects.common.navigateToApp('bar');
+      });
+
+      it('should attach boolean to window.receivedStartServices', async () => {
+        const receivedStartServices = await browser.execute('return window.receivedStartServices');
+        expect(receivedStartServices).to.equal(true);
+      });
+    });
   });
 }
diff --git a/test/plugin_functional/test_suites/core_plugins/ui_settings.ts b/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
@@ -18,7 +18,6 @@
  */
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_provider_plugin/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function({ getService, getPageObjects }: PluginFunctionalProviderContext) {
@@ -32,30 +31,15 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
     });
 
     it('client plugins have access to registered settings', async () => {
-      const settings = await browser.execute(() => {
-        return window.__coreProvider.setup.core.uiSettings.getAll().ui_settings_plugin;
-      });
-
+      const settings = await browser.execute('return window.uiSettingsPlugin');
       expect(settings).to.eql({
         category: ['any'],
         description: 'just for testing',
         name: 'from_ui_settings_plugin',
         value: '2',
       });
-
-      const settingsValue = await browser.execute(() => {
-        return window.__coreProvider.setup.core.uiSettings.get('ui_settings_plugin');
-      });
-
+      const settingsValue = await browser.execute('return window.uiSettingsPluginValue');
       expect(settingsValue).to.be('2');
-
-      const settingsValueViaObservables = await browser.executeAsync(async (callback: Function) => {
-        window.__coreProvider.setup.core.uiSettings
-          .get$('ui_settings_plugin')
-          .subscribe(v => callback(v));
-      });
-
-      expect(settingsValueViaObservables).to.be('2');
     });
 
     it('server plugins have access to registered settings', async () => {

diff --git a/x-pack/legacy/plugins/apm/public/components/shared/LoadingStatePrompt.tsx b/x-pack/legacy/plugins/apm/public/components/shared/LoadingStatePrompt.tsx
@@ -5,20 +5,14 @@
  */
 
 import React from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiEmptyPrompt } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
 
 export function LoadingStatePrompt() {
   return (
-    <EuiEmptyPrompt
-      title={
-        <div>
-          {i18n.translate('xpack.apm.loading.prompt', {
-            defaultMessage: 'Loading...'
-          })}
-        </div>
-      }
-      titleSize="s"
-    />
+    <EuiFlexGroup justifyContent="spaceAround">
+      <EuiFlexItem grow={false}>
+        <EuiLoadingSpinner size="l" />
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 }