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.

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

Core 5002 add new member table #1235

Merged
merged 2 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
150 changes: 150 additions & 0 deletions components/membership-table/membershipTable.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
import React, { useState } from 'react'
import { Button, Table, TextField } from '@oacore/design/lib/elements'

import styles from './styles.module.scss'
import imagePlaceholder from '../../public/images/supporters/imagePlaceholder.svg'
import { Section } from '../../design-v2/components'

const MembershipTable = ({ title, members, excludedIds, customSort }) => {
const [searchValue, setSearchValue] = useState('')
const [displayedItems, setDisplayedItems] = useState(30)

const handleSearch = (event) => {
const { value } = event.target
setSearchValue(value)
}

const filteredMembers = members.filter((member) =>
member.organisation_name.toLowerCase().includes(searchValue.toLowerCase())
)

const sortedMembers = customSort
? [...filteredMembers].sort(customSort)
: [...filteredMembers].sort((a, b) =>
a.organisation_name.localeCompare(b.organisation_name)
)

const renderBillingType = (member) => {
if (
excludedIds.includes(member.repo_id) ||
(Array.isArray(member.repo_id) &&
member.repo_id.some((id) => excludedIds.includes(id)))
) {
return (
<a
target="_blank"
href="https://sparcopen.org/our-work/us-repository-network/discovery-pilot-project/"
rel="noreferrer"
>
USRN Partner
</a>
)
}

return (
<a target="_blank" href="https://core.ac.uk/membership" rel="noreferrer">
{member.billing_type} Member
</a>
)
}

const handleRedirect = (providerId) => {
const repoId = Array.isArray(providerId) ? providerId[0] : providerId
if (typeof window !== 'undefined')
window.location.href = `https://core.ac.uk/data-providers/${repoId}`
}

const getLink = (repoId) => {
if (Array.isArray(repoId)) {
// eslint-disable-next-line no-param-reassign
repoId = repoId.find((id) =>
fetch(`https://api.core.ac.uk/data-providers/${id}/logo`).then(() => id)
)
}

return (
<img
className={styles.repositoryLogo}
src={`https://api.core.ac.uk/data-providers/${repoId}/logo`}
onError={(e) => {
e.target.src = imagePlaceholder
}}
alt="logo"
/>
)
}

return (
<Section className={styles.supporters}>
<h3>{title}</h3>
<form>
<TextField
className={styles.search}
value={searchValue}
onChange={handleSearch}
id="search"
type="search"
name="institution"
label="Find Organisation"
placeholder="e.g Open University"
/>
</form>
<Table>
<Table.Head>
<Table.Row>
<Table.HeadCell>Organisation name</Table.HeadCell>
<Table.HeadCell>Country</Table.HeadCell>
<Table.HeadCell>Membership status</Table.HeadCell>
</Table.Row>
</Table.Head>
<Table.Body>
{sortedMembers?.slice(0, displayedItems).map((member) => (
<Table.Row className={styles.tableRow} key={member.organisation_id}>
<div className={styles.organisationWrapper}>
<div className={styles.logoWrapper}>
{getLink(member.repo_id)}
</div>
<Table.Cell onClick={() => handleRedirect(member.repo_id)}>
{member.organisation_name}
</Table.Cell>
</div>
<Table.Cell>{member.country}</Table.Cell>
<Table.Cell className={styles.memberColumn}>
{renderBillingType(member)}
</Table.Cell>
</Table.Row>
))}
{filteredMembers?.length === 0 && (
<Table.Row>
<Table.Cell colSpan={2}>
No results. Please update your query
</Table.Cell>
</Table.Row>
)}
</Table.Body>
<Table.Footer>
<Table.Row className={styles.paginationRow}>
<Table.Cell colSpan={3}>
<p className={styles.paginationText}>
Showing 1 - {Math.min(displayedItems, filteredMembers?.length)}
</p>
<Button
onClick={() =>
setDisplayedItems((prevCount) =>
Math.min(prevCount + 10, filteredMembers?.length)
)
}
variant="outlined"
disabled={displayedItems >= filteredMembers?.length}
>
Show More
</Button>
</Table.Cell>
</Table.Row>
</Table.Footer>
</Table>
</Section>
)
}

export default MembershipTable
86 changes: 86 additions & 0 deletions components/membership-table/styles.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
@import 'design-v2/variables';
$grid-responsive-for-sections: repeat(auto-fit, minmax(300px, 1fr));
$grid-responsive-for-items: repeat(auto-fit, minmax(500px, 1fr));

.search {
margin: 1rem 0;
}

.supporters {
.table-row {
cursor: pointer;
.organisation-wrapper {
display: flex;
align-items: center;
padding-left: 8px;
.logo-wrapper {
width: 56px;
height: 56px;
border-radius: 50%;
border: 2px solid #b75400;
padding: 4px;
margin: 5px 0;
.repository-logo {
width: 100%;
height: 100%;
border-radius: 50%;
box-shadow: inset 0px 0px 2px rgba(0, 0, 0, 0.1),
inset 0px 1px 2px rgba(0, 0, 0, 0.05);
}
@media (max-width: $breakpoint-sm) {
width: 40px;
height: 40px;
}
}
td {
@media (max-width: $breakpoint-sm) {
padding: 8px;
}
}
}
.member-column {
color: var(--primary);
text-transform: capitalize;
}
td {
@media (max-width: $breakpoint-sm) {
padding: 8px;
}
}
&:hover {
background: #eee;
transition: 0.5s all ease-in-out;
}
}
}

.pagination {
display: flex;
align-items: center;
justify-content: center;
gap: 1rem;
p {
margin-bottom: 0;
}
}

.row {
border-bottom: none;
}

.pagination-row {
text-align: right;
border-bottom: none;
.pagination-text {
display: inline-block;
margin-right: 32px;
margin-top: 32px;
}
}

.icon {
color: var(--gray-700);
}
.icon-disabled {
color: var(--gray-300);
}
19 changes: 16 additions & 3 deletions pages/membership/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@ const getSections = async ({ ref } = {}) => {
return page
}

const MembershipPage = ({ members, page }) => (
const MembershipPage = ({ members, page, allMembers }) => (
<Page
title={page.header.header.title}
description={page.header.header.description}
>
<MembershipPageTemplate members={members} data={page} />
<MembershipPageTemplate
members={members}
allMembers={allMembers}
data={page}
/>
</Page>
)

Expand All @@ -48,21 +52,30 @@ export async function getStaticProps({ previewData }) {
(country) =>
country.code.toLowerCase() === item.country_code.toLowerCase()
)?.name
} else item.country = ''
}
if (!item.country) item.country = ''

return item
})

const filteredMembers = members.filter(
(member) =>
member.billing_type !== 'starting' &&
member.organisation_name &&
!member.organisation_name.toLowerCase().includes('test')
)

const allMembers = members.filter(
(member) =>
member.organisation_name &&
!member.organisation_name.toLowerCase().includes('test')
)

return {
props: {
page,
members: filteredMembers,
allMembers,
},
}
}
Expand Down
Loading
Loading