This repository has been archived by the owner on Jan 24, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 21
feat: 批量增加接口限制并发数量为5 #10
Open
smartcatboy
wants to merge
1
commit into
Aurora-Admin-Panel:main
Choose a base branch
from
smartcatboy:feature2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
import React, { useEffect, useState } from "react"; | ||
import { useDispatch } from "react-redux"; | ||
import promiseLimit from 'promise-limit' | ||
|
||
import { | ||
Button, | ||
|
@@ -15,15 +16,16 @@ import Modal from '../components/Modals/Modal' | |
|
||
import AuthSelector from "../components/AuthSelector" | ||
import { | ||
getServerPorts, | ||
createServerPort, | ||
bulkCreateServerPort, | ||
editServerPort, | ||
deleteServerPort, | ||
editServerPortUsage, | ||
} from "../redux/actions/ports"; | ||
import { formatSpeed, formatQuota } from "../utils/formatter"; | ||
import { SpeedLimitOptions, QuotaOptions, DueActionOptions, DateOptions } from "../utils/constants" | ||
|
||
const CREATE_PORT_LIMIT = 5 | ||
|
||
const PortEditor = ({ port, serverId, isModalOpen, setIsModalOpen }) => { | ||
const dispatch = useDispatch(); | ||
|
@@ -77,7 +79,7 @@ const PortEditor = ({ port, serverId, isModalOpen, setIsModalOpen }) => { | |
dispatch(editServerPortUsage(serverId, port.id, data)); | ||
setIsModalOpen(false); | ||
}; | ||
const submitForm = () => { | ||
const submitForm = async () => { | ||
if (isDelete) { | ||
dispatch(deleteServerPort(serverId, port.id)); | ||
} else { | ||
|
@@ -109,25 +111,26 @@ const PortEditor = ({ port, serverId, isModalOpen, setIsModalOpen }) => { | |
} else { | ||
const numStr = num.toString(); | ||
const idx = numStr.indexOf('-') | ||
if (idx !== -1) { | ||
const start = parseInt(numStr.slice(0, idx)) | ||
const end = parseInt(numStr.slice(idx + 1)) | ||
dispatch(bulkCreateServerPort(serverId, [...Array(end - start + 1).keys()].map(i => ( | ||
{ | ||
num: i + start, | ||
external_num: null, | ||
config: { | ||
egress_limit: null, | ||
ingress_limit: null, | ||
valid_until: null, | ||
due_action: 0, | ||
quota: null, | ||
quota_action: 0, | ||
} | ||
})))); | ||
} else { | ||
dispatch(createServerPort(serverId, data)); | ||
} | ||
const isBatch = idx !== -1 | ||
const start = parseInt(numStr.slice(0, idx)) | ||
const end = parseInt(numStr.slice(idx + 1)) | ||
const portsData = !isBatch ? data : [...Array(end - start + 1).keys()].map(i => ({ | ||
num: i + start, | ||
external_num: null, | ||
config: { | ||
egress_limit: null, | ||
ingress_limit: null, | ||
valid_until: null, | ||
due_action: 0, | ||
quota: null, | ||
quota_action: 0, | ||
} | ||
})) | ||
const limit = promiseLimit(CREATE_PORT_LIMIT) | ||
await Promise.all(portsData.map(c => limit(() => new Promise(r => { | ||
dispatch(createServerPort(serverId, c)).then(r) | ||
})))) | ||
await getServerPorts(serverId) | ||
Comment on lines
+115
to
+133
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. component不应该关注bulk create的逻辑如何实现,放到action层会比较好。最简单的道理,如果我在其他地方再加个批量的按钮,我得把这块代码再复制黏贴一遍? |
||
} | ||
} | ||
setIsModalOpen(false); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,23 +64,13 @@ export const getServerPorts = (server_id, page = null, size = null) => { | |
}; | ||
|
||
export const createServerPort = (server_id, data) => { | ||
return (dispatch) => { | ||
return async (dispatch) => { | ||
dispatch({ type: LOAD_SERVER_PORTS }) | ||
serverPortCreate(server_id, data) | ||
return serverPortCreate(server_id, data) | ||
.catch((error) => handleError(dispatch, error)) | ||
.then(() => dispatch(getServerPorts(server_id))) | ||
}; | ||
}; | ||
|
||
export const bulkCreateServerPort = (server_id, data_array) => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 为什么不把promise_limit的逻辑放到这一层? |
||
return (dispatch) => { | ||
dispatch({ type: LOAD_SERVER_PORTS }) | ||
Promise.all(data_array.map(data => serverPortCreate(server_id, data))) | ||
.catch((error) => handleError(dispatch, error)) | ||
.then(() => dispatch(getServerPorts(server_id))) | ||
} | ||
} | ||
|
||
export const deleteServerPort = (server_id, port_id) => { | ||
return (dispatch) => { | ||
serverPortDelete(server_id, port_id) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这tab可不可以稍微整理下,至少保持整个项目一致吧