From 39908bbd5a57e5510c202ae2dfe592c5a8cc8a76 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 19 Aug 2021 01:28:40 -0400 Subject: [PATCH] cleanup w2l result delete page --- .../w2l_result_delete/W2lResultDeleteFc.tsx | 69 ++++--------------- 1 file changed, 14 insertions(+), 55 deletions(-) diff --git a/vocodes/src/v2/w2l/w2l_result_delete/W2lResultDeleteFc.tsx b/vocodes/src/v2/w2l/w2l_result_delete/W2lResultDeleteFc.tsx index 59074244ae..36e9008431 100644 --- a/vocodes/src/v2/w2l/w2l_result_delete/W2lResultDeleteFc.tsx +++ b/vocodes/src/v2/w2l/w2l_result_delete/W2lResultDeleteFc.tsx @@ -4,7 +4,6 @@ import { ApiConfig } from '../../../common/ApiConfig'; import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig'; import { SessionWrapper } from '../../../session/SessionWrapper'; import { useParams, Link, useHistory } from 'react-router-dom'; -import { GetW2lTemplateUseCount } from '../../api/w2l/GetW2lTemplateUseCount'; import { GetW2lResult, W2lResult } from '../../api/w2l/GetW2lResult'; interface Props { @@ -16,25 +15,18 @@ function W2lResultDeleteFc(props: Props) { let { token } = useParams() as { token : string }; - const [w2lTemplate, setW2lTemplate] = useState(undefined); - const [w2lTemplateUseCount, setW2lTemplateUseCount] = useState(undefined); + const [w2lInferenceResult, setW2lInferenceResult] = useState(undefined); - const getTemplate = useCallback(async (token) => { + const getInferenceResult = useCallback(async (token) => { const templateResponse = await GetW2lResult(token); if (templateResponse) { - setW2lTemplate(templateResponse) + setW2lInferenceResult(templateResponse) } }, []); - const getTemplateUseCount = useCallback(async (token) => { - const count = await GetW2lTemplateUseCount(token); - setW2lTemplateUseCount(count || 0) - }, []); - useEffect(() => { - getTemplate(token); - getTemplateUseCount(token); - }, [token, getTemplate, getTemplateUseCount]); + getInferenceResult(token); + }, [token, getInferenceResult]); const templateResultLink = FrontendUrlConfig.w2lResultPage(token); @@ -74,15 +66,15 @@ function W2lResultDeleteFc(props: Props) { let creatorLink = ; - if (!!w2lTemplate?.maybe_creator_display_name) { - const creatorUrl = FrontendUrlConfig.userProfilePage(w2lTemplate?.maybe_creator_display_name); + if (!!w2lInferenceResult?.maybe_creator_display_name) { + const creatorUrl = FrontendUrlConfig.userProfilePage(w2lInferenceResult?.maybe_creator_display_name); creatorLink = ( - {w2lTemplate?.maybe_creator_display_name} + {w2lInferenceResult?.maybe_creator_display_name} ); } - let currentlyDeleted = !!w2lTemplate?.maybe_moderator_fields?.mod_deleted_at || - !!w2lTemplate?.maybe_moderator_fields?.user_deleted_at; + let currentlyDeleted = !!w2lInferenceResult?.maybe_moderator_fields?.mod_deleted_at || + !!w2lInferenceResult?.maybe_moderator_fields?.user_deleted_at; const h1Title = currentlyDeleted ? "Undelete Result?" : "Delete Result?"; @@ -96,32 +88,6 @@ function W2lResultDeleteFc(props: Props) { "Recover the W2L Result (makes it visible again)" : "Delete W2L Result (hides from everyone but mods)"; - let humanUseCount : string | number = 'Fetching...'; - - if (w2lTemplateUseCount !== undefined && w2lTemplateUseCount !== null) { - humanUseCount = w2lTemplateUseCount; - } - - let moderatorRows = null; - - if (props.sessionWrapper.canDeleteOtherUsersW2lResults() || props.sessionWrapper.canDeleteOtherUsersW2lTemplates()) { - moderatorRows = ( - <> - - Creator IP address - {w2lTemplate?.maybe_moderator_fields?.creator_ip_address || "server error"} - - - Mod Deleted At (UTC) - {w2lTemplate?.maybe_moderator_fields?.mod_deleted_at || "not deleted"} - - - User Deleted At (UTC) - {w2lTemplate?.maybe_moderator_fields?.user_deleted_at || "not deleted"} - - - ); - } return (
@@ -146,20 +112,13 @@ function W2lResultDeleteFc(props: Props) { - Use Count - {humanUseCount} + Template title + {w2lInferenceResult?.template_title} - Title - {w2lTemplate?.template_title} + Duration (milliseconds) + {w2lInferenceResult?.duration_millis} - - Upload Date (UTC) - {w2lTemplate?.created_at} - - - {moderatorRows} -