Skip to content

Commit

Permalink
[8.x] SKA: Unify serverless modules + storybook config (#211570) (#…
Browse files Browse the repository at this point in the history
…211693)

# Backport

This will backport the following commits from `main` to `8.x`:
- [SKA: Unify `serverless` modules + storybook config
(#211570)](#211570)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Gerard
Soldevila","email":"gerard.soldevila@elastic.co"},"sourceCommit":{"committedDate":"2025-02-19T08:10:35Z","message":"SKA:
Unify `serverless` modules + storybook config (#211570)\n\n##
Summary\r\n\r\nAs part of the SKA, some groups of modules have been
broken-down and\r\nrelocated in different folders, negatively impacting
DX. This is the\r\ncase for `serverless` modules, that are spread
across:\r\n```\r\n- packages/serverless # storybook config\r\n-
src/platform/packages/private/serverless\r\n-
src/platform/packages/shared/serverless\r\n```\r\n\r\nThe goal of this
PR is to unify them back
under\r\n`src/platform/packages/shared/severless`.\r\nIn this scenario,
I believe the simplification is worth the trade off.\r\n\r\nCC
@elastic/kibana-management @elastic/appex-sharedux
WDYT?\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"8f7f6a7a81dd25d529b1d87c882f49afbe7bdf99","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Kibana
Management","release_note:skip","v9.0.0","Team:SharedUX","backport:version","v8.18.0","v9.1.0","v8.19.0"],"title":"SKA:
Unify `serverless` modules + storybook
config","number":211570,"url":"https://github.com/elastic/kibana/pull/211570","mergeCommit":{"message":"SKA:
Unify `serverless` modules + storybook config (#211570)\n\n##
Summary\r\n\r\nAs part of the SKA, some groups of modules have been
broken-down and\r\nrelocated in different folders, negatively impacting
DX. This is the\r\ncase for `serverless` modules, that are spread
across:\r\n```\r\n- packages/serverless # storybook config\r\n-
src/platform/packages/private/serverless\r\n-
src/platform/packages/shared/serverless\r\n```\r\n\r\nThe goal of this
PR is to unify them back
under\r\n`src/platform/packages/shared/severless`.\r\nIn this scenario,
I believe the simplification is worth the trade off.\r\n\r\nCC
@elastic/kibana-management @elastic/appex-sharedux
WDYT?\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"8f7f6a7a81dd25d529b1d87c882f49afbe7bdf99"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","8.x"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/211570","number":211570,"mergeCommit":{"message":"SKA:
Unify `serverless` modules + storybook config (#211570)\n\n##
Summary\r\n\r\nAs part of the SKA, some groups of modules have been
broken-down and\r\nrelocated in different folders, negatively impacting
DX. This is the\r\ncase for `serverless` modules, that are spread
across:\r\n```\r\n- packages/serverless # storybook config\r\n-
src/platform/packages/private/serverless\r\n-
src/platform/packages/shared/serverless\r\n```\r\n\r\nThe goal of this
PR is to unify them back
under\r\n`src/platform/packages/shared/severless`.\r\nIn this scenario,
I believe the simplification is worth the trade off.\r\n\r\nCC
@elastic/kibana-management @elastic/appex-sharedux
WDYT?\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"8f7f6a7a81dd25d529b1d87c882f49afbe7bdf99"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
  • Loading branch information
gsoldevila authored Feb 19, 2025
1 parent 9022827 commit af941d8
Show file tree
Hide file tree
Showing 24 changed files with 25 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -870,15 +870,15 @@ src/platform/packages/shared/kbn-server-route-repository @elastic/obs-knowledge-
src/platform/packages/shared/kbn-server-route-repository-client @elastic/obs-knowledge-team
src/platform/packages/shared/kbn-server-route-repository-utils @elastic/obs-knowledge-team
x-pack/platform/plugins/shared/serverless @elastic/appex-sharedux
src/platform/packages/private/serverless/settings/common @elastic/appex-sharedux @elastic/kibana-management
src/platform/packages/shared/serverless/settings/common @elastic/appex-sharedux @elastic/kibana-management
x-pack/solutions/observability/plugins/serverless_observability @elastic/obs-ux-management-team
src/platform/packages/shared/serverless/settings/observability_project @elastic/appex-sharedux @elastic/kibana-management @elastic/obs-ux-management-team
src/platform/packages/private/serverless/project_switcher @elastic/appex-sharedux
x-pack/solutions/search/plugins/serverless_search @elastic/search-kibana
src/platform/packages/shared/serverless/settings/search_project @elastic/search-kibana @elastic/kibana-management
src/platform/packages/shared/serverless/settings/security_project @elastic/security-solution @elastic/kibana-management
packages/serverless/storybook/config @elastic/appex-sharedux
src/platform/packages/private/serverless/types @elastic/appex-sharedux
src/platform/packages/shared/serverless/storybook/config @elastic/appex-sharedux
src/platform/packages/shared/serverless/types @elastic/appex-sharedux
test/plugin_functional/plugins/session_notifications @elastic/kibana-core
x-pack/solutions/security/plugins/session_view @elastic/kibana-cloud-security-posture
packages/kbn-set-map @elastic/kibana-operations
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -871,14 +871,14 @@
"@kbn/server-route-repository-client": "link:src/platform/packages/shared/kbn-server-route-repository-client",
"@kbn/server-route-repository-utils": "link:src/platform/packages/shared/kbn-server-route-repository-utils",
"@kbn/serverless": "link:x-pack/platform/plugins/shared/serverless",
"@kbn/serverless-common-settings": "link:src/platform/packages/private/serverless/settings/common",
"@kbn/serverless-common-settings": "link:src/platform/packages/shared/serverless/settings/common",
"@kbn/serverless-observability": "link:x-pack/solutions/observability/plugins/serverless_observability",
"@kbn/serverless-observability-settings": "link:src/platform/packages/shared/serverless/settings/observability_project",
"@kbn/serverless-project-switcher": "link:src/platform/packages/private/serverless/project_switcher",
"@kbn/serverless-search": "link:x-pack/solutions/search/plugins/serverless_search",
"@kbn/serverless-search-settings": "link:src/platform/packages/shared/serverless/settings/search_project",
"@kbn/serverless-security-settings": "link:src/platform/packages/shared/serverless/settings/security_project",
"@kbn/serverless-types": "link:src/platform/packages/private/serverless/types",
"@kbn/serverless-types": "link:src/platform/packages/shared/serverless/types",
"@kbn/session-notifications-plugin": "link:test/plugin_functional/plugins/session_notifications",
"@kbn/session-view-plugin": "link:x-pack/solutions/security/plugins/session_view",
"@kbn/share-examples-plugin": "link:examples/share_examples",
Expand Down Expand Up @@ -1498,7 +1498,7 @@
"@kbn/scout-oblt": "link:x-pack/solutions/observability/packages/kbn-scout-oblt",
"@kbn/scout-reporting": "link:packages/kbn-scout-reporting",
"@kbn/security-api-integration-helpers": "link:x-pack/test/security_api_integration/packages/helpers",
"@kbn/serverless-storybook-config": "link:packages/serverless/storybook/config",
"@kbn/serverless-storybook-config": "link:src/platform/packages/shared/serverless/storybook/config",
"@kbn/set-map": "link:packages/kbn-set-map",
"@kbn/shared-ux-card-no-data-mocks": "link:src/platform/packages/shared/shared-ux/card/no_data/mocks",
"@kbn/shared-ux-file-image-mocks": "link:src/platform/packages/shared/shared-ux/file/image/mocks",
Expand Down
2 changes: 1 addition & 1 deletion src/dev/storybook/aliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const storybookAliases = {
// Skipped, please check and fix https://github.com/elastic/kibana/issues/207227
// security_solution: 'x-pack/solutions/security/plugins/security_solution/.storybook',
// security_solution_packages: 'x-pack/solutions/security/packages/storybook/config',
serverless: 'packages/serverless/storybook/config',
serverless: 'src/platform/packages/shared/serverless/storybook/config',
shared_ux: 'src/platform/packages/private/shared-ux/storybook/config',
threat_intelligence: 'x-pack/solutions/security/plugins/threat_intelligence/.storybook',
triggers_actions_ui: 'x-pack/platform/plugins/shared/triggers_actions_ui/.storybook',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"@elastic/kibana-management"
],
"group": "platform",
"visibility": "private"
}
"visibility": "shared"
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
export const TITLE = 'Serverless Storybook';

/** The remote URL of the root from which Storybook loads stories for Serverless. */
export const URL = 'https://github.com/elastic/kibana/tree/main/packages/serverless';
export const URL =
'https://github.com/elastic/kibana/tree/main/src/platform/packages/shared/serverless';
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
"type": "shared-common",
"id": "@kbn/serverless-storybook-config",
"owner": "@elastic/appex-sharedux",
"group": "platform",
"visibility": "shared",
"devOnly": true
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../../tsconfig.base.json",
"extends": "../../../../../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
"types": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"@elastic/appex-sharedux"
],
"group": "platform",
"visibility": "private"
}
"visibility": "shared"
}
12 changes: 6 additions & 6 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -1734,8 +1734,8 @@
"@kbn/server-route-repository-utils/*": ["src/platform/packages/shared/kbn-server-route-repository-utils/*"],
"@kbn/serverless": ["x-pack/platform/plugins/shared/serverless"],
"@kbn/serverless/*": ["x-pack/platform/plugins/shared/serverless/*"],
"@kbn/serverless-common-settings": ["src/platform/packages/private/serverless/settings/common"],
"@kbn/serverless-common-settings/*": ["src/platform/packages/private/serverless/settings/common/*"],
"@kbn/serverless-common-settings": ["src/platform/packages/shared/serverless/settings/common"],
"@kbn/serverless-common-settings/*": ["src/platform/packages/shared/serverless/settings/common/*"],
"@kbn/serverless-observability": ["x-pack/solutions/observability/plugins/serverless_observability"],
"@kbn/serverless-observability/*": ["x-pack/solutions/observability/plugins/serverless_observability/*"],
"@kbn/serverless-observability-settings": ["src/platform/packages/shared/serverless/settings/observability_project"],
Expand All @@ -1748,10 +1748,10 @@
"@kbn/serverless-search-settings/*": ["src/platform/packages/shared/serverless/settings/search_project/*"],
"@kbn/serverless-security-settings": ["src/platform/packages/shared/serverless/settings/security_project"],
"@kbn/serverless-security-settings/*": ["src/platform/packages/shared/serverless/settings/security_project/*"],
"@kbn/serverless-storybook-config": ["packages/serverless/storybook/config"],
"@kbn/serverless-storybook-config/*": ["packages/serverless/storybook/config/*"],
"@kbn/serverless-types": ["src/platform/packages/private/serverless/types"],
"@kbn/serverless-types/*": ["src/platform/packages/private/serverless/types/*"],
"@kbn/serverless-storybook-config": ["src/platform/packages/shared/serverless/storybook/config"],
"@kbn/serverless-storybook-config/*": ["src/platform/packages/shared/serverless/storybook/config/*"],
"@kbn/serverless-types": ["src/platform/packages/shared/serverless/types"],
"@kbn/serverless-types/*": ["src/platform/packages/shared/serverless/types/*"],
"@kbn/session-notifications-plugin": ["test/plugin_functional/plugins/session_notifications"],
"@kbn/session-notifications-plugin/*": ["test/plugin_functional/plugins/session_notifications/*"],
"@kbn/session-view-plugin": ["x-pack/solutions/security/plugins/session_view"],
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7318,7 +7318,7 @@
version "0.0.0"
uid ""

"@kbn/serverless-common-settings@link:src/platform/packages/private/serverless/settings/common":
"@kbn/serverless-common-settings@link:src/platform/packages/shared/serverless/settings/common":
version "0.0.0"
uid ""

Expand Down Expand Up @@ -7346,11 +7346,11 @@
version "0.0.0"
uid ""

"@kbn/serverless-storybook-config@link:packages/serverless/storybook/config":
"@kbn/serverless-storybook-config@link:src/platform/packages/shared/serverless/storybook/config":
version "0.0.0"
uid ""

"@kbn/serverless-types@link:src/platform/packages/private/serverless/types":
"@kbn/serverless-types@link:src/platform/packages/shared/serverless/types":
version "0.0.0"
uid ""

Expand Down

0 comments on commit af941d8

Please sign in to comment.