diff options
Diffstat (limited to 'app/assets/javascripts/ci/runner')
5 files changed, 50 insertions, 4 deletions
diff --git a/app/assets/javascripts/ci/runner/components/runner_jobs_table.vue b/app/assets/javascripts/ci/runner/components/runner_jobs_table.vue index efa7909c913..e359344ab77 100644 --- a/app/assets/javascripts/ci/runner/components/runner_jobs_table.vue +++ b/app/assets/javascripts/ci/runner/components/runner_jobs_table.vue @@ -3,7 +3,7 @@ import { GlTableLite } from '@gitlab/ui'; import { __, s__ } from '~/locale'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { durationTimeFormatted } from '~/lib/utils/datetime_utility'; -import CiBadge from '~/vue_shared/components/ci_badge_link.vue'; +import CiBadgeLink from '~/vue_shared/components/ci_badge_link.vue'; import RunnerTags from '~/ci/runner/components/runner_tags.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import { tableField } from '../utils'; @@ -11,7 +11,7 @@ import LinkCell from './cells/link_cell.vue'; export default { components: { - CiBadge, + CiBadgeLink, GlTableLite, LinkCell, RunnerTags, @@ -80,7 +80,7 @@ export default { fixed > <template #cell(status)="{ item = {} }"> - <ci-badge v-if="item.detailedStatus" :status="item.detailedStatus" /> + <ci-badge-link v-if="item.detailedStatus" :status="item.detailedStatus" /> </template> <template #cell(job)="{ item = {} }"> diff --git a/app/assets/javascripts/ci/runner/components/stat/runner_stats.vue b/app/assets/javascripts/ci/runner/components/stat/runner_stats.vue index 2e50dc13d2d..e0a6f4b1e67 100644 --- a/app/assets/javascripts/ci/runner/components/stat/runner_stats.vue +++ b/app/assets/javascripts/ci/runner/components/stat/runner_stats.vue @@ -23,6 +23,8 @@ export default { RunnerSingleStat, RunnerUpgradeStatusStats: () => import('ee_component/ci/runner/components/stat/runner_upgrade_status_stats.vue'), + RunnerPerformanceStat: () => + import('ee_component/ci/runner/components/stat/runner_performance_stat.vue'), }, props: { scope: { @@ -95,6 +97,8 @@ export default { :scope="scope" :variables="variables" /> + + <runner-performance-stat class="gl-px-5" /> </div> </runner-count> </template> diff --git a/app/assets/javascripts/ci/runner/graphql/show/runner_jobs.query.graphql b/app/assets/javascripts/ci/runner/graphql/show/runner_jobs.query.graphql index edfc22f644b..075dbb06190 100644 --- a/app/assets/javascripts/ci/runner/graphql/show/runner_jobs.query.graphql +++ b/app/assets/javascripts/ci/runner/graphql/show/runner_jobs.query.graphql @@ -8,7 +8,7 @@ query getRunnerJobs($id: CiRunnerID!, $first: Int, $last: Int, $before: String, nodes { id detailedStatus { - # fields for `<ci-badge>` + # fields for `<ci-badge-link>` id detailsPath group diff --git a/app/assets/javascripts/ci/runner/project_runners/index.js b/app/assets/javascripts/ci/runner/project_runners/index.js new file mode 100644 index 00000000000..3be2b4a7422 --- /dev/null +++ b/app/assets/javascripts/ci/runner/project_runners/index.js @@ -0,0 +1,23 @@ +import Vue from 'vue'; +import ProjectRunnersApp from './project_runners_app.vue'; + +export const initProjectRunners = (selector = '#js-project-runners') => { + const el = document.querySelector(selector); + + if (!el) { + return null; + } + + const { projectFullPath } = el.dataset; + + return new Vue({ + el, + render(h) { + return h(ProjectRunnersApp, { + props: { + projectFullPath, + }, + }); + }, + }); +}; diff --git a/app/assets/javascripts/ci/runner/project_runners/project_runners_app.vue b/app/assets/javascripts/ci/runner/project_runners/project_runners_app.vue new file mode 100644 index 00000000000..c7bf5e521a1 --- /dev/null +++ b/app/assets/javascripts/ci/runner/project_runners/project_runners_app.vue @@ -0,0 +1,19 @@ +<script> +export default { + props: { + projectFullPath: { + required: true, + type: String, + }, + }, +}; +</script> +<template> + <div> + <!-- + Under development + Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/33803 + Feature rollout: https://gitlab.com/gitlab-org/gitlab/-/issues/386573 + --> + </div> +</template> |