Merge ILL branch

src/OutputDatasetObsoleteDto_fix.d.ts

@@ -0,0 +1,11 @@
+import "@scicatproject/scicat-sdk-ts-angular";
+
+// Extend the existing interface
+declare module "@scicatproject/scicat-sdk-ts-angular" {
+  interface OutputDatasetObsoleteDto {
+    /**
+     * IDs of the instruments where the data was created.
+     */
+    instrumentIds?: Array<string>;
+  }
+}

src/app/_layout/app-header/app-header.component.html

@@ -68,6 +68,26 @@ <h3>{{ status }}</h3>
 
     <span class="spacer"></span>
 
+    <span *ngIf="isDatasetDetailPage">
+      <button
+        mat-icon-button
+        matTooltip="Nomad Logs"
+        (click)="openNomadLogs()"
+        class="icon-button"
+      >
+        <mat-icon>subject</mat-icon>
+      </button>
+
+      <button
+        mat-icon-button
+        matTooltip="Nomad Charts"
+        (click)="openNomadCharts()"
+        class="icon-button"
+      >
+        <mat-icon>bar_chart</mat-icon>
+      </button>
+    </span>
+
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/help']">

src/app/_layout/app-header/app-header.component.ts

@@ -1,5 +1,5 @@
 import { DOCUMENT } from "@angular/common";
-import { Component, OnInit, Inject } from "@angular/core";
+import { Component, OnInit, Inject, OnDestroy } from "@angular/core";
 import { APP_CONFIG, AppConfig } from "app-config.module";
 import { Store } from "@ngrx/store";
 import {
@@ -13,14 +13,19 @@ import {
 } from "state-management/selectors/user.selectors";
 import { selectDatasetsInBatchIndicator } from "state-management/selectors/datasets.selectors";
 import { AppConfigService, OAuth2Endpoint } from "app-config.service";
-import { Router } from "@angular/router";
+import { Router, NavigationEnd } from "@angular/router";
+import { NomadViewerService } from "shared/services/nomad-buttons-service";
+import { filter, Subscription } from "rxjs";
 
 @Component({
   selector: "app-app-header",
   templateUrl: "./app-header.component.html",
   styleUrls: ["./app-header.component.scss"],
 })
-export class AppHeaderComponent implements OnInit {
+export class AppHeaderComponent implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
+  isDatasetDetailPage = false;
+
   config = this.appConfigService.getConfig();
   facility = this.config.facility ?? "";
   status = this.appConfig.production ? "" : "test";
@@ -38,6 +43,7 @@ export class AppHeaderComponent implements OnInit {
     @Inject(APP_CONFIG) public appConfig: AppConfig,
     private store: Store,
     @Inject(DOCUMENT) public document: Document,
+    private nomadViewerService: NomadViewerService,
   ) {}
 
   logout(): void {
@@ -58,5 +64,31 @@ export class AppHeaderComponent implements OnInit {
   ngOnInit() {
     this.store.dispatch(fetchCurrentUserAction());
     this.oAuth2Endpoints = this.config.oAuth2Endpoints;
+    this.isDatasetDetailPage = /\/datasets\/[^/]+(?:\/.*)?$/.test(
+      this.router.url,
+    );
+
+    this.subscriptions.push(
+      this.router.events
+        .pipe(filter((event) => event instanceof NavigationEnd))
+        .subscribe((event: NavigationEnd) => {
+          this.isDatasetDetailPage = /\/datasets\/[^/]+(?:\/.*)?$/.test(
+            event.url,
+          );
+        }),
+    );
+  }
+
+  ngOnDestroy() {
+    // existing cleanup code
+    this.subscriptions.forEach((sub) => sub.unsubscribe());
+  }
+
+  openNomadLogs(): void {
+    this.nomadViewerService.openNomadLogs();
+  }
+
+  openNomadCharts(): void {
+    this.nomadViewerService.openNomadCharts();
   }
 }

src/app/_layout/layout.module.ts

@@ -12,6 +12,7 @@ import { AppMainLayoutComponent } from "./app-main-layout/app-main-layout.compon
 import { BatchCardModule } from "datasets/batch-card/batch-card.module";
 import { BreadcrumbModule } from "shared/modules/breadcrumb/breadcrumb.module";
 import { UsersModule } from "../users/users.module";
+import { MatTooltipModule } from "@angular/material/tooltip";
 
 @NgModule({
   declarations: [
@@ -27,6 +28,7 @@ import { UsersModule } from "../users/users.module";
     MatIconModule,
     MatMenuModule,
     MatToolbarModule,
+    MatTooltipModule,
     RouterModule,
     BreadcrumbModule,
     UsersModule,

src/app/app.module.ts

@@ -32,6 +32,7 @@ import { TranslateLoader, TranslateModule } from "@ngx-translate/core";
 import { CustomTranslateLoader } from "shared/loaders/custom-translate.loader";
 import { DATE_PIPE_DEFAULT_OPTIONS } from "@angular/common";
 import { RouteTrackerService } from "shared/services/route-tracker.service";
+import { SearchService } from "./datasets/services/search.service";
 
 const appConfigInitializerFn = (appConfig: AppConfigService) => {
   return () => appConfig.loadAppConfig();
@@ -143,6 +144,7 @@ const apiConfigurationFn = (
       deps: [AuthService, AppConfigService],
       multi: false,
     },
+    SearchService,
   ],
   bootstrap: [AppComponent],
 })