Make image width/height required

stashapp · Feb 17, 2024 · ab71dfd · ab71dfd
1 parent 977c1c3
commit ab71dfd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/frontend/src/components/editCard/ModifyEdit.tsx b/frontend/src/components/editCard/ModifyEdit.tsx
@@ -35,10 +35,10 @@ type OldDetails = EditFragment["old_details"];
 type Options = EditFragment["options"];
 
 type Image = {
-  height?: number | undefined;
+  height: number;
   id: string;
   url: string;
-  width?: number | undefined;
+  width: number;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

diff --git a/frontend/src/components/editImages/editImages.tsx b/frontend/src/components/editImages/editImages.tsx
@@ -67,7 +67,6 @@ const EditImages: FC<EditImagesProps> = ({
         if (i.data?.imageCreate?.id) {
           if (!images.some((image) => image.id === i.data?.imageCreate?.id)) {
             append(i.data.imageCreate);
-            console.log(i.data.imageCreate);
           }
           setFile(undefined);
           setImageData("");

diff --git a/frontend/src/components/imageChangeRow/ImageChangeRow.tsx b/frontend/src/components/imageChangeRow/ImageChangeRow.tsx
@@ -2,10 +2,10 @@ import { FC } from "react";
 import { Col, Row } from "react-bootstrap";
 
 type Image = {
-  height?: number | undefined;
+  height: number;
   id: string;
   url: string;
-  width?: number | undefined;
+  width: number;
 };
 
 const CLASSNAME = "ImageChangeRow";

diff --git a/frontend/src/pages/scenes/sceneForm/schema.ts b/frontend/src/pages/scenes/sceneForm/schema.ts
@@ -81,8 +81,8 @@ export const SceneSchema = yup.object({
       yup.object({
         id: yup.string().required(),
         url: yup.string().required(),
-        width: yup.number().default(0),
-        height: yup.number().default(0),
+        width: yup.number().required(),
+        height: yup.number().required(),
       })
     )
     .required(),

diff --git a/frontend/src/pages/studios/studioForm/schema.ts b/frontend/src/pages/studios/studioForm/schema.ts
@@ -23,8 +23,8 @@ export const StudioSchema = yup.object({
       yup.object({
         id: yup.string().required(),
         url: yup.string().required(),
-        width: yup.number().default(0),
-        height: yup.number().default(0),
+        width: yup.number().required(),
+        height: yup.number().required(),
       })
     )
     .required(),

diff --git a/frontend/src/utils/diff.ts b/frontend/src/utils/diff.ts
@@ -27,7 +27,7 @@ export const diffImages = (
 ) =>
   diffArray(
     (newImages ?? []).flatMap((i) =>
-      i.id && i.url
+      i.id && i.url && i.height && i.width
         ? [
             {
               id: i.id,