Skip to content

Facet search with curie #188

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

Draft
akhuoa wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Facet search with curie #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e4d7a7
Facet search with curie
akhuoa Oct 2, 2025
e698001
Merge branch 'ABI-Software:main' into feature/filter-curie
akhuoa Oct 5, 2025
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
13 changes: 10 additions & 3 deletions src/algolia/algolia.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,14 @@ export class AlgoliaClient {
return o.curie
}
}).filter(Boolean)
: []
: [],
labels: h.anatomy
? h.anatomy.organ.map(o => {
if (filteredOrganNames.includes(o.name.toLowerCase())) {
return o.name
}
}).filter(Boolean)
: [],
}
return data
})
Expand All @@ -299,7 +306,7 @@ export class AlgoliaClient {
const anatomyOrganSubcategoryNames = anatomyOrganSubcategoryName ? Object.keys(anatomyOrganSubcategoryName) : []
const anatomyOrganSubsubcategoryNames = anatomyOrganSubsubcategoryName ? Object.keys(anatomyOrganSubsubcategoryName) : []
const filteredOrganNames = []

anatomyOrganCategoryNames.forEach((_categoryName) => {
const categoryName = _categoryName.toLowerCase();
anatomyOrganNames.forEach((_organName) => {
Expand All @@ -313,7 +320,7 @@ export class AlgoliaClient {
} else {
return anatomyOrganSubsubcategoryNames.find((name) => {
const fullsubsubname = `${subcategoryName}.${organName}`
return (fullsubsubname === name)
return (fullsubsubname === name)
})
}
});
Expand Down
17 changes: 15 additions & 2 deletions src/algolia/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const shownFilters = {
/* Returns filter for searching algolia. All facets of the same category are joined with OR,
* and each of those results is then joined with an AND.
* i.e. (color:blue OR color:red) AND (shape:circle OR shape:red) */
export function getFilters(selectedFacetArray = undefined) {
export function getFilters(selectedFacetArray = undefined, anatomyInDatasets = []) {
// return all datasets if no filter
if (selectedFacetArray === undefined) {
return 'NOT item.published.status:embargo'
Expand Down Expand Up @@ -101,7 +101,20 @@ export function getFilters(selectedFacetArray = undefined) {
facet.facetSubPropPath : facetFilterPath ?
facetFilterPath : facetPropPath
if (facet.AND) {
andFilters += `AND "${facetPropPathToUse}":"${facet.label}"`;
let term = '';
if (facetPropPathToUse === "anatomy.organ.name" && anatomyInDatasets.length > 0) {
const lowerLabel = facet.label.toLowerCase();
const dataset = anatomyInDatasets.find(item => item.labels.map(label => label.toLowerCase()).includes(lowerLabel));
if (dataset) {
const index = dataset.labels.map(label => label.toLowerCase()).indexOf(lowerLabel);
term = dataset.terms[index];
}
}
if (term) {
andFilters += `AND "anatomy.organ.curie":"${term}"`;
} else {
andFilters += `AND "${facetPropPathToUse}":"${facet.label}"`;
}
} else {
orFilters += `"${facetPropPathToUse}":"${facet.label}" OR `;
}
Expand Down
6 changes: 4 additions & 2 deletions src/components/DatasetExplorer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ export default {
display: 'flex',
},
cascaderIsReady: false,
anatomyInDatasets: [],
}
},
computed: {
Expand Down Expand Up @@ -304,14 +305,15 @@ export default {
// Algolia search
this.loadingCards = true
this.algoliaClient
.anatomyInSearch(getFilters(filters), query)
.anatomyInSearch(getFilters(filters, this.anatomyInDatasets), query)
.then((r) => {
// Send result anatomy to the scaffold and flatmap
this.anatomyInDatasets = r.forFlatmap;
EventBus.emit('anatomy-in-datasets', r.forFlatmap)
EventBus.emit('number-of-datasets-for-anatomies', r.forScaffold)
})
this.algoliaClient
.search(getFilters(filters), query, this.numberPerPage, this.page)
.search(getFilters(filters, this.anatomyInDatasets), query, this.numberPerPage, this.page)
.then((searchData) => {
this.numberOfHits = searchData.total
this.discoverIds = searchData.discoverIds
Expand Down