fix(web): replace aws client sdk v3 with v2 (#546)

labring · Dec 15, 2022 · 3282894 · 3282894
1 parent 7c712e8
commit 3282894
Show file tree

Hide file tree

Showing 12 changed files with 9,700 additions and 6,653 deletions.
diff --git a/web/.eslintrc.json b/web/.eslintrc.json
@@ -20,7 +20,7 @@
               ["^react", "^@?\\w"],
               ["^(@chakra-ui)/(/.*|$/)"],
               // Internal packages.
-              ["^(@/components|@/constants|@/utils|/@/services)(/.*|$)"],
+              ["^(@/components|@/constants|@/utils|/@/services|/@/pages)(/.*|$)"],
               // Side effect imports.
               ["^\\u0000"],
               // Parent imports. Put `..` last.

diff --git a/web/index.html b/web/index.html
@@ -10,6 +10,7 @@
 
 <body>
   <div id="root"></div>
+  <script src="/js/aws-sdk-2.1275.0.min.js"></script>
   <script type="module" src="/src/main.tsx"></script>
 </body>
 

diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -15,15 +15,16 @@
     "@monaco-editor/react": "^4.4.6",
     "@tanstack/react-query": "^4.20.2",
     "aws-sdk": "^2.1274.0",
+    "@aws-sdk/client-s3": "^3.231.0",
     "axios": "^1.2.1",
     "clsx": "^1.2.1",
     "dayjs": "^1.11.7",
-    "laf-client-sdk": "^0.8.13",
     "framer-motion": "^7.8.1",
     "i18next": "^22.4.5",
     "i18next-browser-languagedetector": "7.0.1",
     "i18next-http-backend": "2.1.0",
     "immer": "^9.0.16",
+    "laf-client-sdk": "^0.8.13",
     "lodash": "^4.17.21",
     "make-plural": "^7.2.0",
     "react": "18.2.0",

diff --git a/web/public/js/aws-sdk-2.1275.0.min.js b/web/public/js/aws-sdk-2.1275.0.min.js
diff --git a/web/src/components/Editor/JsonEditor.tsx b/web/src/components/Editor/JsonEditor.tsx
@@ -5,7 +5,13 @@ export default function JsonEditor(props: {
   height?: string;
   onChange?: (value: string | undefined) => void;
 }) {
-  const { value } = props;
+  let value = "{\n\t\n}";
+  let objValue = {};
+  try {
+    objValue = JSON.parse(props.value || "{}");
+  } catch (error) {}
+
+  value = Object.keys(objValue).length ? JSON.stringify(objValue, null, 2) : value;
 
   function handleEditorWillMount(monaco: any) {
     monaco?.editor.defineTheme("jsonEditorTheme", {
@@ -26,7 +32,7 @@ export default function JsonEditor(props: {
   return (
     <Editor
       defaultLanguage="json"
-      value={JSON.stringify(JSON.parse(value), null, 2) || ""}
+      value={value}
       height={props.height || "100%"}
       onChange={(value, event) => {
         props.onChange && props.onChange(value);

diff --git a/web/src/hooks/useAwsS3.ts b/web/src/hooks/useAwsS3.ts
@@ -1,4 +1,4 @@
-import AWS from "aws-sdk";
+// import { S3Client } from '@aws-sdk/client-s3';
 
 import useGlobalStore from "@/pages/globalStore";
 
@@ -7,7 +7,7 @@ function useAwsS3() {
   const credentials = currentApp?.oss.credentials!;
   const region = currentApp?.oss.spec.region;
 
-  const s3 = new AWS.S3({
+  const s3 = new (window as any).AWS.S3({
     accessKeyId: credentials.accessKeyId,
     secretAccessKey: credentials.secretAccessKey,
     sessionToken: credentials.sessionToken,

diff --git a/web/src/hooks/useOss.ts b/web/src/hooks/useOss.ts
diff --git a/web/src/pages/app/database/CollectionDataList/mods/DataPannel/index.tsx b/web/src/pages/app/database/CollectionDataList/mods/DataPannel/index.tsx
@@ -98,7 +98,6 @@ export default function DataPannel() {
                 px="4"
                 onClick={async () => {
                   const params = JSON.parse(record);
-                  debugger;
                   const r = await db.collection(currentDB?.name!).add({ ...params });
                   if (!r.error) {
                     showSuccess("保存成功");
@@ -113,7 +112,7 @@ export default function DataPannel() {
             </div>
             <div className=" flex-1" style={{}}>
               <JsonEditor
-                value={currentData}
+                value={JSON.stringify(currentData || {}, null, 2)}
                 onChange={(values) => {
                   setRecord(values!);
                 }}

diff --git a/web/src/pages/app/storages/FileList/index.tsx b/web/src/pages/app/storages/FileList/index.tsx
diff --git a/web/src/pages/app/storages/mods/FileList/index.tsx b/web/src/pages/app/storages/mods/FileList/index.tsx
@@ -6,7 +6,7 @@ import IconWrap from "@/components/IconWrap";
 import PanelHeader from "@/components/Panel/Header";
 import { formatDate } from "@/utils/format";
 
-import useStorageStore from "../../store";
+import useStorageStore, { TFile } from "../../store";
 import CreateFolderModal from "../CreateFolderModal";
 import HostingDrawer from "../HostingDrawer";
 import UploadButton from "../UploadButton";
@@ -57,16 +57,10 @@ export default function FileList() {
               </Tr>
             </Thead>
             <Tbody>
-              {(query?.data || []).map((file: any) => {
+              {(query?.data || []).map((file: TFile) => {
                 return (
-                  <Tr _hover={{ bgColor: "#efefef" }} key={file.key}>
-                    <Td>
-                      {file.prefix ? (
-                        <span className="text-blue-600 underline cursor-pointer">{file.name}</span>
-                      ) : (
-                        <span>{file.name}</span>
-                      )}
-                    </Td>
+                  <Tr _hover={{ bgColor: "#efefef" }} key={file.Key}>
+                    <Td>jpg</Td>
                     <Td style={{ maxWidth: 200 }}>{file.Key}</Td>
                     <Td isNumeric>{file.Size}</Td>
                     <Td isNumeric>{formatDate(file.LastModified)}</Td>

diff --git a/web/src/pages/app/storages/store.ts b/web/src/pages/app/storages/store.ts
@@ -5,11 +5,16 @@ import { immer } from "zustand/middleware/immer";
 import { TBucket } from "@/apis/typing";
 
 export type TFile = {
-  name: string;
-  path: string;
-  size: number;
-  updateTime: string;
-  prefix: string;
+  Key: string;
+  LastModified: string;
+  ETag: string;
+  ChecksumAlgorithm: any[];
+  Size: number;
+  StorageClass: string;
+  Owner: {
+    DisplayName: string;
+    ID: string;
+  };
 };
 
 type State = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
     <body>
       <div id="root"></div>
+      <script src="/js/aws-sdk-2.1275.0.min.js"></script>
       <script type="module" src="/src/main.tsx"></script>
     </body>
@@ Expand Down @@