Adding disambiguation field to performer draft (#709)

stashapp · Feb 19, 2024 · 95a343b · 95a343b
1 parent e099cef
commit 95a343b
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 2 deletions.
diff --git a/frontend/src/graphql/queries/Draft.gql b/frontend/src/graphql/queries/Draft.gql
@@ -12,6 +12,7 @@ query Draft($id: ID!) {
       ... on PerformerDraft {
         id
         name
+        disambiguation
         aliases
         gender
         birthdate

diff --git a/frontend/src/graphql/types.ts b/frontend/src/graphql/types.ts
@@ -809,6 +809,7 @@ export type PerformerDraft = {
   career_end_year?: Maybe<Scalars["Int"]>;
   career_start_year?: Maybe<Scalars["Int"]>;
   country?: Maybe<Scalars["String"]>;
+  disambiguation?: Maybe<Scalars["String"]>;
   ethnicity?: Maybe<Scalars["String"]>;
   eye_color?: Maybe<Scalars["String"]>;
   gender?: Maybe<Scalars["String"]>;
@@ -830,6 +831,7 @@ export type PerformerDraftInput = {
   career_end_year?: InputMaybe<Scalars["Int"]>;
   career_start_year?: InputMaybe<Scalars["Int"]>;
   country?: InputMaybe<Scalars["String"]>;
+  disambiguation?: InputMaybe<Scalars["String"]>;
   ethnicity?: InputMaybe<Scalars["String"]>;
   eye_color?: InputMaybe<Scalars["String"]>;
   gender?: InputMaybe<Scalars["String"]>;
@@ -13896,6 +13898,7 @@ export type DraftQuery = {
           __typename: "PerformerDraft";
           id?: string | null;
           name: string;
+          disambiguation?: string | null;
           aliases?: string | null;
           gender?: string | null;
           birthdate?: string | null;
@@ -39225,6 +39228,10 @@ export const DraftDocument = {
                               kind: "Field",
                               name: { kind: "Name", value: "name" },
                             },
+                            {
+                              kind: "Field",
+                              name: { kind: "Name", value: "disambiguation" },
+                            },
                             {
                               kind: "Field",
                               name: { kind: "Name", value: "aliases" },

diff --git a/frontend/src/pages/drafts/parse.ts b/frontend/src/pages/drafts/parse.ts
@@ -167,7 +167,7 @@ export const parsePerformerDraft = (
 
   const performer: InitialPerformer = {
     name: draft.name,
-    disambiguation: null,
+    disambiguation: draft.disambiguation ?? null,
     images: joinImages(draft.image, existingPerformer?.images),
     gender: parseEnum(draft.gender, GenderEnum) as GenderEnum | null,
     ethnicity: parseEnum(

diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
@@ -368,6 +368,7 @@ input PerformerQueryInput {
 type PerformerDraft {
   id: ID
   name: String!
+  disambiguation: String
   aliases: String
   gender: String
   birthdate: String
@@ -388,6 +389,7 @@ type PerformerDraft {
 
 input PerformerDraftInput {
   id: ID
+  disambiguation: String
   name: String!
   aliases: String
   gender: String

diff --git a/pkg/api/resolver_mutation_draft.go b/pkg/api/resolver_mutation_draft.go
@@ -84,6 +84,7 @@ func (r *mutationResolver) SubmitPerformerDraft(ctx context.Context, input model
 	data := models.PerformerDraft{
 		ID:              input.ID,
 		Name:            input.Name,
+		Disambiguation:  input.Disambiguation,
 		Aliases:         input.Aliases,
 		Gender:          input.Gender,
 		Birthdate:       input.Birthdate,

diff --git a/pkg/models/generated_exec.go b/pkg/models/generated_exec.go
diff --git a/pkg/models/generated_models.go b/pkg/models/generated_models.go
diff --git a/pkg/models/model_draft.go b/pkg/models/model_draft.go
@@ -46,6 +46,7 @@ func (SceneDraft) IsDraftData() {}
 type PerformerDraft struct {
 	ID              *uuid.UUID `json:"id,omitempty"`
 	Name            string     `json:"name"`
+	Disambiguation  *string    `json:"disambiguation,omitempty"`
 	Aliases         *string    `json:"aliases,omitempty"`
 	Gender          *string    `json:"gender,omitempty"`
 	Birthdate       *string    `json:"birthdate,omitempty"`