fix(web): port info (#871)

labring · Mar 8, 2023 · b096734 · b096734
1 parent b12b3b9
commit b096734
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/web/src/hooks/useAwsS3.ts b/web/src/hooks/useAwsS3.ts
@@ -2,13 +2,13 @@ import useGlobalStore from "@/pages/globalStore";
 
 function useAwsS3() {
   const currentApp = useGlobalStore((state) => state.currentApp);
-  const credentials = currentApp?.storage?.credentials!;
+  const credentials = currentApp?.storage?.credentials;
 
   const s3 = new (window as any).AWS.S3({
-    accessKeyId: credentials.accessKeyId,
-    secretAccessKey: credentials.secretAccessKey,
-    sessionToken: credentials.sessionToken,
-    endpoint: credentials.endpoint,
+    accessKeyId: credentials?.accessKeyId,
+    secretAccessKey: credentials?.secretAccessKey,
+    sessionToken: credentials?.sessionToken,
+    endpoint: credentials?.endpoint,
     s3ForcePathStyle: true,
     signatureVersion: "v4",
   });

diff --git a/web/src/pages/app/logs/index.tsx b/web/src/pages/app/logs/index.tsx
@@ -101,7 +101,6 @@ export default function LogsPage() {
                 width={200}
                 size="sm"
                 placeholder={t("FunctionPanel.FunctionName").toString()}
-                bg="white"
                 {...register("functionName")}
               />
 

diff --git a/web/src/pages/app/storages/store.ts b/web/src/pages/app/storages/store.ts
@@ -52,7 +52,7 @@ const useStorageStore = create<State>()(
 
       getOrigin: (domain: string) => {
         const currentApp = useGlobalStore.getState().currentApp;
-        return `${currentApp?.tls ? "https" : "http"}://${domain}:${formatPort(currentApp?.port)}`;
+        return `${currentApp?.tls ? "https" : "http"}://${domain}${formatPort(currentApp?.port)}`;
       },
     })),
   ),

diff --git a/web/src/pages/globalStore.ts b/web/src/pages/globalStore.ts
@@ -4,6 +4,7 @@ import { devtools } from "zustand/middleware";
 import { immer } from "zustand/middleware/immer";
 
 import { APP_PHASE_STATUS } from "@/constants";
+import { formatPort } from "@/utils/format";
 
 import { TApplication, TRegion, TRuntime, TUserInfo } from "@/apis/typing";
 import { ApplicationControllerRemove, ApplicationControllerUpdate } from "@/apis/v1/applications";
@@ -117,7 +118,7 @@ const useGlobalStore = create<State>()(
           state.currentApp = app;
 
           if (typeof state.currentApp === "object") {
-            const host = `${state.currentApp?.domain?.domain}:${state.currentApp.port}`;
+            const host = `${state.currentApp?.domain?.domain}${formatPort(state.currentApp.port)}`;
             state.currentApp.host = host;
             state.currentApp.origin = `${state.currentApp?.tls ? "https://" : "http://"}${host}`;
           }

diff --git a/web/src/utils/format.ts b/web/src/utils/format.ts
@@ -36,11 +36,11 @@ export function formatDateOption(): { label: string; value: number | string }[]
   const optionDay = [7, 30, 60, 90];
   const option: { label: string; value: string | number }[] = optionDay.map((item) => {
     return {
-      label: `${item} ${t(" Days")}`,
+      label: `${item} ${t("Days")}`,
       value: item * 24 * 60 * 60,
     };
   });
-  option.push({ label: t(" Custom"), value: "custom" });
+  option.push({ label: t("Custom"), value: "custom" });
   return option;
 }
 

diff --git a/web/tsconfig.node.json b/web/tsconfig.node.json
@@ -3,6 +3,7 @@
     "target": "ESNext",
     "composite": true,
     "module": "ESNext",
+    "skipLibCheck": true,
     "moduleResolution": "Node",
     "allowSyntheticDefaultImports": true,
     "types": ["node"]