Skip to content

Results Ratio #8

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: pmr-results-mixed
Choose a base branch
from
Draft

Results Ratio #8

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
5d13c3c
Update PMR and SPARC result flags
akhuoa Aug 9, 2024
b758718
Merge pull request #9 from akhuoa/pmr-results-mixed
akhuoa Aug 19, 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
37 changes: 26 additions & 11 deletions src/components/SidebarContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ var initial_state = {
numberPerPage: 10,
page: 1,
pmrResultsFlag: false,
sparcResultsFlag: false,
sparcResultsFlag: true,
hasSearched: false,
contextCardEnabled: false,
RatioOfPMRResults: RatioOfPMRResults,
Expand Down Expand Up @@ -250,22 +250,20 @@ export default {
}
},
handleAllSearch: function (filter, search) {
if (this.pmrResultsFlag) {
this.openPMRSearch(filter, search);
}
else if (this.sparcResultsFlag) {
if (this.sparcResultsFlag) {
this.searchAlgolia(filter, search);
}
else {
this.searchAlgolia(filter, search);

if (this.pmrResultsFlag) {
this.openPMRSearch(filter, search);
}
},
// openPMRSearch: Resets the results, populates dataset cards and filters with PMR data.
openPMRSearch: function (filter, search = '') {
this.loadingCards = true;
this.flatmapQueries.updateOffset(this.calculatePMROffest())
this.flatmapQueries.updateLimit(this.PMRLimit(this.pmrResultsFlag))
const pmrLimit = 2; // TODO: this.PMRLimit(this.sparcResultsFlag);
this.flatmapQueries.updateLimit(pmrLimit);
this.flatmapQueries.pmrSearch(filter, search).then((data) => {
// clear the existing results for concurrent requests
this.results = [];
Expand Down Expand Up @@ -299,6 +297,7 @@ export default {
this.$refs.filtersRef.checkShowAllBoxes()
this.resetSearch()
} else if (this.filter) {
this.updatePMRAndSPARCResultsFlags(this.filter);
this.handleAllSearch(this.filter, search);
this.$refs.filtersRef.setCascader(this.filter)
}
Expand All @@ -307,6 +306,7 @@ export default {
//otherwise waith for cascader to be ready
this.filter = filter
if (!filter || filter.length == 0) {
this.updatePMRAndSPARCResultsFlags(this.filter);
this.handleAllSearch(this.filter, search);
}
}
Expand Down Expand Up @@ -355,6 +355,15 @@ export default {
return;
}

if (!filters.length) {
this.sparcResultsFlag = true;

if (this.withPMRData) {
this.pmrResultsFlag = true;
}
return;
}

const dataTypeFilters = filters.filter((item) => item.facetPropPath === 'item.types.name');
const pmrFilter = dataTypeFilters.filter((item) => item.facet === 'PMR');
const showAllFilter = dataTypeFilters.filter((item) => item.facet === 'Show all');
Expand Down Expand Up @@ -399,9 +408,14 @@ export default {
// Send result anatomy to the scaffold and flatmap
EventBus.emit('anatomy-in-datasets', r.forFlatmap)
EventBus.emit('number-of-datasets-for-anatomies', r.forScaffold)
})

// TODO: to update ratio and offset limit before search
this.sparcNumberOfHits = r.forFlatmap.length;
this.calculateVariableRatio();
const sparcLimit = 8; // this.SPARCLimit(this.sparcResultsFlag);
// TODO: to perform search only if there has result
this.algoliaClient
.search(getFilters(filters), query, this.calculateSPARCOffest(), this.SPARCLimit(this.pmrResultsFlag))
.search(getFilters(filters), query, this.calculateSPARCOffest(), sparcLimit)
.then((searchData) => {
this.sparcNumberOfHits = searchData.total
this.discoverIds = searchData.discoverIds
Expand All @@ -427,7 +441,8 @@ export default {
const signal = this._abortController.signal
//Search ongoing, let the current flow progress
this.perItemSearch(signal, { count: 0 })
})
});
});
},
filtersLoading: function (val) {
this.loadingCards = val
Expand Down
4 changes: 2 additions & 2 deletions src/mixins/mixedPageCalculation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ export default {
return 0
}
},
SPARCLimit: function(pmrResultsFlag=false) {
if(pmrResultsFlag) {
SPARCLimit: function(sparcResultsFlag=true) {
if(!sparcResultsFlag) {
return 0
}
if (this.variableRatio === this.RatioOfPMRResults) {
Expand Down