Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display all Tools #726

Merged
merged 11 commits into from
Jul 3, 2024
Merged

Display all Tools #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e3e4964
Display all tools
koechkevin Jun 20, 2024
581dd85
Merge branch 'main' into feature/display-all-tools
koechkevin Jun 20, 2024
ff2d8f4
Do not process missing tool name
koechkevin Jun 21, 2024
f3e05e3
Merge branch 'main' into feature/display-all-tools
koechkevin Jun 21, 2024
0d0e40b
Updated last active
koechkevin Jun 21, 2024
2f160ca
Merge branch 'main' into feature/display-all-tools
koechkevin Jun 21, 2024
4861e3c
Merge branch 'main' into feature/display-all-tools
koechkevin Jun 22, 2024
4c89f5a
Merge branch 'main' into feature/display-all-tools
koechkevin Jun 24, 2024
5e09a77
Merge branch 'main' into feature/display-all-tools
koechkevin Jun 26, 2024
f96f161
Ensure key fields exist
koechkevin Jun 27, 2024
3b3014f
Merge branch 'main' into feature/display-all-tools
koechkevin Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/charterafrica/src/components/Tool/DescriptionAndShare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import ShareThisPage from "@/charterafrica/components/ShareThisPage";
const DescriptionAndShare = React.forwardRef(
function DescriptionAndShare(props, ref) {
const { sx, description, lastActive, activeText } = props;
const lastActiveText = lastActive ? `${activeText} ${lastActive}` : null;
return (
<Box sx={sx} ref={ref}>
<RichTypography
Expand All @@ -28,7 +29,7 @@ const DescriptionAndShare = React.forwardRef(
}}
variant="captionCap"
>
{activeText} {lastActive}
{lastActiveText}
</RichTypography>
<Box
display="flex"
Expand Down
7 changes: 5 additions & 2 deletions apps/charterafrica/src/components/Tool/Metrics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@ import ViewsIcon from "@/charterafrica/assets/icons/Type=views, Size=24, Color=C
const Metrics = React.forwardRef(function Metrics(props, ref) {
const {
sx,
stars = "0",
stars,
starsText,
commitText,
forksText,
contributorsText,
lastCommit,
forks = "0",
forks,
contributors,
} = props;
if (!contributors?.length && !stars && !forks && !lastCommit.committedDate) {
return null;
}
return (
<Box display="flex" sx={sx} ref={ref} flexWrap="wrap" alignItems="center">
<Box display="flex" alignItems="center" sx={{ mb: 2, mr: 2 }}>
Expand Down
8 changes: 4 additions & 4 deletions apps/charterafrica/src/components/Tool/OrgThemeAndOperatingCountries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const OrgThemeAndOperatingCountries = React.forwardRef(
function OrgThemeAndOperatingCountries(props, ref) {
const { sx, organisation, theme, operatingCountries } = props;
const countries = operatingCountries?.join(", ");
if (!organisation) {
if (!organisation && !theme) {
return null;
}
return (
Expand All @@ -25,8 +25,8 @@ const OrgThemeAndOperatingCountries = React.forwardRef(
>
<Figure
ImageProps={{
alt: organisation.name,
src: organisation.avatarUrl,
alt: organisation?.name,
src: organisation?.avatarUrl,
}}
sx={{
height: 50,
Expand All @@ -51,7 +51,7 @@ const OrgThemeAndOperatingCountries = React.forwardRef(
sx={{ textDecoration: "none", fontWeight: 400 }}
variant="h4"
>
{organisation.name}
{organisation?.name}
</Link>
</Box>
<Box
Expand Down
64 changes: 34 additions & 30 deletions apps/charterafrica/src/components/Tool/Tool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,44 +121,48 @@ const Tool = React.forwardRef(function Tool(props, ref) {
ml: "auto",
}}
>
<Button
component={goToRepo?.href ? Link : undefined}
href={goToRepo?.href}
variant="contained"
target="_blank"
sx={{
mt: 1.25,
width: "100%",
height: 50,
}}
>
<SvgIcon
component={GithubIcon}
{goToRepo?.href ? (
<Button
component={Link}
href={goToRepo?.href}
variant="contained"
target="_blank"
sx={{
color: "text.secondary",
display: "inline-flex",
fill: "none",
width: 16,
height: 16,
mr: 1,
mt: 1.25,
width: "100%",
height: 50,
}}
/>
{goToRepo?.label}
</Button>
>
<SvgIcon
component={GithubIcon}
sx={{
color: "text.secondary",
display: "inline-flex",
fill: "none",
width: 16,
height: 16,
mr: 1,
}}
/>
{goToRepo?.label}
</Button>
) : null}
</Box>
<TechSkills
list={techSkills}
title="Skills Needed"
sx={{ mt: 3.75 }}
/>
<Box sx={{ mt: 3.75 }}>
<RichTypography variant="p3SemiBold" color="neutral.dark">
{collectionText}
</RichTypography>
<RichTypography sx={{ mt: 1 }} variant="p3">
{classification}
</RichTypography>
</Box>
{classification ? (
<Box sx={{ mt: 3.75 }}>
<RichTypography variant="p3SemiBold" color="neutral.dark">
{collectionText}
</RichTypography>
<RichTypography sx={{ mt: 1 }} variant="p3">
{classification}
</RichTypography>
</Box>
) : null}
<Contributors
sx={{ mt: 3.75 }}
list={contributors}
Expand Down
38 changes: 3 additions & 35 deletions apps/charterafrica/src/components/Tool/Tool.snap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,7 @@ exports[`<Tool /> renders unchanged 1`] = `
/>
<div
class="MuiBox-root css-1isemmb"
>
<div
class="MuiTypography-root MuiTypography-p1 css-1tpbw3s-MuiTypography-root"
>
0
</div>
</div>
/>
</div>
<div
class="MuiBox-root css-33u6ly"
Expand All @@ -106,13 +100,7 @@ exports[`<Tool /> renders unchanged 1`] = `
/>
<div
class="MuiBox-root css-1isemmb"
>
<div
class="MuiTypography-root MuiTypography-p1 css-1tpbw3s-MuiTypography-root"
>
0
</div>
</div>
/>
</div>
</div>
<div
Expand All @@ -126,8 +114,7 @@ exports[`<Tool /> renders unchanged 1`] = `
<div
class="MuiTypography-root MuiTypography-captionCap css-hr3rav-MuiTypography-root"
>

6 Months ago
undefined 6 Months ago
</div>
<div
class="MuiBox-root css-oqyb22"
Expand Down Expand Up @@ -190,25 +177,6 @@ exports[`<Tool /> renders unchanged 1`] = `
>
<div
class="MuiBox-root css-11uk14q"
>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-qy1l2s-MuiButtonBase-root-MuiButton-root"
href=""
tabindex="0"
target="_blank"
type="button"
>
<div
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-1bnrqzj-MuiSvgIcon-root"
focusable="false"
viewbox="0 0 24 24"
/>
Go to Repo
</button>
</div>
<div
class="MuiBox-root css-46b038"
/>
<div
class="MuiBox-root css-46b038"
Expand Down
35 changes: 31 additions & 4 deletions apps/charterafrica/src/lib/ecosystem/airtable/processData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ function getSourceType(link) {
return "github";
}

function checkFields(obj) {
const emptyFields = Object.keys(obj)
.map((field) => (!obj[field] ? field : null))
.filter(Boolean);
if (emptyFields.length > 0) {
return `The following fields are missing ${emptyFields.join(", ")}`;
}
return null;
}

function getRepoLink(source = "github", slug = "") {
if (source === "github" && slug) {
return `https://github.com/${slug}`;
Expand Down Expand Up @@ -70,8 +80,9 @@ export function processTool(item, config, { partnersData }) {
} = config;
const data = { ...item.fields, id: item.id };
const externalId = getValue(data, toolTableColumns.slug)?.trim();
if (!externalId?.length) {
const message = `Missing externalId for Tool ${data.id}. Skipping`;
const name = getValue(data, toolTableColumns.name)?.trim();
if (!name) {
const message = `Missing name for Tool ${data.id}. Skipping`;
Sentry.captureMessage(message);
return null;
}
Expand Down Expand Up @@ -115,12 +126,28 @@ export function processTool(item, config, { partnersData }) {
data,
);
const source = getSourceType(getValue(data, toolTableColumns.source.url));
const avatarUrl =
getValue(data, toolTableColumns.avatarUrl)?.[0]?.url ?? null;
const fieldsToCheck = {
avatarUrl,
name,
description,
operatingCountries,
theme,
};
const missingFields = checkFields(fieldsToCheck);
if (missingFields) {
const message = `Tool ${name}: ${missingFields}`;
Sentry.captureMessage(message);
return null;
}

return {
airtableId: data.id,
avatarUrl: getValue(data, toolTableColumns.avatarUrl)?.[0]?.url ?? null,
avatarUrl,
externalId,
repoLink: getValue(data, toolTableColumns.source.url),
name: getValue(data, toolTableColumns.name),
name,
link: getValue(data, toolTableColumns.url),
operatingCountries,
contributors: getValue(data, toolTableColumns.contributors),
Expand Down
3 changes: 3 additions & 0 deletions apps/charterafrica/src/lib/ecosystem/github/processData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ function fetchUserQuery(username) {
}

export async function fetchTool({ externalId }) {
if (!externalId) {
return null;
}
let [repositoryOwner, repositoryName] = externalId
.replace(/^https?:\/\/github\.com\//, "")
.replace(/\/$/, "")
Expand Down
Loading