Windows | 
macOS | 
Linux | 
Docker
:---:|:---:|:---:|:---:
[Latest Release](https://github.com/stashapp/stash/releases/latest/download/stash-win.exe)
+
-
-
+ {content}
);
}
+ if (config.loading) {
+ return renderSimple(
{
formats={intlFormats}
>
-
+
-
+
{maybeRenderReleaseNotes()}
diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx
index ae7937588..97175e1c2 100644
--- a/ui/v2.5/src/components/Changelog/Changelog.tsx
+++ b/ui/v2.5/src/components/Changelog/Changelog.tsx
@@ -33,7 +33,13 @@ import V0250 from "src/docs/en/Changelog/v0250.md";
import V0260 from "src/docs/en/Changelog/v0260.md";
import V0270 from "src/docs/en/Changelog/v0270.md";
import V0280 from "src/docs/en/Changelog/v0280.md";
+import V0290 from "src/docs/en/Changelog/v0290.md";
+import V0300 from "src/docs/en/Changelog/v0300.md";
+
+import V0290ReleaseNotes from "src/docs/en/ReleaseNotes/v0290.md";
+
import { MarkdownPage } from "../Shared/MarkdownPage";
+import { FormattedMessage } from "react-intl";
const Changelog: React.FC = () => {
const [{ data, loading }, setOpenState] = useChangelogStorage();
@@ -63,14 +69,15 @@ const Changelog: React.FC = () => {
date?: string;
page: string;
defaultOpen?: boolean;
+ releaseNotes?: string;
}
// after new release:
// add entry to releases, using the current* fields
// then update the current fields.
- const currentVersion = stashVersion || "v0.28.1";
+ const currentVersion = stashVersion || "v0.30.0";
const currentDate = buildDate;
- const currentPage = V0280;
+ const currentPage = V0300;
const releases: IStashRelease[] = [
{
@@ -79,6 +86,17 @@ const Changelog: React.FC = () => {
page: currentPage,
defaultOpen: true,
},
+ {
+ version: "v0.29.3",
+ date: "2025-11-06",
+ page: V0290,
+ releaseNotes: V0290ReleaseNotes,
+ },
+ {
+ version: "v0.28.1",
+ date: "2025-03-20",
+ page: V0280,
+ },
{
version: "v0.27.2",
date: "2024-10-16",
@@ -248,6 +266,15 @@ const Changelog: React.FC = () => {
setOpenState={setVersionOpenState}
defaultOpen={r.defaultOpen}
>
+ {r.releaseNotes && (
+ = ({
+export const GenerateDialog: React.FC = ({
selectedIds,
onClose,
type,
}) => {
- const { configuration } = React.useContext(ConfigurationContext);
+ const sceneIDs = type === "scene" ? selectedIds : undefined;
+ const imageIDs = type === "image" ? selectedIds : undefined;
+ const galleryIDs = type === "gallery" ? selectedIds : undefined;
+
+ const { configuration } = useConfigurationContext();
function getDefaultOptions(): GQL.GenerateMetadataInput {
return {
@@ -89,6 +93,13 @@ export const GenerateDialog: React.FC = ({
}, [configuration, configRead]);
const selectionStatus = useMemo(() => {
+ const countableIds: Record = {
+ scene: "countables.scenes",
+ image: "countables.images",
+ gallery: "countables.galleries",
+ };
+ const countableId = countableIds[type];
+
if (selectedIds) {
return (
@@ -98,7 +109,7 @@ export const GenerateDialog: React.FC = ({
num: selectedIds.length,
scene: intl.formatMessage(
{
- id: "countables.scenes",
+ id: countableId,
},
{
count: selectedIds.length,
@@ -118,7 +129,7 @@ export const GenerateDialog: React.FC = ({
num: intl.formatMessage({ id: "all" }),
scene: intl.formatMessage(
{
- id: "countables.scenes",
+ id: countableId,
},
{
count: 0,
@@ -135,13 +146,15 @@ export const GenerateDialog: React.FC = ({
);
- }, [selectedIds, intl]);
+ }, [selectedIds, intl, type]);
async function onGenerate() {
try {
await mutateMetadataGenerate({
...options,
- sceneIDs: selectedIds,
+ sceneIDs,
+ imageIDs,
+ galleryIDs,
});
Toast.success(
intl.formatMessage(
diff --git a/ui/v2.5/src/components/FrontPage/Control.tsx b/ui/v2.5/src/components/FrontPage/Control.tsx
index 7ce32cb44..72f84516f 100644
--- a/ui/v2.5/src/components/FrontPage/Control.tsx
+++ b/ui/v2.5/src/components/FrontPage/Control.tsx
@@ -1,9 +1,9 @@
-import React, { useContext, useMemo } from "react";
+import React, { useMemo } from "react";
import { useIntl } from "react-intl";
import { FrontPageContent, ICustomFilter } from "src/core/config";
import * as GQL from "src/core/generated-graphql";
import { useFindSavedFilter } from "src/core/StashService";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
import { ListFilterModel } from "src/models/list-filter/filter";
import { GalleryRecommendationRow } from "../Galleries/GalleryRecommendationRow";
import { ImageRecommendationRow } from "../Images/ImageRecommendationRow";
@@ -12,6 +12,7 @@ import { PerformerRecommendationRow } from "../Performers/PerformerRecommendatio
import { SceneRecommendationRow } from "../Scenes/SceneRecommendationRow";
import { StudioRecommendationRow } from "../Studios/StudioRecommendationRow";
import { TagRecommendationRow } from "../Tags/TagRecommendationRow";
+import { SceneMarkerRecommendationRow } from "../Scenes/SceneMarkerRecommendationRow";
interface IFilter {
mode: GQL.FilterMode;
@@ -84,6 +85,14 @@ const RecommendationRow: React.FC = ({ mode, filter, header }) => {
header={header}
/>
);
+ case GQL.FilterMode.SceneMarkers:
+ return (
+ = ({
savedFilterID,
}) => {
- const { configuration: config } = useContext(ConfigurationContext);
+ const { configuration: config } = useConfigurationContext();
const { loading, data } = useFindSavedFilter(savedFilterID.toString());
const filter = useMemo(() => {
@@ -127,7 +136,7 @@ interface ICustomFilterProps {
const CustomFilterResults: React.FC = ({
customFilter,
}) => {
- const { configuration: config } = useContext(ConfigurationContext);
+ const { configuration: config } = useConfigurationContext();
const intl = useIntl();
const filter = useMemo(() => {
diff --git a/ui/v2.5/src/components/FrontPage/FrontPage.tsx b/ui/v2.5/src/components/FrontPage/FrontPage.tsx
index 89b4db468..12e56f6ab 100644
--- a/ui/v2.5/src/components/FrontPage/FrontPage.tsx
+++ b/ui/v2.5/src/components/FrontPage/FrontPage.tsx
@@ -6,7 +6,7 @@ import { Button } from "react-bootstrap";
import { FrontPageConfig } from "./FrontPageConfig";
import { useToast } from "src/hooks/Toast";
import { Control } from "./Control";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
import {
FrontPageContent,
generateDefaultFrontPageContent,
@@ -24,7 +24,7 @@ const FrontPage: React.FC = PatchComponent("FrontPage", () => {
const [saveUI] = useConfigureUI();
- const { configuration, loading } = React.useContext(ConfigurationContext);
+ const { configuration } = useConfigurationContext();
useScrollToTopOnMount();
@@ -51,7 +51,7 @@ const FrontPage: React.FC = PatchComponent("FrontPage", () => {
setSaving(false);
}
- if (loading || saving) {
+ if (saving) {
return = ({
].concat(
candidates.findSavedFilters
.filter((f) => {
- // markers not currently supported
- return (
- f.mode !== GQL.FilterMode.SceneMarkers &&
- !existingSavedFilterIDs.includes(f.id)
- );
+ return !existingSavedFilterIDs.includes(f.id);
})
.map((f) => {
return {
@@ -281,11 +277,11 @@ interface IFrontPageConfigProps {
export const FrontPageConfig: React.FC = ({
onClose,
}) => {
- const { configuration, loading } = React.useContext(ConfigurationContext);
+ const { configuration } = useConfigurationContext();
const ui = configuration?.ui;
- const { data: allFilters, loading: loading2 } = useFindSavedFilters();
+ const { data: allFilters, loading } = useFindSavedFilters();
const [isAdd, setIsAdd] = useState(false);
const [currentContent, setCurrentContent] = useState([]);
@@ -342,7 +338,7 @@ export const FrontPageConfig: React.FC = ({
setDragIndex(undefined);
}
- if (loading || loading2) {
+ if (loading) {
return > = ({
- className,
- header,
- link,
- children,
-}) => (
-
{children}
);
@@ -294,34 +308,43 @@ export const App: React.FC = () => {
);
}
- const titleProps = makeTitleProps();
+ const title = config.data?.configuration.ui.title || "Stash";
+ const titleProps = makeTitleProps(title);
if (!messages) {
return null;
}
- if (config.error) {
+ function renderSimple(content: React.ReactNode) {
return (
+
+
+
+
+ )}
+
+ +
{message}
- = (
{ count: props.selected.length, singularEntity, pluralEntity }
);
- const { configuration: config } = React.useContext(ConfigurationContext);
+ const { configuration: config } = useConfigurationContext();
const [deleteFile, setDeleteFile] = useState(
config?.defaults.deleteFile ?? false
@@ -84,6 +84,11 @@ export const DeleteGalleriesDialog: React.FC = (
return;
}
+ const deleteTrashPath = config?.general.deleteTrashPath;
+ const deleteAlertId = deleteTrashPath
+ ? "dialogs.delete_alert_to_trash"
+ : "dialogs.delete_alert";
+
return (
-
-);
+ )
+ );
diff --git a/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx b/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
index 2feaa0f1e..35aaea797 100644
--- a/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
@@ -4,7 +4,7 @@ import { useGalleryDestroy } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { ModalComponent } from "../Shared/Modal";
import { useToast } from "src/hooks/Toast";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@@ -33,7 +33,7 @@ export const DeleteGalleriesDialog: React.FC
- > =
+ PatchComponent(
+ "RecommendationRow",
+ ({ className, header, link, children }) => (
+
- {children}
- {header}
+export const RecommendationRow: React.FC
+
- {link}
-
+
+ {children}
+
+ {link}
+ {header}
+
@@ -93,7 +98,7 @@ export const DeleteGalleriesDialog: React.FC
-
diff --git a/ui/v2.5/src/components/Galleries/Galleries.tsx b/ui/v2.5/src/components/Galleries/Galleries.tsx
index c845a153c..388ce6720 100644
--- a/ui/v2.5/src/components/Galleries/Galleries.tsx
+++ b/ui/v2.5/src/components/Galleries/Galleries.tsx
@@ -4,7 +4,7 @@ import { Helmet } from "react-helmet";
import { useTitleProps } from "src/hooks/title";
import Gallery from "./GalleryDetails/Gallery";
import GalleryCreate from "./GalleryDetails/GalleryCreate";
-import { GalleryList } from "./GalleryList";
+import { FilteredGalleryList } from "./GalleryList";
import { View } from "../List/views";
import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { ErrorMessage } from "../Shared/ErrorMessage";
@@ -40,7 +40,7 @@ const GalleryImage: React.FC
+ {galleries.map((gallery) => (
+ 0}
+ selected={selectedIds.has(gallery.id)}
+ onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
+ onSelectChange(gallery.id, selected, shiftKey)
+ }
+ />
+ ))}
+
+ );
+ }
+);
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
index 20023904b..18cbeff96 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
@@ -1,12 +1,12 @@
import { Button, Tab, Nav, Dropdown } from "react-bootstrap";
-import React, { useContext, useEffect, useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
import {
useHistory,
Link,
RouteComponentProps,
Redirect,
} from "react-router-dom";
-import { FormattedDate, FormattedMessage, useIntl } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
import { Helmet } from "react-helmet";
import * as GQL from "src/core/generated-graphql";
import {
@@ -15,6 +15,11 @@ import {
useFindGallery,
useGalleryUpdate,
} from "src/core/StashService";
+import { lazyComponent } from "src/utils/lazyComponent";
+
+const GenerateDialog = lazyComponent(
+ () => import("../../Dialogs/GenerateDialog")
+);
import { ErrorMessage } from "src/components/Shared/ErrorMessage";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { Icon } from "src/components/Shared/Icon";
@@ -41,8 +46,10 @@ import { useScrollToTopOnMount } from "src/hooks/scrollToTop";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import cx from "classnames";
import { useRatingKeybinds } from "src/hooks/keybinds";
-import { ConfigurationContext } from "src/hooks/Config";
+import { useConfigurationContext } from "src/hooks/Config";
import { TruncatedText } from "src/components/Shared/TruncatedText";
+import { goBackOrReplace } from "src/utils/history";
+import { FormattedDate } from "src/components/Shared/Date";
interface IProps {
gallery: GQL.GalleryDataFragment;
@@ -58,7 +65,7 @@ export const GalleryPage: React.FC
@@ -409,11 +436,7 @@ export const GalleryPage: React.FC = ({ gallery, add }) => {
[];
}
-export const GalleryAddPanel: React.FC = ({
- active,
- gallery,
-}) => {
- const Toast = useToast();
- const intl = useIntl();
+export const GalleryAddPanel: React.FC = PatchComponent(
+ "GalleryAddPanel",
+ ({ active, gallery, extraOperations = [] }) => {
+ const Toast = useToast();
+ const intl = useIntl();
- function filterHook(filter: ListFilterModel) {
- const galleryValue = {
- id: gallery.id,
- label: galleryTitle(gallery),
- };
- // if galleries is already present, then we modify it, otherwise add
- let galleryCriterion = filter.criteria.find((c) => {
- return c.criterionOption.type === "galleries";
- }) as GalleriesCriterion | undefined;
+ function filterHook(filter: ListFilterModel) {
+ const galleryValue = {
+ id: gallery.id,
+ label: galleryTitle(gallery),
+ };
+ // if galleries is already present, then we modify it, otherwise add
+ let galleryCriterion = filter.criteria.find((c) => {
+ return c.criterionOption.type === "galleries";
+ }) as GalleriesCriterion | undefined;
- if (
- galleryCriterion &&
- galleryCriterion.modifier === GQL.CriterionModifier.Excludes
- ) {
- // add the gallery if not present
if (
- !galleryCriterion.value.find((p) => {
- return p.id === gallery.id;
- })
+ galleryCriterion &&
+ galleryCriterion.modifier === GQL.CriterionModifier.Excludes
) {
- galleryCriterion.value.push(galleryValue);
+ // add the gallery if not present
+ if (
+ !galleryCriterion.value.find((p) => {
+ return p.id === gallery.id;
+ })
+ ) {
+ galleryCriterion.value.push(galleryValue);
+ }
+
+ galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
+ } else {
+ // overwrite
+ galleryCriterion = new GalleriesCriterion();
+ galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
+ galleryCriterion.value = [galleryValue];
+ filter.criteria.push(galleryCriterion);
}
- galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
- } else {
- // overwrite
- galleryCriterion = new GalleriesCriterion();
- galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
- galleryCriterion.value = [galleryValue];
- filter.criteria.push(galleryCriterion);
+ return filter;
}
- return filter;
- }
-
- async function addImages(
- result: GQL.FindImagesQueryResult,
- filter: ListFilterModel,
- selectedIds: Set
- ) {
- try {
- await mutateAddGalleryImages({
- gallery_id: gallery.id!,
- image_ids: Array.from(selectedIds.values()),
- });
- const imageCount = selectedIds.size;
- Toast.success(
- intl.formatMessage(
- { id: "toast.added_entity" },
- {
- count: imageCount,
- singularEntity: intl.formatMessage({ id: "image" }),
- pluralEntity: intl.formatMessage({ id: "images" }),
- }
- )
- );
- } catch (e) {
- Toast.error(e);
+ async function addImages(
+ result: GQL.FindImagesQueryResult,
+ filter: ListFilterModel,
+ selectedIds: Set
+ ) {
+ try {
+ await mutateAddGalleryImages({
+ gallery_id: gallery.id!,
+ image_ids: Array.from(selectedIds.values()),
+ });
+ const imageCount = selectedIds.size;
+ Toast.success(
+ intl.formatMessage(
+ { id: "toast.added_entity" },
+ {
+ count: imageCount,
+ singularEntity: intl.formatMessage({ id: "image" }),
+ pluralEntity: intl.formatMessage({ id: "images" }),
+ }
+ )
+ );
+ } catch (e) {
+ Toast.error(e);
+ }
}
+
+ const otherOperations = [
+ ...extraOperations,
+ {
+ text: intl.formatMessage(
+ { id: "actions.add_to_entity" },
+ { entityType: intl.formatMessage({ id: "gallery" }) }
+ ),
+ onClick: addImages,
+ isDisplayed: showWhenSelected,
+ postRefetch: true,
+ icon: faPlus,
+ },
+ ];
+
+ return (
+ ;
isVisible: boolean;
- onSubmit: (input: GQL.GalleryCreateInput) => Promise;
+ onSubmit: (input: GQL.GalleryCreateInput, andNew?: boolean) => Promise;
onDelete: () => void;
}
@@ -162,10 +162,25 @@ export const GalleryEditPanel: React.FC = ({
);
}, [scrapers]);
- async function onSave(input: InputValues) {
+ const cover = useMemo(() => {
+ if (gallery?.paths?.cover) {
+ return (
+ = ({
setIsLoading(false);
}
+ async function onSaveAndNewClick() {
+ const input = schema.cast(formik.values);
+ onSave(input, true);
+ }
+
async function onScrapeClicked(s: GQL.ScraperSourceInput) {
if (!gallery || !gallery.id) return;
@@ -335,6 +355,19 @@ export const GalleryEditPanel: React.FC = ({
xl: 12,
},
};
+ const urlProps = isNew
+ ? splitProps
+ : {
+ labelProps: {
+ column: true,
+ md: 3,
+ lg: 12,
+ },
+ fieldProps: {
+ md: 9,
+ lg: 12,
+ },
+ };
const { renderField, renderInputField, renderDateField, renderURLListField } =
formikUtils(intl, formik, splitProps);
@@ -417,16 +450,31 @@ export const GalleryEditPanel: React.FC = ({
{!!gallery.date && (
-
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
index 9e859c1c8..275c4263b 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
@@ -9,98 +9,102 @@ import { useToast } from "src/hooks/Toast";
import { useIntl } from "react-intl";
import { faPlus } from "@fortawesome/free-solid-svg-icons";
import { galleryTitle } from "src/core/galleries";
+import { IItemListOperation } from "src/components/List/FilteredListToolbar";
+import { PatchComponent } from "src/patch";
interface IGalleryAddProps {
active: boolean;
gallery: GQL.GalleryDataFragment;
+ extraOperations?: IItemListOperation
+ 
+
+ );
+ }
+
+ return ;
+ }, [gallery?.paths?.cover, intl]);
+
+ async function onSave(input: InputValues, andNew?: boolean) {
setIsLoading(true);
try {
- await onSubmit(input);
+ await onSubmit(input, andNew);
formik.resetForm();
} catch (e) {
Toast.error(e);
@@ -173,6 +188,11 @@ export const GalleryEditPanel: React.FC