Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
Container registry
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
4be3f387
提交
4be3f387
编辑于
9 months ago
作者:
Eugenia Grieff
浏览文件
操作
下载
补丁
差异文件
Add support for legacy epic references in workItemsByReference query
Add specs Changelog: added EE: true
上级
85ebf80c
No related branches found
No related tags found
无相关合并请求
变更
2
隐藏空白变更内容
行内
左右并排
显示
2 个更改的文件
app/graphql/resolvers/work_item_references_resolver.rb
+9
-4
9 个添加, 4 个删除
app/graphql/resolvers/work_item_references_resolver.rb
ee/spec/requests/api/graphql/work_items/work_items_by_reference_spec.rb
+34
-6
34 个添加, 6 个删除
...ts/api/graphql/work_items/work_items_by_reference_spec.rb
有
43 个添加
和
10 个删除
app/graphql/resolvers/work_item_references_resolver.rb
+
9
−
4
浏览文件 @
4be3f387
...
@@ -45,15 +45,20 @@ def resolve_with_lookahead(context_namespace_path: nil, refs: [])
...
@@ -45,15 +45,20 @@ def resolve_with_lookahead(context_namespace_path: nil, refs: [])
# rubocop: disable CodeReuse/ActiveRecord -- #references is not an ActiveRecord method
# rubocop: disable CodeReuse/ActiveRecord -- #references is not an ActiveRecord method
def
find_work_items
(
references
)
def
find_work_items
(
references
)
# Also check for references with :issue pattern to find legacy issues
epic_refs
,
issue_refs
=
references
.
partition
{
|
r
|
r
.
match?
(
/epics|&/
)
}
item_ids
=
references_extractor
(
references
).
references
(
:issue
,
ids_only:
true
)
item_ids
=
references_extractor
(
issue_refs
)
&
.
references
(
:work_item
,
ids_only:
true
)
||
[]
item_ids
<<
references_extractor
(
references
).
references
(
:work_item
,
ids_only:
true
)
WorkItem
.
id_in
(
item_ids
.
flatten
)
# Also check for references with :issue and :epic patterns to find legacy items
item_ids
<<
references_extractor
(
issue_refs
)
&
.
references
(
:issue
,
ids_only:
true
)
item_ids
<<
references_extractor
(
epic_refs
)
&
.
references
(
:epic
)
&
.
pluck
(
:issue_id
)
WorkItem
.
id_in
(
item_ids
.
flatten
.
compact
)
end
end
# rubocop: enable CodeReuse/ActiveRecord
# rubocop: enable CodeReuse/ActiveRecord
def
references_extractor
(
refs
)
def
references_extractor
(
refs
)
return
unless
refs
.
any?
extractor
,
analyze_context
=
extractor
,
analyze_context
=
if
container
.
is_a?
(
Group
)
if
container
.
is_a?
(
Group
)
[
::
Gitlab
::
ReferenceExtractor
.
new
(
nil
,
context
[
:current_user
]),
{
group:
container
}]
[
::
Gitlab
::
ReferenceExtractor
.
new
(
nil
,
context
[
:current_user
]),
{
group:
container
}]
...
...
此差异已折叠。
点击以展开。
ee/spec/requests/api/graphql/work_items/work_items_by_reference_spec.rb
+
34
−
6
浏览文件 @
4be3f387
...
@@ -13,18 +13,38 @@
...
@@ -13,18 +13,38 @@
let_it_be
(
:work_item_epic1
)
{
create
(
:work_item
,
:epic
,
namespace:
public_group
)
}
let_it_be
(
:work_item_epic1
)
{
create
(
:work_item
,
:epic
,
namespace:
public_group
)
}
let_it_be
(
:work_item_epic2
)
{
create
(
:work_item
,
:epic
,
namespace:
public_group
)
}
let_it_be
(
:work_item_epic2
)
{
create
(
:work_item
,
:epic
,
namespace:
public_group
)
}
let_it_be
(
:private_work_item_epic
)
{
create
(
:work_item
,
:epic
,
namespace:
private_group
)
}
let_it_be
(
:private_work_item_epic
)
{
create
(
:work_item
,
:epic
,
namespace:
private_group
)
}
let_it_be
(
:legacy_epic1
)
{
create
(
:epic
,
group:
public_group
)
}
let_it_be
(
:legacy_epic2
)
{
create
(
:epic
,
group:
public_group
)
}
let_it_be
(
:legacy_issue1
)
{
create
(
:issue
,
project:
public_project
)
}
let_it_be
(
:legacy_issue2
)
{
create
(
:issue
,
project:
public_project
)
}
let
(
:references
)
do
let
(
:references
)
do
[
[
task
.
to_reference
(
full:
true
),
task
.
to_reference
(
full:
true
),
work_item_epic1
.
to_reference
(
full:
true
),
work_item_epic1
.
to_reference
(
full:
true
),
Gitlab
::
UrlBuilder
.
build
(
work_item_epic2
),
Gitlab
::
UrlBuilder
.
build
(
work_item_epic2
),
private_work_item_epic
.
to_reference
(
full:
true
)
private_work_item_epic
.
to_reference
(
full:
true
),
Gitlab
::
UrlBuilder
.
build
(
legacy_epic1
),
legacy_epic2
.
to_reference
(
full:
true
),
Gitlab
::
UrlBuilder
.
build
(
legacy_issue1
),
legacy_issue2
.
to_reference
(
full:
true
)
]
]
end
end
before
do
stub_licensed_features
(
epics:
true
)
end
shared_examples
'response with accessible work items'
do
shared_examples
'response with accessible work items'
do
let
(
:items
)
{
[
work_item_epic2
,
work_item_epic1
,
task
]
}
let
(
:issue_work_item1
)
{
WorkItem
.
find
(
legacy_issue1
.
id
)
}
let
(
:issue_work_item2
)
{
WorkItem
.
find
(
legacy_issue2
.
id
)
}
let
(
:items
)
do
[
issue_work_item2
,
issue_work_item1
,
legacy_epic2
.
work_item
,
legacy_epic1
.
work_item
,
work_item_epic2
,
work_item_epic1
,
task
]
end
it_behaves_like
'a working graphql query that returns data'
do
it_behaves_like
'a working graphql query that returns data'
do
before
do
before
do
...
@@ -42,22 +62,30 @@
...
@@ -42,22 +62,30 @@
it
'avoids N+1 queries'
,
:use_sql_query_cache
do
it
'avoids N+1 queries'
,
:use_sql_query_cache
do
post_graphql
(
query
,
current_user:
current_user
)
# warm up
post_graphql
(
query
,
current_user:
current_user
)
# warm up
references1
=
[
task
,
work_item_epic1
,
work_item_epic2
].
map
{
|
item
|
item
.
to_reference
(
full:
true
)
}
control_count
=
ActiveRecord
::
QueryRecorder
.
new
(
skip_cached:
false
)
do
control_count
=
ActiveRecord
::
QueryRecorder
.
new
(
skip_cached:
false
)
do
post_graphql
(
query
,
current_user:
current_user
)
post_graphql
(
query
(
refs:
references1
)
,
current_user:
current_user
)
end
end
expect
(
graphql_data_at
(
'workItemsByReference'
,
'nodes'
).
size
).
to
eq
(
3
)
expect
(
graphql_data_at
(
'workItemsByReference'
,
'nodes'
).
size
).
to
eq
(
3
)
extra_work_items
=
create_list
(
:work_item
,
3
,
:epic
,
namespace:
public_group
)
extra_work_items
=
create_list
(
:work_item
,
3
,
:epic
,
namespace:
public_group
)
ref
s
=
references
+
extra_work_items
.
map
{
|
item
|
item
.
to_reference
(
full:
true
)
}
ref
erences2
=
references
1
+
extra_work_items
.
map
{
|
item
|
item
.
to_reference
(
full:
true
)
}
expect
do
expect
do
post_graphql
(
query
(
refs:
ref
s
),
current_user:
current_user
)
post_graphql
(
query
(
refs:
ref
erences2
),
current_user:
current_user
)
end
.
not_to
exceed_all_query_limit
(
control_count
)
end
.
not_to
exceed_all_query_limit
(
control_count
)
expect
(
graphql_data_at
(
'workItemsByReference'
,
'nodes'
).
size
).
to
eq
(
6
)
expect
(
graphql_data_at
(
'workItemsByReference'
,
'nodes'
).
size
).
to
eq
(
6
)
end
end
context
'with access to private group'
do
context
'with access to private group'
do
let
(
:items
)
{
[
private_work_item_epic
,
work_item_epic2
,
work_item_epic1
,
task
]
}
let
(
:items
)
do
[
issue_work_item2
,
issue_work_item1
,
legacy_epic2
.
work_item
,
legacy_epic1
.
work_item
,
private_work_item_epic
,
work_item_epic2
,
work_item_epic1
,
task
]
end
before_all
do
before_all
do
private_group
.
add_guest
(
current_user
)
private_group
.
add_guest
(
current_user
)
...
...
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录