Allow creation of galleries from multi-select form

This commit is contained in:
ghuds540 2025-12-03 21:48:44 -05:00
parent 39fd8a6550
commit a8913254c6
10 changed files with 76 additions and 0 deletions

View file

@ -66,6 +66,9 @@ models:
model: github.com/stashapp/stash/internal/manager/config.ImageLightboxScrollMode
ConfigDisableDropdownCreate:
model: github.com/stashapp/stash/internal/manager/config.ConfigDisableDropdownCreate
fields:
gallery:
resolver: true
ScanMetadataOptions:
model: github.com/stashapp/stash/internal/manager/config.ScanMetadataOptions
CleanGeneratedInput:

View file

@ -319,6 +319,7 @@ input ConfigDisableDropdownCreateInput {
tag: Boolean
studio: Boolean
movie: Boolean
gallery: Boolean
}
enum ImageLightboxDisplayMode {
@ -419,6 +420,7 @@ type ConfigDisableDropdownCreate {
tag: Boolean!
studio: Boolean!
movie: Boolean!
gallery: Boolean!
}
type ConfigInterfaceResult {

View file

@ -110,6 +110,9 @@ func (r *Resolver) Plugin() PluginResolver {
func (r *Resolver) ConfigResult() ConfigResultResolver {
return &configResultResolver{r}
}
func (r *Resolver) ConfigDisableDropdownCreate() ConfigDisableDropdownCreateResolver {
return &configDisableDropdownCreateResolver{r}
}
type mutationResolver struct{ *Resolver }
type queryResolver struct{ *Resolver }
@ -136,6 +139,7 @@ type folderResolver struct{ *Resolver }
type savedFilterResolver struct{ *Resolver }
type pluginResolver struct{ *Resolver }
type configResultResolver struct{ *Resolver }
type configDisableDropdownCreateResolver struct{ *Resolver }
func (r *Resolver) withTxn(ctx context.Context, fn func(ctx context.Context) error) error {
return r.repository.WithTxn(ctx, fn)

View file

@ -6,6 +6,10 @@ import (
"github.com/stashapp/stash/internal/manager/config"
)
func (r *configDisableDropdownCreateResolver) Gallery(ctx context.Context, obj *config.ConfigDisableDropdownCreate) (bool, error) {
return obj.Gallery, nil
}
func (r *configResultResolver) Plugins(ctx context.Context, obj *ConfigResult, include []string) (map[string]map[string]interface{}, error) {
if len(include) == 0 {
ret := config.GetInstance().GetAllPluginConfiguration()

View file

@ -521,6 +521,7 @@ func (r *mutationResolver) ConfigureInterface(ctx context.Context, input ConfigI
r.setConfigBool(config.DisableDropdownCreateStudio, ddc.Studio)
r.setConfigBool(config.DisableDropdownCreateTag, ddc.Tag)
r.setConfigBool(config.DisableDropdownCreateMovie, ddc.Movie)
r.setConfigBool(config.DisableDropdownCreateGallery, ddc.Gallery)
}
r.setConfigString(config.HandyKey, input.HandyKey)

View file

@ -219,6 +219,7 @@ const (
DisableDropdownCreateStudio = "disable_dropdown_create.studio"
DisableDropdownCreateTag = "disable_dropdown_create.tag"
DisableDropdownCreateMovie = "disable_dropdown_create.movie"
DisableDropdownCreateGallery = "disable_dropdown_create.gallery"
HandyKey = "handy_key"
FunscriptOffset = "funscript_offset"
@ -1311,6 +1312,7 @@ func (i *Config) GetDisableDropdownCreate() *ConfigDisableDropdownCreate {
Studio: i.getBool(DisableDropdownCreateStudio),
Tag: i.getBool(DisableDropdownCreateTag),
Movie: i.getBool(DisableDropdownCreateMovie),
Gallery: i.getBool(DisableDropdownCreateGallery),
}
}

View file

@ -105,4 +105,5 @@ type ConfigDisableDropdownCreate struct {
Tag bool `json:"tag"`
Studio bool `json:"studio"`
Movie bool `json:"movie"`
Gallery bool `json:"gallery"`
}

View file

@ -107,6 +107,7 @@ fragment ConfigInterfaceData on ConfigInterfaceResult {
tag
studio
movie
gallery
}
handyKey
funscriptOffset

View file

@ -11,6 +11,7 @@ import * as GQL from "src/core/generated-graphql";
import {
queryFindGalleriesForSelect,
queryFindGalleriesByIDForSelect,
useGalleryCreate,
} from "src/core/StashService";
import { useConfigurationContext } from "src/hooks/Config";
import { useIntl } from "react-intl";
@ -70,10 +71,14 @@ const gallerySelectSort = PatchFunction(
const _GallerySelect: React.FC<
IFilterProps & IFilterValueProps<Gallery> & ExtraGalleryProps
> = (props) => {
const [createGallery] = useGalleryCreate();
const { configuration } = useConfigurationContext();
const intl = useIntl();
const maxOptionsShown =
configuration?.ui.maxOptionsShown ?? defaultMaxOptionsShown;
const defaultCreatable =
!configuration?.interface.disableDropdownCreate.gallery;
const exclude = useMemo(() => props.excludeIds ?? [], [props.excludeIds]);
@ -203,6 +208,42 @@ const _GallerySelect: React.FC<
return <reactSelectComponents.SingleValue {...thisOptionProps} />;
};
const onCreate = async (name: string) => {
const result = await createGallery({
variables: { input: { title: name } },
});
return {
value: result.data!.galleryCreate!.id,
item: result.data!.galleryCreate!,
message: "Created gallery",
};
};
const getNamedObject = (id: string, name: string): Gallery => {
return {
id,
title: name,
files: [],
folder: null,
};
};
const isValidNewOption = (inputValue: string, options: Gallery[]) => {
if (!inputValue) {
return false;
}
if (
options.some((o) => {
return galleryTitle(o).toLowerCase() === inputValue.toLowerCase();
})
) {
return false;
}
return true;
};
return (
<FilterSelectComponent<Gallery, boolean>
{...props}
@ -214,12 +255,16 @@ const _GallerySelect: React.FC<
props.className
)}
loadOptions={loadGalleries}
getNamedObject={getNamedObject}
isValidNewOption={isValidNewOption}
components={{
Option: GalleryOption,
MultiValueLabel: GalleryMultiValueLabel,
SingleValue: GalleryValueLabel,
}}
isMulti={props.isMulti ?? false}
creatable={props.creatable ?? defaultCreatable}
onCreate={onCreate}
placeholder={
props.noSelectionString ??
intl.formatMessage(

View file

@ -735,6 +735,19 @@ export const SettingsInterfacePanel: React.FC = PatchComponent(
})
}
/>
<BooleanSetting
id="disableDropdownCreate_gallery"
headingID="gallery"
checked={iface.disableDropdownCreate?.gallery ?? undefined}
onChange={(v) =>
saveInterface({
disableDropdownCreate: {
...iface.disableDropdownCreate,
gallery: v,
},
})
}
/>
</div>
<NumberSetting
id="max_options_shown"