From a40173bc747f348af3971dc8af1cf60b991d5994 Mon Sep 17 00:00:00 2001 From: wil Date: Tue, 18 Jun 2024 23:59:51 -0400 Subject: [PATCH] Api2.5/ rename scene (#500) - rename scene endpoint done - slight refactor, cleanup - and update eslint config for better eslint debugging this goes after https://github.com/storytold/GottaGoFast/pull/499 Co-authored-by: wil --- .eslintrc.cjs | 1 + app/Classes/ApiManager/MediaFilesApi.ts | 2 +- app/api.tsx | 4 +-- .../signaled/TopBar/SceneTitleInput.tsx | 29 +++++++++++++------ app/components/signaled/TopBar/utilities.tsx | 28 ------------------ 5 files changed, 24 insertions(+), 40 deletions(-) delete mode 100644 app/components/signaled/TopBar/utilities.tsx diff --git a/.eslintrc.cjs b/.eslintrc.cjs index d86348de16..b1993b5797 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -59,6 +59,7 @@ module.exports = { "jsx-a11y/click-events-have-key-events": SEVERITY.OFF, "jsx-a11y/no-static-element-interactions": SEVERITY.OFF, "jsx-a11y/media-has-caption": SEVERITY.OFF, + "jsx-a11y/no-autofocus": SEVERITY.OFF, }, }, diff --git a/app/Classes/ApiManager/MediaFilesApi.ts b/app/Classes/ApiManager/MediaFilesApi.ts index f5e27c7bb6..f0aa1683b1 100644 --- a/app/Classes/ApiManager/MediaFilesApi.ts +++ b/app/Classes/ApiManager/MediaFilesApi.ts @@ -222,7 +222,7 @@ export class MediaFilesApi extends ApiManager { mediaToken: string; name: string; }): Promise> { - const endpoint = `${this.ApiTargets.BaseApi}/v1/media_file/rename/${mediaToken}`; + const endpoint = `${this.ApiTargets.BaseApi}/v1/media_files/rename/${mediaToken}`; const body = { name }; return await this.post< diff --git a/app/api.tsx b/app/api.tsx index 9ba016dc46..34abfae170 100644 --- a/app/api.tsx +++ b/app/api.tsx @@ -37,5 +37,5 @@ export const uploadNewScene = `${apiHost}/v1/media_files/upload/new_scene`; export const uploadThumbnail = `${apiHost}/v1/media_files/cover_image/`; export const updateExistingScene = (sceneToken: string) => `${apiHost}/v1/media_files/upload/saved_scene/${sceneToken}`; -export const renameScene = (sceneToken: string) => - `${apiHost}/v1/media_files/rename/${sceneToken}`; +// export const renameScene = (sceneToken: string) => +// `${apiHost}/v1/media_files/rename/${sceneToken}`; diff --git a/app/components/signaled/TopBar/SceneTitleInput.tsx b/app/components/signaled/TopBar/SceneTitleInput.tsx index 6d6c0659bf..eafc49c4b6 100644 --- a/app/components/signaled/TopBar/SceneTitleInput.tsx +++ b/app/components/signaled/TopBar/SceneTitleInput.tsx @@ -10,7 +10,7 @@ import { errorDialogTitle, } from "~/pages/PageEnigma/signals"; import { Input } from "~/components"; -import { renameScene } from "./utilities"; +import { MediaFilesApi } from "~/Classes/ApiManager/MediaFilesApi"; interface Props { pageName: string; @@ -34,9 +34,9 @@ export const SceneTitleInput = ({ pageName }: Props) => { setState((curr) => ({ ...curr, isSaving: val })); }; - const handleShowErrorDialog = () => { + const handleShowErrorDialog = (errorMessage: string) => { errorDialogTitle.value = "Error"; - errorDialogMessage.value = "Scene name can not be empty."; + errorDialogMessage.value = errorMessage; showErrorDialog.value = true; }; @@ -50,11 +50,26 @@ export const SceneTitleInput = ({ pageName }: Props) => { } }; + const renameScene = async (sceneTitle: string, sceneToken: string) => { + const mediaFileApi = new MediaFilesApi(); + const response = await mediaFileApi.RenameMediaFileByToken({ + mediaToken: sceneToken, + name: sceneTitle, + }); + if (!response.success) { + handleShowErrorDialog( + response.errorMessage || "Unknown Error in Renaming Scene", + ); + resetPreviousTitle(); + } + setIsSaving(false); + }; + const validateSceneTitle = (e: React.FocusEvent) => { setShowInput(false); if (scene.value.title === "") { setIsValid(false); - handleShowErrorDialog(); + handleShowErrorDialog("Scene name can not be empty."); resetPreviousTitle(); e.currentTarget.focus(); } else if (scene.value.token) { @@ -62,11 +77,7 @@ export const SceneTitleInput = ({ pageName }: Props) => { renameScene( scene.value.title!, //guarunteed by input scene.value.token, - ).then((res) => { - // console.log(res); - //TODO: HANDLE ERROR - setIsSaving(false); - }); + ); } }; diff --git a/app/components/signaled/TopBar/utilities.tsx b/app/components/signaled/TopBar/utilities.tsx deleted file mode 100644 index 450a4936c4..0000000000 --- a/app/components/signaled/TopBar/utilities.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import { renameScene as renameSceneEndpoint } from "~/api"; - -export const renameScene = (sceneTitle: string, sceneToken: string) => { - const endpoint = renameSceneEndpoint(sceneToken); - - return fetch(endpoint, { - method: "POST", - headers: { - Accept: "application/json", - "Content-Type": "application/json", - }, - credentials: "include", - body: JSON.stringify({ - name: sceneTitle, - }), - }) - .then((res) => res.json()) - .then((res) => { - if (res && res.success) { - // console.log(res); - return res; - } - return { success: false }; - }) - .catch(() => { - return { success: false }; - }); -};