Remove breaking enum change

stashapp · Nov 23, 2024 · 5a9dd26 · 5a9dd26
1 parent ed6b6bc
commit 5a9dd26
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/frontend/src/constants/enums.ts b/frontend/src/constants/enums.ts
@@ -53,8 +53,8 @@ export const HairColorTypes: EnumDictionary<HairColorEnum, string> = {
   [HairColorEnum.AUBURN]: "Auburn",
   [HairColorEnum.BALD]: "Bald",
   [HairColorEnum.BLACK]: "Black",
-  [HairColorEnum.BLOND]: "Blond",
-  [HairColorEnum.BROWN]: "Brown",
+  [HairColorEnum.BLONDE]: "Blond",
+  [HairColorEnum.BRUNETTE]: "Brown",
   [HairColorEnum.GREY]: "Grey",
   [HairColorEnum.OTHER]: "Other",
   [HairColorEnum.RED]: "Red",

diff --git a/frontend/src/pages/performers/performerForm/PerformerForm.tsx b/frontend/src/pages/performers/performerForm/PerformerForm.tsx
@@ -62,8 +62,8 @@ const GENDER: OptionEnum[] = [
 
 const HAIR: OptionEnum[] = [
   { value: "null", label: "Unknown" },
-  { value: "BLOND", label: "Blond" },
-  { value: "BROWN", label: "Brown" },
+  { value: "BLONDE", label: "Blond" },
+  { value: "BRUNETTE", label: "Brown" },
   { value: "BLACK", label: "Black" },
   { value: "RED", label: "Red" },
   { value: "AUBURN", label: "Auburn" },

diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
@@ -62,8 +62,8 @@ enum EyeColorEnum {
 }
 
 enum HairColorEnum {
-  BLOND
-  BROWN
+  BLONDE
+  BRUNETTE
   BLACK
   RED
   AUBURN

diff --git a/pkg/api/performer_integration_test.go b/pkg/api/performer_integration_test.go
@@ -32,7 +32,7 @@ func (s *performerTestRunner) testCreatePerformer() {
 	gender := models.GenderEnumFemale
 	ethnicity := models.EthnicityEnumCaucasian
 	eyeColor := models.EyeColorEnumBlue
-	hairColor := models.HairColorEnumBlond
+	hairColor := models.HairColorEnumBlonde
 	breastType := models.BreastTypeEnumNatural
 	birthdate := "2001-02-03"
 	site, err := s.createTestSite(nil)

diff --git a/pkg/database/migrations/postgres/31_hair_color_enum.up.sql b/pkg/database/migrations/postgres/31_hair_color_enum.up.sql
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,8 +62,8 @@ enum EyeColorEnum { @@
     }
     enum HairColorEnum {
-      BLOND
-      BROWN
+      BLONDE
+      BRUNETTE
       BLACK
       RED
       AUBURN
@@ Expand Down @@