Skip to content

Commit 683a2b7

Browse files
committed
I should really start running tests *before* I commit
1 parent 3e109eb commit 683a2b7

4 files changed

Lines changed: 9 additions & 11 deletions

File tree

frontend/src/modules/discovery/components/BrowseFilters.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ export const BrowseFilters: React.FC<BrowseFiltersProps> = React.memo(({
461461
placeholder="12"
462462
containerClassName="relative flex-none h-10 w-16"
463463
buttonLabel={itemsPerPage}
464-
buttonAriaLabel={`${itemsPerPage} results per page`}
464+
buttonAriaLabel="Results per page"
465465
buttonTitle="Results per page"
466466
showSelectedCheck={false}
467467
buttonClassName="w-full h-full flex items-center justify-center gap-1 border rounded-xl px-2 text-xs font-black transition-all whitespace-nowrap bg-white dark:bg-slate-900 border-slate-200 dark:border-white/10 text-slate-700 dark:text-slate-300 hover:bg-slate-50 dark:hover:bg-white/[0.02] shadow-sm"

frontend/src/modules/discovery/views/Browse.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export const Browse: React.FC<BrowseViewProps> = ({
6262
const { initialData } = useSSRData();
6363

6464
const hasComplexParams = searchParams.has('q') || searchParams.has('tags') || searchParams.has('version') || searchParams.has('minDl') || searchParams.has('minFav') || searchParams.has('date') || searchParams.has('category') || (searchParams.get('page') && parseInt(searchParams.get('page')!, 10) > 0);
65-
const hasUsableBrowseSSRData = Boolean(initialData?.browseData);
65+
const hasUsableBrowseSSRData = Boolean(initialData?.browseData && initialData?.browseDataReady !== false);
6666
const useSSR = hasUsableBrowseSSRData && !hasComplexParams;
6767
const initialPreferences = useMemo(() => getInitialBrowsePreferences(), []);
6868
const [viewStyle, setViewStyle] = useState<BrowseViewStyle>(initialPreferences.viewStyle);

frontend/src/modules/home/views/Home.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,10 @@ export const Home: React.FC<{
178178
const initialTrendingProjects = ssrData?.homeTrendingProjects || ssrData?.homeProjects || [];
179179
const initialNewestProjects = ssrData?.homeNewestProjects || [];
180180
const hasHomeSSRData = Boolean(
181-
ssrData
182-
&& (
183-
'homeMarqueeProjects' in ssrData
184-
|| 'homeTrendingProjects' in ssrData
185-
|| 'homeNewestProjects' in ssrData
186-
|| 'homeProjects' in ssrData
187-
)
181+
ssrData?.homeDataReady
182+
|| initialMarqueeProjects.length
183+
|| initialTrendingProjects.length
184+
|| initialNewestProjects.length
188185
);
189186
const initialProjectSeed = useMemo(
190187
() => dedupeProjects([...initialTrendingProjects, ...initialNewestProjects]),
@@ -233,7 +230,7 @@ export const Home: React.FC<{
233230

234231
const shouldFetchFallbackNewest = !hasHomeSSRData && !initialNewestProjects.length && initialProjectSeed.length === 0;
235232
const shouldRefreshNewestProjects = !initialNewestProjects.length && initialProjectSeed.length > 0;
236-
const shouldFetchFallbackStats = !ssrData?.stats;
233+
const shouldFetchFallbackStats = !hasHomeSSRData || !ssrData?.stats;
237234
let isCancelled = false;
238235
const scheduledTasks: Array<() => void> = [];
239236

frontend/src/pages/[...all].astro

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ if (classification) {
162162
const newestProjects = newest?.content || [];
163163
164164
initialData = {
165+
homeDataReady: true,
165166
homeProjects: unique || [],
166167
homeMarqueeProjects: marqueeProjects,
167168
homeTrendingProjects: unique || [],
@@ -176,7 +177,7 @@ if (classification) {
176177
177178
ssrSuccessfullyCompleted = true;
178179
} catch {
179-
initialData = { homeProjects: [], stats: { totalProjects: 0, totalDownloads: 0, totalUsers: 0 } };
180+
initialData = { homeDataReady: false, homeProjects: [], stats: { totalProjects: 0, totalDownloads: 0, totalUsers: 0 } };
180181
}
181182
} else if (isStaticBrowseRequest) {
182183
try {

0 commit comments

Comments
 (0)