Merge branch 'main' into 146162d-fix-group-mini-histograms

elastic · Dec 15, 2022 · 499fd5c · 499fd5c
2 parents 8a6dc4c + e337638
commit 499fd5c
Show file tree

Hide file tree

Showing 12 changed files with 312 additions and 104 deletions.
diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts
@@ -44,7 +44,7 @@ export const ENTERPRISE_SEARCH_CONTENT_PLUGIN = {
 export const ANALYTICS_PLUGIN = {
   ID: 'enterpriseSearchAnalytics',
   NAME: i18n.translate('xpack.enterpriseSearch.analytics.productName', {
-    defaultMessage: 'Analytics',
+    defaultMessage: 'Behavorial Analytics',
   }),
   DESCRIPTION: i18n.translate('xpack.enterpriseSearch.analytics.productDescription', {
     defaultMessage:

diff --git a/...analytics_collection_integrate/analytics_collection_integrate_javascript_client_embed.tsx b/...analytics_collection_integrate/analytics_collection_integrate_javascript_client_embed.tsx
@@ -97,7 +97,7 @@ trackEvent,
           </p>
           <EuiCodeBlock language="javascript" isCopyable>
             {`createTracker({
-dsn: "${analyticsDNSUrl}",
+  dsn: "${analyticsDNSUrl}",
 });`}
           </EuiCodeBlock>
         </EuiText>
@@ -136,16 +136,15 @@ dsn: "${analyticsDNSUrl}",
             {`// track a page view in React
 
 const SearchPage = (props) => {
-useEffect(() => {
-trackPageView();
-}, []);
+  useEffect(() => {
+    trackPageView();
+  }, []);
 
-return (
-<div>
-  <h1>Search Page</h1>
-  <
-</div>
-);
+  return (
+    <div>
+      <h1>Search Page</h1>
+    </div>
+  );
 };`}
           </EuiCodeBlock>
           <EuiSpacer size="m" />
@@ -164,20 +163,21 @@ import { trackEvent } from '@elastic/behavioural-analytics-javascript-tracker';
 
 const ProductDetailPage = (props) => {
 
-return (
-<div>
-  <h1>Product detail page</h1>
-  <input type="button" onClick={() => {
-    trackEvent("click", {
-      category: "product",
-      action: "add_to_cart",
-      label: "product_id",
-      value: "123"
-    })
-  }} />
-  }}>Add to Basket</input>
-</div>
-)
+  return (
+    <div>
+      <h1>Product detail page</h1>
+      <input type="button" onClick={() => {
+        trackEvent("click", {
+          category: "product",
+          action: "add_to_cart",
+          label: "product_id",
+          value: "123"
+        })
+      }} />
+      }}>Add to Basket</input>
+    </div>
+    )
+  }
 }`}
           </EuiCodeBlock>
         </EuiText>

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx
@@ -67,7 +67,7 @@ describe('useEnterpriseSearchContentNav', () => {
             name: 'Collections',
           },
         ],
-        name: 'Analytics',
+        name: 'Behavorial Analytics',
       },
       {
         id: 'search',

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
@@ -106,7 +106,7 @@ export const useEnterpriseSearchNav = () => {
         },
       ],
       name: i18n.translate('xpack.enterpriseSearch.nav.analyticsTitle', {
-        defaultMessage: 'Analytics',
+        defaultMessage: 'Behavorial Analytics',
       }),
     },
     {

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
@@ -479,9 +479,14 @@ export const LensTopNavMenu = ({
     if (!activeDatasourceId || !discoverLocator) {
       return;
     }
+    if (visualization.activeId == null) {
+      return;
+    }
     return getLayerMetaInfo(
       datasourceMap[activeDatasourceId],
       datasourceStates[activeDatasourceId].state,
+      visualizationMap[visualization.activeId],
+      visualization.state,
       activeData,
       dataViews.indexPatterns,
       data.query.timefilter.timefilter.getTime(),
@@ -490,8 +495,10 @@ export const LensTopNavMenu = ({
   }, [
     activeDatasourceId,
     discoverLocator,
+    visualization,
     datasourceMap,
     datasourceStates,
+    visualizationMap,
     activeData,
     dataViews.indexPatterns,
     data.query.timefilter.timefilter,