From 1e55cfc2f6dbc6350b092221281ea4dc5bad6df8 Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Wed, 8 Jan 2025 16:52:51 +0100 Subject: [PATCH] Relocating module `@kbn/url-drilldown-plugin` --- .github/CODEOWNERS | 2 +- docs/developer/plugin-list.asciidoc | 2 +- package.json | 2 +- tsconfig.base.json | 4 ++-- x-pack/.i18nrc.json | 2 +- .../plugins/private}/drilldowns/url_drilldown/README.md | 0 .../plugins/private}/drilldowns/url_drilldown/kibana.jsonc | 0 .../plugins/private}/drilldowns/url_drilldown/public/index.ts | 0 .../private}/drilldowns/url_drilldown/public/lib/i18n.ts | 0 .../private}/drilldowns/url_drilldown/public/lib/index.ts | 0 .../private}/drilldowns/url_drilldown/public/lib/test/data.ts | 0 .../url_drilldown/public/lib/url_drilldown.test.tsx | 0 .../drilldowns/url_drilldown/public/lib/url_drilldown.tsx | 0 .../public/lib/variables/context_variables.test.ts | 0 .../url_drilldown/public/lib/variables/context_variables.ts | 0 .../public/lib/variables/event_variables.test.ts | 0 .../url_drilldown/public/lib/variables/event_variables.ts | 0 .../url_drilldown/public/lib/variables/global_variables.ts | 0 .../drilldowns/url_drilldown/public/lib/variables/i18n.ts | 0 .../drilldowns/url_drilldown/public/lib/variables/util.ts | 0 .../private}/drilldowns/url_drilldown/public/plugin.ts | 0 .../plugins/private}/drilldowns/url_drilldown/tsconfig.json | 2 +- .../shared/maps/public/trigger_actions/trigger_utils.ts | 2 +- x-pack/plugins/drilldowns/jest.config.js | 2 +- yarn.lock | 2 +- 25 files changed, 10 insertions(+), 10 deletions(-) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/README.md (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/kibana.jsonc (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/i18n.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/index.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/test/data.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/url_drilldown.test.tsx (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/url_drilldown.tsx (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/variables/context_variables.test.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/variables/context_variables.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/variables/event_variables.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/variables/global_variables.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/variables/i18n.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/lib/variables/util.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/public/plugin.ts (100%) rename x-pack/{plugins => platform/plugins/private}/drilldowns/url_drilldown/tsconfig.json (92%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a0be13943fe39..40b6fb7917aae 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -839,6 +839,7 @@ x-pack/platform/plugins/private/custom_branding @elastic/appex-sharedux x-pack/platform/plugins/private/data_usage @elastic/obs-ai-assistant @elastic/security-solution x-pack/platform/plugins/private/data_visualizer @elastic/ml-ui x-pack/platform/plugins/private/discover_enhanced @elastic/kibana-data-discovery +x-pack/platform/plugins/private/drilldowns/url_drilldown @elastic/appex-sharedux x-pack/platform/plugins/private/file_upload @elastic/kibana-presentation @elastic/ml-ui x-pack/platform/plugins/private/global_search_bar @elastic/appex-sharedux x-pack/platform/plugins/private/global_search_providers @elastic/appex-sharedux @@ -904,7 +905,6 @@ x-pack/platform/plugins/shared/stack_alerts @elastic/response-ops x-pack/platform/plugins/shared/stack_connectors @elastic/response-ops x-pack/platform/plugins/shared/task_manager @elastic/response-ops x-pack/platform/plugins/shared/triggers_actions_ui @elastic/response-ops -x-pack/plugins/drilldowns/url_drilldown @elastic/appex-sharedux x-pack/solutions/observability/packages/alert_details @elastic/obs-ux-management-team x-pack/solutions/observability/packages/alerting_test_data @elastic/obs-ux-management-team x-pack/solutions/observability/packages/get_padded_alert_time_range_util @elastic/obs-ux-management-team diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index 1566070728780..6a17ab02a197d 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -970,7 +970,7 @@ As a developer you can reuse and extend built-in alerts and actions UI functiona in their infrastructure. -|{kib-repo}blob/{branch}/x-pack/plugins/drilldowns/url_drilldown/README.md[urlDrilldown] +|{kib-repo}blob/{branch}/x-pack/platform/plugins/private/drilldowns/url_drilldown/README.md[urlDrilldown] |NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin. diff --git a/package.json b/package.json index c5709ecc9ac30..a122b66bf0962 100644 --- a/package.json +++ b/package.json @@ -996,7 +996,7 @@ "@kbn/unsaved-changes-prompt": "link:src/platform/packages/shared/kbn-unsaved-changes-prompt", "@kbn/upgrade-assistant-plugin": "link:x-pack/platform/plugins/private/upgrade_assistant", "@kbn/uptime-plugin": "link:x-pack/solutions/observability/plugins/uptime", - "@kbn/url-drilldown-plugin": "link:x-pack/plugins/drilldowns/url_drilldown", + "@kbn/url-drilldown-plugin": "link:x-pack/platform/plugins/private/drilldowns/url_drilldown", "@kbn/url-forwarding-plugin": "link:src/platform/plugins/private/url_forwarding", "@kbn/usage-collection-plugin": "link:src/platform/plugins/shared/usage_collection", "@kbn/usage-collection-test-plugin": "link:test/plugin_functional/plugins/usage_collection", diff --git a/tsconfig.base.json b/tsconfig.base.json index 61f27d6d43d64..bd896625c57c6 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -2008,8 +2008,8 @@ "@kbn/upgrade-assistant-plugin/*": ["x-pack/platform/plugins/private/upgrade_assistant/*"], "@kbn/uptime-plugin": ["x-pack/solutions/observability/plugins/uptime"], "@kbn/uptime-plugin/*": ["x-pack/solutions/observability/plugins/uptime/*"], - "@kbn/url-drilldown-plugin": ["x-pack/plugins/drilldowns/url_drilldown"], - "@kbn/url-drilldown-plugin/*": ["x-pack/plugins/drilldowns/url_drilldown/*"], + "@kbn/url-drilldown-plugin": ["x-pack/platform/plugins/private/drilldowns/url_drilldown"], + "@kbn/url-drilldown-plugin/*": ["x-pack/platform/plugins/private/drilldowns/url_drilldown/*"], "@kbn/url-forwarding-plugin": ["src/platform/plugins/private/url_forwarding"], "@kbn/url-forwarding-plugin/*": ["src/platform/plugins/private/url_forwarding/*"], "@kbn/usage-collection-plugin": ["src/platform/plugins/shared/usage_collection"], diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json index e90a31e284c07..2f5ba408dcdd5 100644 --- a/x-pack/.i18nrc.json +++ b/x-pack/.i18nrc.json @@ -176,7 +176,7 @@ "xpack.ux": [ "solutions/observability/plugins/ux" ], - "xpack.urlDrilldown": "plugins/drilldowns/url_drilldown", + "xpack.urlDrilldown": "platform/plugins/private/drilldowns/url_drilldown", "xpack.watcher": "platform/plugins/private/watcher" }, "exclude": [ diff --git a/x-pack/plugins/drilldowns/url_drilldown/README.md b/x-pack/platform/plugins/private/drilldowns/url_drilldown/README.md similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/README.md rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/README.md diff --git a/x-pack/plugins/drilldowns/url_drilldown/kibana.jsonc b/x-pack/platform/plugins/private/drilldowns/url_drilldown/kibana.jsonc similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/kibana.jsonc rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/kibana.jsonc diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/index.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/index.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/index.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/index.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/i18n.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/i18n.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/i18n.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/i18n.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/index.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/index.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/index.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/index.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/test/data.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/test/data.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/test/data.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/test/data.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.test.tsx b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/url_drilldown.test.tsx similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.test.tsx rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/url_drilldown.test.tsx diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.tsx b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/url_drilldown.tsx similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.tsx rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/url_drilldown.tsx diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.test.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/context_variables.test.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.test.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/context_variables.test.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/context_variables.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/context_variables.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/event_variables.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/event_variables.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/global_variables.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/global_variables.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/global_variables.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/global_variables.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/i18n.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/i18n.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/i18n.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/i18n.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/util.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/util.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/util.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/variables/util.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/plugin.ts b/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/plugin.ts similarity index 100% rename from x-pack/plugins/drilldowns/url_drilldown/public/plugin.ts rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/public/plugin.ts diff --git a/x-pack/plugins/drilldowns/url_drilldown/tsconfig.json b/x-pack/platform/plugins/private/drilldowns/url_drilldown/tsconfig.json similarity index 92% rename from x-pack/plugins/drilldowns/url_drilldown/tsconfig.json rename to x-pack/platform/plugins/private/drilldowns/url_drilldown/tsconfig.json index 7da816978edcf..8c018bb451e39 100644 --- a/x-pack/plugins/drilldowns/url_drilldown/tsconfig.json +++ b/x-pack/platform/plugins/private/drilldowns/url_drilldown/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../tsconfig.base.json", + "extends": "../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types", }, diff --git a/x-pack/platform/plugins/shared/maps/public/trigger_actions/trigger_utils.ts b/x-pack/platform/plugins/shared/maps/public/trigger_actions/trigger_utils.ts index 0f85a7b332e37..f1d1ed5d32904 100644 --- a/x-pack/platform/plugins/shared/maps/public/trigger_actions/trigger_utils.ts +++ b/x-pack/platform/plugins/shared/maps/public/trigger_actions/trigger_utils.ts @@ -15,7 +15,7 @@ export function isUrlDrilldown(action: Action) { // VALUE_CLICK_TRIGGER is coupled with expressions and Datatable type // URL drilldown parses event scope from Datatable -// https://github.com/elastic/kibana/blob/7.10/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown_scope.ts#L140 +// https://github.com/elastic/kibana/blob/7.10/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/lib/url_drilldown_scope.ts#L140 // In order to use URL drilldown, maps has to package its data in Datatable compatiable format. export function toValueClickDataFormat(key: string, value: RawValue) { return [ diff --git a/x-pack/plugins/drilldowns/jest.config.js b/x-pack/plugins/drilldowns/jest.config.js index a5db93a916ebb..940950829bc22 100644 --- a/x-pack/plugins/drilldowns/jest.config.js +++ b/x-pack/plugins/drilldowns/jest.config.js @@ -11,5 +11,5 @@ module.exports = { roots: ['/x-pack/plugins/drilldowns'], coverageDirectory: '/target/kibana-coverage/jest/x-pack/plugins/drilldowns', coverageReporters: ['text', 'html'], - collectCoverageFrom: ['/x-pack/plugins/drilldowns/url_drilldown/public/**/*.{ts,tsx}'], + collectCoverageFrom: ['/x-pack/platform/plugins/private/drilldowns/url_drilldown/public/**/*.{ts,tsx}'], }; diff --git a/yarn.lock b/yarn.lock index 1790f6db1ea10..d2e5fbc800b99 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7869,7 +7869,7 @@ version "0.0.0" uid "" -"@kbn/url-drilldown-plugin@link:x-pack/plugins/drilldowns/url_drilldown": +"@kbn/url-drilldown-plugin@link:x-pack/platform/plugins/private/drilldowns/url_drilldown": version "0.0.0" uid ""