Commit 3f4b98f8 authored by James Fargher's avatar James Fargher

Merge branch '213567-frontend-feature-flag-remove-save_issuable_health_status-flag' into 'master'

Remove save_issuable_health_status feature flag use in the frontend

See merge request gitlab-org/gitlab!40863
parents 4dbd1e2c 7606aef9
query($fullPath: ID!, $iid: String!) {
project(fullPath: $fullPath) {
issue(iid: $iid) {
iid
}
}
}
import sidebarDetailsQuery from 'ee_else_ce/sidebar/queries/sidebarDetails.query.graphql'; import sidebarDetailsQuery from 'ee_else_ce/sidebar/queries/sidebarDetails.query.graphql';
import sidebarDetailsForHealthStatusFeatureFlagQuery from 'ee_else_ce/sidebar/queries/sidebarDetailsForHealthStatusFeatureFlag.query.graphql';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import createGqClient, { fetchPolicies } from '~/lib/graphql'; import createGqClient, { fetchPolicies } from '~/lib/graphql';
...@@ -27,14 +26,10 @@ export default class SidebarService { ...@@ -27,14 +26,10 @@ export default class SidebarService {
} }
get() { get() {
const hasHealthStatusFeatureFlag = gon.features && gon.features.saveIssuableHealthStatus;
return Promise.all([ return Promise.all([
axios.get(this.endpoint), axios.get(this.endpoint),
gqClient.query({ gqClient.query({
query: hasHealthStatusFeatureFlag query: sidebarDetailsQuery,
? sidebarDetailsForHealthStatusFeatureFlagQuery
: sidebarDetailsQuery,
variables: { variables: {
fullPath: this.fullPath, fullPath: this.fullPath,
iid: this.iid.toString(), iid: this.iid.toString(),
......
query($fullPath: ID!, $iid: String!) { query($fullPath: ID!, $iid: String!) {
project(fullPath: $fullPath) { project(fullPath: $fullPath) {
issue(iid: $iid) { issue(iid: $iid) {
iid healthStatus
} }
} }
} }
query($fullPath: ID!, $iid: String!) {
project(fullPath: $fullPath) {
issue(iid: $iid) {
healthStatus
}
}
}
...@@ -10,10 +10,6 @@ module EE ...@@ -10,10 +10,6 @@ module EE
include DescriptionDiffActions include DescriptionDiffActions
before_action :whitelist_query_limiting_ee, only: [:update] before_action :whitelist_query_limiting_ee, only: [:update]
before_action do
push_frontend_feature_flag(:save_issuable_health_status, project.group, default_enabled: true)
end
end end
private private
......
...@@ -125,21 +125,6 @@ RSpec.describe 'Issue Sidebar' do ...@@ -125,21 +125,6 @@ RSpec.describe 'Issue Sidebar' do
expect(page).not_to have_selector('.block.health-status') expect(page).not_to have_selector('.block.health-status')
end end
end end
it 'pushes frontend feature flag saveIssuableHealthStatus' do
visit_issue(project, issue)
expect(page).to have_pushed_frontend_feature_flags(saveIssuableHealthStatus: true)
end
context 'when save_issuable_health_status feature flag is disabled' do
it 'pushes disabled frontend feature flag saveIssuableHealthStatus' do
stub_feature_flags(save_issuable_health_status: false)
visit_issue(project, issue)
expect(page).to have_pushed_frontend_feature_flags(saveIssuableHealthStatus: false)
end
end
end end
context 'Iterations', :js do context 'Iterations', :js do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment