Added noSsr option to server renderer - and applied to task pages

digirati-co-uk · Nov 26, 2024 · 1bf3ce0 · 1bf3ce0
1 parent 0b3c4ac
commit 1bf3ce0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/services/madoc-ts/src/frontend/shared/plugins/external/server-renderer-for.ts b/services/madoc-ts/src/frontend/shared/plugins/external/server-renderer-for.ts
@@ -10,8 +10,10 @@ export function serverRendererFor<TVariables = any, Data = any>(
     getData?: (key: string, vars: TVariables, api: ApiClient, pathname: string) => Promise<Data>;
     hooks?: AdditionalHooks[];
     theme?: { name: string } & Partial<MadocTheme>;
+    noSsr?: boolean;
   }
 ) {
+  (component as any).noSsr = config.noSsr;
   (component as any).getKey = config.getKey;
   (component as any).getData = config.getData;
   (component as any).hooks = config.hooks;

diff --git a/services/madoc-ts/src/frontend/shared/utility/create-server-renderer.tsx b/services/madoc-ts/src/frontend/shared/utility/create-server-renderer.tsx
@@ -138,7 +138,7 @@ export function createServerRenderer(
         routeContext.project = match.params.slug ? match.params.slug : undefined;
       }
 
-      if (route.component && route.component.getKey && route.component.getData) {
+      if (route.component && route.component.getKey && route.component.getData && route.component.noSsr !== true) {
         requests.push(
           prefetchCache.prefetchQuery(
             route.component.getKey(match.params, queryString, path),
@@ -362,7 +362,7 @@ export function createServerRenderer(
         : `
       <script>document.body.classList.add('dev-loading');</script>
       <style>
-      body > * { 
+      body > * {
         transition: opacity 200ms;
       }
       .dev-loading > * {

diff --git a/services/madoc-ts/src/frontend/shared/utility/create-universal-component.ts b/services/madoc-ts/src/frontend/shared/utility/create-universal-component.ts
@@ -17,6 +17,7 @@ export function createUniversalComponent<
   Component: React.FC,
   options: {
     getKey?: GetKey;
+    noSsr?: boolean;
     getData?: GetData;
     hooks?: AdditionalHooks[];
   }
@@ -26,5 +27,6 @@ export function createUniversalComponent<
   ReturnComponent.getKey = options.getKey;
   ReturnComponent.getData = options.getData;
   ReturnComponent.hooks = options.hooks;
+  ReturnComponent.noSsr = options.noSsr;
   return ReturnComponent;
 }
diff --git a/services/madoc-ts/src/frontend/site/pages/all-tasks.tsx b/services/madoc-ts/src/frontend/site/pages/all-tasks.tsx
@@ -54,7 +54,12 @@ export const AllTasks: UniversalComponent<AllTasksType> = createUniversalCompone
     const user = useUser();
     const isAdmin = user && user.scope && user.scope.indexOf('site.admin') !== -1;
     const isReviewer = isAdmin || (user && user.scope && user.scope.indexOf('tasks.create') !== -1);
-    const { data: pages, fetchMore, canFetchMore, isFetchingMore } = useInfiniteData(AllTasks, undefined, {
+    const {
+      data: pages,
+      fetchMore,
+      canFetchMore,
+      isFetchingMore,
+    } = useInfiniteData(AllTasks, undefined, {
       getFetchMore: lastPage => {
         if (lastPage.pagination.totalPages === 0 || lastPage.pagination.totalPages === lastPage.pagination.page) {
           return undefined;
@@ -172,6 +177,7 @@ export const AllTasks: UniversalComponent<AllTasksType> = createUniversalCompone
     );
   },
   {
+    noSsr: true,
     getKey: (params, { preview, ...query }) => {
       return ['all-tasks', { query, projectSlug: params.slug }];
     },

diff --git a/services/madoc-ts/src/frontend/site/pages/tasks/review-listing/review-listing-page.tsx b/services/madoc-ts/src/frontend/site/pages/tasks/review-listing/review-listing-page.tsx
@@ -411,6 +411,7 @@ function SingleReviewTableRow({
 }
 
 serverRendererFor(ReviewListingPage, {
+  noSsr: true,
   getKey: (params, { preview, ...query }) => {
     return ['all-review-tasks', { query, projectSlug: params.slug, page: query.page || 1 }];
   },