diff --git a/src/app/components/network/network.component.ts b/src/app/components/network/network.component.ts index c24c4ac148cdc04a70575e4a3b299d28769e76c8..d15cf243bf16f0563e7dfebb65860434a0bdbc56 100644 --- a/src/app/components/network/network.component.ts +++ b/src/app/components/network/network.component.ts @@ -117,7 +117,7 @@ export class NetworkComponent implements OnInit { this.adjacentDisordersProtein = bool; if (this.adjacentDisordersProtein) { - this.netex.adjacentDisorders(this.nodeData.nodes.get(), 'proteins', this.drugstoneConfig.config.associatedProteinDisorder, this.drugstoneConfig.config.licencedDatasets).subscribe(response => { + this.netex.adjacentDisorders(this.nodeData.nodes.get(), 'proteins', this.drugstoneConfig.config.associatedProteinDisorder, this.drugstoneConfig.config.licensedDatasets).subscribe(response => { const proteinMap = this.getProteinMap() const addedEdge = {} for (const interaction of response.edges) { @@ -160,7 +160,7 @@ export class NetworkComponent implements OnInit { public updateAdjacentDrugDisorders(bool: boolean) { this.adjacentDisordersDrug = bool; if (this.adjacentDisordersDrug) { - this.netex.adjacentDisorders(this.nodeData.nodes.get(), 'drugs', this.drugstoneConfig.config.indicationDrugDisorder, this.drugstoneConfig.config.licencedDatasets).subscribe(response => { + this.netex.adjacentDisorders(this.nodeData.nodes.get(), 'drugs', this.drugstoneConfig.config.indicationDrugDisorder, this.drugstoneConfig.config.licensedDatasets).subscribe(response => { for (const interaction of response.edges) { const edge = {from: interaction.drug, to: interaction.disorder}; this.adjacentDrugDisorderEdgesList.push(mapCustomEdge(edge, this.drugstoneConfig.config)); @@ -214,7 +214,7 @@ export class NetworkComponent implements OnInit { if (this.adjacentDrugs) { const addedEdge = {} const proteinMap = this.getProteinMap() - this.netex.adjacentDrugs(this.drugstoneConfig.config.interactionDrugProtein, this.drugstoneConfig.config.licencedDatasets, this.nodeData.nodes.get()).subscribe(response => { + this.netex.adjacentDrugs(this.drugstoneConfig.config.interactionDrugProtein, this.drugstoneConfig.config.licensedDatasets, this.nodeData.nodes.get()).subscribe(response => { const existingDrugIDs = this.nodeData.nodes.get().filter(n => n.drugstoneId && n.drugstoneType === 'drug').map(n => n.drugstoneId); for (const interaction of response.pdis) { const edge = mapCustomEdge({from: interaction.protein, to: interaction.drug}, this.drugstoneConfig.config) diff --git a/src/app/config.ts b/src/app/config.ts index cdf776f9c9546819d187aac3cea2d78dcda07a7b..bd6112e250ba0dac15edba64a6214fc545d57b54 100644 --- a/src/app/config.ts +++ b/src/app/config.ts @@ -74,7 +74,6 @@ export interface IConfig { interactionDrugProtein: InteractionDrugProteinDB; interactionProteinProtein: InteractionProteinProteinDB; indicationDrugDisorder: IndicationDrugDisorderDB; - licencedDatasets?: boolean; associatedProteinDisorder: AssociatedProteinDisorderDB; autofillEdges: boolean; interactions?: InteractionDatabase; diff --git a/src/app/dialogs/launch-analysis/launch-analysis.component.ts b/src/app/dialogs/launch-analysis/launch-analysis.component.ts index dc8c975a7d2e7c4f1193bf20621d27d4927a1f4c..273822d56a599c053baa142ec9968bcf603143a0 100644 --- a/src/app/dialogs/launch-analysis/launch-analysis.component.ts +++ b/src/app/dialogs/launch-analysis/launch-analysis.component.ts @@ -117,7 +117,7 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges { }; parameters.ppi_dataset = this.drugstoneConfig.config.interactionProteinProtein; parameters.pdi_dataset = this.drugstoneConfig.config.interactionDrugProtein; - parameters.licenced = this.drugstoneConfig.config.licencedDatasets; + parameters.licenced = this.drugstoneConfig.config.licensedDatasets; parameters.target = this.target === 'drug' ? 'drug' : 'drug-target'; diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html index 16ad5120d298bc10963e0149fc7470188d023d9e..788dfcab121d839455b647aa0a6a35f8f2d3e509 100644 --- a/src/app/pages/explorer-page/explorer-page.component.html +++ b/src/app/pages/explorer-page/explorer-page.component.html @@ -465,50 +465,6 @@ </i> </div> - <!-- <footer class="card-footer" *ngIf="selectedAnalysisToken"> - <a (click)="analysis.addSeeds(currentViewNodes)" - class="card-footer-item has-text-success" tooltipPosition="top" pTooltip="Add all visible seeds."> - - <span class="icon"> - <i class="fa fa-plus"></i> - </span> - <span> - Add seeds - </span> - </a> - <a (click)="analysis.removeSeeds(currentViewNodes)" - class="card-footer-item has-text-danger" tooltipPosition="top" pTooltip="Remove all seeds."> - <span class="icon"> - <i class="fa fa-minus"></i> - </span> - <span> - Remove seeds - </span> - </a> - </footer> - - <footer class="card-footer"> - <a (click)="showCustomProteinsDialog = true" - class="card-footer-item text-primary" - tooltipPosition="top" pTooltip="Add a custom list of proteins."> - <span class="icon"> - <i class="fa fa-upload"></i> - </span> - <span> - Custom proteins - </span> - </a> - <a (click)="showThresholdDialog = true" - class="card-footer-item text-primary" - pTooltip="Add proteins expressed in the tissue." tooltipPosition="top"> - <span class="icon"> - <i class="fas fa-angle-double-up"></i> - </span> - <span> - Tissue proteins - </span> - </a> - </footer> --> <footer class="card-footer"> <!-- <a (click)="analysis.invertSelection(currentViewNodes)" class="card-footer-item text-primary" diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts index 7aeea73551c329ddd134d974e9332c9917da9f0f..f43a78c29d1298d881fa41f788397398912fc418 100644 --- a/src/app/pages/explorer-page/explorer-page.component.ts +++ b/src/app/pages/explorer-page/explorer-page.component.ts @@ -284,7 +284,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { }) } }) - const netexEdges = await this.netex.fetchEdges(nodes, this.drugstoneConfig.config.interactionProteinProtein, this.drugstoneConfig.config.licencedDatasets); + const netexEdges = await this.netex.fetchEdges(nodes, this.drugstoneConfig.config.interactionProteinProtein, this.drugstoneConfig.config.licensedDatasets); edges.push(...netexEdges.map(netexEdge => mapNetexEdge(netexEdge, this.drugstoneConfig.config, node_map)).flatMap(e => e)); } diff --git a/src/index.html b/src/index.html index 7569b4e2fafc8d6ba191416310df563dd3838282..c6a928f336ca52e3cd40c0b0c09b0a43d2538490 100644 --- a/src/index.html +++ b/src/index.html @@ -77,8 +77,8 @@ <i>Protein-Disorder Associations</i> <select name="Protein-Disorder Associations" onchange="applyDataset()" id="pdis-dataset"> <option value="NeDRex">NeDRex</option> - <option value="DisGeNET">CTD</option> - <option value="OMIM">Drug Central</option> + <option value="DisGeNET">DisGeNET</option> + <option value="omim">OMIM</option> </select> </div> diff --git a/src/index_static.html b/src/index_static.html index 79f219a2f2675d8221bc0383126b2d45e05d605d..b75da7c040acdf9af3787107a2e0c8548a323b5d 100644 --- a/src/index_static.html +++ b/src/index_static.html @@ -78,8 +78,8 @@ <i>Protein-Disorder Associations</i> <select name="Protein-Disorder Associations" onchange="applyDataset()" id="pdis-dataset"> <option value="NeDRex">NeDRex</option> - <option value="DisGeNET">CTD</option> - <option value="OMIM">Drug Central</option> + <option value="DisGeNET">DisGeNET</option> + <option value="omim">OMIM</option> </select> </div>