Merge pull request #72 from xpack-ai/feat/resource-group-management

feat:  resource-group-management
This commit is contained in:
ningyv authored and GitHub committed 2025-12-16 14:20:53 +08:00
commit ada170e525
5 files changed
+14 -23

No files matched your search

@@ -123,7 +123,7 @@ export const UserTable: React.FC<UserTableProps> = ({
>
<TableHeader>
<TableColumn>{t("Email")}</TableColumn>
<TableColumn>{t("Resource Group")}</TableColumn>
<TableColumn width={250}>{t("Resource Group")}</TableColumn>
<TableColumn>{t("Register Date")}</TableColumn>
<TableColumn>{t("Balance")}</TableColumn>
<TableColumn>{t("Actions")}</TableColumn>
@@ -143,7 +143,7 @@ export const UserTable: React.FC<UserTableProps> = ({
<Select
items={simpleResourceGroups}
placeholder={t("Select resource group")}
selectedKeys={user.resource_group ? [user.resource_group] : []}
selectedKeys={user.group_id ? [user.group_id] : []}
onSelectionChange={(keys) => {
const selectedKey = Array.from(keys)[0] as string;
if (selectedKey) {
@@ -151,7 +151,7 @@ export const UserTable: React.FC<UserTableProps> = ({
}
}}
size="sm"
className="min-w-[200px]"
className="max-w-[250px]"
aria-label={t("Select resource group")}
>
{(group) => (
+2 -2
View File
@@ -109,8 +109,8 @@ export const useMCPServiceDetail = () => {
* @param keyword 关键词
* @returns 资源组列表
*/
const fetchMCPResourceGroups = useCallback(async (page: number, page_size: number, keyword: string): Promise<GetMCPResourceGroupsParams> => {
const response = await fetchMCPResourceGroupsAPI(page, page_size, keyword);
const fetchMCPResourceGroups = useCallback(async (id: string, page: number, page_size: number, keyword: string): Promise<GetMCPResourceGroupsParams> => {
const response = await fetchMCPResourceGroupsAPI(id, page, page_size, keyword);
return response;
}, []);
+6 -15
View File
@@ -229,10 +229,9 @@ export const parseOpenAPIDocumentForUpdate = async (
/**
* 获取资源组列表
*/
export const fetchMCPResourceGroups = async (page: number, page_size: number, keyword: string): Promise<GetMCPResourceGroupsParams> => {
export const fetchMCPResourceGroups = async (id: string, page: number, page_size: number, keyword: string): Promise<GetMCPResourceGroupsParams> => {
try {
// const response = await fetchAPI<ResourceGroup[]>(`/api/service/resource_group/list?page=${page}&page_size=${page_size}&keyword=${keyword}`);
const response = await fetchAdminAPI<MCPResourceGroupResponse[]>(`http://uat.apikit.com:11204/mockApi/CaAau8f9f09663d610e0d7d919412be238695b46d0a44b1/api/service/resource_group/list?page=${page}&page_size=${page_size}&keyword=${keyword}`);
const response = await fetchAdminAPI<MCPResourceGroupResponse[]>(`/api/resource_group/service/list?id=${id}&page=${page}&page_size=${page_size}&keyword=${keyword}`);
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to load resource groups"));
return {
@@ -264,14 +263,10 @@ export const fetchMCPResourceGroups = async (page: number, page_size: number, ke
*/
export const deleteResourceGroup = async (serviceById: string, resourceGroupId: string): Promise<boolean> => {
try {
const response = await fetchAdminAPI<ApiObjectResponse<boolean>>(`http://uat.apikit.com:11204/mockApi/CaAau8f9f09663d610e0d7d919412be238695b46d0a44b1/api/service/resource_group`, {
const response = await fetchAdminAPI<boolean>(`/api/resource_group/service?id=${serviceById}`, {
method: "DELETE",
body: { id: serviceById, resource_group: resourceGroupId } as unknown as BodyInit,
body: { services: resourceGroupId } as unknown as BodyInit,
});
// const response = await fetchAPI<ApiObjectResponse<boolean>>(`/api/service/resource_group`, {
// method: "DELETE"
// body: { id: serviceById, resource_group: resourceGroupId } as unknown as BodyInit,
// });
if (!response.success) {
toast.error(response?.error_message || i18n.t("Failed to delete resource group"));
return false;
@@ -291,14 +286,10 @@ export const addServiceToGroup = async (
services: string[]
): Promise<boolean> => {
try {
const response = await fetchAdminAPI<ApiObjectResponse<boolean>>(`http://uat.apikit.com:11204/mockApi/CaAau8f9f09663d610e0d7d919412be238695b46d0a44b1/api/service/resource_group`, {
const response = await fetchAdminAPI<boolean>(`/api/resource_group/service?id=${groupId}`, {
method: "PUT",
body: { id: groupId, resource_group: services } as unknown as BodyInit,
body: { services: services } as unknown as BodyInit,
});
// const response = await fetchAPI<ApiObjectResponse<boolean>>(`/api/service/resource_group`, {
// method: "PUT"
// body: { id: groupId, resource_group: services } as unknown as BodyInit,
// });
if (!response.success) {
toast.error(response?.error_message || i18n.t("Failed to add service to group"));
return false;
@@ -30,7 +30,7 @@ export interface ResourceGroup {
interface ResourceGroupProps {
deleteResourceGroup: (serviceById: string, resourceGroupId: string) => Promise<boolean>;
fetchMCPResourceGroups: (page: number, page_size: number, keyword: string) => Promise<GetMCPResourceGroupsParams>;
fetchMCPResourceGroups: (id: string, page: number, page_size: number, keyword: string) => Promise<GetMCPResourceGroupsParams>;
addServiceToGroup: (groupId: string, serverIds: string[]) => Promise<boolean>;
formData: MCPServiceFormData;
}
@@ -70,7 +70,7 @@ const ResourceGroup: React.FC<ResourceGroupProps> = ({
) => {
setLoading(true);
try {
const response = await fetchMCPResourceGroups(page, pageSize, keyword);
const response = await fetchMCPResourceGroups(formData?.id || "", page, pageSize, keyword);
setResourceGroups(response.data);
setPagination({
page: response.page,
+1 -1
View File
@@ -3,7 +3,7 @@ export interface User {
id: string;
email: string;
balance: number;
resource_group: string;
group_id: string;
}
// user management related filter interface