From be050713eec6fbfb7f92de42d5044c57afd4a4ce Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 20 Jul 2023 11:45:44 +0200 Subject: [PATCH] Upgrade eslint to v8 --- package.json | 20 +- src/dev/eslint/eslint_bin_path.ts | 15 + src/dev/eslint/index.ts | 1 + src/dev/eslint/lint_files.ts | 33 +- src/dev/eslint/pick_files_to_lint.ts | 23 +- src/dev/eslint/run_eslint_with_types.ts | 5 +- src/dev/run_eslint.js | 8 +- src/dev/run_precommit_hook.js | 2 +- src/plugins/interactive_setup/public/app.tsx | 2 +- .../public/cluster_address_form.tsx | 2 +- .../public/cluster_configuration_form.tsx | 2 +- .../public/enrollment_token_form.test.tsx | 2 +- .../public/enrollment_token_form.tsx | 2 +- .../public/submit_error_callout.test.tsx | 2 +- .../public/verification_code_form.tsx | 2 +- .../server/elasticsearch_service.test.ts | 2 +- .../server/elasticsearch_service.ts | 4 +- .../interactive_setup/server/plugin.ts | 2 +- .../server/routes/configure.test.ts | 4 +- .../server/routes/enroll.test.ts | 4 +- .../interactive_setup/server/routes/index.ts | 10 +- .../server/routes/ping.test.ts | 4 +- .../server/verification_code.test.ts | 2 +- x-pack/plugins/apm/scripts/eslint.js | 8 +- .../encryption_key_rotation_service.test.ts | 2 +- .../crypto/encryption_key_rotation_service.ts | 4 +- .../server/routes/index.ts | 2 +- .../server/routes/key_rotation.test.ts | 2 +- .../server/saved_objects/index.ts | 2 +- ...saved_objects_encryption_extension.test.ts | 2 +- .../saved_objects_encryption_extension.ts | 2 +- .../__mocks__/kea_logic/kibana_logic.mock.ts | 2 +- .../api_logs/api_logs_logic.test.ts | 2 +- .../search_experience_content.test.tsx | 2 +- .../ml_inference/test_pipeline_logic.test.ts | 2 +- .../assets_and_objects.test.tsx | 2 +- .../blocked_window_item.test.tsx | 2 +- .../blocked_window_tab.test.tsx | 2 +- .../views/groups/group_logic.test.ts | 2 +- .../views/groups/groups_logic.test.ts | 2 +- .../views/overview/onboarding_steps.test.tsx | 2 +- .../views/overview/overview_logic.test.ts | 2 +- .../views/overview/recent_activity.test.tsx | 2 +- .../connectors/fetch_connector_index_names.ts | 2 +- .../enterprise_search/analytics.test.ts | 2 +- .../queries/ecs_mapping_editor_field.tsx | 2 +- .../osquery/public/results/results_table.tsx | 2 +- .../account_management_app.test.tsx | 4 +- .../account_management_page.test.tsx | 8 +- .../account_management_page.tsx | 2 +- .../user_profile/user_profile.test.tsx | 2 +- .../user_profile/user_profile.tsx | 2 +- .../analytics/analytics_service.test.ts | 2 +- .../public/analytics/analytics_service.ts | 2 +- .../analytics/register_user_context.test.ts | 2 +- .../authentication/authentication_service.ts | 6 +- .../logged_out/logged_out_page.test.tsx | 2 +- .../components/login_form/login_form.tsx | 4 +- .../authentication/login/login_page.test.tsx | 6 +- .../authentication/login/login_page.tsx | 6 +- .../authentication/logout/logout_app.test.ts | 2 +- .../overwritten_session_app.test.ts | 2 +- .../overwritten_session_page.test.tsx | 2 +- .../security/public/components/use_badge.ts | 2 +- .../public/components/use_capabilities.ts | 2 +- .../api_keys/api_keys_grid/api_key_flyout.tsx | 4 +- .../api_keys_grid/api_keys_grid_page.test.tsx | 2 +- .../api_keys_grid/api_keys_grid_page.tsx | 6 +- .../api_keys/api_keys_management_app.test.tsx | 2 +- .../management/management_service.test.ts | 6 +- .../public/management/management_service.ts | 6 +- .../delete_provider/delete_provider.test.tsx | 2 +- .../edit_role_mapping_page.test.tsx | 6 +- .../edit_role_mapping_page.tsx | 6 +- .../mapping_info_panel.test.tsx | 2 +- .../role_selector/role_selector.test.tsx | 6 +- .../role_selector/role_selector.tsx | 4 +- .../role_selector/role_template_editor.tsx | 2 +- .../add_rule_button.test.tsx | 2 +- .../field_rule_editor.test.tsx | 2 +- .../json_rule_editor.test.tsx | 2 +- .../rule_editor_panel.test.tsx | 2 +- .../rule_editor_panel/rule_editor_panel.tsx | 4 +- .../rule_group_editor.test.tsx | 2 +- .../rule_editor_panel/rule_group_editor.tsx | 4 +- .../visual_rule_editor.test.tsx | 2 +- .../rule_editor_panel/visual_rule_editor.tsx | 4 +- .../services/role_mapping_validation.test.ts | 2 +- .../services/role_template_type.test.ts | 2 +- .../role_mappings/model/rule_builder.test.ts | 2 +- .../role_mappings/model/rule_builder.ts | 2 +- .../role_mappings_grid_page.test.tsx | 4 +- .../role_mappings_grid_page.tsx | 2 +- .../roles/edit_role/edit_role_page.test.tsx | 8 +- .../roles/edit_role/edit_role_page.tsx | 12 +- .../privileges/es/cluster_privileges.test.tsx | 2 +- .../es/elasticsearch_privileges.test.tsx | 2 +- .../es/elasticsearch_privileges.tsx | 4 +- .../es/index_privilege_form.test.tsx | 2 +- .../privileges/es/index_privileges.test.tsx | 4 +- .../privileges/es/index_privileges.tsx | 2 +- .../feature_table/feature_table.test.tsx | 4 +- .../kibana/feature_table/feature_table.tsx | 4 +- .../feature_table_expanded_row.test.tsx | 2 +- .../feature_table_expanded_row.tsx | 2 +- .../feature_table/sub_feature_form.test.tsx | 2 +- .../feature_table_cell.test.tsx | 2 +- .../kibana/kibana_privileges_region.test.tsx | 6 +- .../kibana/kibana_privileges_region.tsx | 6 +- .../privilege_form_calculator.test.ts | 2 +- .../privilege_summary.test.tsx | 4 +- .../privilege_summary/privilege_summary.tsx | 2 +- .../privilege_summary_calculator.test.ts | 2 +- .../privilege_summary_expanded_row.tsx | 2 +- .../privilege_summary_table.test.tsx | 6 +- .../privilege_summary_table.tsx | 8 +- .../space_column_header.test.tsx | 2 +- .../simple_privilege_section.test.tsx | 4 +- .../simple_privilege_section.tsx | 2 +- .../privilege_space_form.test.tsx | 4 +- .../privilege_space_form.tsx | 2 +- .../privilege_space_table.test.tsx | 4 +- .../privilege_space_table.tsx | 2 +- .../space_aware_privilege_section.test.tsx | 6 +- .../space_aware_privilege_section.tsx | 4 +- .../edit_role/reserved_role_badge.test.tsx | 2 +- .../roles/edit_role/validate_role.test.ts | 2 +- .../roles/model/kibana_privileges.test.ts | 4 +- .../roles/model/kibana_privileges.ts | 4 +- .../management/roles/roles_api_client.test.ts | 2 +- .../roles/roles_grid/roles_grid_page.test.tsx | 4 +- .../roles/roles_grid/roles_grid_page.tsx | 4 +- .../roles/roles_management_app.test.tsx | 2 +- .../change_password_form.test.tsx | 2 +- .../confirm_delete_users.test.tsx | 2 +- .../users/edit_user/create_user_page.test.tsx | 2 +- .../users/edit_user/create_user_page.tsx | 2 +- .../users/edit_user/edit_user_page.test.tsx | 2 +- .../users/edit_user/edit_user_page.tsx | 8 +- .../management/users/user_utils.test.ts | 2 +- .../users/users_grid/users_grid_page.test.tsx | 2 +- .../users/users_management_app.test.tsx | 2 +- x-pack/plugins/security/public/mocks.ts | 6 +- .../nav_control_component.test.tsx | 2 +- .../nav_control/nav_control_service.test.ts | 2 +- .../nav_control/nav_control_service.tsx | 4 +- x-pack/plugins/security/public/plugin.tsx | 4 +- .../security_checkup_service.test.ts | 2 +- .../security_checkup_service.tsx | 2 +- .../session/session_expiration_toast.tsx | 2 +- .../public/session/session_expired.test.ts | 2 +- .../public/session/session_timeout.test.ts | 4 +- .../public/session/session_timeout.ts | 4 +- ...thorized_response_http_interceptor.test.ts | 6 +- .../unauthorized_response_http_interceptor.ts | 2 +- .../change_password/change_password_async.tsx | 2 +- .../anonymous_access_service.test.ts | 2 +- .../server/audit/audit_events.test.ts | 6 +- .../server/audit/audit_service.test.ts | 6 +- .../security/server/audit/audit_service.ts | 4 +- .../authentication/api_keys/api_keys.test.ts | 2 +- .../authentication/api_keys/api_keys.ts | 2 +- .../authentication_result.test.ts | 2 +- .../authentication_service.test.ts | 6 +- .../authentication/authentication_service.ts | 14 +- .../authentication/authenticator.test.ts | 18 +- .../server/authentication/authenticator.ts | 40 +- .../can_redirect_request.test.ts | 2 +- .../providers/anonymous.test.ts | 4 +- .../authentication/providers/anonymous.ts | 4 +- .../authentication/providers/basic.test.ts | 4 +- .../server/authentication/providers/basic.ts | 2 +- .../authentication/providers/http.test.ts | 6 +- .../server/authentication/providers/http.ts | 4 +- .../authentication/providers/kerberos.test.ts | 6 +- .../authentication/providers/kerberos.ts | 2 +- .../authentication/providers/oidc.test.ts | 8 +- .../server/authentication/providers/oidc.ts | 4 +- .../authentication/providers/pki.test.ts | 6 +- .../server/authentication/providers/pki.ts | 2 +- .../authentication/providers/saml.test.ts | 8 +- .../server/authentication/providers/saml.ts | 4 +- .../authentication/providers/token.test.ts | 6 +- .../server/authentication/providers/token.ts | 2 +- .../server/authentication/tokens.test.ts | 2 +- .../authentication/unauthenticated_page.tsx | 2 +- .../authorization_service.test.ts | 17 +- .../authorization/authorization_service.tsx | 12 +- .../authorization/check_privileges.test.ts | 2 +- .../server/authorization/check_privileges.ts | 2 +- .../check_privileges_dynamically.ts | 2 +- .../check_saved_objects_privileges.test.ts | 2 +- .../check_saved_objects_privileges.ts | 2 +- .../disable_ui_capabilities.test.ts | 2 +- .../authorization/disable_ui_capabilities.ts | 2 +- .../server/authorization/mode.test.ts | 2 +- .../alerting.test.ts | 2 +- .../feature_privilege_builder/cases.test.ts | 2 +- .../feature_privilege_builder/index.ts | 2 +- .../privileges/privileges.test.ts | 2 +- .../authorization/privileges/privileges.ts | 2 +- .../authorization/privileges_serializer.ts | 2 +- .../register_privileges_with_cluster.test.ts | 2 +- .../authorization/reset_session_page.tsx | 2 +- .../deprecations/kibana_user_role.test.ts | 2 +- .../elasticsearch_service.test.ts | 2 +- .../security/server/lib/role_utils.test.ts | 2 +- .../plugins/security/server/lib/role_utils.ts | 2 +- x-pack/plugins/security/server/mocks.ts | 6 +- x-pack/plugins/security/server/plugin.ts | 4 +- .../plugins/security/server/prompt_page.tsx | 2 +- .../analytics/authentication_type.test.ts | 2 +- .../security/server/routes/analytics/index.ts | 2 +- .../anonymous_access/get_capabilities.test.ts | 2 +- .../routes/anonymous_access/get_state.test.ts | 2 +- .../server/routes/anonymous_access/index.ts | 2 +- .../server/routes/api_keys/create.test.ts | 2 +- .../server/routes/api_keys/enabled.test.ts | 2 +- .../server/routes/api_keys/get.test.ts | 2 +- .../security/server/routes/api_keys/index.ts | 2 +- .../server/routes/api_keys/invalidate.test.ts | 2 +- .../server/routes/api_keys/update.test.ts | 2 +- .../routes/authentication/common.test.ts | 2 +- .../server/routes/authentication/index.ts | 2 +- .../server/routes/authentication/saml.test.ts | 2 +- .../server/routes/authorization/index.ts | 2 +- .../authorization/privileges/get.test.ts | 2 +- .../routes/authorization/privileges/index.ts | 2 +- .../routes/authorization/roles/delete.test.ts | 2 +- .../routes/authorization/roles/get.test.ts | 2 +- .../authorization/roles/get_all.test.ts | 2 +- .../routes/authorization/roles/index.ts | 2 +- .../roles/model/put_payload.test.ts | 2 +- .../routes/authorization/roles/put.test.ts | 2 +- .../server/routes/authorization/roles/put.ts | 4 +- .../share_saved_object_permissions.test.ts | 2 +- .../server/routes/deprecations/index.ts | 2 +- .../deprecations/kibana_user_role.test.ts | 2 +- .../plugins/security/server/routes/index.ts | 20 +- .../server/routes/indices/get_fields.test.ts | 2 +- .../security/server/routes/indices/index.ts | 2 +- .../server/routes/role_mapping/delete.test.ts | 2 +- .../routes/role_mapping/feature_check.test.ts | 2 +- .../server/routes/role_mapping/get.test.ts | 2 +- .../server/routes/role_mapping/index.ts | 2 +- .../server/routes/role_mapping/post.test.ts | 2 +- .../routes/security_checkup/get_state.test.ts | 2 +- .../routes/session_management/extend.test.ts | 2 +- .../server/routes/session_management/index.ts | 2 +- .../routes/session_management/info.test.ts | 2 +- .../session_management/invalidate.test.ts | 2 +- .../routes/user_profile/bulk_get.test.ts | 2 +- .../routes/user_profile/get_current.test.ts | 2 +- .../server/routes/user_profile/index.ts | 2 +- .../server/routes/user_profile/update.test.ts | 2 +- .../routes/users/change_password.test.ts | 2 +- .../security/server/routes/users/index.ts | 2 +- .../routes/views/access_agreement.test.ts | 2 +- .../server/routes/views/capture_url.test.ts | 2 +- .../security/server/routes/views/index.ts | 2 +- .../server/routes/views/logged_out.test.ts | 2 +- .../server/routes/views/login.test.ts | 2 +- .../saved_objects/ensure_authorized.test.ts | 6 +- .../security/server/saved_objects/index.ts | 2 +- .../saved_objects_security_extension.test.ts | 20 +- .../saved_objects_security_extension.ts | 2 +- .../server/session_management/session.mock.ts | 2 +- .../server/session_management/session.test.ts | 10 +- .../server/session_management/session.ts | 8 +- .../session_management/session_index.test.ts | 10 +- .../session_management_service.test.ts | 8 +- .../session_management_service.ts | 6 +- .../secure_spaces_client_wrapper.test.ts | 6 +- .../spaces/secure_spaces_client_wrapper.ts | 2 +- .../server/spaces/setup_spaces_client.test.ts | 2 +- .../server/spaces/setup_spaces_client.ts | 2 +- .../security_usage_collector.test.ts | 2 +- .../user_profile/user_profile_service.test.ts | 2 +- .../user_profile/user_profile_service.ts | 2 +- .../user_settings_service.test.ts | 6 +- .../risk_engine/utils/create_datastream.ts | 3 - .../common/lib/spaces_url_parser.test.ts | 2 +- .../advanced_settings_service.tsx | 2 +- .../advanced_settings_title.test.tsx | 2 +- .../copy_status_summary_indicator.tsx | 2 +- .../copy_to_space_flyout_internal.test.tsx | 8 +- .../copy_to_space_flyout_internal.tsx | 6 +- .../components/copy_to_space_form.tsx | 4 +- .../components/processing_copy_to_space.tsx | 2 +- .../components/resolve_all_conflicts.test.tsx | 4 +- .../components/space_result.tsx | 4 +- .../components/space_result_details.tsx | 2 +- .../lib/summarize_copy_result.test.ts | 2 +- .../embeddable_legacy_url_conflict.tsx | 2 +- .../components/legacy_url_conflict.tsx | 2 +- .../public/legacy_urls/redirect_legacy_url.ts | 2 +- .../confirm_delete_modal.test.tsx | 2 +- .../customize_space/customize_space.test.tsx | 2 +- .../customize_space/customize_space.tsx | 2 +- .../customize_space_avatar.test.tsx | 2 +- .../edit_space/delete_spaces_button.test.tsx | 2 +- .../enabled_features/enabled_features.tsx | 2 +- .../edit_space/manage_space_page.test.tsx | 4 +- .../edit_space/manage_space_page.tsx | 8 +- .../public/management/lib/validate_space.ts | 2 +- .../management/management_service.test.ts | 2 +- .../public/management/management_service.tsx | 2 +- .../spaces_grid/spaces_grid_page.test.tsx | 2 +- .../management/spaces_management_app.test.tsx | 2 +- .../components/spaces_description.tsx | 2 +- .../nav_control/components/spaces_menu.tsx | 2 +- .../nav_control/nav_control_popover.test.tsx | 2 +- .../nav_control/nav_control_popover.tsx | 4 +- .../components/alias_table.tsx | 2 +- .../components/selectable_spaces_control.tsx | 2 +- .../components/share_mode_control.tsx | 2 +- .../share_to_space_flyout_internal.test.tsx | 12 +- .../share_to_space_flyout_internal.tsx | 10 +- .../components/share_to_space_form.tsx | 2 +- .../space_avatar/space_avatar_internal.tsx | 2 +- .../space_list/space_list_internal.test.tsx | 4 +- .../public/space_list/space_list_internal.tsx | 2 +- .../space_selector/components/space_cards.tsx | 2 +- .../space_selector/space_selector.test.tsx | 2 +- .../public/space_selector/space_selector.tsx | 4 +- .../spaces/public/spaces_context/context.tsx | 2 +- .../spaces_context/wrapper_internal.tsx | 4 +- .../spaces_manager/spaces_manager.mock.ts | 2 +- .../public/spaces_manager/spaces_manager.ts | 2 +- x-pack/plugins/spaces/public/types.ts | 2 +- .../spaces/public/ui_api/components.tsx | 4 +- x-pack/plugins/spaces/public/ui_api/index.ts | 4 +- .../capabilities_switcher.test.ts | 2 +- .../spaces/server/capabilities/index.ts | 4 +- .../default_space_service.test.ts | 2 +- .../default_space/default_space_service.ts | 2 +- .../lib/copy_to_spaces/copy_to_spaces.ts | 4 +- .../lib/saved_objects_client_opts.ts | 2 +- .../copy_to_spaces/resolve_copy_conflicts.ts | 2 +- .../on_post_auth_interceptor.test.ts | 11 +- .../on_request_interceptor.test.ts | 2 +- .../spaces_tutorial_context_factory.test.ts | 2 +- x-pack/plugins/spaces/server/plugin.ts | 2 +- .../routes/api/external/copy_to_space.test.ts | 4 +- .../server/routes/api/external/delete.test.ts | 2 +- .../disable_legacy_url_aliases.test.ts | 2 +- .../server/routes/api/external/get.test.ts | 2 +- .../routes/api/external/get_all.test.ts | 2 +- .../external/get_shareable_references.test.ts | 2 +- .../server/routes/api/external/index.ts | 6 +- .../server/routes/api/external/post.test.ts | 2 +- .../server/routes/api/external/put.test.ts | 2 +- .../external/update_objects_spaces.test.ts | 2 +- .../api/internal/get_active_space.test.ts | 2 +- .../server/routes/api/internal/index.ts | 2 +- .../migrations/space_migrations.test.ts | 2 +- .../migrations/usage_stats_migrations.test.ts | 2 +- .../saved_objects_service.test.ts | 2 +- .../saved_objects/saved_objects_service.ts | 4 +- .../saved_objects_spaces_extension.test.ts | 2 +- .../spaces_client/spaces_client.mock.ts | 2 +- .../spaces_client/spaces_client.test.ts | 4 +- .../server/spaces_client/spaces_client.ts | 2 +- .../spaces_client_service.mock.ts | 2 +- .../spaces_client_service.test.ts | 4 +- .../spaces_client/spaces_client_service.ts | 2 +- .../spaces_service/spaces_service.mock.ts | 2 +- .../spaces_service/spaces_service.test.ts | 2 +- .../spaces_usage_collector.test.ts | 4 +- .../server/usage_stats/usage_stats_client.ts | 2 +- yarn.lock | 640 ++++++++---------- 371 files changed, 959 insertions(+), 995 deletions(-) create mode 100644 src/dev/eslint/eslint_bin_path.ts diff --git a/package.json b/package.json index 53f5526bf73dda..a65195f5bd2cdc 100644 --- a/package.json +++ b/package.json @@ -1252,7 +1252,7 @@ "@types/delete-empty": "^2.0.0", "@types/ejs": "^3.0.6", "@types/enzyme": "^3.10.12", - "@types/eslint": "^7.28.0", + "@types/eslint": "^8.44.1", "@types/express": "^4.17.13", "@types/extract-zip": "^1.6.2", "@types/faker": "^5.1.5", @@ -1421,17 +1421,17 @@ "ejs": "^3.1.8", "enzyme": "^3.11.0", "enzyme-to-json": "^3.6.2", - "eslint": "^7.32.0", - "eslint-config-prettier": "^8.5.0", - "eslint-module-utils": "^2.6.2", - "eslint-plugin-ban": "^1.5.2", - "eslint-plugin-cypress": "^2.13.2", + "eslint": "^8.45.0", + "eslint-config-prettier": "^8.8.0", + "eslint-module-utils": "^2.8.0", + "eslint-plugin-ban": "^1.6.0", + "eslint-plugin-cypress": "^2.13.3", "eslint-plugin-eslint-comments": "^3.2.0", - "eslint-plugin-import": "^2.24.2", + "eslint-plugin-import": "^2.27.5", "eslint-plugin-jest": "^27.2.3", - "eslint-plugin-jsx-a11y": "^6.4.1", - "eslint-plugin-mocha": "^10.0.5", - "eslint-plugin-no-unsanitized": "^3.1.5", + "eslint-plugin-jsx-a11y": "^6.7.1", + "eslint-plugin-mocha": "^10.1.0", + "eslint-plugin-no-unsanitized": "^4.0.2", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-react": "^7.32.2", diff --git a/src/dev/eslint/eslint_bin_path.ts b/src/dev/eslint/eslint_bin_path.ts new file mode 100644 index 00000000000000..b29a0c433e162e --- /dev/null +++ b/src/dev/eslint/eslint_bin_path.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { join, dirname } from 'path'; +import { bin } from 'eslint/package.json'; + +// Since eslint 8.0 we can't resolve `eslint/bin/eslint` directly since it's +// not exported in the eslint package.json file. Instead we need to resolve it +// using the following hack: +export const eslintBinPath = join(dirname(require.resolve('eslint/package.json')), bin.eslint); diff --git a/src/dev/eslint/index.ts b/src/dev/eslint/index.ts index 5aeb83c45ad057..889ed6ed47bf26 100644 --- a/src/dev/eslint/index.ts +++ b/src/dev/eslint/index.ts @@ -9,3 +9,4 @@ export { pickFilesToLint } from './pick_files_to_lint'; export { lintFiles } from './lint_files'; export { runEslintWithTypes } from './run_eslint_with_types'; +export { eslintBinPath } from './eslint_bin_path'; diff --git a/src/dev/eslint/lint_files.ts b/src/dev/eslint/lint_files.ts index 2e62cbd451add3..220d07f121d74a 100644 --- a/src/dev/eslint/lint_files.ts +++ b/src/dev/eslint/lint_files.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { CLIEngine } from 'eslint'; +import { ESLint } from 'eslint'; import { REPO_ROOT } from '@kbn/repo-info'; import { createFailError } from '@kbn/dev-cli-errors'; @@ -21,26 +21,39 @@ import { File } from '../file'; * @param {Array} files * @return {undefined} */ -export function lintFiles(log: ToolingLog, files: File[], { fix }: { fix?: boolean } = {}) { - const cli = new CLIEngine({ +export async function lintFiles(log: ToolingLog, files: File[], { fix }: { fix?: boolean } = {}) { + const eslint = new ESLint({ cache: true, cwd: REPO_ROOT, fix, }); const paths = files.map((file) => file.getRelativePath()); - const report = cli.executeOnFiles(paths); + const reports = await eslint.lintFiles(paths); if (fix) { - CLIEngine.outputFixes(report); + await ESLint.outputFixes(reports); } - if (report.errorCount || report.warningCount) { - log[report.errorCount ? 'error' : 'warning'](cli.getFormatter()(report.results)); - } + let foundError = false; + let foundWarning = false; + reports.some((report) => { + if (report.errorCount !== 0) { + foundError = true; + return true; + } else if (report.warningCount !== 0) { + foundWarning = true; + } + }); + + if (foundError || foundWarning) { + const formatter = await eslint.loadFormatter(); + const msg = await formatter.format(reports); + log[foundError ? 'error' : 'warning'](msg); - if (report.errorCount) { - throw createFailError(`[eslint] errors`); + if (foundError) { + throw createFailError(`[eslint] errors`); + } } log.success('[eslint] %d files linted successfully', files.length); diff --git a/src/dev/eslint/pick_files_to_lint.ts b/src/dev/eslint/pick_files_to_lint.ts index c65f4e63437874..1fc60d9d5d5c10 100644 --- a/src/dev/eslint/pick_files_to_lint.ts +++ b/src/dev/eslint/pick_files_to_lint.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { CLIEngine } from 'eslint'; +import { ESLint } from 'eslint'; import { ToolingLog } from '@kbn/tooling-log'; import { File } from '../file'; @@ -18,22 +18,23 @@ import { File } from '../file'; * @param {Array} files * @return {Array} */ -export function pickFilesToLint(log: ToolingLog, files: File[]) { - const cli = new CLIEngine({}); +export async function pickFilesToLint(log: ToolingLog, files: File[]) { + const eslint = new ESLint(); + const filesToLint = []; - return files.filter((file) => { - if (!file.isJs() && !file.isTypescript()) { - return; - } + for (const file of files) { + if (!file.isJs() && !file.isTypescript()) continue; const path = file.getRelativePath(); - if (cli.isPathIgnored(path)) { + if (await eslint.isPathIgnored(path)) { log.warning(`[eslint] %j ignored by .eslintignore`, file); - return false; + continue; } log.debug('[eslint] linting %j', file); - return true; - }); + filesToLint.push(file); + } + + return filesToLint; } diff --git a/src/dev/eslint/run_eslint_with_types.ts b/src/dev/eslint/run_eslint_with_types.ts index 75f49ba351579b..1ce39beb282064 100644 --- a/src/dev/eslint/run_eslint_with_types.ts +++ b/src/dev/eslint/run_eslint_with_types.ts @@ -20,10 +20,11 @@ import { REPO_ROOT } from '@kbn/repo-info'; import { TS_PROJECTS, type TsProject } from '@kbn/ts-projects'; +import { eslintBinPath } from './eslint_bin_path'; + export function runEslintWithTypes() { run( async ({ log, flags }) => { - const eslintPath = require.resolve('eslint/bin/eslint'); const ignoreFilePath = Path.resolve(REPO_ROOT, '.eslintignore'); const configTemplate = Fs.readFileSync( Path.resolve(__dirname, 'types.eslint.config.template.js'), @@ -77,7 +78,7 @@ export function runEslintWithTypes() { const proc = await execa( process.execPath, [ - Path.relative(project.directory, eslintPath), + Path.relative(project.directory, eslintBinPath), ...(project.config.include ?? []).map((p) => p.endsWith('*') ? `${p}.{ts,tsx}` : p ), diff --git a/src/dev/run_eslint.js b/src/dev/run_eslint.js index dd5aee101432b6..bf3017a277bce4 100644 --- a/src/dev/run_eslint.js +++ b/src/dev/run_eslint.js @@ -6,7 +6,9 @@ * Side Public License, v 1. */ -import { parse } from 'eslint/lib/options'; +import yargs from 'yargs'; + +import { eslintBinPath } from './eslint'; let quiet = true; if (process.argv.includes('--no-quiet')) { @@ -15,7 +17,7 @@ if (process.argv.includes('--no-quiet')) { process.argv.push('--quiet'); } -const options = parse(process.argv); +const options = yargs(process.argv).argv; process.env.KIBANA_RESOLVER_HARD_CACHE = 'true'; if (!options._.length && !options.printConfig) { @@ -31,7 +33,7 @@ if (!process.argv.includes('--ext')) { } // common-js is required so that logic before this executes before loading eslint -require('eslint/bin/eslint'); +require(eslintBinPath); // eslint-disable-line import/no-dynamic-require if (quiet) { process.on('exit', (code) => { diff --git a/src/dev/run_precommit_hook.js b/src/dev/run_precommit_hook.js index 7b8b8d25da1217..fb36a14ac3411d 100644 --- a/src/dev/run_precommit_hook.js +++ b/src/dev/run_precommit_hook.js @@ -43,7 +43,7 @@ run( } for (const Linter of [Eslint, Stylelint]) { - const filesToLint = Linter.pickFilesToLint(log, files); + const filesToLint = await Linter.pickFilesToLint(log, files); if (filesToLint.length > 0) { try { await Linter.lintFiles(log, filesToLint, { diff --git a/src/plugins/interactive_setup/public/app.tsx b/src/plugins/interactive_setup/public/app.tsx index f64e6628d14728..b3e98f7e97266b 100644 --- a/src/plugins/interactive_setup/public/app.tsx +++ b/src/plugins/interactive_setup/public/app.tsx @@ -15,13 +15,13 @@ import useAsync from 'react-use/lib/useAsync'; import { FormattedMessage } from '@kbn/i18n-react'; -import type { StatusResult } from '../common'; import { ClusterAddressForm } from './cluster_address_form'; import type { ClusterConfigurationFormProps } from './cluster_configuration_form'; import { ClusterConfigurationForm } from './cluster_configuration_form'; import { EnrollmentTokenForm } from './enrollment_token_form'; import { ProgressIndicator } from './progress_indicator'; import { useKibana } from './use_kibana'; +import type { StatusResult } from '../common'; export interface AppProps { onSuccess?(): void; diff --git a/src/plugins/interactive_setup/public/cluster_address_form.tsx b/src/plugins/interactive_setup/public/cluster_address_form.tsx index 6c4654472e0aa0..2e2debe44c7830 100644 --- a/src/plugins/interactive_setup/public/cluster_address_form.tsx +++ b/src/plugins/interactive_setup/public/cluster_address_form.tsx @@ -22,11 +22,11 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; -import type { PingResult } from '../common'; import { SubmitErrorCallout } from './submit_error_callout'; import type { ValidationErrors } from './use_form'; import { useForm } from './use_form'; import { useKibana } from './use_kibana'; +import type { PingResult } from '../common'; export interface ClusterAddressFormValues { host: string; diff --git a/src/plugins/interactive_setup/public/cluster_configuration_form.tsx b/src/plugins/interactive_setup/public/cluster_configuration_form.tsx index d511e69dffdf8b..89b1f3f520d09c 100644 --- a/src/plugins/interactive_setup/public/cluster_configuration_form.tsx +++ b/src/plugins/interactive_setup/public/cluster_configuration_form.tsx @@ -40,7 +40,6 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import { euiThemeVars } from '@kbn/ui-theme'; -import type { Certificate } from '../common'; import { DocLink } from './doc_link'; import { getCommandLineSnippet } from './get_command_line_snippet'; import { SubmitErrorCallout } from './submit_error_callout'; @@ -51,6 +50,7 @@ import { useHtmlId } from './use_html_id'; import { useKibana } from './use_kibana'; import { useVerification } from './use_verification'; import { useVisibility } from './use_visibility'; +import type { Certificate } from '../common'; export interface ClusterConfigurationFormValues { username: string; diff --git a/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx b/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx index 53f95ce62d7a7d..29952fb5da5ec0 100644 --- a/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx +++ b/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx @@ -11,9 +11,9 @@ import React from 'react'; import { coreMock, themeServiceMock } from '@kbn/core/public/mocks'; -import type { EnrollmentToken } from '../common'; import { decodeEnrollmentToken, EnrollmentTokenForm } from './enrollment_token_form'; import { Providers } from './plugin'; +import type { EnrollmentToken } from '../common'; jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({ htmlIdGenerator: () => () => `id-${Math.random()}`, diff --git a/src/plugins/interactive_setup/public/enrollment_token_form.tsx b/src/plugins/interactive_setup/public/enrollment_token_form.tsx index 7944f33365213f..3e95ff4d420b9a 100644 --- a/src/plugins/interactive_setup/public/enrollment_token_form.tsx +++ b/src/plugins/interactive_setup/public/enrollment_token_form.tsx @@ -28,7 +28,6 @@ import useUpdateEffect from 'react-use/lib/useUpdateEffect'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; -import type { EnrollmentToken } from '../common'; import { DocLink } from './doc_link'; import { getCommandLineSnippet } from './get_command_line_snippet'; import { SubmitErrorCallout } from './submit_error_callout'; @@ -38,6 +37,7 @@ import { useForm } from './use_form'; import { useKibana } from './use_kibana'; import { useVerification } from './use_verification'; import { useVisibility } from './use_visibility'; +import type { EnrollmentToken } from '../common'; export interface EnrollmentTokenFormValues { token: string; diff --git a/src/plugins/interactive_setup/public/submit_error_callout.test.tsx b/src/plugins/interactive_setup/public/submit_error_callout.test.tsx index f71263c1ae754c..4247b45acee008 100644 --- a/src/plugins/interactive_setup/public/submit_error_callout.test.tsx +++ b/src/plugins/interactive_setup/public/submit_error_callout.test.tsx @@ -10,6 +10,7 @@ import { errors } from '@elastic/elasticsearch'; import { shallow } from 'enzyme'; import React from 'react'; +import { SubmitErrorCallout } from './submit_error_callout'; import { ERROR_CONFIGURE_FAILURE, ERROR_ELASTICSEARCH_CONNECTION_CONFIGURED, @@ -20,7 +21,6 @@ import { ERROR_PING_FAILURE, } from '../common'; import { interactiveSetupMock } from '../server/mocks'; -import { SubmitErrorCallout } from './submit_error_callout'; describe('SubmitErrorCallout', () => { it('renders unknown errors correctly', async () => { diff --git a/src/plugins/interactive_setup/public/verification_code_form.tsx b/src/plugins/interactive_setup/public/verification_code_form.tsx index ca63b7d0e24535..cbb2070c2e66d6 100644 --- a/src/plugins/interactive_setup/public/verification_code_form.tsx +++ b/src/plugins/interactive_setup/public/verification_code_form.tsx @@ -22,13 +22,13 @@ import type { IHttpFetchError, ResponseErrorBody } from '@kbn/core-http-browser' import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; -import { VERIFICATION_CODE_LENGTH } from '../common'; import { getCommandLineSnippet } from './get_command_line_snippet'; import { SingleCharsField } from './single_chars_field'; import { SubmitErrorCallout } from './submit_error_callout'; import type { ValidationErrors } from './use_form'; import { useForm } from './use_form'; import { useKibana } from './use_kibana'; +import { VERIFICATION_CODE_LENGTH } from '../common'; export interface VerificationCodeFormValues { code: string; diff --git a/src/plugins/interactive_setup/server/elasticsearch_service.test.ts b/src/plugins/interactive_setup/server/elasticsearch_service.test.ts index 1ec799ad74a66a..38808ad3d1b8ad 100644 --- a/src/plugins/interactive_setup/server/elasticsearch_service.test.ts +++ b/src/plugins/interactive_setup/server/elasticsearch_service.test.ts @@ -15,11 +15,11 @@ import type { NodesVersionCompatibility } from '@kbn/core/server'; import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; import { nextTick } from '@kbn/test-jest-helpers'; -import { ElasticsearchConnectionStatus } from '../common'; import { ConfigSchema } from './config'; import type { ElasticsearchServiceSetup } from './elasticsearch_service'; import { ElasticsearchService } from './elasticsearch_service'; import { interactiveSetupMock } from './mocks'; +import { ElasticsearchConnectionStatus } from '../common'; jest.mock('tls'); jest.mock('@kbn/core/server', () => ({ diff --git a/src/plugins/interactive_setup/server/elasticsearch_service.ts b/src/plugins/interactive_setup/server/elasticsearch_service.ts index 25c704a89024b4..6994a38912ce14 100644 --- a/src/plugins/interactive_setup/server/elasticsearch_service.ts +++ b/src/plugins/interactive_setup/server/elasticsearch_service.ts @@ -30,10 +30,10 @@ import type { } from '@kbn/core/server'; import { pollEsNodesVersion } from '@kbn/core/server'; -import { ElasticsearchConnectionStatus } from '../common'; -import type { Certificate, PingResult } from '../common'; import { CompatibilityError } from './compatibility_error'; import { getDetailedErrorMessage, getErrorStatusCode } from './errors'; +import { ElasticsearchConnectionStatus } from '../common'; +import type { Certificate, PingResult } from '../common'; export interface EnrollParameters { apiKey: string; diff --git a/src/plugins/interactive_setup/server/plugin.ts b/src/plugins/interactive_setup/server/plugin.ts index ee09c2c71e7524..944dc6b3f7a292 100644 --- a/src/plugins/interactive_setup/server/plugin.ts +++ b/src/plugins/interactive_setup/server/plugin.ts @@ -18,12 +18,12 @@ import type { } from '@kbn/core/server'; import { getDataPath } from '@kbn/utils'; -import { ElasticsearchConnectionStatus } from '../common'; import type { ConfigSchema, ConfigType } from './config'; import { ElasticsearchService } from './elasticsearch_service'; import { KibanaConfigWriter } from './kibana_config_writer'; import { defineRoutes } from './routes'; import { VerificationService } from './verification_service'; +import { ElasticsearchConnectionStatus } from '../common'; // List of the Elasticsearch hosts Kibana uses by default. const DEFAULT_ELASTICSEARCH_HOSTS = [ diff --git a/src/plugins/interactive_setup/server/routes/configure.test.ts b/src/plugins/interactive_setup/server/routes/configure.test.ts index def3a8dcdb11a1..f69a5a92bf4f46 100644 --- a/src/plugins/interactive_setup/server/routes/configure.test.ts +++ b/src/plugins/interactive_setup/server/routes/configure.test.ts @@ -13,6 +13,8 @@ import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; +import { defineConfigureRoute } from './configure'; +import { routeDefinitionParamsMock } from './index.mock'; import { ElasticsearchConnectionStatus, ERROR_CONFIGURE_FAILURE, @@ -22,8 +24,6 @@ import { ERROR_OUTSIDE_PREBOOT_STAGE, } from '../../common'; import { interactiveSetupMock } from '../mocks'; -import { defineConfigureRoute } from './configure'; -import { routeDefinitionParamsMock } from './index.mock'; describe('Configure routes', () => { let router: jest.Mocked; diff --git a/src/plugins/interactive_setup/server/routes/enroll.test.ts b/src/plugins/interactive_setup/server/routes/enroll.test.ts index a803792cfa9eb1..8a0356d2dddceb 100644 --- a/src/plugins/interactive_setup/server/routes/enroll.test.ts +++ b/src/plugins/interactive_setup/server/routes/enroll.test.ts @@ -13,6 +13,8 @@ import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; +import { defineEnrollRoutes } from './enroll'; +import { routeDefinitionParamsMock } from './index.mock'; import { ElasticsearchConnectionStatus, ERROR_ELASTICSEARCH_CONNECTION_CONFIGURED, @@ -22,8 +24,6 @@ import { ERROR_OUTSIDE_PREBOOT_STAGE, } from '../../common'; import { interactiveSetupMock } from '../mocks'; -import { defineEnrollRoutes } from './enroll'; -import { routeDefinitionParamsMock } from './index.mock'; describe('Enroll routes', () => { let router: jest.Mocked; diff --git a/src/plugins/interactive_setup/server/routes/index.ts b/src/plugins/interactive_setup/server/routes/index.ts index 410fb5b42037cb..aba4bdb680d30c 100644 --- a/src/plugins/interactive_setup/server/routes/index.ts +++ b/src/plugins/interactive_setup/server/routes/index.ts @@ -6,19 +6,19 @@ * Side Public License, v 1. */ -import type { PrebootServicePreboot } from '@kbn/core-preboot-server'; import type { IBasePath, IRouter, Logger } from '@kbn/core/server'; +import type { PrebootServicePreboot } from '@kbn/core-preboot-server'; import type { PublicContract, PublicMethodsOf } from '@kbn/utility-types'; -import type { ConfigType } from '../config'; -import type { ElasticsearchServiceSetup } from '../elasticsearch_service'; -import type { KibanaConfigWriter } from '../kibana_config_writer'; -import type { VerificationCode } from '../verification_code'; import { defineConfigureRoute } from './configure'; import { defineEnrollRoutes } from './enroll'; import { definePingRoute } from './ping'; import { defineStatusRoute } from './status'; import { defineVerifyRoute } from './verify'; +import type { ConfigType } from '../config'; +import type { ElasticsearchServiceSetup } from '../elasticsearch_service'; +import type { KibanaConfigWriter } from '../kibana_config_writer'; +import type { VerificationCode } from '../verification_code'; /** * Describes parameters used to define HTTP routes. diff --git a/src/plugins/interactive_setup/server/routes/ping.test.ts b/src/plugins/interactive_setup/server/routes/ping.test.ts index 4e98fc841fc579..dc00a47730ef9a 100644 --- a/src/plugins/interactive_setup/server/routes/ping.test.ts +++ b/src/plugins/interactive_setup/server/routes/ping.test.ts @@ -13,10 +13,10 @@ import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; -import { ERROR_OUTSIDE_PREBOOT_STAGE, ERROR_PING_FAILURE } from '../../common'; -import { interactiveSetupMock } from '../mocks'; import { routeDefinitionParamsMock } from './index.mock'; import { definePingRoute } from './ping'; +import { ERROR_OUTSIDE_PREBOOT_STAGE, ERROR_PING_FAILURE } from '../../common'; +import { interactiveSetupMock } from '../mocks'; describe('Configure routes', () => { let router: jest.Mocked; diff --git a/src/plugins/interactive_setup/server/verification_code.test.ts b/src/plugins/interactive_setup/server/verification_code.test.ts index ec9aa48ab2b973..d430fce285234b 100644 --- a/src/plugins/interactive_setup/server/verification_code.test.ts +++ b/src/plugins/interactive_setup/server/verification_code.test.ts @@ -8,8 +8,8 @@ import { loggingSystemMock } from '@kbn/core/server/mocks'; -import { VERIFICATION_CODE_LENGTH } from '../common'; import { VerificationCode } from './verification_code'; +import { VERIFICATION_CODE_LENGTH } from '../common'; const loggerMock = loggingSystemMock.createLogger(); diff --git a/x-pack/plugins/apm/scripts/eslint.js b/x-pack/plugins/apm/scripts/eslint.js index 7869dd4c434fb2..a1a4de0c89b0f2 100644 --- a/x-pack/plugins/apm/scripts/eslint.js +++ b/x-pack/plugins/apm/scripts/eslint.js @@ -6,7 +6,7 @@ */ //eslint-disable-next-line import/no-extraneous-dependencies -const { CLIEngine } = require('eslint'); +const { ESLint } = require('eslint'); const { resolve } = require('path'); //eslint-disable-next-line import/no-extraneous-dependencies const { argv } = require('yargs'); @@ -14,15 +14,15 @@ const { argv } = require('yargs'); async function run() { const fix = !!argv.fix; - const engine = new CLIEngine({ + const eslint = new ESLint({ fix, cache: true, extensions: ['.js', '.jsx', '.ts', '.tsx'], }); - const report = engine.executeOnFiles(resolve(__dirname, '..')); + const report = await eslint.lintFiles(resolve(__dirname, '..')); - const formatter = engine.getFormatter(); + const formatter = await eslint.loadFormatter(); return formatter(report.results); } diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts index acd5c20fd1efd0..c92d33b9833b8d 100644 --- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts +++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts @@ -5,7 +5,6 @@ * 2.0. */ -import { ENCRYPTION_EXTENSION_ID } from '@kbn/core-saved-objects-server'; import type { SavedObject, SavedObjectsClientContract, @@ -18,6 +17,7 @@ import { savedObjectsClientMock, savedObjectsTypeRegistryMock, } from '@kbn/core/server/mocks'; +import { ENCRYPTION_EXTENSION_ID } from '@kbn/core-saved-objects-server'; import type { EncryptedSavedObjectsService } from './encrypted_saved_objects_service'; import { EncryptionError, EncryptionErrorOperation } from './encryption_error'; diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts index 9de649a8cf5e78..c18c7a46c54c4e 100644 --- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts +++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts @@ -5,7 +5,6 @@ * 2.0. */ -import { ENCRYPTION_EXTENSION_ID } from '@kbn/core-saved-objects-server'; import type { ISavedObjectTypeRegistry, KibanaRequest, @@ -14,12 +13,13 @@ import type { SavedObjectsBulkUpdateObject, StartServicesAccessor, } from '@kbn/core/server'; +import { ENCRYPTION_EXTENSION_ID } from '@kbn/core-saved-objects-server'; import type { AuthenticatedUser, SecurityPluginSetup } from '@kbn/security-plugin/server'; import type { PublicMethodsOf } from '@kbn/utility-types'; -import { getDescriptorNamespace } from '../saved_objects/get_descriptor_namespace'; import type { EncryptedSavedObjectsService } from './encrypted_saved_objects_service'; import { EncryptionError } from './encryption_error'; +import { getDescriptorNamespace } from '../saved_objects/get_descriptor_namespace'; interface EncryptionKeyRotationServiceOptions { logger: Logger; diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts index d0318c0bb06d3c..28f8dde589c758 100644 --- a/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts +++ b/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts @@ -8,9 +8,9 @@ import type { IRouter, Logger } from '@kbn/core/server'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { defineKeyRotationRoutes } from './key_rotation'; import type { ConfigType } from '../config'; import type { EncryptionKeyRotationService } from '../crypto'; -import { defineKeyRotationRoutes } from './key_rotation'; /** * Describes parameters used to define HTTP routes. diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts index b1c7f3b38139bd..edcf522987115e 100644 --- a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts +++ b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts @@ -10,9 +10,9 @@ import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; -import type { EncryptionKeyRotationService } from '../crypto'; import { routeDefinitionParamsMock } from './index.mock'; import { defineKeyRotationRoutes } from './key_rotation'; +import type { EncryptionKeyRotationService } from '../crypto'; describe('Key rotation routes', () => { let router: jest.Mocked; diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts index b7a7da6ba75853..78100be78e5d4a 100644 --- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts +++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts @@ -21,9 +21,9 @@ import type { import type { SecurityPluginSetup } from '@kbn/security-plugin/server'; import type { PublicMethodsOf } from '@kbn/utility-types'; -import type { EncryptedSavedObjectsService } from '../crypto'; import { getDescriptorNamespace, normalizeNamespace } from './get_descriptor_namespace'; import { SavedObjectsEncryptionExtension } from './saved_objects_encryption_extension'; +import type { EncryptedSavedObjectsService } from '../crypto'; export { normalizeNamespace }; diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.test.ts index aa958c8c9d1d9e..b3da9bdd19f95e 100644 --- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.test.ts +++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.test.ts @@ -9,10 +9,10 @@ import { mockGetDescriptorNamespace } from './saved_objects_encryption_extension import { savedObjectsTypeRegistryMock } from '@kbn/core/server/mocks'; +import { SavedObjectsEncryptionExtension } from './saved_objects_encryption_extension'; import { EncryptionError } from '../crypto'; import { encryptedSavedObjectsServiceMock } from '../crypto/encrypted_saved_objects_service.mocks'; import { EncryptionErrorOperation } from '../crypto/encryption_error'; -import { SavedObjectsEncryptionExtension } from './saved_objects_encryption_extension'; const KNOWN_TYPE = 'known-type'; const ATTRIBUTE_TO_STRIP = 'attrSecret'; diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.ts index 10c870275e5909..fe5d00ee4a8fb4 100644 --- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.ts +++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.ts @@ -13,8 +13,8 @@ import type { } from '@kbn/core-saved-objects-server'; import type { AuthenticatedUser } from '@kbn/security-plugin/common'; -import type { EncryptedSavedObjectsService } from '../crypto'; import { getDescriptorNamespace } from './get_descriptor_namespace'; +import type { EncryptedSavedObjectsService } from '../crypto'; /** * @internal Only exported for unit testing. diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts index d9413b7a4e66c9..f374fe8b606668 100644 --- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts +++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts @@ -7,8 +7,8 @@ import { chartPluginMock } from '@kbn/charts-plugin/public/mocks'; import { cloudMock } from '@kbn/cloud-plugin/public/mocks'; -import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks'; import { ApplicationStart, Capabilities } from '@kbn/core/public'; +import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks'; import { dataPluginMock } from '@kbn/data-plugin/public/mocks'; diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts index 0b28f635f16794..8e2e1383a3ac8e 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts @@ -5,12 +5,12 @@ * 2.0. */ +import { mockApiLog } from './__mocks__/api_log.mock'; import { LogicMounter, mockHttpValues, mockFlashMessageHelpers, } from '../../../__mocks__/kea_logic'; -import { mockApiLog } from './__mocks__/api_log.mock'; import '../../__mocks__/engine_logic.mock'; import { nextTick } from '@kbn/test-jest-helpers'; diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience_content.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience_content.test.tsx index 16a18a71981a27..53570e8868f44b 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience_content.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience_content.test.tsx @@ -5,8 +5,8 @@ * 2.0. */ -import { setMockValues } from '../../../../__mocks__/kea_logic'; import { setMockSearchContextState } from './__mocks__/hooks.mock'; +import { setMockValues } from '../../../../__mocks__/kea_logic'; import React from 'react'; diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/test_pipeline_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/test_pipeline_logic.test.ts index 61685bfeb04201..7f3ea8ecb4120a 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/test_pipeline_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/test_pipeline_logic.test.ts @@ -5,9 +5,9 @@ * 2.0. */ +import { mockMlInferenceValues } from './__mocks__/ml_inference_logic.mock'; import { LogicMounter } from '../../../../../__mocks__/kea_logic'; import { nerModel } from '../../../../__mocks__/ml_models.mock'; -import { mockMlInferenceValues } from './__mocks__/ml_inference_logic.mock'; import { HttpError, Status } from '../../../../../../../common/types/api'; import { MlInferencePipeline } from '../../../../../../../common/types/pipelines'; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/assets_and_objects.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/assets_and_objects.test.tsx index aee83b31be0451..41951a1eede532 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/assets_and_objects.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/assets_and_objects.test.tsx @@ -6,9 +6,9 @@ */ import '../../../../../__mocks__/shallow_useeffect.mock'; +import { blockedWindow } from './__mocks__/synchronization.mock'; import { setMockActions, setMockValues } from '../../../../../__mocks__/kea_logic'; import { fullContentSources } from '../../../../__mocks__/content_sources.mock'; -import { blockedWindow } from './__mocks__/synchronization.mock'; import React from 'react'; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.test.tsx index a709fa90fa4382..e29ea8bbd15f67 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.test.tsx @@ -6,9 +6,9 @@ */ import '../../../../../__mocks__/shallow_useeffect.mock'; +import { blockedWindow } from './__mocks__/synchronization.mock'; import { setMockActions, setMockValues } from '../../../../../__mocks__/kea_logic'; import { fullContentSources } from '../../../../__mocks__/content_sources.mock'; -import { blockedWindow } from './__mocks__/synchronization.mock'; import React from 'react'; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_tab.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_tab.test.tsx index 44973cef966eed..534de9cab7ae2f 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_tab.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_tab.test.tsx @@ -6,9 +6,9 @@ */ import '../../../../../__mocks__/shallow_useeffect.mock'; +import { blockedWindow } from './__mocks__/synchronization.mock'; import { setMockActions, setMockValues } from '../../../../../__mocks__/kea_logic'; import { fullContentSources } from '../../../../__mocks__/content_sources.mock'; -import { blockedWindow } from './__mocks__/synchronization.mock'; import React from 'react'; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_logic.test.ts index 1e2a9fc2de5a27..3938d697828f3f 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_logic.test.ts @@ -5,6 +5,7 @@ * 2.0. */ +import { mockGroupValues } from './__mocks__/group_logic.mock'; import { LogicMounter, mockKibanaValues, @@ -12,7 +13,6 @@ import { mockHttpValues, } from '../../../__mocks__/kea_logic'; import { groups } from '../../__mocks__/groups.mock'; -import { mockGroupValues } from './__mocks__/group_logic.mock'; import { nextTick } from '@kbn/test-jest-helpers'; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_logic.test.ts index 88117358db6884..15ac41b1bd66d4 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_logic.test.ts @@ -5,6 +5,7 @@ * 2.0. */ +import { mockGroupsValues } from './__mocks__/groups_logic.mock'; import { LogicMounter, mockFlashMessageHelpers, @@ -12,7 +13,6 @@ import { } from '../../../__mocks__/kea_logic'; import { contentSources } from '../../__mocks__/content_sources.mock'; import { groups } from '../../__mocks__/groups.mock'; -import { mockGroupsValues } from './__mocks__/groups_logic.mock'; import { nextTick } from '@kbn/test-jest-helpers'; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx index f4f87f48f63955..011e78d29aefb0 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx @@ -5,8 +5,8 @@ * 2.0. */ -import { mockTelemetryActions } from '../../../__mocks__/kea_logic'; import { setMockValues } from './__mocks__'; +import { mockTelemetryActions } from '../../../__mocks__/kea_logic'; import './__mocks__/overview_logic.mock'; import React from 'react'; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts index d74e255cf4591b..cadab9c139fa6c 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { LogicMounter, mockHttpValues } from '../../../__mocks__/kea_logic'; import { mockOverviewValues } from './__mocks__'; +import { LogicMounter, mockHttpValues } from '../../../__mocks__/kea_logic'; import { OverviewLogic } from './overview_logic'; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.test.tsx index 9cf332b7c540f0..7ba0bf6cd19c35 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.test.tsx @@ -5,8 +5,8 @@ * 2.0. */ -import { mockTelemetryActions } from '../../../__mocks__/kea_logic'; import { setMockValues } from './__mocks__'; +import { mockTelemetryActions } from '../../../__mocks__/kea_logic'; import './__mocks__/overview_logic.mock'; import React from 'react'; diff --git a/x-pack/plugins/enterprise_search/server/lib/connectors/fetch_connector_index_names.ts b/x-pack/plugins/enterprise_search/server/lib/connectors/fetch_connector_index_names.ts index 695a23139fbc6f..7d087f8e74c756 100644 --- a/x-pack/plugins/enterprise_search/server/lib/connectors/fetch_connector_index_names.ts +++ b/x-pack/plugins/enterprise_search/server/lib/connectors/fetch_connector_index_names.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { isIndexNotFoundException } from '@kbn/core-saved-objects-migration-server-internal'; import { IScopedClusterClient } from '@kbn/core/server'; +import { isIndexNotFoundException } from '@kbn/core-saved-objects-migration-server-internal'; import { CONNECTORS_INDEX } from '../..'; diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.test.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.test.ts index 690379fc0c4c35..96c6501200e564 100644 --- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/analytics.test.ts @@ -7,8 +7,8 @@ import { MockRouter, mockDependencies } from '../../__mocks__'; -import { SavedObjectsServiceStart } from '@kbn/core-saved-objects-server'; import { RequestHandlerContext } from '@kbn/core/server'; +import { SavedObjectsServiceStart } from '@kbn/core-saved-objects-server'; import { DataPluginStart } from '@kbn/data-plugin/server/plugin'; jest.mock('../../lib/analytics/fetch_analytics_collection', () => ({ diff --git a/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx b/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx index b7215f679f550b..9015836a93bcbf 100644 --- a/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx +++ b/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx @@ -920,7 +920,7 @@ export const ECSMappingEditorField = React.memo(({ euiFieldProps }: ECSMappingEd */ const [table, column] = selectItem.name.includes('.') - ? selectItem.name?.split('.') + ? selectItem.name.split('.') : [Object.keys(astOsqueryTables)[0], selectItem.name]; if (column === '*' && astOsqueryTables[table]) { diff --git a/x-pack/plugins/osquery/public/results/results_table.tsx b/x-pack/plugins/osquery/public/results/results_table.tsx index 0240909f4c8b50..9f08cab70b0642 100644 --- a/x-pack/plugins/osquery/public/results/results_table.tsx +++ b/x-pack/plugins/osquery/public/results/results_table.tsx @@ -255,7 +255,7 @@ const ResultsTableComponent: React.FC = ({ return; } - const fields = ['agent.name', ...ecsMappingColumns.sort(), ...allResultsData?.columns]; + const fields = ['agent.name', ...ecsMappingColumns.sort(), ...(allResultsData?.columns || [])]; const newColumns = fields.reduce( (acc, fieldName) => { diff --git a/x-pack/plugins/security/public/account_management/account_management_app.test.tsx b/x-pack/plugins/security/public/account_management/account_management_app.test.tsx index 528190cca0c9d9..543ec093e367be 100644 --- a/x-pack/plugins/security/public/account_management/account_management_app.test.tsx +++ b/x-pack/plugins/security/public/account_management/account_management_app.test.tsx @@ -12,11 +12,11 @@ import type { AppUnmount } from '@kbn/core/public'; import { AppNavLinkStatus } from '@kbn/core/public'; import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks'; -import { UserAPIClient } from '../management'; -import { securityMock } from '../mocks'; import { accountManagementApp } from './account_management_app'; import * as AccountManagementPageImports from './account_management_page'; import { UserProfileAPIClient } from './user_profile/user_profile_api_client'; +import { UserAPIClient } from '../management'; +import { securityMock } from '../mocks'; const AccountManagementPageMock = jest .spyOn(AccountManagementPageImports, 'AccountManagementPage') diff --git a/x-pack/plugins/security/public/account_management/account_management_page.test.tsx b/x-pack/plugins/security/public/account_management/account_management_page.test.tsx index 4e4e783580bc9d..bbcd40c95ed0ba 100644 --- a/x-pack/plugins/security/public/account_management/account_management_page.test.tsx +++ b/x-pack/plugins/security/public/account_management/account_management_page.test.tsx @@ -10,14 +10,14 @@ import React from 'react'; import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks'; -import type { UserProfileData } from '../../common'; -import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; -import { UserAPIClient } from '../management'; -import { securityMock } from '../mocks'; import { Providers } from './account_management_app'; import { AccountManagementPage } from './account_management_page'; import * as UserProfileImports from './user_profile/user_profile'; import { UserProfileAPIClient } from './user_profile/user_profile_api_client'; +import type { UserProfileData } from '../../common'; +import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; +import { UserAPIClient } from '../management'; +import { securityMock } from '../mocks'; const UserProfileMock = jest.spyOn(UserProfileImports, 'UserProfile'); diff --git a/x-pack/plugins/security/public/account_management/account_management_page.tsx b/x-pack/plugins/security/public/account_management/account_management_page.tsx index 620e3249c05df7..9066c00144e3dc 100644 --- a/x-pack/plugins/security/public/account_management/account_management_page.tsx +++ b/x-pack/plugins/security/public/account_management/account_management_page.tsx @@ -13,11 +13,11 @@ import type { CoreStart } from '@kbn/core/public'; import { i18n } from '@kbn/i18n'; import { useKibana } from '@kbn/kibana-react-plugin/public'; +import { UserProfile } from './user_profile'; import type { UserProfileData } from '../../common'; import { canUserHaveProfile } from '../../common/model'; import { useCurrentUser, useUserProfile } from '../components'; import { Breadcrumb } from '../components/breadcrumb'; -import { UserProfile } from './user_profile'; export const AccountManagementPage: FunctionComponent = () => { const { services } = useKibana(); diff --git a/x-pack/plugins/security/public/account_management/user_profile/user_profile.test.tsx b/x-pack/plugins/security/public/account_management/user_profile/user_profile.test.tsx index 3263b4db80c666..bae93d048af884 100644 --- a/x-pack/plugins/security/public/account_management/user_profile/user_profile.test.tsx +++ b/x-pack/plugins/security/public/account_management/user_profile/user_profile.test.tsx @@ -12,13 +12,13 @@ import React from 'react'; import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks'; +import { UserProfile, useUserProfileForm } from './user_profile'; import { UserProfileAPIClient } from '..'; import type { UserProfileData } from '../../../common'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { UserAPIClient } from '../../management'; import { securityMock } from '../../mocks'; import { Providers } from '../account_management_app'; -import { UserProfile, useUserProfileForm } from './user_profile'; const user = mockAuthenticatedUser(); const coreStart = coreMock.createStart(); diff --git a/x-pack/plugins/security/public/account_management/user_profile/user_profile.tsx b/x-pack/plugins/security/public/account_management/user_profile/user_profile.tsx index a6227baee40616..7d11da956acaf9 100644 --- a/x-pack/plugins/security/public/account_management/user_profile/user_profile.tsx +++ b/x-pack/plugins/security/public/account_management/user_profile/user_profile.tsx @@ -42,6 +42,7 @@ import { useKibana } from '@kbn/kibana-react-plugin/public'; import type { DarkModeValue, UserProfileData } from '@kbn/user-profile-components'; import { UserAvatar, useUpdateUserProfile } from '@kbn/user-profile-components'; +import { createImageHandler, getRandomColor, IMAGE_FILE_TYPES, VALID_HEX_COLOR } from './utils'; import type { AuthenticatedUser } from '../../../common'; import { canUserChangeDetails, @@ -61,7 +62,6 @@ import { FormLabel } from '../../components/form_label'; import { FormRow, OptionalText } from '../../components/form_row'; import { ChangePasswordModal } from '../../management/users/edit_user/change_password_modal'; import { isUserReserved } from '../../management/users/user_utils'; -import { createImageHandler, getRandomColor, IMAGE_FILE_TYPES, VALID_HEX_COLOR } from './utils'; export interface UserProfileProps { user: AuthenticatedUser; diff --git a/x-pack/plugins/security/public/analytics/analytics_service.test.ts b/x-pack/plugins/security/public/analytics/analytics_service.test.ts index e8014293c2f7fe..998f4a6d62afa6 100644 --- a/x-pack/plugins/security/public/analytics/analytics_service.test.ts +++ b/x-pack/plugins/security/public/analytics/analytics_service.test.ts @@ -10,10 +10,10 @@ import { BehaviorSubject } from 'rxjs'; import { coreMock } from '@kbn/core/public/mocks'; import { nextTick } from '@kbn/test-jest-helpers'; +import { AnalyticsService } from './analytics_service'; import { licenseMock } from '../../common/licensing/index.mock'; import { authenticationMock } from '../authentication/index.mock'; import { securityMock } from '../mocks'; -import { AnalyticsService } from './analytics_service'; describe('AnalyticsService', () => { let analyticsService: AnalyticsService; diff --git a/x-pack/plugins/security/public/analytics/analytics_service.ts b/x-pack/plugins/security/public/analytics/analytics_service.ts index 1c87db674eb409..2a4a5eba595b87 100644 --- a/x-pack/plugins/security/public/analytics/analytics_service.ts +++ b/x-pack/plugins/security/public/analytics/analytics_service.ts @@ -15,9 +15,9 @@ import type { HttpStart, } from '@kbn/core/public'; +import { registerUserContext } from './register_user_context'; import type { AuthenticationServiceSetup } from '..'; import type { SecurityLicense } from '../../common'; -import { registerUserContext } from './register_user_context'; interface AnalyticsServiceSetupParams { securityLicense: SecurityLicense; diff --git a/x-pack/plugins/security/public/analytics/register_user_context.test.ts b/x-pack/plugins/security/public/analytics/register_user_context.test.ts index 0654042059649b..bc4e0dd0938350 100644 --- a/x-pack/plugins/security/public/analytics/register_user_context.test.ts +++ b/x-pack/plugins/security/public/analytics/register_user_context.test.ts @@ -11,10 +11,10 @@ import type { AnalyticsServiceSetup } from '@kbn/core/public'; import { coreMock } from '@kbn/core/public/mocks'; import { Sha256 } from '@kbn/crypto-browser'; +import { registerUserContext } from './register_user_context'; import type { AuthenticationServiceSetup } from '..'; import { authenticationMock } from '../authentication/index.mock'; import { securityMock } from '../mocks'; -import { registerUserContext } from './register_user_context'; describe('registerUserContext', () => { const username = '1234'; diff --git a/x-pack/plugins/security/public/authentication/authentication_service.ts b/x-pack/plugins/security/public/authentication/authentication_service.ts index 5cbf5007be218c..62c60587282ef4 100644 --- a/x-pack/plugins/security/public/authentication/authentication_service.ts +++ b/x-pack/plugins/security/public/authentication/authentication_service.ts @@ -12,15 +12,15 @@ import type { StartServicesAccessor, } from '@kbn/core/public'; -import type { AuthenticatedUser } from '../../common/model'; -import type { ConfigType } from '../config'; -import type { PluginStartDependencies } from '../plugin'; import { accessAgreementApp } from './access_agreement'; import { captureURLApp } from './capture_url'; import { loggedOutApp } from './logged_out'; import { loginApp } from './login'; import { logoutApp } from './logout'; import { overwrittenSessionApp } from './overwritten_session'; +import type { AuthenticatedUser } from '../../common/model'; +import type { ConfigType } from '../config'; +import type { PluginStartDependencies } from '../plugin'; interface SetupParams { application: ApplicationSetup; diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx b/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx index 48f6d3782f619d..424bfe27352b5e 100644 --- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx +++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx @@ -8,8 +8,8 @@ import { EuiButton } from '@elastic/eui'; import React from 'react'; -import { customBrandingServiceMock } from '@kbn/core-custom-branding-browser-mocks'; import { coreMock } from '@kbn/core/public/mocks'; +import { customBrandingServiceMock } from '@kbn/core-custom-branding-browser-mocks'; import { mountWithIntl } from '@kbn/test-jest-helpers'; import { LoggedOutPage } from './logged_out_page'; diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx index 44053cea1174dc..e8b2e684819c0f 100644 --- a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx +++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx @@ -29,13 +29,13 @@ import type { ChangeEvent, FormEvent, MouseEvent } from 'react'; import React, { Component, Fragment } from 'react'; import ReactMarkdown from 'react-markdown'; -import type { IHttpFetchError } from '@kbn/core-http-browser'; import type { HttpStart, NotificationsStart } from '@kbn/core/public'; +import type { IHttpFetchError } from '@kbn/core-http-browser'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; -import type { LoginSelector, LoginSelectorProvider } from '../../../../../common/login_state'; import { LoginValidator } from './validate_login'; +import type { LoginSelector, LoginSelectorProvider } from '../../../../../common/login_state'; export interface LoginFormProps { http: HttpStart; diff --git a/x-pack/plugins/security/public/authentication/login/login_page.test.tsx b/x-pack/plugins/security/public/authentication/login/login_page.test.tsx index a9c5d8f57527b5..e752b3c5aa0bfe 100644 --- a/x-pack/plugins/security/public/authentication/login/login_page.test.tsx +++ b/x-pack/plugins/security/public/authentication/login/login_page.test.tsx @@ -11,14 +11,14 @@ import { shallow } from 'enzyme'; import React from 'react'; import { of } from 'rxjs'; -import { customBrandingServiceMock } from '@kbn/core-custom-branding-browser-mocks'; import { coreMock } from '@kbn/core/public/mocks'; +import { customBrandingServiceMock } from '@kbn/core-custom-branding-browser-mocks'; import { nextTick } from '@kbn/test-jest-helpers'; -import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER } from '../../../common/constants'; -import type { LoginState } from '../../../common/login_state'; import { DisabledLoginForm, LoginForm, LoginFormMessageType } from './components'; import { LoginPage } from './login_page'; +import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER } from '../../../common/constants'; +import type { LoginState } from '../../../common/login_state'; const createLoginState = (options?: Partial) => { return { diff --git a/x-pack/plugins/security/public/authentication/login/login_page.tsx b/x-pack/plugins/security/public/authentication/login/login_page.tsx index 30c4aa678f8cca..a645ab70a540f4 100644 --- a/x-pack/plugins/security/public/authentication/login/login_page.tsx +++ b/x-pack/plugins/security/public/authentication/login/login_page.tsx @@ -23,7 +23,6 @@ import ReactDOM from 'react-dom'; import type { Subscription } from 'rxjs'; import { BehaviorSubject } from 'rxjs'; -import type { CustomBranding } from '@kbn/core-custom-branding-common'; import type { AppMountParameters, CoreStart, @@ -32,10 +31,13 @@ import type { HttpStart, NotificationsStart, } from '@kbn/core/public'; +import type { CustomBranding } from '@kbn/core-custom-branding-common'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; +import type { LoginFormProps } from './components'; +import { DisabledLoginForm, LoginForm, LoginFormMessageType } from './components'; import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER, LOGOUT_REASON_QUERY_STRING_PARAMETER, @@ -43,8 +45,6 @@ import { import type { LoginState } from '../../../common/login_state'; import type { LogoutReason } from '../../../common/types'; import type { ConfigType } from '../../config'; -import type { LoginFormProps } from './components'; -import { DisabledLoginForm, LoginForm, LoginFormMessageType } from './components'; interface Props { http: HttpStart; diff --git a/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts b/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts index 12194223dbec06..9ee4e22c070782 100644 --- a/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts +++ b/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts @@ -8,8 +8,8 @@ import type { AppMount } from '@kbn/core/public'; import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks'; -import { AnalyticsService } from '../../analytics'; import { logoutApp } from './logout_app'; +import { AnalyticsService } from '../../analytics'; describe('logoutApp', () => { beforeAll(() => { diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts index ac7238f8db7a8b..dee4149b085071 100644 --- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts +++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts @@ -10,8 +10,8 @@ jest.mock('./overwritten_session_page'); import type { AppMount } from '@kbn/core/public'; import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks'; -import { securityMock } from '../../mocks'; import { overwrittenSessionApp } from './overwritten_session_app'; +import { securityMock } from '../../mocks'; describe('overwrittenSessionApp', () => { it('properly registers application', () => { diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx index 586f5b4b91507d..6782b0e01939f7 100644 --- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx +++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx @@ -12,10 +12,10 @@ import React from 'react'; import { coreMock } from '@kbn/core/public/mocks'; import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers'; +import { OverwrittenSessionPage } from './overwritten_session_page'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { AuthenticationStatePage } from '../components/authentication_state_page'; import { authenticationMock } from '../index.mock'; -import { OverwrittenSessionPage } from './overwritten_session_page'; describe('OverwrittenSessionPage', () => { beforeAll(() => { diff --git a/x-pack/plugins/security/public/components/use_badge.ts b/x-pack/plugins/security/public/components/use_badge.ts index cd5a8d3620a2fc..22e2bd553f3d11 100644 --- a/x-pack/plugins/security/public/components/use_badge.ts +++ b/x-pack/plugins/security/public/components/use_badge.ts @@ -8,8 +8,8 @@ import type { DependencyList } from 'react'; import { useEffect } from 'react'; -import type { ChromeBadge } from '@kbn/core-chrome-browser'; import type { CoreStart } from '@kbn/core/public'; +import type { ChromeBadge } from '@kbn/core-chrome-browser'; import { useKibana } from '@kbn/kibana-react-plugin/public'; export type { ChromeBadge }; diff --git a/x-pack/plugins/security/public/components/use_capabilities.ts b/x-pack/plugins/security/public/components/use_capabilities.ts index cdf54e2700a526..17fa3a1a6a4910 100644 --- a/x-pack/plugins/security/public/components/use_capabilities.ts +++ b/x-pack/plugins/security/public/components/use_capabilities.ts @@ -5,8 +5,8 @@ * 2.0. */ -import type { Capabilities } from '@kbn/core-capabilities-common'; import type { CoreStart } from '@kbn/core/public'; +import type { Capabilities } from '@kbn/core-capabilities-common'; import { useKibana } from '@kbn/kibana-react-plugin/public'; type FeatureCapabilities = Capabilities[string]; diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_key_flyout.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_key_flyout.tsx index c4196355cda16a..6d100f2a8261ee 100644 --- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_key_flyout.tsx +++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_key_flyout.tsx @@ -31,6 +31,8 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import { CodeEditorField, useKibana } from '@kbn/kibana-react-plugin/public'; +import type { CategorizedApiKey } from './api_keys_grid_page'; +import { ApiKeyBadge, ApiKeyStatus, TimeToolTip, UsernameWithIcon } from './api_keys_grid_page'; import type { ApiKeyRoleDescriptors } from '../../../../common/model'; import { DocLink } from '../../../components/doc_link'; import { FormField } from '../../../components/form_field'; @@ -47,8 +49,6 @@ import type { UpdateAPIKeyParams, UpdateAPIKeyResult, } from '../api_keys_api_client'; -import type { CategorizedApiKey } from './api_keys_grid_page'; -import { ApiKeyBadge, ApiKeyStatus, TimeToolTip, UsernameWithIcon } from './api_keys_grid_page'; export interface ApiKeyFormValues { name: string; diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx index 6a7234ba104885..b10a1eaeaacda7 100644 --- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx +++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx @@ -11,10 +11,10 @@ import React from 'react'; import { coreMock, themeServiceMock } from '@kbn/core/public/mocks'; +import { APIKeysGridPage } from './api_keys_grid_page'; import { mockAuthenticatedUser } from '../../../../common/model/authenticated_user.mock'; import { securityMock } from '../../../mocks'; import { Providers } from '../api_keys_management_app'; -import { APIKeysGridPage } from './api_keys_grid_page'; /* * Note to engineers diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx index 90839fd3ac83cb..b1872a459d8b07 100644 --- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx +++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx @@ -35,6 +35,9 @@ import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template'; import { Route } from '@kbn/shared-ux-router'; import { UserAvatar, UserProfilesPopover } from '@kbn/user-profile-components'; +import { ApiKeyFlyout } from './api_key_flyout'; +import { ApiKeysEmptyPrompt } from './api_keys_empty_prompt'; +import { InvalidateProvider } from './invalidate_provider'; import type { ApiKey, AuthenticatedUser, RestApiKey } from '../../../../common/model'; import { Breadcrumb } from '../../../components/breadcrumb'; import { SelectableTokenField } from '../../../components/token_field'; @@ -42,9 +45,6 @@ import { useCapabilities } from '../../../components/use_capabilities'; import { useAuthentication } from '../../../components/use_current_user'; import type { CreateAPIKeyResult } from '../api_keys_api_client'; import { APIKeysAPIClient } from '../api_keys_api_client'; -import { ApiKeyFlyout } from './api_key_flyout'; -import { ApiKeysEmptyPrompt } from './api_keys_empty_prompt'; -import { InvalidateProvider } from './invalidate_provider'; export const APIKeysGridPage: FunctionComponent = () => { const { services } = useKibana(); diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx index b487b977b620b9..36307494a7711c 100644 --- a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx +++ b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx @@ -11,9 +11,9 @@ import { noop } from 'lodash'; import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks'; import type { Unmount } from '@kbn/management-plugin/public/types'; +import { apiKeysManagementApp } from './api_keys_management_app'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { securityMock } from '../../mocks'; -import { apiKeysManagementApp } from './api_keys_management_app'; const element = document.body.appendChild(document.createElement('div')); diff --git a/x-pack/plugins/security/public/management/management_service.test.ts b/x-pack/plugins/security/public/management/management_service.test.ts index d157806dc85113..8591d4d6fd665a 100644 --- a/x-pack/plugins/security/public/management/management_service.test.ts +++ b/x-pack/plugins/security/public/management/management_service.test.ts @@ -15,15 +15,15 @@ import type { } from '@kbn/management-plugin/public'; import { createManagementSectionMock } from '@kbn/management-plugin/public/mocks'; -import { licenseMock } from '../../common/licensing/index.mock'; -import type { SecurityLicenseFeatures } from '../../common/licensing/license_features'; -import { securityMock } from '../mocks'; import { apiKeysManagementApp } from './api_keys'; import type { ManagementAppConfigType } from './management_service'; import { ManagementService } from './management_service'; import { roleMappingsManagementApp } from './role_mappings'; import { rolesManagementApp } from './roles'; import { usersManagementApp } from './users'; +import { licenseMock } from '../../common/licensing/index.mock'; +import type { SecurityLicenseFeatures } from '../../common/licensing/license_features'; +import { securityMock } from '../mocks'; const mockSection = createManagementSectionMock(); diff --git a/x-pack/plugins/security/public/management/management_service.ts b/x-pack/plugins/security/public/management/management_service.ts index 059eeba201c8a7..30b90c1031902f 100644 --- a/x-pack/plugins/security/public/management/management_service.ts +++ b/x-pack/plugins/security/public/management/management_service.ts @@ -14,13 +14,13 @@ import type { ManagementSetup, } from '@kbn/management-plugin/public'; -import type { SecurityLicense } from '../../common/licensing'; -import type { AuthenticationServiceSetup } from '../authentication'; -import type { PluginStartDependencies } from '../plugin'; import { apiKeysManagementApp } from './api_keys'; import { roleMappingsManagementApp } from './role_mappings'; import { rolesManagementApp } from './roles'; import { usersManagementApp } from './users'; +import type { SecurityLicense } from '../../common/licensing'; +import type { AuthenticationServiceSetup } from '../authentication'; +import type { PluginStartDependencies } from '../plugin'; export interface ManagementAppConfigType { userManagementEnabled: boolean; diff --git a/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx b/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx index 171f592988ba9a..ce1b6b0d0efc17 100644 --- a/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx @@ -12,9 +12,9 @@ import React from 'react'; import { coreMock } from '@kbn/core/public/mocks'; import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers'; +import { DeleteProvider } from './delete_provider'; import type { RoleMapping } from '../../../../../common/model'; import { roleMappingsAPIClientMock } from '../../index.mock'; -import { DeleteProvider } from './delete_provider'; describe('DeleteProvider', () => { beforeEach(() => { diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx index a6d0de7da144c8..017e5ec37a332f 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx @@ -17,15 +17,15 @@ import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public'; import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { EditRoleMappingPage } from './edit_role_mapping_page'; +import { JSONRuleEditor } from './rule_editor_panel/json_rule_editor'; +import { VisualRuleEditor } from './rule_editor_panel/visual_rule_editor'; import type { Role } from '../../../../common/model'; import { RoleComboBox } from '../../role_combo_box'; import type { RolesAPIClient } from '../../roles'; import { rolesAPIClientMock } from '../../roles/roles_api_client.mock'; import { NoCompatibleRealms, PermissionDenied, SectionLoading } from '../components'; import { roleMappingsAPIClientMock } from '../role_mappings_api_client.mock'; -import { EditRoleMappingPage } from './edit_role_mapping_page'; -import { JSONRuleEditor } from './rule_editor_panel/json_rule_editor'; -import { VisualRuleEditor } from './rule_editor_panel/visual_rule_editor'; describe('EditRoleMappingPage', () => { const history = scopedHistoryMock.create(); diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx index b8f16fa6e2b76b..0d4c797a9452e4 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx @@ -23,6 +23,9 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { MappingInfoPanel } from './mapping_info_panel'; +import { RuleEditorPanel } from './rule_editor_panel'; +import { validateRoleMappingForSave } from './services/role_mapping_validation'; import type { RoleMapping } from '../../../../common/model'; import type { RolesAPIClient } from '../../roles'; import { @@ -32,9 +35,6 @@ import { SectionLoading, } from '../components'; import type { RoleMappingsAPIClient } from '../role_mappings_api_client'; -import { MappingInfoPanel } from './mapping_info_panel'; -import { RuleEditorPanel } from './rule_editor_panel'; -import { validateRoleMappingForSave } from './services/role_mapping_validation'; interface State { loadState: 'loading' | 'permissionDenied' | 'ready' | 'saveInProgress'; diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx index c10068e593b662..8faf0fa99998a0 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx @@ -11,12 +11,12 @@ import { coreMock } from '@kbn/core/public/mocks'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { MappingInfoPanel } from './mapping_info_panel'; import type { Role, RoleMapping } from '../../../../../common/model'; import type { RolesAPIClient } from '../../../roles'; import { rolesAPIClientMock } from '../../../roles/roles_api_client.mock'; import { RoleSelector } from '../role_selector'; import { RoleTemplateEditor } from '../role_selector/role_template_editor'; -import { MappingInfoPanel } from './mapping_info_panel'; describe('MappingInfoPanel', () => { let rolesAPI: PublicMethodsOf; diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_selector.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_selector.test.tsx index eee585043e0748..219e01512ed2fc 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_selector.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_selector.test.tsx @@ -11,12 +11,12 @@ import React from 'react'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; import type { PublicMethodsOf } from '@kbn/utility-types'; -import type { Role, RoleMapping } from '../../../../../common/model'; -import type { RolesAPIClient } from '../../../roles'; -import { rolesAPIClientMock } from '../../../roles/roles_api_client.mock'; import { AddRoleTemplateButton } from './add_role_template_button'; import { RoleSelector } from './role_selector'; import { RoleTemplateEditor } from './role_template_editor'; +import type { Role, RoleMapping } from '../../../../../common/model'; +import type { RolesAPIClient } from '../../../roles'; +import { rolesAPIClientMock } from '../../../roles/roles_api_client.mock'; describe('RoleSelector', () => { let rolesAPI: PublicMethodsOf; diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_selector.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_selector.tsx index c292cda5e9bdfc..bf8b68ab7a9278 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_selector.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_selector.tsx @@ -12,12 +12,12 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { AddRoleTemplateButton } from './add_role_template_button'; +import { RoleTemplateEditor } from './role_template_editor'; import type { Role, RoleMapping } from '../../../../../common/model'; import { isRoleDeprecated } from '../../../../../common/model'; import { RoleComboBox } from '../../../role_combo_box'; import type { RolesAPIClient } from '../../../roles'; -import { AddRoleTemplateButton } from './add_role_template_button'; -import { RoleTemplateEditor } from './role_template_editor'; interface Props { rolesAPIClient: PublicMethodsOf; diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_template_editor.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_template_editor.tsx index de2db57cc3f137..4641e0fe13bd28 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_template_editor.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_template_editor.tsx @@ -21,13 +21,13 @@ import React, { Fragment } from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { RoleTemplateTypeSelect } from './role_template_type_select'; import type { RoleTemplate } from '../../../../../common/model'; import { isInlineRoleTemplate, isInvalidRoleTemplate, isStoredRoleTemplate, } from '../services/role_template_type'; -import { RoleTemplateTypeSelect } from './role_template_type_select'; interface Props { roleTemplate: RoleTemplate; diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/add_rule_button.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/add_rule_button.test.tsx index 2ada7e9730cb0c..803739cd8b55cc 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/add_rule_button.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/add_rule_button.test.tsx @@ -9,8 +9,8 @@ import React from 'react'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; -import { AllRule, FieldRule } from '../../model'; import { AddRuleButton } from './add_rule_button'; +import { AllRule, FieldRule } from '../../model'; describe('AddRuleButton', () => { it('allows a field rule to be created', () => { diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/field_rule_editor.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/field_rule_editor.test.tsx index 9355b74fc3bffc..53300a4ec65559 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/field_rule_editor.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/field_rule_editor.test.tsx @@ -11,8 +11,8 @@ import React from 'react'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; -import { FieldRule } from '../../model'; import { FieldRuleEditor } from './field_rule_editor'; +import { FieldRule } from '../../model'; function assertField(wrapper: ReactWrapper, index: number, field: string) { const isFirst = index === 0; diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx index 514ac48976b1c3..f8624431b401db 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx @@ -19,8 +19,8 @@ import { CodeEditorField } from '@kbn/kibana-react-plugin/public'; import type { monaco } from '@kbn/monaco'; import { shallowWithIntl } from '@kbn/test-jest-helpers'; -import { AllRule, AnyRule, ExceptAllRule, ExceptAnyRule, FieldRule } from '../../model'; import { JSONRuleEditor } from './json_rule_editor'; +import { AllRule, AnyRule, ExceptAllRule, ExceptAnyRule, FieldRule } from '../../model'; jest.mock('@kbn/kibana-react-plugin/public', () => ({ ...jest.requireActual('@kbn/kibana-react-plugin/public'), diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx index 99b26d878b066e..a4c307a849fdb7 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx @@ -17,10 +17,10 @@ import { coreMock } from '@kbn/core/public/mocks'; import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; -import { AllRule, FieldRule } from '../../model'; import { JSONRuleEditor } from './json_rule_editor'; import { RuleEditorPanel } from './rule_editor_panel'; import { VisualRuleEditor } from './visual_rule_editor'; +import { AllRule, FieldRule } from '../../model'; describe('RuleEditorPanel', () => { const renderView = (props: Omit, 'docLinks'>) => { diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx index acc96e27ae6d3d..1a5549ecd1e9ba 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx @@ -25,13 +25,13 @@ import type { DocLinksStart } from '@kbn/core/public'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { JSONRuleEditor } from './json_rule_editor'; +import { VisualRuleEditor } from './visual_rule_editor'; import type { RoleMapping } from '../../../../../common/model'; import type { Rule } from '../../model'; import { generateRulesFromRaw } from '../../model'; import { VISUAL_MAX_RULE_DEPTH } from '../services/role_mapping_constants'; import { validateRoleMappingRules } from '../services/role_mapping_validation'; -import { JSONRuleEditor } from './json_rule_editor'; -import { VisualRuleEditor } from './visual_rule_editor'; interface Props { rawRules: RoleMapping['rules']; diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_group_editor.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_group_editor.test.tsx index 283b347015bf90..3bd34cb00c2a7c 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_group_editor.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_group_editor.test.tsx @@ -10,11 +10,11 @@ import React from 'react'; import { findTestSubject, mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers'; -import { AllRule, AnyRule, ExceptAnyRule, FieldRule } from '../../model'; import { AddRuleButton } from './add_rule_button'; import { FieldRuleEditor } from './field_rule_editor'; import { RuleGroupEditor } from './rule_group_editor'; import { RuleGroupTitle } from './rule_group_title'; +import { AllRule, AnyRule, ExceptAnyRule, FieldRule } from '../../model'; describe('RuleGroupEditor', () => { it('renders an empty group', () => { diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_group_editor.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_group_editor.tsx index cb905e193c2a47..e4711143390838 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_group_editor.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_group_editor.tsx @@ -18,11 +18,11 @@ import React, { Component, Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; -import type { FieldRule, Rule, RuleGroup } from '../../model'; -import { isRuleGroup } from '../services/is_rule_group'; import { AddRuleButton } from './add_rule_button'; import { FieldRuleEditor } from './field_rule_editor'; import { RuleGroupTitle } from './rule_group_title'; +import type { FieldRule, Rule, RuleGroup } from '../../model'; +import { isRuleGroup } from '../services/is_rule_group'; interface Props { rule: RuleGroup; diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/visual_rule_editor.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/visual_rule_editor.test.tsx index 20de1f0ed86c42..2090e83548643c 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/visual_rule_editor.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/visual_rule_editor.test.tsx @@ -9,10 +9,10 @@ import React from 'react'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; -import { AllRule, AnyRule, ExceptAllRule, ExceptAnyRule, FieldRule } from '../../model'; import { FieldRuleEditor } from './field_rule_editor'; import { RuleGroupEditor } from './rule_group_editor'; import { VisualRuleEditor } from './visual_rule_editor'; +import { AllRule, AnyRule, ExceptAllRule, ExceptAnyRule, FieldRule } from '../../model'; describe('VisualRuleEditor', () => { it('renders an add rule prompt when no rules are defined', () => { diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/visual_rule_editor.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/visual_rule_editor.tsx index 254bc7838db4a5..19620d46ad251d 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/visual_rule_editor.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/visual_rule_editor.tsx @@ -10,12 +10,12 @@ import React, { Component, Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; +import { FieldRuleEditor } from './field_rule_editor'; +import { RuleGroupEditor } from './rule_group_editor'; import type { Rule, RuleGroup } from '../../model'; import { AllRule, FieldRule } from '../../model'; import { isRuleGroup } from '../services/is_rule_group'; import { VISUAL_MAX_RULE_DEPTH } from '../services/role_mapping_constants'; -import { FieldRuleEditor } from './field_rule_editor'; -import { RuleGroupEditor } from './rule_group_editor'; interface Props { rules: Rule | null; diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/services/role_mapping_validation.test.ts b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/services/role_mapping_validation.test.ts index 5ab690b8253bbe..7dfa891e8d1b03 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/services/role_mapping_validation.test.ts +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/services/role_mapping_validation.test.ts @@ -5,7 +5,6 @@ * 2.0. */ -import type { RoleMapping } from '../../../../../common/model'; import { validateRoleMappingForSave, validateRoleMappingName, @@ -13,6 +12,7 @@ import { validateRoleMappingRoleTemplates, validateRoleMappingRules, } from './role_mapping_validation'; +import type { RoleMapping } from '../../../../../common/model'; describe('validateRoleMappingName', () => { it('requires a value', () => { diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/services/role_template_type.test.ts b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/services/role_template_type.test.ts index 22ff31acd0c7c7..50c821541d07ac 100644 --- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/services/role_template_type.test.ts +++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/services/role_template_type.test.ts @@ -5,12 +5,12 @@ * 2.0. */ -import type { RoleTemplate } from '../../../../../common/model'; import { isInlineRoleTemplate, isInvalidRoleTemplate, isStoredRoleTemplate, } from './role_template_type'; +import type { RoleTemplate } from '../../../../../common/model'; describe('#isStoredRoleTemplate', () => { it('returns true for stored templates, false otherwise', () => { diff --git a/x-pack/plugins/security/public/management/role_mappings/model/rule_builder.test.ts b/x-pack/plugins/security/public/management/role_mappings/model/rule_builder.test.ts index 551c1d8ef964ff..2db57590042dfc 100644 --- a/x-pack/plugins/security/public/management/role_mappings/model/rule_builder.test.ts +++ b/x-pack/plugins/security/public/management/role_mappings/model/rule_builder.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import type { RoleMapping } from '../../../../common/model'; import { FieldRule } from './field_rule'; import { generateRulesFromRaw } from './rule_builder'; import { RuleBuilderError } from './rule_builder_error'; +import type { RoleMapping } from '../../../../common/model'; describe('generateRulesFromRaw', () => { it('returns null for an empty rule set', () => { diff --git a/x-pack/plugins/security/public/management/role_mappings/model/rule_builder.ts b/x-pack/plugins/security/public/management/role_mappings/model/rule_builder.ts index f25f4fa7cda5f7..b248f63410a2ba 100644 --- a/x-pack/plugins/security/public/management/role_mappings/model/rule_builder.ts +++ b/x-pack/plugins/security/public/management/role_mappings/model/rule_builder.ts @@ -7,7 +7,6 @@ import { i18n } from '@kbn/i18n'; -import type { RoleMapping } from '../../../../common/model'; import { AllRule } from './all_rule'; import { AnyRule } from './any_rule'; import { ExceptAllRule } from './except_all_rule'; @@ -16,6 +15,7 @@ import type { FieldRuleValue } from './field_rule'; import { FieldRule } from './field_rule'; import type { Rule } from './rule'; import { RuleBuilderError } from './rule_builder_error'; +import type { RoleMapping } from '../../../../common/model'; interface RuleBuilderResult { /** The maximum rule depth within the parsed rule set. */ diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx index 04dbc1907ec001..bebc0619e2a689 100644 --- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx @@ -14,11 +14,11 @@ import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks'; import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public'; import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers'; +import { EmptyPrompt } from './empty_prompt'; +import { RoleMappingsGridPage } from './role_mappings_grid_page'; import { rolesAPIClientMock } from '../../roles/index.mock'; import { NoCompatibleRealms, PermissionDenied, SectionLoading } from '../components'; import { roleMappingsAPIClientMock } from '../role_mappings_api_client.mock'; -import { EmptyPrompt } from './empty_prompt'; -import { RoleMappingsGridPage } from './role_mappings_grid_page'; describe('RoleMappingsGridPage', () => { let history: ReturnType; diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx index ad8f204fa75cd3..0224512cdc211a 100644 --- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx +++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx @@ -31,6 +31,7 @@ import { FormattedMessage } from '@kbn/i18n-react'; import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { EmptyPrompt } from './empty_prompt'; import type { Role, RoleMapping } from '../../../../common/model'; import { DisabledBadge, EnabledBadge } from '../../badges'; import { @@ -49,7 +50,6 @@ import { } from '../components'; import type { DeleteRoleMappings } from '../components/delete_provider/delete_provider'; import type { RoleMappingsAPIClient } from '../role_mappings_api_client'; -import { EmptyPrompt } from './empty_prompt'; interface Props { rolesAPIClient: PublicMethodsOf; roleMappingsAPI: PublicMethodsOf; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx index 52e3d768ef07e5..7b5aef1d844f26 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx @@ -19,15 +19,15 @@ import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mock import { getUiApi } from '@kbn/spaces-plugin/public/ui_api'; import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers'; +import { EditRolePage } from './edit_role_page'; +import { SimplePrivilegeSection } from './privileges/kibana/simple_privilege_section'; +import { SpaceAwarePrivilegeSection } from './privileges/kibana/space_aware_privilege_section'; +import { TransformErrorSection } from './privileges/kibana/transform_error_section'; import { licenseMock } from '../../../../common/licensing/index.mock'; import type { Role } from '../../../../common/model'; import { userAPIClientMock } from '../../users/index.mock'; import { createRawKibanaPrivileges } from '../__fixtures__/kibana_privileges'; import { indicesAPIClientMock, privilegesAPIClientMock, rolesAPIClientMock } from '../index.mock'; -import { EditRolePage } from './edit_role_page'; -import { SimplePrivilegeSection } from './privileges/kibana/simple_privilege_section'; -import { SpaceAwarePrivilegeSection } from './privileges/kibana/space_aware_privilege_section'; -import { TransformErrorSection } from './privileges/kibana/transform_error_section'; const spacesManager = spacesManagerMock.create(); const { getStartServices } = coreMock.createSetup(); diff --git a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx index 9388ab92a0a76d..4348f37ae8d394 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx @@ -23,7 +23,6 @@ import type { ChangeEvent, FocusEvent, FunctionComponent, HTMLProps } from 'reac import React, { Fragment, useCallback, useEffect, useRef, useState } from 'react'; import useAsync from 'react-use/lib/useAsync'; -import type { IHttpFetchError } from '@kbn/core-http-browser'; import type { Capabilities, DocLinksStart, @@ -32,6 +31,7 @@ import type { NotificationsStart, ScopedHistory, } from '@kbn/core/public'; +import type { IHttpFetchError } from '@kbn/core-http-browser'; import type { DataViewsContract } from '@kbn/data-views-plugin/public'; import type { KibanaFeature } from '@kbn/features-plugin/common'; import type { FeaturesPluginStart } from '@kbn/features-plugin/public'; @@ -41,6 +41,11 @@ import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public'; import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { DeleteRoleButton } from './delete_role_button'; +import { ElasticsearchPrivileges, KibanaPrivilegesRegion } from './privileges'; +import { ReservedRoleBadge } from './reserved_role_badge'; +import type { RoleValidationResult } from './validate_role'; +import { RoleValidator } from './validate_role'; import type { SecurityLicense } from '../../../../common/licensing'; import type { BuiltinESPrivileges, @@ -63,11 +68,6 @@ import type { IndicesAPIClient } from '../indices_api_client'; import { KibanaPrivileges } from '../model'; import type { PrivilegesAPIClient } from '../privileges_api_client'; import type { RolesAPIClient } from '../roles_api_client'; -import { DeleteRoleButton } from './delete_role_button'; -import { ElasticsearchPrivileges, KibanaPrivilegesRegion } from './privileges'; -import { ReservedRoleBadge } from './reserved_role_badge'; -import type { RoleValidationResult } from './validate_role'; -import { RoleValidator } from './validate_role'; interface Props { action: 'edit' | 'clone'; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/cluster_privileges.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/cluster_privileges.test.tsx index b9b653e108738a..23dcb3673192f7 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/cluster_privileges.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/cluster_privileges.test.tsx @@ -10,8 +10,8 @@ import React from 'react'; import { mountWithIntl } from '@kbn/test-jest-helpers'; -import type { Role } from '../../../../../../common/model'; import { ClusterPrivileges } from './cluster_privileges'; +import type { Role } from '../../../../../../common/model'; test('it renders without crashing', () => { const role: Role = { diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx index 1a1486f6d82e3a..ba33767e2240ce 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx @@ -10,10 +10,10 @@ import React from 'react'; import { coreMock } from '@kbn/core/public/mocks'; import { shallowWithIntl } from '@kbn/test-jest-helpers'; +import { ElasticsearchPrivileges } from './elasticsearch_privileges'; import { licenseMock } from '../../../../../../common/licensing/index.mock'; import { indicesAPIClientMock } from '../../../index.mock'; import { RoleValidator } from '../../validate_role'; -import { ElasticsearchPrivileges } from './elasticsearch_privileges'; function getProps() { const license = licenseMock.create(); diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx index e963c4eda6d925..211cd7a77efcf9 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx @@ -21,13 +21,13 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { ClusterPrivileges } from './cluster_privileges'; +import { IndexPrivileges } from './index_privileges'; import type { SecurityLicense } from '../../../../../../common/licensing'; import type { BuiltinESPrivileges, Role } from '../../../../../../common/model'; import type { IndicesAPIClient } from '../../../indices_api_client'; import { CollapsiblePanel } from '../../collapsible_panel'; import type { RoleValidator } from '../../validate_role'; -import { ClusterPrivileges } from './cluster_privileges'; -import { IndexPrivileges } from './index_privileges'; interface Props { role: Role; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx index 09160ce3b69671..60e025d968614b 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx @@ -12,9 +12,9 @@ import { coreMock } from '@kbn/core/public/mocks'; import { CodeEditorField, KibanaContextProvider } from '@kbn/kibana-react-plugin/public'; import { findTestSubject, mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers'; +import { IndexPrivilegeForm } from './index_privilege_form'; import { indicesAPIClientMock } from '../../../index.mock'; import { RoleValidator } from '../../validate_role'; -import { IndexPrivilegeForm } from './index_privilege_form'; test('it renders without crashing', () => { const wrapper = shallowWithIntl( diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx index 5247b56d52a916..e05e6c4a4f8d19 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx @@ -11,11 +11,11 @@ import { coreMock } from '@kbn/core/public/mocks'; import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public'; import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers'; +import { IndexPrivilegeForm } from './index_privilege_form'; +import { IndexPrivileges } from './index_privileges'; import { licenseMock } from '../../../../../../common/licensing/index.mock'; import { indicesAPIClientMock } from '../../../index.mock'; import { RoleValidator } from '../../validate_role'; -import { IndexPrivilegeForm } from './index_privilege_form'; -import { IndexPrivileges } from './index_privileges'; // the IndexPrivileges post-mount hook kicks off some promises; // we need to wait for those promises to resolve to ensure any errors are properly caught diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.tsx index b47cff5b216696..edf2ebd9485129 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.tsx @@ -11,12 +11,12 @@ import React, { Component, Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { IndexPrivilegeForm } from './index_privilege_form'; import type { SecurityLicense } from '../../../../../../common/licensing'; import type { Role, RoleIndexPrivilege } from '../../../../../../common/model'; import { isRoleEnabled, isRoleReadOnly } from '../../../../../../common/model'; import type { IndicesAPIClient } from '../../../indices_api_client'; import type { RoleValidator } from '../../validate_role'; -import { IndexPrivilegeForm } from './index_privilege_form'; interface Props { indexType: 'indices' | 'remote_indices'; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx index 0383e857adda4e..59418010b114d9 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx @@ -11,12 +11,12 @@ import React from 'react'; import type { KibanaFeature, SubFeatureConfig } from '@kbn/features-plugin/public'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; +import { getDisplayedFeaturePrivileges } from './__fixtures__'; +import { FeatureTable } from './feature_table'; import type { Role } from '../../../../../../../common/model'; import { createFeature, kibanaFeatures } from '../../../../__fixtures__/kibana_features'; import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; import { PrivilegeFormCalculator } from '../privilege_form_calculator'; -import { getDisplayedFeaturePrivileges } from './__fixtures__'; -import { FeatureTable } from './feature_table'; const createRole = (kibana: Role['kibana'] = []): Role => { return { diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx index d2a5625b724a6b..8d9573383b255e 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx @@ -30,13 +30,13 @@ import type { AppCategory } from '@kbn/core/public'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { ChangeAllPrivilegesControl } from './change_all_privileges'; +import { FeatureTableExpandedRow } from './feature_table_expanded_row'; import type { Role } from '../../../../../../../common/model'; import type { KibanaPrivileges, SecuredFeature } from '../../../../model'; import { NO_PRIVILEGE_VALUE } from '../constants'; import { FeatureTableCell } from '../feature_table_cell'; import type { PrivilegeFormCalculator } from '../privilege_form_calculator'; -import { ChangeAllPrivilegesControl } from './change_all_privileges'; -import { FeatureTableExpandedRow } from './feature_table_expanded_row'; interface Props { role: Role; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.test.tsx index c7ab5a2be78907..42a08b3244363e 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.test.tsx @@ -10,11 +10,11 @@ import React from 'react'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; +import { FeatureTableExpandedRow } from './feature_table_expanded_row'; import type { Role } from '../../../../../../../common/model'; import { kibanaFeatures } from '../../../../__fixtures__/kibana_features'; import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; import { PrivilegeFormCalculator } from '../privilege_form_calculator'; -import { FeatureTableExpandedRow } from './feature_table_expanded_row'; const createRole = (kibana: Role['kibana'] = []): Role => { return { diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.tsx index e89102e62ca8da..abc33abcb86604 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table_expanded_row.tsx @@ -12,9 +12,9 @@ import React, { useEffect, useState } from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { SubFeatureForm } from './sub_feature_form'; import type { SecuredFeature } from '../../../../model'; import type { PrivilegeFormCalculator } from '../privilege_form_calculator'; -import { SubFeatureForm } from './sub_feature_form'; interface Props { feature: SecuredFeature; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx index 12a9a8a79944b9..3047cb0f91f122 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx @@ -12,12 +12,12 @@ import React from 'react'; import { KibanaFeature } from '@kbn/features-plugin/public'; import { mountWithIntl } from '@kbn/test-jest-helpers'; +import { SubFeatureForm } from './sub_feature_form'; import type { Role } from '../../../../../../../common/model'; import { kibanaFeatures } from '../../../../__fixtures__/kibana_features'; import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; import { SecuredSubFeature } from '../../../../model'; import { PrivilegeFormCalculator } from '../privilege_form_calculator'; -import { SubFeatureForm } from './sub_feature_form'; // Note: these tests are not concerned with the proper display of privileges, // as that is verified by the feature_table and privilege_space_form tests. diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx index c503ef35ae06c9..372b24048fe5b3 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx @@ -10,9 +10,9 @@ import React from 'react'; import { mountWithIntl } from '@kbn/test-jest-helpers'; +import { FeatureTableCell } from './feature_table_cell'; import { createFeature } from '../../../../__fixtures__/kibana_features'; import { SecuredFeature } from '../../../../model'; -import { FeatureTableCell } from './feature_table_cell'; describe('FeatureTableCell', () => { it('renders the feature name', () => { diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.test.tsx index 62627073943f0f..ef6e4ca485d0bc 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.test.tsx @@ -12,13 +12,13 @@ import { coreMock } from '@kbn/core/public/mocks'; import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks'; import { getUiApi } from '@kbn/spaces-plugin/public/ui_api'; -import type { Role } from '../../../../../../common/model'; -import { KibanaPrivileges } from '../../../model'; -import { RoleValidator } from '../../validate_role'; import { KibanaPrivilegesRegion } from './kibana_privileges_region'; import { SimplePrivilegeSection } from './simple_privilege_section'; import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section'; import { TransformErrorSection } from './transform_error_section'; +import type { Role } from '../../../../../../common/model'; +import { KibanaPrivileges } from '../../../model'; +import { RoleValidator } from '../../validate_role'; const spacesManager = spacesManagerMock.create(); const { getStartServices } = coreMock.createSetup(); diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx index 62a1a021c0aaeb..e45829d722cbc7 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx @@ -10,13 +10,13 @@ import React, { Component } from 'react'; import type { Capabilities } from '@kbn/core/public'; import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public'; +import { SimplePrivilegeSection } from './simple_privilege_section'; +import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section'; +import { TransformErrorSection } from './transform_error_section'; import type { Role } from '../../../../../../common/model'; import type { KibanaPrivileges } from '../../../model'; import { CollapsiblePanel } from '../../collapsible_panel'; import type { RoleValidator } from '../../validate_role'; -import { SimplePrivilegeSection } from './simple_privilege_section'; -import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section'; -import { TransformErrorSection } from './transform_error_section'; interface Props { role: Role; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.test.ts index a640c5cbbf0879..901cd14e24038c 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.test.ts +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_form_calculator/privilege_form_calculator.test.ts @@ -5,10 +5,10 @@ * 2.0. */ +import { PrivilegeFormCalculator } from './privilege_form_calculator'; import type { Role } from '../../../../../../../common/model'; import { kibanaFeatures } from '../../../../__fixtures__/kibana_features'; import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; -import { PrivilegeFormCalculator } from './privilege_form_calculator'; const createRole = (kibana: Role['kibana'] = []): Role => { return { diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx index 2a33d01c6e38cb..7de3c66f8f4f55 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx @@ -13,11 +13,11 @@ import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mock import { getUiApi } from '@kbn/spaces-plugin/public/ui_api'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; +import { PrivilegeSummary } from './privilege_summary'; +import { PrivilegeSummaryTable } from './privilege_summary_table'; import type { RoleKibanaPrivilege } from '../../../../../../../common/model'; import { kibanaFeatures } from '../../../../__fixtures__/kibana_features'; import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; -import { PrivilegeSummary } from './privilege_summary'; -import { PrivilegeSummaryTable } from './privilege_summary_table'; const createRole = (roleKibanaPrivileges: RoleKibanaPrivilege[]) => ({ name: 'some-role', diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx index 2aaec1ae95d870..d5a98510b02654 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx @@ -19,9 +19,9 @@ import React, { Fragment, useState } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public'; +import { PrivilegeSummaryTable } from './privilege_summary_table'; import type { Role } from '../../../../../../../common/model'; import type { KibanaPrivileges } from '../../../../model'; -import { PrivilegeSummaryTable } from './privilege_summary_table'; interface Props { role: Role; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.test.ts index 61be3af6eb1c8d..856404408d55c4 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.test.ts +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_calculator.test.ts @@ -5,10 +5,10 @@ * 2.0. */ +import { PrivilegeSummaryCalculator } from './privilege_summary_calculator'; import type { Role } from '../../../../../../../common/model'; import { kibanaFeatures } from '../../../../__fixtures__/kibana_features'; import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; -import { PrivilegeSummaryCalculator } from './privilege_summary_calculator'; const createRole = (kibana: Role['kibana'] = []): Role => { return { diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_expanded_row.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_expanded_row.tsx index d81af7ae9de877..727bcdc1b103d5 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_expanded_row.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_expanded_row.tsx @@ -10,12 +10,12 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; +import type { EffectiveFeaturePrivileges } from './privilege_summary_calculator'; import type { SecuredFeature, SubFeaturePrivilege, SubFeaturePrivilegeGroup, } from '../../../../model'; -import type { EffectiveFeaturePrivileges } from './privilege_summary_calculator'; interface Props { feature: SecuredFeature; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx index 62ad9bc83b1cc5..7efe5bc8333fd5 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx @@ -13,12 +13,12 @@ import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mock import { getUiApi } from '@kbn/spaces-plugin/public/ui_api'; import { mountWithIntl } from '@kbn/test-jest-helpers'; -import type { RoleKibanaPrivilege } from '../../../../../../../common/model'; -import { kibanaFeatures } from '../../../../__fixtures__/kibana_features'; -import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; import { getDisplayedFeaturePrivileges } from './__fixtures__'; import type { PrivilegeSummaryTableProps } from './privilege_summary_table'; import { PrivilegeSummaryTable } from './privilege_summary_table'; +import type { RoleKibanaPrivilege } from '../../../../../../../common/model'; +import { kibanaFeatures } from '../../../../__fixtures__/kibana_features'; +import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; const createRole = (roleKibanaPrivileges: RoleKibanaPrivilege[]) => ({ name: 'some-role', diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx index f8e5867443b3f6..4bddc6bad6fda9 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx @@ -22,15 +22,15 @@ import React, { Fragment, useMemo, useState } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public'; +import type { EffectiveFeaturePrivileges } from './privilege_summary_calculator'; +import { PrivilegeSummaryCalculator } from './privilege_summary_calculator'; +import { PrivilegeSummaryExpandedRow } from './privilege_summary_expanded_row'; +import { SpaceColumnHeader } from './space_column_header'; import { ALL_SPACES_ID } from '../../../../../../../common/constants'; import type { Role, RoleKibanaPrivilege } from '../../../../../../../common/model'; import type { KibanaPrivileges, PrimaryFeaturePrivilege, SecuredFeature } from '../../../../model'; import { isGlobalPrivilegeDefinition } from '../../../privilege_utils'; import { FeatureTableCell } from '../feature_table_cell'; -import type { EffectiveFeaturePrivileges } from './privilege_summary_calculator'; -import { PrivilegeSummaryCalculator } from './privilege_summary_calculator'; -import { PrivilegeSummaryExpandedRow } from './privilege_summary_expanded_row'; -import { SpaceColumnHeader } from './space_column_header'; export interface PrivilegeSummaryTableProps { role: Role; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx index 015dd8a5548cd8..61a7c024a28285 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx @@ -14,9 +14,9 @@ import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mock import { getUiApi } from '@kbn/spaces-plugin/public/ui_api'; import { mountWithIntl } from '@kbn/test-jest-helpers'; +import { SpaceColumnHeader } from './space_column_header'; import type { RoleKibanaPrivilege } from '../../../../../../../common/model'; import { SpacesPopoverList } from '../../../spaces_popover_list'; -import { SpaceColumnHeader } from './space_column_header'; const spaces = [ { diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx index 8f5efff64aadd7..85f8af876dae74 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx @@ -11,10 +11,10 @@ import React from 'react'; import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers'; -import type { Role } from '../../../../../../../common/model'; -import { KibanaPrivileges, SecuredFeature } from '../../../../model'; import { SimplePrivilegeSection } from './simple_privilege_section'; import { UnsupportedSpacePrivilegesWarning } from './unsupported_space_privileges_warning'; +import type { Role } from '../../../../../../../common/model'; +import { KibanaPrivileges, SecuredFeature } from '../../../../model'; const buildProps = (customProps: any = {}) => { const features = [ diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.tsx index f886de819e1445..786039ce0a2375 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/simple_privilege_section.tsx @@ -17,6 +17,7 @@ import React, { Component, Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; +import { UnsupportedSpacePrivilegesWarning } from './unsupported_space_privileges_warning'; import type { Role, RoleKibanaPrivilege } from '../../../../../../../common/model'; import { copyRole } from '../../../../../../../common/model'; import type { KibanaPrivileges } from '../../../../model'; @@ -24,7 +25,6 @@ import { isGlobalPrivilegeDefinition } from '../../../privilege_utils'; import { CUSTOM_PRIVILEGE_VALUE, NO_PRIVILEGE_VALUE } from '../constants'; import { FeatureTable } from '../feature_table'; import { PrivilegeFormCalculator } from '../privilege_form_calculator'; -import { UnsupportedSpacePrivilegesWarning } from './unsupported_space_privileges_warning'; interface Props { role: Role; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx index 71876eeed963d9..4fdeff85fb00d3 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx @@ -11,13 +11,13 @@ import React from 'react'; import type { Space } from '@kbn/spaces-plugin/public'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; +import { PrivilegeSpaceForm } from './privilege_space_form'; +import { SpaceSelector } from './space_selector'; import type { Role } from '../../../../../../../common/model'; import { createFeature, kibanaFeatures } from '../../../../__fixtures__/kibana_features'; import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; import { FeatureTable } from '../feature_table'; import { getDisplayedFeaturePrivileges } from '../feature_table/__fixtures__'; -import { PrivilegeSpaceForm } from './privilege_space_form'; -import { SpaceSelector } from './space_selector'; const createRole = (kibana: Role['kibana'] = []): Role => { return { diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx index 5b39b158e67c28..05327142e21052 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx @@ -31,6 +31,7 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import type { Space } from '@kbn/spaces-plugin/public'; +import { SpaceSelector } from './space_selector'; import { ALL_SPACES_ID } from '../../../../../../../common/constants'; import type { FeaturesPrivileges, Role } from '../../../../../../../common/model'; import { copyRole } from '../../../../../../../common/model'; @@ -38,7 +39,6 @@ import type { KibanaPrivileges } from '../../../../model'; import { CUSTOM_PRIVILEGE_VALUE } from '../constants'; import { FeatureTable } from '../feature_table'; import { PrivilegeFormCalculator } from '../privilege_form_calculator'; -import { SpaceSelector } from './space_selector'; interface Props { role: Role; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx index 36755875848dc6..5c9220872d9b36 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx @@ -12,11 +12,11 @@ import React from 'react'; import { KibanaFeature } from '@kbn/features-plugin/public'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; +import { PrivilegeDisplay } from './privilege_display'; +import { PrivilegeSpaceTable } from './privilege_space_table'; import type { Role, RoleKibanaPrivilege } from '../../../../../../../common/model'; import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; import { PrivilegeFormCalculator } from '../privilege_form_calculator'; -import { PrivilegeDisplay } from './privilege_display'; -import { PrivilegeSpaceTable } from './privilege_space_table'; interface TableRow { spaces: string[]; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx index bae3b7f4a9b53e..adfc8100aeb937 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx @@ -25,12 +25,12 @@ import { FormattedMessage } from '@kbn/i18n-react'; import type { Space } from '@kbn/spaces-plugin/public'; import { getSpaceColor } from '@kbn/spaces-plugin/public'; +import { PrivilegeDisplay } from './privilege_display'; import type { FeaturesPrivileges, Role } from '../../../../../../../common/model'; import { copyRole } from '../../../../../../../common/model'; import { isGlobalPrivilegeDefinition } from '../../../privilege_utils'; import { CUSTOM_PRIVILEGE_VALUE } from '../constants'; import type { PrivilegeFormCalculator } from '../privilege_form_calculator'; -import { PrivilegeDisplay } from './privilege_display'; const SPACES_DISPLAY_COUNT = 4; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.test.tsx index 8152a21bd931c8..3b44f20336d81e 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.test.tsx @@ -9,13 +9,13 @@ import React from 'react'; import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers'; +import { PrivilegeSpaceForm } from './privilege_space_form'; +import { PrivilegeSpaceTable } from './privilege_space_table'; +import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section'; import { kibanaFeatures } from '../../../../__fixtures__/kibana_features'; import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges'; import { RoleValidator } from '../../../validate_role'; import { PrivilegeSummary } from '../privilege_summary'; -import { PrivilegeSpaceForm } from './privilege_space_form'; -import { PrivilegeSpaceTable } from './privilege_space_table'; -import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section'; const buildProps = (customProps: any = {}) => { return { diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx index 563911848b122c..20315691695711 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx @@ -22,14 +22,14 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public'; +import { PrivilegeSpaceForm } from './privilege_space_form'; +import { PrivilegeSpaceTable } from './privilege_space_table'; import type { Role } from '../../../../../../../common/model'; import { isRoleReserved } from '../../../../../../../common/model'; import type { KibanaPrivileges } from '../../../../model'; import type { RoleValidator } from '../../../validate_role'; import { PrivilegeFormCalculator } from '../privilege_form_calculator'; import { PrivilegeSummary } from '../privilege_summary'; -import { PrivilegeSpaceForm } from './privilege_space_form'; -import { PrivilegeSpaceTable } from './privilege_space_table'; interface Props { kibanaPrivileges: KibanaPrivileges; diff --git a/x-pack/plugins/security/public/management/roles/edit_role/reserved_role_badge.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/reserved_role_badge.test.tsx index 3145c43f2be422..ac3c36c510bcd2 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/reserved_role_badge.test.tsx +++ b/x-pack/plugins/security/public/management/roles/edit_role/reserved_role_badge.test.tsx @@ -9,8 +9,8 @@ import { EuiIcon } from '@elastic/eui'; import { shallow } from 'enzyme'; import React from 'react'; -import type { Role } from '../../../../common/model'; import { ReservedRoleBadge } from './reserved_role_badge'; +import type { Role } from '../../../../common/model'; const reservedRole: Role = { name: '', diff --git a/x-pack/plugins/security/public/management/roles/edit_role/validate_role.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/validate_role.test.ts index 61c0902b4ef903..f2f2f9a10e52c3 100644 --- a/x-pack/plugins/security/public/management/roles/edit_role/validate_role.test.ts +++ b/x-pack/plugins/security/public/management/roles/edit_role/validate_role.test.ts @@ -5,8 +5,8 @@ * 2.0. */ -import type { Role } from '../../../../common/model'; import { RoleValidator } from './validate_role'; +import type { Role } from '../../../../common/model'; let validator: RoleValidator; diff --git a/x-pack/plugins/security/public/management/roles/model/kibana_privileges.test.ts b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.test.ts index 973c017e3a1905..5baaf7d08055b8 100644 --- a/x-pack/plugins/security/public/management/roles/model/kibana_privileges.test.ts +++ b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.test.ts @@ -5,11 +5,11 @@ * 2.0. */ +import { KibanaPrivilege } from './kibana_privilege'; +import { KibanaPrivileges } from './kibana_privileges'; import type { RoleKibanaPrivilege } from '../../../../common/model'; import { kibanaFeatures } from '../__fixtures__/kibana_features'; import { createRawKibanaPrivileges } from '../__fixtures__/kibana_privileges'; -import { KibanaPrivilege } from './kibana_privilege'; -import { KibanaPrivileges } from './kibana_privileges'; describe('KibanaPrivileges', () => { describe('#getBasePrivileges', () => { diff --git a/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts index b48fc18527cd69..7e5151d6d67aff 100644 --- a/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts +++ b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts @@ -7,11 +7,11 @@ import type { KibanaFeature } from '@kbn/features-plugin/common'; -import type { RawKibanaPrivileges, RoleKibanaPrivilege } from '../../../../common/model'; -import { isGlobalPrivilegeDefinition } from '../edit_role/privilege_utils'; import { KibanaPrivilege } from './kibana_privilege'; import { PrivilegeCollection } from './privilege_collection'; import { SecuredFeature } from './secured_feature'; +import type { RawKibanaPrivileges, RoleKibanaPrivilege } from '../../../../common/model'; +import { isGlobalPrivilegeDefinition } from '../edit_role/privilege_utils'; function toBasePrivilege(entry: [string, string[]]): [string, KibanaPrivilege] { const [privilegeId, actions] = entry; diff --git a/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts b/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts index ce7af35dccf226..ac30132df8a80b 100644 --- a/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts +++ b/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts @@ -7,8 +7,8 @@ import { httpServiceMock } from '@kbn/core/public/mocks'; -import type { Role } from '../../../common/model'; import { RolesAPIClient } from './roles_api_client'; +import type { Role } from '../../../common/model'; describe('RolesAPIClient', () => { async function saveRole(role: Role) { diff --git a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx index 57a3a5aa8ad031..6ca8dd1322cbff 100644 --- a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx +++ b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx @@ -13,11 +13,11 @@ import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { PermissionDenied } from './permission_denied'; +import { RolesGridPage } from './roles_grid_page'; import { DisabledBadge, ReservedBadge } from '../../badges'; import { rolesAPIClientMock } from '../index.mock'; import type { RolesAPIClient } from '../roles_api_client'; -import { PermissionDenied } from './permission_denied'; -import { RolesGridPage } from './roles_grid_page'; const mock403 = () => ({ body: { statusCode: 403 } }); diff --git a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx index 8b5631328f6f70..4c6962585976c7 100644 --- a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx +++ b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx @@ -28,6 +28,8 @@ import { FormattedMessage } from '@kbn/i18n-react'; import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { ConfirmDelete } from './confirm_delete'; +import { PermissionDenied } from './permission_denied'; import type { Role } from '../../../../common/model'; import { getExtendedRoleDeprecationNotice, @@ -39,8 +41,6 @@ import { import { DeprecatedBadge, DisabledBadge, ReservedBadge } from '../../badges'; import { ActionsEuiTableFormatting } from '../../table_utils'; import type { RolesAPIClient } from '../roles_api_client'; -import { ConfirmDelete } from './confirm_delete'; -import { PermissionDenied } from './permission_denied'; interface Props { notifications: NotificationsStart; diff --git a/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx b/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx index f1536631a66e78..5e9d5fcc56350f 100644 --- a/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx +++ b/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx @@ -12,8 +12,8 @@ import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/ import { featuresPluginMock } from '@kbn/features-plugin/public/mocks'; import type { Unmount } from '@kbn/management-plugin/public/types'; -import { licenseMock } from '../../../common/licensing/index.mock'; import { rolesManagementApp } from './roles_management_app'; +import { licenseMock } from '../../../common/licensing/index.mock'; jest.mock('./roles_grid', () => ({ RolesGridPage: (props: any) => `Roles Page: ${JSON.stringify(props)}`, diff --git a/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx b/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx index a5f459dfc11249..4ab78b64bf9ae5 100644 --- a/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx +++ b/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx @@ -12,9 +12,9 @@ import React from 'react'; import { coreMock } from '@kbn/core/public/mocks'; import { mountWithIntl } from '@kbn/test-jest-helpers'; +import { ChangePasswordForm } from './change_password_form'; import type { User } from '../../../../../common/model'; import { userAPIClientMock } from '../../index.mock'; -import { ChangePasswordForm } from './change_password_form'; function getCurrentPasswordField(wrapper: ReactWrapper) { return wrapper.find(EuiFieldPassword).filter('[data-test-subj="currentPassword"]'); diff --git a/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx b/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx index 8fd11556228cdd..70e4a911dd61ef 100644 --- a/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx +++ b/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx @@ -10,8 +10,8 @@ import React from 'react'; import { coreMock } from '@kbn/core/public/mocks'; import { mountWithIntl } from '@kbn/test-jest-helpers'; -import { userAPIClientMock } from '../../index.mock'; import { ConfirmDeleteUsers } from './confirm_delete_users'; +import { userAPIClientMock } from '../../index.mock'; describe('ConfirmDeleteUsers', () => { it('renders a warning for a single user', () => { diff --git a/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx b/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx index 329b4bfc28b54f..ef41ba92c78502 100644 --- a/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx +++ b/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx @@ -11,9 +11,9 @@ import React from 'react'; import { coreMock, themeServiceMock } from '@kbn/core/public/mocks'; +import { CreateUserPage } from './create_user_page'; import { securityMock } from '../../../mocks'; import { Providers } from '../users_management_app'; -import { CreateUserPage } from './create_user_page'; jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({ htmlIdGenerator: () => () => `id-${Math.random()}`, diff --git a/x-pack/plugins/security/public/management/users/edit_user/create_user_page.tsx b/x-pack/plugins/security/public/management/users/edit_user/create_user_page.tsx index d72732cfd99ed2..9378d885f46b09 100644 --- a/x-pack/plugins/security/public/management/users/edit_user/create_user_page.tsx +++ b/x-pack/plugins/security/public/management/users/edit_user/create_user_page.tsx @@ -12,8 +12,8 @@ import { useHistory } from 'react-router-dom'; import { FormattedMessage } from '@kbn/i18n-react'; -import { useCapabilities } from '../../../components/use_capabilities'; import { UserForm } from './user_form'; +import { useCapabilities } from '../../../components/use_capabilities'; export const CreateUserPage: FunctionComponent = () => { const history = useHistory(); diff --git a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx index c4a47a5fd1ed76..673fd2e89599a4 100644 --- a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx +++ b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx @@ -11,9 +11,9 @@ import React from 'react'; import { coreMock, themeServiceMock } from '@kbn/core/public/mocks'; +import { EditUserPage } from './edit_user_page'; import { securityMock } from '../../../mocks'; import { Providers } from '../users_management_app'; -import { EditUserPage } from './edit_user_page'; const userMock = { username: 'jdoe', diff --git a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx index d4b35b833c8781..9926fe49883eb6 100644 --- a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx +++ b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx @@ -29,15 +29,15 @@ import useAsyncFn from 'react-use/lib/useAsyncFn'; import { FormattedMessage } from '@kbn/i18n-react'; import { useKibana } from '@kbn/kibana-react-plugin/public'; -import { getUserDisplayName } from '../../../../common/model'; -import { useCapabilities } from '../../../components/use_capabilities'; -import { UserAPIClient } from '../user_api_client'; -import { isUserDeprecated, isUserReserved } from '../user_utils'; import { ChangePasswordModal } from './change_password_modal'; import { ConfirmDeleteUsers } from './confirm_delete_users'; import { ConfirmDisableUsers } from './confirm_disable_users'; import { ConfirmEnableUsers } from './confirm_enable_users'; import { UserForm } from './user_form'; +import { getUserDisplayName } from '../../../../common/model'; +import { useCapabilities } from '../../../components/use_capabilities'; +import { UserAPIClient } from '../user_api_client'; +import { isUserDeprecated, isUserReserved } from '../user_utils'; export interface EditUserPageProps { username: string; diff --git a/x-pack/plugins/security/public/management/users/user_utils.test.ts b/x-pack/plugins/security/public/management/users/user_utils.test.ts index 273086be971d1f..a2d3fddf7725d7 100644 --- a/x-pack/plugins/security/public/management/users/user_utils.test.ts +++ b/x-pack/plugins/security/public/management/users/user_utils.test.ts @@ -5,8 +5,8 @@ * 2.0. */ -import type { User } from '../../../common/model'; import { getExtendedUserDeprecationNotice, isUserDeprecated, isUserReserved } from './user_utils'; +import type { User } from '../../../common/model'; describe('#isUserReserved', () => { it('returns false for a user with no metadata', () => { diff --git a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx index 3c133b3628b436..dd7b68566a1974 100644 --- a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx +++ b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx @@ -14,10 +14,10 @@ import type { CoreStart, ScopedHistory } from '@kbn/core/public'; import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks'; import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers'; +import { UsersGridPage } from './users_grid_page'; import type { User } from '../../../../common/model'; import { rolesAPIClientMock } from '../../roles/index.mock'; import { userAPIClientMock } from '../index.mock'; -import { UsersGridPage } from './users_grid_page'; describe('UsersGridPage', () => { let history: ScopedHistory; diff --git a/x-pack/plugins/security/public/management/users/users_management_app.test.tsx b/x-pack/plugins/security/public/management/users/users_management_app.test.tsx index dd5495cd8bd1d5..992ec3204de216 100644 --- a/x-pack/plugins/security/public/management/users/users_management_app.test.tsx +++ b/x-pack/plugins/security/public/management/users/users_management_app.test.tsx @@ -11,8 +11,8 @@ import { noop } from 'lodash'; import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks'; import type { Unmount } from '@kbn/management-plugin/public/types'; -import { securityMock } from '../../mocks'; import { usersManagementApp } from './users_management_app'; +import { securityMock } from '../../mocks'; const element = document.body.appendChild(document.createElement('div')); diff --git a/x-pack/plugins/security/public/mocks.ts b/x-pack/plugins/security/public/mocks.ts index 8a9232869b430c..f31a4f01f35352 100644 --- a/x-pack/plugins/security/public/mocks.ts +++ b/x-pack/plugins/security/public/mocks.ts @@ -7,12 +7,12 @@ import { of } from 'rxjs'; -import { licenseMock } from '../common/licensing/index.mock'; -import type { MockAuthenticatedUserProps } from '../common/model/authenticated_user.mock'; -import { mockAuthenticatedUser } from '../common/model/authenticated_user.mock'; import { authenticationMock } from './authentication/index.mock'; import { navControlServiceMock } from './nav_control/index.mock'; import { getUiApiMock } from './ui_api/index.mock'; +import { licenseMock } from '../common/licensing/index.mock'; +import type { MockAuthenticatedUserProps } from '../common/model/authenticated_user.mock'; +import { mockAuthenticatedUser } from '../common/model/authenticated_user.mock'; function createSetupMock() { return { diff --git a/x-pack/plugins/security/public/nav_control/nav_control_component.test.tsx b/x-pack/plugins/security/public/nav_control/nav_control_component.test.tsx index a0f9df820c91e5..c09eb20328c49f 100644 --- a/x-pack/plugins/security/public/nav_control/nav_control_component.test.tsx +++ b/x-pack/plugins/security/public/nav_control/nav_control_component.test.tsx @@ -13,10 +13,10 @@ import { act } from 'react-dom/test-utils'; import useObservable from 'react-use/lib/useObservable'; import { BehaviorSubject } from 'rxjs'; +import { SecurityNavControl } from './nav_control_component'; import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; import { userProfileMock } from '../../common/model/user_profile.mock'; import * as UseCurrentUserImports from '../components/use_current_user'; -import { SecurityNavControl } from './nav_control_component'; jest.mock('../components/use_current_user'); jest.mock('react-use/lib/useObservable'); diff --git a/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts b/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts index 68672b8033a665..2346d26c44a834 100644 --- a/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts +++ b/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts @@ -12,12 +12,12 @@ import { coreMock } from '@kbn/core/public/mocks'; import type { ILicense } from '@kbn/licensing-plugin/public'; import { nextTick } from '@kbn/test-jest-helpers'; +import { SecurityNavControlService } from './nav_control_service'; import { SecurityLicenseService } from '../../common/licensing'; import { UserProfileAPIClient } from '../account_management'; import { authenticationMock } from '../authentication/index.mock'; import * as UseCurrentUserImports from '../components/use_current_user'; import { UserAPIClient } from '../management'; -import { SecurityNavControlService } from './nav_control_service'; const useUserProfileMock = jest.spyOn(UseCurrentUserImports, 'useUserProfile'); const useCurrentUserMock = jest.spyOn(UseCurrentUserImports, 'useCurrentUser'); diff --git a/x-pack/plugins/security/public/nav_control/nav_control_service.tsx b/x-pack/plugins/security/public/nav_control/nav_control_service.tsx index 0a5560b743f997..de87a5ea166259 100644 --- a/x-pack/plugins/security/public/nav_control/nav_control_service.tsx +++ b/x-pack/plugins/security/public/nav_control/nav_control_service.tsx @@ -18,12 +18,12 @@ import { I18nProvider } from '@kbn/i18n-react'; import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app'; +import type { UserMenuLink } from './nav_control_component'; +import { SecurityNavControl } from './nav_control_component'; import type { SecurityLicense } from '../../common/licensing'; import type { AuthenticationServiceSetup } from '../authentication'; import type { SecurityApiClients } from '../components'; import { AuthenticationProvider, SecurityApiClientsProvider } from '../components'; -import type { UserMenuLink } from './nav_control_component'; -import { SecurityNavControl } from './nav_control_component'; interface SetupDeps { securityLicense: SecurityLicense; diff --git a/x-pack/plugins/security/public/plugin.tsx b/x-pack/plugins/security/public/plugin.tsx index 49c0a14e2fd9ce..2c9c4025129e4c 100644 --- a/x-pack/plugins/security/public/plugin.tsx +++ b/x-pack/plugins/security/public/plugin.tsx @@ -22,8 +22,6 @@ import type { ManagementSetup, ManagementStart } from '@kbn/management-plugin/pu import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public'; import type { SpacesPluginStart } from '@kbn/spaces-plugin/public'; -import type { SecurityLicense } from '../common/licensing'; -import { SecurityLicenseService } from '../common/licensing'; import { accountManagementApp, UserProfileAPIClient } from './account_management'; import { AnalyticsService } from './analytics'; import { AnonymousAccessService } from './anonymous_access'; @@ -38,6 +36,8 @@ import { SecurityCheckupService } from './security_checkup'; import { SessionExpired, SessionTimeout, UnauthorizedResponseHttpInterceptor } from './session'; import type { UiApi } from './ui_api'; import { getUiApi } from './ui_api'; +import { SecurityLicenseService } from '../common/licensing'; +import type { SecurityLicense } from '../common/licensing'; export interface PluginSetupDependencies { licensing: LicensingPluginSetup; diff --git a/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts b/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts index 4a59ba96a998a6..2c6ba4861857ee 100644 --- a/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts +++ b/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts @@ -9,8 +9,8 @@ import type { DocLinksStart } from '@kbn/core/public'; import { coreMock } from '@kbn/core/public/mocks'; import { nextTick } from '@kbn/test-jest-helpers'; -import type { ConfigType } from '../config'; import { SecurityCheckupService } from './security_checkup_service'; +import type { ConfigType } from '../config'; let mockOnDismissCallback: (persist: boolean) => void = jest.fn().mockImplementation(() => { throw new Error('expected callback to be replaced!'); diff --git a/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx b/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx index 280ce8dee5df5b..d2b3e31f48a596 100644 --- a/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx +++ b/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx @@ -16,9 +16,9 @@ import type { Toast, } from '@kbn/core/public'; +import { insecureClusterAlertText, insecureClusterAlertTitle } from './components'; import type { SecurityCheckupState } from '../../common/types'; import type { ConfigType } from '../config'; -import { insecureClusterAlertText, insecureClusterAlertTitle } from './components'; interface SetupDeps { http: HttpSetup; diff --git a/x-pack/plugins/security/public/session/session_expiration_toast.tsx b/x-pack/plugins/security/public/session/session_expiration_toast.tsx index 9bdee832e9b667..b5aa984a5ce1f7 100644 --- a/x-pack/plugins/security/public/session/session_expiration_toast.tsx +++ b/x-pack/plugins/security/public/session/session_expiration_toast.tsx @@ -17,8 +17,8 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage, FormattedRelative } from '@kbn/i18n-react'; import { toMountPoint } from '@kbn/kibana-react-plugin/public'; -import { SESSION_GRACE_PERIOD_MS } from '../../common/constants'; import type { SessionState } from './session_timeout'; +import { SESSION_GRACE_PERIOD_MS } from '../../common/constants'; export interface SessionExpirationToastProps { sessionState$: Observable; diff --git a/x-pack/plugins/security/public/session/session_expired.test.ts b/x-pack/plugins/security/public/session/session_expired.test.ts index 02a41f1b80b80e..956018573ad31b 100644 --- a/x-pack/plugins/security/public/session/session_expired.test.ts +++ b/x-pack/plugins/security/public/session/session_expired.test.ts @@ -7,8 +7,8 @@ import { applicationServiceMock } from '@kbn/core/public/mocks'; -import { LogoutReason } from '../../common/types'; import { SessionExpired } from './session_expired'; +import { LogoutReason } from '../../common/types'; describe('#logout', () => { const application = applicationServiceMock.createStartContract(); diff --git a/x-pack/plugins/security/public/session/session_timeout.test.ts b/x-pack/plugins/security/public/session/session_timeout.test.ts index 6ee9f1c3614615..fa0bcffc66b015 100644 --- a/x-pack/plugins/security/public/session/session_timeout.test.ts +++ b/x-pack/plugins/security/public/session/session_timeout.test.ts @@ -14,6 +14,8 @@ import { } from '@kbn/test-jest-helpers'; stubBroadcastChannel(); +import { createSessionExpiredMock } from './session_expired.mock'; +import { SessionTimeout, startTimer } from './session_timeout'; import { SESSION_CHECK_MS, SESSION_EXPIRATION_WARNING_MS, @@ -22,8 +24,6 @@ import { SESSION_ROUTE, } from '../../common/constants'; import type { SessionInfo } from '../../common/types'; -import { createSessionExpiredMock } from './session_expired.mock'; -import { SessionTimeout, startTimer } from './session_timeout'; jest.useFakeTimers({ legacyFakeTimers: true }); diff --git a/x-pack/plugins/security/public/session/session_timeout.ts b/x-pack/plugins/security/public/session/session_timeout.ts index 02e43c2fd3a836..0d116641c11790 100644 --- a/x-pack/plugins/security/public/session/session_timeout.ts +++ b/x-pack/plugins/security/public/session/session_timeout.ts @@ -16,6 +16,8 @@ import type { Toast, } from '@kbn/core/public'; +import { createSessionExpirationToast } from './session_expiration_toast'; +import type { SessionExpired } from './session_expired'; import { SESSION_CHECK_MS, SESSION_EXPIRATION_WARNING_MS, @@ -25,8 +27,6 @@ import { } from '../../common/constants'; import { LogoutReason } from '../../common/types'; import type { SessionInfo } from '../../common/types'; -import { createSessionExpirationToast } from './session_expiration_toast'; -import type { SessionExpired } from './session_expired'; export interface SessionState extends Pick { lastExtensionTime: number; diff --git a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts index b4228b573243db..7f3f0d57d449ce 100644 --- a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts +++ b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts @@ -8,13 +8,13 @@ // @ts-ignore import fetchMock from 'fetch-mock/es5/client'; -import { setup } from '@kbn/core-test-helpers-http-setup-browser'; import { applicationServiceMock } from '@kbn/core/public/mocks'; +import { setup } from '@kbn/core-test-helpers-http-setup-browser'; -import { SESSION_ERROR_REASON_HEADER } from '../../common/constants'; -import { LogoutReason } from '../../common/types'; import { SessionExpired } from './session_expired'; import { UnauthorizedResponseHttpInterceptor } from './unauthorized_response_http_interceptor'; +import { SESSION_ERROR_REASON_HEADER } from '../../common/constants'; +import { LogoutReason } from '../../common/types'; jest.mock('./session_expired'); diff --git a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts index e09a9e5f26c312..d96d9d0b69c9b3 100644 --- a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts +++ b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts @@ -12,9 +12,9 @@ import type { IHttpInterceptController, } from '@kbn/core/public'; +import type { SessionExpired } from './session_expired'; import { SESSION_ERROR_REASON_HEADER } from '../../common/constants'; import { LogoutReason } from '../../common/types'; -import type { SessionExpired } from './session_expired'; export class UnauthorizedResponseHttpInterceptor implements HttpInterceptor { constructor(private sessionExpired: SessionExpired, private anonymousPaths: IAnonymousPaths) {} diff --git a/x-pack/plugins/security/public/ui_api/change_password/change_password_async.tsx b/x-pack/plugins/security/public/ui_api/change_password/change_password_async.tsx index 92dbb572df0453..3ef59a77c74c3f 100644 --- a/x-pack/plugins/security/public/ui_api/change_password/change_password_async.tsx +++ b/x-pack/plugins/security/public/ui_api/change_password/change_password_async.tsx @@ -9,8 +9,8 @@ import React from 'react'; import type { CoreStart } from '@kbn/core/public'; -import { UserAPIClient } from '../../management/users'; import type { ChangePasswordProps } from './change_password'; +import { UserAPIClient } from '../../management/users'; export const getChangePasswordComponent = async ( core: CoreStart diff --git a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts index 63486b4dad703c..3cee2adf03f5c3 100644 --- a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts +++ b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts @@ -16,9 +16,9 @@ import { } from '@kbn/core/server/mocks'; import { spacesMock } from '@kbn/spaces-plugin/server/mocks'; +import { AnonymousAccessService } from './anonymous_access_service'; import { ConfigSchema, createConfig } from '../config'; import { securityMock } from '../mocks'; -import { AnonymousAccessService } from './anonymous_access_service'; const createSecurityConfig = (config: Record = {}) => { return createConfig(ConfigSchema.validate(config), loggingSystemMock.createLogger(), { diff --git a/x-pack/plugins/security/server/audit/audit_events.test.ts b/x-pack/plugins/security/server/audit/audit_events.test.ts index c41676fbaa9014..b1e3b1826f8ce6 100644 --- a/x-pack/plugins/security/server/audit/audit_events.test.ts +++ b/x-pack/plugins/security/server/audit/audit_events.test.ts @@ -9,9 +9,6 @@ import { URL } from 'url'; import { httpServerMock } from '@kbn/core/server/mocks'; -import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; -import { AuthenticationResult } from '../authentication'; -import { AuditAction } from '../saved_objects/saved_objects_security_extension'; import { httpRequestEvent, savedObjectEvent, @@ -23,6 +20,9 @@ import { userLogoutEvent, userSessionConcurrentLimitLogoutEvent, } from './audit_events'; +import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; +import { AuthenticationResult } from '../authentication'; +import { AuditAction } from '../saved_objects/saved_objects_security_extension'; describe('#savedObjectEvent', () => { test('creates event with `unknown` outcome', () => { diff --git a/x-pack/plugins/security/server/audit/audit_service.test.ts b/x-pack/plugins/security/server/audit/audit_service.test.ts index a0d35bf80389ca..a03e5047a10a25 100644 --- a/x-pack/plugins/security/server/audit/audit_service.test.ts +++ b/x-pack/plugins/security/server/audit/audit_service.test.ts @@ -17,9 +17,6 @@ import { loggingSystemMock, } from '@kbn/core/server/mocks'; -import { licenseMock } from '../../common/licensing/index.mock'; -import type { ConfigType } from '../config'; -import { ConfigSchema, createConfig } from '../config'; import type { AuditEvent } from './audit_events'; import { AuditService, @@ -28,6 +25,9 @@ import { getForwardedFor, RECORD_USAGE_INTERVAL, } from './audit_service'; +import { licenseMock } from '../../common/licensing/index.mock'; +import type { ConfigType } from '../config'; +import { ConfigSchema, createConfig } from '../config'; jest.useFakeTimers({ legacyFakeTimers: true }); diff --git a/x-pack/plugins/security/server/audit/audit_service.ts b/x-pack/plugins/security/server/audit/audit_service.ts index a163a75e71874f..dddb24d47fdaf5 100644 --- a/x-pack/plugins/security/server/audit/audit_service.ts +++ b/x-pack/plugins/security/server/audit/audit_service.ts @@ -16,11 +16,11 @@ import type { } from '@kbn/core/server'; import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server'; +import type { AuditEvent } from './audit_events'; +import { httpRequestEvent } from './audit_events'; import type { SecurityLicense, SecurityLicenseFeatures } from '../../common/licensing'; import type { ConfigType } from '../config'; import type { SecurityPluginSetup } from '../plugin'; -import type { AuditEvent } from './audit_events'; -import { httpRequestEvent } from './audit_events'; export const ECS_VERSION = '1.6.0'; export const RECORD_USAGE_INTERVAL = 60 * 60 * 1000; // 1 hour diff --git a/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts b/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts index 24bebe08625915..da411cf5d8c97c 100644 --- a/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts +++ b/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts @@ -15,10 +15,10 @@ import { } from '@kbn/core/server/mocks'; import type { Logger } from '@kbn/logging'; +import { APIKeys } from './api_keys'; import { ALL_SPACES_ID } from '../../../common/constants'; import type { SecurityLicense } from '../../../common/licensing'; import { licenseMock } from '../../../common/licensing/index.mock'; -import { APIKeys } from './api_keys'; const encodeToBase64 = (str: string) => Buffer.from(str).toString('base64'); diff --git a/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts b/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts index 462630d4eae281..4f3f802d576f97 100644 --- a/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts +++ b/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts @@ -10,6 +10,7 @@ import type { IClusterClient, KibanaRequest, Logger } from '@kbn/core/server'; import type { KibanaFeature } from '@kbn/features-plugin/server'; +import { getFakeKibanaRequest } from './fake_kibana_request'; import type { SecurityLicense } from '../../../common/licensing'; import { transformPrivilegesToElasticsearchPrivileges, validateKibanaPrivileges } from '../../lib'; import type { @@ -25,7 +26,6 @@ import { BasicHTTPAuthorizationHeaderCredentials, HTTPAuthorizationHeader, } from '../http_authentication'; -import { getFakeKibanaRequest } from './fake_kibana_request'; export type { CreateAPIKeyParams, diff --git a/x-pack/plugins/security/server/authentication/authentication_result.test.ts b/x-pack/plugins/security/server/authentication/authentication_result.test.ts index 73465a9fdaf1ee..b2a24bd28d45ee 100644 --- a/x-pack/plugins/security/server/authentication/authentication_result.test.ts +++ b/x-pack/plugins/security/server/authentication/authentication_result.test.ts @@ -7,9 +7,9 @@ import Boom from '@hapi/boom'; +import { AuthenticationResult } from './authentication_result'; import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; import type { UserProfileGrant } from '../user_profile'; -import { AuthenticationResult } from './authentication_result'; describe('AuthenticationResult', () => { describe('notHandled', () => { diff --git a/x-pack/plugins/security/server/authentication/authentication_service.test.ts b/x-pack/plugins/security/server/authentication/authentication_service.test.ts index 5509b68d14c1f1..7f79b8c7d54ba3 100644 --- a/x-pack/plugins/security/server/authentication/authentication_service.test.ts +++ b/x-pack/plugins/security/server/authentication/authentication_service.test.ts @@ -12,7 +12,6 @@ import { mockCanRedirectRequest } from './authentication_service.test.mocks'; import { errors } from '@elastic/elasticsearch'; -import { customBrandingServiceMock } from '@kbn/core-custom-branding-server-mocks'; import type { AuthenticationHandler, AuthToolkit, @@ -35,9 +34,12 @@ import { httpServiceMock, loggingSystemMock, } from '@kbn/core/server/mocks'; +import { customBrandingServiceMock } from '@kbn/core-custom-branding-server-mocks'; import type { UnauthorizedError } from '@kbn/es-errors'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { AuthenticationResult } from './authentication_result'; +import { AuthenticationService } from './authentication_service'; import type { AuthenticatedUser, SecurityLicense } from '../../common'; import { licenseMock } from '../../common/licensing/index.mock'; import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; @@ -52,8 +54,6 @@ import { ROUTE_TAG_AUTH_FLOW } from '../routes/tags'; import type { Session } from '../session_management'; import { sessionMock } from '../session_management/session.mock'; import { userProfileServiceMock } from '../user_profile/user_profile_service.mock'; -import { AuthenticationResult } from './authentication_result'; -import { AuthenticationService } from './authentication_service'; describe('AuthenticationService', () => { let service: AuthenticationService; diff --git a/x-pack/plugins/security/server/authentication/authentication_service.ts b/x-pack/plugins/security/server/authentication/authentication_service.ts index 170d3d1d247846..171b7ae4212b37 100644 --- a/x-pack/plugins/security/server/authentication/authentication_service.ts +++ b/x-pack/plugins/security/server/authentication/authentication_service.ts @@ -18,6 +18,13 @@ import type { import type { KibanaFeature } from '@kbn/features-plugin/server'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { APIKeys } from './api_keys'; +import type { AuthenticationResult } from './authentication_result'; +import type { ProviderLoginAttempt } from './authenticator'; +import { Authenticator } from './authenticator'; +import { canRedirectRequest } from './can_redirect_request'; +import type { DeauthenticationResult } from './deauthentication_result'; +import { renderUnauthenticatedPage } from './unauthenticated_page'; import type { AuthenticatedUser, SecurityLicense } from '../../common'; import { NEXT_URL_QUERY_STRING_PARAMETER } from '../../common/constants'; import { shouldProviderUseLoginForm } from '../../common/model'; @@ -28,13 +35,6 @@ import type { SecurityFeatureUsageServiceStart } from '../feature_usage'; import { ROUTE_TAG_AUTH_FLOW } from '../routes/tags'; import type { Session } from '../session_management'; import type { UserProfileServiceStartInternal } from '../user_profile'; -import { APIKeys } from './api_keys'; -import type { AuthenticationResult } from './authentication_result'; -import type { ProviderLoginAttempt } from './authenticator'; -import { Authenticator } from './authenticator'; -import { canRedirectRequest } from './can_redirect_request'; -import type { DeauthenticationResult } from './deauthentication_result'; -import { renderUnauthenticatedPage } from './unauthenticated_page'; interface AuthenticationServiceSetupParams { http: Pick; diff --git a/x-pack/plugins/security/server/authentication/authenticator.test.ts b/x-pack/plugins/security/server/authentication/authenticator.test.ts index 7edf3ea0505906..f0e1479362fdf4 100644 --- a/x-pack/plugins/security/server/authentication/authenticator.test.ts +++ b/x-pack/plugins/security/server/authentication/authenticator.test.ts @@ -20,6 +20,15 @@ import { } from '@kbn/core/server/mocks'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { AuthenticationResult } from './authentication_result'; +import type { AuthenticatorOptions } from './authenticator'; +import { Authenticator, enrichWithUserProfileId } from './authenticator'; +import { DeauthenticationResult } from './deauthentication_result'; +import type { + BasicAuthenticationProvider, + HTTPAuthenticationProvider, + SAMLAuthenticationProvider, +} from './providers'; import type { SecurityLicenseFeatures } from '../../common'; import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER, @@ -45,15 +54,6 @@ import { import { sessionMock } from '../session_management/index.mock'; import type { UserProfileGrant } from '../user_profile'; import { userProfileServiceMock } from '../user_profile/user_profile_service.mock'; -import { AuthenticationResult } from './authentication_result'; -import type { AuthenticatorOptions } from './authenticator'; -import { Authenticator, enrichWithUserProfileId } from './authenticator'; -import { DeauthenticationResult } from './deauthentication_result'; -import type { - BasicAuthenticationProvider, - HTTPAuthenticationProvider, - SAMLAuthenticationProvider, -} from './providers'; let auditLogger: AuditLogger; function getMockOptions({ diff --git a/x-pack/plugins/security/server/authentication/authenticator.ts b/x-pack/plugins/security/server/authentication/authenticator.ts index 8599eb287989ed..3d1ffebabb5133 100644 --- a/x-pack/plugins/security/server/authentication/authenticator.ts +++ b/x-pack/plugins/security/server/authentication/authenticator.ts @@ -10,6 +10,26 @@ import { CoreKibanaRequest } from '@kbn/core/server'; import type { Logger } from '@kbn/logging'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { AuthenticationResult } from './authentication_result'; +import { canRedirectRequest } from './can_redirect_request'; +import { DeauthenticationResult } from './deauthentication_result'; +import { HTTPAuthorizationHeader } from './http_authentication'; +import type { + AuthenticationProviderOptions, + AuthenticationProviderSpecificOptions, + BaseAuthenticationProvider, +} from './providers'; +import { + AnonymousAuthenticationProvider, + BasicAuthenticationProvider, + HTTPAuthenticationProvider, + KerberosAuthenticationProvider, + OIDCAuthenticationProvider, + PKIAuthenticationProvider, + SAMLAuthenticationProvider, + TokenAuthenticationProvider, +} from './providers'; +import { Tokens } from './tokens'; import type { AuthenticatedUser, AuthenticationProvider, SecurityLicense } from '../../common'; import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER, @@ -33,26 +53,6 @@ import { type SessionValue, } from '../session_management'; import type { UserProfileServiceStartInternal } from '../user_profile'; -import { AuthenticationResult } from './authentication_result'; -import { canRedirectRequest } from './can_redirect_request'; -import { DeauthenticationResult } from './deauthentication_result'; -import { HTTPAuthorizationHeader } from './http_authentication'; -import type { - AuthenticationProviderOptions, - AuthenticationProviderSpecificOptions, - BaseAuthenticationProvider, -} from './providers'; -import { - AnonymousAuthenticationProvider, - BasicAuthenticationProvider, - HTTPAuthenticationProvider, - KerberosAuthenticationProvider, - OIDCAuthenticationProvider, - PKIAuthenticationProvider, - SAMLAuthenticationProvider, - TokenAuthenticationProvider, -} from './providers'; -import { Tokens } from './tokens'; /** * List of query string parameters used to pass various authentication related metadata that should diff --git a/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts b/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts index 47a09297ff866a..03a97af10c7d1e 100644 --- a/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts +++ b/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts @@ -7,8 +7,8 @@ import { httpServerMock } from '@kbn/core/server/mocks'; -import { ROUTE_TAG_API, ROUTE_TAG_CAN_REDIRECT } from '../routes/tags'; import { canRedirectRequest } from './can_redirect_request'; +import { ROUTE_TAG_API, ROUTE_TAG_CAN_REDIRECT } from '../routes/tags'; describe('can_redirect_request', () => { it('returns true if request does not have either a kbn-version or kbn-xsrf header or x-elastic-internal-origin', () => { diff --git a/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts b/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts index b6c1eb4e12b0ad..9cb2b30040d667 100644 --- a/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts +++ b/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts @@ -10,6 +10,8 @@ import { errors } from '@elastic/elasticsearch'; import type { ScopeableRequest } from '@kbn/core/server'; import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks'; +import { AnonymousAuthenticationProvider } from './anonymous'; +import { mockAuthenticationProviderOptions } from './base.mock'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { securityMock } from '../../mocks'; import { AuthenticationResult } from '../authentication_result'; @@ -18,8 +20,6 @@ import { BasicHTTPAuthorizationHeaderCredentials, HTTPAuthorizationHeader, } from '../http_authentication'; -import { AnonymousAuthenticationProvider } from './anonymous'; -import { mockAuthenticationProviderOptions } from './base.mock'; function expectAuthenticateCall( mockClusterClient: ReturnType, diff --git a/x-pack/plugins/security/server/authentication/providers/anonymous.ts b/x-pack/plugins/security/server/authentication/providers/anonymous.ts index fb48a2ddcd0f62..6bbf2aa2c43f4d 100644 --- a/x-pack/plugins/security/server/authentication/providers/anonymous.ts +++ b/x-pack/plugins/security/server/authentication/providers/anonymous.ts @@ -7,6 +7,8 @@ import type { KibanaRequest } from '@kbn/core/server'; +import type { AuthenticationProviderOptions } from './base'; +import { BaseAuthenticationProvider } from './base'; import { getErrorStatusCode } from '../../errors'; import { AuthenticationResult } from '../authentication_result'; import { canRedirectRequest } from '../can_redirect_request'; @@ -15,8 +17,6 @@ import { BasicHTTPAuthorizationHeaderCredentials, HTTPAuthorizationHeader, } from '../http_authentication'; -import type { AuthenticationProviderOptions } from './base'; -import { BaseAuthenticationProvider } from './base'; /** * Credentials that are based on the username and password. diff --git a/x-pack/plugins/security/server/authentication/providers/basic.test.ts b/x-pack/plugins/security/server/authentication/providers/basic.test.ts index 29bf38c6f1653c..f9663e3fdab0d0 100644 --- a/x-pack/plugins/security/server/authentication/providers/basic.test.ts +++ b/x-pack/plugins/security/server/authentication/providers/basic.test.ts @@ -10,12 +10,12 @@ import { errors } from '@elastic/elasticsearch'; import type { ScopeableRequest } from '@kbn/core/server'; import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks'; +import { mockAuthenticationProviderOptions } from './base.mock'; +import { BasicAuthenticationProvider } from './basic'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { securityMock } from '../../mocks'; import { AuthenticationResult } from '../authentication_result'; import { DeauthenticationResult } from '../deauthentication_result'; -import { mockAuthenticationProviderOptions } from './base.mock'; -import { BasicAuthenticationProvider } from './basic'; function generateAuthorizationHeader(username: string, password: string) { return `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`; diff --git a/x-pack/plugins/security/server/authentication/providers/basic.ts b/x-pack/plugins/security/server/authentication/providers/basic.ts index cbdcfbe9a5eada..6c363936e44086 100644 --- a/x-pack/plugins/security/server/authentication/providers/basic.ts +++ b/x-pack/plugins/security/server/authentication/providers/basic.ts @@ -7,6 +7,7 @@ import type { KibanaRequest } from '@kbn/core/server'; +import { BaseAuthenticationProvider } from './base'; import { NEXT_URL_QUERY_STRING_PARAMETER } from '../../../common/constants'; import { AuthenticationResult } from '../authentication_result'; import { canRedirectRequest } from '../can_redirect_request'; @@ -15,7 +16,6 @@ import { BasicHTTPAuthorizationHeaderCredentials, HTTPAuthorizationHeader, } from '../http_authentication'; -import { BaseAuthenticationProvider } from './base'; /** * Describes the parameters that are required by the provider to process the initial login request. diff --git a/x-pack/plugins/security/server/authentication/providers/http.test.ts b/x-pack/plugins/security/server/authentication/providers/http.test.ts index 6e257c7f6b7ab7..c1e7ba662c5138 100644 --- a/x-pack/plugins/security/server/authentication/providers/http.test.ts +++ b/x-pack/plugins/security/server/authentication/providers/http.test.ts @@ -10,13 +10,13 @@ import { errors } from '@elastic/elasticsearch'; import type { ScopeableRequest } from '@kbn/core/server'; import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks'; +import type { MockAuthenticationProviderOptions } from './base.mock'; +import { mockAuthenticationProviderOptions } from './base.mock'; +import { HTTPAuthenticationProvider } from './http'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { securityMock } from '../../mocks'; import { AuthenticationResult } from '../authentication_result'; import { DeauthenticationResult } from '../deauthentication_result'; -import type { MockAuthenticationProviderOptions } from './base.mock'; -import { mockAuthenticationProviderOptions } from './base.mock'; -import { HTTPAuthenticationProvider } from './http'; function expectAuthenticateCall( mockClusterClient: ReturnType, diff --git a/x-pack/plugins/security/server/authentication/providers/http.ts b/x-pack/plugins/security/server/authentication/providers/http.ts index 958b125a75c173..21c2b25d3be8a3 100644 --- a/x-pack/plugins/security/server/authentication/providers/http.ts +++ b/x-pack/plugins/security/server/authentication/providers/http.ts @@ -7,11 +7,11 @@ import type { KibanaRequest } from '@kbn/core/server'; +import type { AuthenticationProviderOptions } from './base'; +import { BaseAuthenticationProvider } from './base'; import { AuthenticationResult } from '../authentication_result'; import { DeauthenticationResult } from '../deauthentication_result'; import { HTTPAuthorizationHeader } from '../http_authentication'; -import type { AuthenticationProviderOptions } from './base'; -import { BaseAuthenticationProvider } from './base'; interface HTTPAuthenticationProviderOptions { supportedSchemes: Set; diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts index 8643386f762b32..da31624fddd670 100644 --- a/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts +++ b/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts @@ -11,13 +11,13 @@ import Boom from '@hapi/boom'; import type { KibanaRequest, ScopeableRequest } from '@kbn/core/server'; import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks'; +import type { MockAuthenticationProviderOptions } from './base.mock'; +import { mockAuthenticationProviderOptions } from './base.mock'; +import { KerberosAuthenticationProvider } from './kerberos'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { securityMock } from '../../mocks'; import { AuthenticationResult } from '../authentication_result'; import { DeauthenticationResult } from '../deauthentication_result'; -import type { MockAuthenticationProviderOptions } from './base.mock'; -import { mockAuthenticationProviderOptions } from './base.mock'; -import { KerberosAuthenticationProvider } from './kerberos'; function expectAuthenticateCall( mockClusterClient: ReturnType, diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.ts index 5cf7ede569e5d8..e45e0e09ec8515 100644 --- a/x-pack/plugins/security/server/authentication/providers/kerberos.ts +++ b/x-pack/plugins/security/server/authentication/providers/kerberos.ts @@ -10,6 +10,7 @@ import Boom from '@hapi/boom'; import type { KibanaRequest } from '@kbn/core/server'; +import { BaseAuthenticationProvider } from './base'; import type { AuthenticationInfo } from '../../elasticsearch'; import { getDetailedErrorMessage, getErrorStatusCode } from '../../errors'; import { AuthenticationResult } from '../authentication_result'; @@ -18,7 +19,6 @@ import { DeauthenticationResult } from '../deauthentication_result'; import { HTTPAuthorizationHeader } from '../http_authentication'; import type { RefreshTokenResult, TokenPair } from '../tokens'; import { Tokens } from '../tokens'; -import { BaseAuthenticationProvider } from './base'; /** * The state supported by the provider. diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts index c02f7c54c5421f..ea9a44fbc623fa 100644 --- a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts +++ b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts @@ -11,6 +11,10 @@ import Boom from '@hapi/boom'; import type { KibanaRequest } from '@kbn/core/server'; import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks'; +import type { MockAuthenticationProviderOptions } from './base.mock'; +import { mockAuthenticationProviderOptions } from './base.mock'; +import type { ProviderLoginAttempt } from './oidc'; +import { OIDCAuthenticationProvider, OIDCLogin } from './oidc'; import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER, AUTH_URL_HASH_QUERY_STRING_PARAMETER, @@ -19,10 +23,6 @@ import { mockAuthenticatedUser } from '../../../common/model/authenticated_user. import { securityMock } from '../../mocks'; import { AuthenticationResult } from '../authentication_result'; import { DeauthenticationResult } from '../deauthentication_result'; -import type { MockAuthenticationProviderOptions } from './base.mock'; -import { mockAuthenticationProviderOptions } from './base.mock'; -import type { ProviderLoginAttempt } from './oidc'; -import { OIDCAuthenticationProvider, OIDCLogin } from './oidc'; describe('OIDCAuthenticationProvider', () => { let provider: OIDCAuthenticationProvider; diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.ts b/x-pack/plugins/security/server/authentication/providers/oidc.ts index 143245b31770b8..df4abf62a6e688 100644 --- a/x-pack/plugins/security/server/authentication/providers/oidc.ts +++ b/x-pack/plugins/security/server/authentication/providers/oidc.ts @@ -10,6 +10,8 @@ import type from 'type-detect'; import type { KibanaRequest } from '@kbn/core/server'; +import type { AuthenticationProviderOptions, AuthenticationProviderSpecificOptions } from './base'; +import { BaseAuthenticationProvider } from './base'; import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER, AUTH_URL_HASH_QUERY_STRING_PARAMETER, @@ -23,8 +25,6 @@ import { DeauthenticationResult } from '../deauthentication_result'; import { HTTPAuthorizationHeader } from '../http_authentication'; import type { RefreshTokenResult, TokenPair } from '../tokens'; import { Tokens } from '../tokens'; -import type { AuthenticationProviderOptions, AuthenticationProviderSpecificOptions } from './base'; -import { BaseAuthenticationProvider } from './base'; /** * Describes possible OpenID Connect login flows. diff --git a/x-pack/plugins/security/server/authentication/providers/pki.test.ts b/x-pack/plugins/security/server/authentication/providers/pki.test.ts index 0196ec8d994219..e5b862f5799659 100644 --- a/x-pack/plugins/security/server/authentication/providers/pki.test.ts +++ b/x-pack/plugins/security/server/authentication/providers/pki.test.ts @@ -17,13 +17,13 @@ import { TLSSocket } from 'tls'; import type { KibanaRequest, ScopeableRequest } from '@kbn/core/server'; import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks'; +import type { MockAuthenticationProviderOptions } from './base.mock'; +import { mockAuthenticationProviderOptions } from './base.mock'; +import { PKIAuthenticationProvider } from './pki'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { securityMock } from '../../mocks'; import { AuthenticationResult } from '../authentication_result'; import { DeauthenticationResult } from '../deauthentication_result'; -import type { MockAuthenticationProviderOptions } from './base.mock'; -import { mockAuthenticationProviderOptions } from './base.mock'; -import { PKIAuthenticationProvider } from './pki'; interface MockPeerCertificate extends Partial { issuerCertificate: MockPeerCertificate; diff --git a/x-pack/plugins/security/server/authentication/providers/pki.ts b/x-pack/plugins/security/server/authentication/providers/pki.ts index 0e3544063f1d67..1137c8fd71563c 100644 --- a/x-pack/plugins/security/server/authentication/providers/pki.ts +++ b/x-pack/plugins/security/server/authentication/providers/pki.ts @@ -10,13 +10,13 @@ import type { DetailedPeerCertificate } from 'tls'; import type { KibanaRequest } from '@kbn/core/server'; +import { BaseAuthenticationProvider } from './base'; import type { AuthenticationInfo } from '../../elasticsearch'; import { AuthenticationResult } from '../authentication_result'; import { canRedirectRequest } from '../can_redirect_request'; import { DeauthenticationResult } from '../deauthentication_result'; import { HTTPAuthorizationHeader } from '../http_authentication'; import { Tokens } from '../tokens'; -import { BaseAuthenticationProvider } from './base'; /** * The state supported by the provider. diff --git a/x-pack/plugins/security/server/authentication/providers/saml.test.ts b/x-pack/plugins/security/server/authentication/providers/saml.test.ts index a165b1960c3f33..15ff615af9ad25 100644 --- a/x-pack/plugins/security/server/authentication/providers/saml.test.ts +++ b/x-pack/plugins/security/server/authentication/providers/saml.test.ts @@ -10,6 +10,10 @@ import Boom from '@hapi/boom'; import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks'; +import { ELASTIC_CLOUD_SSO_REALM_NAME } from './base'; +import type { MockAuthenticationProviderOptions } from './base.mock'; +import { mockAuthenticationProviderOptions } from './base.mock'; +import { SAMLAuthenticationProvider, SAMLLogin } from './saml'; import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER, AUTH_URL_HASH_QUERY_STRING_PARAMETER, @@ -18,10 +22,6 @@ import { mockAuthenticatedUser } from '../../../common/model/authenticated_user. import { securityMock } from '../../mocks'; import { AuthenticationResult } from '../authentication_result'; import { DeauthenticationResult } from '../deauthentication_result'; -import { ELASTIC_CLOUD_SSO_REALM_NAME } from './base'; -import type { MockAuthenticationProviderOptions } from './base.mock'; -import { mockAuthenticationProviderOptions } from './base.mock'; -import { SAMLAuthenticationProvider, SAMLLogin } from './saml'; describe('SAMLAuthenticationProvider', () => { let provider: SAMLAuthenticationProvider; diff --git a/x-pack/plugins/security/server/authentication/providers/saml.ts b/x-pack/plugins/security/server/authentication/providers/saml.ts index 890e76301ddc72..5f76622bf96316 100644 --- a/x-pack/plugins/security/server/authentication/providers/saml.ts +++ b/x-pack/plugins/security/server/authentication/providers/saml.ts @@ -9,6 +9,8 @@ import Boom from '@hapi/boom'; import type { KibanaRequest } from '@kbn/core/server'; +import type { AuthenticationProviderOptions } from './base'; +import { BaseAuthenticationProvider } from './base'; import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER, AUTH_URL_HASH_QUERY_STRING_PARAMETER, @@ -23,8 +25,6 @@ import { DeauthenticationResult } from '../deauthentication_result'; import { HTTPAuthorizationHeader } from '../http_authentication'; import type { RefreshTokenResult, TokenPair } from '../tokens'; import { Tokens } from '../tokens'; -import type { AuthenticationProviderOptions } from './base'; -import { BaseAuthenticationProvider } from './base'; /** * The state supported by the provider (for the SAML handshake or established session). diff --git a/x-pack/plugins/security/server/authentication/providers/token.test.ts b/x-pack/plugins/security/server/authentication/providers/token.test.ts index fbdf6e39abff30..f8ef97caf78a45 100644 --- a/x-pack/plugins/security/server/authentication/providers/token.test.ts +++ b/x-pack/plugins/security/server/authentication/providers/token.test.ts @@ -11,13 +11,13 @@ import Boom from '@hapi/boom'; import type { ScopeableRequest } from '@kbn/core/server'; import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks'; +import type { MockAuthenticationProviderOptions } from './base.mock'; +import { mockAuthenticationProviderOptions } from './base.mock'; +import { TokenAuthenticationProvider } from './token'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { securityMock } from '../../mocks'; import { AuthenticationResult } from '../authentication_result'; import { DeauthenticationResult } from '../deauthentication_result'; -import type { MockAuthenticationProviderOptions } from './base.mock'; -import { mockAuthenticationProviderOptions } from './base.mock'; -import { TokenAuthenticationProvider } from './token'; function expectAuthenticateCall( mockClusterClient: ReturnType, diff --git a/x-pack/plugins/security/server/authentication/providers/token.ts b/x-pack/plugins/security/server/authentication/providers/token.ts index d34704c53260b5..5132ffa7294c93 100644 --- a/x-pack/plugins/security/server/authentication/providers/token.ts +++ b/x-pack/plugins/security/server/authentication/providers/token.ts @@ -9,6 +9,7 @@ import Boom from '@hapi/boom'; import type { KibanaRequest } from '@kbn/core/server'; +import { BaseAuthenticationProvider } from './base'; import { NEXT_URL_QUERY_STRING_PARAMETER } from '../../../common/constants'; import type { AuthenticationInfo } from '../../elasticsearch'; import { getDetailedErrorMessage } from '../../errors'; @@ -18,7 +19,6 @@ import { DeauthenticationResult } from '../deauthentication_result'; import { HTTPAuthorizationHeader } from '../http_authentication'; import type { RefreshTokenResult, TokenPair } from '../tokens'; import { Tokens } from '../tokens'; -import { BaseAuthenticationProvider } from './base'; /** * Describes the parameters that are required by the provider to process the initial login request. diff --git a/x-pack/plugins/security/server/authentication/tokens.test.ts b/x-pack/plugins/security/server/authentication/tokens.test.ts index a5ebc432454a79..8269184a2dca84 100644 --- a/x-pack/plugins/security/server/authentication/tokens.test.ts +++ b/x-pack/plugins/security/server/authentication/tokens.test.ts @@ -9,9 +9,9 @@ import { errors } from '@elastic/elasticsearch'; import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; +import { Tokens } from './tokens'; import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; import { securityMock } from '../mocks'; -import { Tokens } from './tokens'; describe('Tokens', () => { let tokens: Tokens; diff --git a/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx b/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx index a03401f929e921..df26a7b802d4d7 100644 --- a/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx +++ b/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx @@ -10,8 +10,8 @@ import { EuiButton } from '@elastic/eui/lib/components/button'; import React from 'react'; import { renderToStaticMarkup } from 'react-dom/server'; -import type { CustomBranding } from '@kbn/core-custom-branding-common'; import type { IBasePath } from '@kbn/core/server'; +import type { CustomBranding } from '@kbn/core-custom-branding-common'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; diff --git a/x-pack/plugins/security/server/authorization/authorization_service.test.ts b/x-pack/plugins/security/server/authorization/authorization_service.test.ts index 01421c94c69743..0d1009bdd4b9e5 100644 --- a/x-pack/plugins/security/server/authorization/authorization_service.test.ts +++ b/x-pack/plugins/security/server/authorization/authorization_service.test.ts @@ -5,14 +5,7 @@ * 2.0. */ -import { Subject } from 'rxjs'; - -import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; -import { featuresPluginMock } from '@kbn/features-plugin/server/mocks'; -import { nextTick } from '@kbn/test-jest-helpers'; - // Note: this import must be before other relative imports for the mocks to work as intended. -// eslint-disable-next-line import/order import { mockAuthorizationModeFactory, mockCheckPrivilegesDynamicallyWithRequestFactory, @@ -22,14 +15,20 @@ import { mockRegisterPrivilegesWithCluster, } from './service.test.mocks'; -import { licenseMock } from '../../common/licensing/index.mock'; -import type { OnlineStatusRetryScheduler } from '../elasticsearch'; +import { Subject } from 'rxjs'; + +import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; +import { featuresPluginMock } from '@kbn/features-plugin/server/mocks'; +import { nextTick } from '@kbn/test-jest-helpers'; + import { AuthorizationService } from './authorization_service'; import { checkPrivilegesFactory } from './check_privileges'; import { checkPrivilegesDynamicallyWithRequestFactory } from './check_privileges_dynamically'; import { checkSavedObjectsPrivilegesWithRequestFactory } from './check_saved_objects_privileges'; import { authorizationModeFactory } from './mode'; import { privilegesFactory } from './privileges'; +import { licenseMock } from '../../common/licensing/index.mock'; +import type { OnlineStatusRetryScheduler } from '../elasticsearch'; const kibanaIndexName = '.a-kibana-index'; const application = `kibana-${kibanaIndexName}`; diff --git a/x-pack/plugins/security/server/authorization/authorization_service.tsx b/x-pack/plugins/security/server/authorization/authorization_service.tsx index 82412e7b76470e..6e0fda1fa3d8ea 100644 --- a/x-pack/plugins/security/server/authorization/authorization_service.tsx +++ b/x-pack/plugins/security/server/authorization/authorization_service.tsx @@ -25,12 +25,6 @@ import type { PluginStartContract as FeaturesPluginStart, } from '@kbn/features-plugin/server'; -import { APPLICATION_PREFIX } from '../../common/constants'; -import type { SecurityLicense } from '../../common/licensing'; -import type { AuthenticatedUser } from '../../common/model'; -import { canRedirectRequest } from '../authentication'; -import type { OnlineStatusRetryScheduler } from '../elasticsearch'; -import type { SpacesService } from '../plugin'; import { Actions } from './actions'; import { initAPIAuthorization } from './api_authorization'; import { initAppAuthorization } from './app_authorization'; @@ -49,6 +43,12 @@ import { ResetSessionPage } from './reset_session_page'; import type { CheckPrivilegesWithRequest, CheckUserProfilesPrivileges } from './types'; import { validateFeaturePrivileges } from './validate_feature_privileges'; import { validateReservedPrivileges } from './validate_reserved_privileges'; +import { APPLICATION_PREFIX } from '../../common/constants'; +import type { SecurityLicense } from '../../common/licensing'; +import type { AuthenticatedUser } from '../../common/model'; +import { canRedirectRequest } from '../authentication'; +import type { OnlineStatusRetryScheduler } from '../elasticsearch'; +import type { SpacesService } from '../plugin'; export { Actions } from './actions'; export type { CheckSavedObjectsPrivileges } from './check_saved_objects_privileges'; diff --git a/x-pack/plugins/security/server/authorization/check_privileges.test.ts b/x-pack/plugins/security/server/authorization/check_privileges.test.ts index e994dee8f1887b..e339645f76dfdb 100644 --- a/x-pack/plugins/security/server/authorization/check_privileges.test.ts +++ b/x-pack/plugins/security/server/authorization/check_privileges.test.ts @@ -9,9 +9,9 @@ import { uniq } from 'lodash'; import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks'; -import { GLOBAL_RESOURCE } from '../../common/constants'; import { checkPrivilegesFactory } from './check_privileges'; import type { HasPrivilegesResponse } from './types'; +import { GLOBAL_RESOURCE } from '../../common/constants'; const application = 'kibana-our_application'; diff --git a/x-pack/plugins/security/server/authorization/check_privileges.ts b/x-pack/plugins/security/server/authorization/check_privileges.ts index c0ec5f02ec193a..0e842da4e48511 100644 --- a/x-pack/plugins/security/server/authorization/check_privileges.ts +++ b/x-pack/plugins/security/server/authorization/check_privileges.ts @@ -10,7 +10,6 @@ import { pick, transform, uniq } from 'lodash'; import type { IClusterClient, KibanaRequest } from '@kbn/core/server'; -import { GLOBAL_RESOURCE } from '../../common/constants'; import { ResourceSerializer } from './resource_serializer'; import type { CheckPrivileges, @@ -24,6 +23,7 @@ import type { HasPrivilegesResponseApplication, } from './types'; import { validateEsPrivilegeResponse } from './validate_es_response'; +import { GLOBAL_RESOURCE } from '../../common/constants'; interface CheckPrivilegesActions { login: string; diff --git a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts index b5ff420b420e9a..22c2e53e9ab27e 100644 --- a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts +++ b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts @@ -7,13 +7,13 @@ import type { KibanaRequest } from '@kbn/core/server'; -import type { SpacesService } from '../plugin'; import type { CheckPrivilegesOptions, CheckPrivilegesPayload, CheckPrivilegesResponse, CheckPrivilegesWithRequest, } from './types'; +import type { SpacesService } from '../plugin'; export type CheckPrivilegesDynamically = ( privileges: CheckPrivilegesPayload, diff --git a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts index e2e988e7f53175..0afcd4118ab8b5 100644 --- a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts +++ b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts @@ -7,9 +7,9 @@ import { httpServerMock } from '@kbn/core/server/mocks'; -import type { SpacesService } from '../plugin'; import { checkSavedObjectsPrivilegesWithRequestFactory } from './check_saved_objects_privileges'; import type { CheckPrivileges, CheckPrivilegesWithRequest } from './types'; +import type { SpacesService } from '../plugin'; let mockCheckPrivileges: jest.Mocked; let mockCheckPrivilegesWithRequest: jest.Mocked; diff --git a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts index ca14802903c6d5..0afa29fab3c588 100644 --- a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts +++ b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts @@ -7,9 +7,9 @@ import type { KibanaRequest } from '@kbn/core/server'; +import type { CheckPrivilegesResponse, CheckPrivilegesWithRequest } from './types'; import { ALL_SPACES_ID } from '../../common/constants'; import type { SpacesService } from '../plugin'; -import type { CheckPrivilegesResponse, CheckPrivilegesWithRequest } from './types'; export type CheckSavedObjectsPrivilegesWithRequest = ( request: KibanaRequest diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts index a61a00f6c2c4eb..8f56ba95883b57 100644 --- a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts +++ b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts @@ -8,11 +8,11 @@ import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks'; import { ElasticsearchFeature, KibanaFeature } from '@kbn/features-plugin/server'; -import type { AuthenticatedUser } from '../../common/model'; import { Actions } from './actions'; import { disableUICapabilitiesFactory } from './disable_ui_capabilities'; import { authorizationMock } from './index.mock'; import type { CheckPrivilegesResponse } from './types'; +import type { AuthenticatedUser } from '../../common/model'; type MockAuthzOptions = | { rejectCheckPrivileges: any } diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts index 6023ea402ae561..e3cd51bc77015b 100644 --- a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts +++ b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts @@ -16,9 +16,9 @@ import type { } from '@kbn/features-plugin/server'; import type { RecursiveReadonly, RecursiveReadonlyArray } from '@kbn/utility-types'; -import type { AuthenticatedUser } from '../../common/model'; import type { AuthorizationServiceSetup } from './authorization_service'; import type { CheckPrivilegesResponse } from './types'; +import type { AuthenticatedUser } from '../../common/model'; export function disableUICapabilitiesFactory( request: KibanaRequest, diff --git a/x-pack/plugins/security/server/authorization/mode.test.ts b/x-pack/plugins/security/server/authorization/mode.test.ts index b0c73b1eda51da..2df3d9ab6b5b28 100644 --- a/x-pack/plugins/security/server/authorization/mode.test.ts +++ b/x-pack/plugins/security/server/authorization/mode.test.ts @@ -7,10 +7,10 @@ import { httpServerMock } from '@kbn/core/server/mocks'; +import { authorizationModeFactory } from './mode'; import type { SecurityLicense } from '../../common/licensing'; import { licenseMock } from '../../common/licensing/index.mock'; import type { SecurityLicenseFeatures } from '../../common/licensing/license_features'; -import { authorizationModeFactory } from './mode'; describe(`#useRbacForRequest`, () => { let mockLicense: jest.Mocked; diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts index bd689d5d469f3e..86689c03ab96b1 100644 --- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts +++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts @@ -8,8 +8,8 @@ import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server'; import { KibanaFeature } from '@kbn/features-plugin/server'; -import { Actions } from '../../actions'; import { FeaturePrivilegeAlertingBuilder } from './alerting'; +import { Actions } from '../../actions'; describe(`feature_privilege_builder`, () => { describe(`alerting`, () => { diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts index fd345f3455a443..d4d49a5334f1d1 100644 --- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts +++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts @@ -8,8 +8,8 @@ import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server'; import { KibanaFeature } from '@kbn/features-plugin/server'; -import { Actions } from '../../actions'; import { FeaturePrivilegeCasesBuilder } from './cases'; +import { Actions } from '../../actions'; describe(`cases`, () => { describe(`feature_privilege_builder`, () => { diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts index f6a80929dfd90e..11544832420ae2 100644 --- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts +++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts @@ -9,7 +9,6 @@ import { flatten } from 'lodash'; import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server'; -import type { Actions } from '../../actions'; import { FeaturePrivilegeAlertingBuilder } from './alerting'; import { FeaturePrivilegeApiBuilder } from './api'; import { FeaturePrivilegeAppBuilder } from './app'; @@ -20,6 +19,7 @@ import { FeaturePrivilegeManagementBuilder } from './management'; import { FeaturePrivilegeNavlinkBuilder } from './navlink'; import { FeaturePrivilegeSavedObjectBuilder } from './saved_object'; import { FeaturePrivilegeUIBuilder } from './ui'; +import type { Actions } from '../../actions'; export type { CasesSupportedOperations } from './cases'; export type { FeaturePrivilegeBuilder }; diff --git a/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts b/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts index 4cad968dabb353..2d8fe4b8f4c242 100644 --- a/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts +++ b/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts @@ -8,9 +8,9 @@ import { KibanaFeature } from '@kbn/features-plugin/server'; import { featuresPluginMock } from '@kbn/features-plugin/server/mocks'; +import { privilegesFactory } from './privileges'; import { licenseMock } from '../../../common/licensing/index.mock'; import { Actions } from '../actions'; -import { privilegesFactory } from './privileges'; const actions = new Actions(); diff --git a/x-pack/plugins/security/server/authorization/privileges/privileges.ts b/x-pack/plugins/security/server/authorization/privileges/privileges.ts index d0643a157f45fb..20de4011c39f42 100644 --- a/x-pack/plugins/security/server/authorization/privileges/privileges.ts +++ b/x-pack/plugins/security/server/authorization/privileges/privileges.ts @@ -12,10 +12,10 @@ import type { KibanaFeature, } from '@kbn/features-plugin/server'; +import { featurePrivilegeBuilderFactory } from './feature_privilege_builder'; import type { SecurityLicense } from '../../../common/licensing'; import type { RawKibanaPrivileges } from '../../../common/model'; import type { Actions } from '../actions'; -import { featurePrivilegeBuilderFactory } from './feature_privilege_builder'; export interface PrivilegesService { get(respectLicenseLevel?: boolean): RawKibanaPrivileges; diff --git a/x-pack/plugins/security/server/authorization/privileges_serializer.ts b/x-pack/plugins/security/server/authorization/privileges_serializer.ts index 58b5ee50dc8f13..8679dbefab4dfa 100644 --- a/x-pack/plugins/security/server/authorization/privileges_serializer.ts +++ b/x-pack/plugins/security/server/authorization/privileges_serializer.ts @@ -5,8 +5,8 @@ * 2.0. */ -import type { RawKibanaPrivileges } from '../../common/model'; import { PrivilegeSerializer } from './privilege_serializer'; +import type { RawKibanaPrivileges } from '../../common/model'; interface SerializedPrivilege { application: string; diff --git a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts index 4216500da2bd1e..89b556f416843e 100644 --- a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts +++ b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts @@ -10,8 +10,8 @@ import type { Logger } from '@kbn/core/server'; import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; -import type { RawKibanaPrivileges } from '../../common/model'; import { registerPrivilegesWithCluster } from './register_privileges_with_cluster'; +import type { RawKibanaPrivileges } from '../../common/model'; const application = 'default-application'; const registerPrivilegesWithClusterTest = ( diff --git a/x-pack/plugins/security/server/authorization/reset_session_page.tsx b/x-pack/plugins/security/server/authorization/reset_session_page.tsx index 61555d2b4dba51..30fafabe0ae432 100644 --- a/x-pack/plugins/security/server/authorization/reset_session_page.tsx +++ b/x-pack/plugins/security/server/authorization/reset_session_page.tsx @@ -9,8 +9,8 @@ import { EuiButton, EuiButtonEmpty } from '@elastic/eui/lib/components/button'; import React from 'react'; -import type { CustomBranding } from '@kbn/core-custom-branding-common'; import type { IBasePath } from '@kbn/core/server'; +import type { CustomBranding } from '@kbn/core-custom-branding-common'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; diff --git a/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts b/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts index 338e278e507689..c0b1c31a91aa96 100644 --- a/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts +++ b/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts @@ -16,9 +16,9 @@ import { savedObjectsClientMock, } from '@kbn/core/server/mocks'; +import { registerKibanaUserRoleDeprecation } from './kibana_user_role'; import { licenseMock } from '../../common/licensing/index.mock'; import { securityMock } from '../mocks'; -import { registerKibanaUserRoleDeprecation } from './kibana_user_role'; function getDepsMock() { return { diff --git a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts index 0dc25164eb1bc3..1d9985fbc86505 100644 --- a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts +++ b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts @@ -12,9 +12,9 @@ import { ServiceStatusLevels } from '@kbn/core/server'; import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks'; import { nextTick } from '@kbn/test-jest-helpers'; +import { ElasticsearchService } from './elasticsearch_service'; import type { SecurityLicense, SecurityLicenseFeatures } from '../../common/licensing'; import { licenseMock } from '../../common/licensing/index.mock'; -import { ElasticsearchService } from './elasticsearch_service'; describe('ElasticsearchService', () => { let service: ElasticsearchService; diff --git a/x-pack/plugins/security/server/lib/role_utils.test.ts b/x-pack/plugins/security/server/lib/role_utils.test.ts index 6c04b6121c2d1f..ec808f231808d6 100644 --- a/x-pack/plugins/security/server/lib/role_utils.test.ts +++ b/x-pack/plugins/security/server/lib/role_utils.test.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { ALL_SPACES_ID } from '../../common/constants'; import { transformPrivilegesToElasticsearchPrivileges } from './role_utils'; +import { ALL_SPACES_ID } from '../../common/constants'; describe('transformPrivilegesToElasticsearchPrivileges', () => { test('returns expected result', () => { diff --git a/x-pack/plugins/security/server/lib/role_utils.ts b/x-pack/plugins/security/server/lib/role_utils.ts index 3ec3247bf61a78..ff7a6902934434 100644 --- a/x-pack/plugins/security/server/lib/role_utils.ts +++ b/x-pack/plugins/security/server/lib/role_utils.ts @@ -7,10 +7,10 @@ import type { KibanaFeature } from '@kbn/features-plugin/server'; +import type { KibanaPrivilegesType } from './role_schema'; import { ALL_SPACES_ID, GLOBAL_RESOURCE } from '../../common/constants'; import { PrivilegeSerializer } from '../authorization/privilege_serializer'; import { ResourceSerializer } from '../authorization/resource_serializer'; -import type { KibanaPrivilegesType } from './role_schema'; export const transformPrivilegesToElasticsearchPrivileges = ( application: string, diff --git a/x-pack/plugins/security/server/mocks.ts b/x-pack/plugins/security/server/mocks.ts index 9b6c6c4b8cbdc9..ba0dbaafeef3bb 100644 --- a/x-pack/plugins/security/server/mocks.ts +++ b/x-pack/plugins/security/server/mocks.ts @@ -7,13 +7,13 @@ import type { TransportResult } from '@elastic/elasticsearch'; -import { licenseMock } from '../common/licensing/index.mock'; -import type { MockAuthenticatedUserProps } from '../common/model/authenticated_user.mock'; -import { mockAuthenticatedUser } from '../common/model/authenticated_user.mock'; import { auditServiceMock } from './audit/mocks'; import { authenticationServiceMock } from './authentication/authentication_service.mock'; import { authorizationMock } from './authorization/index.mock'; import { userProfileServiceMock } from './user_profile/user_profile_service.mock'; +import { licenseMock } from '../common/licensing/index.mock'; +import { mockAuthenticatedUser } from '../common/model/authenticated_user.mock'; +import type { MockAuthenticatedUserProps } from '../common/model/authenticated_user.mock'; function createSetupMock() { const mockAuthz = authorizationMock.create(); diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts index e3f38699c06510..a022fdd418e6e4 100644 --- a/x-pack/plugins/security/server/plugin.ts +++ b/x-pack/plugins/security/server/plugin.ts @@ -30,8 +30,6 @@ import type { } from '@kbn/task-manager-plugin/server'; import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server'; -import type { AuthenticatedUser, PrivilegeDeprecationsService, SecurityLicense } from '../common'; -import { SecurityLicenseService } from '../common/licensing'; import { AnalyticsService } from './analytics'; import type { AnonymousAccessServiceStart } from './anonymous_access'; import { AnonymousAccessService } from './anonymous_access'; @@ -62,6 +60,8 @@ import type { UserProfileServiceStart, UserProfileServiceStartInternal } from '. import { UserProfileSettingsClient } from './user_profile/user_profile_settings_client'; import type { UserSettingServiceStart } from './user_profile/user_setting_service'; import { UserSettingService } from './user_profile/user_setting_service'; +import type { AuthenticatedUser, PrivilegeDeprecationsService, SecurityLicense } from '../common'; +import { SecurityLicenseService } from '../common/licensing'; export type SpacesService = Pick< SpacesPluginSetup['spacesService'], diff --git a/x-pack/plugins/security/server/prompt_page.tsx b/x-pack/plugins/security/server/prompt_page.tsx index 88293e6d033778..31c1f057942de4 100644 --- a/x-pack/plugins/security/server/prompt_page.tsx +++ b/x-pack/plugins/security/server/prompt_page.tsx @@ -22,9 +22,9 @@ import type { ReactNode } from 'react'; import React from 'react'; import { renderToString } from 'react-dom/server'; +import type { IBasePath } from '@kbn/core/server'; import type { CustomBranding } from '@kbn/core-custom-branding-common'; import { Fonts } from '@kbn/core-rendering-server-internal'; -import type { IBasePath } from '@kbn/core/server'; import { i18n } from '@kbn/i18n'; import { I18nProvider } from '@kbn/i18n-react'; import UiSharedDepsNpm from '@kbn/ui-shared-deps-npm'; diff --git a/x-pack/plugins/security/server/routes/analytics/authentication_type.test.ts b/x-pack/plugins/security/server/routes/analytics/authentication_type.test.ts index df201afced9b63..afbab0d2bfbd45 100644 --- a/x-pack/plugins/security/server/routes/analytics/authentication_type.test.ts +++ b/x-pack/plugins/security/server/routes/analytics/authentication_type.test.ts @@ -10,13 +10,13 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineRecordAnalyticsOnAuthTypeRoutes } from './authentication_type'; import type { RouteDefinitionParams } from '..'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { HTTPAuthenticationProvider, TokenAuthenticationProvider } from '../../authentication'; import { authenticationServiceMock } from '../../authentication/authentication_service.mock'; import type { SecurityRequestHandlerContext } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineRecordAnalyticsOnAuthTypeRoutes } from './authentication_type'; const FAKE_TIMESTAMP = 1637665318135; diff --git a/x-pack/plugins/security/server/routes/analytics/index.ts b/x-pack/plugins/security/server/routes/analytics/index.ts index c84ff1c5d2ccd0..a8152117a28739 100644 --- a/x-pack/plugins/security/server/routes/analytics/index.ts +++ b/x-pack/plugins/security/server/routes/analytics/index.ts @@ -5,8 +5,8 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineRecordAnalyticsOnAuthTypeRoutes } from './authentication_type'; +import type { RouteDefinitionParams } from '..'; export function defineAnalyticsRoutes(params: RouteDefinitionParams) { defineRecordAnalyticsOnAuthTypeRoutes(params); diff --git a/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts b/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts index 3a794c9ac5f368..b0518086f97d96 100644 --- a/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts +++ b/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts @@ -8,8 +8,8 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; -import { routeDefinitionParamsMock, securityRequestHandlerContextMock } from '../index.mock'; import { defineAnonymousAccessGetCapabilitiesRoutes } from './get_capabilities'; +import { routeDefinitionParamsMock, securityRequestHandlerContextMock } from '../index.mock'; describe('GET /internal/security/anonymous_access/capabilities', () => { it('returns anonymous access state', async () => { diff --git a/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts b/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts index 85cc04cf63e70d..00c07fe6ad0d74 100644 --- a/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts +++ b/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts @@ -8,9 +8,9 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; +import { defineAnonymousAccessGetStateRoutes } from './get_state'; import type { AnonymousAccessServiceStart } from '../../anonymous_access'; import { routeDefinitionParamsMock, securityRequestHandlerContextMock } from '../index.mock'; -import { defineAnonymousAccessGetStateRoutes } from './get_state'; describe('GET /internal/security/anonymous_access/state', () => { function doMockAndTest(accessURLParameters: AnonymousAccessServiceStart['accessURLParameters']) { diff --git a/x-pack/plugins/security/server/routes/anonymous_access/index.ts b/x-pack/plugins/security/server/routes/anonymous_access/index.ts index c634d721c33542..a075d8bb66403b 100644 --- a/x-pack/plugins/security/server/routes/anonymous_access/index.ts +++ b/x-pack/plugins/security/server/routes/anonymous_access/index.ts @@ -5,9 +5,9 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineAnonymousAccessGetCapabilitiesRoutes } from './get_capabilities'; import { defineAnonymousAccessGetStateRoutes } from './get_state'; +import type { RouteDefinitionParams } from '..'; export function defineAnonymousAccessRoutes(params: RouteDefinitionParams) { defineAnonymousAccessGetCapabilitiesRoutes(params); diff --git a/x-pack/plugins/security/server/routes/api_keys/create.test.ts b/x-pack/plugins/security/server/routes/api_keys/create.test.ts index 27167f945aaa10..39ecb39a399606 100644 --- a/x-pack/plugins/security/server/routes/api_keys/create.test.ts +++ b/x-pack/plugins/security/server/routes/api_keys/create.test.ts @@ -12,10 +12,10 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineCreateApiKeyRoutes } from './create'; import type { InternalAuthenticationServiceStart } from '../../authentication'; import { authenticationServiceMock } from '../../authentication/authentication_service.mock'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineCreateApiKeyRoutes } from './create'; describe('Create API Key route', () => { function getMockContext( diff --git a/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts b/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts index b123c5cc0be804..6870dc6b9464aa 100644 --- a/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts +++ b/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts @@ -12,10 +12,10 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineEnabledApiKeysRoutes } from './enabled'; import type { InternalAuthenticationServiceStart } from '../../authentication'; import { authenticationServiceMock } from '../../authentication/authentication_service.mock'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineEnabledApiKeysRoutes } from './enabled'; describe('API keys enabled', () => { function getMockContext( diff --git a/x-pack/plugins/security/server/routes/api_keys/get.test.ts b/x-pack/plugins/security/server/routes/api_keys/get.test.ts index 40257dc2171c5b..3e5d18312b79b0 100644 --- a/x-pack/plugins/security/server/routes/api_keys/get.test.ts +++ b/x-pack/plugins/security/server/routes/api_keys/get.test.ts @@ -13,10 +13,10 @@ import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import { licensingMock } from '@kbn/licensing-plugin/server/mocks'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineGetApiKeysRoutes } from './get'; import type { InternalAuthenticationServiceStart } from '../../authentication'; import { authenticationServiceMock } from '../../authentication/authentication_service.mock'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineGetApiKeysRoutes } from './get'; describe('Get API Keys route', () => { let routeHandler: RequestHandler; diff --git a/x-pack/plugins/security/server/routes/api_keys/index.ts b/x-pack/plugins/security/server/routes/api_keys/index.ts index 15c8e149470d0e..9f086afcfd248c 100644 --- a/x-pack/plugins/security/server/routes/api_keys/index.ts +++ b/x-pack/plugins/security/server/routes/api_keys/index.ts @@ -5,12 +5,12 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineCreateApiKeyRoutes } from './create'; import { defineEnabledApiKeysRoutes } from './enabled'; import { defineGetApiKeysRoutes } from './get'; import { defineInvalidateApiKeysRoutes } from './invalidate'; import { defineUpdateApiKeyRoutes } from './update'; +import type { RouteDefinitionParams } from '..'; export type { CreateAPIKeyParams, diff --git a/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts b/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts index c6f4594e8fb3c8..16f39383997e90 100644 --- a/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts +++ b/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts @@ -12,8 +12,8 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { LicenseCheck } from '@kbn/licensing-plugin/server'; -import { routeDefinitionParamsMock } from '../index.mock'; import { defineInvalidateApiKeysRoutes } from './invalidate'; +import { routeDefinitionParamsMock } from '../index.mock'; interface TestOptions { licenseCheckResult?: LicenseCheck; diff --git a/x-pack/plugins/security/server/routes/api_keys/update.test.ts b/x-pack/plugins/security/server/routes/api_keys/update.test.ts index b00f8cfdfb2112..40cbf6da9e058a 100644 --- a/x-pack/plugins/security/server/routes/api_keys/update.test.ts +++ b/x-pack/plugins/security/server/routes/api_keys/update.test.ts @@ -12,10 +12,10 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineUpdateApiKeyRoutes } from './update'; import type { InternalAuthenticationServiceStart } from '../../authentication'; import { authenticationServiceMock } from '../../authentication/authentication_service.mock'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineUpdateApiKeyRoutes } from './update'; describe('Update API Key route', () => { function getMockContext( diff --git a/x-pack/plugins/security/server/routes/authentication/common.test.ts b/x-pack/plugins/security/server/routes/authentication/common.test.ts index d5e04f76149998..44b56b73b220de 100644 --- a/x-pack/plugins/security/server/routes/authentication/common.test.ts +++ b/x-pack/plugins/security/server/routes/authentication/common.test.ts @@ -11,6 +11,7 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineCommonRoutes } from './common'; import type { SecurityLicense, SecurityLicenseFeatures } from '../../../common/licensing'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import type { InternalAuthenticationServiceStart } from '../../authentication'; @@ -24,7 +25,6 @@ import { authenticationServiceMock } from '../../authentication/authentication_s import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; import { ROUTE_TAG_AUTH_FLOW, ROUTE_TAG_CAN_REDIRECT } from '../tags'; -import { defineCommonRoutes } from './common'; describe('Common authentication routes', () => { let router: jest.Mocked; diff --git a/x-pack/plugins/security/server/routes/authentication/index.ts b/x-pack/plugins/security/server/routes/authentication/index.ts index e7051f9ad67bd8..d9d5604940b3a6 100644 --- a/x-pack/plugins/security/server/routes/authentication/index.ts +++ b/x-pack/plugins/security/server/routes/authentication/index.ts @@ -5,10 +5,10 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineCommonRoutes } from './common'; import { defineOIDCRoutes } from './oidc'; import { defineSAMLRoutes } from './saml'; +import type { RouteDefinitionParams } from '..'; export function defineAuthenticationRoutes(params: RouteDefinitionParams) { defineCommonRoutes(params); diff --git a/x-pack/plugins/security/server/routes/authentication/saml.test.ts b/x-pack/plugins/security/server/routes/authentication/saml.test.ts index 30b9bb5160b2b1..e952d98a386490 100644 --- a/x-pack/plugins/security/server/routes/authentication/saml.test.ts +++ b/x-pack/plugins/security/server/routes/authentication/saml.test.ts @@ -10,6 +10,7 @@ import type { RequestHandler, RouteConfig } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineSAMLRoutes } from './saml'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import type { InternalAuthenticationServiceStart } from '../../authentication'; import { AuthenticationResult, SAMLLogin } from '../../authentication'; @@ -17,7 +18,6 @@ import { authenticationServiceMock } from '../../authentication/authentication_s import type { SecurityRouter } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; import { ROUTE_TAG_AUTH_FLOW, ROUTE_TAG_CAN_REDIRECT } from '../tags'; -import { defineSAMLRoutes } from './saml'; describe('SAML authentication routes', () => { let router: jest.Mocked; diff --git a/x-pack/plugins/security/server/routes/authorization/index.ts b/x-pack/plugins/security/server/routes/authorization/index.ts index c2d2b3cdf8eaf1..b3b29e950d7214 100644 --- a/x-pack/plugins/security/server/routes/authorization/index.ts +++ b/x-pack/plugins/security/server/routes/authorization/index.ts @@ -5,11 +5,11 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { definePrivilegesRoutes } from './privileges'; import { resetSessionPageRoutes } from './reset_session_page'; import { defineRolesRoutes } from './roles'; import { defineShareSavedObjectPermissionRoutes } from './spaces'; +import type { RouteDefinitionParams } from '..'; export function defineAuthorizationRoutes(params: RouteDefinitionParams) { defineRolesRoutes(params); diff --git a/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts b/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts index fca0a0e4388f4e..18315bb9caf8fa 100644 --- a/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts @@ -9,10 +9,10 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { LicenseCheck } from '@kbn/licensing-plugin/server'; +import { defineGetPrivilegesRoutes } from './get'; import type { RawKibanaPrivileges } from '../../../../common/model'; import type { SecurityRequestHandlerContext } from '../../../types'; import { routeDefinitionParamsMock } from '../../index.mock'; -import { defineGetPrivilegesRoutes } from './get'; const createRawKibanaPrivileges: () => RawKibanaPrivileges = () => { return { diff --git a/x-pack/plugins/security/server/routes/authorization/privileges/index.ts b/x-pack/plugins/security/server/routes/authorization/privileges/index.ts index 572a7a2584dccc..0cc3d1dc4dd479 100644 --- a/x-pack/plugins/security/server/routes/authorization/privileges/index.ts +++ b/x-pack/plugins/security/server/routes/authorization/privileges/index.ts @@ -5,9 +5,9 @@ * 2.0. */ -import type { RouteDefinitionParams } from '../..'; import { defineGetPrivilegesRoutes } from './get'; import { defineGetBuiltinPrivilegesRoutes } from './get_builtin'; +import type { RouteDefinitionParams } from '../..'; export function definePrivilegesRoutes(params: RouteDefinitionParams) { defineGetPrivilegesRoutes(params); diff --git a/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts index dfe2af12a23e40..223949843fee57 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts @@ -11,8 +11,8 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { LicenseCheck } from '@kbn/licensing-plugin/server'; -import { routeDefinitionParamsMock } from '../../index.mock'; import { defineDeleteRolesRoutes } from './delete'; +import { routeDefinitionParamsMock } from '../../index.mock'; interface TestOptions { licenseCheckResult?: LicenseCheck; diff --git a/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts index 90457c71b90a7d..ab938ac24d30e9 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts @@ -11,8 +11,8 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { LicenseCheck } from '@kbn/licensing-plugin/server'; -import { routeDefinitionParamsMock } from '../../index.mock'; import { defineGetRolesRoutes } from './get'; +import { routeDefinitionParamsMock } from '../../index.mock'; const application = 'kibana-.kibana'; const reservedPrivilegesApplicationWildcard = 'kibana-*'; diff --git a/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts index a7833f803afa1e..3823b34f9c1536 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts @@ -11,8 +11,8 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { LicenseCheck } from '@kbn/licensing-plugin/server'; -import { routeDefinitionParamsMock } from '../../index.mock'; import { defineGetAllRolesRoutes } from './get_all'; +import { routeDefinitionParamsMock } from '../../index.mock'; const application = 'kibana-.kibana'; const reservedPrivilegesApplicationWildcard = 'kibana-*'; diff --git a/x-pack/plugins/security/server/routes/authorization/roles/index.ts b/x-pack/plugins/security/server/routes/authorization/roles/index.ts index e3ea1a3889b1ff..257d5e303a4a37 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/index.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/index.ts @@ -5,11 +5,11 @@ * 2.0. */ -import type { RouteDefinitionParams } from '../..'; import { defineDeleteRolesRoutes } from './delete'; import { defineGetRolesRoutes } from './get'; import { defineGetAllRolesRoutes } from './get_all'; import { definePutRolesRoutes } from './put'; +import type { RouteDefinitionParams } from '../..'; export function defineRolesRoutes(params: RouteDefinitionParams) { defineGetRolesRoutes(params); diff --git a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts index 9dd2deb876c611..717170567a550a 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts @@ -7,9 +7,9 @@ import { KibanaFeature } from '@kbn/features-plugin/common'; +import { getPutPayloadSchema } from './put_payload'; import { ALL_SPACES_ID } from '../../../../../common/constants'; import { validateKibanaPrivileges } from '../../../../lib'; -import { getPutPayloadSchema } from './put_payload'; const basePrivilegeNamesMap = { global: ['all', 'read'], diff --git a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts index 6adbe8975b0a99..77e3bd51b5e80f 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts @@ -11,10 +11,10 @@ import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import { KibanaFeature } from '@kbn/features-plugin/server'; import type { LicenseCheck } from '@kbn/licensing-plugin/server'; +import { definePutRolesRoutes } from './put'; import { GLOBAL_RESOURCE } from '../../../../common/constants'; import { securityFeatureUsageServiceMock } from '../../../feature_usage/index.mock'; import { routeDefinitionParamsMock } from '../../index.mock'; -import { definePutRolesRoutes } from './put'; const application = 'kibana-.kibana'; const privilegeMap = { diff --git a/x-pack/plugins/security/server/routes/authorization/roles/put.ts b/x-pack/plugins/security/server/routes/authorization/roles/put.ts index bc2df19cf261d3..b05b9a438c6817 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/put.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/put.ts @@ -8,12 +8,12 @@ import { schema } from '@kbn/config-schema'; import type { KibanaFeature } from '@kbn/features-plugin/common'; +import type { RolePayloadSchemaType } from './model'; +import { getPutPayloadSchema, transformPutPayloadToElasticsearchRole } from './model'; import type { RouteDefinitionParams } from '../..'; import { wrapIntoCustomErrorResponse } from '../../../errors'; import { validateKibanaPrivileges } from '../../../lib'; import { createLicensedRouteHandler } from '../../licensed_route_handler'; -import type { RolePayloadSchemaType } from './model'; -import { getPutPayloadSchema, transformPutPayloadToElasticsearchRole } from './model'; const roleGrantsSubFeaturePrivileges = (features: KibanaFeature[], role: RolePayloadSchemaType) => { if (!role.kibana) { diff --git a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts index a8fa3888efeb95..8329be6a91862a 100644 --- a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts @@ -10,11 +10,11 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineShareSavedObjectPermissionRoutes } from './share_saved_object_permissions'; import type { RouteDefinitionParams } from '../..'; import type { CheckPrivileges } from '../../../authorization/types'; import type { SecurityRequestHandlerContext, SecurityRouter } from '../../../types'; import { routeDefinitionParamsMock } from '../../index.mock'; -import { defineShareSavedObjectPermissionRoutes } from './share_saved_object_permissions'; describe('Share Saved Object Permissions', () => { let router: jest.Mocked; diff --git a/x-pack/plugins/security/server/routes/deprecations/index.ts b/x-pack/plugins/security/server/routes/deprecations/index.ts index 46c681052efb08..4b9b5941ed6599 100644 --- a/x-pack/plugins/security/server/routes/deprecations/index.ts +++ b/x-pack/plugins/security/server/routes/deprecations/index.ts @@ -5,8 +5,8 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineKibanaUserRoleDeprecationRoutes } from './kibana_user_role'; +import type { RouteDefinitionParams } from '..'; export function defineDeprecationsRoutes(params: RouteDefinitionParams) { defineKibanaUserRoleDeprecationRoutes(params); diff --git a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts index 4cb5e8ffbf93d8..211598e7065546 100644 --- a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts +++ b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts @@ -13,10 +13,10 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineKibanaUserRoleDeprecationRoutes } from './kibana_user_role'; import { securityMock } from '../../mocks'; import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineKibanaUserRoleDeprecationRoutes } from './kibana_user_role'; function createMockUser(user: Partial = {}) { return { enabled: true, username: 'userA', roles: ['roleA'], metadata: {}, ...user }; diff --git a/x-pack/plugins/security/server/routes/index.ts b/x-pack/plugins/security/server/routes/index.ts index 6c39f060944331..ba33ca319cd205 100644 --- a/x-pack/plugins/security/server/routes/index.ts +++ b/x-pack/plugins/security/server/routes/index.ts @@ -11,16 +11,6 @@ import type { HttpResources, IBasePath, Logger } from '@kbn/core/server'; import type { KibanaFeature } from '@kbn/features-plugin/server'; import type { PublicMethodsOf } from '@kbn/utility-types'; -import type { SecurityLicense } from '../../common'; -import type { AnalyticsServiceSetup } from '../analytics'; -import type { AnonymousAccessServiceStart } from '../anonymous_access'; -import type { InternalAuthenticationServiceStart } from '../authentication'; -import type { AuthorizationServiceSetupInternal } from '../authorization'; -import type { ConfigType } from '../config'; -import type { SecurityFeatureUsageServiceStart } from '../feature_usage'; -import type { Session } from '../session_management'; -import type { SecurityRouter } from '../types'; -import type { UserProfileServiceStartInternal } from '../user_profile'; import { defineAnalyticsRoutes } from './analytics'; import { defineAnonymousAccessRoutes } from './anonymous_access'; import { defineApiKeysRoutes } from './api_keys'; @@ -34,6 +24,16 @@ import { defineSessionManagementRoutes } from './session_management'; import { defineUserProfileRoutes } from './user_profile'; import { defineUsersRoutes } from './users'; import { defineViewRoutes } from './views'; +import type { SecurityLicense } from '../../common'; +import type { AnalyticsServiceSetup } from '../analytics'; +import type { AnonymousAccessServiceStart } from '../anonymous_access'; +import type { InternalAuthenticationServiceStart } from '../authentication'; +import type { AuthorizationServiceSetupInternal } from '../authorization'; +import type { ConfigType } from '../config'; +import type { SecurityFeatureUsageServiceStart } from '../feature_usage'; +import type { Session } from '../session_management'; +import type { SecurityRouter } from '../types'; +import type { UserProfileServiceStartInternal } from '../user_profile'; /** * Describes parameters used to define HTTP routes. diff --git a/x-pack/plugins/security/server/routes/indices/get_fields.test.ts b/x-pack/plugins/security/server/routes/indices/get_fields.test.ts index 5396a16763f8da..8f4f28bcb32dd8 100644 --- a/x-pack/plugins/security/server/routes/indices/get_fields.test.ts +++ b/x-pack/plugins/security/server/routes/indices/get_fields.test.ts @@ -8,8 +8,8 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; -import { routeDefinitionParamsMock } from '../index.mock'; import { defineGetFieldsRoutes } from './get_fields'; +import { routeDefinitionParamsMock } from '../index.mock'; const createFieldMapping = (field: string, type: string) => ({ [field]: { mapping: { [field]: { type } } }, diff --git a/x-pack/plugins/security/server/routes/indices/index.ts b/x-pack/plugins/security/server/routes/indices/index.ts index 4e8475b1c3b127..343b9a07aeb8fb 100644 --- a/x-pack/plugins/security/server/routes/indices/index.ts +++ b/x-pack/plugins/security/server/routes/indices/index.ts @@ -5,8 +5,8 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineGetFieldsRoutes } from './get_fields'; +import type { RouteDefinitionParams } from '..'; export function defineIndicesRoutes(params: RouteDefinitionParams) { defineGetFieldsRoutes(params); diff --git a/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts b/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts index 63e0d602cf1224..fae211e2f44f6e 100644 --- a/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts +++ b/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts @@ -8,8 +8,8 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; -import { routeDefinitionParamsMock } from '../index.mock'; import { defineRoleMappingDeleteRoutes } from './delete'; +import { routeDefinitionParamsMock } from '../index.mock'; describe('DELETE role mappings', () => { it('allows a role mapping to be deleted', async () => { diff --git a/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts b/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts index ce0a38ef730392..d18fd1ff1d314d 100644 --- a/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts +++ b/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts @@ -9,8 +9,8 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { LicenseCheck } from '@kbn/licensing-plugin/server'; -import { routeDefinitionParamsMock } from '../index.mock'; import { defineRoleMappingFeatureCheckRoute } from './feature_check'; +import { routeDefinitionParamsMock } from '../index.mock'; interface TestOptions { licenseCheckResult?: LicenseCheck; diff --git a/x-pack/plugins/security/server/routes/role_mapping/get.test.ts b/x-pack/plugins/security/server/routes/role_mapping/get.test.ts index 564f93d302353e..875377a87181db 100644 --- a/x-pack/plugins/security/server/routes/role_mapping/get.test.ts +++ b/x-pack/plugins/security/server/routes/role_mapping/get.test.ts @@ -10,8 +10,8 @@ import Boom from '@hapi/boom'; import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; -import { routeDefinitionParamsMock } from '../index.mock'; import { defineRoleMappingGetRoutes } from './get'; +import { routeDefinitionParamsMock } from '../index.mock'; const mockRoleMappingResponse = { mapping1: { diff --git a/x-pack/plugins/security/server/routes/role_mapping/index.ts b/x-pack/plugins/security/server/routes/role_mapping/index.ts index 3b9eca33a66f48..49ad928c0b7e47 100644 --- a/x-pack/plugins/security/server/routes/role_mapping/index.ts +++ b/x-pack/plugins/security/server/routes/role_mapping/index.ts @@ -5,11 +5,11 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineRoleMappingDeleteRoutes } from './delete'; import { defineRoleMappingFeatureCheckRoute } from './feature_check'; import { defineRoleMappingGetRoutes } from './get'; import { defineRoleMappingPostRoutes } from './post'; +import type { RouteDefinitionParams } from '..'; export function defineRoleMappingRoutes(params: RouteDefinitionParams) { defineRoleMappingFeatureCheckRoute(params); diff --git a/x-pack/plugins/security/server/routes/role_mapping/post.test.ts b/x-pack/plugins/security/server/routes/role_mapping/post.test.ts index a6acc866b2d073..cc4d643d7862c9 100644 --- a/x-pack/plugins/security/server/routes/role_mapping/post.test.ts +++ b/x-pack/plugins/security/server/routes/role_mapping/post.test.ts @@ -8,8 +8,8 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; -import { routeDefinitionParamsMock } from '../index.mock'; import { defineRoleMappingPostRoutes } from './post'; +import { routeDefinitionParamsMock } from '../index.mock'; describe('POST role mappings', () => { it('allows a role mapping to be created', async () => { diff --git a/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts b/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts index 152c06b83dd1f3..c40f0b92b54a2e 100644 --- a/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts +++ b/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts @@ -14,10 +14,10 @@ import { BehaviorSubject } from 'rxjs'; import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; +import { defineSecurityCheckupGetStateRoutes } from './get_state'; import type { SecurityLicenseFeatures } from '../../../common/licensing'; import { licenseMock } from '../../../common/licensing/index.mock'; import { routeDefinitionParamsMock, securityRequestHandlerContextMock } from '../index.mock'; -import { defineSecurityCheckupGetStateRoutes } from './get_state'; interface SetupParams { showInsecureClusterWarning: boolean; diff --git a/x-pack/plugins/security/server/routes/session_management/extend.test.ts b/x-pack/plugins/security/server/routes/session_management/extend.test.ts index 428621316ec183..06a60e3c189681 100644 --- a/x-pack/plugins/security/server/routes/session_management/extend.test.ts +++ b/x-pack/plugins/security/server/routes/session_management/extend.test.ts @@ -9,9 +9,9 @@ import type { RequestHandler, RouteConfig } from '@kbn/core/server'; import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; +import { defineSessionExtendRoutes } from './extend'; import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineSessionExtendRoutes } from './extend'; describe('Extend session routes', () => { let router: jest.Mocked; diff --git a/x-pack/plugins/security/server/routes/session_management/index.ts b/x-pack/plugins/security/server/routes/session_management/index.ts index 0ac63704ea3b33..041feea8a62fd2 100644 --- a/x-pack/plugins/security/server/routes/session_management/index.ts +++ b/x-pack/plugins/security/server/routes/session_management/index.ts @@ -5,10 +5,10 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineSessionExtendRoutes } from './extend'; import { defineSessionInfoRoutes } from './info'; import { defineInvalidateSessionsRoutes } from './invalidate'; +import type { RouteDefinitionParams } from '..'; export function defineSessionManagementRoutes(params: RouteDefinitionParams) { defineSessionInfoRoutes(params); diff --git a/x-pack/plugins/security/server/routes/session_management/info.test.ts b/x-pack/plugins/security/server/routes/session_management/info.test.ts index 30919f96beeea2..81a3431f93e266 100644 --- a/x-pack/plugins/security/server/routes/session_management/info.test.ts +++ b/x-pack/plugins/security/server/routes/session_management/info.test.ts @@ -10,12 +10,12 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { defineSessionInfoRoutes } from './info'; import { SESSION_EXPIRATION_WARNING_MS } from '../../../common/constants'; import type { Session } from '../../session_management'; import { sessionMock } from '../../session_management/session.mock'; import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineSessionInfoRoutes } from './info'; describe('Info session routes', () => { let router: jest.Mocked; diff --git a/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts b/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts index c0bb04fc3bad95..0ea0b04149ab91 100644 --- a/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts +++ b/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts @@ -11,11 +11,11 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { defineInvalidateSessionsRoutes } from './invalidate'; import type { Session } from '../../session_management'; import { sessionMock } from '../../session_management/session.mock'; import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineInvalidateSessionsRoutes } from './invalidate'; describe('Invalidate sessions routes', () => { let router: jest.Mocked; diff --git a/x-pack/plugins/security/server/routes/user_profile/bulk_get.test.ts b/x-pack/plugins/security/server/routes/user_profile/bulk_get.test.ts index 6bd2e2b85e9972..f5d449bd8423dc 100644 --- a/x-pack/plugins/security/server/routes/user_profile/bulk_get.test.ts +++ b/x-pack/plugins/security/server/routes/user_profile/bulk_get.test.ts @@ -10,12 +10,12 @@ import type { RequestHandler, RouteConfig } from '@kbn/core/server'; import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; +import { defineBulkGetUserProfilesRoute } from './bulk_get'; import { userProfileMock } from '../../../common/model/user_profile.mock'; import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types'; import type { UserProfileServiceStartInternal } from '../../user_profile'; import { userProfileServiceMock } from '../../user_profile/user_profile_service.mock'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineBulkGetUserProfilesRoute } from './bulk_get'; function getMockContext() { return { diff --git a/x-pack/plugins/security/server/routes/user_profile/get_current.test.ts b/x-pack/plugins/security/server/routes/user_profile/get_current.test.ts index 8816f7b50828cf..aad0e201e996bc 100644 --- a/x-pack/plugins/security/server/routes/user_profile/get_current.test.ts +++ b/x-pack/plugins/security/server/routes/user_profile/get_current.test.ts @@ -10,6 +10,7 @@ import type { RequestHandler, RouteConfig } from '@kbn/core/server'; import { kibanaResponseFactory } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; +import { defineGetCurrentUserProfileRoute } from './get_current'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { userProfileMock } from '../../../common/model/user_profile.mock'; import { authenticationServiceMock } from '../../authentication/authentication_service.mock'; @@ -17,7 +18,6 @@ import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types' import type { UserProfileServiceStartInternal } from '../../user_profile'; import { userProfileServiceMock } from '../../user_profile/user_profile_service.mock'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineGetCurrentUserProfileRoute } from './get_current'; function getMockContext() { return { diff --git a/x-pack/plugins/security/server/routes/user_profile/index.ts b/x-pack/plugins/security/server/routes/user_profile/index.ts index e87c80a6d33593..b553e5c575fbdf 100644 --- a/x-pack/plugins/security/server/routes/user_profile/index.ts +++ b/x-pack/plugins/security/server/routes/user_profile/index.ts @@ -5,10 +5,10 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineBulkGetUserProfilesRoute } from './bulk_get'; import { defineGetCurrentUserProfileRoute } from './get_current'; import { defineUpdateUserProfileDataRoute } from './update'; +import type { RouteDefinitionParams } from '..'; export function defineUserProfileRoutes(params: RouteDefinitionParams) { defineUpdateUserProfileDataRoute(params); diff --git a/x-pack/plugins/security/server/routes/user_profile/update.test.ts b/x-pack/plugins/security/server/routes/user_profile/update.test.ts index 9165ee154cb781..819229b5ad8fd5 100644 --- a/x-pack/plugins/security/server/routes/user_profile/update.test.ts +++ b/x-pack/plugins/security/server/routes/user_profile/update.test.ts @@ -12,6 +12,7 @@ import { httpServerMock } from '@kbn/core/server/mocks'; import type { PublicMethodsOf } from '@kbn/utility-types'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineUpdateUserProfileDataRoute } from './update'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import type { InternalAuthenticationServiceStart } from '../../authentication'; import { authenticationServiceMock } from '../../authentication/authentication_service.mock'; @@ -21,7 +22,6 @@ import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types' import type { UserProfileServiceStartInternal } from '../../user_profile'; import { userProfileServiceMock } from '../../user_profile/user_profile_service.mock'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineUpdateUserProfileDataRoute } from './update'; function getMockContext() { return { diff --git a/x-pack/plugins/security/server/routes/users/change_password.test.ts b/x-pack/plugins/security/server/routes/users/change_password.test.ts index 27166943a16d06..b53642e96af1e9 100644 --- a/x-pack/plugins/security/server/routes/users/change_password.test.ts +++ b/x-pack/plugins/security/server/routes/users/change_password.test.ts @@ -14,6 +14,7 @@ import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { PublicMethodsOf } from '@kbn/utility-types'; import type { DeeplyMockedKeys } from '@kbn/utility-types-jest'; +import { defineChangeUserPasswordRoutes } from './change_password'; import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock'; import { AuthenticationResult } from '../../authentication'; import type { InternalAuthenticationServiceStart } from '../../authentication'; @@ -23,7 +24,6 @@ import { type Session, SessionMissingError } from '../../session_management'; import { sessionMock } from '../../session_management/session.mock'; import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineChangeUserPasswordRoutes } from './change_password'; describe('Change password', () => { let router: jest.Mocked; diff --git a/x-pack/plugins/security/server/routes/users/index.ts b/x-pack/plugins/security/server/routes/users/index.ts index 410bedb5b7fb9a..bdd4bbf82273b7 100644 --- a/x-pack/plugins/security/server/routes/users/index.ts +++ b/x-pack/plugins/security/server/routes/users/index.ts @@ -5,7 +5,6 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineChangeUserPasswordRoutes } from './change_password'; import { defineCreateOrUpdateUserRoutes } from './create_or_update'; import { defineDeleteUserRoutes } from './delete'; @@ -13,6 +12,7 @@ import { defineDisableUserRoutes } from './disable'; import { defineEnableUserRoutes } from './enable'; import { defineGetUserRoutes } from './get'; import { defineGetAllUsersRoutes } from './get_all'; +import type { RouteDefinitionParams } from '..'; export function defineUsersRoutes(params: RouteDefinitionParams) { defineGetUserRoutes(params); diff --git a/x-pack/plugins/security/server/routes/views/access_agreement.test.ts b/x-pack/plugins/security/server/routes/views/access_agreement.test.ts index a2a96f0545743a..6190f03e6ed788 100644 --- a/x-pack/plugins/security/server/routes/views/access_agreement.test.ts +++ b/x-pack/plugins/security/server/routes/views/access_agreement.test.ts @@ -15,6 +15,7 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { defineAccessAgreementRoutes } from './access_agreement'; import type { SecurityLicense, SecurityLicenseFeatures } from '../../../common/licensing'; import type { AuthenticationProvider } from '../../../common/model'; import type { ConfigType } from '../../config'; @@ -22,7 +23,6 @@ import type { Session } from '../../session_management'; import { sessionMock } from '../../session_management/session.mock'; import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineAccessAgreementRoutes } from './access_agreement'; describe('Access agreement view routes', () => { let httpResources: jest.Mocked; diff --git a/x-pack/plugins/security/server/routes/views/capture_url.test.ts b/x-pack/plugins/security/server/routes/views/capture_url.test.ts index 13f07b528996c6..1893ad6c9cb5f6 100644 --- a/x-pack/plugins/security/server/routes/views/capture_url.test.ts +++ b/x-pack/plugins/security/server/routes/views/capture_url.test.ts @@ -9,9 +9,9 @@ import { Type } from '@kbn/config-schema'; import type { HttpResources, HttpResourcesRequestHandler, RouteConfig } from '@kbn/core/server'; import { httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks'; +import { defineCaptureURLRoutes } from './capture_url'; import type { SecurityRequestHandlerContext } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineCaptureURLRoutes } from './capture_url'; describe('Capture URL view routes', () => { let httpResources: jest.Mocked; diff --git a/x-pack/plugins/security/server/routes/views/index.ts b/x-pack/plugins/security/server/routes/views/index.ts index ad2585cb0b771f..f1efa4611dc588 100644 --- a/x-pack/plugins/security/server/routes/views/index.ts +++ b/x-pack/plugins/security/server/routes/views/index.ts @@ -5,7 +5,6 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineAccessAgreementRoutes } from './access_agreement'; import { defineAccountManagementRoutes } from './account_management'; import { defineCaptureURLRoutes } from './capture_url'; @@ -13,6 +12,7 @@ import { defineLoggedOutRoutes } from './logged_out'; import { defineLoginRoutes } from './login'; import { defineLogoutRoutes } from './logout'; import { defineOverwrittenSessionRoutes } from './overwritten_session'; +import type { RouteDefinitionParams } from '..'; export function defineViewRoutes(params: RouteDefinitionParams) { if ( diff --git a/x-pack/plugins/security/server/routes/views/logged_out.test.ts b/x-pack/plugins/security/server/routes/views/logged_out.test.ts index c5fc45716ec22a..850a533e3d93ac 100644 --- a/x-pack/plugins/security/server/routes/views/logged_out.test.ts +++ b/x-pack/plugins/security/server/routes/views/logged_out.test.ts @@ -9,10 +9,10 @@ import type { HttpResourcesRequestHandler, RouteConfig } from '@kbn/core/server' import { httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { defineLoggedOutRoutes } from './logged_out'; import type { Session } from '../../session_management'; import { sessionMock } from '../../session_management/session.mock'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineLoggedOutRoutes } from './logged_out'; describe('LoggedOut view routes', () => { let session: jest.Mocked>; diff --git a/x-pack/plugins/security/server/routes/views/login.test.ts b/x-pack/plugins/security/server/routes/views/login.test.ts index 7575aafead6e0e..b73b048d9f4d3c 100644 --- a/x-pack/plugins/security/server/routes/views/login.test.ts +++ b/x-pack/plugins/security/server/routes/views/login.test.ts @@ -17,12 +17,12 @@ import type { import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks'; +import { defineLoginRoutes } from './login'; import type { SecurityLicense } from '../../../common/licensing'; import type { LoginSelectorProvider } from '../../../common/login_state'; import type { ConfigType } from '../../config'; import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineLoginRoutes } from './login'; describe('Login view routes', () => { let httpResources: jest.Mocked; diff --git a/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts b/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts index ef5a25e538c07b..2c7799eae5261e 100644 --- a/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts +++ b/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts @@ -7,15 +7,15 @@ import type { SavedObjectsErrorHelpers } from '@kbn/core/server'; -import type { CheckSavedObjectsPrivileges } from '../authorization'; -import { Actions } from '../authorization'; -import type { CheckPrivilegesResponse } from '../authorization/types'; import type { EnsureAuthorizedResult } from './ensure_authorized'; import { ensureAuthorized, getEnsureAuthorizedActionResult, isAuthorizedForObjectInAllSpaces, } from './ensure_authorized'; +import type { CheckSavedObjectsPrivileges } from '../authorization'; +import { Actions } from '../authorization'; +import type { CheckPrivilegesResponse } from '../authorization/types'; describe('ensureAuthorized', () => { function setupDependencies() { diff --git a/x-pack/plugins/security/server/saved_objects/index.ts b/x-pack/plugins/security/server/saved_objects/index.ts index 67e6d2294cc5c3..6068ada7a37292 100644 --- a/x-pack/plugins/security/server/saved_objects/index.ts +++ b/x-pack/plugins/security/server/saved_objects/index.ts @@ -8,9 +8,9 @@ import type { CoreSetup } from '@kbn/core/server'; import { SavedObjectsClient } from '@kbn/core/server'; +import { SavedObjectsSecurityExtension } from './saved_objects_security_extension'; import type { AuditServiceSetup } from '../audit'; import type { AuthorizationServiceSetupInternal } from '../authorization'; -import { SavedObjectsSecurityExtension } from './saved_objects_security_extension'; interface SetupSavedObjectsParams { audit: AuditServiceSetup; diff --git a/x-pack/plugins/security/server/saved_objects/saved_objects_security_extension.test.ts b/x-pack/plugins/security/server/saved_objects/saved_objects_security_extension.test.ts index 278cba8393741f..ff962c3421ce7d 100644 --- a/x-pack/plugins/security/server/saved_objects/saved_objects_security_extension.test.ts +++ b/x-pack/plugins/security/server/saved_objects/saved_objects_security_extension.test.ts @@ -5,6 +5,12 @@ * 2.0. */ +import type { + SavedObjectReferenceWithContext, + SavedObjectsClient, + SavedObjectsFindResult, + SavedObjectsResolveResponse, +} from '@kbn/core/server'; import type { LegacyUrlAliasTarget } from '@kbn/core-saved-objects-common'; import type { AuthorizeBulkGetObject, @@ -13,22 +19,16 @@ import type { AuthorizeUpdateObject, BulkResolveError, } from '@kbn/core-saved-objects-server'; -import type { - SavedObjectReferenceWithContext, - SavedObjectsClient, - SavedObjectsFindResult, - SavedObjectsResolveResponse, -} from '@kbn/core/server'; -import { auditLoggerMock } from '../audit/mocks'; -import type { CheckSavedObjectsPrivileges } from '../authorization'; -import { Actions } from '../authorization'; -import type { CheckPrivilegesResponse } from '../authorization/types'; import { AuditAction, SavedObjectsSecurityExtension, SecurityAction, } from './saved_objects_security_extension'; +import { auditLoggerMock } from '../audit/mocks'; +import type { CheckSavedObjectsPrivileges } from '../authorization'; +import { Actions } from '../authorization'; +import type { CheckPrivilegesResponse } from '../authorization/types'; const checkAuthorizationSpy = jest.spyOn( SavedObjectsSecurityExtension.prototype as any, diff --git a/x-pack/plugins/security/server/saved_objects/saved_objects_security_extension.ts b/x-pack/plugins/security/server/saved_objects/saved_objects_security_extension.ts index e53b129474a625..81b909da2c984c 100644 --- a/x-pack/plugins/security/server/saved_objects/saved_objects_security_extension.ts +++ b/x-pack/plugins/security/server/saved_objects/saved_objects_security_extension.ts @@ -43,12 +43,12 @@ import type { AuthorizeObject } from '@kbn/core-saved-objects-server/src/extensi import { ALL_NAMESPACES_STRING, SavedObjectsUtils } from '@kbn/core-saved-objects-utils-server'; import type { EcsEvent } from '@kbn/ecs'; +import { isAuthorizedInAllSpaces } from './authorization_utils'; import { ALL_SPACES_ID, UNKNOWN_SPACE } from '../../common/constants'; import type { AuditLogger } from '../audit'; import { savedObjectEvent } from '../audit'; import type { Actions, CheckSavedObjectsPrivileges } from '../authorization'; import type { CheckPrivilegesResponse } from '../authorization/types'; -import { isAuthorizedInAllSpaces } from './authorization_utils'; interface Params { actions: Actions; diff --git a/x-pack/plugins/security/server/session_management/session.mock.ts b/x-pack/plugins/security/server/session_management/session.mock.ts index 613746932bfb6f..75bbd3075f67e7 100644 --- a/x-pack/plugins/security/server/session_management/session.mock.ts +++ b/x-pack/plugins/security/server/session_management/session.mock.ts @@ -7,10 +7,10 @@ import type { PublicMethodsOf } from '@kbn/utility-types'; -import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; import type { Session, SessionValue } from './session'; import { SessionMissingError } from './session_errors'; import { sessionIndexMock } from './session_index.mock'; +import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; export const sessionMock = { create: (): jest.Mocked> => ({ diff --git a/x-pack/plugins/security/server/session_management/session.test.ts b/x-pack/plugins/security/server/session_management/session.test.ts index ca6a669ecd5e41..691b6db78b5188 100644 --- a/x-pack/plugins/security/server/session_management/session.test.ts +++ b/x-pack/plugins/security/server/session_management/session.test.ts @@ -11,11 +11,6 @@ import crypto from 'crypto'; import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks'; import type { PublicMethodsOf } from '@kbn/utility-types'; -import type { AuditLogger } from '..'; -import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; -import { userSessionConcurrentLimitLogoutEvent } from '../audit'; -import { auditLoggerMock, auditServiceMock } from '../audit/mocks'; -import { ConfigSchema, createConfig } from '../config'; import { sessionCookieMock, sessionIndexMock, sessionMock } from './index.mock'; import { getPrintableSessionId, Session, type SessionValueContentToEncrypt } from './session'; import type { SessionCookie } from './session_cookie'; @@ -26,6 +21,11 @@ import { SessionUnexpectedError, } from './session_errors'; import type { SessionIndex } from './session_index'; +import type { AuditLogger } from '..'; +import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock'; +import { userSessionConcurrentLimitLogoutEvent } from '../audit'; +import { auditLoggerMock, auditServiceMock } from '../audit/mocks'; +import { ConfigSchema, createConfig } from '../config'; describe('Session', () => { const now = 123456; diff --git a/x-pack/plugins/security/server/session_management/session.ts b/x-pack/plugins/security/server/session_management/session.ts index 228f9b05e57517..38b3cc7d2443ce 100644 --- a/x-pack/plugins/security/server/session_management/session.ts +++ b/x-pack/plugins/security/server/session_management/session.ts @@ -13,10 +13,6 @@ import { promisify } from 'util'; import type { KibanaRequest, Logger } from '@kbn/core/server'; import type { PublicMethodsOf } from '@kbn/utility-types'; -import type { AuditServiceSetup } from '..'; -import type { AuthenticationProvider } from '../../common'; -import { userSessionConcurrentLimitLogoutEvent } from '../audit'; -import type { ConfigType } from '../config'; import type { SessionCookie } from './session_cookie'; import { SessionConcurrencyLimitError, @@ -25,6 +21,10 @@ import { SessionUnexpectedError, } from './session_errors'; import type { SessionIndex, SessionIndexValue } from './session_index'; +import type { AuditServiceSetup } from '..'; +import type { AuthenticationProvider } from '../../common'; +import { userSessionConcurrentLimitLogoutEvent } from '../audit'; +import type { ConfigType } from '../config'; /** * The shape of the value that represents user's session information. diff --git a/x-pack/plugins/security/server/session_management/session_index.test.ts b/x-pack/plugins/security/server/session_management/session_index.test.ts index f3c6d430a0644e..36dea9c1caf7bd 100644 --- a/x-pack/plugins/security/server/session_management/session_index.test.ts +++ b/x-pack/plugins/security/server/session_management/session_index.test.ts @@ -17,17 +17,17 @@ import type { import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; -import type { AuditLogger } from '../audit'; -import { auditLoggerMock } from '../audit/mocks'; -import { AnonymousAuthenticationProvider } from '../authentication'; -import { ConfigSchema, createConfig } from '../config'; -import { securityMock } from '../mocks'; import { getSessionIndexSettings, SESSION_INDEX_MAPPINGS_VERSION_META_FIELD_NAME, SessionIndex, } from './session_index'; import { sessionIndexMock } from './session_index.mock'; +import type { AuditLogger } from '../audit'; +import { auditLoggerMock } from '../audit/mocks'; +import { AnonymousAuthenticationProvider } from '../authentication'; +import { ConfigSchema, createConfig } from '../config'; +import { securityMock } from '../mocks'; describe('Session index', () => { let mockElasticsearchClient: ReturnType< diff --git a/x-pack/plugins/security/server/session_management/session_management_service.test.ts b/x-pack/plugins/security/server/session_management/session_management_service.test.ts index 69a15085882203..46bb0499f8e4d5 100644 --- a/x-pack/plugins/security/server/session_management/session_management_service.test.ts +++ b/x-pack/plugins/security/server/session_management/session_management_service.test.ts @@ -15,16 +15,16 @@ import type { import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks'; import { nextTick } from '@kbn/test-jest-helpers'; -import type { AuditServiceSetup } from '../audit'; -import { auditServiceMock } from '../audit/mocks'; -import { ConfigSchema, createConfig } from '../config'; -import type { OnlineStatusRetryScheduler } from '../elasticsearch'; import { Session } from './session'; import { SessionIndex } from './session_index'; import { SESSION_INDEX_CLEANUP_TASK_NAME, SessionManagementService, } from './session_management_service'; +import type { AuditServiceSetup } from '../audit'; +import { auditServiceMock } from '../audit/mocks'; +import { ConfigSchema, createConfig } from '../config'; +import type { OnlineStatusRetryScheduler } from '../elasticsearch'; const mockSessionIndexInitialize = jest.spyOn(SessionIndex.prototype, 'initialize'); mockSessionIndexInitialize.mockResolvedValue(); diff --git a/x-pack/plugins/security/server/session_management/session_management_service.ts b/x-pack/plugins/security/server/session_management/session_management_service.ts index 289f60aa973c08..10395999f502b0 100644 --- a/x-pack/plugins/security/server/session_management/session_management_service.ts +++ b/x-pack/plugins/security/server/session_management/session_management_service.ts @@ -14,12 +14,12 @@ import type { TaskManagerStartContract, } from '@kbn/task-manager-plugin/server'; -import type { AuditServiceSetup } from '../audit'; -import type { ConfigType } from '../config'; -import type { OnlineStatusRetryScheduler } from '../elasticsearch'; import { Session } from './session'; import { SessionCookie } from './session_cookie'; import { SessionIndex } from './session_index'; +import type { AuditServiceSetup } from '../audit'; +import type { ConfigType } from '../config'; +import type { OnlineStatusRetryScheduler } from '../elasticsearch'; export interface SessionManagementServiceSetupParams { readonly http: Pick; diff --git a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts index 8479b2f25f8c2c..f990bf8095a1bb 100644 --- a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts +++ b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts @@ -5,15 +5,16 @@ * 2.0. */ -import { savedObjectsExtensionsMock } from '@kbn/core-saved-objects-api-server-mocks'; -import type { ISavedObjectsSecurityExtension } from '@kbn/core-saved-objects-server'; import type { EcsEvent, SavedObjectsFindResponse } from '@kbn/core/server'; import { SavedObjectsErrorHelpers } from '@kbn/core/server'; import { httpServerMock } from '@kbn/core/server/mocks'; +import { savedObjectsExtensionsMock } from '@kbn/core-saved-objects-api-server-mocks'; +import type { ISavedObjectsSecurityExtension } from '@kbn/core-saved-objects-server'; import type { GetAllSpacesPurpose, Space } from '@kbn/spaces-plugin/server'; import { spacesClientMock } from '@kbn/spaces-plugin/server/mocks'; import { deepFreeze } from '@kbn/std'; +import { SecureSpacesClientWrapper } from './secure_spaces_client_wrapper'; import type { AuditEvent, AuditLogger } from '../audit'; import { SpaceAuditAction } from '../audit'; import { auditLoggerMock } from '../audit/mocks'; @@ -23,7 +24,6 @@ import type { } from '../authorization'; import { authorizationMock } from '../authorization/index.mock'; import type { CheckPrivilegesResponse } from '../authorization/types'; -import { SecureSpacesClientWrapper } from './secure_spaces_client_wrapper'; interface Opts { securityEnabled?: boolean; diff --git a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts index 5449407f8d5a7c..18c6ae824584c9 100644 --- a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts +++ b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts @@ -7,9 +7,9 @@ import Boom from '@hapi/boom'; +import type { KibanaRequest, SavedObjectsClient } from '@kbn/core/server'; import type { LegacyUrlAliasTarget } from '@kbn/core-saved-objects-common'; import type { ISavedObjectsSecurityExtension } from '@kbn/core-saved-objects-server'; -import type { KibanaRequest, SavedObjectsClient } from '@kbn/core/server'; import type { GetAllSpacesOptions, GetAllSpacesPurpose, diff --git a/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts b/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts index 179f6cfa1cf0a1..ba3779af2dde07 100644 --- a/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts +++ b/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts @@ -8,9 +8,9 @@ import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import { spacesMock } from '@kbn/spaces-plugin/server/mocks'; +import { setupSpacesClient } from './setup_spaces_client'; import { auditServiceMock } from '../audit/mocks'; import { authorizationMock } from '../authorization/index.mock'; -import { setupSpacesClient } from './setup_spaces_client'; describe('setupSpacesClient', () => { it('does not setup the spaces client when spaces is disabled', () => { diff --git a/x-pack/plugins/security/server/spaces/setup_spaces_client.ts b/x-pack/plugins/security/server/spaces/setup_spaces_client.ts index b2871c8bc7ef17..43351c575d395e 100644 --- a/x-pack/plugins/security/server/spaces/setup_spaces_client.ts +++ b/x-pack/plugins/security/server/spaces/setup_spaces_client.ts @@ -8,10 +8,10 @@ import { SavedObjectsClient } from '@kbn/core/server'; import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server'; +import { SecureSpacesClientWrapper } from './secure_spaces_client_wrapper'; import type { AuditServiceSetup } from '../audit'; import type { AuthorizationServiceSetup } from '../authorization'; import { SavedObjectsSecurityExtension } from '../saved_objects'; -import { SecureSpacesClientWrapper } from './secure_spaces_client_wrapper'; interface Deps { audit: AuditServiceSetup; diff --git a/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts b/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts index a74d02b10befa5..d120aae57a5182 100644 --- a/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts +++ b/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts @@ -12,10 +12,10 @@ import { usageCollectionPluginMock, } from '@kbn/usage-collection-plugin/server/mocks'; +import { registerSecurityUsageCollector } from './security_usage_collector'; import type { SecurityLicenseFeatures } from '../../common/licensing'; import { licenseMock } from '../../common/licensing/index.mock'; import { ConfigSchema, createConfig } from '../config'; -import { registerSecurityUsageCollector } from './security_usage_collector'; describe('Security UsageCollector', () => { const createSecurityConfig = (config: TypeOf) => { diff --git a/x-pack/plugins/security/server/user_profile/user_profile_service.test.ts b/x-pack/plugins/security/server/user_profile/user_profile_service.test.ts index 3154e0e69b8f04..bf9687913514fd 100644 --- a/x-pack/plugins/security/server/user_profile/user_profile_service.test.ts +++ b/x-pack/plugins/security/server/user_profile/user_profile_service.test.ts @@ -19,13 +19,13 @@ import { } from '@kbn/core/server/mocks'; import { nextTick } from '@kbn/test-jest-helpers'; +import { prefixCommaSeparatedValues, UserProfileService } from './user_profile_service'; import type { UserProfileWithSecurity } from '../../common'; import { licenseMock } from '../../common/licensing/index.mock'; import { userProfileMock } from '../../common/model/user_profile.mock'; import { authorizationMock } from '../authorization/index.mock'; import { securityMock } from '../mocks'; import { sessionMock } from '../session_management/session.mock'; -import { prefixCommaSeparatedValues, UserProfileService } from './user_profile_service'; const logger = loggingSystemMock.createLogger(); describe('UserProfileService', () => { diff --git a/x-pack/plugins/security/server/user_profile/user_profile_service.ts b/x-pack/plugins/security/server/user_profile/user_profile_service.ts index 04b2249600e61e..8ef87b60f9e152 100644 --- a/x-pack/plugins/security/server/user_profile/user_profile_service.ts +++ b/x-pack/plugins/security/server/user_profile/user_profile_service.ts @@ -11,6 +11,7 @@ import type { SecurityUserProfile } from '@elastic/elasticsearch/lib/api/typesWi import type { IClusterClient, KibanaRequest, Logger } from '@kbn/core/server'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import type { UserProfileGrant } from './user_profile_grant'; import type { SecurityLicense, UserProfile, @@ -22,7 +23,6 @@ import type { AuthorizationServiceSetupInternal } from '../authorization'; import type { CheckUserProfilesPrivilegesResponse } from '../authorization/types'; import { getDetailedErrorMessage, getErrorStatusCode } from '../errors'; import { getPrintableSessionId, type Session } from '../session_management'; -import type { UserProfileGrant } from './user_profile_grant'; const KIBANA_DATA_ROOT = 'kibana'; const ACTIVATION_MAX_RETRIES = 10; diff --git a/x-pack/plugins/security/server/user_profile/user_settings_service.test.ts b/x-pack/plugins/security/server/user_profile/user_settings_service.test.ts index a5dafd16f60ec9..07e30826d8f0c8 100644 --- a/x-pack/plugins/security/server/user_profile/user_settings_service.test.ts +++ b/x-pack/plugins/security/server/user_profile/user_settings_service.test.ts @@ -13,14 +13,14 @@ import { loggingSystemMock, } from '@kbn/core/server/mocks'; +import type { UserProfileServiceStart } from './user_profile_service'; +import { UserProfileService } from './user_profile_service'; +import { UserSettingService } from './user_setting_service'; import type { UserProfileWithSecurity } from '../../common'; import { licenseMock } from '../../common/licensing/index.mock'; import { userProfileMock } from '../../common/model/user_profile.mock'; import { authorizationMock } from '../authorization/index.mock'; import { sessionMock } from '../session_management/session.mock'; -import type { UserProfileServiceStart } from './user_profile_service'; -import { UserProfileService } from './user_profile_service'; -import { UserSettingService } from './user_setting_service'; const logger = loggingSystemMock.createLogger(); describe('UserSettingService', () => { diff --git a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/create_datastream.ts b/x-pack/plugins/security_solution/server/lib/risk_engine/utils/create_datastream.ts index 910ba5e8870465..fee229fa942f9e 100644 --- a/x-pack/plugins/security_solution/server/lib/risk_engine/utils/create_datastream.ts +++ b/x-pack/plugins/security_solution/server/lib/risk_engine/utils/create_datastream.ts @@ -55,7 +55,6 @@ const updateTotalFieldLimitSetting = async ({ }), { logger } ); - return; } catch (err) { logger.error( `Failed to PUT index.mapping.total_fields.limit settings for alias ${alias}: ${err.message}` @@ -99,8 +98,6 @@ const updateUnderlyingMapping = async ({ () => esClient.indices.putMapping({ index, body: simulatedMapping }), { logger } ); - - return; } catch (err) { logger.error(`Failed to PUT mapping for alias ${alias}: ${err.message}`); throw err; diff --git a/x-pack/plugins/spaces/common/lib/spaces_url_parser.test.ts b/x-pack/plugins/spaces/common/lib/spaces_url_parser.test.ts index 94385aa4e295d3..52ccd8c9c3bd18 100644 --- a/x-pack/plugins/spaces/common/lib/spaces_url_parser.test.ts +++ b/x-pack/plugins/spaces/common/lib/spaces_url_parser.test.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { DEFAULT_SPACE_ID } from '../constants'; import { addSpaceIdToPath, getSpaceIdFromPath } from './spaces_url_parser'; +import { DEFAULT_SPACE_ID } from '../constants'; describe('getSpaceIdFromPath', () => { describe('without a serverBasePath defined', () => { diff --git a/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx b/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx index 52e308d71c8fd2..e068b8e8d38be1 100644 --- a/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx +++ b/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx @@ -9,8 +9,8 @@ import React from 'react'; import type { AdvancedSettingsSetup } from '@kbn/advanced-settings-plugin/public'; -import type { Space } from '../../common'; import { AdvancedSettingsSubtitle, AdvancedSettingsTitle } from './components'; +import type { Space } from '../../common'; interface SetupDeps { getActiveSpace: () => Promise; diff --git a/x-pack/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx b/x-pack/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx index e8b6766411d0c6..63f340863e859e 100644 --- a/x-pack/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx +++ b/x-pack/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx @@ -10,8 +10,8 @@ import React from 'react'; import { mountWithIntl } from '@kbn/test-jest-helpers'; -import { SpaceAvatarInternal } from '../../../space_avatar/space_avatar_internal'; import { AdvancedSettingsTitle } from './advanced_settings_title'; +import { SpaceAvatarInternal } from '../../../space_avatar/space_avatar_internal'; describe('AdvancedSettingsTitle', () => { it('renders without crashing', async () => { diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx index 34cb51a144f755..bcd7ef069e0c17 100644 --- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx +++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx @@ -12,10 +12,10 @@ import React, { Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; +import { ResolveAllConflicts } from './resolve_all_conflicts'; import type { SpacesDataEntry } from '../../types'; import type { SummarizedCopyToSpaceResult } from '../lib'; import type { ImportRetry } from '../types'; -import { ResolveAllConflicts } from './resolve_all_conflicts'; interface Props { space: SpacesDataEntry; diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx index 775e93c6008fdb..da4aed1df6fc7e 100644 --- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx +++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx @@ -13,15 +13,15 @@ import React from 'react'; import { coreMock } from '@kbn/core/public/mocks'; import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers'; -import type { Space } from '../../../common'; -import { getSpacesContextProviderWrapper } from '../../spaces_context'; -import { spacesManagerMock } from '../../spaces_manager/mocks'; -import type { CopyToSpaceSavedObjectTarget } from '../types'; import { CopyModeControl } from './copy_mode_control'; import { getCopyToSpaceFlyoutComponent } from './copy_to_space_flyout'; import { CopyToSpaceForm } from './copy_to_space_form'; import { ProcessingCopyToSpace } from './processing_copy_to_space'; import { SelectableSpacesControl } from './selectable_spaces_control'; +import type { Space } from '../../../common'; +import { getSpacesContextProviderWrapper } from '../../spaces_context'; +import { spacesManagerMock } from '../../spaces_manager/mocks'; +import type { CopyToSpaceSavedObjectTarget } from '../types'; interface SetupOpts { mockSpaces?: Space[]; diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx index b4d3ec634b8f3e..681b57a6d4f473 100644 --- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx +++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx @@ -25,14 +25,14 @@ import React, { useEffect, useMemo, useState } from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { CopyToSpaceFlyoutFooter } from './copy_to_space_flyout_footer'; +import { CopyToSpaceForm } from './copy_to_space_form'; +import { ProcessingCopyToSpace } from './processing_copy_to_space'; import { useSpaces } from '../../spaces_context'; import type { SpacesDataEntry } from '../../types'; import { processImportResponse } from '../lib'; import type { ProcessedImportResponse } from '../lib'; import type { CopyOptions, CopyToSpaceFlyoutProps, ImportRetry } from '../types'; -import { CopyToSpaceFlyoutFooter } from './copy_to_space_flyout_footer'; -import { CopyToSpaceForm } from './copy_to_space_form'; -import { ProcessingCopyToSpace } from './processing_copy_to_space'; const INCLUDE_RELATED_DEFAULT = true; const CREATE_NEW_COPIES_DEFAULT = true; diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx index 5e6f0123a86f39..d2863b0060ee7f 100644 --- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx +++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx @@ -10,11 +10,11 @@ import React from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; -import type { SpacesDataEntry } from '../../types'; -import type { CopyOptions, CopyToSpaceSavedObjectTarget } from '../types'; import type { CopyMode } from './copy_mode_control'; import { CopyModeControl } from './copy_mode_control'; import { SelectableSpacesControl } from './selectable_spaces_control'; +import type { SpacesDataEntry } from '../../types'; +import type { CopyOptions, CopyToSpaceSavedObjectTarget } from '../types'; interface Props { savedObjectTarget: Required; diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx index eb0cb9f0be8f62..e68c64eb68a8ae 100644 --- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx +++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx @@ -16,11 +16,11 @@ import React, { Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; +import { SpaceResult, SpaceResultProcessing } from './space_result'; import type { SpacesDataEntry } from '../../types'; import type { ProcessedImportResponse } from '../lib'; import { summarizeCopyResult } from '../lib'; import type { CopyOptions, CopyToSpaceSavedObjectTarget, ImportRetry } from '../types'; -import { SpaceResult, SpaceResultProcessing } from './space_result'; interface Props { savedObjectTarget: Required; diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.test.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.test.tsx index f824b9c9c33388..31bf973abe8590 100644 --- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.test.tsx +++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.test.tsx @@ -11,10 +11,10 @@ import React from 'react'; import { findTestSubject, mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers'; -import type { SummarizedCopyToSpaceResult } from '../lib'; -import type { ImportRetry } from '../types'; import type { ResolveAllConflictsProps } from './resolve_all_conflicts'; import { ResolveAllConflicts } from './resolve_all_conflicts'; +import type { SummarizedCopyToSpaceResult } from '../lib'; +import type { ImportRetry } from '../types'; describe('ResolveAllConflicts', () => { const summarizedCopyResult = { diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx index ebfe0be779917b..e72f3705f83685 100644 --- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx +++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx @@ -17,12 +17,12 @@ import { } from '@elastic/eui'; import React, { lazy, Suspense, useState } from 'react'; +import { CopyStatusSummaryIndicator } from './copy_status_summary_indicator'; +import { SpaceCopyResultDetails } from './space_result_details'; import { getSpaceAvatarComponent } from '../../space_avatar'; import type { SpacesDataEntry } from '../../types'; import type { SummarizedCopyToSpaceResult } from '../lib'; import type { ImportRetry } from '../types'; -import { CopyStatusSummaryIndicator } from './copy_status_summary_indicator'; -import { SpaceCopyResultDetails } from './space_result_details'; // No need to wrap LazySpaceAvatar in an error boundary, because it is one of the first chunks loaded when opening Kibana. const LazySpaceAvatar = lazy(() => diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx index ef9a592da4d64b..64fdfa2a5b7bc5 100644 --- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx +++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx @@ -26,10 +26,10 @@ import type { } from '@kbn/core/public'; import { i18n } from '@kbn/i18n'; +import { CopyStatusIndicator } from './copy_status_indicator'; import type { SpacesDataEntry } from '../../types'; import type { SummarizedCopyToSpaceResult } from '../lib'; import type { ImportRetry } from '../types'; -import { CopyStatusIndicator } from './copy_status_indicator'; interface Props { summarizedCopyResult: SummarizedCopyToSpaceResult; diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts index faa1d1f4c68719..46cc05ca2b9533 100644 --- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts +++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts @@ -6,8 +6,8 @@ */ import type { FailedImport, ProcessedImportResponse } from '.'; -import type { CopyToSpaceSavedObjectTarget } from '../types'; import { summarizeCopyResult } from './summarize_copy_result'; +import type { CopyToSpaceSavedObjectTarget } from '../types'; // Sample data references: // diff --git a/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict.tsx b/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict.tsx index 24f36723f9782f..36677e9b0ea1a1 100644 --- a/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict.tsx +++ b/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict.tsx @@ -7,8 +7,8 @@ import React from 'react'; -import type { EmbeddableLegacyUrlConflictProps } from '../types'; import type { InternalProps } from './embeddable_legacy_url_conflict_internal'; +import type { EmbeddableLegacyUrlConflictProps } from '../types'; export const getEmbeddableLegacyUrlConflict = async ( internalProps: InternalProps diff --git a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict.tsx b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict.tsx index 8aaf455204c9b1..b4f4751c7aced4 100644 --- a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict.tsx +++ b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict.tsx @@ -7,8 +7,8 @@ import React from 'react'; -import type { LegacyUrlConflictProps } from '../types'; import type { InternalProps } from './legacy_url_conflict_internal'; +import type { LegacyUrlConflictProps } from '../types'; export const getLegacyUrlConflict = async ( internalProps: InternalProps diff --git a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts index 521889e790391a..1d60a244605950 100644 --- a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts +++ b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts @@ -10,10 +10,10 @@ import { first } from 'rxjs/operators'; import type { StartServicesAccessor } from '@kbn/core/public'; import { i18n } from '@kbn/i18n'; +import type { RedirectLegacyUrlParams } from './types'; import { DEFAULT_OBJECT_NOUN } from '../constants'; import type { PluginsStart } from '../plugin'; import type { SpacesApiUi } from '../ui_api'; -import type { RedirectLegacyUrlParams } from './types'; export function createRedirectLegacyUrl( getStartServices: StartServicesAccessor diff --git a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx index 53e4060112a57d..7a2882bc9ff5db 100644 --- a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx +++ b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx @@ -10,8 +10,8 @@ import { act } from 'react-dom/test-utils'; import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers'; -import { spacesManagerMock } from '../../../spaces_manager/mocks'; import { ConfirmDeleteModal } from './confirm_delete_modal'; +import { spacesManagerMock } from '../../../spaces_manager/mocks'; describe('ConfirmDeleteModal', () => { it('renders as expected', () => { diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.test.tsx index cea22e31a82892..14d458af36b3bf 100644 --- a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.test.tsx +++ b/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.test.tsx @@ -9,8 +9,8 @@ import React from 'react'; import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers'; -import { SpaceValidator } from '../../lib'; import { CustomizeSpace } from './customize_space'; +import { SpaceValidator } from '../../lib'; const validator = new SpaceValidator({ shouldValidate: true }); diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx b/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx index 23c9f8fd96091f..41f4b6c2190cd5 100644 --- a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx +++ b/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx @@ -20,12 +20,12 @@ import React, { Component, lazy, Suspense } from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { CustomizeSpaceAvatar } from './customize_space_avatar'; import { getSpaceAvatarComponent, getSpaceColor, getSpaceInitials } from '../../../space_avatar'; import type { SpaceValidator } from '../../lib'; import { toSpaceIdentifier } from '../../lib'; import type { FormValues } from '../manage_space_page'; import { SectionPanel } from '../section_panel'; -import { CustomizeSpaceAvatar } from './customize_space_avatar'; // No need to wrap LazySpaceAvatar in an error boundary, because it is one of the first chunks loaded when opening Kibana. const LazySpaceAvatar = lazy(() => diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx index ddc767163f0b57..21904ee94b8ab2 100644 --- a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx +++ b/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx @@ -10,8 +10,8 @@ import React from 'react'; import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers'; -import { SpaceValidator } from '../../lib'; import { CustomizeSpaceAvatar } from './customize_space_avatar'; +import { SpaceValidator } from '../../lib'; const space = { id: '', diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx index 42a4f2f46832e7..b5dc1f0c54ebc6 100644 --- a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx +++ b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx @@ -10,9 +10,9 @@ import React from 'react'; import { notificationServiceMock } from '@kbn/core/public/mocks'; import { shallowWithIntl } from '@kbn/test-jest-helpers'; +import { DeleteSpacesButton } from './delete_spaces_button'; import type { SpacesManager } from '../../spaces_manager'; import { spacesManagerMock } from '../../spaces_manager/mocks'; -import { DeleteSpacesButton } from './delete_spaces_button'; const space = { id: 'my-space', diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx index 07a848e523f10f..36d06949532422 100644 --- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx +++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx @@ -14,9 +14,9 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import { useKibana } from '@kbn/kibana-react-plugin/public'; +import { FeatureTable } from './feature_table'; import type { Space } from '../../../../common'; import { SectionPanel } from '../section_panel'; -import { FeatureTable } from './feature_table'; interface Props { space: Partial; diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx index ccb5412aa39c68..c95e4e4363dee5 100644 --- a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx +++ b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx @@ -17,11 +17,11 @@ import { KibanaFeature } from '@kbn/features-plugin/public'; import { featuresPluginMock } from '@kbn/features-plugin/public/mocks'; import { mountWithIntl } from '@kbn/test-jest-helpers'; -import type { SpacesManager } from '../../spaces_manager'; -import { spacesManagerMock } from '../../spaces_manager/mocks'; import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal'; import { EnabledFeatures } from './enabled_features'; import { ManageSpacePage } from './manage_space_page'; +import type { SpacesManager } from '../../spaces_manager'; +import { spacesManagerMock } from '../../spaces_manager/mocks'; // To be resolved by EUI team. // https://github.com/elastic/eui/issues/3712 diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx index 143f4fce34d26d..f5b82b8fdafd24 100644 --- a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx +++ b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx @@ -26,6 +26,10 @@ import type { FeaturesPluginStart, KibanaFeature } from '@kbn/features-plugin/pu import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal'; +import { CustomizeSpace } from './customize_space'; +import { DeleteSpacesButton } from './delete_spaces_button'; +import { EnabledFeatures } from './enabled_features'; import type { Space } from '../../../common'; import { isReservedSpace } from '../../../common'; import { getSpacesFeatureDescription } from '../../constants'; @@ -34,10 +38,6 @@ import type { SpacesManager } from '../../spaces_manager'; import { UnauthorizedPrompt } from '../components'; import { toSpaceIdentifier } from '../lib'; import { SpaceValidator } from '../lib/validate_space'; -import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal'; -import { CustomizeSpace } from './customize_space'; -import { DeleteSpacesButton } from './delete_spaces_button'; -import { EnabledFeatures } from './enabled_features'; export interface FormValues extends Partial { customIdentifier?: boolean; diff --git a/x-pack/plugins/spaces/public/management/lib/validate_space.ts b/x-pack/plugins/spaces/public/management/lib/validate_space.ts index 4767d35f060fbc..a93d627f6e159a 100644 --- a/x-pack/plugins/spaces/public/management/lib/validate_space.ts +++ b/x-pack/plugins/spaces/public/management/lib/validate_space.ts @@ -9,9 +9,9 @@ import { isValidHex } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; +import { isValidSpaceIdentifier } from './space_identifier_utils'; import { isReservedSpace } from '../../../common/is_reserved_space'; import type { FormValues } from '../edit_space/manage_space_page'; -import { isValidSpaceIdentifier } from './space_identifier_utils'; interface SpaceValidatorOptions { shouldValidate?: boolean; diff --git a/x-pack/plugins/spaces/public/management/management_service.test.ts b/x-pack/plugins/spaces/public/management/management_service.test.ts index 105466e42827ea..88b88b0e9e7dd1 100644 --- a/x-pack/plugins/spaces/public/management/management_service.test.ts +++ b/x-pack/plugins/spaces/public/management/management_service.test.ts @@ -10,10 +10,10 @@ import { coreMock } from '@kbn/core/public/mocks'; import type { ManagementSection } from '@kbn/management-plugin/public'; import { managementPluginMock } from '@kbn/management-plugin/public/mocks'; +import { ManagementService } from './management_service'; import type { ConfigType } from '../config'; import type { PluginsStart } from '../plugin'; import { spacesManagerMock } from '../spaces_manager/mocks'; -import { ManagementService } from './management_service'; describe('ManagementService', () => { const config: ConfigType = { diff --git a/x-pack/plugins/spaces/public/management/management_service.tsx b/x-pack/plugins/spaces/public/management/management_service.tsx index b4498e26f1935c..de9e7dfdeb717b 100644 --- a/x-pack/plugins/spaces/public/management/management_service.tsx +++ b/x-pack/plugins/spaces/public/management/management_service.tsx @@ -8,10 +8,10 @@ import type { StartServicesAccessor } from '@kbn/core/public'; import type { ManagementApp, ManagementSetup } from '@kbn/management-plugin/public'; +import { spacesManagementApp } from './spaces_management_app'; import type { ConfigType } from '../config'; import type { PluginsStart } from '../plugin'; import type { SpacesManager } from '../spaces_manager'; -import { spacesManagementApp } from './spaces_management_app'; interface SetupDeps { management: ManagementSetup; diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx index dc041de2bc4940..59d4f1414e03a8 100644 --- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx +++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx @@ -17,10 +17,10 @@ import { KibanaFeature } from '@kbn/features-plugin/public'; import { featuresPluginMock } from '@kbn/features-plugin/public/mocks'; import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers'; +import { SpacesGridPage } from './spaces_grid_page'; import { SpaceAvatarInternal } from '../../space_avatar/space_avatar_internal'; import type { SpacesManager } from '../../spaces_manager'; import { spacesManagerMock } from '../../spaces_manager/mocks'; -import { SpacesGridPage } from './spaces_grid_page'; const spaces = [ { diff --git a/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx b/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx index fecc81077d6908..5a418286596e3f 100644 --- a/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx +++ b/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx @@ -21,10 +21,10 @@ jest.mock('./edit_space', () => ({ import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks'; import { featuresPluginMock } from '@kbn/features-plugin/public/mocks'; +import { spacesManagementApp } from './spaces_management_app'; import type { ConfigType } from '../config'; import type { PluginsStart } from '../plugin'; import { spacesManagerMock } from '../spaces_manager/mocks'; -import { spacesManagementApp } from './spaces_management_app'; const config: ConfigType = { maxSpaces: 1000, diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx b/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx index 3424bac325d181..982e11ffbf4e73 100644 --- a/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx +++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx @@ -14,8 +14,8 @@ import React from 'react'; import type { ApplicationStart, Capabilities } from '@kbn/core/public'; import { i18n } from '@kbn/i18n'; -import { getSpacesFeatureDescription } from '../../constants'; import { ManageSpacesButton } from './manage_spaces_button'; +import { getSpacesFeatureDescription } from '../../constants'; interface Props { id: string; diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx index adad431cd05eac..337e7373618c4d 100644 --- a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx +++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx @@ -27,10 +27,10 @@ import { i18n } from '@kbn/i18n'; import type { InjectedIntl } from '@kbn/i18n-react'; import { FormattedMessage, injectI18n } from '@kbn/i18n-react'; +import { ManageSpacesButton } from './manage_spaces_button'; import type { Space } from '../../../common'; import { addSpaceIdToPath, ENTER_SPACE_PATH, SPACE_SEARCH_COUNT_THRESHOLD } from '../../../common'; import { getSpaceAvatarComponent } from '../../space_avatar'; -import { ManageSpacesButton } from './manage_spaces_button'; const LazySpaceAvatar = lazy(() => getSpaceAvatarComponent().then((component) => ({ default: component })) diff --git a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.test.tsx b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.test.tsx index 9be4fb5a69e3ba..62e1c6d6e09ec5 100644 --- a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.test.tsx +++ b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.test.tsx @@ -19,11 +19,11 @@ import * as Rx from 'rxjs'; import { mountWithIntl } from '@kbn/test-jest-helpers'; +import { NavControlPopover } from './nav_control_popover'; import type { Space } from '../../common'; import { SpaceAvatarInternal } from '../space_avatar/space_avatar_internal'; import type { SpacesManager } from '../spaces_manager'; import { spacesManagerMock } from '../spaces_manager/mocks'; -import { NavControlPopover } from './nav_control_popover'; const mockSpaces = [ { diff --git a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx index 45a6c21c86f04e..ceedb99c60d186 100644 --- a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx +++ b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx @@ -18,11 +18,11 @@ import type { Subscription } from 'rxjs'; import type { ApplicationStart, Capabilities } from '@kbn/core/public'; import { i18n } from '@kbn/i18n'; +import { SpacesDescription } from './components/spaces_description'; +import { SpacesMenu } from './components/spaces_menu'; import type { Space } from '../../common'; import { getSpaceAvatarComponent } from '../space_avatar'; import type { SpacesManager } from '../spaces_manager'; -import { SpacesDescription } from './components/spaces_description'; -import { SpacesMenu } from './components/spaces_menu'; // No need to wrap LazySpaceAvatar in an error boundary, because it is one of the first chunks loaded when opening Kibana. const LazySpaceAvatar = lazy(() => diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/alias_table.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/alias_table.tsx index 1cb5016beb1d67..b0832b41850db1 100644 --- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/alias_table.tsx +++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/alias_table.tsx @@ -18,9 +18,9 @@ import React, { lazy, Suspense, useMemo, useState } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; +import type { InternalLegacyUrlAliasTarget } from './types'; import { getSpaceAvatarComponent } from '../../space_avatar'; import type { SpacesDataEntry } from '../../types'; -import type { InternalLegacyUrlAliasTarget } from './types'; // No need to wrap LazySpaceAvatar in an error boundary, because it is one of the first chunks loaded when opening Kibana. const LazySpaceAvatar = lazy(() => diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx index ac727c2088d381..08062e0c93f564 100644 --- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx +++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx @@ -24,13 +24,13 @@ import React, { lazy, Suspense } from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { NoSpacesAvailable } from './no_spaces_available'; import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../common'; import { ALL_SPACES_ID, UNKNOWN_SPACE } from '../../../common/constants'; import { getSpaceAvatarComponent } from '../../space_avatar'; import { useSpaces } from '../../spaces_context'; import type { SpacesDataEntry } from '../../types'; import type { ShareOptions } from '../types'; -import { NoSpacesAvailable } from './no_spaces_available'; // No need to wrap LazySpaceAvatar in an error boundary, because it is one of the first chunks loaded when opening Kibana. const LazySpaceAvatar = lazy(() => diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_mode_control.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_mode_control.tsx index 7735a94622a77a..e5756b41d438f2 100644 --- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_mode_control.tsx +++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_mode_control.tsx @@ -22,11 +22,11 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { SelectableSpacesControl } from './selectable_spaces_control'; import { ALL_SPACES_ID } from '../../../common/constants'; import { useSpaces } from '../../spaces_context'; import type { SpacesDataEntry } from '../../types'; import type { ShareOptions } from '../types'; -import { SelectableSpacesControl } from './selectable_spaces_control'; interface Props { spaces: SpacesDataEntry[]; diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx index a51ac07b3091b2..42a19fe367dee8 100644 --- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx +++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx @@ -11,15 +11,10 @@ import { act } from '@testing-library/react'; import type { ReactWrapper } from 'enzyme'; import React from 'react'; -import type { SavedObjectReferenceWithContext } from '@kbn/core-saved-objects-api-server'; import { coreMock } from '@kbn/core/public/mocks'; +import type { SavedObjectReferenceWithContext } from '@kbn/core-saved-objects-api-server'; import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers'; -import type { Space } from '../../../common'; -import { ALL_SPACES_ID } from '../../../common/constants'; -import { CopyToSpaceFlyoutInternal } from '../../copy_saved_objects_to_space/components/copy_to_space_flyout_internal'; -import { getSpacesContextProviderWrapper } from '../../spaces_context'; -import { spacesManagerMock } from '../../spaces_manager/mocks'; import { AliasTable } from './alias_table'; import { NoSpacesAvailable } from './no_spaces_available'; import { RelativesFooter } from './relatives_footer'; @@ -27,6 +22,11 @@ import { SelectableSpacesControl } from './selectable_spaces_control'; import { ShareModeControl } from './share_mode_control'; import { getShareToSpaceFlyoutComponent } from './share_to_space_flyout'; import { ShareToSpaceForm } from './share_to_space_form'; +import type { Space } from '../../../common'; +import { ALL_SPACES_ID } from '../../../common/constants'; +import { CopyToSpaceFlyoutInternal } from '../../copy_saved_objects_to_space/components/copy_to_space_flyout_internal'; +import { getSpacesContextProviderWrapper } from '../../spaces_context'; +import { spacesManagerMock } from '../../spaces_manager/mocks'; interface SetupOpts { mockSpaces?: Space[]; diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx index 5d661d84f2a127..96ca0e2917c9d0 100644 --- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx +++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx @@ -23,11 +23,15 @@ import { } from '@elastic/eui'; import React, { lazy, Suspense, useEffect, useMemo, useState } from 'react'; -import type { SavedObjectReferenceWithContext } from '@kbn/core-saved-objects-api-server'; import type { ToastsStart } from '@kbn/core/public'; +import type { SavedObjectReferenceWithContext } from '@kbn/core-saved-objects-api-server'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import { AliasTable } from './alias_table'; +import { RelativesFooter } from './relatives_footer'; +import { ShareToSpaceForm } from './share_to_space_form'; +import type { InternalLegacyUrlAliasTarget } from './types'; import { ALL_SPACES_ID, UNKNOWN_SPACE } from '../../../common/constants'; import { DEFAULT_OBJECT_NOUN } from '../../constants'; import { getCopyToSpaceFlyoutComponent } from '../../copy_saved_objects_to_space'; @@ -39,10 +43,6 @@ import type { ShareToSpaceFlyoutProps, ShareToSpaceSavedObjectTarget, } from '../types'; -import { AliasTable } from './alias_table'; -import { RelativesFooter } from './relatives_footer'; -import { ShareToSpaceForm } from './share_to_space_form'; -import type { InternalLegacyUrlAliasTarget } from './types'; interface SpacesState { isLoading: boolean; diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx index 658a1ca2d09803..e3bc2dc4d0e5f2 100644 --- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx +++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx @@ -12,9 +12,9 @@ import React from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; +import { ShareModeControl } from './share_mode_control'; import type { SpacesDataEntry } from '../../types'; import type { ShareOptions } from '../types'; -import { ShareModeControl } from './share_mode_control'; interface Props { spaces: SpacesDataEntry[]; diff --git a/x-pack/plugins/spaces/public/space_avatar/space_avatar_internal.tsx b/x-pack/plugins/spaces/public/space_avatar/space_avatar_internal.tsx index b8fd5ed77f488b..3f77821a5d92b9 100644 --- a/x-pack/plugins/spaces/public/space_avatar/space_avatar_internal.tsx +++ b/x-pack/plugins/spaces/public/space_avatar/space_avatar_internal.tsx @@ -10,9 +10,9 @@ import { EuiAvatar, isValidHex } from '@elastic/eui'; import type { FC } from 'react'; import React from 'react'; -import { MAX_SPACE_INITIALS } from '../../common'; import { getSpaceColor, getSpaceImageUrl, getSpaceInitials } from './space_attributes'; import type { SpaceAvatarProps } from './types'; +import { MAX_SPACE_INITIALS } from '../../common'; export const SpaceAvatarInternal: FC = (props: SpaceAvatarProps) => { const { space, size, announceSpaceName, ...rest } = props; diff --git a/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx b/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx index db753d7b57ce95..e0e458a03864e8 100644 --- a/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx +++ b/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx @@ -12,11 +12,11 @@ import React from 'react'; import { coreMock } from '@kbn/core/public/mocks'; import { mountWithIntl } from '@kbn/test-jest-helpers'; +import { SpaceListInternal } from './space_list_internal'; +import type { SpaceListProps } from './types'; import type { Space } from '../../common'; import { getSpacesContextProviderWrapper } from '../spaces_context'; import { spacesManagerMock } from '../spaces_manager/mocks'; -import { SpaceListInternal } from './space_list_internal'; -import type { SpaceListProps } from './types'; const ACTIVE_SPACE: Space = { id: 'default', diff --git a/x-pack/plugins/spaces/public/space_list/space_list_internal.tsx b/x-pack/plugins/spaces/public/space_list/space_list_internal.tsx index 9d0bbd344c647d..37f3032a85e5f4 100644 --- a/x-pack/plugins/spaces/public/space_list/space_list_internal.tsx +++ b/x-pack/plugins/spaces/public/space_list/space_list_internal.tsx @@ -19,11 +19,11 @@ import React, { lazy, Suspense, useEffect, useState } from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; +import type { SpaceListProps } from './types'; import { ALL_SPACES_ID, UNKNOWN_SPACE } from '../../common/constants'; import { getSpaceAvatarComponent } from '../space_avatar'; import { useSpaces } from '../spaces_context'; import type { SpacesData, SpacesDataEntry } from '../types'; -import type { SpaceListProps } from './types'; // No need to wrap LazySpaceAvatar in an error boundary, because it is one of the first chunks loaded when opening Kibana. const LazySpaceAvatar = lazy(() => diff --git a/x-pack/plugins/spaces/public/space_selector/components/space_cards.tsx b/x-pack/plugins/spaces/public/space_selector/components/space_cards.tsx index c13a3a53fbe8fc..b803ab2aea324c 100644 --- a/x-pack/plugins/spaces/public/space_selector/components/space_cards.tsx +++ b/x-pack/plugins/spaces/public/space_selector/components/space_cards.tsx @@ -10,8 +10,8 @@ import './space_cards.scss'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import React, { Component } from 'react'; -import type { Space } from '../../../common'; import { SpaceCard } from './space_card'; +import type { Space } from '../../../common'; interface Props { spaces: Space[]; diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.test.tsx b/x-pack/plugins/spaces/public/space_selector/space_selector.test.tsx index 57225e0d6473fb..3b923652da2204 100644 --- a/x-pack/plugins/spaces/public/space_selector/space_selector.test.tsx +++ b/x-pack/plugins/spaces/public/space_selector/space_selector.test.tsx @@ -13,9 +13,9 @@ import { customBrandingServiceMock } from '@kbn/core-custom-branding-browser-moc import { KibanaSolutionAvatar } from '@kbn/shared-ux-avatar-solution'; import { shallowWithIntl } from '@kbn/test-jest-helpers'; +import { SpaceSelector } from './space_selector'; import type { Space } from '../../common'; import { spacesManagerMock } from '../spaces_manager/mocks'; -import { SpaceSelector } from './space_selector'; function getSpacesManager(spaces: Space[] = []) { const manager = spacesManagerMock.create(); diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx index 5a16587fb54341..ee7d320ead7ccd 100644 --- a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx +++ b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx @@ -22,18 +22,18 @@ import React, { Component, Fragment } from 'react'; import ReactDOM from 'react-dom'; import type { Observable, Subscription } from 'rxjs'; -import type { CustomBranding } from '@kbn/core-custom-branding-common'; import type { AppMountParameters, CoreStart } from '@kbn/core/public'; +import type { CustomBranding } from '@kbn/core-custom-branding-common'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; import { KibanaSolutionAvatar } from '@kbn/shared-ux-avatar-solution'; import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template'; +import { SpaceCards } from './components'; import type { Space } from '../../common'; import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../common/constants'; import type { SpacesManager } from '../spaces_manager'; -import { SpaceCards } from './components'; interface Props { spacesManager: SpacesManager; diff --git a/x-pack/plugins/spaces/public/spaces_context/context.tsx b/x-pack/plugins/spaces/public/spaces_context/context.tsx index 820c993ccac59b..69df4a639ca91d 100644 --- a/x-pack/plugins/spaces/public/spaces_context/context.tsx +++ b/x-pack/plugins/spaces/public/spaces_context/context.tsx @@ -9,9 +9,9 @@ import * as React from 'react'; import type { CoreStart } from '@kbn/core/public'; +import type { SpacesReactContext, SpacesReactContextValue } from './types'; import type { SpacesManager } from '../spaces_manager'; import type { SpacesData } from '../types'; -import type { SpacesReactContext, SpacesReactContextValue } from './types'; const { useContext, createElement, createContext } = React; diff --git a/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx b/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx index f316ff3001631a..9a7ab53ecdc682 100644 --- a/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx +++ b/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx @@ -10,11 +10,11 @@ import React, { useEffect, useMemo, useState } from 'react'; import type { ApplicationStart, DocLinksStart, NotificationsStart } from '@kbn/core/public'; +import { createSpacesReactContext } from './context'; +import type { InternalProps, SpacesContextProps, SpacesReactContext } from './types'; import type { GetAllSpacesPurpose } from '../../common'; import type { SpacesManager } from '../spaces_manager'; import type { SpacesData, SpacesDataEntry } from '../types'; -import { createSpacesReactContext } from './context'; -import type { InternalProps, SpacesContextProps, SpacesReactContext } from './types'; interface Services { application: ApplicationStart; diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts index 18de3b0a567c40..61ac8da35d3ae9 100644 --- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts +++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts @@ -8,8 +8,8 @@ import type { Observable } from 'rxjs'; import { of } from 'rxjs'; -import type { Space } from '../../common'; import type { SpacesManager } from './spaces_manager'; +import type { Space } from '../../common'; function createSpacesManagerMock() { return { diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts index e08e8c4b29ae08..3f2dff01d8914a 100644 --- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts +++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts @@ -9,9 +9,9 @@ import type { Observable } from 'rxjs'; import { BehaviorSubject } from 'rxjs'; import { skipWhile } from 'rxjs/operators'; +import type { HttpSetup } from '@kbn/core/public'; import type { SavedObjectsCollectMultiNamespaceReferencesResponse } from '@kbn/core-saved-objects-api-server'; import type { LegacyUrlAliasTarget } from '@kbn/core-saved-objects-common'; -import type { HttpSetup } from '@kbn/core/public'; import type { GetAllSpacesOptions, GetSpaceResult, Space } from '../../common'; import type { CopySavedObjectsToSpaceResponse } from '../copy_saved_objects_to_space/types'; diff --git a/x-pack/plugins/spaces/public/types.ts b/x-pack/plugins/spaces/public/types.ts index fd926621b72da0..edde4ad4c86622 100644 --- a/x-pack/plugins/spaces/public/types.ts +++ b/x-pack/plugins/spaces/public/types.ts @@ -7,8 +7,8 @@ import type { Observable } from 'rxjs'; -import type { GetAllSpacesPurpose, GetSpaceResult, Space } from '../common'; import type { SpacesApiUi } from './ui_api'; +import type { GetAllSpacesPurpose, GetSpaceResult, Space } from '../common'; /** * The structure for all of the space data that must be loaded for share-to-space components to function. diff --git a/x-pack/plugins/spaces/public/ui_api/components.tsx b/x-pack/plugins/spaces/public/ui_api/components.tsx index c6623dfaf508b6..abf9e8c0ecd1ce 100644 --- a/x-pack/plugins/spaces/public/ui_api/components.tsx +++ b/x-pack/plugins/spaces/public/ui_api/components.tsx @@ -10,6 +10,8 @@ import React from 'react'; import type { StartServicesAccessor } from '@kbn/core/public'; +import { LazyWrapper } from './lazy_wrapper'; +import type { SpacesApiUiComponent } from './types'; import { getCopyToSpaceFlyoutComponent } from '../copy_saved_objects_to_space'; import { getEmbeddableLegacyUrlConflict, getLegacyUrlConflict } from '../legacy_urls'; import type { PluginsStart } from '../plugin'; @@ -18,8 +20,6 @@ import { getSpaceAvatarComponent } from '../space_avatar'; import { getSpaceListComponent } from '../space_list'; import { getSpacesContextProviderWrapper } from '../spaces_context'; import type { SpacesManager } from '../spaces_manager'; -import { LazyWrapper } from './lazy_wrapper'; -import type { SpacesApiUiComponent } from './types'; export interface GetComponentsOptions { spacesManager: SpacesManager; diff --git a/x-pack/plugins/spaces/public/ui_api/index.ts b/x-pack/plugins/spaces/public/ui_api/index.ts index ad38a927845452..ec0f7d25e188df 100644 --- a/x-pack/plugins/spaces/public/ui_api/index.ts +++ b/x-pack/plugins/spaces/public/ui_api/index.ts @@ -7,12 +7,12 @@ import type { StartServicesAccessor } from '@kbn/core/public'; +import { getComponents } from './components'; +import type { LazyComponentFn, SpacesApiUi, SpacesApiUiComponent } from './types'; import { createRedirectLegacyUrl } from '../legacy_urls'; import type { PluginsStart } from '../plugin'; import { useSpaces } from '../spaces_context'; import type { SpacesManager } from '../spaces_manager'; -import { getComponents } from './components'; -import type { LazyComponentFn, SpacesApiUi, SpacesApiUiComponent } from './types'; interface GetUiApiOptions { spacesManager: SpacesManager; diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts index 5ad5e49052a715..b7bb839a752c65 100644 --- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts +++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts @@ -10,10 +10,10 @@ import { coreMock, httpServerMock, loggingSystemMock } from '@kbn/core/server/mo import type { KibanaFeature } from '@kbn/features-plugin/server'; import { featuresPluginMock } from '@kbn/features-plugin/server/mocks'; +import { setupCapabilitiesSwitcher } from './capabilities_switcher'; import type { Space } from '../../common'; import type { PluginsStart } from '../plugin'; import { spacesServiceMock } from '../spaces_service/spaces_service.mock'; -import { setupCapabilitiesSwitcher } from './capabilities_switcher'; const features = [ { diff --git a/x-pack/plugins/spaces/server/capabilities/index.ts b/x-pack/plugins/spaces/server/capabilities/index.ts index 47f19b2d8b264f..745015b50042f4 100644 --- a/x-pack/plugins/spaces/server/capabilities/index.ts +++ b/x-pack/plugins/spaces/server/capabilities/index.ts @@ -7,10 +7,10 @@ import type { CoreSetup, Logger } from '@kbn/core/server'; -import type { PluginsStart } from '../plugin'; -import type { SpacesServiceStart } from '../spaces_service'; import { capabilitiesProvider } from './capabilities_provider'; import { setupCapabilitiesSwitcher } from './capabilities_switcher'; +import type { PluginsStart } from '../plugin'; +import type { SpacesServiceStart } from '../spaces_service'; export const setupCapabilities = ( core: CoreSetup, diff --git a/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts b/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts index 7bda2f9aedb77a..2a2bc43aff4c7c 100644 --- a/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts +++ b/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts @@ -15,12 +15,12 @@ import { licensingMock } from '@kbn/licensing-plugin/server/mocks'; import { nextTick } from '@kbn/test-jest-helpers'; import type { Writable } from '@kbn/utility-types'; -import { SpacesLicenseService } from '../../common/licensing'; import { DefaultSpaceService, RETRY_DURATION_MAX, RETRY_SCALE_DURATION, } from './default_space_service'; +import { SpacesLicenseService } from '../../common/licensing'; const advanceRetry = async (initializeCount: number) => { await Promise.resolve(); diff --git a/x-pack/plugins/spaces/server/default_space/default_space_service.ts b/x-pack/plugins/spaces/server/default_space/default_space_service.ts index 8ba115e5d32f53..26059fe90ea36c 100644 --- a/x-pack/plugins/spaces/server/default_space/default_space_service.ts +++ b/x-pack/plugins/spaces/server/default_space/default_space_service.ts @@ -13,8 +13,8 @@ import type { CoreSetup, Logger, SavedObjectsServiceStart, ServiceStatus } from import { ServiceStatusLevels } from '@kbn/core/server'; import type { ILicense } from '@kbn/licensing-plugin/server'; -import type { SpacesLicense } from '../../common/licensing'; import { createDefaultSpace } from './create_default_space'; +import type { SpacesLicense } from '../../common/licensing'; interface Deps { coreStatus: CoreSetup['status']; diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts index ddb08095b1dc33..d6da6899b25bfd 100644 --- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts +++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts @@ -9,14 +9,14 @@ import type { Readable } from 'stream'; import type { CoreStart, KibanaRequest, SavedObject } from '@kbn/core/server'; -import { ALL_SPACES_ID } from '../../../common/constants'; -import { spaceIdToNamespace } from '../utils/namespace'; import { createEmptyFailureResponse } from './lib/create_empty_failure_response'; import { getIneligibleTypes } from './lib/get_ineligible_types'; import { readStreamToCompletion } from './lib/read_stream_to_completion'; import { createReadableStreamFromArray } from './lib/readable_stream_from_array'; import { COPY_TO_SPACES_SAVED_OBJECTS_CLIENT_OPTS } from './lib/saved_objects_client_opts'; import type { CopyOptions, CopyResponse } from './types'; +import { ALL_SPACES_ID } from '../../../common/constants'; +import { spaceIdToNamespace } from '../utils/namespace'; export function copySavedObjectsToSpacesFactory( savedObjects: CoreStart['savedObjects'], diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts index 122d1dbd182b45..d071d19e384c68 100644 --- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts +++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { SPACES_EXTENSION_ID } from '@kbn/core-saved-objects-server'; import type { SavedObjectsClientProviderOptions } from '@kbn/core/server'; +import { SPACES_EXTENSION_ID } from '@kbn/core-saved-objects-server'; export const COPY_TO_SPACES_SAVED_OBJECTS_CLIENT_OPTS: SavedObjectsClientProviderOptions = { excludedExtensions: [SPACES_EXTENSION_ID], diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts index a82e8ff6bc689e..b33dd82c7bb8db 100644 --- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts +++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts @@ -14,13 +14,13 @@ import type { SavedObjectsImportRetry, } from '@kbn/core/server'; -import { spaceIdToNamespace } from '../utils/namespace'; import { createEmptyFailureResponse } from './lib/create_empty_failure_response'; import { getIneligibleTypes } from './lib/get_ineligible_types'; import { readStreamToCompletion } from './lib/read_stream_to_completion'; import { createReadableStreamFromArray } from './lib/readable_stream_from_array'; import { COPY_TO_SPACES_SAVED_OBJECTS_CLIENT_OPTS } from './lib/saved_objects_client_opts'; import type { CopyOptions, CopyResponse, ResolveConflictsOptions } from './types'; +import { spaceIdToNamespace } from '../utils/namespace'; export function resolveCopySavedObjectsToSpacesConflictsFactory( savedObjects: CoreStart['savedObjects'], diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts index df381982466f45..24a94b43029e0b 100644 --- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts +++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts @@ -7,23 +7,22 @@ import Boom from '@hapi/boom'; -// @ts-ignore +import type { CoreSetup, IBasePath, IRouter, RequestHandlerContext } from '@kbn/core/server'; +import { SavedObjectsErrorHelpers } from '@kbn/core/server'; +import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; import { type createRoot, request as kbnTestServerRequest, } from '@kbn/core-test-helpers-kbn-server'; -import type { CoreSetup, IBasePath, IRouter, RequestHandlerContext } from '@kbn/core/server'; -import { SavedObjectsErrorHelpers } from '@kbn/core/server'; -import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; import type { KibanaFeature } from '@kbn/features-plugin/server'; import { featuresPluginMock } from '@kbn/features-plugin/server/mocks'; import { kibanaTestUser } from '@kbn/test'; +import { initSpacesOnPostAuthRequestInterceptor } from './on_post_auth_interceptor'; +import { initSpacesOnRequestInterceptor } from './on_request_interceptor'; import { convertSavedObjectToSpace } from '../../routes/lib'; import { spacesClientServiceMock } from '../../spaces_client/spaces_client_service.mock'; import { SpacesService } from '../../spaces_service'; -import { initSpacesOnPostAuthRequestInterceptor } from './on_post_auth_interceptor'; -import { initSpacesOnRequestInterceptor } from './on_request_interceptor'; // FLAKY: https://github.com/elastic/kibana/issues/55953 describe.skip('onPostAuthInterceptor', () => { diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts index b495e930f3944e..bf3d0a57ccae25 100644 --- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts +++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts @@ -6,7 +6,6 @@ */ import { schema } from '@kbn/config-schema'; -import { type createRoot, request } from '@kbn/core-test-helpers-kbn-server'; import type { CoreSetup, IBasePath, @@ -16,6 +15,7 @@ import type { RequestHandlerContext, } from '@kbn/core/server'; import { elasticsearchServiceMock } from '@kbn/core/server/mocks'; +import { type createRoot, request } from '@kbn/core-test-helpers-kbn-server'; import { initSpacesOnRequestInterceptor } from './on_request_interceptor'; diff --git a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts index 0c07a77468f6f4..82ab96fde81ce5 100644 --- a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts +++ b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts @@ -7,11 +7,11 @@ import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; +import { createSpacesTutorialContextFactory } from './spaces_tutorial_context_factory'; import { DEFAULT_SPACE_ID } from '../../common/constants'; import { spacesClientServiceMock } from '../spaces_client/spaces_client_service.mock'; import { SpacesService } from '../spaces_service'; import { spacesServiceMock } from '../spaces_service/spaces_service.mock'; -import { createSpacesTutorialContextFactory } from './spaces_tutorial_context_factory'; const service = new SpacesService(); diff --git a/x-pack/plugins/spaces/server/plugin.ts b/x-pack/plugins/spaces/server/plugin.ts index 19c79c244e6c1b..cb8b42f343baa2 100644 --- a/x-pack/plugins/spaces/server/plugin.ts +++ b/x-pack/plugins/spaces/server/plugin.ts @@ -22,7 +22,6 @@ import type { HomeServerPluginSetup } from '@kbn/home-plugin/server'; import type { LicensingPluginSetup } from '@kbn/licensing-plugin/server'; import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server'; -import { SpacesLicenseService } from '../common/licensing'; import { setupCapabilities } from './capabilities'; import type { ConfigType } from './config'; import { DefaultSpaceService } from './default_space'; @@ -39,6 +38,7 @@ import { SpacesService } from './spaces_service'; import type { SpacesRequestHandlerContext } from './types'; import { registerSpacesUsageCollector } from './usage_collection'; import { UsageStatsService } from './usage_stats'; +import { SpacesLicenseService } from '../common/licensing'; export interface PluginsSetup { features: FeaturesPluginSetup; diff --git a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts index c43fcb627d60b6..4018cfa11b7b73 100644 --- a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts @@ -8,7 +8,6 @@ import * as Rx from 'rxjs'; import type { ObjectType } from '@kbn/config-schema'; -import { SPACES_EXTENSION_ID } from '@kbn/core-saved-objects-server'; import type { RouteValidatorConfig } from '@kbn/core/server'; import { kibanaResponseFactory } from '@kbn/core/server'; import { @@ -17,7 +16,9 @@ import { httpServiceMock, loggingSystemMock, } from '@kbn/core/server/mocks'; +import { SPACES_EXTENSION_ID } from '@kbn/core-saved-objects-server'; +import { initCopyToSpacesApi } from './copy_to_space'; import { spacesConfig } from '../../../lib/__fixtures__'; import { SpacesClientService } from '../../../spaces_client'; import { SpacesService } from '../../../spaces_service'; @@ -33,7 +34,6 @@ import { mockRouteContext, mockRouteContextWithInvalidLicense, } from '../__fixtures__'; -import { initCopyToSpacesApi } from './copy_to_space'; describe('copy to space', () => { const spacesSavedObjects = createSpaces(); diff --git a/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts index 95260615e86f4d..02792389424dbe 100644 --- a/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts @@ -17,6 +17,7 @@ import { loggingSystemMock, } from '@kbn/core/server/mocks'; +import { initDeleteSpacesApi } from './delete'; import { spacesConfig } from '../../../lib/__fixtures__'; import { SpacesClientService } from '../../../spaces_client'; import { SpacesService } from '../../../spaces_service'; @@ -27,7 +28,6 @@ import { mockRouteContext, mockRouteContextWithInvalidLicense, } from '../__fixtures__'; -import { initDeleteSpacesApi } from './delete'; describe('Spaces Public API', () => { const spacesSavedObjects = createSpaces(); diff --git a/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts b/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts index b4fa5d677b2551..6af58c124be085 100644 --- a/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts @@ -16,6 +16,7 @@ import { loggingSystemMock, } from '@kbn/core/server/mocks'; +import { initDisableLegacyUrlAliasesApi } from './disable_legacy_url_aliases'; import { spacesConfig } from '../../../lib/__fixtures__'; import { SpacesClientService } from '../../../spaces_client'; import { SpacesService } from '../../../spaces_service'; @@ -27,7 +28,6 @@ import { mockRouteContext, mockRouteContextWithInvalidLicense, } from '../__fixtures__'; -import { initDisableLegacyUrlAliasesApi } from './disable_legacy_url_aliases'; describe('_disable_legacy_url_aliases', () => { const spacesSavedObjects = createSpaces(); diff --git a/x-pack/plugins/spaces/server/routes/api/external/get.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get.test.ts index 818c748a97498b..43ac45ec3c4c57 100644 --- a/x-pack/plugins/spaces/server/routes/api/external/get.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/get.test.ts @@ -15,6 +15,7 @@ import { loggingSystemMock, } from '@kbn/core/server/mocks'; +import { initGetSpaceApi } from './get'; import { spacesConfig } from '../../../lib/__fixtures__'; import { SpacesClientService } from '../../../spaces_client'; import { SpacesService } from '../../../spaces_service'; @@ -25,7 +26,6 @@ import { mockRouteContext, mockRouteContextWithInvalidLicense, } from '../__fixtures__'; -import { initGetSpaceApi } from './get'; describe('GET space', () => { const spacesSavedObjects = createSpaces(); diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts index 923d1668f59a66..8fa87bf5ffa427 100644 --- a/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts @@ -16,6 +16,7 @@ import { loggingSystemMock, } from '@kbn/core/server/mocks'; +import { initGetAllSpacesApi } from './get_all'; import { spacesConfig } from '../../../lib/__fixtures__'; import { SpacesClientService } from '../../../spaces_client'; import { SpacesService } from '../../../spaces_service'; @@ -26,7 +27,6 @@ import { mockRouteContext, mockRouteContextWithInvalidLicense, } from '../__fixtures__'; -import { initGetAllSpacesApi } from './get_all'; describe('GET /spaces/space', () => { const spacesSavedObjects = createSpaces(); diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts index 5a1046579bfdea..daa957c04d11f6 100644 --- a/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts @@ -16,6 +16,7 @@ import { loggingSystemMock, } from '@kbn/core/server/mocks'; +import { initGetShareableReferencesApi } from './get_shareable_references'; import { spacesConfig } from '../../../lib/__fixtures__'; import { SpacesClientService } from '../../../spaces_client'; import { SpacesService } from '../../../spaces_service'; @@ -27,7 +28,6 @@ import { mockRouteContext, mockRouteContextWithInvalidLicense, } from '../__fixtures__'; -import { initGetShareableReferencesApi } from './get_shareable_references'; describe('get shareable references', () => { const spacesSavedObjects = createSpaces(); diff --git a/x-pack/plugins/spaces/server/routes/api/external/index.ts b/x-pack/plugins/spaces/server/routes/api/external/index.ts index b4126e76a71106..8716f63a5657ff 100644 --- a/x-pack/plugins/spaces/server/routes/api/external/index.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/index.ts @@ -7,9 +7,6 @@ import type { CoreSetup, Logger } from '@kbn/core/server'; -import type { SpacesServiceStart } from '../../../spaces_service'; -import type { SpacesRouter } from '../../../types'; -import type { UsageStatsServiceSetup } from '../../../usage_stats'; import { initCopyToSpacesApi } from './copy_to_space'; import { initDeleteSpacesApi } from './delete'; import { initDisableLegacyUrlAliasesApi } from './disable_legacy_url_aliases'; @@ -19,6 +16,9 @@ import { initGetShareableReferencesApi } from './get_shareable_references'; import { initPostSpacesApi } from './post'; import { initPutSpacesApi } from './put'; import { initUpdateObjectsSpacesApi } from './update_objects_spaces'; +import type { SpacesServiceStart } from '../../../spaces_service'; +import type { SpacesRouter } from '../../../types'; +import type { UsageStatsServiceSetup } from '../../../usage_stats'; export interface ExternalRouteDeps { externalRouter: SpacesRouter; diff --git a/x-pack/plugins/spaces/server/routes/api/external/post.test.ts b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts index 57a724a16ece83..01c08eca85ec76 100644 --- a/x-pack/plugins/spaces/server/routes/api/external/post.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts @@ -17,6 +17,7 @@ import { loggingSystemMock, } from '@kbn/core/server/mocks'; +import { initPostSpacesApi } from './post'; import { spacesConfig } from '../../../lib/__fixtures__'; import { SpacesClientService } from '../../../spaces_client'; import { SpacesService } from '../../../spaces_service'; @@ -27,7 +28,6 @@ import { mockRouteContext, mockRouteContextWithInvalidLicense, } from '../__fixtures__'; -import { initPostSpacesApi } from './post'; describe('Spaces Public API', () => { const spacesSavedObjects = createSpaces(); diff --git a/x-pack/plugins/spaces/server/routes/api/external/put.test.ts b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts index ac85d14989ebb1..126d15268edf8d 100644 --- a/x-pack/plugins/spaces/server/routes/api/external/put.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts @@ -17,6 +17,7 @@ import { loggingSystemMock, } from '@kbn/core/server/mocks'; +import { initPutSpacesApi } from './put'; import { spacesConfig } from '../../../lib/__fixtures__'; import { SpacesClientService } from '../../../spaces_client'; import { SpacesService } from '../../../spaces_service'; @@ -27,7 +28,6 @@ import { mockRouteContext, mockRouteContextWithInvalidLicense, } from '../__fixtures__'; -import { initPutSpacesApi } from './put'; describe('PUT /api/spaces/space', () => { const spacesSavedObjects = createSpaces(); diff --git a/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts b/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts index 0e7808dccfc1b6..4c5fd44a6bb30e 100644 --- a/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts @@ -17,6 +17,7 @@ import { loggingSystemMock, } from '@kbn/core/server/mocks'; +import { initUpdateObjectsSpacesApi } from './update_objects_spaces'; import { spacesConfig } from '../../../lib/__fixtures__'; import { SpacesClientService } from '../../../spaces_client'; import { SpacesService } from '../../../spaces_service'; @@ -28,7 +29,6 @@ import { mockRouteContext, mockRouteContextWithInvalidLicense, } from '../__fixtures__'; -import { initUpdateObjectsSpacesApi } from './update_objects_spaces'; describe('update_objects_spaces', () => { const spacesSavedObjects = createSpaces(); diff --git a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts index 6c239a7d0c9bec..172f1afec53cf6 100644 --- a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts @@ -8,10 +8,10 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock, httpServiceMock } from '@kbn/core/server/mocks'; +import { initGetActiveSpaceApi } from './get_active_space'; import { spacesClientServiceMock } from '../../../spaces_client/spaces_client_service.mock'; import { SpacesService } from '../../../spaces_service'; import { mockRouteContextWithInvalidLicense } from '../__fixtures__'; -import { initGetActiveSpaceApi } from './get_active_space'; describe('GET /internal/spaces/_active_space', () => { const setup = async () => { diff --git a/x-pack/plugins/spaces/server/routes/api/internal/index.ts b/x-pack/plugins/spaces/server/routes/api/internal/index.ts index 7263adad43f821..2f732bfcaf5ab5 100644 --- a/x-pack/plugins/spaces/server/routes/api/internal/index.ts +++ b/x-pack/plugins/spaces/server/routes/api/internal/index.ts @@ -5,9 +5,9 @@ * 2.0. */ +import { initGetActiveSpaceApi } from './get_active_space'; import type { SpacesServiceStart } from '../../../spaces_service/spaces_service'; import type { SpacesRouter } from '../../../types'; -import { initGetActiveSpaceApi } from './get_active_space'; export interface InternalRouteDeps { internalRouter: SpacesRouter; diff --git a/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.test.ts b/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.test.ts index e07050fe97d73a..af09ab75f508f5 100644 --- a/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.test.ts +++ b/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.test.ts @@ -5,8 +5,8 @@ * 2.0. */ -import type { Space } from '../../../common'; import { migrateTo660 } from './space_migrations'; +import type { Space } from '../../../common'; describe('migrateTo660', () => { it('adds a "disabledFeatures" attribute initialized as an empty array', () => { diff --git a/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts b/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts index c8beb16c4df088..cfe83a3c42f2fe 100644 --- a/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts +++ b/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts @@ -7,8 +7,8 @@ import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server'; -import type { UsageStats } from '../../usage_stats'; import { migrateTo7141 } from './usage_stats_migrations'; +import type { UsageStats } from '../../usage_stats'; const type = 'obj-type'; const id = 'obj-id'; diff --git a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts index 92727dc223fc32..c32fb2bc2854f8 100644 --- a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts +++ b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts @@ -7,9 +7,9 @@ import { coreMock } from '@kbn/core/server/mocks'; +import { SpacesSavedObjectsService } from './saved_objects_service'; import { spacesServiceMock } from '../spaces_service/spaces_service.mock'; import { SPACES_USAGE_STATS_TYPE } from '../usage_stats'; -import { SpacesSavedObjectsService } from './saved_objects_service'; describe('SpacesSavedObjectsService', () => { describe('#setup', () => { diff --git a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts index 42cc1ea620640f..b86bbf58f065ce 100644 --- a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts +++ b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts @@ -7,12 +7,12 @@ import type { CoreSetup } from '@kbn/core/server'; -import type { SpacesServiceStart } from '../spaces_service'; -import { SPACES_USAGE_STATS_TYPE } from '../usage_stats'; import { SpacesSavedObjectMappings, UsageStatsMappings } from './mappings'; import { spaceMigrations, usageStatsMigrations } from './migrations'; import { SavedObjectsSpacesExtension } from './saved_objects_spaces_extension'; import { SpacesSavedObjectSchemas } from './schemas'; +import type { SpacesServiceStart } from '../spaces_service'; +import { SPACES_USAGE_STATS_TYPE } from '../usage_stats'; interface SetupDeps { core: Pick; diff --git a/x-pack/plugins/spaces/server/saved_objects/saved_objects_spaces_extension.test.ts b/x-pack/plugins/spaces/server/saved_objects/saved_objects_spaces_extension.test.ts index 4dc6ae8cd24971..a2a4877ac4d9ac 100644 --- a/x-pack/plugins/spaces/server/saved_objects/saved_objects_spaces_extension.test.ts +++ b/x-pack/plugins/spaces/server/saved_objects/saved_objects_spaces_extension.test.ts @@ -9,8 +9,8 @@ import { mockSpaceIdToNamespace } from './saved_objects_spaces_extension.test.mo import Boom from '@hapi/boom'; -import { spacesClientMock } from '../mocks'; import { SavedObjectsSpacesExtension } from './saved_objects_spaces_extension'; +import { spacesClientMock } from '../mocks'; const ACTIVE_SPACE_ID = 'active-spaceId'; function setup() { diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts index d18fe5d5ec3a9d..fe36c9ea72cd6f 100644 --- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts +++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts @@ -7,9 +7,9 @@ import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks'; +import type { SpacesClient } from './spaces_client'; import type { Space } from '../../common'; import { DEFAULT_SPACE_ID } from '../../common/constants'; -import type { SpacesClient } from './spaces_client'; const createSpacesClientMock = () => { const repositoryMock = savedObjectsRepositoryMock.create(); diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts index 709faff41c4779..e9305f07f1b0ee 100644 --- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts +++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts @@ -5,13 +5,13 @@ * 2.0. */ -import type { SavedObject } from '@kbn/core-saved-objects-server'; import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks'; +import type { SavedObject } from '@kbn/core-saved-objects-server'; +import { SpacesClient } from './spaces_client'; import type { GetAllSpacesPurpose, Space } from '../../common'; import type { ConfigType } from '../config'; import { ConfigSchema } from '../config'; -import { SpacesClient } from './spaces_client'; const createMockDebugLogger = () => { return jest.fn(); diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts index a09ddf8ad3f38f..cc4058ad22485a 100644 --- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts +++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts @@ -7,12 +7,12 @@ import Boom from '@hapi/boom'; -import type { LegacyUrlAliasTarget } from '@kbn/core-saved-objects-common'; import type { ISavedObjectsPointInTimeFinder, ISavedObjectsRepository, SavedObject, } from '@kbn/core/server'; +import type { LegacyUrlAliasTarget } from '@kbn/core-saved-objects-common'; import { isReservedSpace } from '../../common'; import type { spaceV1 as v1 } from '../../common'; diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.mock.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.mock.ts index da9dcd86eed2aa..4f56739bda71b2 100644 --- a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.mock.ts +++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.mock.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { spacesClientMock } from '../mocks'; import type { SpacesClientServiceSetup, SpacesClientServiceStart } from './spaces_client_service'; +import { spacesClientMock } from '../mocks'; const createSpacesClientServiceSetupMock = () => ({ diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts index 36a4438266239a..455387a816bd50 100644 --- a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts +++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts @@ -9,11 +9,11 @@ import * as Rx from 'rxjs'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; -import type { ConfigType } from '../config'; -import { spacesConfig } from '../lib/__fixtures__'; import type { ISpacesClient } from './spaces_client'; import { SpacesClient } from './spaces_client'; import { SpacesClientService } from './spaces_client_service'; +import type { ConfigType } from '../config'; +import { spacesConfig } from '../lib/__fixtures__'; const debugLogger = jest.fn(); diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts index 21b6de36dbd3f7..8a6c0eaab0d3b8 100644 --- a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts +++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts @@ -14,9 +14,9 @@ import type { SavedObjectsServiceStart, } from '@kbn/core/server'; -import type { ConfigType } from '../config'; import type { ISpacesClient } from './spaces_client'; import { SpacesClient } from './spaces_client'; +import type { ConfigType } from '../config'; /** * For consumption by the security plugin only. diff --git a/x-pack/plugins/spaces/server/spaces_service/spaces_service.mock.ts b/x-pack/plugins/spaces/server/spaces_service/spaces_service.mock.ts index 625e02a557288d..2d1ea97891ff16 100644 --- a/x-pack/plugins/spaces/server/spaces_service/spaces_service.mock.ts +++ b/x-pack/plugins/spaces/server/spaces_service/spaces_service.mock.ts @@ -5,10 +5,10 @@ * 2.0. */ +import type { SpacesServiceSetup, SpacesServiceStart } from './spaces_service'; import { DEFAULT_SPACE_ID } from '../../common/constants'; import { namespaceToSpaceId, spaceIdToNamespace } from '../lib/utils/namespace'; import { spacesClientMock } from '../spaces_client/spaces_client.mock'; -import type { SpacesServiceSetup, SpacesServiceStart } from './spaces_service'; const createSetupContractMock = (spaceId = DEFAULT_SPACE_ID) => { const setupContract: jest.Mocked = { diff --git a/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts b/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts index cf7e27941508c2..694fb5b69e46ae 100644 --- a/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts +++ b/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts @@ -11,11 +11,11 @@ import type { HttpServiceSetup, KibanaRequest, SavedObjectsRepository } from '@k import { SavedObjectsErrorHelpers } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; +import { SpacesService } from './spaces_service'; import { DEFAULT_SPACE_ID } from '../../common/constants'; import { getSpaceIdFromPath } from '../../common/lib/spaces_url_parser'; import { spacesConfig } from '../lib/__fixtures__'; import { SpacesClientService } from '../spaces_client'; -import { SpacesService } from './spaces_service'; const createService = (serverBasePath: string = '') => { const spacesService = new SpacesService(); diff --git a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts index 36d2c99503c111..5f7f42b3713877 100644 --- a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts +++ b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts @@ -12,12 +12,12 @@ import type { KibanaFeature } from '@kbn/features-plugin/server'; import type { ILicense, LicensingPluginSetup } from '@kbn/licensing-plugin/server'; import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks'; +import type { UsageData } from './spaces_usage_collector'; +import { getSpacesUsageCollector } from './spaces_usage_collector'; import type { PluginsSetup } from '../plugin'; import type { UsageStats } from '../usage_stats'; import { usageStatsClientMock } from '../usage_stats/usage_stats_client.mock'; import { usageStatsServiceMock } from '../usage_stats/usage_stats_service.mock'; -import type { UsageData } from './spaces_usage_collector'; -import { getSpacesUsageCollector } from './spaces_usage_collector'; interface SetupOpts { license?: Partial; diff --git a/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts b/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts index 0c2c43eef68a7c..b7b95c742b4c56 100644 --- a/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts +++ b/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts @@ -7,9 +7,9 @@ import type { Headers, ISavedObjectsRepository } from '@kbn/core/server'; -import type { CopyOptions, ResolveConflictsOptions } from '../lib/copy_to_spaces/types'; import { SPACES_USAGE_STATS_ID, SPACES_USAGE_STATS_TYPE } from './constants'; import type { UsageStats } from './types'; +import type { CopyOptions, ResolveConflictsOptions } from '../lib/copy_to_spaces/types'; interface BaseIncrementOptions { headers?: Headers; diff --git a/yarn.lock b/yarn.lock index 952c808afb0669..971e76ee0dcf38 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@aashutoshrathi/word-wrap@^1.2.3": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" + integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== + "@adobe/css-tools@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.0.1.tgz#b38b444ad3aa5fedbb15f2f746dcd934226a12dd" @@ -73,13 +78,6 @@ "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3" chokidar "^3.4.0" -"@babel/code-frame@7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== - dependencies: - "@babel/highlight" "^7.10.4" - "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" @@ -384,7 +382,7 @@ "@babel/traverse" "^7.21.0" "@babel/types" "^7.21.0" -"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6": +"@babel/highlight@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== @@ -1177,15 +1175,7 @@ pirates "^4.0.5" source-map-support "^0.5.16" -"@babel/runtime-corejs3@^7.10.2": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.20.0.tgz#56ef7af3cd23d1570969809a5a8782e774e0141a" - integrity sha512-v1JH7PeAAGBEyTQM9TqojVl+b20zXtesFKCJHu50xMxZKD1fX0TKaKHPsZfFkXfs7D1M9M6Eeqg1FkJ3a0x2dA== - dependencies: - core-js-pure "^3.25.1" - regenerator-runtime "^0.13.10" - -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== @@ -2085,21 +2075,38 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz#c5a1a4bfe1b57f0c3e61b29883525c6da3e5c091" integrity sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q== -"@eslint/eslintrc@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" - integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== +"@eslint-community/eslint-utils@^4.2.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" + integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== + dependencies: + eslint-visitor-keys "^3.3.0" + +"@eslint-community/regexpp@^4.4.0": + version "4.5.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884" + integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ== + +"@eslint/eslintrc@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d" + integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A== dependencies: ajv "^6.12.4" - debug "^4.1.1" - espree "^7.3.0" - globals "^13.9.0" - ignore "^4.0.6" + debug "^4.3.2" + espree "^9.6.0" + globals "^13.19.0" + ignore "^5.2.0" import-fresh "^3.2.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" + js-yaml "^4.1.0" + minimatch "^3.1.2" strip-json-comments "^3.1.1" +"@eslint/js@8.44.0": + version "8.44.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af" + integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw== + "@foliojs-fork/fontkit@^1.9.1": version "1.9.1" resolved "https://registry.yarnpkg.com/@foliojs-fork/fontkit/-/fontkit-1.9.1.tgz#8124649168eb5273f580f66697a139fb5041296b" @@ -2472,19 +2479,24 @@ "@hapi/bourne" "2.x.x" "@hapi/hoek" "9.x.x" -"@humanwhocodes/config-array@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" - integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== +"@humanwhocodes/config-array@^0.11.10": + version "0.11.10" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2" + integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ== dependencies: - "@humanwhocodes/object-schema" "^1.2.0" + "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" - minimatch "^3.0.4" + minimatch "^3.0.5" -"@humanwhocodes/object-schema@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" - integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + +"@humanwhocodes/object-schema@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== "@icons/material@^0.2.4": version "0.2.4" @@ -6303,30 +6315,30 @@ dependencies: eslint-scope "5.1.1" -"@nodelib/fs.scandir@2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" - integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw== +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== dependencies: - "@nodelib/fs.stat" "2.0.3" + "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" - integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA== +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.stat@^1.1.2": version "1.1.3" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@nodelib/fs.walk@^1.2.3": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" - integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ== +"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: - "@nodelib/fs.scandir" "2.1.3" + "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" "@npmcli/fs@^1.0.0": @@ -8560,18 +8572,18 @@ "@types/eslint" "*" "@types/estree" "*" -"@types/eslint@*": - version "8.4.6" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.6.tgz#7976f054c1bccfcf514bff0564c0c41df5c08207" - integrity sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g== +"@types/eslint@*", "@types/eslint@^8.44.1": + version "8.44.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.1.tgz#d1811559bb6bcd1a76009e3f7883034b78a0415e" + integrity sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg== dependencies: "@types/estree" "*" "@types/json-schema" "*" -"@types/eslint@^7.2.13", "@types/eslint@^7.28.0": - version "7.28.0" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" - integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== +"@types/eslint@^7.2.13": + version "7.29.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78" + integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -10319,7 +10331,7 @@ acorn-import-assertions@^1.7.6: resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== -acorn-jsx@^5.3.1: +acorn-jsx@^5.3.1, acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== @@ -10353,15 +10365,15 @@ acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== -acorn@^7.0.0, acorn@^7.4.0, acorn@^7.4.1: +acorn@^7.0.0, acorn@^7.4.1: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.1.0, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" - integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== +acorn@^8.0.4, acorn@^8.1.0, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.9.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== address@^1.0.1: version "1.1.2" @@ -10776,18 +10788,12 @@ aria-hidden@^1.2.2: dependencies: tslib "^2.0.0" -aria-query@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" - integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA== +aria-query@^5.0.0, aria-query@^5.1.3: + version "5.3.0" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e" + integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A== dependencies: - "@babel/runtime" "^7.10.2" - "@babel/runtime-corejs3" "^7.10.2" - -aria-query@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c" - integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg== + dequal "^2.0.3" arr-diff@^4.0.0: version "4.0.0" @@ -10842,7 +10848,7 @@ array-from@^2.1.1: resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195" integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU= -array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3, array-includes@^3.1.6: +array-includes@^3.0.3, array-includes@^3.1.2, array-includes@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== @@ -10875,14 +10881,15 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" - integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== +array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3, array.prototype.flat@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" + integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + es-shim-unscopables "^1.0.0" array.prototype.flatmap@^1.2.1, array.prototype.flatmap@^1.3.1: version "1.3.1" @@ -11143,20 +11150,10 @@ axe-core@^3.5.5: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-3.5.6.tgz#e762a90d7f6dbd244ceacb4e72760ff8aad521b5" integrity sha512-LEUDjgmdJoA3LqklSTwKYqkjcZ4HKc4ddIYGSAiSkr46NTjzg2L9RNB+lekO9P7Dlpa87+hBtzc2Fzn/+GUWMQ== -axe-core@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.0.2.tgz#c7cf7378378a51fcd272d3c09668002a4990b1cb" - integrity sha512-arU1h31OGFu+LPrOLGZ7nB45v940NMDMEJeNmbutu57P+UFDVnkZg3e+J1I2HJRZ9hT7gO8J91dn/PMrAiKakA== - -axe-core@^4.2.0: - version "4.3.5" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5" - integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA== - -axe-core@^4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.6.1.tgz#79cccdee3e3ab61a8f42c458d4123a6768e6fbce" - integrity sha512-lCZN5XRuOnpG4bpMq8v0khrWtUOn+i8lZSb6wHZH56ZfbIEv6XwJV84AAueh9/zi7qPVJ/E4yz6fmsiyOmXR4w== +axe-core@^4.2.0, axe-core@^4.6.1, axe-core@^4.6.2: + version "4.7.2" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.2.tgz#040a7342b20765cb18bb50b628394c21bccc17a0" + integrity sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g== axios@^0.21.1: version "0.21.4" @@ -11189,10 +11186,12 @@ axios@^1.3.4, axios@^1.4.0: form-data "^4.0.0" proxy-from-env "^1.1.0" -axobject-query@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" - integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA== +axobject-query@^3.1.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.2.1.tgz#39c378a6e3b06ca679f29138151e45b2b32da62a" + integrity sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg== + dependencies: + dequal "^2.0.3" babel-jest@^29.6.1: version "29.6.1" @@ -13085,7 +13084,7 @@ core-js-compat@^3.25.1, core-js-compat@^3.8.1: dependencies: browserslist "^4.21.4" -core-js-pure@^3.25.1, core-js-pure@^3.8.1: +core-js-pure@^3.8.1: version "3.26.0" resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.26.0.tgz#7ad8a5dd7d910756f3124374b50026e23265ca9a" integrity sha512-LiN6fylpVBVwT8twhhluD9TzXmZQQsr2I2eIKtWNbZI1XMfBT7CV18itaN6RA7EtQd/SDdRx/wzvAShX2HvhQA== @@ -13867,10 +13866,10 @@ dagre@^0.8.2: graphlib "^2.1.8" lodash "^4.17.15" -damerau-levenshtein@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791" - integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug== +damerau-levenshtein@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" + integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== dash-ast@^1.0.0: version "1.0.0" @@ -13953,7 +13952,7 @@ debug@3.X, debug@^3.0.0, debug@^3.1.0, debug@^3.2.7: dependencies: ms "^2.1.1" -debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -14256,6 +14255,11 @@ deprecation@^2.0.0, deprecation@^2.3.1: resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== +dequal@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" + integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== + des.js@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" @@ -14866,7 +14870,7 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emoji-regex@^9.0.0, emoji-regex@^9.2.2: +emoji-regex@^9.2.2: version "9.2.2" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== @@ -14931,7 +14935,7 @@ enhanced-resolve@^5.10.0: graceful-fs "^4.2.4" tapable "^2.2.0" -enquirer@^2.3.5, enquirer@^2.3.6: +enquirer@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== @@ -15056,7 +15060,7 @@ error-stack-parser@^2.0.4, error-stack-parser@^2.0.6: dependencies: stackframe "^1.1.1" -es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5, es-abstract@^1.18.0-next.1, es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.4.3, es-abstract@^1.9.0: +es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5, es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.4.3, es-abstract@^1.9.0: version "1.22.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc" integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw== @@ -15321,10 +15325,10 @@ escodegen@~1.2.0: optionalDependencies: source-map "~0.1.30" -eslint-config-prettier@^8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" - integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== +eslint-config-prettier@^8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348" + integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA== eslint-formatter-pretty@^4.1.0: version "4.1.0" @@ -15340,33 +15344,33 @@ eslint-formatter-pretty@^4.1.0: string-width "^4.2.0" supports-hyperlinks "^2.0.0" -eslint-import-resolver-node@^0.3.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" - integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== +eslint-import-resolver-node@^0.3.7: + version "0.3.7" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7" + integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA== dependencies: debug "^3.2.7" - resolve "^1.20.0" + is-core-module "^2.11.0" + resolve "^1.22.1" -eslint-module-utils@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534" - integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q== +eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" + integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== dependencies: debug "^3.2.7" - pkg-dir "^2.0.0" -eslint-plugin-ban@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-ban/-/eslint-plugin-ban-1.5.2.tgz#5ca01fa5acdecf79e7422e2876eb330c22b5de9a" - integrity sha512-i6yjMbep866kREX8HfCPM32QyTZG4gfhlEFjL7s04P+sJjsM+oa0pejwyLOz/6s/oiW7BQqc6u3Dcr9tKz+svg== +eslint-plugin-ban@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-ban/-/eslint-plugin-ban-1.6.0.tgz#f4e8e9b754b0f2c405f9747ea9fcb4be63c37d05" + integrity sha512-gZptoV+SFHOHO57/5lmPvizMvSXrjFatP9qlVQf3meL/WHo9TxSoERygrMlESl19CPh95U86asTxohT8OprwDw== dependencies: requireindex "~1.2.0" -eslint-plugin-cypress@^2.13.2: - version "2.13.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.13.2.tgz#b42b763f449ff713cecf6bdf1903e7cee6e48bfc" - integrity sha512-LlwjnBTzuKuC0A4H0RxVjs0YeAWK+CD1iM9Dp8un3lzT713ePQxfpPstCD+9HSAss8emuE3b2hCNUST+NrUwKw== +eslint-plugin-cypress@^2.13.3: + version "2.13.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.13.3.tgz#5fc1afdc939aaa7daa9181f651f2f35429733ff2" + integrity sha512-nAPjZE5WopCsgJwl3vHm5iafpV+ZRO76Z9hMyRygWhmg5ODXDPd+9MaPl7kdJ2azj+sO87H3P1PRnggIrz848g== dependencies: globals "^11.12.0" @@ -15386,26 +15390,26 @@ eslint-plugin-eslint-comments@^3.2.0: escape-string-regexp "^1.0.5" ignore "^5.0.5" -eslint-plugin-import@^2.24.2: - version "2.24.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da" - integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q== +eslint-plugin-import@^2.27.5: + version "2.27.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65" + integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow== dependencies: - array-includes "^3.1.3" - array.prototype.flat "^1.2.4" - debug "^2.6.9" + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + array.prototype.flatmap "^1.3.1" + debug "^3.2.7" doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.6.2" - find-up "^2.0.0" + eslint-import-resolver-node "^0.3.7" + eslint-module-utils "^2.7.4" has "^1.0.3" - is-core-module "^2.6.0" - minimatch "^3.0.4" - object.values "^1.1.4" - pkg-up "^2.0.0" - read-pkg-up "^3.0.0" - resolve "^1.20.0" - tsconfig-paths "^3.11.0" + is-core-module "^2.11.0" + is-glob "^4.0.3" + minimatch "^3.1.2" + object.values "^1.1.6" + resolve "^1.22.1" + semver "^6.3.0" + tsconfig-paths "^3.14.1" eslint-plugin-jest@^27.2.3: version "27.2.3" @@ -15414,35 +15418,40 @@ eslint-plugin-jest@^27.2.3: dependencies: "@typescript-eslint/utils" "^5.10.0" -eslint-plugin-jsx-a11y@^6.4.1: - version "6.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz#a2d84caa49756942f42f1ffab9002436391718fd" - integrity sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg== +eslint-plugin-jsx-a11y@^6.7.1: + version "6.7.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz#fca5e02d115f48c9a597a6894d5bcec2f7a76976" + integrity sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA== dependencies: - "@babel/runtime" "^7.11.2" - aria-query "^4.2.2" - array-includes "^3.1.1" + "@babel/runtime" "^7.20.7" + aria-query "^5.1.3" + array-includes "^3.1.6" + array.prototype.flatmap "^1.3.1" ast-types-flow "^0.0.7" - axe-core "^4.0.2" - axobject-query "^2.2.0" - damerau-levenshtein "^1.0.6" - emoji-regex "^9.0.0" + axe-core "^4.6.2" + axobject-query "^3.1.1" + damerau-levenshtein "^1.0.8" + emoji-regex "^9.2.2" has "^1.0.3" - jsx-ast-utils "^3.1.0" - language-tags "^1.0.5" + jsx-ast-utils "^3.3.3" + language-tags "=1.0.5" + minimatch "^3.1.2" + object.entries "^1.1.6" + object.fromentries "^2.0.6" + semver "^6.3.0" -eslint-plugin-mocha@^10.0.5: - version "10.0.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.0.5.tgz#c3b1e9f59c01063566d8e64b64226533376ffccd" - integrity sha512-H5xuD5NStlpaKLqUWYC5BsMx8fHgrIYsdloFbONUTc2vgVNiJcWdKoX29Tt0BO75QgAltplPLIziByMozGGixA== +eslint-plugin-mocha@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz#69325414f875be87fb2cb00b2ef33168d4eb7c8d" + integrity sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw== dependencies: eslint-utils "^3.0.0" rambda "^7.1.0" -eslint-plugin-no-unsanitized@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.1.5.tgz#7e1ee74cf41ae59fec48c2ee2e21a7dcb86965fb" - integrity sha512-s/6w++p1590h/H/dE2Wo660bOkaM/3OEK14Y7xm1UT0bafxkKw1Cq0ksjxkxLdH/WWd014DlsLKuD6CyNrR2Dw== +eslint-plugin-no-unsanitized@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.2.tgz#e872b302cdfb5fe1262db989ba29cfcc334b499b" + integrity sha512-Pry0S9YmHoz8NCEMRQh7N0Yexh2MYCNPIlrV52hTmS7qXnTghWsjXouF08bgsrrZqaW9tt1ZiK3j5NEmPE+EjQ== eslint-plugin-node@^11.1.0: version "11.1.0" @@ -15520,12 +15529,20 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-scope@^7.2.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.1.tgz#936821d3462675f25a18ac5fd88a67cc15b393bd" + integrity sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + eslint-traverse@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/eslint-traverse/-/eslint-traverse-1.0.0.tgz#108d360a171a6e6334e1af0cee905a93bd0dcc53" integrity sha512-bSp37rQs93LF8rZ409EI369DGCI4tELbFVmFNxI6QbuveS7VRxYVyUhwDafKN/enMyUh88HQQ7ZoGUHtPuGdcw== -eslint-utils@^2.0.0, eslint-utils@^2.1.0: +eslint-utils@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== @@ -15539,7 +15556,7 @@ eslint-utils@^3.0.0: dependencies: eslint-visitor-keys "^2.0.0" -eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: +eslint-visitor-keys@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== @@ -15549,65 +15566,62 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint-visitor-keys@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" - integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== - -eslint@^7.32.0: - version "7.32.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" - integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== - dependencies: - "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.3" - "@humanwhocodes/config-array" "^0.5.0" +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" + integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== + +eslint@^8.45.0: + version "8.45.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78" + integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@eslint-community/regexpp" "^4.4.0" + "@eslint/eslintrc" "^2.1.0" + "@eslint/js" "8.44.0" + "@humanwhocodes/config-array" "^0.11.10" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" - debug "^4.0.1" + debug "^4.3.2" doctrine "^3.0.0" - enquirer "^2.3.5" escape-string-regexp "^4.0.0" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^2.0.0" - espree "^7.3.1" - esquery "^1.4.0" + eslint-scope "^7.2.0" + eslint-visitor-keys "^3.4.1" + espree "^9.6.0" + esquery "^1.4.2" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.1.2" - globals "^13.6.0" - ignore "^4.0.6" - import-fresh "^3.0.0" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.19.0" + graphemer "^1.4.0" + ignore "^5.2.0" imurmurhash "^0.1.4" is-glob "^4.0.0" - js-yaml "^3.13.1" + is-path-inside "^3.0.3" + js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" lodash.merge "^4.6.2" - minimatch "^3.0.4" + minimatch "^3.1.2" natural-compare "^1.4.0" - optionator "^0.9.1" - progress "^2.0.0" - regexpp "^3.1.0" - semver "^7.2.1" - strip-ansi "^6.0.0" - strip-json-comments "^3.1.0" - table "^6.0.9" + optionator "^0.9.3" + strip-ansi "^6.0.1" text-table "^0.2.0" - v8-compile-cache "^2.0.3" -espree@^7.3.0, espree@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" - integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== +espree@^9.6.0: + version "9.6.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" + integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== dependencies: - acorn "^7.4.0" - acorn-jsx "^5.3.1" - eslint-visitor-keys "^1.3.0" + acorn "^8.9.0" + acorn-jsx "^5.3.2" + eslint-visitor-keys "^3.4.1" esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" @@ -15619,10 +15633,10 @@ esprima@~1.0.4: resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad" integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0= -esquery@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" - integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== +esquery@^1.4.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" + integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== dependencies: estraverse "^5.1.0" @@ -15633,12 +15647,7 @@ esrecurse@^4.1.0, esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" - integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM= - -estraverse@^4.2.0: +estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -15651,7 +15660,7 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: estraverse@~1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71" - integrity sha1-hno+jlip+EYYr7bC3bzZFrfLr3E= + integrity sha512-FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ== estree-is-function@^1.0.0: version "1.0.0" @@ -16315,13 +16324,6 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.0.0, find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= - dependencies: - locate-path "^2.0.0" - find-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -16707,11 +16709,6 @@ function.prototype.name@^1.1.0, function.prototype.name@^1.1.2, function.prototy es-abstract "^1.19.0" functions-have-names "^1.2.2" -functional-red-black-tree@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= - functions-have-names@^1.2.2, functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" @@ -17061,10 +17058,10 @@ globals@^11.1.0, globals@^11.12.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.6.0, globals@^13.9.0: - version "13.11.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7" - integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== +globals@^13.19.0: + version "13.20.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82" + integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== dependencies: type-fest "^0.20.2" @@ -17222,6 +17219,11 @@ grapheme-splitter@^1.0.4: resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== +graphemer@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" + integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== + graphlib@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" @@ -18005,7 +18007,7 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore@^4.0.3, ignore@^4.0.6: +ignore@^4.0.3: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== @@ -18025,7 +18027,7 @@ immer@^9.0.15, immer@^9.0.7: resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.15.tgz#0b9169e5b1d22137aba7d43f8a81a495dd1b62dc" integrity sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ== -import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: +import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== @@ -18385,10 +18387,10 @@ is-ci@^3.0.0: dependencies: ci-info "^3.2.0" -is-core-module@^2.6.0, is-core-module@^2.9.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed" - integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg== +is-core-module@^2.11.0, is-core-module@^2.9.0: + version "2.12.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd" + integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg== dependencies: has "^1.0.3" @@ -18640,10 +18642,10 @@ is-path-inside@^2.1.0: dependencies: path-is-inside "^1.0.2" -is-path-inside@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" - integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== +is-path-inside@^3.0.2, is-path-inside@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== is-plain-obj@2.1.0, is-plain-obj@^2.0.0, is-plain-obj@^2.1.0: version "2.1.0" @@ -19878,7 +19880,7 @@ json5@*, json5@^2.1.2, json5@^2.2.2, json5@^2.2.3: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -json5@^1.0.1: +json5@^1.0.1, json5@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== @@ -19951,7 +19953,7 @@ jsts@^1.6.2: resolved "https://registry.yarnpkg.com/jsts/-/jsts-1.6.2.tgz#c0efc885edae06ae84f78cbf2a0110ba929c5925" integrity sha512-JNfDQk/fo5MeXx4xefvCyHZD22/DHowHr5K07FdgCJ81MEqn02HsDV5FQvYTz60ZIOv/+hhGbsVzXX5cuDWWlA== -"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0: +"jsx-ast-utils@^2.4.1 || ^3.0.0": version "3.2.0" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82" integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q== @@ -19959,6 +19961,16 @@ jsts@^1.6.2: array-includes "^3.1.2" object.assign "^4.1.2" +jsx-ast-utils@^3.3.3: + version "3.3.4" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz#b896535fed5b867650acce5a9bd4135ffc7b3bf9" + integrity sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw== + dependencies: + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + object.assign "^4.1.4" + object.values "^1.1.6" + jszip@^3.10.1: version "3.10.1" resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2" @@ -20098,7 +20110,7 @@ language-subtag-registry@~0.3.2: resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a" integrity sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg== -language-tags@^1.0.5: +language-tags@=1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a" integrity sha1-0yHbxNowuovzAk4ED6XBRmH5GTo= @@ -20353,16 +20365,6 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -load-json-file@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" - integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= - dependencies: - graceful-fs "^4.1.2" - parse-json "^4.0.0" - pify "^3.0.0" - strip-bom "^3.0.0" - load-json-file@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1" @@ -20401,14 +20403,6 @@ loader-utils@^2.0.0, loader-utils@^2.0.4: emojis-list "^3.0.0" json5 "^2.1.2" -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -21431,7 +21425,7 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@~3.0.2: +minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@~3.0.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -22532,7 +22526,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.4, object.values@^1.1.6: +object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== @@ -22674,17 +22668,17 @@ optionator@^0.8.1: type-check "~0.3.2" word-wrap "~1.2.3" -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== +optionator@^0.9.3: + version "0.9.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" + integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== dependencies: + "@aashutoshrathi/word-wrap" "^1.2.3" deep-is "^0.1.3" fast-levenshtein "^2.0.6" levn "^0.4.1" prelude-ls "^1.2.1" type-check "^0.4.0" - word-wrap "^1.2.3" ora@^4.0.4: version "4.1.1" @@ -22806,13 +22800,6 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= -p-limit@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" - integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== - dependencies: - p-try "^1.0.0" - p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2, p-limit@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -22827,13 +22814,6 @@ p-limit@^3.0.1, p-limit@^3.0.2, p-limit@^3.1.0: dependencies: yocto-queue "^0.1.0" -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= - dependencies: - p-limit "^1.1.0" - p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -22902,11 +22882,6 @@ p-timeout@^2.0.1: dependencies: p-finally "^1.0.0" -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= - p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -23006,14 +22981,6 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - parse-json@^5.0.0, parse-json@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" @@ -23315,13 +23282,6 @@ pixelmatch@^5.3.0: dependencies: pngjs "^6.0.0" -pkg-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" - integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= - dependencies: - find-up "^2.1.0" - pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -23343,13 +23303,6 @@ pkg-dir@^5.0.0: dependencies: find-up "^5.0.0" -pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" - integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= - dependencies: - find-up "^2.1.0" - pkg-up@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" @@ -23927,7 +23880,7 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= -progress@2.0.3, progress@^2.0.0: +progress@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== @@ -24994,14 +24947,6 @@ read-pkg-up@^1.0.1: find-up "^1.0.0" read-pkg "^1.0.0" -read-pkg-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" - integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= - dependencies: - find-up "^2.0.0" - read-pkg "^3.0.0" - read-pkg-up@^7.0.0, read-pkg-up@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" @@ -25020,15 +24965,6 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -read-pkg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= - dependencies: - load-json-file "^4.0.0" - normalize-package-data "^2.3.2" - path-type "^3.0.0" - read-pkg@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -25236,7 +25172,7 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.10, regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.7: +regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.7: version "0.13.11" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== @@ -25265,7 +25201,7 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0, regexp.prototype.f define-properties "^1.2.0" functions-have-names "^1.2.3" -regexpp@^3.0.0, regexpp@^3.1.0, regexpp@^3.2.0: +regexpp@^3.0.0, regexpp@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== @@ -26107,7 +26043,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semve resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.2.1, semver@^7.3.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3: +semver@^7.3.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3: version "7.5.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ== @@ -27280,7 +27216,7 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: +strip-json-comments@3.1.1, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -27540,7 +27476,7 @@ tabbable@^5.2.1: resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.2.1.tgz#e3fda7367ddbb172dcda9f871c0fdb36d1c4cd9c" integrity sha512-40pEZ2mhjaZzK0BnI+QGNjJO8UYx9pP5v7BGe17SORTO0OEuuaAwQTkAp8whcZvqon44wKFOikD+Al11K3JICQ== -table@^6.0.9, table@^6.8.0: +table@^6.8.0: version "6.8.0" resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== @@ -28126,14 +28062,14 @@ ts-pnp@^1.1.6: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== -tsconfig-paths@^3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" - integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== +tsconfig-paths@^3.14.1: + version "3.14.2" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088" + integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g== dependencies: "@types/json5" "^0.0.29" - json5 "^1.0.1" - minimist "^1.2.0" + json5 "^1.0.2" + minimist "^1.2.6" strip-bom "^3.0.0" tsd@^0.20.0: @@ -28909,7 +28845,7 @@ uuid@^8.3.0, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0: +v8-compile-cache@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== @@ -29942,7 +29878,7 @@ wkt-parser@^1.2.4: resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.3.2.tgz#deeff04a21edc5b170a60da418e9ed1d1ab0e219" integrity sha512-A26BOOo7sHAagyxG7iuRhnKMO7Q3mEOiOT4oGUmohtN/Li5wameeU4S6f8vWw6NADTVKljBs8bzA8JPQgSEMVQ== -word-wrap@^1.2.3, word-wrap@~1.2.3: +word-wrap@~1.2.3: version "1.2.5" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==