Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 08:26:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix performer stash ids being overwritten in performer tagger (#4215)

Browse source
This commit is contained in:
WithoutPants 2023-10-17 11:42:57 +11:00 committed by GitHub
parent 5e0f27bed2
commit a9ab1fcca7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ui/v2.5/src/components/Tagger/performers/PerformerTagger.tsx
View file

@ -25,6 +25,7 @@ import { LOCAL_FORAGE_KEY, ITaggerConfig, initialConfig } from "../constants";
import PerformerModal from "../PerformerModal";
import { useUpdatePerformer } from "../queries";
import { faStar, faTags } from "@fortawesome/free-solid-svg-icons";
import { mergeStashIDs } from "src/utils/stashbox";
type JobFragment = Pick<
GQL.Job,
@ -367,10 +368,18 @@ const PerformerTaggerList: React.FC<IPerformerTaggerListProps> = ({
});
}
const handlePerformerUpdate = async (input: GQL.PerformerCreateInput) => {
const handlePerformerUpdate = async (
existing: GQL.PerformerDataFragment,
input: GQL.PerformerCreateInput
) => {
setModalPerformer(undefined);
const performerID = modalPerformer?.stored_id;
if (performerID) {
// handle stash ids - we want to add, not set them
if (input.stash_ids?.length) {
input.stash_ids = mergeStashIDs(existing.stash_ids, input.stash_ids);
}
const updateData: GQL.PerformerUpdateInput = {
...input,
id: performerID,
@ -540,7 +549,9 @@ const PerformerTaggerList: React.FC<IPerformerTaggerListProps> = ({
closeModal={() => setModalPerformer(undefined)}
modalVisible={modalPerformer.stored_id === performer.id}
performer={modalPerformer}
onSave={handlePerformerUpdate}
onSave={(input) => {
handlePerformerUpdate(performer, input);
}}
excludedPerformerFields={config.excludedPerformerFields}
icon={faTags}
header={intl.formatMessage({

5
ui/v2.5/src/components/Tagger/performers/StashSearchResult.tsx
View file

@ -5,6 +5,7 @@ import * as GQL from "src/core/generated-graphql";
import { useUpdatePerformer } from "../queries";
import PerformerModal from "../PerformerModal";
import { faTags } from "@fortawesome/free-solid-svg-icons";
import { mergeStashIDs } from "src/utils/stashbox";
interface IStashSearchResultProps {
performer: GQL.SlimPerformerDataFragment;
@ -38,6 +39,10 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
setSaveState("Saving performer");
setModalPerformer(undefined);
if (input.stash_ids?.length) {
input.stash_ids = mergeStashIDs(performer.stash_ids, input.stash_ids);
}
const updateData: GQL.PerformerUpdateInput = {
...input,
id: performer.id,

10
ui/v2.5/src/utils/stashbox.ts
View file

@ -1,6 +1,16 @@
import { StashIdInput } from "src/core/generated-graphql";
export function stashboxDisplayName(name: string, index: number) {
return name || `Stash-Box #${index + 1}`;
}
export const getStashboxBase = (endpoint: string) =>
endpoint.match(/(https?:\/\/.*?\/)graphql/)?.[1];
// mergeStashIDs merges the src stash ID into the dest stash IDs.
// If the src stash ID is already in dest, the src stash ID overwrites the dest stash ID.
export function mergeStashIDs(dest: StashIdInput[], src: StashIdInput[]) {
return dest
.filter((i) => !src.find((j) => i.endpoint === j.endpoint))
.concat(src);
}