From fc93dd00c617e57267ae48eaa44a8c9fa9dc4beb Mon Sep 17 00:00:00 2001 From: wil Date: Mon, 22 Jan 2024 16:55:00 -0500 Subject: [PATCH] added spinner, tab disabled mode, simplified code --- .../src/components/common/Tabs/Tabs.scss | 5 ++ .../src/components/common/Tabs/Tabs.tsx | 10 ++-- .../v2/view/pages/video_mocap/VideoMocap.tsx | 46 ++++++++----------- .../components/pageInferenceStatuses.tsx | 28 ++--------- .../components/pageVideoProvision.tsx | 39 ---------------- .../components/tabContentUpload.tsx | 14 +++++- 6 files changed, 49 insertions(+), 93 deletions(-) delete mode 100644 packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageVideoProvision.tsx diff --git a/packages/fakeyou.com/src/components/common/Tabs/Tabs.scss b/packages/fakeyou.com/src/components/common/Tabs/Tabs.scss index 9e5c2bba9d..16337e6dd3 100644 --- a/packages/fakeyou.com/src/components/common/Tabs/Tabs.scss +++ b/packages/fakeyou.com/src/components/common/Tabs/Tabs.scss @@ -32,5 +32,10 @@ background-color: transparent; border-bottom: 4px solid $primary !important; } + + &.disabled{ + color: rgba($white, 0.5) !important; + pointer-events: none; + } } } diff --git a/packages/fakeyou.com/src/components/common/Tabs/Tabs.tsx b/packages/fakeyou.com/src/components/common/Tabs/Tabs.tsx index 8d0277ace4..db2f6fe3bf 100644 --- a/packages/fakeyou.com/src/components/common/Tabs/Tabs.tsx +++ b/packages/fakeyou.com/src/components/common/Tabs/Tabs.tsx @@ -4,6 +4,7 @@ import { useSpring, a } from "@react-spring/web"; import "./Tabs.scss"; import { IconDefinition } from "@fortawesome/fontawesome-svg-core"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import makeClass from "resources/makeClass"; interface TabProps { to: string; @@ -11,10 +12,12 @@ interface TabProps { content?: React.ReactNode; icon?: IconDefinition; padding?: boolean; + disabled?:boolean; } interface TabsProps { tabs: TabProps[]; + disabled?: boolean; } interface TabContentProps { @@ -22,12 +25,12 @@ interface TabContentProps { padding?: boolean; } -function Tab({ to, label, icon, onClick }: TabProps & { onClick: () => void }) { +function Tab({ to, label, icon, onClick, disabled }: TabProps & { onClick: () => void }) { return (
  • @@ -43,7 +46,7 @@ function TabContent({ children, padding }: TabContentProps) { return
    {children}
    ; } -function Tabs({ tabs }: TabsProps) { +function Tabs({ tabs, disabled }: TabsProps) { const location = useLocation(); const currentPath = location.pathname; const initialTab = tabs.find(tab => tab.to === currentPath) || tabs[0]; @@ -83,6 +86,7 @@ function Tabs({ tabs }: TabsProps) { label={tab.label} onClick={() => handleTabClick(tab.to)} icon={tab.icon} + disabled={disabled || tab.disabled} /> ))} diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx index 286edfa1c4..25374eb5b7 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx @@ -28,35 +28,29 @@ export default function VideoMotionCapture(props: { const { enqueueInferenceJob } = props; const { t } = useLocalize("VideoMotionCapture"); enum pageStates { - VIDEO_PROVISION, + START, + VIDEO_PROVISIONING, SHOW_JOB_STATUS, } - const { VIDEO_PROVISION, SHOW_JOB_STATUS } = pageStates; - const [pageState, setPageState] = useState<{ - index: number; - inputMediaToken: string; - jobToken: string; - resultMediaToken: string; - }>({ - index: VIDEO_PROVISION, - inputMediaToken: "", - jobToken: "", - resultMediaToken: "", - }); + const { START, VIDEO_PROVISIONING, SHOW_JOB_STATUS } = pageStates; + const [pageState, setPageState] = useState(START); const handlePageState = ({ - tokenType, + nextState, token, }: { - tokenType: string; - token: string | undefined; + nextState: number; + token?: string; }) => { - if (token && tokenType === "jobToken") { - setPageState({ - ...pageState, - index: SHOW_JOB_STATUS, - jobToken: token, - }); + if(nextState===VIDEO_PROVISIONING){ + setPageState(VIDEO_PROVISIONING) + } + else if (nextState===SHOW_JOB_STATUS && token) { + enqueueInferenceJob( + token, + FrontendInferenceJobType.VideoMotionCapture + ); + setPageState(SHOW_JOB_STATUS); } }; @@ -91,14 +85,14 @@ export default function VideoMotionCapture(props: {
    {/*Video Provision Tabs & Job Statuses*/}
    - {pageState.index === VIDEO_PROVISION && } - {pageState.index === SHOW_JOB_STATUS && ( + {pageState !== SHOW_JOB_STATUS && + + } + {pageState === SHOW_JOB_STATUS && ( diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx index fc1002c526..d742e22801 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageInferenceStatuses.tsx @@ -1,4 +1,4 @@ -import React, { useEffect } from 'react' +import React from 'react' import { Analytics } from "common/Analytics"; import InferenceJobsList from "components/layout/InferenceJobsList"; @@ -7,26 +7,9 @@ import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/Infer export function PageInferenceStatuses (props:{ t: Function, pageStates: Object, - pageState: { - index:number, - inputMediaToken: string, - jobToken: string, - resultMediaToken: string - }, - enqueueInferenceJob: ( - jobToken: string, - frontendInferenceJobType: FrontendInferenceJobType - ) => void, - pageStateCallback: (data:{tokenType:string, token:string | undefined}) => void + pageStateCallback: (data:{nextState:number, token?:string}) => void }){ - const { t, pageState, enqueueInferenceJob } = props; - useEffect(()=>{ - console.log("ENQUEUE INFERENCE JOB>>") - enqueueInferenceJob( - props.pageState.jobToken, - FrontendInferenceJobType.VideoMotionCapture - ); - }, [props.pageState.jobToken, enqueueInferenceJob]) + const { t } = props; const failures = (fail = "") => { switch (fail) { @@ -38,15 +21,14 @@ export function PageInferenceStatuses (props:{ }; return( - <> +

    {t("tab.message.mocapNetRequestSucceed")}

    -

    Job Token: {pageState.jobToken}

    Analytics.voiceConversionClickDownload(), jobType: FrontendInferenceJobType.VideoMotionCapture, }}/> - +
    ) } \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageVideoProvision.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageVideoProvision.tsx deleted file mode 100644 index 65bb821b75..0000000000 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/pageVideoProvision.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import React from "react"; -import TabContentUpload from "./tabContentUpload"; -import TabContentLibrary from "./tabContentLibrary"; - -export function PageVideoProvision (props:{ - t: Function - pageStateCallback: (data:{tokenType:string, token:string | undefined}) => void -}){ - const {t} = props; - return(<> -
      -
    • - -
    • -
    • - -
    • -
    -
    - - -
    - ); -} \ No newline at end of file diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx index 015bbb6d17..148cf39af4 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/components/tabContentUpload.tsx @@ -5,13 +5,15 @@ import { UploadMedia } from "@storyteller/components/src/api/media_files/UploadM import { EnqueueVideoMotionCapture } from "@storyteller/components/src/api/video_mocap"; import { useFile } from "hooks"; +import { Spinner } from "components/common"; import VideoInput from "components/common/VideoInput"; export default function TabContentUpload(props: { t: Function; pageStateCallback: (data: { - tokenType: string; - token: string | undefined; + nextState: number; + tokenType?: string; + token?: string | undefined; }) => void; }) { const { t, pageStateCallback } = props; @@ -43,6 +45,11 @@ export default function TabContentUpload(props: { } }); }; + useEffect(()=>{ + if(tabState === FILE_UPLOADING){ + pageStateCallback({nextState:1}); + } + }, [tabState]) useEffect(() => { if (token !== "") setTabState(FILE_UPLOADED); }, [token, FILE_UPLOADED]); @@ -54,6 +61,7 @@ export default function TabContentUpload(props: { }; EnqueueVideoMotionCapture(request).then(res => { pageStateCallback({ + nextState: 2, tokenType: "jobToken", token: res.inference_job_token, }); @@ -98,6 +106,7 @@ export default function TabContentUpload(props: {

    {t("tab.message.fileUploading")}

    +
    @@ -123,6 +132,7 @@ export default function TabContentUpload(props: {

    {t("tab.message.mocapNetRequesting")}

    +