fix(portal-web): 仪表盘处集群无法获取运行时不报500的错误提示和快捷方式跳转去掉basePath (#1095)

## 说明： ![image](https://github.com/PKUHPC/SCOW/assets/74037789/9b8e501f-2da8-4cdb-bdcb-cea75d7d6046) ### CPU和GPU的利用率的保留两位小数 ### 还有快捷方式跳转去掉basePath，不然url会多出basePath，与期望不符
PKUHPC · Jan 29, 2024 · f126469 · f126469
1 parent a41c45b
commit f126469
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/.changeset/tasty-walls-draw.md b/.changeset/tasty-walls-draw.md
@@ -0,0 +1,5 @@
+---
+"@scow/portal-web": patch
+---
+
+仪表盘处集群无法获取运行时不报 500 的错误提示和快捷方式跳转去掉 basePath
diff --git a/apps/portal-web/src/pageComponents/dashboard/OverviewTable.tsx b/apps/portal-web/src/pageComponents/dashboard/OverviewTable.tsx
@@ -23,8 +23,8 @@ import { styled } from "styled-components";
 export interface ClusterInfo extends PartitionInfo {
   id: number;
   clusterName: I18nStringType | undefined;
-  cpuUsage: number;
-  gpuUsage?: number;
+  cpuUsage: string;
+  gpuUsage?: string;
 }
 
 interface Props {
@@ -38,8 +38,8 @@ interface InfoProps {
   partitionName: string;
   nodeCount: number;
   pendingJobCount: number;
-  cpuUsage: number;
-  gpuUsage?: number;
+  cpuUsage: string;
+  gpuUsage?: string;
   usageRatePercentage: number;
   partitionStatus: PartitionInfo_PartitionStatus;
 }

diff --git a/apps/portal-web/src/pageComponents/dashboard/Sortable.tsx b/apps/portal-web/src/pageComponents/dashboard/Sortable.tsx
@@ -33,7 +33,6 @@ import { join } from "path";
 import { FC, useCallback, useEffect, useMemo, useState } from "react";
 import { api } from "src/apis";
 import { prefix, useI18n, useI18nTranslateToString } from "src/i18n";
-import { publicConfig } from "src/utils/config";
 import { formatEntryId, getEntryClusterName, getEntryIcon, getEntryLogoPath, getEntryName } from "src/utils/dashboard";
 import { styled } from "styled-components";
 
@@ -173,16 +172,16 @@ export const Sortable: FC<Props> = ({ isEditable, isFinished, quickEntryArray, a
       if (!isEditable) {
         switch (item.entry?.$case) {
         case "pageLink":
-          router.push(join(publicConfig.BASE_PATH, item.entry.pageLink.path));
+          router.push(item.entry.pageLink.path);
           break;
 
         case "shell":
-          router.push(join(publicConfig.BASE_PATH, "/shell", item.entry.shell.clusterId, item.entry.shell.loginNode));
+          router.push(join("/shell", item.entry.shell.clusterId, item.entry.shell.loginNode));
           break;
 
         case "app":
           router.push(
-            join(publicConfig.BASE_PATH, "/apps", item.entry.app.clusterId, "/create", item.id.split("-")[0]));
+            join("/apps", item.entry.app.clusterId, "/create", item.id.split("-")[0]));
           break;
 
         default:

diff --git a/apps/portal-web/src/pages/dashboard.tsx b/apps/portal-web/src/pages/dashboard.tsx
@@ -45,10 +45,12 @@ export const DashboardPage: NextPage<Props> = requireAuth(() => true)(() => {
 
   const { data, isLoading } = useAsync({
     promiseFn: useCallback(async () => {
+
       const clusters = publicConfig.CLUSTERS;
 
       const rawClusterInfoPromises = clusters.map((x) =>
-        api.getClusterRunningInfo({ query: { clusterId: x.id } }),
+        api.getClusterRunningInfo({ query: { clusterId: x.id } })
+          .httpError(500, () => {}),
       );
 
       const rawClusterInfoResults = await Promise.allSettled(rawClusterInfoPromises);
@@ -73,9 +75,9 @@ export const DashboardPage: NextPage<Props> = requireAuth(() => true)(() => {
           cluster.clusterInfo.partitions.map((x) => ({
             clusterName: cluster.clusterInfo.clusterName,
             ...x,
-            cpuUsage:x.runningCpuCount / x.cpuCoreCount,
+            cpuUsage:(x.runningCpuCount / x.cpuCoreCount).toFixed(2),
             // 有些分区没有gpu就为空，前端显示'-'
-            ...x.gpuCoreCount ? { gpuUsage:x.runningGpuCount / x.gpuCoreCount } : {},
+            ...x.gpuCoreCount ? { gpuUsage:(x.runningGpuCount / x.gpuCoreCount).toFixed(2) } : {},
           })),
         );