From 31f130daa3567cf275d1ed8b0920df420d5e513e 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 --- .eslintrc.js | 6 +- package.json | 28 +- packages/kbn-eslint-config/react.js | 9 +- .../ui_settings/index.test.ts | 4 +- 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 +- .../_hierarchical_tooltip_formatter.js | 82 -- .../public/vislib/components/tooltip/index.js | 1 - .../components/data_table/index.tsx | 1 + x-pack/plugins/apm/scripts/eslint.js | 8 +- .../public/components/add_comment/index.tsx | 2 + .../use_cases_add_to_new_case_flyout.test.tsx | 2 - .../components/insert_timeline/index.tsx | 2 + .../components/markdown_editor/editor.tsx | 4 +- .../components/markdown_editor/eui_form.tsx | 2 + .../user_actions/comment/actions.tsx | 2 - .../comment/registered_attachments.tsx | 2 - .../components/user_actions/comment/user.tsx | 2 - .../public/components/user_actions/common.tsx | 1 - .../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 +- .../components/setup_guide/setup_guide.tsx | 2 +- .../ml_inference/test_pipeline_logic.test.ts | 2 +- .../components/setup_guide/setup_guide.tsx | 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 +- x-pack/plugins/infra/common/color_palette.ts | 2 +- .../source_configuration.ts | 2 +- .../threshold_annotations.tsx | 2 +- .../inventory/components/expression.tsx | 2 +- .../inventory/components/expression_chart.tsx | 2 +- .../alerting/inventory/components/metric.tsx | 2 +- .../components/log_rate_analysis.tsx | 2 +- .../alert_details_app_section/index.tsx | 2 +- .../expression_editor/criterion.tsx | 2 +- .../expression_editor/threshold.tsx | 2 +- .../alerting/log_threshold/validation.ts | 2 +- .../components/influencer_filter.tsx | 3 +- .../custom_equation_editor.tsx | 2 +- .../custom_equation/metric_row_with_agg.tsx | 2 +- .../components/expression.tsx | 2 +- .../components/expression_row.tsx | 2 +- .../use_metric_threshold_alert_prefill.ts | 2 +- .../asset_details/tabs/metadata/table.tsx | 2 +- .../tabs/processes/processes.tsx | 2 +- .../tabs/processes/processes_table.tsx | 2 +- .../tabs/processes/summary_table.tsx | 2 +- .../infra/public/components/auto_sizer.tsx | 2 +- .../quality_warning_notices.tsx | 2 +- .../logging/log_highlights_menu.tsx | 2 +- .../logging/log_minimap/density_chart.tsx | 2 +- .../log_analysis/log_analysis_setup_state.ts | 2 +- .../public/containers/logs/log_flyout.tsx | 2 +- .../containers/react_query_provider.tsx | 2 +- .../logs/stream/page_view_log_in_context.tsx | 2 +- .../hooks/use_control_panels_url_state.ts | 2 +- .../ml/anomaly_detection/job_setup_screen.tsx | 2 +- .../node_details/tabs/metrics/metrics.tsx | 2 +- .../node_details/tabs/processes/index.tsx | 2 +- .../tabs/processes/process_row_charts.tsx | 2 +- .../tabs/processes/processes_table.tsx | 2 +- .../tabs/processes/summary_table.tsx | 2 +- .../inventory_view/components/table_view.tsx | 2 +- .../components/timeline/timeline.tsx | 2 +- .../components/waffle/conditional_tooltip.tsx | 2 +- .../components/waffle/group_of_nodes.tsx | 2 +- .../inventory_view/components/waffle/node.tsx | 2 +- .../inventory_view/hooks/use_timeline.ts | 2 +- .../inventory_view/lib/color_from_value.ts | 2 +- .../components/gauges_section_vis.tsx | 2 +- .../components/metadata_details.tsx | 2 +- .../metrics_explorer/components/chart.tsx | 2 +- .../infra/public/utils/typed_react.tsx | 2 +- x-pack/plugins/infra/server/deprecations.ts | 2 +- .../metrics/kibana_metrics_adapter.ts | 2 +- .../infra/server/lib/alerting/common/utils.ts | 2 +- .../evaluate_condition.ts | 2 +- .../inventory_metric_threshold_executor.ts | 2 +- .../metric_anomaly/metric_anomaly_executor.ts | 2 +- .../metric_threshold_executor.ts | 2 +- .../lib/convert_buckets_to_metrics_series.ts | 2 +- .../infra/server/lib/sources/sources.ts | 2 +- .../infra/server/routes/ip_to_hostname.ts | 2 +- .../infra/server/routes/metadata/index.ts | 2 +- .../lib/find_interval_for_metrics.ts | 2 +- .../queries/ecs_mapping_editor_field.tsx | 4 +- .../osquery/public/results/results_table.tsx | 2 +- .../osquery_results/osquery_result.tsx | 2 + .../osquery_result_wrapper.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 | 4 +- .../user_profile/user_profile_api_client.ts | 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_grid/api_keys_grid_page.test.tsx | 2 +- .../api_keys_grid/api_keys_grid_page.tsx | 12 +- .../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/privileges.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 +- .../components/endpoint/link_to_app.tsx | 2 + .../common/components/events_viewer/index.tsx | 2 +- .../components/header_section/index.tsx | 4 +- .../components/markdown_editor/eui_form.tsx | 2 + .../public/common/components/top_n/top_n.tsx | 2 +- .../filters/multiselect_filter/index.tsx | 2 + .../components/rules/mitre/index.tsx | 2 + .../components/take_action_dropdown/index.tsx | 2 + .../detections/pages/alert_details/index.tsx | 2 + .../import_exceptions_list_flyout/index.tsx | 3 + .../paginated_content/paginated_content.tsx | 2 +- .../view/components/blocklist_form.tsx | 2 + .../policy_artifacts_delete_modal.tsx | 2 + .../with_security_context.tsx | 2 + .../components/event_collection_card.tsx | 1 - .../resolver/view/panels/cube_for_process.tsx | 2 + .../view/panels/panel_content_error.tsx | 2 + .../resolver/view/process_event_dot.tsx | 2 + .../view/resolver_without_providers.tsx | 2 - .../components/open_timeline/index.tsx | 2 + .../event_details/flyout/footer.tsx | 2 + .../data_providers/provider_item_actions.tsx | 2 +- .../timeline/query_bar/eql/index.tsx | 2 + .../components/timeline/query_bar/index.tsx | 2 + .../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 +- .../waterfall_flyout/waterfall_flyout.tsx | 2 +- .../translations/translations/fr-FR.json | 2 - .../translations/translations/ja-JP.json | 2 - .../translations/translations/zh-CN.json | 2 - .../waterfall/waterfall_flyout.tsx | 2 +- yarn.lock | 1275 +++++++++-------- 479 files changed, 1481 insertions(+), 1435 deletions(-) create mode 100644 src/dev/eslint/eslint_bin_path.ts delete mode 100644 src/plugins/vis_types/vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js diff --git a/.eslintrc.js b/.eslintrc.js index de3adc0913fc98f..556cf9eead8f5de 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -725,7 +725,7 @@ module.exports = { { files: ['**/*.test.{js,mjs,ts,tsx}'], rules: { - 'jest/valid-describe': 'error', + 'jest/valid-describe-callback': 'error', }, }, @@ -1160,12 +1160,12 @@ module.exports = { 'react/no-unsafe': 'error', 'react/no-unused-prop-types': 'error', 'react/no-unused-state': 'error', + 'react/sort-default-props': 'error', 'react/void-dom-elements-no-children': 'error', 'react/jsx-no-comment-textnodes': 'error', 'react/jsx-no-literals': 'error', 'react/jsx-no-target-blank': 'error', 'react/jsx-fragments': 'error', - 'react/jsx-sort-default-props': 'error', 'require-atomic-updates': 'error', 'symbol-description': 'error', 'vars-on-top': 'error', @@ -1255,12 +1255,12 @@ module.exports = { 'react/no-unused-prop-types': 'error', 'react/no-unused-state': 'error', 'react/sort-comp': 'error', + 'react/sort-default-props': 'error', 'react/void-dom-elements-no-children': 'error', 'react/jsx-no-comment-textnodes': 'error', 'react/jsx-no-literals': 'error', 'react/jsx-no-target-blank': 'error', 'react/jsx-fragments': 'error', - 'react/jsx-sort-default-props': 'error', }, }, { diff --git a/package.json b/package.json index e9315514fc88567..5d5f683da6dd32d 100644 --- a/package.json +++ b/package.json @@ -1242,7 +1242,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.0", "@types/express": "^4.17.13", "@types/extract-zip": "^1.6.2", "@types/faker": "^5.1.5", @@ -1411,22 +1411,22 @@ "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-jest": "^24.5.0", - "eslint-plugin-jsx-a11y": "^6.4.1", - "eslint-plugin-mocha": "^10.0.5", - "eslint-plugin-no-unsanitized": "^3.1.5", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-jest": "^27.2.3", + "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.26.1", - "eslint-plugin-react-hooks": "^4.2.0", - "eslint-plugin-react-perf": "^3.3.0", + "eslint-plugin-react": "^7.32.2", + "eslint-plugin-react-hooks": "^4.6.0", + "eslint-plugin-react-perf": "^3.3.1", "eslint-traverse": "^1.0.0", "exit-hook": "^2.2.0", "expect": "^29.6.1", diff --git a/packages/kbn-eslint-config/react.js b/packages/kbn-eslint-config/react.js index c5db0546630a590..05d64529fe9e155 100644 --- a/packages/kbn-eslint-config/react.js +++ b/packages/kbn-eslint-config/react.js @@ -61,7 +61,14 @@ module.exports = { 'react/no-will-update-set-state': 'error', 'react/no-is-mounted': 'error', 'react/no-multi-comp': ['error', { ignoreStateless: true }], - 'react/no-unknown-property': 'error', + 'react/no-unknown-property': ['error', { ignore: [ + 'css', + 'kbn-canvas-height', + 'kbn-canvas-page', + 'kbn-canvas-shareable', + 'kbn-canvas-url', + 'kbn-canvas-width', + ] }], 'react/prefer-es6-class': ['error', 'always'], 'react/prefer-stateless-function': ['error', { ignorePureComponents: true }], 'react/no-unescaped-entities': 'error', diff --git a/src/core/server/integration_tests/ui_settings/index.test.ts b/src/core/server/integration_tests/ui_settings/index.test.ts index fc61f2cd5a33f3c..5bc4082e25b2c71 100644 --- a/src/core/server/integration_tests/ui_settings/index.test.ts +++ b/src/core/server/integration_tests/ui_settings/index.test.ts @@ -20,9 +20,9 @@ describe('uiSettings/routes', function () { jest.setTimeout(120_000); beforeAll(startServers); - // eslint-disable-next-line jest/valid-describe + // eslint-disable-next-line jest/valid-describe-callback describe('doc missing', docMissingSuite(savedObjectIndex)); - // eslint-disable-next-line jest/valid-describe + // eslint-disable-next-line jest/valid-describe-callback describe('doc exists', docExistsSuite(savedObjectIndex)); afterAll(stopServers); }); diff --git a/src/dev/eslint/eslint_bin_path.ts b/src/dev/eslint/eslint_bin_path.ts new file mode 100644 index 000000000000000..b29a0c433e162ea --- /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 5aeb83c45ad057a..889ed6ed47bf26a 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 2e62cbd451add39..220d07f121d74ad 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 c65f4e634378747..1fc60d9d5d5c108 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 75f49ba351579b6..1ce39beb282064b 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 dd5aee101432b62..7f07e0a0d4d3065 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 minimist from 'minimist'; + +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 = minimist(process.argv.slice(2)); 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 7b8b8d25da1217f..fb36a14ac3411dc 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 f64e6628d147280..b3e98f7e97266b5 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 6c4654472e0aa04..2e2debe44c78308 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 d511e69dffdf8ba..89b1f3f520d09cb 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 53f95ce62d7a7d0..29952fb5da5ec0a 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 7944f33365213fd..3e95ff4d420b9a1 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 f71263c1ae754cd..4247b45acee008b 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 ca63b7d0e245350..cbb2070c2e66d6f 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 1ec799ad74a66ae..38808ad3d1b8adf 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 25c704a89024b48..6994a38912ce147 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 ee09c2c71e75246..944dc6b3f7a292f 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 def3a8dcdb11a1f..f69a5a92bf4f46d 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 a803792cfa9eb1d..8a0356d2dddceb8 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 410fb5b42037cb3..aba4bdb680d30cf 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 4e98fc841fc5795..dc00a47730ef9a1 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 ec9aa48ab2b9737..d430fce285234bf 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/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js b/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js deleted file mode 100644 index 3dc2d4976f63d89..000000000000000 --- a/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js +++ /dev/null @@ -1,82 +0,0 @@ -/* - * 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 React from 'react'; -import _ from 'lodash'; -import numeral from '@elastic/numeral'; -import { renderToStaticMarkup } from 'react-dom/server'; - -import { FormattedMessage, I18nProvider } from '@kbn/i18n-react'; - -import { collectBranch } from './_collect_branch'; - -export function hierarchicalTooltipFormatter(metricFieldFormatter) { - return function ({ datum }) { - // Collect the current leaf and parents into an array of values - const rows = collectBranch(datum); - - // Map those values to what the tooltipSource.rows format. - _.forEachRight(rows, function (row) { - row.spacer = _.escape(_.repeat(' ', row.depth)); - - let percent; - if (row.item.percentOfGroup !== null && row.item.percentOfGroup !== undefined) { - percent = row.item.percentOfGroup; - } - - row.metric = metricFieldFormatter ? metricFieldFormatter.convert(row.metric) : row.metric; - - if (percent !== null && percent !== undefined) { - row.metric += ' (' + numeral(percent).format('0.[00]%') + ')'; - } - - return row; - }); - - return renderToStaticMarkup( - - - - - - - - - - - - {rows.map((row, index) => ( - - - - - - ))} - -
{/* {metricCol.label} */}
-
- - {row.field} -
- 		-
{row.bucket}
- 		{row.metric}
- - ); - }; -} diff --git a/src/plugins/vis_types/vislib/public/vislib/components/tooltip/index.js b/src/plugins/vis_types/vislib/public/vislib/components/tooltip/index.js index 5805360ceaa0d8c..e9d5b96187bd3eb 100644 --- a/src/plugins/vis_types/vislib/public/vislib/components/tooltip/index.js +++ b/src/plugins/vis_types/vislib/public/vislib/components/tooltip/index.js @@ -7,5 +7,4 @@ */ export { Tooltip } from './tooltip'; -export { hierarchicalTooltipFormatter } from './_hierarchical_tooltip_formatter'; export { pointSeriesTooltipFormatter } from './_pointseries_tooltip_formatter'; diff --git a/x-pack/packages/security-solution/data_table/components/data_table/index.tsx b/x-pack/packages/security-solution/data_table/components/data_table/index.tsx index 0018702ce5e0e9a..19143dd6da788d4 100644 --- a/x-pack/packages/security-solution/data_table/components/data_table/index.tsx +++ b/x-pack/packages/security-solution/data_table/components/data_table/index.tsx @@ -6,6 +6,7 @@ */ /* eslint-disable @kbn/eslint/module_migration */ +/* eslint-disable react/display-name */ import type { EuiDataGridRefProps, diff --git a/x-pack/plugins/apm/scripts/eslint.js b/x-pack/plugins/apm/scripts/eslint.js index 7869dd4c434fb21..a1a4de0c89b0f27 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/cases/public/components/add_comment/index.tsx b/x-pack/plugins/cases/public/components/add_comment/index.tsx index 59fc1fcde0fac03..5c4b8e4529a2018 100644 --- a/x-pack/plugins/cases/public/components/add_comment/index.tsx +++ b/x-pack/plugins/cases/public/components/add_comment/index.tsx @@ -54,6 +54,7 @@ export interface AddCommentRefObject { editor: EuiMarkdownEditorRef | null; } +/* eslint-disable react/no-unused-prop-types */ export interface AddCommentProps { id: string; caseId: string; @@ -62,6 +63,7 @@ export interface AddCommentProps { showLoading?: boolean; statusActionButton: JSX.Element | null; } +/* eslint-enable react/no-unused-prop-types */ export const AddComment = React.memo( forwardRef( diff --git a/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.test.tsx b/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.test.tsx index a6af4822209419b..7f4a84b4a3e2966 100644 --- a/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.test.tsx +++ b/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.test.tsx @@ -5,8 +5,6 @@ * 2.0. */ -/* eslint-disable react/display-name */ - import { alertComment } from '../../../containers/mock'; import { renderHook } from '@testing-library/react-hooks'; import React from 'react'; diff --git a/x-pack/plugins/cases/public/components/insert_timeline/index.tsx b/x-pack/plugins/cases/public/components/insert_timeline/index.tsx index 0a1e6c02b22e627..3ea7c43135e2120 100644 --- a/x-pack/plugins/cases/public/components/insert_timeline/index.tsx +++ b/x-pack/plugins/cases/public/components/insert_timeline/index.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import { useCallback } from 'react'; import { useFormContext } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib'; import { useTimelineContext } from '../timeline_context/use_timeline_context'; diff --git a/x-pack/plugins/cases/public/components/markdown_editor/editor.tsx b/x-pack/plugins/cases/public/components/markdown_editor/editor.tsx index 613fe6153b25d16..5befb82f6e27218 100644 --- a/x-pack/plugins/cases/public/components/markdown_editor/editor.tsx +++ b/x-pack/plugins/cases/public/components/markdown_editor/editor.tsx @@ -20,8 +20,8 @@ interface MarkdownEditorProps { editorId: string; height?: number; onChange: (content: string) => void; - parsingPlugins?: PluggableList; - processingPlugins?: PluggableList; + parsingPlugins?: PluggableList; // eslint-disable-line react/no-unused-prop-types + processingPlugins?: PluggableList; // eslint-disable-line react/no-unused-prop-types disabledUiPlugins?: string[] | undefined; value: string; } diff --git a/x-pack/plugins/cases/public/components/markdown_editor/eui_form.tsx b/x-pack/plugins/cases/public/components/markdown_editor/eui_form.tsx index cf3964129d04b1a..1f744c01b5b0b43 100644 --- a/x-pack/plugins/cases/public/components/markdown_editor/eui_form.tsx +++ b/x-pack/plugins/cases/public/components/markdown_editor/eui_form.tsx @@ -17,6 +17,7 @@ import { MarkdownEditor } from './editor'; import { CommentEditorContext } from './context'; import { useMarkdownSessionStorage } from './use_markdown_session_storage'; +/* eslint-disable react/no-unused-prop-types */ type MarkdownEditorFormProps = EuiMarkdownEditorProps & { id: string; field: FieldHook; @@ -30,6 +31,7 @@ type MarkdownEditorFormProps = EuiMarkdownEditorProps & { disabledUiPlugins?: string[]; initialValue?: string; }; +/* eslint-enable react/no-unused-prop-types */ const BottomContentWrapper = styled(EuiFlexGroup)` ${({ theme }) => ` diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/actions.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/actions.tsx index d4086805d7cd9a5..f85ccc74644b5f9 100644 --- a/x-pack/plugins/cases/public/components/user_actions/comment/actions.tsx +++ b/x-pack/plugins/cases/public/components/user_actions/comment/actions.tsx @@ -30,8 +30,6 @@ export const createActionAttachmentUserActionBuilder = ({ comment, actionsNavigation, }: BuilderArgs): ReturnType => ({ - // TODO: Fix this manually. Issue #123375 - // eslint-disable-next-line react/display-name build: () => { const actionIconName = comment.actions.type === 'isolate' ? 'lock' : 'lockOpen'; return [ diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx index beb74a87bff9d99..18f8a334817e5d3 100644 --- a/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx +++ b/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx @@ -90,8 +90,6 @@ export const createRegisteredAttachmentUserActionBuilder = < getAttachmentViewProps, handleDeleteComment, }: BuilderArgs): ReturnType => ({ - // TODO: Fix this manually. Issue #123375 - // eslint-disable-next-line react/display-name build: () => { const attachmentTypeId: string = getId(); const isTypeRegistered = registry.has(attachmentTypeId); diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx index 119ae2b9039b33b..232b211867f08b6 100644 --- a/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx +++ b/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx @@ -73,8 +73,6 @@ export const createUserAttachmentUserActionBuilder = ({ handleManageQuote, handleDeleteComment, }: BuilderArgs): ReturnType => ({ - // TODO: Fix this manually. Issue #123375 - // eslint-disable-next-line react/display-name build: () => [ { username: , diff --git a/x-pack/plugins/cases/public/components/user_actions/common.tsx b/x-pack/plugins/cases/public/components/user_actions/common.tsx index 7c5f10e627c3e18..5b61fe7066b634c 100644 --- a/x-pack/plugins/cases/public/components/user_actions/common.tsx +++ b/x-pack/plugins/cases/public/components/user_actions/common.tsx @@ -62,7 +62,6 @@ export const createCommonUpdateUserActionBuilder = ({ handleOutlineComment, }: BuilderArgs): ReturnType => { return { - // eslint-disable-next-line react/display-name build: () => [ { username: ( 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 acd5c20fd1efd03..c92d33b9833b8d5 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 9de649a8cf5e78c..c18c7a46c54c4ec 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 d0318c0bb06d3c8..28f8dde589c758e 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 b1c7f3b38139bd9..edcf522987115ef 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 b7a7da6ba758538..78100be78e5d4a2 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 aa958c8c9d1d9e5..b3da9bdd19f95e3 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 10c870275e59094..fe5d00ee4a8fb47 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 d9413b7a4e66c98..f374fe8b606668d 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 0b28f635f16794b..8e2e1383a3ac8e1 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 16a18a71981a275..53570e8868f44b1 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/app_search/components/setup_guide/setup_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx index 1cf1cf8a0d5bd13..3bba21361c91314 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx @@ -36,7 +36,7 @@ export const SetupGuide: React.FC = () => ( "Getting started with App Search - in this short video we'll guide you through how to get App Search up and running", })} width="1280" - height-="720" + height="720" /> 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 fcec6868e1b4922..9c691bf3ed06348 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/enterprise_search_overview/components/setup_guide/setup_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.tsx index 8d787e5254b937a..01686158ee81c0d 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.tsx @@ -34,7 +34,7 @@ export const SetupGuide: React.FC = () => ( defaultMessage: 'Getting started with Enterprise Search', })} width="1280" - height-="720" + height="720" /> 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 aee83b31be04512..41951a1eede5328 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 a709fa90fa4382b..e29ea8bbd15f679 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 44973cef966eed3..534de9cab7ae2f9 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 1e2a9fc2de5a272..3938d697828f3ff 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 88117358db6884a..15ac41b1bd66d43 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 f4f87f48f63955c..011e78d29aefb04 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 d74e255cf4591b3..cadab9c139fa6ca 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 9cf332b7c540f0c..7ba0bf6cd19c358 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 695a23139fbc6f0..7d087f8e74c7564 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 690379fc0c4c353..96c6501200e564d 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/infra/common/color_palette.ts b/x-pack/plugins/infra/common/color_palette.ts index d0b340765a788d5..e02d99c0a3a7643 100644 --- a/x-pack/plugins/infra/common/color_palette.ts +++ b/x-pack/plugins/infra/common/color_palette.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { difference, first, values } from 'lodash'; import { euiPaletteColorBlind } from '@elastic/eui'; +import { difference, first, values } from 'lodash'; export enum Color { color0 = 'color0', diff --git a/x-pack/plugins/infra/common/source_configuration/source_configuration.ts b/x-pack/plugins/infra/common/source_configuration/source_configuration.ts index 8881b5fab5f5fbf..f80ff9b3ce65437 100644 --- a/x-pack/plugins/infra/common/source_configuration/source_configuration.ts +++ b/x-pack/plugins/infra/common/source_configuration/source_configuration.ts @@ -17,8 +17,8 @@ /* eslint-disable @typescript-eslint/no-empty-interface */ -import { omit } from 'lodash'; import * as rt from 'io-ts'; +import { omit } from 'lodash'; /** * Source configuration config file properties. diff --git a/x-pack/plugins/infra/public/alerting/common/criterion_preview_chart/threshold_annotations.tsx b/x-pack/plugins/infra/public/alerting/common/criterion_preview_chart/threshold_annotations.tsx index 9400537bb9d7c77..493db2b9598cee1 100644 --- a/x-pack/plugins/infra/public/alerting/common/criterion_preview_chart/threshold_annotations.tsx +++ b/x-pack/plugins/infra/public/alerting/common/criterion_preview_chart/threshold_annotations.tsx @@ -5,8 +5,8 @@ * 2.0. */ import { AnnotationDomainType, LineAnnotation, RectAnnotation } from '@elastic/charts'; -import { first, last } from 'lodash'; import React from 'react'; +import { first, last } from 'lodash'; import { Comparator } from '../../../../common/alerting/metrics'; import { Color, colorTransformer } from '../../../../common/color_palette'; diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx index f06335145877df2..06945aa4f13523f 100644 --- a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx +++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx @@ -28,9 +28,9 @@ import { RuleTypeParamsExpressionProps, ThresholdExpression, } from '@kbn/triggers-actions-ui-plugin/public'; -import { debounce, omit } from 'lodash'; import React, { ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react'; import useToggle from 'react-use/lib/useToggle'; +import { debounce, omit } from 'lodash'; import { Comparator, FilterQuery, diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/expression_chart.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/expression_chart.tsx index 856c926c14aec3e..714e2edf67c0b94 100644 --- a/x-pack/plugins/infra/public/alerting/inventory/components/expression_chart.tsx +++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression_chart.tsx @@ -7,9 +7,9 @@ import { Axis, Chart, niceTimeFormatter, Position, Settings, Tooltip } from '@elastic/charts'; import { EuiText } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n-react'; -import { first, last } from 'lodash'; import moment from 'moment'; import React, { useCallback, useMemo } from 'react'; +import { first, last } from 'lodash'; import { useTimelineChartTheme } from '../../../utils/use_timeline_chart_theme'; import { InventoryMetricConditions } from '../../../../common/alerting/metrics'; import { Color } from '../../../../common/color_palette'; diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx index 5d96a80da652a5b..87a44bc2db43a6d 100644 --- a/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx +++ b/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx @@ -21,9 +21,9 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; -import { debounce } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public'; +import { debounce } from 'lodash'; import { getCustomMetricLabel } from '../../../../common/formatters/get_custom_metric_label'; import { SnapshotCustomAggregation, diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_details_app_section/components/log_rate_analysis.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_details_app_section/components/log_rate_analysis.tsx index fda5c9934b90403..ebc0c72c3b24fff 100644 --- a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_details_app_section/components/log_rate_analysis.tsx +++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_details_app_section/components/log_rate_analysis.tsx @@ -6,7 +6,6 @@ */ import React, { FC, useEffect, useState } from 'react'; -import { pick, orderBy } from 'lodash'; import moment from 'moment'; import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiTitle } from '@elastic/eui'; @@ -20,6 +19,7 @@ import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types'; import { i18n } from '@kbn/i18n'; import { CoPilotPromptId } from '@kbn/observability-plugin/common'; import { ALERT_END } from '@kbn/rule-data-utils'; +import { pick, orderBy } from 'lodash'; import { Color, colorTransformer } from '../../../../../../common/color_palette'; import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana'; import { diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_details_app_section/index.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_details_app_section/index.tsx index 00041cdffec02ca..5713b14966ff629 100644 --- a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_details_app_section/index.tsx +++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_details_app_section/index.tsx @@ -19,9 +19,9 @@ import { useTheme } from '@emotion/react'; import { EuiTitle } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { getPaddedAlertTimeRange } from '@kbn/observability-alert-details'; -import { get, identity } from 'lodash'; import { CoPilotContextProvider } from '@kbn/observability-plugin/public'; import { useLogView } from '@kbn/logs-shared-plugin/public'; +import { get, identity } from 'lodash'; import { useKibanaContextForPlugin } from '../../../../hooks/use_kibana'; import { Comparator, diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx index f2bb1d8ed578548..2f8086f05bdbe74 100644 --- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx +++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx @@ -19,10 +19,10 @@ import { EuiSelect, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { isFinite, isNumber } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; import type { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public'; import type { ResolvedLogViewField } from '@kbn/logs-shared-plugin/common'; +import { isFinite, isNumber } from 'lodash'; import { Comparator, ComparatorToi18nMap, diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx index 2f0ff956663fa3b..2125a3a1f3d120c 100644 --- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx +++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx @@ -16,9 +16,9 @@ import { EuiSelect, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { isFinite, isNumber } from 'lodash'; import React, { useState } from 'react'; import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public'; +import { isFinite, isNumber } from 'lodash'; import { Comparator, ComparatorToi18nMap, diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts b/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts index 59cae9c53c7ff68..85b11a5840f51a8 100644 --- a/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts +++ b/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts @@ -7,8 +7,8 @@ import { i18n } from '@kbn/i18n'; import * as rt from 'io-ts'; -import { isNumber, isFinite } from 'lodash'; import { IErrorObject, ValidationResult } from '@kbn/triggers-actions-ui-plugin/public'; +import { isNumber, isFinite } from 'lodash'; import { PartialCountCriteria, isRatioRule, diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/influencer_filter.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/influencer_filter.tsx index cc1e664d6f9d965..c7a6ccb03b79be3 100644 --- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/influencer_filter.tsx +++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/influencer_filter.tsx @@ -5,11 +5,10 @@ * 2.0. */ -import { debounce } from 'lodash'; import { i18n } from '@kbn/i18n'; import React, { useState, useCallback, useEffect, useMemo } from 'react'; -import { first } from 'lodash'; import { EuiFlexGroup, EuiFormRow, EuiCheckbox, EuiFlexItem, EuiSelect } from '@elastic/eui'; +import { first, debounce } from 'lodash'; import { MetricsExplorerKueryBar, CurryLoadSuggestionsType, diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/custom_equation/custom_equation_editor.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/custom_equation/custom_equation_editor.tsx index 3b00563fcc0f4bf..3a3a6915a61f0fc 100644 --- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/custom_equation/custom_equation_editor.tsx +++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/custom_equation/custom_equation_editor.tsx @@ -13,10 +13,10 @@ import { EuiSpacer, } from '@elastic/eui'; import React, { useState, useCallback, useMemo } from 'react'; -import { omit, range, first, xor, debounce } from 'lodash'; import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public'; import { FormattedMessage } from '@kbn/i18n-react'; import { DataViewBase } from '@kbn/es-query'; +import { omit, range, first, xor, debounce } from 'lodash'; import { OMITTED_AGGREGATIONS_FOR_CUSTOM_METRICS } from '../../../../../common/http_api'; import { Aggregators, diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/custom_equation/metric_row_with_agg.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/custom_equation/metric_row_with_agg.tsx index 8bfa3961b7fa2fb..682b1d23b7be174 100644 --- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/custom_equation/metric_row_with_agg.tsx +++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/custom_equation/metric_row_with_agg.tsx @@ -15,9 +15,9 @@ import { EuiComboBoxOptionOption, } from '@elastic/eui'; import React, { useMemo, useCallback } from 'react'; -import { get } from 'lodash'; import { i18n } from '@kbn/i18n'; import { ValidNormalizedTypes } from '@kbn/triggers-actions-ui-plugin/public'; +import { get } from 'lodash'; import { Aggregators, CustomMetricAggTypes } from '../../../../../common/alerting/metrics'; import { MetricRowControls } from './metric_row_controls'; import { NormalizedFields, MetricRowBaseProps } from './types'; diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx index 2d3cfd13aac1fbd..af748fe2ff185fc 100644 --- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx +++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx @@ -20,7 +20,6 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; -import { debounce } from 'lodash'; import { ForLastExpression, IErrorObject, @@ -28,6 +27,7 @@ import { RuleTypeParamsExpressionProps, } from '@kbn/triggers-actions-ui-plugin/public'; import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration'; +import { debounce } from 'lodash'; import { useSourceContext, withSourceProvider } from '../../../containers/metrics_source'; import { Aggregators, Comparator, QUERY_INVALID } from '../../../../common/alerting/metrics'; import { useKibanaContextForPlugin } from '../../../hooks/use_kibana'; diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx index 3a59108e7e4d8ab..ab65c3c2acdda67 100644 --- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx +++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx @@ -16,7 +16,6 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; -import { omit } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; import { @@ -29,6 +28,7 @@ import { } from '@kbn/triggers-actions-ui-plugin/public'; import { DataViewBase } from '@kbn/es-query'; import useToggle from 'react-use/lib/useToggle'; +import { omit } from 'lodash'; import { Aggregators, Comparator } from '../../../../common/alerting/metrics'; import { decimalToPct, pctToDecimal } from '../../../../common/utils/corrected_percent_convert'; import { DerivedIndexPattern } from '../../../containers/metrics_source'; diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/hooks/use_metric_threshold_alert_prefill.ts b/x-pack/plugins/infra/public/alerting/metric_threshold/hooks/use_metric_threshold_alert_prefill.ts index 068c33ea2c31f57..64a0c6969c3a7af 100644 --- a/x-pack/plugins/infra/public/alerting/metric_threshold/hooks/use_metric_threshold_alert_prefill.ts +++ b/x-pack/plugins/infra/public/alerting/metric_threshold/hooks/use_metric_threshold_alert_prefill.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { isEqual } from 'lodash'; import { useState } from 'react'; +import { isEqual } from 'lodash'; import { MetricsExplorerMetric } from '../../../../common/http_api/metrics_explorer'; export interface MetricThresholdPrefillOptions { diff --git a/x-pack/plugins/infra/public/components/asset_details/tabs/metadata/table.tsx b/x-pack/plugins/infra/public/components/asset_details/tabs/metadata/table.tsx index 5fe888c26e8bf47..acea9eac75f07ab 100644 --- a/x-pack/plugins/infra/public/components/asset_details/tabs/metadata/table.tsx +++ b/x-pack/plugins/infra/public/components/asset_details/tabs/metadata/table.tsx @@ -14,9 +14,9 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React, { useCallback, useMemo, useState } from 'react'; -import { debounce } from 'lodash'; import { Query } from '@elastic/eui'; import useLocalStorage from 'react-use/lib/useLocalStorage'; +import { debounce } from 'lodash'; import { AddMetadataFilterButton } from './add_metadata_filter_button'; import { ExpandableContent } from '../../components/expandable_content'; import { type Field, getRowsWithPins } from './utils'; diff --git a/x-pack/plugins/infra/public/components/asset_details/tabs/processes/processes.tsx b/x-pack/plugins/infra/public/components/asset_details/tabs/processes/processes.tsx index 07615f3e6e34cec..aeea2a80472ed1b 100644 --- a/x-pack/plugins/infra/public/components/asset_details/tabs/processes/processes.tsx +++ b/x-pack/plugins/infra/public/components/asset_details/tabs/processes/processes.tsx @@ -6,7 +6,6 @@ */ import React, { useMemo, useState, useCallback } from 'react'; -import { debounce } from 'lodash'; import { i18n } from '@kbn/i18n'; import { EuiSearchBar, @@ -17,6 +16,7 @@ import { EuiIconTip, Query, } from '@elastic/eui'; +import { debounce } from 'lodash'; import { parseSearchString } from './parse_search_string'; import { ProcessesTable } from './processes_table'; import { STATE_NAMES } from './states'; diff --git a/x-pack/plugins/infra/public/components/asset_details/tabs/processes/processes_table.tsx b/x-pack/plugins/infra/public/components/asset_details/tabs/processes/processes_table.tsx index c3e1cbd30739860..eb07b401575a063 100644 --- a/x-pack/plugins/infra/public/components/asset_details/tabs/processes/processes_table.tsx +++ b/x-pack/plugins/infra/public/components/asset_details/tabs/processes/processes_table.tsx @@ -6,7 +6,6 @@ */ import React, { useMemo, useState, useCallback } from 'react'; -import { omit } from 'lodash'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import { @@ -25,6 +24,7 @@ import { RIGHT_ALIGNMENT, } from '@elastic/eui'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { omit } from 'lodash'; import { FORMATTERS } from '../../../../../common/formatters'; import type { SortBy } from '../../../../pages/metrics/inventory_view/hooks/use_process_list'; import type { Process } from './types'; diff --git a/x-pack/plugins/infra/public/components/asset_details/tabs/processes/summary_table.tsx b/x-pack/plugins/infra/public/components/asset_details/tabs/processes/summary_table.tsx index 57814aa7bacc2dc..a2b53b5c75cda03 100644 --- a/x-pack/plugins/infra/public/components/asset_details/tabs/processes/summary_table.tsx +++ b/x-pack/plugins/infra/public/components/asset_details/tabs/processes/summary_table.tsx @@ -6,7 +6,6 @@ */ import React, { useMemo } from 'react'; -import { mapValues } from 'lodash'; import { i18n } from '@kbn/i18n'; import { EuiLoadingSpinner, @@ -18,6 +17,7 @@ import { EuiHorizontalRule, } from '@elastic/eui'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { mapValues } from 'lodash'; import type { ProcessListAPIResponse } from '../../../../../common/http_api'; import { STATE_NAMES } from './states'; import { NOT_AVAILABLE_LABEL } from '../../translations'; diff --git a/x-pack/plugins/infra/public/components/auto_sizer.tsx b/x-pack/plugins/infra/public/components/auto_sizer.tsx index a983502fa85b7ea..472ed371f55bcb3 100644 --- a/x-pack/plugins/infra/public/components/auto_sizer.tsx +++ b/x-pack/plugins/infra/public/components/auto_sizer.tsx @@ -5,8 +5,8 @@ * 2.0. */ -import { isEqual } from 'lodash'; import React from 'react'; +import { isEqual } from 'lodash'; interface Measurement { width?: number; diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx index b86df4954c43178..f70d699fccbfe71 100644 --- a/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx @@ -15,9 +15,9 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; -import { groupBy } from 'lodash'; import React, { Fragment, useState } from 'react'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { groupBy } from 'lodash'; import { CategoryQualityWarning, CategoryQualityWarningReason, diff --git a/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx index 3d4c2cd2c3c0e0d..a7d042e24057c85 100644 --- a/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx @@ -16,10 +16,10 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; -import { debounce } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { debounce } from 'lodash'; import { useVisibilityState } from '../../utils/use_visibility_state'; interface LogHighlightsMenuProps { diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx index 72709d7d2faeed8..83c42225b0e9f50 100644 --- a/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx @@ -7,11 +7,11 @@ import { scaleLinear, scaleTime } from 'd3-scale'; import { area, curveMonotoneY } from 'd3-shape'; -import { max } from 'lodash'; import * as React from 'react'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; import { LogEntriesSummaryBucket } from '@kbn/logs-shared-plugin/common'; +import { max } from 'lodash'; interface DensityChartProps { buckets: LogEntriesSummaryBucket[]; diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts index fad6fd56f62517d..eb0b8379dbf0758 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { isEqual } from 'lodash'; import { useCallback, useEffect, useMemo, useState } from 'react'; import usePrevious from 'react-use/lib/usePrevious'; +import { isEqual } from 'lodash'; import { combineDatasetFilters, DatasetFilter, diff --git a/x-pack/plugins/infra/public/containers/logs/log_flyout.tsx b/x-pack/plugins/infra/public/containers/logs/log_flyout.tsx index ee7f4ebe7fb6e45..dea4e5f0d03ff3a 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_flyout.tsx +++ b/x-pack/plugins/infra/public/containers/logs/log_flyout.tsx @@ -6,8 +6,8 @@ */ import createContainer from 'constate'; -import { isString } from 'lodash'; import React, { useCallback, useState } from 'react'; +import { isString } from 'lodash'; import { UrlStateContainer } from '../../utils/url_state'; export enum FlyoutVisibility { diff --git a/x-pack/plugins/infra/public/containers/react_query_provider.tsx b/x-pack/plugins/infra/public/containers/react_query_provider.tsx index 050575dcc054ab9..566a80e0dbf08dd 100644 --- a/x-pack/plugins/infra/public/containers/react_query_provider.tsx +++ b/x-pack/plugins/infra/public/containers/react_query_provider.tsx @@ -7,9 +7,9 @@ import React, { useState } from 'react'; import { QueryClient, QueryClientConfig, QueryClientProvider } from '@tanstack/react-query'; -import merge from 'lodash/merge'; import { EuiButtonIcon } from '@elastic/eui'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; +import merge from 'lodash/merge'; const DEFAULT_CONFIG = { defaultOptions: { diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx index 2917b7b21d78fae..8ccc4cfab98a1b3 100644 --- a/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx +++ b/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx @@ -14,11 +14,11 @@ import { EuiToolTip, } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n-react'; -import { isEmpty } from 'lodash'; import React, { useCallback, useMemo } from 'react'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; import { LogEntry } from '@kbn/logs-shared-plugin/common'; import { LogStream } from '@kbn/logs-shared-plugin/public'; +import { isEmpty } from 'lodash'; import { useViewLogInProviderContext } from '../../../containers/logs/view_log_in_context'; import { useViewportDimensions } from '../../../utils/use_viewport_dimensions'; diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_control_panels_url_state.ts b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_control_panels_url_state.ts index 177c8d869ac6b6e..94b4018eb9231bb 100644 --- a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_control_panels_url_state.ts +++ b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_control_panels_url_state.ts @@ -6,11 +6,11 @@ */ import * as rt from 'io-ts'; -import { pick } from 'lodash'; import { pipe } from 'fp-ts/lib/pipeable'; import { fold } from 'fp-ts/lib/Either'; import { constant, identity } from 'fp-ts/lib/function'; import type { DataView } from '@kbn/data-views-plugin/public'; +import { pick } from 'lodash'; import { useUrlState } from '../../../../utils/use_url_state'; const HOST_FILTERS_URL_STATE_KEY = 'controlPanels'; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx index 2de3ee7bbb30123..eaffaecf82b6727 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx @@ -4,7 +4,6 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import { debounce } from 'lodash'; import React, { useState, useCallback, useMemo, useEffect } from 'react'; import { EuiForm, EuiDescribedFormGroup, EuiFormRow } from '@elastic/eui'; import { EuiText, EuiSpacer } from '@elastic/eui'; @@ -18,6 +17,7 @@ import { EuiComboBox } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { EuiLoadingSpinner } from '@elastic/eui'; import { useUiTracker } from '@kbn/observability-shared-plugin/public'; +import { debounce } from 'lodash'; import { useSourceContext } from '../../../../../../containers/metrics_source'; import { useMetricK8sModuleContext } from '../../../../../../containers/ml/modules/metrics_k8s/module'; import { useMetricHostsModuleContext } from '../../../../../../containers/ml/modules/metrics_hosts/module'; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx index 6e8908bf2362a6c..be053bced1c7201 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx @@ -9,8 +9,8 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react' import { i18n } from '@kbn/i18n'; import { Chart, niceTimeFormatter, PointerEvent } from '@elastic/charts'; import { EuiLoadingChart, EuiSpacer, EuiFlexGrid, EuiFlexItem } from '@elastic/eui'; -import { first, last } from 'lodash'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { first, last } from 'lodash'; import { TabContent, TabProps } from '../shared'; import { useSnapshot } from '../../../../hooks/use_snaphot'; import { useWaffleOptionsContext } from '../../../../hooks/use_waffle_options'; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/index.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/index.tsx index 2d4ef39864a45fc..f46ef5e77a6dabf 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/index.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/index.tsx @@ -6,7 +6,6 @@ */ import React, { useMemo, useState, useCallback } from 'react'; -import { debounce } from 'lodash'; import { i18n } from '@kbn/i18n'; import { EuiSearchBar, @@ -17,6 +16,7 @@ import { EuiIconTip, Query, } from '@elastic/eui'; +import { debounce } from 'lodash'; import { getFieldByType } from '../../../../../../../../common/inventory_models'; import { useProcessList, diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx index b19a859f196ea34..efc1837542f1967 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx @@ -16,9 +16,9 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; -import { first, last } from 'lodash'; import moment from 'moment'; import React, { useMemo } from 'react'; +import { first, last } from 'lodash'; import { useTimelineChartTheme } from '../../../../../../../utils/use_timeline_chart_theme'; import { Color } from '../../../../../../../../common/color_palette'; import { createFormatter } from '../../../../../../../../common/formatters'; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx index c85cc1577fa7f78..d46960f367a03ab 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx @@ -6,7 +6,6 @@ */ import React, { useMemo, useState, useCallback } from 'react'; -import { omit } from 'lodash'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import { @@ -25,6 +24,7 @@ import { RIGHT_ALIGNMENT, } from '@elastic/eui'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { omit } from 'lodash'; import { ProcessListAPIResponse } from '../../../../../../../../common/http_api'; import { FORMATTERS } from '../../../../../../../../common/formatters'; import { SortBy } from '../../../../hooks/use_process_list'; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx index 61e5cde4211817e..228efb6739ce891 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx @@ -6,7 +6,6 @@ */ import React, { useMemo } from 'react'; -import { mapValues } from 'lodash'; import { i18n } from '@kbn/i18n'; import { EuiLoadingSpinner, @@ -18,6 +17,7 @@ import { EuiHorizontalRule, } from '@elastic/eui'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { mapValues } from 'lodash'; import { ProcessListAPIResponse } from '../../../../../../../../common/http_api'; import { STATE_NAMES } from './states'; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/table_view.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/table_view.tsx index dfede3481dca619..855599520858a25 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/table_view.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/table_view.tsx @@ -8,9 +8,9 @@ import { EuiButtonEmpty, EuiInMemoryTable, EuiToolTip, EuiBasicTableColumn } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { last, first } from 'lodash'; import React, { useState, useMemo } from 'react'; import { EuiPopover } from '@elastic/eui'; +import { last, first } from 'lodash'; import { createWaffleMapNode } from '../lib/nodes_to_wafflemap'; import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../../lib/lib'; import { fieldToName } from '../lib/field_to_display_name'; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx index 1e69f7fb6d8b4da..d690c70a1b8f56f 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx @@ -9,7 +9,6 @@ import React, { useMemo, useCallback, useEffect } from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; import moment from 'moment'; -import { first, last } from 'lodash'; import { EuiLoadingChart, EuiText, EuiEmptyPrompt, EuiButton } from '@elastic/eui'; import { Axis, @@ -28,6 +27,7 @@ import { EuiFlexItem } from '@elastic/eui'; import { EuiFlexGroup } from '@elastic/eui'; import { EuiIcon } from '@elastic/eui'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { first, last } from 'lodash'; import { useTimelineChartTheme } from '../../../../../utils/use_timeline_chart_theme'; import { toMetricOpt } from '../../../../../../common/snapshot_metric_i18n'; import { MetricsExplorerAggregation } from '../../../../../../common/http_api'; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx index 5ef86a7fd695bbe..4d60b37ff282aa6 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; -import { first } from 'lodash'; import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common'; +import { first } from 'lodash'; import { getCustomMetricLabel } from '../../../../../../common/formatters/get_custom_metric_label'; import { SnapshotCustomMetricInput } from '../../../../../../common/http_api'; import { useSourceContext } from '../../../../../containers/metrics_source'; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx index 043586b68269338..b5a5a005681aa07 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { EuiLoadingSpinner } from '@elastic/eui'; -import { isEqual } from 'lodash'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { isEqual } from 'lodash'; import { InfraWaffleMapBounds, InfraWaffleMapGroupOfNodes, diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx index 0eda4c4b72cd1a0..eea54777e01c616 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx @@ -10,9 +10,9 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; -import { first } from 'lodash'; import { EuiPopover, EuiToolTip } from '@elastic/eui'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { first } from 'lodash'; import { InfraWaffleMapBounds, InfraWaffleMapNode, diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_timeline.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_timeline.ts index 31c2ce9e186effc..b5d3ab64295ed51 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_timeline.ts +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_timeline.ts @@ -8,8 +8,8 @@ import { fold } from 'fp-ts/lib/Either'; import { identity } from 'fp-ts/lib/function'; import { pipe } from 'fp-ts/lib/pipeable'; -import { first } from 'lodash'; import { useEffect, useMemo, useCallback } from 'react'; +import { first } from 'lodash'; import { getIntervalInSeconds } from '../../../../../common/utils/get_interval_in_seconds'; import { throwErrors, createPlainError } from '../../../../../common/runtime_types'; import { useHTTPRequest } from '../../../../hooks/use_http_request'; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/color_from_value.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/color_from_value.ts index 9b4899c9d7a2089..9b61449c1b2678e 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/color_from_value.ts +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/color_from_value.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { isEqual, first, gt, gte, last, lt, lte, sortBy } from 'lodash'; import { mix, parseToRgb, toColorString } from 'polished'; +import { isEqual, first, gt, gte, last, lt, lte, sortBy } from 'lodash'; import { InfraWaffleMapBounds, InfraWaffleMapLegend, diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx index 6faa13f31fc80f9..553c3706dd2ec51 100644 --- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx @@ -14,10 +14,10 @@ import { EuiText, EuiTitle, } from '@elastic/eui'; -import { get, last, max } from 'lodash'; import React, { ReactText } from 'react'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { get, last, max } from 'lodash'; import { createFormatter } from '../../../../../common/formatters'; import { InventoryFormatterType } from '../../../../../common/inventory_models/types'; import { SeriesOverrides, VisSectionProps } from '../types'; diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx index edd760bc17f64fc..d713b58115f7b6e 100644 --- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx @@ -8,8 +8,8 @@ import React, { useContext, useState, useCallback, useMemo } from 'react'; import { EuiButtonIcon, EuiFlexGrid, EuiFlexItem, EuiTitle, EuiText } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { get } from 'lodash'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; +import { get } from 'lodash'; import { InfraMetadata } from '../../../../../common/http_api'; import { MetadataContext } from '../containers/metadata_context'; diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx index afd2b9a4cb26309..bc5cec2a12e3210 100644 --- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx @@ -17,9 +17,9 @@ import { } from '@elastic/charts'; import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiToolTip } from '@elastic/eui'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; -import { first, last } from 'lodash'; import moment from 'moment'; import React, { useCallback, useMemo } from 'react'; +import { first, last } from 'lodash'; import { useTimelineChartTheme } from '../../../../utils/use_timeline_chart_theme'; import { useKibanaContextForPlugin } from '../../../../hooks/use_kibana'; import { MetricsExplorerSeries } from '../../../../../common/http_api/metrics_explorer'; diff --git a/x-pack/plugins/infra/public/utils/typed_react.tsx b/x-pack/plugins/infra/public/utils/typed_react.tsx index b5b7a440c117c4a..9a59fb8a9ed8ec0 100644 --- a/x-pack/plugins/infra/public/utils/typed_react.tsx +++ b/x-pack/plugins/infra/public/utils/typed_react.tsx @@ -5,9 +5,9 @@ * 2.0. */ -import { omit } from 'lodash'; import React from 'react'; import { InferableComponentEnhancerWithProps, ConnectedComponent } from 'react-redux'; +import { omit } from 'lodash'; export type RendererResult = React.ReactElement | null; export type RendererFunction = (args: RenderArgs) => Result; diff --git a/x-pack/plugins/infra/server/deprecations.ts b/x-pack/plugins/infra/server/deprecations.ts index 93d93f32ff5c092..1e490315a1cbbf5 100644 --- a/x-pack/plugins/infra/server/deprecations.ts +++ b/x-pack/plugins/infra/server/deprecations.ts @@ -6,13 +6,13 @@ */ import { i18n } from '@kbn/i18n'; -import { get } from 'lodash'; import { ConfigDeprecationProvider, ConfigDeprecation, DeprecationsDetails, GetDeprecationsContext, } from '@kbn/core/server'; +import { get } from 'lodash'; import { TIMESTAMP_FIELD, TIEBREAKER_FIELD, diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts index 9708761daad617f..edce81d7d2bca0e 100644 --- a/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts @@ -7,8 +7,8 @@ import { i18n } from '@kbn/i18n'; import { KibanaRequest } from '@kbn/core/server'; -import { flatten, get } from 'lodash'; import { isVisSeriesData } from '@kbn/vis-type-timeseries-plugin/server'; +import { flatten, get } from 'lodash'; import { TIMESTAMP_FIELD } from '../../../../common/constants'; import { NodeDetailsMetricData } from '../../../../common/http_api/node_details_api'; import { KibanaFramework } from '../framework/kibana_framework_adapter'; diff --git a/x-pack/plugins/infra/server/lib/alerting/common/utils.ts b/x-pack/plugins/infra/server/lib/alerting/common/utils.ts index dc518e1e08cf76f..600597ed40410ec 100644 --- a/x-pack/plugins/infra/server/lib/alerting/common/utils.ts +++ b/x-pack/plugins/infra/server/lib/alerting/common/utils.ts @@ -5,7 +5,6 @@ * 2.0. */ -import { isEmpty, isError } from 'lodash'; import { schema } from '@kbn/config-schema'; import { Logger, LogMeta } from '@kbn/logging'; import type { ElasticsearchClient, IBasePath } from '@kbn/core/server'; @@ -19,6 +18,7 @@ import { import { ES_FIELD_TYPES } from '@kbn/field-types'; import { set } from '@kbn/safer-lodash-set'; import { ParsedExperimentalFields } from '@kbn/rule-registry-plugin/common/parse_experimental_fields'; +import { isEmpty, isError } from 'lodash'; import { LINK_TO_METRICS_EXPLORER } from '../../../../common/alerting/metrics'; import { getInventoryViewInAppUrl } from '../../../../common/alerting/metrics/alert_link'; import { diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts index fb19bbcef9c57d6..d5b3aa9b228542a 100644 --- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts +++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts @@ -6,8 +6,8 @@ */ import { ElasticsearchClient } from '@kbn/core/server'; -import { mapValues } from 'lodash'; import type { Logger } from '@kbn/logging'; +import { mapValues } from 'lodash'; import { InventoryMetricConditions } from '../../../../common/alerting/metrics'; import { InfraTimerangeInput } from '../../../../common/http_api'; import { InventoryItemType } from '../../../../common/inventory_models/types'; diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts index 0754c79a99688d2..a053bbeffbafa18 100644 --- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts +++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts @@ -7,7 +7,6 @@ import { i18n } from '@kbn/i18n'; import { ALERT_REASON, ALERT_ACTION_GROUP, ALERT_EVALUATION_VALUES } from '@kbn/rule-data-utils'; -import { first, get } from 'lodash'; import { ActionGroup, ActionGroupIdsOf, @@ -16,6 +15,7 @@ import { } from '@kbn/alerting-plugin/common'; import { Alert, RuleTypeState } from '@kbn/alerting-plugin/server'; import { getAlertUrl } from '@kbn/observability-plugin/common'; +import { first, get } from 'lodash'; import { getOriginalActionGroup } from '../../../utils/get_original_action_group'; import { AlertStates, InventoryMetricThresholdParams } from '../../../../common/alerting/metrics'; import { createFormatter } from '../../../../common/formatters'; diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts index b6d583cb17e6b20..e9c41684aab493f 100644 --- a/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts +++ b/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts @@ -7,7 +7,6 @@ import { i18n } from '@kbn/i18n'; import { KibanaRequest } from '@kbn/core/server'; -import { first } from 'lodash'; import moment from 'moment'; import { ActionGroup, @@ -16,6 +15,7 @@ import { } from '@kbn/alerting-plugin/common'; import { RuleExecutorOptions } from '@kbn/alerting-plugin/server'; import { MlPluginSetup } from '@kbn/ml-plugin/server'; +import { first } from 'lodash'; import { AlertStates, MetricAnomalyParams } from '../../../../common/alerting/metrics'; import { getIntervalInSeconds } from '../../../../common/utils/get_interval_in_seconds'; import { MappedAnomalyHit } from '../../infra_ml'; diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts index 26db822e9caf5ef..fdc15d19b478459 100644 --- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts +++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts @@ -7,7 +7,6 @@ import { i18n } from '@kbn/i18n'; import { ALERT_ACTION_GROUP, ALERT_EVALUATION_VALUES, ALERT_REASON } from '@kbn/rule-data-utils'; -import { isEqual } from 'lodash'; import { ActionGroupIdsOf, AlertInstanceContext as AlertContext, @@ -17,6 +16,7 @@ import { import { Alert, RuleTypeState } from '@kbn/alerting-plugin/server'; import type { TimeUnitChar } from '@kbn/observability-plugin/common'; import { getAlertUrl } from '@kbn/observability-plugin/common'; +import { isEqual } from 'lodash'; import { getOriginalActionGroup } from '../../../utils/get_original_action_group'; import { AlertStates, Comparator } from '../../../../common/alerting/metrics'; import { createFormatter } from '../../../../common/formatters'; diff --git a/x-pack/plugins/infra/server/lib/metrics/lib/convert_buckets_to_metrics_series.ts b/x-pack/plugins/infra/server/lib/metrics/lib/convert_buckets_to_metrics_series.ts index 56ee719c931ec46..5a69abf54714748 100644 --- a/x-pack/plugins/infra/server/lib/metrics/lib/convert_buckets_to_metrics_series.ts +++ b/x-pack/plugins/infra/server/lib/metrics/lib/convert_buckets_to_metrics_series.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { get, values, first } from 'lodash'; import * as rt from 'io-ts'; +import { get, values, first } from 'lodash'; import { MetricsAPIRequest, MetricsAPISeries, diff --git a/x-pack/plugins/infra/server/lib/sources/sources.ts b/x-pack/plugins/infra/server/lib/sources/sources.ts index 693c4aba20ae1ae..042e8bae21e5f0b 100644 --- a/x-pack/plugins/infra/server/lib/sources/sources.ts +++ b/x-pack/plugins/infra/server/lib/sources/sources.ts @@ -9,12 +9,12 @@ import { fold, map } from 'fp-ts/lib/Either'; import { constant, identity } from 'fp-ts/lib/function'; import { pipe } from 'fp-ts/lib/pipeable'; import { failure } from 'io-ts/lib/PathReporter'; -import { inRange } from 'lodash'; import { SavedObject, SavedObjectsClientContract, SavedObjectsErrorHelpers, } from '@kbn/core/server'; +import { inRange } from 'lodash'; import { InfraSavedSourceConfiguration, InfraSource, diff --git a/x-pack/plugins/infra/server/routes/ip_to_hostname.ts b/x-pack/plugins/infra/server/routes/ip_to_hostname.ts index 7bafa787506906a..cc046441640b0ee 100644 --- a/x-pack/plugins/infra/server/routes/ip_to_hostname.ts +++ b/x-pack/plugins/infra/server/routes/ip_to_hostname.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { first } from 'lodash'; import { schema } from '@kbn/config-schema'; +import { first } from 'lodash'; import { InfraBackendLibs } from '../lib/infra_types'; interface HostDoc { diff --git a/x-pack/plugins/infra/server/routes/metadata/index.ts b/x-pack/plugins/infra/server/routes/metadata/index.ts index 18ee48ed5ad090f..72f869a2e6c19b8 100644 --- a/x-pack/plugins/infra/server/routes/metadata/index.ts +++ b/x-pack/plugins/infra/server/routes/metadata/index.ts @@ -7,10 +7,10 @@ import { schema } from '@kbn/config-schema'; import Boom from '@hapi/boom'; -import { get } from 'lodash'; import { pipe } from 'fp-ts/lib/pipeable'; import { fold } from 'fp-ts/lib/Either'; import { identity } from 'fp-ts/lib/function'; +import { get } from 'lodash'; import { InfraMetadataFeature, InfraMetadataRequestRT, diff --git a/x-pack/plugins/infra/server/routes/metrics_explorer/lib/find_interval_for_metrics.ts b/x-pack/plugins/infra/server/routes/metrics_explorer/lib/find_interval_for_metrics.ts index 62e99cf8ffd320d..fe326925aca3a17 100644 --- a/x-pack/plugins/infra/server/routes/metrics_explorer/lib/find_interval_for_metrics.ts +++ b/x-pack/plugins/infra/server/routes/metrics_explorer/lib/find_interval_for_metrics.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { uniq } from 'lodash'; import LRU from 'lru-cache'; +import { uniq } from 'lodash'; import { MetricsExplorerRequestBody } from '../../../../common/http_api'; import { getDatasetForField } from './get_dataset_for_field'; import { calculateMetricInterval } from '../../../utils/calculate_metric_interval'; 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 4646c12fdfc2760..0b8ff188bf74b15 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 @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import { last, castArray, @@ -956,7 +958,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 e7fae8d6c78bd7d..313d0556a48369b 100644 --- a/x-pack/plugins/osquery/public/results/results_table.tsx +++ b/x-pack/plugins/osquery/public/results/results_table.tsx @@ -253,7 +253,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/osquery/public/shared_components/osquery_results/osquery_result.tsx b/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.tsx index d7c16cdbc401c8f..0de1b9c6303e530 100644 --- a/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.tsx +++ b/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import { EuiComment, EuiSpacer } from '@elastic/eui'; import React, { useLayoutEffect, useState } from 'react'; import { FormattedRelative } from '@kbn/i18n-react'; diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result_wrapper.tsx b/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result_wrapper.tsx index 084c1f778cbd46f..ac8cbb777caf3ef 100644 --- a/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result_wrapper.tsx +++ b/x-pack/plugins/osquery/public/shared_components/osquery_results/osquery_result_wrapper.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import { EuiComment, EuiErrorBoundary } from '@elastic/eui'; import React, { useState, useEffect } from 'react'; import { FormattedRelative } from '@kbn/i18n-react'; 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 528190cca0c9d95..543ec093e367bed 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 4e4e783580bc9d7..bbcd40c95ed0ba7 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 620e3249c05df71..9066c00144e3dc3 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 3263b4db80c666e..bae93d048af884b 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 2632f73e99d076e..089642373215023 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 @@ -41,6 +41,8 @@ import { FormattedMessage } from '@kbn/i18n-react'; import { useKibana } from '@kbn/kibana-react-plugin/public'; import { UserAvatar } from '@kbn/user-profile-components'; +import { getUseUpdateUserProfile } from './use_update_user_profile'; +import { createImageHandler, getRandomColor, IMAGE_FILE_TYPES, VALID_HEX_COLOR } from './utils'; import type { AuthenticatedUser } from '../../../common'; import { canUserChangeDetails, @@ -65,8 +67,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 { getUseUpdateUserProfile } from './use_update_user_profile'; -import { createImageHandler, getRandomColor, IMAGE_FILE_TYPES, VALID_HEX_COLOR } from './utils'; export interface UserProfileData { avatar?: UserProfileAvatarData; diff --git a/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.ts b/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.ts index 4b992f616ca141d..ad8f64087890da7 100644 --- a/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.ts +++ b/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.ts @@ -11,8 +11,8 @@ import { BehaviorSubject, Subject } from 'rxjs'; import type { HttpStart } from '@kbn/core/public'; -import type { GetUserProfileResponse, UserProfile } from '../../../common'; import type { UserProfileData } from './user_profile'; +import type { GetUserProfileResponse, UserProfile } from '../../../common'; /** * Parameters for the get user profile for the current user API. 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 e8014293c2f7fed..998f4a6d62afa6e 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 1c87db674eb4098..2a4a5eba595b87e 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 0654042059649bb..bc4e0dd09383502 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 5cbf5007be218c2..62c60587282ef45 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 48f6d3782f619d2..424bfe27352b5e3 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 44053cea1174dce..e8b2e684819c0fc 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 a9c5d8f57527b51..e752b3c5aa0bfef 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 30c4aa678f8ccae..a645ab70a540f45 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 12194223dbec06b..9ee4e22c0707820 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 ac7238f8db7a8b3..dee4149b0850719 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 586f5b4b91507dd..6782b0e01939f79 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 cd5a8d3620a2fc8..22e2bd553f3d11e 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 cdf54e2700a5264..17fa3a1a6a49104 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_keys_grid_page.test.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx index 0f20e4a5cfe9693..52b161880666f4f 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,11 +11,11 @@ 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 { apiKeysAPIClientMock } from '../index.mock'; -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 1ce95fc80897eda..e2b974b6248c9a0 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 @@ -34,6 +34,12 @@ import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template'; import { Route } from '@kbn/shared-ux-router'; import type { PublicMethodsOf } from '@kbn/utility-types'; +import { ApiKeyFlyout } from './api_key_flyout'; +import { ApiKeysEmptyPrompt } from './api_keys_empty_prompt'; +import type { InvalidateApiKeys } from './invalidate_provider'; +import { InvalidateProvider } from './invalidate_provider'; +import { NotEnabled } from './not_enabled'; +import { PermissionDenied } from './permission_denied'; import type { ApiKey, ApiKeyToInvalidate } from '../../../../common/model'; import { Breadcrumb } from '../../../components/breadcrumb'; import { SelectableTokenField } from '../../../components/token_field'; @@ -42,12 +48,6 @@ import type { CreateApiKeyResponse, UpdateApiKeyResponse, } from '../api_keys_api_client'; -import { ApiKeyFlyout } from './api_key_flyout'; -import { ApiKeysEmptyPrompt } from './api_keys_empty_prompt'; -import type { InvalidateApiKeys } from './invalidate_provider'; -import { InvalidateProvider } from './invalidate_provider'; -import { NotEnabled } from './not_enabled'; -import { PermissionDenied } from './permission_denied'; interface Props { history: History; 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 bcde6bbb619b778..bd0db3b9a1f9fe1 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 @@ -14,8 +14,8 @@ import { act } from '@testing-library/react'; import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks'; import type { Unmount } from '@kbn/management-plugin/public/types'; -import { securityMock } from '../../mocks'; import { apiKeysManagementApp } from './api_keys_management_app'; +import { securityMock } from '../../mocks'; describe('apiKeysManagementApp', () => { it('create() returns proper management app descriptor', () => { 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 d157806dc85113b..8591d4d6fd665ab 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 059eeba201c8a77..30b90c1031902f0 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 171f592988ba9a0..ce1b6b0d0efc174 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 a6d0de7da144c8b..017e5ec37a332f4 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 b8f16fa6e2b76b7..0d4c797a9452e45 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 c10068e593b6628..8faf0fa99998a01 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 eee585043e0748b..219e01512ed2fc7 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 c292cda5e9bdfc4..bf8b68ab7a9278e 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 de2db57cc3f137c..4641e0fe13bd282 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 2ada7e9730cb0c4..803739cd8b55cce 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 9355b74fc3bffce..53300a4ec65559f 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 514ac48976b1c3e..f8624431b401db2 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 99b26d878b066e0..a4c307a849fdb72 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 acc96e27ae6d3dd..1a5549ecd1e9baf 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 283b347015bf904..3bd34cb00c2a7c3 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 cb905e193c2a470..e47111433908380 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 20de1f0ed86c424..2090e83548643c5 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 254bc7838db4a56..19620d46ad251d3 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 5ab690b8253bbe5..7dfa891e8d1b03b 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 22ff31acd0c7c7b..50c821541d07acc 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 551c1d8ef964ff9..2db57590042dfc7 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 f25f4fa7cda5f70..b248f63410a2ba6 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 04dbc1907ec001a..bebc0619e2a6892 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 e6feadd199b02ea..aa63b8f424bcead 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 52e3d768ef07e5c..7b5aef1d844f26c 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 9388ab92a0a76de..4348f37ae8d394a 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 b9b653e108738aa..23dcb3673192f75 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 1a1486f6d82e3ac..ba33767e2240cea 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 e963c4eda6d925f..211cd7a77efcf9c 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 09160ce3b69671e..60e025d968614ba 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 5247b56d52a9164..e05e6c4a4f8d191 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 b47cff5b216696d..edf2ebd9485129c 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 0383e857adda4ee..59418010b114d9f 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 d2a5625b724a6b5..8d9573383b255ea 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 c7ab5a2be789075..42a08b3244363ed 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 e89102e62ca8dab..abc33abcb866042 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 12a9a8a79944b9c..3047cb0f91f1224 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 c503ef35ae06c93..372b24048fe5b3b 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 62627073943f0fe..ef6e4ca485d0bcf 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 62a1a021c0aaeb0..e45829d722cbc7b 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 a640c5cbbf08796..901cd14e24038c6 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 2a33d01c6e38cbe..7de3c66f8f4f55f 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 2aaec1ae95d8700..d5a98510b026547 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 61be3af6eb1c8df..856404408d55c4c 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 d81af7ae9de8779..727bcdc1b103d57 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 62ad9bc83b1cc54..7efe5bc8333fd57 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 f8e5867443b3f6e..4bddc6bad6fda9e 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 015dd8a5548cd8c..61a7c024a282852 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 8f5efff64aadd7f..85f8af876dae74f 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 f886de819e14455..786039ce0a2375a 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 71876eeed963d97..4fdeff85fb00d34 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 5b39b158e67c28b..05327142e210526 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 36755875848dc67..5c9220872d9b366 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 bae3b7f4a9b53e6..adfc8100aeb9370 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 8152a21bd931c81..3b44f20336d81e6 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 563911848b122cf..20315691695711e 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 3145c43f2be4228..ac3c36c510bcd20 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 61c0902b4ef9037..f2f2f9a10e52c31 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 973c017e3a19054..5baaf7d08055b89 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 b48fc18527cd694..7e5151d6d67affb 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 ce7af35dccf2264..ac30132df8a80be 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 57a3a5aa8ad031e..6ca8dd1322cbffd 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 8b5631328f6f70f..4c6962585976c73 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 f1536631a66e782..5e9d5fcc56350fb 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 a5f459dfc112490..4ab78b64bf9ae58 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 8fd11556228cddd..70e4a911dd61ef6 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 329b4bfc28b54f9..ef41ba92c78502a 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 d72732cfd99ed22..9378d885f46b09c 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 c4a47a5fd1ed76c..673fd2e89599a4c 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 d4b35b833c87810..9926fe49883eb66 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 273086be971d1f7..a2d3fddf7725d77 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 3c133b3628b4369..dd7b68566a1974d 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 dd5495cd8bd1d56..992ec3204de2160 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 f0081307ef33f1d..54f7617c3526587 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 a0f9df820c91e59..c09eb20328c49fe 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 68672b8033a665a..2346d26c44a8347 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 e1af50e986450b8..a3aaa86203d6979 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 631b7341fc3b3ca..36343ebe9a806d8 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 type { UpdateUserProfileHook } from './account_management'; import { accountManagementApp, UserProfileAPIClient } from './account_management'; import { getUseUpdateUserProfile } from './account_management/user_profile/use_update_user_profile'; @@ -40,6 +38,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 4a59ba96a998a6c..2c6ba4861857eed 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 280ce8dee5df5b4..d2b3e31f48a5964 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 9bdee832e9b667d..b5aa984a5ce1f7d 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 02a41f1b80b80e4..956018573ad31b1 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 6ee9f1c36146156..fa0bcffc66b0158 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 02e43c2fd3a8361..0d116641c117909 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 b4228b573243db0..7f3f0d57d449ce0 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 e09a9e5f26c312a..d96d9d0b69c9b3a 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 92dbb572df04535..3ef59a77c74c3ff 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 63486b4dad703c2..3cee2adf03f5c31 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 c41676fbaa90140..b1e3b1826f8ce68 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 a0d35bf80389ca4..a03e5047a10a258 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 a163a75e71874fe..dddb24d47fdaf57 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 b59ff8e50638098..c5877daeba5ce33 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 854524df7d596e5..b6a33880f2b7fe3 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 @@ -11,6 +11,7 @@ import type { IClusterClient, KibanaRequest, Logger } from '@kbn/core/server'; import type { KibanaFeature } from '@kbn/features-plugin/server'; import type { OneOf } from '@kbn/utility-types'; +import { getFakeKibanaRequest } from './fake_kibana_request'; import type { SecurityLicense } from '../../../common/licensing'; import type { ElasticsearchPrivilegesType, KibanaPrivilegesType } from '../../lib'; import { transformPrivilegesToElasticsearchPrivileges, validateKibanaPrivileges } from '../../lib'; @@ -18,7 +19,6 @@ import { BasicHTTPAuthorizationHeaderCredentials, HTTPAuthorizationHeader, } from '../http_authentication'; -import { getFakeKibanaRequest } from './fake_kibana_request'; /** * Represents the options to create an APIKey class instance that will be 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 73465a9fdaf1eed..b2a24bd28d45ee3 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 5509b68d14c1f11..7f79b8c7d54ba3e 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 cbd71b890761fb7..b22a5244d4e2419 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 7edf3ea05059067..f0e1479362fdf41 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 8599eb287989ed8..3d1ffebabb5133c 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 47a09297ff866a5..03a97af10c7d1ef 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 b6c1eb4e12b0ad7..9cb2b30040d6671 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 fb48a2ddcd0f624..6bbf2aa2c43f4d9 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 29bf38c6f1653c9..f9663e3fdab0d0f 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 cbdcfbe9a5eada0..6c363936e440861 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 6e257c7f6b7ab70..c1e7ba662c51389 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 958b125a75c1737..21c2b25d3be8a37 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 8643386f762b32c..da31624fddd670f 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 5cf7ede569e5d85..e45e0e09ec85152 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 c02f7c54c5421fc..ea9a44fbc623fa7 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 143245b31770b85..df4abf62a6e6880 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 0196ec8d9942195..e5b862f57996596 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 0e3544063f1d67b..1137c8fd71563ce 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 a165b1960c3f330..15ff615af9ad25a 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 890e76301ddc72b..5f76622bf96316e 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 fbdf6e39abff302..f8ef97caf78a45c 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 d34704c53260b58..5132ffa7294c93b 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 a5ebc432454a795..8269184a2dca845 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 a03401f929e9211..df26a7b802d4d70 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 01421c94c697433..0d1009bdd4b9e59 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 82412e7b76470e4..6e0fda1fa3d8eae 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 e994dee8f1887bf..e339645f76dfdbc 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 c0ec5f02ec193ad..0e842da4e485114 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 b5ff420b420e9a5..22c2e53e9ab27e9 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 e2e988e7f531752..0afcd4118ab8b53 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 ca14802903c6d56..0afa29fab3c5882 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 a61a00f6c2c4eb9..8f56ba95883b572 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 6023ea402ae561d..e3cd51bc77015b8 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 b0c73b1eda51da8..2df3d9ab6b5b28e 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 bd689d5d469f3e9..86689c03ab96b1d 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 fd345f3455a4433..d4d49a5334f1d18 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 f6a80929dfd90e5..11544832420ae2b 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 4cad968dabb3533..2d8fe4b8f4c2422 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 d0643a157f45fbf..20de4011c39f425 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 58b5ee50dc8f13f..8679dbefab4dfa4 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 4216500da2bd1e7..89b556f416843e9 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 61555d2b4dba51a..30fafabe0ae4326 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 338e278e5076896..c0b1c31a91aa964 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 0dc25164eb1bc3d..1d9985fbc865053 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 6c04b6121c2d1f6..ec808f231808d61 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 3ec3247bf61a787..ff7a69029344346 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 9b6c6c4b8cbdc91..ba0dbaafeef3bb9 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 e3f38699c06510f..a022fdd418e6e46 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 88293e6d0337785..31c1f057942de4c 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 df201afced9b636..afbab0d2bfbd45f 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 c84ff1c5d2ccd08..a8152117a287391 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 3a794c9ac5f3685..b0518086f97d96b 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 85cc04cf63e70d7..00c07fe6ad0d742 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 c634d721c33542b..a075d8bb66403b2 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 7236e46df7ed533..0dfe2239f6c465d 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 b123c5cc0be804a..6870dc6b9464aa5 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 c34a67ff1bfcbe1..28fdd043d3ec3a9 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 @@ -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 { defineGetApiKeysRoutes } from './get'; +import { routeDefinitionParamsMock } from '../index.mock'; interface TestOptions { isAdmin?: boolean; 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 d815fb749fb4d0a..265e234d3ad918f 100644 --- a/x-pack/plugins/security/server/routes/api_keys/index.ts +++ b/x-pack/plugins/security/server/routes/api_keys/index.ts @@ -5,13 +5,13 @@ * 2.0. */ -import type { RouteDefinitionParams } from '..'; import { defineCreateApiKeyRoutes } from './create'; import { defineEnabledApiKeysRoutes } from './enabled'; import { defineGetApiKeysRoutes } from './get'; import { defineInvalidateApiKeysRoutes } from './invalidate'; import { defineCheckPrivilegesRoutes } from './privileges'; import { defineUpdateApiKeyRoutes } from './update'; +import type { RouteDefinitionParams } from '..'; export function defineApiKeysRoutes(params: RouteDefinitionParams) { defineEnabledApiKeysRoutes(params); 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 c6f4594e8fb3c8e..16f39383997e90a 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/privileges.test.ts b/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts index 52d1d59a486da53..56bf40a8ea249aa 100644 --- a/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts +++ b/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts @@ -11,9 +11,9 @@ import { kibanaResponseFactory } from '@kbn/core/server'; import { coreMock, httpServerMock } from '@kbn/core/server/mocks'; import type { LicenseCheck } from '@kbn/licensing-plugin/server'; +import { defineCheckPrivilegesRoutes } from './privileges'; import { authenticationServiceMock } from '../../authentication/authentication_service.mock'; import { routeDefinitionParamsMock } from '../index.mock'; -import { defineCheckPrivilegesRoutes } from './privileges'; 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 b00f8cfdfb21126..40cbf6da9e058a9 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 46a9bb729d76bf7..63ed9345fd7d1ba 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 e7051f9ad67bd87..d9d5604940b3a68 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 a3fb47afb0ae8de..05fdddd49ee0ace 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 c2d2b3cdf8eaf11..b3b29e950d72141 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 fca0a0e4388f4e1..18315bb9caf8fa3 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 572a7a2584dccc6..0cc3d1dc4dd479f 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 dfe2af12a23e400..223949843fee57e 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 90457c71b90a7d8..ab938ac24d30e98 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 a7833f803afa1e7..3823b34f9c1536d 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 e3ea1a3889b1ffa..257d5e303a4a37d 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 9dd2deb876c6117..717170567a550a3 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 6adbe8975b0a991..77e3bd51b5e80f2 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 bc2df19cf261d39..b05b9a438c68176 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 a8fa3888efeb955..8329be6a91862a0 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 46c681052efb08e..4b9b5941ed65992 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 4cb5e8ffbf93d8e..211598e70655467 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 6c39f060944331e..ba33ca319cd2057 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 5396a16763f8da5..8f4f28bcb32dd8d 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 4e8475b1c3b1278..343b9a07aeb8fb5 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 63e0d602cf1224a..fae211e2f44f6ed 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 ce0a38ef7303928..d18fd1ff1d314d1 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 564f93d302353e6..875377a87181db1 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 3b9eca33a66f487..49ad928c0b7e474 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 a6acc866b2d0733..cc4d643d7862c96 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 152c06b83dd1f37..c40f0b92b54a2ec 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 428621316ec1836..06a60e3c1896811 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 0ac63704ea3b33a..041feea8a62fd20 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 30919f96beeea2d..81a3431f93e2668 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 c0bb04fc3bad950..0ea0b04149ab910 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 6bd2e2b85e99723..f5d449bd8423dc7 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 8816f7b50828cfd..aad0e201e996bcb 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 e87c80a6d335930..b553e5c575fbdf1 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 9165ee154cb781c..819229b5ad8fd50 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 27166943a16d06f..b53642e96af1e90 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 410bedb5b7fb9ac..bdd4bbf82273b73 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 a2a96f0545743a2..6190f03e6ed7883 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 13f07b528996c65..1893ad6c9cb5f68 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 ad2585cb0b771f8..f1efa4611dc5880 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 c5fc45716ec22a0..850a533e3d93ac4 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 7575aafead6e0e2..b73b048d9f4d3ce 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 ef5a25e538c07b0..2c7799eae5261ec 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 67e6d2294cc5c33..6068ada7a37292a 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 278cba8393741ff..ff962c3421ce7d0 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 e53b129474a6257..81b909da2c984c8 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 613746932bfb6fd..75bbd3075f67e76 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 ca6a669ecd5e411..691b6db78b51882 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 228f9b05e575174..38b3cc7d2443ceb 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 f3c6d430a0644ef..36dea9c1caf7bdb 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 69a150858822030..46bb0499f8e4d53 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 289f60aa973c086..10395999f502b02 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 8479b2f25f8c2c0..f990bf8095a1bbe 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 5449407f8d5a7c5..18c6ae824584c9c 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 179f6cfa1cf0a13..ba3779af2dde077 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 b2871c8bc7ef17c..43351c575d395ef 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 8f74d62b64c68c4..9485bd0d3cfa5b0 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 3154e0e69b8f040..bf9687913514fdd 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 04b2249600e61ea..8ef87b60f9e1529 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 a5dafd16f60ec91..07e30826d8f0c8d 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/public/common/components/endpoint/link_to_app.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.tsx index cb4856fbf3728f5..11cf828664fb8d4 100644 --- a/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.tsx +++ b/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import type { MouseEventHandler } from 'react'; import React, { memo } from 'react'; import type { EuiLinkProps, EuiButtonProps } from '@elastic/eui'; diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx index 7c1c88360a2e7ba..f89a84ff308fb94 100644 --- a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx @@ -93,7 +93,7 @@ export interface EventsViewerProps { leadingControlColumns: ControlColumnProps[]; sourcererScope: SourcererScopeName; start: string; - showTotalCount?: boolean; + showTotalCount?: boolean; // eslint-disable-line react/no-unused-prop-types pageFilters?: Filter[]; currentFilter?: AlertWorkflowStatus; onRuleChange?: () => void; diff --git a/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx b/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx index 5596ba005e3ef39..ece266087aa89d0 100644 --- a/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx @@ -19,8 +19,8 @@ import * as i18n from '../../containers/query_toggle/translations'; interface HeaderProps { border?: boolean; height?: number; - className?: string; - $hideSubtitle?: boolean; + className?: string; // eslint-disable-line react/no-unused-prop-types + $hideSubtitle?: boolean; // eslint-disable-line react/no-unused-prop-types } const Header = styled.header` diff --git a/x-pack/plugins/security_solution/public/common/components/markdown_editor/eui_form.tsx b/x-pack/plugins/security_solution/public/common/components/markdown_editor/eui_form.tsx index c44ff696f202049..dc157a85afa2bae 100644 --- a/x-pack/plugins/security_solution/public/common/components/markdown_editor/eui_form.tsx +++ b/x-pack/plugins/security_solution/public/common/components/markdown_editor/eui_form.tsx @@ -15,6 +15,7 @@ import { getFieldValidityAndErrorMessage } from '../../../shared_imports'; import type { MarkdownEditorRef } from './editor'; import { MarkdownEditor } from './editor'; +/* eslint-disable react/no-unused-prop-types */ type MarkdownEditorFormProps = EuiMarkdownEditorProps & { id: string; field: FieldHook; @@ -23,6 +24,7 @@ type MarkdownEditorFormProps = EuiMarkdownEditorProps & { isDisabled?: boolean; bottomRightContent?: React.ReactNode; }; +/* eslint-enable react/no-unused-prop-types */ const BottomContentWrapper = styled(EuiFlexGroup)` ${({ theme }) => ` diff --git a/x-pack/plugins/security_solution/public/common/components/top_n/top_n.tsx b/x-pack/plugins/security_solution/public/common/components/top_n/top_n.tsx index 02ff400388ee310..926f61452522592 100644 --- a/x-pack/plugins/security_solution/public/common/components/top_n/top_n.tsx +++ b/x-pack/plugins/security_solution/public/common/components/top_n/top_n.tsx @@ -57,7 +57,7 @@ export interface Props extends Pick void; - onFilterAdded?: () => void; + onFilterAdded?: () => void; // eslint-disable-line react/no-unused-prop-types } const TopNComponent: React.FC = ({ diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_monitoring/components/basic/filters/multiselect_filter/index.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_monitoring/components/basic/filters/multiselect_filter/index.tsx index c666c09561f0875..e93942d5a725704 100644 --- a/x-pack/plugins/security_solution/public/detection_engine/rule_monitoring/components/basic/filters/multiselect_filter/index.tsx +++ b/x-pack/plugins/security_solution/public/detection_engine/rule_monitoring/components/basic/filters/multiselect_filter/index.tsx @@ -10,6 +10,7 @@ import { noop } from 'lodash'; import { EuiPopover, EuiFilterGroup, EuiFilterButton, EuiFilterSelectItem } from '@elastic/eui'; import { useBoolState } from '../../../../../../common/hooks/use_bool_state'; +/* eslint-disable react/no-unused-prop-types */ export interface MultiselectFilterProps { dataTestSubj?: string; title: string; @@ -19,6 +20,7 @@ export interface MultiselectFilterProps { renderItem?: (item: T) => React.ReactChild; renderLabel?: (item: T) => string; } +/* eslint-enable react/no-unused-prop-types */ const MultiselectFilterComponent = (props: MultiselectFilterProps) => { const { dataTestSubj, title, items, selectedItems, onSelectionChange, renderItem, renderLabel } = diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.tsx index 8dc5abb7f18e479..60af718838aad91 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import { EuiButtonIcon, EuiFormRow, EuiSuperSelect, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { isEmpty, camelCase } from 'lodash/fp'; import React, { memo, useCallback, useEffect, useMemo, useState } from 'react'; diff --git a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx index c280ffa25f28467..6a6265316ccc8ea 100644 --- a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import React, { useCallback, useMemo, useState } from 'react'; import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui'; import type { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types'; diff --git a/x-pack/plugins/security_solution/public/detections/pages/alert_details/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/alert_details/index.tsx index ed9c7a79a0718c1..926e1960b0f044a 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/alert_details/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/alert_details/index.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import React, { memo, useEffect, useMemo } from 'react'; import { useParams } from 'react-router-dom'; import { Routes, Route } from '@kbn/shared-ux-router'; diff --git a/x-pack/plugins/security_solution/public/exceptions/components/import_exceptions_list_flyout/index.tsx b/x-pack/plugins/security_solution/public/exceptions/components/import_exceptions_list_flyout/index.tsx index 2aa346324915ed6..67fff2793bc42d6 100644 --- a/x-pack/plugins/security_solution/public/exceptions/components/import_exceptions_list_flyout/index.tsx +++ b/x-pack/plugins/security_solution/public/exceptions/components/import_exceptions_list_flyout/index.tsx @@ -4,6 +4,9 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ + +/* eslint-disable react/display-name */ + import type { SetStateAction, Dispatch } from 'react'; import React, { useEffect, useRef, useCallback, useState } from 'react'; diff --git a/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx b/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx index ffa8ecf426ac24e..f052335e6d7d341 100644 --- a/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx +++ b/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx @@ -124,7 +124,7 @@ ErrorMessage.displayName = 'ErrorMessage'; * controls similar to the BasicTable of EUI. The props supported by this component (for the most part) * support those that BasicTable accept. */ -// eslint-disable-next-line react/display-name + export const PaginatedContent = memo( ({ items, diff --git a/x-pack/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx b/x-pack/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx index 52b9f95ce591b10..7d377599f012e59 100644 --- a/x-pack/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import React, { useMemo, useState, useCallback, memo, useEffect, useRef } from 'react'; import type { EuiSuperSelectOption, EuiComboBoxOptionOption } from '@elastic/eui'; import { diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx index b37fbfe95bd5969..bc7c33df82b6ca2 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import { EuiCallOut, EuiConfirmModal, EuiSpacer, EuiText } from '@elastic/eui'; import { useQueryClient } from '@tanstack/react-query'; import type { IHttpFetchError } from '@kbn/core-http-browser'; diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/components/with_security_context/with_security_context.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/components/with_security_context/with_security_context.tsx index 579ab87561f8746..1c0eed30a35bf4d 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/components/with_security_context/with_security_context.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/components/with_security_context/with_security_context.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import type { ComponentType } from 'react'; import React, { memo } from 'react'; import type { CoreStart } from '@kbn/core/public'; diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/event_collection_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/event_collection_card.tsx index 35ec4e5795335ae..97bff346e35a38c 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/event_collection_card.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/event_collection_card.tsx @@ -77,7 +77,6 @@ interface EventCollectionCardComponent { displayName?: string | undefined; } -// eslint-disable-next-line react/display-name export const EventCollectionCard = memo( ({ policy, diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/cube_for_process.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/cube_for_process.tsx index 205c086cec90b96..ef601669b8b39ea 100644 --- a/x-pack/plugins/security_solution/public/resolver/view/panels/cube_for_process.tsx +++ b/x-pack/plugins/security_solution/public/resolver/view/panels/cube_for_process.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import styled from 'styled-components'; import { i18n } from '@kbn/i18n'; diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx index 3b71cc2feb32f58..42c89a7b30c8dd9 100644 --- a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx +++ b/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import { i18n } from '@kbn/i18n'; import { EuiSpacer, EuiText, EuiButtonEmpty } from '@elastic/eui'; import React, { memo, useMemo } from 'react'; diff --git a/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx b/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx index 9bb6ee5604267c0..ef2158e98f36002 100644 --- a/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx +++ b/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import React, { useCallback, useMemo, useContext } from 'react'; import styled from 'styled-components'; import { htmlIdGenerator, EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; diff --git a/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx b/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx index e2d0529d1412912..77a7042a8f9a23f 100644 --- a/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx +++ b/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx @@ -5,8 +5,6 @@ * 2.0. */ -/* eslint-disable react/display-name */ - import React, { useContext, useCallback } from 'react'; import { useSelector } from 'react-redux'; import { EuiLoadingSpinner } from '@elastic/eui'; diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx index d8fc685d7a6b707..51f4761dc9f9e39 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import React, { useEffect, useState, useCallback, useMemo } from 'react'; import { useDispatch } from 'react-redux'; import { encode } from '@kbn/rison'; diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/flyout/footer.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/flyout/footer.tsx index e85f27a7f8b47d5..53c78a4d2ab37a1 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/flyout/footer.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/flyout/footer.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import React, { useCallback, useMemo, useState } from 'react'; import { EuiFlyoutFooter, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { find } from 'lodash/fp'; diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_item_actions.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_item_actions.tsx index d35e0034ea4ca30..8d43b8b785eff02 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_item_actions.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_item_actions.tsx @@ -36,7 +36,7 @@ interface OwnProps { closePopover: () => void; deleteProvider: () => void; field: string; - kqlQuery: string; + kqlQuery: string; // eslint-disable-line react/no-unused-prop-types isEnabled: boolean; isExcluded: boolean; isLoading: boolean; diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/eql/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/eql/index.tsx index f4b21265a7906c6..22316885cd8a30b 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/eql/index.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/eql/index.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import { isEmpty, isEqual } from 'lodash'; import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useDispatch } from 'react-redux'; diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx index c040f0c6b1abe01..6d12695c0e7a0df 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx @@ -5,6 +5,8 @@ * 2.0. */ +/* eslint-disable react/display-name */ + import { isEmpty } from 'lodash/fp'; import React, { memo, useCallback, useState, useEffect } from 'react'; import { useDispatch } from 'react-redux'; 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 910ba5e8870465c..fee229fa942f9ec 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 94385aa4e295d34..52ccd8c9c3bd181 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 52e308d71c8fd23..e068b8e8d38be12 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 e8b6766411d0c6a..63f340863e859ec 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 34cb51a144f7554..bcd7ef069e0c173 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 775e93c6008fdbd..da4aed1df6fc7e0 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 b4d3ec634b8f3ee..681b57a6d4f4731 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 5e6f0123a86f390..d2863b0060ee7f1 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 eb0cb9f0be8f62c..e68c64eb68a8ae6 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 f824b9c9c333885..31bf973abe85907 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 ebfe0be779917b1..e72f3705f83685c 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 ef9a592da4d64b5..64fdfa2a5b7bc52 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 faa1d1f4c687196..46cc05ca2b95336 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 24f36723f9782f1..36677e9b0ea1a10 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 8aaf455204c9b14..b4f4751c7aced43 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 521889e790391a2..1d60a2446059506 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 53e4060112a57d3..7a2882bc9ff5dba 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 cea22e31a82892b..14d458af36b3bfd 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 23c9f8fd96091ff..41f4b6c2190cd50 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 ddc767163f0b575..21904ee94b8ab27 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 42a4f2f46832e73..b5dc1f0c54ebc6d 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 07a848e523f10f4..36d069495324226 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 ccb5412aa39c681..c95e4e4363dee5f 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 143f4fce34d26d9..f5b82b8fdafd24a 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 4767d35f060fbcc..a93d627f6e159ac 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 105466e42827ea7..88b88b0e9e7dd11 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 b4498e26f1935c2..de9e7dfdeb717ba 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 dc041de2bc4940b..59d4f1414e03a8c 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 fecc81077d69086..5a418286596e3f7 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 3424bac325d1814..982e11ffbf4e731 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 adad431cd05eacd..337e7373618c4d6 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 9be4fb5a69e3baa..62e1c6d6e09ec53 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 45a6c21c86f04e4..ceedb99c60d1860 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 1cb5016beb1d67b..b0832b41850db17 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 ac727c2088d3814..08062e0c93f5647 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 7735a94622a77a0..e5756b41d438f29 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 a51ac07b3091b2f..42a19fe367dee81 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 5d661d84f2a127e..96ca0e2917c9d00 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 658a1ca2d098039..e3bc2dc4d0e5f28 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 b8fd5ed77f488b1..3f77821a5d92b9b 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 db753d7b57ce95c..e0e458a03864e8c 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 9d0bbd344c647d6..37f3032a85e5f45 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 c13a3a53fbe8fce..b803ab2aea324c2 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 57225e0d6473fbf..3b923652da2204a 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 5a16587fb54341f..ee7d320ead7ccd6 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 820c993ccac59b9..69df4a639ca91df 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 f316ff3001631af..9a7ab53ecdc6828 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 18de3b0a567c40e..61ac8da35d3ae9c 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 e08e8c4b29ae08f..3f2dff01d8914a9 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 fd926621b72da06..edde4ad4c866223 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 c6623dfaf508b61..abf9e8c0ecd1ce1 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 ad38a927845452a..ec0f7d25e188dfc 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 5ad5e49052a715b..b7bb839a752c656 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 47f19b2d8b264fb..745015b50042f42 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 7bda2f9aedb77af..2a2bc43aff4c7ce 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 8ba115e5d32f534..26059fe90ea36cd 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 ddb08095b1dc33d..d6da6899b25bfd5 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 122d1dbd182b456..d071d19e384c687 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 a82e8ff6bc689eb..b33dd82c7bb8dbf 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 df381982466f45d..24a94b43029e0b2 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 b495e930f3944eb..bf3d0a57ccae259 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 0c07a77468f6f4e..82ab96fde81ce56 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 19c79c244e6c1bd..cb8b42f343baa23 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 c43fcb627d60b6a..4018cfa11b7b736 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 95260615e86f4d7..02792389424dbe5 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 b4fa5d677b25519..6af58c124be0857 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 818c748a97498b7..43ac45ec3c4c578 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 923d1668f59a66d..8fa87bf5ffa4270 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 5a1046579bfdea2..daa957c04d11f62 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 b4126e76a711069..8716f63a5657ffe 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 57a724a16ece835..01c08eca85ec768 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 ac85d14989ebb17..126d15268edf8d3 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 0e7808dccfc1b6c..4c5fd44a6bb30e8 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 6c239a7d0c9bec3..172f1afec53cf61 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 7263adad43f821e..2f732bfcaf5ab5f 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 e07050fe97d73af..af09ab75f508f5c 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 c8beb16c4df0881..cfe83a3c42f2feb 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 92727dc223fc322..c32fb2bc2854f80 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 42cc1ea620640fa..b86bbf58f065ce3 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 4dc6ae8cd249710..a2a4877ac4d9ac8 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 d18fe5d5ec3a9d1..fe36c9ea72cd6f8 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 709faff41c4779f..e9305f07f1b0eef 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 a09ddf8ad3f38f4..cc4058ad22485a7 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 da9dcd86eed2aa0..4f56739bda71b29 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 36a4438266239ad..455387a816bd501 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 21b6de36dbd3f76..8a6c0eaab0d3b86 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 625e02a557288db..2d1ea97891ff16c 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 cf7e27941508c28..694fb5b69e46aeb 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 36d2c99503c1111..5f7f42b37138778 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 0c2c43eef68a7c3..b7b95c742b4c56a 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/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/step_waterfall_chart/waterfall/waterfall_flyout/waterfall_flyout.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/step_waterfall_chart/waterfall/waterfall_flyout/waterfall_flyout.tsx index 3338f8ec57a51b1..cb3babffd16b420 100644 --- a/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/step_waterfall_chart/waterfall/waterfall_flyout/waterfall_flyout.tsx +++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/step_waterfall_chart/waterfall/waterfall_flyout/waterfall_flyout.tsx @@ -83,7 +83,7 @@ export const WaterfallFlyout = ({ return (