From d26ba8a9f3333c2a40edcc7ad8204a6cba31594a Mon Sep 17 00:00:00 2001 From: Sonia Sanz Vivas Date: Fri, 3 Jan 2025 15:25:35 +0100 Subject: [PATCH] [Remote Clusters] Modify folder structure (#205473) Part of https://github.com/elastic/kibana/issues/199664 ## Summary As part of the work of the `Remote clusters: UX improvements` project I've changed a bit the folder structure and moved some files that are going to be used by more than one step. Since the PR will be large, I decided to create a PR only for the structure changes to avoid much noise in the main PR. The new structure will be as follows: ``` |-- x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/ |-- remote_cluster_config_steps [new folder] |-- components [will be used for the common components for all the steps] |-- request_flyout.tsx [existing but moved here] |-- remote_cluster_form |-- remote_cluster_setup_trust ``` --- .../edit/remote_clusters_edit.test.tsx | 2 +- .../public/application/sections/components/index.js | 4 ++-- .../components}/request_flyout.tsx | 2 +- .../remote_cluster_form/components/connection_mode.tsx | 4 ++-- .../components/connection_mode_cloud.tsx | 2 +- .../remote_cluster_form/components/index.ts | 0 .../components/proxy_connection.tsx | 2 +- .../components/sniff_connection.tsx | 2 +- .../remote_cluster_form/index.ts | 0 .../remote_cluster_form/remote_cluster_form.tsx | 10 +++++----- .../__snapshots__/validate_name.test.ts.snap | 0 .../validate_node_connections.test.tsx.snap | 0 .../__snapshots__/validate_proxy.test.ts.snap | 0 .../__snapshots__/validate_seeds.test.ts.snap | 0 .../remote_cluster_form/validators/index.ts | 0 .../validators/validate_address.test.ts | 0 .../remote_cluster_form/validators/validate_address.ts | 0 .../validators/validate_cloud_url.test.ts | 0 .../validators/validate_cloud_url.tsx | 2 +- .../validators/validate_cluster.tsx | 2 +- .../validators/validate_name.test.ts | 0 .../remote_cluster_form/validators/validate_name.tsx | 0 .../validators/validate_node_connections.test.tsx | 2 +- .../validators/validate_node_connections.tsx | 2 +- .../validators/validate_proxy.test.ts | 0 .../remote_cluster_form/validators/validate_proxy.tsx | 0 .../validators/validate_seed.test.ts | 0 .../remote_cluster_form/validators/validate_seed.tsx | 0 .../validators/validate_seeds.test.ts | 0 .../remote_cluster_form/validators/validate_seeds.tsx | 0 .../remote_cluster_setup_trust/confirm_modal.tsx | 0 .../remote_cluster_setup_trust/index.ts | 0 .../remote_cluster_setup_trust.tsx | 4 ++-- 33 files changed, 20 insertions(+), 20 deletions(-) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{remote_cluster_form => remote_cluster_config_steps/components}/request_flyout.tsx (99%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/components/connection_mode.tsx (94%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/components/connection_mode_cloud.tsx (98%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/components/index.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/components/proxy_connection.tsx (98%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/components/sniff_connection.tsx (98%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/index.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/remote_cluster_form.tsx (97%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/__snapshots__/validate_name.test.ts.snap (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/__snapshots__/validate_node_connections.test.tsx.snap (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/__snapshots__/validate_proxy.test.ts.snap (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/__snapshots__/validate_seeds.test.ts.snap (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/index.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_address.test.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_address.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_cloud_url.test.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_cloud_url.tsx (97%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_cluster.tsx (94%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_name.test.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_name.tsx (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_node_connections.test.tsx (90%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_node_connections.tsx (90%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_proxy.test.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_proxy.tsx (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_seed.test.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_seed.tsx (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_seeds.test.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_form/validators/validate_seeds.tsx (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_setup_trust/confirm_modal.tsx (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_setup_trust/index.ts (100%) rename x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/{ => remote_cluster_config_steps}/remote_cluster_setup_trust/remote_cluster_setup_trust.tsx (98%) diff --git a/x-pack/platform/plugins/private/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.test.tsx b/x-pack/platform/plugins/private/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.test.tsx index c4c656bb646d5..1025c7f50fa7a 100644 --- a/x-pack/platform/plugins/private/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.test.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.test.tsx @@ -8,7 +8,7 @@ import { act } from 'react-dom/test-utils'; import { TestBed } from '@kbn/test-jest-helpers'; -import { RemoteClusterForm } from '../../../public/application/sections/components/remote_cluster_form'; +import { RemoteClusterForm } from '../../../public/application/sections/components/remote_cluster_config_steps/remote_cluster_form'; import { RemoteClustersActions, setupEnvironment } from '../helpers'; import { setup as setupRemoteClustersAdd } from '../add/remote_clusters_add.helpers'; import { diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/index.js b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/index.js index 6fe583f0c5d79..e6801a6b3bbb1 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/index.js +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/index.js @@ -5,7 +5,7 @@ * 2.0. */ -export { RemoteClusterSetupTrust } from './remote_cluster_setup_trust'; -export { RemoteClusterForm } from './remote_cluster_form'; +export { RemoteClusterSetupTrust } from './remote_cluster_config_steps/remote_cluster_setup_trust'; +export { RemoteClusterForm } from './remote_cluster_config_steps/remote_cluster_form'; export { RemoteClusterPageTitle } from './remote_cluster_page_title'; export { ConfiguredByNodeWarning } from './configured_by_node_warning'; diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/request_flyout.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/components/request_flyout.tsx similarity index 99% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/request_flyout.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/components/request_flyout.tsx index a729315357f04..cf46689137b07 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/request_flyout.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/components/request_flyout.tsx @@ -20,7 +20,7 @@ import { EuiTitle, } from '@elastic/eui'; -import { ClusterPayload, serializeCluster } from '../../../../../common/lib'; +import { ClusterPayload, serializeCluster } from '../../../../../../common/lib'; interface Props { close: () => void; diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/connection_mode.tsx similarity index 94% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/connection_mode.tsx index b51d389b73014..8cc45fd2b3473 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/connection_mode.tsx @@ -10,8 +10,8 @@ import { FormattedMessage } from '@kbn/i18n-react'; import { EuiDescribedFormGroup, EuiTitle, EuiFormRow, EuiSwitch } from '@elastic/eui'; -import { SNIFF_MODE, PROXY_MODE } from '../../../../../../common/constants'; -import { useAppContext } from '../../../../app_context'; +import { SNIFF_MODE, PROXY_MODE } from '../../../../../../../common/constants'; +import { useAppContext } from '../../../../../app_context'; import { ClusterErrors } from '../validators'; import { ConnectionModeCloud } from './connection_mode_cloud'; diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode_cloud.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/connection_mode_cloud.tsx similarity index 98% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode_cloud.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/connection_mode_cloud.tsx index b5d27b15de8e2..f9a13f86b8fc3 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode_cloud.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/connection_mode_cloud.tsx @@ -21,7 +21,7 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { proxySettingsUrl } from '../../../../services/documentation'; +import { proxySettingsUrl } from '../../../../../services/documentation'; import { ClusterErrors } from '../validators'; import { FormFields } from '../remote_cluster_form'; diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/index.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/index.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/index.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/index.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/proxy_connection.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/proxy_connection.tsx similarity index 98% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/proxy_connection.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/proxy_connection.tsx index f322aebee9d7e..3d579da219106 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/proxy_connection.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/proxy_connection.tsx @@ -9,7 +9,7 @@ import React, { FunctionComponent } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; import { i18n } from '@kbn/i18n'; import { EuiFieldNumber, EuiFieldText, EuiFormRow, EuiLink } from '@elastic/eui'; -import { proxySettingsUrl } from '../../../../services/documentation'; +import { proxySettingsUrl } from '../../../../../services/documentation'; import { Props } from './connection_mode'; export const ProxyConnection: FunctionComponent = (props) => { diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/sniff_connection.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/sniff_connection.tsx similarity index 98% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/sniff_connection.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/sniff_connection.tsx index c29a1ce5c2169..b4dc347673cdb 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/components/sniff_connection.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/components/sniff_connection.tsx @@ -16,7 +16,7 @@ import { EuiLink, } from '@elastic/eui'; -import { transportPortUrl } from '../../../../services/documentation'; +import { transportPortUrl } from '../../../../../services/documentation'; import { validateSeed } from '../validators'; import { Props } from './connection_mode'; diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/index.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/index.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/index.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/index.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/remote_cluster_form.tsx similarity index 97% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/remote_cluster_form.tsx index 083f7b8f06c93..4eadc0acd25c6 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/remote_cluster_form.tsx @@ -31,14 +31,14 @@ import { EuiSwitchEvent, } from '@elastic/eui'; -import { Cluster, ClusterPayload } from '../../../../../common/lib'; -import { SNIFF_MODE, PROXY_MODE } from '../../../../../common/constants'; +import { Cluster, ClusterPayload } from '../../../../../../common/lib'; +import { SNIFF_MODE, PROXY_MODE } from '../../../../../../common/constants'; -import { AppContext, Context } from '../../../app_context'; +import { AppContext, Context } from '../../../../app_context'; -import { skippingDisconnectedClustersUrl } from '../../../services/documentation'; +import { skippingDisconnectedClustersUrl } from '../../../../services/documentation'; -import { RequestFlyout } from './request_flyout'; +import { RequestFlyout } from '../components/request_flyout'; import { ConnectionMode } from './components'; import { ClusterErrors, diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_name.test.ts.snap b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/__snapshots__/validate_name.test.ts.snap similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_name.test.ts.snap rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/__snapshots__/validate_name.test.ts.snap diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_node_connections.test.tsx.snap b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/__snapshots__/validate_node_connections.test.tsx.snap similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_node_connections.test.tsx.snap rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/__snapshots__/validate_node_connections.test.tsx.snap diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_proxy.test.ts.snap b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/__snapshots__/validate_proxy.test.ts.snap similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_proxy.test.ts.snap rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/__snapshots__/validate_proxy.test.ts.snap diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_seeds.test.ts.snap b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/__snapshots__/validate_seeds.test.ts.snap similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_seeds.test.ts.snap rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/__snapshots__/validate_seeds.test.ts.snap diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/index.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/index.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_address.test.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_address.test.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_address.test.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_address.test.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_address.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_address.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_address.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_address.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.test.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_cloud_url.test.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.test.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_cloud_url.test.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_cloud_url.tsx similarity index 97% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_cloud_url.tsx index 54f050a789b9f..247a996182884 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cloud_url.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_cloud_url.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; -import { Cluster } from '../../../../../../common/lib'; +import { Cluster } from '../../../../../../../common/lib'; import { isAddressValid } from './validate_address'; export const i18nTexts = { diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cluster.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_cluster.tsx similarity index 94% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cluster.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_cluster.tsx index 6d3f9e31c74b6..15686b50d3728 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_cluster.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_cluster.tsx @@ -6,7 +6,7 @@ */ import { validateName } from './validate_name'; -import { PROXY_MODE, SNIFF_MODE } from '../../../../../../common/constants'; +import { PROXY_MODE, SNIFF_MODE } from '../../../../../../../common/constants'; import { validateSeeds } from './validate_seeds'; import { validateProxy } from './validate_proxy'; import { validateCloudRemoteAddress } from './validate_cloud_url'; diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_name.test.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_name.test.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_name.test.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_name.test.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_name.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_name.tsx similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_name.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_name.tsx diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_node_connections.test.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_node_connections.test.tsx similarity index 90% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_node_connections.test.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_node_connections.test.tsx index 20f39395692b7..4d9fedc205e60 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_node_connections.test.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_node_connections.test.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import { MAX_NODE_CONNECTIONS } from '../../../../../../common/constants'; +import { MAX_NODE_CONNECTIONS } from '../../../../../../../common/constants'; import { validateNodeConnections } from './validate_node_connections'; describe('validateNodeConnections', () => { diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_node_connections.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_node_connections.tsx similarity index 90% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_node_connections.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_node_connections.tsx index 4adadb6fc1d6d..2ed76a968cf98 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_node_connections.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_node_connections.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; -import { MAX_NODE_CONNECTIONS } from '../../../../../../common/constants'; +import { MAX_NODE_CONNECTIONS } from '../../../../../../../common/constants'; export function validateNodeConnections(connections?: number | null): null | JSX.Element { if (connections && connections > MAX_NODE_CONNECTIONS) { diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_proxy.test.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_proxy.test.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_proxy.test.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_proxy.test.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_proxy.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_proxy.tsx similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_proxy.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_proxy.tsx diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seed.test.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_seed.test.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seed.test.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_seed.test.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seed.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_seed.tsx similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seed.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_seed.tsx diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seeds.test.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_seeds.test.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seeds.test.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_seeds.test.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seeds.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_seeds.tsx similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seeds.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_form/validators/validate_seeds.tsx diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_setup_trust/confirm_modal.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_setup_trust/confirm_modal.tsx similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_setup_trust/confirm_modal.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_setup_trust/confirm_modal.tsx diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_setup_trust/index.ts b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_setup_trust/index.ts similarity index 100% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_setup_trust/index.ts rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_setup_trust/index.ts diff --git a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_setup_trust/remote_cluster_setup_trust.tsx b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_setup_trust/remote_cluster_setup_trust.tsx similarity index 98% rename from x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_setup_trust/remote_cluster_setup_trust.tsx rename to x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_setup_trust/remote_cluster_setup_trust.tsx index 399e49fc8fc3f..12aa1787d6792 100644 --- a/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_setup_trust/remote_cluster_setup_trust.tsx +++ b/x-pack/platform/plugins/private/remote_clusters/public/application/sections/components/remote_cluster_config_steps/remote_cluster_setup_trust/remote_cluster_setup_trust.tsx @@ -18,8 +18,8 @@ import { EuiButtonEmpty, } from '@elastic/eui'; -import * as docs from '../../../services/documentation'; -import { AppContext } from '../../../app_context'; +import * as docs from '../../../../services/documentation'; +import { AppContext } from '../../../../app_context'; import { ConfirmTrustSetupModal } from './confirm_modal'; const MIN_ALLOWED_VERSION_API_KEYS_METHOD = '8.10';