From 310d861ce65d430d31d1d42c25949a9297a1065c Mon Sep 17 00:00:00 2001
From: mgandres <mandres@gitlab.com>
Date: Mon, 16 May 2022 14:59:14 +0800
Subject: [PATCH 1/2] Clean up `pipeline_editor_file_tree` feature flag

Changelog: added
---
 .../file_nav/pipeline_editor_file_nav.vue     |  8 +-
 .../pipeline_editor/pipeline_editor_home.vue  |  7 +-
 .../projects/ci/pipeline_editor_controller.rb |  1 -
 .../development/pipeline_editor_file_tree.yml |  8 --
 doc/ci/pipeline_editor/index.md               |  8 +-
 spec/features/projects/ci/editor_spec.rb      | 10 +-
 .../file-nav/pipeline_editor_file_nav_spec.js | 40 +-------
 .../pipeline_editor_home_spec.js              | 92 ++++++++-----------
 8 files changed, 47 insertions(+), 127 deletions(-)
 delete mode 100644 config/feature_flags/development/pipeline_editor_file_tree.yml

diff --git a/app/assets/javascripts/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue b/app/assets/javascripts/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue
index 58df98d0fb7adc..8e95fad1e4821e 100644
--- a/app/assets/javascripts/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue
+++ b/app/assets/javascripts/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue
@@ -1,7 +1,6 @@
 <script>
 import { GlButton } from '@gitlab/ui';
 import getAppStatus from '~/pipeline_editor/graphql/queries/client/app_status.query.graphql';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { EDITOR_APP_STATUS_EMPTY, EDITOR_APP_STATUS_LOADING } from '../../constants';
 import FileTreePopover from '../popovers/file_tree_popover.vue';
 import BranchSwitcher from './branch_switcher.vue';
@@ -12,7 +11,6 @@ export default {
     FileTreePopover,
     GlButton,
   },
-  mixins: [glFeatureFlagMixin()],
   props: {
     hasUnsavedChanges: {
       type: Boolean,
@@ -43,11 +41,7 @@ export default {
       return this.appStatus === EDITOR_APP_STATUS_LOADING;
     },
     showFileTreeToggle() {
-      return (
-        this.glFeatures.pipelineEditorFileTree &&
-        !this.isNewCiConfigFile &&
-        this.appStatus !== EDITOR_APP_STATUS_EMPTY
-      );
+      return !this.isNewCiConfigFile && this.appStatus !== EDITOR_APP_STATUS_EMPTY;
     },
   },
   methods: {
diff --git a/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue b/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue
index 59022a913225d9..f26cdd8b017129 100644
--- a/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue
+++ b/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue
@@ -1,7 +1,6 @@
 <script>
 import { GlModal } from '@gitlab/ui';
 import { __ } from '~/locale';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import CommitSection from './components/commit/commit_section.vue';
 import PipelineEditorDrawer from './components/drawer/pipeline_editor_drawer.vue';
 import PipelineEditorFileNav from './components/file_nav/pipeline_editor_file_nav.vue';
@@ -34,7 +33,6 @@ export default {
     PipelineEditorHeader,
     PipelineEditorTabs,
   },
-  mixins: [glFeatureFlagMixin()],
   props: {
     ciConfigData: {
       type: Object,
@@ -76,9 +74,6 @@ export default {
     includesFiles() {
       return this.ciConfigData?.includes || [];
     },
-    isFileTreeVisible() {
-      return this.showFileTree && this.glFeatures.pipelineEditorFileTree;
-    },
   },
   mounted() {
     this.showFileTree = JSON.parse(localStorage.getItem(FILE_TREE_DISPLAY_KEY)) || false;
@@ -140,7 +135,7 @@ export default {
     />
     <div class="gl-display-flex gl-w-full gl-sm-flex-direction-column">
       <pipeline-editor-file-tree
-        v-if="isFileTreeVisible"
+        v-if="showFileTree"
         class="gl-flex-shrink-0"
         :includes="includesFiles"
       />
diff --git a/app/controllers/projects/ci/pipeline_editor_controller.rb b/app/controllers/projects/ci/pipeline_editor_controller.rb
index dbf3b2051fb2bc..84e5d59a2c3d4d 100644
--- a/app/controllers/projects/ci/pipeline_editor_controller.rb
+++ b/app/controllers/projects/ci/pipeline_editor_controller.rb
@@ -4,7 +4,6 @@ class Projects::Ci::PipelineEditorController < Projects::ApplicationController
   before_action :check_can_collaborate!
   before_action do
     push_frontend_feature_flag(:schema_linting, @project)
-    push_frontend_feature_flag(:pipeline_editor_file_tree, @project)
   end
 
   feature_category :pipeline_authoring
diff --git a/config/feature_flags/development/pipeline_editor_file_tree.yml b/config/feature_flags/development/pipeline_editor_file_tree.yml
deleted file mode 100644
index db31133a530048..00000000000000
--- a/config/feature_flags/development/pipeline_editor_file_tree.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pipeline_editor_file_tree
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83910
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357219
-milestone: '15.0'
-type: development
-group: group::pipeline authoring
-default_enabled: false
diff --git a/doc/ci/pipeline_editor/index.md b/doc/ci/pipeline_editor/index.md
index 57a9d7a935840a..8c95ae24556143 100644
--- a/doc/ci/pipeline_editor/index.md
+++ b/doc/ci/pipeline_editor/index.md
@@ -53,12 +53,8 @@ reflected in the CI lint. It displays the same results as the existing [CI Lint
 
 ## View included CI/CD configuration
 
-> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/7064) in GitLab 15.0 [with a flag](../../administration/feature_flags.md) named `pipeline_editor_file_tree`. Disabled by default.
-
-FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available,
-ask an administrator to [enable the feature flag](../../administration/feature_flags.md)
-named `pipeline_editor_file_tree`.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/7064) in GitLab 15.0.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/357219) in GitLab 15.1.
 
 You can review configuration added with the [`include`](../yaml/index.md#include)
 keyword in the pipeline editor. In the top right, select the file tree (**{file-tree}**)
diff --git a/spec/features/projects/ci/editor_spec.rb b/spec/features/projects/ci/editor_spec.rb
index 2f960c099367b7..8197fe46c7b94d 100644
--- a/spec/features/projects/ci/editor_spec.rb
+++ b/spec/features/projects/ci/editor_spec.rb
@@ -12,8 +12,6 @@
   let(:other_branch) { 'test' }
 
   before do
-    stub_feature_flags(pipeline_editor_file_tree: false)
-
     sign_in(user)
     project.add_developer(user)
 
@@ -70,14 +68,8 @@ def switch_to_branch(branch)
     expect(page).to have_content('Pipeline Editor')
   end
 
-  describe 'Branch Switcher (pipeline_editor_file_tree disabled)' do
-    it_behaves_like 'default branch switcher behavior'
-  end
-
-  describe 'Branch Switcher (pipeline_editor_file_tree enabled)' do
+  describe 'Branch Switcher' do
     before do
-      stub_feature_flags(pipeline_editor_file_tree: true)
-
       visit project_ci_pipeline_editor_path(project)
       wait_for_requests
 
diff --git a/spec/frontend/pipeline_editor/components/file-nav/pipeline_editor_file_nav_spec.js b/spec/frontend/pipeline_editor/components/file-nav/pipeline_editor_file_nav_spec.js
index a61796dbed2bcb..d503aff40b8143 100644
--- a/spec/frontend/pipeline_editor/components/file-nav/pipeline_editor_file_nav_spec.js
+++ b/spec/frontend/pipeline_editor/components/file-nav/pipeline_editor_file_nav_spec.js
@@ -23,7 +23,6 @@ describe('Pipeline editor file nav', () => {
   const createComponent = ({
     appStatus = EDITOR_APP_STATUS_VALID,
     isNewCiConfigFile = false,
-    pipelineEditorFileTree = false,
   } = {}) => {
     mockApollo.clients.defaultClient.cache.writeQuery({
       query: getAppStatus,
@@ -38,11 +37,6 @@ describe('Pipeline editor file nav', () => {
     wrapper = extendedWrapper(
       shallowMount(PipelineEditorFileNav, {
         apolloProvider: mockApollo,
-        provide: {
-          glFeatures: {
-            pipelineEditorFileTree,
-          },
-        },
         propsData: {
           isNewCiConfigFile,
         },
@@ -66,24 +60,12 @@ describe('Pipeline editor file nav', () => {
     it('renders the branch switcher', () => {
       expect(findBranchSwitcher().exists()).toBe(true);
     });
-
-    it('does not render the file tree button', () => {
-      expect(findFileTreeBtn().exists()).toBe(false);
-    });
-
-    it('does not render the file tree popover', () => {
-      expect(findPopoverContainer().exists()).toBe(false);
-    });
   });
 
-  describe('with pipelineEditorFileTree feature flag ON', () => {
+  describe('file tree', () => {
     describe('when editor is in the empty state', () => {
       beforeEach(() => {
-        createComponent({
-          appStatus: EDITOR_APP_STATUS_EMPTY,
-          isNewCiConfigFile: false,
-          pipelineEditorFileTree: true,
-        });
+        createComponent({ appStatus: EDITOR_APP_STATUS_EMPTY, isNewCiConfigFile: false });
       });
 
       it('does not render the file tree button', () => {
@@ -97,11 +79,7 @@ describe('Pipeline editor file nav', () => {
 
     describe('when user is about to create their config file for the first time', () => {
       beforeEach(() => {
-        createComponent({
-          appStatus: EDITOR_APP_STATUS_VALID,
-          isNewCiConfigFile: true,
-          pipelineEditorFileTree: true,
-        });
+        createComponent({ appStatus: EDITOR_APP_STATUS_VALID, isNewCiConfigFile: true });
       });
 
       it('does not render the file tree button', () => {
@@ -115,11 +93,7 @@ describe('Pipeline editor file nav', () => {
 
     describe('when app is in a global loading state', () => {
       it('renders the file tree button with a loading icon', () => {
-        createComponent({
-          appStatus: EDITOR_APP_STATUS_LOADING,
-          isNewCiConfigFile: false,
-          pipelineEditorFileTree: true,
-        });
+        createComponent({ appStatus: EDITOR_APP_STATUS_LOADING, isNewCiConfigFile: false });
 
         expect(findFileTreeBtn().exists()).toBe(true);
         expect(findFileTreeBtn().attributes('loading')).toBe('true');
@@ -128,11 +102,7 @@ describe('Pipeline editor file nav', () => {
 
     describe('when editor has a non-empty config file open', () => {
       beforeEach(() => {
-        createComponent({
-          appStatus: EDITOR_APP_STATUS_VALID,
-          isNewCiConfigFile: false,
-          pipelineEditorFileTree: true,
-        });
+        createComponent({ appStatus: EDITOR_APP_STATUS_VALID, isNewCiConfigFile: false });
       });
 
       it('renders the file tree button', () => {
diff --git a/spec/frontend/pipeline_editor/pipeline_editor_home_spec.js b/spec/frontend/pipeline_editor/pipeline_editor_home_spec.js
index bf0f7fd8c9ff30..6307a5aefe71a9 100644
--- a/spec/frontend/pipeline_editor/pipeline_editor_home_spec.js
+++ b/spec/frontend/pipeline_editor/pipeline_editor_home_spec.js
@@ -247,81 +247,63 @@ describe('Pipeline editor home wrapper', () => {
       await nextTick();
     };
 
-    describe('with pipelineEditorFileTree feature flag OFF', () => {
+    describe('button toggle', () => {
       beforeEach(() => {
-        createComponent();
+        createComponent({
+          stubs: {
+            GlButton,
+            PipelineEditorFileNav,
+          },
+        });
       });
 
-      it('hides the file tree', () => {
-        expect(findFileTreeBtn().exists()).toBe(false);
-        expect(findPipelineEditorFileTree().exists()).toBe(false);
+      it('shows button toggle', () => {
+        expect(findFileTreeBtn().exists()).toBe(true);
       });
-    });
-
-    describe('with pipelineEditorFileTree feature flag ON', () => {
-      describe('button toggle', () => {
-        beforeEach(() => {
-          createComponent({
-            glFeatures: {
-              pipelineEditorFileTree: true,
-            },
-            stubs: {
-              GlButton,
-              PipelineEditorFileNav,
-            },
-          });
-        });
-
-        it('shows button toggle', () => {
-          expect(findFileTreeBtn().exists()).toBe(true);
-        });
 
-        it('toggles the drawer on button click', async () => {
-          await toggleFileTree();
+      it('toggles the drawer on button click', async () => {
+        await toggleFileTree();
 
-          expect(findPipelineEditorFileTree().exists()).toBe(true);
+        expect(findPipelineEditorFileTree().exists()).toBe(true);
 
-          await toggleFileTree();
+        await toggleFileTree();
 
-          expect(findPipelineEditorFileTree().exists()).toBe(false);
-        });
+        expect(findPipelineEditorFileTree().exists()).toBe(false);
+      });
 
-        it('sets the display state in local storage', async () => {
-          await toggleFileTree();
+      it('sets the display state in local storage', async () => {
+        await toggleFileTree();
 
-          expect(localStorage.getItem(FILE_TREE_DISPLAY_KEY)).toBe('true');
+        expect(localStorage.getItem(FILE_TREE_DISPLAY_KEY)).toBe('true');
 
-          await toggleFileTree();
+        await toggleFileTree();
 
-          expect(localStorage.getItem(FILE_TREE_DISPLAY_KEY)).toBe('false');
-        });
+        expect(localStorage.getItem(FILE_TREE_DISPLAY_KEY)).toBe('false');
       });
+    });
 
-      describe('when file tree display state is saved in local storage', () => {
-        beforeEach(() => {
-          localStorage.setItem(FILE_TREE_DISPLAY_KEY, 'true');
-          createComponent({
-            glFeatures: { pipelineEditorFileTree: true },
-            stubs: { PipelineEditorFileNav },
-          });
+    describe('when file tree display state is saved in local storage', () => {
+      beforeEach(() => {
+        localStorage.setItem(FILE_TREE_DISPLAY_KEY, 'true');
+        createComponent({
+          stubs: { PipelineEditorFileNav },
         });
+      });
 
-        it('shows the file tree by default', () => {
-          expect(findPipelineEditorFileTree().exists()).toBe(true);
-        });
+      it('shows the file tree by default', () => {
+        expect(findPipelineEditorFileTree().exists()).toBe(true);
       });
+    });
 
-      describe('when file tree display state is not saved in local storage', () => {
-        beforeEach(() => {
-          createComponent({
-            glFeatures: { pipelineEditorFileTree: true },
-            stubs: { PipelineEditorFileNav },
-          });
+    describe('when file tree display state is not saved in local storage', () => {
+      beforeEach(() => {
+        createComponent({
+          stubs: { PipelineEditorFileNav },
         });
+      });
 
-        it('hides the file tree by default', () => {
-          expect(findPipelineEditorFileTree().exists()).toBe(false);
-        });
+      it('hides the file tree by default', () => {
+        expect(findPipelineEditorFileTree().exists()).toBe(false);
       });
     });
   });
-- 
GitLab


From c8bfec39d16e8464d04e7e8e4a6ff82fcc636e0e Mon Sep 17 00:00:00 2001
From: Marcel Amirault <mamirault@gitlab.com>
Date: Tue, 17 May 2022 07:01:09 +0000
Subject: [PATCH 2/2] Keep feature flag note from before

---
 doc/ci/pipeline_editor/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ci/pipeline_editor/index.md b/doc/ci/pipeline_editor/index.md
index 8c95ae24556143..d87b336224c62b 100644
--- a/doc/ci/pipeline_editor/index.md
+++ b/doc/ci/pipeline_editor/index.md
@@ -53,7 +53,7 @@ reflected in the CI lint. It displays the same results as the existing [CI Lint
 
 ## View included CI/CD configuration
 
-> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/7064) in GitLab 15.0.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/7064) in GitLab 15.0 [with a flag](../../administration/feature_flags.md) named `pipeline_editor_file_tree`. Disabled by default.
 > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/357219) in GitLab 15.1.
 
 You can review configuration added with the [`include`](../yaml/index.md#include)
-- 
GitLab