first implementation renaming

This commit is contained in:
Niklas 2021-08-29 19:59:25 +02:00
parent 5f4da5d13f
commit 6f25be49ca
5 changed files with 73 additions and 4 deletions

View File

@ -33,6 +33,8 @@ const FileBrowser: React.FC<RouteComponentProps> = (props) => {
const [srcID,setSrcID] = useState("") const [srcID,setSrcID] = useState("")
const [pasteAction,setPasteAction] = useState<Action>() const [pasteAction,setPasteAction] = useState<Action>()
const [editID,setEditID] = useState("")
const [editEnable,setEditEnable] = useState(false)
const [deleteMutation] = useDeleteFileMutation() const [deleteMutation] = useDeleteFileMutation()
const [copyMutation] = useCopyMutation() const [copyMutation] = useCopyMutation()
@ -94,6 +96,10 @@ const FileBrowser: React.FC<RouteComponentProps> = (props) => {
case Action.FileDownload: case Action.FileDownload:
downloadFile(genDownloadLink(id)) downloadFile(genDownloadLink(id))
break break
case Action.FileRename:
setEditID(id)
setEditEnable(true)
break
default: default:
break break
} }
@ -153,6 +159,18 @@ const FileBrowser: React.FC<RouteComponentProps> = (props) => {
e.preventDefault() e.preventDefault()
showFileContext(e,{props:{id}}) showFileContext(e,{props:{id}})
}} }}
editId={editID}
editEnable={editEnable}
onRenameDone={(id,changed,newName)=>{
setEditEnable(false)
if (changed){
console.debug("Changed: ",newName)
}else{
console.debug("Not changed")
}
}}
/> />
{loading && {loading &&
<div className="flex justify-center mt-4"> <div className="flex justify-center mt-4">

View File

@ -11,6 +11,7 @@ export enum Action {
FilePaste, FilePaste,
FileMove, FileMove,
FileDownload, FileDownload,
FileRename,
DirDelete DirDelete
} }
@ -32,6 +33,7 @@ const FileBrowserContextMenu: React.FC<Props> = (props) => {
<Item onClick={onClick} data={Action.FileDelete} >Delete</Item> <Item onClick={onClick} data={Action.FileDelete} >Delete</Item>
<Item onClick={onClick} data={Action.FileCopy} >Copy</Item> <Item onClick={onClick} data={Action.FileCopy} >Copy</Item>
<Item onClick={onClick} data={Action.FileMove} >Move</Item> <Item onClick={onClick} data={Action.FileMove} >Move</Item>
<Item onClick={onClick} data={Action.FileRename} >Rename</Item>
<Item onClick={onClick} data={Action.FileDownload} >Download</Item> <Item onClick={onClick} data={Action.FileDownload} >Download</Item>
<Separator /> <Separator />
<Item onClick={onClick} data={Action.FilePaste} disabled={!props.pasteActive}>Paste</Item> <Item onClick={onClick} data={Action.FilePaste} disabled={!props.pasteActive}>Paste</Item>

View File

@ -8,6 +8,9 @@ interface Props {
dir?: Directory dir?: Directory
onClick?: (event: React.MouseEvent ,data: File | Directory) => void onClick?: (event: React.MouseEvent ,data: File | Directory) => void
onContextMenu?: (e:React.MouseEvent) => void onContextMenu?: (e:React.MouseEvent) => void
edit: boolean
onRename?: (newName: string)=>void
onCancleRename?: ()=>void
} }
const FileBrowserElement: React.FC<Props> = (props) => { const FileBrowserElement: React.FC<Props> = (props) => {
@ -25,7 +28,14 @@ const FileBrowserElement: React.FC<Props> = (props) => {
onContextMenu={(e)=>props.onContextMenu?.(e)} onContextMenu={(e)=>props.onContextMenu?.(e)}
> >
{(props.file) ? <FileElement file={props.file}/>:(props.dir)?<DirectoryComponent dir={props.dir} />:<></>} {(props.file) ? <FileElement
edit={props.edit}
file={props.file}
onCancleRename={props.onCancleRename}
onRename={props.onRename}
/>:(props.dir)?<DirectoryComponent
dir={props.dir}
/>:<></>}
</tr> </tr>
) )
} }

View File

@ -5,10 +5,15 @@ import FileBrowserElement from "./FileBrowserElement"
interface Props{ interface Props{
directorys: Directory[] directorys: Directory[]
files: File[] files: File[]
onFileContext?: (event: React.MouseEvent, id: string)=>void onFileContext?: (event: React.MouseEvent, id: string)=>void
onDirContext?: (event: React.MouseEvent, path: string)=>void onDirContext?: (event: React.MouseEvent, path: string)=>void
onFileClick?: (event: React.MouseEvent,id: string)=>void onFileClick?: (event: React.MouseEvent,id: string)=>void
onDirClick?: (event: React.MouseEvent,path: string)=>void onDirClick?: (event: React.MouseEvent,path: string)=>void
editId: string
editEnable: boolean
onRenameDone?: (id: string, changed: boolean, newName: string)=>void
} }
const FileBrowserList: React.FC<Props> = (props) => { const FileBrowserList: React.FC<Props> = (props) => {
@ -31,6 +36,18 @@ const FileBrowserList: React.FC<Props> = (props) => {
onContextMenu={(e)=>{ onContextMenu={(e)=>{
props.onDirContext?.(e,v.id) props.onDirContext?.(e,v.id)
}} }}
edit={props.editEnable && (v.id === props.editId)}
onRename={(newName)=>{
if (v.name != newName){
props.onRenameDone?.(v.id,true,newName)
}else{
props.onRenameDone?.(v.id,false,newName)
}
}}
onCancleRename={()=>props.onRenameDone?.(v.id,false,"")}
/>))} />))}
{ props.files.map(v => (<FileBrowserElement { props.files.map(v => (<FileBrowserElement
@ -42,6 +59,18 @@ const FileBrowserList: React.FC<Props> = (props) => {
onContextMenu={(e)=>{ onContextMenu={(e)=>{
props.onFileContext?.(e,v.id) props.onFileContext?.(e,v.id)
}} }}
edit={props.editEnable && (v.id === props.editId)}
onRename={(newName)=>{
if (v.name != newName){
props.onRenameDone?.(v.id,true,newName)
}else{
props.onRenameDone?.(v.id,false,newName)
}
}}
onCancleRename={()=>props.onRenameDone?.(v.id,false,"")}
/>))} />))}
</tbody> </tbody>
</table> </table>

View File

@ -3,16 +3,26 @@ import { File } from "../generated/graphql"
import sizeToReadable from "../functions/sizeToReadable" import sizeToReadable from "../functions/sizeToReadable"
import dateFormat from "../functions/dateFomat" import dateFormat from "../functions/dateFomat"
import { FaRegFileAlt } from "react-icons/fa" import { FaRegFileAlt } from "react-icons/fa"
import Renameable from "./Renameable"
interface Props { interface Props {
file: File file: File,
edit: boolean
onRename?: (newName: string)=>void
onCancleRename?: ()=>void
} }
const FileElement: React.FC<Props> = (props) => { const FileElement: React.FC<Props> = (props) => {
return ( return (
<> <>
<td> <td>
<FaRegFileAlt className="inline" /> {props.file.name} <FaRegFileAlt className="inline" />
<Renameable
text={props.file.name || ""}
edit={props.edit}
onCancleRename={props.onCancleRename}
onRename={props.onRename}
/>
</td> </td>
<td> <td>
{dateFormat(props.file.lastModified)} {dateFormat(props.file.lastModified)}