Make ethnicity freetext and fix freeones ethnicity panic (stashapp#431)

* Make ethnicity free text * Fix panic in freeones scraper for other ethnicity
Tweeticoats · Apr 1, 2020 · 9b03995 · 9b03995
1 parent 8ac369d
commit 9b03995
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/pkg/scraper/freeones.go b/pkg/scraper/freeones.go
@@ -278,7 +278,9 @@ func getEthnicity(ethnicity string) string {
 	case "Asian":
 		return "asian"
 	default:
-		panic("unknown ethnicity")
+		// #367 - unknown ethnicity shouldn't cause the entire operation to
+		// fail. Just return the original string instead
+		return ethnicity
 	}
 }
 

diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
@@ -221,12 +221,12 @@ export const PerformerDetailsPanel: React.FC<IPerformerDetails> = ({
   }
 
   function renderEthnicity() {
-    return TableUtils.renderHtmlSelect({
+    return TableUtils.renderInputGroup({
       title: "Ethnicity",
       value: ethnicity,
       isEditing: !!isEditing,
-      onChange: (value: string) => setEthnicity(value),
-      selectOptions: ["white", "black", "asian", "hispanic"]
+      placeholder: "Ethnicity",
+      onChange: setEthnicity
     });
   }
 

diff --git a/ui/v2/src/components/performers/PerformerDetails/PerformerDetailsPanel.tsx b/ui/v2/src/components/performers/PerformerDetails/PerformerDetailsPanel.tsx
@@ -228,12 +228,12 @@ export const PerformerDetailsPanel: FunctionComponent<IPerformerDetailsProps> =
   }
 
   function renderEthnicity() {
-    return TableUtils.renderHtmlSelect({
+    return TableUtils.renderInputGroup({
       title: "Ethnicity",
       value: ethnicity,
       isEditing: !!props.isEditing,
-      onChange: (value: string) => setEthnicity(value),
-      selectOptions: ["white", "black", "asian", "hispanic"],
+      placeholder: "Ethnicity",
+      onChange: setEthnicity
     });
   }