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.

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

fix(mis): 消费记录、充值记录搜索功能优化 #1152

Merged
merged 38 commits into from
May 9, 2024

Conversation

OYX-1
Copy link
Contributor

@OYX-1 OYX-1 commented Mar 4, 2024

消费记录类型选择框修改

账户管理->消费记录、租户管理->账户消费记录,平台管理->账户消费记录:
1、类型改为多选
2、类型选择下拉框不隐藏文字信息

改进前

1713859929246

改进后

1713860086118
1713860050066

充值记录类型选择框修改

账户管理->充值记录,租户管理->账户充值记录,租户管理->租户充值记录,平台管理->充值记录:
1、增加充值类型搜索
2、类型搜索框进行trim

改进前

1713860486279

改进后

1713860541548
1713862788038

账户搜索框修改

租户管理->账户消费记录,租户管理->账户充值记录,平台管理->账户消费记录:
1、账户搜索框改为可以输入多个
2、账户搜索框,允许直接输入内容后,不用再点击搜索结果也可以进行搜索

改进前

修改前

改进后

修改后

其他

1、导出功能根据类型从string->string[]同步更新
2、mis、audit中测试用例随着账户名和类型可多选,string->string[],随之修改和增加
3、mis、audit中日志相关随string->string[]进行一定修改
连锁i修改,操作日志,体现单选、多选、全选,并兼容过去记录:
微信截图_20240507114137

@pkuhpc-review-bot pkuhpc-review-bot bot added the Code-ReviewRequested Code Review Requested label Mar 4, 2024
@pkuhpc-review-bot pkuhpc-review-bot bot requested a review from ddadaal March 4, 2024 08:09
Copy link

changeset-bot bot commented Mar 4, 2024

🦋 Changeset detected

Latest commit: 0dd2263

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 15 packages
Name Type
@scow/grpc-api Minor
@scow/mis-server Patch
@scow/mis-web Patch
@scow/protos Patch
@scow/lib-hook Patch
@scow/lib-operation-log Patch
@scow/lib-scheduler-adapter Patch
@scow/lib-server Patch
@scow/audit-server Patch
@scow/portal-server Patch
@scow/portal-web Patch
@scow/ai Patch
@scow/auth Patch
@scow/gateway Patch
@scow/cli Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@OYX-1 OYX-1 marked this pull request as draft March 4, 2024 08:20
@OYX-1 OYX-1 removed the request for review from ddadaal March 4, 2024 11:35
@cuvalign cuvalign marked this pull request as ready for review April 23, 2024 07:35
@cuvalign cuvalign requested review from ddadaal and removed request for ddadaal April 23, 2024 07:41
Copy link
Member

@ddadaal ddadaal left a comment

Choose a reason for hiding this comment

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

所有修改SCOW API的变化需要确保兼容性!仔细阅读开发文档里的版本控制 -> Protobuf接口版本兼容性方案

protos/audit/operation_log.proto Outdated Show resolved Hide resolved
protos/server/export.proto Outdated Show resolved Hide resolved
protos/server/export.proto Outdated Show resolved Hide resolved
protos/server/charging.proto Outdated Show resolved Hide resolved
protos/server/export.proto Outdated Show resolved Hide resolved
@pkuhpc-review-bot pkuhpc-review-bot bot added Code-ChangeRequested and removed Code-ReviewRequested Code Review Requested labels Apr 24, 2024
@cuvalign cuvalign requested a review from ddadaal April 30, 2024 17:55
@pkuhpc-review-bot pkuhpc-review-bot bot added Code-ReviewRequested Code Review Requested and removed Code-ChangeRequested labels Apr 30, 2024
@cuvalign
Copy link
Contributor

7dd42ae是不合并前较完善版本,后续为中间版本。请检查4d809b6(自测导出平台日志没有输入操作行为时会报错)和62dee63(本地pnpm test有问题,但单独测报错文件又没报错),在合并SpecificAccountsOfTenant到AccountsOfTenantTarget后,日志思路不大确定。日志的AccountsOfTenant是否需要accountNames或者部分保留SpecificAccountsOfTenant?目前UI中mis没有涉及,但未来AI或后续也有相关?总之可能涉及不同方向。希望先确认一下思路。

Copy link
Member

@ddadaal ddadaal left a comment

Choose a reason for hiding this comment

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

改一下就行

@@ -0,0 +1,5 @@
---
"@scow/grpc-api": patch
Copy link
Member

Choose a reason for hiding this comment

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

根据规则,修改了API,但是兼容当前的API,则需要提高minor版本。

@pkuhpc-review-bot pkuhpc-review-bot bot added Code-Approved Code Review approved ReadyForMerge Ready for merge and removed Code-ReviewRequested Code Review Requested labels May 5, 2024
Comment on lines 171 to 172
// 返回多个特定账户的消费记录
AccountsTarget accounts = 10;
Copy link
Member

Choose a reason for hiding this comment

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

这个target是否可以使用AccountsOfAllTenantsTarget代替?因为虽然实际上账户名是全局唯一的,但是这是因为底层是用的slurm,slurm保证的账户名全局唯一,但是SCOW这一层并不要求账户名必须全局唯一,而只保证租户中账户名唯一,SCOW的API也要和SCOW的设计一致。

Copy link
Member

Choose a reason for hiding this comment

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

日志部分同样考虑下这个问题,并且仍然合并到AccountsOfTenant里去

@pkuhpc-review-bot pkuhpc-review-bot bot added Code-ChangeRequested and removed Code-Approved Code Review approved ReadyForMerge Ready for merge labels May 5, 2024
@cuvalign
Copy link
Contributor

cuvalign commented May 7, 2024

已经合并了AccountsTarget进入AccountsOfAllTenantsTarget,日志进行同步修改,并且兼容了先前没有accountNames的情况。连锁修改,日志的消费和充值记录中,能体现单选、多选、全选。

@cuvalign cuvalign requested a review from ddadaal May 7, 2024 03:59
@pkuhpc-review-bot pkuhpc-review-bot bot added Code-ReviewRequested Code Review Requested and removed Code-ChangeRequested labels May 7, 2024
@pkuhpc-review-bot pkuhpc-review-bot bot added Code-Approved Code Review approved ReadyForMerge Ready for merge and removed Code-ReviewRequested Code Review Requested labels May 9, 2024
@ddadaal ddadaal merged commit a53bcad into master May 9, 2024
11 checks passed
@ddadaal ddadaal deleted the fix-search-optimize branch May 9, 2024 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code-Approved Code Review approved ReadyForMerge Ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants