Merge branch 'master' into migrate-ua-connector-id

elastic · Sep 20, 2021 · f3473b7 · f3473b7
2 parents 25c8fa4 + 1fb0982
commit f3473b7
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 38 deletions.
diff --git a/src/plugins/embeddable/public/plugin.tsx b/src/plugins/embeddable/public/plugin.tsx
@@ -173,8 +173,8 @@ export class EmbeddablePublicPlugin implements Plugin<EmbeddableSetup, Embeddabl
         );
 
     const commonContract: CommonEmbeddableStartContract = {
-      getEmbeddableFactory: (this
-        .getEmbeddableFactory as unknown) as CommonEmbeddableStartContract['getEmbeddableFactory'],
+      getEmbeddableFactory: this
+        .getEmbeddableFactory as unknown as CommonEmbeddableStartContract['getEmbeddableFactory'],
       getEnhancement: this.getEnhancement,
     };
 

diff --git a/src/plugins/embeddable/public/tests/customize_panel_modal.test.tsx b/src/plugins/embeddable/public/tests/customize_panel_modal.test.tsx
@@ -39,7 +39,7 @@ beforeEach(async () => {
 
   const contactCardFactory = new ContactCardEmbeddableFactory(
     uiActions.executeTriggerActions,
-    ({} as unknown) as OverlayStart
+    {} as unknown as OverlayStart
   );
   setup.registerEmbeddableFactory(contactCardFactory.type, contactCardFactory);
 

diff --git a/src/plugins/embeddable/server/plugin.ts b/src/plugins/embeddable/server/plugin.ts
@@ -45,8 +45,8 @@ export class EmbeddableServerPlugin implements Plugin<EmbeddableSetup, Embeddabl
 
   public setup(core: CoreSetup) {
     const commonContract: CommonEmbeddableStartContract = {
-      getEmbeddableFactory: (this
-        .getEmbeddableFactory as unknown) as CommonEmbeddableStartContract['getEmbeddableFactory'],
+      getEmbeddableFactory: this
+        .getEmbeddableFactory as unknown as CommonEmbeddableStartContract['getEmbeddableFactory'],
       getEnhancement: this.getEnhancement,
     };
 
@@ -68,8 +68,8 @@ export class EmbeddableServerPlugin implements Plugin<EmbeddableSetup, Embeddabl
 
   public start(core: CoreStart) {
     const commonContract: CommonEmbeddableStartContract = {
-      getEmbeddableFactory: (this
-        .getEmbeddableFactory as unknown) as CommonEmbeddableStartContract['getEmbeddableFactory'],
+      getEmbeddableFactory: this
+        .getEmbeddableFactory as unknown as CommonEmbeddableStartContract['getEmbeddableFactory'],
       getEnhancement: this.getEnhancement,
     };
 

diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
@@ -187,7 +187,11 @@ export class VisualizeEmbeddable
     if (!adapters) return;
 
     return this.deps.start().plugins.inspector.open(adapters, {
-      title: this.getTitle(),
+      title:
+        this.getTitle() ||
+        i18n.translate('visualizations.embeddable.inspectorTitle', {
+          defaultMessage: 'Inspector',
+        }),
     });
   };
 

diff --git a/x-pack/plugins/fleet/public/components/agent_policy_package_badges.tsx b/x-pack/plugins/fleet/public/components/agent_policy_package_badges.tsx
@@ -84,33 +84,42 @@ export const AgentPolicyPackageBadges: React.FunctionComponent<Props> = ({
           <EuiSpacer size="s" />
         </>
       )}
-      {packages.map((pkg, idx) => {
-        return (
-          <EuiBadge
-            key={idx}
-            color="hollow"
-            isDisabled={excludeFleetServer && pkg.name === FLEET_SERVER_PACKAGE}
-          >
-            <EuiFlexGroup direction="row" gutterSize="xs" alignItems="center" responsive={false}>
-              <EuiFlexItem grow={false}>
-                <PackageIcon
-                  packageName={pkg.name}
-                  version={pkg.version}
-                  tryApi={true}
-                  style={
-                    // when a custom SVG is used the logo is rendered with <img class="euiIcon euiIcon--small">
-                    // this collides with some EuiText (+img) CSS from the EuiIcon component
-                    // which  makes the button large, wide, and poorly layed out
-                    // override those styles until the bug is fixed or we find a better approach
-                    { margin: 'unset', width: '16px' }
-                  }
-                />
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>{pkg.title}</EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiBadge>
-        );
-      })}
+      <EuiFlexGroup direction="row" gutterSize="xs" alignItems="center" wrap>
+        {packages.map((pkg, idx) => {
+          return (
+            <EuiFlexItem grow={false}>
+              <EuiBadge
+                key={idx}
+                color="hollow"
+                isDisabled={excludeFleetServer && pkg.name === FLEET_SERVER_PACKAGE}
+              >
+                <EuiFlexGroup
+                  direction="row"
+                  gutterSize="xs"
+                  alignItems="center"
+                  responsive={false}
+                >
+                  <EuiFlexItem grow={false}>
+                    <PackageIcon
+                      packageName={pkg.name}
+                      version={pkg.version}
+                      tryApi={true}
+                      style={
+                        // when a custom SVG is used the logo is rendered with <img class="euiIcon euiIcon--small">
+                        // this collides with some EuiText (+img) CSS from the EuiIcon component
+                        // which  makes the button large, wide, and poorly layed out
+                        // override those styles until the bug is fixed or we find a better approach
+                        { margin: 'unset', width: '16px' }
+                      }
+                    />
+                  </EuiFlexItem>
+                  <EuiFlexItem grow={false}>{pkg.title}</EuiFlexItem>
+                </EuiFlexGroup>
+              </EuiBadge>
+            </EuiFlexItem>
+          );
+        })}
+      </EuiFlexGroup>
       {showFleetServerWarning && (
         <>
           <EuiSpacer size="s" />

diff --git a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
@@ -255,7 +255,7 @@ export const LensTopNavMenu = ({
           },
         },
         actions: {
-          inspect: lensInspector.inspect,
+          inspect: () => lensInspector.inspect({ title }),
           exportToCSV: () => {
             if (!activeData) {
               return;
@@ -335,7 +335,7 @@ export const LensTopNavMenu = ({
       setIsSaveModalVisible,
       uiSettings,
       unsavedTitle,
-      lensInspector.inspect,
+      lensInspector,
     ]
   );
 

diff --git a/x-pack/plugins/lens/public/lens_inspector_service.ts b/x-pack/plugins/lens/public/lens_inspector_service.ts
@@ -7,6 +7,7 @@
 
 import type {
   Adapters,
+  InspectorOptions,
   Start as InspectorStartContract,
 } from '../../../../src/plugins/inspector/public';
 
@@ -16,7 +17,7 @@ export const getLensInspectorService = (inspector: InspectorStartContract) => {
   const adapters: Adapters = createDefaultInspectorAdapters();
   return {
     adapters,
-    inspect: () => inspector.open(adapters),
+    inspect: (options?: InspectorOptions) => inspector.open(adapters, options),
   };
 };
 

diff --git a/x-pack/test/functional/apps/lens/formula.ts b/x-pack/test/functional/apps/lens/formula.ts
@@ -87,6 +87,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       input = await find.activeElement();
       await input.type(`Men\'s Clothing`);
 
+      await PageObjects.common.sleep(100);
+
       await PageObjects.lens.expectFormulaText(`count(kql='Men\\'s Clothing')`);
     });