Skip to content

Commit 547dadb

Browse files
authored
Revert "refactor:batch rename and remove (#174)"
This reverts commit 90c8597.
1 parent 90c8597 commit 547dadb

File tree

4 files changed

+4
-22
lines changed

4 files changed

+4
-22
lines changed

src/pages/home/toolbar/BatchRename.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export const BatchRename = () => {
143143

144144
const renameObj: RenameObj = {
145145
src_name: obj.name,
146-
new_name: srcName() + tempNum + (suffix == "" ? "" : "." + suffix),
146+
new_name: srcName() + tempNum + "." + suffix,
147147
}
148148
tempNum = (parseInt(tempNum) + 1)
149149
.toString()

src/pages/home/toolbar/Delete.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ export const Delete = () => {
5454
onClick={async () => {
5555
const resp = await ok(
5656
pathname(),
57-
selectedObjs().map((obj) => ({
58-
id: obj.id,
59-
name: obj.name,
60-
})),
57+
selectedObjs().map((obj) => obj.name),
6158
)
6259
handleRespWithNotifySuccess(resp, () => {
6360
refresh()

src/types/obj.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export enum ObjType {
1111
}
1212

1313
export interface Obj {
14-
id: string
1514
name: string
1615
size: number
1716
is_dir: boolean
@@ -28,11 +27,6 @@ export type StoreObj = Obj & {
2827
selected?: boolean
2928
}
3029

31-
export type IDName = {
32-
id: string
33-
name: string
34-
}
35-
3630
export type RenameObj = {
3731
src_name: string
3832
new_name: string

src/utils/api.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
RenameObj,
1010
ArchiveMeta,
1111
ArchiveList,
12-
IDName,
1312
} from "~/types"
1413
import { r } from "."
1514

@@ -105,16 +104,8 @@ export const fsCopy = (
105104
return r.post("/fs/copy", { src_dir, dst_dir, names, overwrite })
106105
}
107106

108-
export const fsRemove = (dir: string, names: IDName[]): PEmptyResp => {
109-
return r.post(
110-
"/fs/remove",
111-
{ names },
112-
{
113-
headers: {
114-
"File-Path": encodeURIComponent(dir),
115-
},
116-
},
117-
)
107+
export const fsRemove = (dir: string, names: string[]): PEmptyResp => {
108+
return r.post("/fs/remove", { dir, names })
118109
}
119110

120111
export const fsRemoveEmptyDirectory = (src_dir: string): PEmptyResp => {

0 commit comments

Comments
 (0)