From 28b8473f2d5ef80ecc7a7acf67b600e57048e98a Mon Sep 17 00:00:00 2001
From: DingDongSoLong4 <99329275+DingDongSoLong4@users.noreply.github.com>
Date: Mon, 20 Feb 2023 00:25:48 +0200
Subject: [PATCH] Minor gallery-related fixes (#3448)

* Fix gallery titles
* Fix SceneListTable
---
 graphql/documents/data/scene-slim.graphql     |  3 ++
 .../Dialogs/IdentifyDialog/styles.scss        |  4 --
 .../Scenes/SceneDetails/SceneEditPanel.tsx    |  3 +-
 .../src/components/Scenes/SceneListTable.tsx  | 50 +++++++++----------
 ui/v2.5/src/styles/_theme.scss                |  8 ---
 5 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/graphql/documents/data/scene-slim.graphql b/graphql/documents/data/scene-slim.graphql
index 3e0749dd8..b6ed326e0 100644
--- a/graphql/documents/data/scene-slim.graphql
+++ b/graphql/documents/data/scene-slim.graphql
@@ -46,6 +46,9 @@ fragment SlimSceneData on Scene {
     files {
       path
     }
+    folder {
+      path
+    }
     title
   }
 
diff --git a/ui/v2.5/src/components/Dialogs/IdentifyDialog/styles.scss b/ui/v2.5/src/components/Dialogs/IdentifyDialog/styles.scss
index 450b31e86..dcaeb054c 100644
--- a/ui/v2.5/src/components/Dialogs/IdentifyDialog/styles.scss
+++ b/ui/v2.5/src/components/Dialogs/IdentifyDialog/styles.scss
@@ -32,7 +32,3 @@
     margin-right: 0.25em;
   }
 }
-
-.field-options-table td:first-child {
-  padding-left: 0.75rem;
-}
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 1a4686556..701d3c1a4 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -48,6 +48,7 @@ import {
   faTrashAlt,
 } from "@fortawesome/free-solid-svg-icons";
 import { objectTitle } from "src/core/files";
+import { galleryTitle } from "src/core/galleries";
 import { useRatingKeybinds } from "src/hooks/keybinds";
 
 const SceneScrapeDialog = lazy(() => import("./SceneScrapeDialog"));
@@ -100,7 +101,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
     setGalleries(
       scene.galleries?.map((g) => ({
         id: g.id,
-        title: objectTitle(g),
+        title: galleryTitle(g),
       })) ?? []
     );
   }, [scene.galleries]);
diff --git a/ui/v2.5/src/components/Scenes/SceneListTable.tsx b/ui/v2.5/src/components/Scenes/SceneListTable.tsx
index 5a934b86e..874d0893f 100644
--- a/ui/v2.5/src/components/Scenes/SceneListTable.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneListTable.tsx
@@ -1,14 +1,13 @@
-// @ts-nocheck
-/* eslint-disable jsx-a11y/control-has-associated-label */
 import React from "react";
-import { Table, Button, Form } from "react-bootstrap";
+import { Table, Form } from "react-bootstrap";
 import { Link } from "react-router-dom";
 import * as GQL from "src/core/generated-graphql";
 import NavUtils from "src/utils/navigation";
 import TextUtils from "src/utils/text";
-import { Icon } from "src/components/Shared/Icon";
 import { FormattedMessage } from "react-intl";
 import { objectTitle } from "src/core/files";
+import { galleryTitle } from "src/core/galleries";
+import SceneQueue from "src/models/sceneQueue";
 
 interface ISceneListTableProps {
   scenes: GQL.SlimSceneDataFragment[];
@@ -20,14 +19,14 @@ interface ISceneListTableProps {
 export const SceneListTable: React.FC<ISceneListTableProps> = (
   props: ISceneListTableProps
 ) => {
-  const renderTags = (tags: GQL.SlimTagDataFragment[]) =>
+  const renderTags = (tags: Partial<GQL.TagDataFragment>[]) =>
     tags.map((tag) => (
       <Link key={tag.id} to={NavUtils.makeTagScenesUrl(tag)}>
         <h6>{tag.name}</h6>
       </Link>
     ));
 
-  const renderPerformers = (performers: Partial<GQL.Performer>[]) =>
+  const renderPerformers = (performers: Partial<GQL.PerformerDataFragment>[]) =>
     performers.map((performer) => (
       <Link key={performer.id} to={NavUtils.makePerformerScenesUrl(performer)}>
         <h6>{performer.name}</h6>
@@ -35,16 +34,21 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
     ));
 
   const renderMovies = (scene: GQL.SlimSceneDataFragment) =>
-    scene.movies.map((sceneMovie) =>
-      !sceneMovie.movie ? undefined : (
-        <Link
-          key={sceneMovie.movie.id}
-          to={NavUtils.makeMovieScenesUrl(sceneMovie.movie)}
-        >
-          <h6>{sceneMovie.movie.name}</h6>
-        </Link>
-      )
-    );
+    scene.movies.map((sceneMovie) => (
+      <Link
+        key={sceneMovie.movie.id}
+        to={NavUtils.makeMovieScenesUrl(sceneMovie.movie)}
+      >
+        <h6>{sceneMovie.movie.name}</h6>
+      </Link>
+    ));
+
+  const renderGalleries = (scene: GQL.SlimSceneDataFragment) =>
+    scene.galleries.map((gallery) => (
+      <Link key={gallery.id} to={`/galleries/${gallery.id}`}>
+        <h6>{galleryTitle(gallery)}</h6>
+      </Link>
+    ));
 
   const renderSceneRow = (scene: GQL.SlimSceneDataFragment, index: number) => {
     const sceneLink = props.queue
@@ -64,7 +68,7 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
               type="checkbox"
               checked={props.selectedIds.has(scene.id)}
               onChange={() =>
-                props.onSelectChange!(
+                props.onSelectChange(
                   scene.id,
                   !props.selectedIds.has(scene.id),
                   shiftKey
@@ -106,15 +110,7 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
           )}
         </td>
         <td>{renderMovies(scene)}</td>
-        <td>
-          {scene.gallery && (
-            <Button className="minimal">
-              <Link to={`/galleries/${scene.gallery.id}`}>
-                <Icon icon={faImage} />
-              </Link>
-            </Button>
-          )}
-        </td>
+        <td>{renderGalleries(scene)}</td>
       </tr>
     );
   };
@@ -148,7 +144,7 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
               <FormattedMessage id="movies" />
             </th>
             <th>
-              <FormattedMessage id="gallery" />
+              <FormattedMessage id="galleries" />
             </th>
           </tr>
         </thead>
diff --git a/ui/v2.5/src/styles/_theme.scss b/ui/v2.5/src/styles/_theme.scss
index 03f7e8b8c..e680335e2 100644
--- a/ui/v2.5/src/styles/_theme.scss
+++ b/ui/v2.5/src/styles/_theme.scss
@@ -126,14 +126,6 @@ hr {
     border: none;
     border-color: #414c53;
     padding: 0.25rem 0.75rem;
-
-    &:first-child {
-      padding-left: 0;
-    }
-
-    &:last-child {
-      padding-right: 0;
-    }
   }
 }