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

Revert "feat(mis/portal): 集群停用功能" #1264

Merged
merged 1 commit into from
May 24, 2024
Merged

Revert "feat(mis/portal): 集群停用功能" #1264

merged 1 commit into from
May 24, 2024

Conversation

ddadaal
Copy link
Member

@ddadaal ddadaal commented May 24, 2024

Reverts #1219
/

@pkuhpc-review-bot pkuhpc-review-bot bot added the Code-ReviewRequested Code Review Requested label May 24, 2024
@changeset-bot changeset-bot
Copy link

changeset-bot bot commented May 24, 2024

⚠️ No Changeset found

Latest commit: d6314bc

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

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

@ddadaal ddadaal merged commit a12a987 into master May 24, 2024
5 of 6 checks passed
@ddadaal ddadaal deleted the revert-1219-feat-suspend-cluster-by-admin branch May 24, 2024 12:43
@ddadaal ddadaal restored the revert-1219-feat-suspend-cluster-by-admin branch May 24, 2024 12:43
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 24, 2024 •
edited
Loading

PR Preview Action v1.4.7
Preview removed because the pull request was closed.
2024-05-24 12:45 UTC

piccaSun added a commit that referenced this pull request May 24, 2024
@piccaSun
Revert "Revert "feat(mis/portal): 集群停用功能" (#1264)"
1981cb0 
This reverts commit a12a987.
@piccaSun piccaSun mentioned this pull request May 24, 2024
Merged
ddadaal pushed a commit that referenced this pull request Jun 1, 2024
@piccaSun
feat(mis/portal): 集群停用功能 (#1266)
b8d1270 
Reverts #1264

### 做了什么
增加依赖于管理系统的数据库及grpc-api接口的集群停用功能
管理员在管理系统中进行集群停用后，集群在scow中停用
停用后集群中数据不再更新，上线后账户/作业等数据如需同步需手动同步
停用后理应在所有页面不再显示，但注意如历史作业等已经存在的数据可按原集群信息进行查询

**修改mis-web/portal-web下获取集群配置信息的方法为使用grpc api getClusterConfigFiles,
不再在config.js下直接读取配置
文件**
**更改集群配置时不再需要重启系统只需刷新页面**



![image](https://github.com/PKUHPC/SCOW/assets/43978285/566de74d-da9c-4587-b7a0-e977881c3af6)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/d7c3c991-5b30-4152-ab7a-c55e57d323a2)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/ff19386f-41ce-4086-90c2-e621508ca1fa)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/bd062972-2371-4e11-9b9b-33f2f47d9a01)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/04e5bbe0-6229-4536-b1ae-e9465809f474)

如果正在访问的集群不存在或没有可以使用的集群
则页面报错或跳转无可用集群页面

请测试老师测试时注意集群配置读取，集群停用时和再启用后的各相关功能
OYX-1 pushed a commit that referenced this pull request Jun 4, 2024
@piccaSun @OYX-1
feat(mis/portal): 集群停用功能 (#1266)
0ed8509 
Reverts #1264

增加依赖于管理系统的数据库及grpc-api接口的集群停用功能
管理员在管理系统中进行集群停用后，集群在scow中停用
停用后集群中数据不再更新，上线后账户/作业等数据如需同步需手动同步
停用后理应在所有页面不再显示，但注意如历史作业等已经存在的数据可按原集群信息进行查询

**修改mis-web/portal-web下获取集群配置信息的方法为使用grpc api getClusterConfigFiles,
不再在config.js下直接读取配置
文件**
**更改集群配置时不再需要重启系统只需刷新页面**

![image](https://github.com/PKUHPC/SCOW/assets/43978285/566de74d-da9c-4587-b7a0-e977881c3af6)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/d7c3c991-5b30-4152-ab7a-c55e57d323a2)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/ff19386f-41ce-4086-90c2-e621508ca1fa)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/bd062972-2371-4e11-9b9b-33f2f47d9a01)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/04e5bbe0-6229-4536-b1ae-e9465809f474)

如果正在访问的集群不存在或没有可以使用的集群
则页面报错或跳转无可用集群页面

请测试老师测试时注意集群配置读取，集群停用时和再启用后的各相关功能
OYX-1 pushed a commit that referenced this pull request Jun 4, 2024
@piccaSun @OYX-1
feat(mis/portal): 集群停用功能 (#1266)
d4f332a 
Reverts #1264

增加依赖于管理系统的数据库及grpc-api接口的集群停用功能
管理员在管理系统中进行集群停用后，集群在scow中停用
停用后集群中数据不再更新，上线后账户/作业等数据如需同步需手动同步
停用后理应在所有页面不再显示，但注意如历史作业等已经存在的数据可按原集群信息进行查询

**修改mis-web/portal-web下获取集群配置信息的方法为使用grpc api getClusterConfigFiles,
不再在config.js下直接读取配置
文件**
**更改集群配置时不再需要重启系统只需刷新页面**

![image](https://github.com/PKUHPC/SCOW/assets/43978285/566de74d-da9c-4587-b7a0-e977881c3af6)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/d7c3c991-5b30-4152-ab7a-c55e57d323a2)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/ff19386f-41ce-4086-90c2-e621508ca1fa)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/bd062972-2371-4e11-9b9b-33f2f47d9a01)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/04e5bbe0-6229-4536-b1ae-e9465809f474)

如果正在访问的集群不存在或没有可以使用的集群
则页面报错或跳转无可用集群页面

请测试老师测试时注意集群配置读取，集群停用时和再启用后的各相关功能
OYX-1 pushed a commit that referenced this pull request Jul 4, 2024
@ddadaal @OYX-1
Revert "feat(mis/portal): 集群停用功能" (#1264)
5eed030 
Reverts #1219
/
OYX-1 pushed a commit that referenced this pull request Jul 4, 2024
@piccaSun @OYX-1
feat(mis/portal): 集群停用功能 (#1266)
51a1d28 
Reverts #1264

### 做了什么
增加依赖于管理系统的数据库及grpc-api接口的集群停用功能
管理员在管理系统中进行集群停用后，集群在scow中停用
停用后集群中数据不再更新，上线后账户/作业等数据如需同步需手动同步
停用后理应在所有页面不再显示，但注意如历史作业等已经存在的数据可按原集群信息进行查询

**修改mis-web/portal-web下获取集群配置信息的方法为使用grpc api getClusterConfigFiles,
不再在config.js下直接读取配置
文件**
**更改集群配置时不再需要重启系统只需刷新页面**



![image](https://github.com/PKUHPC/SCOW/assets/43978285/566de74d-da9c-4587-b7a0-e977881c3af6)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/d7c3c991-5b30-4152-ab7a-c55e57d323a2)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/ff19386f-41ce-4086-90c2-e621508ca1fa)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/bd062972-2371-4e11-9b9b-33f2f47d9a01)

![image](https://github.com/PKUHPC/SCOW/assets/43978285/04e5bbe0-6229-4536-b1ae-e9465809f474)

如果正在访问的集群不存在或没有可以使用的集群
则页面报错或跳转无可用集群页面

请测试老师测试时注意集群配置读取，集群停用时和再启用后的各相关功能
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Code-ReviewRequested Code Review Requested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ddadaal