From d858b3b467a0f08c033dcad6ba846d75ac625a8e Mon Sep 17 00:00:00 2001 From: Ashokaditya Date: Fri, 22 Nov 2024 19:47:23 +0100 Subject: [PATCH] fix imports --- x-pack/plugins/data_usage/common/index.ts | 27 ------------------- .../public/app/components/chart_panel.tsx | 2 +- .../public/app/components/charts.tsx | 2 +- .../app/components/data_usage_metrics.tsx | 2 +- .../app/components/filters/charts_filter.tsx | 2 +- .../app/components/filters/date_picker.tsx | 2 +- .../public/app/hooks/use_charts_filter.tsx | 8 +++--- .../app/hooks/use_charts_url_params.test.tsx | 2 +- .../app/hooks/use_charts_url_params.tsx | 2 +- .../plugins/data_usage/public/application.tsx | 3 ++- .../public/hooks/use_get_usage_metrics.ts | 12 ++++----- .../server/routes/internal/data_streams.ts | 3 ++- .../server/routes/internal/usage_metrics.ts | 7 ++--- .../routes/internal/usage_metrics_handler.ts | 12 ++++----- .../data_usage/server/services/autoops_api.ts | 4 +-- .../data_usage/server/services/index.ts | 2 +- 16 files changed, 32 insertions(+), 60 deletions(-) diff --git a/x-pack/plugins/data_usage/common/index.ts b/x-pack/plugins/data_usage/common/index.ts index 2448893df0685..63e34f872108c 100644 --- a/x-pack/plugins/data_usage/common/index.ts +++ b/x-pack/plugins/data_usage/common/index.ts @@ -12,30 +12,3 @@ export { DATA_USAGE_METRICS_API_ROUTE, DATA_USAGE_DATA_STREAMS_API_ROUTE, } from './constants'; -export { dateParser, momentDateParser } from './utils'; - -export { - DataUsageQueryClient, - dataUsageQueryClient, - DataUsageReactQueryClientProvider, - type ReactQueryClientProviderProps, -} from './query_client'; - -export { - DEFAULT_METRIC_TYPES, - METRIC_TYPE_VALUES, - isDefaultMetricType, - METRIC_TYPE_API_VALUES_TO_UI_OPTIONS_MAP, - isMetricType, - UsageMetricsRequestSchema, - UsageMetricsResponseSchema, - UsageMetricsAutoOpsResponseSchema, - DataStreamsResponseSchema, - type MetricTypes, - type UsageMetricsRequestBody, - type UsageMetricsResponseSchemaBody, - type MetricSeries, - type UsageMetricsAutoOpsResponseMetricSeries, - type UsageMetricsAutoOpsResponseSchemaBody, - type DataStreamsResponseBodySchemaBody, -} from './rest_types'; diff --git a/x-pack/plugins/data_usage/public/app/components/chart_panel.tsx b/x-pack/plugins/data_usage/public/app/components/chart_panel.tsx index 9556b5b377d0f..9fdb4e1f73ac5 100644 --- a/x-pack/plugins/data_usage/public/app/components/chart_panel.tsx +++ b/x-pack/plugins/data_usage/public/app/components/chart_panel.tsx @@ -20,7 +20,7 @@ import { } from '@elastic/charts'; import { i18n } from '@kbn/i18n'; import { LegendAction } from './legend_action'; -import { type MetricTypes, type MetricSeries } from '../../../common'; +import { type MetricTypes, type MetricSeries } from '../../../common/rest_types'; import { formatBytes } from '../../utils/format_bytes'; // TODO: Remove this when we have a title for each metric type diff --git a/x-pack/plugins/data_usage/public/app/components/charts.tsx b/x-pack/plugins/data_usage/public/app/components/charts.tsx index fc1dcfcfd9459..271cfe432402d 100644 --- a/x-pack/plugins/data_usage/public/app/components/charts.tsx +++ b/x-pack/plugins/data_usage/public/app/components/charts.tsx @@ -7,7 +7,7 @@ import React, { useCallback, useState } from 'react'; import { EuiFlexGroup } from '@elastic/eui'; import { ChartPanel } from './chart_panel'; -import { type UsageMetricsResponseSchemaBody, type MetricTypes } from '../../../common'; +import type { UsageMetricsResponseSchemaBody, MetricTypes } from '../../../common/rest_types'; import { useTestIdGenerator } from '../../hooks/use_test_id_generator'; interface ChartsProps { data: UsageMetricsResponseSchemaBody; diff --git a/x-pack/plugins/data_usage/public/app/components/data_usage_metrics.tsx b/x-pack/plugins/data_usage/public/app/components/data_usage_metrics.tsx index 94566f92e8daf..d7d6417cf1444 100644 --- a/x-pack/plugins/data_usage/public/app/components/data_usage_metrics.tsx +++ b/x-pack/plugins/data_usage/public/app/components/data_usage_metrics.tsx @@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n'; import { Charts } from './charts'; import { useBreadcrumbs } from '../../utils/use_breadcrumbs'; import { useKibanaContextForPlugin } from '../../utils/use_kibana'; -import { DEFAULT_METRIC_TYPES, type UsageMetricsRequestBody } from '../../../common'; +import { DEFAULT_METRIC_TYPES, type UsageMetricsRequestBody } from '../../../common/rest_types'; import { PLUGIN_NAME } from '../../translations'; import { useGetDataUsageMetrics } from '../../hooks/use_get_usage_metrics'; import { useGetDataUsageDataStreams } from '../../hooks/use_get_data_streams'; diff --git a/x-pack/plugins/data_usage/public/app/components/filters/charts_filter.tsx b/x-pack/plugins/data_usage/public/app/components/filters/charts_filter.tsx index 5cda4f578172b..fcff6fc13f260 100644 --- a/x-pack/plugins/data_usage/public/app/components/filters/charts_filter.tsx +++ b/x-pack/plugins/data_usage/public/app/components/filters/charts_filter.tsx @@ -10,7 +10,7 @@ import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from ' import { EuiPopoverTitle, EuiSelectable, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { useTestIdGenerator } from '../../../hooks/use_test_id_generator'; -import { METRIC_TYPE_API_VALUES_TO_UI_OPTIONS_MAP } from '../../../../common'; +import { METRIC_TYPE_API_VALUES_TO_UI_OPTIONS_MAP } from '../../../../common/rest_types'; import { UX_LABELS } from '../../../translations'; import { ChartsFilterPopover } from './charts_filter_popover'; import { ToggleAllButton } from './toggle_all_button'; diff --git a/x-pack/plugins/data_usage/public/app/components/filters/date_picker.tsx b/x-pack/plugins/data_usage/public/app/components/filters/date_picker.tsx index 234535efe01e9..81ab435670f89 100644 --- a/x-pack/plugins/data_usage/public/app/components/filters/date_picker.tsx +++ b/x-pack/plugins/data_usage/public/app/components/filters/date_picker.tsx @@ -15,7 +15,7 @@ import type { OnRefreshChangeProps, } from '@elastic/eui/src/components/date_picker/types'; import { UI_SETTINGS } from '@kbn/data-plugin/common'; -import { momentDateParser } from '../../../../common'; +import { momentDateParser } from '../../../../common/utils'; import { useTestIdGenerator } from '../../../hooks/use_test_id_generator'; import { DEFAULT_DATE_RANGE_OPTIONS } from '../../hooks/use_date_picker'; diff --git a/x-pack/plugins/data_usage/public/app/hooks/use_charts_filter.tsx b/x-pack/plugins/data_usage/public/app/hooks/use_charts_filter.tsx index b7c39f7ab737f..012a6027aadb2 100644 --- a/x-pack/plugins/data_usage/public/app/hooks/use_charts_filter.tsx +++ b/x-pack/plugins/data_usage/public/app/hooks/use_charts_filter.tsx @@ -6,12 +6,12 @@ */ import { useState, useEffect, useMemo } from 'react'; +import { DEFAULT_SELECTED_OPTIONS } from '../../../common'; import { - isDefaultMetricType, - METRIC_TYPE_API_VALUES_TO_UI_OPTIONS_MAP, METRIC_TYPE_VALUES, - DEFAULT_SELECTED_OPTIONS, -} from '../../../common'; + METRIC_TYPE_API_VALUES_TO_UI_OPTIONS_MAP, + isDefaultMetricType, +} from '../../../common/rest_types'; import { FILTER_NAMES } from '../../translations'; import { useDataUsageMetricsUrlParams } from './use_charts_url_params'; import { formatBytes } from '../../utils/format_bytes'; diff --git a/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.test.tsx b/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.test.tsx index b9491bde0c60f..20f091029f5b8 100644 --- a/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.test.tsx +++ b/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.test.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import { METRIC_TYPE_VALUES, type MetricTypes } from '../../../common'; +import { METRIC_TYPE_VALUES, type MetricTypes } from '../../../common/rest_types'; import { getDataUsageMetricsFiltersFromUrlParams } from './use_charts_url_params'; describe('#getDataUsageMetricsFiltersFromUrlParams', () => { diff --git a/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.tsx b/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.tsx index 070662babf8e6..3a1ba7dc1de62 100644 --- a/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.tsx +++ b/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.tsx @@ -6,7 +6,7 @@ */ import { useCallback, useEffect, useMemo, useState } from 'react'; import { useHistory, useLocation } from 'react-router-dom'; -import { type MetricTypes, isMetricType } from '../../../common'; +import { type MetricTypes, isMetricType } from '../../../common/rest_types'; import { useUrlParams } from '../../hooks/use_url_params'; import { DEFAULT_DATE_RANGE_OPTIONS } from './use_date_picker'; diff --git a/x-pack/plugins/data_usage/public/application.tsx b/x-pack/plugins/data_usage/public/application.tsx index 491caaa2ab506..7bd2c794d5b3c 100644 --- a/x-pack/plugins/data_usage/public/application.tsx +++ b/x-pack/plugins/data_usage/public/application.tsx @@ -15,7 +15,8 @@ import { useExecutionContext } from '@kbn/kibana-react-plugin/public'; import { PerformanceContextProvider } from '@kbn/ebt-tools'; import { useKibanaContextForPluginProvider } from './utils/use_kibana'; import { DataUsageStartDependencies, DataUsagePublicStart } from './types'; -import { PLUGIN_ID, DataUsageReactQueryClientProvider } from '../common'; +import { PLUGIN_ID } from '../common'; +import { DataUsageReactQueryClientProvider } from '../common/query_client'; import { DataUsageMetricsPage } from './app/data_usage_metrics_page'; export const renderApp = ( diff --git a/x-pack/plugins/data_usage/public/hooks/use_get_usage_metrics.ts b/x-pack/plugins/data_usage/public/hooks/use_get_usage_metrics.ts index f62cf08953e3d..da5f3004d0024 100644 --- a/x-pack/plugins/data_usage/public/hooks/use_get_usage_metrics.ts +++ b/x-pack/plugins/data_usage/public/hooks/use_get_usage_metrics.ts @@ -8,12 +8,12 @@ import type { UseQueryOptions, UseQueryResult } from '@tanstack/react-query'; import { useQuery } from '@tanstack/react-query'; import type { IHttpFetchError } from '@kbn/core-http-browser'; -import { - type UsageMetricsRequestBody, - type UsageMetricsResponseSchemaBody, - DATA_USAGE_METRICS_API_ROUTE, - dateParser, -} from '../../common'; +import { dateParser } from '../../common/utils'; +import { DATA_USAGE_METRICS_API_ROUTE } from '../../common'; +import type { + UsageMetricsRequestBody, + UsageMetricsResponseSchemaBody, +} from '../../common/rest_types'; import { useKibanaContextForPlugin } from '../utils/use_kibana'; interface ErrorType { diff --git a/x-pack/plugins/data_usage/server/routes/internal/data_streams.ts b/x-pack/plugins/data_usage/server/routes/internal/data_streams.ts index a808eccd2e9d0..bfa236aa1cec0 100644 --- a/x-pack/plugins/data_usage/server/routes/internal/data_streams.ts +++ b/x-pack/plugins/data_usage/server/routes/internal/data_streams.ts @@ -5,7 +5,8 @@ * 2.0. */ -import { DataStreamsResponseSchema, DATA_USAGE_DATA_STREAMS_API_ROUTE } from '../../../common'; +import { DataStreamsResponseSchema } from '../../../common/rest_types'; +import { DATA_USAGE_DATA_STREAMS_API_ROUTE } from '../../../common'; import { DataUsageContext, DataUsageRouter } from '../../types'; import { getDataStreamsHandler } from './data_streams_handler'; diff --git a/x-pack/plugins/data_usage/server/routes/internal/usage_metrics.ts b/x-pack/plugins/data_usage/server/routes/internal/usage_metrics.ts index 93b3dbe764913..866f7e646a8dc 100644 --- a/x-pack/plugins/data_usage/server/routes/internal/usage_metrics.ts +++ b/x-pack/plugins/data_usage/server/routes/internal/usage_metrics.ts @@ -5,11 +5,8 @@ * 2.0. */ -import { - UsageMetricsRequestSchema, - UsageMetricsResponseSchema, - DATA_USAGE_METRICS_API_ROUTE, -} from '../../../common'; +import { UsageMetricsRequestSchema, UsageMetricsResponseSchema } from '../../../common/rest_types'; +import { DATA_USAGE_METRICS_API_ROUTE } from '../../../common'; import { DataUsageContext, DataUsageRouter } from '../../types'; import { getUsageMetricsHandler } from './usage_metrics_handler'; diff --git a/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts b/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts index 2b855c2a34cab..c2dee4ca2ce52 100644 --- a/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts +++ b/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts @@ -7,12 +7,12 @@ import { chunk } from 'lodash/fp'; import { RequestHandler } from '@kbn/core/server'; -import { - type MetricTypes, - type UsageMetricsAutoOpsResponseSchemaBody, - type UsageMetricsRequestBody, - type UsageMetricsResponseSchemaBody, -} from '../../../common'; +import type { + MetricTypes, + UsageMetricsAutoOpsResponseSchemaBody, + UsageMetricsRequestBody, + UsageMetricsResponseSchemaBody, +} from '../../../common/rest_types'; import { DataUsageContext, DataUsageRequestHandlerContext } from '../../types'; import { errorHandler } from '../error_handler'; diff --git a/x-pack/plugins/data_usage/server/services/autoops_api.ts b/x-pack/plugins/data_usage/server/services/autoops_api.ts index 63312ad893da4..2ff824e04f6dd 100644 --- a/x-pack/plugins/data_usage/server/services/autoops_api.ts +++ b/x-pack/plugins/data_usage/server/services/autoops_api.ts @@ -18,8 +18,8 @@ import { UsageMetricsAutoOpsResponseSchema, type UsageMetricsAutoOpsResponseSchemaBody, type UsageMetricsRequestBody, - dateParser, -} from '../../common'; +} from '../../common/rest_types'; +import { dateParser } from '../../common/utils'; import { AutoOpsConfig } from '../types'; import { AutoOpsError } from './errors'; import { appContextService } from './app_context'; diff --git a/x-pack/plugins/data_usage/server/services/index.ts b/x-pack/plugins/data_usage/server/services/index.ts index 64038063a39ea..56e449c8a5679 100644 --- a/x-pack/plugins/data_usage/server/services/index.ts +++ b/x-pack/plugins/data_usage/server/services/index.ts @@ -6,7 +6,7 @@ */ import { ValidationError } from '@kbn/config-schema'; import { Logger } from '@kbn/logging'; -import { type MetricTypes } from '../../common'; +import type { MetricTypes } from '../../common/rest_types'; import { AutoOpsError } from './errors'; import { AutoOpsAPIService } from './autoops_api';