From 4c5468b40825debc2b7bbe08b975dedd2f7f1523 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 24 Jun 2020 15:08:50 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/alert_details.vue | 2 +- .../components/alert_management_list.vue | 81 +++---- .../components/alert_sidebar.vue | 4 +- .../components/alert_status.vue | 116 ++++++++++ .../components/sidebar/sidebar_assignees.vue | 4 +- .../components/sidebar/sidebar_status.vue | 99 ++------- .../javascripts/helpers/event_hub_factory.js | 87 +++++++- app/assets/javascripts/lib/utils/constants.js | 2 + .../javascripts/lib/utils/text_utility.js | 81 ++++++- .../admin/abuse_reports/abuse_reports.js | 2 +- .../components/release_block_assets.vue | 4 +- .../pages/alert_management/list.scss | 2 +- app/graphql/types/milestone_stats_type.rb | 16 ++ app/graphql/types/milestone_type.rb | 11 + ..._batch-and-diffs_metadata-actions-for-.yml | 5 + ...nd-released_at-to-releaser-cli-and-yml.yml | 5 + ...xpose-ref-milestones-relesed-at-to-cli.yml | 5 + ...-add-issue-stats-to-milestones-graphql.yml | 5 + .../nfriend-fix-assets-for-guest-users.yml | 5 + .../graphql/reference/gitlab_schema.graphql | 20 ++ doc/api/graphql/reference/gitlab_schema.json | 55 +++++ doc/api/graphql/reference/index.md | 10 + doc/development/code_review.md | 9 +- .../compliance/license_compliance/index.md | 3 +- lib/container_registry/tag.rb | 7 - lib/gitlab/ci/build/releaser.rb | 15 +- lib/gitlab/ci/config/entry/release.rb | 24 +- .../Security/License-Scanning.gitlab-ci.yml | 3 +- lib/gitlab/diff/file.rb | 8 +- lib/gitlab/diff/file_collection/base.rb | 11 +- .../merge_request_diff_base.rb | 35 ++- lib/gitlab/diff/stats_cache.rb | 54 +++++ locale/gitlab.pot | 9 +- .../components/alert_management_list_spec.js | 14 +- .../components/alert_sidebar_status_spec.js | 4 +- .../components/diff_gutter_avatars_spec.js | 2 +- .../helpers/event_hub_factory_spec.js | 71 ++++-- spec/frontend/lib/utils/text_utility_spec.js | 50 +++++ .../components/release_block_assets_spec.js | 32 ++- .../renderers/build_uneditable_token_spec.js | 2 +- .../renderers/render_kramdown_list_spec.js | 2 +- .../renderers/render_kramdown_text_spec.js | 2 +- .../types/milestone_stats_type_spec.rb | 15 ++ spec/graphql/types/milestone_type_spec.rb | 17 ++ spec/lib/gitlab/ci/build/releaser_spec.rb | 16 +- .../gitlab/ci/config/entry/release_spec.rb | 205 ++++++++++++++---- spec/lib/gitlab/ci/yaml_processor_spec.rb | 3 + spec/lib/gitlab/diff/stats_cache_spec.rb | 84 +++++++ .../gitlab/git/diff_stats_collection_spec.rb | 4 +- .../api/graphql/group/milestones_spec.rb | 102 ++++++++- spec/requests/api/runner_spec.rb | 2 +- .../generate_image_versions_service_spec.rb | 2 +- .../save_designs_service_spec.rb | 2 +- ...capture_diff_note_position_service_spec.rb | 2 +- ...apture_diff_note_positions_service_spec.rb | 2 +- .../discussions/resolve_service_spec.rb | 2 +- .../update_diff_position_service_spec.rb | 2 +- .../draft_notes/create_service_spec.rb | 2 +- .../draft_notes/destroy_service_spec.rb | 2 +- .../draft_notes/publish_service_spec.rb | 2 +- spec/services/emails/confirm_service_spec.rb | 2 +- spec/services/emails/create_service_spec.rb | 2 +- spec/services/emails/destroy_service_spec.rb | 2 +- .../environments/auto_stop_service_spec.rb | 2 +- .../reset_auto_stop_service_spec.rb | 2 +- .../error_tracking/base_service_spec.rb | 2 +- .../issue_details_service_spec.rb | 2 +- .../issue_latest_event_service_spec.rb | 2 +- .../issue_update_service_spec.rb | 2 +- .../list_issues_service_spec.rb | 2 +- .../list_projects_service_spec.rb | 2 +- spec/services/event_create_service_spec.rb | 2 +- spec/services/events/render_service_spec.rb | 2 +- spec/services/files/create_service_spec.rb | 2 +- spec/services/files/delete_service_spec.rb | 2 +- spec/services/files/multi_service_spec.rb | 2 +- spec/services/files/update_service_spec.rb | 2 +- spec/services/git/base_hooks_service_spec.rb | 2 +- .../services/git/branch_hooks_service_spec.rb | 2 +- spec/services/git/branch_push_service_spec.rb | 2 +- .../git/process_ref_changes_service_spec.rb | 2 +- spec/services/git/tag_hooks_service_spec.rb | 2 +- spec/services/git/tag_push_service_spec.rb | 2 +- .../git/wiki_push_service/change_spec.rb | 2 +- spec/services/git/wiki_push_service_spec.rb | 2 +- spec/services/gpg_keys/create_service_spec.rb | 2 +- spec/services/grafana/proxy_service_spec.rb | 2 +- spec/services/gravatar_service_spec.rb | 2 +- .../groups/auto_devops_service_spec.rb | 2 +- spec/services/groups/create_service_spec.rb | 2 +- .../deploy_tokens/create_service_spec.rb | 2 +- .../deploy_tokens/destroy_service_spec.rb | 2 +- spec/services/groups/destroy_service_spec.rb | 2 +- .../groups/group_links/create_service_spec.rb | 2 +- .../group_links/destroy_service_spec.rb | 2 +- .../groups/group_links/update_service_spec.rb | 2 +- .../import_export/export_service_spec.rb | 2 +- .../import_export/import_service_spec.rb | 2 +- .../groups/nested_create_service_spec.rb | 2 +- spec/services/groups/transfer_service_spec.rb | 2 +- spec/services/groups/update_service_spec.rb | 2 +- spec/services/import/github_service_spec.rb | 2 +- .../import_export_clean_up_service_spec.rb | 2 +- .../create_issue_service_spec.rb | 2 +- .../issuable/bulk_update_service_spec.rb | 2 +- .../clone/attributes_rewriter_spec.rb | 2 +- .../issuable/clone/content_rewriter_spec.rb | 2 +- .../common_system_notes_service_spec.rb | 2 +- .../services/issuable/destroy_service_spec.rb | 2 +- spec/services/issues/build_service_spec.rb | 2 +- spec/services/issues/close_service_spec.rb | 2 +- spec/services/issues/create_service_spec.rb | 2 +- .../services/issues/duplicate_service_spec.rb | 2 +- .../issues/export_csv_service_spec.rb | 2 +- .../issues/import_csv_service_spec.rb | 2 +- spec/services/issues/move_service_spec.rb | 2 +- .../referenced_merge_requests_service_spec.rb | 2 +- .../issues/related_branches_service_spec.rb | 2 +- spec/services/issues/reopen_service_spec.rb | 2 +- spec/services/issues/reorder_service_spec.rb | 2 +- .../issues/resolve_discussions_spec.rb | 2 +- spec/services/issues/update_service_spec.rb | 2 +- .../services/issues/zoom_link_service_spec.rb | 2 +- spec/services/jira/requests/projects_spec.rb | 2 +- .../jira_import/start_import_service_spec.rb | 2 +- .../jira_import/users_importer_spec.rb | 2 +- .../services/jira_import/users_mapper_spec.rb | 2 +- spec/services/keys/create_service_spec.rb | 2 +- spec/services/keys/destroy_service_spec.rb | 2 +- spec/services/keys/last_used_service_spec.rb | 2 +- .../labels/available_labels_service_spec.rb | 2 +- spec/services/labels/create_service_spec.rb | 2 +- .../labels/find_or_create_service_spec.rb | 2 +- spec/services/labels/promote_service_spec.rb | 2 +- spec/services/labels/transfer_service_spec.rb | 2 +- spec/services/labels/update_service_spec.rb | 2 +- spec/services/lfs/file_transformer_spec.rb | 2 +- spec/services/lfs/lock_file_service_spec.rb | 2 +- .../services/lfs/locks_finder_service_spec.rb | 2 +- spec/services/lfs/unlock_file_service_spec.rb | 2 +- .../approve_access_request_service_spec.rb | 2 +- spec/services/members/create_service_spec.rb | 2 +- spec/services/members/destroy_service_spec.rb | 2 +- .../members/request_access_service_spec.rb | 2 +- spec/services/members/update_service_spec.rb | 2 +- .../add_context_service_spec.rb | 2 +- .../add_todo_when_build_fails_service_spec.rb | 2 +- .../after_create_service_spec.rb | 2 +- .../assign_issues_service_spec.rb | 2 +- .../merge_requests/build_service_spec.rb | 2 +- .../merge_requests/close_service_spec.rb | 2 +- .../conflicts/list_service_spec.rb | 2 +- .../conflicts/resolve_service_spec.rb | 2 +- .../create_from_issue_service_spec.rb | 2 +- .../create_pipeline_service_spec.rb | 2 +- .../merge_requests/create_service_spec.rb | 2 +- .../delete_non_latest_diffs_service_spec.rb | 2 +- .../merge_requests/ff_merge_service_spec.rb | 2 +- .../merge_requests/get_urls_service_spec.rb | 2 +- .../link_lfs_objects_service_spec.rb | 2 +- .../merge_orchestration_service_spec.rb | 2 +- .../merge_requests/merge_service_spec.rb | 2 +- .../merge_to_ref_service_spec.rb | 2 +- .../mergeability_check_service_spec.rb | 2 +- .../migrate_external_diffs_service_spec.rb | 2 +- .../merge_requests/post_merge_service_spec.rb | 2 +- .../push_options_handler_service_spec.rb | 2 +- .../pushed_branches_service_spec.rb | 2 +- .../merge_requests/rebase_service_spec.rb | 2 +- .../merge_requests/refresh_service_spec.rb | 2 +- .../reload_diffs_service_spec.rb | 8 +- .../merge_requests/reopen_service_spec.rb | 2 +- ...ed_discussion_notification_service_spec.rb | 2 +- .../merge_requests/squash_service_spec.rb | 2 +- .../merge_requests/update_service_spec.rb | 2 +- .../annotations/create_service_spec.rb | 2 +- .../annotations/delete_service_spec.rb | 2 +- .../dashboard/clone_dashboard_service_spec.rb | 2 +- .../custom_dashboard_service_spec.rb | 2 +- .../custom_metric_embed_service_spec.rb | 2 +- .../dashboard/default_embed_service_spec.rb | 2 +- .../dashboard/dynamic_embed_service_spec.rb | 2 +- .../gitlab_alert_embed_service_spec.rb | 2 +- .../grafana_metric_embed_service_spec.rb | 6 +- .../dashboard/pod_dashboard_service_spec.rb | 2 +- .../self_monitoring_dashboard_service_spec.rb | 2 +- .../system_dashboard_service_spec.rb | 2 +- .../dashboard/transient_embed_service_spec.rb | 2 +- .../update_dashboard_service_spec.rb | 2 +- .../metrics/sample_metrics_service_spec.rb | 2 +- .../create_service_spec.rb | 2 +- .../delete_service_spec.rb | 2 +- .../services/milestones/close_service_spec.rb | 2 +- .../closed_issues_count_service_spec.rb | 2 +- .../milestones/create_service_spec.rb | 2 +- .../milestones/destroy_service_spec.rb | 2 +- .../milestones/find_or_create_service_spec.rb | 2 +- .../milestones/issues_count_service_spec.rb | 2 +- .../milestones/promote_service_spec.rb | 2 +- .../milestones/transfer_service_spec.rb | 2 +- .../milestones/update_service_spec.rb | 2 +- .../check_storage_size_service_spec.rb | 2 +- .../statistics_refresher_service_spec.rb | 2 +- spec/services/note_summary_spec.rb | 2 +- spec/services/notes/build_service_spec.rb | 2 +- spec/services/notes/create_service_spec.rb | 2 +- spec/services/notes/destroy_service_spec.rb | 2 +- .../notes/post_process_service_spec.rb | 2 +- .../notes/quick_actions_service_spec.rb | 2 +- spec/services/notes/render_service_spec.rb | 2 +- spec/services/notes/resolve_service_spec.rb | 2 +- spec/services/notes/update_service_spec.rb | 2 +- .../build_service_spec.rb | 2 +- .../builder/default_spec.rb | 2 +- .../builder/new_note_spec.rb | 2 +- spec/services/notification_service_spec.rb | 2 +- spec/services/pages/delete_services_spec.rb | 2 +- .../create_acme_order_service_spec.rb | 2 +- ...n_lets_encrypt_certificate_service_spec.rb | 2 +- .../retry_acme_order_service_spec.rb | 2 +- .../create_service_spec.rb | 2 +- spec/services/pod_logs/base_service_spec.rb | 2 +- .../pod_logs/elasticsearch_service_spec.rb | 2 +- .../pod_logs/kubernetes_service_spec.rb | 2 +- spec/services/post_receive_service_spec.rb | 2 +- .../services/preview_markdown_service_spec.rb | 2 +- .../projects/after_import_service_spec.rb | 2 +- .../projects/after_rename_service_spec.rb | 2 +- .../projects/alerting/notify_service_spec.rb | 2 +- .../auto_devops/disable_service_spec.rb | 2 +- .../projects/autocomplete_service_spec.rb | 2 +- .../batch_open_issues_count_service_spec.rb | 2 +- .../services/projects/cleanup_service_spec.rb | 2 +- .../cleanup_tags_service_spec.rb | 2 +- .../delete_tags_service_spec.rb | 2 +- .../destroy_service_spec.rb | 2 +- spec/services/projects/count_service_spec.rb | 2 +- .../create_from_template_service_spec.rb | 2 +- spec/services/projects/create_service_spec.rb | 2 +- .../deploy_tokens/create_service_spec.rb | 2 +- .../deploy_tokens/destroy_service_spec.rb | 2 +- .../projects/destroy_rollback_service_spec.rb | 2 +- .../services/projects/destroy_service_spec.rb | 2 +- ...etect_repository_languages_service_spec.rb | 2 +- .../projects/download_service_spec.rb | 2 +- .../enable_deploy_key_service_spec.rb | 2 +- ...fetch_statistics_increment_service_spec.rb | 2 +- spec/services/projects/fork_service_spec.rb | 2 +- .../projects/forks_count_service_spec.rb | 2 +- .../git_deduplication_service_spec.rb | 2 +- .../gitlab_projects_import_service_spec.rb | 2 +- .../group_links/create_service_spec.rb | 2 +- .../group_links/destroy_service_spec.rb | 2 +- .../group_links/update_service_spec.rb | 2 +- .../base_attachment_service_spec.rb | 2 +- .../migrate_attachments_service_spec.rb | 2 +- .../migrate_repository_service_spec.rb | 2 +- .../hashed_storage/migration_service_spec.rb | 2 +- .../rollback_attachments_service_spec.rb | 2 +- .../rollback_repository_service_spec.rb | 2 +- .../hashed_storage/rollback_service_spec.rb | 2 +- .../projects/housekeeping_service_spec.rb | 2 +- .../projects/import_error_filter_spec.rb | 2 +- .../import_export/export_service_spec.rb | 2 +- spec/services/projects/import_service_spec.rb | 2 +- .../lfs_download_link_list_service_spec.rb | 2 +- .../lfs_pointers/lfs_download_service_spec.rb | 2 +- .../lfs_pointers/lfs_import_service_spec.rb | 2 +- .../lfs_pointers/lfs_link_service_spec.rb | 2 +- .../lfs_object_download_list_service_spec.rb | 2 +- .../projects/move_access_service_spec.rb | 2 +- .../move_deploy_keys_projects_service_spec.rb | 2 +- .../projects/move_forks_service_spec.rb | 2 +- .../move_lfs_objects_projects_service_spec.rb | 2 +- ...move_notification_settings_service_spec.rb | 2 +- ...ove_project_authorizations_service_spec.rb | 2 +- .../move_project_group_links_service_spec.rb | 2 +- .../move_project_members_service_spec.rb | 2 +- .../move_users_star_projects_service_spec.rb | 2 +- .../open_issues_count_service_spec.rb | 2 +- .../open_merge_requests_count_service_spec.rb | 2 +- .../operations/update_service_spec.rb | 2 +- .../overwrite_project_service_spec.rb | 2 +- .../projects/participants_service_spec.rb | 2 +- .../alerts/create_events_service_spec.rb | 2 +- .../prometheus/alerts/create_service_spec.rb | 2 +- .../prometheus/alerts/destroy_service_spec.rb | 2 +- .../prometheus/alerts/notify_service_spec.rb | 2 +- .../prometheus/alerts/update_service_spec.rb | 2 +- .../metrics/destroy_service_spec.rb | 2 +- .../prometheus/metrics/update_service_spec.rb | 2 +- .../propagate_service_template_spec.rb | 2 +- .../protect_default_branch_service_spec.rb | 2 +- .../repository_languages_service_spec.rb | 2 +- .../projects/transfer_service_spec.rb | 2 +- .../projects/unlink_fork_service_spec.rb | 2 +- ...update_pages_configuration_service_spec.rb | 2 +- .../projects/update_pages_service_spec.rb | 2 +- .../update_remote_mirror_service_spec.rb | 2 +- .../update_repository_storage_service_spec.rb | 2 +- spec/services/projects/update_service_spec.rb | 2 +- .../update_statistics_service_spec.rb | 2 +- .../create_default_alerts_service_spec.rb | 2 +- .../services/prometheus/proxy_service_spec.rb | 2 +- ...roxy_variable_substitution_service_spec.rb | 2 +- .../protected_branches/create_service_spec.rb | 2 +- .../destroy_service_spec.rb | 2 +- .../protected_branches/update_service_spec.rb | 2 +- .../protected_tags/create_service_spec.rb | 2 +- .../protected_tags/destroy_service_spec.rb | 2 +- .../protected_tags/update_service_spec.rb | 2 +- .../push_event_payload_service_spec.rb | 2 +- .../quick_actions/interpret_service_spec.rb | 2 +- .../quick_actions/target_service_spec.rb | 2 +- .../releases/create_evidence_service_spec.rb | 2 +- spec/services/releases/create_service_spec.rb | 2 +- .../services/releases/destroy_service_spec.rb | 2 +- spec/services/releases/update_service_spec.rb | 2 +- .../destroy_rollback_service_spec.rb | 2 +- .../repositories/destroy_service_spec.rb | 2 +- .../shell_destroy_service_spec.rb | 2 +- ...epository_archive_clean_up_service_spec.rb | 2 +- .../reset_project_cache_service_spec.rb | 2 +- .../create_service_spec.rb | 2 +- .../revoke_service_spec.rb | 2 +- .../change_labels_service_spec.rb | 2 +- .../change_milestone_service_spec.rb | 2 +- .../change_state_service_spec.rb | 2 +- .../merge_into_notes_service_spec.rb | 2 +- ...thetic_label_notes_builder_service_spec.rb | 2 +- ...ic_milestone_notes_builder_service_spec.rb | 2 +- spec/services/search/global_service_spec.rb | 2 +- spec/services/search/group_service_spec.rb | 2 +- spec/services/search/snippet_service_spec.rb | 2 +- spec/services/search_service_spec.rb | 2 +- .../associate_domain_service_spec.rb | 2 +- spec/services/service_response_spec.rb | 2 +- .../snippets/bulk_destroy_service_spec.rb | 2 +- spec/services/snippets/count_service_spec.rb | 2 +- spec/services/snippets/create_service_spec.rb | 2 +- .../services/snippets/destroy_service_spec.rb | 2 +- spec/services/snippets/update_service_spec.rb | 2 +- spec/services/spam/akismet_service_spec.rb | 2 +- spec/services/spam/ham_service_spec.rb | 2 +- .../spam/mark_as_spam_service_spec.rb | 2 +- .../services/spam/spam_action_service_spec.rb | 2 +- .../spam/spam_verdict_service_spec.rb | 2 +- .../submit_usage_ping_service_spec.rb | 2 +- .../submodules/update_service_spec.rb | 2 +- .../suggestions/apply_service_spec.rb | 2 +- .../suggestions/create_service_spec.rb | 2 +- .../suggestions/outdate_service_spec.rb | 2 +- spec/services/system_hooks_service_spec.rb | 2 +- spec/services/system_note_service_spec.rb | 2 +- .../system_notes/base_service_spec.rb | 2 +- .../system_notes/commit_service_spec.rb | 2 +- .../design_management_service_spec.rb | 2 +- .../system_notes/issuables_service_spec.rb | 2 +- .../merge_requests_service_spec.rb | 2 +- .../time_tracking_service_spec.rb | 2 +- .../system_notes/zoom_service_spec.rb | 2 +- spec/services/tags/create_service_spec.rb | 2 +- spec/services/tags/destroy_service_spec.rb | 2 +- .../services/task_list_toggle_service_spec.rb | 2 +- .../terraform/remote_state_handler_spec.rb | 2 +- .../test_hooks/project_service_spec.rb | 2 +- .../test_hooks/system_service_spec.rb | 2 +- spec/services/todo_service_spec.rb | 2 +- .../confidential_issue_service_spec.rb | 2 +- .../destroy/entity_leave_service_spec.rb | 2 +- .../destroy/group_private_service_spec.rb | 2 +- .../destroy/private_features_service_spec.rb | 2 +- .../destroy/project_private_service_spec.rb | 2 +- ...date_merge_request_metrics_service_spec.rb | 2 +- spec/services/upload_service_spec.rb | 2 +- ...ser_project_access_changed_service_spec.rb | 2 +- spec/services/users/activity_service_spec.rb | 2 +- spec/services/users/block_service_spec.rb | 2 +- spec/services/users/build_service_spec.rb | 2 +- spec/services/users/create_service_spec.rb | 2 +- spec/services/users/destroy_service_spec.rb | 2 +- .../services/users/keys_count_service_spec.rb | 2 +- .../users/last_push_event_service_spec.rb | 2 +- .../migrate_to_ghost_user_service_spec.rb | 2 +- ...efresh_authorized_projects_service_spec.rb | 2 +- .../users/repair_ldap_blocked_service_spec.rb | 2 +- .../users/respond_to_terms_service_spec.rb | 2 +- .../services/users/set_status_service_spec.rb | 2 +- spec/services/users/signup_service_spec.rb | 2 +- .../update_canonical_email_service_spec.rb | 2 +- ...update_highest_member_role_service_spec.rb | 2 +- spec/services/users/update_service_spec.rb | 2 +- .../verify_pages_domain_service_spec.rb | 2 +- spec/services/web_hook_service_spec.rb | 2 +- spec/services/wiki_pages/base_service_spec.rb | 2 +- .../wiki_pages/create_service_spec.rb | 2 +- .../wiki_pages/destroy_service_spec.rb | 2 +- .../wiki_pages/event_create_service_spec.rb | 2 +- .../wiki_pages/update_service_spec.rb | 2 +- .../wikis/create_attachment_service_spec.rb | 2 +- .../x509_certificate_revoke_service_spec.rb | 2 +- spec/sidekiq/cron/job_gem_dependency_spec.rb | 2 +- ...ect_import_rate_limiter_shared_examples.rb | 2 +- .../helpers/reference_parser_helpers.rb | 4 +- ...lowed_users_in_namespace_shared_context.rb | 2 +- .../design_management_shared_contexts.rb | 2 +- .../features/error_tracking_shared_context.rb | 2 +- .../issuable/merge_request_shared_context.rb | 2 +- .../issuable/project_shared_context.rb | 2 +- .../project_service_shared_context.rb | 2 +- .../jira_import/jira_projects_context.rb | 2 +- .../sentry_error_tracking_shared_context.rb | 2 +- .../support/shared_contexts/spam_constants.rb | 2 +- .../features/error_tracking_shared_example.rb | 6 +- .../jira_import_resolver_shared_examples.rb | 4 +- .../services_resolver_shared_examples.rb | 4 +- .../helm_commands_shared_examples.rb | 4 +- .../mentions_migration_shared_examples.rb | 6 +- .../base_stage_shared_examples.rb | 6 +- .../default_query_config_shared_examples.rb | 2 +- .../diff_file_collections_shared_examples.rb | 113 +++++++++- ...tuck_import_job_workers_shared_examples.rb | 2 +- .../base_importer_shared_examples.rb | 2 +- .../jira_import_state_shared_examples.rb | 10 +- .../note_access_check_shared_examples.rb | 4 +- .../projects/services_shared_examples.rb | 2 +- .../shared_examples/resource_events.rb | 6 +- .../start_import_service_shared_examples.rb | 2 +- ...hange_milestone_service_shared_examples.rb | 2 +- .../uploaders/upload_type_shared_examples.rb | 6 +- .../views/pipeline_status_changes_email.rb | 2 +- .../jira_import_workers_shared_examples.rb | 8 +- .../active_record/query_recorder_spec.rb | 2 +- .../helpers/graphql_helpers_spec.rb | 2 +- .../helpers/stub_feature_flags_spec.rb | 2 +- .../exceed_query_limit_helpers_spec.rb | 2 +- spec/tasks/cache/clear/redis_spec.rb | 2 +- spec/tasks/config_lint_spec.rb | 4 +- .../tasks/gitlab/artifacts/check_rake_spec.rb | 2 +- .../gitlab/artifacts/migrate_rake_spec.rb | 2 +- spec/tasks/gitlab/backup_rake_spec.rb | 2 +- spec/tasks/gitlab/check_rake_spec.rb | 2 +- spec/tasks/gitlab/cleanup_rake_spec.rb | 2 +- .../gitlab/container_registry_rake_spec.rb | 2 +- spec/tasks/gitlab/db_rake_spec.rb | 2 +- .../generate_sample_prometheus_data_spec.rb | 2 +- spec/tasks/gitlab/git_rake_spec.rb | 2 +- spec/tasks/gitlab/gitaly_rake_spec.rb | 2 +- spec/tasks/gitlab/info_rake_spec.rb | 2 +- spec/tasks/gitlab/ldap_rake_spec.rb | 2 +- spec/tasks/gitlab/lfs/check_rake_spec.rb | 2 +- spec/tasks/gitlab/lfs/migrate_rake_spec.rb | 2 +- spec/tasks/gitlab/praefect_rake_spec.rb | 2 +- .../tasks/gitlab/seed/group_seed_rake_spec.rb | 2 +- spec/tasks/gitlab/shell_rake_spec.rb | 2 +- spec/tasks/gitlab/snippets_rake_spec.rb | 2 +- spec/tasks/gitlab/storage_rake_spec.rb | 2 +- spec/tasks/gitlab/task_helpers_spec.rb | 2 +- .../gitlab/update_templates_rake_spec.rb | 2 +- spec/tasks/gitlab/uploads/check_rake_spec.rb | 2 +- .../tasks/gitlab/uploads/migrate_rake_spec.rb | 2 +- spec/tasks/gitlab/web_hook_rake_spec.rb | 2 +- spec/tasks/gitlab/workhorse_rake_spec.rb | 2 +- spec/tasks/gitlab/x509/update_rake_spec.rb | 2 +- spec/tasks/migrate/schema_check_rake_spec.rb | 2 +- spec/tasks/tokens_spec.rb | 2 +- spec/uploaders/attachment_uploader_spec.rb | 2 +- spec/uploaders/avatar_uploader_spec.rb | 2 +- spec/uploaders/content_type_whitelist_spec.rb | 2 +- .../design_v432x230_uploader_spec.rb | 2 +- spec/uploaders/external_diff_uploader_spec.rb | 2 +- spec/uploaders/favicon_uploader_spec.rb | 2 +- spec/uploaders/file_mover_spec.rb | 2 +- spec/uploaders/file_uploader_spec.rb | 2 +- spec/uploaders/gitlab_uploader_spec.rb | 2 +- spec/uploaders/import_export_uploader_spec.rb | 2 +- spec/uploaders/job_artifact_uploader_spec.rb | 2 +- spec/uploaders/lfs_object_uploader_spec.rb | 2 +- .../uploaders/namespace_file_uploader_spec.rb | 2 +- spec/uploaders/object_storage_spec.rb | 2 +- spec/uploaders/personal_file_uploader_spec.rb | 2 +- spec/uploaders/records_uploads_spec.rb | 2 +- .../terraform/state_uploader_spec.rb | 2 +- spec/uploaders/uploader_helper_spec.rb | 2 +- .../background_move_worker_spec.rb | 2 +- .../migrate_uploads_worker_spec.rb | 2 +- .../addressable_url_validator_spec.rb | 2 +- .../branch_filter_validator_spec.rb | 2 +- spec/validators/color_validator_spec.rb | 2 +- ...n_freeze_period_timezone_validator_spec.rb | 2 +- spec/validators/cron_validator_spec.rb | 2 +- .../validators/devise_email_validator_spec.rb | 2 +- spec/validators/js_regex_validator_spec.rb | 2 +- spec/validators/json_schema_validator_spec.rb | 2 +- .../named_ecdsa_key_validator_spec.rb | 2 +- .../namespace_path_validator_spec.rb | 2 +- .../validators/project_path_validator_spec.rb | 2 +- spec/validators/public_url_validator_spec.rb | 2 +- .../qualified_domain_array_validator_spec.rb | 2 +- spec/validators/sha_validator_spec.rb | 2 +- .../system_hook_url_validator_spec.rb | 2 +- .../variable_duplicates_validator_spec.rb | 2 +- ..._certificate_credentials_validator_spec.rb | 2 +- .../_eks.html.haml_spec.rb | 2 +- .../_repository_storage.html.haml_spec.rb | 2 +- .../general.html.haml_spec.rb | 2 +- .../admin/dashboard/index.html.haml_spec.rb | 2 +- .../admin/sessions/new.html.haml_spec.rb | 2 +- .../sessions/two_factor.html.haml_spec.rb | 2 +- .../views/admin/users/_user.html.haml_spec.rb | 2 +- spec/views/ci/status/_badge.html.haml_spec.rb | 2 +- spec/views/ci/status/_icon.html.haml_spec.rb | 2 +- .../_blank_state_admin_welcome.haml_spec.rb | 2 +- .../dashboard/projects/_nav.html.haml_spec.rb | 2 +- .../devise/sessions/new.html.haml_spec.rb | 2 +- .../shared/_signin_box.html.haml_spec.rb | 2 +- .../errors/access_denied.html.haml_spec.rb | 2 +- .../events/event/_push.html.haml_spec.rb | 2 +- .../groups/_home_panel.html.haml_spec.rb | 2 +- spec/views/groups/edit.html.haml_spec.rb | 2 +- spec/views/help/index.html.haml_spec.rb | 2 +- .../instance_configuration.html.haml_spec.rb | 2 +- spec/views/help/show.html.haml_spec.rb | 2 +- .../gitlab_projects/new.html.haml_spec.rb | 2 +- spec/views/layouts/_head.html.haml_spec.rb | 2 +- .../layouts/application.html.haml_spec.rb | 2 +- .../layouts/header/_new_dropdown.haml_spec.rb | 2 +- .../nav/sidebar/_admin.html.haml_spec.rb | 2 +- .../nav/sidebar/_group.html.haml_spec.rb | 2 +- .../_instance_statistics.html.haml_spec.rb | 2 +- .../nav/sidebar/_profile.html.haml_spec.rb | 2 +- .../nav/sidebar/_project.html.haml_spec.rb | 2 +- .../changed_milestone_email.html.haml_spec.rb | 2 +- .../pipeline_failed_email.html.haml_spec.rb | 2 +- .../pipeline_failed_email.text.erb_spec.rb | 2 +- .../pipeline_fixed_email.html.haml_spec.rb | 2 +- .../pipeline_fixed_email.text.erb_spec.rb | 2 +- .../pipeline_success_email.html.haml_spec.rb | 2 +- .../pipeline_success_email.text.erb_spec.rb | 2 +- .../preferences/show.html.haml_spec.rb | 2 +- spec/views/profiles/show.html.haml_spec.rb | 2 +- .../projects/_home_panel.html.haml_spec.rb | 2 +- .../projects/blob/_viewer.html.haml_spec.rb | 2 +- .../buttons/_dropdown.html.haml_spec.rb | 2 +- .../projects/ci/lints/show.html.haml_spec.rb | 2 +- .../clusters/gcp/_form.html.haml_spec.rb | 2 +- .../commit/_commit_box.html.haml_spec.rb | 2 +- .../commit/branches.html.haml_spec.rb | 2 +- .../projects/commit/show.html.haml_spec.rb | 2 +- .../commits/_commit.html.haml_spec.rb | 2 +- .../_confirm_rollback_modal_spec.html_spec.rb | 2 +- .../projects/diffs/_stats.html.haml_spec.rb | 2 +- .../projects/diffs/_viewer.html.haml_spec.rb | 2 +- spec/views/projects/edit.html.haml_spec.rb | 2 +- .../environments/terminal.html.haml_spec.rb | 2 +- .../projects/imports/new.html.haml_spec.rb | 2 +- .../_related_branches.html.haml_spec.rb | 2 +- .../projects/issues/show.html.haml_spec.rb | 2 +- .../projects/jobs/_build.html.haml_spec.rb | 2 +- .../_generic_commit_status.html.haml_spec.rb | 2 +- .../projects/jobs/show.html.haml_spec.rb | 2 +- .../merge_requests/_commits.html.haml_spec.rb | 2 +- .../creations/_new_submit.html.haml_spec.rb | 2 +- .../diffs/_diffs.html.haml_spec.rb | 2 +- .../merge_requests/edit.html.haml_spec.rb | 2 +- .../merge_requests/show.html.haml_spec.rb | 2 +- .../_more_actions_dropdown.html.haml_spec.rb | 2 +- .../projects/pages/show.html.haml_spec.rb | 2 +- .../pages_domains/show.html.haml_spec.rb | 2 +- .../_pipeline_schedule.html.haml_spec.rb | 2 +- .../pipelines/_stage.html.haml_spec.rb | 2 +- .../projects/services/_form.haml_spec.rb | 2 +- .../projects/services/edit.html.haml_spec.rb | 2 +- .../ci_cd/_autodevops_form.html.haml_spec.rb | 2 +- .../operations/show.html.haml_spec.rb | 2 +- spec/views/projects/show.html.haml_spec.rb | 2 +- .../projects/tags/index.html.haml_spec.rb | 2 +- .../tree/_tree_header.html.haml_spec.rb | 2 +- .../projects/tree/_tree_row.html.haml_spec.rb | 2 +- .../projects/tree/show.html.haml_spec.rb | 2 +- spec/views/search/_filter.html.haml_spec.rb | 2 +- spec/views/search/_form.html.haml_spec.rb | 2 +- spec/views/search/_results.html.haml_spec.rb | 2 +- spec/views/search/show.html.haml_spec.rb | 2 +- .../views/shared/_label_row.html.haml_spec.rb | 2 +- .../milestones/_issuable.html.haml_spec.rb | 2 +- .../milestones/_issuables.html.haml_spec.rb | 2 +- .../shared/milestones/_top.html.haml_spec.rb | 2 +- .../shared/notes/_form.html.haml_spec.rb | 2 +- .../shared/projects/_list.html.haml_spec.rb | 2 +- .../projects/_project.html.haml_spec.rb | 2 +- .../shared/runners/show.html.haml_spec.rb | 2 +- spec/workers/admin_email_worker_spec.rb | 2 +- spec/workers/archive_trace_worker_spec.rb | 2 +- spec/workers/authorized_keys_worker_spec.rb | 2 +- .../project_create_worker_spec.rb | 2 +- ...er_refresh_with_low_urgency_worker_spec.rb | 2 +- .../authorized_projects_worker_spec.rb | 2 +- .../auto_devops/disable_worker_spec.rb | 2 +- .../workers/auto_merge_process_worker_spec.rb | 2 +- .../background_migration_worker_spec.rb | 2 +- spec/workers/build_coverage_worker_spec.rb | 2 +- spec/workers/build_finished_worker_spec.rb | 2 +- spec/workers/build_hooks_worker_spec.rb | 2 +- spec/workers/build_success_worker_spec.rb | 2 +- .../build_trace_sections_worker_spec.rb | 2 +- spec/workers/chat_notification_worker_spec.rb | 2 +- .../ci/archive_traces_cron_worker_spec.rb | 2 +- spec/workers/ci/build_prepare_worker_spec.rb | 2 +- .../ci/build_report_result_worker_spec.rb | 2 +- spec/workers/ci/build_schedule_worker_spec.rb | 2 +- ...eate_cross_project_pipeline_worker_spec.rb | 2 +- ..._build_group_report_results_worker_spec.rb | 2 +- .../ci/pipeline_bridge_status_worker_spec.rb | 2 +- ...esource_from_resource_group_worker_spec.rb | 2 +- ...leanup_container_repository_worker_spec.rb | 2 +- .../cluster_configure_istio_worker_spec.rb | 2 +- spec/workers/cluster_provision_worker_spec.rb | 2 +- .../workers/cluster_update_app_worker_spec.rb | 2 +- ...cluster_wait_for_app_update_worker_spec.rb | 2 +- ...wait_for_ingress_ip_address_worker_spec.rb | 2 +- .../activate_service_worker_spec.rb | 2 +- .../check_prometheus_health_worker_spec.rb | 2 +- .../deactivate_service_worker_spec.rb | 2 +- .../wait_for_uninstall_app_worker_spec.rb | 2 +- .../clusters/cleanup/app_worker_spec.rb | 2 +- .../cleanup/project_namespace_worker_spec.rb | 2 +- .../cleanup/service_account_worker_spec.rb | 2 +- .../concerns/application_worker_spec.rb | 2 +- spec/workers/concerns/cluster_queue_spec.rb | 2 +- spec/workers/concerns/cronjob_queue_spec.rb | 2 +- .../github_import/object_importer_spec.rb | 2 +- .../gitlab/github_import/queue_spec.rb | 2 +- .../rescheduling_methods_spec.rb | 2 +- .../github_import/stage_methods_spec.rb | 2 +- .../concerns/gitlab/notify_upon_death_spec.rb | 2 +- .../pipeline_background_queue_spec.rb | 2 +- spec/workers/concerns/pipeline_queue_spec.rb | 2 +- .../concerns/project_export_options_spec.rb | 2 +- .../concerns/project_import_options_spec.rb | 2 +- spec/workers/concerns/reenqueuer_spec.rb | 4 +- .../concerns/repository_check_queue_spec.rb | 2 +- spec/workers/concerns/waitable_worker_spec.rb | 2 +- spec/workers/concerns/worker_context_spec.rb | 2 +- ...container_expiration_policy_worker_spec.rb | 2 +- .../create_commit_signature_worker_spec.rb | 2 +- spec/workers/create_evidence_worker_spec.rb | 2 +- .../create_note_diff_file_worker_spec.rb | 2 +- spec/workers/create_pipeline_worker_spec.rb | 2 +- ...delete_container_repository_worker_spec.rb | 2 +- spec/workers/delete_diff_files_worker_spec.rb | 2 +- .../delete_merged_branches_worker_spec.rb | 2 +- spec/workers/delete_user_worker_spec.rb | 2 +- .../deployments/finished_worker_spec.rb | 2 +- .../deployments/success_worker_spec.rb | 2 +- .../new_version_worker_spec.rb | 2 +- ...detect_repository_languages_worker_spec.rb | 2 +- spec/workers/email_receiver_worker_spec.rb | 2 +- spec/workers/emails_on_push_worker_spec.rb | 2 +- .../auto_stop_cron_worker_spec.rb | 2 +- .../error_tracking_issue_link_worker_spec.rb | 2 +- spec/workers/every_sidekiq_worker_spec.rb | 2 +- .../expire_build_artifacts_worker_spec.rb | 2 +- ...re_build_instance_artifacts_worker_spec.rb | 2 +- spec/workers/expire_job_cache_worker_spec.rb | 2 +- .../expire_pipeline_cache_worker_spec.rb | 2 +- spec/workers/export_csv_worker_spec.rb | 2 +- ...al_service_reactive_caching_worker_spec.rb | 2 +- spec/workers/file_hook_worker_spec.rb | 2 +- .../git_garbage_collect_worker_spec.rb | 2 +- .../advance_stage_worker_spec.rb | 2 +- .../import_diff_note_worker_spec.rb | 2 +- .../github_import/import_issue_worker_spec.rb | 2 +- .../github_import/import_note_worker_spec.rb | 2 +- .../import_pull_request_worker_spec.rb | 2 +- .../refresh_import_jid_worker_spec.rb | 2 +- .../stage/finish_import_worker_spec.rb | 2 +- .../stage/import_base_data_worker_spec.rb | 2 +- ...mport_issues_and_diff_notes_worker_spec.rb | 2 +- .../stage/import_lfs_objects_worker_spec.rb | 2 +- .../stage/import_notes_worker_spec.rb | 2 +- .../stage/import_pull_requests_worker_spec.rb | 2 +- .../stage/import_repository_worker_spec.rb | 2 +- .../jira_import/import_issue_worker_spec.rb | 2 +- .../stage/finish_import_worker_spec.rb | 2 +- .../stage/import_attachments_worker_spec.rb | 2 +- .../stage/import_issues_worker_spec.rb | 2 +- .../stage/import_labels_worker_spec.rb | 2 +- .../stage/import_notes_worker_spec.rb | 2 +- .../stage/start_import_worker_spec.rb | 2 +- .../stuck_jira_import_jobs_worker_spec.rb | 2 +- .../phabricator_import/base_worker_spec.rb | 2 +- .../import_tasks_worker_spec.rb | 2 +- spec/workers/gitlab_shell_worker_spec.rb | 2 +- spec/workers/gitlab_usage_ping_worker_spec.rb | 2 +- spec/workers/group_destroy_worker_spec.rb | 2 +- spec/workers/group_export_worker_spec.rb | 2 +- spec/workers/group_import_worker_spec.rb | 2 +- .../hashed_storage/migrator_worker_spec.rb | 2 +- .../project_migrate_worker_spec.rb | 2 +- .../project_rollback_worker_spec.rb | 2 +- .../hashed_storage/rollbacker_worker_spec.rb | 2 +- spec/workers/import_issues_csv_worker_spec.rb | 2 +- .../process_alert_worker_spec.rb | 2 +- .../process_prometheus_alert_worker_spec.rb | 2 +- ...nvalid_gpg_signature_update_worker_spec.rb | 2 +- .../issue_due_scheduler_worker_spec.rb | 2 +- .../mail_scheduler/issue_due_worker_spec.rb | 2 +- .../notification_service_worker_spec.rb | 2 +- ..._request_mergeability_check_worker_spec.rb | 2 +- spec/workers/merge_worker_spec.rb | 2 +- .../schedule_annotations_prune_worker_spec.rb | 2 +- .../migrate_external_diffs_worker_spec.rb | 2 +- ...mespaceless_project_destroy_worker_spec.rb | 2 +- ...prune_aggregation_schedules_worker_spec.rb | 2 +- .../namespaces/root_statistics_worker_spec.rb | 2 +- .../schedule_aggregation_worker_spec.rb | 2 +- spec/workers/new_issue_worker_spec.rb | 2 +- spec/workers/new_merge_request_worker_spec.rb | 2 +- spec/workers/new_note_worker_spec.rb | 2 +- spec/workers/new_release_worker_spec.rb | 2 +- .../workers/object_pool/create_worker_spec.rb | 2 +- .../object_pool/destroy_worker_spec.rb | 2 +- spec/workers/object_pool/join_worker_spec.rb | 2 +- .../pages_domain_removal_cron_worker_spec.rb | 2 +- ...ges_domain_ssl_renewal_cron_worker_spec.rb | 2 +- .../pages_domain_ssl_renewal_worker_spec.rb | 2 +- ...es_domain_verification_cron_worker_spec.rb | 2 +- .../pages_domain_verification_worker_spec.rb | 2 +- spec/workers/pipeline_hooks_worker_spec.rb | 2 +- spec/workers/pipeline_metrics_worker_spec.rb | 2 +- .../pipeline_notification_worker_spec.rb | 2 +- spec/workers/pipeline_process_worker_spec.rb | 2 +- spec/workers/pipeline_schedule_worker_spec.rb | 2 +- ...pdate_ci_ref_status_worker_service_spec.rb | 2 +- spec/workers/pipeline_update_worker_spec.rb | 2 +- spec/workers/post_receive_spec.rb | 2 +- spec/workers/process_commit_worker_spec.rb | 2 +- spec/workers/project_cache_worker_spec.rb | 2 +- .../project_daily_statistics_worker_spec.rb | 2 +- spec/workers/project_destroy_worker_spec.rb | 2 +- spec/workers/project_export_worker_spec.rb | 2 +- spec/workers/project_service_worker_spec.rb | 2 +- ...t_update_repository_storage_worker_spec.rb | 2 +- .../create_default_alerts_worker_spec.rb | 2 +- .../propagate_integration_worker_spec.rb | 2 +- .../propagate_service_template_worker_spec.rb | 2 +- spec/workers/prune_old_events_worker_spec.rb | 2 +- .../prune_web_hook_logs_worker_spec.rb | 2 +- spec/workers/reactive_caching_worker_spec.rb | 2 +- spec/workers/rebase_worker_spec.rb | 2 +- .../remote_mirror_notification_worker_spec.rb | 2 +- 752 files changed, 1974 insertions(+), 1023 deletions(-) create mode 100644 app/assets/javascripts/alert_management/components/alert_status.vue create mode 100644 app/graphql/types/milestone_stats_type.rb create mode 100644 changelogs/unreleased/209786-improve-performance-of-diffs_batch-and-diffs_metadata-actions-for-.yml create mode 100644 changelogs/unreleased/223135-add-ref-milestones-and-released_at-to-releaser-cli-and-yml.yml create mode 100644 changelogs/unreleased/223135-expose-ref-milestones-relesed-at-to-cli.yml create mode 100644 changelogs/unreleased/nfriend-add-issue-stats-to-milestones-graphql.yml create mode 100644 changelogs/unreleased/nfriend-fix-assets-for-guest-users.yml create mode 100644 lib/gitlab/diff/stats_cache.rb create mode 100644 spec/graphql/types/milestone_stats_type_spec.rb create mode 100644 spec/lib/gitlab/diff/stats_cache_spec.rb diff --git a/app/assets/javascripts/alert_management/components/alert_details.vue b/app/assets/javascripts/alert_management/components/alert_details.vue index b3b1551497a..3da338bf13f 100644 --- a/app/assets/javascripts/alert_management/components/alert_details.vue +++ b/app/assets/javascripts/alert_management/components/alert_details.vue @@ -336,7 +336,7 @@ export default { :sidebar-collapsed="sidebarCollapsed" @alert-refresh="alertRefresh" @toggle-sidebar="toggleSidebar" - @alert-sidebar-error="handleAlertSidebarError" + @alert-error="handleAlertSidebarError" /> diff --git a/app/assets/javascripts/alert_management/components/alert_management_list.vue b/app/assets/javascripts/alert_management/components/alert_management_list.vue index 6c92dc3c89a..ea6d3e3a931 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_list.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_list.vue @@ -6,8 +6,6 @@ import { GlTable, GlAlert, GlIcon, - GlDropdown, - GlDropdownItem, GlLink, GlTabs, GlTab, @@ -16,12 +14,13 @@ import { GlSearchBoxByType, GlSprintf, } from '@gitlab/ui'; -import createFlash from '~/flash'; import { __, s__ } from '~/locale'; import { debounce, trim } from 'lodash'; import { joinPaths, visitUrl } from '~/lib/utils/url_utility'; import { fetchPolicies } from '~/lib/graphql'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; +import { convertToSnakeCase } from '~/lib/utils/text_utility'; +import Tracking from '~/tracking'; import getAlerts from '../graphql/queries/get_alerts.query.graphql'; import getAlertsCountByStatus from '../graphql/queries/get_count_by_status.query.graphql'; import { @@ -31,9 +30,7 @@ import { trackAlertListViewsOptions, trackAlertStatusUpdateOptions, } from '../constants'; -import updateAlertStatus from '../graphql/mutations/update_alert_status.graphql'; -import { convertToSnakeCase } from '~/lib/utils/text_utility'; -import Tracking from '~/tracking'; +import AlertStatus from './alert_status.vue'; const tdClass = 'table-col gl-display-flex d-md-table-cell gl-align-items-center'; const thClass = 'gl-hover-bg-blue-50'; @@ -107,11 +104,6 @@ export default { sortable: true, }, ], - statuses: { - TRIGGERED: s__('AlertManagement|Triggered'), - ACKNOWLEDGED: s__('AlertManagement|Acknowledged'), - RESOLVED: s__('AlertManagement|Resolved'), - }, severityLabels: ALERTS_SEVERITY_LABELS, statusTabs: ALERTS_STATUS_TABS, components: { @@ -121,8 +113,6 @@ export default { GlAlert, GlDeprecatedButton, TimeAgo, - GlDropdown, - GlDropdownItem, GlIcon, GlLink, GlTabs, @@ -131,6 +121,7 @@ export default { GlPagination, GlSearchBoxByType, GlSprintf, + AlertStatus, }, props: { projectPath: { @@ -204,6 +195,7 @@ export default { return { searchTerm: '', errored: false, + errorMessage: '', isAlertDismissed: false, isErrorAlertDismissed: false, sort: 'STARTED_AT_DESC', @@ -275,30 +267,6 @@ export default { this.searchTerm = trimmedInput; } }, 500), - updateAlertStatus(status, iid) { - this.$apollo - .mutate({ - mutation: updateAlertStatus, - variables: { - iid, - status: status.toUpperCase(), - projectPath: this.projectPath, - }, - }) - .then(() => { - this.trackStatusUpdate(status); - this.$apollo.queries.alerts.refetch(); - this.$apollo.queries.alertsCount.refetch(); - this.resetPagination(); - }) - .catch(() => { - createFlash( - s__( - 'AlertManagement|There was an error while updating the status of the alert. Please try again.', - ), - ); - }); - }, navigateToAlertDetails({ iid }) { return visitUrl(joinPaths(window.location.pathname, iid, 'details')); }, @@ -338,6 +306,14 @@ export default { resetPagination() { this.pagination = initialPaginationState; }, + handleAlertError(errorMessage) { + this.errored = true; + this.errorMessage = errorMessage; + }, + dismissError() { + this.isErrorAlertDismissed = true; + this.errorMessage = ''; + }, }, }; @@ -357,8 +333,13 @@ export default { - - {{ $options.i18n.errorMsg }} + + {{ errorMessage || $options.i18n.errorMsg }} @@ -437,22 +418,12 @@ export default {