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

2024-03-28-Release #292

Merged
merged 18 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5f0dd68
[ALS-5760] Add ternary operator to handle null case
Gcolon021 Jan 23, 2024
1c86b18
Minor H2 html element fix
Gcolon021 Jan 31, 2024
882a92d
[ALS-5583] Update build process to support AIM-AHEAD PIC-SURE (#273)
Gcolon021 Feb 2, 2024
5b656dd
[ALS-5703] AIM-AHEAD PIC-SURE Help Tab (#278)
Gcolon021 Feb 2, 2024
578ff1f
[ALS-5789] Add Loading spinner when search result selected (#279)
JamesPeck Feb 7, 2024
0fc561a
Improve redirectModal message flexibility
Gcolon021 Feb 6, 2024
82b75c5
[ALS-5883] Allow optional override of download modal message
Gcolon021 Feb 6, 2024
aace08e
[ALS-5584] Add ontology instance dependency to search-view (#281)
Gcolon021 Feb 15, 2024
bbb7fbf
[ALS-5332] Add Admin consoles and Fix bug with saving a user (#282)
JamesPeck Feb 15, 2024
9df8338
[ALS-5077] Remove "Counts" column from studies table (#283)
Gcolon021 Feb 23, 2024
2407f5f
[ALS-5082] Persist database: Flyway (#287)
Gcolon021 Mar 6, 2024
755babd
[ALS-5548] Stigmatizing Variables Displayed in Dataset View of Open P…
Gcolon021 Mar 11, 2024
c8053ae
Merge remote-tracking branch 'origin/master' into release
Gcolon021 Mar 13, 2024
fc106db
[ALS-6144] Fix filter variable info modal button (#289)
JamesPeck Mar 15, 2024
fc80f4b
Update condition for variable display in datatable-filter-modal-view …
Gcolon021 Mar 26, 2024
d82be6f
"Conditionally add BioData Catalyst-specific filters" (#290)
Gcolon021 Mar 26, 2024
95847e0
Merge for AIM-AHEAD 2024-03-14-Release (#288) (#293)
Gcolon021 Mar 26, 2024
2dc9c0a
Merge branch 'master' into release
Gcolon021 Mar 26, 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
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,24 @@ define(['backbone', 'handlebars', 'underscore', 'text!search-interface/datatable
let data = this.dtData;
const isOpenAccess = JSON.parse(sessionStorage.getItem('isOpenAccess'));
if(!data){
data = this.model.dtVariables.filter(function (variable) {
// Check if the variable is stigmatized and if it is, don't display it
return isOpenAccess && (variable.result.metadata?.is_stigmatized === "false" || variable.result.metadata?.columnmeta_is_stigmatized === "false");
}).map(function(variable) {

if (isOpenAccess) {
// filter out stigmatized variables
data = this.model.dtVariables.filter(function (variable) {
return variable.result.metadata?.is_stigmatized === "false" || variable.result.metadata?.columnmeta_is_stigmatized === "false";
});
} else {
data = this.model.dtVariables;
}

data = data.map(function(variable) {
let values = variable.result.values.join(", ");
return [
existingFilter ?
(_.find(existingFilter.get('variables'), (conceptPath)=>{
return conceptPath.includes(variable.result.metadata.columnmeta_var_id);
}) !== undefined ? true : false) : false,
(_.find(existingFilter.get('variables'), (conceptPath) => {
return conceptPath.includes(variable.result.metadata.columnmeta_var_id);
}) !== undefined) : false,

variable.result.metadata.columnmeta_var_id,
variable.result.metadata.columnmeta_name,
variable.result.metadata.columnmeta_description,
Expand Down
Loading