Merge pull request #1817 from ResearchHub/hotfix-load

Fix incorrect broken references/loading in author pages
ResearchHub · Aug 21, 2024 · 6e56988 · 6e56988
2 parents 7eed53b + cdb8250
commit 6e56988
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 14 deletions.
diff --git a/components/Author/lib/api.ts b/components/Author/lib/api.ts
@@ -109,11 +109,36 @@ export const removePublicationFromAuthorProfile = ({
     .then(Helpers.parseJSON);
 };
 
-export const fetchProfileData = async ({ authorId }: { authorId: string }) => {
+export const fetchProfileData = async ({
+  authorId,
+  fetchOverview = false,
+  fetchAchievements = false,
+  fetchSummary = false,
+}: {
+  authorId: string,
+  fetchOverview?: boolean,
+  fetchAchievements?: boolean,
+  fetchSummary?: boolean,
+}) => {
+  const promises:Array<Promise<any>> = [];
+
   const profilePromise = fetchAuthorProfile({ authorId });
-  // const overviewPromise = fetchAuthorOverview({ authorId });
-  const summaryPromise = fetchAuthorSummary({ authorId });
-  const achievementPromise = fetchAuthorAchievements({ authorId });
+  promises.push(profilePromise);
+
+  if (fetchOverview) {
+    const overviewPromise = fetchAuthorOverview({ authorId });
+    promises.push(overviewPromise);
+  }
+
+  if (fetchSummary) {
+    const summaryPromise = fetchAuthorSummary({ authorId });
+    promises.push(summaryPromise);
+  }
+
+  if (fetchAchievements) {
+    const achievementPromise = fetchAuthorAchievements({ authorId });
+    promises.push(achievementPromise);
+  }
 
-  return Promise.all([profilePromise, /*overviewPromise, */ summaryPromise, achievementPromise]);
+  return Promise.all(promises);
 }
diff --git a/pages/author/[authorId]/bounties.tsx b/pages/author/[authorId]/bounties.tsx
@@ -111,12 +111,15 @@ const styles = StyleSheet.create({
 
 
 export const getStaticProps: GetStaticProps = async (ctx) => {
-  const [profile, overview, summary, achievements] = await fetchProfileData({ authorId: ctx!.params!.authorId as string });
+  const [profile, summary, achievements] = await fetchProfileData({
+    authorId: ctx!.params!.authorId as string,
+    fetchSummary: true,
+    fetchAchievements: true,
+  });
 
   return {
     props: {
       profile,
-      overview,
       summary,
       achievements,
     },

diff --git a/pages/author/[authorId]/comments.tsx b/pages/author/[authorId]/comments.tsx
@@ -110,12 +110,15 @@ const styles = StyleSheet.create({
 });
 
 export const getStaticProps: GetStaticProps = async (ctx) => {
-  const [profile, overview, summary, achievements] = await fetchProfileData({ authorId: ctx!.params!.authorId as string });
+  const [profile, summary, achievements] = await fetchProfileData({
+    authorId: ctx!.params!.authorId as string,
+    fetchSummary: true,
+    fetchAchievements: true,
+  });
 
   return {
     props: {
       profile,
-      overview,
       summary,
       achievements,
     },

diff --git a/pages/author/[authorId]/index.tsx b/pages/author/[authorId]/index.tsx
@@ -224,7 +224,12 @@ const styles = StyleSheet.create({
 });
 
 export const getStaticProps: GetStaticProps = async (ctx) => {
-  const [profile, /*overview,*/ summary, achievements] = await fetchProfileData({ authorId: ctx!.params!.authorId as string });
+  const [profile, summary, achievements] = await fetchProfileData({
+    authorId: ctx!.params!.authorId as string,
+    fetchOverview: false,
+    fetchSummary: true,
+    fetchAchievements: true,
+  });
 
   return {
     props: {

diff --git a/pages/author/[authorId]/publications.tsx b/pages/author/[authorId]/publications.tsx
@@ -129,15 +129,19 @@ const styles = StyleSheet.create({
 });
 
 export const getStaticProps: GetStaticProps = async (ctx) => {
-  const [profile, overview, summary, achievements] = await fetchProfileData({ authorId: ctx!.params!.authorId as string });
+  const [profile, summary, achievements] = await fetchProfileData({
+    authorId: ctx!.params!.authorId as string,
+    fetchSummary: true,
+    fetchAchievements: true,
+  });
   const publicationsResponse = await fetchAuthorPublications({ authorId: ctx!.params!.authorId as string })
 
   return {
     props: {
       profile,
-      publicationsResponse,
       summary,
       achievements,
+      publicationsResponse,
     },
     revalidate: 86000,
   };

diff --git a/pages/author/[authorId]/reviews.tsx b/pages/author/[authorId]/reviews.tsx
@@ -113,12 +113,15 @@ const styles = StyleSheet.create({
 });
 
 export const getStaticProps: GetStaticProps = async (ctx) => {
-  const [profile, overview, summary, achievements] = await fetchProfileData({ authorId: ctx!.params!.authorId as string });
+  const [profile, summary, achievements] = await fetchProfileData({
+    authorId: ctx!.params!.authorId as string,
+    fetchSummary: true,
+    fetchAchievements: true,
+  });
 
   return {
     props: {
       profile,
-      overview,
       summary,
       achievements,
     },