diff --git a/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.component.ts b/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.component.ts index 5148e5dc938ca150fa8b135c98a33e60ad44b227..af4f139d68610b4fd275c5e202866e941040b1d7 100644 --- a/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.component.ts +++ b/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.component.ts @@ -22,6 +22,7 @@ import { import {HttpClient} from "@angular/common/http"; import {BS_ENDPOINT} from "src/util/constants"; import {getIdFromKgIdObj} from "common/util"; +import {OVERWRITE_SHOW_DATASET_DIALOG_TOKEN} from "src/util/interfaces"; const CONNECTIVITY_NAME_PLATE = 'Connectivity' @@ -29,6 +30,12 @@ const CONNECTIVITY_NAME_PLATE = 'Connectivity' @Component({ selector: 'connectivity-browser', templateUrl: './connectivityBrowser.template.html', + providers: [ + { + provide: OVERWRITE_SHOW_DATASET_DIALOG_TOKEN, + useValue: null + } + ] }) export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDestroy { diff --git a/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.template.html b/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.template.html index 26f19900d69d5bf370450ddbac35436c8558cd95..696e579280a4b119a33ae589417bc282246cd634 100644 --- a/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.template.html +++ b/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.template.html @@ -36,13 +36,13 @@ </mat-select> </mat-form-field> <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-name]="selectedDataset" [iav-dataset-show-dataset-dialog-description]="selectedDatasetDescription" [iav-dataset-show-dataset-dialog-kgid]="selectedDatasetKgId? selectedDatasetKgId : null" [iav-dataset-show-dataset-dialog-kgschema]="selectedDatasetKgSchema? selectedDatasetKgSchema : null" - [iav-dataset-show-dataset-dialog-show-dialog]="true" > <i class="fas fa-info"></i> </button> diff --git a/src/atlasComponents/connectivity/module.ts b/src/atlasComponents/connectivity/module.ts index 1f505eb7ca659ecef7d6a7f088e82eb31a605e3f..f8fa66e0e5378141834f3696091ad3227a367bbf 100644 --- a/src/atlasComponents/connectivity/module.ts +++ b/src/atlasComponents/connectivity/module.ts @@ -1,14 +1,14 @@ import { CommonModule } from "@angular/common"; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from "@angular/core"; import { AngularMaterialModule } from "src/ui/sharedModules/angularMaterial.module"; -import { DatabrowserModule } from "../databrowserModule"; import { ConnectivityBrowserComponent } from "./connectivityBrowser/connectivityBrowser.component"; import {HasConnectivity} from "src/atlasComponents/connectivity/hasConnectivity.directive"; +import {KgDatasetModule} from "src/atlasComponents/regionalFeatures/bsFeatures/kgDataset"; @NgModule({ imports: [ CommonModule, - DatabrowserModule, + KgDatasetModule, AngularMaterialModule ], declarations: [ diff --git a/src/atlasComponents/regionalFeatures/bsFeatures/kgDataset/showDataset/showDataset.directive.ts b/src/atlasComponents/regionalFeatures/bsFeatures/kgDataset/showDataset/showDataset.directive.ts index 18b766a9034ad49da8ce4b98d403bbea2fe373a2..e8052369bf5226a29285ab37e7d65093f29d5728 100644 --- a/src/atlasComponents/regionalFeatures/bsFeatures/kgDataset/showDataset/showDataset.directive.ts +++ b/src/atlasComponents/regionalFeatures/bsFeatures/kgDataset/showDataset/showDataset.directive.ts @@ -37,9 +37,6 @@ export class ShowDatasetDialogDirective{ doi: string }[] = [] - @Input('iav-dataset-show-dataset-dialog-show-dialog') - showDialog: boolean = false - constructor( private matDialog: MatDialog, private snackbar: MatSnackBar, @@ -65,7 +62,7 @@ export class ShowDatasetDialogDirective{ return this.snackbar.open(`Cannot show dataset. Neither fullId nor kgId provided.`) } - if (this.overwriteFn && !this.showDialog) { + if (this.overwriteFn) { return this.overwriteFn(data) }