fix: jobShell connect container (#1386)

## 1.回归测试ai时发现没法打开shell页面，报错如图，缺少Provider ![image](https://github.com/user-attachments/assets/91ff0802-8469-425d-88f1-9f6497cf8df9) ## 2. 修改连接getJobById的fields
PKUHPC · Aug 6, 2024 · be429fc · be429fc
1 parent 1492188
commit be429fc
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 32 deletions.
diff --git a/.changeset/strange-lemons-notice.md b/.changeset/strange-lemons-notice.md
@@ -0,0 +1,5 @@
+---
+"@scow/ai": patch
+---
+
+ai 加上国际化的 Provider
diff --git a/apps/ai/src/app/clientLayout.tsx b/apps/ai/src/app/clientLayout.tsx
@@ -18,6 +18,9 @@ import { usePathname } from "next/navigation";
 import { ErrorBoundary } from "src/components/ErrorBoundary";
 import { Loading } from "src/components/Loading";
 import { TopProgressBar } from "src/components/TopProgressBar";
+import { Provider } from "src/i18n";
+import en from "src/i18n/en";
+import zh_cn from "src/i18n/zh_cn";
 import { AntdConfigProvider } from "src/layouts/AntdConfigProvider";
 import { DarkModeCookie, DarkModeProvider } from "src/layouts/darkMode";
 import { RootErrorContent } from "src/layouts/error/RootErrorContent";
@@ -28,6 +31,11 @@ import { trpc } from "src/utils/trpc";
 
 import { UiConfigContext } from "./uiContext";
 
+const languagesMap = {
+  "zh_cn": zh_cn,
+  "en": en,
+};
+
 export function ClientLayout(props: {
   children: React.ReactNode,
   initialDark?: DarkModeCookie,
@@ -49,36 +57,44 @@ export function ClientLayout(props: {
     ?? primaryColor?.defaultColor ?? uiConfig.defaultPrimaryColor;
 
   return (
-    <StyleProvider hashPriority="high" transformers={[legacyLogicalPropertiesTransformer]}>
-      <StyledComponentsRegistry>
-        <AntdStyleRegistry>
-          <body>
-            {
-              useConfig.isLoading ?
-                <Loading />
-                : (
-                  <DarkModeProvider initial={props.initialDark}>
-                    <AntdConfigProvider color={color}>
-                      <GlobalStyle />
-                      <TopProgressBar />
-                      <ErrorBoundary Component={RootErrorContent} pathname={pathname ?? ""}>
-                        <UiConfigContext.Provider
-                          value={{
-                            hostname,
-                            uiConfig,
-                          }}
-                        >
-                          {props.children}
-                        </UiConfigContext.Provider>
-                      </ErrorBoundary>
-                    </AntdConfigProvider>
-                  </DarkModeProvider>
-                )
-            }
+    <Provider initialLanguage={{
+      // ai还未开发国际化，先直接写zh_cn
+      id: "zh_cn",
+      definitions: languagesMap.zh_cn,
+    }}
+    >
+      <StyleProvider hashPriority="high" transformers={[legacyLogicalPropertiesTransformer]}>
+        <StyledComponentsRegistry>
+          <AntdStyleRegistry>
+            <body>
+              {
+                useConfig.isLoading ?
+                  <Loading />
+                  : (
+                    <DarkModeProvider initial={props.initialDark}>
+                      <AntdConfigProvider color={color}>
+                        <GlobalStyle />
+                        <TopProgressBar />
+                        <ErrorBoundary Component={RootErrorContent} pathname={pathname ?? ""}>
+                          <UiConfigContext.Provider
+                            value={{
+                              hostname,
+                              uiConfig,
+                            }}
+                          >
+                            {props.children}
+                          </UiConfigContext.Provider>
+                        </ErrorBoundary>
+                      </AntdConfigProvider>
+                    </DarkModeProvider>
+                  )
+              }
+
+            </body>
+          </AntdStyleRegistry>
+        </StyledComponentsRegistry>
+      </StyleProvider>
+    </Provider>
 
-          </body>
-        </AntdStyleRegistry>
-      </StyledComponentsRegistry>
-    </StyleProvider>
   );
 }
diff --git a/apps/ai/src/server/setup/jobShell.ts b/apps/ai/src/server/setup/jobShell.ts
@@ -179,7 +179,7 @@ wss.on("connection", async (ws: AliveCheckedWebSocket, req) => {
   });
 
   const { job } = await asyncClientCall(client.job, "getJobById", {
-    fields: ["namespace", "pod"],
+    fields: ["container_job_info"],
     jobId: currentJobInfo.jobId,
   });
 

diff --git a/apps/ai/src/server/trpc/route/jobs/apps.ts b/apps/ai/src/server/trpc/route/jobs/apps.ts
@@ -657,7 +657,7 @@ export const saveImage =
         const client = getAdapterClient(clusterId);
 
         const { job } = await asyncClientCall(client.job, "getJobById", {
-          fields: ["node", "container_id"],
+          fields: ["container_job_info"],
           jobId,
         });