Performer select refactor

graphql/documents/data/performer-slim.graphql

@@ -34,3 +34,10 @@ fragment SlimPerformerData on Performer {
   death_date
   weight
 }
+
+fragment SelectPerformerData on Performer {
+  id
+  name
+  disambiguation
+  alias_list
+}

graphql/documents/queries/misc.graphql

@@ -6,15 +6,6 @@ query MarkerStrings($q: String, $sort: String) {
   }
 }
 
-query AllPerformersForFilter {
-  allPerformers {
-    id
-    name
-    disambiguation
-    alias_list
-  }
-}
-
 query AllStudiosForFilter {
   allStudios {
     id

graphql/documents/queries/performer.graphql

@@ -1,8 +1,13 @@
 query FindPerformers(
   $filter: FindFilterType
   $performer_filter: PerformerFilterType
+  $performer_ids: [Int!]
 ) {
-  findPerformers(filter: $filter, performer_filter: $performer_filter) {
+  findPerformers(
+    filter: $filter
+    performer_filter: $performer_filter
+    performer_ids: $performer_ids
+  ) {
     count
     performers {
       ...PerformerData
@@ -15,3 +20,20 @@ query FindPerformer($id: ID!) {
     ...PerformerData
   }
 }
+
+query FindPerformersForSelect(
+  $filter: FindFilterType
+  $performer_filter: PerformerFilterType
+  $performer_ids: [Int!]
+) {
+  findPerformers(
+    filter: $filter
+    performer_filter: $performer_filter
+    performer_ids: $performer_ids
+  ) {
+    count
+    performers {
+      ...SelectPerformerData
+    }
+  }
+}

graphql/schema/schema.graphql

@@ -60,6 +60,7 @@ type Query {
   findPerformers(
     performer_filter: PerformerFilterType
     filter: FindFilterType
+    performer_ids: [Int!]
   ): FindPerformersResultType!
 
   "Find a studio by ID"
@@ -223,11 +224,13 @@ type Query {
   allSceneMarkers: [SceneMarker!]!
   allImages: [Image!]!
   allGalleries: [Gallery!]!
-  allPerformers: [Performer!]!
   allStudios: [Studio!]!
   allMovies: [Movie!]!
   allTags: [Tag!]!
 
+  # @deprecated
+  allPerformers: [Performer!]!
+
   # Get everything with minimal metadata
 
   # Version

internal/api/resolver_query_find_performer.go

@@ -23,9 +23,19 @@ func (r *queryResolver) FindPerformer(ctx context.Context, id string) (ret *mode
 	return ret, nil
 }
 
-func (r *queryResolver) FindPerformers(ctx context.Context, performerFilter *models.PerformerFilterType, filter *models.FindFilterType) (ret *FindPerformersResultType, err error) {
+func (r *queryResolver) FindPerformers(ctx context.Context, performerFilter *models.PerformerFilterType, filter *models.FindFilterType, performerIDs []int) (ret *FindPerformersResultType, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		performers, total, err := r.repository.Performer.Query(ctx, performerFilter, filter)
+		var performers []*models.Performer
+		var err error
+		var total int
+
+		if len(performerIDs) > 0 {
+			performers, err = r.repository.Performer.FindMany(ctx, performerIDs)
+			total = len(performers)
+		} else {
+			performers, total, err = r.repository.Performer.Query(ctx, performerFilter, filter)
+		}
+
 		if err != nil {
 			return err
 		}
@@ -34,6 +44,7 @@ func (r *queryResolver) FindPerformers(ctx context.Context, performerFilter *mod
 			Count:      total,
 			Performers: performers,
 		}
+
 		return nil
 	}); err != nil {
 		return nil, err

ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx

@@ -19,7 +19,6 @@ import {
   mutateReloadScrapers,
 } from "src/core/StashService";
 import {
-  PerformerSelect,
   TagSelect,
   SceneSelect,
   StudioSelect,
@@ -39,6 +38,10 @@ import { ConfigurationContext } from "src/hooks/Config";
 import isEqual from "lodash-es/isEqual";
 import { DateInput } from "src/components/Shared/DateInput";
 import { handleUnsavedChanges } from "src/utils/navigation";
+import {
+  Performer,
+  PerformerSelect,
+} from "src/components/Performers/PerformerSelect";
 
 interface IProps {
   gallery: Partial<GQL.GalleryDataFragment>;
@@ -62,6 +65,8 @@ export const GalleryEditPanel: React.FC<IProps> = ({
     }))
   );
 
+  const [performers, setPerformers] = useState<Performer[]>([]);
+
   const isNew = gallery.id === undefined;
   const { configuration: stashConfig } = React.useContext(ConfigurationContext);
 
@@ -139,12 +144,24 @@ export const GalleryEditPanel: React.FC<IProps> = ({
     );
   }
 
+  function onSetPerformers(items: Performer[]) {
+    setPerformers(items);
+    formik.setFieldValue(
+      "performer_ids",
+      items.map((item) => item.id)
+    );
+  }
+
   useRatingKeybinds(
     isVisible,
     stashConfig?.ui?.ratingSystemOptions?.type,
     setRating
   );
 
+  useEffect(() => {
+    setPerformers(gallery.performers ?? []);
+  }, [gallery.performers]);
+
   useEffect(() => {
     if (isVisible) {
       Mousetrap.bind("s s", () => {
@@ -309,8 +326,15 @@ export const GalleryEditPanel: React.FC<IProps> = ({
       });
 
       if (idPerfs.length > 0) {
-        const newIds = idPerfs.map((p) => p.stored_id);
-        formik.setFieldValue("performer_ids", newIds as string[]);
+        onSetPerformers(
+          idPerfs.map((p) => {
+            return {
+              id: p.stored_id!,
+              name: p.name ?? "",
+              alias_list: [],
+            };
+          })
+        );
       }
     }
 
@@ -472,13 +496,8 @@ export const GalleryEditPanel: React.FC<IProps> = ({
               <Col sm={9} xl={12}>
                 <PerformerSelect
                   isMulti
-                  onSelect={(items) =>
-                    formik.setFieldValue(
-                      "performer_ids",
-                      items.map((item) => item.id)
-                    )
-                  }
-                  ids={formik.values.performer_ids}
+                  onSelect={onSetPerformers}
+                  values={performers}
                 />
               </Col>
             </Form.Group>

ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx

@@ -4,11 +4,7 @@ import { FormattedMessage, useIntl } from "react-intl";
 import Mousetrap from "mousetrap";
 import * as GQL from "src/core/generated-graphql";
 import * as yup from "yup";
-import {
-  PerformerSelect,
-  TagSelect,
-  StudioSelect,
-} from "src/components/Shared/Select";
+import { TagSelect, StudioSelect } from "src/components/Shared/Select";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { URLField } from "src/components/Shared/URLField";
 import { useToast } from "src/hooks/Toast";
@@ -20,6 +16,10 @@ import { useRatingKeybinds } from "src/hooks/keybinds";
 import { ConfigurationContext } from "src/hooks/Config";
 import isEqual from "lodash-es/isEqual";
 import { DateInput } from "src/components/Shared/DateInput";
+import {
+  Performer,
+  PerformerSelect,
+} from "src/components/Performers/PerformerSelect";
 
 interface IProps {
   image: GQL.ImageDataFragment;
@@ -42,6 +42,8 @@ export const ImageEditPanel: React.FC<IProps> = ({
 
   const { configuration } = React.useContext(ConfigurationContext);
 
+  const [performers, setPerformers] = useState<Performer[]>([]);
+
   const schema = yup.object({
     title: yup.string().ensure(),
     url: yup.string().ensure(),
@@ -87,12 +89,24 @@ export const ImageEditPanel: React.FC<IProps> = ({
     formik.setFieldValue("rating100", v);
   }
 
+  function onSetPerformers(items: Performer[]) {
+    setPerformers(items);
+    formik.setFieldValue(
+      "performer_ids",
+      items.map((item) => item.id)
+    );
+  }
+
   useRatingKeybinds(
     true,
     configuration?.ui?.ratingSystemOptions?.type,
     setRating
   );
 
+  useEffect(() => {
+    setPerformers(image.performers ?? []);
+  }, [image.performers]);
+
   useEffect(() => {
     if (isVisible) {
       Mousetrap.bind("s s", () => {
@@ -249,13 +263,8 @@ export const ImageEditPanel: React.FC<IProps> = ({
               <Col sm={9} xl={12}>
                 <PerformerSelect
                   isMulti
-                  onSelect={(items) =>
-                    formik.setFieldValue(
-                      "performer_ids",
-                      items.map((item) => item.id)
-                    )
-                  }
-                  ids={formik.values.performer_ids}
+                  onSelect={onSetPerformers}
+                  values={performers}
                 />
               </Col>
             </Form.Group>