fix: show worker added message
This commit is contained in:
@@ -6,7 +6,7 @@ import { useIntl } from '@umijs/max';
|
||||
import { useMemoizedFn } from 'ahooks';
|
||||
import { ConfigProvider, Table } from 'antd';
|
||||
import _ from 'lodash';
|
||||
import { forwardRef, useImperativeHandle } from 'react';
|
||||
import { forwardRef, useEffect, useImperativeHandle } from 'react';
|
||||
import {
|
||||
deleteModelInstance,
|
||||
MODEL_INSTANCE_API,
|
||||
@@ -16,6 +16,7 @@ import ViewLogsModal from '../components/view-logs-modal';
|
||||
import { useDeploymentsContext } from '../config/deploments-context';
|
||||
import { ModelInstanceListItem as ListItem } from '../config/types';
|
||||
import useViewInstanceLogs from '../hooks/use-view-instance-logs';
|
||||
import useQueryModelList from '../services/use-query-model-list';
|
||||
import LeftFilters from './left-filters';
|
||||
import useInstanceColumns from './use-instance-columns';
|
||||
|
||||
@@ -44,10 +45,15 @@ const InstanceView = forwardRef((props, ref) => {
|
||||
contentForDelete: 'menu.models.instances'
|
||||
});
|
||||
const intl = useIntl();
|
||||
const { dataList: modelList, fetchData: fetchModelList } =
|
||||
useQueryModelList();
|
||||
const { clusterList, workerList } = useDeploymentsContext();
|
||||
const { openViewLogsModal, openViewLogsModalStatus, closeViewLogsModal } =
|
||||
useViewInstanceLogs();
|
||||
|
||||
useEffect(() => {
|
||||
fetchModelList({ page: -1 });
|
||||
}, []);
|
||||
const handleSelect = useMemoizedFn((val: any, row: ListItem) => {
|
||||
if (val === 'delete') {
|
||||
handleDelete(row, {
|
||||
@@ -119,6 +125,7 @@ const InstanceView = forwardRef((props, ref) => {
|
||||
const columns = useInstanceColumns({
|
||||
handleSelect,
|
||||
clusterList,
|
||||
modelList,
|
||||
workerList
|
||||
});
|
||||
|
||||
|
||||
@@ -15,7 +15,10 @@ import InstanceStatusCell from '../components/instance-cells/instance-status-cel
|
||||
import NameCell, {
|
||||
NameCellProps
|
||||
} from '../components/instance-cells/name-cell';
|
||||
import { ModelInstanceListItem as ListItem } from '../config/types';
|
||||
import {
|
||||
ModelInstanceListItem as ListItem,
|
||||
ListItem as ModelListItem
|
||||
} from '../config/types';
|
||||
import { calcTotalVram } from '../utils';
|
||||
const WorkerInfoContent: React.FC<NameCellProps> = ({ record, modelData }) => {
|
||||
let workerIp = '-';
|
||||
@@ -48,6 +51,7 @@ const WorkerInfoContent: React.FC<NameCellProps> = ({ record, modelData }) => {
|
||||
|
||||
const useInstancesColumns = (options: {
|
||||
workerList: workerListItem[];
|
||||
modelList: ModelListItem[];
|
||||
clusterList: Global.BaseOption<
|
||||
number,
|
||||
{
|
||||
@@ -60,7 +64,8 @@ const useInstancesColumns = (options: {
|
||||
onCellClick?: (record: ListItem, dataIndex: string) => void;
|
||||
}): ColumnsType<ListItem> => {
|
||||
const intl = useIntl();
|
||||
const { workerList, clusterList, handleSelect, onCellClick } = options;
|
||||
const { workerList, clusterList, modelList, handleSelect, onCellClick } =
|
||||
options;
|
||||
|
||||
const renderWorkerCell = (text: number, record: ListItem) => {
|
||||
if (text) {
|
||||
@@ -144,7 +149,7 @@ const useInstancesColumns = (options: {
|
||||
width: 160,
|
||||
render: (text: string, record: ListItem) => (
|
||||
<span style={{ gap: 4 }} className="flex-center">
|
||||
<InstanceStatusCell record={record} onSelect={() => {}} />
|
||||
<InstanceStatusCell record={record} onSelect={handleSelect} />
|
||||
<DownloadingStatusCell
|
||||
backend={record?.backend}
|
||||
distributed_servers={record.distributed_servers}
|
||||
@@ -173,15 +178,17 @@ const useInstancesColumns = (options: {
|
||||
render: (value: string, record: ListItem) => (
|
||||
<ActionsCell
|
||||
record={record}
|
||||
modelData={{
|
||||
categories: record.categories || []
|
||||
}}
|
||||
modelData={
|
||||
modelList.find(
|
||||
(model) => model.id === record.model_id
|
||||
) as ModelListItem
|
||||
}
|
||||
onSelect={handleSelect}
|
||||
></ActionsCell>
|
||||
)
|
||||
}
|
||||
];
|
||||
}, [handleSelect, onCellClick, workerList, clusterList]);
|
||||
}, [handleSelect, onCellClick, workerList, clusterList, modelList]);
|
||||
};
|
||||
|
||||
export default useInstancesColumns;
|
||||
|
||||
Reference in New Issue
Block a user