beenull/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[desktop] Allow refreshing when inside an album (#1827)

Browse source 
Steps to reproduce on Linux:

- Open an album
- Open a photo
- View > Reload

Causes a 404 page to be displayed.
This commit is contained in:
Manav Rathi 2024-05-23 16:17:41 +05:30 committed by GitHub
commit 1ee52c780f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
web/apps/auth/src/pages/404.tsx
View file

@ -1,9 +1,3 @@
import { APPS } from "@ente/shared/apps/constants";
import NotFoundPage from "@ente/shared/next/pages/404";
import { AppContext } from "pages/_app";
import { useContext } from "react";
import Page from "@ente/shared/next/pages/404";
export default function NotFound() {
const appContext = useContext(AppContext);
return <NotFoundPage appContext={appContext} appName={APPS.AUTH} />;
}
export default Page;

10
web/apps/photos/src/pages/404.tsx
View file

@ -1,9 +1,3 @@
import { APPS } from "@ente/shared/apps/constants";
import NotFoundPage from "@ente/shared/next/pages/404";
import { AppContext } from "pages/_app";
import { useContext } from "react";
import Page from "@ente/shared/next/pages/404";
export default function NotFound() {
const appContext = useContext(AppContext);
return <NotFoundPage appContext={appContext} appName={APPS.AUTH} />;
}
export default Page;

41
web/packages/shared/next/pages/404.tsx
View file

@ -1,19 +1,30 @@
import { VerticallyCentered } from "@ente/shared/components/Container";
import { t } from "i18next";
import { useEffect, useState } from "react";
import { PAGES } from "@ente/accounts/constants/pages";
import { useRouter } from "next/router";
import { useEffect } from "react";
import { PageProps } from "@ente/shared/apps/types";
import EnteSpinner from "@ente/shared/components/EnteSpinner";
const Page: React.FC = () => {
// [Note: 404 back to home]
//
// In the desktop app, if the user presses the refresh button when the URL
// has an attached query parameter, e.g. "/gallery?collectionId=xxx", then
// the code in next-electron-server blindly appends the html extension to
// this URL, resulting in it trying to open "gallery?collectionId=xxx.html"
// instead of "gallery.html". It doesn't find such a file, causing it open
// "404.html" (the static file generated from this file).
//
// One way around is to patch the package, e.g.
// https://github.com/ente-io/next-electron-server/pull/1/files
//
// However, redirecting back to the root is arguably a better fallback in
// all cases (even when running on our website), since our app is a SPA.
const router = useRouter();
export default function NotFound({ appContext }: PageProps) {
const [loading, setLoading] = useState(true);
useEffect(() => {
appContext.showNavBar(true);
setLoading(false);
router.push(PAGES.ROOT);
}, []);
return (
<VerticallyCentered>
{loading ? <EnteSpinner /> : t("NOT_FOUND")}
</VerticallyCentered>
);
}
return <></>;
};
export default Page;