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

[ALS-5336] Fix bug where users were seeing the DCC study tag when they should not #272

Merged
merged 2 commits into from
Jan 12, 2024
Merged

[ALS-5336] Fix bug where users were seeing the DCC study tag when they should not #272

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9331cf
Add check for DCC studies
JamesPeck Jan 12, 2024
813b2f2
refactor and comments
JamesPeck Jan 12, 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
12 changes: 11 additions & 1 deletion biodatacatalyst-ui/src/main/webapp/picsureui/search-interface/search-util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@ define(["jquery", "underscore", "text!studyAccess/studies-data.json", "text!sett
}
},

/*
This function detects if the user should see the dcc tag and variables in search results.
*/
shouldShowDCCDataSets: function() {
const queryScopes = JSON.parse(sessionStorage.getItem("session"))?.queryScopes;
const harmonizedStudies = queryScopes.filter(scope => this.isStudyHarmonized(scope.replace(/\\/g, '')));
return harmonizedStudies?.length > 1;
},

/**
* This function returns the study id from the study abbreviation or study name. If the study id is not found
* then the study abbreviation is returned.
Expand All @@ -99,7 +108,6 @@ define(["jquery", "underscore", "text!studyAccess/studies-data.json", "text!sett
*/
getAntiScopeTags: function() {
let queryScopes = JSON.parse(sessionStorage.getItem("session")).queryScopes;

// tell the back end to exclude concepts from studies not in the user's scope'
let antiScopeStudies = _.filter(studiesData.bio_data_catalyst, function(studyData){
//if this study is NOT in the query scopes, _.find will return NULL
Expand All @@ -115,6 +123,8 @@ define(["jquery", "underscore", "text!studyAccess/studies-data.json", "text!sett
antiScopeTags.add(study.study_identifier.toUpperCase());
antiScopeTags.add((study.study_identifier + "." + study.study_version).toLowerCase());
});
// add dcc harmonized tag if user does not have access to more than one harmonized study
!this.shouldShowDCCDataSets() && antiScopeTags.add(dccHarmonizedTag)

// convert set to array
return Array.from(antiScopeTags);
Expand Down