mirror of
https://github.com/stashapp/stash.git
synced 2026-05-09 05:05:29 +02:00
Fix CI regressions for default performer gender updates.
Resolve the golangci-lint builtin name conflict and relax scraped performer helper typing so UI type-check passes when scraper gender is string-valued.
This commit is contained in:
parent
178124177e
commit
f3ef04e4d7
2 changed files with 4 additions and 4 deletions
|
|
@ -64,8 +64,8 @@ func (r *mutationResolver) setConfigString(key string, value *string) {
|
|||
|
||||
// applyDefaultPerformerGenderInput updates or clears DefaultPerformerGender.
|
||||
// Omit both fields to leave the stored value unchanged.
|
||||
func (r *mutationResolver) applyDefaultPerformerGenderInput(value *models.GenderEnum, clear *bool) error {
|
||||
if clear != nil && *clear {
|
||||
func (r *mutationResolver) applyDefaultPerformerGenderInput(value *models.GenderEnum, shouldClear *bool) error {
|
||||
if shouldClear != nil && *shouldClear {
|
||||
if value != nil {
|
||||
return fmt.Errorf("cannot set and clear default performer gender in the same request")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,12 +59,12 @@ const isScraper = (
|
|||
): scraper is GQL.Scraper => (scraper as GQL.Scraper).id !== undefined;
|
||||
|
||||
function withScrapedPerformerDefaultGender<
|
||||
T extends { gender?: GQL.GenderEnum | null }
|
||||
T extends { gender?: string | null }
|
||||
>(scraped: T, defaultGender: GQL.GenderEnum | null | undefined): T {
|
||||
if (scraped.gender || !defaultGender) {
|
||||
return scraped;
|
||||
}
|
||||
return { ...scraped, gender: defaultGender };
|
||||
return { ...scraped, gender: defaultGender } as T;
|
||||
}
|
||||
|
||||
interface IPerformerDetails {
|
||||
|
|
|
|||
Loading…
Reference in a new issue