mirror of
https://github.com/hydralauncher/hydra.git
synced 2026-01-20 01:33:56 +00:00
Merge branch 'main' into feat/displaying-new-game-update
This commit is contained in:
@@ -60,7 +60,7 @@ export function Header() {
|
||||
};
|
||||
|
||||
const handleSearch = (value: string) => {
|
||||
dispatch(setFilters({ title: value }));
|
||||
dispatch(setFilters({ title: value.slice(0, 255) }));
|
||||
|
||||
if (!location.pathname.startsWith("/catalogue")) {
|
||||
navigate("/catalogue");
|
||||
|
||||
@@ -293,6 +293,8 @@ export function GameDetailsContextProvider({
|
||||
}, [objectId, shop, userDetails]);
|
||||
|
||||
useEffect(() => {
|
||||
if (shop === "custom") return;
|
||||
|
||||
const fetchDownloadSources = async () => {
|
||||
try {
|
||||
const sources = await window.electron.getDownloadSources();
|
||||
|
||||
@@ -35,7 +35,7 @@ export default function Catalogue() {
|
||||
|
||||
const { steamDevelopers, steamPublishers, downloadSources } = useCatalogue();
|
||||
|
||||
const { steamGenres, steamUserTags } = useAppSelector(
|
||||
const { steamGenres, steamUserTags, filters, page } = useAppSelector(
|
||||
(state) => state.catalogueSearch
|
||||
);
|
||||
|
||||
@@ -47,8 +47,6 @@ export default function Catalogue() {
|
||||
|
||||
const { formatNumber } = useFormat();
|
||||
|
||||
const { filters, page } = useAppSelector((state) => state.catalogueSearch);
|
||||
|
||||
const dispatch = useAppDispatch();
|
||||
|
||||
const { t, i18n } = useTranslation("catalogue");
|
||||
|
||||
@@ -29,9 +29,11 @@ function JumpControl({
|
||||
return isOpen ? (
|
||||
<input
|
||||
ref={inputRef}
|
||||
type="number"
|
||||
type="text"
|
||||
min={1}
|
||||
max={totalPages}
|
||||
inputMode="numeric"
|
||||
pattern="[0-9]*"
|
||||
className="pagination__page-input"
|
||||
value={value}
|
||||
onChange={onChange}
|
||||
@@ -56,7 +58,7 @@ export function Pagination({
|
||||
page,
|
||||
totalPages,
|
||||
onPageChange,
|
||||
}: PaginationProps) {
|
||||
}: Readonly<PaginationProps>) {
|
||||
const { formatNumber } = useFormat();
|
||||
|
||||
const [isJumpOpen, setIsJumpOpen] = useState(false);
|
||||
@@ -87,13 +89,15 @@ export function Pagination({
|
||||
}
|
||||
|
||||
const onJumpChange = (e: ChangeEvent<HTMLInputElement>) => {
|
||||
const val = e.target.value;
|
||||
if (val === "") {
|
||||
const raw = e.target.value;
|
||||
const digitsOnly = raw.replaceAll(/\D+/g, "");
|
||||
if (digitsOnly === "") {
|
||||
setJumpValue("");
|
||||
return;
|
||||
}
|
||||
const num = Number(val);
|
||||
const num = Number.parseInt(digitsOnly, 10);
|
||||
if (Number.isNaN(num)) {
|
||||
setJumpValue("");
|
||||
return;
|
||||
}
|
||||
if (num < 1) {
|
||||
@@ -104,19 +108,36 @@ export function Pagination({
|
||||
setJumpValue(String(totalPages));
|
||||
return;
|
||||
}
|
||||
setJumpValue(val);
|
||||
setJumpValue(String(num));
|
||||
};
|
||||
|
||||
const onJumpKeyDown = (e: KeyboardEvent<HTMLInputElement>) => {
|
||||
const controlKeys = [
|
||||
"Backspace",
|
||||
"Delete",
|
||||
"Tab",
|
||||
"ArrowLeft",
|
||||
"ArrowRight",
|
||||
"Home",
|
||||
"End",
|
||||
];
|
||||
|
||||
if (controlKeys.includes(e.key) || e.ctrlKey || e.metaKey) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (e.key === "Enter") {
|
||||
if (jumpValue.trim() === "") return;
|
||||
const parsed = Number(jumpValue);
|
||||
const sanitized = jumpValue.replaceAll(/\D+/g, "");
|
||||
if (sanitized.trim() === "") return;
|
||||
const parsed = Number.parseInt(sanitized, 10);
|
||||
if (Number.isNaN(parsed)) return;
|
||||
const target = Math.max(1, Math.min(totalPages, parsed));
|
||||
onPageChange(target);
|
||||
setIsJumpOpen(false);
|
||||
} else if (e.key === "Escape") {
|
||||
setIsJumpOpen(false);
|
||||
} else if (!/^\d$/.test(e.key)) {
|
||||
e.preventDefault();
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -163,7 +163,6 @@ export function GameReviews({
|
||||
take: "20",
|
||||
skip: skip.toString(),
|
||||
sortBy: reviewsSortBy,
|
||||
language: i18n.language,
|
||||
});
|
||||
|
||||
const response = await window.electron.hydraApi.get(
|
||||
|
||||
@@ -71,25 +71,18 @@ export function ReviewItem({
|
||||
|
||||
const [showOriginal, setShowOriginal] = useState(false);
|
||||
|
||||
// Check if this is the user's own review
|
||||
const isOwnReview = userDetailsId === review.user.id;
|
||||
|
||||
// Helper to get base language code (e.g., "pt" from "pt-BR")
|
||||
const getBaseLanguage = (lang: string) => lang.split("-")[0];
|
||||
const getBaseLanguage = (lang: string | null) => lang?.split("-")[0] || "";
|
||||
|
||||
// Check if the review is in a different language (comparing base language codes)
|
||||
const isDifferentLanguage =
|
||||
getBaseLanguage(review.detectedLanguage) !== getBaseLanguage(i18n.language);
|
||||
|
||||
// Check if translation is available and needed (but not for own reviews)
|
||||
const needsTranslation =
|
||||
!isOwnReview &&
|
||||
isDifferentLanguage &&
|
||||
review.translations &&
|
||||
review.translations[i18n.language];
|
||||
!isOwnReview && isDifferentLanguage && review.translations[i18n.language];
|
||||
|
||||
// Get the full language name using Intl.DisplayNames
|
||||
const getLanguageName = (languageCode: string) => {
|
||||
const getLanguageName = (languageCode: string | null) => {
|
||||
if (!languageCode) return "";
|
||||
try {
|
||||
const displayNames = new Intl.DisplayNames([i18n.language], {
|
||||
type: "language",
|
||||
@@ -100,7 +93,6 @@ export function ReviewItem({
|
||||
}
|
||||
};
|
||||
|
||||
// Determine which content to show - always show original for own reviews
|
||||
const displayContent = needsTranslation
|
||||
? review.translations[i18n.language]
|
||||
: review.reviewHtml;
|
||||
@@ -109,12 +101,12 @@ export function ReviewItem({
|
||||
return (
|
||||
<div className="game-details__review-item">
|
||||
<div className="game-details__blocked-review-simple">
|
||||
Review from blocked user —{" "}
|
||||
{t("review_from_blocked_user")}
|
||||
<button
|
||||
className="game-details__blocked-review-show-link"
|
||||
onClick={() => onToggleVisibility(review.id)}
|
||||
>
|
||||
Show
|
||||
{t("show")}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -323,7 +315,7 @@ export function ReviewItem({
|
||||
className="game-details__blocked-review-hide-link"
|
||||
onClick={() => onToggleVisibility(review.id)}
|
||||
>
|
||||
Hide
|
||||
{t("hide")}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -89,7 +89,7 @@ export function SettingsDownloadSources() {
|
||||
try {
|
||||
await window.electron.removeDownloadSource(false, downloadSource.id);
|
||||
const sources = await window.electron.getDownloadSources();
|
||||
setDownloadSources(sources as DownloadSource[]);
|
||||
setDownloadSources(sources);
|
||||
showSuccessToast(t("removed_download_source"));
|
||||
} catch (error) {
|
||||
logger.error("Failed to remove download source:", error);
|
||||
@@ -104,7 +104,7 @@ export function SettingsDownloadSources() {
|
||||
try {
|
||||
await window.electron.removeDownloadSource(true);
|
||||
const sources = await window.electron.getDownloadSources();
|
||||
setDownloadSources(sources as DownloadSource[]);
|
||||
setDownloadSources(sources);
|
||||
showSuccessToast(t("removed_all_download_sources"));
|
||||
} catch (error) {
|
||||
logger.error("Failed to remove all download sources:", error);
|
||||
@@ -117,7 +117,7 @@ export function SettingsDownloadSources() {
|
||||
const handleAddDownloadSource = async () => {
|
||||
try {
|
||||
const sources = await window.electron.getDownloadSources();
|
||||
setDownloadSources(sources as DownloadSource[]);
|
||||
setDownloadSources(sources);
|
||||
} catch (error) {
|
||||
logger.error("Failed to refresh download sources:", error);
|
||||
}
|
||||
@@ -128,7 +128,7 @@ export function SettingsDownloadSources() {
|
||||
try {
|
||||
await window.electron.syncDownloadSources();
|
||||
const sources = await window.electron.getDownloadSources();
|
||||
setDownloadSources(sources as DownloadSource[]);
|
||||
setDownloadSources(sources);
|
||||
|
||||
showSuccessToast(t("download_sources_synced_successfully"));
|
||||
} finally {
|
||||
|
||||
Reference in New Issue
Block a user