From ffa7120cd6516684aaea1ae26af495c25ae6f498 Mon Sep 17 00:00:00 2001
From: cp3hnu <cp3hnu@gmail.com>
Date: Thu, 6 Jun 2024 17:23:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A8=A1=E5=9E=8B=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ResourceIntro/index.tsx        |  3 +--
 .../Dataset/components/ResourceList/index.tsx |  2 +-
 react-ui/src/pages/Dataset/config.tsx         |  1 +
 .../Experiment/components/LogGroup/index.tsx  |  5 +++-
 react-ui/src/pages/Mirror/Info/index.tsx      | 23 +++++++------------
 react-ui/src/pages/Mirror/List/index.tsx      |  2 +-
 .../pages/ModelDeployment/Create/index.tsx    |  2 +-
 7 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx b/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
index 0a0717fb..8636e648 100644
--- a/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
+++ b/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
@@ -17,7 +17,6 @@ const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
   const [searchParams] = useSearchParams();
   const [versionList, setVersionList] = useState([]);
   const [version, setVersion] = useState<string | undefined>(undefined);
-  const isPublic = searchParams.get('isPublic') === 'true';
   const defaultTab = searchParams.get('tab') || '1';
   let versionParam = searchParams.get('version');
   const resourceId = Number(locationParams.id);
@@ -85,7 +84,7 @@ const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
           resourceType={resourceType}
           resourceId={resourceId}
           resourceName={info.name}
-          isPublic={isPublic}
+          isPublic={info.available_range === 1}
           versionList={versionList}
           version={version}
           getVersionList={getVersionList}
diff --git a/react-ui/src/pages/Dataset/components/ResourceList/index.tsx b/react-ui/src/pages/Dataset/components/ResourceList/index.tsx
index acfd9fdb..830a9e1c 100644
--- a/react-ui/src/pages/Dataset/components/ResourceList/index.tsx
+++ b/react-ui/src/pages/Dataset/components/ResourceList/index.tsx
@@ -130,7 +130,7 @@ function ResourceList(
       activeTag: dataTag,
     });
     const prefix = resourceConfig[resourceType].prefix;
-    navigate(`/dataset/${prefix}/${record.id}?isPublic=${isPublic}`);
+    navigate(`/dataset/${prefix}/${record.id}`);
   };
 
   // 分页切换
diff --git a/react-ui/src/pages/Dataset/config.tsx b/react-ui/src/pages/Dataset/config.tsx
index 285efd97..c013912a 100644
--- a/react-ui/src/pages/Dataset/config.tsx
+++ b/react-ui/src/pages/Dataset/config.tsx
@@ -148,6 +148,7 @@ export type ResourceData = {
   description: string;
   create_by: string;
   update_time: string;
+  available_range: number;
   model_type_name?: string;
   model_tag_name?: string;
   dataset_type_name?: string;
diff --git a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
index 38b98af8..244b9c78 100644
--- a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
+++ b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
@@ -99,7 +99,10 @@ function LogGroup({
           scrollToBottom();
         }, 100);
       }
-    } else {
+    }
+
+    // 判断是否日志是否加载完成
+    if (!log_detail?.log_content) {
       setCompleted(true);
     }
   };
diff --git a/react-ui/src/pages/Mirror/Info/index.tsx b/react-ui/src/pages/Mirror/Info/index.tsx
index 5f56c678..c99c919d 100644
--- a/react-ui/src/pages/Mirror/Info/index.tsx
+++ b/react-ui/src/pages/Mirror/Info/index.tsx
@@ -20,7 +20,7 @@ import { formatDate } from '@/utils/date';
 import { to } from '@/utils/promise';
 import { mirrorNameKey, setSessionStorageItem } from '@/utils/sessionStorage';
 import { modalConfirm } from '@/utils/ui';
-import { useNavigate, useParams, useSearchParams } from '@umijs/max';
+import { useNavigate, useParams } from '@umijs/max';
 import {
   App,
   Button,
@@ -33,7 +33,7 @@ import {
   type TableProps,
 } from 'antd';
 import classNames from 'classnames';
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import MirrorStatusCell from '../components/MirrorStatusCell';
 import styles from './index.less';
 
@@ -42,6 +42,7 @@ type MirrorInfoData = {
   description?: string;
   version_count?: string;
   create_time?: string;
+  image_type?: number;
 };
 
 type MirrorVersionData = {
@@ -56,7 +57,6 @@ type MirrorVersionData = {
 function MirrorInfo() {
   const navigate = useNavigate();
   const urlParams = useParams();
-  const [searchParams] = useSearchParams();
   const [cacheState, setCacheState] = useCacheState();
   const [mirrorInfo, setMirrorInfo] = useState<MirrorInfoData>({});
   const [tableData, setTableData] = useState<MirrorVersionData[]>([]);
@@ -69,7 +69,7 @@ function MirrorInfo() {
     },
   );
   const { message } = App.useApp();
-  const isPublic = searchParams.get('isPublic') === 'true';
+  const isPublic = useMemo(() => mirrorInfo.image_type === 1, [mirrorInfo]);
 
   useEffect(() => {
     getMirrorInfo();
@@ -84,14 +84,7 @@ function MirrorInfo() {
     const id = Number(urlParams.id);
     const [res] = await to(getMirrorInfoReq(id));
     if (res && res.data) {
-      const { name = '', description = '', version_count = '', create_time: time } = res.data;
-      const create_time = formatDate(time);
-      setMirrorInfo({
-        name,
-        description,
-        version_count,
-        create_time,
-      });
+      setMirrorInfo(res.data);
     }
   };
 
@@ -258,7 +251,7 @@ function MirrorInfo() {
               <Col span={10}>
                 <div className={styles['mirror-info__basic__item']}>
                   <div className={styles['label']}>创建时间：</div>
-                  <div className={styles['value']}>{mirrorInfo.create_time}</div>
+                  <div className={styles['value']}>{formatDate(mirrorInfo.create_time)}</div>
                 </div>
               </Col>
             </Row>
@@ -270,7 +263,7 @@ function MirrorInfo() {
             ></SubAreaTitle>
             {!isPublic && (
               <Button
-                style={{ marginRight: 0, marginLeft: 'auto' }}
+                style={{ marginLeft: 'auto' }}
                 type="default"
                 onClick={createMirrorVersion}
                 icon={<KFIcon type="icon-xinjian2" />}
@@ -279,7 +272,7 @@ function MirrorInfo() {
               </Button>
             )}
             <Button
-              style={{ marginLeft: '20px' }}
+              style={{ marginLeft: isPublic ? 'auto' : '20px', marginRight: 0 }}
               type="default"
               onClick={getMirrorVersionList}
               icon={<KFIcon type="icon-shuaxin" />}
diff --git a/react-ui/src/pages/Mirror/List/index.tsx b/react-ui/src/pages/Mirror/List/index.tsx
index 5f0aa178..f0b2bf77 100644
--- a/react-ui/src/pages/Mirror/List/index.tsx
+++ b/react-ui/src/pages/Mirror/List/index.tsx
@@ -125,7 +125,7 @@ function MirrorList() {
 
   // 查看详情
   const toDetail = (record: MirrorData) => {
-    navigate(`/dataset/mirror/${record.id}?isPublic=${activeTab === CommonTabKeys.Public}`);
+    navigate(`/dataset/mirror/${record.id}`);
     setCacheState({
       activeTab,
       pagination,
diff --git a/react-ui/src/pages/ModelDeployment/Create/index.tsx b/react-ui/src/pages/ModelDeployment/Create/index.tsx
index 1c9d25b8..41eabc03 100644
--- a/react-ui/src/pages/ModelDeployment/Create/index.tsx
+++ b/react-ui/src/pages/ModelDeployment/Create/index.tsx
@@ -104,7 +104,7 @@ function ModelDeploymentCreate() {
       onOk: (res) => {
         if (res) {
           if (type === ResourceSelectorType.Mirror) {
-            form.setFieldValue(name, res);
+            form.setFieldValue(name, res.path);
           } else {
             const response = res as ResourceSelectorResponse;
             const showValue = `${response.name}:${response.version}`;