Replace UI usages of shared runner with instance runner
What does this MR do and why?
This change aims to reduce the inconsistency between the terminology of "shared" and "instance" runner in our UI.
It is meant as a first step to making the UI more consistent and it is not extensive, as there may be usages of "shared runner" left. It is also not meant to cover internal changes in the code.
Changelog: changed
Related issue: gitlab-runner#37340
MR acceptance checklist
Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.
Screenshots or screen recordings
Group settings
http://gdk.test:3000/groups/flightjs/-/settings/ci_cd | |
---|---|
http://gdk.test:3000/groups/flightjs/-/usage_quotas#pipelines-quota-tab | |
---|---|
Use this diff to force the chart to show
diff --git a/ee/app/assets/javascripts/usage_quotas/pipelines/components/minutes_usage_per_month.vue b/ee/app/assets/javascripts/usage_quotas/pipelines/components/minutes_usage_per_month.vue
index 90c70a3e9549..85bfab7a861f 100644
--- a/ee/app/assets/javascripts/usage_quotas/pipelines/components/minutes_usage_per_month.vue
+++ b/ee/app/assets/javascripts/usage_quotas/pipelines/components/minutes_usage_per_month.vue
@@ -67,7 +67,7 @@ export default {
<help-popover :options="$options.SHARED_RUNNER_POPOVER_OPTIONS" />
</div>
</template>
- <no-minutes-alert v-if="!hasSharedRunnersMinutes" />
+ <no-minutes-alert v-if="false && !hasSharedRunnersMinutes" />
<shared-runner-usage-month-chart
v-else
:selected-year="selectedYear"
Project settings
http://gdk.test:3000/flightjs/Flight/-/settings/ci_cd | |||
---|---|---|---|
You can use this diff to see other variants
diff --git a/app/assets/javascripts/projects/settings/components/shared_runners_toggle.vue b/app/assets/javascripts/projects/settings/components/shared_runners_toggle.vue
index db3d4a22c33a..7185fbba5d80 100644
--- a/app/assets/javascripts/projects/settings/components/shared_runners_toggle.vue
+++ b/app/assets/javascripts/projects/settings/components/shared_runners_toggle.vue
@@ -60,6 +60,7 @@ export default {
},
computed: {
ccRequiredError() {
+ return true;
return this.errorMessage === CC_VALIDATION_REQUIRED_ERROR && !this.ccAlertDismissed;
},
genericError() {
diff --git a/app/views/projects/runners/_shared_runners.html.haml b/app/views/projects/runners/_shared_runners.html.haml
index fd77ac0505cf..948244d35b5b 100644
--- a/app/views/projects/runners/_shared_runners.html.haml
+++ b/app/views/projects/runners/_shared_runners.html.haml
@@ -2,7 +2,7 @@
#toggle-shared-runners-form{ data: toggle_shared_runners_settings_data(@project) }
-- if @shared_runners_count == 0
+- if @shared_runners_count == 0 || true
= _('This GitLab instance does not provide any instance runners yet. Administrators can register instance runners in the admin area.')
- else
%div{ data: { testid: 'available-shared-runners' } }
Admin
http://gdk.test:3000/admin/application_settings/ci_cd | http://gdk.test:3000/admin |
---|---|
http://gdk.test:3000/admin/users/reported_user_5/edit | |
---|---|
http://gdk.test:3000/admin/groups/flightjs/edit |
---|
Verification Callout
Apply this diff to show the callout locally
diff --git a/ee/app/views/layouts/header/_verification_reminder.html.haml b/ee/app/views/layouts/header/_verification_reminder.html.haml
index c68024ad6e7f..d0c08b7eb7dc 100644
--- a/ee/app/views/layouts/header/_verification_reminder.html.haml
+++ b/ee/app/views/layouts/header/_verification_reminder.html.haml
@@ -1,2 +1,2 @@
-- if show_verification_reminder?
+- if show_verification_reminder? || true
.js-verification-reminder
Job page
Job page header |
---|
Force the callout
diff --git a/app/assets/javascripts/ci/job_details/job_app.vue b/app/assets/javascripts/ci/job_details/job_app.vue
index c2394aa4facc..2e0e4531abfb 100644
--- a/app/assets/javascripts/ci/job_details/job_app.vue
+++ b/app/assets/javascripts/ci/job_details/job_app.vue
@@ -253,9 +253,9 @@ export default {
/>
<shared-runner
- v-if="shouldRenderSharedRunnerLimitWarning"
- :quota-used="job.runners.quota.used"
- :quota-limit="job.runners.quota.limit"
+ v-if="shouldRenderSharedRunnerLimitWarning || true"
+ :quota-used="100"
+ :quota-limit="100"
:subscriptions-more-minutes-url="subscriptionsMoreMinutesUrl"
/>
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
Edited by Miguel Rincon