Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 20:34:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add group graphql interfaces (#5017)

Browse Source 
* Deprecate movie and add group interfaces
* UI changes
This commit is contained in:
WithoutPants
2024-07-03 13:59:40 +10:00
committed by GitHub
parent f477b996b5
commit 2739696813
108 changed files with 1437 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
View File

@@ -100,10 +100,10 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
};
}
function groupToStoredID(o: { movie: { id: string; name: string } }) {
function groupToStoredID(o: { group: { id: string; name: string } }) {
return {
stored_id: o.movie.id,
name: o.movie.name,
stored_id: o.group.id,
name: o.group.name,
};
}
@@ -142,10 +142,10 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
);
const [groups, setGroups] = useState<
ObjectListScrapeResult<GQL.ScrapedMovie>
ObjectListScrapeResult<GQL.ScrapedGroup>
>(
new ObjectListScrapeResult<GQL.ScrapedMovie>(
sortStoredIdObjects(dest.movies.map(groupToStoredID))
new ObjectListScrapeResult<GQL.ScrapedGroup>(
sortStoredIdObjects(dest.groups.map(groupToStoredID))
)
);
@@ -253,9 +253,9 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
);
setGroups(
new ObjectListScrapeResult<GQL.ScrapedMovie>(
sortStoredIdObjects(dest.movies.map(groupToStoredID)),
uniqIDStoredIDs(all.map((s) => s.movies.map(groupToStoredID)).flat())
new ObjectListScrapeResult<GQL.ScrapedGroup>(
sortStoredIdObjects(dest.groups.map(groupToStoredID)),
uniqIDStoredIDs(all.map((s) => s.groups.map(groupToStoredID)).flat())
)
);
@@ -585,14 +585,14 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
gallery_ids: galleries.getNewValue(),
studio_id: studio.getNewValue()?.stored_id,
performer_ids: performers.getNewValue()?.map((p) => p.stored_id!),
movies: groups.getNewValue()?.map((m) => {
// find the equivalent movie in the original scenes
groups: groups.getNewValue()?.map((m) => {
// find the equivalent group in the original scenes
const found = all
.map((s) => s.movies)
.map((s) => s.groups)
.flat()
.find((mm) => mm.movie.id === m.stored_id);
.find((mm) => mm.group.id === m.stored_id);
return {
movie_id: m.stored_id!,
group_id: m.stored_id!,
scene_index: found!.scene_index,
};
}),