From 3d1dcae5c2c96ab70964f5560eceaf9b4fdc5c04 Mon Sep 17 00:00:00 2001
From: Alex Pennells <apennells@gitlab.com>
Date: Tue, 5 Nov 2024 10:46:11 -0500
Subject: [PATCH] Remove `vsa_standalone_settings_page` feature flag

Removes the feature flag and code related to the old modal UX.

Changelog: removed
EE: true
---
 .../javascripts/analytics/shared/utils.js     |   2 -
 .../group/value_stream_analytics/index.md     |  10 -
 .../components/value_stream_empty_state.vue   |  23 +-
 .../components/value_stream_form.vue          |  51 --
 .../components/value_stream_form_content.vue  | 460 -------------
 .../components/value_stream_select.vue        |  47 +-
 .../store/actions/value_streams.js            |  10 +-
 .../cycle_analytics/vsa_settings/index.js     |   5 +-
 .../value_streams_controller.rb               |   4 -
 .../ee/projects/cycle_analytics_controller.rb |   6 -
 .../value_streams_controller.rb               |   4 -
 .../analytics/cycle_analytics_controller.rb   |   2 -
 .../beta/vsa_standalone_settings_page.yml     |   9 -
 .../multiple_value_streams_spec.rb            |  32 -
 .../value_stream_empty_state_spec.js          |  29 -
 .../value_stream_form_content_spec.js         | 644 ------------------
 .../components/value_stream_form_spec.js      | 101 ---
 .../components/value_stream_select_spec.js    |  85 +--
 .../store/actions/value_streams_spec.js       |  21 +-
 qa/qa/ee/page/value_stream_analytics.rb       |  11 +-
 20 files changed, 17 insertions(+), 1539 deletions(-)
 delete mode 100644 ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_form.vue
 delete mode 100644 ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_form_content.vue
 delete mode 100644 ee/config/feature_flags/beta/vsa_standalone_settings_page.yml
 delete mode 100644 ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_content_spec.js
 delete mode 100644 ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_spec.js

diff --git a/app/assets/javascripts/analytics/shared/utils.js b/app/assets/javascripts/analytics/shared/utils.js
index 98ad20b9b14bae..57556daf6f2e11 100644
--- a/app/assets/javascripts/analytics/shared/utils.js
+++ b/app/assets/javascripts/analytics/shared/utils.js
@@ -148,6 +148,4 @@ export const extractVSAFeaturesFromGON = () => ({
   cycleAnalyticsForGroups: Boolean(gon?.licensed_features?.cycleAnalyticsForGroups),
   cycleAnalyticsForProjects: Boolean(gon?.licensed_features?.cycleAnalyticsForProjects),
   groupLevelAnalyticsDashboard: Boolean(gon?.licensed_features?.groupLevelAnalyticsDashboard),
-  // feature flags
-  vsaStandaloneSettingsPage: Boolean(gon?.features?.vsaStandaloneSettingsPage),
 });
diff --git a/doc/user/group/value_stream_analytics/index.md b/doc/user/group/value_stream_analytics/index.md
index 626b153ed20757..5ddd8cd4ba190a 100644
--- a/doc/user/group/value_stream_analytics/index.md
+++ b/doc/user/group/value_stream_analytics/index.md
@@ -449,11 +449,6 @@ DETAILS:
 **Tier:** Premium, Ultimate
 **Offering:** GitLab.com, Self-managed, GitLab Dedicated
 
-> - **New value stream** feature [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/381002) from a dialog to a page in GitLab 16.11 [with a flag](../../../administration/feature_flags.md) named `vsa_standalone_settings_page`. Disabled by default.
-
-FLAG:
-On self-managed GitLab, by default the **New value stream** feature is not available. To make it available, an administrator can enable the [feature flag](../../../administration/feature_flags.md) named `vsa_standalone_settings_page`. On GitLab.com and GitLab Dedicated, this feature is not available. This feature is not ready for production use.
-
 ### Create a value stream with GitLab default stages
 
 When you create a value stream, you can use GitLab default stages and hide or re-order them. You can also
@@ -520,11 +515,6 @@ DETAILS:
 **Tier:** Premium, Ultimate
 **Offering:** GitLab.com, Self-managed, GitLab Dedicated
 
-> - **Edit value stream** feature [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/381002) from a dialog to a page in GitLab 16.11 [with a flag](../../../administration/feature_flags.md) named `vsa_standalone_settings_page`. Disabled by default.
-
-FLAG:
-On self-managed GitLab, by default the **Edit value stream** feature is not available. To make it available, an administrator can enable the [feature flag](../../../administration/feature_flags.md) named `vsa_standalone_settings_page`. On GitLab.com and GitLab Dedicated, this feature is not available. This feature is not ready for production use.
-
 After you create a value stream, you can customize it to suit your purposes. To edit a value stream:
 
 1. On the left sidebar, select **Search or go to** and find your project or group.
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_empty_state.vue b/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_empty_state.vue
index cb12a88fead031..550966f513aecc 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_empty_state.vue
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_empty_state.vue
@@ -1,8 +1,7 @@
 <script>
-import { GlButton, GlEmptyState, GlLoadingIcon, GlModalDirective } from '@gitlab/ui';
+import { GlButton, GlEmptyState, GlLoadingIcon } from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import Tracking from '~/tracking';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
   EMPTY_STATE_TITLE,
   EMPTY_STATE_DESCRIPTION,
@@ -11,7 +10,6 @@ import {
   EMPTY_STATE_FILTER_ERROR_TITLE,
   EMPTY_STATE_FILTER_ERROR_DESCRIPTION,
 } from '../constants';
-import ValueStreamForm from './value_stream_form.vue';
 
 export default {
   name: 'ValueStreamEmptyState',
@@ -19,12 +17,8 @@ export default {
     GlButton,
     GlEmptyState,
     GlLoadingIcon,
-    ValueStreamForm,
   },
-  directives: {
-    GlModalDirective,
-  },
-  mixins: [Tracking.mixin(), glFeatureFlagsMixin()],
+  mixins: [Tracking.mixin()],
   inject: ['newValueStreamPath'],
   props: {
     isLoading: {
@@ -58,15 +52,6 @@ export default {
         ? this.$options.i18n.EMPTY_STATE_FILTER_ERROR_DESCRIPTION
         : this.$options.i18n.EMPTY_STATE_DESCRIPTION;
     },
-    isVSAStandaloneSettingsPageEnabled() {
-      return this.glFeatures?.vsaStandaloneSettingsPage;
-    },
-    createValueStreamHref() {
-      return this.isVSAStandaloneSettingsPageEnabled ? this.newValueStreamPath : null;
-    },
-    valueStreamFormModalId() {
-      return !this.isVSAStandaloneSettingsPageEnabled && 'value-stream-form-modal';
-    },
   },
   i18n: {
     EMPTY_STATE_TITLE,
@@ -95,8 +80,7 @@ export default {
     >
       <template v-if="!hasDateRangeError && canEdit" #actions>
         <gl-button
-          v-gl-modal-directive="valueStreamFormModalId"
-          :href="createValueStreamHref"
+          :href="newValueStreamPath"
           class="gl-mx-2 gl-mb-3"
           variant="confirm"
           data-testid="create-value-stream-button"
@@ -109,6 +93,5 @@ export default {
         </gl-button>
       </template>
     </gl-empty-state>
-    <value-stream-form />
   </div>
 </template>
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_form.vue b/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_form.vue
deleted file mode 100644
index b8e640b95a033f..00000000000000
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_form.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<script>
-// eslint-disable-next-line no-restricted-imports
-import { mapState } from 'vuex';
-import ValueStreamFormContent from './value_stream_form_content.vue';
-import { generateInitialStageData } from './create_value_stream_form/utils';
-
-export default {
-  name: 'ValueStreamForm',
-  components: {
-    ValueStreamFormContent,
-  },
-  props: {
-    isEditing: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-  },
-  computed: {
-    ...mapState({
-      selectedValueStream: 'selectedValueStream',
-      selectedValueStreamStages: 'stages',
-      initialFormErrors: 'createValueStreamErrors',
-      defaultStageConfig: 'defaultStageConfig',
-    }),
-    initialData() {
-      return this.isEditing
-        ? {
-            ...this.selectedValueStream,
-            stages: generateInitialStageData(
-              this.defaultStageConfig,
-              this.selectedValueStreamStages,
-            ),
-          }
-        : {
-            name: '',
-            stages: [],
-          };
-    },
-  },
-};
-</script>
-<template>
-  <value-stream-form-content
-    :initial-data="initialData"
-    :initial-form-errors="initialFormErrors"
-    :default-stage-config="defaultStageConfig"
-    :is-editing="isEditing"
-    @hidden="$emit('hidden')"
-  />
-</template>
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_form_content.vue b/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_form_content.vue
deleted file mode 100644
index 2a46a0bd82f251..00000000000000
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_form_content.vue
+++ /dev/null
@@ -1,460 +0,0 @@
-<script>
-import {
-  GlAlert,
-  GlButton,
-  GlForm,
-  GlFormInput,
-  GlFormGroup,
-  GlFormRadioGroup,
-  GlLoadingIcon,
-  GlModal,
-} from '@gitlab/ui';
-import { cloneDeep, uniqueId } from 'lodash';
-// eslint-disable-next-line no-restricted-imports
-import { mapState, mapActions } from 'vuex';
-import { filterStagesByHiddenStatus } from '~/analytics/cycle_analytics/utils';
-import { swapArrayItems } from '~/lib/utils/array_utility';
-import { sprintf } from '~/locale';
-import Tracking from '~/tracking';
-import {
-  STAGE_SORT_DIRECTION,
-  i18n,
-  defaultCustomStageFields,
-  PRESET_OPTIONS,
-  PRESET_OPTIONS_DEFAULT,
-} from './create_value_stream_form/constants';
-import CustomStageFields from './create_value_stream_form/custom_stage_fields.vue';
-import DefaultStageFields from './create_value_stream_form/default_stage_fields.vue';
-import {
-  validateValueStreamName,
-  cleanStageName,
-  validateStage,
-  formatStageDataForSubmission,
-  hasDirtyStage,
-} from './create_value_stream_form/utils';
-
-const initializeStageErrors = (defaultStageConfig, selectedPreset = PRESET_OPTIONS_DEFAULT) =>
-  selectedPreset === PRESET_OPTIONS_DEFAULT ? defaultStageConfig.map(() => ({})) : [{}];
-
-const initializeStages = (defaultStageConfig, selectedPreset = PRESET_OPTIONS_DEFAULT) => {
-  const stages =
-    selectedPreset === PRESET_OPTIONS_DEFAULT
-      ? defaultStageConfig
-      : [{ ...defaultCustomStageFields }];
-
-  return stages.map((stage) => ({ ...stage, transitionKey: uniqueId('stage-') }));
-};
-
-const initializeEditingStages = (stages = []) =>
-  filterStagesByHiddenStatus(cloneDeep(stages), false).map((stage) => ({
-    ...stage,
-    transitionKey: uniqueId(`stage-${stage.name}-`),
-  }));
-
-export default {
-  name: 'ValueStreamFormContent',
-  components: {
-    GlAlert,
-    GlButton,
-    GlForm,
-    GlFormInput,
-    GlFormGroup,
-    GlFormRadioGroup,
-    GlLoadingIcon,
-    GlModal,
-    DefaultStageFields,
-    CustomStageFields,
-  },
-  mixins: [Tracking.mixin()],
-  props: {
-    initialData: {
-      type: Object,
-      required: false,
-      default: () => ({}),
-    },
-    initialPreset: {
-      type: String,
-      required: false,
-      default: PRESET_OPTIONS_DEFAULT,
-    },
-    initialFormErrors: {
-      type: Object,
-      required: false,
-      default: () => ({}),
-    },
-    defaultStageConfig: {
-      type: Array,
-      required: true,
-    },
-    isEditing: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-  },
-  data() {
-    const {
-      defaultStageConfig = [],
-      initialData: { name: initialName, stages: initialStages = [] },
-      initialFormErrors,
-      initialPreset,
-    } = this;
-    const { name: nameErrors = [], stages: stageErrors = [{}] } = initialFormErrors;
-    const additionalFields = {
-      stages: this.isEditing
-        ? initializeEditingStages(initialStages)
-        : initializeStages(defaultStageConfig, initialPreset),
-      stageErrors:
-        cloneDeep(stageErrors) || initializeStageErrors(defaultStageConfig, initialPreset),
-    };
-
-    return {
-      hiddenStages: filterStagesByHiddenStatus(initialStages),
-      selectedPreset: initialPreset,
-      presetOptions: PRESET_OPTIONS,
-      name: initialName,
-      nameErrors,
-      stageErrors,
-      showSubmitError: false,
-      ...additionalFields,
-    };
-  },
-  computed: {
-    ...mapState({
-      isCreating: 'isCreatingValueStream',
-      isFetchingGroupLabels: 'isFetchingGroupLabels',
-      formEvents: 'formEvents',
-      defaultGroupLabels: 'defaultGroupLabels',
-    }),
-    isValueStreamNameValid() {
-      return !this.nameErrors?.length;
-    },
-    invalidNameFeedback() {
-      return this.nameErrors?.length ? this.nameErrors.join('\n\n') : null;
-    },
-    hasInitialFormErrors() {
-      const { initialFormErrors } = this;
-      return Boolean(Object.keys(initialFormErrors).length);
-    },
-    isLoading() {
-      return this.isCreating;
-    },
-    formTitle() {
-      return this.isEditing ? this.$options.i18n.EDIT_FORM_TITLE : this.$options.i18n.FORM_TITLE;
-    },
-    primaryProps() {
-      return {
-        text: this.isEditing ? this.$options.i18n.EDIT_FORM_ACTION : this.$options.i18n.FORM_TITLE,
-        attributes: { variant: 'confirm', loading: this.isLoading },
-      };
-    },
-    secondaryProps() {
-      return {
-        text: this.$options.i18n.BTN_ADD_ANOTHER_STAGE,
-        attributes: { category: 'secondary', variant: 'confirm', class: '' },
-      };
-    },
-    cancelProps() {
-      return { text: this.$options.i18n.BTN_CANCEL };
-    },
-    hasFormErrors() {
-      return Boolean(
-        this.nameErrors.length || this.stageErrors.some((obj) => Object.keys(obj).length),
-      );
-    },
-    isDirtyEditing() {
-      return (
-        this.isEditing &&
-        (this.hasDirtyName(this.name, this.initialData.name) ||
-          hasDirtyStage(this.stages, this.initialData.stages))
-      );
-    },
-    canRestore() {
-      return this.hiddenStages.length || this.isDirtyEditing;
-    },
-    currentValueStreamStageNames() {
-      return this.stages.map(({ name }) => cleanStageName(name));
-    },
-  },
-  created() {
-    if (!this.defaultGroupLabels) {
-      this.fetchGroupLabels();
-    }
-  },
-  methods: {
-    ...mapActions(['createValueStream', 'updateValueStream', 'fetchGroupLabels']),
-    onSubmit() {
-      this.showSubmitError = false;
-      this.validate();
-      if (this.hasFormErrors) return false;
-
-      let req = this.createValueStream;
-      let params = {
-        name: this.name,
-        stages: formatStageDataForSubmission(this.stages, this.isEditing),
-      };
-      if (this.isEditing) {
-        req = this.updateValueStream;
-        params = {
-          ...params,
-          id: this.initialData.id,
-        };
-      }
-
-      return req(params).then(() => {
-        if (!this.hasInitialFormErrors) {
-          const msg = this.isEditing
-            ? this.$options.i18n.FORM_EDITED
-            : this.$options.i18n.FORM_CREATED;
-          this.$toast.show(sprintf(msg, { name: this.name }));
-          this.name = '';
-          this.nameErrors = [];
-          this.stages = initializeStages(this.defaultStageConfig, this.selectedPreset);
-          this.stageErrors = initializeStageErrors(this.defaultStageConfig, this.selectedPreset);
-          this.track('submit_form', {
-            label: this.isEditing ? 'edit_value_stream' : 'create_value_stream',
-          });
-        } else {
-          const { name: nameErrors = [], stages: stageErrors = [{}] } = this.initialFormErrors;
-
-          this.nameErrors = nameErrors;
-          this.stageErrors = stageErrors;
-          this.showSubmitError = true;
-        }
-      });
-    },
-    stageGroupLabel(index) {
-      return sprintf(this.$options.i18n.STAGE_INDEX, { index: index + 1 });
-    },
-    recoverStageTitle(name) {
-      return sprintf(this.$options.i18n.HIDDEN_DEFAULT_STAGE, { name });
-    },
-    hasDirtyName(current, original) {
-      return current.trim().toLowerCase() !== original.trim().toLowerCase();
-    },
-    validateStages() {
-      return this.stages.map((stage) => validateStage(stage, this.currentValueStreamStageNames));
-    },
-    validate() {
-      const { name } = this;
-      this.nameErrors = validateValueStreamName({ name });
-      this.stageErrors = this.validateStages();
-    },
-    moveItem(arr, index, direction) {
-      return direction === STAGE_SORT_DIRECTION.UP
-        ? swapArrayItems(arr, index - 1, index)
-        : swapArrayItems(arr, index, index + 1);
-    },
-    handleMove({ index, direction }) {
-      const newStages = this.moveItem(this.stages, index, direction);
-      const newErrors = this.moveItem(this.stageErrors, index, direction);
-      this.stages = cloneDeep(newStages);
-      this.stageErrors = cloneDeep(newErrors);
-    },
-    validateStageFields(index) {
-      const copy = [...this.stageErrors];
-      copy[index] = validateStage(this.stages[index]);
-      this.stageErrors = copy;
-    },
-    fieldErrors(index) {
-      return this.stageErrors && this.stageErrors[index] ? this.stageErrors[index] : {};
-    },
-    onHide(index) {
-      const target = this.stages[index];
-      this.stages = [...this.stages.filter((_, i) => i !== index)];
-      this.hiddenStages = [...this.hiddenStages, target];
-    },
-    onRemove(index) {
-      const newErrors = this.stageErrors.filter((_, idx) => idx !== index);
-      const newStages = this.stages.filter((_, idx) => idx !== index);
-
-      this.stages = [...newStages];
-      this.stageErrors = [...newErrors];
-    },
-    onRestore(hiddenStageIndex) {
-      const target = this.hiddenStages[hiddenStageIndex];
-      this.hiddenStages = [...this.hiddenStages.filter((_, i) => i !== hiddenStageIndex)];
-      this.stages = [
-        ...this.stages,
-        { ...target, transitionKey: uniqueId(`stage-${target.name}-`) },
-      ];
-    },
-    lastStage() {
-      const stages = this.$refs.formStages;
-      return stages[stages.length - 1];
-    },
-    async scrollToLastStage() {
-      await this.$nextTick();
-      // Scroll to the new stage we have added
-      this.lastStage().focus();
-      this.lastStage().scrollIntoView({ behavior: 'smooth' });
-    },
-    addNewStage() {
-      // validate previous stages only and add a new stage
-      this.validate();
-      this.stages = [
-        ...this.stages,
-        { ...defaultCustomStageFields, transitionKey: uniqueId('stage-') },
-      ];
-      this.stageErrors = [...this.stageErrors, {}];
-    },
-    onAddStage() {
-      this.addNewStage();
-      this.scrollToLastStage();
-    },
-    onFieldInput(activeStageIndex, { field, value }) {
-      const updatedStage = { ...this.stages[activeStageIndex], [field]: value };
-      const copy = [...this.stages];
-      copy[activeStageIndex] = updatedStage;
-      this.stages = copy;
-    },
-    resetAllFieldsToDefault() {
-      this.stages = initializeStages(this.defaultStageConfig, this.selectedPreset);
-      this.stageErrors = initializeStageErrors(this.defaultStageConfig, this.selectedPreset);
-    },
-    handleResetDefaults() {
-      if (this.isEditing) {
-        const {
-          initialData: { name: initialName, stages: initialStages },
-        } = this;
-        this.name = initialName;
-        this.nameErrors = [];
-        this.stages = initializeStages(initialStages);
-        this.stageErrors = [{}];
-      } else {
-        this.resetAllFieldsToDefault();
-      }
-    },
-    onSelectPreset() {
-      if (this.selectedPreset === PRESET_OPTIONS_DEFAULT) {
-        this.handleResetDefaults();
-      } else {
-        this.resetAllFieldsToDefault();
-      }
-    },
-    restoreActionTestId(index) {
-      return `stage-action-restore-${index}`;
-    },
-  },
-  i18n,
-};
-</script>
-<template>
-  <gl-modal
-    data-testid="value-stream-form-modal"
-    modal-id="value-stream-form-modal"
-    dialog-class="!gl-items-start gl-py-7"
-    scrollable
-    :title="formTitle"
-    :action-primary="primaryProps"
-    :action-secondary="secondaryProps"
-    :action-cancel="cancelProps"
-    :hide-footer="isFetchingGroupLabels"
-    @hidden.prevent="$emit('hidden')"
-    @secondary.prevent="onAddStage"
-    @primary.prevent="onSubmit"
-  >
-    <gl-loading-icon v-if="isFetchingGroupLabels" size="lg" color="dark" class="gl-my-12" />
-    <gl-form v-else>
-      <gl-alert
-        v-if="showSubmitError"
-        variant="danger"
-        class="gl-mb-3"
-        @dismiss="showSubmitError = false"
-      >
-        {{ $options.i18n.SUBMIT_FAILED }}
-      </gl-alert>
-      <gl-form-group
-        data-testid="create-value-stream-name"
-        label-for="create-value-stream-name"
-        :label="$options.i18n.FORM_FIELD_NAME_LABEL"
-        :invalid-feedback="invalidNameFeedback"
-        :state="isValueStreamNameValid"
-      >
-        <div class="gl-flex gl-justify-between">
-          <gl-form-input
-            id="create-value-stream-name"
-            v-model.trim="name"
-            name="create-value-stream-name"
-            data-testid="create-value-stream-name-input"
-            :placeholder="$options.i18n.FORM_FIELD_NAME_PLACEHOLDER"
-            :state="isValueStreamNameValid"
-            required
-          />
-          <transition name="fade">
-            <gl-button
-              v-if="canRestore"
-              data-testid="vsa-reset-button"
-              class="gl-ml-3"
-              variant="link"
-              @click="handleResetDefaults"
-              >{{ $options.i18n.RESTORE_DEFAULTS }}</gl-button
-            >
-          </transition>
-        </div>
-      </gl-form-group>
-      <gl-form-radio-group
-        v-if="!isEditing"
-        v-model="selectedPreset"
-        class="gl-mb-4"
-        data-testid="vsa-preset-selector"
-        :options="presetOptions"
-        name="preset"
-        @input="onSelectPreset"
-      />
-      <div data-testid="extended-form-fields">
-        <transition-group name="stage-list" tag="div">
-          <div
-            v-for="(stage, activeStageIndex) in stages"
-            ref="formStages"
-            :key="stage.id || stage.transitionKey"
-          >
-            <hr class="gl-my-3" />
-            <custom-stage-fields
-              v-if="stage.custom"
-              :stage-label="stageGroupLabel(activeStageIndex)"
-              :stage="stage"
-              :stage-events="formEvents"
-              :index="activeStageIndex"
-              :total-stages="stages.length"
-              :errors="fieldErrors(activeStageIndex)"
-              @move="handleMove"
-              @remove="onRemove"
-              @input="onFieldInput(activeStageIndex, $event)"
-            />
-            <default-stage-fields
-              v-else
-              :stage-label="stageGroupLabel(activeStageIndex)"
-              :stage="stage"
-              :stage-events="formEvents"
-              :index="activeStageIndex"
-              :total-stages="stages.length"
-              :errors="fieldErrors(activeStageIndex)"
-              @move="handleMove"
-              @hide="onHide"
-              @input="validateStageFields(activeStageIndex)"
-            />
-          </div>
-        </transition-group>
-        <div v-if="hiddenStages.length">
-          <hr />
-          <gl-form-group
-            v-for="(stage, hiddenStageIndex) in hiddenStages"
-            :key="stage.id"
-            data-testid="vsa-hidden-stage"
-          >
-            <span class="gl-m-0 gl-mr-3 gl-align-middle gl-font-bold">{{
-              recoverStageTitle(stage.name)
-            }}</span>
-            <gl-button
-              variant="link"
-              :data-testid="restoreActionTestId(hiddenStageIndex)"
-              @click="onRestore(hiddenStageIndex)"
-              >{{ $options.i18n.RESTORE_HIDDEN_STAGE }}</gl-button
-            >
-          </gl-form-group>
-        </div>
-      </div>
-    </gl-form>
-  </gl-modal>
-</template>
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_select.vue b/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_select.vue
index 7cad17a44a15d4..621093c851cd4c 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_select.vue
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_select.vue
@@ -12,8 +12,6 @@ import { mapState, mapActions } from 'vuex';
 import { slugifyWithUnderscore } from '~/lib/utils/text_utility';
 import { sprintf, __, s__ } from '~/locale';
 import Tracking from '~/tracking';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import ValueStreamForm from './value_stream_form.vue';
 
 const i18n = {
   DELETE_NAME: s__('DeleteValueStream|Delete %{name}'),
@@ -34,12 +32,11 @@ export default {
     GlCollapsibleListbox,
     GlModal,
     GlSprintf,
-    ValueStreamForm,
   },
   directives: {
     GlModalDirective,
   },
-  mixins: [Tracking.mixin(), glFeatureFlagsMixin()],
+  mixins: [Tracking.mixin()],
   inject: ['newValueStreamPath', 'editValueStreamPath'],
   props: {
     canEdit: {
@@ -48,12 +45,6 @@ export default {
       default: false,
     },
   },
-  data() {
-    return {
-      showForm: false,
-      isEditing: false,
-    };
-  },
   computed: {
     ...mapState({
       isDeleting: 'isDeletingValueStream',
@@ -83,20 +74,11 @@ export default {
         name: this.selectedValueStreamName,
       });
     },
-    isVSAStandaloneSettingsPageEnabled() {
-      return this.glFeatures?.vsaStandaloneSettingsPage;
-    },
-    createValueStreamButtonHref() {
-      return this.isVSAStandaloneSettingsPageEnabled ? this.newValueStreamPath : null;
-    },
     editValueStreamButtonHref() {
-      if (!this.isVSAStandaloneSettingsPageEnabled || !this.selectedValueStreamId) return null;
+      if (!this.selectedValueStreamId) return null;
 
       return this.editValueStreamPath.replace(':id', this.selectedValueStreamId);
     },
-    valueStreamFormModalId() {
-      return !this.isVSAStandaloneSettingsPageEnabled && 'value-stream-form-modal';
-    },
   },
   methods: {
     ...mapActions(['setSelectedValueStream', 'deleteValueStream']),
@@ -120,20 +102,6 @@ export default {
         }
       });
     },
-    onCreate() {
-      if (!this.isVSAStandaloneSettingsPageEnabled) {
-        this.showForm = true;
-      }
-
-      this.isEditing = false;
-    },
-    onEdit() {
-      if (!this.isVSAStandaloneSettingsPageEnabled) {
-        this.showForm = true;
-      }
-
-      this.isEditing = true;
-    },
     slugify(valueStreamTitle) {
       return slugifyWithUnderscore(valueStreamTitle);
     },
@@ -155,14 +123,12 @@ export default {
       <template v-if="canEdit" #footer>
         <div class="gl-border-t gl-p-2">
           <gl-button
-            v-gl-modal-directive="valueStreamFormModalId"
             class="gl-w-full !gl-justify-start"
             category="tertiary"
-            :href="createValueStreamButtonHref"
+            :href="newValueStreamPath"
             data-testid="create-value-stream-option"
             data-track-action="click_dropdown"
             data-track-label="create_value_stream_form_open"
-            @click="onCreate"
             >{{ $options.i18n.CREATE_VALUE_STREAM }}</gl-button
           >
           <gl-button
@@ -184,25 +150,20 @@ export default {
     </gl-collapsible-listbox>
     <gl-button
       v-if="isCustomValueStream && canEdit"
-      v-gl-modal-directive="valueStreamFormModalId"
       :href="editValueStreamButtonHref"
       data-testid="edit-value-stream"
       data-track-action="click_button"
       data-track-label="edit_value_stream_form_open"
-      @click="onEdit"
       >{{ $options.i18n.EDIT_VALUE_STREAM }}</gl-button
     >
     <gl-button
       v-if="!hasValueStreams"
-      v-gl-modal-directive="valueStreamFormModalId"
-      :href="createValueStreamButtonHref"
+      :href="newValueStreamPath"
       data-testid="create-value-stream-button"
       data-track-action="click_button"
       data-track-label="create_value_stream_form_open"
-      @click="onCreate"
       >{{ $options.i18n.CREATE_VALUE_STREAM }}</gl-button
     >
-    <value-stream-form v-if="showForm" :is-editing="isEditing" @hidden="showForm = false" />
     <gl-modal
       data-testid="delete-value-stream-modal"
       modal-id="delete-value-stream-modal"
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions/value_streams.js b/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions/value_streams.js
index a31424fa65dd40..efb2a79f53b6a7 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions/value_streams.js
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/store/actions/value_streams.js
@@ -24,20 +24,12 @@ export const createValueStream = ({ commit, dispatch, getters }, data) => {
     });
 };
 
-export const updateValueStream = (
-  { state, commit, dispatch, getters },
-  { id: valueStreamId, ...data },
-) => {
+export const updateValueStream = ({ commit, getters }, { id: valueStreamId, ...data }) => {
   const { namespacePath } = getters;
   commit(types.REQUEST_UPDATE_VALUE_STREAM);
 
   return apiUpdateValueStream({ namespacePath, valueStreamId, data })
     .then(({ data: newValueStream }) => {
-      if (!state.features.vsaStandaloneSettingsPage) {
-        commit(types.RECEIVE_UPDATE_VALUE_STREAM_SUCCESS, newValueStream);
-        return dispatch('fetchCycleAnalyticsData');
-      }
-
       return commit(types.RECEIVE_UPDATE_VALUE_STREAM_SUCCESS, newValueStream);
     })
     .catch(({ response } = {}) => {
diff --git a/ee/app/assets/javascripts/analytics/cycle_analytics/vsa_settings/index.js b/ee/app/assets/javascripts/analytics/cycle_analytics/vsa_settings/index.js
index bb97eecb56c612..c666407959e500 100644
--- a/ee/app/assets/javascripts/analytics/cycle_analytics/vsa_settings/index.js
+++ b/ee/app/assets/javascripts/analytics/cycle_analytics/vsa_settings/index.js
@@ -6,10 +6,7 @@ import VSASettingsApp from './components/app.vue';
 
 export default () => {
   const el = document.getElementById('js-vsa-settings-app');
-
-  if (!el || !gon.features?.vsaStandaloneSettingsPage) {
-    return false;
-  }
+  if (!el) return false;
 
   const { isEditPage, vsaPath } = el.dataset;
   const initialData = buildCycleAnalyticsInitialData(el.dataset);
diff --git a/ee/app/controllers/ee/projects/analytics/cycle_analytics/value_streams_controller.rb b/ee/app/controllers/ee/projects/analytics/cycle_analytics/value_streams_controller.rb
index 4ecb36fe81dff5..30ca56b19784d1 100644
--- a/ee/app/controllers/ee/projects/analytics/cycle_analytics/value_streams_controller.rb
+++ b/ee/app/controllers/ee/projects/analytics/cycle_analytics/value_streams_controller.rb
@@ -11,10 +11,6 @@ module ValueStreamsController
           prepended do
             before_action :load_stage_events, only: %i[new edit]
             before_action :value_stream, only: %i[edit]
-
-            before_action do
-              push_frontend_feature_flag(:vsa_standalone_settings_page, project.namespace)
-            end
           end
         end
       end
diff --git a/ee/app/controllers/ee/projects/cycle_analytics_controller.rb b/ee/app/controllers/ee/projects/cycle_analytics_controller.rb
index 46e7774a8adf20..bc32cb7ed4626c 100644
--- a/ee/app/controllers/ee/projects/cycle_analytics_controller.rb
+++ b/ee/app/controllers/ee/projects/cycle_analytics_controller.rb
@@ -7,12 +7,6 @@ module CycleAnalyticsController
       extend ActiveSupport::Concern
       extend ::Gitlab::Utils::Override
 
-      prepended do
-        before_action do
-          push_frontend_feature_flag(:vsa_standalone_settings_page, project.namespace)
-        end
-      end
-
       override :value_stream
       def value_stream
         return super unless params[:value_stream_id]
diff --git a/ee/app/controllers/groups/analytics/cycle_analytics/value_streams_controller.rb b/ee/app/controllers/groups/analytics/cycle_analytics/value_streams_controller.rb
index fe753e02754c95..ede1712e351d7c 100644
--- a/ee/app/controllers/groups/analytics/cycle_analytics/value_streams_controller.rb
+++ b/ee/app/controllers/groups/analytics/cycle_analytics/value_streams_controller.rb
@@ -8,10 +8,6 @@ class Groups::Analytics::CycleAnalytics::ValueStreamsController < Groups::Analyt
   before_action :load_stage_events, only: %i[new edit]
   before_action :value_stream, only: %i[show edit update]
 
-  before_action do
-    push_frontend_feature_flag(:vsa_standalone_settings_page, namespace)
-  end
-
   layout 'group'
 
   private
diff --git a/ee/app/controllers/groups/analytics/cycle_analytics_controller.rb b/ee/app/controllers/groups/analytics/cycle_analytics_controller.rb
index 88ef162aeae6c3..0114e1f40f0d54 100644
--- a/ee/app/controllers/groups/analytics/cycle_analytics_controller.rb
+++ b/ee/app/controllers/groups/analytics/cycle_analytics_controller.rb
@@ -14,8 +14,6 @@ class Groups::Analytics::CycleAnalyticsController < Groups::Analytics::Applicati
   before_action do
     push_licensed_feature(:group_level_analytics_dashboard) if group_feature?(:group_level_analytics_dashboard)
 
-    push_frontend_feature_flag(:vsa_standalone_settings_page, @group)
-
     render_403 unless can?(current_user, :read_cycle_analytics, @group)
   end
 
diff --git a/ee/config/feature_flags/beta/vsa_standalone_settings_page.yml b/ee/config/feature_flags/beta/vsa_standalone_settings_page.yml
deleted file mode 100644
index be66ade1006aff..00000000000000
--- a/ee/config/feature_flags/beta/vsa_standalone_settings_page.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: vsa_standalone_settings_page
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381002
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/146538
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/444848
-milestone: '16.10'
-group: group::optimize
-type: beta
-default_enabled: false
diff --git a/ee/spec/features/groups/analytics/cycle_analytics/multiple_value_streams_spec.rb b/ee/spec/features/groups/analytics/cycle_analytics/multiple_value_streams_spec.rb
index dca207b1e78e93..8deb142bd5fdfa 100644
--- a/ee/spec/features/groups/analytics/cycle_analytics/multiple_value_streams_spec.rb
+++ b/ee/spec/features/groups/analytics/cycle_analytics/multiple_value_streams_spec.rb
@@ -339,29 +339,6 @@ def expect_successful_update(value_stream_name, expect_redirect)
         it_behaves_like 'empty state'
       end
     end
-
-    context 'when `vsa_standalone_settings_page` feature flag is disabled' do
-      before do
-        stub_feature_flags(vsa_standalone_settings_page: false)
-        select_group(group, empty_state_selector)
-      end
-
-      it_behaves_like 'empty state'
-
-      context '`New value stream...` button is selected' do
-        before do
-          find_by_testid('create-value-stream-button').click
-        end
-
-        it 'opens the create value stream form modal' do
-          expect(page).to have_selector('[data-testid="value-stream-form-modal"]')
-        end
-
-        it 'does not navigate to the new value stream settings page' do
-          expect(page).to have_current_path(group_analytics_cycle_analytics_path(group), ignore_query: true)
-        end
-      end
-    end
   end
 
   context 'with a value stream' do
@@ -397,15 +374,6 @@ def expect_successful_update(value_stream_name, expect_redirect)
 
       it_behaves_like 'create group value streams', true, true
       it_behaves_like 'create sub group value streams', true, true
-
-      context 'when `vsa_standalone_settings_page` feature flag is disabled' do
-        before do
-          stub_feature_flags(vsa_standalone_settings_page: false)
-        end
-
-        it_behaves_like 'create group value streams', true
-        it_behaves_like 'create sub group value streams', true
-      end
     end
   end
 end
diff --git a/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_empty_state_spec.js b/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_empty_state_spec.js
index 8069ed756c3854..5a8af651bda17a 100644
--- a/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_empty_state_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_empty_state_spec.js
@@ -1,6 +1,5 @@
 import { GlLoadingIcon, GlEmptyState } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import ValueStreamEmptyState from 'ee/analytics/cycle_analytics/components/value_stream_empty_state.vue';
 import {
   EMPTY_STATE_ACTION_TEXT,
@@ -28,15 +27,9 @@ describe('ValueStreamEmptyState', () => {
       },
       provide: {
         newValueStreamPath,
-        glFeatures: {
-          vsaStandaloneSettingsPage: true,
-        },
         ...provide,
       },
       stubs: { GlEmptyState },
-      directives: {
-        GlModalDirective: createMockDirective('gl-modal-directive'),
-      },
     });
   };
 
@@ -69,12 +62,6 @@ describe('ValueStreamEmptyState', () => {
       expect(findPrimaryAction().attributes('href')).toBe(newValueStreamPath);
     });
 
-    it('does not bind modal directive to new value stream button', () => {
-      const binding = getBinding(findPrimaryAction().element, 'gl-modal-directive');
-
-      expect(binding.value).toBe(false);
-    });
-
     it('renders the learn more button', () => {
       expect(findSecondaryAction().exists()).toBe(true);
       expect(findSecondaryAction().text()).toBe(EMPTY_STATE_SECONDARY_TEXT);
@@ -141,20 +128,4 @@ describe('ValueStreamEmptyState', () => {
       expect(findSecondaryAction().exists()).toBe(false);
     });
   });
-
-  describe('vsaStandaloneSettingsPage = false', () => {
-    beforeEach(() => {
-      createComponent({ provide: { glFeatures: { vsaStandaloneSettingsPage: false } } });
-    });
-
-    it('renders new value stream button without a link', () => {
-      expect(findPrimaryAction().attributes('href')).toBe(undefined);
-    });
-
-    it('binds modal directive to new value stream button', () => {
-      const binding = getBinding(findPrimaryAction().element, 'gl-modal-directive');
-
-      expect(binding.value).toBe('value-stream-form-modal');
-    });
-  });
 });
diff --git a/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_content_spec.js b/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_content_spec.js
deleted file mode 100644
index 8aab5b53ed9d2a..00000000000000
--- a/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_content_spec.js
+++ /dev/null
@@ -1,644 +0,0 @@
-import { GlAlert, GlModal, GlFormInput } from '@gitlab/ui';
-import Vue from 'vue';
-// eslint-disable-next-line no-restricted-imports
-import Vuex from 'vuex';
-import {
-  i18n,
-  PRESET_OPTIONS_BLANK,
-  PRESET_OPTIONS_DEFAULT,
-} from 'ee/analytics/cycle_analytics/components/create_value_stream_form/constants';
-import CustomStageFields from 'ee/analytics/cycle_analytics/components/create_value_stream_form/custom_stage_fields.vue';
-import CustomStageEventField from 'ee/analytics/cycle_analytics/components/create_value_stream_form/custom_stage_event_field.vue';
-import DefaultStageFields from 'ee/analytics/cycle_analytics/components/create_value_stream_form/default_stage_fields.vue';
-import ValueStreamFormContent from 'ee/analytics/cycle_analytics/components/value_stream_form_content.vue';
-import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import {
-  convertObjectPropsToCamelCase,
-  convertObjectPropsToSnakeCase,
-} from '~/lib/utils/common_utils';
-import {
-  customStageEvents as formEvents,
-  defaultStageConfig,
-  rawCustomStage,
-  groupLabels as defaultGroupLabels,
-} from '../mock_data';
-
-const scrollIntoViewMock = jest.fn();
-HTMLElement.prototype.scrollIntoView = scrollIntoViewMock;
-
-Vue.use(Vuex);
-
-describe('ValueStreamFormContent', () => {
-  let wrapper = null;
-  let trackingSpy = null;
-
-  const createValueStreamMock = jest.fn(() => Promise.resolve());
-  const updateValueStreamMock = jest.fn(() => Promise.resolve());
-  const fetchGroupLabelsMock = jest.fn(() => Promise.resolve());
-  const mockEvent = { preventDefault: jest.fn() };
-  const mockToastShow = jest.fn();
-  const streamName = 'Cool stream';
-  const initialFormNameErrors = { name: ['Name field required'] };
-  const initialFormStageErrors = {
-    stages: [
-      {
-        name: ['Name field is required'],
-        endEventIdentifier: ['Please select a start event first'],
-      },
-    ],
-  };
-  const formSubmissionErrors = {
-    name: ['has already been taken'],
-    stages: [
-      {
-        name: ['has already been taken'],
-      },
-    ],
-  };
-
-  const initialData = {
-    stages: [convertObjectPropsToCamelCase(rawCustomStage)],
-    id: 1337,
-    name: 'Editable value stream',
-  };
-
-  const initialPreset = PRESET_OPTIONS_DEFAULT;
-
-  const fakeStore = ({ state }) =>
-    new Vuex.Store({
-      state: {
-        isCreatingValueStream: false,
-        formEvents,
-        defaultGroupLabels,
-        ...state,
-      },
-      actions: {
-        createValueStream: createValueStreamMock,
-        updateValueStream: updateValueStreamMock,
-        fetchGroupLabels: fetchGroupLabelsMock,
-      },
-    });
-
-  const createComponent = ({ props = {}, data = {}, stubs = {}, state = {} } = {}) =>
-    shallowMountExtended(ValueStreamFormContent, {
-      store: fakeStore({ state }),
-      data() {
-        return {
-          ...data,
-        };
-      },
-      propsData: {
-        defaultStageConfig,
-        ...props,
-      },
-      mocks: {
-        $toast: {
-          show: mockToastShow,
-        },
-      },
-      stubs: {
-        ...stubs,
-      },
-    });
-
-  const findModal = () => wrapper.findComponent(GlModal);
-  const findExtendedFormFields = () => wrapper.findByTestId('extended-form-fields');
-  const findDefaultStages = () => findExtendedFormFields().findAllComponents(DefaultStageFields);
-  const findCustomStages = () => findExtendedFormFields().findAllComponents(CustomStageFields);
-  const findPresetSelector = () => wrapper.findByTestId('vsa-preset-selector');
-  const findRestoreButton = () => wrapper.findByTestId('vsa-reset-button');
-  const findRestoreStageButton = (index) => wrapper.findByTestId(`stage-action-restore-${index}`);
-  const findHiddenStages = () => wrapper.findAllByTestId('vsa-hidden-stage').wrappers;
-  const findBtn = (btn) => findModal().props(btn);
-  const findCustomStageEventField = (index = 0) =>
-    wrapper.findAllComponents(CustomStageEventField).at(index);
-  const findFieldErrors = (testId) => wrapper.findByTestId(testId).attributes('invalid-feedback');
-  const findNameInput = () =>
-    wrapper.findByTestId('create-value-stream-name').findComponent(GlFormInput);
-  const findSubmitErrorAlert = () => wrapper.findComponent(GlAlert);
-
-  const fillStageNameAtIndex = (name, index) =>
-    findCustomStages().at(index).findComponent(GlFormInput).vm.$emit('input', name);
-
-  const clickSubmit = () => findModal().vm.$emit('primary', mockEvent);
-  const clickAddStage = () => findModal().vm.$emit('secondary', mockEvent);
-  const clickRestoreStageAtIndex = (index) => findRestoreStageButton(index).vm.$emit('click');
-  const expectFieldError = (testId, error = '') => expect(findFieldErrors(testId)).toBe(error);
-  const expectCustomFieldError = (index, attr, error = '') =>
-    expect(findCustomStageEventField(index).attributes(attr)).toBe(error);
-  const expectStageTransitionKeys = (stages) =>
-    stages.forEach((stage) => expect(stage.transitionKey).toContain('stage-'));
-
-  describe('default state', () => {
-    beforeEach(() => {
-      wrapper = createComponent({ state: { defaultGroupLabels: null } });
-    });
-
-    it('has the extended fields', () => {
-      expect(findExtendedFormFields().exists()).toBe(true);
-    });
-
-    it('sets the submit action text to "Create Value Stream"', () => {
-      expect(findBtn('actionPrimary').text).toBe(i18n.FORM_TITLE);
-    });
-
-    it('renders the modal footer buttons', () => {
-      expect(findModal().attributes('hide-footer')).toBeUndefined();
-    });
-
-    describe('Preset selector', () => {
-      it('has the preset button', () => {
-        expect(findPresetSelector().exists()).toBe(true);
-      });
-
-      it('will toggle between the blank and default templates', async () => {
-        expect(findDefaultStages()).toHaveLength(defaultStageConfig.length);
-        expect(findCustomStages()).toHaveLength(0);
-
-        await findPresetSelector().vm.$emit('input', PRESET_OPTIONS_BLANK);
-
-        expect(findDefaultStages()).toHaveLength(0);
-        expect(findCustomStages()).toHaveLength(1);
-
-        await findPresetSelector().vm.$emit('input', PRESET_OPTIONS_DEFAULT);
-
-        expect(findDefaultStages()).toHaveLength(defaultStageConfig.length);
-        expect(findCustomStages()).toHaveLength(0);
-      });
-
-      it('does not clear name when toggling templates', async () => {
-        await findNameInput().vm.$emit('input', initialData.name);
-
-        expect(findNameInput().attributes('value')).toBe(initialData.name);
-
-        await findPresetSelector().vm.$emit('input', PRESET_OPTIONS_BLANK);
-
-        expect(findNameInput().attributes('value')).toBe(initialData.name);
-
-        await findPresetSelector().vm.$emit('input', PRESET_OPTIONS_DEFAULT);
-
-        expect(findNameInput().attributes('value')).toBe(initialData.name);
-      });
-
-      it('each stage has a transition key when toggling', async () => {
-        await findPresetSelector().vm.$emit('input', PRESET_OPTIONS_BLANK);
-
-        expectStageTransitionKeys(wrapper.vm.stages);
-
-        await findPresetSelector().vm.$emit('input', PRESET_OPTIONS_DEFAULT);
-
-        expectStageTransitionKeys(wrapper.vm.stages);
-      });
-
-      it('does not display any hidden stages', () => {
-        expect(findHiddenStages()).toHaveLength(0);
-      });
-
-      it('will fetch group labels', () => {
-        expect(fetchGroupLabelsMock).toHaveBeenCalled();
-      });
-    });
-
-    describe('Add stage button', () => {
-      beforeEach(() => {
-        wrapper = createComponent({
-          stubs: {
-            CustomStageFields,
-          },
-        });
-      });
-
-      it('has the add stage button', () => {
-        expect(findBtn('actionSecondary')).toMatchObject({ text: 'Add another stage' });
-      });
-
-      it('adds a blank custom stage when clicked', async () => {
-        expect(findDefaultStages()).toHaveLength(defaultStageConfig.length);
-        expect(findCustomStages()).toHaveLength(0);
-
-        await clickAddStage();
-
-        expect(findDefaultStages()).toHaveLength(defaultStageConfig.length);
-        expect(findCustomStages()).toHaveLength(1);
-      });
-
-      it('each stage has a transition key', () => {
-        expectStageTransitionKeys(wrapper.vm.stages);
-      });
-    });
-
-    describe('field validation', () => {
-      beforeEach(() => {
-        wrapper = createComponent({
-          stubs: {
-            CustomStageFields,
-          },
-        });
-      });
-
-      it('validates existing fields when clicked', async () => {
-        const fieldTestId = 'create-value-stream-name';
-        expect(findFieldErrors(fieldTestId)).toBeUndefined();
-
-        await clickAddStage();
-
-        expectFieldError(fieldTestId, 'Name is required');
-      });
-
-      it('does not allow duplicate stage names', async () => {
-        const [firstDefaultStage] = defaultStageConfig;
-        await findNameInput().vm.$emit('input', streamName);
-
-        await clickAddStage();
-        await fillStageNameAtIndex(firstDefaultStage.name, 0);
-
-        // Trigger the field validation
-        await clickAddStage();
-
-        expectFieldError('custom-stage-name-3', 'Stage name already exists');
-      });
-    });
-
-    describe('initial form stage errors', () => {
-      const commonExtendedData = {
-        props: {
-          initialFormErrors: initialFormStageErrors,
-        },
-      };
-
-      it('renders errors for a default stage field', () => {
-        wrapper = createComponent({
-          ...commonExtendedData,
-          stubs: {
-            DefaultStageFields,
-          },
-        });
-
-        expectFieldError('default-stage-name-0', initialFormStageErrors.stages[0].name[0]);
-      });
-
-      it('renders errors for a custom stage field', () => {
-        wrapper = createComponent({
-          props: {
-            ...commonExtendedData.props,
-            initialPreset: PRESET_OPTIONS_BLANK,
-          },
-          stubs: {
-            CustomStageFields,
-          },
-        });
-
-        expectFieldError('custom-stage-name-0', initialFormStageErrors.stages[0].name[0]);
-        expectCustomFieldError(
-          1,
-          'identifiererror',
-          initialFormStageErrors.stages[0].endEventIdentifier[0],
-        );
-      });
-    });
-
-    describe('initial form name errors', () => {
-      beforeEach(() => {
-        wrapper = createComponent({
-          props: {
-            initialFormErrors: initialFormNameErrors,
-          },
-        });
-      });
-
-      it('renders errors for the name field', () => {
-        expectFieldError('create-value-stream-name', initialFormNameErrors.name[0]);
-      });
-    });
-
-    describe('with valid fields', () => {
-      beforeEach(() => {
-        trackingSpy = mockTracking(undefined, wrapper.element, jest.spyOn);
-      });
-
-      afterEach(() => {
-        unmockTracking();
-      });
-
-      describe('form submitted successfully', () => {
-        beforeEach(async () => {
-          wrapper = createComponent();
-
-          await findNameInput().vm.$emit('input', streamName);
-          clickSubmit();
-        });
-
-        it('calls the "createValueStream" event when submitted', () => {
-          expect(createValueStreamMock).toHaveBeenCalledWith(expect.any(Object), {
-            name: streamName,
-            stages: [
-              {
-                custom: false,
-                name: 'issue',
-              },
-              {
-                custom: false,
-                name: 'plan',
-              },
-              {
-                custom: false,
-                name: 'code',
-              },
-            ],
-          });
-        });
-
-        it('clears the name field', () => {
-          expect(findNameInput().attributes('value')).toBe('');
-        });
-
-        it('displays a toast message', () => {
-          expect(mockToastShow).toHaveBeenCalledWith(`'${streamName}' Value Stream created`);
-        });
-
-        it('sends tracking information', () => {
-          expect(trackingSpy).toHaveBeenCalledWith(undefined, 'submit_form', {
-            label: 'create_value_stream',
-          });
-        });
-      });
-
-      describe('form submission fails', () => {
-        beforeEach(async () => {
-          wrapper = createComponent({
-            props: {
-              initialFormErrors: formSubmissionErrors,
-            },
-            stubs: {
-              CustomStageFields,
-            },
-          });
-
-          await findNameInput().vm.$emit('input', streamName);
-          clickSubmit();
-        });
-
-        it('calls the createValueStream action', () => {
-          expect(createValueStreamMock).toHaveBeenCalled();
-        });
-
-        it('does not clear the name field', () => {
-          expect(findNameInput().attributes('value')).toBe(streamName);
-        });
-
-        it('does not display a toast message', () => {
-          expect(mockToastShow).not.toHaveBeenCalled();
-        });
-
-        it('renders errors for the name field', () => {
-          expectFieldError('create-value-stream-name', formSubmissionErrors.name[0]);
-        });
-
-        it('renders a dismissible generic alert error', async () => {
-          expect(findSubmitErrorAlert().exists()).toBe(true);
-          await findSubmitErrorAlert().vm.$emit('dismiss');
-          expect(findSubmitErrorAlert().exists()).toBe(false);
-        });
-      });
-    });
-  });
-
-  describe('isEditing=true', () => {
-    const stageCount = initialData.stages.length;
-    beforeEach(() => {
-      wrapper = createComponent({
-        props: {
-          initialPreset,
-          initialData,
-          isEditing: true,
-        },
-      });
-    });
-
-    it('does not have the preset button', () => {
-      expect(findPresetSelector().exists()).toBe(false);
-    });
-
-    it('sets the submit action text to "Save value stream"', () => {
-      expect(findBtn('actionPrimary').text).toBe(i18n.EDIT_FORM_ACTION);
-    });
-
-    it('does not display any hidden stages', () => {
-      expect(findHiddenStages()).toHaveLength(0);
-    });
-
-    it('each stage has a transition key', () => {
-      expectStageTransitionKeys(wrapper.vm.stages);
-    });
-
-    describe('restore defaults button', () => {
-      it('restores the original name', async () => {
-        const newName = 'name';
-
-        await findNameInput().vm.$emit('input', newName);
-
-        expect(findNameInput().attributes('value')).toBe(newName);
-
-        await findRestoreButton().vm.$emit('click');
-
-        expect(findNameInput().attributes('value')).toBe(initialData.name);
-      });
-
-      it('will clear the form fields', async () => {
-        expect(findCustomStages()).toHaveLength(stageCount);
-
-        await clickAddStage();
-
-        expect(findCustomStages()).toHaveLength(stageCount + 1);
-
-        await findRestoreButton().vm.$emit('click');
-
-        expect(findCustomStages()).toHaveLength(stageCount);
-      });
-    });
-
-    describe('with hidden stages', () => {
-      const hiddenStages = defaultStageConfig.map((s) => ({ ...s, hidden: true }));
-
-      beforeEach(() => {
-        wrapper = createComponent({
-          props: {
-            initialPreset,
-            initialData: { ...initialData, stages: [...initialData.stages, ...hiddenStages] },
-            isEditing: true,
-          },
-        });
-      });
-
-      it('displays hidden each stage', () => {
-        expect(findHiddenStages()).toHaveLength(hiddenStages.length);
-
-        findHiddenStages().forEach((s) => {
-          expect(s.text()).toContain('Restore stage');
-        });
-      });
-
-      it('when `Restore stage` is clicked, the stage is restored', async () => {
-        expect(findHiddenStages()).toHaveLength(hiddenStages.length);
-        expect(findDefaultStages()).toHaveLength(0);
-        expect(findCustomStages()).toHaveLength(stageCount);
-
-        await clickRestoreStageAtIndex(1);
-
-        expect(findHiddenStages()).toHaveLength(hiddenStages.length - 1);
-        expect(findDefaultStages()).toHaveLength(1);
-        expect(findCustomStages()).toHaveLength(stageCount);
-      });
-
-      it('when a stage is restored it has a transition key', async () => {
-        await clickRestoreStageAtIndex(1);
-
-        expect(wrapper.vm.stages[stageCount].transitionKey).toContain(
-          `stage-${hiddenStages[1].name}-`,
-        );
-      });
-    });
-
-    describe('Add stage button', () => {
-      beforeEach(() => {
-        wrapper = createComponent({
-          props: {
-            initialPreset,
-            initialData,
-            isEditing: true,
-          },
-          stubs: {
-            CustomStageFields,
-          },
-        });
-      });
-
-      it('has the add stage button', () => {
-        expect(findBtn('actionSecondary')).toMatchObject({ text: i18n.BTN_ADD_ANOTHER_STAGE });
-      });
-
-      it('adds a blank custom stage when clicked', async () => {
-        expect(findCustomStages()).toHaveLength(stageCount);
-
-        await clickAddStage();
-
-        expect(findCustomStages()).toHaveLength(stageCount + 1);
-      });
-
-      it('validates existing fields when clicked', async () => {
-        const fieldTestId = 'create-value-stream-name';
-        expect(findFieldErrors(fieldTestId)).toBeUndefined();
-
-        await findNameInput().vm.$emit('input', '');
-        await clickAddStage();
-
-        expectFieldError(fieldTestId, 'Name is required');
-      });
-    });
-
-    describe('with valid fields', () => {
-      beforeEach(() => {
-        trackingSpy = mockTracking(undefined, wrapper.element, jest.spyOn);
-      });
-
-      afterEach(() => {
-        unmockTracking();
-      });
-
-      describe('form submitted successfully', () => {
-        beforeEach(() => {
-          wrapper = createComponent({
-            props: {
-              initialPreset,
-              initialData,
-              isEditing: true,
-            },
-          });
-
-          clickSubmit();
-        });
-
-        it('calls the "updateValueStreamMock" event when submitted', () => {
-          expect(updateValueStreamMock).toHaveBeenCalledWith(expect.any(Object), {
-            ...initialData,
-            stages: initialData.stages.map((stage) =>
-              convertObjectPropsToSnakeCase(stage, { deep: true }),
-            ),
-          });
-        });
-
-        it('displays a toast message', () => {
-          expect(mockToastShow).toHaveBeenCalledWith(`'${initialData.name}' Value Stream saved`);
-        });
-
-        it('sends tracking information', () => {
-          expect(trackingSpy).toHaveBeenCalledWith(undefined, 'submit_form', {
-            label: 'edit_value_stream',
-          });
-        });
-      });
-
-      describe('form submission fails', () => {
-        beforeEach(() => {
-          wrapper = createComponent({
-            props: {
-              initialFormErrors: formSubmissionErrors,
-              initialData,
-              initialPreset,
-              isEditing: true,
-            },
-            stubs: {
-              CustomStageFields,
-            },
-          });
-
-          clickSubmit();
-        });
-
-        it('calls the updateValueStreamMock action', () => {
-          expect(updateValueStreamMock).toHaveBeenCalled();
-        });
-
-        it('does not clear the name field', () => {
-          const { name } = initialData;
-
-          expect(findNameInput().attributes('value')).toBe(name);
-        });
-
-        it('does not display a toast message', () => {
-          expect(mockToastShow).not.toHaveBeenCalled();
-        });
-
-        it('renders errors for the name field', () => {
-          expectFieldError('create-value-stream-name', formSubmissionErrors.name[0]);
-        });
-
-        it('renders errors for a custom stage field', () => {
-          expectFieldError('custom-stage-name-0', formSubmissionErrors.stages[0].name[0]);
-        });
-
-        it('renders a dismissible generic alert error', async () => {
-          expect(findSubmitErrorAlert().exists()).toBe(true);
-          await findSubmitErrorAlert().vm.$emit('dismiss');
-          expect(findSubmitErrorAlert().exists()).toBe(false);
-        });
-      });
-    });
-  });
-
-  describe('isFetchingGroupLabels=true', () => {
-    beforeEach(() => {
-      wrapper = createComponent({
-        state: {
-          defaultGroupLabels: [],
-          isFetchingGroupLabels: true,
-        },
-      });
-    });
-
-    it('hides the modal footer buttons', () => {
-      expect(findModal().attributes('hide-footer')).toBe('true');
-    });
-  });
-});
diff --git a/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_spec.js b/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_spec.js
deleted file mode 100644
index d333e4b7759e86..00000000000000
--- a/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_spec.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import { shallowMount } from '@vue/test-utils';
-import Vue from 'vue';
-// eslint-disable-next-line no-restricted-imports
-import Vuex from 'vuex';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
-import ValueStreamForm from 'ee/analytics/cycle_analytics/components/value_stream_form.vue';
-import ValueStreamFormContent from 'ee/analytics/cycle_analytics/components/value_stream_form_content.vue';
-import { extendedWrapper } from 'helpers/vue_test_utils_helper';
-import { rawCustomStage, valueStreams, defaultStageConfig } from '../mock_data';
-
-Vue.use(Vuex);
-
-const [selectedValueStream] = valueStreams;
-const camelCustomStage = convertObjectPropsToCamelCase(rawCustomStage);
-const stages = [camelCustomStage];
-const initialData = { name: '', stages: [] };
-
-const fakeStore = ({ state }) =>
-  new Vuex.Store({
-    state: {
-      createValueStreamErrors: {},
-      defaultStageConfig,
-      ...state,
-    },
-  });
-
-const createComponent = ({ props = {}, state = {} } = {}) =>
-  extendedWrapper(
-    shallowMount(ValueStreamForm, {
-      store: fakeStore({ state }),
-      propsData: {
-        defaultStageConfig,
-        ...props,
-      },
-    }),
-  );
-
-describe('ValueStreamForm', () => {
-  let wrapper = null;
-
-  const findForm = () => wrapper.findComponent(ValueStreamFormContent);
-  const findFormProps = () => findForm().props();
-
-  describe('default state', () => {
-    beforeEach(() => {
-      wrapper = createComponent();
-    });
-
-    it('renders the form component', () => {
-      expect(findForm().exists()).toBe(true);
-      expect(findFormProps()).toMatchObject({
-        defaultStageConfig,
-        initialData,
-        isEditing: false,
-      });
-    });
-
-    it('emits `hidden` when the modal is hidden', () => {
-      expect(wrapper.emitted('hidden')).toBeUndefined();
-
-      findForm().vm.$emit('hidden');
-
-      expect(wrapper.emitted('hidden')).toHaveLength(1);
-    });
-  });
-
-  describe('when editing', () => {
-    beforeEach(() => {
-      wrapper = createComponent({
-        props: { isEditing: true },
-        state: { selectedValueStream, stages },
-      });
-    });
-
-    it('sets the form initialData', () => {
-      const props = findFormProps();
-      expect(props.initialData).toMatchObject({
-        id: selectedValueStream.id,
-        name: selectedValueStream.name,
-        stages: [
-          camelCustomStage,
-          ...defaultStageConfig.map(({ custom, name }) => ({ custom, name, hidden: true })),
-        ],
-      });
-    });
-  });
-
-  describe('with createValueStreamErrors', () => {
-    const nameError = "Name can't be blank";
-    beforeEach(() => {
-      wrapper = createComponent({
-        state: { createValueStreamErrors: { name: nameError } },
-      });
-    });
-
-    it('sets the form initialFormErrors', () => {
-      const props = findFormProps();
-      expect(props.initialFormErrors).toEqual({ name: nameError });
-    });
-  });
-});
diff --git a/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_select_spec.js b/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_select_spec.js
index af56493feb885b..f867e202063175 100644
--- a/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_select_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/components/value_stream_select_spec.js
@@ -5,7 +5,7 @@ import Vuex from 'vuex';
 import ValueStreamSelect from 'ee/analytics/cycle_analytics/components/value_stream_select.vue';
 import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
 import { shallowMountExtended, mountExtended } from 'helpers/vue_test_utils_helper';
-import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
+import { createMockDirective } from 'helpers/vue_mock_directive';
 import {
   valueStreams,
   defaultStageConfig,
@@ -66,9 +66,6 @@ describe('ValueStreamSelect', () => {
       provide: {
         newValueStreamPath,
         editValueStreamPath,
-        glFeatures: {
-          vsaStandaloneSettingsPage: true,
-        },
         ...provide,
       },
       mocks: {
@@ -81,8 +78,7 @@ describe('ValueStreamSelect', () => {
       },
     });
 
-  const findModal = (modal) => wrapper.findByTestId(`${modal}-value-stream-modal`);
-  const submitModal = (modal) => findModal(modal).vm.$emit('primary', mockEvent);
+  const findDeleteModal = () => wrapper.findByTestId('delete-value-stream-modal');
   const findSelectValueStreamDropdown = () => wrapper.findComponent(GlCollapsibleListbox);
   const findCreateValueStreamOption = () => wrapper.findByTestId('create-value-stream-option');
   const findCreateValueStreamButton = () => wrapper.findByTestId('create-value-stream-button');
@@ -159,54 +155,6 @@ describe('ValueStreamSelect', () => {
           expect(findEditValueStreamButton().text()).toBe('Edit');
           expect(findEditValueStreamButton().attributes('href')).toBe(editValueStreamPathWithId);
         });
-
-        it('does not bind modal directive to edit button', () => {
-          const binding = getBinding(findEditValueStreamButton().element, 'gl-modal-directive');
-
-          expect(binding.value).toBe(false);
-        });
-
-        it('does not bind modal directive to create option', () => {
-          const binding = getBinding(findCreateValueStreamOption().element, 'gl-modal-directive');
-
-          expect(binding.value).toBe(false);
-        });
-
-        describe('vsaStandaloneSettingsPage = false', () => {
-          beforeEach(() => {
-            wrapper = createComponent({
-              mountFn: mountExtended,
-              initialState: {
-                valueStreams,
-                selectedValueStream: {
-                  ...selectedValueStream,
-                  isCustom: true,
-                },
-              },
-              provide: { glFeatures: { vsaStandaloneSettingsPage: false } },
-            });
-          });
-
-          it('renders create option without a link', () => {
-            expect(findCreateValueStreamOption().attributes('href')).toBe(undefined);
-          });
-
-          it('binds modal directive to create option', () => {
-            const binding = getBinding(findCreateValueStreamOption().element, 'gl-modal-directive');
-
-            expect(binding.value).toBe('value-stream-form-modal');
-          });
-
-          it('renders edit button without a link', () => {
-            expect(findEditValueStreamButton().attributes('href')).toBe(undefined);
-          });
-
-          it('binds modal directive to edit button', () => {
-            const binding = getBinding(findEditValueStreamButton().element, 'gl-modal-directive');
-
-            expect(binding.value).toBe('value-stream-form-modal');
-          });
-        });
       });
 
       describe('with canEdit=false', () => {
@@ -290,12 +238,6 @@ describe('ValueStreamSelect', () => {
       expect(findCreateValueStreamButton().attributes('href')).toBe(newValueStreamPath);
     });
 
-    it('does not bind modal directive to create value stream button', () => {
-      const binding = getBinding(findCreateValueStreamButton().element, 'gl-modal-directive');
-
-      expect(binding.value).toBe(false);
-    });
-
     it('does not display the select value stream dropdown', () => {
       expect(findSelectValueStreamDropdown().exists()).toBe(false);
     });
@@ -303,27 +245,6 @@ describe('ValueStreamSelect', () => {
     it('does not render an edit button for default value streams', () => {
       expect(findEditValueStreamButton().exists()).toBe(false);
     });
-
-    describe('vsaStandaloneSettingsPage = false', () => {
-      beforeEach(() => {
-        wrapper = createComponent({
-          initialState: {
-            valueStreams: [],
-          },
-          provide: { glFeatures: { vsaStandaloneSettingsPage: false } },
-        });
-      });
-
-      it('renders create value stream button without a link', () => {
-        expect(findCreateValueStreamButton().attributes('href')).toBe(undefined);
-      });
-
-      it('binds modal directive to create value stream button', () => {
-        const binding = getBinding(findCreateValueStreamButton().element, 'gl-modal-directive');
-
-        expect(binding.value).toBe('value-stream-form-modal');
-      });
-    });
   });
 
   describe('Delete value stream modal', () => {
@@ -341,7 +262,7 @@ describe('ValueStreamSelect', () => {
 
         trackingSpy = mockTracking(undefined, wrapper.element, jest.spyOn);
 
-        submitModal('delete');
+        findDeleteModal().vm.$emit('primary', mockEvent);
       });
 
       it('calls the "deleteValueStream" event when submitted', () => {
diff --git a/ee/spec/frontend/analytics/cycle_analytics/store/actions/value_streams_spec.js b/ee/spec/frontend/analytics/cycle_analytics/store/actions/value_streams_spec.js
index 174e5b489f4794..549f083ab5a700 100644
--- a/ee/spec/frontend/analytics/cycle_analytics/store/actions/value_streams_spec.js
+++ b/ee/spec/frontend/analytics/cycle_analytics/store/actions/value_streams_spec.js
@@ -160,7 +160,7 @@ describe('Value Stream Analytics actions / value streams', () => {
 
     describe('with no errors', () => {
       beforeEach(() => {
-        state = { currentGroup, features: { vsaStandaloneSettingsPage: true } };
+        state = { currentGroup };
         mock.onPut(endpoints.valueStreamData).replyOnce(HTTP_STATUS_OK, updateResp);
       });
 
@@ -170,25 +170,6 @@ describe('Value Stream Analytics actions / value streams', () => {
           { type: types.RECEIVE_UPDATE_VALUE_STREAM_SUCCESS, payload: updateResp },
         ]);
       });
-
-      describe('when `vsaStandaloneSettingsPage` feature flag is disabled', () => {
-        beforeEach(() => {
-          state = { currentGroup, features: { vsaStandaloneSettingsPage: false } };
-        });
-
-        it(`commits the ${types.REQUEST_UPDATE_VALUE_STREAM} and ${types.RECEIVE_UPDATE_VALUE_STREAM_SUCCESS} mutations and dispatches the 'fetchCycleAnalyticsData' action`, () => {
-          return testAction(
-            actions.updateValueStream,
-            payload,
-            state,
-            [
-              { type: types.REQUEST_UPDATE_VALUE_STREAM },
-              { type: types.RECEIVE_UPDATE_VALUE_STREAM_SUCCESS, payload: updateResp },
-            ],
-            [{ type: 'fetchCycleAnalyticsData' }],
-          );
-        });
-      });
     });
 
     describe('with errors', () => {
diff --git a/qa/qa/ee/page/value_stream_analytics.rb b/qa/qa/ee/page/value_stream_analytics.rb
index 9102e6cb9cc46f..36988977b3169f 100644
--- a/qa/qa/ee/page/value_stream_analytics.rb
+++ b/qa/qa/ee/page/value_stream_analytics.rb
@@ -14,10 +14,12 @@ def self.included(base)
               element 'create-value-stream-button'
             end
 
-            view "ee/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_form_content.vue" do
+            # rubocop:disable Layout/LineLength -- Long filename
+            view "ee/app/assets/javascripts/analytics/cycle_analytics/vsa_settings/components/value_stream_form_content.vue" do
               element 'create-value-stream-name-input'
               element 'vsa-preset-selector'
             end
+            # rubocop:enable Layout/LineLength
 
             view "ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue" do
               element 'vsa-path-navigation'
@@ -156,12 +158,7 @@ def create_value_stream
         # @return [void]
         def add_another_stage
           # footer buttons are generic UI components from gitlab/ui
-          # Remove else once vsa_standalone_settings_page feature flag is removed
-          if has_button?("Add a stage")
-            find_button("Add a stage").click
-          else
-            find_button("Add another stage").click
-          end
+          find_button("Add a stage").click
         end
 
         # Select custom event in stage
-- 
GitLab