fix: intl refresh in modal confirm
This commit is contained in:
jialin
@@ -1,7 +1,7 @@
|
||||
import DeleteModal from '@/components/delete-modal';
|
||||
import PageTools from '@/components/page-tools';
|
||||
import { PageAction } from '@/config';
|
||||
import type { PageActionType } from '@/config/types';
|
||||
import useDeleteModal from '@/hooks/use-delete-modal';
|
||||
import useTableRowSelection from '@/hooks/use-table-row-selection';
|
||||
import useTableSort from '@/hooks/use-table-sort';
|
||||
import { handleBatchRequest } from '@/utils';
|
||||
@@ -11,7 +11,7 @@ import { useIntl } from '@umijs/max';
|
||||
import { Button, Input, Space, Table, Tooltip } from 'antd';
|
||||
import dayjs from 'dayjs';
|
||||
import _ from 'lodash';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { deleteApisKey, queryApisKeysList } from './apis';
|
||||
import AddAPIKeyModal from './components/add-apikey';
|
||||
import { ListItem } from './config/types';
|
||||
@@ -19,12 +19,12 @@ import { ListItem } from './config/types';
|
||||
const { Column } = Table;
|
||||
|
||||
const Models: React.FC = () => {
|
||||
const { showDeleteModal } = useDeleteModal();
|
||||
const rowSelection = useTableRowSelection();
|
||||
const { sortOrder, setSortOrder } = useTableSort({
|
||||
defaultSortOrder: 'descend'
|
||||
});
|
||||
const intl = useIntl();
|
||||
const modalRef = useRef<any>(null);
|
||||
const [dataSource, setDataSource] = useState([]);
|
||||
const [total, setTotal] = useState(0);
|
||||
const [openAddModal, setOpenAddModal] = useState(false);
|
||||
@@ -98,12 +98,9 @@ const Models: React.FC = () => {
|
||||
};
|
||||
|
||||
const handleDelete = (row: ListItem) => {
|
||||
showDeleteModal({
|
||||
modalRef.current.show({
|
||||
title: '',
|
||||
content: intl.formatMessage(
|
||||
{ id: 'common.delete.confirm' },
|
||||
{ type: intl.formatMessage({ id: 'apikeys.table.apikeys' }) }
|
||||
),
|
||||
content: 'apikeys.table.apikeys',
|
||||
async onOk() {
|
||||
console.log('OK');
|
||||
await deleteApisKey(row.id);
|
||||
@@ -113,12 +110,9 @@ const Models: React.FC = () => {
|
||||
};
|
||||
|
||||
const handleDeleteBatch = () => {
|
||||
showDeleteModal({
|
||||
modalRef.current.show({
|
||||
title: '',
|
||||
content: intl.formatMessage(
|
||||
{ id: 'common.delete.confirm' },
|
||||
{ type: intl.formatMessage({ id: 'apikeys.table.apikeys' }) }
|
||||
),
|
||||
content: 'apikeys.table.apikeys',
|
||||
async onOk() {
|
||||
await handleBatchRequest(rowSelection.selectedRowKeys, deleteApisKey);
|
||||
rowSelection.clearSelections();
|
||||
@@ -262,6 +256,7 @@ const Models: React.FC = () => {
|
||||
onCancel={handleModalCancel}
|
||||
onOk={handleModalOk}
|
||||
></AddAPIKeyModal>
|
||||
<DeleteModal ref={modalRef}></DeleteModal>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -5,7 +5,6 @@ import SealTable from '@/components/seal-table';
|
||||
import SealColumn from '@/components/seal-table/components/seal-column';
|
||||
import { PageAction } from '@/config';
|
||||
import type { PageActionType } from '@/config/types';
|
||||
import useDeleteModal from '@/hooks/use-delete-modal';
|
||||
import useExpandedRowKeys from '@/hooks/use-expanded-row-keys';
|
||||
import useTableRowSelection from '@/hooks/use-table-row-selection';
|
||||
import useTableSort from '@/hooks/use-table-sort';
|
||||
@@ -66,7 +65,6 @@ const Models: React.FC<ModelsProps> = ({
|
||||
const access = useAccess();
|
||||
const intl = useIntl();
|
||||
const [modal, contextHolder] = Modal.useModal();
|
||||
const { showDeleteModal } = useDeleteModal();
|
||||
const navigate = useNavigate();
|
||||
const rowSelection = useTableRowSelection();
|
||||
const { handleExpandChange, updateExpandedRowKeys, expandedRowKeys } =
|
||||
@@ -82,8 +80,6 @@ const Models: React.FC<ModelsProps> = ({
|
||||
undefined
|
||||
);
|
||||
const [currentInstanceUrl, setCurrentInstanceUrl] = useState<string>('');
|
||||
const [deleteModalVisible, setDeleteModalVisible] = useState(false);
|
||||
const [deletConfig, setDeletConfig] = useState<any>({});
|
||||
const modalRef = useRef<any>(null);
|
||||
|
||||
const ActionList = [
|
||||
@@ -152,41 +148,19 @@ const Models: React.FC<ModelsProps> = ({
|
||||
setOpenLogModal(false);
|
||||
}, []);
|
||||
const handleDelete = async (row: any) => {
|
||||
console.log('handleDelete=======111', row);
|
||||
showDeleteModal({
|
||||
modalRef.current.show({
|
||||
title: '',
|
||||
content: intl.formatMessage(
|
||||
{ id: 'common.delete.confirm' },
|
||||
{ type: intl.formatMessage({ id: 'models.table.models' }) }
|
||||
),
|
||||
content: 'models.table.models',
|
||||
async onOk() {
|
||||
await deleteModel(row.id);
|
||||
updateExpandedRowKeys([row.id]);
|
||||
}
|
||||
});
|
||||
// setDeleteModalVisible(true);
|
||||
// setDeletConfig({
|
||||
// title: '',
|
||||
// content: intl.formatMessage(
|
||||
// { id: 'common.delete.confirm' },
|
||||
// { type: intl.formatMessage({ id: 'models.table.models' }) }
|
||||
// ),
|
||||
// async onOk() {
|
||||
// await deleteModel(row.id);
|
||||
// updateExpandedRowKeys([row.id]);
|
||||
// },
|
||||
// onCancel: () => {
|
||||
// setDeleteModalVisible(false);
|
||||
// }
|
||||
// });
|
||||
};
|
||||
const handleDeleteBatch = () => {
|
||||
showDeleteModal({
|
||||
modalRef.current.show({
|
||||
title: '',
|
||||
content: intl.formatMessage(
|
||||
{ id: 'common.delete.confirm' },
|
||||
{ type: intl.formatMessage({ id: 'models.table.models' }) }
|
||||
),
|
||||
content: 'models.table.models',
|
||||
async onOk() {
|
||||
await handleBatchRequest(rowSelection.selectedRowKeys, deleteModel);
|
||||
rowSelection.clearSelections();
|
||||
@@ -208,12 +182,9 @@ const Models: React.FC<ModelsProps> = ({
|
||||
}
|
||||
};
|
||||
const handleDeleteInstace = (row: any, list: ModelInstanceListItem[]) => {
|
||||
showDeleteModal({
|
||||
modalRef.current.show({
|
||||
title: '',
|
||||
content: intl.formatMessage(
|
||||
{ id: 'common.delete.confirm' },
|
||||
{ type: intl.formatMessage({ id: 'models.instances' }) }
|
||||
),
|
||||
content: 'models.instances',
|
||||
async onOk() {
|
||||
await deleteModelInstance(row.id);
|
||||
if (list.length === 1) {
|
||||
@@ -430,11 +401,7 @@ const Models: React.FC<ModelsProps> = ({
|
||||
open={openLogModal}
|
||||
onCancel={handleLogModalCancel}
|
||||
></ViewLogsModal>
|
||||
<DeleteModal
|
||||
open={deleteModalVisible}
|
||||
{...deletConfig}
|
||||
ref={modalRef}
|
||||
></DeleteModal>
|
||||
<DeleteModal ref={modalRef}></DeleteModal>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -56,10 +56,15 @@ const ViewCodeModal: React.FC<ViewModalProps> = (props) => {
|
||||
const systemList = systemMessage
|
||||
? [{ role: 'system', content: systemMessage }]
|
||||
: [];
|
||||
const code = `curl ${window.location.origin}/v1-openai/chat/completions \\\n-H "Content-Type: application/json" \\\n-H "Authorization: Bearer $\{GPUSTACK_API_KEY}" \\\n-d '${JSON.stringify(
|
||||
const code = `curl ${window.location.origin}/v1-openai/chat/completions \\\n-H "Content-Type: application/json" \\\n-H "Authorization: Bearer {YOUR_GUPSTACK_API_KEY}" \\\n-d '${JSON.stringify(
|
||||
{
|
||||
...parameters,
|
||||
messages: [...systemList, ...messageList]
|
||||
messages: [
|
||||
...systemList,
|
||||
..._.map(messageList, (item: any) => {
|
||||
return { role: item.role, content: item.content };
|
||||
})
|
||||
]
|
||||
},
|
||||
null,
|
||||
2
|
||||
@@ -69,10 +74,15 @@ const ViewCodeModal: React.FC<ViewModalProps> = (props) => {
|
||||
const systemList = systemMessage
|
||||
? [{ role: 'system', content: systemMessage }]
|
||||
: [];
|
||||
const code = `const OpenAI = require("openai");\n\nconst openai = new OpenAI({\n"apiKey": $\{GUPSTACK_API_KEY},\n"baseURL": "${BaseURL}"\n});\n\n\nasync function main(){\nconst params = ${JSON.stringify(
|
||||
const code = `const OpenAI = require("openai");\n\nconst openai = new OpenAI({\n"apiKey": "YOUR_GUPSTACK_API_KEY",\n"baseURL": "${BaseURL}"\n});\n\n\nasync function main(){\nconst params = ${JSON.stringify(
|
||||
{
|
||||
...parameters,
|
||||
messages: [...systemList, ...messageList]
|
||||
messages: [
|
||||
...systemList,
|
||||
..._.map(messageList, (item: any) => {
|
||||
return { role: item.role, content: item.content };
|
||||
})
|
||||
]
|
||||
},
|
||||
null,
|
||||
2
|
||||
@@ -95,7 +105,16 @@ const ViewCodeModal: React.FC<ViewModalProps> = (props) => {
|
||||
const systemList = systemMessage
|
||||
? [{ role: 'system', content: systemMessage }]
|
||||
: [];
|
||||
const code = `from openai import OpenAI\n\nbaseURL = ${BaseURL}\n\nclient = OpenAI(\nbase_url=baseURL, \napi_key="$\{GUPSTACK_API_KEY}"\n)\n\ncompletion = client.chat.completions.create(\n${formattedParams} messages=${JSON.stringify([...systemList, ...messageList], null, 2)})\nprint(completion.choices[0].message.content)`;
|
||||
const code = `from openai import OpenAI\n\nbaseURL = "${BaseURL}"\n\nclient = OpenAI(\nbase_url=baseURL, \napi_key="YOUR_GUPSTACK_API_KEY"\n)\n\ncompletion = client.chat.completions.create(\n${formattedParams} messages=${JSON.stringify(
|
||||
[
|
||||
...systemList,
|
||||
..._.map(messageList, (item: any) => {
|
||||
return { role: item.role, content: item.content };
|
||||
})
|
||||
],
|
||||
null,
|
||||
2
|
||||
)})\nprint(completion.choices[0].message.content)`;
|
||||
setCodeValue(code);
|
||||
}
|
||||
formatCode();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import DeleteModal from '@/components/delete-modal';
|
||||
import PageTools from '@/components/page-tools';
|
||||
import ProgressBar from '@/components/progress-bar';
|
||||
import StatusTag from '@/components/status-tag';
|
||||
import useDeleteModal from '@/hooks/use-delete-modal';
|
||||
import useTableRowSelection from '@/hooks/use-table-row-selection';
|
||||
import useTableSort from '@/hooks/use-table-sort';
|
||||
import { convertFileSize, handleBatchRequest } from '@/utils';
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
import { useIntl } from '@umijs/max';
|
||||
import { Button, Input, Space, Table, Tooltip } from 'antd';
|
||||
import _ from 'lodash';
|
||||
import { memo, useEffect, useState } from 'react';
|
||||
import { memo, useEffect, useRef, useState } from 'react';
|
||||
import { deleteWorker, queryWorkersList } from '../apis';
|
||||
import { WorkerStatusMapValue, status } from '../config';
|
||||
import { Filesystem, GPUDeviceItem, ListItem } from '../config/types';
|
||||
@@ -25,7 +25,7 @@ const Resources: React.FC = () => {
|
||||
const { sortOrder, setSortOrder } = useTableSort({
|
||||
defaultSortOrder: 'descend'
|
||||
});
|
||||
const { showDeleteModal } = useDeleteModal();
|
||||
const modalRef = useRef<any>(null);
|
||||
const rowSelection = useTableRowSelection();
|
||||
const intl = useIntl();
|
||||
const [total, setTotal] = useState(0);
|
||||
@@ -102,12 +102,9 @@ const Resources: React.FC = () => {
|
||||
};
|
||||
|
||||
const handleDelete = (row: ListItem) => {
|
||||
showDeleteModal({
|
||||
modalRef.current.show({
|
||||
title: '',
|
||||
content: intl.formatMessage(
|
||||
{ id: 'common.delete.confirm' },
|
||||
{ type: ' worker ' }
|
||||
),
|
||||
content: 'worker',
|
||||
async onOk() {
|
||||
console.log('OK');
|
||||
await deleteWorker(row.id);
|
||||
@@ -117,12 +114,9 @@ const Resources: React.FC = () => {
|
||||
};
|
||||
|
||||
const handleDeleteBatch = () => {
|
||||
showDeleteModal({
|
||||
modalRef.current.show({
|
||||
title: '',
|
||||
content: intl.formatMessage(
|
||||
{ id: 'common.delete.confirm' },
|
||||
{ type: ` wokers ` }
|
||||
),
|
||||
content: 'wokers',
|
||||
async onOk() {
|
||||
await handleBatchRequest(rowSelection.selectedRowKeys, deleteWorker);
|
||||
rowSelection.clearSelections();
|
||||
@@ -279,7 +273,7 @@ const Resources: React.FC = () => {
|
||||
className="m-r-5"
|
||||
style={{ display: 'flex', width: 25 }}
|
||||
>
|
||||
[{index}]
|
||||
[{item.index}]
|
||||
</span>
|
||||
<ProgressBar
|
||||
key={index}
|
||||
@@ -383,6 +377,7 @@ const Resources: React.FC = () => {
|
||||
}}
|
||||
/>
|
||||
</Table>
|
||||
<DeleteModal ref={modalRef}></DeleteModal>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import DeleteModal from '@/components/delete-modal';
|
||||
import DropdownButtons from '@/components/drop-down-buttons';
|
||||
import PageTools from '@/components/page-tools';
|
||||
import { PageAction } from '@/config';
|
||||
import type { PageActionType } from '@/config/types';
|
||||
import useDeleteModal from '@/hooks/use-delete-modal';
|
||||
import useTableRowSelection from '@/hooks/use-table-row-selection';
|
||||
import useTableSort from '@/hooks/use-table-sort';
|
||||
import { handleBatchRequest } from '@/utils';
|
||||
@@ -19,7 +19,7 @@ import { useIntl } from '@umijs/max';
|
||||
import { Button, Input, Space, Table, message } from 'antd';
|
||||
import dayjs from 'dayjs';
|
||||
import _ from 'lodash';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { createUser, deleteUser, queryUsersList, updateUser } from './apis';
|
||||
import AddModal from './components/add-modal';
|
||||
import { FormData, ListItem } from './config/types';
|
||||
@@ -31,8 +31,8 @@ const Users: React.FC = () => {
|
||||
const { sortOrder, setSortOrder } = useTableSort({
|
||||
defaultSortOrder: 'descend'
|
||||
});
|
||||
const { showDeleteModal } = useDeleteModal();
|
||||
const intl = useIntl();
|
||||
const modalRef = useRef<any>(null);
|
||||
const [total, setTotal] = useState(0);
|
||||
const [openAddModal, setOpenAddModal] = useState(false);
|
||||
const [loading, setLoading] = useState(false);
|
||||
@@ -142,12 +142,9 @@ const Users: React.FC = () => {
|
||||
};
|
||||
|
||||
const handleDelete = (row: ListItem) => {
|
||||
showDeleteModal({
|
||||
modalRef.current.show({
|
||||
title: '',
|
||||
content: intl.formatMessage(
|
||||
{ id: 'common.delete.confirm' },
|
||||
{ type: intl.formatMessage({ id: 'users.table.user' }) }
|
||||
),
|
||||
content: 'users.table.user',
|
||||
async onOk() {
|
||||
console.log('OK');
|
||||
await deleteUser(row.id);
|
||||
@@ -157,12 +154,9 @@ const Users: React.FC = () => {
|
||||
};
|
||||
|
||||
const handleDeleteBatch = () => {
|
||||
showDeleteModal({
|
||||
modalRef.current.show({
|
||||
title: '',
|
||||
content: intl.formatMessage(
|
||||
{ id: 'common.delete.confirm' },
|
||||
{ type: intl.formatMessage({ id: 'users.table.user' }) }
|
||||
),
|
||||
content: 'users.table.user',
|
||||
async onOk() {
|
||||
await handleBatchRequest(rowSelection.selectedRowKeys, deleteUser);
|
||||
rowSelection.clearSelections();
|
||||
@@ -319,6 +313,7 @@ const Users: React.FC = () => {
|
||||
onCancel={handleModalCancel}
|
||||
onOk={handleModalOk}
|
||||
></AddModal>
|
||||
<DeleteModal ref={modalRef}></DeleteModal>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user