From 76a093b7c3c6685d6b0077c4673ead743bf7e949 Mon Sep 17 00:00:00 2001
From: Julia Miocene <jmiocene@gitlab.com>
Date: Wed, 2 Apr 2025 17:49:41 +0200
Subject: [PATCH 1/5] Create runner form: Add new FF for new form

Adds a new FF :new_runner_create_form for the form changes.

Changelog: added
---
 .../runner/admin_new_runner/admin_new_runner_app.vue   | 10 +++++++++-
 .../javascripts/ci/runner/admin_new_runner/index.js    |  3 +++
 .../ci/runner/components/runner_create_form_new.vue    |  8 ++++++++
 config/feature_flags/wip/new_runner_create_form.yml    |  9 +++++++++
 lib/gitlab/gon_helper.rb                               |  1 +
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/ci/runner/components/runner_create_form_new.vue
 create mode 100644 config/feature_flags/wip/new_runner_create_form.yml

diff --git a/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue b/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue
index d8f9e808640dbc..473f499dd911d0 100644
--- a/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue
+++ b/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue
@@ -5,6 +5,7 @@ import { s__ } from '~/locale';
 
 import PageHeading from '~/vue_shared/components/page_heading.vue';
 import RunnerCreateForm from '~/ci/runner/components/runner_create_form.vue';
+import RunnerCreateFormNew from '~/ci/runner/components/runner_create_form_new.vue';
 import { INSTANCE_TYPE } from '../constants';
 import { saveAlertToLocalStorage } from '../local_storage_alert/save_alert_to_local_storage';
 
@@ -12,8 +13,14 @@ export default {
   name: 'AdminNewRunnerApp',
   components: {
     RunnerCreateForm,
+    RunnerCreateFormNew,
     PageHeading,
   },
+  inject: {
+    ifNewFormFeatureFlagEnabled: {
+      default: false,
+    },
+  },
   methods: {
     onSaved(runner) {
       saveAlertToLocalStorage({
@@ -31,7 +38,8 @@ export default {
 </script>
 
 <template>
-  <div>
+  <runner-create-form-new v-if="ifNewFormFeatureFlagEnabled" />
+  <div v-else>
     <page-heading :heading="s__('Runners|New instance runner')">
       <template #description>
         {{
diff --git a/app/assets/javascripts/ci/runner/admin_new_runner/index.js b/app/assets/javascripts/ci/runner/admin_new_runner/index.js
index 434c1197f71989..658850c4a71803 100644
--- a/app/assets/javascripts/ci/runner/admin_new_runner/index.js
+++ b/app/assets/javascripts/ci/runner/admin_new_runner/index.js
@@ -19,6 +19,9 @@ export const initAdminNewRunner = (selector = '#js-admin-new-runner') => {
   return new Vue({
     el,
     apolloProvider,
+    provide: {
+      ifNewFormFeatureFlagEnabled: gon.features.newRunnerCreateForm,
+    },
     render(h) {
       return h(AdminNewRunnerApp);
     },
diff --git a/app/assets/javascripts/ci/runner/components/runner_create_form_new.vue b/app/assets/javascripts/ci/runner/components/runner_create_form_new.vue
new file mode 100644
index 00000000000000..092be2b023fc91
--- /dev/null
+++ b/app/assets/javascripts/ci/runner/components/runner_create_form_new.vue
@@ -0,0 +1,8 @@
+
+<template>
+  <h1>{{ s__('Runners|New instance runner') }}</h1>
+</template>
diff --git a/config/feature_flags/wip/new_runner_create_form.yml b/config/feature_flags/wip/new_runner_create_form.yml
new file mode 100644
index 00000000000000..63853565aa5da5
--- /dev/null
+++ b/config/feature_flags/wip/new_runner_create_form.yml
@@ -0,0 +1,9 @@
+---
+name: new_runner_create_form
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/396544
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/533827
+milestone: '17.11'
+group: group::runner
+type: wip
+default_enabled: false
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index 0dacd8ad920938..2f0c17270a2ffb 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -94,6 +94,7 @@ def add_gon_variables
       push_frontend_feature_flag(:new_project_creation_form, current_user, type: :wip)
       push_frontend_feature_flag(:work_items_client_side_boards, current_user)
       push_frontend_feature_flag(:glql_work_items, current_user, type: :wip)
+      push_frontend_feature_flag(:new_runner_create_form, current_user, type: :wip)
     end
 
     # Exposes the state of a feature flag to the frontend code.
-- 
GitLab


From d6cd9ad39cbd2da5370c86984854265c846b24fd Mon Sep 17 00:00:00 2001
From: Julia Miocene <jmiocene@gitlab.com>
Date: Wed, 2 Apr 2025 18:35:59 +0200
Subject: [PATCH 2/5] Apply 1 suggestion(s) to 1 file(s)

Co-authored-by: DANGER_GITLAB_API_TOKEN <project_278964_bot_b66b169fda2a3223a645094be35d5515@noreply.gitlab.com>
---
 config/feature_flags/wip/new_runner_create_form.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/feature_flags/wip/new_runner_create_form.yml b/config/feature_flags/wip/new_runner_create_form.yml
index 63853565aa5da5..e3adb52f994b48 100644
--- a/config/feature_flags/wip/new_runner_create_form.yml
+++ b/config/feature_flags/wip/new_runner_create_form.yml
@@ -1,7 +1,7 @@
 ---
 name: new_runner_create_form
 feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/396544
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186711
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/533827
 milestone: '17.11'
 group: group::runner
-- 
GitLab


From c1fbfad89282ba06a2634d9ed2a4fc2c84b04d7f Mon Sep 17 00:00:00 2001
From: Julia Miocene <jmiocene@gitlab.com>
Date: Thu, 3 Apr 2025 13:06:49 +0200
Subject: [PATCH 3/5] Apply suggestions

---
 .../admin_new_runner/admin_new_runner_app.vue       | 13 +++++--------
 .../javascripts/ci/runner/admin_new_runner/index.js |  3 ---
 ...create_form_new.vue => runner_create_wizard.vue} |  2 +-
 ...eate_form.yml => runner_create_wizard_admin.yml} |  2 +-
 lib/gitlab/gon_helper.rb                            |  2 +-
 spec/controllers/admin/runners_controller_spec.rb   |  4 ++++
 6 files changed, 12 insertions(+), 14 deletions(-)
 rename app/assets/javascripts/ci/runner/components/{runner_create_form_new.vue => runner_create_wizard.vue} (78%)
 rename config/feature_flags/wip/{new_runner_create_form.yml => runner_create_wizard_admin.yml} (90%)

diff --git a/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue b/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue
index 473f499dd911d0..e90d6048df0466 100644
--- a/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue
+++ b/app/assets/javascripts/ci/runner/admin_new_runner/admin_new_runner_app.vue
@@ -3,9 +3,10 @@ import { createAlert, VARIANT_SUCCESS } from '~/alert';
 import { visitUrl } from '~/lib/utils/url_utility';
 import { s__ } from '~/locale';
 
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import PageHeading from '~/vue_shared/components/page_heading.vue';
 import RunnerCreateForm from '~/ci/runner/components/runner_create_form.vue';
-import RunnerCreateFormNew from '~/ci/runner/components/runner_create_form_new.vue';
+import RunnerCreateWizard from '~/ci/runner/components/runner_create_wizard.vue';
 import { INSTANCE_TYPE } from '../constants';
 import { saveAlertToLocalStorage } from '../local_storage_alert/save_alert_to_local_storage';
 
@@ -13,14 +14,10 @@ export default {
   name: 'AdminNewRunnerApp',
   components: {
     RunnerCreateForm,
-    RunnerCreateFormNew,
+    RunnerCreateWizard,
     PageHeading,
   },
-  inject: {
-    ifNewFormFeatureFlagEnabled: {
-      default: false,
-    },
-  },
+  mixins: [glFeatureFlagsMixin()],
   methods: {
     onSaved(runner) {
       saveAlertToLocalStorage({
@@ -38,7 +35,7 @@ export default {
 </script>
 
 <template>
-  <runner-create-form-new v-if="ifNewFormFeatureFlagEnabled" />
+  <runner-create-wizard v-if="glFeatures.runnerCreateWizardAdmin" />
   <div v-else>
     <page-heading :heading="s__('Runners|New instance runner')">
       <template #description>
diff --git a/app/assets/javascripts/ci/runner/admin_new_runner/index.js b/app/assets/javascripts/ci/runner/admin_new_runner/index.js
index 658850c4a71803..434c1197f71989 100644
--- a/app/assets/javascripts/ci/runner/admin_new_runner/index.js
+++ b/app/assets/javascripts/ci/runner/admin_new_runner/index.js
@@ -19,9 +19,6 @@ export const initAdminNewRunner = (selector = '#js-admin-new-runner') => {
   return new Vue({
     el,
     apolloProvider,
-    provide: {
-      ifNewFormFeatureFlagEnabled: gon.features.newRunnerCreateForm,
-    },
     render(h) {
       return h(AdminNewRunnerApp);
     },
diff --git a/app/assets/javascripts/ci/runner/components/runner_create_form_new.vue b/app/assets/javascripts/ci/runner/components/runner_create_wizard.vue
similarity index 78%
rename from app/assets/javascripts/ci/runner/components/runner_create_form_new.vue
rename to app/assets/javascripts/ci/runner/components/runner_create_wizard.vue
index 092be2b023fc91..b563ca52bbd1e8 100644
--- a/app/assets/javascripts/ci/runner/components/runner_create_form_new.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_create_wizard.vue
@@ -1,6 +1,6 @@
 
 <template>
diff --git a/config/feature_flags/wip/new_runner_create_form.yml b/config/feature_flags/wip/runner_create_wizard_admin.yml
similarity index 90%
rename from config/feature_flags/wip/new_runner_create_form.yml
rename to config/feature_flags/wip/runner_create_wizard_admin.yml
index e3adb52f994b48..141c54a2d7f9dd 100644
--- a/config/feature_flags/wip/new_runner_create_form.yml
+++ b/config/feature_flags/wip/runner_create_wizard_admin.yml
@@ -1,5 +1,5 @@
 ---
-name: new_runner_create_form
+name: runner_create_wizard_admin
 feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/396544
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186711
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/533827
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index 2f0c17270a2ffb..f50735cc98ea89 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -94,7 +94,7 @@ def add_gon_variables
       push_frontend_feature_flag(:new_project_creation_form, current_user, type: :wip)
       push_frontend_feature_flag(:work_items_client_side_boards, current_user)
       push_frontend_feature_flag(:glql_work_items, current_user, type: :wip)
-      push_frontend_feature_flag(:new_runner_create_form, current_user, type: :wip)
+      push_frontend_feature_flag(:runner_create_wizard_admin, current_user, type: :wip)
     end
 
     # Exposes the state of a feature flag to the frontend code.
diff --git a/spec/controllers/admin/runners_controller_spec.rb b/spec/controllers/admin/runners_controller_spec.rb
index 652ce5267af882..44465d9bcc08f3 100644
--- a/spec/controllers/admin/runners_controller_spec.rb
+++ b/spec/controllers/admin/runners_controller_spec.rb
@@ -35,6 +35,10 @@
   end
 
   describe '#new' do
+    before do
+      stub_feature_flags(runner_create_wizard_admin: false)
+    end
+
     it 'renders a :new template' do
       get :new
 
-- 
GitLab


From 4fa464936f570c5b8a90fbbac27b74581f5773a6 Mon Sep 17 00:00:00 2001
From: Julia Miocene <jmiocene@gitlab.com>
Date: Thu, 3 Apr 2025 14:29:19 +0200
Subject: [PATCH 4/5] Add FF to a runner_controller

---
 app/controllers/admin/runners_controller.rb | 3 +++
 lib/gitlab/gon_helper.rb                    | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb
index 449f5749b9e482..63a01f5ed5586e 100644
--- a/app/controllers/admin/runners_controller.rb
+++ b/app/controllers/admin/runners_controller.rb
@@ -6,6 +6,9 @@ class Admin::RunnersController < Admin::ApplicationController
   TAGS_LIMIT = 20
 
   before_action :runner, only: [:show, :edit, :register, :update]
+  before_action only: [:new] do
+    push_frontend_feature_flag(:runner_create_wizard_admin, current_user)
+  end
 
   feature_category :runner
   urgency :low
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index f50735cc98ea89..0dacd8ad920938 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -94,7 +94,6 @@ def add_gon_variables
       push_frontend_feature_flag(:new_project_creation_form, current_user, type: :wip)
       push_frontend_feature_flag(:work_items_client_side_boards, current_user)
       push_frontend_feature_flag(:glql_work_items, current_user, type: :wip)
-      push_frontend_feature_flag(:runner_create_wizard_admin, current_user, type: :wip)
     end
 
     # Exposes the state of a feature flag to the frontend code.
-- 
GitLab


From 1a62121b380f5ac163dd651bc3c3b8916663da20 Mon Sep 17 00:00:00 2001
From: Julia Miocene <jmiocene@gitlab.com>
Date: Mon, 7 Apr 2025 18:16:42 +0200
Subject: [PATCH 5/5] Fix specs

---
 .../features/admin/runners/admin_creates_instance_runner_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/features/admin/runners/admin_creates_instance_runner_spec.rb b/spec/features/admin/runners/admin_creates_instance_runner_spec.rb
index ecb8d177b68297..0a7cb29bd6e882 100644
--- a/spec/features/admin/runners/admin_creates_instance_runner_spec.rb
+++ b/spec/features/admin/runners/admin_creates_instance_runner_spec.rb
@@ -6,6 +6,7 @@
   let_it_be(:admin) { create(:admin) }
 
   before do
+    stub_feature_flags(runner_create_wizard_admin: false)
     sign_in(admin)
     enable_admin_mode!(admin)
   end
-- 
GitLab