fix(share): multipath selector is not joined base path (#235)

Author: KirCute

src/components/MultiPathInput.tsx

@@ -16,6 +16,7 @@ import {
 import { createSignal } from "solid-js"
 import { TbPlus, TbFolder } from "solid-icons/tb"
 import { useT } from "~/hooks"
+import { pathJoin } from "~/utils"
 import { EnhancedFolderTree } from "~/components/EnhancedFolderTree"
 
 export interface MultiPathInputProps {
@@ -25,6 +26,7 @@ export interface MultiPathInputProps {
   readOnly?: boolean
   id?: string
   placeholder?: string
+  basePath?: string
 }
 
 export const MultiPathInput = (props: MultiPathInputProps) => {
@@ -34,7 +36,11 @@ export const MultiPathInput = (props: MultiPathInputProps) => {
 
   const addPath = () => {
     const currentPaths = props.value ? props.value.split("\n") : []
-    const newPaths = [...currentPaths, selectedPath()].filter(Boolean)
+    let sp = selectedPath()
+    if (props.basePath) {
+      sp = pathJoin(props.basePath, sp)
+    }
+    const newPaths = [...currentPaths, sp].filter(Boolean)
     const uniquePaths = [...new Set(newPaths)]
     props.onChange(uniquePaths.join("\n"))
     onClose()

src/pages/manage/shares/AddOrEdit.tsx

@@ -7,6 +7,7 @@ import { MaybeLoading } from "~/components"
 import { ResponsiveGrid } from "../common/ResponsiveGrid"
 import { batch, createSignal, Show } from "solid-js"
 import { Item } from "./Item"
+import { me } from "~/store"
 
 const AddOrEdit = () => {
   const t = useT()
@@ -52,6 +53,7 @@ const AddOrEdit = () => {
           type={Type.MultiPath}
           value={files()}
           valid={filesValid()}
+          basePath={me().base_path}
           required
           onChange={(f) => {
             setFiles(f)

src/pages/manage/shares/Item.tsx

@@ -50,6 +50,7 @@ export type ItemProps = {
       type: Type.MultiPath
       onChange?: (value: string) => void
       value: string
+      basePath?: string
     }
   | {
       type: Type.Select
@@ -164,6 +165,7 @@ const Item = (props: ItemProps) => {
             value={props.value as string}
             valid={props.valid}
             readOnly={props.readonly}
+            basePath={props.basePath}
             onChange={(value) => {
               if (props.type === Type.MultiPath) {
                 props.onChange?.(value)

src/pages/manage/shares/Share.tsx

@@ -2,7 +2,6 @@ import { PEmptyResp, ShareInfo, UserMethods } from "~/types"
 import { useFetch, useRouter, useT, useUtil } from "~/hooks"
 import { Badge, Button, HStack, Td, Tr } from "@hope-ui/solid"
 import {
-  base_path,
   handleResp,
   handleRespWithNotifySuccess,
   makeTemplateData,
@@ -29,9 +28,7 @@ function ShareOp(props: ShareProps) {
   const [enableOrDisableLoading, enableOrDisable] = useFetch(
     (): PEmptyResp =>
       r.post(
-        `/share/${props.share.disabled ? "enable" : "disable"}?id=${
-          props.share.id
-        }`,
+        `/share/${props.share.disabled ? "enable" : "disable"}?id=${props.share.id}`,
       ),
   )
   return (