From 6f2057a51e094d02488d49386552ca8b9fd0ef96 Mon Sep 17 00:00:00 2001 From: WithoutPants <53250216+WithoutPants@users.noreply.github.com> Date: Tue, 7 Feb 2023 16:44:00 +1100 Subject: [PATCH] Handle unset rating system (#3410) --- .../Galleries/GalleryDetails/GalleryEditPanel.tsx | 2 +- .../src/components/Images/ImageDetails/ImageEditPanel.tsx | 2 +- .../src/components/Movies/MovieDetails/MovieEditPanel.tsx | 6 +++++- .../components/Performers/PerformerDetails/Performer.tsx | 2 +- .../src/components/Scenes/SceneDetails/SceneEditPanel.tsx | 2 +- .../components/Studios/StudioDetails/StudioEditPanel.tsx | 2 +- ui/v2.5/src/hooks/keybinds.ts | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx index d7c1a55fa..5372c30c0 100644 --- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx +++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx @@ -139,7 +139,7 @@ export const GalleryEditPanel: React.FC< useRatingKeybinds( isVisible, - stashConfig?.ui.ratingSystemOptions.type, + stashConfig?.ui?.ratingSystemOptions?.type, setRating ); diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx index 6259db41a..b21c84e00 100644 --- a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx +++ b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx @@ -75,7 +75,7 @@ export const ImageEditPanel: React.FC = ({ useRatingKeybinds( true, - configuration?.ui.ratingSystemOptions.type, + configuration?.ui?.ratingSystemOptions?.type, setRating ); diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx b/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx index 7acb6c93e..b822724b5 100644 --- a/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx +++ b/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx @@ -122,7 +122,11 @@ export const MovieEditPanel: React.FC = ({ formik.setFieldValue("rating100", v); } - useRatingKeybinds(true, stashConfig?.ui.ratingSystemOptions.type, setRating); + useRatingKeybinds( + true, + stashConfig?.ui?.ratingSystemOptions?.type, + setRating + ); // set up hotkeys useEffect(() => { diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx index 5853e6e55..8d7077406 100644 --- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx +++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx @@ -113,7 +113,7 @@ const PerformerPage: React.FC = ({ performer }) => { useRatingKeybinds( true, - configuration?.ui.ratingSystemOptions.type, + configuration?.ui?.ratingSystemOptions?.type, setRating ); diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx index 48f0b32aa..5fba98e27 100644 --- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx +++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx @@ -190,7 +190,7 @@ export const SceneEditPanel: React.FC = ({ useRatingKeybinds( isVisible, - stashConfig?.ui.ratingSystemOptions.type, + stashConfig?.ui?.ratingSystemOptions?.type, setRating ); diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx index f0b8b622c..0ee83e0c2 100644 --- a/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx +++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioEditPanel.tsx @@ -105,7 +105,7 @@ export const StudioEditPanel: React.FC = ({ useRatingKeybinds( true, - configuration?.ui.ratingSystemOptions.type, + configuration?.ui?.ratingSystemOptions?.type, setRating ); diff --git a/ui/v2.5/src/hooks/keybinds.ts b/ui/v2.5/src/hooks/keybinds.ts index dc85ce51d..46c7e75c9 100644 --- a/ui/v2.5/src/hooks/keybinds.ts +++ b/ui/v2.5/src/hooks/keybinds.ts @@ -71,7 +71,7 @@ export function useRatingKeybinds( document.activeElement.blur(); } - if (ratingSystem === RatingSystemType.Stars) { + if (!ratingSystem || ratingSystem === RatingSystemType.Stars) { return handleStarRatingKeybinds(); } else { return handleDecimalKeybinds();