more minor refactoring

stashapp · Jul 27, 2023 · a0986f8 · a0986f8
1 parent 906a44c
commit a0986f8
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryChapterForm.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryChapterForm.tsx
@@ -14,13 +14,13 @@ import isEqual from "lodash-es/isEqual";
 
 interface IGalleryChapterForm {
   galleryID: string;
-  editingChapter?: GQL.GalleryChapterDataFragment;
+  chapter?: GQL.GalleryChapterDataFragment;
   onClose: () => void;
 }
 
 export const GalleryChapterForm: React.FC<IGalleryChapterForm> = ({
   galleryID,
-  editingChapter,
+  chapter,
   onClose,
 }) => {
   const intl = useIntl();
@@ -30,6 +30,8 @@ export const GalleryChapterForm: React.FC<IGalleryChapterForm> = ({
   const [galleryChapterDestroy] = useGalleryChapterDestroy();
   const Toast = useToast();
 
+  const isNew = chapter === undefined;
+
   const schema = yup.object({
     title: yup.string().ensure(),
     image_index: yup
@@ -41,8 +43,8 @@ export const GalleryChapterForm: React.FC<IGalleryChapterForm> = ({
   });
 
   const initialValues = {
-    title: editingChapter?.title ?? "",
-    image_index: editingChapter?.image_index ?? 1,
+    title: chapter?.title ?? "",
+    image_index: chapter?.image_index ?? 1,
   };
 
   type InputValues = yup.InferType<typeof schema>;
@@ -56,7 +58,7 @@ export const GalleryChapterForm: React.FC<IGalleryChapterForm> = ({
 
   async function onSave(input: InputValues) {
     try {
-      if (!editingChapter) {
+      if (isNew) {
         await galleryChapterCreate({
           variables: {
             gallery_id: galleryID,
@@ -66,7 +68,7 @@ export const GalleryChapterForm: React.FC<IGalleryChapterForm> = ({
       } else {
         await galleryChapterUpdate({
           variables: {
-            id: editingChapter.id,
+            id: chapter.id,
             gallery_id: galleryID,
             ...input,
           },
@@ -80,10 +82,10 @@ export const GalleryChapterForm: React.FC<IGalleryChapterForm> = ({
   }
 
   async function onDelete() {
-    if (!editingChapter) return;
+    if (isNew) return;
 
     try {
-      await galleryChapterDestroy({ variables: { id: editingChapter.id } });
+      await galleryChapterDestroy({ variables: { id: chapter.id } });
     } catch (e) {
       Toast.error(e);
     } finally {
@@ -130,9 +132,7 @@ export const GalleryChapterForm: React.FC<IGalleryChapterForm> = ({
         <div className="col d-flex">
           <Button
             variant="primary"
-            disabled={
-              (editingChapter && !formik.dirty) || !isEqual(formik.errors, {})
-            }
+            disabled={(!isNew && !formik.dirty) || !isEqual(formik.errors, {})}
             onClick={() => formik.submitForm()}
           >
             <FormattedMessage id="actions.save" />
@@ -145,7 +145,7 @@ export const GalleryChapterForm: React.FC<IGalleryChapterForm> = ({
           >
             <FormattedMessage id="actions.cancel" />
           </Button>
-          {editingChapter && (
+          {!isNew && (
             <Button
               variant="danger"
               className="ml-auto"

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryChaptersPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryChaptersPanel.tsx
@@ -46,7 +46,7 @@ export const GalleryChapterPanel: React.FC<IGalleryChapterPanelProps> = ({
     return (
       <GalleryChapterForm
         galleryID={gallery.id}
-        editingChapter={editingChapter}
+        chapter={editingChapter}
         onClose={closeEditor}
       />
     );

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
@@ -17,20 +17,22 @@ import isEqual from "lodash-es/isEqual";
 
 interface ISceneMarkerForm {
   sceneID: string;
-  editingMarker?: GQL.SceneMarkerDataFragment;
+  marker?: GQL.SceneMarkerDataFragment;
   onClose: () => void;
 }
 
 export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
   sceneID,
-  editingMarker,
+  marker,
   onClose,
 }) => {
   const [sceneMarkerCreate] = useSceneMarkerCreate();
   const [sceneMarkerUpdate] = useSceneMarkerUpdate();
   const [sceneMarkerDestroy] = useSceneMarkerDestroy();
   const Toast = useToast();
 
+  const isNew = marker === undefined;
+
   const schema = yup.object({
     title: yup.string().ensure(),
     seconds: yup.number().required().integer(),
@@ -39,10 +41,10 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
   });
 
   const initialValues = {
-    title: editingMarker?.title ?? "",
-    seconds: editingMarker?.seconds ?? Math.round(getPlayerPosition() ?? 0),
-    primary_tag_id: editingMarker?.primary_tag.id ?? "",
-    tag_ids: editingMarker?.tags.map((tag) => tag.id) ?? [],
+    title: marker?.title ?? "",
+    seconds: marker?.seconds ?? Math.round(getPlayerPosition() ?? 0),
+    primary_tag_id: marker?.primary_tag.id ?? "",
+    tag_ids: marker?.tags.map((tag) => tag.id) ?? [],
   };
 
   type InputValues = yup.InferType<typeof schema>;
@@ -56,7 +58,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
 
   async function onSave(input: InputValues) {
     try {
-      if (!editingMarker) {
+      if (isNew) {
         await sceneMarkerCreate({
           variables: {
             scene_id: sceneID,
@@ -66,7 +68,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
       } else {
         await sceneMarkerUpdate({
           variables: {
-            id: editingMarker.id,
+            id: marker.id,
             scene_id: sceneID,
             ...input,
           },
@@ -80,10 +82,10 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
   }
 
   async function onDelete() {
-    if (!editingMarker) return;
+    if (isNew) return;
 
     try {
-      await sceneMarkerDestroy({ variables: { id: editingMarker.id } });
+      await sceneMarkerDestroy({ variables: { id: marker.id } });
     } catch (e) {
       Toast.error(e);
     } finally {
@@ -169,9 +171,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
         <div className="col d-flex">
           <Button
             variant="primary"
-            disabled={
-              (editingMarker && !formik.dirty) || !isEqual(formik.errors, {})
-            }
+            disabled={(!isNew && !formik.dirty) || !isEqual(formik.errors, {})}
             onClick={() => formik.submitForm()}
           >
             <FormattedMessage id="actions.save" />
@@ -184,7 +184,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
           >
             <FormattedMessage id="actions.cancel" />
           </Button>
-          {editingMarker && (
+          {!isNew && (
             <Button
               variant="danger"
               className="ml-auto"

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkersPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkersPanel.tsx
@@ -52,7 +52,7 @@ export const SceneMarkersPanel: React.FC<ISceneMarkersPanelProps> = ({
     return (
       <SceneMarkerForm
         sceneID={sceneId}
-        editingMarker={editingMarker}
+        marker={editingMarker}
         onClose={closeEditor}
       />
     );