mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 20:34:37 +03:00
Rename Movie to Group in UI (#4963)
* Replace movies with groups in the UI * Massage menu items * Change view names * Rename Movie components to Group * Refactor movie to group variable names * Rename movie class names to group
This commit is contained in:
@@ -30,7 +30,7 @@ import {
|
||||
hasScrapedValues,
|
||||
} from "../Shared/ScrapeDialog/scrapeResult";
|
||||
import {
|
||||
ScrapedMoviesRow,
|
||||
ScrapedGroupsRow,
|
||||
ScrapedPerformersRow,
|
||||
ScrapedStudioRow,
|
||||
ScrapedTagsRow,
|
||||
@@ -100,7 +100,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
||||
};
|
||||
}
|
||||
|
||||
function movieToStoredID(o: { movie: { id: string; name: string } }) {
|
||||
function groupToStoredID(o: { movie: { id: string; name: string } }) {
|
||||
return {
|
||||
stored_id: o.movie.id,
|
||||
name: o.movie.name,
|
||||
@@ -141,11 +141,11 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
||||
)
|
||||
);
|
||||
|
||||
const [movies, setMovies] = useState<
|
||||
const [groups, setGroups] = useState<
|
||||
ObjectListScrapeResult<GQL.ScrapedMovie>
|
||||
>(
|
||||
new ObjectListScrapeResult<GQL.ScrapedMovie>(
|
||||
sortStoredIdObjects(dest.movies.map(movieToStoredID))
|
||||
sortStoredIdObjects(dest.movies.map(groupToStoredID))
|
||||
)
|
||||
);
|
||||
|
||||
@@ -252,10 +252,10 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
||||
)
|
||||
);
|
||||
|
||||
setMovies(
|
||||
setGroups(
|
||||
new ObjectListScrapeResult<GQL.ScrapedMovie>(
|
||||
sortStoredIdObjects(dest.movies.map(movieToStoredID)),
|
||||
uniqIDStoredIDs(all.map((s) => s.movies.map(movieToStoredID)).flat())
|
||||
sortStoredIdObjects(dest.movies.map(groupToStoredID)),
|
||||
uniqIDStoredIDs(all.map((s) => s.movies.map(groupToStoredID)).flat())
|
||||
)
|
||||
);
|
||||
|
||||
@@ -331,7 +331,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
||||
galleries,
|
||||
studio,
|
||||
performers,
|
||||
movies,
|
||||
groups,
|
||||
tags,
|
||||
details,
|
||||
organized,
|
||||
@@ -348,7 +348,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
||||
galleries,
|
||||
studio,
|
||||
performers,
|
||||
movies,
|
||||
groups,
|
||||
tags,
|
||||
details,
|
||||
organized,
|
||||
@@ -508,10 +508,10 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
||||
result={performers}
|
||||
onChange={(value) => setPerformers(value)}
|
||||
/>
|
||||
<ScrapedMoviesRow
|
||||
title={intl.formatMessage({ id: "movies" })}
|
||||
result={movies}
|
||||
onChange={(value) => setMovies(value)}
|
||||
<ScrapedGroupsRow
|
||||
title={intl.formatMessage({ id: "groups" })}
|
||||
result={groups}
|
||||
onChange={(value) => setGroups(value)}
|
||||
/>
|
||||
<ScrapedTagsRow
|
||||
title={intl.formatMessage({ id: "tags" })}
|
||||
@@ -585,7 +585,7 @@ 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: movies.getNewValue()?.map((m) => {
|
||||
movies: groups.getNewValue()?.map((m) => {
|
||||
// find the equivalent movie in the original scenes
|
||||
const found = all
|
||||
.map((s) => s.movies)
|
||||
|
||||
Reference in New Issue
Block a user