fix: distributed servers info

src/pages/api-keys/index.tsx

@@ -1,5 +1,4 @@
 import AutoTooltip from '@/components/auto-tooltip';
-import DeleteModal from '@/components/delete-modal';
 import PageTools from '@/components/page-tools';
 import { PageAction } from '@/config';
 import HotKeys from '@/config/hotkeys';
@@ -32,7 +31,7 @@ const APIKeys: React.FC = () => {
     rowSelection,
     queryParams,
     sortOrder,
-    modalRef,
+    DeleteModal,
     handleDelete,
     handleDeleteBatch,
     fetchData,
@@ -261,7 +260,7 @@ const APIKeys: React.FC = () => {
         onCancel={handleModalCancel}
         onOk={handleModalOk}
       ></AddAPIKeyModal>
-      <DeleteModal ref={modalRef}></DeleteModal>
+      <DeleteModal></DeleteModal>
     </>
   );
 };

src/pages/llmodels/components/instance-item.tsx

@@ -471,10 +471,24 @@ const InstanceItem: React.FC<InstanceItemProps> = ({
     );
   };
 
-  const renderDistributionInfo = (severList: any[]) => {
+  const renderDistributionInfo = (distributed_servers: Record<string, any>) => {
+    const { rpc_servers, ray_actors, subordinate_workers } =
+      distributed_servers;
+
+    let severList: any[] = [];
+
+    if (rpc_servers?.length > 0) {
+      severList = rpc_servers;
+    } else if (ray_actors?.length > 0) {
+      severList = ray_actors;
+    } else if (subordinate_workers?.length > 0) {
+      severList = subordinate_workers;
+    }
+
     if (!severList.length) {
       return null;
     }
+
     return (
       <TooltipOverlayScroller
         toolTipProps={{
@@ -612,12 +626,7 @@ const InstanceItem: React.FC<InstanceItemProps> = ({
                 className="flex align-center"
               >
                 {renderOffloadInfo}
-                {renderDistributionInfo(
-                  instanceData.distributed_servers?.rpc_servers ||
-                    instanceData.distributed_servers?.ray_actors ||
-                    instanceData.distributed_servers?.subordinate_workers ||
-                    []
-                )}
+                {renderDistributionInfo(instanceData.distributed_servers || {})}
               </span>
             </Col>
             <Col span={4}>

src/pages/llmodels/components/table-list.tsx

@@ -1,6 +1,6 @@
 import { modelsExpandKeysAtom } from '@/atoms/models';
 import AutoTooltip from '@/components/auto-tooltip';
-import DeleteModal from '@/components/delete-modal';
+import useDeleteModel from '@/components/delete-modal';
 import DropDownActions from '@/components/drop-down-actions';
 import DropdownButtons from '@/components/drop-down-buttons';
 import { PageSize } from '@/components/logs-viewer/config';
@@ -146,6 +146,7 @@ const Models: React.FC<ModelsProps> = ({
   loadend,
   total
 }) => {
+  const { DeleteModal, show } = useDeleteModel();
   const { getGPUList, generateFormValues, gpuDeviceList } =
     useGenerateFormEditInitialValues();
   const { saveScrollHeight, restoreScrollHeight } = useBodyScroll();
@@ -327,7 +328,7 @@ const Models: React.FC<ModelsProps> = ({
   }, [onCancelViewLogs]);
 
   const handleDelete = async (row: any) => {
-    modalRef.current.show({
+    show({
       content: 'models.table.models',
       operation: 'common.delete.single.confirm',
       name: row.name,
@@ -342,7 +343,7 @@ const Models: React.FC<ModelsProps> = ({
   };
 
   const handleDeleteBatch = () => {
-    modalRef.current.show({
+    show({
       content: 'models.table.models',
       operation: 'common.delete.confirm',
       selection: true,
@@ -406,7 +407,7 @@ const Models: React.FC<ModelsProps> = ({
   );
   const handleDeleteInstace = useCallback(
     (row: any) => {
-      modalRef.current.show({
+      show({
         content: 'models.instances',
         okText: 'common.button.delrecreate',
         operation: 'common.delete.single.confirm',
@@ -487,7 +488,7 @@ const Models: React.FC<ModelsProps> = ({
         }
 
         if (val === 'stop') {
-          modalRef.current.show({
+          show({
             content: 'models.instances',
             title: 'common.title.stop.confirm',
             okText: 'common.button.stop',
@@ -562,7 +563,7 @@ const Models: React.FC<ModelsProps> = ({
   };
 
   const handleStartBatch = async () => {
-    modalRef.current.show({
+    show({
       content: 'models.table.models',
       title: 'common.title.start.confirm',
       okText: 'common.button.start',
@@ -575,7 +576,7 @@ const Models: React.FC<ModelsProps> = ({
   };
 
   const handleStopBatch = async () => {
-    modalRef.current.show({
+    show({
       content: 'models.table.models',
       title: 'common.title.stop.confirm',
       okText: 'common.button.stop',
@@ -884,7 +885,7 @@ const Models: React.FC<ModelsProps> = ({
         open={openLogModal}
         onCancel={handleLogModalCancel}
       ></ViewLogsModal>
-      <DeleteModal ref={modalRef}></DeleteModal>
+      <DeleteModal></DeleteModal>
       <APIAccessInfoModal
         open={apiAccessInfo.show}
         data={apiAccessInfo.data}

src/pages/resources/components/model-files.tsx

@@ -1,6 +1,5 @@
 import { modelsExpandKeysAtom } from '@/atoms/models';
 import AutoTooltip from '@/components/auto-tooltip';
-import DeleteModal from '@/components/delete-modal';
 import DropdownButtons from '@/components/drop-down-buttons';
 import { TooltipOverlayScroller } from '@/components/overlay-scroller';
 import { FilterBar } from '@/components/page-tools';
@@ -294,7 +293,7 @@ const ModelFiles = () => {
     dataSource,
     rowSelection,
     queryParams,
-    modalRef,
+    DeleteModal,
     fetchData,
     handleDelete,
     handleDeleteBatch,
@@ -683,7 +682,7 @@ const ModelFiles = () => {
           }}
         ></Table>
       </ConfigProvider>
-      <DeleteModal ref={modalRef}></DeleteModal>
+      <DeleteModal></DeleteModal>
       <DownloadModal
         onCancel={handleDownloadCancel}
         onOk={handleDownload}

src/pages/resources/components/workers.tsx

@@ -1,5 +1,4 @@
 import AutoTooltip from '@/components/auto-tooltip';
-import DeleteModal from '@/components/delete-modal';
 import DropdownButtons from '@/components/drop-down-buttons';
 import { FilterBar } from '@/components/page-tools';
 import ProgressBar from '@/components/progress-bar';
@@ -94,7 +93,7 @@ const Workers: React.FC = () => {
     dataSource,
     rowSelection,
     queryParams,
-    modalRef,
+    DeleteModal,
     handleDelete,
     handleDeleteBatch,
     fetchData,
@@ -447,7 +446,7 @@ const Workers: React.FC = () => {
           />
         </Table>
       </ConfigProvider>
-      <DeleteModal ref={modalRef}></DeleteModal>
+      <DeleteModal></DeleteModal>
       <AddWorker open={open} onCancel={() => setOpen(false)}></AddWorker>
       <UpdateLabels
         open={updateLabelsData.open}

src/pages/users/index.tsx

@@ -1,5 +1,4 @@
 import AutoTooltip from '@/components/auto-tooltip';
-import DeleteModal from '@/components/delete-modal';
 import DropdownButtons from '@/components/drop-down-buttons';
 import PageTools from '@/components/page-tools';
 import { PageAction } from '@/config';
@@ -55,7 +54,7 @@ const Users: React.FC = () => {
     rowSelection,
     queryParams,
     sortOrder,
-    modalRef,
+    DeleteModal,
     handleDelete,
     handleDeleteBatch,
     fetchData,
@@ -321,7 +320,7 @@ const Users: React.FC = () => {
         onCancel={handleModalCancel}
         onOk={handleModalOk}
       ></AddModal>
-      <DeleteModal ref={modalRef}></DeleteModal>
+      <DeleteModal></DeleteModal>
     </>
   );
 };