+
diff --git a/web/frontend/src/app/component/subset-details/subset-details.component.ts b/web/frontend/src/app/component/subset-details/subset-details.component.ts
index b8612433..b10d6bd7 100644
--- a/web/frontend/src/app/component/subset-details/subset-details.component.ts
+++ b/web/frontend/src/app/component/subset-details/subset-details.component.ts
@@ -81,8 +81,10 @@ export class SubsetDetailsComponent implements OnInit {
this.subsetCodes = {};
this.subsets.unshift(this.selectedSubset);
this.subsets.forEach((c) => {
- synonymMap.push(this.getSynonymSources(c['synonyms']));
- if (c.inverseAssociations?.find((assoc) => assoc.type == 'Concept_In_Subset')) {
+ if (c && c['synonyms'].length > 0) {
+ synonymMap.push(this.getSynonymSources(c['synonyms']));
+ }
+ if (c && c['inverseAssociations'].length > 0 && c['inverseAssociations'].find((assoc) => assoc.type == 'Concept_In_Subset')) {
this.subsetCodes[c.code] = 1;
}
});
@@ -401,16 +403,25 @@ export class SubsetDetailsComponent implements OnInit {
getCdiscSubmissionValue(concept: Concept): string {
// If a single CDISC/PT, return it
const matchingSynonyms = concept.synonyms.filter((sy) => sy.source === 'CDISC' && sy.termType === 'PT');
- if (matchingSynonyms.length==1) {
+ if (matchingSynonyms.length===1) {
return matchingSynonyms[0].name;
}
- // Otherwise, find the one matching the sumissionValueCode
+ // Otherwise, find the one matching the submissionValueCode
const matchingSynonym = matchingSynonyms.find((sy) => sy.code === this.submissionValueCode);
if (matchingSynonym) {
return matchingSynonym.name;
}
// can't figure it out, just return the first again
- return matchingSynonyms[0].name;
+ if(matchingSynonyms.length > 0)
+ return matchingSynonyms[0].name;
+
+ // if we get all the way here there isn't one
+ return null;
+
+ }
+ linkNotInDescription() {
+ const desc = this.selectedSubset.properties.find((item) => item.type === "Term_Browser_Value_Set_Description");
+ return (this.selectedSubset.subsetLink !== undefined && desc !== undefined && !desc.value.includes(this.selectedSubset.subsetLink));
}
}
diff --git a/web/frontend/src/app/component/welcome/welcome.component.ts b/web/frontend/src/app/component/welcome/welcome.component.ts
index bb8b1204..cb508ae7 100644
--- a/web/frontend/src/app/component/welcome/welcome.component.ts
+++ b/web/frontend/src/app/component/welcome/welcome.component.ts
@@ -18,7 +18,7 @@ export class WelcomeComponent implements OnInit, OnDestroy, AfterViewInit {
welcomeText: any = null;
boilerPlateWelcomeText: any = 'Loading welcome text for ' + this.configService.getTerminologyName() + ' ...';
allTerminologies: any = null;
- selectedMultiTerminologies = new Set();
+ selectedMultiTerminologies = new Set
();
checkboxStates: { [key: string]: boolean } = {}; // track the state of the checkbox based on terminology
private subscription = null;
@@ -37,23 +37,27 @@ export class WelcomeComponent implements OnInit, OnDestroy, AfterViewInit {
ngOnInit(): void {
this.route.queryParams
.subscribe(params => {
- if (Object.keys(params).length > 0 && params.terminology !== 'multi' && !params.terminology.includes(',')) {
- this.setWelcomeText(params.terminology != undefined ? params.terminology : 'ncit');
+ if (Object.keys(params).length > 0 && params.terminology !== 'multi' && params.terminology !== undefined && !params.terminology.includes(',')) {
+ this.setWelcomeText(params.terminology !== undefined ? params.terminology : 'ncit');
this.configService.setMultiSearch(false);
} else if (Object.keys(params).length > 0) {
- if (params.terminology.includes(',')) {
+ if (params.terminology !== undefined && params.terminology.includes(',')) {
// populating saved terminologies in url
params.terminology.split(',').forEach(term => {
this.selectedMultiTerminologies.add(term);
});
-
+ this.configService.setMultiSearch(true);
+ } else if (params.terminology === "multi") {
+ this.configService.setMultiSearch(true);
+ }
+ else {
+ this.setWelcomeText(params.terminology !== undefined ? params.terminology : 'ncit');
+ this.configService.setMultiSearch(false);
}
- this.configService.setMultiSearch(true);
}
this.allTerminologies = this.configService.getTerminologies().map((terminology) => {
// initialize checkboxStates for each terminology
- const normalizedTerm = terminology.metadata.uiLabel.replace(/\:.*/, '').toLowerCase();
- this.checkboxStates[normalizedTerm] = false;
+ this.checkboxStates[terminology.terminology] = this.selectedMultiTerminologies.has(terminology.terminology);
// set the checkbox state based on the selected terminologies
return {
label: terminology.metadata.uiLabel.replace(/\:.*/, ''),