From d2c8af73a2457e8a687fb82e13dc6d6df6eb2597 Mon Sep 17 00:00:00 2001 From: Charis Kalpakis <39087493+fake-haris@users.noreply.github.com> Date: Mon, 30 Jun 2025 22:01:26 +0300 Subject: [PATCH 1/2] resolved conflicts --- .buildkite/ftr_platform_stateful_configs.yml | 8 +++---- .github/CODEOWNERS | 22 +++++++++---------- .../functional/apps/painless_lab/config.ts | 2 +- .../functional/apps/painless_lab/index.ts | 0 .../apps/painless_lab/painless_lab.ts | 0 .../apps/painless_lab/painless_lab_flyout.ts | 0 .../__snapshots__/report_listing.snap | 0 .../apps/reporting_management/config.ts | 2 +- .../apps/reporting_management/index.ts} | 3 ++- .../reporting_management/report_listing.ts | 0 .../apps/upgrade_assistant/config.ts | 2 +- .../upgrade_assistant/deprecation_pages.ts | 0 .../es_deprecation_logs_page.ts | 0 .../feature_controls/index.ts | 0 .../upgrade_assistant_security.ts | 0 .../apps/upgrade_assistant/index.ts | 0 .../apps/upgrade_assistant/overview_page.ts | 0 .../functional/config.upgrade_assistant.ts | 2 +- .../test/functional/page_objects/index.ts | 2 ++ .../page_objects/upgrade_assistant_page.ts | 0 x-pack/test/functional/page_objects/index.ts | 2 +- 21 files changed, 24 insertions(+), 21 deletions(-) rename x-pack/{ => platform}/test/functional/apps/painless_lab/config.ts (95%) rename x-pack/{ => platform}/test/functional/apps/painless_lab/index.ts (100%) rename x-pack/{ => platform}/test/functional/apps/painless_lab/painless_lab.ts (100%) rename x-pack/{ => platform}/test/functional/apps/painless_lab/painless_lab_flyout.ts (100%) rename x-pack/{ => platform}/test/functional/apps/reporting_management/__snapshots__/report_listing.snap (100%) rename x-pack/{ => platform}/test/functional/apps/reporting_management/config.ts (95%) rename x-pack/{test/functional/apps/reporting_management/index.js => platform/test/functional/apps/reporting_management/index.ts} (74%) rename x-pack/{ => platform}/test/functional/apps/reporting_management/report_listing.ts (100%) rename x-pack/{ => platform}/test/functional/apps/upgrade_assistant/config.ts (95%) rename x-pack/{ => platform}/test/functional/apps/upgrade_assistant/deprecation_pages.ts (100%) rename x-pack/{ => platform}/test/functional/apps/upgrade_assistant/es_deprecation_logs_page.ts (100%) rename x-pack/{ => platform}/test/functional/apps/upgrade_assistant/feature_controls/index.ts (100%) rename x-pack/{ => platform}/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts (100%) rename x-pack/{ => platform}/test/functional/apps/upgrade_assistant/index.ts (100%) rename x-pack/{ => platform}/test/functional/apps/upgrade_assistant/overview_page.ts (100%) rename x-pack/{ => platform}/test/functional/config.upgrade_assistant.ts (97%) rename x-pack/{ => platform}/test/functional/page_objects/upgrade_assistant_page.ts (100%) diff --git a/.buildkite/ftr_platform_stateful_configs.yml b/.buildkite/ftr_platform_stateful_configs.yml index 391dc52f9729d..ec694d88d8e5e 100644 --- a/.buildkite/ftr_platform_stateful_configs.yml +++ b/.buildkite/ftr_platform_stateful_configs.yml @@ -241,9 +241,9 @@ enabled: - x-pack/test/functional/apps/ml/stack_management_jobs/config.ts - x-pack/test/functional/apps/ml/memory_usage/config.ts - x-pack/test/functional/apps/monitoring/config.ts - - x-pack/test/functional/apps/painless_lab/config.ts + - x-pack/platform/test/functional/apps/painless_lab/config.ts - x-pack/test/functional/apps/remote_clusters/config.ts - - x-pack/test/functional/apps/reporting_management/config.ts + - x-pack/platform/test/functional/apps/reporting_management/config.ts - x-pack/test/functional/apps/rollup_job/config.ts - x-pack/test/functional/apps/saved_objects_management/config.ts - x-pack/test/functional/apps/saved_query_management/config.ts @@ -257,7 +257,7 @@ enabled: - x-pack/test/functional/apps/transform/edit_clone/config.ts - x-pack/test/functional/apps/transform/permissions/config.ts - x-pack/test/functional/apps/transform/feature_controls/config.ts - - x-pack/test/functional/apps/upgrade_assistant/config.ts + - x-pack/platform/test/functional/apps/upgrade_assistant/config.ts - x-pack/test/functional/apps/user_profiles/config.ts - x-pack/test/functional/apps/visualize/config.ts - x-pack/platform/test/functional/apps/watcher/config.ts @@ -265,7 +265,7 @@ enabled: - x-pack/test/functional/config.ccs.ts - x-pack/test/functional/config.firefox.js - x-pack/platform/test/functional/config.firefox.ts - - x-pack/test/functional/config.upgrade_assistant.ts + - x-pack/platform/test/functional/config.upgrade_assistant.ts - x-pack/test/functional_cloud/config.ts - x-pack/test/functional_cloud/saml.config.ts - x-pack/test/functional_solution_sidenav/config.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5b7644906a81f..e862e97a8c2b3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1208,14 +1208,14 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql # Global Experience -### Global Experience Reporting -/x-pack/test/functional/apps/dashboard/reporting/ @elastic/appex-sharedux -/x-pack/test/functional/apps/reporting/ @elastic/appex-sharedux -/x-pack/test/functional/apps/reporting_management/ @elastic/appex-sharedux -/x-pack/test/examples/screenshotting/ @elastic/appex-sharedux -/x-pack/test/functional/es_archives/lens/reporting/ @elastic/appex-sharedux -/x-pack/test/functional/es_archives/reporting/ @elastic/appex-sharedux -/x-pack/test/functional/fixtures/kbn_archiver/reporting/ @elastic/appex-sharedux +### Reporting +/x-pack/test/functional/apps/dashboard/reporting/ @elastic/response-ops +/x-pack/test/functional/apps/reporting/ @elastic/response-ops +/x-pack/platform/test/functional/apps/reporting_management/ @elastic/response-ops +/x-pack/test/examples/screenshotting/ @elastic/response-ops +/x-pack/test/functional/es_archives/lens/reporting/ @elastic/response-ops +/x-pack/test/functional/es_archives/reporting/ @elastic/response-ops +/x-pack/test/functional/fixtures/kbn_archiver/reporting/ @elastic/response-ops /x-pack/platform/test/reporting_api_integration/ @elastic/response-ops /x-pack/platform/test/reporting_functional/ @elastic/response-ops /x-pack/test/stack_functional_integration/apps/reporting/ @elastic/appex-sharedux @@ -2104,7 +2104,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi /x-pack/test/stack_functional_integration/apps/ccs @elastic/kibana-management /x-pack/test/functional/services/data_stream.ts @elastic/kibana-management /x-pack/platform/test/functional/page_objects/watcher_page.ts @elastic/kibana-management -/x-pack/test/functional/page_objects/upgrade_assistant_page.ts @elastic/kibana-management +/x-pack/platform/test/functional/page_objects/upgrade_assistant_page.ts @elastic/kibana-management /x-pack/test/functional/page_objects/snapshot_restore_page.ts @elastic/kibana-management /x-pack/test/functional/page_objects/rollup_page.ts @elastic/kibana-management /x-pack/test/functional/page_objects/ingest_pipelines_page.ts @elastic/kibana-management @@ -2112,7 +2112,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi /x-pack/test/functional/page_objects/cross_cluster_replication_page.ts @elastic/kibana-management /x-pack/test/functional/fixtures/ingest_pipeline_example_mapping.csv @elastic/kibana-management /x-pack/test/functional/apps/snapshot_restore @elastic/kibana-management -/x-pack/test/functional/apps/painless_lab @elastic/kibana-management +/x-pack/platform/test/functional/apps/painless_lab @elastic/kibana-management /x-pack/test_serverless/functional/test_suites/common/spaces/spaces_management.ts @elastic/kibana-management /x-pack/test/stack_functional_integration/apps/management @elastic/kibana-management /x-pack/test/functional/page_objects/*_management_page.ts @elastic/kibana-management @@ -2134,7 +2134,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi ^/src/platform/test/functional/apps/saved_objects_management @elastic/kibana-management ^/src/platform/test/functional/apps/console/*.ts @elastic/kibana-management ^/src/platform/test/api_integration/apis/console/*.ts @elastic/kibana-management -/x-pack/test/functional/apps/upgrade_assistant @elastic/kibana-management +/x-pack/platform/test/functional/apps/upgrade_assistant @elastic/kibana-management /x-pack/platform/test/functional/apps/dev_tools @elastic/kibana-management /x-pack/test/upgrade_assistant_integration @elastic/kibana-management /x-pack/test/api_integration/deployment_agnostic/apis/console/ @elastic/kibana-management diff --git a/x-pack/test/functional/apps/painless_lab/config.ts b/x-pack/platform/test/functional/apps/painless_lab/config.ts similarity index 95% rename from x-pack/test/functional/apps/painless_lab/config.ts rename to x-pack/platform/test/functional/apps/painless_lab/config.ts index d0d07ff200281..91f4b6ff8ebc9 100644 --- a/x-pack/test/functional/apps/painless_lab/config.ts +++ b/x-pack/platform/test/functional/apps/painless_lab/config.ts @@ -8,7 +8,7 @@ import { FtrConfigProviderContext } from '@kbn/test'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { - const functionalConfig = await readConfigFile(require.resolve('../../config.base.js')); + const functionalConfig = await readConfigFile(require.resolve('../../config.base.ts')); return { ...functionalConfig.getAll(), diff --git a/x-pack/test/functional/apps/painless_lab/index.ts b/x-pack/platform/test/functional/apps/painless_lab/index.ts similarity index 100% rename from x-pack/test/functional/apps/painless_lab/index.ts rename to x-pack/platform/test/functional/apps/painless_lab/index.ts diff --git a/x-pack/test/functional/apps/painless_lab/painless_lab.ts b/x-pack/platform/test/functional/apps/painless_lab/painless_lab.ts similarity index 100% rename from x-pack/test/functional/apps/painless_lab/painless_lab.ts rename to x-pack/platform/test/functional/apps/painless_lab/painless_lab.ts diff --git a/x-pack/test/functional/apps/painless_lab/painless_lab_flyout.ts b/x-pack/platform/test/functional/apps/painless_lab/painless_lab_flyout.ts similarity index 100% rename from x-pack/test/functional/apps/painless_lab/painless_lab_flyout.ts rename to x-pack/platform/test/functional/apps/painless_lab/painless_lab_flyout.ts diff --git a/x-pack/test/functional/apps/reporting_management/__snapshots__/report_listing.snap b/x-pack/platform/test/functional/apps/reporting_management/__snapshots__/report_listing.snap similarity index 100% rename from x-pack/test/functional/apps/reporting_management/__snapshots__/report_listing.snap rename to x-pack/platform/test/functional/apps/reporting_management/__snapshots__/report_listing.snap diff --git a/x-pack/test/functional/apps/reporting_management/config.ts b/x-pack/platform/test/functional/apps/reporting_management/config.ts similarity index 95% rename from x-pack/test/functional/apps/reporting_management/config.ts rename to x-pack/platform/test/functional/apps/reporting_management/config.ts index a0b91502568f1..bf71346501171 100644 --- a/x-pack/test/functional/apps/reporting_management/config.ts +++ b/x-pack/platform/test/functional/apps/reporting_management/config.ts @@ -8,7 +8,7 @@ import { FtrConfigProviderContext } from '@kbn/test'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { - const functionalConfig = await readConfigFile(require.resolve('../../config.base.js')); + const functionalConfig = await readConfigFile(require.resolve('../../config.base.ts')); return { ...functionalConfig.getAll(), diff --git a/x-pack/test/functional/apps/reporting_management/index.js b/x-pack/platform/test/functional/apps/reporting_management/index.ts similarity index 74% rename from x-pack/test/functional/apps/reporting_management/index.js rename to x-pack/platform/test/functional/apps/reporting_management/index.ts index dcf5583eeb92a..75bb032648a0d 100644 --- a/x-pack/test/functional/apps/reporting_management/index.js +++ b/x-pack/platform/test/functional/apps/reporting_management/index.ts @@ -4,8 +4,9 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ +import { FtrProviderContext } from '../../ftr_provider_context'; -export default ({ loadTestFile }) => { +export default ({ loadTestFile }: FtrProviderContext) => { describe('reporting management app', function () { loadTestFile(require.resolve('./report_listing')); }); diff --git a/x-pack/test/functional/apps/reporting_management/report_listing.ts b/x-pack/platform/test/functional/apps/reporting_management/report_listing.ts similarity index 100% rename from x-pack/test/functional/apps/reporting_management/report_listing.ts rename to x-pack/platform/test/functional/apps/reporting_management/report_listing.ts diff --git a/x-pack/test/functional/apps/upgrade_assistant/config.ts b/x-pack/platform/test/functional/apps/upgrade_assistant/config.ts similarity index 95% rename from x-pack/test/functional/apps/upgrade_assistant/config.ts rename to x-pack/platform/test/functional/apps/upgrade_assistant/config.ts index d0d07ff200281..91f4b6ff8ebc9 100644 --- a/x-pack/test/functional/apps/upgrade_assistant/config.ts +++ b/x-pack/platform/test/functional/apps/upgrade_assistant/config.ts @@ -8,7 +8,7 @@ import { FtrConfigProviderContext } from '@kbn/test'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { - const functionalConfig = await readConfigFile(require.resolve('../../config.base.js')); + const functionalConfig = await readConfigFile(require.resolve('../../config.base.ts')); return { ...functionalConfig.getAll(), diff --git a/x-pack/test/functional/apps/upgrade_assistant/deprecation_pages.ts b/x-pack/platform/test/functional/apps/upgrade_assistant/deprecation_pages.ts similarity index 100% rename from x-pack/test/functional/apps/upgrade_assistant/deprecation_pages.ts rename to x-pack/platform/test/functional/apps/upgrade_assistant/deprecation_pages.ts diff --git a/x-pack/test/functional/apps/upgrade_assistant/es_deprecation_logs_page.ts b/x-pack/platform/test/functional/apps/upgrade_assistant/es_deprecation_logs_page.ts similarity index 100% rename from x-pack/test/functional/apps/upgrade_assistant/es_deprecation_logs_page.ts rename to x-pack/platform/test/functional/apps/upgrade_assistant/es_deprecation_logs_page.ts diff --git a/x-pack/test/functional/apps/upgrade_assistant/feature_controls/index.ts b/x-pack/platform/test/functional/apps/upgrade_assistant/feature_controls/index.ts similarity index 100% rename from x-pack/test/functional/apps/upgrade_assistant/feature_controls/index.ts rename to x-pack/platform/test/functional/apps/upgrade_assistant/feature_controls/index.ts diff --git a/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts b/x-pack/platform/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts similarity index 100% rename from x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts rename to x-pack/platform/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts diff --git a/x-pack/test/functional/apps/upgrade_assistant/index.ts b/x-pack/platform/test/functional/apps/upgrade_assistant/index.ts similarity index 100% rename from x-pack/test/functional/apps/upgrade_assistant/index.ts rename to x-pack/platform/test/functional/apps/upgrade_assistant/index.ts diff --git a/x-pack/test/functional/apps/upgrade_assistant/overview_page.ts b/x-pack/platform/test/functional/apps/upgrade_assistant/overview_page.ts similarity index 100% rename from x-pack/test/functional/apps/upgrade_assistant/overview_page.ts rename to x-pack/platform/test/functional/apps/upgrade_assistant/overview_page.ts diff --git a/x-pack/test/functional/config.upgrade_assistant.ts b/x-pack/platform/test/functional/config.upgrade_assistant.ts similarity index 97% rename from x-pack/test/functional/config.upgrade_assistant.ts rename to x-pack/platform/test/functional/config.upgrade_assistant.ts index d251916697af4..82cc779aaa9b1 100644 --- a/x-pack/test/functional/config.upgrade_assistant.ts +++ b/x-pack/platform/test/functional/config.upgrade_assistant.ts @@ -8,7 +8,7 @@ import { FtrConfigProviderContext } from '@kbn/test'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { - const functionalConfig = await readConfigFile(require.resolve('./config.base.js')); + const functionalConfig = await readConfigFile(require.resolve('./config.base.ts')); return { ...functionalConfig.getAll(), diff --git a/x-pack/platform/test/functional/page_objects/index.ts b/x-pack/platform/test/functional/page_objects/index.ts index 68e4602208e83..364fd9dbd94f6 100644 --- a/x-pack/platform/test/functional/page_objects/index.ts +++ b/x-pack/platform/test/functional/page_objects/index.ts @@ -18,6 +18,7 @@ import { GisPageObject } from './gis_page'; import { ReportingPageObject } from './reporting_page'; import { WatcherPageObject } from './watcher_page'; import { SearchProfilerPageProvider } from './search_profiler_page'; +import { UpgradeAssistantFlyoutObject } from './upgrade_assistant_page'; // just like services, PageObjects are defined as a map of // names to Providers. Merge in Kibana's or pick specific ones @@ -35,4 +36,5 @@ export const pageObjects = { reporting: ReportingPageObject, watcher: WatcherPageObject, searchProfiler: SearchProfilerPageProvider, + upgradeAssistant: UpgradeAssistantFlyoutObject, }; diff --git a/x-pack/test/functional/page_objects/upgrade_assistant_page.ts b/x-pack/platform/test/functional/page_objects/upgrade_assistant_page.ts similarity index 100% rename from x-pack/test/functional/page_objects/upgrade_assistant_page.ts rename to x-pack/platform/test/functional/page_objects/upgrade_assistant_page.ts diff --git a/x-pack/test/functional/page_objects/index.ts b/x-pack/test/functional/page_objects/index.ts index cd323530b9480..1f95fec1fe302 100644 --- a/x-pack/test/functional/page_objects/index.ts +++ b/x-pack/test/functional/page_objects/index.ts @@ -18,6 +18,7 @@ import { SearchProfilerPageProvider } from '@kbn/test-suites-xpack-platform/func import { CanvasPageProvider } from '@kbn/test-suites-xpack-platform/functional/page_objects/canvas_page'; import { GisPageObject } from '@kbn/test-suites-xpack-platform/functional/page_objects/gis_page'; import { LensPageProvider } from '@kbn/test-suites-xpack-platform/functional/page_objects/lens_page'; +import { UpgradeAssistantFlyoutObject } from '@kbn/test-suites-xpack-platform/functional/page_objects/upgrade_assistant_page'; import { ApiKeysPageProvider } from './api_keys_page'; import { AssetDetailsProvider } from './asset_details'; import { BannersPageObject } from './banners_page'; @@ -50,7 +51,6 @@ import { ShareSavedObjectsToSpacePageProvider } from './share_saved_objects_to_s import { SnapshotRestorePageProvider } from './snapshot_restore_page'; import { StatusPageObject } from './status_page'; import { TagManagementPageObject } from './tag_management_page'; -import { UpgradeAssistantFlyoutObject } from './upgrade_assistant_page'; import { UptimePageObject } from './uptime_page'; import { UserProfilePageProvider } from './user_profile_page'; import { SearchPlaygroundPageProvider } from './search_playground_page'; From 99dfc4dfb93309e1bae570f72a260fe3dd0003d9 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Tue, 1 Jul 2025 07:52:20 +0000 Subject: [PATCH 2/2] [CI] Auto-commit changed files from 'node scripts/lint_ts_projects --fix' --- x-pack/test/tsconfig.json | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index 48d961e1916b4..0c25eaa00f1a0 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -109,7 +109,6 @@ "@kbn/es", "@kbn/metrics-data-access-plugin", "@kbn/dataset-quality-plugin", - "@kbn/reporting-common", "@kbn/observability-logs-explorer-plugin", "@kbn/io-ts-utils", "@kbn/logs-explorer-plugin",