From e3cd36f25fc0499a6b46fd8b4582cfa030be58ba Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:21:56 +1100
Subject: [PATCH] Use primary tag name as marker title where title is empty
 (#2994)

* Fix display of marker popovers
* Use primary tag as title where marker title empty
---
 graphql/documents/data/scene-slim.graphql       |  4 ++++
 .../Scenes/SceneDetails/PrimaryTags.tsx         |  3 ++-
 ui/v2.5/src/components/Shared/TagLink.tsx       | 15 ++++++++++-----
 ui/v2.5/src/components/Wall/WallItem.tsx        |  9 ++++-----
 ui/v2.5/src/core/markers.ts                     | 17 +++++++++++++++++
 ui/v2.5/src/utils/navigation.ts                 |  8 +++++---
 6 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 ui/v2.5/src/core/markers.ts

diff --git a/graphql/documents/data/scene-slim.graphql b/graphql/documents/data/scene-slim.graphql
index 36b903409..362ac4092 100644
--- a/graphql/documents/data/scene-slim.graphql
+++ b/graphql/documents/data/scene-slim.graphql
@@ -31,6 +31,10 @@ fragment SlimSceneData on Scene {
     id
     title
     seconds
+    primary_tag {
+      id
+      name
+    }
   }
 
   galleries {
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/PrimaryTags.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/PrimaryTags.tsx
index 6cbca4ae0..f658d34b1 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/PrimaryTags.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/PrimaryTags.tsx
@@ -3,6 +3,7 @@ import { FormattedMessage } from "react-intl";
 import * as GQL from "src/core/generated-graphql";
 import { Button, Badge, Card } from "react-bootstrap";
 import TextUtils from "src/utils/text";
+import { markerTitle } from "src/core/markers";
 
 interface IPrimaryTags {
   sceneMarkers: GQL.SceneMarkerDataFragment[];
@@ -40,7 +41,7 @@ export const PrimaryTags: React.FC<IPrimaryTags> = ({
           <hr />
           <div className="row">
             <Button variant="link" onClick={() => onClickMarker(marker)}>
-              {marker.title}
+              {markerTitle(marker)}
             </Button>
             <Button
               variant="link"
diff --git a/ui/v2.5/src/components/Shared/TagLink.tsx b/ui/v2.5/src/components/Shared/TagLink.tsx
index dedb8b6e3..b8eca27ae 100644
--- a/ui/v2.5/src/components/Shared/TagLink.tsx
+++ b/ui/v2.5/src/components/Shared/TagLink.tsx
@@ -4,7 +4,6 @@ import { Link } from "react-router-dom";
 import cx from "classnames";
 import {
   PerformerDataFragment,
-  SceneMarkerDataFragment,
   TagDataFragment,
   MovieDataFragment,
   SceneDataFragment,
@@ -15,6 +14,7 @@ import { objectTitle } from "src/core/files";
 import { galleryTitle } from "src/core/galleries";
 import * as GQL from "src/core/generated-graphql";
 import { TagPopover } from "../Tags/TagPopover";
+import { markerTitle } from "src/core/markers";
 
 interface IFile {
   path: string;
@@ -26,11 +26,16 @@ interface IGallery {
   title: GQL.Maybe<string>;
 }
 
+type SceneMarkerFragment = Pick<GQL.SceneMarker, "id" | "title" | "seconds"> & {
+  scene: Pick<GQL.Scene, "id">;
+  primary_tag: Pick<GQL.Tag, "id" | "name">;
+};
+
 interface IProps {
   tag?: Partial<TagDataFragment>;
   tagType?: "performer" | "scene" | "gallery" | "image";
   performer?: Partial<PerformerDataFragment>;
-  marker?: Partial<SceneMarkerDataFragment>;
+  marker?: SceneMarkerFragment;
   movie?: Partial<MovieDataFragment>;
   scene?: Partial<Pick<SceneDataFragment, "id" | "title" | "files">>;
   gallery?: Partial<IGallery>;
@@ -67,9 +72,9 @@ export const TagLink: React.FC<IProps> = (props: IProps) => {
     title = props.movie.name || "";
   } else if (props.marker) {
     link = NavUtils.makeSceneMarkerUrl(props.marker);
-    title = `${
-      props.marker.title || props.marker.primary_tag?.name || ""
-    } - ${TextUtils.secondsToTimestamp(props.marker.seconds || 0)}`;
+    title = `${markerTitle(props.marker)} - ${TextUtils.secondsToTimestamp(
+      props.marker.seconds || 0
+    )}`;
   } else if (props.gallery) {
     link = `/galleries/${props.gallery.id}`;
     title = galleryTitle(props.gallery);
diff --git a/ui/v2.5/src/components/Wall/WallItem.tsx b/ui/v2.5/src/components/Wall/WallItem.tsx
index 7ac671e9f..25e4ce5aa 100644
--- a/ui/v2.5/src/components/Wall/WallItem.tsx
+++ b/ui/v2.5/src/components/Wall/WallItem.tsx
@@ -5,6 +5,7 @@ import { TextUtils, NavUtils } from "src/utils";
 import cx from "classnames";
 import { SceneQueue } from "src/models/sceneQueue";
 import { ConfigurationContext } from "src/hooks/Config";
+import { markerTitle } from "src/core/markers";
 
 interface IWallItemProps {
   index?: number;
@@ -182,12 +183,10 @@ export const WallItem: React.FC<IWallItemProps> = (props: IWallItemProps) => {
   const renderText = () => {
     if (!showTextContainer) return;
 
-    const markerTitle = props.sceneMarker?.title;
-
     const title = props.sceneMarker
-      ? `${
-          markerTitle ? `${markerTitle} - ` : ""
-        }${TextUtils.secondsToTimestamp(props.sceneMarker.seconds)}`
+      ? `${markerTitle(props.sceneMarker)} - ${TextUtils.secondsToTimestamp(
+          props.sceneMarker.seconds
+        )}`
       : props.scene?.title ?? "";
     const tags = props.sceneMarker
       ? [props.sceneMarker.primary_tag, ...props.sceneMarker.tags]
diff --git a/ui/v2.5/src/core/markers.ts b/ui/v2.5/src/core/markers.ts
new file mode 100644
index 000000000..84e3ff019
--- /dev/null
+++ b/ui/v2.5/src/core/markers.ts
@@ -0,0 +1,17 @@
+import { SceneMarker, Tag } from "./generated-graphql";
+
+type SceneMarkerFragment = Pick<SceneMarker, "id" | "title"> & {
+  primary_tag: Pick<Tag, "id" | "name">;
+};
+
+export function markerTitle(s: SceneMarkerFragment) {
+  if (s.title) {
+    return s.title;
+  }
+
+  if (s.primary_tag?.name) {
+    return s.primary_tag?.name;
+  }
+
+  return "";
+}
diff --git a/ui/v2.5/src/utils/navigation.ts b/ui/v2.5/src/utils/navigation.ts
index e2e1d2633..adfd01ada 100644
--- a/ui/v2.5/src/utils/navigation.ts
+++ b/ui/v2.5/src/utils/navigation.ts
@@ -264,9 +264,11 @@ const makeTagImagesUrl = (tag: Partial<GQL.TagDataFragment>) => {
   return `/images?${filter.makeQueryParameters()}`;
 };
 
-const makeSceneMarkerUrl = (
-  sceneMarker: Partial<GQL.SceneMarkerDataFragment>
-) => {
+type SceneMarkerDataFragment = Pick<GQL.SceneMarker, "id" | "seconds"> & {
+  scene: Pick<GQL.Scene, "id">;
+};
+
+const makeSceneMarkerUrl = (sceneMarker: SceneMarkerDataFragment) => {
   if (!sceneMarker.id || !sceneMarker.scene) return "#";
   return `/scenes/${sceneMarker.scene.id}?t=${sceneMarker.seconds}`;
 };