[Metrics UI] Reorganize file layout for Metrics UI (#60049) (#64007)

* [Metrics UI] Reorganize pages specific files under pages - Restructuring pages folder - Renaming metrics_ui to metrics - Fixing paths in jest mocks - Fixing AlertsFlyout path - Fixing bad file paths from the merge * Fixing typo compontents to components Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
elastic · Apr 21, 2020 · b0d7c8c · b0d7c8c
1 parent d860bb8
commit b0d7c8c
Show file tree

Hide file tree

Showing 139 changed files with 683 additions and 722 deletions.
diff --git a/x-pack/plugins/infra/common/inventory_models/aws_ec2/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_ec2/layout.tsx
@@ -6,19 +6,19 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutPropsWithTheme } from '../../../public/pages/metrics/types';
+import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Section } from '../../../public/pages/metrics/components/section';
+import { Section } from '../../../public/pages/metrics/metric_detail/components/section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SubSection } from '../../../public/pages/metrics/components/sub_section';
+import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
+import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
+import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { withTheme } from '../../../../observability/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { MetadataDetails } from '../../../public/pages/metrics/components/metadata_details';
+import { MetadataDetails } from '../../../public/pages/metrics/metric_detail/components/metadata_details';
 
 export const Layout = withTheme(({ metrics, theme, onChangeRangeTime }: LayoutPropsWithTheme) => (
   <React.Fragment>

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx
@@ -6,9 +6,9 @@
 
 import React from 'react';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
-import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
-import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
+import { ToolbarProps } from '../../../public/pages/metrics/inventory_view/components/toolbars/toolbar';
+import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_groupby_toolbar_items';
+import { CloudToolbarItems } from '../shared/components/cloud_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
 export const AwsEC2ToolbarItems = (props: ToolbarProps) => {

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_rds/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_rds/layout.tsx
@@ -6,17 +6,17 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutPropsWithTheme } from '../../../public/pages/metrics/types';
+import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Section } from '../../../public/pages/metrics/components/section';
+import { Section } from '../../../public/pages/metrics/metric_detail/components/section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SubSection } from '../../../public/pages/metrics/components/sub_section';
+import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
+import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { withTheme } from '../../../../observability/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
+import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
 export const Layout = withTheme(({ metrics, onChangeRangeTime, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx
@@ -6,9 +6,9 @@
 
 import React from 'react';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
-import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
-import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
+import { ToolbarProps } from '../../../public/pages/metrics/inventory_view/components/toolbars/toolbar';
+import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_groupby_toolbar_items';
+import { CloudToolbarItems } from '../shared/components/cloud_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
 export const AwsRDSToolbarItems = (props: ToolbarProps) => {

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_s3/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_s3/layout.tsx
@@ -6,17 +6,17 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutPropsWithTheme } from '../../../public/pages/metrics/types';
+import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Section } from '../../../public/pages/metrics/components/section';
+import { Section } from '../../../public/pages/metrics/metric_detail/components/section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SubSection } from '../../../public/pages/metrics/components/sub_section';
+import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
+import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { withTheme } from '../../../../observability/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
+import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
 export const Layout = withTheme(({ metrics, onChangeRangeTime, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx
@@ -6,9 +6,9 @@
 
 import React from 'react';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
-import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
-import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
+import { ToolbarProps } from '../../../public/pages/metrics/inventory_view/components/toolbars/toolbar';
+import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_groupby_toolbar_items';
+import { CloudToolbarItems } from '../shared/components/cloud_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
 export const AwsS3ToolbarItems = (props: ToolbarProps) => {

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_sqs/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_sqs/layout.tsx
@@ -6,17 +6,17 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutPropsWithTheme } from '../../../public/pages/metrics/types';
+import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Section } from '../../../public/pages/metrics/components/section';
+import { Section } from '../../../public/pages/metrics/metric_detail/components/section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SubSection } from '../../../public/pages/metrics/components/sub_section';
+import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
+import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { withTheme } from '../../../../observability/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
+import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
 export const Layout = withTheme(({ metrics, onChangeRangeTime, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx
@@ -6,9 +6,9 @@
 
 import React from 'react';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
-import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
-import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
+import { ToolbarProps } from '../../../public/pages/metrics/inventory_view/components/toolbars/toolbar';
+import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_groupby_toolbar_items';
+import { CloudToolbarItems } from '../shared/components/cloud_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
 export const AwsSQSToolbarItems = (props: ToolbarProps) => {

diff --git a/x-pack/plugins/infra/common/inventory_models/container/layout.tsx b/x-pack/plugins/infra/common/inventory_models/container/layout.tsx
@@ -6,21 +6,21 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutPropsWithTheme } from '../../../public/pages/metrics/types';
+import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Section } from '../../../public/pages/metrics/components/section';
+import { Section } from '../../../public/pages/metrics/metric_detail/components/section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SubSection } from '../../../public/pages/metrics/components/sub_section';
+import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { GaugesSectionVis } from '../../../public/pages/metrics/components/gauges_section_vis';
+import { GaugesSectionVis } from '../../../public/pages/metrics/metric_detail/components/gauges_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
+import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { withTheme } from '../../../../observability/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
+import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { MetadataDetails } from '../../../public/pages/metrics/components/metadata_details';
+import { MetadataDetails } from '../../../public/pages/metrics/metric_detail/components/metadata_details';
 
 export const Layout = withTheme(({ metrics, onChangeRangeTime, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>

diff --git a/x-pack/plugins/infra/common/inventory_models/container/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/container/toolbar_items.tsx
@@ -6,8 +6,8 @@
 
 import React from 'react';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
-import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
+import { ToolbarProps } from '../../../public/pages/metrics/inventory_view/components/toolbars/toolbar';
+import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_groupby_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
 export const ContainerToolbarItems = (props: ToolbarProps) => {

diff --git a/x-pack/plugins/infra/common/inventory_models/host/layout.tsx b/x-pack/plugins/infra/common/inventory_models/host/layout.tsx
@@ -8,21 +8,21 @@ import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { withTheme } from '../../../../observability/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutPropsWithTheme } from '../../../public/pages/metrics/types';
+import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Section } from '../../../public/pages/metrics/components/section';
+import { Section } from '../../../public/pages/metrics/metric_detail/components/section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SubSection } from '../../../public/pages/metrics/components/sub_section';
+import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { GaugesSectionVis } from '../../../public/pages/metrics/components/gauges_section_vis';
+import { GaugesSectionVis } from '../../../public/pages/metrics/metric_detail/components/gauges_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
+import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
 import * as Aws from '../shared/layouts/aws';
 import * as Ngnix from '../shared/layouts/nginx';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { MetadataDetails } from '../../../public/pages/metrics/components/metadata_details';
+import { MetadataDetails } from '../../../public/pages/metrics/metric_detail/components/metadata_details';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
+import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
 export const Layout = withTheme(({ metrics, onChangeRangeTime, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>

diff --git a/x-pack/plugins/infra/common/inventory_models/host/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/host/toolbar_items.tsx
@@ -6,8 +6,8 @@
 
 import React from 'react';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
-import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
+import { ToolbarProps } from '../../../public/pages/metrics/inventory_view/components/toolbars/toolbar';
+import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_groupby_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
 export const HostToolbarItems = (props: ToolbarProps) => {

diff --git a/x-pack/plugins/infra/common/inventory_models/layouts.ts b/x-pack/plugins/infra/common/inventory_models/layouts.ts
@@ -23,7 +23,7 @@ import { Layout as AwsRDSLayout } from './aws_rds/layout';
 import { Layout as AwsSQSLayout } from './aws_sqs/layout';
 import { InventoryItemType } from './types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutProps } from '../../public/pages/metrics/types';
+import { LayoutProps } from '../../public/pages/metrics/metric_detail/types';
 
 interface Layouts {
   [type: string]: ReactNode;

diff --git a/x-pack/plugins/infra/common/inventory_models/pod/layout.tsx b/x-pack/plugins/infra/common/inventory_models/pod/layout.tsx
@@ -6,22 +6,22 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutPropsWithTheme } from '../../../public/pages/metrics/types';
+import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Section } from '../../../public/pages/metrics/components/section';
+import { Section } from '../../../public/pages/metrics/metric_detail/components/section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SubSection } from '../../../public/pages/metrics/components/sub_section';
+import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { GaugesSectionVis } from '../../../public/pages/metrics/components/gauges_section_vis';
+import { GaugesSectionVis } from '../../../public/pages/metrics/metric_detail/components/gauges_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
+import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { withTheme } from '../../../../observability/public';
 import * as Nginx from '../shared/layouts/nginx';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { MetadataDetails } from '../../../public/pages/metrics/components/metadata_details';
+import { MetadataDetails } from '../../../public/pages/metrics/metric_detail/components/metadata_details';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
+import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
 export const Layout = withTheme(({ metrics, onChangeRangeTime, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>

diff --git a/x-pack/plugins/infra/common/inventory_models/pod/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/pod/toolbar_items.tsx
@@ -6,8 +6,8 @@
 
 import React from 'react';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
-import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
+import { ToolbarProps } from '../../../public/pages/metrics/inventory_view/components/toolbars/toolbar';
+import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_groupby_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
 export const PodToolbarItems = (props: ToolbarProps) => {

diff --git a/...hared/compontents/cloud_toolbar_items.tsx → ...shared/components/cloud_toolbar_items.tsx b/...hared/compontents/cloud_toolbar_items.tsx → ...shared/components/cloud_toolbar_items.tsx
@@ -7,11 +7,11 @@
 import React from 'react';
 import { EuiFlexItem } from '@elastic/eui';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ToolbarProps } from '../../../../public/components/inventory/toolbars/toolbar';
+import { ToolbarProps } from '../../../../public/pages/metrics/inventory_view/components/toolbars/toolbar';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { WaffleAccountsControls } from '../../../../public/components/waffle/waffle_accounts_controls';
+import { WaffleAccountsControls } from '../../../../public/pages/metrics/inventory_view/components/waffle/waffle_accounts_controls';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { WaffleRegionControls } from '../../../../public/components/waffle/waffle_region_controls';
+import { WaffleRegionControls } from '../../../../public/pages/metrics/inventory_view/components/waffle/waffle_region_controls';
 
 type Props = ToolbarProps;