diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-07 03:09:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-07 03:09:45 +0300 |
commit | d8f61f6383a930a4b25455fd8ccf624fa313bb07 (patch) | |
tree | d1a4eca43aa9a251ae37e9747f4461bebe9445fa /app/assets/javascripts/ci | |
parent | 179a30a49dbbbf4de03f28ac0fe9a8925d5f4883 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ci')
-rw-r--r-- | app/assets/javascripts/ci/common/private/job_action_component.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/jobs_shared/action_component.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/common/private/job_links_layer.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph_shared/links_layer.vue) | 6 | ||||
-rw-r--r-- | app/assets/javascripts/ci/common/private/job_name_component.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/jobs_shared/job_name_component.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/merge_requests/graphql/mutations/retry_mr_failed_job.mutation.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/mutations/retry_mr_failed_job.mutation.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/merge_requests/graphql/queries/get_merge_request_pipelines.query.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/queries/get_merge_request_pipelines.query.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/dag/components/dag_annotations.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/dag/dag_annotations.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/dag/components/dag_graph.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/dag/dag_graph.vue) | 8 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/dag/constants.js (renamed from app/assets/javascripts/ci/pipeline_details/components/dag/constants.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/dag/dag.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/dag/dag.vue) | 15 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/dag/drawing_utils.js (renamed from app/assets/javascripts/ci/pipeline_details/components/dag/drawing_utils.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/dag/graphql/queries/get_dag_vis_data.query.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/queries/get_dag_vis_data.query.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/dag/interactions.js (renamed from app/assets/javascripts/ci/pipeline_details/components/dag/interactions.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/api_utils.js (renamed from app/assets/javascripts/ci/pipeline_details/components/graph_shared/api.js) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/components/graph_component.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/graph_component.vue) | 12 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/components/graph_view_selector.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/graph_view_selector.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/components/job_group_dropdown.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/job_group_dropdown.vue) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/job_item.vue) | 8 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/components/linked_graph_wrapper.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph_shared/linked_graph_wrapper.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipeline.vue) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipelines_column.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipelines_column.vue) | 8 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/components/links_inner.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph_shared/links_inner.vue) | 7 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/components/root_graph_layout.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph_shared/main_graph_wrapper.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/components/stage_column_component.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/stage_column_component.vue) | 12 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/constants.js (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/constants.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/graph_component_wrapper.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/graph_component_wrapper.vue) | 12 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/graphql/mutations/dismiss_pipeline_notification.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/mutations/dismiss_pipeline_notification.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/perf_utils.js (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/perf_utils.js) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/graph/utils.js (renamed from app/assets/javascripts/ci/pipeline_details/components/graph/utils.js) | 7 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/header/graphql/queries/get_pipeline_header_data.query.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_header_data.query.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/header/pipeline_details_header.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_details_header.vue) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/jobs/components/failed_jobs_table.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/jobs/failed_jobs_table.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/jobs/failed_jobs_app.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/jobs/failed_jobs_app.vue) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/jobs/graphql/mutations/retry_failed_job.mutation.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/mutations/retry_failed_job.mutation.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/jobs/graphql/queries/get_failed_jobs.query.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/queries/get_failed_jobs.query.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/jobs/graphql/queries/get_pipeline_jobs.query.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_jobs.query.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/jobs/jobs_app.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/jobs/jobs_app.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/mixins/stage_column_mixin.js | 14 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipeline_details_header.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipeline_tabs.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/nav_controls.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/nav_controls.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_labels.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_labels.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_multi_actions.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_multi_actions.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_operations.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_operations.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_stop_modal.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_stop_modal.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_triggerer.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_triggerer.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_url.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_url.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_artifacts.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_artifacts.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_filtered_search.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_filtered_search.vue) | 10 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_manual_actions.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_manual_actions.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_status_badge.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_status_badge.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_table.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_table.vue) | 6 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/components/time_ago.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/time_ago.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/ci_templates.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state/ci_templates.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/ios_templates.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state/ios_templates.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/no_ci_empty_state.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state.vue) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/pipelines_ci_templates.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state/pipelines_ci_templates.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/failed_job_details.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/failed_job_details.vue) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/failed_jobs_list.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/failed_jobs_list.vue) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/utils.js (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/utils.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/graphql/queries/get_pipeline_actions.query.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_actions.query.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/graphql/queries/get_pipeline_failed_jobs.query.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_failed_jobs.query.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/graphql/queries/get_pipeline_failed_jobs_count.query.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_failed_jobs_count.query.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/pipelines.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines.vue) | 20 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/constants.js (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/constants.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_branch_name_token.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_branch_name_token.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_source_token.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_source_token.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_status_token.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_status_token.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_tag_name_token.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_tag_name_token.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_trigger_author_token.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_trigger_author_token.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/routes.js | 10 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_tabs.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/test_reports/empty_state.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/test_reports/empty_state.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/test_reports/test_case_details.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/test_reports/test_case_details.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/test_reports/test_reports.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/test_reports/test_suite_table.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/test_reports/test_suite_table.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/test_reports/test_summary.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/test_reports/test_summary.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/test_reports/test_summary_table.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/test_reports/test_summary_table.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/utils/drawing_utils.js (renamed from app/assets/javascripts/ci/pipeline_details/components/graph_shared/drawing_utils.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/utils/index.js (renamed from app/assets/javascripts/ci/pipeline_details/utils.js) | 19 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/utils/parsing_utils.js (renamed from app/assets/javascripts/ci/pipeline_details/components/parsing_utils.js) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_details/utils/unwrapping_utils.js (renamed from app/assets/javascripts/ci/pipeline_details/components/unwrapping_utils.js) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_editor/components/graph/job_pill.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/job_pill.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_editor/components/graph/pipeline_graph.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/pipeline_graph.vue) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_editor/components/graph/stage_name.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/stage_name.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_status.vue | 7 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_editor/components/pipeline_editor_tabs.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_editor/pipeline_editor_app.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/accessors/linked_pipelines_accessors.js (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/accessors/linked_pipelines_accessors.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/graphql/queries/get_pipeline_stage.query.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_stage.query.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/graphql/queries/get_pipeline_stages.query.graphql (renamed from app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_stages.query.graphql) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/job_item.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/job_item.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/legacy_job_item.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_job_item.vue) | 8 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_stage.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_stage.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/linked_pipelines_mini_list.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/linked_pipelines_mini_list.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_mini_graph.vue) | 9 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stage.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stage.vue) | 7 | ||||
-rw-r--r-- | app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue (renamed from app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stages.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/ci/utils.js | 17 |
102 files changed, 146 insertions, 161 deletions
diff --git a/app/assets/javascripts/ci/pipeline_details/components/jobs_shared/action_component.vue b/app/assets/javascripts/ci/common/private/job_action_component.vue index ffb6ab71b22..f649750ce8a 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/jobs_shared/action_component.vue +++ b/app/assets/javascripts/ci/common/private/job_action_component.vue @@ -5,7 +5,7 @@ import axios from '~/lib/utils/axios_utils'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; import { dasherize } from '~/lib/utils/text_utility'; import { __ } from '~/locale'; -import { reportToSentry } from '../../utils'; +import { reportToSentry } from '~/ci/utils'; /** * Renders either a cancel, retry or play icon button and handles the post request diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/links_layer.vue b/app/assets/javascripts/ci/common/private/job_links_layer.vue index ef24694e494..59260ca3f81 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/links_layer.vue +++ b/app/assets/javascripts/ci/common/private/job_links_layer.vue @@ -1,8 +1,8 @@ <script> import { memoize } from 'lodash'; -import { reportToSentry } from '../../utils'; -import { parseData } from '../parsing_utils'; -import LinksInner from './links_inner.vue'; +import { reportToSentry } from '~/ci/utils'; +import { parseData } from '~/ci/pipeline_details/utils/parsing_utils'; +import LinksInner from '~/ci/pipeline_details/graph/components/links_inner.vue'; const parseForLinksBare = (pipeline) => { const arrayOfJobs = pipeline.flatMap(({ groups }) => groups); diff --git a/app/assets/javascripts/ci/pipeline_details/components/jobs_shared/job_name_component.vue b/app/assets/javascripts/ci/common/private/job_name_component.vue index 1c7f5a7476d..1c7f5a7476d 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/jobs_shared/job_name_component.vue +++ b/app/assets/javascripts/ci/common/private/job_name_component.vue diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/mutations/retry_mr_failed_job.mutation.graphql b/app/assets/javascripts/ci/merge_requests/graphql/mutations/retry_mr_failed_job.mutation.graphql index 022d461dbec..022d461dbec 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/mutations/retry_mr_failed_job.mutation.graphql +++ b/app/assets/javascripts/ci/merge_requests/graphql/mutations/retry_mr_failed_job.mutation.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_merge_request_pipelines.query.graphql b/app/assets/javascripts/ci/merge_requests/graphql/queries/get_merge_request_pipelines.query.graphql index 8c235032e6c..8c235032e6c 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_merge_request_pipelines.query.graphql +++ b/app/assets/javascripts/ci/merge_requests/graphql/queries/get_merge_request_pipelines.query.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/components/dag/dag_annotations.vue b/app/assets/javascripts/ci/pipeline_details/dag/components/dag_annotations.vue index a1500166cdc..a1500166cdc 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/dag/dag_annotations.vue +++ b/app/assets/javascripts/ci/pipeline_details/dag/components/dag_annotations.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/dag/dag_graph.vue b/app/assets/javascripts/ci/pipeline_details/dag/components/dag_graph.vue index 7646c11773c..67e80145e83 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/dag/dag_graph.vue +++ b/app/assets/javascripts/ci/pipeline_details/dag/components/dag_graph.vue @@ -1,10 +1,10 @@ <script> import * as d3 from 'd3'; import { uniqueId } from 'lodash'; +import { getMaxNodes, removeOrphanNodes } from '~/ci/pipeline_details/utils/parsing_utils'; import { PARSE_FAILURE } from '../../constants'; -import { getMaxNodes, removeOrphanNodes } from '../parsing_utils'; -import { LINK_SELECTOR, NODE_SELECTOR, ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from './constants'; -import { calculateClip, createLinkPath, createSankey, labelPosition } from './drawing_utils'; +import { LINK_SELECTOR, NODE_SELECTOR, ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from '../constants'; +import { calculateClip, createLinkPath, createSankey, labelPosition } from '../drawing_utils'; import { currentIsLive, getLiveLinksAsDict, @@ -12,7 +12,7 @@ import { restoreLinks, toggleLinkHighlight, togglePathHighlights, -} from './interactions'; +} from '../interactions'; export default { viewOptions: { diff --git a/app/assets/javascripts/ci/pipeline_details/components/dag/constants.js b/app/assets/javascripts/ci/pipeline_details/dag/constants.js index cd89055737f..cd89055737f 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/dag/constants.js +++ b/app/assets/javascripts/ci/pipeline_details/dag/constants.js diff --git a/app/assets/javascripts/ci/pipeline_details/components/dag/dag.vue b/app/assets/javascripts/ci/pipeline_details/dag/dag.vue index afb5aa05098..5415340c956 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/dag/dag.vue +++ b/app/assets/javascripts/ci/pipeline_details/dag/dag.vue @@ -4,12 +4,17 @@ import { GlAlert, GlButton, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui'; import { isEmpty } from 'lodash'; import { fetchPolicies } from '~/lib/graphql'; import { __ } from '~/locale'; -import { DEFAULT, PARSE_FAILURE, LOAD_FAILURE, UNSUPPORTED_DATA } from '../../constants'; -import getDagVisData from '../../graphql/queries/get_dag_vis_data.query.graphql'; -import { parseData } from '../parsing_utils'; +import { + DEFAULT, + PARSE_FAILURE, + LOAD_FAILURE, + UNSUPPORTED_DATA, +} from '~/ci/pipeline_details/constants'; +import { parseData } from '~/ci/pipeline_details/utils/parsing_utils'; +import getDagVisData from './graphql/queries/get_dag_vis_data.query.graphql'; import { ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from './constants'; -import DagAnnotations from './dag_annotations.vue'; -import DagGraph from './dag_graph.vue'; +import DagAnnotations from './components/dag_annotations.vue'; +import DagGraph from './components/dag_graph.vue'; export default { // eslint-disable-next-line @gitlab/require-i18n-strings diff --git a/app/assets/javascripts/ci/pipeline_details/components/dag/drawing_utils.js b/app/assets/javascripts/ci/pipeline_details/dag/drawing_utils.js index 3cd09d57ffb..3cd09d57ffb 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/dag/drawing_utils.js +++ b/app/assets/javascripts/ci/pipeline_details/dag/drawing_utils.js diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_dag_vis_data.query.graphql b/app/assets/javascripts/ci/pipeline_details/dag/graphql/queries/get_dag_vis_data.query.graphql index 2a0b13dd0cc..2a0b13dd0cc 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_dag_vis_data.query.graphql +++ b/app/assets/javascripts/ci/pipeline_details/dag/graphql/queries/get_dag_vis_data.query.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/components/dag/interactions.js b/app/assets/javascripts/ci/pipeline_details/dag/interactions.js index 69f36feeee4..69f36feeee4 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/dag/interactions.js +++ b/app/assets/javascripts/ci/pipeline_details/dag/interactions.js diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/api.js b/app/assets/javascripts/ci/pipeline_details/graph/api_utils.js index 0fe7d9ffda3..f9f47d1ea15 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/api.js +++ b/app/assets/javascripts/ci/pipeline_details/graph/api_utils.js @@ -1,5 +1,5 @@ import axios from '~/lib/utils/axios_utils'; -import { reportToSentry } from '../../utils'; +import { reportToSentry } from '~/ci/utils'; export const reportPerformance = (path, stats) => { // FIXME: https://gitlab.com/gitlab-org/gitlab/-/issues/330245 diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/graph_component.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/graph_component.vue index 49df71beeec..f098d790736 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/graph_component.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/graph_component.vue @@ -1,15 +1,15 @@ <script> -import { reportToSentry } from '../../utils'; -import LinkedGraphWrapper from '../graph_shared/linked_graph_wrapper.vue'; -import LinksLayer from '../graph_shared/links_layer.vue'; +import { reportToSentry } from '~/ci/utils'; import { generateColumnsFromLayersListMemoized, keepLatestDownstreamPipelines, -} from '../parsing_utils'; -import { DOWNSTREAM, MAIN, UPSTREAM, ONE_COL_WIDTH, STAGE_VIEW } from './constants'; +} from '~/ci/pipeline_details/utils/parsing_utils'; +import LinksLayer from '../../../common/private/job_links_layer.vue'; +import { DOWNSTREAM, MAIN, UPSTREAM, ONE_COL_WIDTH, STAGE_VIEW } from '../constants'; +import { validateConfigPaths } from '../utils'; +import LinkedGraphWrapper from './linked_graph_wrapper.vue'; import LinkedPipelinesColumn from './linked_pipelines_column.vue'; import StageColumnComponent from './stage_column_component.vue'; -import { validateConfigPaths } from './utils'; export default { name: 'PipelineGraph', diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/graph_view_selector.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/graph_view_selector.vue index 73143c981ed..fb7dcb300f1 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/graph_view_selector.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/graph_view_selector.vue @@ -1,7 +1,7 @@ <script> import { GlAlert, GlButton, GlButtonGroup, GlLoadingIcon, GlToggle } from '@gitlab/ui'; import { __, s__ } from '~/locale'; -import { STAGE_VIEW, LAYER_VIEW } from './constants'; +import { STAGE_VIEW, LAYER_VIEW } from '../constants'; export default { name: 'GraphViewSelector', diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/job_group_dropdown.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/job_group_dropdown.vue index d4852224df5..7538ad87af8 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/job_group_dropdown.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/job_group_dropdown.vue @@ -1,6 +1,6 @@ <script> -import { reportToSentry } from '../../utils'; -import { JOB_DROPDOWN, SINGLE_JOB } from './constants'; +import { reportToSentry } from '~/ci/utils'; +import { JOB_DROPDOWN, SINGLE_JOB } from '../constants'; import JobItem from './job_item.vue'; /** diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/job_item.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue index 22895a31082..bab05d0c232 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/job_item.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/job_item.vue @@ -1,14 +1,14 @@ <script> import { GlBadge, GlForm, GlFormCheckbox, GlLink, GlModal, GlTooltipDirective } from '@gitlab/ui'; +import { reportToSentry } from '~/ci/utils'; import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin'; import { helpPagePath } from '~/helpers/help_page_helper'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; import { __, s__, sprintf } from '~/locale'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; -import { reportToSentry } from '../../utils'; -import ActionComponent from '../jobs_shared/action_component.vue'; -import JobNameComponent from '../jobs_shared/job_name_component.vue'; -import { BRIDGE_KIND, RETRY_ACTION_TITLE, SINGLE_JOB, SKIP_RETRY_MODAL_KEY } from './constants'; +import ActionComponent from '../../../common/private/job_action_component.vue'; +import JobNameComponent from '../../../common/private/job_name_component.vue'; +import { BRIDGE_KIND, RETRY_ACTION_TITLE, SINGLE_JOB, SKIP_RETRY_MODAL_KEY } from '../constants'; /** * Renders the badge for the pipeline graph and the job's dropdown. diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/linked_graph_wrapper.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_graph_wrapper.vue index fb2280d971a..fb2280d971a 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/linked_graph_wrapper.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_graph_wrapper.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipeline.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue index 8aa49e03718..cc52ff57c13 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipeline.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipeline.vue @@ -14,8 +14,8 @@ import { __, sprintf } from '~/locale'; import CancelPipelineMutation from '~/ci/pipeline_details/graphql/mutations/cancel_pipeline.mutation.graphql'; import RetryPipelineMutation from '~/ci/pipeline_details/graphql/mutations/retry_pipeline.mutation.graphql'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; -import { reportToSentry } from '../../utils'; -import { ACTION_FAILURE, DOWNSTREAM, UPSTREAM } from './constants'; +import { reportToSentry } from '~/ci/utils'; +import { ACTION_FAILURE, DOWNSTREAM, UPSTREAM } from '../constants'; export default { directives: { diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipelines_column.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipelines_column.vue index 02e426064c9..2de7e43c9b1 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/linked_pipelines_column.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/linked_pipelines_column.vue @@ -1,9 +1,8 @@ <script> import getPipelineDetails from 'shared_queries/pipelines/get_pipeline_details.query.graphql'; +import { reportToSentry } from '~/ci/utils'; import { LOAD_FAILURE } from '../../constants'; -import { reportToSentry } from '../../utils'; -import { ONE_COL_WIDTH, UPSTREAM, LAYER_VIEW, STAGE_VIEW } from './constants'; -import LinkedPipeline from './linked_pipeline.vue'; +import { ONE_COL_WIDTH, UPSTREAM, LAYER_VIEW, STAGE_VIEW } from '../constants'; import { calculatePipelineLayersInfo, getQueryHeaders, @@ -11,7 +10,8 @@ import { toggleQueryPollingByVisibility, unwrapPipelineData, validateConfigPaths, -} from './utils'; +} from '../utils'; +import LinkedPipeline from './linked_pipeline.vue'; export default { components: { diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/links_inner.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/links_inner.vue index 1189c2ebad8..09285525c38 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/links_inner.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/links_inner.vue @@ -1,9 +1,10 @@ <script> import { isEmpty } from 'lodash'; +import { STAGE_VIEW } from '~/ci/pipeline_details/graph/constants'; +import { createJobsHash, generateJobNeedsDict } from '~/ci/pipeline_details/utils'; +import { reportToSentry } from '~/ci/utils'; import { DRAW_FAILURE } from '../../constants'; -import { createJobsHash, generateJobNeedsDict, reportToSentry } from '../../utils'; -import { STAGE_VIEW } from '../graph/constants'; -import { generateLinksData } from './drawing_utils'; +import { generateLinksData } from '../../utils/drawing_utils'; export default { name: 'LinksInner', diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/main_graph_wrapper.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/root_graph_layout.vue index bcd7705669e..bcd7705669e 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/main_graph_wrapper.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/root_graph_layout.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/stage_column_component.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/stage_column_component.vue index ffd0fec2ca8..1401bdba5ca 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/stage_column_component.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/stage_column_component.vue @@ -1,9 +1,9 @@ <script> import { escape, isEmpty } from 'lodash'; +import ActionComponent from '~/ci/common/private/job_action_component.vue'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { reportToSentry } from '../../utils'; -import MainGraphWrapper from '../graph_shared/main_graph_wrapper.vue'; -import ActionComponent from '../jobs_shared/action_component.vue'; +import { reportToSentry } from '~/ci/utils'; +import RootGraphLayout from './root_graph_layout.vue'; import JobGroupDropdown from './job_group_dropdown.vue'; import JobItem from './job_item.vue'; @@ -12,7 +12,7 @@ export default { ActionComponent, JobGroupDropdown, JobItem, - MainGraphWrapper, + RootGraphLayout, }, mixins: [glFeatureFlagMixin()], props: { @@ -135,7 +135,7 @@ export default { }; </script> <template> - <main-graph-wrapper :class="columnSpacingClass" data-testid="stage-column"> + <root-graph-layout :class="columnSpacingClass" data-testid="stage-column"> <template #stages> <div data-testid="stage-column-title" @@ -192,5 +192,5 @@ export default { </div> </div> </template> - </main-graph-wrapper> + </root-graph-layout> </template> diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/constants.js b/app/assets/javascripts/ci/pipeline_details/graph/constants.js index e650a48bc2a..e650a48bc2a 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/constants.js +++ b/app/assets/javascripts/ci/pipeline_details/graph/constants.js diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/graph_component_wrapper.vue b/app/assets/javascripts/ci/pipeline_details/graph/graph_component_wrapper.vue index b2cef7c37b9..bd7325f7925 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/graph_component_wrapper.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/graph_component_wrapper.vue @@ -4,10 +4,10 @@ import getPipelineDetails from 'shared_queries/pipelines/get_pipeline_details.qu import getUserCallouts from '~/graphql_shared/queries/get_user_callouts.query.graphql'; import { __, s__ } from '~/locale'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; -import { DEFAULT, DRAW_FAILURE, LOAD_FAILURE } from '../../constants'; -import DismissPipelineGraphCallout from '../../graphql/mutations/dismiss_pipeline_notification.graphql'; -import getPipelineQuery from '../../graphql/queries/get_pipeline_header_data.query.graphql'; -import { reportToSentry, reportMessageToSentry } from '../../utils'; +import { DEFAULT, DRAW_FAILURE, LOAD_FAILURE } from '~/ci/pipeline_details/constants'; +import getPipelineQuery from '~/ci/pipeline_details/header/graphql/queries/get_pipeline_header_data.query.graphql'; +import { reportToSentry, reportMessageToSentry } from '~/ci/utils'; +import DismissPipelineGraphCallout from './graphql/mutations/dismiss_pipeline_notification.graphql'; import { ACTION_FAILURE, IID_FAILURE, @@ -16,8 +16,8 @@ import { STAGE_VIEW, VIEW_TYPE_KEY, } from './constants'; -import PipelineGraph from './graph_component.vue'; -import GraphViewSelector from './graph_view_selector.vue'; +import PipelineGraph from './components/graph_component.vue'; +import GraphViewSelector from './components/graph_view_selector.vue'; import { calculatePipelineLayersInfo, getQueryHeaders, diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/mutations/dismiss_pipeline_notification.graphql b/app/assets/javascripts/ci/pipeline_details/graph/graphql/mutations/dismiss_pipeline_notification.graphql index e8af1db9592..e8af1db9592 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/mutations/dismiss_pipeline_notification.graphql +++ b/app/assets/javascripts/ci/pipeline_details/graph/graphql/mutations/dismiss_pipeline_notification.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/perf_utils.js b/app/assets/javascripts/ci/pipeline_details/graph/perf_utils.js index 3737a209f5c..511dcbe6889 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/perf_utils.js +++ b/app/assets/javascripts/ci/pipeline_details/graph/perf_utils.js @@ -8,7 +8,7 @@ import { } from '~/performance/constants'; import { performanceMarkAndMeasure } from '~/performance/utils'; -import { reportPerformance } from '../graph_shared/api'; +import { reportPerformance } from './api_utils'; export const beginPerfMeasure = () => { performanceMarkAndMeasure({ mark: PIPELINES_DETAIL_LINKS_MARK_CALCULATE_START }); diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph/utils.js b/app/assets/javascripts/ci/pipeline_details/graph/utils.js index c888c8a5537..9a8d6440d4d 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph/utils.js +++ b/app/assets/javascripts/ci/pipeline_details/graph/utils.js @@ -1,8 +1,9 @@ import { isEmpty } from 'lodash'; import { getIdFromGraphQLId, etagQueryHeaders } from '~/graphql_shared/utils'; -import { reportToSentry } from '../../utils'; -import { listByLayers } from '../parsing_utils'; -import { unwrapStagesWithNeedsAndLookup } from '../unwrapping_utils'; +import { reportToSentry } from '~/ci/utils'; + +import { listByLayers } from '~/ci/pipeline_details/utils/parsing_utils'; +import { unwrapStagesWithNeedsAndLookup } from '~/ci/pipeline_details/utils/unwrapping_utils'; import { beginPerfMeasure, finishPerfMeasureAndSend } from './perf_utils'; export { toggleQueryPollingByVisibility } from '~/graphql_shared/utils'; diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_header_data.query.graphql b/app/assets/javascripts/ci/pipeline_details/header/graphql/queries/get_pipeline_header_data.query.graphql index eb5643126a2..eb5643126a2 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_header_data.query.graphql +++ b/app/assets/javascripts/ci/pipeline_details/header/graphql/queries/get_pipeline_header_data.query.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_details_header.vue b/app/assets/javascripts/ci/pipeline_details/header/pipeline_details_header.vue index 98798d3b8ad..4a15f5b581a 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_details_header.vue +++ b/app/assets/javascripts/ci/pipeline_details/header/pipeline_details_header.vue @@ -30,8 +30,8 @@ import { import cancelPipelineMutation from '../graphql/mutations/cancel_pipeline.mutation.graphql'; import deletePipelineMutation from '../graphql/mutations/delete_pipeline.mutation.graphql'; import retryPipelineMutation from '../graphql/mutations/retry_pipeline.mutation.graphql'; -import getPipelineQuery from '../graphql/queries/get_pipeline_header_data.query.graphql'; -import { getQueryHeaders } from './graph/utils'; +import { getQueryHeaders } from '../graph/utils'; +import getPipelineQuery from './graphql/queries/get_pipeline_header_data.query.graphql'; const DELETE_MODAL_ID = 'pipeline-delete-modal'; const POLL_INTERVAL = 10000; diff --git a/app/assets/javascripts/ci/pipeline_details/components/jobs/failed_jobs_table.vue b/app/assets/javascripts/ci/pipeline_details/jobs/components/failed_jobs_table.vue index f84ae13180d..98431bd1fcc 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/jobs/failed_jobs_table.vue +++ b/app/assets/javascripts/ci/pipeline_details/jobs/components/failed_jobs_table.vue @@ -6,7 +6,7 @@ import { createAlert } from '~/alert'; import Tracking from '~/tracking'; import { redirectTo } from '~/lib/utils/url_utility'; // eslint-disable-line import/no-deprecated import CiBadgeLink from '~/vue_shared/components/ci_badge_link.vue'; -import RetryFailedJobMutation from '../../graphql/mutations/retry_failed_job.mutation.graphql'; +import RetryFailedJobMutation from '../graphql/mutations/retry_failed_job.mutation.graphql'; import { DEFAULT_FIELDS, TRACKING_CATEGORIES } from '../../constants'; export default { diff --git a/app/assets/javascripts/ci/pipeline_details/components/jobs/failed_jobs_app.vue b/app/assets/javascripts/ci/pipeline_details/jobs/failed_jobs_app.vue index c24862f828b..b946a40e590 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/jobs/failed_jobs_app.vue +++ b/app/assets/javascripts/ci/pipeline_details/jobs/failed_jobs_app.vue @@ -2,8 +2,8 @@ import { GlLoadingIcon } from '@gitlab/ui'; import { s__ } from '~/locale'; import { createAlert } from '~/alert'; -import GetFailedJobsQuery from '../../graphql/queries/get_failed_jobs.query.graphql'; -import FailedJobsTable from './failed_jobs_table.vue'; +import GetFailedJobsQuery from './graphql/queries/get_failed_jobs.query.graphql'; +import FailedJobsTable from './components/failed_jobs_table.vue'; export default { components: { diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/mutations/retry_failed_job.mutation.graphql b/app/assets/javascripts/ci/pipeline_details/jobs/graphql/mutations/retry_failed_job.mutation.graphql index 1955cc9b0ac..1955cc9b0ac 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/mutations/retry_failed_job.mutation.graphql +++ b/app/assets/javascripts/ci/pipeline_details/jobs/graphql/mutations/retry_failed_job.mutation.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_failed_jobs.query.graphql b/app/assets/javascripts/ci/pipeline_details/jobs/graphql/queries/get_failed_jobs.query.graphql index c1f994ece24..c1f994ece24 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_failed_jobs.query.graphql +++ b/app/assets/javascripts/ci/pipeline_details/jobs/graphql/queries/get_failed_jobs.query.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_jobs.query.graphql b/app/assets/javascripts/ci/pipeline_details/jobs/graphql/queries/get_pipeline_jobs.query.graphql index b0f875160d4..b0f875160d4 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_jobs.query.graphql +++ b/app/assets/javascripts/ci/pipeline_details/jobs/graphql/queries/get_pipeline_jobs.query.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/components/jobs/jobs_app.vue b/app/assets/javascripts/ci/pipeline_details/jobs/jobs_app.vue index 61748860983..7a09dd27ad8 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/jobs/jobs_app.vue +++ b/app/assets/javascripts/ci/pipeline_details/jobs/jobs_app.vue @@ -6,7 +6,7 @@ import { __ } from '~/locale'; import eventHub from '~/jobs/components/table/event_hub'; import JobsTable from '~/jobs/components/table/jobs_table.vue'; import { JOBS_TAB_FIELDS } from '~/jobs/components/table/constants'; -import getPipelineJobs from '../../graphql/queries/get_pipeline_jobs.query.graphql'; +import getPipelineJobs from './graphql/queries/get_pipeline_jobs.query.graphql'; export default { fields: JOBS_TAB_FIELDS, diff --git a/app/assets/javascripts/ci/pipeline_details/mixins/stage_column_mixin.js b/app/assets/javascripts/ci/pipeline_details/mixins/stage_column_mixin.js deleted file mode 100644 index 578ff498358..00000000000 --- a/app/assets/javascripts/ci/pipeline_details/mixins/stage_column_mixin.js +++ /dev/null @@ -1,14 +0,0 @@ -export default { - props: { - hasUpstream: { - type: Boolean, - required: false, - default: false, - }, - }, - methods: { - buildConnnectorClass(index) { - return index === 0 && (!this.isFirstColumn || this.hasUpstream) ? 'left-connector' : ''; - }, - }, -}; diff --git a/app/assets/javascripts/ci/pipeline_details/pipeline_details_header.js b/app/assets/javascripts/ci/pipeline_details/pipeline_details_header.js index c79aaef23e8..067ec3f305e 100644 --- a/app/assets/javascripts/ci/pipeline_details/pipeline_details_header.js +++ b/app/assets/javascripts/ci/pipeline_details/pipeline_details_header.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import { parseBoolean } from '~/lib/utils/common_utils'; -import PipelineDetailsHeader from './components/pipeline_details_header.vue'; +import PipelineDetailsHeader from './header/pipeline_details_header.vue'; Vue.use(VueApollo); diff --git a/app/assets/javascripts/ci/pipeline_details/pipeline_tabs.js b/app/assets/javascripts/ci/pipeline_details/pipeline_tabs.js index 8d4c9d1220a..0ca9a68e70d 100644 --- a/app/assets/javascripts/ci/pipeline_details/pipeline_tabs.js +++ b/app/assets/javascripts/ci/pipeline_details/pipeline_tabs.js @@ -4,10 +4,11 @@ import VueRouter from 'vue-router'; import Vuex from 'vuex'; import VueApollo from 'vue-apollo'; import { GlToast } from '@gitlab/ui'; -import PipelineTabs from 'ee_else_ce/ci/pipeline_details/components/pipeline_tabs.vue'; +import PipelineTabs from 'ee_else_ce/ci/pipeline_details/tabs/pipeline_tabs.vue'; +import { reportToSentry } from '~/ci/utils'; import { parseBoolean } from '~/lib/utils/common_utils'; import createTestReportsStore from './stores/test_reports'; -import { getPipelineDefaultTab, reportToSentry } from './utils'; +import { getPipelineDefaultTab } from './utils'; Vue.use(GlToast); Vue.use(VueApollo); diff --git a/app/assets/javascripts/ci/pipeline_details/pipelines_index.js b/app/assets/javascripts/ci/pipeline_details/pipelines_index.js index 20fd0915e28..86b565d7821 100644 --- a/app/assets/javascripts/ci/pipeline_details/pipelines_index.js +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_index.js @@ -10,7 +10,7 @@ import { import { doesHashExistInUrl } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import Translate from '~/vue_shared/translate'; -import Pipelines from './components/pipelines_list/pipelines.vue'; +import Pipelines from './pipelines_list/pipelines.vue'; import PipelinesStore from './stores/pipelines_store'; Vue.use(Translate); diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/nav_controls.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/nav_controls.vue index 235126fea0c..235126fea0c 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/nav_controls.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/nav_controls.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_labels.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_labels.vue index f8b4299485e..082ede60244 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_labels.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_labels.vue @@ -1,7 +1,7 @@ <script> import { GlLink, GlPopover, GlSprintf, GlTooltipDirective, GlBadge } from '@gitlab/ui'; import { helpPagePath } from '~/helpers/help_page_helper'; -import { SCHEDULE_ORIGIN } from '../../constants'; +import { SCHEDULE_ORIGIN } from '~/ci/pipeline_details/constants'; export default { components: { diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_multi_actions.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_multi_actions.vue index 747d94d92f2..747d94d92f2 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_multi_actions.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_multi_actions.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_operations.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_operations.vue index caeee7edefe..8f275bee91f 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_operations.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_operations.vue @@ -1,8 +1,8 @@ <script> import { GlButton, GlTooltipDirective, GlModalDirective } from '@gitlab/ui'; import Tracking from '~/tracking'; -import eventHub from '../../event_hub'; import { BUTTON_TOOLTIP_RETRY, BUTTON_TOOLTIP_CANCEL, TRACKING_CATEGORIES } from '../../constants'; +import eventHub from '../../event_hub'; import PipelineMultiActions from './pipeline_multi_actions.vue'; import PipelinesManualActions from './pipelines_manual_actions.vue'; diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_stop_modal.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_stop_modal.vue index 9f38be668f2..9f38be668f2 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_stop_modal.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_stop_modal.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_triggerer.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_triggerer.vue index 2a73795db0a..2a73795db0a 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_triggerer.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_triggerer.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_url.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_url.vue index ff1a01d5037..ff1a01d5037 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipeline_url.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipeline_url.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_artifacts.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_artifacts.vue index 4452db64b0a..4452db64b0a 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_artifacts.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_artifacts.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_filtered_search.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_filtered_search.vue index 7dc1e60610e..6aadb6b73c8 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_filtered_search.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_filtered_search.vue @@ -5,11 +5,11 @@ import { s__ } from '~/locale'; import Tracking from '~/tracking'; import { OPERATORS_IS } from '~/vue_shared/components/filtered_search_bar/constants'; import { TRACKING_CATEGORIES } from '../../constants'; -import PipelineBranchNameToken from './tokens/pipeline_branch_name_token.vue'; -import PipelineSourceToken from './tokens/pipeline_source_token.vue'; -import PipelineStatusToken from './tokens/pipeline_status_token.vue'; -import PipelineTagNameToken from './tokens/pipeline_tag_name_token.vue'; -import PipelineTriggerAuthorToken from './tokens/pipeline_trigger_author_token.vue'; +import PipelineBranchNameToken from '../tokens/pipeline_branch_name_token.vue'; +import PipelineSourceToken from '../tokens/pipeline_source_token.vue'; +import PipelineStatusToken from '../tokens/pipeline_status_token.vue'; +import PipelineTagNameToken from '../tokens/pipeline_tag_name_token.vue'; +import PipelineTriggerAuthorToken from '../tokens/pipeline_trigger_author_token.vue'; export default { userType: 'username', diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_manual_actions.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_manual_actions.vue index 262e82677a7..4dacd474bde 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_manual_actions.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_manual_actions.vue @@ -8,7 +8,7 @@ import Tracking from '~/tracking'; import GlCountdown from '~/vue_shared/components/gl_countdown.vue'; import eventHub from '../../event_hub'; import { TRACKING_CATEGORIES } from '../../constants'; -import getPipelineActionsQuery from '../../graphql/queries/get_pipeline_actions.query.graphql'; +import getPipelineActionsQuery from '../graphql/queries/get_pipeline_actions.query.graphql'; export default { name: 'PipelinesManualActions', diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_status_badge.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_status_badge.vue index 050dd486cbd..050dd486cbd 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_status_badge.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_status_badge.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_table.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_table.vue index 2dadc78b904..9784186ac67 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines_table.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_table.vue @@ -4,9 +4,9 @@ import { cleanLeadingSeparator } from '~/lib/utils/url_utility'; import { s__, __ } from '~/locale'; import Tracking from '~/tracking'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { keepLatestDownstreamPipelines } from '~/ci/pipeline_details/components/parsing_utils'; -import LegacyPipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; -import PipelineFailedJobsWidget from '~/ci/pipeline_details/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue'; +import { keepLatestDownstreamPipelines } from '~/ci/pipeline_details/utils/parsing_utils'; +import LegacyPipelineMiniGraph from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; +import PipelineFailedJobsWidget from '~/ci/pipeline_details/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue'; import eventHub from '../../event_hub'; import { TRACKING_CATEGORIES } from '../../constants'; import PipelineOperations from './pipeline_operations.vue'; diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/time_ago.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/time_ago.vue index 70343544638..70343544638 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/time_ago.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/time_ago.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state/ci_templates.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/ci_templates.vue index 439dc0eb253..439dc0eb253 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state/ci_templates.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/ci_templates.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state/ios_templates.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/ios_templates.vue index 1a2021df9c8..1a2021df9c8 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state/ios_templates.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/ios_templates.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/no_ci_empty_state.vue index 3bbdfc73e1b..6e7d6908cd9 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/no_ci_empty_state.vue @@ -2,8 +2,8 @@ import { GlEmptyState } from '@gitlab/ui'; import { s__ } from '~/locale'; import GitlabExperiment from '~/experimentation/components/gitlab_experiment.vue'; -import PipelinesCiTemplates from './empty_state/pipelines_ci_templates.vue'; -import IosTemplates from './empty_state/ios_templates.vue'; +import PipelinesCiTemplates from './pipelines_ci_templates.vue'; +import IosTemplates from './ios_templates.vue'; export default { i18n: { diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state/pipelines_ci_templates.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/pipelines_ci_templates.vue index a6297213402..a6297213402 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/empty_state/pipelines_ci_templates.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/empty_state/pipelines_ci_templates.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/failed_job_details.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/failed_job_details.vue index edf397f4797..82f1d57912a 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/failed_job_details.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/failed_job_details.vue @@ -5,8 +5,8 @@ import { __, s__, sprintf } from '~/locale'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import SafeHtml from '~/vue_shared/directives/safe_html'; -import { BRIDGE_KIND } from '~/ci/pipeline_details/components/graph/constants'; -import RetryMrFailedJobMutation from '../../../graphql/mutations/retry_mr_failed_job.mutation.graphql'; +import { BRIDGE_KIND } from '~/ci/pipeline_details/graph/constants'; +import RetryMrFailedJobMutation from '~/ci/merge_requests/graphql/mutations/retry_mr_failed_job.mutation.graphql'; export default { components: { diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/failed_jobs_list.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/failed_jobs_list.vue index 343036d2049..375f72bb72f 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/failed_jobs_list.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/failed_jobs_list.vue @@ -2,9 +2,9 @@ import { GlLoadingIcon } from '@gitlab/ui'; import { createAlert } from '~/alert'; import { __, s__, sprintf } from '~/locale'; -import { getQueryHeaders } from '~/ci/pipeline_details/components/graph/utils'; +import { getQueryHeaders } from '~/ci/pipeline_details/graph/utils'; import { graphqlEtagPipelinePath } from '~/ci/pipeline_details/utils'; -import getPipelineFailedJobs from '../../../graphql/queries/get_pipeline_failed_jobs.query.graphql'; +import getPipelineFailedJobs from '~/ci/pipeline_details/pipelines_list/graphql/queries/get_pipeline_failed_jobs.query.graphql'; import { sortJobsByStatus } from './utils'; import FailedJobDetails from './failed_job_details.vue'; diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue index c01037e9791..c01037e9791 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/utils.js b/app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/utils.js index 3f395fff7e0..3f395fff7e0 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/failure_widget/utils.js +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/failure_widget/utils.js diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_actions.query.graphql b/app/assets/javascripts/ci/pipeline_details/pipelines_list/graphql/queries/get_pipeline_actions.query.graphql index d1878c01e91..d1878c01e91 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_actions.query.graphql +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/graphql/queries/get_pipeline_actions.query.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_failed_jobs.query.graphql b/app/assets/javascripts/ci/pipeline_details/pipelines_list/graphql/queries/get_pipeline_failed_jobs.query.graphql index 6b553866f63..6b553866f63 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_failed_jobs.query.graphql +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/graphql/queries/get_pipeline_failed_jobs.query.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_failed_jobs_count.query.graphql b/app/assets/javascripts/ci/pipeline_details/pipelines_list/graphql/queries/get_pipeline_failed_jobs_count.query.graphql index b70e95deab6..b70e95deab6 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_failed_jobs_count.query.graphql +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/graphql/queries/get_pipeline_failed_jobs_count.query.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/pipelines.vue index 574d291a767..26db10505ef 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/pipelines.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/pipelines.vue @@ -17,19 +17,19 @@ import { FILTER_TAG_IDENTIFIER, PipelineKeyOptions, TRACKING_CATEGORIES, -} from '../../constants'; -import PipelinesMixin from '../../mixins/pipelines_mixin'; -import PipelinesService from '../../services/pipelines_service'; -import { validateParams } from '../../utils'; -import EmptyState from './empty_state.vue'; -import NavigationControls from './nav_controls.vue'; -import PipelinesFilteredSearch from './pipelines_filtered_search.vue'; -import PipelinesTableComponent from './pipelines_table.vue'; +} from '../constants'; +import PipelinesMixin from '../mixins/pipelines_mixin'; +import PipelinesService from '../services/pipelines_service'; +import { validateParams } from '../utils'; +import NoCiEmptyState from './empty_state/no_ci_empty_state.vue'; +import NavigationControls from './components/nav_controls.vue'; +import PipelinesFilteredSearch from './components/pipelines_filtered_search.vue'; +import PipelinesTableComponent from './components/pipelines_table.vue'; export default { PipelineKeyOptions, components: { - EmptyState, + NoCiEmptyState, GlCollapsibleListbox, GlEmptyState, GlIcon, @@ -409,7 +409,7 @@ export default { class="prepend-top-20" /> - <empty-state + <no-ci-empty-state v-else-if="stateToRender === $options.stateMap.emptyState" :empty-state-svg-path="emptyStateSvgPath" :can-set-ci="canCreatePipeline" diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/constants.js b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/constants.js index d8f15cfde91..d8f15cfde91 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/constants.js +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/constants.js diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_branch_name_token.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_branch_name_token.vue index 81f46d5f2f9..5c2c1aa03d5 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_branch_name_token.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_branch_name_token.vue @@ -3,7 +3,7 @@ import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from import { debounce } from 'lodash'; import Api from '~/api'; import { createAlert } from '~/alert'; -import { FETCH_BRANCH_ERROR_MESSAGE, FILTER_PIPELINES_SEARCH_DELAY } from '../../../constants'; +import { FETCH_BRANCH_ERROR_MESSAGE, FILTER_PIPELINES_SEARCH_DELAY } from '../../constants'; export default { components: { diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_source_token.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_source_token.vue index 28c2e28dd91..03d9e6478ac 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_source_token.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_source_token.vue @@ -1,6 +1,6 @@ <script> import { GlFilteredSearchToken, GlFilteredSearchSuggestion } from '@gitlab/ui'; -import { PIPELINE_SOURCES } from 'ee_else_ce/ci/pipeline_details/components/pipelines_list/tokens/constants'; +import { PIPELINE_SOURCES } from 'ee_else_ce/ci/pipeline_details/pipelines_list/tokens/constants'; export default { PIPELINE_SOURCES, diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_status_token.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_status_token.vue index 020a08b8cee..020a08b8cee 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_status_token.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_status_token.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_tag_name_token.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_tag_name_token.vue index b32f5de2d7e..ceb6176df3d 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_tag_name_token.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_tag_name_token.vue @@ -3,7 +3,7 @@ import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from import { debounce } from 'lodash'; import Api from '~/api'; import { createAlert } from '~/alert'; -import { FETCH_TAG_ERROR_MESSAGE, FILTER_PIPELINES_SEARCH_DELAY } from '../../../constants'; +import { FETCH_TAG_ERROR_MESSAGE, FILTER_PIPELINES_SEARCH_DELAY } from '../../constants'; export default { components: { diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_trigger_author_token.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_trigger_author_token.vue index a89354c671a..8c516cc8cb3 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipelines_list/tokens/pipeline_trigger_author_token.vue +++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/tokens/pipeline_trigger_author_token.vue @@ -13,7 +13,7 @@ import { ANY_TRIGGER_AUTHOR, FETCH_AUTHOR_ERROR_MESSAGE, FILTER_PIPELINES_SEARCH_DELAY, -} from '../../../constants'; +} from '../../constants'; export default { anyTriggerAuthor: ANY_TRIGGER_AUTHOR, diff --git a/app/assets/javascripts/ci/pipeline_details/routes.js b/app/assets/javascripts/ci/pipeline_details/routes.js index 0e1414ec390..84207f3ab0c 100644 --- a/app/assets/javascripts/ci/pipeline_details/routes.js +++ b/app/assets/javascripts/ci/pipeline_details/routes.js @@ -1,8 +1,8 @@ -import PipelineGraphWrapper from './components/graph/graph_component_wrapper.vue'; -import Dag from './components/dag/dag.vue'; -import FailedJobsApp from './components/jobs/failed_jobs_app.vue'; -import JobsApp from './components/jobs/jobs_app.vue'; -import TestReports from './components/test_reports/test_reports.vue'; +import PipelineGraphWrapper from './graph/graph_component_wrapper.vue'; +import Dag from './dag/dag.vue'; +import FailedJobsApp from './jobs/failed_jobs_app.vue'; +import JobsApp from './jobs/jobs_app.vue'; +import TestReports from './test_reports/test_reports.vue'; import { pipelineTabName, needsTabName, diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_tabs.vue b/app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue index 35dde6379dd..35dde6379dd 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_tabs.vue +++ b/app/assets/javascripts/ci/pipeline_details/tabs/pipeline_tabs.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/test_reports/empty_state.vue b/app/assets/javascripts/ci/pipeline_details/test_reports/empty_state.vue index 3e7827dc416..3e7827dc416 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/test_reports/empty_state.vue +++ b/app/assets/javascripts/ci/pipeline_details/test_reports/empty_state.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/test_reports/test_case_details.vue b/app/assets/javascripts/ci/pipeline_details/test_reports/test_case_details.vue index 3e6faa6b346..3e6faa6b346 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/test_reports/test_case_details.vue +++ b/app/assets/javascripts/ci/pipeline_details/test_reports/test_case_details.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/test_reports/test_reports.vue b/app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue index a7737d33285..a7737d33285 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/test_reports/test_reports.vue +++ b/app/assets/javascripts/ci/pipeline_details/test_reports/test_reports.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/test_reports/test_suite_table.vue b/app/assets/javascripts/ci/pipeline_details/test_reports/test_suite_table.vue index d8af926a796..d8af926a796 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/test_reports/test_suite_table.vue +++ b/app/assets/javascripts/ci/pipeline_details/test_reports/test_suite_table.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/test_reports/test_summary.vue b/app/assets/javascripts/ci/pipeline_details/test_reports/test_summary.vue index 6b723ad5481..f6090678ca4 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/test_reports/test_summary.vue +++ b/app/assets/javascripts/ci/pipeline_details/test_reports/test_summary.vue @@ -1,7 +1,7 @@ <script> import { GlButton, GlProgressBar } from '@gitlab/ui'; import { __ } from '~/locale'; -import { formattedTime } from '../../stores/test_reports/utils'; +import { formattedTime } from '../stores/test_reports/utils'; export default { name: 'TestSummary', diff --git a/app/assets/javascripts/ci/pipeline_details/components/test_reports/test_summary_table.vue b/app/assets/javascripts/ci/pipeline_details/test_reports/test_summary_table.vue index 9141947ea04..9141947ea04 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/test_reports/test_summary_table.vue +++ b/app/assets/javascripts/ci/pipeline_details/test_reports/test_summary_table.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/drawing_utils.js b/app/assets/javascripts/ci/pipeline_details/utils/drawing_utils.js index d6d9ea94c13..d6d9ea94c13 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/graph_shared/drawing_utils.js +++ b/app/assets/javascripts/ci/pipeline_details/utils/drawing_utils.js diff --git a/app/assets/javascripts/ci/pipeline_details/utils.js b/app/assets/javascripts/ci/pipeline_details/utils/index.js index f030ca943fd..9109342707e 100644 --- a/app/assets/javascripts/ci/pipeline_details/utils.js +++ b/app/assets/javascripts/ci/pipeline_details/utils/index.js @@ -1,4 +1,3 @@ -import * as Sentry from '@sentry/browser'; import { pickBy } from 'lodash'; import { parseUrlPathname } from '~/lib/utils/url_utility'; import { @@ -6,7 +5,7 @@ import { SUPPORTED_FILTER_PARAMETERS, validPipelineTabNames, pipelineTabName, -} from './constants'; +} from '../constants'; /* The following functions are the main engine in transforming the data as received from the endpoint into the format the d3 graph expects. @@ -128,22 +127,6 @@ export const generateJobNeedsDict = (jobs = {}) => { }, {}); }; -export const reportToSentry = (component, failureType) => { - Sentry.withScope((scope) => { - scope.setTag('component', component); - Sentry.captureException(failureType); - }); -}; - -export const reportMessageToSentry = (component, message, context) => { - Sentry.withScope((scope) => { - // eslint-disable-next-line @gitlab/require-i18n-strings - scope.setContext('Vue data', context); - scope.setTag('component', component); - Sentry.captureMessage(message); - }); -}; - export const getPipelineDefaultTab = (url) => { const strippedUrl = parseUrlPathname(url); const regexp = /\w*$/; diff --git a/app/assets/javascripts/ci/pipeline_details/components/parsing_utils.js b/app/assets/javascripts/ci/pipeline_details/utils/parsing_utils.js index e158f8809b5..cfe488b7d14 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/parsing_utils.js +++ b/app/assets/javascripts/ci/pipeline_details/utils/parsing_utils.js @@ -1,7 +1,7 @@ import { memoize } from 'lodash'; -import { createNodeDict } from '../utils'; import { EXPLICIT_NEEDS_PROPERTY, NEEDS_PROPERTY } from '../constants'; -import { createSankey } from './dag/drawing_utils'; +import { createSankey } from '../dag/drawing_utils'; +import { createNodeDict } from './index'; /* A peformant alternative to lodash's isEqual. Because findIndex always finds diff --git a/app/assets/javascripts/ci/pipeline_details/components/unwrapping_utils.js b/app/assets/javascripts/ci/pipeline_details/utils/unwrapping_utils.js index d42a11c3aba..7ac813bd527 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/unwrapping_utils.js +++ b/app/assets/javascripts/ci/pipeline_details/utils/unwrapping_utils.js @@ -1,4 +1,4 @@ -import { reportToSentry } from '../utils'; +import { reportToSentry } from '~/ci/utils'; import { EXPLICIT_NEEDS_PROPERTY, NEEDS_PROPERTY } from '../constants'; const unwrapGroups = (stages) => { diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/job_pill.vue b/app/assets/javascripts/ci/pipeline_editor/components/graph/job_pill.vue index 3f1d7255a2b..3f1d7255a2b 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/job_pill.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/graph/job_pill.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/pipeline_graph.vue b/app/assets/javascripts/ci/pipeline_editor/components/graph/pipeline_graph.vue index 64210576b29..eb906cfc486 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/pipeline_graph.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/graph/pipeline_graph.vue @@ -1,8 +1,8 @@ <script> import { GlAlert } from '@gitlab/ui'; import { __ } from '~/locale'; -import { DRAW_FAILURE, DEFAULT } from '../../constants'; -import LinksLayer from '../graph_shared/links_layer.vue'; +import { DRAW_FAILURE, DEFAULT } from '~/ci/pipeline_details/constants'; +import LinksLayer from '~/ci/common/private/job_links_layer.vue'; import JobPill from './job_pill.vue'; import StageName from './stage_name.vue'; diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/stage_name.vue b/app/assets/javascripts/ci/pipeline_editor/components/graph/stage_name.vue index 600832b7633..600832b7633 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_graph/stage_name.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/graph/stage_name.vue diff --git a/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue b/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue index d1c9439e4cd..f00098105d3 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue @@ -1,7 +1,7 @@ <script> import { __ } from '~/locale'; -import { keepLatestDownstreamPipelines } from '~/ci/pipeline_details/components/parsing_utils'; -import LegacyPipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; +import { keepLatestDownstreamPipelines } from '~/ci/pipeline_details/utils/parsing_utils'; +import LegacyPipelineMiniGraph from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; import getLinkedPipelinesQuery from '~/ci/pipeline_details/graphql/queries/get_linked_pipelines.query.graphql'; import { PIPELINE_FAILURE } from '../../constants'; diff --git a/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_status.vue b/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_status.vue index cdc53175729..5ce3c645145 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_status.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/header/pipeline_status.vue @@ -5,13 +5,10 @@ import { truncateSha } from '~/lib/utils/text_utility'; import { s__ } from '~/locale'; import getPipelineQuery from '~/ci/pipeline_editor/graphql/queries/pipeline.query.graphql'; import getPipelineEtag from '~/ci/pipeline_editor/graphql/queries/client/pipeline_etag.query.graphql'; -import { - getQueryHeaders, - toggleQueryPollingByVisibility, -} from '~/ci/pipeline_details/components/graph/utils'; +import { getQueryHeaders, toggleQueryPollingByVisibility } from '~/ci/pipeline_details/graph/utils'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; -import PipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/pipeline_mini_graph.vue'; +import PipelineMiniGraph from '~/ci/pipeline_mini_graph/pipeline_mini_graph.vue'; import PipelineEditorMiniGraph from './pipeline_editor_mini_graph.vue'; const POLL_INTERVAL = 10000; diff --git a/app/assets/javascripts/ci/pipeline_editor/components/pipeline_editor_tabs.vue b/app/assets/javascripts/ci/pipeline_editor/components/pipeline_editor_tabs.vue index 265ca742275..c7c15cdd76e 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/pipeline_editor_tabs.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/pipeline_editor_tabs.vue @@ -2,7 +2,7 @@ import { GlAlert, GlLoadingIcon, GlTabs } from '@gitlab/ui'; import CiEditorHeader from 'ee_else_ce/ci/pipeline_editor/components/editor/ci_editor_header.vue'; import { s__, __ } from '~/locale'; -import PipelineGraph from '~/ci/pipeline_details/components/pipeline_graph/pipeline_graph.vue'; +import PipelineGraph from '~/ci/pipeline_editor/components/graph/pipeline_graph.vue'; import { getParameterValues, setUrlParams, updateHistory } from '~/lib/utils/url_utility'; import { CREATE_TAB, diff --git a/app/assets/javascripts/ci/pipeline_editor/pipeline_editor_app.vue b/app/assets/javascripts/ci/pipeline_editor/pipeline_editor_app.vue index 0a1da8bcd11..49562b0be28 100644 --- a/app/assets/javascripts/ci/pipeline_editor/pipeline_editor_app.vue +++ b/app/assets/javascripts/ci/pipeline_editor/pipeline_editor_app.vue @@ -4,7 +4,7 @@ import { fetchPolicies } from '~/lib/graphql'; import { mergeUrlParams, queryToObject, redirectTo } from '~/lib/utils/url_utility'; // eslint-disable-line import/no-deprecated import { __, s__ } from '~/locale'; -import { unwrapStagesWithNeeds } from '~/ci/pipeline_details/components/unwrapping_utils'; +import { unwrapStagesWithNeeds } from '~/ci/pipeline_details/utils/unwrapping_utils'; import ConfirmUnsavedChangesDialog from './components/ui/confirm_unsaved_changes_dialog.vue'; import PipelineEditorEmptyState from './components/ui/pipeline_editor_empty_state.vue'; diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/accessors/linked_pipelines_accessors.js b/app/assets/javascripts/ci/pipeline_mini_graph/accessors/linked_pipelines_accessors.js index 1ca9e35c008..1ca9e35c008 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/accessors/linked_pipelines_accessors.js +++ b/app/assets/javascripts/ci/pipeline_mini_graph/accessors/linked_pipelines_accessors.js diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_stage.query.graphql b/app/assets/javascripts/ci/pipeline_mini_graph/graphql/queries/get_pipeline_stage.query.graphql index 64a5964dbeb..64a5964dbeb 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_stage.query.graphql +++ b/app/assets/javascripts/ci/pipeline_mini_graph/graphql/queries/get_pipeline_stage.query.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_stages.query.graphql b/app/assets/javascripts/ci/pipeline_mini_graph/graphql/queries/get_pipeline_stages.query.graphql index 69a29947b16..69a29947b16 100644 --- a/app/assets/javascripts/ci/pipeline_details/graphql/queries/get_pipeline_stages.query.graphql +++ b/app/assets/javascripts/ci/pipeline_mini_graph/graphql/queries/get_pipeline_stages.query.graphql diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/job_item.vue b/app/assets/javascripts/ci/pipeline_mini_graph/job_item.vue index 7f97097def6..7f97097def6 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/job_item.vue +++ b/app/assets/javascripts/ci/pipeline_mini_graph/job_item.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_job_item.vue b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_job_item.vue index d6e585d093b..27917d029b3 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_job_item.vue +++ b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_job_item.vue @@ -1,11 +1,11 @@ <script> import { GlTooltipDirective, GlLink } from '@gitlab/ui'; +import ActionComponent from '~/ci/common/private/job_action_component.vue'; +import JobNameComponent from '~/ci/common/private/job_name_component.vue'; +import { ICONS } from '~/ci/pipeline_details/constants'; import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin'; import { s__, sprintf } from '~/locale'; -import { reportToSentry } from '../../utils'; -import ActionComponent from '../jobs_shared/action_component.vue'; -import JobNameComponent from '../jobs_shared/job_name_component.vue'; -import { ICONS } from '../../constants'; +import { reportToSentry } from '../utils'; /** * Renders the badge for the pipeline graph and the job's dropdown. diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph.vue index 8c0e65d1d39..8c0e65d1d39 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue +++ b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_stage.vue b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_stage.vue index 048e42731c7..682393d8901 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_stage.vue +++ b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_stage.vue @@ -15,9 +15,9 @@ import { GlDropdown, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import { createAlert } from '~/alert'; +import eventHub from '~/ci/pipeline_details/event_hub'; import axios from '~/lib/utils/axios_utils'; import { __, s__, sprintf } from '~/locale'; -import eventHub from '../../event_hub'; import LegacyJobItem from './legacy_job_item.vue'; export default { diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/linked_pipelines_mini_list.vue b/app/assets/javascripts/ci/pipeline_mini_graph/linked_pipelines_mini_list.vue index 8567654a89e..8567654a89e 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/linked_pipelines_mini_list.vue +++ b/app/assets/javascripts/ci/pipeline_mini_graph/linked_pipelines_mini_list.vue diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_mini_graph.vue b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue index a4e6fec1625..358d3dc826e 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_mini_graph.vue +++ b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue @@ -2,14 +2,11 @@ import { GlLoadingIcon } from '@gitlab/ui'; import { createAlert } from '~/alert'; import { __ } from '~/locale'; -import { keepLatestDownstreamPipelines } from '~/ci/pipeline_details/components/parsing_utils'; -import { - getQueryHeaders, - toggleQueryPollingByVisibility, -} from '~/ci/pipeline_details/components/graph/utils'; +import { keepLatestDownstreamPipelines } from '~/ci/pipeline_details/utils/parsing_utils'; +import { getQueryHeaders, toggleQueryPollingByVisibility } from '~/ci/pipeline_details/graph/utils'; import { PIPELINE_MINI_GRAPH_POLL_INTERVAL } from '~/ci/pipeline_details/constants'; import getLinkedPipelinesQuery from '~/ci/pipeline_details/graphql/queries/get_linked_pipelines.query.graphql'; -import getPipelineStagesQuery from '~/ci/pipeline_details/graphql/queries/get_pipeline_stages.query.graphql'; +import getPipelineStagesQuery from './graphql/queries/get_pipeline_stages.query.graphql'; import LegacyPipelineMiniGraph from './legacy_pipeline_mini_graph.vue'; export default { diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stage.vue b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stage.vue index 44e2849cdac..747b5d33b1a 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stage.vue +++ b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stage.vue @@ -2,11 +2,8 @@ import { createAlert } from '~/alert'; import { __ } from '~/locale'; import { PIPELINE_MINI_GRAPH_POLL_INTERVAL } from '~/ci/pipeline_details/constants'; -import { - getQueryHeaders, - toggleQueryPollingByVisibility, -} from '~/ci/pipeline_details/components/graph/utils'; -import getPipelineStageQuery from '~/ci/pipeline_details/graphql/queries/get_pipeline_stage.query.graphql'; +import { getQueryHeaders, toggleQueryPollingByVisibility } from '~/ci/pipeline_details/graph/utils'; +import getPipelineStageQuery from './graphql/queries/get_pipeline_stage.query.graphql'; import JobItem from './job_item.vue'; export default { diff --git a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stages.vue b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue index f883833f7ea..f883833f7ea 100644 --- a/app/assets/javascripts/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stages.vue +++ b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue diff --git a/app/assets/javascripts/ci/utils.js b/app/assets/javascripts/ci/utils.js new file mode 100644 index 00000000000..eb9e9538b75 --- /dev/null +++ b/app/assets/javascripts/ci/utils.js @@ -0,0 +1,17 @@ +import * as Sentry from '@sentry/browser'; + +export const reportToSentry = (component, failureType) => { + Sentry.withScope((scope) => { + scope.setTag('component', component); + Sentry.captureException(failureType); + }); +}; + +export const reportMessageToSentry = (component, message, context) => { + Sentry.withScope((scope) => { + // eslint-disable-next-line @gitlab/require-i18n-strings + scope.setContext('Vue data', context); + scope.setTag('component', component); + Sentry.captureMessage(message); + }); +}; |