Update UX

elastic · May 16, 2023 · 0bc520b · 0bc520b
1 parent 52b5eb2
commit 0bc520b
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 27 deletions.
diff --git a/x-pack/plugins/ux/public/application/application.test.tsx b/x-pack/plugins/ux/public/application/application.test.tsx
@@ -25,6 +25,17 @@ jest.mock('../components/app/rum_dashboard/rum_home', () => ({
   RumHome: () => <p>Home Mock</p>,
 }));
 
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const actual = jest.requireActual('@kbn/kibana-react-plugin/public');
+  return {
+    ...actual,
+    useUiSetting: () => ({
+      from: new Date(),
+      to: new Date(),
+    }),
+  };
+});
+
 const mockPlugin = {
   data: {
     query: {
@@ -48,7 +59,7 @@ const mockCorePlugins = {
   embeddable: mockEmbeddable,
   inspector: {},
   maps: {},
-  observability: {
+  observabilityShared: {
     navigation: {
       registerSections: () => jest.fn(),
       PageTemplate: ({ children }: { children: React.ReactNode }) => (

diff --git a/x-pack/plugins/ux/public/application/ux_app.tsx b/x-pack/plugins/ux/public/application/ux_app.tsx
@@ -27,11 +27,11 @@ import {
   useUiSetting$,
 } from '@kbn/kibana-react-plugin/public';
 
+import { DatePickerContextProvider } from '@kbn/observability-plugin/public';
 import {
-  DatePickerContextProvider,
   InspectorContextProvider,
   useBreadcrumbs,
-} from '@kbn/observability-plugin/public';
+} from '@kbn/observability-shared-plugin/public';
 import { CsmSharedContextProvider } from '../components/app/rum_dashboard/csm_shared_context';
 import {
   DASHBOARD_LABEL,
@@ -160,6 +160,7 @@ export function UXAppRoot({
             value={{
               appMountParameters,
               exploratoryView,
+              observabilityShared,
             }}
           >
             <i18nCore.Context>

diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiHeaderLinks, EuiHeaderLink, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { HeaderMenuPortal } from '@kbn/observability-plugin/public';
+import { HeaderMenuPortal } from '@kbn/observability-shared-plugin/public';
 import {
   RECORDS_FIELD,
   createExploratoryViewUrl,

diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/inpector_link.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/inpector_link.tsx
@@ -8,10 +8,8 @@
 import { EuiHeaderLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import {
-  useInspectorContext,
-  enableInspectEsQueries,
-} from '@kbn/observability-plugin/public';
+import { enableInspectEsQueries } from '@kbn/observability-plugin/public';
+import { useInspectorContext } from '@kbn/observability-shared-plugin/public';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
 
 export function UxInspectorHeaderLink() {

diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_views_chart.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_views_chart.tsx
@@ -7,7 +7,8 @@
 
 import moment from 'moment';
 import React, { useCallback } from 'react';
-import { fromQuery, toQuery, useTheme } from '@kbn/observability-plugin/public';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
+import { useTheme } from '@kbn/observability-shared-plugin/public';
 import { AllSeries, RECORDS_FIELD } from '@kbn/exploratory-view-plugin/public';
 import { useHistory } from 'react-router-dom';
 

diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/hooks/use_has_rum_data.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/hooks/use_has_rum_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useEsSearch } from '@kbn/observability-plugin/public';
+import { useEsSearch } from '@kbn/observability-shared-plugin/public';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
 import { useEffect } from 'react';
 import {

diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_wildcards.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_wildcards.tsx
@@ -8,11 +8,8 @@
 import * as React from 'react';
 import { useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
-import {
-  FilterValueLabel,
-  fromQuery,
-  toQuery,
-} from '@kbn/observability-plugin/public';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
+import { FilterValueLabel } from '@kbn/exploratory-view-plugin/public';
 import type { DataView } from '@kbn/data-views-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { TRANSACTION_URL } from '../../../../../common/elasticsearch_fieldnames';

diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/panels/web_application_select.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/panels/web_application_select.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { useEsSearch } from '@kbn/observability-plugin/public';
+import { useEsSearch } from '@kbn/observability-shared-plugin/public';
 import { serviceNameQuery } from '../../../../services/data/service_name_query';
 import { ServiceNameFilter } from '../url_filter/service_name_filter';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';

diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_dashboard.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_dashboard.tsx
@@ -7,7 +7,7 @@
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import React from 'react';
-import { LoadWhenInView } from '@kbn/observability-plugin/public';
+import { LoadWhenInView } from '@kbn/observability-shared-plugin/public';
 import { I18LABELS } from './translations';
 import { UXMetrics } from './ux_metrics';
 import { ImpactfulMetrics } from './impactful_metrics';

diff --git a/...k/plugins/ux/public/components/app/rum_dashboard/url_filter/url_search/use_url_search.tsx b/...k/plugins/ux/public/components/app/rum_dashboard/url_filter/url_search/use_url_search.tsx
@@ -7,7 +7,7 @@
 
 import useDebounce from 'react-use/lib/useDebounce';
 import { useMemo, useState } from 'react';
-import { useEsSearch } from '@kbn/observability-plugin/public';
+import { useEsSearch } from '@kbn/observability-shared-plugin/public';
 import { useUxQuery } from '../../hooks/use_ux_query';
 import { useLegacyUrlParams } from '../../../../../context/url_params_context/use_url_params';
 import { useDataView } from '../../local_uifilters/use_data_view';

diff --git a/x-pack/plugins/ux/public/context/plugin_context.ts b/x-pack/plugins/ux/public/context/plugin_context.ts
@@ -5,13 +5,15 @@
  * 2.0.
  */
 
-import { AppMountParameters } from '@kbn/core/public';
-import type { ExploratoryViewPublicStart } from '@kbn/exploratory-view-plugin/public';
 import { createContext } from 'react';
+import type { AppMountParameters } from '@kbn/core/public';
+import type { ExploratoryViewPublicStart } from '@kbn/exploratory-view-plugin/public';
+import type { ObservabilitySharedPluginStart } from '@kbn/observability-shared-plugin/public';
 
 export interface PluginContextValue {
   appMountParameters: AppMountParameters;
   exploratoryView: ExploratoryViewPublicStart;
+  observabilityShared: ObservabilitySharedPluginStart;
 }
 
 export const PluginContext = createContext({} as PluginContextValue);
diff --git a/x-pack/plugins/ux/public/hooks/use_client_metrics_query.ts b/x-pack/plugins/ux/public/hooks/use_client_metrics_query.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useEsSearch } from '@kbn/observability-plugin/public';
+import { useEsSearch } from '@kbn/observability-shared-plugin/public';
 import { useMemo } from 'react';
 import { useDataView } from '../components/app/rum_dashboard/local_uifilters/use_data_view';
 import { useLegacyUrlParams } from '../context/url_params_context/use_url_params';

diff --git a/x-pack/plugins/ux/public/hooks/use_core_web_vitals_query.ts b/x-pack/plugins/ux/public/hooks/use_core_web_vitals_query.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useEsSearch } from '@kbn/observability-plugin/public';
+import { useEsSearch } from '@kbn/observability-shared-plugin/public';
 import { useMemo } from 'react';
 import { useDataView } from '../components/app/rum_dashboard/local_uifilters/use_data_view';
 import { callDateMath } from '../services/data/call_date_math';

diff --git a/x-pack/plugins/ux/public/hooks/use_environments_fetcher.tsx b/x-pack/plugins/ux/public/hooks/use_environments_fetcher.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useEsSearch } from '@kbn/observability-plugin/public';
+import { useEsSearch } from '@kbn/observability-shared-plugin/public';
 import { useMemo } from 'react';
 import {
   ENVIRONMENT_ALL,

diff --git a/x-pack/plugins/ux/public/hooks/use_fetcher.tsx b/x-pack/plugins/ux/public/hooks/use_fetcher.tsx
@@ -16,7 +16,7 @@ import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   useInspectorContext,
   FETCH_STATUS,
-} from '@kbn/observability-plugin/public';
+} from '@kbn/observability-shared-plugin/public';
 import {
   AutoAbortedAPMClient,
   callApmApi,

diff --git a/x-pack/plugins/ux/public/hooks/use_js_errors_query.tsx b/x-pack/plugins/ux/public/hooks/use_js_errors_query.tsx
@@ -6,7 +6,7 @@
  */
 
 import datemath from '@kbn/datemath';
-import { useEsSearch } from '@kbn/observability-plugin/public';
+import { useEsSearch } from '@kbn/observability-shared-plugin/public';
 import { useMemo } from 'react';
 import { useDataView } from '../components/app/rum_dashboard/local_uifilters/use_data_view';
 import { jsErrorsQuery } from '../services/data/js_errors_query';

diff --git a/x-pack/plugins/ux/public/hooks/use_long_task_metrics_query.tsx b/x-pack/plugins/ux/public/hooks/use_long_task_metrics_query.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useEsSearch } from '@kbn/observability-plugin/public';
+import { useEsSearch } from '@kbn/observability-shared-plugin/public';
 import { useMemo } from 'react';
 import { useDataView } from '../components/app/rum_dashboard/local_uifilters/use_data_view';
 import { longTaskMetricsQuery } from '../services/data/long_task_metrics_query';

diff --git a/x-pack/plugins/ux/public/hooks/use_static_data_view.ts b/x-pack/plugins/ux/public/hooks/use_static_data_view.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useFetcher } from '@kbn/observability-plugin/public';
+import { useFetcher } from '@kbn/observability-shared-plugin/public';
 import { useKibanaServices } from './use_kibana_services';
 
 export function useStaticDataView() {