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

updated project page filters to show tools #6549

Merged
merged 3 commits into from
Apr 12, 2024
Merged

updated project page filters to show tools #6549

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e46605b
updated project page filters to show tools
partapparam Mar 30, 2024
d8bd1a3
updated filters on projects page to show tools
partapparam Apr 2, 2024
699790e
removed comments and cleaned up code for update tool filter
partapparam Apr 2, 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
29 changes: 19 additions & 10 deletions assets/js/current-projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ document.addEventListener("DOMContentLoaded",function(){
if (window.location.pathname === '/projects-check/') {
filterTitle = filterName;
} else {
filterTitle = 'languages / technologies'
filterTitle = 'languages / technologies / tools'
}
filterValue.sort((a,b)=> {
a = a.toLowerCase()
Expand All @@ -40,9 +40,10 @@ document.addEventListener("DOMContentLoaded",function(){
} else {
filterTitle = filterName;
}

// for issue #4648, needed to add languages inside the technologies filter-item group, might be able to optimize for future iterations
if (filterName === 'languages') {

// This ensures that the /projects-check page does not change
if ((filterName === 'languages' || filterName === 'tools') && window.location.pathname === '/projects/') {
// remove the view all button
document.querySelector(`#technologies`).lastElementChild.remove()
// insert data inside at the end of the category
Expand Down Expand Up @@ -255,7 +256,8 @@ function createFilter(sortedProjectData){
// ^ See issue #1997 for more info on why this is commented out
'programs': [...new Set(sortedProjectData.map(item => item.project.programAreas ? item.project.programAreas.map(programArea => programArea) : '').flat() ) ].filter(v=>v!='').sort(),
'technologies': [...new Set(sortedProjectData.map(item => (item.project.technologies?.length > 0) ? [item.project.technologies].flat() : '').flat() ) ].filter(v=>v!='').sort(),
'languages': [...new Set(sortedProjectData.map(item => (item.project.languages?.length > 0) ? [item.project.languages].flat() : '').flat() ) ].filter(v=>v!='').sort(),
'languages': [...new Set(sortedProjectData.map(item => (item.project.languages?.length > 0) ? [item.project.languages].flat() : '').flat())].filter(v => v != '').sort(),
'tools': [...new Set(sortedProjectData.map(item => (item.project.tools?.length > 0) ? [item.project.tools].flat() : '').flat() ) ].filter(v=>v!='').sort(),
'status': [... new Set(sortedProjectData.map(item => item.project.status))].sort()
}
}
Expand Down Expand Up @@ -459,8 +461,9 @@ function updateCategoryCounter(filterParams){
let container = []
for(const [key,value] of Object.entries(filterParams)){
// for issue #4648, added this modifiedKey so that the counter for languages will be tied to technologies
let modifiedKey = key
if (key === 'languages') {
let modifiedKey = key
// for issue #6196 - added tools to the counter
if (key === 'languages' || key === 'tools') {
modifiedKey = 'technologies'
}
if (key !== 'Search') {
Expand Down Expand Up @@ -490,8 +493,8 @@ function updateProjectCardDisplayState(filterParams){
if(key !=='Search'){
projectCardObj[key] = projectCard.dataset[key].split(",");
}
else{
const searchAreas=['technologies','description','partner','programs','title','languages'];
else {
const searchAreas=['technologies','description','partner','programs','title','languages', 'tools'];
for(const area of searchAreas){
projectCardObj[area]=projectCard.dataset[area].split(",");
}
Expand Down Expand Up @@ -689,12 +692,18 @@ function clearAllEventHandler(){
/**
* Takes a single project object and returns the html string representing the project card
*/
function projectCardComponent(project){
function projectCardComponent(project) {
const projectLanguages = project.languages ? [... new Set(project.languages.map(lang => lang))] : ""
const projectTechnologies = project.technologies ? [... new Set(project.technologies.map(t => t))] : ""
const projectTools = project.tools ? [... new Set(project.tools.map(t => t))] : ""
// the data-technologies attr will be used by UpdateFilterFrequency
// to generate Filter's Object
const dataTechnologiesArr = [...projectLanguages, ...projectTechnologies, ...projectTools]
return `
<li class="project-card" id="${ project.identification }"
data-status="${project.status}"
data-looking="${project.looking ? [... new Set(project.looking.map(looking => looking.category)) ] : ''}"
data-technologies="${(project.technologies && project.languages) ? [... new Set(project.technologies.map(tech => tech)), project.languages.map(lang => lang)] : project.languages.map(lang => lang) }"
data-technologies="${[...dataTechnologiesArr]}"
data-languages="${project.languages ? [... new Set(project.languages.map(lang => lang))] : '' }"
data-tools="${project.tools ? [... new Set(project.tools.map(tool => tool))] : '' }"
data-location="${project.location? project.location.map(city => city) : '' }"
Expand Down