Skip to content
Snippets Groups Projects
Commit 7758541c authored by fsdavid's avatar fsdavid
Browse files

Fix showing dataset on connectivity

parent 56d06670
No related branches found
No related tags found
No related merge requests found
...@@ -22,6 +22,7 @@ import { ...@@ -22,6 +22,7 @@ import {
import {HttpClient} from "@angular/common/http"; import {HttpClient} from "@angular/common/http";
import {BS_ENDPOINT} from "src/util/constants"; import {BS_ENDPOINT} from "src/util/constants";
import {getIdFromKgIdObj} from "common/util"; import {getIdFromKgIdObj} from "common/util";
import {OVERWRITE_SHOW_DATASET_DIALOG_TOKEN} from "src/util/interfaces";
const CONNECTIVITY_NAME_PLATE = 'Connectivity' const CONNECTIVITY_NAME_PLATE = 'Connectivity'
...@@ -29,6 +30,12 @@ const CONNECTIVITY_NAME_PLATE = 'Connectivity' ...@@ -29,6 +30,12 @@ const CONNECTIVITY_NAME_PLATE = 'Connectivity'
@Component({ @Component({
selector: 'connectivity-browser', selector: 'connectivity-browser',
templateUrl: './connectivityBrowser.template.html', templateUrl: './connectivityBrowser.template.html',
providers: [
{
provide: OVERWRITE_SHOW_DATASET_DIALOG_TOKEN,
useValue: null
}
]
}) })
export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDestroy { export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDestroy {
......
...@@ -36,13 +36,13 @@ ...@@ -36,13 +36,13 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<ng-container *ngIf="selectedDataset && (selectedDatasetDescription || selectedDatasetKgId)" > <ng-container *ngIf="selectedDataset && (selectedDatasetDescription || selectedDatasetKgId)" >
<button class="flex-grow-0 flex-shrink-0" mat-icon-button <button class="flex-grow-0 flex-shrink-0"
mat-icon-button
iav-dataset-show-dataset-dialog iav-dataset-show-dataset-dialog
[iav-dataset-show-dataset-dialog-name]="selectedDataset" [iav-dataset-show-dataset-dialog-name]="selectedDataset"
[iav-dataset-show-dataset-dialog-description]="selectedDatasetDescription" [iav-dataset-show-dataset-dialog-description]="selectedDatasetDescription"
[iav-dataset-show-dataset-dialog-kgid]="selectedDatasetKgId? selectedDatasetKgId : null" [iav-dataset-show-dataset-dialog-kgid]="selectedDatasetKgId? selectedDatasetKgId : null"
[iav-dataset-show-dataset-dialog-kgschema]="selectedDatasetKgSchema? selectedDatasetKgSchema : null" [iav-dataset-show-dataset-dialog-kgschema]="selectedDatasetKgSchema? selectedDatasetKgSchema : null"
[iav-dataset-show-dataset-dialog-show-dialog]="true"
> >
<i class="fas fa-info"></i> <i class="fas fa-info"></i>
</button> </button>
......
import { CommonModule } from "@angular/common"; import { CommonModule } from "@angular/common";
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from "@angular/core"; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from "@angular/core";
import { AngularMaterialModule } from "src/ui/sharedModules/angularMaterial.module"; import { AngularMaterialModule } from "src/ui/sharedModules/angularMaterial.module";
import { DatabrowserModule } from "../databrowserModule";
import { ConnectivityBrowserComponent } from "./connectivityBrowser/connectivityBrowser.component"; import { ConnectivityBrowserComponent } from "./connectivityBrowser/connectivityBrowser.component";
import {HasConnectivity} from "src/atlasComponents/connectivity/hasConnectivity.directive"; import {HasConnectivity} from "src/atlasComponents/connectivity/hasConnectivity.directive";
import {KgDatasetModule} from "src/atlasComponents/regionalFeatures/bsFeatures/kgDataset";
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
DatabrowserModule, KgDatasetModule,
AngularMaterialModule AngularMaterialModule
], ],
declarations: [ declarations: [
......
...@@ -37,9 +37,6 @@ export class ShowDatasetDialogDirective{ ...@@ -37,9 +37,6 @@ export class ShowDatasetDialogDirective{
doi: string doi: string
}[] = [] }[] = []
@Input('iav-dataset-show-dataset-dialog-show-dialog')
showDialog: boolean = false
constructor( constructor(
private matDialog: MatDialog, private matDialog: MatDialog,
private snackbar: MatSnackBar, private snackbar: MatSnackBar,
...@@ -65,7 +62,7 @@ export class ShowDatasetDialogDirective{ ...@@ -65,7 +62,7 @@ export class ShowDatasetDialogDirective{
return this.snackbar.open(`Cannot show dataset. Neither fullId nor kgId provided.`) return this.snackbar.open(`Cannot show dataset. Neither fullId nor kgId provided.`)
} }
if (this.overwriteFn && !this.showDialog) { if (this.overwriteFn) {
return this.overwriteFn(data) return this.overwriteFn(data)
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment