Skip to content

Commit bf99c0e

Browse files
committed
fix[frontend]: wrong state on deletion
1 parent dfede5b commit bf99c0e

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

frontend/pb.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export function PasteBin() {
7676
const systemDark = window.matchMedia ? window.matchMedia("(prefers-color-scheme: dark)").matches : false
7777
const isDark = darkModeSelect === "system" ? systemDark : darkModeSelect === "dark"
7878

79-
function showErrorMsg(err: string, title: string) {
79+
function showModal(err: string, title: string) {
8080
setModalErrMsg(err)
8181
setModalErrTitle(title)
8282
setModalOpen(true)
@@ -85,7 +85,7 @@ export function PasteBin() {
8585
async function reportResponseError(resp: Response, title: string) {
8686
const statusText = resp.statusText === "error" ? "Unknown error" : resp.statusText
8787
const errText = (await resp.text()) || statusText
88-
showErrorMsg(errText, title)
88+
showModal(errText, title)
8989
}
9090

9191
const errorModal = (
@@ -96,6 +96,7 @@ export function PasteBin() {
9696
if (!open) {
9797
setIsPasteLoading(false)
9898
setIsLoading(false)
99+
console.log("set false isLoading")
99100
}
100101
}}
101102
>
@@ -178,13 +179,13 @@ export function PasteBin() {
178179
const fd = new FormData()
179180
if (editKind === "file") {
180181
if (uploadFile === null) {
181-
showErrorMsg("No file selected", "Error on preparing upload")
182+
showModal("No file selected", "Error on preparing upload")
182183
return
183184
}
184185
fd.append("c", uploadFile)
185186
} else {
186187
if (pasteEdit.length === 0) {
187-
showErrorMsg("Empty paste", "Error on preparing upload")
188+
showModal("Empty paste", "Error on preparing upload")
188189
return
189190
}
190191
fd.append("c", pasteEdit)
@@ -212,11 +213,13 @@ export function PasteBin() {
212213
if (resp.ok) {
213214
const respParsed = JSON.parse(await resp.text()) as PasteResponse
214215
setPasteResponse(respParsed)
216+
setIsLoading(false)
215217
} else {
216218
await reportResponseError(resp, `Error ${resp.status}`)
219+
// will setIsLoading(false) on closing modal
217220
}
218221
} catch (e) {
219-
showErrorMsg((e as Error).toString(), "Error on uploading paste")
222+
showModal((e as Error).toString(), "Error on uploading paste")
220223
console.error(e)
221224
}
222225
}
@@ -227,12 +230,13 @@ export function PasteBin() {
227230
method: "DELETE",
228231
})
229232
if (resp.ok) {
233+
showModal("It may takes 60 seconds for the deletion to propagate to the world", "Deletion succeeded")
230234
setPasteResponse(null)
231235
} else {
232236
await reportResponseError(resp, `Error ${resp.status}`)
233237
}
234238
} catch (e) {
235-
showErrorMsg((e as Error).message, "Error on deleting paste")
239+
showModal((e as Error).message, "Error on deleting paste")
236240
console.error(e)
237241
}
238242
}

0 commit comments

Comments
 (0)