Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 未命名版本有修改的配置文件与配置项顶置+支持筛选 --story=116041083 #2940

Merged
merged 1 commit into from
Feb 2, 2024
Merged

feat: 未命名版本有修改的配置文件与配置项顶置+支持筛选 --story=116041083 #2940

merged 1 commit into from
Feb 2, 2024

Conversation

Ambition9186
Copy link
Contributor

  • 未命名版本有修改的配置文件与配置项顶置+支持筛选
  • 模板配置和配置项排序

AlkaidChan
AlkaidChan reviewed Feb 2, 2024
View reviewed changes
bcs-services/bcs-bscp/pkg/dal/dao/template.go Outdated
@@ -236,9 +236,10 @@ func (dao *templateDao) List(kit *kit.Kit, bizID, templateSpaceID uint32, s sear
}
d := q.Where(m.BizID.Eq(bizID), m.TemplateSpaceID.Eq(templateSpaceID)).Where(conds...)
if len(topIds) != 0 {
d = d.Order(utils.NewCustomExpr(`CASE WHEN id IN (?) THEN 0 ELSE 1 END,path,name ASC`, []interface{}{topIds}))
d = d.Order(utils.NewCustomExpr(`CASE WHEN id IN (?) THEN 0 ELSE 1 END,CONCAT(path, name) ASC`,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里用的 CONCAT，能保证模板文件路径都是以 / 结尾吗

bcs-services/bcs-bscp/pkg/protocol/data-service/data_service.proto Outdated
@@ -1553,6 +1554,7 @@ message ListKvsReq {
string sort = 12;
string order = 13;
string top_ids = 14;
string change_status = 15;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个参数就叫 status 就行了，目前是没有歧义，可以注释列举一下可选的枚举值

bcs-services/bcs-bscp/pkg/protocol/data-service/data_service.proto Outdated
@@ -409,6 +409,7 @@ message ListConfigItemsReq {
string ids = 7;
bool all = 8;
bool with_status = 9;
string change_status = 10;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个参数就叫 status 就行了，目前是没有歧义，可以注释列举一下可选的枚举值

@AlkaidChan AlkaidChan merged commit 5a487b3 into TencentBlueKing:master Feb 2, 2024
11 checks passed
wenxinlee2015 added a commit that referenced this pull request Feb 5, 2024
@wenxinlee2015
Merge remote-tracking branch 'github-bk-bcs/master'
5f588e3 
* github-bk-bcs/master:
  feature: 完善导入AKS集群及集群扩缩容功能 (#2942)
  feat: 未命名版本有修改的配置文件与配置项顶置+支持筛选 (#2940)
@Ambition9186 Ambition9186 deleted the feature/config_item branch April 29, 2024 03:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlkaidChan AlkaidChan AlkaidChan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Ambition9186 @AlkaidChan