From 9a75a30b874538af760161fbf713f5cfe87c6035 Mon Sep 17 00:00:00 2001 From: Opaque02 <66582645+Opaque02@users.noreply.github.com> Date: Mon, 7 Oct 2024 09:59:40 +1000 Subject: [PATCH] Promise stuff still --- src/ui/admin-ui-handler.ts | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts index 4a50ed54c99..35344ff23cb 100644 --- a/src/ui/admin-ui-handler.ts +++ b/src/ui/admin-ui-handler.ts @@ -114,9 +114,9 @@ export default class AdminUiHandler extends FormModalUiHandler { } else if (this.adminMode === AdminMode.SEARCH) { const results = this.adminSearch(adminSearchResult) .then(response => { - console.log("RESONSE: " + response); + console.log("RESPONSE: " + response); response?.adminSearchResult; - console.log("RESONSE.adminSearchResult: " + response?.adminSearchResult); + console.log("RESPONSE.adminSearchResult: " + response?.adminSearchResult); this.updateAdminPanelInfo(adminSearchResult); }); console.log(results); @@ -242,19 +242,21 @@ export default class AdminUiHandler extends FormModalUiHandler { async adminSearch(adminSearchResult: AdminSearchInfo): Promise<{ adminSearchResult?: AdminSearchInfo, error: boolean, errorType?: string }> { try { - const response = await Utils.apiFetch(`admin/account/admin-search?username=${encodeURIComponent(adminSearchResult.username)}`, true); - if (!response.ok) { // error - console.error(response); - console.log(adminSearchResult); - return { adminSearchResult: adminSearchResult, error: true, errorType: "Error" }; - } else if (response.status === this.httpUserNotFoundErrorCode) { // username doesn't exist - console.log(adminSearchResult); - return { adminSearchResult: adminSearchResult, error: true, errorType: "UsernameNotFound" }; - } - response.json().then(jsonResponse => { - console.log(jsonResponse); - return { adminSearchResult: jsonResponse, error: false }; - }); + await Utils.apiFetch(`admin/account/admin-search?username=${encodeURIComponent(adminSearchResult.username)}`, true) + .then(response => { + if (!response.ok) { // error + console.error(response); + console.log(adminSearchResult); + return { adminSearchResult: adminSearchResult, error: true, errorType: "Error" }; + } else if (response.status === this.httpUserNotFoundErrorCode) { // username doesn't exist + console.log(adminSearchResult); + return { adminSearchResult: adminSearchResult, error: true, errorType: "UsernameNotFound" }; + } + response.json().then(jsonResponse => { + console.log(jsonResponse); + return { adminSearchResult: jsonResponse, error: false }; + }); + }); } catch (err) { console.error(err); return { error: true, errorType: err };