Skip to content
代码片段 群组 项目
提交 2cd6c501 编辑于 作者: Mireya Andres's avatar Mireya Andres
浏览文件

Cleanup ci_group_env_scope_graphql feature flag

By default, the environment scope dropdown for group CI variables
will now fetch data via the new GraphQL query.

Changelog: added
上级 c7353cc2
No related branches found
No related tags found
无相关合并请求
......@@ -23,15 +23,6 @@ export default {
graphqlId() {
return convertToGraphQLId(TYPENAME_GROUP, this.groupId);
},
queriesAvailable() {
if (this.glFeatures.ciGroupEnvScopeGraphql) {
return this.$options.queryData;
}
return {
ciVariables: this.$options.queryData.ciVariables,
};
},
},
mutationData: {
[ADD_MUTATION_ACTION]: addGroupVariable,
......@@ -59,6 +50,6 @@ export default {
entity="group"
:full-path="groupPath"
:mutation-data="$options.mutationData"
:query-data="queriesAvailable"
:query-data="$options.queryData"
/>
</template>
......@@ -14,7 +14,6 @@ class CiCdController < Groups::ApplicationController
feature_category :continuous_integration
before_action do
push_frontend_feature_flag(:ci_group_env_scope_graphql, group)
push_frontend_feature_flag(:ci_variables_pages, current_user)
end
......
---
name: ci_group_env_scope_graphql
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124134
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416385
milestone: '16.2'
type: development
group: group::pipeline security
default_enabled: false
......@@ -30,7 +30,6 @@ describe('Ci Group Variable wrapper', () => {
provide: {
...mockProvide,
glFeatures: {
ciGroupEnvScopeGraphql: false,
groupScopedCiVariables: false,
...featureFlags,
},
......@@ -61,6 +60,10 @@ describe('Ci Group Variable wrapper', () => {
lookup: expect.any(Function),
query: getGroupVariables,
},
environments: {
lookup: expect.any(Function),
query: getGroupEnvironments,
},
},
refetchAfterMutation: false,
});
......@@ -88,26 +91,4 @@ describe('Ci Group Variable wrapper', () => {
});
});
});
describe('ciGroupEnvScopeGraphql feature flag', () => {
describe('When enabled', () => {
beforeEach(() => {
createComponent({ featureFlags: { ciGroupEnvScopeGraphql: true } });
});
it('Passes down environments query to variable shared component', () => {
expect(findCiShared().props('queryData').environments.query).toBe(getGroupEnvironments);
});
});
describe('When disabled', () => {
beforeEach(() => {
createComponent();
});
it('Does not pass down environments query to variable shared component', () => {
expect(findCiShared().props('queryData').environments).toBe(undefined);
});
});
});
});
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册