Merge branch 'enable-deployments-filters' into 'master'

Enable deployments filters

See merge request gitlab-org/gitlab!46683

app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js

@@ -96,43 +96,41 @@ export default (IssuableTokenKeys, disableTargetBranchFilter = false) => {
   IssuableTokenKeys.tokenKeysWithAlternative.splice(tokenPosition, 0, ...[approvedBy.token]);
   IssuableTokenKeys.conditions.push(...approvedBy.condition);
 
-  if (gon?.features?.deploymentFilters) {
-    const environmentToken = {
-      formattedKey: __('Environment'),
-      key: 'environment',
-      type: 'string',
-      param: '',
-      symbol: '',
-      icon: 'cloud-gear',
-      tag: 'environment',
-    };
+  const environmentToken = {
+    formattedKey: __('Environment'),
+    key: 'environment',
+    type: 'string',
+    param: '',
+    symbol: '',
+    icon: 'cloud-gear',
+    tag: 'environment',
+  };
 
-    const deployedBeforeToken = {
-      formattedKey: __('Deployed-before'),
-      key: 'deployed-before',
-      type: 'string',
-      param: '',
-      symbol: '',
-      icon: 'clock',
-      tag: 'deployed_before',
-    };
+  const deployedBeforeToken = {
+    formattedKey: __('Deployed-before'),
+    key: 'deployed-before',
+    type: 'string',
+    param: '',
+    symbol: '',
+    icon: 'clock',
+    tag: 'deployed_before',
+  };
 
-    const deployedAfterToken = {
-      formattedKey: __('Deployed-after'),
-      key: 'deployed-after',
-      type: 'string',
-      param: '',
-      symbol: '',
-      icon: 'clock',
-      tag: 'deployed_after',
-    };
+  const deployedAfterToken = {
+    formattedKey: __('Deployed-after'),
+    key: 'deployed-after',
+    type: 'string',
+    param: '',
+    symbol: '',
+    icon: 'clock',
+    tag: 'deployed_after',
+  };
 
-    IssuableTokenKeys.tokenKeys.push(environmentToken, deployedBeforeToken, deployedAfterToken);
+  IssuableTokenKeys.tokenKeys.push(environmentToken, deployedBeforeToken, deployedAfterToken);
 
-    IssuableTokenKeys.tokenKeysWithAlternative.push(
-      environmentToken,
-      deployedBeforeToken,
-      deployedAfterToken,
-    );
-  }
+  IssuableTokenKeys.tokenKeysWithAlternative.push(
+    environmentToken,
+    deployedBeforeToken,
+    deployedAfterToken,
+  );
 };

app/controllers/groups_controller.rb

@@ -30,7 +30,6 @@ class GroupsController < Groups::ApplicationController
 
   before_action do
     push_frontend_feature_flag(:vue_issuables_list, @group)
-    push_frontend_feature_flag(:deployment_filters)
   end
 
   before_action do
@@ -181,8 +180,6 @@ class GroupsController < Groups::ApplicationController
   end
 
   def unfoldered_environment_names
-    return render_404 unless Feature.enabled?(:deployment_filters)
-
     respond_to do |format|
       format.json do
         render json: EnvironmentNamesFinder.new(@group, current_user).execute

app/controllers/projects/merge_requests_controller.rb

@@ -48,7 +48,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
 
   before_action do
     push_frontend_feature_flag(:vue_issuable_sidebar, @project.group)
-    push_frontend_feature_flag(:deployment_filters)
   end
 
   around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]

app/controllers/projects_controller.rb

@@ -317,8 +317,6 @@ class ProjectsController < Projects::ApplicationController
   end
 
   def unfoldered_environment_names
-    return render_404 unless Feature.enabled?(:deployment_filters)
-
     respond_to do |format|
       format.json do
         render json: EnvironmentNamesFinder.new(@project, current_user).execute

app/finders/merge_requests_finder.rb

@@ -155,19 +155,6 @@ class MergeRequestsFinder < IssuableFinder
       .or(table[:title].matches('(Draft)%'))
   end
 
-  # rubocop: disable CodeReuse/ActiveRecord
-  def by_deployment(items)
-    return items unless deployment_id
-
-    items.includes(:deployment_merge_requests)
-         .where(deployment_merge_requests: { deployment_id: deployment_id })
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
-  def deployment_id
-    @deployment_id ||= params[:deployment_id].presence
-  end
-
   # Filter by merge requests that had been approved by specific users
   # rubocop: disable CodeReuse/Finder
   def by_approvals(items)
@@ -178,10 +165,6 @@ class MergeRequestsFinder < IssuableFinder
   # rubocop: enable CodeReuse/Finder
 
   def by_deployments(items)
-    # Until this feature flag is enabled permanently, we retain the old
-    # filtering behaviour/code.
-    return by_deployment(items) unless Feature.enabled?(:deployment_filters)
-
     env = params[:environment]
     before = params[:deployed_before]
     after = params[:deployed_after]

changelogs/unreleased/enable-deployments-filters.yml

+---
+title: Add merge requests filters for filtering by environments and deployment dates
+merge_request: 46683
+author:
+type: added

config/feature_flags/development/deployment_filters.yml

----
-name: deployment_filters
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44041
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267561
-type: development
-group: group::source code
-default_enabled: false