Merge pull request #631 from CodeForAfrica/charterafrica/fix-links

Fix go to repository broken link
CodeForAfrica · Oct 6, 2023 · 73018e2 · 73018e2
2 parents aa24ccd + 57626a2
commit 73018e2
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 39 deletions.
diff --git a/apps/charterafrica/contrib/dokku/Dockerfile b/apps/charterafrica/contrib/dokku/Dockerfile
@@ -1 +1 @@
-FROM codeforafrica/charterafrica-ui:0.1.10
+FROM codeforafrica/charterafrica-ui:0.1.11
diff --git a/apps/charterafrica/package.json b/apps/charterafrica/package.json
@@ -1,6 +1,6 @@
 {
   "name": "charterafrica",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "private": true,
   "author": "Code for Africa <[email protected]>",
   "description": "This is the official code for https://charter.africa site",

diff --git a/apps/charterafrica/src/components/Tool/Tool.js b/apps/charterafrica/src/components/Tool/Tool.js
@@ -18,7 +18,6 @@ const Tool = React.forwardRef(function Tool(props, ref) {
   const {
     image,
     name,
-    link,
     organisation,
     theme,
     operatingCountries,
@@ -34,6 +33,7 @@ const Tool = React.forwardRef(function Tool(props, ref) {
     partners,
     tools,
     toolsTitle,
+    externalLink,
   } = props;
   return (
     <Box bgcolor="common.white" ref={ref}>
@@ -62,18 +62,20 @@ const Tool = React.forwardRef(function Tool(props, ref) {
                 <RichTypography color="neutral.dark" variant="h2SemiBold">
                   {name}
                 </RichTypography>
-                <Link href={link.href}>
-                  <SvgIcon
-                    inheritViewBox
-                    component={ExternalLink}
-                    sx={{
-                      color: "text.primary",
-                      fill: "none",
-                      height: 32,
-                      width: 32,
-                    }}
-                  />
-                </Link>
+                {externalLink?.href ? (
+                  <Link href={externalLink.href}>
+                    <SvgIcon
+                      inheritViewBox
+                      component={ExternalLink}
+                      sx={{
+                        color: "text.primary",
+                        fill: "none",
+                        height: 32,
+                        width: 32,
+                      }}
+                    />
+                  </Link>
+                ) : null}
               </Box>
             </Grid>
             <Grid item>

diff --git a/apps/charterafrica/src/components/Tool/Tool.snap.js b/apps/charterafrica/src/components/Tool/Tool.snap.js
@@ -34,18 +34,6 @@ exports[`<Tool /> renders unchanged 1`] = `
               >
                 Tool Name
               </div>
-              <a
-                class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways active css-4xpak5-MuiTypography-root-MuiLink-root"
-                href="https://git.com"
-                rel="noreferrer noopener"
-                target="_blank"
-              >
-                <div
-                  aria-hidden="true"
-                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mg30as-MuiSvgIcon-root"
-                  focusable="false"
-                />
-              </a>
             </div>
           </div>
           <div

diff --git a/apps/charterafrica/src/lib/data/common/processPageTools.js b/apps/charterafrica/src/lib/data/common/processPageTools.js
@@ -33,15 +33,6 @@ const queryBuilder = (query) => {
   return where;
 };
 
-const getRepoLink = (tool) => {
-  switch (tool.source && tool.externalId) {
-    case "github":
-      return `https://github.com/${tool.externalId}`;
-    default:
-      return "";
-  }
-};
-
 async function processPageSingleTool(page, api, context) {
   const { params, locale } = context;
   const { slug: collection } = page;
@@ -79,11 +70,11 @@ async function processPageSingleTool(page, api, context) {
         ...tool,
         slug: "tool",
         contribute: {
-          href: getRepoLink(tool),
+          href: tool.repoLink,
           label: filterLabels.contribute,
         },
         goToRepo: {
-          href: getRepoLink(tool),
+          href: tool.repoLink,
           label: filterLabels.goToRepo,
         },
         topicLabel: filterLabels.theme,
@@ -113,6 +104,9 @@ async function processPageSingleTool(page, api, context) {
         commitText: filterLabels.lastCommit,
         forksText: filterLabels.forks,
         starsText: filterLabels.stars,
+        externalLink: {
+          href: tool.docLink ?? null,
+        },
       },
     ],
   };

diff --git a/apps/charterafrica/src/payload/utils/nestCollectionUnderPage.js b/apps/charterafrica/src/payload/utils/nestCollectionUnderPage.js
@@ -16,7 +16,7 @@ function nestCollectionUnderPage(pageSlug) {
     } catch (error) {
       // TODO(kilemensi): Add Sentry to payload & report errors
     }
-    return { ...doc, link: { href } };
+    return { ...doc, docLink: doc.link ?? null, link: { href } };
   };
 }