Skip to content

Commit

Permalink
SKA: Unify kbn-management folders + storybook config (elastic#211564)
Browse files Browse the repository at this point in the history
## Summary

As part of the SKA, some groups of modules have been broken-down and
relocated in different folders, negatively impacting DX. This is the
case for `kbn-management` modules, that are spread across:
```
- packages/kbn-management (storybook config)
- src/platform/packages/private/kbn-management
- src/platform/packages/shared/kbn-management
```

The goal of this PR is to unify them back under
`src/platform/packages/shared/kbn-management`.
In this scenario, I believe the simplification is worth the trade off.

CC @elastic/kibana-management WDYT?

Co-authored-by: Matthew Kime <matt@mattki.me>
  • Loading branch information
gsoldevila and mattkime authored Feb 19, 2025
1 parent ae9971b commit b2b3fa9
Show file tree
Hide file tree
Showing 74 changed files with 36 additions and 67 deletions.
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ packages/kbn-lint-packages-cli @elastic/kibana-operations
packages/kbn-lint-ts-projects-cli @elastic/kibana-operations
packages/kbn-managed-vscode-config @elastic/kibana-operations
packages/kbn-managed-vscode-config-cli @elastic/kibana-operations
packages/kbn-management/storybook/config @elastic/kibana-management
packages/kbn-manifest @elastic/kibana-core
packages/kbn-mock-idp-plugin @elastic/kibana-security
packages/kbn-mock-idp-utils @elastic/kibana-security
Expand Down Expand Up @@ -367,9 +366,6 @@ src/platform/packages/private/kbn-item-buffer @elastic/appex-sharedux
src/platform/packages/private/kbn-language-documentation @elastic/kibana-esql
src/platform/packages/private/kbn-lens-formula-docs @elastic/kibana-visualizations
src/platform/packages/private/kbn-managed-content-badge @elastic/kibana-visualizations
src/platform/packages/private/kbn-management/settings/application @elastic/kibana-management
src/platform/packages/private/kbn-management/settings/components/field_category @elastic/kibana-management
src/platform/packages/private/kbn-management/settings/components/form @elastic/kibana-management
src/platform/packages/private/kbn-mapbox-gl @elastic/kibana-presentation
src/platform/packages/private/kbn-panel-loader @elastic/kibana-presentation
src/platform/packages/private/kbn-react-mute-legacy-root-warning @elastic/appex-sharedux
Expand Down Expand Up @@ -482,13 +478,17 @@ src/platform/packages/shared/kbn-logging @elastic/kibana-core
src/platform/packages/shared/kbn-logging-mocks @elastic/kibana-core
src/platform/packages/shared/kbn-management/cards_navigation @elastic/kibana-management
src/platform/packages/shared/kbn-management/delete_managed_assets_callout @elastic/kibana-management
src/platform/packages/shared/kbn-management/settings/application @elastic/kibana-management
src/platform/packages/shared/kbn-management/settings/components/field_category @elastic/kibana-management
src/platform/packages/shared/kbn-management/settings/components/field_input @elastic/kibana-management
src/platform/packages/shared/kbn-management/settings/components/field_row @elastic/kibana-management
src/platform/packages/shared/kbn-management/settings/components/form @elastic/kibana-management
src/platform/packages/shared/kbn-management/settings/field_definition @elastic/kibana-management
src/platform/packages/shared/kbn-management/settings/section_registry @elastic/appex-sharedux @elastic/kibana-management
src/platform/packages/shared/kbn-management/settings/setting_ids @elastic/appex-sharedux @elastic/kibana-management
src/platform/packages/shared/kbn-management/settings/types @elastic/kibana-management
src/platform/packages/shared/kbn-management/settings/utilities @elastic/kibana-management
src/platform/packages/shared/kbn-management/storybook/config @elastic/kibana-management
src/platform/packages/shared/kbn-monaco @elastic/appex-sharedux
src/platform/packages/shared/kbn-object-utils @elastic/kibana-core
src/platform/packages/shared/kbn-object-versioning @elastic/appex-sharedux
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -635,11 +635,11 @@
"@kbn/managed-content-badge": "link:src/platform/packages/private/kbn-managed-content-badge",
"@kbn/management-cards-navigation": "link:src/platform/packages/shared/kbn-management/cards_navigation",
"@kbn/management-plugin": "link:src/platform/plugins/shared/management",
"@kbn/management-settings-application": "link:src/platform/packages/private/kbn-management/settings/application",
"@kbn/management-settings-components-field-category": "link:src/platform/packages/private/kbn-management/settings/components/field_category",
"@kbn/management-settings-application": "link:src/platform/packages/shared/kbn-management/settings/application",
"@kbn/management-settings-components-field-category": "link:src/platform/packages/shared/kbn-management/settings/components/field_category",
"@kbn/management-settings-components-field-input": "link:src/platform/packages/shared/kbn-management/settings/components/field_input",
"@kbn/management-settings-components-field-row": "link:src/platform/packages/shared/kbn-management/settings/components/field_row",
"@kbn/management-settings-components-form": "link:src/platform/packages/private/kbn-management/settings/components/form",
"@kbn/management-settings-components-form": "link:src/platform/packages/shared/kbn-management/settings/components/form",
"@kbn/management-settings-field-definition": "link:src/platform/packages/shared/kbn-management/settings/field_definition",
"@kbn/management-settings-ids": "link:src/platform/packages/shared/kbn-management/settings/setting_ids",
"@kbn/management-settings-section-registry": "link:src/platform/packages/shared/kbn-management/settings/section_registry",
Expand Down Expand Up @@ -1466,7 +1466,7 @@
"@kbn/lint-ts-projects-cli": "link:packages/kbn-lint-ts-projects-cli",
"@kbn/managed-vscode-config": "link:packages/kbn-managed-vscode-config",
"@kbn/managed-vscode-config-cli": "link:packages/kbn-managed-vscode-config-cli",
"@kbn/management-storybook-config": "link:packages/kbn-management/storybook/config",
"@kbn/management-storybook-config": "link:src/platform/packages/shared/kbn-management/storybook/config",
"@kbn/manifest": "link:packages/kbn-manifest",
"@kbn/mock-idp-plugin": "link:packages/kbn-mock-idp-plugin",
"@kbn/mock-idp-utils": "link:packages/kbn-mock-idp-utils",
Expand Down
18 changes: 0 additions & 18 deletions packages/kbn-management/settings/jest.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/dev/storybook/aliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const storybookAliases = {
investigate: 'x-pack/solutions/observability/plugins/investigate_app/.storybook',
kibana_react: 'src/platform/plugins/shared/kibana_react/.storybook',
lists: 'x-pack/solutions/security/plugins/lists/.storybook',
management: 'packages/kbn-management/storybook/config',
management: 'src/platform/packages/shared/kbn-management/storybook/config',
observability: 'x-pack/solutions/observability/plugins/observability/.storybook',
observability_ai_assistant:
'x-pack/platform/plugins/shared/observability_ai_assistant/.storybook',
Expand Down
14 changes: 0 additions & 14 deletions src/platform/packages/private/kbn-management/jest.config.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ These packages comprise the Management Advanced Settings application. The sourc

In the interest of time and compatibility, we've opted to use the pattern from the original components in `advancedSettings`. We plan to revisit the state management and prop-drilling when `advancedSettings` is refactored with these components.

This is being tracked with https://github.com/elastic/kibana/issues/166579
This is being tracked with https://github.com/elastic/kibana/issues/166579
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"@elastic/kibana-management"
],
"group": "platform",
"visibility": "private"
}
"visibility": "shared"
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ module.exports = {
preset: '@kbn/test',
rootDir: '../../../../../../../..',
roots: [
'<rootDir>/src/platform/packages/private/kbn-management/settings/components/field_category',
'<rootDir>/src/platform/packages/shared/kbn-management/settings/components/field_category',
],
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"@elastic/kibana-management"
],
"group": "platform",
"visibility": "private"
}
"visibility": "shared"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,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 = 'kbn-management storybook';

/** The remote URL of the root from which Storybook loads stories for kbn-management. */
export const URL = 'https://github.com/elastic/kibana/tree/main/packages/kbn-management';
export const URL =
'https://github.com/elastic/kibana/tree/main/src/platform/packages/shared/kbn-management';
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
"type": "shared-common",
"id": "@kbn/management-storybook-config",
"owner": "@elastic/kibana-management",
"group": "platform",
"visibility": "shared",
"devOnly": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import { defaultConfig } from '@kbn/storybook';

module.exports = {
...defaultConfig,
stories: [
'../../../../src/platform/packages/(private|shared)/kbn-management/**/*.stories.+(tsx|mdx)',
],
stories: ['../../**/*.stories.+(tsx|mdx)'],
reactOptions: {
strictMode: true,
},
Expand Down
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
18 changes: 9 additions & 9 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -1204,16 +1204,16 @@
"@kbn/management-cards-navigation/*": ["src/platform/packages/shared/kbn-management/cards_navigation/*"],
"@kbn/management-plugin": ["src/platform/plugins/shared/management"],
"@kbn/management-plugin/*": ["src/platform/plugins/shared/management/*"],
"@kbn/management-settings-application": ["src/platform/packages/private/kbn-management/settings/application"],
"@kbn/management-settings-application/*": ["src/platform/packages/private/kbn-management/settings/application/*"],
"@kbn/management-settings-components-field-category": ["src/platform/packages/private/kbn-management/settings/components/field_category"],
"@kbn/management-settings-components-field-category/*": ["src/platform/packages/private/kbn-management/settings/components/field_category/*"],
"@kbn/management-settings-application": ["src/platform/packages/shared/kbn-management/settings/application"],
"@kbn/management-settings-application/*": ["src/platform/packages/shared/kbn-management/settings/application/*"],
"@kbn/management-settings-components-field-category": ["src/platform/packages/shared/kbn-management/settings/components/field_category"],
"@kbn/management-settings-components-field-category/*": ["src/platform/packages/shared/kbn-management/settings/components/field_category/*"],
"@kbn/management-settings-components-field-input": ["src/platform/packages/shared/kbn-management/settings/components/field_input"],
"@kbn/management-settings-components-field-input/*": ["src/platform/packages/shared/kbn-management/settings/components/field_input/*"],
"@kbn/management-settings-components-field-row": ["src/platform/packages/shared/kbn-management/settings/components/field_row"],
"@kbn/management-settings-components-field-row/*": ["src/platform/packages/shared/kbn-management/settings/components/field_row/*"],
"@kbn/management-settings-components-form": ["src/platform/packages/private/kbn-management/settings/components/form"],
"@kbn/management-settings-components-form/*": ["src/platform/packages/private/kbn-management/settings/components/form/*"],
"@kbn/management-settings-components-form": ["src/platform/packages/shared/kbn-management/settings/components/form"],
"@kbn/management-settings-components-form/*": ["src/platform/packages/shared/kbn-management/settings/components/form/*"],
"@kbn/management-settings-field-definition": ["src/platform/packages/shared/kbn-management/settings/field_definition"],
"@kbn/management-settings-field-definition/*": ["src/platform/packages/shared/kbn-management/settings/field_definition/*"],
"@kbn/management-settings-ids": ["src/platform/packages/shared/kbn-management/settings/setting_ids"],
Expand All @@ -1224,8 +1224,8 @@
"@kbn/management-settings-types/*": ["src/platform/packages/shared/kbn-management/settings/types/*"],
"@kbn/management-settings-utilities": ["src/platform/packages/shared/kbn-management/settings/utilities"],
"@kbn/management-settings-utilities/*": ["src/platform/packages/shared/kbn-management/settings/utilities/*"],
"@kbn/management-storybook-config": ["packages/kbn-management/storybook/config"],
"@kbn/management-storybook-config/*": ["packages/kbn-management/storybook/config/*"],
"@kbn/management-storybook-config": ["src/platform/packages/shared/kbn-management/storybook/config"],
"@kbn/management-storybook-config/*": ["src/platform/packages/shared/kbn-management/storybook/config/*"],
"@kbn/management-test-plugin": ["test/plugin_functional/plugins/management_test_plugin"],
"@kbn/management-test-plugin/*": ["test/plugin_functional/plugins/management_test_plugin/*"],
"@kbn/manifest": ["packages/kbn-manifest"],
Expand Down Expand Up @@ -2180,4 +2180,4 @@
"@kbn/ambient-storybook-types"
]
}
}
}
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6277,11 +6277,11 @@
version "0.0.0"
uid ""

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

"@kbn/management-settings-components-field-category@link:src/platform/packages/private/kbn-management/settings/components/field_category":
"@kbn/management-settings-components-field-category@link:src/platform/packages/shared/kbn-management/settings/components/field_category":
version "0.0.0"
uid ""

Expand All @@ -6293,7 +6293,7 @@
version "0.0.0"
uid ""

"@kbn/management-settings-components-form@link:src/platform/packages/private/kbn-management/settings/components/form":
"@kbn/management-settings-components-form@link:src/platform/packages/shared/kbn-management/settings/components/form":
version "0.0.0"
uid ""

Expand All @@ -6317,7 +6317,7 @@
version "0.0.0"
uid ""

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

Expand Down

0 comments on commit b2b3fa9

Please sign in to comment.