From 7d5eebf228152b91d4f1d3e35610fc5e207c54db Mon Sep 17 00:00:00 2001
From: allence <lizhenq2009@gmail.com>
Date: Sat, 4 Mar 2023 09:47:58 +0800
Subject: [PATCH] feat(web): add file upload code template (#844)

---
 web/public/locales/en/translation.json        |  3 +-
 web/public/locales/zh-CN/translation.json     | 11 ++---
 web/public/locales/zh/translation.json        | 11 ++---
 web/src/components/FileUpload/index.tsx       | 38 ++++++++---------
 web/src/components/Pagination/index.tsx       |  2 +-
 web/src/layouts/Header/UserSetting/index.tsx  |  1 +
 .../mods/DataPanel/index.tsx                  | 15 +++----
 .../app/functions/mods/DeployButton/index.tsx |  5 ++-
 .../CreateModal/functionTemplates.ts          | 41 +++++++++++++++++++
 web/src/pages/app/setting/UserInfo/index.tsx  |  1 +
 .../app/storages/mods/FileList/index.tsx      | 16 +++-----
 .../app/storages/mods/UploadButton/index.tsx  | 38 ++++-------------
 12 files changed, 102 insertions(+), 80 deletions(-)

diff --git a/web/public/locales/en/translation.json b/web/public/locales/en/translation.json
index 6d60ac083b..cd14e0ebe1 100644
--- a/web/public/locales/en/translation.json
+++ b/web/public/locales/en/translation.json
@@ -262,5 +262,6 @@
   "Back": "Return",
   "Personal Access Token": "Personal Access Token",
   "SwitchLanguage": "Switch Language",
-  "Storage": "Storage"
+  "Storage": "Storage",
+  "upload example": "file upload"
 }
diff --git a/web/public/locales/zh-CN/translation.json b/web/public/locales/zh-CN/translation.json
index df89b404e8..113fbe12cc 100644
--- a/web/public/locales/zh-CN/translation.json
+++ b/web/public/locales/zh-CN/translation.json
@@ -161,9 +161,9 @@
     "Storage": "存储",
     "StorageList": "云存储列表",
     "Policy": "权限",
-    "Private": "私有",
-    "Readonly": "公共读",
-    "ReadWrite": "公共读写",
+    "Private": "私有 (private)",
+    "Readonly": "公共读 (readonly)",
+    "ReadWrite": "公共读写 (readwrite)",
     "Upload": "上传",
     "Drag": "拖放到此处或者",
     "File": "文件",
@@ -262,5 +262,6 @@
   "Back": "返回",
   "Personal Access Token": "访问凭证 (PAT)",
   "SwitchLanguage": "切换语言",
-  "Storage": "云存储"
-}
+  "Storage": "云存储",
+  "upload example": "文件上传示例"
+}
\ No newline at end of file
diff --git a/web/public/locales/zh/translation.json b/web/public/locales/zh/translation.json
index 9757d78715..c71d7dea6c 100644
--- a/web/public/locales/zh/translation.json
+++ b/web/public/locales/zh/translation.json
@@ -177,9 +177,9 @@
     "FolderName": "文件夹名称",
     "NameTip": "请输入文件夹名称",
     "Policy": "权限",
-    "Private": "私有",
-    "Readonly": "公共读",
-    "ReadWrite": "公共读写",
+    "Private": "私有 (private)",
+    "Readonly": "公共读 (readonly)",
+    "ReadWrite": "公共读写 (readwrite)",
     "SearchBucket": "输入 bucket 名进行搜索",
     "Size": "大小",
     "Storage": "存储",
@@ -262,5 +262,6 @@
   "Back": "返回",
   "Personal Access Token": "访问凭证 (PAT)",
   "SwitchLanguage": "切换语言",
-  "Storage": "云存储"
-}
+  "Storage": "云存储",
+  "upload example": "文件上传示例"
+}
\ No newline at end of file
diff --git a/web/src/components/FileUpload/index.tsx b/web/src/components/FileUpload/index.tsx
index 234e67fa8f..c26db0f2f7 100644
--- a/web/src/components/FileUpload/index.tsx
+++ b/web/src/components/FileUpload/index.tsx
@@ -1,26 +1,19 @@
-import React, { useEffect } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import clsx from "clsx";
 
 import styles from "./index.module.scss";
 
+type UploadType = "file" | "folder";
+
 // drag drop file component
-function FileUpload(props: { onUpload: (files: any) => void; uploadType: "file" | "folder" }) {
-  const { onUpload = () => {}, uploadType } = props;
+function FileUpload(props: { onUpload: (files: any) => void }) {
+  const { onUpload = () => {} } = props;
   // drag state
   const [dragActive, setDragActive] = React.useState(false);
   // ref
   const inputRef = React.useRef<any>(null);
   const { t } = useTranslation();
-  useEffect(() => {
-    if (uploadType === "folder") {
-      inputRef.current.setAttribute("webkitdirectory", "");
-      inputRef.current.setAttribute("directory", "");
-    } else {
-      inputRef.current.removeAttribute("webkitdirectory");
-      inputRef.current.removeAttribute("directory");
-    }
-  }, [uploadType]);
 
   // handle drag events
   const handleDrag = function (e: any) {
@@ -53,7 +46,14 @@ function FileUpload(props: { onUpload: (files: any) => void; uploadType: "file"
   };
 
   // triggers the input when the button is clicked
-  const onButtonClick = () => {
+  const onButtonClick = (uploadType: UploadType) => {
+    if (uploadType === "folder") {
+      inputRef.current.setAttribute("webkitdirectory", "");
+      inputRef.current.setAttribute("directory", "");
+    } else {
+      inputRef.current.removeAttribute("webkitdirectory");
+      inputRef.current.removeAttribute("directory");
+    }
     inputRef?.current?.click();
   };
 
@@ -78,12 +78,12 @@ function FileUpload(props: { onUpload: (files: any) => void; uploadType: "file"
         htmlFor="input-file-upload"
       >
         <div>
-          <p>
-            {uploadType === "file" ? t("StoragePanel.File") : t("StoragePanel.Folder")}
-            {t("StoragePanel.Drag")}
-          </p>
-          <button className={styles.uploadButton} onClick={onButtonClick}>
-            {uploadType === "file" ? t("StoragePanel.UploadFile") : t("StoragePanel.UploadFolder")}
+          <button className={styles.uploadButton} onClick={() => onButtonClick("file")}>
+            {t("StoragePanel.UploadFile")}
+          </button>
+          <span className="mx-2 text-xl">或</span>
+          <button className={styles.uploadButton} onClick={() => onButtonClick("folder")}>
+            {t("StoragePanel.UploadFolder")}
           </button>
         </div>
       </label>
diff --git a/web/src/components/Pagination/index.tsx b/web/src/components/Pagination/index.tsx
index 54a228c39b..5035f1c499 100644
--- a/web/src/components/Pagination/index.tsx
+++ b/web/src/components/Pagination/index.tsx
@@ -33,7 +33,7 @@ export default function Pagination(props: {
 
   return (
     <HStack alignItems="center" spacing={"1"} display="flex" whiteSpace={"nowrap"}>
-      <Text as="div" className="text-lg mr-2">
+      <Text as="div" className="mr-2">
         {t("Total")}: {total}
       </Text>
       <IconWrap showBg tooltip="First Page" size={18}>
diff --git a/web/src/layouts/Header/UserSetting/index.tsx b/web/src/layouts/Header/UserSetting/index.tsx
index 249ff84af3..d5c6761dc4 100644
--- a/web/src/layouts/Header/UserSetting/index.tsx
+++ b/web/src/layouts/Header/UserSetting/index.tsx
@@ -15,6 +15,7 @@ export default function UserSetting(props: { name: string; avatar?: string; widt
         <Avatar
           size="sm"
           name={props.name}
+          src={props.avatar}
           bgColor="primary.500"
           color="white"
           boxShadow="base"
diff --git a/web/src/pages/app/database/CollectionDataList/mods/DataPanel/index.tsx b/web/src/pages/app/database/CollectionDataList/mods/DataPanel/index.tsx
index 94acb2e32c..fa99b13881 100644
--- a/web/src/pages/app/database/CollectionDataList/mods/DataPanel/index.tsx
+++ b/web/src/pages/app/database/CollectionDataList/mods/DataPanel/index.tsx
@@ -135,7 +135,7 @@ export default function DataPanel() {
 
   return (
     <>
-      <Panel.Header className="w-full h-[60px] flex-shrink-0">
+      <Panel.Header className="w-full h-[40px] flex-shrink-0">
         <div className="flex items-center">
           <AddDataModal
             schema={currentData.data ? currentData.data : {}}
@@ -153,20 +153,21 @@ export default function DataPanel() {
             }}
           >
             <Button
+              size="xs"
+              variant="textGhost"
+              leftIcon={<AddIcon fontSize={10} className="text-grayModern-500" />}
               disabled={store.currentDB === undefined}
-              colorScheme="primary"
-              className="mr-2"
-              style={{ width: "114px" }}
-              leftIcon={<AddIcon />}
+              className="mr-2 font-bold"
             >
               {t("CollectionPanel.AddData")}
             </Button>
           </AddDataModal>
+
           <Button
+            size="xs"
+            variant="textGhost"
             disabled={store.currentDB === undefined}
-            colorScheme="primary"
             className="mr-2"
-            style={{ width: "114px" }}
             isLoading={entryDataQuery.isFetching}
             leftIcon={<BiRefresh fontSize={20} />}
             onClick={() => refresh(search)}
diff --git a/web/src/pages/app/functions/mods/DeployButton/index.tsx b/web/src/pages/app/functions/mods/DeployButton/index.tsx
index 88b713e9e3..2ca53a0eed 100644
--- a/web/src/pages/app/functions/mods/DeployButton/index.tsx
+++ b/web/src/pages/app/functions/mods/DeployButton/index.tsx
@@ -65,7 +65,10 @@ export default function DeployButton() {
 
   return (
     <>
-      <Tooltip label={`快捷键: ${displayName.toUpperCase()}，调试可直接点击右侧「运行」按扭`}>
+      <Tooltip
+        label={`快捷键: ${displayName.toUpperCase()}，调试可直接点击右侧「运行」按扭`}
+        placement="bottom-end"
+      >
         <Button
           variant={"text"}
           isLoading={functionDetailQuery.isFetching}
diff --git a/web/src/pages/app/functions/mods/FunctionPanel/CreateModal/functionTemplates.ts b/web/src/pages/app/functions/mods/FunctionPanel/CreateModal/functionTemplates.ts
index ec6936b1b9..ab8154b1f9 100644
--- a/web/src/pages/app/functions/mods/FunctionPanel/CreateModal/functionTemplates.ts
+++ b/web/src/pages/app/functions/mods/FunctionPanel/CreateModal/functionTemplates.ts
@@ -32,6 +32,47 @@ export async function main(ctx: FunctionContext) {
 }
 `,
   },
+  {
+    label: t("upload example"),
+    value: `import cloud from '@lafjs/cloud'
+import { PutObjectCommand, S3 } from "@aws-sdk/client-s3";
+
+exports.main = async function (ctx: FunctionContext) {
+  const { auth, body, query } = ctx
+  const ENDPOINT = cloud.env.OSS_EXTERNAL_ENDPOINT;
+  const BUCKET = ""; // Create your bucket first
+
+  const s3Client = new S3({
+    region: cloud.env.OSS_REGION,
+    endpoint: ENDPOINT,
+    credentials: {
+      accessKeyId: cloud.env.OSS_ACCESS_KEY,
+      secretAccessKey: cloud.env.OSS_ACCESS_SECRET,
+    },
+    forcePathStyle: true,
+  });
+
+  const file = ctx.files[0]
+  console.log(file)
+  const stream = require('fs').createReadStream(file.path)
+  const cmd = new PutObjectCommand({
+    Bucket: BUCKET,
+    Key: ctx.files[0].filename,
+    Body: stream,
+    ContentType: file.mimetype,
+  })
+  try {
+    const data = await s3Client.send(cmd);
+    return {
+      success: true,
+      fileName: ctx.files[0].filename,
+    }
+  } catch (err) {
+    return { code: 500, err: err }
+  }
+}
+    `,
+  },
 ];
 
 export default functionTemplates;
diff --git a/web/src/pages/app/setting/UserInfo/index.tsx b/web/src/pages/app/setting/UserInfo/index.tsx
index ce4440c812..ce48f6bd86 100644
--- a/web/src/pages/app/setting/UserInfo/index.tsx
+++ b/web/src/pages/app/setting/UserInfo/index.tsx
@@ -26,6 +26,7 @@ export default function UserInfo() {
             <Avatar
               size="lg"
               name={userInfo?.username}
+              src={userInfo?.profile.avatar}
               bgColor="primary.500"
               color="white"
               boxShadow="base"
diff --git a/web/src/pages/app/storages/mods/FileList/index.tsx b/web/src/pages/app/storages/mods/FileList/index.tsx
index 52807f38a4..c46206397b 100644
--- a/web/src/pages/app/storages/mods/FileList/index.tsx
+++ b/web/src/pages/app/storages/mods/FileList/index.tsx
@@ -4,7 +4,6 @@ import {
   Button,
   Center,
   HStack,
-  MenuButton,
   Spinner,
   Table,
   TableContainer,
@@ -76,15 +75,14 @@ export default function FileList() {
         <Panel.Header>
           <HStack spacing={2}>
             <UploadButton onUploadSuccess={() => query.refetch()}>
-              <MenuButton
+              <Button
                 size="sm"
                 variant="textGhost"
-                as={Button}
                 leftIcon={<BiCloudUpload fontSize={22} className="text-grayModern-500" />}
                 disabled={currentStorage === undefined}
               >
                 <p className="font-semibold">{t("StoragePanel.Upload")}</p>
-              </MenuButton>
+              </Button>
             </UploadButton>
             <CreateFolderModal onCreateSuccess={() => query.refetch()} />
             <Button
@@ -121,13 +119,11 @@ export default function FileList() {
             (query.data.length === 1 && query.data[0].Key === prefix) ? (
             <EmptyBox>
               <UploadButton onUploadSuccess={() => query.refetch()}>
-                <div>
+                <div className="text-lg">
                   <span>{t("StoragePanel.UploadTip")}</span>
-                  <MenuButton disabled={currentStorage === undefined}>
-                    <span className="ml-2 text-primary-600 hover:border-b-2 hover:border-primary-600 cursor-pointer">
-                      {t("StoragePanel.InstantUpload")}
-                    </span>
-                  </MenuButton>
+                  <span className="ml-2 text-primary-600 hover:border-b-2 hover:border-primary-600 cursor-pointer">
+                    {t("StoragePanel.InstantUpload")}
+                  </span>
                 </div>
               </UploadButton>
             </EmptyBox>
diff --git a/web/src/pages/app/storages/mods/UploadButton/index.tsx b/web/src/pages/app/storages/mods/UploadButton/index.tsx
index d282bda553..49e0f83f98 100644
--- a/web/src/pages/app/storages/mods/UploadButton/index.tsx
+++ b/web/src/pages/app/storages/mods/UploadButton/index.tsx
@@ -2,9 +2,6 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { CheckCircleIcon } from "@chakra-ui/icons";
 import {
-  Menu,
-  MenuItem,
-  MenuList,
   Modal,
   ModalCloseButton,
   ModalContent,
@@ -29,46 +26,25 @@ function UploadButton(props: { onUploadSuccess: Function; children: React.ReactE
   const { currentStorage, prefix } = useStorageStore();
   const { showSuccess } = useGlobalStore();
   const { uploadFile } = useAwsS3();
-  const [uploadType, setUploadType] = React.useState<"file" | "folder">("file");
   const [fileList, setFileList] = React.useState<TFileItem[]>([]);
   const { t } = useTranslation();
   const { onUploadSuccess, children } = props;
   return (
     <div>
-      <Menu placement="bottom-start">
-        {React.cloneElement(children)}
-        <MenuList minW={24}>
-          <MenuItem
-            onClick={() => {
-              setUploadType("file");
-              setFileList([]);
-              onOpen();
-            }}
-          >
-            {t("StoragePanel.File")}
-          </MenuItem>
-          <MenuItem
-            onClick={() => {
-              setUploadType("folder");
-              setFileList([]);
-              onOpen();
-            }}
-          >
-            {t("StoragePanel.Folder")}
-          </MenuItem>
-        </MenuList>
-      </Menu>
+      {React.cloneElement(children, {
+        onClick: () => {
+          setFileList([]);
+          onOpen();
+        },
+      })}
 
       <Modal isOpen={isOpen} onClose={onClose} size="lg">
         <ModalOverlay />
         <ModalContent>
-          <ModalHeader>
-            {uploadType === "file" ? t("StoragePanel.UploadFile") : t("StoragePanel.UploadFolder")}
-          </ModalHeader>
+          <ModalHeader>{t("StoragePanel.UploadFile")}</ModalHeader>
           <ModalCloseButton />
           <div className="p-6">
             <FileUpload
-              uploadType={uploadType}
               onUpload={async (files) => {
                 console.log(files);
                 const newFileList = Array.from(files).map((item: any) => {