From 139081aee2eee9426a837620606be2a960ad214a Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Mon, 12 Aug 2024 08:42:38 +0000
Subject: [PATCH 001/245] Prepare ingestor frontend minimal ui

---
 .../app-header/app-header.component.html      | 10 +++-
 src/app/app-routing/app-routing.module.ts     |  7 +++
 .../ingestor.feature.module.ts                |  8 +++
 .../ingestor.routing.module.ts                | 15 +++++
 .../ingestor-metadata-editor.component.html   |  4 ++
 .../ingestor-metadata-editor.component.scss   |  0
 .../ingestor-metadata-editor.component.ts     | 18 ++++++
 src/app/ingestor/ingestor.module.ts           | 29 ++++++++++
 .../ingestor/ingestor/ingestor.component.html | 36 ++++++++++++
 .../ingestor/ingestor/ingestor.component.scss |  5 ++
 .../ingestor/ingestor.component.spec.ts       | 24 ++++++++
 .../ingestor/ingestor/ingestor.component.ts   | 58 +++++++++++++++++++
 12 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
 create mode 100644 src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
 create mode 100644 src/app/ingestor/ingestor.module.ts
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.html
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.scss
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.spec.ts
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.ts

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index b844e86598..88baab4099 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -67,7 +67,15 @@ <h3>{{ status }}</h3>
     </a>
 
     <span class="spacer"></span>
-
+    
+    <span>
+      <h6>
+        <a class="toplink" [routerLink]="['/ingestor']">
+          <mat-icon> cloud_upload  </mat-icon>
+          <span class="large-screen-text">Ingestor (OpenEM)</span></a
+        >
+      </h6>
+    </span>
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/help']">
diff --git a/src/app/app-routing/app-routing.module.ts b/src/app/app-routing/app-routing.module.ts
index 3310f2c053..2f95ca27e5 100644
--- a/src/app/app-routing/app-routing.module.ts
+++ b/src/app/app-routing/app-routing.module.ts
@@ -105,6 +105,13 @@ export const routes: Routes = [
                 (m) => m.HelpFeatureModule,
               ),
           },
+          {
+            path: "ingestor",
+            loadChildren: () =>
+              import("./lazy/ingestor-routing/ingestor.feature.module").then(
+                (m) => m.IngestorFeatureModule,
+              ),
+          },
           {
             path: "logbooks",
             loadChildren: () =>
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
new file mode 100644
index 0000000000..8796c9c34e
--- /dev/null
+++ b/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
@@ -0,0 +1,8 @@
+import { NgModule } from "@angular/core";
+import { IngestorRoutingModule } from "./ingestor.routing.module";
+import { IngestorModule } from "ingestor/ingestor.module";
+
+@NgModule({
+  imports: [IngestorModule, IngestorRoutingModule],
+})
+export class IngestorFeatureModule {}
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
new file mode 100644
index 0000000000..c1a5b047d5
--- /dev/null
+++ b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
+import { IngestorComponent } from "ingestor/ingestor/ingestor.component";
+
+const routes: Routes = [
+  {
+    path: "",
+    component: IngestorComponent,
+  },
+];
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class IngestorRoutingModule {}
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
new file mode 100644
index 0000000000..d5ac4b7128
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
@@ -0,0 +1,4 @@
+<div class="ingestor-metadata-editor">
+  <textarea matInput placeholder="Edit Metadata" rows="10"
+    [(ngModel)]="metadata"></textarea>
+</div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
new file mode 100644
index 0000000000..19b7d76c4a
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -0,0 +1,18 @@
+import { Component, EventEmitter, Output } from '@angular/core';
+
+@Component({
+  selector: 'app-metadata-editor',
+  templateUrl: './ingestor-metadata-editor.component.html',
+  styleUrls: ['./ingestor-metadata-editor.component.scss']
+})
+export class IngestorMetadataEditorComponent {
+  metadata: string = '';
+
+    // Optional: EventEmitter, um Änderungen an der Metadata zu melden
+    @Output() metadataChange = new EventEmitter<string>();
+
+    onMetadataChange(newMetadata: string) {
+      this.metadata = newMetadata;
+      this.metadataChange.emit(this.metadata);
+    }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
new file mode 100644
index 0000000000..a693ac724f
--- /dev/null
+++ b/src/app/ingestor/ingestor.module.ts
@@ -0,0 +1,29 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+import { IngestorComponent } from "./ingestor/ingestor.component";
+import { MatCardModule } from "@angular/material/card";
+import { RouterModule } from "@angular/router";
+import { IngestorMetadataEditorComponent } from "./ingestor-metadata-editor/ingestor-metadata-editor.component";
+import { MatButtonModule } from "@angular/material/button";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatInputModule } from "@angular/material/input";
+import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
+import { FormsModule } from "@angular/forms";
+
+@NgModule({
+  declarations: [
+    IngestorComponent,
+    IngestorMetadataEditorComponent
+  ],
+  imports: [
+    CommonModule, 
+    MatCardModule, 
+    FormsModule, 
+    MatFormFieldModule, 
+    MatInputModule, 
+    MatButtonModule, 
+    MatProgressSpinnerModule, 
+    RouterModule
+  ],
+})
+export class IngestorModule { }
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
new file mode 100644
index 0000000000..151391c679
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -0,0 +1,36 @@
+<p>
+  <mat-card class="ingestor-card">
+    <mat-card-header>
+      <mat-card-title>Ingestor-Connection</mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div>
+        <p style="color: red;">No Backend connected</p>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</p>
+
+<p>
+  <mat-card class="ingestor-card">
+    <mat-card-header>
+      <mat-card-title>Ingest Dataset</mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div>
+      </div>
+      <app-metadata-editor></app-metadata-editor>
+      <div>
+        <mat-form-field>
+          <input matInput placeholder="File Path" [(ngModel)]="filePath">
+        </mat-form-field>
+      </div>
+      <div>
+        <button mat-raised-button color="primary" (click)="upload()" [disabled]="loading">
+          <span *ngIf="!loading">Upload</span>
+          <mat-progress-spinner *ngIf="loading" diameter="20" mode="indeterminate"></mat-progress-spinner>
+        </button>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</p>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
new file mode 100644
index 0000000000..b85eb9646e
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -0,0 +1,5 @@
+.ingestor-vertical-layout {
+  display: flex;
+  flex-direction: column;
+  gap: 1em;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.spec.ts b/src/app/ingestor/ingestor/ingestor.component.spec.ts
new file mode 100644
index 0000000000..52186b1077
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { IngestorComponent } from './ingestor.component';
+
+describe('IngestorComponent', () => {
+  let component: IngestorComponent;
+  let fixture: ComponentFixture<IngestorComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ IngestorComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(IngestorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
new file mode 100644
index 0000000000..d300b87a0f
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -0,0 +1,58 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { AppConfigService, HelpMessages } from "app-config.service";
+import { HttpClient } from '@angular/common/http';
+import { IngestorMetadataEditorComponent } from '../ingestor-metadata-editor/ingestor-metadata-editor.component';
+
+@Component({
+  selector: "ingestor",
+  templateUrl: "./ingestor.component.html",
+  styleUrls: ["./ingestor.component.scss"],
+})
+export class IngestorComponent implements OnInit {
+  @ViewChild(IngestorMetadataEditorComponent) metadataEditor: IngestorMetadataEditorComponent;
+
+  appConfig = this.appConfigService.getConfig();
+  facility: string | null = null;
+  ingestManual: string | null = null;
+  gettingStarted: string | null = null;
+  shoppingCartEnabled = false;
+  helpMessages: HelpMessages;
+  filePath: string = '';
+  loading: boolean = false;
+
+  constructor(public appConfigService: AppConfigService, private http: HttpClient) {}
+
+  ngOnInit() {
+    this.facility = this.appConfig.facility;
+    this.ingestManual = this.appConfig.ingestManual;
+    this.helpMessages = new HelpMessages(
+      this.appConfig.helpMessages?.gettingStarted,
+      this.appConfig.helpMessages?.ingestManual,
+    );
+    this.gettingStarted = this.appConfig.gettingStarted;
+  }
+
+  upload() {
+    this.loading = true;
+    const payload = {
+      metadata: this.metadataEditor.metadata,
+      filePath: this.filePath
+    };
+
+    console.log('Uploading', payload);
+
+    setTimeout(() => {
+      this.loading = false;
+    }, 2000);
+    /*this.http.post('/api/upload', payload).subscribe(
+      response => {
+        console.log('Upload successful', response);
+        this.loading = false;
+      },
+      error => {
+        console.error('Upload failed', error);
+        this.loading = false;
+      }
+    );*/
+  }
+}
\ No newline at end of file

From 6e5f33c32b5fe71cf57f67f33f569feecb2c21e4 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 15 Aug 2024 11:21:47 +0000
Subject: [PATCH 002/245] Update API

---
 .github/workflows/test.yml                    |   2 +-
 .vscode/settings.json                         |  16 ---
 CI/ESS/e2e/config.e2e.json                    |   2 +-
 CI/ESS/e2e/cypress.config.ts                  |   2 +-
 cypress.config.ts                             |   2 +-
 scripts/local.proxy.config.json               |   2 +-
 scripts/sample_data.sh                        |   8 +-
 src/app/app-config.service.spec.ts            |   2 +-
 .../ingestor/ingestor/ingestor.component.html |  55 ++++++++-
 .../ingestor/ingestor/ingestor.component.ts   | 111 ++++++++++++++++--
 src/app/shared/sdk/lb.config.ts               |   2 +-
 src/assets/config.json                        |   2 +-
 12 files changed, 164 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 31ea6b31b6..c4c8d31d16 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -124,7 +124,7 @@ jobs:
       - name: Wait for Backend
         run: |
           npm install -g wait-on
-          wait-on http://localhost:3000/api/v3/health --timeout 200000
+          wait-on http://backend.localhost/api/v3/health --timeout 200000
 
       - name: Run Cypress tests
         uses: cypress-io/github-action@v6
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3bd83d36a2..f5f9be20e7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,20 +1,4 @@
 {
-    "workbench.colorCustomizations": {
-      "activityBar.background": "#0e3041",
-      "activityBar.foreground": "#e7e7e7",
-      "activityBar.inactiveForeground": "#e7e7e799",
-      "activityBarBadge.background": "#b82888",
-      "activityBarBadge.foreground": "#e7e7e7",
-      "titleBar.activeBackground": "#051117",
-      "titleBar.inactiveBackground": "#05111799",
-      "titleBar.activeForeground": "#e7e7e7",
-      "titleBar.inactiveForeground": "#e7e7e799",
-      "statusBar.background": "#051117",
-      "statusBarItem.hoverBackground": "#0e3041",
-      "statusBar.foreground": "#e7e7e7",
-      "activityBar.activeBackground": "#0e3041",
-      "activityBar.activeBorder": "#b82888"
-    },
     "peacock.color": "#051117",
     "editor.tabSize": 2,
     "diffEditor.wordWrap": "on",
diff --git a/CI/ESS/e2e/config.e2e.json b/CI/ESS/e2e/config.e2e.json
index 5ff1f6c9d8..a5d14bc917 100644
--- a/CI/ESS/e2e/config.e2e.json
+++ b/CI/ESS/e2e/config.e2e.json
@@ -25,7 +25,7 @@
   "jsonMetadataEnabled": true,
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
-  "lbBaseURL": "http://localhost:3000",
+  "lbBaseURL": "http://backend.localhost",
   "localColumns": [
     {
       "name": "select",
diff --git a/CI/ESS/e2e/cypress.config.ts b/CI/ESS/e2e/cypress.config.ts
index 65eb049682..0753fc83c8 100644
--- a/CI/ESS/e2e/cypress.config.ts
+++ b/CI/ESS/e2e/cypress.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "cypress";
 export default defineConfig({
   e2e: {
     baseUrl: "http://localhost:4200",
-    lbBaseUrl: "http://localhost:3000/api/v3",
+    lbBaseUrl: "http://backend.localhost/api/v3",
     lbLoginEndpoint: "/Users/login?include=user",
     lbTokenPrefix: "Bearer ",
     viewportWidth: 1280,
diff --git a/cypress.config.ts b/cypress.config.ts
index e09b065064..6640cd2b0d 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "cypress";
 export default defineConfig({
   e2e: {
     baseUrl: "http://127.0.0.1:4200",
-    lbBaseUrl: "http://localhost:3000/api/v3",
+    lbBaseUrl: "http://backend.localhost/api/v3",
     lbLoginEndpoint: "/Users/login",
     lbTokenPrefix: "Bearer ",
     viewportWidth: 1280,
diff --git a/scripts/local.proxy.config.json b/scripts/local.proxy.config.json
index ca6147ce54..c447e20553 100644
--- a/scripts/local.proxy.config.json
+++ b/scripts/local.proxy.config.json
@@ -1,6 +1,6 @@
 {
   "/api/v3/*": {
-    "target": "http://localhost:3000",
+    "target": "http://backend.localhost",
     "secure": false,
     "logLevel": "debug",
     "changeOrigin": true
diff --git a/scripts/sample_data.sh b/scripts/sample_data.sh
index 692833eb3d..727782e5ba 100755
--- a/scripts/sample_data.sh
+++ b/scripts/sample_data.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 # UPDATE ACCESS TOKEN 
-http POST http://localhost:3000/api/v3/RawDatasets?access_token=wDBhvBhKAc0OL8Hrc0WP3CcuIFSUVjEFyxF38sNHTUgHZaunDlxqxBeDOSVVJaJx < raw_dataset.json
+http POST http://backend.localhost/api/v3/RawDatasets?access_token=wDBhvBhKAc0OL8Hrc0WP3CcuIFSUVjEFyxF38sNHTUgHZaunDlxqxBeDOSVVJaJx < raw_dataset.json
 
-http POST http://localhost:3000/api/v3/Datablocks?access_token=S5GtalRhAs1jT0PJovPmv8A3QbLwoHeUoRgh3VKiqFcchULvO3zU4VYjSko589fN < datablock_two.json
+http POST http://backend.localhost/api/v3/Datablocks?access_token=S5GtalRhAs1jT0PJovPmv8A3QbLwoHeUoRgh3VKiqFcchULvO3zU4VYjSko589fN < datablock_two.json
 
-# curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d raw_dataset.json 'http://localhost:3000/api/v3/RawDatasets?access_token=QNV0Su9omZy9R6I38H7iv0aMbbWW0j7LsGvve2YoWJvif4MwyLGSSkdZ8RWsIDVq'
+# curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d raw_dataset.json 'http://backend.localhost/api/v3/RawDatasets?access_token=QNV0Su9omZy9R6I38H7iv0aMbbWW0j7LsGvve2YoWJvif4MwyLGSSkdZ8RWsIDVq'
 
-# curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d datablock.json 'http://localhost:3000/api/v3/Datablocks?access_token=QNV0Su9omZy9R6I38H7iv0aMbbWW0j7LsGvve2YoWJvif4MwyLGSSkdZ8RWsIDVq'
+# curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d datablock.json 'http://backend.localhost/api/v3/Datablocks?access_token=QNV0Su9omZy9R6I38H7iv0aMbbWW0j7LsGvve2YoWJvif4MwyLGSSkdZ8RWsIDVq'
 
 
diff --git a/src/app/app-config.service.spec.ts b/src/app/app-config.service.spec.ts
index 3a59efee6a..5956ab44fc 100644
--- a/src/app/app-config.service.spec.ts
+++ b/src/app/app-config.service.spec.ts
@@ -34,7 +34,7 @@ const appConfig: AppConfig = {
   jsonMetadataEnabled: true,
   jupyterHubUrl: "https://jupyterhub.esss.lu.se/",
   landingPage: "doi2.psi.ch/detail/",
-  lbBaseURL: "http://127.0.0.1:3000",
+  lbBaseURL: "http://backend.localhost",
   localColumns: [
     {
       name: "select",
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index 151391c679..61ab5ab393 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -4,14 +4,42 @@
       <mat-card-title>Ingestor-Connection</mat-card-title>
     </mat-card-header>
     <mat-card-content class="ingestor-vertical-layout">
-      <div>
-        <p style="color: red;">No Backend connected</p>
+      <div *ngIf="connectingToFacilityBackend">
+        <mat-progress-spinner diameter="20"
+          mode="indeterminate"></mat-progress-spinner>
+      </div>
+      <div *ngIf="!connectingToFacilityBackend">
+        <ng-container *ngIf="connectedFacilityBackend === ''">
+          <p style="color: red;">No Backend connected</p>
+
+          <p>Please provide a valid Backend URL</p>
+          <mat-form-field>
+            <input matInput placeholder="Backend URL"
+              [(ngModel)]="forwardFacilityBackend">
+          </mat-form-field>
+          <button mat-raised-button color="primary"
+            (click)="forwardToIngestorPage()">Connect</button>
+
+          <div>
+            <ul>
+              <li *ngFor="let backend of lastUsedFacilityBackends">
+                <a (click)="selectFacilityBackend(backend)">{{ backend }}</a>
+              </li>
+            </ul>
+          </div>
+
+        </ng-container>
+        <ng-container *ngIf="connectedFacilityBackend !== ''">
+          <p style="color: green;">Connected to {{ connectedFacilityBackend }}
+            <a (click)="disconnectIngestor()">change</a>
+          </p>
+        </ng-container>
       </div>
     </mat-card-content>
   </mat-card>
 </p>
 
-<p>
+<p *ngIf="connectedFacilityBackend !== ''">
   <mat-card class="ingestor-card">
     <mat-card-header>
       <mat-card-title>Ingest Dataset</mat-card-title>
@@ -26,11 +54,28 @@
         </mat-form-field>
       </div>
       <div>
-        <button mat-raised-button color="primary" (click)="upload()" [disabled]="loading">
+        <button mat-raised-button color="primary" (click)="upload()"
+          [disabled]="loading">
           <span *ngIf="!loading">Upload</span>
-          <mat-progress-spinner *ngIf="loading" diameter="20" mode="indeterminate"></mat-progress-spinner>
+          <mat-progress-spinner *ngIf="loading" diameter="20"
+            mode="indeterminate"></mat-progress-spinner>
         </button>
       </div>
     </mat-card-content>
   </mat-card>
+</p>
+
+<p *ngIf="returnValue !== ''">
+  <mat-card class="ingestor-card">
+    <mat-card-header>
+      <mat-card-title>Return Value</mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div>
+      </div>
+      <div>
+          <p>{{returnValue}}</p>
+      </div>
+    </mat-card-content>
+  </mat-card>
 </p>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index d300b87a0f..e3722a06d9 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -1,7 +1,8 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
+import { Component, OnInit, SimpleChanges, ViewChild } from "@angular/core";
 import { AppConfigService, HelpMessages } from "app-config.service";
 import { HttpClient } from '@angular/common/http';
 import { IngestorMetadataEditorComponent } from '../ingestor-metadata-editor/ingestor-metadata-editor.component';
+import { ActivatedRoute, Router } from '@angular/router';
 
 @Component({
   selector: "ingestor",
@@ -9,6 +10,7 @@ import { IngestorMetadataEditorComponent } from '../ingestor-metadata-editor/ing
   styleUrls: ["./ingestor.component.scss"],
 })
 export class IngestorComponent implements OnInit {
+
   @ViewChild(IngestorMetadataEditorComponent) metadataEditor: IngestorMetadataEditorComponent;
 
   appConfig = this.appConfigService.getConfig();
@@ -19,8 +21,13 @@ export class IngestorComponent implements OnInit {
   helpMessages: HelpMessages;
   filePath: string = '';
   loading: boolean = false;
+  forwardFacilityBackend: string = '';
+  connectedFacilityBackend: string = '';
+  connectingToFacilityBackend: boolean = false;
+  lastUsedFacilityBackends: string[] = [];
+  returnValue: string = '';
 
-  constructor(public appConfigService: AppConfigService, private http: HttpClient) {}
+  constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
 
   ngOnInit() {
     this.facility = this.appConfig.facility;
@@ -30,29 +37,115 @@ export class IngestorComponent implements OnInit {
       this.appConfig.helpMessages?.ingestManual,
     );
     this.gettingStarted = this.appConfig.gettingStarted;
+    this.connectingToFacilityBackend = true;
+    // Get the GET parameter 'backendUrl' from the URL
+    this.route.queryParams.subscribe(params => {
+      const backendUrl = params['backendUrl'];
+      if (backendUrl) {
+        this.connectToFacilityBackend(backendUrl);
+      }
+      else {
+        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackendsFromLocalStorage();
+        this.connectingToFacilityBackend = false;
+      }
+    });
+  }
+
+  connectToFacilityBackend(facilityBackendUrl: string): boolean {
+    // Store the connected facility backend URL in the local storage
+    this.storeLastUsedFacilityBackendInLocalStorage(facilityBackendUrl);
+
+    let facilityBackendUrlCleaned = facilityBackendUrl.slice();
+    // Check if last symbol is a slash and add version endpoint
+    if (facilityBackendUrlCleaned.slice(-1) !== '/') {
+      facilityBackendUrlCleaned += '/';
+    }
+
+    let facilityBackendUrlVersion = facilityBackendUrlCleaned + 'Version';
+
+    // Try to connect to the facility backend/version to check if it is available
+    console.log('Connecting to facility backend: ' + facilityBackendUrlVersion);
+    this.http.get(facilityBackendUrlVersion).subscribe(
+      response => {
+        console.log('Connected to facility backend', response);
+        // If the connection is successful, store the connected facility backend URL
+        this.connectedFacilityBackend = facilityBackendUrlCleaned;
+        this.connectingToFacilityBackend = false;
+      },
+      error => {
+        console.error('Failed to connect to facility backend', error);
+        this.connectedFacilityBackend = '';
+        this.connectingToFacilityBackend = false;
+        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackendsFromLocalStorage();
+      }
+    );
+
+    return true;
   }
 
   upload() {
     this.loading = true;
+    this.returnValue = '';
     const payload = {
-      metadata: this.metadataEditor.metadata,
-      filePath: this.filePath
+      filePath: this.filePath,
+      metaData: this.metadataEditor.metadata
     };
 
     console.log('Uploading', payload);
 
-    setTimeout(() => {
-      this.loading = false;
-    }, 2000);
-    /*this.http.post('/api/upload', payload).subscribe(
+    this.http.post(this.connectedFacilityBackend + 'Dataset/Ingest', payload).subscribe(
       response => {
         console.log('Upload successful', response);
+        this.returnValue = JSON.stringify(response);
         this.loading = false;
       },
       error => {
         console.error('Upload failed', error);
         this.loading = false;
       }
-    );*/
+    );
+  }
+
+  forwardToIngestorPage() {
+    if (this.forwardFacilityBackend) {
+      this.router.navigate(['/ingestor'], { queryParams: { backendUrl: this.forwardFacilityBackend } });
+    }
+  }
+
+  disconnectIngestor() {
+    this.returnValue = '';
+    this.connectedFacilityBackend = '';
+    // Remove the GET parameter 'backendUrl' from the URL
+    this.router.navigate(['/ingestor']);
+  }
+
+  // Helper functions
+  selectFacilityBackend(facilityBackend: string) {
+    this.forwardFacilityBackend = facilityBackend;
+  }
+
+  storeLastUsedFacilityBackendInLocalStorage(item: string) {
+    // Add the item to a list and store the list in the local Storage
+    let lastUsedFacilityBackends = this.loadLastUsedFacilityBackendsFromLocalStorage();
+    if (!lastUsedFacilityBackends) {
+      lastUsedFacilityBackends = [];
+    }
+
+    // Check if the item is already in the list, if yes ignore it
+    if (lastUsedFacilityBackends.includes(item)) {
+      return;
+    }
+
+    lastUsedFacilityBackends.push(item);
+    localStorage.setItem('lastUsedFacilityBackends', JSON.stringify(lastUsedFacilityBackends));
+  }
+
+  loadLastUsedFacilityBackendsFromLocalStorage(): string[] {
+    // Load the list from the local Storage
+    const lastUsedFacilityBackends = localStorage.getItem('lastUsedFacilityBackends');
+    if (lastUsedFacilityBackends) {
+      return JSON.parse(lastUsedFacilityBackends);
+    }
+    return [];
   }
 }
\ No newline at end of file
diff --git a/src/app/shared/sdk/lb.config.ts b/src/app/shared/sdk/lb.config.ts
index 9f8cf2b649..398216a63b 100644
--- a/src/app/shared/sdk/lb.config.ts
+++ b/src/app/shared/sdk/lb.config.ts
@@ -14,7 +14,7 @@
  *
  * export class MyApp {
  *   constructor() {
- *     LoopBackConfig.setBaseURL('http://localhost:3000');
+ *     LoopBackConfig.setBaseURL('http://backend.localhost');
  *     LoopBackConfig.setApiVersion('api');
  *   }
  * }
diff --git a/src/assets/config.json b/src/assets/config.json
index c32cf212b4..e893ad62f9 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -25,7 +25,7 @@
   "jsonMetadataEnabled": true,
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
-  "lbBaseURL": "http://127.0.0.1:3000",
+  "lbBaseURL": "http://backend.localhost",
   "localColumns": [
     {
       "name": "select",

From 5ef4b42ed37a158f303b6707b781f3b49029e036 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Mon, 2 Sep 2024 11:53:34 +0000
Subject: [PATCH 003/245] static list of backends

---
 .../ingestor/ingestor/ingestor.component.ts   | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index e3722a06d9..e2931bc54e 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -38,6 +38,7 @@ export class IngestorComponent implements OnInit {
     );
     this.gettingStarted = this.appConfig.gettingStarted;
     this.connectingToFacilityBackend = true;
+    this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
     // Get the GET parameter 'backendUrl' from the URL
     this.route.queryParams.subscribe(params => {
       const backendUrl = params['backendUrl'];
@@ -45,16 +46,12 @@ export class IngestorComponent implements OnInit {
         this.connectToFacilityBackend(backendUrl);
       }
       else {
-        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackendsFromLocalStorage();
         this.connectingToFacilityBackend = false;
       }
     });
   }
 
   connectToFacilityBackend(facilityBackendUrl: string): boolean {
-    // Store the connected facility backend URL in the local storage
-    this.storeLastUsedFacilityBackendInLocalStorage(facilityBackendUrl);
-
     let facilityBackendUrlCleaned = facilityBackendUrl.slice();
     // Check if last symbol is a slash and add version endpoint
     if (facilityBackendUrlCleaned.slice(-1) !== '/') {
@@ -76,7 +73,7 @@ export class IngestorComponent implements OnInit {
         console.error('Failed to connect to facility backend', error);
         this.connectedFacilityBackend = '';
         this.connectingToFacilityBackend = false;
-        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackendsFromLocalStorage();
+        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
       }
     );
 
@@ -124,25 +121,9 @@ export class IngestorComponent implements OnInit {
     this.forwardFacilityBackend = facilityBackend;
   }
 
-  storeLastUsedFacilityBackendInLocalStorage(item: string) {
-    // Add the item to a list and store the list in the local Storage
-    let lastUsedFacilityBackends = this.loadLastUsedFacilityBackendsFromLocalStorage();
-    if (!lastUsedFacilityBackends) {
-      lastUsedFacilityBackends = [];
-    }
-
-    // Check if the item is already in the list, if yes ignore it
-    if (lastUsedFacilityBackends.includes(item)) {
-      return;
-    }
-
-    lastUsedFacilityBackends.push(item);
-    localStorage.setItem('lastUsedFacilityBackends', JSON.stringify(lastUsedFacilityBackends));
-  }
-
-  loadLastUsedFacilityBackendsFromLocalStorage(): string[] {
+  loadLastUsedFacilityBackends(): string[] {
     // Load the list from the local Storage
-    const lastUsedFacilityBackends = localStorage.getItem('lastUsedFacilityBackends');
+    const lastUsedFacilityBackends = '["http://localhost:8000"]';
     if (lastUsedFacilityBackends) {
       return JSON.parse(lastUsedFacilityBackends);
     }

From 1864db427ec6d3106fcb27a1a32f9aee79cf0106 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Mon, 9 Sep 2024 13:07:02 +0000
Subject: [PATCH 004/245] Remove unused file path input field in ingestor
 component

---
 src/app/ingestor/ingestor/ingestor.component.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index 61ab5ab393..3d19f732df 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -48,11 +48,6 @@
       <div>
       </div>
       <app-metadata-editor></app-metadata-editor>
-      <div>
-        <mat-form-field>
-          <input matInput placeholder="File Path" [(ngModel)]="filePath">
-        </mat-form-field>
-      </div>
       <div>
         <button mat-raised-button color="primary" (click)="upload()"
           [disabled]="loading">

From ba808387551def22156ba03bcf0cf5d611bf7f80 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 12 Sep 2024 15:12:01 +0000
Subject: [PATCH 005/245] Extend ui and adjust api calls

---
 .../ingestor-metadata-editor.component.html   |  2 +-
 .../ingestor-metadata-editor.component.scss   |  3 ++
 src/app/ingestor/ingestor.module.ts           |  6 ++-
 .../ingestor/ingestor-api-endpoints.ts        |  7 ++++
 .../ingestor/ingestor/ingestor.component.html | 37 +++++++++++++++++--
 .../ingestor/ingestor/ingestor.component.scss | 11 ++++++
 .../ingestor/ingestor/ingestor.component.ts   | 29 +++++++++++++--
 7 files changed, 85 insertions(+), 10 deletions(-)
 create mode 100644 src/app/ingestor/ingestor/ingestor-api-endpoints.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
index d5ac4b7128..2e2b11f4ef 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
@@ -1,4 +1,4 @@
 <div class="ingestor-metadata-editor">
-  <textarea matInput placeholder="Edit Metadata" rows="10"
+  <textarea class="ingestor-metadata-editor" matInput placeholder="Edit Metadata" rows="10"
     [(ngModel)]="metadata"></textarea>
 </div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
index e69de29bb2..89fe8050d3 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -0,0 +1,3 @@
+.ingestor-metadata-editor {
+  width: 100%;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index a693ac724f..bd04008153 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -9,6 +9,8 @@ import { MatFormFieldModule } from "@angular/material/form-field";
 import { MatInputModule } from "@angular/material/input";
 import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
 import { FormsModule } from "@angular/forms";
+import { MatListModule } from '@angular/material/list';
+import { MatIconModule } from '@angular/material/icon';
 
 @NgModule({
   declarations: [
@@ -23,7 +25,9 @@ import { FormsModule } from "@angular/forms";
     MatInputModule, 
     MatButtonModule, 
     MatProgressSpinnerModule, 
-    RouterModule
+    RouterModule,
+    MatListModule,
+    MatIconModule
   ],
 })
 export class IngestorModule { }
diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
new file mode 100644
index 0000000000..12e3624f51
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
@@ -0,0 +1,7 @@
+export const INGESTOR_API_ENDPOINTS_V1 = {
+  DATASET: "datasets",
+  TRANSFER: "transfer",
+  OTHER: {
+    VERSION: 'version',
+  },
+};
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index 3d19f732df..a61b5ca5ba 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -30,9 +30,22 @@
 
         </ng-container>
         <ng-container *ngIf="connectedFacilityBackend !== ''">
-          <p style="color: green;">Connected to {{ connectedFacilityBackend }}
-            <a (click)="disconnectIngestor()">change</a>
-          </p>
+          <!-- Mat List with the most important information about the backend connection -->
+          <mat-list>
+            <mat-list-item>
+              <span matListItemTitle>Backend URL</span>
+              <span matListItemLine>{{ connectedFacilityBackend }} <a
+                  (click)="disconnectIngestor()">change</a></span>
+            </mat-list-item>
+            <mat-list-item>
+              <span matListItemTitle>Connection Status</span>
+              <span matListItemLine style="color: green;">Connected</span>
+            </mat-list-item>
+            <mat-list-item>
+              <span matListItemTitle>Version</span>
+              <span matListItemLine>{{ connectedFacilityBackendVersion }}</span>
+            </mat-list-item>
+          </mat-list>
         </ng-container>
       </div>
     </mat-card-content>
@@ -69,7 +82,23 @@
       <div>
       </div>
       <div>
-          <p>{{returnValue}}</p>
+        <p>{{returnValue}}</p>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</p>
+
+<p *ngIf="errorMessage !== ''">
+  <mat-card class="ingestor-card">
+    <mat-card-header class="ingestor-mixed-header">
+      <mat-card-title>Error message</mat-card-title>
+      <button mat-icon-button class="ingestor-close-button" (click)="clearErrorMessage()">
+        <mat-icon>close</mat-icon>
+      </button>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div>
+        <p style="color: red" [innerHTML]="errorMessage"></p>
       </div>
     </mat-card-content>
   </mat-card>
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index b85eb9646e..96cdeec1ba 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -2,4 +2,15 @@
   display: flex;
   flex-direction: column;
   gap: 1em;
+}
+
+/* src/app/ingestor/ingestor.component.scss */
+.ingestor-mixed-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.ingestor-close-button {
+  margin-left: auto;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index e2931bc54e..82213f95c5 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -3,6 +3,7 @@ import { AppConfigService, HelpMessages } from "app-config.service";
 import { HttpClient } from '@angular/common/http';
 import { IngestorMetadataEditorComponent } from '../ingestor-metadata-editor/ingestor-metadata-editor.component';
 import { ActivatedRoute, Router } from '@angular/router';
+import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
 
 @Component({
   selector: "ingestor",
@@ -19,12 +20,17 @@ export class IngestorComponent implements OnInit {
   gettingStarted: string | null = null;
   shoppingCartEnabled = false;
   helpMessages: HelpMessages;
+
   filePath: string = '';
   loading: boolean = false;
   forwardFacilityBackend: string = '';
+
   connectedFacilityBackend: string = '';
+  connectedFacilityBackendVersion: string = '';
   connectingToFacilityBackend: boolean = false;
   lastUsedFacilityBackends: string[] = [];
+
+  errorMessage: string = '';
   returnValue: string = '';
 
   constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
@@ -58,7 +64,7 @@ export class IngestorComponent implements OnInit {
       facilityBackendUrlCleaned += '/';
     }
 
-    let facilityBackendUrlVersion = facilityBackendUrlCleaned + 'Version';
+    let facilityBackendUrlVersion = facilityBackendUrlCleaned + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION;
 
     // Try to connect to the facility backend/version to check if it is available
     console.log('Connecting to facility backend: ' + facilityBackendUrlVersion);
@@ -68,9 +74,11 @@ export class IngestorComponent implements OnInit {
         // If the connection is successful, store the connected facility backend URL
         this.connectedFacilityBackend = facilityBackendUrlCleaned;
         this.connectingToFacilityBackend = false;
+        this.connectedFacilityBackendVersion = response['version'];
       },
       error => {
-        console.error('Failed to connect to facility backend', error);
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+        console.error('Request failed', error);
         this.connectedFacilityBackend = '';
         this.connectingToFacilityBackend = false;
         this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
@@ -90,13 +98,14 @@ export class IngestorComponent implements OnInit {
 
     console.log('Uploading', payload);
 
-    this.http.post(this.connectedFacilityBackend + 'Dataset/Ingest', payload).subscribe(
+    this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET, payload).subscribe(
       response => {
         console.log('Upload successful', response);
         this.returnValue = JSON.stringify(response);
         this.loading = false;
       },
       error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
         console.error('Upload failed', error);
         this.loading = false;
       }
@@ -105,6 +114,14 @@ export class IngestorComponent implements OnInit {
 
   forwardToIngestorPage() {
     if (this.forwardFacilityBackend) {
+      this.connectingToFacilityBackend = true;
+
+      // If current route is equal to the forward route, the router will not navigate to the new route
+      if (this.connectedFacilityBackend === this.forwardFacilityBackend) {
+        this.connectToFacilityBackend(this.forwardFacilityBackend);
+        return;
+      }
+
       this.router.navigate(['/ingestor'], { queryParams: { backendUrl: this.forwardFacilityBackend } });
     }
   }
@@ -123,10 +140,14 @@ export class IngestorComponent implements OnInit {
 
   loadLastUsedFacilityBackends(): string[] {
     // Load the list from the local Storage
-    const lastUsedFacilityBackends = '["http://localhost:8000"]';
+    const lastUsedFacilityBackends = '["http://localhost:8000", "http://localhost:8888"]';
     if (lastUsedFacilityBackends) {
       return JSON.parse(lastUsedFacilityBackends);
     }
     return [];
   }
+
+  clearErrorMessage(): void {
+    this.errorMessage = '';
+  }
 }
\ No newline at end of file

From 80d60bdaa27f0d4edc27d672070543991ef03342 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 12 Sep 2024 15:19:05 +0000
Subject: [PATCH 006/245] Change back to localhost:3000 instead of
 backend.localhost

---
 .github/workflows/test.yml         | 2 +-
 CI/ESS/e2e/config.e2e.json         | 2 +-
 CI/ESS/e2e/cypress.config.ts       | 2 +-
 cypress.config.ts                  | 2 +-
 scripts/local.proxy.config.json    | 2 +-
 scripts/sample_data.sh             | 8 ++++----
 src/app/app-config.service.spec.ts | 2 +-
 src/app/shared/sdk/lb.config.ts    | 2 +-
 src/assets/config.json             | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ccd2e6df40..223e5bca8d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -124,7 +124,7 @@ jobs:
       - name: Wait for Backend
         run: |
           npm install -g wait-on
-          wait-on http://backend.localhost/api/v3/health --timeout 200000
+          wait-on http://localhost:3000/api/v3/health --timeout 200000
 
       - name: Run Cypress tests
         uses: cypress-io/github-action@v6
diff --git a/CI/ESS/e2e/config.e2e.json b/CI/ESS/e2e/config.e2e.json
index a5d14bc917..5ff1f6c9d8 100644
--- a/CI/ESS/e2e/config.e2e.json
+++ b/CI/ESS/e2e/config.e2e.json
@@ -25,7 +25,7 @@
   "jsonMetadataEnabled": true,
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
-  "lbBaseURL": "http://backend.localhost",
+  "lbBaseURL": "http://localhost:3000",
   "localColumns": [
     {
       "name": "select",
diff --git a/CI/ESS/e2e/cypress.config.ts b/CI/ESS/e2e/cypress.config.ts
index 7b82107959..3d875e105e 100644
--- a/CI/ESS/e2e/cypress.config.ts
+++ b/CI/ESS/e2e/cypress.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "cypress";
 export default defineConfig({
   e2e: {
     baseUrl: "http://localhost:4200",
-    lbBaseUrl: "http://backend.localhost/api/v3",
+    lbBaseUrl: "http://localhost:3000/api/v3",
     lbLoginEndpoint: "/Users/login?include=user",
     lbTokenPrefix: "Bearer ",
     viewportWidth: 1280,
diff --git a/cypress.config.ts b/cypress.config.ts
index 59f2aaafc9..e19f1c8b9c 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "cypress";
 export default defineConfig({
   e2e: {
     baseUrl: "http://127.0.0.1:4200",
-    lbBaseUrl: "http://backend.localhost/api/v3",
+    lbBaseUrl: "http://localhost:3000/api/v3",
     lbLoginEndpoint: "/Users/login",
     lbTokenPrefix: "Bearer ",
     viewportWidth: 1280,
diff --git a/scripts/local.proxy.config.json b/scripts/local.proxy.config.json
index c447e20553..ca6147ce54 100644
--- a/scripts/local.proxy.config.json
+++ b/scripts/local.proxy.config.json
@@ -1,6 +1,6 @@
 {
   "/api/v3/*": {
-    "target": "http://backend.localhost",
+    "target": "http://localhost:3000",
     "secure": false,
     "logLevel": "debug",
     "changeOrigin": true
diff --git a/scripts/sample_data.sh b/scripts/sample_data.sh
index 727782e5ba..692833eb3d 100755
--- a/scripts/sample_data.sh
+++ b/scripts/sample_data.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 # UPDATE ACCESS TOKEN 
-http POST http://backend.localhost/api/v3/RawDatasets?access_token=wDBhvBhKAc0OL8Hrc0WP3CcuIFSUVjEFyxF38sNHTUgHZaunDlxqxBeDOSVVJaJx < raw_dataset.json
+http POST http://localhost:3000/api/v3/RawDatasets?access_token=wDBhvBhKAc0OL8Hrc0WP3CcuIFSUVjEFyxF38sNHTUgHZaunDlxqxBeDOSVVJaJx < raw_dataset.json
 
-http POST http://backend.localhost/api/v3/Datablocks?access_token=S5GtalRhAs1jT0PJovPmv8A3QbLwoHeUoRgh3VKiqFcchULvO3zU4VYjSko589fN < datablock_two.json
+http POST http://localhost:3000/api/v3/Datablocks?access_token=S5GtalRhAs1jT0PJovPmv8A3QbLwoHeUoRgh3VKiqFcchULvO3zU4VYjSko589fN < datablock_two.json
 
-# curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d raw_dataset.json 'http://backend.localhost/api/v3/RawDatasets?access_token=QNV0Su9omZy9R6I38H7iv0aMbbWW0j7LsGvve2YoWJvif4MwyLGSSkdZ8RWsIDVq'
+# curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d raw_dataset.json 'http://localhost:3000/api/v3/RawDatasets?access_token=QNV0Su9omZy9R6I38H7iv0aMbbWW0j7LsGvve2YoWJvif4MwyLGSSkdZ8RWsIDVq'
 
-# curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d datablock.json 'http://backend.localhost/api/v3/Datablocks?access_token=QNV0Su9omZy9R6I38H7iv0aMbbWW0j7LsGvve2YoWJvif4MwyLGSSkdZ8RWsIDVq'
+# curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' -d datablock.json 'http://localhost:3000/api/v3/Datablocks?access_token=QNV0Su9omZy9R6I38H7iv0aMbbWW0j7LsGvve2YoWJvif4MwyLGSSkdZ8RWsIDVq'
 
 
diff --git a/src/app/app-config.service.spec.ts b/src/app/app-config.service.spec.ts
index e3310ebca4..a043999e8b 100644
--- a/src/app/app-config.service.spec.ts
+++ b/src/app/app-config.service.spec.ts
@@ -34,7 +34,7 @@ const appConfig: AppConfig = {
   jsonMetadataEnabled: true,
   jupyterHubUrl: "https://jupyterhub.esss.lu.se/",
   landingPage: "doi2.psi.ch/detail/",
-  lbBaseURL: "http://backend.localhost",
+  lbBaseURL: "http://localhost:3000",
   localColumns: [
     {
       name: "select",
diff --git a/src/app/shared/sdk/lb.config.ts b/src/app/shared/sdk/lb.config.ts
index 398216a63b..9f8cf2b649 100644
--- a/src/app/shared/sdk/lb.config.ts
+++ b/src/app/shared/sdk/lb.config.ts
@@ -14,7 +14,7 @@
  *
  * export class MyApp {
  *   constructor() {
- *     LoopBackConfig.setBaseURL('http://backend.localhost');
+ *     LoopBackConfig.setBaseURL('http://localhost:3000');
  *     LoopBackConfig.setApiVersion('api');
  *   }
  * }
diff --git a/src/assets/config.json b/src/assets/config.json
index d2a42303f0..c41fd6c041 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -25,7 +25,7 @@
   "jsonMetadataEnabled": true,
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
-  "lbBaseURL": "http://backend.localhost",
+  "lbBaseURL": "http://localhost:3000",
   "localColumns": [
     {
       "name": "select",

From 27a65441c80270c95ef61abc827be8a72677d48e Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 12 Sep 2024 15:34:59 +0000
Subject: [PATCH 007/245] Change back the files to original state

---
 .vscode/settings.json              | 16 ++++++++++++++++
 src/app/app-config.service.spec.ts |  2 +-
 src/assets/config.json             |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index f5f9be20e7..3bd83d36a2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,20 @@
 {
+    "workbench.colorCustomizations": {
+      "activityBar.background": "#0e3041",
+      "activityBar.foreground": "#e7e7e7",
+      "activityBar.inactiveForeground": "#e7e7e799",
+      "activityBarBadge.background": "#b82888",
+      "activityBarBadge.foreground": "#e7e7e7",
+      "titleBar.activeBackground": "#051117",
+      "titleBar.inactiveBackground": "#05111799",
+      "titleBar.activeForeground": "#e7e7e7",
+      "titleBar.inactiveForeground": "#e7e7e799",
+      "statusBar.background": "#051117",
+      "statusBarItem.hoverBackground": "#0e3041",
+      "statusBar.foreground": "#e7e7e7",
+      "activityBar.activeBackground": "#0e3041",
+      "activityBar.activeBorder": "#b82888"
+    },
     "peacock.color": "#051117",
     "editor.tabSize": 2,
     "diffEditor.wordWrap": "on",
diff --git a/src/app/app-config.service.spec.ts b/src/app/app-config.service.spec.ts
index a043999e8b..4538eea22c 100644
--- a/src/app/app-config.service.spec.ts
+++ b/src/app/app-config.service.spec.ts
@@ -34,7 +34,7 @@ const appConfig: AppConfig = {
   jsonMetadataEnabled: true,
   jupyterHubUrl: "https://jupyterhub.esss.lu.se/",
   landingPage: "doi2.psi.ch/detail/",
-  lbBaseURL: "http://localhost:3000",
+  lbBaseURL: "http://127.0.0.1:3000",
   localColumns: [
     {
       name: "select",
diff --git a/src/assets/config.json b/src/assets/config.json
index c41fd6c041..759ea95070 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -25,7 +25,7 @@
   "jsonMetadataEnabled": true,
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
-  "lbBaseURL": "http://localhost:3000",
+  "lbBaseURL": "http://127.0.0.1:3000",
   "localColumns": [
     {
       "name": "select",

From 03738a9bbf1759b3f19a2983e2b08cb36ad0d8d0 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Wed, 18 Sep 2024 15:25:39 +0000
Subject: [PATCH 008/245] fix ingestor endpoint

---
 src/app/ingestor/ingestor/ingestor-api-endpoints.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
index 12e3624f51..aa0ee1e755 100644
--- a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
+++ b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
@@ -1,5 +1,5 @@
 export const INGESTOR_API_ENDPOINTS_V1 = {
-  DATASET: "datasets",
+  DATASET: "dataset",
   TRANSFER: "transfer",
   OTHER: {
     VERSION: 'version',

From ff6bed97dffc66b31cc0dc881107c2b22cf8f2c1 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Wed, 18 Sep 2024 15:34:24 +0000
Subject: [PATCH 009/245] fix sonarcube issues

---
 src/app/ingestor/ingestor/ingestor.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 82213f95c5..99cf89e0f0 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, SimpleChanges, ViewChild } from "@angular/core";
+import { Component, OnInit, ViewChild } from "@angular/core";
 import { AppConfigService, HelpMessages } from "app-config.service";
 import { HttpClient } from '@angular/common/http';
 import { IngestorMetadataEditorComponent } from '../ingestor-metadata-editor/ingestor-metadata-editor.component';
@@ -60,7 +60,7 @@ export class IngestorComponent implements OnInit {
   connectToFacilityBackend(facilityBackendUrl: string): boolean {
     let facilityBackendUrlCleaned = facilityBackendUrl.slice();
     // Check if last symbol is a slash and add version endpoint
-    if (facilityBackendUrlCleaned.slice(-1) !== '/') {
+    if (!facilityBackendUrlCleaned.endsWith('/')) {
       facilityBackendUrlCleaned += '/';
     }
 

From dd61bdde3fcedf803267eda5594de288df40e786 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 3 Oct 2024 13:14:03 +0000
Subject: [PATCH 010/245] Prepare showing the transfer list

---
 .../ingestor-metadata-editor.component.ts     | 15 +--
 src/app/ingestor/ingestor.module.ts           |  6 +-
 .../ingestor/ingestor/ingestor.component.html | 92 +++++++++++++++----
 .../ingestor/ingestor/ingestor.component.ts   | 57 +++++++++++-
 4 files changed, 139 insertions(+), 31 deletions(-)

diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 19b7d76c4a..d9cd5b12bb 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -8,11 +8,14 @@ import { Component, EventEmitter, Output } from '@angular/core';
 export class IngestorMetadataEditorComponent {
   metadata: string = '';
 
-    // Optional: EventEmitter, um Änderungen an der Metadata zu melden
-    @Output() metadataChange = new EventEmitter<string>();
+  clearMetadata() {
+    this.metadata = '';
+  }
+  // Optional: EventEmitter, um Änderungen an der Metadata zu melden
+  @Output() metadataChange = new EventEmitter<string>();
 
-    onMetadataChange(newMetadata: string) {
-      this.metadata = newMetadata;
-      this.metadataChange.emit(this.metadata);
-    }
+  onMetadataChange(newMetadata: string) {
+    this.metadata = newMetadata;
+    this.metadataChange.emit(this.metadata);
+  }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index bd04008153..febb5625ce 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -11,6 +11,8 @@ import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
 import { FormsModule } from "@angular/forms";
 import { MatListModule } from '@angular/material/list';
 import { MatIconModule } from '@angular/material/icon';
+import { MatTabsModule } from "@angular/material/tabs";
+import { MatTableModule } from "@angular/material/table";
 
 @NgModule({
   declarations: [
@@ -27,7 +29,9 @@ import { MatIconModule } from '@angular/material/icon';
     MatProgressSpinnerModule, 
     RouterModule,
     MatListModule,
-    MatIconModule
+    MatIconModule,
+    MatTabsModule,
+    MatTableModule,
   ],
 })
 export class IngestorModule { }
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index a61b5ca5ba..b458d1edda 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -1,7 +1,7 @@
 <p>
   <mat-card class="ingestor-card">
     <mat-card-header>
-      <mat-card-title>Ingestor-Connection</mat-card-title>
+      <mat-card-title>Control center</mat-card-title>
     </mat-card-header>
     <mat-card-content class="ingestor-vertical-layout">
       <div *ngIf="connectingToFacilityBackend">
@@ -30,29 +30,80 @@
 
         </ng-container>
         <ng-container *ngIf="connectedFacilityBackend !== ''">
-          <!-- Mat List with the most important information about the backend connection -->
-          <mat-list>
-            <mat-list-item>
-              <span matListItemTitle>Backend URL</span>
-              <span matListItemLine>{{ connectedFacilityBackend }} <a
-                  (click)="disconnectIngestor()">change</a></span>
-            </mat-list-item>
-            <mat-list-item>
-              <span matListItemTitle>Connection Status</span>
-              <span matListItemLine style="color: green;">Connected</span>
-            </mat-list-item>
-            <mat-list-item>
-              <span matListItemTitle>Version</span>
-              <span matListItemLine>{{ connectedFacilityBackendVersion }}</span>
-            </mat-list-item>
-          </mat-list>
+          <mat-tab-group animationDuration="0ms">
+            <mat-tab label="Transfers">
+              <button mat-button aria-label="Refresh transfer list"
+                (click)="onRefreshTransferList()">
+                <mat-icon>refresh</mat-icon>
+              </button>
+              <table mat-table [dataSource]="transferDataSource"
+                class="mat-elevation-z8">
+                <ng-container matColumnDef="transferId">
+                  <th mat-header-cell *matHeaderCellDef><b>ID</b> </th>
+                  <td mat-cell *matCellDef="let element"> {{element.transferId}}
+                  </td>
+                </ng-container>
+
+                <ng-container matColumnDef="status">
+                  <th mat-header-cell *matHeaderCellDef><b>Status</b> </th>
+                  <td mat-cell *matCellDef="let element"> {{element.status}}
+                  </td>
+                </ng-container>
+
+                <ng-container matColumnDef="actions">
+                  <th mat-header-cell *matHeaderCellDef class="text-right"> <b>Action</b> </th>
+                  <td mat-cell *matCellDef="let element" class="text-right">
+                  <button mat-button aria-label="Delete transfer"
+                    (click)="onCancelTransfer(element.transferId)">
+                    <mat-icon>delete</mat-icon>
+                  </button>
+                  <button mat-button aria-label="Pause transfer">
+                    <mat-icon>pause_circle</mat-icon>
+                  </button>
+                  </td>
+                </ng-container>
+
+                <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+                <tr mat-row *matRowDef="let row; columns: displayedColumns;">
+                </tr>
+              </table>
+            </mat-tab>
+            <mat-tab label="Connection information">
+              <!-- Mat List with the most important information about the backend connection -->
+              <mat-list>
+                <mat-list-item>
+                  <span matListItemTitle>Backend URL</span>
+                  <span matListItemLine>{{ connectedFacilityBackend }} <a
+                      (click)="disconnectIngestor()">change</a></span>
+                </mat-list-item>
+                <mat-list-item>
+                  <span matListItemTitle>Connection Status</span>
+                  <span matListItemLine style="color: green;">Connected</span>
+                </mat-list-item>
+                <mat-list-item>
+                  <span matListItemTitle>Version</span>
+                  <span matListItemLine>{{ connectedFacilityBackendVersion
+                    }}</span>
+                </mat-list-item>
+              </mat-list>
+            </mat-tab>
+            <mat-tab label="Settings">
+              Todo
+            </mat-tab>
+          </mat-tab-group>
+
+          <br><br>
+          <button mat-fab aria-label="Add a new dataset transfer"
+            color="primary" (click)="openNewTransferDialog()">
+            <mat-icon>add</mat-icon>
+          </button><i>Create new transfer</i>
         </ng-container>
       </div>
     </mat-card-content>
   </mat-card>
 </p>
 
-<p *ngIf="connectedFacilityBackend !== ''">
+<p *ngIf="connectedFacilityBackend !== '' && createNewTransfer">
   <mat-card class="ingestor-card">
     <mat-card-header>
       <mat-card-title>Ingest Dataset</mat-card-title>
@@ -62,7 +113,7 @@
       </div>
       <app-metadata-editor></app-metadata-editor>
       <div>
-        <button mat-raised-button color="primary" (click)="upload()"
+        <button mat-raised-button color="primary" (click)="apiUpload()"
           [disabled]="loading">
           <span *ngIf="!loading">Upload</span>
           <mat-progress-spinner *ngIf="loading" diameter="20"
@@ -92,7 +143,8 @@
   <mat-card class="ingestor-card">
     <mat-card-header class="ingestor-mixed-header">
       <mat-card-title>Error message</mat-card-title>
-      <button mat-icon-button class="ingestor-close-button" (click)="clearErrorMessage()">
+      <button mat-icon-button class="ingestor-close-button"
+        (click)="clearErrorMessage()">
         <mat-icon>close</mat-icon>
       </button>
     </mat-card-header>
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 99cf89e0f0..55d4200fce 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -5,6 +5,11 @@ import { IngestorMetadataEditorComponent } from '../ingestor-metadata-editor/ing
 import { ActivatedRoute, Router } from '@angular/router';
 import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
 
+interface TransferDataListEntry {
+  transferId: string;
+  status: string;
+}
+
 @Component({
   selector: "ingestor",
   templateUrl: "./ingestor.component.html",
@@ -25,10 +30,13 @@ export class IngestorComponent implements OnInit {
   loading: boolean = false;
   forwardFacilityBackend: string = '';
 
+  createNewTransfer: boolean = false;
   connectedFacilityBackend: string = '';
   connectedFacilityBackendVersion: string = '';
   connectingToFacilityBackend: boolean = false;
   lastUsedFacilityBackends: string[] = [];
+  transferDataSource: TransferDataListEntry[] = []; // List of files to be transferred
+  displayedColumns: string[] = ['transferId', 'status', 'actions'];
 
   errorMessage: string = '';
   returnValue: string = '';
@@ -44,12 +52,14 @@ export class IngestorComponent implements OnInit {
     );
     this.gettingStarted = this.appConfig.gettingStarted;
     this.connectingToFacilityBackend = true;
+    this.createNewTransfer = false;
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+    this.transferDataSource = [];
     // Get the GET parameter 'backendUrl' from the URL
     this.route.queryParams.subscribe(params => {
       const backendUrl = params['backendUrl'];
       if (backendUrl) {
-        this.connectToFacilityBackend(backendUrl);
+        this.apiConnectToFacilityBackend(backendUrl);
       }
       else {
         this.connectingToFacilityBackend = false;
@@ -57,7 +67,7 @@ export class IngestorComponent implements OnInit {
     });
   }
 
-  connectToFacilityBackend(facilityBackendUrl: string): boolean {
+  apiConnectToFacilityBackend(facilityBackendUrl: string): boolean {
     let facilityBackendUrlCleaned = facilityBackendUrl.slice();
     // Check if last symbol is a slash and add version endpoint
     if (!facilityBackendUrlCleaned.endsWith('/')) {
@@ -88,7 +98,23 @@ export class IngestorComponent implements OnInit {
     return true;
   }
 
-  upload() {
+  async apiGetTransferList(): Promise<TransferDataListEntry[]> {
+    await this.http.get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER).subscribe(
+      response => {
+        console.log('Transfer list received', response);
+        return response['transfers'];
+      },
+      error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+        console.error('Request failed', error);
+        return [];
+      }
+    );
+
+    return [];
+  }
+
+  apiUpload() {
     this.loading = true;
     this.returnValue = '';
     const payload = {
@@ -118,7 +144,7 @@ export class IngestorComponent implements OnInit {
 
       // If current route is equal to the forward route, the router will not navigate to the new route
       if (this.connectedFacilityBackend === this.forwardFacilityBackend) {
-        this.connectToFacilityBackend(this.forwardFacilityBackend);
+        this.apiConnectToFacilityBackend(this.forwardFacilityBackend);
         return;
       }
 
@@ -150,4 +176,27 @@ export class IngestorComponent implements OnInit {
   clearErrorMessage(): void {
     this.errorMessage = '';
   }
+
+  openNewTransferDialog(): void {
+    this.createNewTransfer = true;
+    this.metadataEditor.clearMetadata();
+  }
+
+  onRefreshTransferList(): void {
+    const TEST_DATALIST: TransferDataListEntry[] = [
+      { transferId: '1', status: 'In progress' },
+      { transferId: '2', status: 'Done' },
+      { transferId: '3', status: 'Failed' },
+    ];
+
+    this.transferDataSource = TEST_DATALIST;
+    console.log(this.transferDataSource);
+    // TODO activate when the API is ready
+    //this.apiGetTransferList();
+  }
+
+  onCancelTransfer(transferId: string) {
+    console.log('Cancel transfer', transferId);
+    // TODO activate when the API is ready
+  }
 }
\ No newline at end of file

From cd3f6b375891928268bda061c069dfd6169ab92d Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 28 Nov 2024 07:12:09 +0000
Subject: [PATCH 011/245] json-forms poc

---
 package.json                                  |   2 +
 .../ingestor-metadata-editor-helper.ts        |  53 +++
 .../ingestor-metadata-editor-schematest.ts    | 421 ++++++++++++++++++
 .../ingestor-metadata-editor.component.ts     |  38 +-
 src/app/ingestor/ingestor.module.ts           |  24 +-
 .../ingestor.confirm-transfer-dialog.html     |  21 +
 .../ingestor.confirm-transfer-dialog.ts       |  27 ++
 .../ingestor.dialog-stepper.component.css     |  17 +
 .../ingestor.dialog-stepper.component.html    |  16 +
 .../ingestor.dialog-stepper.component.ts      |  10 +
 .../ingestor.extractor-metadata-dialog.html   |  17 +
 .../ingestor.extractor-metadata-dialog.ts     |  27 ++
 .../dialog/ingestor.new-transfer-dialog.html  |  37 ++
 .../dialog/ingestor.new-transfer-dialog.ts    |  35 ++
 .../dialog/ingestor.user-metadata-dialog.html |  46 ++
 .../dialog/ingestor.user-metadata-dialog.ts   |  40 ++
 .../ingestor/ingestor-api-endpoints.ts        |   1 +
 .../ingestor/ingestor/ingestor.component.html |  53 +--
 .../ingestor/ingestor/ingestor.component.scss |  54 ++-
 .../ingestor/ingestor/ingestor.component.ts   | 137 ++++--
 20 files changed, 980 insertions(+), 96 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.ts

diff --git a/package.json b/package.json
index 3ec659024a..0a28ad1979 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,8 @@
     "@angular/platform-server": "^16",
     "@angular/router": "^16",
     "@angular/service-worker": "^16",
+    "@jsonforms/angular": "^3.2.1",
+    "@jsonforms/angular-material": "^3.2.1",
     "@ngbracket/ngx-layout": "^16.0.0",
     "@ngrx/effects": "^16",
     "@ngrx/router-store": "^16",
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
new file mode 100644
index 0000000000..632419f9cd
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -0,0 +1,53 @@
+export interface Schema {
+  type?: string;
+  properties?: {
+    [key: string]: {
+      type: string;
+      format?: string;
+      enum?: string[];
+      minLength?: number;
+    };
+  };
+  required?: string[];
+}
+
+export interface UISchema {
+  type: string;
+  elements: { type: string; scope: string; label?: boolean }[];
+}
+
+export class IngestorMetadaEditorHelper {
+  static generateUISchemaFromSchema(schema: string): UISchema {
+    const parsedSchema: Schema = JSON.parse(schema);
+    
+    const flattenProperties = (properties: any, parentKey: string = ''): any[] => {
+      return Object.keys(properties).reduce((acc, key) => {
+        const property = properties[key];
+        const fullKey = parentKey ? `${parentKey}.${key}` : key;
+
+        if (property.type === 'object' && property.properties) {
+          acc.push({
+            type: 'Label',
+            text: key.charAt(0).toUpperCase() + key.slice(1)
+          });
+          acc.push(...flattenProperties(property.properties, fullKey));
+        } else {
+          acc.push({
+            type: 'Control',
+            scope: `#/properties/${fullKey}`,
+            label: parsedSchema.required && parsedSchema.required.includes(key) ? true : undefined
+          });
+        }
+
+        return acc;
+      }, []);
+    };
+
+    const uischema = {
+      type: 'VerticalLayout',
+      elements: flattenProperties(parsedSchema.properties)
+    };
+    
+    return uischema;
+  }
+};
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
new file mode 100644
index 0000000000..8ed4d8d0ea
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
@@ -0,0 +1,421 @@
+export const schema_mask2 = {
+  type: 'object',
+  properties: {
+    id: {
+      type: 'string',
+    },
+    title: {
+      type: 'string',
+    },
+    description: {
+      type: 'string',
+    },
+    status: {
+      type: 'string',
+      enum: ['active', 'completed', 'archived'],
+    },
+    priority: {
+      type: 'integer',
+      minimum: 1,
+      maximum: 5,
+    },
+    first_name: {
+      type: 'string',
+      description: 'first name',
+    },
+    work_status: {
+      type: 'boolean',
+      description: 'work status',
+    },
+    email: {
+      type: 'string',
+      description: 'email',
+      pattern: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$',
+    },
+    work_phone: {
+      type: 'string',
+      description: 'work phone',
+    },
+    name: {
+      type: 'string',
+      description: 'name',
+    },
+    name_org: {
+      type: 'string',
+      description: 'Name of the organization',
+    },
+    type_org: {
+      type: 'string',
+      description: 'Type of organization, academic, commercial, governmental, etc.',
+      enum: ['Academic', 'Commercial', 'Government', 'Other'],
+    },
+    country: {
+      type: 'string',
+      description: 'Country of the institution',
+    },
+    role: {
+      type: 'string',
+      description: 'Role of the author, for example principal investigator',
+    },
+    orcid: {
+      type: 'string',
+      description: 'ORCID of the author, a type of unique identifier',
+    },
+    funder_name: {
+      type: 'string',
+      description: 'funding organization/person.',
+    },
+    start_date: {
+      type: 'string',
+      format: 'date',
+      description: 'start date',
+    },
+    end_date: {
+      type: 'string',
+      format: 'date',
+      description: 'end date',
+    },
+    budget: {
+      type: 'number',
+      description: 'budget',
+    },
+    project_id: {
+      type: 'string',
+      description: 'project id',
+    },
+    grants: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          grant_name: {
+            type: 'string',
+            description: 'name of the grant',
+          },
+          start_date: {
+            type: 'string',
+            format: 'date',
+            description: 'start date',
+          },
+          end_date: {
+            type: 'string',
+            format: 'date',
+            description: 'end date',
+          },
+          budget: {
+            type: 'number',
+            description: 'budget',
+          },
+          project_id: {
+            type: 'string',
+            description: 'project id',
+          },
+          country: {
+            type: 'string',
+            description: 'Country of the institution',
+          },
+        },
+      },
+      description: 'List of grants associated with the project',
+    },
+    authors: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          first_name: {
+            type: 'string',
+            description: 'first name',
+          },
+          work_status: {
+            type: 'boolean',
+            description: 'work status',
+          },
+          email: {
+            type: 'string',
+            description: 'email',
+            pattern: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$',
+          },
+          work_phone: {
+            type: 'string',
+            description: 'work phone',
+          },
+          name: {
+            type: 'string',
+            description: 'name',
+          },
+          name_org: {
+            type: 'string',
+            description: 'Name of the organization',
+          },
+          type_org: {
+            type: 'string',
+            description: 'Type of organization, academic, commercial, governmental, etc.',
+            enum: ['Academic', 'Commercial', 'Government', 'Other'],
+          },
+          country: {
+            type: 'string',
+            description: 'Country of the institution',
+          },
+          role: {
+            type: 'string',
+            description: 'Role of the author, for example principal investigator',
+          },
+          orcid: {
+            type: 'string',
+            description: 'ORCID of the author, a type of unique identifier',
+          },
+        },
+      },
+      description: 'List of authors associated with the project',
+    },
+    instruments: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          microscope: {
+            type: 'string',
+            description: 'Name/Type of the Microscope',
+          },
+          illumination: {
+            type: 'string',
+            description: 'Mode of illumination used during data collection',
+          },
+          imaging: {
+            type: 'string',
+            description: 'Mode of imaging used during data collection',
+          },
+          electron_source: {
+            type: 'string',
+            description: 'Type of electron source used in the microscope, such as FEG',
+          },
+          acceleration_voltage: {
+            type: 'number',
+            description: 'Voltage used for the electron acceleration, in kV',
+          },
+          c2_aperture: {
+            type: 'number',
+            description: 'C2 aperture size used in data acquisition, in µm',
+          },
+          cs: {
+            type: 'number',
+            description: 'Spherical aberration of the instrument, in mm',
+          },
+        },
+      },
+      description: 'List of instruments used in the project',
+    },
+    organizational: {
+      type: 'object',
+      properties: {
+        id: {
+          type: 'string',
+        },
+        title: {
+          type: 'string',
+        },
+        description: {
+          type: 'string',
+        },
+        status: {
+          type: 'string',
+          enum: ['active', 'completed', 'archived'],
+        },
+        priority: {
+          type: 'integer',
+          minimum: 1,
+          maximum: 5,
+        },
+        first_name: {
+          type: 'string',
+          description: 'first name',
+        },
+        work_status: {
+          type: 'boolean',
+          description: 'work status',
+        },
+        email: {
+          type: 'string',
+          description: 'email',
+          pattern: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$',
+        },
+        work_phone: {
+          type: 'string',
+          description: 'work phone',
+        },
+        name: {
+          type: 'string',
+          description: 'name',
+        },
+        name_org: {
+          type: 'string',
+          description: 'Name of the organization',
+        },
+        type_org: {
+          type: 'string',
+          description: 'Type of organization, academic, commercial, governmental, etc.',
+          enum: ['Academic', 'Commercial', 'Government', 'Other'],
+        },
+        country: {
+          type: 'string',
+          description: 'Country of the institution',
+        },
+        role: {
+          type: 'string',
+          description: 'Role of the author, for example principal investigator',
+        },
+        orcid: {
+          type: 'string',
+          description: 'ORCID of the author, a type of unique identifier',
+        },
+        funder_name: {
+          type: 'string',
+          description: 'funding organization/person.',
+        },
+        start_date: {
+          type: 'string',
+          format: 'date',
+          description: 'start date',
+        },
+        end_date: {
+          type: 'string',
+          format: 'date',
+          description: 'end date',
+        },
+        budget: {
+          type: 'number',
+          description: 'budget',
+        },
+        project_id: {
+          type: 'string',
+          description: 'project id',
+        },
+        grants: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              grant_name: {
+                type: 'string',
+                description: 'name of the grant',
+              },
+              start_date: {
+                type: 'string',
+                format: 'date',
+                description: 'start date',
+              },
+              end_date: {
+                type: 'string',
+                format: 'date',
+                description: 'end date',
+              },
+              budget: {
+                type: 'number',
+                description: 'budget',
+              },
+              project_id: {
+                type: 'string',
+                description: 'project id',
+              },
+              country: {
+                type: 'string',
+                description: 'Country of the institution',
+              },
+            },
+          },
+          description: 'List of grants associated with the project',
+        },
+        authors: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              first_name: {
+                type: 'string',
+                description: 'first name',
+              },
+              work_status: {
+                type: 'boolean',
+                description: 'work status',
+              },
+              email: {
+                type: 'string',
+                description: 'email',
+                pattern: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$',
+              },
+              work_phone: {
+                type: 'string',
+                description: 'work phone',
+              },
+              name: {
+                type: 'string',
+                description: 'name',
+              },
+              name_org: {
+                type: 'string',
+                description: 'Name of the organization',
+              },
+              type_org: {
+                type: 'string',
+                description: 'Type of organization, academic, commercial, governmental, etc.',
+                enum: ['Academic', 'Commercial', 'Government', 'Other'],
+              },
+              country: {
+                type: 'string',
+                description: 'Country of the institution',
+              },
+              role: {
+                type: 'string',
+                description: 'Role of the author, for example principal investigator',
+              },
+              orcid: {
+                type: 'string',
+                description: 'ORCID of the author, a type of unique identifier',
+              },
+            },
+          },
+          description: 'List of authors associated with the project',
+        },
+        instruments: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              microscope: {
+                type: 'string',
+                description: 'Name/Type of the Microscope',
+              },
+              illumination: {
+                type: 'string',
+                description: 'Mode of illumination used during data collection',
+              },
+              imaging: {
+                type: 'string',
+                description: 'Mode of imaging used during data collection',
+              },
+              electron_source: {
+                type: 'string',
+                description: 'Type of electron source used in the microscope, such as FEG',
+              },
+              acceleration_voltage: {
+                type: 'number',
+                description: 'Voltage used for the electron acceleration, in kV',
+              },
+              c2_aperture: {
+                type: 'number',
+                description: 'C2 aperture size used in data acquisition, in µm',
+              },
+              cs: {
+                type: 'number',
+                description: 'Spherical aberration of the instrument, in mm',
+              },
+            },
+          },
+          description: 'List of instruments used in the project',
+        },
+      },
+    },
+  },
+  required: ['id', 'title', 'status', 'name', 'email', 'work_phone', 'orcid', 'country', 'type_org', 'name_org'],
+};
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index d9cd5b12bb..56b2a9fc35 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -1,21 +1,35 @@
-import { Component, EventEmitter, Output } from '@angular/core';
+import { Component, EventEmitter, Output, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { angularMaterialRenderers } from '@jsonforms/angular-material';
+import { IngestorMetadaEditorHelper, Schema, UISchema } from './ingestor-metadata-editor-helper';
 
 @Component({
   selector: 'app-metadata-editor',
-  templateUrl: './ingestor-metadata-editor.component.html',
-  styleUrls: ['./ingestor-metadata-editor.component.scss']
+  template: `<jsonforms
+  [data]="data"
+  [schema]="schema"
+  [uischema]="uischema"
+  [renderers]="renderers"
+  (dataChange)="onDataChange($event)"
+></jsonforms>`,
 })
-export class IngestorMetadataEditorComponent {
-  metadata: string = '';
 
-  clearMetadata() {
-    this.metadata = '';
+export class IngestorMetadataEditorComponent implements OnChanges {
+  @Input() data: string;
+  @Input() schema: Schema;
+
+  @Output() dataChange = new EventEmitter<string>();
+
+  renderers = angularMaterialRenderers;
+
+  uischema: UISchema;
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes.schema) {
+      this.uischema = IngestorMetadaEditorHelper.generateUISchemaFromSchema(JSON.stringify(this.schema));
+    }
   }
-  // Optional: EventEmitter, um Änderungen an der Metadata zu melden
-  @Output() metadataChange = new EventEmitter<string>();
 
-  onMetadataChange(newMetadata: string) {
-    this.metadata = newMetadata;
-    this.metadataChange.emit(this.metadata);
+  onDataChange(event: any) {
+    this.dataChange.emit(event);
   }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index febb5625ce..c2248030ec 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -13,11 +13,27 @@ import { MatListModule } from '@angular/material/list';
 import { MatIconModule } from '@angular/material/icon';
 import { MatTabsModule } from "@angular/material/tabs";
 import { MatTableModule } from "@angular/material/table";
+import { MatDialogModule } from "@angular/material/dialog";
+import { MatSelectModule } from "@angular/material/select";
+import { MatOptionModule } from "@angular/material/core";
+import { IngestorNewTransferDialogComponent } from "./ingestor/dialog/ingestor.new-transfer-dialog";
+import { IngestorUserMetadataDialog } from "./ingestor/dialog/ingestor.user-metadata-dialog";
+import { JsonFormsModule } from '@jsonforms/angular';
+import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
+import { IngestorExtractorMetadataDialog } from "./ingestor/dialog/ingestor.extractor-metadata-dialog";
+import { IngestorConfirmTransferDialog } from "./ingestor/dialog/ingestor.confirm-transfer-dialog";
+import { MatStepperModule } from "@angular/material/stepper";
+import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialog-stepper.component";
 
 @NgModule({
   declarations: [
     IngestorComponent,
-    IngestorMetadataEditorComponent
+    IngestorMetadataEditorComponent,
+    IngestorNewTransferDialogComponent,
+    IngestorUserMetadataDialog,
+    IngestorExtractorMetadataDialog,
+    IngestorConfirmTransferDialog,
+    IngestorDialogStepperComponent,
   ],
   imports: [
     CommonModule, 
@@ -32,6 +48,12 @@ import { MatTableModule } from "@angular/material/table";
     MatIconModule,
     MatTabsModule,
     MatTableModule,
+    MatDialogModule,
+    MatSelectModule,
+    MatOptionModule,
+    MatStepperModule,
+    JsonFormsModule,
+    JsonFormsAngularMaterialModule,
   ],
 })
 export class IngestorModule { }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
new file mode 100644
index 0000000000..45d7bcc19b
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
@@ -0,0 +1,21 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Confirm transfer
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close" class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography">
+  <ingestor-dialog-stepper [activeStep]="3"></ingestor-dialog-stepper>
+
+  <p>Confirm Metadata</p>
+  <mat-form-field class="form-full-width">
+    <textarea matInput placeholder="metadata.json...." readonly></textarea>
+  </mat-form-field>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" (click)="onClickConfirm()">Ingest</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.ts
new file mode 100644
index 0000000000..4e5521049b
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.ts
@@ -0,0 +1,27 @@
+import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
+import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+@Component({
+  selector: 'ingestor.confirm-transfer-dialog',
+  templateUrl: 'ingestor.confirm-transfer-dialog.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  styleUrls: ['../ingestor.component.scss'],
+})
+
+export class IngestorConfirmTransferDialog {
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {}
+  
+  onClickBack(): void {
+    console.log('Next button clicked');
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(2); // Beispielwert für den Schritt
+    }
+  }
+
+  onClickConfirm(): void {
+    console.log('Confirm button clicked');
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickConfirm(); 
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css
new file mode 100644
index 0000000000..8e114ace88
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css
@@ -0,0 +1,17 @@
+.stepper {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.stepper div {
+  margin: 5px;
+}
+
+.stepper div.active {
+  font-weight: bold;
+}
+
+button {
+  margin: 5px;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html
new file mode 100644
index 0000000000..9902301bb8
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html
@@ -0,0 +1,16 @@
+<div class="stepper">
+  <mat-stepper [linear]="true" [selectedIndex]="activeStep" #stepper>
+    <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Select your ingestion method</ng-template>
+    </mat-step>
+    <mat-step [completed]="activeStep > 1" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Fill out user-specific metadata</ng-template>
+    </mat-step>
+    <mat-step [completed]="activeStep > 2" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Correct dataset-specific metadata</ng-template>
+    </mat-step>
+    <mat-step [completed]="activeStep > 3" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Confirm inputs</ng-template>
+    </mat-step>
+  </mat-stepper>
+</div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.ts
new file mode 100644
index 0000000000..cda2927a18
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.ts
@@ -0,0 +1,10 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'ingestor-dialog-stepper',
+  templateUrl: './ingestor.dialog-stepper.component.html',
+  styleUrls: ['./ingestor.dialog-stepper.component.css']
+})
+export class IngestorDialogStepperComponent {
+  @Input() activeStep: number = 0;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
new file mode 100644
index 0000000000..ef83ca5d45
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -0,0 +1,17 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Correct dataset-specific metadata
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close" class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography">
+  <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
+
+  <app-metadata-editor></app-metadata-editor>
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" (click)="onClickNext()">Next</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.ts
new file mode 100644
index 0000000000..c636b26543
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.ts
@@ -0,0 +1,27 @@
+import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
+import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+@Component({
+  selector: 'ingestor.extractor-metadata-dialog',
+  templateUrl: 'ingestor.extractor-metadata-dialog.html',
+  styleUrls: ['../ingestor.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+
+export class IngestorExtractorMetadataDialog {
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {}
+
+  onClickBack(): void {
+    console.log('Next button clicked');
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(1); // Beispielwert für den Schritt
+    }
+  }
+
+  onClickNext(): void {
+    console.log('Next button clicked');
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(3); // Beispielwert für den Schritt
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
new file mode 100644
index 0000000000..a054ec9e35
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -0,0 +1,37 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Select your ingestion method
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close" class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+  <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
+
+  <p>First mask where user needs to select path and method</p>
+
+  <div>
+    <mat-form-field class="form-full-width">
+      <mat-label>File Path</mat-label>
+      <input matInput [(ngModel)]="filePath">
+    </mat-form-field>
+  </div>
+
+  <div>
+    <mat-form-field class="form-full-width">
+      <mat-label>Extraction Method</mat-label>
+      <mat-select [(ngModel)]="selectedMethod">
+        <mat-option *ngFor="let method of extractionMethods" [value]="method">
+          {{ method }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+  </div>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close>Cancel</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+    (click)="onClickNext()">Next</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.ts
new file mode 100644
index 0000000000..09464dc94a
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.ts
@@ -0,0 +1,35 @@
+import {ChangeDetectionStrategy, Component, Inject, OnInit} from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
+import { HttpClient } from '@angular/common/http';
+
+@Component({
+  selector: 'ingestor.new-transfer-dialog',
+  templateUrl: 'ingestor.new-transfer-dialog.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  styleUrls: ['../ingestor.component.scss']
+})
+
+export class IngestorNewTransferDialogComponent implements OnInit {
+  filePath: string = '';
+  selectedMethod: string = '';
+  extractionMethods: string[] = [];
+
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any, private http: HttpClient) {}
+
+  ngOnInit(): void {
+    console.log('Initialisieren');
+    /*this.http.get('INGESTOR_API_ENDPOINTS_V1.extractor').subscribe((response: any) => {
+      this.extractionMethods = response;
+      console.log('Extraktoren geladen:', this.extractionMethods);
+    });*/
+
+    this.extractionMethods = ['Extraktor 1', 'Extraktor 2', 'Extraktor 3'];
+  }
+
+  onClickNext(): void {
+    console.log('Next button clicked');
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(1); // Beispielwert für den Schritt
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
new file mode 100644
index 0000000000..f39a46a2bd
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
@@ -0,0 +1,46 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Fill out user-specific metadata
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+  <ingestor-dialog-stepper [activeStep]="1"></ingestor-dialog-stepper>
+  
+  <div fxLayout="row" fxLayout.xs="column">
+    <div fxFlex="80%">
+      <mat-card>
+        <mat-card-header class="organizational-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> person </mat-icon>
+          </div>
+          Organizational Information
+        </mat-card-header>
+        <mat-card-content>
+          <app-metadata-editor [schema]="metadataSchema" [data]="metadataEditorData"
+          (dataChange)="onDataChange($event)"></app-metadata-editor>
+        </mat-card-content>
+      </mat-card>
+
+      <mat-card>
+        <mat-card-header class="sample-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> description </mat-icon>
+          </div>
+          Sample Information
+        </mat-card-header>
+        <mat-card-content>
+        </mat-card-content>
+      </mat-card>
+    </div>
+  </div>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+    (click)="onClickNext()">Next</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.ts
new file mode 100644
index 0000000000..3de23c2960
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.ts
@@ -0,0 +1,40 @@
+import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
+import { Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { schema_mask2 } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
+
+@Component({
+  selector: 'ingestor.user-metadata-dialog',
+  templateUrl: 'ingestor.user-metadata-dialog.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  styleUrls: ['../ingestor.component.scss'],
+})
+
+export class IngestorUserMetadataDialog {
+  metadataSchema: Schema;
+  metadataEditorData: string;
+
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
+    this.metadataSchema = schema_mask2;
+    this.metadataEditorData = data.metadataEditorData;
+  }
+
+  onClickBack(): void {
+    console.log('Next button clicked');
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(0); // Beispielwert für den Schritt
+    }
+  }
+
+  onClickNext(): void {
+    console.log('Next button clicked');
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(2); // Beispielwert für den Schritt
+    }
+  }
+
+  onDataChange(event: any) {
+    this.metadataEditorData = event;
+    console.log(event);
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
index aa0ee1e755..6cd5860805 100644
--- a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
+++ b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
@@ -4,4 +4,5 @@ export const INGESTOR_API_ENDPOINTS_V1 = {
   OTHER: {
     VERSION: 'version',
   },
+  EXTRACTOR: 'extractor',
 };
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index b458d1edda..0f94f8fe97 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -18,12 +18,12 @@
               [(ngModel)]="forwardFacilityBackend">
           </mat-form-field>
           <button mat-raised-button color="primary"
-            (click)="forwardToIngestorPage()">Connect</button>
+            (click)="onClickForwardToIngestorPage()">Connect</button>
 
           <div>
             <ul>
               <li *ngFor="let backend of lastUsedFacilityBackends">
-                <a (click)="selectFacilityBackend(backend)">{{ backend }}</a>
+                <a (click)="onClickSelectFacilityBackend(backend)">{{ backend }}</a>
               </li>
             </ul>
           </div>
@@ -33,7 +33,7 @@
           <mat-tab-group animationDuration="0ms">
             <mat-tab label="Transfers">
               <button mat-button aria-label="Refresh transfer list"
-                (click)="onRefreshTransferList()">
+                (click)="onClickRefreshTransferList()">
                 <mat-icon>refresh</mat-icon>
               </button>
               <table mat-table [dataSource]="transferDataSource"
@@ -51,15 +51,17 @@
                 </ng-container>
 
                 <ng-container matColumnDef="actions">
-                  <th mat-header-cell *matHeaderCellDef class="text-right"> <b>Action</b> </th>
+                  <th mat-header-cell *matHeaderCellDef class="text-right">
+                    <b>Action</b>
+                  </th>
                   <td mat-cell *matCellDef="let element" class="text-right">
-                  <button mat-button aria-label="Delete transfer"
-                    (click)="onCancelTransfer(element.transferId)">
-                    <mat-icon>delete</mat-icon>
-                  </button>
-                  <button mat-button aria-label="Pause transfer">
-                    <mat-icon>pause_circle</mat-icon>
-                  </button>
+                    <button mat-button aria-label="Delete transfer"
+                      (click)="onCancelTransfer(element.transferId)">
+                      <mat-icon>delete</mat-icon>
+                    </button>
+                    <button mat-button aria-label="Pause transfer">
+                      <mat-icon>pause_circle</mat-icon>
+                    </button>
                   </td>
                 </ng-container>
 
@@ -74,7 +76,7 @@
                 <mat-list-item>
                   <span matListItemTitle>Backend URL</span>
                   <span matListItemLine>{{ connectedFacilityBackend }} <a
-                      (click)="disconnectIngestor()">change</a></span>
+                      (click)="onClickDisconnectIngestor()">change</a></span>
                 </mat-list-item>
                 <mat-list-item>
                   <span matListItemTitle>Connection Status</span>
@@ -87,39 +89,24 @@
                 </mat-list-item>
               </mat-list>
             </mat-tab>
-            <mat-tab label="Settings">
-              Todo
-            </mat-tab>
           </mat-tab-group>
-
           <br><br>
-          <button mat-fab aria-label="Add a new dataset transfer"
-            color="primary" (click)="openNewTransferDialog()">
-            <mat-icon>add</mat-icon>
-          </button><i>Create new transfer</i>
         </ng-container>
       </div>
     </mat-card-content>
   </mat-card>
 </p>
 
-<p *ngIf="connectedFacilityBackend !== '' && createNewTransfer">
+<p *ngIf="connectedFacilityBackend !== ''">
   <mat-card class="ingestor-card">
     <mat-card-header>
-      <mat-card-title>Ingest Dataset</mat-card-title>
+      <mat-card-title>New transfer</mat-card-title>
     </mat-card-header>
     <mat-card-content class="ingestor-vertical-layout">
-      <div>
-      </div>
-      <app-metadata-editor></app-metadata-editor>
-      <div>
-        <button mat-raised-button color="primary" (click)="apiUpload()"
-          [disabled]="loading">
-          <span *ngIf="!loading">Upload</span>
-          <mat-progress-spinner *ngIf="loading" diameter="20"
-            mode="indeterminate"></mat-progress-spinner>
-        </button>
-      </div>
+      <button mat-fab aria-label="Add a new dataset transfer" color="primary"
+        (click)="onClickNext(0)">
+        <mat-icon>add</mat-icon>
+      </button>
     </mat-card-content>
   </mat-card>
 </p>
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index 96cdeec1ba..685d6ee35f 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -1,10 +1,12 @@
+@use "sass:map";
+@use "@angular/material" as mat;
+
 .ingestor-vertical-layout {
   display: flex;
   flex-direction: column;
   gap: 1em;
 }
 
-/* src/app/ingestor/ingestor.component.scss */
 .ingestor-mixed-header {
   display: flex;
   justify-content: space-between;
@@ -13,4 +15,52 @@
 
 .ingestor-close-button {
   margin-left: auto;
-}
\ No newline at end of file
+}
+
+.form-full-width {
+  width: 100%;
+}
+
+mat-card {
+  margin: 1em;
+
+  .section-icon {
+    height: auto !important;
+    width: auto !important;
+
+    mat-icon {
+      vertical-align: middle;
+    }
+  }
+}
+
+@mixin color($theme) {
+  $color-config: map-get($theme, "color");
+  $primary: map-get($color-config, "primary");
+  $header-1: map-get($color-config, "header-1");
+  $accent: map-get($color-config, "accent");
+  mat-card {
+    .organizational-header {
+      background-color: mat.get-color-from-palette($primary, "lighter");
+    }
+
+    .sample-header {
+      background-color: mat.get-color-from-palette($header-1, "lighter");
+    }
+
+    .instrument-header {
+      background-color: mat.get-color-from-palette($accent, "lighter");
+    }
+
+    .acquisition-header {
+      background-color: mat.get-color-from-palette($accent, "lighter");
+    }
+  }
+}
+
+@mixin theme($theme) {
+  $color-config: mat.get-color-config($theme);
+  @if $color-config != null {
+    @include color($theme);
+  }
+}
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 55d4200fce..8daab0e076 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -1,58 +1,56 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
-import { AppConfigService, HelpMessages } from "app-config.service";
+import { Component, inject, OnInit } from "@angular/core";
+import { AppConfigService } from "app-config.service";
 import { HttpClient } from '@angular/common/http';
-import { IngestorMetadataEditorComponent } from '../ingestor-metadata-editor/ingestor-metadata-editor.component';
 import { ActivatedRoute, Router } from '@angular/router';
 import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
+import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog";
+import { MatDialog } from "@angular/material/dialog";
+import { IngestorUserMetadataDialog } from "./dialog/ingestor.user-metadata-dialog";
+import { IngestorExtractorMetadataDialog } from "./dialog/ingestor.extractor-metadata-dialog";
+import { IngestorConfirmTransferDialog } from "./dialog/ingestor.confirm-transfer-dialog";
 
-interface TransferDataListEntry {
+interface ITransferDataListEntry {
   transferId: string;
   status: string;
 }
 
+interface IIngestionRequestInformation {
+  filePath: string;
+  availableMethods: string[];
+  userMetaData: string;
+  extractorMetaData: string;
+}
+
 @Component({
   selector: "ingestor",
   templateUrl: "./ingestor.component.html",
   styleUrls: ["./ingestor.component.scss"],
 })
 export class IngestorComponent implements OnInit {
-
-  @ViewChild(IngestorMetadataEditorComponent) metadataEditor: IngestorMetadataEditorComponent;
-
-  appConfig = this.appConfigService.getConfig();
-  facility: string | null = null;
-  ingestManual: string | null = null;
-  gettingStarted: string | null = null;
-  shoppingCartEnabled = false;
-  helpMessages: HelpMessages;
+  readonly dialog = inject(MatDialog);
 
   filePath: string = '';
   loading: boolean = false;
   forwardFacilityBackend: string = '';
 
-  createNewTransfer: boolean = false;
   connectedFacilityBackend: string = '';
   connectedFacilityBackendVersion: string = '';
   connectingToFacilityBackend: boolean = false;
+
   lastUsedFacilityBackends: string[] = [];
-  transferDataSource: TransferDataListEntry[] = []; // List of files to be transferred
+  
+  transferDataSource: ITransferDataListEntry[] = []; // List of files to be transferred
   displayedColumns: string[] = ['transferId', 'status', 'actions'];
 
   errorMessage: string = '';
   returnValue: string = '';
 
+  metadataEditorData: string = ""; // TODO
+
   constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
 
   ngOnInit() {
-    this.facility = this.appConfig.facility;
-    this.ingestManual = this.appConfig.ingestManual;
-    this.helpMessages = new HelpMessages(
-      this.appConfig.helpMessages?.gettingStarted,
-      this.appConfig.helpMessages?.ingestManual,
-    );
-    this.gettingStarted = this.appConfig.gettingStarted;
     this.connectingToFacilityBackend = true;
-    this.createNewTransfer = false;
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
     this.transferDataSource = [];
     // Get the GET parameter 'backendUrl' from the URL
@@ -98,20 +96,24 @@ export class IngestorComponent implements OnInit {
     return true;
   }
 
-  async apiGetTransferList(): Promise<TransferDataListEntry[]> {
-    await this.http.get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER).subscribe(
+  apiGetTransferList(page: number, pageSize: number, transferId?: string): void {
+    const params: any = {
+      page: page.toString(),
+      pageSize: pageSize.toString(),
+    };
+    if (transferId) {
+      params.transferId = transferId;
+    }
+    this.http.get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER, { params }).subscribe(
       response => {
         console.log('Transfer list received', response);
-        return response['transfers'];
+        this.transferDataSource = response['transfers'];
       },
       error => {
         this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
         console.error('Request failed', error);
-        return [];
       }
     );
-
-    return [];
   }
 
   apiUpload() {
@@ -119,7 +121,7 @@ export class IngestorComponent implements OnInit {
     this.returnValue = '';
     const payload = {
       filePath: this.filePath,
-      metaData: this.metadataEditor.metadata
+      metaData: 'todo'//this.metadataEditor.metadata
     };
 
     console.log('Uploading', payload);
@@ -138,7 +140,7 @@ export class IngestorComponent implements OnInit {
     );
   }
 
-  forwardToIngestorPage() {
+  onClickForwardToIngestorPage() {
     if (this.forwardFacilityBackend) {
       this.connectingToFacilityBackend = true;
 
@@ -152,7 +154,7 @@ export class IngestorComponent implements OnInit {
     }
   }
 
-  disconnectIngestor() {
+  onClickDisconnectIngestor() {
     this.returnValue = '';
     this.connectedFacilityBackend = '';
     // Remove the GET parameter 'backendUrl' from the URL
@@ -160,7 +162,7 @@ export class IngestorComponent implements OnInit {
   }
 
   // Helper functions
-  selectFacilityBackend(facilityBackend: string) {
+  onClickSelectFacilityBackend(facilityBackend: string) {
     this.forwardFacilityBackend = facilityBackend;
   }
 
@@ -177,26 +179,65 @@ export class IngestorComponent implements OnInit {
     this.errorMessage = '';
   }
 
-  openNewTransferDialog(): void {
-    this.createNewTransfer = true;
-    this.metadataEditor.clearMetadata();
+  onClickNext(step: number): void {
+    console.log('Next step', step);
+    this.dialog.closeAll();
+
+    let dialogRef = null;
+
+    switch (step) {
+      case 0:
+        dialogRef = this.dialog.open(IngestorNewTransferDialogComponent, {
+          data: { onClickNext: this.onClickNext.bind(this), metadataEditorData: this.metadataEditorData },
+          disableClose: true
+        });
+
+        break;
+      case 1:
+        dialogRef = this.dialog.open(IngestorUserMetadataDialog, {
+          data: { onClickNext: this.onClickNext.bind(this), metadataEditorData: this.metadataEditorData },
+          disableClose: true
+        });
+        break;
+      case 2:
+        dialogRef = this.dialog.open(IngestorExtractorMetadataDialog, {
+          data: { onClickNext: this.onClickNext.bind(this), metadataEditorData: this.metadataEditorData },
+          disableClose: true
+        });
+        break;
+      case 3:
+        dialogRef = this.dialog.open(IngestorConfirmTransferDialog, {
+          data: { onClickNext: this.onClickNext.bind(this), metadataEditorData: this.metadataEditorData },
+          disableClose: true
+        });
+        break;
+      default:
+        console.error('Unknown step', step);
+    }
+
+    // Error if the dialog reference is not set
+    if (dialogRef === null) return;
+
+    /*dialogRef.afterClosed().subscribe(result => {
+      console.log(`Dialog result: ${result}`);
+    });*/
   }
 
-  onRefreshTransferList(): void {
-    const TEST_DATALIST: TransferDataListEntry[] = [
-      { transferId: '1', status: 'In progress' },
-      { transferId: '2', status: 'Done' },
-      { transferId: '3', status: 'Failed' },
-    ];
-
-    this.transferDataSource = TEST_DATALIST;
-    console.log(this.transferDataSource);
-    // TODO activate when the API is ready
-    //this.apiGetTransferList();
+  onClickRefreshTransferList(): void {
+    this.apiGetTransferList(1, 100);
   }
 
   onCancelTransfer(transferId: string) {
     console.log('Cancel transfer', transferId);
-    // TODO activate when the API is ready
+    this.http.delete(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER + '/' + transferId).subscribe(
+      response => {
+        console.log('Transfer cancelled', response);
+        this.apiGetTransferList(1, 100);
+      },
+      error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+        console.error('Cancel transfer failed', error);
+      }
+    );
   }
 }
\ No newline at end of file

From dfec300977583c31bada51f5e54707ef9e9728b2 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Tue, 3 Dec 2024 09:35:19 +0000
Subject: [PATCH 012/245] frontend update - improved json form integration

---
 .../ingestor-metadata-editor-helper.ts        |  24 +-
 .../ingestor-metadata-editor-schematest.ts    | 210 ------------------
 .../ingestor-metadata-editor.component.ts     |   2 +-
 src/app/ingestor/ingestor.module.ts           |  12 +-
 ...estor.confirm-transfer-dialog.component.ts |  39 ++++
 .../ingestor.confirm-transfer-dialog.html     |   3 +-
 .../ingestor.confirm-transfer-dialog.ts       |  27 ---
 ...tor.dialog-stepper.component.component.ts} |   0
 ...tor.extractor-metadata-dialog.component.ts |  44 ++++
 .../ingestor.extractor-metadata-dialog.html   |  44 +++-
 .../ingestor.extractor-metadata-dialog.ts     |  27 ---
 .../ingestor.new-transfer-dialog.component.ts |  56 +++++
 .../dialog/ingestor.new-transfer-dialog.html  |   9 +-
 .../dialog/ingestor.new-transfer-dialog.ts    |  35 ---
 ...ngestor.user-metadata-dialog.component.ts} |  15 +-
 .../dialog/ingestor.user-metadata-dialog.html |   2 +-
 .../ingestor/ingestor/ingestor.component.html |   2 +-
 .../ingestor/ingestor/ingestor.component.scss |   4 +
 .../ingestor/ingestor/ingestor.component.ts   |  52 +++--
 19 files changed, 266 insertions(+), 341 deletions(-)
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
 delete mode 100644 src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.ts
 rename src/app/ingestor/ingestor/dialog/{ingestor.dialog-stepper.component.ts => ingestor.dialog-stepper.component.component.ts} (100%)
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
 delete mode 100644 src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
 delete mode 100644 src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.ts
 rename src/app/ingestor/ingestor/dialog/{ingestor.user-metadata-dialog.ts => ingestor.user-metadata-dialog.component.ts} (67%)

diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index 632419f9cd..edecaf8654 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -1,3 +1,5 @@
+import { IIngestionRequestInformation } from "ingestor/ingestor/ingestor.component";
+
 export interface Schema {
   type?: string;
   properties?: {
@@ -19,8 +21,12 @@ export interface UISchema {
 export class IngestorMetadaEditorHelper {
   static generateUISchemaFromSchema(schema: string): UISchema {
     const parsedSchema: Schema = JSON.parse(schema);
-    
+
     const flattenProperties = (properties: any, parentKey: string = ''): any[] => {
+      if (!properties) {
+        return [];
+      }
+
       return Object.keys(properties).reduce((acc, key) => {
         const property = properties[key];
         const fullKey = parentKey ? `${parentKey}.${key}` : key;
@@ -47,7 +53,21 @@ export class IngestorMetadaEditorHelper {
       type: 'VerticalLayout',
       elements: flattenProperties(parsedSchema.properties)
     };
-    
+
     return uischema;
   }
+
+  static mergeUserAndExtractorMetadata(userMetadata: Object, extractorMetadata: Object, space: number): string {
+    return JSON.stringify({ ...userMetadata, ...extractorMetadata }, null, space);
+  }
+
+  static createEmptyRequestInformation = (): IIngestionRequestInformation => {
+    return {
+      selectedPath: '',
+      selectedMethod: '',
+      userMetaData: {},
+      extractorMetaData: {},
+      mergedMetaDataString: ''
+    };
+  };
 };
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
index 8ed4d8d0ea..05b606f414 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
@@ -206,216 +206,6 @@ export const schema_mask2 = {
       },
       description: 'List of instruments used in the project',
     },
-    organizational: {
-      type: 'object',
-      properties: {
-        id: {
-          type: 'string',
-        },
-        title: {
-          type: 'string',
-        },
-        description: {
-          type: 'string',
-        },
-        status: {
-          type: 'string',
-          enum: ['active', 'completed', 'archived'],
-        },
-        priority: {
-          type: 'integer',
-          minimum: 1,
-          maximum: 5,
-        },
-        first_name: {
-          type: 'string',
-          description: 'first name',
-        },
-        work_status: {
-          type: 'boolean',
-          description: 'work status',
-        },
-        email: {
-          type: 'string',
-          description: 'email',
-          pattern: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$',
-        },
-        work_phone: {
-          type: 'string',
-          description: 'work phone',
-        },
-        name: {
-          type: 'string',
-          description: 'name',
-        },
-        name_org: {
-          type: 'string',
-          description: 'Name of the organization',
-        },
-        type_org: {
-          type: 'string',
-          description: 'Type of organization, academic, commercial, governmental, etc.',
-          enum: ['Academic', 'Commercial', 'Government', 'Other'],
-        },
-        country: {
-          type: 'string',
-          description: 'Country of the institution',
-        },
-        role: {
-          type: 'string',
-          description: 'Role of the author, for example principal investigator',
-        },
-        orcid: {
-          type: 'string',
-          description: 'ORCID of the author, a type of unique identifier',
-        },
-        funder_name: {
-          type: 'string',
-          description: 'funding organization/person.',
-        },
-        start_date: {
-          type: 'string',
-          format: 'date',
-          description: 'start date',
-        },
-        end_date: {
-          type: 'string',
-          format: 'date',
-          description: 'end date',
-        },
-        budget: {
-          type: 'number',
-          description: 'budget',
-        },
-        project_id: {
-          type: 'string',
-          description: 'project id',
-        },
-        grants: {
-          type: 'array',
-          items: {
-            type: 'object',
-            properties: {
-              grant_name: {
-                type: 'string',
-                description: 'name of the grant',
-              },
-              start_date: {
-                type: 'string',
-                format: 'date',
-                description: 'start date',
-              },
-              end_date: {
-                type: 'string',
-                format: 'date',
-                description: 'end date',
-              },
-              budget: {
-                type: 'number',
-                description: 'budget',
-              },
-              project_id: {
-                type: 'string',
-                description: 'project id',
-              },
-              country: {
-                type: 'string',
-                description: 'Country of the institution',
-              },
-            },
-          },
-          description: 'List of grants associated with the project',
-        },
-        authors: {
-          type: 'array',
-          items: {
-            type: 'object',
-            properties: {
-              first_name: {
-                type: 'string',
-                description: 'first name',
-              },
-              work_status: {
-                type: 'boolean',
-                description: 'work status',
-              },
-              email: {
-                type: 'string',
-                description: 'email',
-                pattern: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$',
-              },
-              work_phone: {
-                type: 'string',
-                description: 'work phone',
-              },
-              name: {
-                type: 'string',
-                description: 'name',
-              },
-              name_org: {
-                type: 'string',
-                description: 'Name of the organization',
-              },
-              type_org: {
-                type: 'string',
-                description: 'Type of organization, academic, commercial, governmental, etc.',
-                enum: ['Academic', 'Commercial', 'Government', 'Other'],
-              },
-              country: {
-                type: 'string',
-                description: 'Country of the institution',
-              },
-              role: {
-                type: 'string',
-                description: 'Role of the author, for example principal investigator',
-              },
-              orcid: {
-                type: 'string',
-                description: 'ORCID of the author, a type of unique identifier',
-              },
-            },
-          },
-          description: 'List of authors associated with the project',
-        },
-        instruments: {
-          type: 'array',
-          items: {
-            type: 'object',
-            properties: {
-              microscope: {
-                type: 'string',
-                description: 'Name/Type of the Microscope',
-              },
-              illumination: {
-                type: 'string',
-                description: 'Mode of illumination used during data collection',
-              },
-              imaging: {
-                type: 'string',
-                description: 'Mode of imaging used during data collection',
-              },
-              electron_source: {
-                type: 'string',
-                description: 'Type of electron source used in the microscope, such as FEG',
-              },
-              acceleration_voltage: {
-                type: 'number',
-                description: 'Voltage used for the electron acceleration, in kV',
-              },
-              c2_aperture: {
-                type: 'number',
-                description: 'C2 aperture size used in data acquisition, in µm',
-              },
-              cs: {
-                type: 'number',
-                description: 'Spherical aberration of the instrument, in mm',
-              },
-            },
-          },
-          description: 'List of instruments used in the project',
-        },
-      },
-    },
   },
   required: ['id', 'title', 'status', 'name', 'email', 'work_phone', 'orcid', 'country', 'type_org', 'name_org'],
 };
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 56b2a9fc35..65b7f330c8 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -14,7 +14,7 @@ import { IngestorMetadaEditorHelper, Schema, UISchema } from './ingestor-metadat
 })
 
 export class IngestorMetadataEditorComponent implements OnChanges {
-  @Input() data: string;
+  @Input() data: Object;
   @Input() schema: Schema;
 
   @Output() dataChange = new EventEmitter<string>();
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index c2248030ec..359e3dd500 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -16,14 +16,15 @@ import { MatTableModule } from "@angular/material/table";
 import { MatDialogModule } from "@angular/material/dialog";
 import { MatSelectModule } from "@angular/material/select";
 import { MatOptionModule } from "@angular/material/core";
-import { IngestorNewTransferDialogComponent } from "./ingestor/dialog/ingestor.new-transfer-dialog";
-import { IngestorUserMetadataDialog } from "./ingestor/dialog/ingestor.user-metadata-dialog";
+import { MatAutocompleteModule } from "@angular/material/autocomplete";
+import { IngestorNewTransferDialogComponent } from "./ingestor/dialog/ingestor.new-transfer-dialog.component";
+import { IngestorUserMetadataDialog } from "./ingestor/dialog/ingestor.user-metadata-dialog.component";
 import { JsonFormsModule } from '@jsonforms/angular';
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
-import { IngestorExtractorMetadataDialog } from "./ingestor/dialog/ingestor.extractor-metadata-dialog";
-import { IngestorConfirmTransferDialog } from "./ingestor/dialog/ingestor.confirm-transfer-dialog";
+import { IngestorExtractorMetadataDialog } from "./ingestor/dialog/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialog } from "./ingestor/dialog/ingestor.confirm-transfer-dialog.component";
 import { MatStepperModule } from "@angular/material/stepper";
-import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialog-stepper.component";
+import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialog-stepper.component.component";
 
 @NgModule({
   declarations: [
@@ -52,6 +53,7 @@ import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialo
     MatSelectModule,
     MatOptionModule,
     MatStepperModule,
+    MatAutocompleteModule,
     JsonFormsModule,
     JsonFormsAngularMaterialModule,
   ],
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
new file mode 100644
index 0000000000..d214fed38a
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -0,0 +1,39 @@
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { IIngestionRequestInformation } from '../ingestor.component';
+import { connectableObservableDescriptor } from 'rxjs/internal/observable/ConnectableObservable';
+import { IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+
+@Component({
+  selector: 'ingestor.confirm-transfer-dialog',
+  templateUrl: 'ingestor.confirm-transfer-dialog.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  styleUrls: ['../ingestor.component.scss'],
+})
+
+export class IngestorConfirmTransferDialog {
+  createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
+  provideMergeMetaData: string = '';
+
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
+    this.createNewTransferData = data.createNewTransferData;
+  }
+
+  ngOnInit() {
+    const space = 2;
+    this.provideMergeMetaData = IngestorMetadaEditorHelper.mergeUserAndExtractorMetadata(this.createNewTransferData.userMetaData, this.createNewTransferData.extractorMetaData, space);
+  }
+
+  onClickBack(): void {
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(2); // Beispielwert für den Schritt
+    }
+  }
+
+  onClickConfirm(): void {
+    if (this.data && this.data.onClickNext) {
+      this.createNewTransferData.mergedMetaDataString = this.provideMergeMetaData;
+      this.data.onClickConfirm();
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
index 45d7bcc19b..52dfdddc6a 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
@@ -10,8 +10,9 @@ <h2 mat-dialog-title>
   <ingestor-dialog-stepper [activeStep]="3"></ingestor-dialog-stepper>
 
   <p>Confirm Metadata</p>
+
   <mat-form-field class="form-full-width">
-    <textarea matInput placeholder="metadata.json...." readonly></textarea>
+    <textarea class="metadata-preview" matInput readonly>{{ provideMergeMetaData }}</textarea>
   </mat-form-field>
 
 </mat-dialog-content>
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.ts
deleted file mode 100644
index 4e5521049b..0000000000
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
-import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-
-@Component({
-  selector: 'ingestor.confirm-transfer-dialog',
-  templateUrl: 'ingestor.confirm-transfer-dialog.html',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  styleUrls: ['../ingestor.component.scss'],
-})
-
-export class IngestorConfirmTransferDialog {
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {}
-  
-  onClickBack(): void {
-    console.log('Next button clicked');
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(2); // Beispielwert für den Schritt
-    }
-  }
-
-  onClickConfirm(): void {
-    console.log('Confirm button clicked');
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickConfirm(); 
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.ts
rename to src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
new file mode 100644
index 0000000000..e37ebd7e7a
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -0,0 +1,44 @@
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { IIngestionRequestInformation } from '../ingestor.component';
+import { IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+
+@Component({
+  selector: 'ingestor.extractor-metadata-dialog',
+  templateUrl: 'ingestor.extractor-metadata-dialog.html',
+  styleUrls: ['../ingestor.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+
+export class IngestorExtractorMetadataDialog {
+  metadataSchema: Schema;
+  createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
+
+  waitForExtractedMetaData: boolean = true;
+
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
+    this.metadataSchema = {};
+    this.createNewTransferData = data.createNewTransferData;
+  }
+
+  ngOnInit() {
+    this.waitForExtractedMetaData = false;
+  }
+
+
+  onClickBack(): void {
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(1); // Beispielwert für den Schritt
+    }
+  }
+
+  onClickNext(): void {
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(3); // Beispielwert für den Schritt
+    }
+  }
+
+  onDataChange(event: any) {
+    this.createNewTransferData.extractorMetaData = event;
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
index ef83ca5d45..6366b1d430 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -2,16 +2,52 @@
   <h2 mat-dialog-title>
     Correct dataset-specific metadata
   </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close" class="ingestor-close-button">
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
     <mat-icon>close</mat-icon>
   </button>
 </div>
 <mat-dialog-content class="mat-typography">
-  <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
 
-  <app-metadata-editor></app-metadata-editor>
+  <div *ngIf="waitForExtractedMetaData">
+    <mat-progress-spinner diameter="20"
+      mode="indeterminate"></mat-progress-spinner>
+    <div class="spinner-text">Wait for ingestor...</div>
+  </div>
+
+  <div *ngIf="!waitForExtractedMetaData">
+    <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
+    <div fxLayout="row" fxLayout.xs="column">
+      <div fxFlex="80%">
+        <mat-card>
+          <mat-card-header class="instrument-header">
+            <div mat-card-avatar class="section-icon">
+              <mat-icon> biotech </mat-icon>
+            </div>
+            Instrument Information
+          </mat-card-header>
+          <mat-card-content>
+            <app-metadata-editor [schema]="metadataSchema"
+              [data]="createNewTransferData.extractorMetaData"
+              (dataChange)="onDataChange($event)"></app-metadata-editor>
+          </mat-card-content>
+        </mat-card>
+        <mat-card>
+          <mat-card-header class="acqusition-header">
+            <div mat-card-avatar class="section-icon">
+              <mat-icon> category-search </mat-icon>
+            </div>
+            Acquisition Information
+          </mat-card-header>
+          <mat-card-content>
+          </mat-card-content>
+        </mat-card>
+      </div>
+    </div>
+  </div>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" (click)="onClickNext()">Next</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+    (click)="onClickNext()">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.ts
deleted file mode 100644
index c636b26543..0000000000
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
-import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-
-@Component({
-  selector: 'ingestor.extractor-metadata-dialog',
-  templateUrl: 'ingestor.extractor-metadata-dialog.html',
-  styleUrls: ['../ingestor.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-
-export class IngestorExtractorMetadataDialog {
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {}
-
-  onClickBack(): void {
-    console.log('Next button clicked');
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(1); // Beispielwert für den Schritt
-    }
-  }
-
-  onClickNext(): void {
-    console.log('Next button clicked');
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(3); // Beispielwert für den Schritt
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
new file mode 100644
index 0000000000..352663e37a
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -0,0 +1,56 @@
+import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
+import { HttpClient } from '@angular/common/http';
+import { IIngestionRequestInformation } from '../ingestor.component'
+import { IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+
+@Component({
+  selector: 'ingestor.new-transfer-dialog',
+  templateUrl: 'ingestor.new-transfer-dialog.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  styleUrls: ['../ingestor.component.scss']
+})
+
+export class IngestorNewTransferDialogComponent implements OnInit {
+  extractionMethods: string[] = [];
+  availableFilePaths: string[] = [];
+
+  createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
+
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any, private http: HttpClient) {
+    this.createNewTransferData = data.createNewTransferData;
+  }
+
+  ngOnInit(): void {
+    this.apiGetExtractionMethods();
+    this.apiGetAvailableFilePaths();
+  }
+
+  apiGetExtractionMethods(): void {
+    // Get reqeuest auf den Extractor endpoint
+    /*this.http.get('INGESTOR_API_ENDPOINTS_V1.extractor').subscribe((response: any) => {
+      this.extractionMethods = response;
+      console.log('Extraktoren geladen:', this.extractionMethods);
+    });*/
+
+    const fakeData = ['Extraktor 1', 'Extraktor 2', 'Extraktor 3'];
+    this.extractionMethods = fakeData;
+  }
+
+  apiGetAvailableFilePaths(): void {
+    // Get request auf den Dataset endpoint
+    /*this.http.get('INGESTOR_API_ENDPOINTS_V1.dataset').subscribe((response: any) => {
+      this.availableFilePaths = response;
+      console.log('Pfade geladen:', this.availableFilePaths);
+    });*/
+
+    const fakeData = ['Path 1', 'Path 2', 'Path 3'];
+    this.availableFilePaths = fakeData;
+  }
+
+  onClickNext(): void {
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(1); // Open next dialog
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
index a054ec9e35..16675bd3df 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -14,14 +14,19 @@ <h2 mat-dialog-title>
   <div>
     <mat-form-field class="form-full-width">
       <mat-label>File Path</mat-label>
-      <input matInput [(ngModel)]="filePath">
+      <input matInput [(ngModel)]="createNewTransferData.selectedPath" [matAutocomplete]="auto">
+      <mat-autocomplete #auto="matAutocomplete">
+        <mat-option *ngFor="let method of availableFilePaths" [value]="method">
+          {{ method }}
+        </mat-option>
+      </mat-autocomplete>
     </mat-form-field>
   </div>
 
   <div>
     <mat-form-field class="form-full-width">
       <mat-label>Extraction Method</mat-label>
-      <mat-select [(ngModel)]="selectedMethod">
+      <mat-select [(ngModel)]="createNewTransferData.selectedMethod">
         <mat-option *ngFor="let method of extractionMethods" [value]="method">
           {{ method }}
         </mat-option>
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.ts
deleted file mode 100644
index 09464dc94a..0000000000
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {ChangeDetectionStrategy, Component, Inject, OnInit} from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
-import { HttpClient } from '@angular/common/http';
-
-@Component({
-  selector: 'ingestor.new-transfer-dialog',
-  templateUrl: 'ingestor.new-transfer-dialog.html',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  styleUrls: ['../ingestor.component.scss']
-})
-
-export class IngestorNewTransferDialogComponent implements OnInit {
-  filePath: string = '';
-  selectedMethod: string = '';
-  extractionMethods: string[] = [];
-
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any, private http: HttpClient) {}
-
-  ngOnInit(): void {
-    console.log('Initialisieren');
-    /*this.http.get('INGESTOR_API_ENDPOINTS_V1.extractor').subscribe((response: any) => {
-      this.extractionMethods = response;
-      console.log('Extraktoren geladen:', this.extractionMethods);
-    });*/
-
-    this.extractionMethods = ['Extraktor 1', 'Extraktor 2', 'Extraktor 3'];
-  }
-
-  onClickNext(): void {
-    console.log('Next button clicked');
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(1); // Beispielwert für den Schritt
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
similarity index 67%
rename from src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.ts
rename to src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 3de23c2960..c2fc722861 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -1,7 +1,8 @@
 import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
-import { Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
 import { schema_mask2 } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
+import { IIngestionRequestInformation } from '../ingestor.component';
 
 @Component({
   selector: 'ingestor.user-metadata-dialog',
@@ -12,29 +13,27 @@ import { schema_mask2 } from 'ingestor/ingestor-metadata-editor/ingestor-metadat
 
 export class IngestorUserMetadataDialog {
   metadataSchema: Schema;
-  metadataEditorData: string;
+
+  createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
 
   constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
     this.metadataSchema = schema_mask2;
-    this.metadataEditorData = data.metadataEditorData;
+    this.createNewTransferData = data.createNewTransferData;
   }
 
   onClickBack(): void {
-    console.log('Next button clicked');
     if (this.data && this.data.onClickNext) {
       this.data.onClickNext(0); // Beispielwert für den Schritt
     }
   }
 
   onClickNext(): void {
-    console.log('Next button clicked');
     if (this.data && this.data.onClickNext) {
       this.data.onClickNext(2); // Beispielwert für den Schritt
     }
   }
 
-  onDataChange(event: any) {
-    this.metadataEditorData = event;
-    console.log(event);
+  onDataChange(event: Object) {
+    this.createNewTransferData.userMetaData = event;
   }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
index f39a46a2bd..4ec7ae4c1d 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
@@ -20,7 +20,7 @@ <h2 mat-dialog-title>
           Organizational Information
         </mat-card-header>
         <mat-card-content>
-          <app-metadata-editor [schema]="metadataSchema" [data]="metadataEditorData"
+          <app-metadata-editor [schema]="metadataSchema" [data]="createNewTransferData.userMetaData"
           (dataChange)="onDataChange($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index 0f94f8fe97..187f6f2f76 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -104,7 +104,7 @@
     </mat-card-header>
     <mat-card-content class="ingestor-vertical-layout">
       <button mat-fab aria-label="Add a new dataset transfer" color="primary"
-        (click)="onClickNext(0)">
+        (click)="onClickAddIngestion()">
         <mat-icon>add</mat-icon>
       </button>
     </mat-card-content>
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index 685d6ee35f..defee924f0 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -21,6 +21,10 @@
   width: 100%;
 }
 
+.metadata-preview {
+  height: 50vh !important;
+}
+
 mat-card {
   margin: 1em;
 
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 8daab0e076..80dfd07722 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -3,22 +3,36 @@ import { AppConfigService } from "app-config.service";
 import { HttpClient } from '@angular/common/http';
 import { ActivatedRoute, Router } from '@angular/router';
 import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
-import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog";
+import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog.component";
 import { MatDialog } from "@angular/material/dialog";
-import { IngestorUserMetadataDialog } from "./dialog/ingestor.user-metadata-dialog";
-import { IngestorExtractorMetadataDialog } from "./dialog/ingestor.extractor-metadata-dialog";
-import { IngestorConfirmTransferDialog } from "./dialog/ingestor.confirm-transfer-dialog";
+import { IngestorUserMetadataDialog } from "./dialog/ingestor.user-metadata-dialog.component";
+import { IngestorExtractorMetadataDialog } from "./dialog/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialog } from "./dialog/ingestor.confirm-transfer-dialog.component";
+import { IngestorMetadaEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 interface ITransferDataListEntry {
   transferId: string;
   status: string;
 }
 
-interface IIngestionRequestInformation {
-  filePath: string;
-  availableMethods: string[];
-  userMetaData: string;
-  extractorMetaData: string;
+interface ISciCatHeader {
+  datasetName: string;
+  description: string;
+  creationLocation: string;
+  dataFormat: string;
+  ownerGroup: string;
+  type: string;
+  license: string;
+  keywords: string[];
+  scientificMetadata: string;
+}
+
+export interface IIngestionRequestInformation {
+  selectedPath: string;
+  selectedMethod: string;
+  userMetaData: Object;
+  extractorMetaData: Object;
+  mergedMetaDataString: string;
 }
 
 @Component({
@@ -45,7 +59,7 @@ export class IngestorComponent implements OnInit {
   errorMessage: string = '';
   returnValue: string = '';
 
-  metadataEditorData: string = ""; // TODO
+  createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
 
   constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
 
@@ -120,8 +134,8 @@ export class IngestorComponent implements OnInit {
     this.loading = true;
     this.returnValue = '';
     const payload = {
-      filePath: this.filePath,
-      metaData: 'todo'//this.metadataEditor.metadata
+      filePath: this.createNewTransferData.selectedPath,
+      metaData: this.createNewTransferData.mergedMetaDataString,
     };
 
     console.log('Uploading', payload);
@@ -179,8 +193,12 @@ export class IngestorComponent implements OnInit {
     this.errorMessage = '';
   }
 
+  onClickAddIngestion(): void {
+    this.createNewTransferData = IngestorMetadaEditorHelper.createEmptyRequestInformation();
+    this.onClickNext(0);
+  }
+
   onClickNext(step: number): void {
-    console.log('Next step', step);
     this.dialog.closeAll();
 
     let dialogRef = null;
@@ -188,26 +206,26 @@ export class IngestorComponent implements OnInit {
     switch (step) {
       case 0:
         dialogRef = this.dialog.open(IngestorNewTransferDialogComponent, {
-          data: { onClickNext: this.onClickNext.bind(this), metadataEditorData: this.metadataEditorData },
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData },
           disableClose: true
         });
 
         break;
       case 1:
         dialogRef = this.dialog.open(IngestorUserMetadataDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), metadataEditorData: this.metadataEditorData },
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData },
           disableClose: true
         });
         break;
       case 2:
         dialogRef = this.dialog.open(IngestorExtractorMetadataDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), metadataEditorData: this.metadataEditorData },
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData },
           disableClose: true
         });
         break;
       case 3:
         dialogRef = this.dialog.open(IngestorConfirmTransferDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), metadataEditorData: this.metadataEditorData },
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData },
           disableClose: true
         });
         break;

From 7f5847f26c35887d14a57f98ed5c703b76fe4303 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Tue, 3 Dec 2024 10:39:43 +0000
Subject: [PATCH 013/245] Assignment of the input menus to the appropriate
 metadata

---
 .../ingestor-metadata-editor-helper.ts        |   1 +
 .../ingestor-metadata-editor-schematest.ts    | 480 ++++++++++++++----
 .../ingestor/ingestor/_ingestor-theme.scss    |  39 ++
 ...estor.confirm-transfer-dialog.component.ts |  43 +-
 ...tor.extractor-metadata-dialog.component.ts |  15 +-
 .../ingestor.extractor-metadata-dialog.html   |  11 +-
 ...ingestor.user-metadata-dialog.component.ts |  23 +-
 .../dialog/ingestor.user-metadata-dialog.html |  19 +-
 .../ingestor/ingestor/ingestor.component.scss |  36 +-
 .../ingestor/ingestor/ingestor.component.ts   |  15 +-
 src/styles.scss                               |   2 +
 11 files changed, 514 insertions(+), 170 deletions(-)
 create mode 100644 src/app/ingestor/ingestor/_ingestor-theme.scss

diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index edecaf8654..df2d8bc0a1 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -65,6 +65,7 @@ export class IngestorMetadaEditorHelper {
     return {
       selectedPath: '',
       selectedMethod: '',
+      scicatHeader: {},
       userMetaData: {},
       extractorMetaData: {},
       mergedMetaDataString: ''
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
index 05b606f414..630a06f277 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
@@ -1,88 +1,6 @@
-export const schema_mask2 = {
+export const organizational_schema = {
   type: 'object',
   properties: {
-    id: {
-      type: 'string',
-    },
-    title: {
-      type: 'string',
-    },
-    description: {
-      type: 'string',
-    },
-    status: {
-      type: 'string',
-      enum: ['active', 'completed', 'archived'],
-    },
-    priority: {
-      type: 'integer',
-      minimum: 1,
-      maximum: 5,
-    },
-    first_name: {
-      type: 'string',
-      description: 'first name',
-    },
-    work_status: {
-      type: 'boolean',
-      description: 'work status',
-    },
-    email: {
-      type: 'string',
-      description: 'email',
-      pattern: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$',
-    },
-    work_phone: {
-      type: 'string',
-      description: 'work phone',
-    },
-    name: {
-      type: 'string',
-      description: 'name',
-    },
-    name_org: {
-      type: 'string',
-      description: 'Name of the organization',
-    },
-    type_org: {
-      type: 'string',
-      description: 'Type of organization, academic, commercial, governmental, etc.',
-      enum: ['Academic', 'Commercial', 'Government', 'Other'],
-    },
-    country: {
-      type: 'string',
-      description: 'Country of the institution',
-    },
-    role: {
-      type: 'string',
-      description: 'Role of the author, for example principal investigator',
-    },
-    orcid: {
-      type: 'string',
-      description: 'ORCID of the author, a type of unique identifier',
-    },
-    funder_name: {
-      type: 'string',
-      description: 'funding organization/person.',
-    },
-    start_date: {
-      type: 'string',
-      format: 'date',
-      description: 'start date',
-    },
-    end_date: {
-      type: 'string',
-      format: 'date',
-      description: 'end date',
-    },
-    budget: {
-      type: 'number',
-      description: 'budget',
-    },
-    project_id: {
-      type: 'string',
-      description: 'project id',
-    },
     grants: {
       type: 'array',
       items: {
@@ -169,43 +87,397 @@ export const schema_mask2 = {
       },
       description: 'List of authors associated with the project',
     },
-    instruments: {
+    funder: {
       type: 'array',
       items: {
         type: 'object',
         properties: {
-          microscope: {
+          funder_name: {
             type: 'string',
-            description: 'Name/Type of the Microscope',
+            description: 'funding organization/person.',
           },
-          illumination: {
+          type_org: {
             type: 'string',
-            description: 'Mode of illumination used during data collection',
+            description: 'Type of organization, academic, commercial, governmental, etc.',
+            enum: ['Academic', 'Commercial', 'Government', 'Other'],
           },
-          imaging: {
+          country: {
             type: 'string',
-            description: 'Mode of imaging used during data collection',
+            description: 'Country of the institution',
           },
-          electron_source: {
+        },
+      },
+      description: 'Description of the project funding',
+    },
+  },
+  required: ['authors', 'funder'],
+};
+
+export const acquisition_schema = {
+  type: 'object',
+  properties: {
+    nominal_defocus: {
+      type: 'object',
+      description: 'Target defocus set, min and max values in µm.',
+    },
+    calibrated_defocus: {
+      type: 'object',
+      description: 'Machine estimated defocus, min and max values in µm. Has a tendency to be off.',
+    },
+    nominal_magnification: {
+      type: 'integer',
+      description: 'Magnification level as indicated by the instrument, no unit',
+    },
+    calibrated_magnification: {
+      type: 'integer',
+      description: 'Calculated magnification, no unit',
+    },
+    holder: {
+      type: 'string',
+      description: 'Speciman holder model',
+    },
+    holder_cryogen: {
+      type: 'string',
+      description: 'Type of cryogen used in the holder - if the holder is cooled seperately',
+    },
+    temperature_range: {
+      type: 'object',
+      description: 'Temperature during data collection, in K with min and max values.',
+    },
+    microscope_software: {
+      type: 'string',
+      description: 'Software used for instrument control',
+    },
+    detector: {
+      type: 'string',
+      description: 'Make and model of the detector used',
+    },
+    detector_mode: {
+      type: 'string',
+      description: 'Operating mode of the detector',
+    },
+    dose_per_movie: {
+      type: 'object',
+      description: 'Average dose per image/movie/tilt - given in electrons per square Angstrom',
+    },
+    energy_filter: {
+      type: 'object',
+      description: 'Whether an energy filter was used and its specifics.',
+    },
+    image_size: {
+      type: 'object',
+      description: 'The size of the image in pixels, height and width given.',
+    },
+    date_time: {
+      type: 'string',
+      description: 'Time and date of the data acquisition',
+    },
+    exposure_time: {
+      type: 'object',
+      description: 'Time of data acquisition per movie/tilt - in s',
+    },
+    cryogen: {
+      type: 'string',
+      description: 'Cryogen used in cooling the instrument and sample, usually nitrogen',
+    },
+    frames_per_movie: {
+      type: 'integer',
+      description: 'Number of frames that on average constitute a full movie, can be a bit hard to define for some detectors',
+    },
+    grids_imaged: {
+      type: 'integer',
+      description: 'Number of grids imaged for this project - here with qualifier during this data acquisition',
+    },
+    images_generated: {
+      type: 'integer',
+      description: 'Number of images generated total for this data collection - might need a qualifier for tilt series to determine whether full series or individual tilts are counted',
+    },
+    binning_camera: {
+      type: 'number',
+      description: 'Level of binning on the images applied during data collection',
+    },
+    pixel_size: {
+      type: 'object',
+      description: 'Pixel size, in Angstrom',
+    },
+    specialist_optics: {
+      type: 'object',
+      description: 'Any type of special optics, such as a phaseplate',
+    },
+    beamshift: {
+      type: 'object',
+      description: 'Movement of the beam above the sample for data collection purposes that does not require movement of the stage. Given in mrad.',
+    },
+    beamtilt: {
+      type: 'object',
+      description: 'Another way to move the beam above the sample for data collection purposes that does not require movement of the stage. Given in mrad.',
+    },
+    imageshift: {
+      type: 'object',
+      description: 'Movement of the Beam below the image in order to shift the image on the detector. Given in µm.',
+    },
+    beamtiltgroups: {
+      type: 'integer',
+      description: 'Number of Beamtilt groups present in this dataset - for optimized processing split dataset into groups of same tilt angle. Despite its name Beamshift is often used to achieve this result.',
+    },
+    gainref_flip_rotate: {
+      type: 'string',
+      description: 'Whether and how you have to flip or rotate the gainref in order to align with your acquired images',
+    },
+  },
+  required: ['detector', 'dose_per_movie', 'date_time', 'binning_camera', 'pixel_size'],
+};
+
+export const sample_schema = {
+  type: 'object',
+  properties: {
+    overall_molecule: {
+      type: 'object',
+      description: 'Description of the overall molecule',
+      properties: {
+        molecular_type: {
+          type: 'string',
+          description: 'Description of the overall molecular type, i.e., a complex',
+        },
+        name_sample: {
+          type: 'string',
+          description: 'Name of the full sample',
+        },
+        source: {
+          type: 'string',
+          description: 'Where the sample was taken from, i.e., natural host, recombinantly expressed, etc.',
+        },
+        molecular_weight: {
+          type: 'object',
+          description: 'Molecular weight in Da',
+        },
+        assembly: {
+          type: 'string',
+          description: 'What type of higher order structure your sample forms - if any.',
+          enum: ['FILAMENT', 'HELICAL ARRAY', 'PARTICLE'],
+        },
+      },
+      required: ['molecular_type', 'name_sample', 'source', 'assembly'],
+    },
+    molecule: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          name_mol: {
             type: 'string',
-            description: 'Type of electron source used in the microscope, such as FEG',
+            description: 'Name of an individual molecule (often protein) in the sample',
           },
-          acceleration_voltage: {
-            type: 'number',
-            description: 'Voltage used for the electron acceleration, in kV',
+          molecular_type: {
+            type: 'string',
+            description: 'Description of the overall molecular type, i.e., a complex',
           },
-          c2_aperture: {
-            type: 'number',
-            description: 'C2 aperture size used in data acquisition, in µm',
+          molecular_class: {
+            type: 'string',
+            description: 'Class of the molecule',
+            enum: ['Antibiotic', 'Carbohydrate', 'Chimera', 'None of these'],
           },
-          cs: {
-            type: 'number',
-            description: 'Spherical aberration of the instrument, in mm',
+          sequence: {
+            type: 'string',
+            description: 'Full sequence of the sample as in the data, i.e., cleaved tags should also be removed from sequence here',
+          },
+          natural_source: {
+            type: 'string',
+            description: 'Scientific name of the natural host organism',
+          },
+          taxonomy_id_source: {
+            type: 'string',
+            description: 'Taxonomy ID of the natural source organism',
+          },
+          expression_system: {
+            type: 'string',
+            description: 'Scientific name of the organism used to produce the molecule of interest',
+          },
+          taxonomy_id_expression: {
+            type: 'string',
+            description: 'Taxonomy ID of the expression system organism',
+          },
+          gene_name: {
+            type: 'string',
+            description: 'Name of the gene of interest',
+          },
+        },
+      },
+      required: ['name_mol', 'molecular_type', 'molecular_class', 'sequence', 'natural_source', 'taxonomy_id_source', 'expression_system', 'taxonomy_id_expression'],
+    },
+    ligands: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          present: {
+            type: 'boolean',
+            description: 'Whether the model contains any ligands',
+          },
+          smiles: {
+            type: 'string',
+            description: 'Provide a valid SMILES string of your ligand',
           },
+          reference: {
+            type: 'string',
+            description: 'Link to a reference of your ligand, i.e., CCD, PubChem, etc.',
+          },
+        },
+      },
+      description: 'List of ligands associated with the sample',
+    },
+    specimen: {
+      type: 'object',
+      description: 'Description of the specimen',
+      properties: {
+        buffer: {
+          type: 'string',
+          description: 'Name/composition of the (chemical) sample buffer during grid preparation',
+        },
+        concentration: {
+          type: 'object',
+          description: 'Concentration of the (supra)molecule in the sample, in mg/ml',
+        },
+        ph: {
+          type: 'number',
+          description: 'pH of the sample buffer',
+        },
+        vitrification: {
+          type: 'boolean',
+          description: 'Whether the sample was vitrified',
+        },
+        vitrification_cryogen: {
+          type: 'string',
+          description: 'Which cryogen was used for vitrification',
+        },
+        humidity: {
+          type: 'object',
+          description: 'Environmental humidity just before vitrification, in %',
+        },
+        temperature: {
+          type: 'object',
+          description: 'Environmental temperature just before vitrification, in K',
+          minimum: 0.0,
+        },
+        staining: {
+          type: 'boolean',
+          description: 'Whether the sample was stained',
+        },
+        embedding: {
+          type: 'boolean',
+          description: 'Whether the sample was embedded',
+        },
+        shadowing: {
+          type: 'boolean',
+          description: 'Whether the sample was shadowed',
+        },
+      },
+      required: ['ph', 'vitrification', 'vitrification_cryogen', 'staining', 'embedding', 'shadowing'],
+    },
+    grid: {
+      type: 'object',
+      description: 'Description of the grid used',
+      properties: {
+        manufacturer: {
+          type: 'string',
+          description: 'Grid manufacturer',
+        },
+        material: {
+          type: 'string',
+          description: 'Material out of which the grid is made',
+        },
+        mesh: {
+          type: 'number',
+          description: 'Grid mesh in lines per inch',
+        },
+        film_support: {
+          type: 'boolean',
+          description: 'Whether a support film was used',
+        },
+        film_material: {
+          type: 'string',
+          description: 'Type of material the support film is made of',
+        },
+        film_topology: {
+          type: 'string',
+          description: 'Topology of the support film',
+        },
+        film_thickness: {
+          type: 'string',
+          description: 'Thickness of the support film',
+        },
+        pretreatment_type: {
+          type: 'string',
+          description: 'Type of pretreatment of the grid, i.e., glow discharge',
+        },
+        pretreatment_time: {
+          type: 'object',
+          description: 'Length of time of the pretreatment in s',
+        },
+        pretreatment_pressure: {
+          type: 'object',
+          description: 'Pressure of the chamber during pretreatment, in Pa',
+        },
+        pretreatment_atmosphere: {
+          type: 'string',
+          description: 'Atmospheric conditions in the chamber during pretreatment, i.e., addition of specific gases, etc.',
         },
       },
-      description: 'List of instruments used in the project',
     },
   },
-  required: ['id', 'title', 'status', 'name', 'email', 'work_phone', 'orcid', 'country', 'type_org', 'name_org'],
-};
\ No newline at end of file
+  required: ['overall_molecule', 'molecule', 'specimen', 'grid'],
+};
+
+export const instrument_schema = { 
+  type: 'object',
+  properties: {
+    microscope: {
+      type: 'string',
+      description: 'Name/Type of the Microscope',
+    },
+    illumination: {
+      type: 'string',
+      description: 'Mode of illumination used during data collection',
+    },
+    imaging: {
+      type: 'string',
+      description: 'Mode of imaging used during data collection',
+    },
+    electron_source: {
+      type: 'string',
+      description: 'Type of electron source used in the microscope, such as FEG',
+    },
+    acceleration_voltage: {
+      type: 'object',
+      description: 'Voltage used for the electron acceleration, in kV',
+    },
+    c2_aperture: {
+      type: 'object',
+      description: 'C2 aperture size used in data acquisition, in µm',
+    },
+    cs: {
+      type: 'object',
+      description: 'Spherical aberration of the instrument, in mm',
+    },
+  },
+  required: ['microscope', 'illumination', 'imaging', 'electron_source', 'acceleration_voltage', 'cs'],
+};
+
+export const scicatheader_schema = {
+  type: "object",
+  properties: {
+    datasetName: { type: "string" },
+    description: { type: "string" },
+    creationLocation: { type: "string" },
+    dataFormat: { type: "string" },
+    ownerGroup: { type: "string" },
+    type: { type: "string" },
+    license: { type: "string" },
+    keywords: {
+      type: "array",
+      items: { type: "string" }
+    },
+    scientificMetadata: { type: "string" }
+  },
+  required: ["datasetName", "description", "creationLocation", "dataFormat", "ownerGroup", "type", "license", "keywords", "scientificMetadata"]
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/_ingestor-theme.scss b/src/app/ingestor/ingestor/_ingestor-theme.scss
new file mode 100644
index 0000000000..39875ec92b
--- /dev/null
+++ b/src/app/ingestor/ingestor/_ingestor-theme.scss
@@ -0,0 +1,39 @@
+@use "sass:map";
+@use "@angular/material" as mat;
+
+@mixin color($theme) {
+  $color-config: map-get($theme, "color");
+  $primary: map-get($color-config, "primary");
+  $header-1: map-get($color-config, "header-1");
+  $header-2: map-get($color-config, "header-2");
+  $header-3: map-get($color-config, "header-3");
+  $accent: map-get($color-config, "accent");
+  mat-card {
+    .scicat-header {
+      background-color: mat.get-color-from-palette($primary, "lighter");
+    }
+
+    .organizational-header {
+      background-color: mat.get-color-from-palette($header-1, "lighter");
+    }
+
+    .sample-header {
+      background-color: mat.get-color-from-palette($header-2, "lighter");
+    }
+
+    .instrument-header {
+      background-color: mat.get-color-from-palette($header-3, "lighter");
+    }
+
+    .acquisition-header {
+      background-color: mat.get-color-from-palette($accent, "lighter");
+    }
+  }
+}
+
+@mixin theme($theme) {
+  $color-config: mat.get-color-config($theme);
+  @if $color-config != null {
+    @include color($theme);
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index d214fed38a..76637b90fd 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -1,9 +1,27 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
 import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { IIngestionRequestInformation } from '../ingestor.component';
-import { connectableObservableDescriptor } from 'rxjs/internal/observable/ConnectableObservable';
 import { IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
 
+interface ISciCatHeader {
+  datasetName: string;
+  description: string;
+  creationLocation: string;
+  dataFormat: string;
+  ownerGroup: string;
+  type: string;
+  license: string;
+  keywords: string[];
+  scientificMetadata: IScientificMetadata;
+}
+
+interface IScientificMetadata {
+  organization: Object;
+  sample: Object;
+  acquisition: Object;
+  instrument: Object;
+}
+
 @Component({
   selector: 'ingestor.confirm-transfer-dialog',
   templateUrl: 'ingestor.confirm-transfer-dialog.html',
@@ -20,8 +38,29 @@ export class IngestorConfirmTransferDialog {
   }
 
   ngOnInit() {
+    this.provideMergeMetaData = this.createMetaDataString();
+  }
+
+  createMetaDataString(): string {
     const space = 2;
-    this.provideMergeMetaData = IngestorMetadaEditorHelper.mergeUserAndExtractorMetadata(this.createNewTransferData.userMetaData, this.createNewTransferData.extractorMetaData, space);
+    const scicatMetadata: ISciCatHeader = {
+      datasetName: this.createNewTransferData.scicatHeader['datasetName'],
+      description: this.createNewTransferData.scicatHeader['description'],
+      creationLocation: this.createNewTransferData.scicatHeader['creationLocation'],
+      dataFormat: this.createNewTransferData.scicatHeader['dataFormat'],
+      ownerGroup: this.createNewTransferData.scicatHeader['ownerGroup'],
+      type: this.createNewTransferData.scicatHeader['type'],
+      license: this.createNewTransferData.scicatHeader['license'],
+      keywords: this.createNewTransferData.scicatHeader['keywords'],
+      scientificMetadata: {
+        organization: this.createNewTransferData.userMetaData['organization'],
+        sample: this.createNewTransferData.userMetaData['sample'],
+        acquisition: this.createNewTransferData.extractorMetaData['acquisition'],
+        instrument: this.createNewTransferData.extractorMetaData['instrument'],
+      },
+    };
+
+    return JSON.stringify(scicatMetadata, null, space);
   }
 
   onClickBack(): void {
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index e37ebd7e7a..d094471392 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
 import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { IIngestionRequestInformation } from '../ingestor.component';
 import { IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { acquisition_schema, instrument_schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
 
 @Component({
   selector: 'ingestor.extractor-metadata-dialog',
@@ -11,13 +12,15 @@ import { IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-e
 })
 
 export class IngestorExtractorMetadataDialog {
-  metadataSchema: Schema;
+  metadataSchemaInstrument: Schema;
+  metadataSchemaAcquisition: Schema;
   createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
 
   waitForExtractedMetaData: boolean = true;
 
   constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
-    this.metadataSchema = {};
+    this.metadataSchemaInstrument = instrument_schema;
+    this.metadataSchemaAcquisition = acquisition_schema;
     this.createNewTransferData = data.createNewTransferData;
   }
 
@@ -38,7 +41,11 @@ export class IngestorExtractorMetadataDialog {
     }
   }
 
-  onDataChange(event: any) {
-    this.createNewTransferData.extractorMetaData = event;
+  onDataChangeUserMetadataInstrument(event: any) {
+    this.createNewTransferData.extractorMetaData['instrument'] = event;
+  }
+
+  onDataChangeUserMetadataAcquisition(event: any) {
+    this.createNewTransferData.extractorMetaData['acquisition'] = event;
   }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
index 6366b1d430..c3283d3e05 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -27,19 +27,22 @@ <h2 mat-dialog-title>
             Instrument Information
           </mat-card-header>
           <mat-card-content>
-            <app-metadata-editor [schema]="metadataSchema"
-              [data]="createNewTransferData.extractorMetaData"
-              (dataChange)="onDataChange($event)"></app-metadata-editor>
+            <app-metadata-editor [schema]="metadataSchemaInstrument"
+              [data]="createNewTransferData.userMetaData['instrument']"
+              (dataChange)="onDataChangeUserMetadataInstrument($event)"></app-metadata-editor>
           </mat-card-content>
         </mat-card>
         <mat-card>
-          <mat-card-header class="acqusition-header">
+          <mat-card-header class="acquisition-header">
             <div mat-card-avatar class="section-icon">
               <mat-icon> category-search </mat-icon>
             </div>
             Acquisition Information
           </mat-card-header>
           <mat-card-content>
+            <app-metadata-editor [schema]="metadataSchemaAcquisition"
+              [data]="createNewTransferData.userMetaData['acquisition']"
+              (dataChange)="onDataChangeUserMetadataAcquisition($event)"></app-metadata-editor>
           </mat-card-content>
         </mat-card>
       </div>
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index c2fc722861..e5532f221b 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -1,7 +1,7 @@
 import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
 import { IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
-import { schema_mask2 } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
+import { organizational_schema, sample_schema, scicatheader_schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
 import { IIngestionRequestInformation } from '../ingestor.component';
 
 @Component({
@@ -12,12 +12,15 @@ import { IIngestionRequestInformation } from '../ingestor.component';
 })
 
 export class IngestorUserMetadataDialog {
-  metadataSchema: Schema;
-
+  metadataSchemaOrganizational: Schema;
+  metadataSchemaSample: Schema;
+  scicatHeaderSchema: Schema;
   createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
 
   constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
-    this.metadataSchema = schema_mask2;
+    this.metadataSchemaOrganizational = organizational_schema;
+    this.metadataSchemaSample = sample_schema;
+    this.scicatHeaderSchema = scicatheader_schema;
     this.createNewTransferData = data.createNewTransferData;
   }
 
@@ -33,7 +36,15 @@ export class IngestorUserMetadataDialog {
     }
   }
 
-  onDataChange(event: Object) {
-    this.createNewTransferData.userMetaData = event;
+  onDataChangeUserMetadataOrganization(event: Object) {
+    this.createNewTransferData.userMetaData['organization'] = event;
+  }
+
+  onDataChangeUserMetadataSample(event: Object) {
+    this.createNewTransferData.userMetaData['sample'] = event;
+  }
+
+  onDataChangeUserScicatHeader(event: Object) {
+    this.createNewTransferData.scicatHeader = event;
   }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
index 4ec7ae4c1d..abf714cf8c 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
@@ -12,6 +12,19 @@ <h2 mat-dialog-title>
   
   <div fxLayout="row" fxLayout.xs="column">
     <div fxFlex="80%">
+      <mat-card>
+        <mat-card-header class="scicat-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> info </mat-icon>
+          </div>
+          SciCat Information
+        </mat-card-header>
+        <mat-card-content>
+          <app-metadata-editor [schema]="scicatHeaderSchema" [data]="createNewTransferData.scicatHeader"
+          (dataChange)="onDataChangeUserScicatHeader($event)"></app-metadata-editor>
+        </mat-card-content>
+      </mat-card>
+
       <mat-card>
         <mat-card-header class="organizational-header">
           <div mat-card-avatar class="section-icon">
@@ -20,8 +33,8 @@ <h2 mat-dialog-title>
           Organizational Information
         </mat-card-header>
         <mat-card-content>
-          <app-metadata-editor [schema]="metadataSchema" [data]="createNewTransferData.userMetaData"
-          (dataChange)="onDataChange($event)"></app-metadata-editor>
+          <app-metadata-editor [schema]="metadataSchemaOrganizational" [data]="createNewTransferData.userMetaData['organization']"
+          (dataChange)="onDataChangeUserMetadataOrganization($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
 
@@ -33,6 +46,8 @@ <h2 mat-dialog-title>
           Sample Information
         </mat-card-header>
         <mat-card-content>
+          <app-metadata-editor [schema]="metadataSchemaSample" [data]="createNewTransferData.userMetaData['sample']"
+          (dataChange)="onDataChangeUserMetadataSample($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
     </div>
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index defee924f0..6daf14159e 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -1,6 +1,3 @@
-@use "sass:map";
-@use "@angular/material" as mat;
-
 .ingestor-vertical-layout {
   display: flex;
   flex-direction: column;
@@ -36,35 +33,4 @@ mat-card {
       vertical-align: middle;
     }
   }
-}
-
-@mixin color($theme) {
-  $color-config: map-get($theme, "color");
-  $primary: map-get($color-config, "primary");
-  $header-1: map-get($color-config, "header-1");
-  $accent: map-get($color-config, "accent");
-  mat-card {
-    .organizational-header {
-      background-color: mat.get-color-from-palette($primary, "lighter");
-    }
-
-    .sample-header {
-      background-color: mat.get-color-from-palette($header-1, "lighter");
-    }
-
-    .instrument-header {
-      background-color: mat.get-color-from-palette($accent, "lighter");
-    }
-
-    .acquisition-header {
-      background-color: mat.get-color-from-palette($accent, "lighter");
-    }
-  }
-}
-
-@mixin theme($theme) {
-  $color-config: mat.get-color-config($theme);
-  @if $color-config != null {
-    @include color($theme);
-  }
-}
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 80dfd07722..a6c7def86d 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -15,21 +15,10 @@ interface ITransferDataListEntry {
   status: string;
 }
 
-interface ISciCatHeader {
-  datasetName: string;
-  description: string;
-  creationLocation: string;
-  dataFormat: string;
-  ownerGroup: string;
-  type: string;
-  license: string;
-  keywords: string[];
-  scientificMetadata: string;
-}
-
 export interface IIngestionRequestInformation {
   selectedPath: string;
   selectedMethod: string;
+  scicatHeader: Object;
   userMetaData: Object;
   extractorMetaData: Object;
   mergedMetaDataString: string;
@@ -52,7 +41,7 @@ export class IngestorComponent implements OnInit {
   connectingToFacilityBackend: boolean = false;
 
   lastUsedFacilityBackends: string[] = [];
-  
+
   transferDataSource: ITransferDataListEntry[] = []; // List of files to be transferred
   displayedColumns: string[] = ['transferId', 'status', 'actions'];
 
diff --git a/src/styles.scss b/src/styles.scss
index 9aee94e724..150dc3ab4c 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -29,6 +29,7 @@
 @use "./app/shared/modules/shared-table/shared-table-theme" as shared-table;
 @use "./app/shared/modules/table/table-theme" as table;
 @use "./app/users/user-settings/user-settings-theme" as user-settings;
+@use "./app/ingestor/ingestor/ingestor-theme" as ingestor;
 
 $my-custom-button-level: mat.define-typography-level(
   $font-weight: 400,
@@ -221,6 +222,7 @@ $theme: map-merge(
 @include shared-table.theme($theme);
 @include table.theme($theme);
 @include user-settings.theme($theme);
+@include ingestor.theme($theme);
 @include mat.button-density(0);
 @include mat.icon-button-density(0);
 

From eabe2647505b1cff8411b8f758af999e3d013c7f Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 12 Dec 2024 07:56:23 +0000
Subject: [PATCH 014/245] fix package.json for json-forms

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0a28ad1979..d7eeff7c93 100644
--- a/package.json
+++ b/package.json
@@ -29,8 +29,8 @@
     "@angular/platform-server": "^16",
     "@angular/router": "^16",
     "@angular/service-worker": "^16",
-    "@jsonforms/angular": "^3.2.1",
-    "@jsonforms/angular-material": "^3.2.1",
+    "@jsonforms/angular": "3.2.*",
+    "@jsonforms/angular-material": "3.2.*",
     "@ngbracket/ngx-layout": "^16.0.0",
     "@ngrx/effects": "^16",
     "@ngrx/router-store": "^16",

From b91fb860cb46f96837d91c07db922f50935954cc Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Sat, 14 Dec 2024 11:39:16 +0000
Subject: [PATCH 015/245] Embedding ingestor backend part 1

---
 .../customRenderer/all-of-renderer.ts         |  14 +++
 .../customRenderer/any-of-renderer.ts         |  38 +++++++
 .../customRenderer/custom-renderers.ts        |  20 ++++
 .../customRenderer/one-of-renderer.ts         |  14 +++
 .../ingestor-metadata-editor-helper.ts        | 101 ++++++++++--------
 .../ingestor-metadata-editor.component.ts     |  18 ++--
 ...estor.confirm-transfer-dialog.component.ts |   5 +-
 ...tor.extractor-metadata-dialog.component.ts |  14 +--
 .../ingestor.extractor-metadata-dialog.html   |  10 +-
 .../ingestor.new-transfer-dialog.component.ts |  81 ++++++++++----
 .../dialog/ingestor.new-transfer-dialog.html  |  15 +--
 ...ingestor.user-metadata-dialog.component.ts |  36 ++++++-
 .../dialog/ingestor.user-metadata-dialog.html |  20 ++--
 .../ingestor/ingestor/ingestor.component.scss |  22 ++++
 .../ingestor/ingestor/ingestor.component.ts   |  19 +---
 15 files changed, 310 insertions(+), 117 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
new file mode 100644
index 0000000000..91085fbaf7
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import { JsonFormsControl } from '@jsonforms/angular';
+
+@Component({
+  selector: 'AllOfRenderer',
+  template: `<div>AllOf Renderer</div>`
+})
+export class AllOfRenderer extends JsonFormsControl {
+  data: any[] = [];
+
+  ngOnInit() {
+    this.data = this.uischema?.options?.items || [];
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
new file mode 100644
index 0000000000..4add5848a0
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -0,0 +1,38 @@
+import { Component } from '@angular/core';
+import { JsonFormsControl } from '@jsonforms/angular';
+import { JsonSchema } from '@jsonforms/core';
+
+@Component({
+  selector: 'checkbox-with-price-control',
+  template: `
+    <div>
+      <label>
+        {{ label }}
+        <input type="checkbox" [checked]="data" (change)="onCheckboxChange($event)" />
+      </label>
+    </div>
+    <div *ngIf="schema.price > 50">
+      <p>Versand ist kostenlos!</p>
+    </div>
+  `,
+})
+export class AnyOfRenderer extends JsonFormsControl {
+  schema: JsonSchema;
+  label: string;
+
+  ngOnInit() {
+    super.ngOnInit();
+    this.schema = this.scopedSchema as JsonSchema;
+    this.data = this.data || false;
+    this.label = `${this.label} (${this.schema.title})`;
+  }
+
+  onCheckboxChange(event: Event) {
+    const input = event.target as HTMLInputElement;
+    this.data = input.checked;
+    this.onChange(this.data);
+
+    this.data = "TEST";
+    
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
new file mode 100644
index 0000000000..8b807f113b
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -0,0 +1,20 @@
+import { isAllOfControl, isAnyOfControl, isOneOfControl, JsonFormsRendererRegistryEntry } from '@jsonforms/core';
+import { OneOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer';
+import { AllOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer';
+import { AnyOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer';
+import { isRangeControl, RankedTester, rankWith } from '@jsonforms/core';
+
+export const customRenderers: JsonFormsRendererRegistryEntry[] = [
+  {
+    tester: rankWith(4, isOneOfControl),
+    renderer: OneOfRenderer
+  },
+  {
+    tester: rankWith(4, isAllOfControl),
+    renderer: AllOfRenderer
+  },
+  {
+    tester: rankWith(4, isAnyOfControl),
+    renderer: AnyOfRenderer
+  }
+];
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
new file mode 100644
index 0000000000..efc546ae48
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import { JsonFormsControl } from '@jsonforms/angular';
+
+@Component({
+  selector: 'OneOfRenderer',
+  template: `<div>OneOf Renderer</div>`
+})
+export class OneOfRenderer extends JsonFormsControl {
+  data: any[] = [];
+
+  ngOnInit() {
+    this.data = this.uischema?.options?.items || [];
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index df2d8bc0a1..5208f602b3 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -1,4 +1,17 @@
-import { IIngestionRequestInformation } from "ingestor/ingestor/ingestor.component";
+export interface IIngestionRequestInformation {
+  selectedPath: string;
+  selectedMethod: IExtractionMethod;
+  scicatHeader: Object;
+  userMetaData: Object;
+  extractorMetaData: Object;
+  extractorMetaDataReady: boolean;
+  mergedMetaDataString: string;
+}
+
+export interface IExtractionMethod {
+  name: string;
+  schema: string; // Base64 encoded JSON schema
+};
 
 export interface Schema {
   type?: string;
@@ -8,54 +21,55 @@ export interface Schema {
       format?: string;
       enum?: string[];
       minLength?: number;
+      maxLength?: number;
+      pattern?: string;
+      items?: Schema;
+      additionalProperties?: boolean | Schema;
+      description?: string;
+      title?: string;
+      anyOf?: any[];
+      allOf?: any[];
+      oneOf?: any[];
+      not?: Schema;
+      required?: string[];
+      properties?: {
+        [key: string]: Schema;
+      };
     };
   };
   required?: string[];
-}
-
-export interface UISchema {
-  type: string;
-  elements: { type: string; scope: string; label?: boolean }[];
+  additionalProperties?: boolean | Schema;
+  description?: string;
+  title?: string;
+  anyOf?: any[];
+  allOf?: any[];
+  oneOf?: any[];
+  not?: Schema;
 }
 
 export class IngestorMetadaEditorHelper {
-  static generateUISchemaFromSchema(schema: string): UISchema {
-    const parsedSchema: Schema = JSON.parse(schema);
+  // Resolve all $ref in a schema
+  static resolveRefs(schema: any, rootSchema: any): any {
+    if (schema === null || schema === undefined) {
+      return schema;
+    }
 
-    const flattenProperties = (properties: any, parentKey: string = ''): any[] => {
-      if (!properties) {
-        return [];
-      }
-
-      return Object.keys(properties).reduce((acc, key) => {
-        const property = properties[key];
-        const fullKey = parentKey ? `${parentKey}.${key}` : key;
-
-        if (property.type === 'object' && property.properties) {
-          acc.push({
-            type: 'Label',
-            text: key.charAt(0).toUpperCase() + key.slice(1)
-          });
-          acc.push(...flattenProperties(property.properties, fullKey));
-        } else {
-          acc.push({
-            type: 'Control',
-            scope: `#/properties/${fullKey}`,
-            label: parsedSchema.required && parsedSchema.required.includes(key) ? true : undefined
-          });
+    if (schema.$ref) {
+      const refPath = schema.$ref.replace('#/', '').split('/');
+      let ref = rootSchema;
+      refPath.forEach((part) => {
+        ref = ref[part];
+      });
+      return IngestorMetadaEditorHelper.resolveRefs(ref, rootSchema);
+    } else if (typeof schema === 'object') {
+      for (const key in schema) {
+        if (schema.hasOwnProperty(key)) {
+          schema[key] = IngestorMetadaEditorHelper.resolveRefs(schema[key], rootSchema);
         }
-
-        return acc;
-      }, []);
-    };
-
-    const uischema = {
-      type: 'VerticalLayout',
-      elements: flattenProperties(parsedSchema.properties)
-    };
-
-    return uischema;
-  }
+      }
+    }
+    return schema;
+  };
 
   static mergeUserAndExtractorMetadata(userMetadata: Object, extractorMetadata: Object, space: number): string {
     return JSON.stringify({ ...userMetadata, ...extractorMetadata }, null, space);
@@ -64,11 +78,12 @@ export class IngestorMetadaEditorHelper {
   static createEmptyRequestInformation = (): IIngestionRequestInformation => {
     return {
       selectedPath: '',
-      selectedMethod: '',
+      selectedMethod: { name: '', schema: '' },
       scicatHeader: {},
       userMetaData: {},
       extractorMetaData: {},
-      mergedMetaDataString: ''
+      extractorMetaDataReady: false,
+      mergedMetaDataString: '',
     };
   };
 };
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 65b7f330c8..db5348c195 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -1,32 +1,26 @@
 import { Component, EventEmitter, Output, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { angularMaterialRenderers } from '@jsonforms/angular-material';
-import { IngestorMetadaEditorHelper, Schema, UISchema } from './ingestor-metadata-editor-helper';
+import { Schema } from './ingestor-metadata-editor-helper';
+import { customRenderers } from './customRenderer/custom-renderers';
 
 @Component({
   selector: 'app-metadata-editor',
   template: `<jsonforms
   [data]="data"
   [schema]="schema"
-  [uischema]="uischema"
-  [renderers]="renderers"
+  [renderers]="combinedRenderers"
   (dataChange)="onDataChange($event)"
 ></jsonforms>`,
 })
 
-export class IngestorMetadataEditorComponent implements OnChanges {
+export class IngestorMetadataEditorComponent {
   @Input() data: Object;
   @Input() schema: Schema;
 
   @Output() dataChange = new EventEmitter<string>();
 
-  renderers = angularMaterialRenderers;
-
-  uischema: UISchema;
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes.schema) {
-      this.uischema = IngestorMetadaEditorHelper.generateUISchemaFromSchema(JSON.stringify(this.schema));
-    }
+  get combinedRenderers() {
+    return [...angularMaterialRenderers, ...customRenderers];
   }
 
   onDataChange(event: any) {
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 76637b90fd..1968c67429 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -1,7 +1,6 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
 import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { IIngestionRequestInformation } from '../ingestor.component';
-import { IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { IIngestionRequestInformation, IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
 
 interface ISciCatHeader {
   datasetName: string;
@@ -32,9 +31,11 @@ interface IScientificMetadata {
 export class IngestorConfirmTransferDialog {
   createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
   provideMergeMetaData: string = '';
+  backendURL: string = '';
 
   constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
     this.createNewTransferData = data.createNewTransferData;
+    this.backendURL = data.backendURL;
   }
 
   ngOnInit() {
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index d094471392..fae49b798a 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -1,7 +1,6 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
 import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { IIngestionRequestInformation } from '../ingestor.component';
-import { IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { IIngestionRequestInformation, IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
 import { acquisition_schema, instrument_schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
 
 @Component({
@@ -16,16 +15,15 @@ export class IngestorExtractorMetadataDialog {
   metadataSchemaAcquisition: Schema;
   createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
 
-  waitForExtractedMetaData: boolean = true;
+  backendURL: string = '';
+  extractorMetaDataReady: boolean = true;
 
   constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
+    this.backendURL = data.backendURL;
     this.metadataSchemaInstrument = instrument_schema;
     this.metadataSchemaAcquisition = acquisition_schema;
     this.createNewTransferData = data.createNewTransferData;
-  }
-
-  ngOnInit() {
-    this.waitForExtractedMetaData = false;
+    this.extractorMetaDataReady = data.extractorMetaDataReady
   }
 
 
@@ -36,6 +34,8 @@ export class IngestorExtractorMetadataDialog {
   }
 
   onClickNext(): void {
+    console.log(this.createNewTransferData.selectedMethod)
+
     if (this.data && this.data.onClickNext) {
       this.data.onClickNext(3); // Beispielwert für den Schritt
     }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
index c3283d3e05..15298bee8e 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -9,13 +9,15 @@ <h2 mat-dialog-title>
 </div>
 <mat-dialog-content class="mat-typography">
 
-  <div *ngIf="waitForExtractedMetaData">
+  <div *ngIf="!extractorMetaDataReady" class="spinner-container">
     <mat-progress-spinner diameter="20"
       mode="indeterminate"></mat-progress-spinner>
-    <div class="spinner-text">Wait for ingestor...</div>
+      <div class="spinner-text">
+        <span>Wait for the Ingestor...</span>
+      </div>
   </div>
 
-  <div *ngIf="!waitForExtractedMetaData">
+  <div *ngIf="extractorMetaDataReady">
     <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
     <div fxLayout="row" fxLayout.xs="column">
       <div fxFlex="80%">
@@ -51,6 +53,6 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" disabled="!extractorMetaDataReady"
     (click)="onClickNext()">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 352663e37a..0433f6122a 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -1,8 +1,8 @@
 import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
 import { HttpClient } from '@angular/common/http';
-import { IIngestionRequestInformation } from '../ingestor.component'
-import { IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { IExtractionMethod, IIngestionRequestInformation, IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { INGESTOR_API_ENDPOINTS_V1 } from '../ingestor-api-endpoints';
 
 @Component({
   selector: 'ingestor.new-transfer-dialog',
@@ -12,13 +12,19 @@ import { IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/in
 })
 
 export class IngestorNewTransferDialogComponent implements OnInit {
-  extractionMethods: string[] = [];
+  extractionMethods: IExtractionMethod[] = [];
   availableFilePaths: string[] = [];
+  backendURL: string = '';
+  extractionMethodsError: string = '';
+  availableFilePathsError: string = '';
+
+  uiNextButtonReady: boolean = false;
 
   createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
 
   constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any, private http: HttpClient) {
     this.createNewTransferData = data.createNewTransferData;
+    this.backendURL = data.backendURL;
   }
 
   ngOnInit(): void {
@@ -26,26 +32,61 @@ export class IngestorNewTransferDialogComponent implements OnInit {
     this.apiGetAvailableFilePaths();
   }
 
-  apiGetExtractionMethods(): void {
-    // Get reqeuest auf den Extractor endpoint
-    /*this.http.get('INGESTOR_API_ENDPOINTS_V1.extractor').subscribe((response: any) => {
-      this.extractionMethods = response;
-      console.log('Extraktoren geladen:', this.extractionMethods);
-    });*/
+  set selectedPath(value: string) {
+    this.createNewTransferData.selectedPath = value;
+    this.validateNextButton();
+  }
+
+  get selectedPath(): string {
+    return this.createNewTransferData.selectedPath;
+  }
+
+  set selectedMethod(value: IExtractionMethod) {
+    this.createNewTransferData.selectedMethod = value;
+    this.validateNextButton();
+  }
 
-    const fakeData = ['Extraktor 1', 'Extraktor 2', 'Extraktor 3'];
-    this.extractionMethods = fakeData;
+  get selectedMethod(): IExtractionMethod {
+    return this.createNewTransferData.selectedMethod;
+  }
+
+  apiGetExtractionMethods(): void {
+    this.http.get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR).subscribe(
+      (response: any) => {
+        if (response.methods && response.methods.length > 0) {
+          this.extractionMethods = response.methods;
+        }
+        else {
+          this.extractionMethodsError = 'No extraction methods found.';
+        }
+      },
+      (error: any) => {
+        this.extractionMethodsError = error.message;
+        console.error(this.extractionMethodsError);
+      }
+    );
   }
 
   apiGetAvailableFilePaths(): void {
-    // Get request auf den Dataset endpoint
-    /*this.http.get('INGESTOR_API_ENDPOINTS_V1.dataset').subscribe((response: any) => {
-      this.availableFilePaths = response;
-      console.log('Pfade geladen:', this.availableFilePaths);
-    });*/
+    this.http.get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET).subscribe(
+      (response: any) => {
+        if (response.datasets && response.datasets.length > 0) {
+          this.availableFilePaths = response.datasets;
+        }
+        else {
+          this.availableFilePathsError = 'No datasets found.';
+        }
+      },
+      (error: any) => {
+        this.availableFilePathsError = error.message;
+        console.error(this.availableFilePathsError);
+      }
+    );
+  }
 
-    const fakeData = ['Path 1', 'Path 2', 'Path 3'];
-    this.availableFilePaths = fakeData;
+  onClickRetryRequests(): void {
+    this.apiGetExtractionMethods();
+    this.apiGetAvailableFilePaths();
   }
 
   onClickNext(): void {
@@ -53,4 +94,8 @@ export class IngestorNewTransferDialogComponent implements OnInit {
       this.data.onClickNext(1); // Open next dialog
     }
   }
+
+  validateNextButton(): void {
+    this.uiNextButtonReady = !!this.createNewTransferData.selectedPath && !!this.createNewTransferData.selectedMethod?.name;
+  }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
index 16675bd3df..6bd1a6d738 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -14,29 +14,32 @@ <h2 mat-dialog-title>
   <div>
     <mat-form-field class="form-full-width">
       <mat-label>File Path</mat-label>
-      <input matInput [(ngModel)]="createNewTransferData.selectedPath" [matAutocomplete]="auto">
+      <input matInput [(ngModel)]="selectedPath" [matAutocomplete]="auto">
       <mat-autocomplete #auto="matAutocomplete">
-        <mat-option *ngFor="let method of availableFilePaths" [value]="method">
-          {{ method }}
+        <mat-option *ngFor="let filePath of availableFilePaths" [value]="filePath">
+          {{ filePath }}
         </mat-option>
       </mat-autocomplete>
     </mat-form-field>
+    <mat-error *ngIf="availableFilePathsError">{{ availableFilePathsError }}</mat-error>
   </div>
 
   <div>
     <mat-form-field class="form-full-width">
       <mat-label>Extraction Method</mat-label>
-      <mat-select [(ngModel)]="createNewTransferData.selectedMethod">
+      <mat-select [(ngModel)]="selectedMethod">
         <mat-option *ngFor="let method of extractionMethods" [value]="method">
-          {{ method }}
+          {{ method.name }}
         </mat-option>
       </mat-select>
     </mat-form-field>
+    <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError }}</mat-error>
   </div>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end">
+  <button *ngIf="availableFilePathsError || extractionMethodsError" mat-button color="warn" (click)="onClickRetryRequests()">Retry</button>
   <button mat-button mat-dialog-close>Cancel</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" [disabled]="!uiNextButtonReady"
     (click)="onClickNext()">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index e5532f221b..cbf4cacd83 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -1,8 +1,7 @@
 import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
-import { IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { IIngestionRequestInformation, IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
 import { organizational_schema, sample_schema, scicatheader_schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
-import { IIngestionRequestInformation } from '../ingestor.component';
 
 @Component({
   selector: 'ingestor.user-metadata-dialog',
@@ -16,12 +15,37 @@ export class IngestorUserMetadataDialog {
   metadataSchemaSample: Schema;
   scicatHeaderSchema: Schema;
   createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
+  backendURL: string = '';
+
+  uiNextButtonReady: boolean = true; // Change to false when dev is ready
+
+  isCardContentVisible = {
+    scicat: true,
+    organizational: true,
+    sample: true
+  };
 
   constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
-    this.metadataSchemaOrganizational = organizational_schema;
-    this.metadataSchemaSample = sample_schema;
+    const encodedSchema = data.createNewTransferData.selectedMethod.schema;
+    const decodedSchema = atob(encodedSchema);
+    const schema = JSON.parse(decodedSchema);
+    
+    console.log(schema);
+    const resolvedSchema = IngestorMetadaEditorHelper.resolveRefs(schema, schema);
+
+    console.log(resolvedSchema);
+
+    const organizationalSchema = resolvedSchema.properties.organizational;
+    const sampleSchema = resolvedSchema.properties.sample;
+
+    console.log(organizationalSchema);
+    console.log(sampleSchema);
+    
+    this.metadataSchemaOrganizational = organizationalSchema;
+    this.metadataSchemaSample = sampleSchema;
     this.scicatHeaderSchema = scicatheader_schema;
     this.createNewTransferData = data.createNewTransferData;
+    this.backendURL = data.backendURL;
   }
 
   onClickBack(): void {
@@ -47,4 +71,8 @@ export class IngestorUserMetadataDialog {
   onDataChangeUserScicatHeader(event: Object) {
     this.createNewTransferData.scicatHeader = event;
   }
+
+  toggleCardContent(card: string): void {
+    this.isCardContentVisible[card] = !this.isCardContentVisible[card];
+  }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
index abf714cf8c..8e3fd19142 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
@@ -13,39 +13,45 @@ <h2 mat-dialog-title>
   <div fxLayout="row" fxLayout.xs="column">
     <div fxFlex="80%">
       <mat-card>
-        <mat-card-header class="scicat-header">
+        <mat-card-header class="scicat-header" (click)="toggleCardContent('scicat')">
           <div mat-card-avatar class="section-icon">
             <mat-icon> info </mat-icon>
           </div>
           SciCat Information
+          <span class="spacer"></span>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ? 'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
-        <mat-card-content>
+        <mat-card-content *ngIf="isCardContentVisible.scicat">
           <app-metadata-editor [schema]="scicatHeaderSchema" [data]="createNewTransferData.scicatHeader"
           (dataChange)="onDataChangeUserScicatHeader($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
 
       <mat-card>
-        <mat-card-header class="organizational-header">
+        <mat-card-header class="organizational-header" (click)="toggleCardContent('organizational')">
           <div mat-card-avatar class="section-icon">
             <mat-icon> person </mat-icon>
           </div>
           Organizational Information
+          <span class="spacer"></span>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ? 'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
-        <mat-card-content>
+        <mat-card-content *ngIf="isCardContentVisible.organizational">
           <app-metadata-editor [schema]="metadataSchemaOrganizational" [data]="createNewTransferData.userMetaData['organization']"
           (dataChange)="onDataChangeUserMetadataOrganization($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
 
       <mat-card>
-        <mat-card-header class="sample-header">
+        <mat-card-header class="sample-header" (click)="toggleCardContent('sample')">
           <div mat-card-avatar class="section-icon">
             <mat-icon> description </mat-icon>
           </div>
           Sample Information
+          <span class="spacer"></span>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ? 'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
-        <mat-card-content>
+        <mat-card-content *ngIf="isCardContentVisible.sample">
           <app-metadata-editor [schema]="metadataSchemaSample" [data]="createNewTransferData.userMetaData['sample']"
           (dataChange)="onDataChangeUserMetadataSample($event)"></app-metadata-editor>
         </mat-card-content>
@@ -56,6 +62,6 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" [disabled]="!uiNextButtonReady"
     (click)="onClickNext()">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index 6daf14159e..bbfccd1e5a 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -25,6 +25,10 @@
 mat-card {
   margin: 1em;
 
+  .mat-mdc-card-content {
+    padding: 16px;
+  }
+
   .section-icon {
     height: auto !important;
     width: auto !important;
@@ -33,4 +37,22 @@ mat-card {
       vertical-align: middle;
     }
   }
+}
+
+.spinner-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+}
+
+.spinner-text {
+  margin-top: 10px;
+  font-size: 16px;
+  text-align: center;
+}
+
+.spacer {
+  flex: 1 1 auto;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index a6c7def86d..ba34313352 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -8,22 +8,13 @@ import { MatDialog } from "@angular/material/dialog";
 import { IngestorUserMetadataDialog } from "./dialog/ingestor.user-metadata-dialog.component";
 import { IngestorExtractorMetadataDialog } from "./dialog/ingestor.extractor-metadata-dialog.component";
 import { IngestorConfirmTransferDialog } from "./dialog/ingestor.confirm-transfer-dialog.component";
-import { IngestorMetadaEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import { IIngestionRequestInformation, IngestorMetadaEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 interface ITransferDataListEntry {
   transferId: string;
   status: string;
 }
 
-export interface IIngestionRequestInformation {
-  selectedPath: string;
-  selectedMethod: string;
-  scicatHeader: Object;
-  userMetaData: Object;
-  extractorMetaData: Object;
-  mergedMetaDataString: string;
-}
-
 @Component({
   selector: "ingestor",
   templateUrl: "./ingestor.component.html",
@@ -195,26 +186,26 @@ export class IngestorComponent implements OnInit {
     switch (step) {
       case 0:
         dialogRef = this.dialog.open(IngestorNewTransferDialogComponent, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData },
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
           disableClose: true
         });
 
         break;
       case 1:
         dialogRef = this.dialog.open(IngestorUserMetadataDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData },
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
           disableClose: true
         });
         break;
       case 2:
         dialogRef = this.dialog.open(IngestorExtractorMetadataDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData },
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
           disableClose: true
         });
         break;
       case 3:
         dialogRef = this.dialog.open(IngestorConfirmTransferDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData },
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
           disableClose: true
         });
         break;

From 2428606d503e5852924be2fbc6fe59aab337bc9b Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Sat, 14 Dec 2024 16:32:41 +0000
Subject: [PATCH 016/245] Embedding ingestor backend part 2

---
 .../customRenderer/any-of-renderer.ts         | 89 ++++++++++++-------
 .../customRenderer/one-of-renderer.ts         | 71 +++++++++++++--
 .../ingestor-metadata-editor-helper.ts        | 41 ++-------
 .../ingestor-metadata-editor.component.ts     |  7 +-
 src/app/ingestor/ingestor.module.ts           |  6 ++
 ...tor.extractor-metadata-dialog.component.ts | 27 ++++--
 .../ingestor.extractor-metadata-dialog.html   |  3 +-
 ...ingestor.user-metadata-dialog.component.ts | 18 ++--
 8 files changed, 164 insertions(+), 98 deletions(-)

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 4add5848a0..3e212da8d8 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -1,38 +1,65 @@
 import { Component } from '@angular/core';
-import { JsonFormsControl } from '@jsonforms/angular';
-import { JsonSchema } from '@jsonforms/core';
+import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
+import { ControlProps, JsonSchema } from '@jsonforms/core';
+import { configuredRenderer } from '../ingestor-metadata-editor-helper';
 
 @Component({
-  selector: 'checkbox-with-price-control',
-  template: `
-    <div>
-      <label>
-        {{ label }}
-        <input type="checkbox" [checked]="data" (change)="onCheckboxChange($event)" />
-      </label>
-    </div>
-    <div *ngIf="schema.price > 50">
-      <p>Versand ist kostenlos!</p>
+    selector: 'app-anyof-renderer',
+    template: `
+    <div class="anyof-group">
+    <mat-card-title>{{anyOfTitle}}</mat-card-title>
+
+    <mat-tab-group animationDuration="0ms">
+        <mat-tab *ngFor="let option of options" label="{{option}}">
+            <div style="margin-top: 20px;" *ngIf="option !== 'null'">
+                <jsonforms [schema]="getTabSchema(option)" [data]="passedProps.data" [renderers]="defaultRenderer" (dataChange)=onInnerJsonFormsChange($event)></jsonforms>
+            </div>
+        </mat-tab>
+    </mat-tab-group>
     </div>
-  `,
+  `
 })
 export class AnyOfRenderer extends JsonFormsControl {
-  schema: JsonSchema;
-  label: string;
-
-  ngOnInit() {
-    super.ngOnInit();
-    this.schema = this.scopedSchema as JsonSchema;
-    this.data = this.data || false;
-    this.label = `${this.label} (${this.schema.title})`;
-  }
-
-  onCheckboxChange(event: Event) {
-    const input = event.target as HTMLInputElement;
-    this.data = input.checked;
-    this.onChange(this.data);
-
-    this.data = "TEST";
-    
-  }
+
+    dataAsString: string;
+    options: string[] = [];
+    anyOfTitle: string;
+
+    rendererService: JsonFormsAngularService;
+
+    defaultRenderer = configuredRenderer;
+    passedProps: ControlProps;
+
+    constructor(service: JsonFormsAngularService) {
+        super(service);
+        this.rendererService = service;
+    }
+
+    public mapAdditionalProps(props: ControlProps) {
+        this.passedProps = props;
+        this.anyOfTitle = props.label || 'AnyOf';
+        this.options = props.schema.anyOf.map((option: any) => option.title || option.type || JSON.stringify(option));
+    }
+
+    public getTabSchema(tabOption: string): JsonSchema {
+        const selectedSchema = (this.passedProps.schema.anyOf as any).find((option: any) => option.title === tabOption || option.type === tabOption || JSON.stringify(option) === tabOption);
+        return selectedSchema;
+    }
+
+    public onInnerJsonFormsChange(event: any) {
+        // Check if data is equal to the passedProps.data
+        if (event !== this.passedProps.data) {
+            const updatedData = this.rendererService.getState().jsonforms.core.data;
+
+            // aktualisiere das aktuelle Datenobjekt
+            const pathSegments = this.passedProps.path.split('.');
+            let current = updatedData;
+            for (let i = 0; i < pathSegments.length - 1; i++) {
+                current = current[pathSegments[i]];
+            }
+            current[pathSegments[pathSegments.length - 1]] = event;
+
+            this.rendererService.setData(updatedData);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
index efc546ae48..42665d5c62 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
@@ -1,14 +1,69 @@
 import { Component } from '@angular/core';
-import { JsonFormsControl } from '@jsonforms/angular';
+import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
+import { ControlProps, JsonSchema } from '@jsonforms/core';
+import { configuredRenderer } from '../ingestor-metadata-editor-helper';
 
 @Component({
-  selector: 'OneOfRenderer',
-  template: `<div>OneOf Renderer</div>`
+    selector: 'app-oneof-component',
+    template: `
+    <div class="anyof-group">
+      <p>{{anyOfTitle}}</p>
+      <mat-radio-group [(ngModel)]="selectedOption" (change)="onOptionChange()">
+        <mat-radio-button *ngFor="let option of options" [value]="option" style="margin-right: 10px;">
+          {{option}}
+        </mat-radio-button>
+      </mat-radio-group>
+      <div style="margin-top: 20px;" *ngIf="selectedAnyOption && selectedOption !== 'null'">
+        <jsonforms [schema]="selectedAnyOption" [data]="passedProps.data" [renderers]="defaultRenderer" (dataChange)=onInnerJsonFormsChange($event)></jsonforms>
+      </div>
+    </div>
+  `
 })
 export class OneOfRenderer extends JsonFormsControl {
-  data: any[] = [];
 
-  ngOnInit() {
-    this.data = this.uischema?.options?.items || [];
-  }
-}
+    dataAsString: string;
+    options: string[] = [];
+    anyOfTitle: string;
+    selectedOption: string;
+    selectedAnyOption: JsonSchema;
+
+    rendererService: JsonFormsAngularService;
+
+    defaultRenderer = configuredRenderer;
+    passedProps: ControlProps;
+
+    constructor(service: JsonFormsAngularService) {
+        super(service);
+        this.rendererService = service;
+    }
+
+    public mapAdditionalProps(props: ControlProps) {
+        this.passedProps = props;
+        this.anyOfTitle = props.label || 'AnyOf';
+        this.options = props.schema.anyOf.map((option: any) => option.title || option.type || JSON.stringify(option));
+        if (!props.data) {
+            this.selectedOption = 'null'; // Auf "null" setzen, wenn die Daten leer sind
+        }
+    }
+
+    public onOptionChange() {
+        this.selectedAnyOption = (this.passedProps.schema.anyOf as any).find((option: any) => option.title === this.selectedOption || option.type === this.selectedOption || JSON.stringify(option) === this.selectedOption);
+    }
+
+    public onInnerJsonFormsChange(event: any) {
+        // Check if data is equal to the passedProps.data
+        if (event !== this.passedProps.data) {
+            const updatedData = this.rendererService.getState().jsonforms.core.data;
+
+            // aktualisiere das aktuelle Datenobjekt
+            const pathSegments = this.passedProps.path.split('.');
+            let current = updatedData;
+            for (let i = 0; i < pathSegments.length - 1; i++) {
+                current = current[pathSegments[i]];
+            }
+            current[pathSegments[pathSegments.length - 1]] = event;
+
+            this.rendererService.setData(updatedData);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index 5208f602b3..b1b4ff58bd 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -1,3 +1,6 @@
+import { angularMaterialRenderers } from "@jsonforms/angular-material";
+import { customRenderers } from "./customRenderer/custom-renderers";
+
 export interface IIngestionRequestInformation {
   selectedPath: string;
   selectedMethod: IExtractionMethod;
@@ -13,39 +16,11 @@ export interface IExtractionMethod {
   schema: string; // Base64 encoded JSON schema
 };
 
-export interface Schema {
-  type?: string;
-  properties?: {
-    [key: string]: {
-      type: string;
-      format?: string;
-      enum?: string[];
-      minLength?: number;
-      maxLength?: number;
-      pattern?: string;
-      items?: Schema;
-      additionalProperties?: boolean | Schema;
-      description?: string;
-      title?: string;
-      anyOf?: any[];
-      allOf?: any[];
-      oneOf?: any[];
-      not?: Schema;
-      required?: string[];
-      properties?: {
-        [key: string]: Schema;
-      };
-    };
-  };
-  required?: string[];
-  additionalProperties?: boolean | Schema;
-  description?: string;
-  title?: string;
-  anyOf?: any[];
-  allOf?: any[];
-  oneOf?: any[];
-  not?: Schema;
-}
+export const configuredRenderer = [
+  ...angularMaterialRenderers,
+  ...customRenderers,
+];
+
 
 export class IngestorMetadaEditorHelper {
   // Resolve all $ref in a schema
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index db5348c195..d6921ccbbb 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -1,7 +1,8 @@
 import { Component, EventEmitter, Output, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { angularMaterialRenderers } from '@jsonforms/angular-material';
-import { Schema } from './ingestor-metadata-editor-helper';
 import { customRenderers } from './customRenderer/custom-renderers';
+import { JsonSchema } from '@jsonforms/core';
+import { configuredRenderer } from './ingestor-metadata-editor-helper';
 
 @Component({
   selector: 'app-metadata-editor',
@@ -15,12 +16,12 @@ import { customRenderers } from './customRenderer/custom-renderers';
 
 export class IngestorMetadataEditorComponent {
   @Input() data: Object;
-  @Input() schema: Schema;
+  @Input() schema: JsonSchema;
 
   @Output() dataChange = new EventEmitter<string>();
 
   get combinedRenderers() {
-    return [...angularMaterialRenderers, ...customRenderers];
+    return configuredRenderer;
   }
 
   onDataChange(event: any) {
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 359e3dd500..eb79e0e644 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -25,6 +25,9 @@ import { IngestorExtractorMetadataDialog } from "./ingestor/dialog/ingestor.extr
 import { IngestorConfirmTransferDialog } from "./ingestor/dialog/ingestor.confirm-transfer-dialog.component";
 import { MatStepperModule } from "@angular/material/stepper";
 import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialog-stepper.component.component";
+import { AnyOfRenderer } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
+import { OneOfRenderer } from "./ingestor-metadata-editor/customRenderer/one-of-renderer";
+import { MatRadioModule } from "@angular/material/radio";
 
 @NgModule({
   declarations: [
@@ -35,6 +38,8 @@ import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialo
     IngestorExtractorMetadataDialog,
     IngestorConfirmTransferDialog,
     IngestorDialogStepperComponent,
+    AnyOfRenderer,
+    OneOfRenderer,
   ],
   imports: [
     CommonModule, 
@@ -53,6 +58,7 @@ import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialo
     MatSelectModule,
     MatOptionModule,
     MatStepperModule,
+    MatRadioModule,
     MatAutocompleteModule,
     JsonFormsModule,
     JsonFormsAngularMaterialModule,
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index fae49b798a..cdae97e556 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -1,7 +1,8 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
 import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { IIngestionRequestInformation, IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { IIngestionRequestInformation, IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
 import { acquisition_schema, instrument_schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
+import { JsonSchema } from '@jsonforms/core';
 
 @Component({
   selector: 'ingestor.extractor-metadata-dialog',
@@ -11,19 +12,27 @@ import { acquisition_schema, instrument_schema } from 'ingestor/ingestor-metadat
 })
 
 export class IngestorExtractorMetadataDialog {
-  metadataSchemaInstrument: Schema;
-  metadataSchemaAcquisition: Schema;
+  metadataSchemaInstrument: JsonSchema;
+  metadataSchemaAcquisition: JsonSchema;
   createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
 
   backendURL: string = '';
-  extractorMetaDataReady: boolean = true;
+  extractorMetaDataReady: boolean = false;
 
   constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
-    this.backendURL = data.backendURL;
-    this.metadataSchemaInstrument = instrument_schema;
-    this.metadataSchemaAcquisition = acquisition_schema;
-    this.createNewTransferData = data.createNewTransferData;
-    this.extractorMetaDataReady = data.extractorMetaDataReady
+        const encodedSchema = data.createNewTransferData.selectedMethod.schema;
+        const decodedSchema = atob(encodedSchema);
+        const schema = JSON.parse(decodedSchema);
+        
+        const resolvedSchema = IngestorMetadaEditorHelper.resolveRefs(schema, schema);
+        const instrumentSchema = resolvedSchema.properties.instrument;
+        const acqusitionSchema = resolvedSchema.properties.acquisition;
+        
+        this.metadataSchemaInstrument = instrumentSchema;
+        this.metadataSchemaAcquisition = acqusitionSchema;
+        this.createNewTransferData = data.createNewTransferData;
+        this.backendURL = data.backendURL;
+        this.extractorMetaDataReady = true //data.extractorMetaDataReady
   }
 
 
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
index 15298bee8e..3178a15a54 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -53,6 +53,5 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" disabled="!extractorMetaDataReady"
-    (click)="onClickNext()">Next</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" (click)="onClickNext()">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index cbf4cacd83..c2087642f0 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -1,7 +1,8 @@
 import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
-import { IIngestionRequestInformation, IngestorMetadaEditorHelper, Schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
-import { organizational_schema, sample_schema, scicatheader_schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
+import { IIngestionRequestInformation, IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { scicatheader_schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
+import { JsonSchema } from '@jsonforms/core';
 
 @Component({
   selector: 'ingestor.user-metadata-dialog',
@@ -11,9 +12,9 @@ import { organizational_schema, sample_schema, scicatheader_schema } from 'inges
 })
 
 export class IngestorUserMetadataDialog {
-  metadataSchemaOrganizational: Schema;
-  metadataSchemaSample: Schema;
-  scicatHeaderSchema: Schema;
+  metadataSchemaOrganizational: JsonSchema;
+  metadataSchemaSample: JsonSchema;
+  scicatHeaderSchema: JsonSchema;
   createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
   backendURL: string = '';
 
@@ -30,16 +31,9 @@ export class IngestorUserMetadataDialog {
     const decodedSchema = atob(encodedSchema);
     const schema = JSON.parse(decodedSchema);
     
-    console.log(schema);
     const resolvedSchema = IngestorMetadaEditorHelper.resolveRefs(schema, schema);
-
-    console.log(resolvedSchema);
-
     const organizationalSchema = resolvedSchema.properties.organizational;
     const sampleSchema = resolvedSchema.properties.sample;
-
-    console.log(organizationalSchema);
-    console.log(sampleSchema);
     
     this.metadataSchemaOrganizational = organizationalSchema;
     this.metadataSchemaSample = sampleSchema;

From 2e42ddf60400827266f52c59509e02b7f84fa263 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Sun, 15 Dec 2024 15:02:32 +0000
Subject: [PATCH 017/245] Embedding ingestor backend part 3

---
 .../customRenderer/any-of-renderer.ts         |   9 +-
 .../ingestor-metadata-editor-helper.ts        |  38 +------
 ...> ingestor-metadata-editor-schema_demo.ts} |  10 +-
 .../ingestor-metadata-editor.component.ts     |   4 +-
 ...estor.confirm-transfer-dialog.component.ts |  30 +----
 ...tor.extractor-metadata-dialog.component.ts |  40 +++----
 .../ingestor.extractor-metadata-dialog.html   |  40 +++++--
 .../ingestor.new-transfer-dialog.component.ts |  29 ++++-
 .../dialog/ingestor.new-transfer-dialog.html  |   2 +-
 ...ingestor.user-metadata-dialog.component.ts |  25 ++---
 .../dialog/ingestor.user-metadata-dialog.html |   2 +-
 .../ingestor/ingestor-api-endpoints.ts        |   9 ++
 .../ingestor/ingestor.component-helper.ts     | 104 ++++++++++++++++++
 .../ingestor/ingestor/ingestor.component.scss |   4 +
 .../ingestor/ingestor/ingestor.component.ts   |  71 +++++++++---
 15 files changed, 282 insertions(+), 135 deletions(-)
 rename src/app/ingestor/ingestor-metadata-editor/{ingestor-metadata-editor-schematest.ts => ingestor-metadata-editor-schema_demo.ts} (98%)
 create mode 100644 src/app/ingestor/ingestor/ingestor.component-helper.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 3e212da8d8..530d762196 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -9,9 +9,9 @@ import { configuredRenderer } from '../ingestor-metadata-editor-helper';
     <div class="anyof-group">
     <mat-card-title>{{anyOfTitle}}</mat-card-title>
 
-    <mat-tab-group animationDuration="0ms">
+    <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
         <mat-tab *ngFor="let option of options" label="{{option}}">
-            <div style="margin-top: 20px;" *ngIf="option !== 'null'">
+            <div style="margin: 20px auto; width: 85%" *ngIf="option !== 'null'">
                 <jsonforms [schema]="getTabSchema(option)" [data]="passedProps.data" [renderers]="defaultRenderer" (dataChange)=onInnerJsonFormsChange($event)></jsonforms>
             </div>
         </mat-tab>
@@ -24,6 +24,7 @@ export class AnyOfRenderer extends JsonFormsControl {
     dataAsString: string;
     options: string[] = [];
     anyOfTitle: string;
+    selectedTabIndex: number = 0; // default value 
 
     rendererService: JsonFormsAngularService;
 
@@ -39,6 +40,10 @@ export class AnyOfRenderer extends JsonFormsControl {
         this.passedProps = props;
         this.anyOfTitle = props.label || 'AnyOf';
         this.options = props.schema.anyOf.map((option: any) => option.title || option.type || JSON.stringify(option));
+    
+        if (this.options.includes("null") && !props.data) {
+            this.selectedTabIndex = this.options.indexOf("null");
+        }
     }
 
     public getTabSchema(tabOption: string): JsonSchema {
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index b1b4ff58bd..65c4d640d3 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -1,28 +1,12 @@
 import { angularMaterialRenderers } from "@jsonforms/angular-material";
 import { customRenderers } from "./customRenderer/custom-renderers";
 
-export interface IIngestionRequestInformation {
-  selectedPath: string;
-  selectedMethod: IExtractionMethod;
-  scicatHeader: Object;
-  userMetaData: Object;
-  extractorMetaData: Object;
-  extractorMetaDataReady: boolean;
-  mergedMetaDataString: string;
-}
-
-export interface IExtractionMethod {
-  name: string;
-  schema: string; // Base64 encoded JSON schema
-};
-
 export const configuredRenderer = [
   ...angularMaterialRenderers,
   ...customRenderers,
 ];
 
-
-export class IngestorMetadaEditorHelper {
+export class IngestorMetadataEditorHelper {
   // Resolve all $ref in a schema
   static resolveRefs(schema: any, rootSchema: any): any {
     if (schema === null || schema === undefined) {
@@ -35,30 +19,14 @@ export class IngestorMetadaEditorHelper {
       refPath.forEach((part) => {
         ref = ref[part];
       });
-      return IngestorMetadaEditorHelper.resolveRefs(ref, rootSchema);
+      return IngestorMetadataEditorHelper.resolveRefs(ref, rootSchema);
     } else if (typeof schema === 'object') {
       for (const key in schema) {
         if (schema.hasOwnProperty(key)) {
-          schema[key] = IngestorMetadaEditorHelper.resolveRefs(schema[key], rootSchema);
+          schema[key] = IngestorMetadataEditorHelper.resolveRefs(schema[key], rootSchema);
         }
       }
     }
     return schema;
   };
-
-  static mergeUserAndExtractorMetadata(userMetadata: Object, extractorMetadata: Object, space: number): string {
-    return JSON.stringify({ ...userMetadata, ...extractorMetadata }, null, space);
-  }
-
-  static createEmptyRequestInformation = (): IIngestionRequestInformation => {
-    return {
-      selectedPath: '',
-      selectedMethod: { name: '', schema: '' },
-      scicatHeader: {},
-      userMetaData: {},
-      extractorMetaData: {},
-      extractorMetaDataReady: false,
-      mergedMetaDataString: '',
-    };
-  };
 };
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
similarity index 98%
rename from src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
rename to src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
index 630a06f277..5874d74d42 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
@@ -1,4 +1,4 @@
-export const organizational_schema = {
+export const demo_organizational_schema = {
   type: 'object',
   properties: {
     grants: {
@@ -113,7 +113,7 @@ export const organizational_schema = {
   required: ['authors', 'funder'],
 };
 
-export const acquisition_schema = {
+export const demo_acquisition_schema = {
   type: 'object',
   properties: {
     nominal_defocus: {
@@ -228,7 +228,7 @@ export const acquisition_schema = {
   required: ['detector', 'dose_per_movie', 'date_time', 'binning_camera', 'pixel_size'],
 };
 
-export const sample_schema = {
+export const demo_sample_schema = {
   type: 'object',
   properties: {
     overall_molecule: {
@@ -428,7 +428,7 @@ export const sample_schema = {
   required: ['overall_molecule', 'molecule', 'specimen', 'grid'],
 };
 
-export const instrument_schema = { 
+export const demo_instrument_schema = { 
   type: 'object',
   properties: {
     microscope: {
@@ -463,7 +463,7 @@ export const instrument_schema = {
   required: ['microscope', 'illumination', 'imaging', 'electron_source', 'acceleration_voltage', 'cs'],
 };
 
-export const scicatheader_schema = {
+export const demo_scicatheader_schema = {
   type: "object",
   properties: {
     datasetName: { type: "string" },
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index d6921ccbbb..308a64143b 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -1,6 +1,4 @@
-import { Component, EventEmitter, Output, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { angularMaterialRenderers } from '@jsonforms/angular-material';
-import { customRenderers } from './customRenderer/custom-renderers';
+import { Component, EventEmitter, Output, Input } from '@angular/core';
 import { JsonSchema } from '@jsonforms/core';
 import { configuredRenderer } from './ingestor-metadata-editor-helper';
 
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 1968c67429..52285fca6b 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -1,25 +1,6 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
 import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { IIngestionRequestInformation, IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
-
-interface ISciCatHeader {
-  datasetName: string;
-  description: string;
-  creationLocation: string;
-  dataFormat: string;
-  ownerGroup: string;
-  type: string;
-  license: string;
-  keywords: string[];
-  scientificMetadata: IScientificMetadata;
-}
-
-interface IScientificMetadata {
-  organization: Object;
-  sample: Object;
-  acquisition: Object;
-  instrument: Object;
-}
+import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper, ISciCatHeader } from '../ingestor.component-helper';
 
 @Component({
   selector: 'ingestor.confirm-transfer-dialog',
@@ -29,11 +10,11 @@ interface IScientificMetadata {
 })
 
 export class IngestorConfirmTransferDialog {
-  createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
+  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
   provideMergeMetaData: string = '';
   backendURL: string = '';
 
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
   }
@@ -53,8 +34,9 @@ export class IngestorConfirmTransferDialog {
       type: this.createNewTransferData.scicatHeader['type'],
       license: this.createNewTransferData.scicatHeader['license'],
       keywords: this.createNewTransferData.scicatHeader['keywords'],
+      filePath: this.createNewTransferData.scicatHeader['filePath'],
       scientificMetadata: {
-        organization: this.createNewTransferData.userMetaData['organization'],
+        organizational: this.createNewTransferData.userMetaData['organizational'],
         sample: this.createNewTransferData.userMetaData['sample'],
         acquisition: this.createNewTransferData.extractorMetaData['acquisition'],
         instrument: this.createNewTransferData.extractorMetaData['instrument'],
@@ -73,7 +55,7 @@ export class IngestorConfirmTransferDialog {
   onClickConfirm(): void {
     if (this.data && this.data.onClickNext) {
       this.createNewTransferData.mergedMetaDataString = this.provideMergeMetaData;
-      this.data.onClickConfirm();
+      this.data.onClickNext(4);
     }
   }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index cdae97e556..97ba8e811d 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -1,8 +1,7 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
 import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { IIngestionRequestInformation, IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
-import { acquisition_schema, instrument_schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
 import { JsonSchema } from '@jsonforms/core';
+import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper } from '../ingestor.component-helper';
 
 @Component({
   selector: 'ingestor.extractor-metadata-dialog',
@@ -14,28 +13,29 @@ import { JsonSchema } from '@jsonforms/core';
 export class IngestorExtractorMetadataDialog {
   metadataSchemaInstrument: JsonSchema;
   metadataSchemaAcquisition: JsonSchema;
-  createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
+  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
 
   backendURL: string = '';
   extractorMetaDataReady: boolean = false;
+  extractorMetaDataError: boolean = false;
 
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
-        const encodedSchema = data.createNewTransferData.selectedMethod.schema;
-        const decodedSchema = atob(encodedSchema);
-        const schema = JSON.parse(decodedSchema);
-        
-        const resolvedSchema = IngestorMetadaEditorHelper.resolveRefs(schema, schema);
-        const instrumentSchema = resolvedSchema.properties.instrument;
-        const acqusitionSchema = resolvedSchema.properties.acquisition;
+  isCardContentVisible = {
+    instrument: true,
+    acquisition: true
+  };
+
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
+        this.createNewTransferData = data.createNewTransferData;
+        this.backendURL = data.backendURL;
+        const instrumentSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.instrument;
+        const acqusitionSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.acquisition;
         
         this.metadataSchemaInstrument = instrumentSchema;
         this.metadataSchemaAcquisition = acqusitionSchema;
-        this.createNewTransferData = data.createNewTransferData;
-        this.backendURL = data.backendURL;
-        this.extractorMetaDataReady = true //data.extractorMetaDataReady
+        this.extractorMetaDataReady = this.createNewTransferData.extractorMetaDataReady;
+        this.extractorMetaDataError = this.createNewTransferData.apiErrorInformation.metaDataExtraction;
   }
 
-
   onClickBack(): void {
     if (this.data && this.data.onClickNext) {
       this.data.onClickNext(1); // Beispielwert für den Schritt
@@ -43,18 +43,20 @@ export class IngestorExtractorMetadataDialog {
   }
 
   onClickNext(): void {
-    console.log(this.createNewTransferData.selectedMethod)
-
     if (this.data && this.data.onClickNext) {
       this.data.onClickNext(3); // Beispielwert für den Schritt
     }
   }
 
-  onDataChangeUserMetadataInstrument(event: any) {
+  onDataChangeExtractorMetadataInstrument(event: Object) {
     this.createNewTransferData.extractorMetaData['instrument'] = event;
   }
 
-  onDataChangeUserMetadataAcquisition(event: any) {
+  onDataChangeExtractorMetadataAcquisition(event: Object) {
     this.createNewTransferData.extractorMetaData['acquisition'] = event;
   }
+
+  toggleCardContent(card: string): void {
+    this.isCardContentVisible[card] = !this.isCardContentVisible[card];
+  }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
index 3178a15a54..fe985f0d6a 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -12,39 +12,54 @@ <h2 mat-dialog-title>
   <div *ngIf="!extractorMetaDataReady" class="spinner-container">
     <mat-progress-spinner diameter="20"
       mode="indeterminate"></mat-progress-spinner>
-      <div class="spinner-text">
-        <span>Wait for the Ingestor...</span>
-      </div>
+    <div class="spinner-text">
+      <span>Wait for the Ingestor...</span>
+    </div>
   </div>
 
   <div *ngIf="extractorMetaDataReady">
     <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
+    <div *ngIf="extractorMetaDataError" class="error-message">
+      <mat-card class="error-card">
+        <mat-card-header>
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> error </mat-icon>
+          </div>
+          The automatic metadata extraction was not successful. Please enter
+          the data manually.
+        </mat-card-header>
+      </mat-card>
+    </div>
     <div fxLayout="row" fxLayout.xs="column">
       <div fxFlex="80%">
         <mat-card>
-          <mat-card-header class="instrument-header">
+          <mat-card-header class="instrument-header" (click)="toggleCardContent('instrument')">
             <div mat-card-avatar class="section-icon">
               <mat-icon> biotech </mat-icon>
             </div>
             Instrument Information
+            <span class="spacer"></span>
+            <mat-icon class="toggle-icon">{{ isCardContentVisible.instrument ? 'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
-          <mat-card-content>
+          <mat-card-content *ngIf="isCardContentVisible.instrument">
             <app-metadata-editor [schema]="metadataSchemaInstrument"
-              [data]="createNewTransferData.userMetaData['instrument']"
-              (dataChange)="onDataChangeUserMetadataInstrument($event)"></app-metadata-editor>
+              [data]="createNewTransferData.extractorMetaData['instrument']"
+              (dataChange)="onDataChangeExtractorMetadataInstrument($event)"></app-metadata-editor>
           </mat-card-content>
         </mat-card>
         <mat-card>
-          <mat-card-header class="acquisition-header">
+          <mat-card-header class="acquisition-header" (click)="toggleCardContent('acquisition')">
             <div mat-card-avatar class="section-icon">
               <mat-icon> category-search </mat-icon>
             </div>
             Acquisition Information
+            <span class="spacer"></span>
+            <mat-icon class="toggle-icon">{{ isCardContentVisible.acquisition ? 'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
-          <mat-card-content>
+          <mat-card-content *ngIf="isCardContentVisible.acquisition">
             <app-metadata-editor [schema]="metadataSchemaAcquisition"
-              [data]="createNewTransferData.userMetaData['acquisition']"
-              (dataChange)="onDataChangeUserMetadataAcquisition($event)"></app-metadata-editor>
+              [data]="createNewTransferData.extractorMetaData['acquisition']"
+              (dataChange)="onDataChangeExtractorMetadataAcquisition($event)"></app-metadata-editor>
           </mat-card-content>
         </mat-card>
       </div>
@@ -53,5 +68,6 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" (click)="onClickNext()">Next</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+    (click)="onClickNext()" [disabled]="!extractorMetaDataReady">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 0433f6122a..198b11fdfd 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -1,8 +1,9 @@
 import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
 import { HttpClient } from '@angular/common/http';
-import { IExtractionMethod, IIngestionRequestInformation, IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
 import { INGESTOR_API_ENDPOINTS_V1 } from '../ingestor-api-endpoints';
+import { IDialogDataObject, IExtractionMethod, IIngestionRequestInformation, IngestorHelper } from '../ingestor.component-helper';
+import { IngestorMetadataEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
 
 @Component({
   selector: 'ingestor.new-transfer-dialog',
@@ -20,9 +21,9 @@ export class IngestorNewTransferDialogComponent implements OnInit {
 
   uiNextButtonReady: boolean = false;
 
-  createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
+  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
 
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any, private http: HttpClient) {
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject, private http: HttpClient) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
   }
@@ -84,6 +85,26 @@ export class IngestorNewTransferDialogComponent implements OnInit {
     );
   }
 
+  generateExampleDataForSciCatHeader(): void {
+    this.data.createNewTransferData.scicatHeader['filePath'] = this.createNewTransferData.selectedPath;
+    this.data.createNewTransferData.scicatHeader['keywords'] = ['OpenEM'];
+
+    const nameWithoutPath = this.createNewTransferData.selectedPath.split('/|\\')[-1] ?? this.createNewTransferData.selectedPath;
+    this.data.createNewTransferData.scicatHeader['datasetName'] = nameWithoutPath;
+    this.data.createNewTransferData.scicatHeader['license'] = 'MIT License';
+    this.data.createNewTransferData.scicatHeader['type'] = 'raw';
+    this.data.createNewTransferData.scicatHeader['dataFormat'] = 'root';
+    this.data.createNewTransferData.scicatHeader['owner'] = 'User';
+  }
+
+  prepareSchemaForProcessing(): void {
+    const encodedSchema = this.createNewTransferData.selectedMethod.schema;
+    const decodedSchema = atob(encodedSchema);
+    const schema = JSON.parse(decodedSchema);
+    const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(schema, schema);
+    this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
+  }
+
   onClickRetryRequests(): void {
     this.apiGetExtractionMethods();
     this.apiGetAvailableFilePaths();
@@ -91,6 +112,8 @@ export class IngestorNewTransferDialogComponent implements OnInit {
 
   onClickNext(): void {
     if (this.data && this.data.onClickNext) {
+      this.generateExampleDataForSciCatHeader();
+      this.prepareSchemaForProcessing();
       this.data.onClickNext(1); // Open next dialog
     }
   }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
index 6bd1a6d738..a80e8c4d8a 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -9,7 +9,7 @@ <h2 mat-dialog-title>
 <mat-dialog-content class="mat-typography" disableClose="true">
   <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
 
-  <p>First mask where user needs to select path and method</p>
+  <p>Please select the dataset to be uploaded and the appropriate metadata extractor method.</p>
 
   <div>
     <mat-form-field class="form-full-width">
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index c2087642f0..427bacd801 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -1,8 +1,8 @@
 import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
-import { IIngestionRequestInformation, IngestorMetadaEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
-import { scicatheader_schema } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schematest';
+import { IngestorMetadataEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
 import { JsonSchema } from '@jsonforms/core';
+import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper, SciCatHeader_Schema } from '../ingestor.component-helper';
 
 @Component({
   selector: 'ingestor.user-metadata-dialog',
@@ -15,7 +15,7 @@ export class IngestorUserMetadataDialog {
   metadataSchemaOrganizational: JsonSchema;
   metadataSchemaSample: JsonSchema;
   scicatHeaderSchema: JsonSchema;
-  createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
+  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
   backendURL: string = '';
 
   uiNextButtonReady: boolean = true; // Change to false when dev is ready
@@ -26,20 +26,15 @@ export class IngestorUserMetadataDialog {
     sample: true
   };
 
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any) {
-    const encodedSchema = data.createNewTransferData.selectedMethod.schema;
-    const decodedSchema = atob(encodedSchema);
-    const schema = JSON.parse(decodedSchema);
-    
-    const resolvedSchema = IngestorMetadaEditorHelper.resolveRefs(schema, schema);
-    const organizationalSchema = resolvedSchema.properties.organizational;
-    const sampleSchema = resolvedSchema.properties.sample;
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
+    this.createNewTransferData = data.createNewTransferData;
+    this.backendURL = data.backendURL;
+    const organizationalSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.organizational;
+    const sampleSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
     
     this.metadataSchemaOrganizational = organizationalSchema;
     this.metadataSchemaSample = sampleSchema;
-    this.scicatHeaderSchema = scicatheader_schema;
-    this.createNewTransferData = data.createNewTransferData;
-    this.backendURL = data.backendURL;
+    this.scicatHeaderSchema = SciCatHeader_Schema;
   }
 
   onClickBack(): void {
@@ -55,7 +50,7 @@ export class IngestorUserMetadataDialog {
   }
 
   onDataChangeUserMetadataOrganization(event: Object) {
-    this.createNewTransferData.userMetaData['organization'] = event;
+    this.createNewTransferData.userMetaData['organizational'] = event;
   }
 
   onDataChangeUserMetadataSample(event: Object) {
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
index 8e3fd19142..39fbf41a49 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
@@ -37,7 +37,7 @@ <h2 mat-dialog-title>
           <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ? 'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.organizational">
-          <app-metadata-editor [schema]="metadataSchemaOrganizational" [data]="createNewTransferData.userMetaData['organization']"
+          <app-metadata-editor [schema]="metadataSchemaOrganizational" [data]="createNewTransferData.userMetaData['organizational']"
           (dataChange)="onDataChangeUserMetadataOrganization($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
index 6cd5860805..df2d088330 100644
--- a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
+++ b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
@@ -6,3 +6,12 @@ export const INGESTOR_API_ENDPOINTS_V1 = {
   },
   EXTRACTOR: 'extractor',
 };
+
+export interface IPostExtractorEndpoint {
+  filePath: string,
+  methodName: string,
+}
+
+export interface IPostDatasetEndpoint {
+  metaData: string
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component-helper.ts b/src/app/ingestor/ingestor/ingestor.component-helper.ts
new file mode 100644
index 0000000000..1d31525d57
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component-helper.ts
@@ -0,0 +1,104 @@
+import { JsonSchema } from '@jsonforms/core';
+
+export interface IExtractionMethod {
+  name: string;
+  schema: string; // Base64 encoded JSON schema
+};
+
+export interface IIngestionRequestInformation {
+  selectedPath: string;
+  selectedMethod: IExtractionMethod;
+  selectedResolvedDecodedSchema: JsonSchema;
+  scicatHeader: Object;
+  userMetaData: {
+    organizational: Object,
+    sample: Object,
+  };
+  extractorMetaData: {
+    instrument: Object,
+    acquisition: Object,
+  };
+  extractorMetaDataReady: boolean;
+  extractMetaDataRequested: boolean;
+  mergedMetaDataString: string;
+
+  apiErrorInformation: {
+    metaDataExtraction: boolean;
+  }
+}
+
+// There are many more... see DerivedDataset.ts
+export interface ISciCatHeader {
+  datasetName: string;
+  description: string;
+  creationLocation: string;
+  dataFormat: string;
+  ownerGroup: string;
+  type: string;
+  license: string;
+  keywords: string[];
+  filePath: string;
+  scientificMetadata: IScientificMetadata;
+}
+
+export interface IScientificMetadata {
+  organizational: Object;
+  sample: Object;
+  acquisition: Object;
+  instrument: Object;
+}
+
+export interface IDialogDataObject {
+  createNewTransferData: IIngestionRequestInformation;
+  backendURL: string;
+  onClickNext: (step: number) => void;
+}
+
+export class IngestorHelper {
+  static createEmptyRequestInformation = (): IIngestionRequestInformation => {
+    return {
+      selectedPath: '',
+      selectedMethod: { name: '', schema: '' },
+      selectedResolvedDecodedSchema: {},
+      scicatHeader: {},
+      userMetaData: {
+        organizational: {},
+        sample: {},
+      },
+      extractorMetaData: {
+        instrument: {},
+        acquisition: {},
+      },
+      extractorMetaDataReady: false,
+      extractMetaDataRequested: false,
+      mergedMetaDataString: '',
+      apiErrorInformation: {
+        metaDataExtraction: false,
+      },
+    };
+  };
+
+  static mergeUserAndExtractorMetadata(userMetadata: Object, extractorMetadata: Object, space: number): string {
+    return JSON.stringify({ ...userMetadata, ...extractorMetadata }, null, space);
+  };
+}
+
+export const SciCatHeader_Schema: JsonSchema = {
+  type: "object",
+  properties: {
+    datasetName: { type: "string" },
+    description: { type: "string" },
+    creationLocation: { type: "string" },
+    dataFormat: { type: "string" },
+    ownerGroup: { type: "string" },
+    filePath: { type: "string", readOnly: true }, // disabled, because its selected in the first step
+    type: { type: "string" },
+    license: { type: "string" },
+    keywords: {
+      type: "array",
+      items: { type: "string" }
+    },
+    // scientificMetadata: { type: "string" } ; is created during the ingestor process
+  },
+  required: ["datasetName", "creationLocation", "dataFormat", "ownerGroup", "type", "license", "keywords", "scientificMetadata", "filePath"]
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index bbfccd1e5a..a5c5dcad67 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -55,4 +55,8 @@ mat-card {
 
 .spacer {
   flex: 1 1 auto;
+}
+
+.error-message {
+  color: red;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index ba34313352..2b49f2f90a 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -2,13 +2,13 @@ import { Component, inject, OnInit } from "@angular/core";
 import { AppConfigService } from "app-config.service";
 import { HttpClient } from '@angular/common/http';
 import { ActivatedRoute, Router } from '@angular/router';
-import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
+import { INGESTOR_API_ENDPOINTS_V1, IPostDatasetEndpoint, IPostExtractorEndpoint } from "./ingestor-api-endpoints";
 import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog.component";
 import { MatDialog } from "@angular/material/dialog";
 import { IngestorUserMetadataDialog } from "./dialog/ingestor.user-metadata-dialog.component";
 import { IngestorExtractorMetadataDialog } from "./dialog/ingestor.extractor-metadata-dialog.component";
 import { IngestorConfirmTransferDialog } from "./dialog/ingestor.confirm-transfer-dialog.component";
-import { IIngestionRequestInformation, IngestorMetadaEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import { IIngestionRequestInformation, IngestorHelper } from "./ingestor.component-helper";
 
 interface ITransferDataListEntry {
   transferId: string;
@@ -39,7 +39,7 @@ export class IngestorComponent implements OnInit {
   errorMessage: string = '';
   returnValue: string = '';
 
-  createNewTransferData: IIngestionRequestInformation = IngestorMetadaEditorHelper.createEmptyRequestInformation();
+  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
 
   constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
 
@@ -112,17 +112,14 @@ export class IngestorComponent implements OnInit {
 
   apiUpload() {
     this.loading = true;
-    this.returnValue = '';
-    const payload = {
-      filePath: this.createNewTransferData.selectedPath,
+
+    const payload: IPostDatasetEndpoint = {
       metaData: this.createNewTransferData.mergedMetaDataString,
     };
 
-    console.log('Uploading', payload);
-
     this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET, payload).subscribe(
       response => {
-        console.log('Upload successful', response);
+        console.log('Upload successfully started', response);
         this.returnValue = JSON.stringify(response);
         this.loading = false;
       },
@@ -134,6 +131,42 @@ export class IngestorComponent implements OnInit {
     );
   }
 
+  async apiStartMetadataExtraction(): Promise<boolean> {
+    this.createNewTransferData.apiErrorInformation.metaDataExtraction = false;
+
+    if (this.createNewTransferData.extractMetaDataRequested) {
+      console.log(this.createNewTransferData.extractMetaDataRequested, ' already requested'); // Debugging
+      return false;
+    }
+
+    this.createNewTransferData.extractorMetaDataReady = false;
+    this.createNewTransferData.extractMetaDataRequested = true;
+
+    const payload: IPostExtractorEndpoint = {
+      filePath: this.createNewTransferData.selectedPath,
+      methodName: this.createNewTransferData.selectedMethod.name,
+    };
+
+    return new Promise<boolean>((resolve) => {
+      this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, payload).subscribe(
+        response => {
+          console.log('Metadata extraction result', response);
+          this.createNewTransferData.extractorMetaData.instrument = (response as any).instrument ?? {};
+          this.createNewTransferData.extractorMetaData.acquisition = (response as any).acquisition ?? {};
+          this.createNewTransferData.extractorMetaDataReady = true;
+          resolve(true);
+        },
+        error => {
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+          console.error('Metadata extraction failed', error);
+          this.createNewTransferData.extractorMetaDataReady = true;
+          this.createNewTransferData.apiErrorInformation.metaDataExtraction = true;
+          resolve(false);
+        }
+      );
+    });
+  }
+
   onClickForwardToIngestorPage() {
     if (this.forwardFacilityBackend) {
       this.connectingToFacilityBackend = true;
@@ -174,8 +207,8 @@ export class IngestorComponent implements OnInit {
   }
 
   onClickAddIngestion(): void {
-    this.createNewTransferData = IngestorMetadaEditorHelper.createEmptyRequestInformation();
-    this.onClickNext(0);
+    this.createNewTransferData = IngestorHelper.createEmptyRequestInformation();
+    this.onClickNext(0); // Open first dialog to start the ingestion process
   }
 
   onClickNext(step: number): void {
@@ -185,6 +218,8 @@ export class IngestorComponent implements OnInit {
 
     switch (step) {
       case 0:
+        this.createNewTransferData.extractMetaDataRequested = false;
+        this.createNewTransferData.extractorMetaDataReady = false;
         dialogRef = this.dialog.open(IngestorNewTransferDialogComponent, {
           data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
           disableClose: true
@@ -192,6 +227,13 @@ export class IngestorComponent implements OnInit {
 
         break;
       case 1:
+        this.apiStartMetadataExtraction().then((response: boolean) => {
+          if (response) console.log('Metadata extraction finished');
+          else console.error('Metadata extraction failed');
+        }).catch(error => {
+          console.error('Metadata extraction error', error);
+        });
+
         dialogRef = this.dialog.open(IngestorUserMetadataDialog, {
           data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
           disableClose: true
@@ -209,16 +251,15 @@ export class IngestorComponent implements OnInit {
           disableClose: true
         });
         break;
+      case 4:
+        this.apiUpload();
+        break;
       default:
         console.error('Unknown step', step);
     }
 
     // Error if the dialog reference is not set
     if (dialogRef === null) return;
-
-    /*dialogRef.afterClosed().subscribe(result => {
-      console.log(`Dialog result: ${result}`);
-    });*/
   }
 
   onClickRefreshTransferList(): void {

From 476c006199e57df17ac79a38a0223de56bdefa01 Mon Sep 17 00:00:00 2001
From: Despina Adamopoulou <16343312+despadam@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:57:28 +0200
Subject: [PATCH 018/245] Update frontend to match with release-jobs backend
 (#1585)

* update job view to match release-jobs

* update job schema and timestamp fields

* update jobs-detail page

* fix testing and linting
---
 src/app/datasets/archiving.service.ts         |   8 +-
 .../datafiles-action.component.spec.ts        |   4 +-
 .../datasets/datafiles/datafiles.component.ts |  13 +-
 .../jobs-dashboard-new.component.ts           |  23 +-
 .../jobs-dashboard.component.spec.ts          |   4 +-
 .../jobs-dashboard.component.ts               |  19 +-
 .../jobs-detail/jobs-detail.component.html    | 203 +++++++++++-------
 .../jobs-detail/jobs-detail.component.scss    |  33 +--
 .../shared-table/_shared-table-theme.scss     |   1 +
 9 files changed, 178 insertions(+), 130 deletions(-)

diff --git a/src/app/datasets/archiving.service.ts b/src/app/datasets/archiving.service.ts
index fcf68c4a12..99cfb094f2 100644
--- a/src/app/datasets/archiving.service.ts
+++ b/src/app/datasets/archiving.service.ts
@@ -30,7 +30,7 @@ export class ArchivingService {
   ) {
     const extra = archive ? {} : destinationPath;
     const jobParams = {
-      username: user.username,
+      datasetIds: datasets.map((dataset) => dataset.pid),
       ...extra,
     };
 
@@ -40,12 +40,8 @@ export class ArchivingService {
 
     const data = {
       jobParams,
-      emailJobInitiator: user.email,
+      createdBy: user.username,
       // Revise this, files == []...? See earlier version of this method in dataset-table component for context
-      datasetList: datasets.map((dataset) => ({
-        pid: dataset.pid,
-        files: [],
-      })),
       type: archive ? "archive" : "retrieve",
     };
 
diff --git a/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts b/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
index 46e362e2b5..0919c32cc0 100644
--- a/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
+++ b/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
@@ -185,7 +185,7 @@ describe("1000: DatafilesActionComponent", () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(DatafilesActionComponent);
     component = fixture.componentInstance;
-    component.files = structuredClone(actionFiles);
+    component.files = JSON.parse(JSON.stringify(actionFiles));
     component.actionConfig = actionsConfig[0];
     component.actionDataset = actionDataset;
     component.maxFileSize = lowerMaxFileSizeLimit;
@@ -484,7 +484,7 @@ describe("1000: DatafilesActionComponent", () => {
         component.maxFileSize = lowerMaxFileSizeLimit;
         break;
     }
-    component.files = structuredClone(actionFiles);
+    component.files = JSON.parse(JSON.stringify(actionFiles));
     switch (selectedFiles) {
       case selectedFilesType.file1:
         component.files[0].selected = true;
diff --git a/src/app/datasets/datafiles/datafiles.component.ts b/src/app/datasets/datafiles/datafiles.component.ts
index d807d09145..91da0d4b1e 100644
--- a/src/app/datasets/datafiles/datafiles.component.ts
+++ b/src/app/datasets/datafiles/datafiles.component.ts
@@ -304,15 +304,12 @@ export class DatafilesComponent
       if (email) {
         this.getSelectedFiles();
         const data = {
-          emailJobInitiator: email,
-          creationTime: new Date(),
+          createdBy: email,
+          createdAt: new Date(),
           type: "public",
-          datasetList: [
-            {
-              pid: this.datasetPid,
-              files: this.getSelectedFiles(),
-            },
-          ],
+          jobParams: {
+            datasetIds: [this.datasetPid],
+          },
         };
         this.store.dispatch(submitJobAction({ job: data }));
       }
diff --git a/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts b/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
index 611ee66cec..fb6689b8c8 100644
--- a/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
+++ b/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
@@ -4,6 +4,7 @@ import {
   Component,
   OnDestroy,
 } from "@angular/core";
+import { Router } from "@angular/router";
 import { SciCatDataSource } from "../../shared/services/scicat.datasource";
 import { ScicatDataService } from "../../shared/services/scicat-data-service";
 import { ExportExcelService } from "../../shared/services/export-excel.service";
@@ -30,11 +31,11 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 0,
     },
     {
-      id: "emailJobInitiator",
-      label: "Initiator",
+      id: "createdBy",
+      label: "Creator",
       icon: "person",
       canSort: true,
-      matchMode: "contains",
+      matchMode: "is",
       hideOrder: 1,
     },
     {
@@ -46,7 +47,7 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 2,
     },
     {
-      id: "creationTime",
+      id: "createdAt",
       icon: "schedule",
       label: "Created at local time",
       format: "date medium ",
@@ -64,22 +65,13 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 4,
     },
     {
-      id: "jobStatusMessage",
+      id: "statusCode",
       icon: "traffic",
       label: "Status",
-      format: "json",
       canSort: true,
       matchMode: "contains",
       hideOrder: 5,
     },
-    {
-      id: "datasetList",
-      icon: "list",
-      label: "Datasets",
-      format: "json",
-      canSort: true,
-      hideOrder: 6,
-    },
     {
       id: "jobResultObject",
       icon: "work_outline",
@@ -102,6 +94,7 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
     private cdRef: ChangeDetectorRef,
     private dataService: ScicatDataService,
     private exportService: ExportExcelService,
+    private router: Router,
   ) {
     this.dataSource = new SciCatDataSource(
       this.appConfigService,
@@ -125,4 +118,4 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
     const id = encodeURIComponent(job.id);
     this.router.navigateByUrl("/user/jobs/" + id); */
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
index 0084ef2f6c..4e50368af3 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
@@ -100,8 +100,8 @@ describe("JobsDashboardComponent", () => {
       dispatchSpy = spyOn(store, "dispatch");
 
       const mode = JobViewMode.myJobs;
-      component.email = "test@email.com";
-      const viewMode = { emailJobInitiator: component.email };
+      component.username = "testName";
+      const viewMode = { createdBy: component.username };
       component.onModeChange(mode);
 
       expect(dispatchSpy).toHaveBeenCalledTimes(1);
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
index 2033ad245a..cc1ae02dd7 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
@@ -48,7 +48,7 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
 
   jobs: JobsTableData[] = [];
   profile: any;
-  email = "";
+  username = "";
 
   subscriptions: Subscription[] = [];
 
@@ -98,11 +98,8 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
         id: job._id,
         initiator: job.emailJobInitiator,
         type: job.type,
-        createdAt: this.datePipe.transform(
-          job.creationTime,
-          "yyyy-MM-dd HH:mm",
-        ),
-        statusMessage: job.jobStatusMessage,
+        createdAt: this.datePipe.transform(job.createdAt, "yyyy-MM-dd HH:mm"),
+        statusMessage: job.statusMessage,
       }));
     }
     return tableData;
@@ -129,7 +126,7 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
         break;
       }
       case JobViewMode.myJobs: {
-        viewMode = { emailJobInitiator: this.email };
+        viewMode = { createdBy: this.username };
         break;
       }
       default: {
@@ -154,11 +151,11 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
     // map column names back to original names
     switch (event.active) {
       case "statusMessage": {
-        event.active = "jobStatusMessage";
+        event.active = "statusMessage";
         break;
       }
       case "initiator": {
-        event.active = "emailJobInitiator";
+        event.active = "createdBy";
         break;
       }
       default: {
@@ -181,13 +178,13 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
     this.subscriptions.push(
       this.store.select(selectCurrentUser).subscribe((current) => {
         if (current) {
-          this.email = current.email;
+          this.username = current.username;
 
           if (!current.realm) {
             this.store.select(selectProfile).subscribe((profile) => {
               if (profile) {
                 this.profile = profile;
-                this.email = profile.email;
+                this.username = profile.username;
               }
               this.onModeChange(JobViewMode.myJobs);
             });
diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.html b/src/app/jobs/jobs-detail/jobs-detail.component.html
index ac46789303..42b3234ba6 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.html
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.html
@@ -1,73 +1,132 @@
-<div *ngIf="job$ | async as job" class="job-detail">
-  <mat-card>
-    <mat-card-content>
-      <table>
-        <tr>
-          <th>
-            <mat-icon> mail </mat-icon>
-            Email Job Initiator
-          </th>
-          <td>{{ job.emailJobInitiator }}</td>
-        </tr>
-        <tr *ngIf="job.type as value">
-          <th>
-            <mat-icon> bubble_chart </mat-icon>
-            Type
-          </th>
-          <td>{{ value }}</td>
-        </tr>
-        <tr *ngIf="job.creationTime as value">
-          <th>
-            <mat-icon> brightness_high </mat-icon>
-            Creation Time
-          </th>
-          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-        </tr>
-        <tr *ngIf="job.executionTime as value">
-          <th>
-            <mat-icon> gavel </mat-icon>
-            Execution Time
-          </th>
-          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-        </tr>
-        <tr *ngIf="job.jobParams as value">
-          <th>
-            <mat-icon> settings </mat-icon>
-            Job Params
-          </th>
-          <td>{{ value | json }}</td>
-        </tr>
-        <tr *ngIf="job.updatedAt as value">
-          <th>
-            <mat-icon> markunread </mat-icon>
-            Date Of Last Message
-          </th>
-          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-        </tr>
-        <tr *ngIf="job.datasetList as value">
-          <th>
-            <mat-icon> folder </mat-icon>
-            Dataset List
-          </th>
-          <div *ngFor="let daSet of value">
-            {{ daSet.pid | json }}
+  <div fxLayout="row" fxLayout.xs="column" *ngIf="job$ | async as job">
+    <div fxFlex="100%">
+      <mat-card>
+        <mat-card-header class="general-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> description </mat-icon>
           </div>
-        </tr>
-        <tr *ngIf="job.createdAt as value">
-          <th>
-            <mat-icon> calendar_today </mat-icon>
-            Created At
-          </th>
-          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-        </tr>
-        <tr *ngIf="job.updatedAt as value">
-          <th>
-            <mat-icon> calendar_today </mat-icon>
-            Updated At
-          </th>
-          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-        </tr>
-      </table>
-    </mat-card-content>
-  </mat-card>
-</div>
+          General Information
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr *ngIf="job.id as value">
+              <th>ID</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.type as value">
+              <th>Type</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.createdAt as value">
+              <th>Created At</th>
+              <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
+            </tr>
+          </table>
+        </mat-card-content>
+      </mat-card>
+      <mat-card>
+        <mat-card-header class="creator-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> person </mat-icon>
+          </div>
+          Users and Ownership
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr *ngIf="job.createdBy as value">
+              <th>Created By</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.contactEmail as value">
+              <th>Contact Email</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.ownerUser as value">
+              <th>Owner User</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.ownerGroup as value">
+              <th>Owner Group</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.accessGroups as value">
+              <th>Access Groups</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.updatedBy as value">
+              <th>Updated By</th>
+              <td>{{ value }}</td>
+            </tr>
+          </table>
+        </mat-card-content>
+      </mat-card>
+      <mat-card>
+        <mat-card-header class="derived-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> analytics </mat-icon>
+          </div>
+          Status
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr *ngIf="job.statusCode as value">
+              <th>Status Code</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.statusMessage as value">
+              <th>Status Message</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.updatedAt as value">
+              <th>Updated At</th>
+              <td>{{ value }}</td>
+            </tr>
+          </table>
+        </mat-card-content>
+      </mat-card>
+      <mat-card>
+        <mat-card-header class="related-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> library_books </mat-icon>
+          </div>
+          Parameters and Configuration
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr *ngIf="job.jobParams as value">
+              <th>Job Parameters</th>
+              <td>{{ value | json }}</td>
+            </tr>
+            <tr *ngIf="job.configVersion as value">
+              <th>Configuration Version</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.jobResultObject as value">
+              <th>Job Result Object</th>
+              <td>{{ value | json }}</td>
+            </tr>
+            <tr *ngIf="!job.datasetsValidation; elseBlockDatasetsValidation">
+              <th>Datasets Validation</th>
+              <td>No</td>
+            </tr>
+            <ng-template #elseBlockDatasetsValidation>
+              <tr>
+                <th>Datasets Validation</th>
+                <td>Yes</td>
+              </tr>
+            </ng-template>
+            <tr *ngIf="!job.isPublished; elseBlockIsPublished">
+              <th>Is Published</th>
+              <td>No</td>
+            </tr>
+            <ng-template #elseBlockIsPublished>
+              <tr>
+                <th>Is Published</th>
+                <td>Yes</td>
+              </tr>
+            </ng-template>
+          </table>
+        </mat-card-content>
+      </mat-card>
+    </div>
+  </div>
diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.scss b/src/app/jobs/jobs-detail/jobs-detail.component.scss
index 2687093ee7..2d1be484f3 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.scss
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.scss
@@ -1,20 +1,25 @@
-.job-detail {
-  mat-card {
-    margin: 1em;
+mat-card {
+  margin: 1em;
 
-    table {
-      td {
-        padding: 0.3em;
-      }
+  .section-icon {
+    height: auto !important;
+    width: auto !important;
 
-      th {
-        text-align: left;
-        padding-right: 0.5em;
+    mat-icon {
+      vertical-align: middle;
+    }
+  }
+
+  table {
+    th {
+      min-width: 10rem;
+      padding-right: 0.5rem;
+      text-align: left;
+    }
 
-        mat-icon {
-          vertical-align: middle;
-        }
-      }
+    td {
+      width: 100%;
+      padding: 0.5rem 0;
     }
   }
 }
diff --git a/src/app/shared/modules/shared-table/_shared-table-theme.scss b/src/app/shared/modules/shared-table/_shared-table-theme.scss
index 4124c88a0c..735cd85127 100644
--- a/src/app/shared/modules/shared-table/_shared-table-theme.scss
+++ b/src/app/shared/modules/shared-table/_shared-table-theme.scss
@@ -31,6 +31,7 @@
 
     mat-row:hover {
       background-color: mat.get-color-from-palette($hover, "lighter");
+      cursor: pointer;
     }
 
     .mat-form-field-appearance-outline {

From b546101c0c42fb315177c764dbdb613818825b6a Mon Sep 17 00:00:00 2001
From: Despina Adamopoulou <16343312+despadam@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:21:54 +0200
Subject: [PATCH 019/245] Remote ingestor (#1586)

* Prepare ingestor frontend minimal ui

* Update API

* static list of backends

* Remove unused file path input field in ingestor component

* Extend ui and adjust api calls

* Change back to localhost:3000 instead of backend.localhost

* Change back the files to original state

* fix ingestor endpoint

* fix sonarcube issues

---------

Co-authored-by: David Wiessner <david.wiessner@indema.ch>
---
 .../app-header/app-header.component.html      |  10 +-
 src/app/app-routing/app-routing.module.ts     |   7 +
 .../ingestor.feature.module.ts                |   8 +
 .../ingestor.routing.module.ts                |  15 ++
 .../ingestor-metadata-editor.component.html   |   4 +
 .../ingestor-metadata-editor.component.scss   |   3 +
 .../ingestor-metadata-editor.component.ts     |  18 +++
 src/app/ingestor/ingestor.module.ts           |  33 ++++
 .../ingestor/ingestor-api-endpoints.ts        |   7 +
 .../ingestor/ingestor/ingestor.component.html | 105 ++++++++++++
 .../ingestor/ingestor/ingestor.component.scss |  16 ++
 .../ingestor/ingestor.component.spec.ts       |  24 +++
 .../ingestor/ingestor/ingestor.component.ts   | 153 ++++++++++++++++++
 13 files changed, 402 insertions(+), 1 deletion(-)
 create mode 100644 src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
 create mode 100644 src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
 create mode 100644 src/app/ingestor/ingestor.module.ts
 create mode 100644 src/app/ingestor/ingestor/ingestor-api-endpoints.ts
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.html
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.scss
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.spec.ts
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.ts

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index b844e86598..88baab4099 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -67,7 +67,15 @@ <h3>{{ status }}</h3>
     </a>
 
     <span class="spacer"></span>
-
+    
+    <span>
+      <h6>
+        <a class="toplink" [routerLink]="['/ingestor']">
+          <mat-icon> cloud_upload  </mat-icon>
+          <span class="large-screen-text">Ingestor (OpenEM)</span></a
+        >
+      </h6>
+    </span>
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/help']">
diff --git a/src/app/app-routing/app-routing.module.ts b/src/app/app-routing/app-routing.module.ts
index 3310f2c053..2f95ca27e5 100644
--- a/src/app/app-routing/app-routing.module.ts
+++ b/src/app/app-routing/app-routing.module.ts
@@ -105,6 +105,13 @@ export const routes: Routes = [
                 (m) => m.HelpFeatureModule,
               ),
           },
+          {
+            path: "ingestor",
+            loadChildren: () =>
+              import("./lazy/ingestor-routing/ingestor.feature.module").then(
+                (m) => m.IngestorFeatureModule,
+              ),
+          },
           {
             path: "logbooks",
             loadChildren: () =>
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
new file mode 100644
index 0000000000..8796c9c34e
--- /dev/null
+++ b/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
@@ -0,0 +1,8 @@
+import { NgModule } from "@angular/core";
+import { IngestorRoutingModule } from "./ingestor.routing.module";
+import { IngestorModule } from "ingestor/ingestor.module";
+
+@NgModule({
+  imports: [IngestorModule, IngestorRoutingModule],
+})
+export class IngestorFeatureModule {}
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
new file mode 100644
index 0000000000..c1a5b047d5
--- /dev/null
+++ b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
+import { IngestorComponent } from "ingestor/ingestor/ingestor.component";
+
+const routes: Routes = [
+  {
+    path: "",
+    component: IngestorComponent,
+  },
+];
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class IngestorRoutingModule {}
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
new file mode 100644
index 0000000000..2e2b11f4ef
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
@@ -0,0 +1,4 @@
+<div class="ingestor-metadata-editor">
+  <textarea class="ingestor-metadata-editor" matInput placeholder="Edit Metadata" rows="10"
+    [(ngModel)]="metadata"></textarea>
+</div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
new file mode 100644
index 0000000000..89fe8050d3
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -0,0 +1,3 @@
+.ingestor-metadata-editor {
+  width: 100%;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
new file mode 100644
index 0000000000..19b7d76c4a
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -0,0 +1,18 @@
+import { Component, EventEmitter, Output } from '@angular/core';
+
+@Component({
+  selector: 'app-metadata-editor',
+  templateUrl: './ingestor-metadata-editor.component.html',
+  styleUrls: ['./ingestor-metadata-editor.component.scss']
+})
+export class IngestorMetadataEditorComponent {
+  metadata: string = '';
+
+    // Optional: EventEmitter, um Änderungen an der Metadata zu melden
+    @Output() metadataChange = new EventEmitter<string>();
+
+    onMetadataChange(newMetadata: string) {
+      this.metadata = newMetadata;
+      this.metadataChange.emit(this.metadata);
+    }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
new file mode 100644
index 0000000000..bd04008153
--- /dev/null
+++ b/src/app/ingestor/ingestor.module.ts
@@ -0,0 +1,33 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+import { IngestorComponent } from "./ingestor/ingestor.component";
+import { MatCardModule } from "@angular/material/card";
+import { RouterModule } from "@angular/router";
+import { IngestorMetadataEditorComponent } from "./ingestor-metadata-editor/ingestor-metadata-editor.component";
+import { MatButtonModule } from "@angular/material/button";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatInputModule } from "@angular/material/input";
+import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
+import { FormsModule } from "@angular/forms";
+import { MatListModule } from '@angular/material/list';
+import { MatIconModule } from '@angular/material/icon';
+
+@NgModule({
+  declarations: [
+    IngestorComponent,
+    IngestorMetadataEditorComponent
+  ],
+  imports: [
+    CommonModule, 
+    MatCardModule, 
+    FormsModule, 
+    MatFormFieldModule, 
+    MatInputModule, 
+    MatButtonModule, 
+    MatProgressSpinnerModule, 
+    RouterModule,
+    MatListModule,
+    MatIconModule
+  ],
+})
+export class IngestorModule { }
diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
new file mode 100644
index 0000000000..aa0ee1e755
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
@@ -0,0 +1,7 @@
+export const INGESTOR_API_ENDPOINTS_V1 = {
+  DATASET: "dataset",
+  TRANSFER: "transfer",
+  OTHER: {
+    VERSION: 'version',
+  },
+};
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
new file mode 100644
index 0000000000..a61b5ca5ba
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -0,0 +1,105 @@
+<p>
+  <mat-card class="ingestor-card">
+    <mat-card-header>
+      <mat-card-title>Ingestor-Connection</mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div *ngIf="connectingToFacilityBackend">
+        <mat-progress-spinner diameter="20"
+          mode="indeterminate"></mat-progress-spinner>
+      </div>
+      <div *ngIf="!connectingToFacilityBackend">
+        <ng-container *ngIf="connectedFacilityBackend === ''">
+          <p style="color: red;">No Backend connected</p>
+
+          <p>Please provide a valid Backend URL</p>
+          <mat-form-field>
+            <input matInput placeholder="Backend URL"
+              [(ngModel)]="forwardFacilityBackend">
+          </mat-form-field>
+          <button mat-raised-button color="primary"
+            (click)="forwardToIngestorPage()">Connect</button>
+
+          <div>
+            <ul>
+              <li *ngFor="let backend of lastUsedFacilityBackends">
+                <a (click)="selectFacilityBackend(backend)">{{ backend }}</a>
+              </li>
+            </ul>
+          </div>
+
+        </ng-container>
+        <ng-container *ngIf="connectedFacilityBackend !== ''">
+          <!-- Mat List with the most important information about the backend connection -->
+          <mat-list>
+            <mat-list-item>
+              <span matListItemTitle>Backend URL</span>
+              <span matListItemLine>{{ connectedFacilityBackend }} <a
+                  (click)="disconnectIngestor()">change</a></span>
+            </mat-list-item>
+            <mat-list-item>
+              <span matListItemTitle>Connection Status</span>
+              <span matListItemLine style="color: green;">Connected</span>
+            </mat-list-item>
+            <mat-list-item>
+              <span matListItemTitle>Version</span>
+              <span matListItemLine>{{ connectedFacilityBackendVersion }}</span>
+            </mat-list-item>
+          </mat-list>
+        </ng-container>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</p>
+
+<p *ngIf="connectedFacilityBackend !== ''">
+  <mat-card class="ingestor-card">
+    <mat-card-header>
+      <mat-card-title>Ingest Dataset</mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div>
+      </div>
+      <app-metadata-editor></app-metadata-editor>
+      <div>
+        <button mat-raised-button color="primary" (click)="upload()"
+          [disabled]="loading">
+          <span *ngIf="!loading">Upload</span>
+          <mat-progress-spinner *ngIf="loading" diameter="20"
+            mode="indeterminate"></mat-progress-spinner>
+        </button>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</p>
+
+<p *ngIf="returnValue !== ''">
+  <mat-card class="ingestor-card">
+    <mat-card-header>
+      <mat-card-title>Return Value</mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div>
+      </div>
+      <div>
+        <p>{{returnValue}}</p>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</p>
+
+<p *ngIf="errorMessage !== ''">
+  <mat-card class="ingestor-card">
+    <mat-card-header class="ingestor-mixed-header">
+      <mat-card-title>Error message</mat-card-title>
+      <button mat-icon-button class="ingestor-close-button" (click)="clearErrorMessage()">
+        <mat-icon>close</mat-icon>
+      </button>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div>
+        <p style="color: red" [innerHTML]="errorMessage"></p>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</p>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
new file mode 100644
index 0000000000..96cdeec1ba
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -0,0 +1,16 @@
+.ingestor-vertical-layout {
+  display: flex;
+  flex-direction: column;
+  gap: 1em;
+}
+
+/* src/app/ingestor/ingestor.component.scss */
+.ingestor-mixed-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.ingestor-close-button {
+  margin-left: auto;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.spec.ts b/src/app/ingestor/ingestor/ingestor.component.spec.ts
new file mode 100644
index 0000000000..52186b1077
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { IngestorComponent } from './ingestor.component';
+
+describe('IngestorComponent', () => {
+  let component: IngestorComponent;
+  let fixture: ComponentFixture<IngestorComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ IngestorComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(IngestorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
new file mode 100644
index 0000000000..99cf89e0f0
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -0,0 +1,153 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { AppConfigService, HelpMessages } from "app-config.service";
+import { HttpClient } from '@angular/common/http';
+import { IngestorMetadataEditorComponent } from '../ingestor-metadata-editor/ingestor-metadata-editor.component';
+import { ActivatedRoute, Router } from '@angular/router';
+import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
+
+@Component({
+  selector: "ingestor",
+  templateUrl: "./ingestor.component.html",
+  styleUrls: ["./ingestor.component.scss"],
+})
+export class IngestorComponent implements OnInit {
+
+  @ViewChild(IngestorMetadataEditorComponent) metadataEditor: IngestorMetadataEditorComponent;
+
+  appConfig = this.appConfigService.getConfig();
+  facility: string | null = null;
+  ingestManual: string | null = null;
+  gettingStarted: string | null = null;
+  shoppingCartEnabled = false;
+  helpMessages: HelpMessages;
+
+  filePath: string = '';
+  loading: boolean = false;
+  forwardFacilityBackend: string = '';
+
+  connectedFacilityBackend: string = '';
+  connectedFacilityBackendVersion: string = '';
+  connectingToFacilityBackend: boolean = false;
+  lastUsedFacilityBackends: string[] = [];
+
+  errorMessage: string = '';
+  returnValue: string = '';
+
+  constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
+
+  ngOnInit() {
+    this.facility = this.appConfig.facility;
+    this.ingestManual = this.appConfig.ingestManual;
+    this.helpMessages = new HelpMessages(
+      this.appConfig.helpMessages?.gettingStarted,
+      this.appConfig.helpMessages?.ingestManual,
+    );
+    this.gettingStarted = this.appConfig.gettingStarted;
+    this.connectingToFacilityBackend = true;
+    this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+    // Get the GET parameter 'backendUrl' from the URL
+    this.route.queryParams.subscribe(params => {
+      const backendUrl = params['backendUrl'];
+      if (backendUrl) {
+        this.connectToFacilityBackend(backendUrl);
+      }
+      else {
+        this.connectingToFacilityBackend = false;
+      }
+    });
+  }
+
+  connectToFacilityBackend(facilityBackendUrl: string): boolean {
+    let facilityBackendUrlCleaned = facilityBackendUrl.slice();
+    // Check if last symbol is a slash and add version endpoint
+    if (!facilityBackendUrlCleaned.endsWith('/')) {
+      facilityBackendUrlCleaned += '/';
+    }
+
+    let facilityBackendUrlVersion = facilityBackendUrlCleaned + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION;
+
+    // Try to connect to the facility backend/version to check if it is available
+    console.log('Connecting to facility backend: ' + facilityBackendUrlVersion);
+    this.http.get(facilityBackendUrlVersion).subscribe(
+      response => {
+        console.log('Connected to facility backend', response);
+        // If the connection is successful, store the connected facility backend URL
+        this.connectedFacilityBackend = facilityBackendUrlCleaned;
+        this.connectingToFacilityBackend = false;
+        this.connectedFacilityBackendVersion = response['version'];
+      },
+      error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+        console.error('Request failed', error);
+        this.connectedFacilityBackend = '';
+        this.connectingToFacilityBackend = false;
+        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+      }
+    );
+
+    return true;
+  }
+
+  upload() {
+    this.loading = true;
+    this.returnValue = '';
+    const payload = {
+      filePath: this.filePath,
+      metaData: this.metadataEditor.metadata
+    };
+
+    console.log('Uploading', payload);
+
+    this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET, payload).subscribe(
+      response => {
+        console.log('Upload successful', response);
+        this.returnValue = JSON.stringify(response);
+        this.loading = false;
+      },
+      error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+        console.error('Upload failed', error);
+        this.loading = false;
+      }
+    );
+  }
+
+  forwardToIngestorPage() {
+    if (this.forwardFacilityBackend) {
+      this.connectingToFacilityBackend = true;
+
+      // If current route is equal to the forward route, the router will not navigate to the new route
+      if (this.connectedFacilityBackend === this.forwardFacilityBackend) {
+        this.connectToFacilityBackend(this.forwardFacilityBackend);
+        return;
+      }
+
+      this.router.navigate(['/ingestor'], { queryParams: { backendUrl: this.forwardFacilityBackend } });
+    }
+  }
+
+  disconnectIngestor() {
+    this.returnValue = '';
+    this.connectedFacilityBackend = '';
+    // Remove the GET parameter 'backendUrl' from the URL
+    this.router.navigate(['/ingestor']);
+  }
+
+  // Helper functions
+  selectFacilityBackend(facilityBackend: string) {
+    this.forwardFacilityBackend = facilityBackend;
+  }
+
+  loadLastUsedFacilityBackends(): string[] {
+    // Load the list from the local Storage
+    const lastUsedFacilityBackends = '["http://localhost:8000", "http://localhost:8888"]';
+    if (lastUsedFacilityBackends) {
+      return JSON.parse(lastUsedFacilityBackends);
+    }
+    return [];
+  }
+
+  clearErrorMessage(): void {
+    this.errorMessage = '';
+  }
+}
\ No newline at end of file

From fd0ed2ff046396e4804617b2eae77cc886f3f226 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 16 Oct 2024 09:25:42 +0200
Subject: [PATCH 020/245] EM export in the header

---
 .../app-header/app-header.component.html      | 11 +++++
 src/app/app-routing/app-routing.module.ts     |  7 ++++
 .../emexport.feature.module.ts                |  8 ++++
 .../emexport.routing.module.ts                | 26 ++++++++++++
 src/app/emexport/emexport.module.ts           | 33 +++++++++++++++
 .../emexport/emexport/emexport.component.html | 23 +++++++++++
 .../emexport/emexport/emexport.component.scss | 35 ++++++++++++++++
 .../emexport/emexport/emexport.component.ts   | 41 +++++++++++++++++++
 src/app/emexport/empiar/empiar.component.html |  4 ++
 src/app/emexport/empiar/empiar.component.scss |  0
 src/app/emexport/empiar/empiar.component.ts   | 18 ++++++++
 src/app/emexport/onedep/onedep.component.html |  4 ++
 src/app/emexport/onedep/onedep.component.scss |  0
 src/app/emexport/onedep/onedep.component.ts   | 31 ++++++++++++++
 14 files changed, 241 insertions(+)
 create mode 100644 src/app/app-routing/lazy/emexport-routing/emexport.feature.module.ts
 create mode 100644 src/app/app-routing/lazy/emexport-routing/emexport.routing.module.ts
 create mode 100644 src/app/emexport/emexport.module.ts
 create mode 100644 src/app/emexport/emexport/emexport.component.html
 create mode 100644 src/app/emexport/emexport/emexport.component.scss
 create mode 100644 src/app/emexport/emexport/emexport.component.ts
 create mode 100644 src/app/emexport/empiar/empiar.component.html
 create mode 100644 src/app/emexport/empiar/empiar.component.scss
 create mode 100644 src/app/emexport/empiar/empiar.component.ts
 create mode 100644 src/app/emexport/onedep/onedep.component.html
 create mode 100644 src/app/emexport/onedep/onedep.component.scss
 create mode 100644 src/app/emexport/onedep/onedep.component.ts

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index 88baab4099..195563a3d4 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -76,6 +76,17 @@ <h6>
         >
       </h6>
     </span>
+
+    <span>
+      <h6>
+        <a class="toplink" [routerLink]="['/emexport']">
+          <mat-icon> assignment  </mat-icon>
+          <span class="large-screen-text">Export EM data</span></a
+        >
+      </h6>
+    </span>
+
+    
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/help']">
diff --git a/src/app/app-routing/app-routing.module.ts b/src/app/app-routing/app-routing.module.ts
index 2f95ca27e5..85e9660f07 100644
--- a/src/app/app-routing/app-routing.module.ts
+++ b/src/app/app-routing/app-routing.module.ts
@@ -112,6 +112,13 @@ export const routes: Routes = [
                 (m) => m.IngestorFeatureModule,
               ),
           },
+          {
+            path: "emexport",
+            loadChildren: () =>
+              import("./lazy/emexport-routing/emexport.feature.module").then(
+                (m) => m.EmExportFeatureModule,
+              ),
+          },
           {
             path: "logbooks",
             loadChildren: () =>
diff --git a/src/app/app-routing/lazy/emexport-routing/emexport.feature.module.ts b/src/app/app-routing/lazy/emexport-routing/emexport.feature.module.ts
new file mode 100644
index 0000000000..194e47f547
--- /dev/null
+++ b/src/app/app-routing/lazy/emexport-routing/emexport.feature.module.ts
@@ -0,0 +1,8 @@
+import { NgModule } from "@angular/core";
+import { EmExportRoutingModule } from "./emexport.routing.module";
+import { EmExportModule } from "emexport/emexport.module";
+
+@NgModule({
+  imports: [EmExportModule, EmExportRoutingModule],
+})
+export class EmExportFeatureModule {}
diff --git a/src/app/app-routing/lazy/emexport-routing/emexport.routing.module.ts b/src/app/app-routing/lazy/emexport-routing/emexport.routing.module.ts
new file mode 100644
index 0000000000..6b4116ea0b
--- /dev/null
+++ b/src/app/app-routing/lazy/emexport-routing/emexport.routing.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
+
+import { OneDepComponent } from 'emexport/onedep/onedep.component';
+import { EmpiarComponent } from 'emexport/empiar/empiar.component';
+import { EmExportComponent } from "emexport/emexport/emexport.component";
+
+const routes: Routes = [
+  {
+    path: "",
+    component: EmExportComponent,
+  },
+  { 
+    path: "onedep", 
+    component: OneDepComponent, 
+  }, 
+  {
+    path: "empiar",
+    component: EmpiarComponent,
+  },
+];
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EmExportRoutingModule {}
diff --git a/src/app/emexport/emexport.module.ts b/src/app/emexport/emexport.module.ts
new file mode 100644
index 0000000000..d54b86fe85
--- /dev/null
+++ b/src/app/emexport/emexport.module.ts
@@ -0,0 +1,33 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+import { MatCardModule } from "@angular/material/card";
+import { RouterModule } from "@angular/router";
+import { MatButtonModule } from "@angular/material/button";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatInputModule } from "@angular/material/input";
+import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
+import { FormsModule } from "@angular/forms";
+import { MatListModule } from '@angular/material/list';
+import { MatIconModule } from '@angular/material/icon';
+import { EmExportComponent } from "./emexport/emexport.component";
+import { OneDepComponent } from "./onedep/onedep.component"
+
+@NgModule({
+  declarations: [
+    EmExportComponent,
+    OneDepComponent
+  ],
+  imports: [
+    CommonModule, 
+    MatCardModule, 
+    FormsModule, 
+    MatFormFieldModule, 
+    MatInputModule, 
+    MatButtonModule, 
+    MatProgressSpinnerModule, 
+    RouterModule,
+    MatListModule,
+    MatIconModule
+  ],
+})
+export class EmExportModule { }
diff --git a/src/app/emexport/emexport/emexport.component.html b/src/app/emexport/emexport/emexport.component.html
new file mode 100644
index 0000000000..6bdd48eeac
--- /dev/null
+++ b/src/app/emexport/emexport/emexport.component.html
@@ -0,0 +1,23 @@
+  <div class="container two-column-layout">
+    <!-- OneDep Card -->
+    <mat-card class="onedep-card">
+      <mat-card-header class="centered-header">
+        <mat-card-title>OneDep deposition to PDB or EMDB</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="exmexport-vertical-layout centered-content">
+        <!-- Centered button to navigate to OneDep page -->
+        <button mat-raised-button color="primary" (click)="goToOneDep()">start</button>
+      </mat-card-content>
+    </mat-card>
+  
+    <!-- EMPIAR Card -->
+    <mat-card class="empiar-card">
+      <mat-card-header class="centered-header">
+        <mat-card-title>EMPIAR deposition of raw micrograps</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="exmexport-vertical-layout centered-content">
+        <!-- Centered button to navigate to EMPIAR page -->
+        <button mat-raised-button color="primary" (click)="goToEMPIAR()">start</button>
+      </mat-card-content>
+    </mat-card>
+  </div>
\ No newline at end of file
diff --git a/src/app/emexport/emexport/emexport.component.scss b/src/app/emexport/emexport/emexport.component.scss
new file mode 100644
index 0000000000..c815327512
--- /dev/null
+++ b/src/app/emexport/emexport/emexport.component.scss
@@ -0,0 +1,35 @@
+.container {
+    display: flex;
+    justify-content: space-between; /* Distributes space between the cards */
+    gap: 2em; /* Space between columns */
+  }
+  
+  .onedep-card, .empiar-card{
+    flex: 1; /* Makes both cards take equal width */
+    width:30%;
+    min-width: 300px; 
+    margin-top:20px;
+    margin-left:30px;
+    margin-right:30px;
+    
+  }
+  .centered-header {
+    display: flex; /* Use flexbox for centering */
+    justify-content: center; /* Center content horizontally */
+    width: 100%; /* Full width to center */
+  }
+  
+  .exmexport-vertical-layout {
+    display: flex;
+    flex-direction: column;
+    align-items: center; /* Center elements horizontally */
+    gap: 1em;
+  }
+  
+  .centered-content {
+    display: flex; /* Flexbox for centering */
+    flex-direction: column; /* Align items in a column */
+    align-items: center; /* Center items horizontally */
+    justify-content: center; /* Center items vertically */
+  }
+  
\ No newline at end of file
diff --git a/src/app/emexport/emexport/emexport.component.ts b/src/app/emexport/emexport/emexport.component.ts
new file mode 100644
index 0000000000..ea5afea2c9
--- /dev/null
+++ b/src/app/emexport/emexport/emexport.component.ts
@@ -0,0 +1,41 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { AppConfigService, HelpMessages } from "app-config.service";
+import { HttpClient } from '@angular/common/http';
+import { ActivatedRoute, Router } from '@angular/router';
+// import { OneDepComponent } from '../onedep/onedep.component';
+
+
+@Component({
+    selector: "emexport",
+    templateUrl: "./emexport.component.html",
+    styleUrls: ["./emexport.component.scss"],
+})
+export class EmExportComponent implements OnInit {
+
+    // @ViewChild(OneDepComponent) metadataEditor: OneDepComponent;
+
+    appConfig = this.appConfigService.getConfig();
+    facility: string | null = null;
+    ingestManual: string | null = null;
+    gettingStarted: string | null = null;
+    shoppingCartEnabled = false;
+    helpMessages: HelpMessages;
+
+
+    constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
+
+    ngOnInit() {
+        this.facility = this.appConfig.facility;
+        this.helpMessages = new HelpMessages(
+        this.appConfig.helpMessages?.gettingStarted,
+        this.appConfig.helpMessages?.ingestManual,
+        );
+        this.gettingStarted = this.appConfig.gettingStarted;
+    }
+    goToOneDep(){
+        this.router.navigateByUrl("/emexport/onedep");
+    }
+    goToEMPIAR(){
+        this.router.navigateByUrl("/emexport/empiar");
+    }
+}
\ No newline at end of file
diff --git a/src/app/emexport/empiar/empiar.component.html b/src/app/emexport/empiar/empiar.component.html
new file mode 100644
index 0000000000..7fe6bedc3a
--- /dev/null
+++ b/src/app/emexport/empiar/empiar.component.html
@@ -0,0 +1,4 @@
+<!-- onedep.component.html -->
+<div>
+    <h1>EMPIAR here!</h1>
+</div>
\ No newline at end of file
diff --git a/src/app/emexport/empiar/empiar.component.scss b/src/app/emexport/empiar/empiar.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/emexport/empiar/empiar.component.ts b/src/app/emexport/empiar/empiar.component.ts
new file mode 100644
index 0000000000..231735c2d9
--- /dev/null
+++ b/src/app/emexport/empiar/empiar.component.ts
@@ -0,0 +1,18 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { AppConfigService, HelpMessages } from "app-config.service";
+import { HttpClient } from '@angular/common/http';
+import { ActivatedRoute, Router } from '@angular/router';
+
+@Component({
+  selector: 'oneempiardep',
+  templateUrl: './empiar.component.html',
+  styleUrls: ['./empiar.component.scss']
+})
+export class EmpiarComponent implements OnInit {
+
+    empiar : boolean;
+
+    ngOnInit() {
+        this.empiar = true;
+    }
+}
\ No newline at end of file
diff --git a/src/app/emexport/onedep/onedep.component.html b/src/app/emexport/onedep/onedep.component.html
new file mode 100644
index 0000000000..0fcef09a33
--- /dev/null
+++ b/src/app/emexport/onedep/onedep.component.html
@@ -0,0 +1,4 @@
+<!-- onedep.component.html -->
+<div>
+    <h1>One Dep here!</h1>
+</div>
\ No newline at end of file
diff --git a/src/app/emexport/onedep/onedep.component.scss b/src/app/emexport/onedep/onedep.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/emexport/onedep/onedep.component.ts b/src/app/emexport/onedep/onedep.component.ts
new file mode 100644
index 0000000000..053355af00
--- /dev/null
+++ b/src/app/emexport/onedep/onedep.component.ts
@@ -0,0 +1,31 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { AppConfigService, HelpMessages } from "app-config.service";
+import { HttpClient } from '@angular/common/http';
+import { ActivatedRoute, Router } from '@angular/router';
+
+@Component({
+  selector: 'onedep',
+  templateUrl: './onedep.component.html',
+  styleUrls: ['./onedep.component.scss']
+})
+export class OneDepComponent implements OnInit {
+
+    appConfig = this.appConfigService.getConfig();
+    facility: string | null = null;
+    ingestManual: string | null = null;
+    gettingStarted: string | null = null;
+    shoppingCartEnabled = false;
+    helpMessages: HelpMessages;
+
+
+    constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
+
+    ngOnInit() {
+        this.facility = this.appConfig.facility;
+        this.helpMessages = new HelpMessages(
+        this.appConfig.helpMessages?.gettingStarted,
+        this.appConfig.helpMessages?.ingestManual,
+        );
+        this.gettingStarted = this.appConfig.gettingStarted;
+    }
+}
\ No newline at end of file

From 97ce726b4aa0d30ebb20382e92407d7d9c01a06b Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 16 Oct 2024 17:09:54 +0200
Subject: [PATCH 021/245] OneDep from dataset

---
 .../app-header/app-header.component.html      | 10 ---
 src/app/app-routing/app-routing.module.ts     |  7 --
 .../datasets.routing.module.ts                |  5 ++
 .../emexport.feature.module.ts                |  8 --
 .../emexport.routing.module.ts                | 26 ------
 .../dataset-detail.component.html             | 18 ++++
 .../dataset-detail.component.scss             |  4 +
 .../dataset-detail.component.ts               |  1 +
 src/app/datasets/datasets.module.ts           |  2 +
 src/app/datasets/onedep/onedep.component.html | 75 ++++++++++++++++
 src/app/datasets/onedep/onedep.component.scss | 39 ++++++++
 src/app/datasets/onedep/onedep.component.ts   | 89 +++++++++++++++++++
 src/app/emexport/emexport.module.ts           | 33 -------
 .../emexport/emexport/emexport.component.html | 23 -----
 .../emexport/emexport/emexport.component.scss | 35 --------
 .../emexport/emexport/emexport.component.ts   | 41 ---------
 src/app/emexport/onedep/onedep.component.html |  4 -
 src/app/emexport/onedep/onedep.component.scss |  0
 src/app/emexport/onedep/onedep.component.ts   | 31 -------
 .../empiar/empiar.component.html              |  0
 .../empiar/empiar.component.scss              |  0
 .../{emexport => }/empiar/empiar.component.ts |  2 +-
 22 files changed, 234 insertions(+), 219 deletions(-)
 delete mode 100644 src/app/app-routing/lazy/emexport-routing/emexport.feature.module.ts
 delete mode 100644 src/app/app-routing/lazy/emexport-routing/emexport.routing.module.ts
 create mode 100644 src/app/datasets/onedep/onedep.component.html
 create mode 100644 src/app/datasets/onedep/onedep.component.scss
 create mode 100644 src/app/datasets/onedep/onedep.component.ts
 delete mode 100644 src/app/emexport/emexport.module.ts
 delete mode 100644 src/app/emexport/emexport/emexport.component.html
 delete mode 100644 src/app/emexport/emexport/emexport.component.scss
 delete mode 100644 src/app/emexport/emexport/emexport.component.ts
 delete mode 100644 src/app/emexport/onedep/onedep.component.html
 delete mode 100644 src/app/emexport/onedep/onedep.component.scss
 delete mode 100644 src/app/emexport/onedep/onedep.component.ts
 rename src/app/{emexport => }/empiar/empiar.component.html (100%)
 rename src/app/{emexport => }/empiar/empiar.component.scss (100%)
 rename src/app/{emexport => }/empiar/empiar.component.ts (94%)

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index 195563a3d4..dced69ad42 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -76,16 +76,6 @@ <h6>
         >
       </h6>
     </span>
-
-    <span>
-      <h6>
-        <a class="toplink" [routerLink]="['/emexport']">
-          <mat-icon> assignment  </mat-icon>
-          <span class="large-screen-text">Export EM data</span></a
-        >
-      </h6>
-    </span>
-
     
     <span>
       <h6>
diff --git a/src/app/app-routing/app-routing.module.ts b/src/app/app-routing/app-routing.module.ts
index 85e9660f07..2f95ca27e5 100644
--- a/src/app/app-routing/app-routing.module.ts
+++ b/src/app/app-routing/app-routing.module.ts
@@ -112,13 +112,6 @@ export const routes: Routes = [
                 (m) => m.IngestorFeatureModule,
               ),
           },
-          {
-            path: "emexport",
-            loadChildren: () =>
-              import("./lazy/emexport-routing/emexport.feature.module").then(
-                (m) => m.EmExportFeatureModule,
-              ),
-          },
           {
             path: "logbooks",
             loadChildren: () =>
diff --git a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
index d1637dbd59..14feaf6945 100644
--- a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
+++ b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
@@ -6,6 +6,7 @@ import { DashboardComponent } from "datasets/dashboard/dashboard.component";
 import { DatablocksComponent } from "datasets/datablocks-table/datablocks-table.component";
 import { DatasetDetailsDashboardComponent } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
 import { PublishComponent } from "datasets/publish/publish.component";
+import { OneDepComponent } from "datasets/onedep/onedep.component";
 
 const routes: Routes = [
   {
@@ -35,6 +36,10 @@ const routes: Routes = [
     component: DatablocksComponent,
     canActivate: [AuthGuard],
   },
+  { 
+    path: ":id/onedep", 
+    component: OneDepComponent, 
+  }, 
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/app-routing/lazy/emexport-routing/emexport.feature.module.ts b/src/app/app-routing/lazy/emexport-routing/emexport.feature.module.ts
deleted file mode 100644
index 194e47f547..0000000000
--- a/src/app/app-routing/lazy/emexport-routing/emexport.feature.module.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { NgModule } from "@angular/core";
-import { EmExportRoutingModule } from "./emexport.routing.module";
-import { EmExportModule } from "emexport/emexport.module";
-
-@NgModule({
-  imports: [EmExportModule, EmExportRoutingModule],
-})
-export class EmExportFeatureModule {}
diff --git a/src/app/app-routing/lazy/emexport-routing/emexport.routing.module.ts b/src/app/app-routing/lazy/emexport-routing/emexport.routing.module.ts
deleted file mode 100644
index 6b4116ea0b..0000000000
--- a/src/app/app-routing/lazy/emexport-routing/emexport.routing.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NgModule } from "@angular/core";
-import { RouterModule, Routes } from "@angular/router";
-
-import { OneDepComponent } from 'emexport/onedep/onedep.component';
-import { EmpiarComponent } from 'emexport/empiar/empiar.component';
-import { EmExportComponent } from "emexport/emexport/emexport.component";
-
-const routes: Routes = [
-  {
-    path: "",
-    component: EmExportComponent,
-  },
-  { 
-    path: "onedep", 
-    component: OneDepComponent, 
-  }, 
-  {
-    path: "empiar",
-    component: EmpiarComponent,
-  },
-];
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class EmExportRoutingModule {}
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail.component.html
index d049b4fe82..f9c575b4f7 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.html
@@ -21,7 +21,25 @@
         Public
       </mat-slide-toggle>
     </div>
+    <button
+          mat-raised-button
+          id="onedepBtn"
+          class="emexport-button"
+          (click)="onOneDepClick()"
+        >
+          OneDep
+    </button>
+    <div fxFlex="auto">
+      <a
+        mat-raised-button
+        [routerLink]="['/empiar']"
+        class="emexport-button"
+      >
+        EMPIAR
+      </a>
+    </div>
   </div>
+
   <div style="clear: both"></div>
   <div fxLayout="row" fxLayout.xs="column" *ngIf="dataset">
     <div [fxFlex]="(attachments$ | async)?.length > 0 ? '90%' : '100%'">
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.scss b/src/app/datasets/dataset-detail/dataset-detail.component.scss
index 14d17981ed..5eb33c71ce 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.scss
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.scss
@@ -51,6 +51,10 @@ mat-card {
 .jupyter-button {
   margin: 1em 0 0 1em;
 }
+.emexport-button {
+  margin: 1em 0 0 3em;
+  color: hsla(185, 43%, 45%, 0.458);
+}
 .public-toggle {
   margin: 1em 1em 0 0;
   float: right;
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index c13db28b0f..f343936679 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -314,4 +314,5 @@ export class DatasetDetailComponent
   openAttachment(encoded: string) {
     this.attachmentService.openAttachment(encoded);
   }
+
 }
diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index f9092cc4b2..8f8d905a14 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -90,6 +90,7 @@ import { CdkDrag, CdkDragHandle, CdkDropList } from "@angular/cdk/drag-drop";
 import { FiltersModule } from "shared/modules/filters/filters.module";
 import { userReducer } from "state-management/reducers/user.reducer";
 import { MatSnackBarModule } from "@angular/material/snack-bar";
+import { OneDepComponent } from "./onedep/onedep.component";
 
 @NgModule({
   imports: [
@@ -179,6 +180,7 @@ import { MatSnackBarModule } from "@angular/material/snack-bar";
     DatafilesActionsComponent,
     DatafilesActionComponent,
     DatasetsFilterSettingsComponent,
+    OneDepComponent,
   ],
   providers: [
     ArchivingService,
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
new file mode 100644
index 0000000000..346cccafb6
--- /dev/null
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -0,0 +1,75 @@
+<p>OneDep Component is working!</p>
+<ng-template [ngIf]="dataset">
+    <div style="clear: both"></div>
+    <div fxLayout="row" fxLayout.xs="column" *ngIf="dataset">
+        <div fxFlex="80%">
+            <mat-card [formGroup]="form" data-cy="deposition">
+                <mat-card-header class="general-deposition">
+                    <div mat-card-avatar class="section-icon">
+                        <mat-icon> assignment </mat-icon>
+                    </div>
+                    Begin deposition
+                </mat-card-header>
+                <mat-card-content>
+                    <table>
+                        <tr>
+                            <th>Name</th>
+                            <td *ngIf="!editEnabled">{{ dataset.datasetName || "-" }}</td>
+                            <td *ngIf="editEnabled && editingAllowed">
+                                <mat-form-field class="full-width">
+                                    <mat-label>Name</mat-label>
+                                    <input matInput type="text" formControlName="datasetName" />
+                                </mat-form-field>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>Description</th>
+                            <td *ngIf="!editEnabled">
+                                <span [innerHTML]="dataset.description || '-' "></span>
+                            </td>
+                            <td *ngIf="editEnabled && editingAllowed">
+                                <mat-form-field class="full-width">
+                                    <mat-label>Description</mat-label>
+                                    <textarea matInput rows="5" formControlName="description"></textarea>
+                                </mat-form-field>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>PID</th>
+                            <td>
+                                {{ dataset.pid }}
+                            </td>
+                        </tr>
+                        <tr *ngIf="dataset.type as value">
+                            <th>Type</th>
+                            <td>{{ value }}</td>
+                        </tr>
+                        <tr *ngIf="dataset.creationTime as value">
+                            <th>Creation Time</th>
+                            <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
+                        </tr>
+                        <tr class="keywords-row">
+                            <th>Keywords</th>
+                            <td *ngIf="!editEnabled">
+                                <mat-chip-set role="list" #keywordChips>
+                                    <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
+                                        {{ keyword }}
+                                    </mat-chip>
+                                </mat-chip-set>
+                            </td>
+                        </tr>
+                    </table>
+                </mat-card-content>
+            </mat-card>
+        </div>
+
+        <div fxFlex="30%" *ngIf="attachments$ | async as attachments">
+            <ng-container *ngFor="let da of attachments">
+                <mat-card>
+                    <img mat-card-image src="{{ da.thumbnail }}" />
+                    <mat-card-actions>{{ da.caption }}</mat-card-actions>
+                </mat-card>
+            </ng-container>
+        </div>
+    </div>
+</ng-template>
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
new file mode 100644
index 0000000000..b862d7d649
--- /dev/null
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -0,0 +1,39 @@
+mat-card {
+    margin: 1em;
+  
+    .section-icon {
+      height: auto !important;
+      width: auto !important;
+  
+      mat-icon {
+        vertical-align: middle;
+      }
+    }
+  
+    table {
+      th {
+        min-width: 10rem;
+        padding-right: 0.5rem;
+        text-align: left;
+      }
+  
+      td {
+        width: 100%;
+        padding: 0.5rem 0;
+  
+        .sample-edit {
+          padding-left: 0.5rem;
+  
+          mat-icon {
+            font-size: medium;
+          }
+        }
+  
+      }
+  
+      .full-width {
+        width: 100%;
+      }
+    }
+  }
+ 
\ No newline at end of file
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
new file mode 100644
index 0000000000..93ed41e1d2
--- /dev/null
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -0,0 +1,89 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { AppConfigService, HelpMessages } from "app-config.service";
+import { HttpClient } from '@angular/common/http';
+import { ActivatedRoute, Router } from '@angular/router';
+import {
+  FormArray,
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  Validators,
+} from "@angular/forms";
+import { Store } from "@ngrx/store";
+import { Dataset } from "shared/sdk/models";
+import {
+  selectCurrentAttachments,
+  selectCurrentDataset,
+  selectCurrentDatasetWithoutFileInfo,
+} from "state-management/selectors/datasets.selectors";
+
+import {
+  selectCurrentUser,
+  selectIsAdmin,
+  selectIsLoading,
+  selectProfile,
+} from "state-management/selectors/user.selectors";
+
+import { combineLatest, fromEvent, Observable, Subscription } from "rxjs";
+
+import { map } from "rxjs/operators";
+
+@Component({
+  selector: 'onedep',
+  templateUrl: './onedep.component.html',
+  styleUrls: ['./onedep.component.scss']
+})
+export class OneDepComponent implements OnInit {
+
+  appConfig = this.appConfigService.getConfig();
+  facility: string | null = null;
+  ingestManual: string | null = null;
+  gettingStarted: string | null = null;
+  shoppingCartEnabled = false;
+  helpMessages: HelpMessages;
+  editingAllowed = false;
+  editEnabled = false;
+
+  dataset: Dataset | undefined;
+  form: FormGroup;
+  attachments$ = this.store.select(selectCurrentAttachments);
+  datasetWithout$ = this.store.select(selectCurrentDatasetWithoutFileInfo);
+  userProfile$ = this.store.select(selectProfile);
+  isAdmin$ = this.store.select(selectIsAdmin);
+  accessGroups$: Observable<string[]> = this.userProfile$.pipe(
+    map((profile) => (profile ? profile.accessGroups : [])),
+  );
+  private subscriptions: Subscription[] = [];
+
+  constructor(public appConfigService: AppConfigService,
+    private http: HttpClient,
+    private route: ActivatedRoute,
+    private router: Router,
+    private store: Store,
+    private fb: FormBuilder) { }
+
+  
+    ngOnInit() {
+      this.form = this.fb.group({
+        datasetName: new FormControl("", [Validators.required]),
+        description: new FormControl("", [Validators.required]),
+        keywords: this.fb.array([]),
+      });
+  
+      this.subscriptions.push(
+        this.store.select(selectCurrentDataset).subscribe((dataset) => {
+          this.dataset = dataset;
+          console.log(dataset);
+          if (this.dataset) {
+            combineLatest([this.accessGroups$, this.isAdmin$]).subscribe(
+              ([groups, isAdmin]) => {
+                this.editingAllowed =
+                  groups.indexOf(this.dataset.ownerGroup) !== -1 || isAdmin;
+              },
+            );
+          }
+        }),
+      );
+    }
+  
+}
\ No newline at end of file
diff --git a/src/app/emexport/emexport.module.ts b/src/app/emexport/emexport.module.ts
deleted file mode 100644
index d54b86fe85..0000000000
--- a/src/app/emexport/emexport.module.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { NgModule } from "@angular/core";
-import { CommonModule } from "@angular/common";
-import { MatCardModule } from "@angular/material/card";
-import { RouterModule } from "@angular/router";
-import { MatButtonModule } from "@angular/material/button";
-import { MatFormFieldModule } from "@angular/material/form-field";
-import { MatInputModule } from "@angular/material/input";
-import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
-import { FormsModule } from "@angular/forms";
-import { MatListModule } from '@angular/material/list';
-import { MatIconModule } from '@angular/material/icon';
-import { EmExportComponent } from "./emexport/emexport.component";
-import { OneDepComponent } from "./onedep/onedep.component"
-
-@NgModule({
-  declarations: [
-    EmExportComponent,
-    OneDepComponent
-  ],
-  imports: [
-    CommonModule, 
-    MatCardModule, 
-    FormsModule, 
-    MatFormFieldModule, 
-    MatInputModule, 
-    MatButtonModule, 
-    MatProgressSpinnerModule, 
-    RouterModule,
-    MatListModule,
-    MatIconModule
-  ],
-})
-export class EmExportModule { }
diff --git a/src/app/emexport/emexport/emexport.component.html b/src/app/emexport/emexport/emexport.component.html
deleted file mode 100644
index 6bdd48eeac..0000000000
--- a/src/app/emexport/emexport/emexport.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-  <div class="container two-column-layout">
-    <!-- OneDep Card -->
-    <mat-card class="onedep-card">
-      <mat-card-header class="centered-header">
-        <mat-card-title>OneDep deposition to PDB or EMDB</mat-card-title>
-      </mat-card-header>
-      <mat-card-content class="exmexport-vertical-layout centered-content">
-        <!-- Centered button to navigate to OneDep page -->
-        <button mat-raised-button color="primary" (click)="goToOneDep()">start</button>
-      </mat-card-content>
-    </mat-card>
-  
-    <!-- EMPIAR Card -->
-    <mat-card class="empiar-card">
-      <mat-card-header class="centered-header">
-        <mat-card-title>EMPIAR deposition of raw micrograps</mat-card-title>
-      </mat-card-header>
-      <mat-card-content class="exmexport-vertical-layout centered-content">
-        <!-- Centered button to navigate to EMPIAR page -->
-        <button mat-raised-button color="primary" (click)="goToEMPIAR()">start</button>
-      </mat-card-content>
-    </mat-card>
-  </div>
\ No newline at end of file
diff --git a/src/app/emexport/emexport/emexport.component.scss b/src/app/emexport/emexport/emexport.component.scss
deleted file mode 100644
index c815327512..0000000000
--- a/src/app/emexport/emexport/emexport.component.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-.container {
-    display: flex;
-    justify-content: space-between; /* Distributes space between the cards */
-    gap: 2em; /* Space between columns */
-  }
-  
-  .onedep-card, .empiar-card{
-    flex: 1; /* Makes both cards take equal width */
-    width:30%;
-    min-width: 300px; 
-    margin-top:20px;
-    margin-left:30px;
-    margin-right:30px;
-    
-  }
-  .centered-header {
-    display: flex; /* Use flexbox for centering */
-    justify-content: center; /* Center content horizontally */
-    width: 100%; /* Full width to center */
-  }
-  
-  .exmexport-vertical-layout {
-    display: flex;
-    flex-direction: column;
-    align-items: center; /* Center elements horizontally */
-    gap: 1em;
-  }
-  
-  .centered-content {
-    display: flex; /* Flexbox for centering */
-    flex-direction: column; /* Align items in a column */
-    align-items: center; /* Center items horizontally */
-    justify-content: center; /* Center items vertically */
-  }
-  
\ No newline at end of file
diff --git a/src/app/emexport/emexport/emexport.component.ts b/src/app/emexport/emexport/emexport.component.ts
deleted file mode 100644
index ea5afea2c9..0000000000
--- a/src/app/emexport/emexport/emexport.component.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
-import { AppConfigService, HelpMessages } from "app-config.service";
-import { HttpClient } from '@angular/common/http';
-import { ActivatedRoute, Router } from '@angular/router';
-// import { OneDepComponent } from '../onedep/onedep.component';
-
-
-@Component({
-    selector: "emexport",
-    templateUrl: "./emexport.component.html",
-    styleUrls: ["./emexport.component.scss"],
-})
-export class EmExportComponent implements OnInit {
-
-    // @ViewChild(OneDepComponent) metadataEditor: OneDepComponent;
-
-    appConfig = this.appConfigService.getConfig();
-    facility: string | null = null;
-    ingestManual: string | null = null;
-    gettingStarted: string | null = null;
-    shoppingCartEnabled = false;
-    helpMessages: HelpMessages;
-
-
-    constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
-
-    ngOnInit() {
-        this.facility = this.appConfig.facility;
-        this.helpMessages = new HelpMessages(
-        this.appConfig.helpMessages?.gettingStarted,
-        this.appConfig.helpMessages?.ingestManual,
-        );
-        this.gettingStarted = this.appConfig.gettingStarted;
-    }
-    goToOneDep(){
-        this.router.navigateByUrl("/emexport/onedep");
-    }
-    goToEMPIAR(){
-        this.router.navigateByUrl("/emexport/empiar");
-    }
-}
\ No newline at end of file
diff --git a/src/app/emexport/onedep/onedep.component.html b/src/app/emexport/onedep/onedep.component.html
deleted file mode 100644
index 0fcef09a33..0000000000
--- a/src/app/emexport/onedep/onedep.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- onedep.component.html -->
-<div>
-    <h1>One Dep here!</h1>
-</div>
\ No newline at end of file
diff --git a/src/app/emexport/onedep/onedep.component.scss b/src/app/emexport/onedep/onedep.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/emexport/onedep/onedep.component.ts b/src/app/emexport/onedep/onedep.component.ts
deleted file mode 100644
index 053355af00..0000000000
--- a/src/app/emexport/onedep/onedep.component.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
-import { AppConfigService, HelpMessages } from "app-config.service";
-import { HttpClient } from '@angular/common/http';
-import { ActivatedRoute, Router } from '@angular/router';
-
-@Component({
-  selector: 'onedep',
-  templateUrl: './onedep.component.html',
-  styleUrls: ['./onedep.component.scss']
-})
-export class OneDepComponent implements OnInit {
-
-    appConfig = this.appConfigService.getConfig();
-    facility: string | null = null;
-    ingestManual: string | null = null;
-    gettingStarted: string | null = null;
-    shoppingCartEnabled = false;
-    helpMessages: HelpMessages;
-
-
-    constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
-
-    ngOnInit() {
-        this.facility = this.appConfig.facility;
-        this.helpMessages = new HelpMessages(
-        this.appConfig.helpMessages?.gettingStarted,
-        this.appConfig.helpMessages?.ingestManual,
-        );
-        this.gettingStarted = this.appConfig.gettingStarted;
-    }
-}
\ No newline at end of file
diff --git a/src/app/emexport/empiar/empiar.component.html b/src/app/empiar/empiar.component.html
similarity index 100%
rename from src/app/emexport/empiar/empiar.component.html
rename to src/app/empiar/empiar.component.html
diff --git a/src/app/emexport/empiar/empiar.component.scss b/src/app/empiar/empiar.component.scss
similarity index 100%
rename from src/app/emexport/empiar/empiar.component.scss
rename to src/app/empiar/empiar.component.scss
diff --git a/src/app/emexport/empiar/empiar.component.ts b/src/app/empiar/empiar.component.ts
similarity index 94%
rename from src/app/emexport/empiar/empiar.component.ts
rename to src/app/empiar/empiar.component.ts
index 231735c2d9..ae9b3eba27 100644
--- a/src/app/emexport/empiar/empiar.component.ts
+++ b/src/app/empiar/empiar.component.ts
@@ -4,7 +4,7 @@ import { HttpClient } from '@angular/common/http';
 import { ActivatedRoute, Router } from '@angular/router';
 
 @Component({
-  selector: 'oneempiardep',
+  selector: 'empiar',
   templateUrl: './empiar.component.html',
   styleUrls: ['./empiar.component.scss']
 })

From e29f3df2399b3eacb1c70dae1b0fdba99c516cb0 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 17 Oct 2024 17:56:02 +0200
Subject: [PATCH 022/245] OneDep component recieves dataset - turned off
 cleaning in dataset-details dashboard onDestroy

---
 .../dataset-detail.component.html             | 31 +++++---
 .../dataset-detail.component.scss             |  2 +-
 .../dataset-detail.component.ts               |  4 ++
 .../dataset-details-dashboard.component.ts    |  2 +-
 src/app/datasets/onedep/onedep.component.html | 55 +--------------
 src/app/datasets/onedep/onedep.component.ts   | 70 ++++++-------------
 6 files changed, 50 insertions(+), 114 deletions(-)

diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail.component.html
index f9c575b4f7..ba5b6e7f24 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.html
@@ -12,23 +12,23 @@
         Jupyter Hub
       </a>
     </div>
-    <div fxFlex="auto" *ngIf="editingAllowed">
-      <mat-slide-toggle
-        class="public-toggle"
-        [checked]="dataset.isPublished"
-        (change)="onSlidePublic($event)"
-      >
-        Public
-      </mat-slide-toggle>
-    </div>
-    <button
+    <!-- <button
           mat-raised-button
           id="onedepBtn"
           class="emexport-button"
           (click)="onOneDepClick()"
         >
           OneDep
-    </button>
+    </button> -->
+    <div fxFlex="auto">
+      <a
+      mat-raised-button
+      [routerLink]="['/datasets', dataset.pid, 'onedep']"
+      class="emexport-button"
+      >
+        OneDep
+      </a>
+    </div>
     <div fxFlex="auto">
       <a
         mat-raised-button
@@ -38,6 +38,15 @@
         EMPIAR
       </a>
     </div>
+    <div fxFlex="auto" *ngIf="editingAllowed">
+      <mat-slide-toggle
+        class="public-toggle"
+        [checked]="dataset.isPublished"
+        (change)="onSlidePublic($event)"
+      >
+        Public
+      </mat-slide-toggle>
+    </div>
   </div>
 
   <div style="clear: both"></div>
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.scss b/src/app/datasets/dataset-detail/dataset-detail.component.scss
index 5eb33c71ce..efb4f1bdce 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.scss
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.scss
@@ -53,7 +53,7 @@ mat-card {
 }
 .emexport-button {
   margin: 1em 0 0 3em;
-  color: hsla(185, 43%, 45%, 0.458);
+  background-color: hsla(185, 43%, 45%, 0.458);
 }
 .public-toggle {
   margin: 1em 1em 0 0;
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index f343936679..c223b518be 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -25,6 +25,7 @@ import {
   addKeywordFilterAction,
   clearFacetsAction,
   updatePropertyAction,
+  selectDatasetAction,
 } from "state-management/actions/datasets.actions";
 import { Router } from "@angular/router";
 import { selectCurrentProposal } from "state-management/selectors/proposals.selectors";
@@ -88,6 +89,9 @@ export class DatasetDetailComponent
   editingAllowed = false;
   editEnabled = false;
   show = false;
+
+  @Output() emClick = new EventEmitter<Dataset>();
+
   readonly separatorKeyCodes: number[] = [ENTER, COMMA, SPACE];
 
   constructor(
diff --git a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
index aa2b8dcecb..c857094866 100644
--- a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
+++ b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
@@ -289,7 +289,7 @@ export class DatasetDetailsDashboardComponent
   }
 
   ngOnDestroy() {
-    this.store.dispatch(clearCurrentDatasetStateAction());
+    //this.store.dispatch(clearCurrentDatasetStateAction());
     this.store.dispatch(clearCurrentProposalStateAction());
     this.store.dispatch(clearCurrentSampleStateAction());
     this.subscriptions.forEach((subscription) => {
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 346cccafb6..822153b384 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -10,66 +10,17 @@
                     </div>
                     Begin deposition
                 </mat-card-header>
-                <mat-card-content>
-                    <table>
-                        <tr>
-                            <th>Name</th>
-                            <td *ngIf="!editEnabled">{{ dataset.datasetName || "-" }}</td>
-                            <td *ngIf="editEnabled && editingAllowed">
-                                <mat-form-field class="full-width">
-                                    <mat-label>Name</mat-label>
-                                    <input matInput type="text" formControlName="datasetName" />
-                                </mat-form-field>
-                            </td>
-                        </tr>
-                        <tr>
-                            <th>Description</th>
-                            <td *ngIf="!editEnabled">
-                                <span [innerHTML]="dataset.description || '-' "></span>
-                            </td>
-                            <td *ngIf="editEnabled && editingAllowed">
-                                <mat-form-field class="full-width">
-                                    <mat-label>Description</mat-label>
-                                    <textarea matInput rows="5" formControlName="description"></textarea>
-                                </mat-form-field>
-                            </td>
-                        </tr>
-                        <tr>
-                            <th>PID</th>
-                            <td>
-                                {{ dataset.pid }}
-                            </td>
-                        </tr>
-                        <tr *ngIf="dataset.type as value">
-                            <th>Type</th>
-                            <td>{{ value }}</td>
-                        </tr>
-                        <tr *ngIf="dataset.creationTime as value">
-                            <th>Creation Time</th>
-                            <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-                        </tr>
-                        <tr class="keywords-row">
-                            <th>Keywords</th>
-                            <td *ngIf="!editEnabled">
-                                <mat-chip-set role="list" #keywordChips>
-                                    <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
-                                        {{ keyword }}
-                                    </mat-chip>
-                                </mat-chip-set>
-                            </td>
-                        </tr>
-                    </table>
-                </mat-card-content>
+                
             </mat-card>
         </div>
 
-        <div fxFlex="30%" *ngIf="attachments$ | async as attachments">
+        <!-- <div fxFlex="30%" *ngIf="attachments$ | async as attachments">
             <ng-container *ngFor="let da of attachments">
                 <mat-card>
                     <img mat-card-image src="{{ da.thumbnail }}" />
                     <mat-card-actions>{{ da.caption }}</mat-card-actions>
                 </mat-card>
             </ng-container>
-        </div>
+        </div> -->
     </div>
 </ng-template>
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 93ed41e1d2..b1f0a3e4e7 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -1,9 +1,8 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 import { AppConfigService, HelpMessages } from "app-config.service";
 import { HttpClient } from '@angular/common/http';
 import { ActivatedRoute, Router } from '@angular/router';
 import {
-  FormArray,
   FormBuilder,
   FormControl,
   FormGroup,
@@ -12,21 +11,12 @@ import {
 import { Store } from "@ngrx/store";
 import { Dataset } from "shared/sdk/models";
 import {
-  selectCurrentAttachments,
+
   selectCurrentDataset,
-  selectCurrentDatasetWithoutFileInfo,
 } from "state-management/selectors/datasets.selectors";
 
-import {
-  selectCurrentUser,
-  selectIsAdmin,
-  selectIsLoading,
-  selectProfile,
-} from "state-management/selectors/user.selectors";
-
-import { combineLatest, fromEvent, Observable, Subscription } from "rxjs";
+import { Subscription } from "rxjs";
 
-import { map } from "rxjs/operators";
 
 @Component({
   selector: 'onedep',
@@ -36,54 +26,36 @@ import { map } from "rxjs/operators";
 export class OneDepComponent implements OnInit {
 
   appConfig = this.appConfigService.getConfig();
-  facility: string | null = null;
-  ingestManual: string | null = null;
-  gettingStarted: string | null = null;
-  shoppingCartEnabled = false;
-  helpMessages: HelpMessages;
-  editingAllowed = false;
-  editEnabled = false;
-
   dataset: Dataset | undefined;
+  cd$ = this.store.select(selectCurrentDataset);
   form: FormGroup;
-  attachments$ = this.store.select(selectCurrentAttachments);
-  datasetWithout$ = this.store.select(selectCurrentDatasetWithoutFileInfo);
-  userProfile$ = this.store.select(selectProfile);
-  isAdmin$ = this.store.select(selectIsAdmin);
-  accessGroups$: Observable<string[]> = this.userProfile$.pipe(
-    map((profile) => (profile ? profile.accessGroups : [])),
-  );
+  //attachments$ = this.store.select(selectCurrentAttachments);
+  // datasetWithout$ = this.store.select(selectCurrentDatasetWithoutFileInfo);
+  // userProfile$ = this.store.select(selectProfile);
+  // isAdmin$ = this.store.select(selectIsAdmin);
+  // accessGroups$: Observable<string[]> = this.userProfile$.pipe(
+  //   map((profile) => (profile ? profile.accessGroups : [])),
+  // );
   private subscriptions: Subscription[] = [];
 
   constructor(public appConfigService: AppConfigService,
-    private http: HttpClient,
-    private route: ActivatedRoute,
-    private router: Router,
     private store: Store,
-    private fb: FormBuilder) { }
+    // private http: HttpClient,
+    // private route: ActivatedRoute,
+    // private router: Router,
+    private fb: FormBuilder
+    ) { }
 
   
     ngOnInit() {
+      console.log('init OneDep')
       this.form = this.fb.group({
         datasetName: new FormControl("", [Validators.required]),
         description: new FormControl("", [Validators.required]),
         keywords: this.fb.array([]),
       });
-  
-      this.subscriptions.push(
-        this.store.select(selectCurrentDataset).subscribe((dataset) => {
-          this.dataset = dataset;
-          console.log(dataset);
-          if (this.dataset) {
-            combineLatest([this.accessGroups$, this.isAdmin$]).subscribe(
-              ([groups, isAdmin]) => {
-                this.editingAllowed =
-                  groups.indexOf(this.dataset.ownerGroup) !== -1 || isAdmin;
-              },
-            );
-          }
-        }),
-      );
+      this.store.select(selectCurrentDataset).subscribe((dataset) => {
+        this.dataset = dataset;
+      });
     }
-  
-}
\ No newline at end of file
+}

From 7dc30a3c9f72eac390558a8f4692eabfabbcdad3 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 21 Oct 2024 10:56:04 +0200
Subject: [PATCH 023/245] choose em method

---
 .../dataset-detail.component.html             |  15 +-
 .../dataset-detail.component.scss             |   5 +-
 src/app/datasets/onedep/onedep.component.html | 225 ++++++++++++++++--
 src/app/datasets/onedep/onedep.component.ts   |  43 ++--
 4 files changed, 244 insertions(+), 44 deletions(-)

diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail.component.html
index ba5b6e7f24..dd98f6e24f 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.html
@@ -12,27 +12,18 @@
         Jupyter Hub
       </a>
     </div>
-    <!-- <button
+    <button
           mat-raised-button
           id="onedepBtn"
           class="emexport-button"
           (click)="onOneDepClick()"
         >
           OneDep
-    </button> -->
-    <div fxFlex="auto">
-      <a
-      mat-raised-button
-      [routerLink]="['/datasets', dataset.pid, 'onedep']"
-      class="emexport-button"
-      >
-        OneDep
-      </a>
-    </div>
+    </button>
     <div fxFlex="auto">
       <a
         mat-raised-button
-        [routerLink]="['/empiar']"
+        [routerLink]="['/datasets', dataset.pid, 'onedep']"
         class="emexport-button"
       >
         EMPIAR
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.scss b/src/app/datasets/dataset-detail/dataset-detail.component.scss
index efb4f1bdce..4ceac42898 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.scss
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.scss
@@ -52,8 +52,9 @@ mat-card {
   margin: 1em 0 0 1em;
 }
 .emexport-button {
-  margin: 1em 0 0 3em;
-  background-color: hsla(185, 43%, 45%, 0.458);
+  margin: 1em 0 0 1em;
+  background-color: hsla(185, 43%, 45%, 0.858);
+  color: white;
 }
 .public-toggle {
   margin: 1em 1em 0 0;
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 822153b384..db0a8ec7a6 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -1,26 +1,221 @@
-<p>OneDep Component is working!</p>
 <ng-template [ngIf]="dataset">
     <div style="clear: both"></div>
     <div fxLayout="row" fxLayout.xs="column" *ngIf="dataset">
         <div fxFlex="80%">
-            <mat-card [formGroup]="form" data-cy="deposition">
-                <mat-card-header class="general-deposition">
+            <mat-card [formGroup]="form" data-cy="general-info">
+                <mat-card-header class="general-header">
                     <div mat-card-avatar class="section-icon">
                         <mat-icon> assignment </mat-icon>
                     </div>
-                    Begin deposition
+                    General information
                 </mat-card-header>
-                
+                <mat-card-content>
+                    <table>
+                        <tr>
+                            <th>Name</th>
+                            <td>{{ dataset.datasetName || "-" }}</td>
+                        </tr>
+                        <tr>
+                            <th>Description</th>
+                            <td>
+                                <span
+                                    [innerHTML]="dataset.description || '-' | linky"></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>PID</th>
+                            <td>
+                                {{ dataset.pid }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>Type</th>
+                            <td>{{dataset.type }}</td>
+                        </tr>
+                        <tr>
+                            <th>Creation Time</th>
+                            <td>{{ dataset.creationTime | date: "yyyy-MM-dd
+                                HH:mm" }}</td>
+                        </tr>
+                        <tr class="keywords-row">
+                            <th>Keywords</th>
+                            <mat-chip-set role="list" #keywordChips>
+                                <mat-chip role="listitem"
+                                    *ngFor="let keyword of dataset.keywords">
+                                    {{ keyword }}
+                                </mat-chip>
+                            </mat-chip-set>
+                        </tr>
+                    </table>
+                </mat-card-content>
+
             </mat-card>
-        </div>
+            <mat-card>
+                <mat-card-header class="creator-header">
+                    <div mat-card-avatar class="section-icon">
+                        <mat-icon> blur_linear </mat-icon>
+                    </div>
+                    Method Information:
+                </mat-card-header>
+
+                <mat-card-content>
+                    <table>
+                        <!-- Question 1: Electron Microscopy Method -->
+                        <th>Choose Electron Microscopy
+                            Method</th>
+                        <mat-form-field>
+                            <mat-label>experimental method</mat-label>
+                                <mat-select 
+                                    [(ngModel)]="emMethod" name="method">
+                                    <mat-option *ngFor="let method of methodsList" [value]="method.value">
+                                      {{ method.viewValue }}
+                                    </mat-option>
+                                  </mat-select>
+                        </mat-form-field>
+
+
+                        <!-- Question 2: PDB Deposition -->
+                        <tr>
+                            <th>Are you deposing coordinates with this
+                                submission (for PDB)?</th>
+                            <td>
+                                <mat-radio-group
+                                formControlName="deposingCoordinates">
+                                    <mat-radio-button 
+                                        name="deposingCoordinates"
+                                        value=true
+                                        checked
+                                    >
+                                    Yes
+                                    </mat-radio-button>
+                                    <mat-radio-button 
+                                        name="deposingCoordinates"
+                                        value=false
+                                    >
+                                    No
+                                </mat-radio-button>
+                                </mat-radio-group>
+                            </td>
+                        </tr>
+
+                        <!-- Conditional Question: Associated Map Deposited to EMDB -->
+                        <tr
+                            *ngIf="form.get('deposingCoordinates')?.value === 'true'">
+                            <th>Has an associated map been deposited to EMDB?
+                            </th>
+                            <td>
+                                <mat-radio-group
+                                    formControlName="associatedMap">
+                                    <mat-radio-button 
+                                        name="associatedMap"
+                                        value=true
+                                        checked
+                                    >
+                                    Yes
+                                    </mat-radio-button>
+                                    <mat-radio-button 
+                                        name="associatedMap"
+                                        value=false
+                                    >
+                                    No
+                                </mat-radio-button>
+                                </mat-radio-group>
+                            </td>
+                        </tr>
 
-        <!-- <div fxFlex="30%" *ngIf="attachments$ | async as attachments">
-            <ng-container *ngFor="let da of attachments">
-                <mat-card>
-                    <img mat-card-image src="{{ da.thumbnail }}" />
-                    <mat-card-actions>{{ da.caption }}</mat-card-actions>
-                </mat-card>
-            </ng-container>
-        </div> -->
+                        <!-- EMDB Identifier Field -->
+                        <tr *ngIf="form.get('associatedMap').value === true">
+                            <th>EMDB Identifier</th>
+                            <td>
+                                <mat-form-field class="full-width">
+                                    <mat-label>EMDB ID</mat-label>
+                                    <input matInput formControlName="emdbId" />
+                                </mat-form-field>
+                            </td>
+                        </tr>
+
+                        <!-- Final Question: Composite Map -->
+                        <tr>
+                            <th>Is this a composite map?</th>
+                            <td>
+                                <mat-radio-group formControlName="compositeMap">
+                                    <mat-radio-button 
+                                        name="compositeMap"
+                                        value=true
+                                    >
+                                    Yes
+                                </mat-radio-button>
+                                    <mat-radio-button 
+                                        name="compositeMap"
+                                        value=false 
+                                        checked
+                                    >
+                                    No
+                                </mat-radio-button>
+                                </mat-radio-group>
+                            </td>
+                        </tr>
+                    </table>
+                </mat-card-content>
+            </mat-card>
+            <mat-card>
+                <p> showValue()<p >
+            </mat-card>
+            <!-- <mat-card>
+                <mat-card-header class="scientific-header">
+                    <div mat-card-avatar class="section-icon">
+                        <mat-icon> science </mat-icon>
+                    </div>
+                    Scientific Metadata
+                </mat-card-header>
+                <mat-card-content>
+                    <ng-template [ngIf]="appConfig.tableSciDataEnabled"
+                        [ngIfElse]="jsonView">
+                        <ng-template #metadataView>
+                            <div [ngSwitch]="appConfig.metadataStructure">
+                                <tree-view *ngSwitchCase="'tree'"
+                                    [metadata]="dataset['scientificMetadata']"></tree-view>
+                                <metadata-view *ngSwitchDefault
+                                    [metadata]="dataset['scientificMetadata']">
+                                </metadata-view>
+                            </div>
+                        </ng-template>
+                        <mat-tab-group class="metadataGroup"
+                            *ngIf="editingAllowed; else metadataView">
+                            <mat-tab>
+                                <ng-template mat-tab-label>
+                                    <mat-icon> list </mat-icon> View
+                                </ng-template>
+                                <ng-container *ngTemplateOutlet="metadataView">
+                                </ng-container>
+                            </mat-tab>
+                            <mat-tab class="editTab" *ngIf="editingAllowed"
+                                [hidden]="!appConfig.editMetadataEnabled">
+                                <ng-template mat-tab-label>
+                                    <mat-icon> edit </mat-icon> Edit
+                                </ng-template>
+                                <div [ngSwitch]="appConfig.metadataStructure">
+                                    <tree-edit *ngSwitchCase="'tree'"
+                                        [metadata]="dataset['scientificMetadata']"
+                                        (save)="onSaveMetadata($event)"
+                                        (hasUnsavedChanges)="onHasUnsavedChanges($event)">
+                                    </tree-edit>
+                                    <metadata-edit *ngSwitchDefault
+                                        [metadata]="dataset['scientificMetadata']"
+                                        (save)="onSaveMetadata($event)">
+                                    </metadata-edit>
+                                </div>
+                            </mat-tab>
+                        </mat-tab-group>
+                    </ng-template>
+
+                    <ng-template #jsonView>
+                        <ngx-json-viewer [json]="dataset['scientificMetadata']"
+                            [expanded]="false"></ngx-json-viewer>
+                    </ng-template>
+                </mat-card-content>
+            </mat-card> -->
+
+        </div>
     </div>
-</ng-template>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index b1f0a3e4e7..76f308fe17 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, ChangeDetectorRef } from "@angular/core";
 import { AppConfigService, HelpMessages } from "app-config.service";
 import { HttpClient } from '@angular/common/http';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -16,7 +16,12 @@ import {
 } from "state-management/selectors/datasets.selectors";
 
 import { Subscription } from "rxjs";
+import { string } from "mathjs";
 
+interface EmMethod {
+  value: string;
+  viewValue:string;
+}
 
 @Component({
   selector: 'onedep',
@@ -27,35 +32,43 @@ export class OneDepComponent implements OnInit {
 
   appConfig = this.appConfigService.getConfig();
   dataset: Dataset | undefined;
-  cd$ = this.store.select(selectCurrentDataset);
   form: FormGroup;
-  //attachments$ = this.store.select(selectCurrentAttachments);
-  // datasetWithout$ = this.store.select(selectCurrentDatasetWithoutFileInfo);
-  // userProfile$ = this.store.select(selectProfile);
-  // isAdmin$ = this.store.select(selectIsAdmin);
-  // accessGroups$: Observable<string[]> = this.userProfile$.pipe(
-  //   map((profile) => (profile ? profile.accessGroups : [])),
-  // );
   private subscriptions: Subscription[] = [];
+  showAssociatedMapQuestion: boolean = false;
 
+  methodsList: EmMethod[] = [
+    {value:'helical', viewValue: 'Helical'},
+    {value:'single-particle', viewValue:'Single Particle'},
+    {value:'subtomogram-averaging',viewValue: 'Subtomogram Averaging'},
+    {value:'tomogram', viewValue: 'Tomogram'},
+    {value:'electron-cristallography', viewValue:'Electron Crystallography'},
+  ];
+  emMethod: string;
   constructor(public appConfigService: AppConfigService,
     private store: Store,
     // private http: HttpClient,
     // private route: ActivatedRoute,
     // private router: Router,
-    private fb: FormBuilder
+    private fb: FormBuilder,
     ) { }
 
   
     ngOnInit() {
-      console.log('init OneDep')
+      this.store.select(selectCurrentDataset).subscribe((dataset) => {
+        this.dataset = dataset;
+      });
       this.form = this.fb.group({
         datasetName: new FormControl("", [Validators.required]),
         description: new FormControl("", [Validators.required]),
         keywords: this.fb.array([]),
-      });
-      this.store.select(selectCurrentDataset).subscribe((dataset) => {
-        this.dataset = dataset;
-      });
+        deposingCoordinates:new FormControl(true),
+        associatedMap: new FormControl(false),
+        compositeMap:new FormControl(false), 
+        emdbId:new FormControl(false),
+
+      })
+    }
+    showValue(){
+      console.log(this.form['deposingCoordinates'])
     }
 }

From 3de3fef7e7c8dee05db258eccf47dfb836374450 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 31 Oct 2024 17:55:14 +0100
Subject: [PATCH 024/245] prepared dields for OneDep export

---
 .../dataset-detail.component.html             |  19 +-
 .../dataset-detail.component.ts               |   5 +
 src/app/datasets/onedep/onedep.component.html | 382 ++++++++++++------
 src/app/datasets/onedep/onedep.component.scss |  24 +-
 src/app/datasets/onedep/onedep.component.ts   |  87 +++-
 5 files changed, 387 insertions(+), 130 deletions(-)

diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail.component.html
index dd98f6e24f..c5c6d58335 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.html
@@ -16,19 +16,20 @@
           mat-raised-button
           id="onedepBtn"
           class="emexport-button"
+          *ngIf="hasOpenEMKeyword()"
           (click)="onOneDepClick()"
         >
           OneDep
     </button>
-    <div fxFlex="auto">
-      <a
-        mat-raised-button
-        [routerLink]="['/datasets', dataset.pid, 'onedep']"
-        class="emexport-button"
-      >
-        EMPIAR
-      </a>
-    </div>
+    <button
+          mat-raised-button
+          id="onedepBtn"
+          class="emexport-button"
+          *ngIf="hasOpenEMKeyword()"
+          (click)="onEMPIARclick()"
+        >
+          EMPIAR
+    </button>
     <div fxFlex="auto" *ngIf="editingAllowed">
       <mat-slide-toggle
         class="public-toggle"
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index c223b518be..3a3db36fdf 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -159,6 +159,7 @@ export class DatasetDetailComponent
         }
       }),
     );
+    console.log("the keywords:" , this.dataset.keywords);
   }
 
   onEditModeEnable() {
@@ -318,5 +319,9 @@ export class DatasetDetailComponent
   openAttachment(encoded: string) {
     this.attachmentService.openAttachment(encoded);
   }
+  onEMPIARclick(){
+    const id = encodeURIComponent(this.dataset.pid);
+    this.router.navigateByUrl("/datasets/" + id + "/empiar");
+  }
 
 }
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index db0a8ec7a6..7148f5362c 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -18,8 +18,7 @@
                         <tr>
                             <th>Description</th>
                             <td>
-                                <span
-                                    [innerHTML]="dataset.description || '-' | linky"></span>
+                                <span [innerHTML]="dataset.description || '-' | linky"></span>
                             </td>
                         </tr>
                         <tr>
@@ -40,8 +39,7 @@
                         <tr class="keywords-row">
                             <th>Keywords</th>
                             <mat-chip-set role="list" #keywordChips>
-                                <mat-chip role="listitem"
-                                    *ngFor="let keyword of dataset.keywords">
+                                <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
                                     {{ keyword }}
                                 </mat-chip>
                             </mat-chip-set>
@@ -50,7 +48,7 @@
                 </mat-card-content>
 
             </mat-card>
-            <mat-card>
+            <mat-card [formGroup]="form">
                 <mat-card-header class="creator-header">
                     <div mat-card-avatar class="section-icon">
                         <mat-icon> blur_linear </mat-icon>
@@ -61,73 +59,53 @@
                 <mat-card-content>
                     <table>
                         <!-- Question 1: Electron Microscopy Method -->
-                        <th>Choose Electron Microscopy
+                        <th class="questionnaire">Choose Electron Microscopy
                             Method</th>
-                        <mat-form-field>
+                        <mat-form-field class="method-name">
                             <mat-label>experimental method</mat-label>
-                                <mat-select 
-                                    [(ngModel)]="emMethod" name="method">
-                                    <mat-option *ngFor="let method of methodsList" [value]="method.value">
-                                      {{ method.viewValue }}
-                                    </mat-option>
-                                  </mat-select>
+                            <mat-select formControlName="emMethod" name="method">
+                                <mat-option *ngFor="let method of methodsList" [value]="method.value">
+                                    {{ method.viewValue }}
+                                </mat-option>
+                            </mat-select>
                         </mat-form-field>
 
 
                         <!-- Question 2: PDB Deposition -->
                         <tr>
-                            <th>Are you deposing coordinates with this
-                                submission (for PDB)?</th>
+                            <th class="questionnaire">Are you deposing coordinates with this
+                                submission? (for PDB)</th>
                             <td>
-                                <mat-radio-group
-                                formControlName="deposingCoordinates">
-                                    <mat-radio-button 
-                                        name="deposingCoordinates"
-                                        value=true
-                                        checked
-                                    >
-                                    Yes
+                                <mat-radio-group formControlName="deposingCoordinates">
+                                    <mat-radio-button name="deposingCoordinates" value=true checked>
+                                        Yes
+                                    </mat-radio-button>
+                                    <mat-radio-button name="deposingCoordinates" value=false>
+                                        No
                                     </mat-radio-button>
-                                    <mat-radio-button 
-                                        name="deposingCoordinates"
-                                        value=false
-                                    >
-                                    No
-                                </mat-radio-button>
                                 </mat-radio-group>
                             </td>
                         </tr>
-
-                        <!-- Conditional Question: Associated Map Deposited to EMDB -->
-                        <tr
-                            *ngIf="form.get('deposingCoordinates')?.value === 'true'">
+                        <tr *ngIf="form.get('deposingCoordinates')?.value === 'true'">
                             <th>Has an associated map been deposited to EMDB?
                             </th>
                             <td>
-                                <mat-radio-group
-                                    formControlName="associatedMap">
-                                    <mat-radio-button 
-                                        name="associatedMap"
-                                        value=true
-                                        checked
-                                    >
-                                    Yes
+                                <mat-radio-group formControlName="associatedMap">
+                                    <mat-radio-button name="associatedMap" value=true checked>
+                                        Yes
+                                    </mat-radio-button>
+                                    <mat-radio-button name="associatedMap" value=false>
+                                        No
                                     </mat-radio-button>
-                                    <mat-radio-button 
-                                        name="associatedMap"
-                                        value=false
-                                    >
-                                    No
-                                </mat-radio-button>
                                 </mat-radio-group>
                             </td>
                         </tr>
 
                         <!-- EMDB Identifier Field -->
-                        <tr *ngIf="form.get('associatedMap').value === true">
+                        <tr *ngIf="form.get('associatedMap').value === 'true'">
                             <th>EMDB Identifier</th>
                             <td>
-                                <mat-form-field class="full-width">
+                                <mat-form-field class="EMDB-ID">
                                     <mat-label>EMDB ID</mat-label>
                                     <input matInput formControlName="emdbId" />
                                 </mat-form-field>
@@ -136,85 +114,263 @@
 
                         <!-- Final Question: Composite Map -->
                         <tr>
-                            <th>Is this a composite map?</th>
+                            <th class="questionnaire">Is this a composite map?</th>
                             <td>
                                 <mat-radio-group formControlName="compositeMap">
-                                    <mat-radio-button 
-                                        name="compositeMap"
-                                        value=true
-                                    >
-                                    Yes
-                                </mat-radio-button>
-                                    <mat-radio-button 
-                                        name="compositeMap"
-                                        value=false 
-                                        checked
-                                    >
-                                    No
-                                </mat-radio-button>
+                                    <mat-radio-button name="compositeMap" value=true>
+                                        Yes
+                                    </mat-radio-button>
+                                    <mat-radio-button name="compositeMap" value=false checked>
+                                        No
+                                    </mat-radio-button>
                                 </mat-radio-group>
                             </td>
                         </tr>
                     </table>
                 </mat-card-content>
             </mat-card>
+
             <mat-card>
-                <p> showValue()<p >
-            </mat-card>
-            <!-- <mat-card>
-                <mat-card-header class="scientific-header">
+                <mat-card-header class="file-header">
                     <div mat-card-avatar class="section-icon">
-                        <mat-icon> science </mat-icon>
+                        <mat-icon> folder </mat-icon>
                     </div>
-                    Scientific Metadata
+                    Choose files for deposition
                 </mat-card-header>
                 <mat-card-content>
-                    <ng-template [ngIf]="appConfig.tableSciDataEnabled"
-                        [ngIfElse]="jsonView">
-                        <ng-template #metadataView>
-                            <div [ngSwitch]="appConfig.metadataStructure">
-                                <tree-view *ngSwitchCase="'tree'"
-                                    [metadata]="dataset['scientificMetadata']"></tree-view>
-                                <metadata-view *ngSwitchDefault
-                                    [metadata]="dataset['scientificMetadata']">
-                                </metadata-view>
-                            </div>
-                        </ng-template>
-                        <mat-tab-group class="metadataGroup"
-                            *ngIf="editingAllowed; else metadataView">
-                            <mat-tab>
-                                <ng-template mat-tab-label>
-                                    <mat-icon> list </mat-icon> View
-                                </ng-template>
-                                <ng-container *ngTemplateOutlet="metadataView">
-                                </ng-container>
-                            </mat-tab>
-                            <mat-tab class="editTab" *ngIf="editingAllowed"
-                                [hidden]="!appConfig.editMetadataEnabled">
-                                <ng-template mat-tab-label>
-                                    <mat-icon> edit </mat-icon> Edit
-                                </ng-template>
-                                <div [ngSwitch]="appConfig.metadataStructure">
-                                    <tree-edit *ngSwitchCase="'tree'"
-                                        [metadata]="dataset['scientificMetadata']"
-                                        (save)="onSaveMetadata($event)"
-                                        (hasUnsavedChanges)="onHasUnsavedChanges($event)">
-                                    </tree-edit>
-                                    <metadata-edit *ngSwitchDefault
-                                        [metadata]="dataset['scientificMetadata']"
-                                        (save)="onSaveMetadata($event)">
-                                    </metadata-edit>
+                    <table>
+                        <!-- ADD THE MAIN MAP -->
+                        <tr>
+                            <th class="file-types">Main Map</th>
+                            <td>
+                                <div style="display: flex; align-items: center;">
+
+
+                                    <button class="fileChooser" mat-raised-button color="primary"
+                                        (click)="fileInput1.click()">
+                                        Choose File
+                                    </button>
+
+                                    <div *ngIf="selectedFile['pathToMainMap']">
+                                        <mat-icon>attach_file</mat-icon>
+                                    </div>
+
+                                    <input type="file" #fileInput1 (change)="onFileSelected($event, 'pathToMainMap')"
+                                        style="display: none;" />
+
+                                    <!-- Selected file name (shown only when a file is selected) -->
+                                    <div *ngIf="selectedFile['pathToMainMap']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToMainMap'].name }}
+                                        </p>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                        <!-- ADD THE HALF MAP 1 -->
+                        <tr>
+                            <th class="file-types">Half Map (1)</th>
+                            <td>
+                                <div style="display: flex; align-items: center;">
+
+
+                                    <button class="fileChooser" mat-raised-button color="primary"
+                                        (click)="fileInput2.click()">
+                                        Choose File
+                                    </button>
+
+                                    <div *ngIf="selectedFile['pathToHalfMap1']">
+                                        <mat-icon>attach_file</mat-icon>
+                                    </div>
+
+                                    <input type="file" #fileInput2 (change)="onFileSelected($event, 'pathToHalfMap1')"
+                                        style="display: none;" />
+
+                                    <!-- Selected file name (shown only when a file is selected) -->
+                                    <div *ngIf="selectedFile['pathToHalfMap1']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToHalfMap1'].name }}
+                                        </p>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                        <!-- ADD THE HALF MAP 2 -->
+                        <tr>
+                            <th class="file-types">Half Map (2)</th>
+                            <td>
+                                <div style="display: flex; align-items: center;">
+
+
+                                    <button class="fileChooser" mat-raised-button color="primary"
+                                        (click)="fileInput3.click()">
+                                        Choose File
+                                    </button>
+
+                                    <div *ngIf="selectedFile['pathToHalfMap2']">
+                                        <mat-icon>attach_file</mat-icon>
+                                    </div>
+
+                                    <input type="file" #fileInput3 (change)="onFileSelected($event, 'pathToHalfMap2')"
+                                        style="display: none;" />
+
+                                    <!-- Selected file name (shown only when a file is selected) -->
+                                    <div *ngIf="selectedFile['pathToHalfMap2']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToHalfMap2'].name }}
+                                        </p>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <!-- ADD THE MASK MAP  -->
+                        <tr>
+                            <th class="file-types">Mask Map </th>
+                            <td>
+                                <div style="display: flex; align-items: center;">
+
+
+                                    <button class="fileChooser" mat-raised-button color="primary"
+                                        (click)="fileInput4.click()">
+                                        Choose File
+                                    </button>
+
+                                    <div *ngIf="selectedFile['pathToHalfMask']">
+                                        <mat-icon>attach_file</mat-icon>
+                                    </div>
+
+                                    <input type="file" #fileInput4 (change)="onFileSelected($event, 'pathToHalfMask')"
+                                        style="display: none;" />
+
+                                    <!-- Selected file name (shown only when a file is selected) -->
+                                    <div *ngIf="selectedFile['pathToHalfMask']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToHalfMask'].name }}
+                                        </p>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                        <!-- ADD THE ADDITIONAL MAP  -->
+                        <tr>
+                            <th class="file-types">Additional Map </th>
+                            <td>
+                                <div style="display: flex; align-items: center;">
+
+
+                                    <button class="fileChooser" mat-raised-button color="primary"
+                                        (click)="fileInput5.click()">
+                                        Choose File
+                                    </button>
+
+                                    <div *ngIf="selectedFile['pathToAdditionalMap']">
+                                        <mat-icon>attach_file</mat-icon>
+                                    </div>
+
+                                    <input type="file" #fileInput5
+                                        (change)="onFileSelected($event, 'pathToAdditionalMap')"
+                                        style="display: none;" />
+
+                                    <!-- Selected file name (shown only when a file is selected) -->
+                                    <div *ngIf="selectedFile['pathToAdditionalMap']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToAdditionalMap'].name
+                                            }}</p>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <!-- ADD THE COORDINATES FILE  -->
+                        <tr *ngIf="form.get('deposingCoordinates')?.value === 'true'">
+                            <th class="file-types">Coordinates</th>
+                            <td>
+                                <div style="display: flex; align-items: center;">
+
+
+                                    <button class="fileChooser" mat-raised-button color="primary"
+                                        (click)="fileInput6.click()">
+                                        Choose File
+                                    </button>
+
+                                    <div *ngIf="selectedFile['pathToCoordinates']">
+                                        <mat-icon>attach_file</mat-icon>
+                                    </div>
+
+                                    <input type="file" #fileInput6
+                                        (change)="onFileSelected($event, 'pathToCoordinates')" style="display: none;" />
+
+                                    <!-- Selected file name (shown only when a file is selected) -->
+                                    <div *ngIf="selectedFile['pathToCoordinates']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToCoordinates'].name
+                                            }}</p>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <!-- ADD THE IMAGE  -->
+                        <tr>
+                            <th class="file-types"> Public Image </th>
+                            <td>
+                                <div style="display: flex; align-items: center;">
+
+
+                                    <button class="fileChooser" mat-raised-button color="primary"
+                                        (click)="fileInput7.click()">
+                                        Choose File
+                                    </button>
+
+                                    <div *ngIf="selectedFile['pathToImage']">
+                                        <mat-icon>attach_file</mat-icon>
+                                    </div>
+
+                                    <input type="file" #fileInput7 (change)="onFileSelected($event, 'pathToImage')"
+                                        style="display: none;" />
+
+                                    <!-- Selected file name (shown only when a file is selected) -->
+                                    <div *ngIf="selectedFile['pathToImage']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToImage'].name }}</p>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <!-- ADD THE FCS CURVE   -->
+                        <tr>
+                            <th class="file-types">FSC-XML</th>
+                            <td>
+                                <div style="display: flex; align-items: center;">
+
+
+                                    <button class="fileChooser" mat-raised-button color="primary"
+                                        (click)="fileInput8.click()">
+                                        Choose File
+                                    </button>
+
+                                    <div *ngIf="selectedFile['pathToFSC']">
+                                        <mat-icon>attach_file</mat-icon>
+                                    </div>
+
+                                    <input type="file" #fileInput8 (change)="onFileSelected($event, 'pathToFSC')"
+                                        style="display: none;" />
+
+                                    <!-- Selected file name (shown only when a file is selected) -->
+                                    <div *ngIf="selectedFile['pathToFSC']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToFSC'].name }}</p>
+                                    </div>
                                 </div>
-                            </mat-tab>
-                        </mat-tab-group>
-                    </ng-template>
-
-                    <ng-template #jsonView>
-                        <ngx-json-viewer [json]="dataset['scientificMetadata']"
-                            [expanded]="false"></ngx-json-viewer>
-                    </ng-template>
+                            </td>
+                        </tr>
+                        <!-- UPLOAD FILES DONE -->
+
+                        <button class="submitDep" mat-raised-button color="primary" (click)="connectToDepositionBackend()">
+                            connect
+                        </button>
+                        <button class="submitDep" mat-raised-button color="primary" (click)="onDepositClick()">
+                            Start Deposition
+                        </button>
+
+                    </table>
                 </mat-card-content>
-            </mat-card> -->
+            </mat-card>
+
 
         </div>
     </div>
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index b862d7d649..71d65ed58e 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -12,6 +12,9 @@ mat-card {
   
     table {
       th {
+        .questionnaire{
+          min-width: 20rem;
+        }
         min-width: 10rem;
         padding-right: 0.5rem;
         text-align: left;
@@ -30,10 +33,29 @@ mat-card {
         }
   
       }
-  
+      .EMDB-ID{
+        width: 15%;
+      }
+      .method-name{
+        width: 25%;
+      }
+      .file-types{
+        width:10%;
+      }
       .full-width {
         width: 100%;
       }
+      .fileChooser{
+        margin-left: 0px;
+      }
+      .fileName {
+        margin-left: 10px; 
+        white-space: nowrap; 
+      }
+      .submitDep{
+        background-color: blueviolet;
+      }
     }
+    
   }
  
\ No newline at end of file
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 76f308fe17..16434c83f5 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -36,6 +36,14 @@ export class OneDepComponent implements OnInit {
   private subscriptions: Subscription[] = [];
   showAssociatedMapQuestion: boolean = false;
 
+  connectedDepositionBackend: string = '';
+  connectedDepositionBackendVersion: string = '';
+  connectingToDepositionBackend: boolean = false;
+  lastUsedDepositionBackends: string[] = [];
+  forwardDepositionBackend: string = '';
+  errorMessage: string = '';
+
+
   methodsList: EmMethod[] = [
     {value:'helical', viewValue: 'Helical'},
     {value:'single-particle', viewValue:'Single Particle'},
@@ -43,12 +51,15 @@ export class OneDepComponent implements OnInit {
     {value:'tomogram', viewValue: 'Tomogram'},
     {value:'electron-cristallography', viewValue:'Electron Crystallography'},
   ];
-  emMethod: string;
+
+  selectedFile: { [key: string]: File | null } = {}; 
+
+
   constructor(public appConfigService: AppConfigService,
     private store: Store,
-    // private http: HttpClient,
-    // private route: ActivatedRoute,
-    // private router: Router,
+    private http: HttpClient,
+    private route: ActivatedRoute,
+    private router: Router,
     private fb: FormBuilder,
     ) { }
 
@@ -61,14 +72,76 @@ export class OneDepComponent implements OnInit {
         datasetName: new FormControl("", [Validators.required]),
         description: new FormControl("", [Validators.required]),
         keywords: this.fb.array([]),
+        emMethod: new FormControl(""),
         deposingCoordinates:new FormControl(true),
         associatedMap: new FormControl(false),
         compositeMap:new FormControl(false), 
-        emdbId:new FormControl(false),
+        emdbId:new FormControl(""),
 
+        pathToMainMap: new FormControl(""), 
+        pathToHalfMap1: new FormControl(""), 
+        pathToHalfMap2: new FormControl(""), 
+        pathToMask: new FormControl(""), 
+        pathToAdditionalMap: new FormControl(""), 
+        pathToCoordinates: new FormControl(""), 
+        pathToImage: new FormControl(""), 
+        pathToCif: new FormControl(""), 
+        pathToFSC: new FormControl(""), 
       })
+
+      this.connectingToDepositionBackend = true;
+      // Get the GET parameter 'backendUrl' from the URL
+      // this.route.queryParams.subscribe(params => {
+      //   const backendUrl = params['backendUrl'];
+      //   if (backendUrl) {
+      //     this.connectToDepositionBackend(backendUrl);
+      //   }
+      //   else {
+      //     this.connectingToDepositionBackend = false;
+      //   }
+      // });
+    }
+
+    connectToDepositionBackend(): boolean {
+      var DepositionBackendUrl = "http://localhost:8080"
+      let DepositionBackendUrlCleaned = DepositionBackendUrl.slice();
+      // Check if last symbol is a slash and add version endpoint
+      if (!DepositionBackendUrlCleaned.endsWith('/')) {
+        DepositionBackendUrlCleaned += '/';
+      }
+  
+      let DepositionBackendUrlVersion = DepositionBackendUrlCleaned;
+  
+      // Try to connect to the facility backend/version to check if it is available
+      console.log('Connecting to facility backend: ' + DepositionBackendUrlVersion);
+      this.http.get(DepositionBackendUrlVersion).subscribe(
+        response => {
+          console.log('Connected to facility backend', response);
+          // If the connection is successful, store the connected facility backend URL
+          this.connectedDepositionBackend = DepositionBackendUrlCleaned;
+          this.connectingToDepositionBackend = false;
+          this.connectedDepositionBackendVersion = response['version'];
+        },
+        error => {
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+          console.error('Request failed', error);
+          this.connectedDepositionBackend = '';
+          this.connectingToDepositionBackend = false;
+        }
+      );
+  
+      return true;
+    }
+
+    onFileSelected(event: Event, controlName: string) {
+      const input = event.target as HTMLInputElement;
+      if (input.files && input.files.length > 0) {
+        this.selectedFile[controlName] = input.files[0];
+        this.form.get(controlName)?.setValue(this.selectedFile[controlName].name);
+      }
     }
-    showValue(){
-      console.log(this.form['deposingCoordinates'])
+    onDepositClick(){
+      const formData = this.form.value;
     }
+    
 }

From 94bdd298f63b24c51d453018b84322fa0f1caeca Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 1 Nov 2024 16:34:27 +0100
Subject: [PATCH 025/245] connect to OneDep backend when going to onedep

---
 .../dataset-detail.component.ts               | 45 +++++++++++++++++
 src/app/datasets/onedep/onedep.component.html |  4 +-
 src/app/datasets/onedep/onedep.component.ts   | 48 +++++--------------
 3 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index 3a3db36fdf..30f76fa823 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -7,6 +7,7 @@ import { MatDialog } from "@angular/material/dialog";
 import { DialogComponent } from "shared/modules/dialog/dialog.component";
 import { combineLatest, fromEvent, Observable, Subscription } from "rxjs";
 import { Store } from "@ngrx/store";
+import { HttpClient } from '@angular/common/http';
 
 import { showMessageAction } from "state-management/actions/user.actions";
 import {
@@ -90,6 +91,14 @@ export class DatasetDetailComponent
   editEnabled = false;
   show = false;
 
+
+  connectedDepositionBackend: string = '';
+  connectedDepositionBackendVersion: string = '';
+  connectingToDepositionBackend: boolean = false;
+  lastUsedDepositionBackends: string[] = [];
+  forwardDepositionBackend: string = '';
+  errorMessage: string = '';
+
   @Output() emClick = new EventEmitter<Dataset>();
 
   readonly separatorKeyCodes: number[] = [ENTER, COMMA, SPACE];
@@ -100,11 +109,14 @@ export class DatasetDetailComponent
     private attachmentService: AttachmentService,
     public dialog: MatDialog,
     private store: Store,
+    private http: HttpClient,
     private router: Router,
     private fb: FormBuilder,
   ) {}
 
   ngOnInit() {
+    this.connectingToDepositionBackend = true;
+
     this.form = this.fb.group({
       datasetName: new FormControl("", [Validators.required]),
       description: new FormControl("", [Validators.required]),
@@ -324,4 +336,37 @@ export class DatasetDetailComponent
     this.router.navigateByUrl("/datasets/" + id + "/empiar");
   }
 
+
+  connectToDepositionBackend(): boolean {
+    var DepositionBackendUrl = "http://localhost:8080"
+    let DepositionBackendUrlCleaned = DepositionBackendUrl.slice();
+    // Check if last symbol is a slash and add version endpoint
+    if (!DepositionBackendUrlCleaned.endsWith('/')) {
+      DepositionBackendUrlCleaned += '/';
+    }
+
+    let DepositionBackendUrlVersion = DepositionBackendUrlCleaned;
+
+    // Try to connect to the facility backend/version to check if it is available
+    console.log('Connecting to facility backend: ' + DepositionBackendUrlVersion);
+    this.http.get(DepositionBackendUrlVersion).subscribe(
+      response => {
+        console.log('Connected to facility backend', response);
+        // If the connection is successful, store the connected facility backend URL
+        this.connectedDepositionBackend = DepositionBackendUrlCleaned;
+        this.connectingToDepositionBackend = false;
+        this.connectedDepositionBackendVersion = response['version'];
+      },
+      error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+        console.error('Request failed', error);
+        this.connectedDepositionBackend = '';
+        this.connectingToDepositionBackend = false;
+      }
+    );
+
+    return true;
+  }
+
 }
+
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 7148f5362c..62bf4c1668 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -360,9 +360,7 @@
                         </tr>
                         <!-- UPLOAD FILES DONE -->
 
-                        <button class="submitDep" mat-raised-button color="primary" (click)="connectToDepositionBackend()">
-                            connect
-                        </button>
+                 
                         <button class="submitDep" mat-raised-button color="primary" (click)="onDepositClick()">
                             Start Deposition
                         </button>
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 16434c83f5..bb9f31e052 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -36,12 +36,12 @@ export class OneDepComponent implements OnInit {
   private subscriptions: Subscription[] = [];
   showAssociatedMapQuestion: boolean = false;
 
-  connectedDepositionBackend: string = '';
-  connectedDepositionBackendVersion: string = '';
-  connectingToDepositionBackend: boolean = false;
-  lastUsedDepositionBackends: string[] = [];
-  forwardDepositionBackend: string = '';
-  errorMessage: string = '';
+  // connectedDepositionBackend: string = '';
+  // connectedDepositionBackendVersion: string = '';
+  // connectingToDepositionBackend: boolean = false;
+  // lastUsedDepositionBackends: string[] = [];
+  // forwardDepositionBackend: string = '';
+  // errorMessage: string = '';
 
 
   methodsList: EmMethod[] = [
@@ -89,7 +89,7 @@ export class OneDepComponent implements OnInit {
         pathToFSC: new FormControl(""), 
       })
 
-      this.connectingToDepositionBackend = true;
+      // this.connectingToDepositionBackend = true;
       // Get the GET parameter 'backendUrl' from the URL
       // this.route.queryParams.subscribe(params => {
       //   const backendUrl = params['backendUrl'];
@@ -102,36 +102,6 @@ export class OneDepComponent implements OnInit {
       // });
     }
 
-    connectToDepositionBackend(): boolean {
-      var DepositionBackendUrl = "http://localhost:8080"
-      let DepositionBackendUrlCleaned = DepositionBackendUrl.slice();
-      // Check if last symbol is a slash and add version endpoint
-      if (!DepositionBackendUrlCleaned.endsWith('/')) {
-        DepositionBackendUrlCleaned += '/';
-      }
-  
-      let DepositionBackendUrlVersion = DepositionBackendUrlCleaned;
-  
-      // Try to connect to the facility backend/version to check if it is available
-      console.log('Connecting to facility backend: ' + DepositionBackendUrlVersion);
-      this.http.get(DepositionBackendUrlVersion).subscribe(
-        response => {
-          console.log('Connected to facility backend', response);
-          // If the connection is successful, store the connected facility backend URL
-          this.connectedDepositionBackend = DepositionBackendUrlCleaned;
-          this.connectingToDepositionBackend = false;
-          this.connectedDepositionBackendVersion = response['version'];
-        },
-        error => {
-          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-          console.error('Request failed', error);
-          this.connectedDepositionBackend = '';
-          this.connectingToDepositionBackend = false;
-        }
-      );
-  
-      return true;
-    }
 
     onFileSelected(event: Event, controlName: string) {
       const input = event.target as HTMLInputElement;
@@ -142,6 +112,10 @@ export class OneDepComponent implements OnInit {
     }
     onDepositClick(){
       const formData = this.form.value;
+      // need to properly catch the dataset details
+      console.log(this.dataset)
+      //return this.http.post(this.backendUrl, formData);
+      
     }
     
 }

From f3a2ed404461104fbcdb6aaadfa02d46695544a0 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 4 Nov 2024 17:56:56 +0100
Subject: [PATCH 026/245] adding restrictions to deposition types

---
 .../dataset-detail.component.ts               |  14 +-
 src/app/datasets/onedep/onedep.component.html |  66 +++----
 src/app/datasets/onedep/onedep.component.ts   | 184 ++++++++++--------
 src/app/datasets/onedep/types/methods.enum.ts |  39 ++++
 4 files changed, 185 insertions(+), 118 deletions(-)
 create mode 100644 src/app/datasets/onedep/types/methods.enum.ts

diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index 30f76fa823..67f706479c 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -66,8 +66,7 @@ import { AttachmentService } from "shared/services/attachment.service";
   standalone: false,
 })
 export class DatasetDetailComponent
-  implements OnInit, OnDestroy, EditableComponent
-{
+  implements OnInit, OnDestroy, EditableComponent {
   private subscriptions: Subscription[] = [];
   private _hasUnsavedChanges = false;
   form: FormGroup;
@@ -112,7 +111,7 @@ export class DatasetDetailComponent
     private http: HttpClient,
     private router: Router,
     private fb: FormBuilder,
-  ) {}
+  ) { }
 
   ngOnInit() {
     this.connectingToDepositionBackend = true;
@@ -171,7 +170,6 @@ export class DatasetDetailComponent
         }
       }),
     );
-    console.log("the keywords:" , this.dataset.keywords);
   }
 
   onEditModeEnable() {
@@ -331,7 +329,7 @@ export class DatasetDetailComponent
   openAttachment(encoded: string) {
     this.attachmentService.openAttachment(encoded);
   }
-  onEMPIARclick(){
+  onEMPIARclick() {
     const id = encodeURIComponent(this.dataset.pid);
     this.router.navigateByUrl("/datasets/" + id + "/empiar");
   }
@@ -345,13 +343,13 @@ export class DatasetDetailComponent
       DepositionBackendUrlCleaned += '/';
     }
 
-    let DepositionBackendUrlVersion = DepositionBackendUrlCleaned;
+    let DepositionBackendUrlVersion = DepositionBackendUrlCleaned + 'version';
 
     // Try to connect to the facility backend/version to check if it is available
-    console.log('Connecting to facility backend: ' + DepositionBackendUrlVersion);
+    console.log('Connecting to OneDep backend: ' + DepositionBackendUrlVersion);
     this.http.get(DepositionBackendUrlVersion).subscribe(
       response => {
-        console.log('Connected to facility backend', response);
+        console.log('Connected to OneDep backend', response);
         // If the connection is successful, store the connected facility backend URL
         this.connectedDepositionBackend = DepositionBackendUrlCleaned;
         this.connectingToDepositionBackend = false;
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 62bf4c1668..e784b686a7 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -64,7 +64,7 @@
                         <mat-form-field class="method-name">
                             <mat-label>experimental method</mat-label>
                             <mat-select formControlName="emMethod" name="method">
-                                <mat-option *ngFor="let method of methodsList" [value]="method.value">
+                                <mat-option *ngFor="let method of methodsList" [value]="experiment[method.value]">
                                     {{ method.viewValue }}
                                 </mat-option>
                             </mat-select>
@@ -151,16 +151,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['pathToMainMap']">
+                                    <div *ngIf="selectedFile['mainMap']">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput1 (change)="onFileSelected($event, 'pathToMainMap')"
+                                    <input type="file" #fileInput1 (change)="onFileSelected($event, 'mainMap')"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['pathToMainMap']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToMainMap'].name }}
+                                    <div *ngIf="selectedFile['mainMap']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['mainMap'].name }}
                                         </p>
                                     </div>
                                 </div>
@@ -178,16 +178,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['pathToHalfMap1']">
+                                    <div *ngIf="selectedFile['halfMap1']">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput2 (change)="onFileSelected($event, 'pathToHalfMap1')"
+                                    <input type="file" #fileInput2 (change)="onFileSelected($event, 'halfMap1')"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['pathToHalfMap1']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToHalfMap1'].name }}
+                                    <div *ngIf="selectedFile['halfMap1']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['halfMap1'].name }}
                                         </p>
                                     </div>
                                 </div>
@@ -205,16 +205,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['pathToHalfMap2']">
+                                    <div *ngIf="selectedFile['halfMap2']">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput3 (change)="onFileSelected($event, 'pathToHalfMap2')"
+                                    <input type="file" #fileInput3 (change)="onFileSelected($event, 'halfMap2')"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['pathToHalfMap2']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToHalfMap2'].name }}
+                                    <div *ngIf="selectedFile['halfMap2']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['halfMap2'].name }}
                                         </p>
                                     </div>
                                 </div>
@@ -233,16 +233,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['pathToHalfMask']">
+                                    <div *ngIf="selectedFile['mask']">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput4 (change)="onFileSelected($event, 'pathToHalfMask')"
+                                    <input type="file" #fileInput4 (change)="onFileSelected($event, 'mask')"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['pathToHalfMask']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToHalfMask'].name }}
+                                    <div *ngIf="selectedFile['mask']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['mask'].name }}
                                         </p>
                                     </div>
                                 </div>
@@ -260,17 +260,17 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['pathToAdditionalMap']">
+                                    <div *ngIf="selectedFile['addMap']">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
                                     <input type="file" #fileInput5
-                                        (change)="onFileSelected($event, 'pathToAdditionalMap')"
+                                        (change)="onFileSelected($event, 'addMap')"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['pathToAdditionalMap']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToAdditionalMap'].name
+                                    <div *ngIf="selectedFile['addMap']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['addMap'].name
                                             }}</p>
                                     </div>
                                 </div>
@@ -289,16 +289,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['pathToCoordinates']">
+                                    <div *ngIf="selectedFile['coordinates']">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
                                     <input type="file" #fileInput6
-                                        (change)="onFileSelected($event, 'pathToCoordinates')" style="display: none;" />
+                                        (change)="onFileSelected($event, 'coordinates')" style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['pathToCoordinates']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToCoordinates'].name
+                                    <div *ngIf="selectedFile['coordinates']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['coordinates'].name
                                             }}</p>
                                     </div>
                                 </div>
@@ -317,16 +317,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['pathToImage']">
+                                    <div *ngIf="selectedFile['image']">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput7 (change)="onFileSelected($event, 'pathToImage')"
+                                    <input type="file" #fileInput7 (change)="onFileSelected($event, 'image')"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['pathToImage']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToImage'].name }}</p>
+                                    <div *ngIf="selectedFile['image']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['image'].name }}</p>
                                     </div>
                                 </div>
                             </td>
@@ -344,16 +344,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['pathToFSC']">
+                                    <div *ngIf="selectedFile['fsc']">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput8 (change)="onFileSelected($event, 'pathToFSC')"
+                                    <input type="file" #fileInput8 (change)="onFileSelected($event, 'fsc')"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['pathToFSC']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['pathToFSC'].name }}</p>
+                                    <div *ngIf="selectedFile['fsc']" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile['fsc'].name }}</p>
                                     </div>
                                 </div>
                             </td>
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index bb9f31e052..1cbb0ed074 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -14,14 +14,10 @@ import {
 
   selectCurrentDataset,
 } from "state-management/selectors/datasets.selectors";
-
+import { MethodsList, Experiment, OneDepFile } from "./types/methods.enum"
 import { Subscription } from "rxjs";
 import { string } from "mathjs";
 
-interface EmMethod {
-  value: string;
-  viewValue:string;
-}
 
 @Component({
   selector: 'onedep',
@@ -35,24 +31,9 @@ export class OneDepComponent implements OnInit {
   form: FormGroup;
   private subscriptions: Subscription[] = [];
   showAssociatedMapQuestion: boolean = false;
-
-  // connectedDepositionBackend: string = '';
-  // connectedDepositionBackendVersion: string = '';
-  // connectingToDepositionBackend: boolean = false;
-  // lastUsedDepositionBackends: string[] = [];
-  // forwardDepositionBackend: string = '';
-  // errorMessage: string = '';
-
-
-  methodsList: EmMethod[] = [
-    {value:'helical', viewValue: 'Helical'},
-    {value:'single-particle', viewValue:'Single Particle'},
-    {value:'subtomogram-averaging',viewValue: 'Subtomogram Averaging'},
-    {value:'tomogram', viewValue: 'Tomogram'},
-    {value:'electron-cristallography', viewValue:'Electron Crystallography'},
-  ];
-
-  selectedFile: { [key: string]: File | null } = {}; 
+  methodsList = MethodsList;
+  experiment = Experiment;
+  selectedFile: { [key: string]: File | null } = {};
 
 
   constructor(public appConfigService: AppConfigService,
@@ -61,61 +42,110 @@ export class OneDepComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private fb: FormBuilder,
-    ) { }
-
-  
-    ngOnInit() {
-      this.store.select(selectCurrentDataset).subscribe((dataset) => {
-        this.dataset = dataset;
+  ) { }
+
+
+  ngOnInit() {
+    this.store.select(selectCurrentDataset).subscribe((dataset) => {
+      this.dataset = dataset;
+    });
+    this.form = this.fb.group({
+      datasetName: this.dataset.datasetName,
+      description: this.dataset.description,
+      keywords: this.fb.array(this.dataset.keywords),
+      metadata: this.dataset.scientificMetadata,
+      emMethod: new FormControl(""),
+      deposingCoordinates: new FormControl(true),
+      associatedMap: new FormControl(false),
+      compositeMap: new FormControl(false),
+      emdbId: new FormControl(""),
+
+      mainMap: {
+        name: "",
+        type: "vo-map",
+        pathToFile: "",
+        contour: 0.0,
+        details: "",
+      },
+      halfMap1: {
+        name: "",
+        type: "half-map",
+        pathToFile: "",
+        contour: 0.0,
+        details: "",
+      },
+      halfMap2: {
+        name: "",
+        type: "half-map",
+        pathToFile: "",
+        contour: 0.0,
+        details: "",
+      },
+      mask: {
+        name: "",
+        type: "mask-map",
+        pathToFile: "",
+        contour: 0.0,
+        details: "",
+      },
+      addMap: {
+        name: "",
+        type: "add-map",
+        pathToFile: "",
+        contour: 0.0,
+        details: "",
+      },
+      coordinates: {
+        name: "",
+        type: "co-cif",
+        pathToFile: "",
+        details: "",
+      },
+      image: {
+        name: "",
+        type: "img-emdb",
+        pathToFile: "",
+        details: "",
+      },
+      // pathToCif: {  --> should be extracted from this.dataset.scientificMetadata
+      //   name: "",
+      //   type: "undef",
+      //   pathToFile: "",
+      //   details: "",
+      // },
+      fsc: {
+        name: "",
+        type: "fsc-xml",
+        pathToFile: "",
+        details: "",
+      },
+    })
+  }
+
+
+  onFileSelected(event: Event, controlName: string) {
+    const input = event.target as HTMLInputElement;
+    console.log(input);
+    if (input.files && input.files.length > 0) {
+      this.selectedFile[controlName] = input.files[0];
+      this.form.get(controlName)?.setValue({
+        ...this.form.get(controlName)?.value,
+        pathToFile: this.selectedFile[controlName].name
       });
-      this.form = this.fb.group({
-        datasetName: new FormControl("", [Validators.required]),
-        description: new FormControl("", [Validators.required]),
-        keywords: this.fb.array([]),
-        emMethod: new FormControl(""),
-        deposingCoordinates:new FormControl(true),
-        associatedMap: new FormControl(false),
-        compositeMap:new FormControl(false), 
-        emdbId:new FormControl(""),
-
-        pathToMainMap: new FormControl(""), 
-        pathToHalfMap1: new FormControl(""), 
-        pathToHalfMap2: new FormControl(""), 
-        pathToMask: new FormControl(""), 
-        pathToAdditionalMap: new FormControl(""), 
-        pathToCoordinates: new FormControl(""), 
-        pathToImage: new FormControl(""), 
-        pathToCif: new FormControl(""), 
-        pathToFSC: new FormControl(""), 
-      })
-
-      // this.connectingToDepositionBackend = true;
-      // Get the GET parameter 'backendUrl' from the URL
-      // this.route.queryParams.subscribe(params => {
-      //   const backendUrl = params['backendUrl'];
-      //   if (backendUrl) {
-      //     this.connectToDepositionBackend(backendUrl);
-      //   }
-      //   else {
-      //     this.connectingToDepositionBackend = false;
-      //   }
-      // });
     }
-
-
-    onFileSelected(event: Event, controlName: string) {
-      const input = event.target as HTMLInputElement;
-      if (input.files && input.files.length > 0) {
-        this.selectedFile[controlName] = input.files[0];
-        this.form.get(controlName)?.setValue(this.selectedFile[controlName].name);
+  }
+  onDepositClick() {
+    const formData = this.form.value;
+    // need to properly catch the dataset details
+    console.log("creating deposition", formData)
+    this.http.post("http://localhost:8080/onedep", formData).subscribe(
+      response => {
+        console.log('created deposition in OneDep', response);
+      },
+      error => {
+        console.error('Request failed esf', error);
       }
-    }
-    onDepositClick(){
-      const formData = this.form.value;
-      // need to properly catch the dataset details
-      console.log(this.dataset)
-      //return this.http.post(this.backendUrl, formData);
-      
-    }
-    
+    );
+  }
+
 }
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
new file mode 100644
index 0000000000..0432087812
--- /dev/null
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -0,0 +1,39 @@
+export enum EmType {
+    Helical = "helical",
+    SingleParticle = "single-particle",
+    SubtomogramAveraging = "subtomogram-averaging",
+    Tomogram = "tomogram",
+    ElectronCristallography = "electron-cristallography"
+};
+interface EmMethod {
+    value: EmType;
+    viewValue:string;
+}
+
+
+export const MethodsList: EmMethod[] = [
+    {value:EmType.Helical, viewValue: 'Helical'},
+    {value:EmType.SingleParticle, viewValue:'Single Particle'},
+    {value:EmType.SubtomogramAveraging,viewValue: 'Subtomogram Averaging'},
+    {value:EmType.Tomogram, viewValue: 'Tomogram'},
+    {value:EmType.ElectronCristallography, viewValue:'Electron Crystallography'},
+  ];
+interface OneDepExperiment {
+    type: string;
+    subtype?: string;
+}
+
+export const Experiment: { [e in EmType]: OneDepExperiment } = {
+    [EmType.Helical]: { type: "em", subtype: "helical" },
+    [EmType.SingleParticle]: { type: "em", subtype: "single" },
+    [EmType.SubtomogramAveraging]: { type: "em", subtype: "subtomogram" },
+    [EmType.Tomogram]: { type: "em", subtype: "tomography" },
+    [EmType.ElectronCristallography]: { type: "ec" }
+};
+export interface OneDepFile{
+	name:File,
+	type:string,
+	pathToFile:string,
+	contour?: number, 
+	details?: string,
+}
\ No newline at end of file

From 78f1fae1138b384b73e174c791d75e3fcadec6f5 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 5 Nov 2024 10:15:39 +0100
Subject: [PATCH 027/245] refactoring

---
 src/app/datasets/onedep/onedep.component.html | 64 ++++++------
 src/app/datasets/onedep/onedep.component.ts   | 78 +++------------
 src/app/datasets/onedep/types/methods.enum.ts | 99 ++++++++++++++++---
 3 files changed, 128 insertions(+), 113 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index e784b686a7..77003ab2df 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -151,16 +151,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['mainMap']">
+                                    <div *ngIf="selectedFile[emFile.MainMap]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput1 (change)="onFileSelected($event, 'mainMap')"
+                                    <input type="file" #fileInput1 (change)="onFileSelected($event, emFile.MainMap)"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['mainMap']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['mainMap'].name }}
+                                    <div *ngIf="selectedFile[emFile.MainMap]" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.MainMap].name }}
                                         </p>
                                     </div>
                                 </div>
@@ -178,16 +178,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['halfMap1']">
+                                    <div *ngIf="selectedFile[emFile.HalfMap1]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput2 (change)="onFileSelected($event, 'halfMap1')"
+                                    <input type="file" #fileInput2 (change)="onFileSelected($event, emFile.HalfMap1)"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['halfMap1']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['halfMap1'].name }}
+                                    <div *ngIf="selectedFile[emFile.HalfMap1]" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.HalfMap1].name }}
                                         </p>
                                     </div>
                                 </div>
@@ -205,16 +205,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['halfMap2']">
+                                    <div *ngIf="selectedFile[emFile.HalfMap2]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput3 (change)="onFileSelected($event, 'halfMap2')"
+                                    <input type="file" #fileInput3 (change)="onFileSelected($event, emFile.HalfMap2)"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['halfMap2']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['halfMap2'].name }}
+                                    <div *ngIf="selectedFile[emFile.HalfMap2]" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.HalfMap2].name }}
                                         </p>
                                     </div>
                                 </div>
@@ -233,16 +233,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['mask']">
+                                    <div *ngIf="selectedFile[emFile.MaskMap]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput4 (change)="onFileSelected($event, 'mask')"
+                                    <input type="file" #fileInput4 (change)="onFileSelected($event, emFile.MaskMap)"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['mask']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['mask'].name }}
+                                    <div *ngIf="selectedFile[emFile.MaskMap]" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.MaskMap].name }}
                                         </p>
                                     </div>
                                 </div>
@@ -260,17 +260,17 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['addMap']">
+                                    <div *ngIf="selectedFile[emFile.AddMap]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
                                     <input type="file" #fileInput5
-                                        (change)="onFileSelected($event, 'addMap')"
+                                        (change)="onFileSelected($event, emFile.AddMap)"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['addMap']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['addMap'].name
+                                    <div *ngIf="selectedFile[emFile.AddMap]" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.AddMap].name
                                             }}</p>
                                     </div>
                                 </div>
@@ -289,16 +289,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['coordinates']">
+                                    <div *ngIf="selectedFile[emFile.Coordinates]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
                                     <input type="file" #fileInput6
-                                        (change)="onFileSelected($event, 'coordinates')" style="display: none;" />
+                                        (change)="onFileSelected($event, emFile.Coordinates)" style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['coordinates']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['coordinates'].name
+                                    <div *ngIf="selectedFile[emFile.Coordinates]" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.Coordinates].name
                                             }}</p>
                                     </div>
                                 </div>
@@ -317,16 +317,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['image']">
+                                    <div *ngIf="selectedFile[emFile.Image]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput7 (change)="onFileSelected($event, 'image')"
+                                    <input type="file" #fileInput7 (change)="onFileSelected($event, emFile.Image)"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['image']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['image'].name }}</p>
+                                    <div *ngIf="selectedFile[emFile.Image]" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.Image].name }}</p>
                                     </div>
                                 </div>
                             </td>
@@ -344,16 +344,16 @@
                                         Choose File
                                     </button>
 
-                                    <div *ngIf="selectedFile['fsc']">
+                                    <div *ngIf="selectedFile[emFile.FSC]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
 
-                                    <input type="file" #fileInput8 (change)="onFileSelected($event, 'fsc')"
+                                    <input type="file" #fileInput8 (change)="onFileSelected($event, emFile.FSC)"
                                         style="display: none;" />
 
                                     <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile['fsc']" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile['fsc'].name }}</p>
+                                    <div *ngIf="selectedFile[emFile.FSC]" class="fileName">
+                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.FSC].name }}</p>
                                     </div>
                                 </div>
                             </td>
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 1cbb0ed074..3d506a8416 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -14,7 +14,7 @@ import {
 
   selectCurrentDataset,
 } from "state-management/selectors/datasets.selectors";
-import { MethodsList, Experiment, OneDepFile } from "./types/methods.enum"
+import { MethodsList, Experiment, EmFile,  EmFiles } from "./types/methods.enum"
 import { Subscription } from "rxjs";
 import { string } from "mathjs";
 
@@ -34,7 +34,8 @@ export class OneDepComponent implements OnInit {
   methodsList = MethodsList;
   experiment = Experiment;
   selectedFile: { [key: string]: File | null } = {};
-
+  emFile = EmFile;
+  files = EmFiles;
 
   constructor(public appConfigService: AppConfigService,
     private store: Store,
@@ -59,81 +60,24 @@ export class OneDepComponent implements OnInit {
       associatedMap: new FormControl(false),
       compositeMap: new FormControl(false),
       emdbId: new FormControl(""),
-
-      mainMap: {
-        name: "",
-        type: "vo-map",
-        pathToFile: "",
-        contour: 0.0,
-        details: "",
-      },
-      halfMap1: {
-        name: "",
-        type: "half-map",
-        pathToFile: "",
-        contour: 0.0,
-        details: "",
-      },
-      halfMap2: {
-        name: "",
-        type: "half-map",
-        pathToFile: "",
-        contour: 0.0,
-        details: "",
-      },
-      mask: {
-        name: "",
-        type: "mask-map",
-        pathToFile: "",
-        contour: 0.0,
-        details: "",
-      },
-      addMap: {
-        name: "",
-        type: "add-map",
-        pathToFile: "",
-        contour: 0.0,
-        details: "",
-      },
-      coordinates: {
-        name: "",
-        type: "co-cif",
-        pathToFile: "",
-        details: "",
-      },
-      image: {
-        name: "",
-        type: "img-emdb",
-        pathToFile: "",
-        details: "",
-      },
-      // pathToCif: {  --> should be extracted from this.dataset.scientificMetadata
-      //   name: "",
-      //   type: "undef",
-      //   pathToFile: "",
-      //   details: "",
-      // },
-      fsc: {
-        name: "",
-        type: "fsc-xml",
-        pathToFile: "",
-        details: "",
-      },
+      // files: this.fb.group({}),
+      
     })
   }
 
 
   onFileSelected(event: Event, controlName: string) {
     const input = event.target as HTMLInputElement;
-    console.log(input);
+
     if (input.files && input.files.length > 0) {
       this.selectedFile[controlName] = input.files[0];
-      this.form.get(controlName)?.setValue({
-        ...this.form.get(controlName)?.value,
-        pathToFile: this.selectedFile[controlName].name
-      });
+      this.files[controlName].file = this.selectedFile[controlName];
+      this.files[controlName].name = this.selectedFile[controlName].name;
     }
+    console.log(this.files);
   }
+
+
   onDepositClick() {
     const formData = this.form.value;
     // need to properly catch the dataset details
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index 0432087812..5cefb55be2 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -5,19 +5,89 @@ export enum EmType {
     Tomogram = "tomogram",
     ElectronCristallography = "electron-cristallography"
 };
+
+export enum EmFile {
+    MainMap = 'vo-map',
+    HalfMap1 = 'half-map1',
+    HalfMap2 = 'half-map2',
+    MaskMap = 'mask-map',
+    AddMap = 'add-map',
+    Coordinates = 'co-cif',
+    Image = 'img-emdb',
+    FSC = 'fsc-xml',
+
+};
+
+
+export const EmFiles: { [f in EmFile]: OneDepFile } = {
+    [EmFile.MainMap]: {
+        name: "",
+        type: "vo-map",
+        file: null,
+        contour: 0.0,
+        details: "",
+    },
+    [EmFile.HalfMap1]: {
+        name: "",
+        type: "half-map",
+        file: null,
+        contour: 0.0,
+        details: "",
+    },
+    [EmFile.HalfMap2]: {
+        name: "",
+        type: "half-map",
+        file: null,
+        contour: 0.0,
+        details: "",
+    },
+    [EmFile.MaskMap]: {
+        name: "",
+        type: "mask-map",
+        file: null,
+        contour: 0.0,
+        details: "",
+    },
+    [EmFile.AddMap]: {
+        name: "",
+        type: "add-map",
+        file: null,
+        contour: 0.0,
+        details: "",
+    },
+    [EmFile.Coordinates]: {
+        name: "",
+        type: "co-cif",
+        file: null,
+        details: "",
+    },
+    [EmFile.Image]: {
+        name: "",
+        type: "img-emdb",
+        file: null,
+        details: "",
+    },
+    [EmFile.FSC]: {
+        name: "",
+        type: "fsc-xml",
+        file: null,
+        details: "",
+    },
+};
+
 interface EmMethod {
     value: EmType;
-    viewValue:string;
+    viewValue: string;
 }
 
 
 export const MethodsList: EmMethod[] = [
-    {value:EmType.Helical, viewValue: 'Helical'},
-    {value:EmType.SingleParticle, viewValue:'Single Particle'},
-    {value:EmType.SubtomogramAveraging,viewValue: 'Subtomogram Averaging'},
-    {value:EmType.Tomogram, viewValue: 'Tomogram'},
-    {value:EmType.ElectronCristallography, viewValue:'Electron Crystallography'},
-  ];
+    { value: EmType.Helical, viewValue: 'Helical' },
+    { value: EmType.SingleParticle, viewValue: 'Single Particle' },
+    { value: EmType.SubtomogramAveraging, viewValue: 'Subtomogram Averaging' },
+    { value: EmType.Tomogram, viewValue: 'Tomogram' },
+    { value: EmType.ElectronCristallography, viewValue: 'Electron Crystallography' },
+];
 interface OneDepExperiment {
     type: string;
     subtype?: string;
@@ -30,10 +100,11 @@ export const Experiment: { [e in EmType]: OneDepExperiment } = {
     [EmType.Tomogram]: { type: "em", subtype: "tomography" },
     [EmType.ElectronCristallography]: { type: "ec" }
 };
-export interface OneDepFile{
-	name:File,
-	type:string,
-	pathToFile:string,
-	contour?: number, 
-	details?: string,
-}
\ No newline at end of file
+export interface OneDepFile {
+    name: string,
+    type: string,
+    file: File,
+    contour?: number,
+    details?: string,
+}
+

From a766839209c371dc7bce018240b72c4098429749 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 5 Nov 2024 17:31:21 +0100
Subject: [PATCH 028/245] refactoring wip: experiments not passed correctly

---
 src/app/datasets/onedep/onedep.component.html | 267 +++---------------
 src/app/datasets/onedep/onedep.component.scss | 187 ++++++++----
 src/app/datasets/onedep/onedep.component.ts   | 180 ++++++++++--
 src/app/datasets/onedep/types/methods.enum.ts |   8 +-
 4 files changed, 330 insertions(+), 312 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 77003ab2df..5a8b368d58 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -64,7 +64,7 @@
                         <mat-form-field class="method-name">
                             <mat-label>experimental method</mat-label>
                             <mat-select formControlName="emMethod" name="method">
-                                <mat-option *ngFor="let method of methodsList" [value]="experiment[method.value]">
+                                <mat-option *ngFor="let method of methodsList" [value]="experiments[method.value]">
                                     {{ method.viewValue }}
                                 </mat-option>
                             </mat-select>
@@ -138,234 +138,47 @@
                     Choose files for deposition
                 </mat-card-header>
                 <mat-card-content>
-                    <table>
-                        <!-- ADD THE MAIN MAP -->
-                        <tr>
-                            <th class="file-types">Main Map</th>
-                            <td>
-                                <div style="display: flex; align-items: center;">
-
-
-                                    <button class="fileChooser" mat-raised-button color="primary"
-                                        (click)="fileInput1.click()">
-                                        Choose File
-                                    </button>
-
-                                    <div *ngIf="selectedFile[emFile.MainMap]">
-                                        <mat-icon>attach_file</mat-icon>
-                                    </div>
-
-                                    <input type="file" #fileInput1 (change)="onFileSelected($event, emFile.MainMap)"
-                                        style="display: none;" />
-
-                                    <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile[emFile.MainMap]" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.MainMap].name }}
-                                        </p>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-                        <!-- ADD THE HALF MAP 1 -->
-                        <tr>
-                            <th class="file-types">Half Map (1)</th>
-                            <td>
-                                <div style="display: flex; align-items: center;">
-
-
-                                    <button class="fileChooser" mat-raised-button color="primary"
-                                        (click)="fileInput2.click()">
-                                        Choose File
-                                    </button>
-
-                                    <div *ngIf="selectedFile[emFile.HalfMap1]">
-                                        <mat-icon>attach_file</mat-icon>
-                                    </div>
-
-                                    <input type="file" #fileInput2 (change)="onFileSelected($event, emFile.HalfMap1)"
-                                        style="display: none;" />
-
-                                    <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile[emFile.HalfMap1]" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.HalfMap1].name }}
-                                        </p>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-                        <!-- ADD THE HALF MAP 2 -->
-                        <tr>
-                            <th class="file-types">Half Map (2)</th>
-                            <td>
-                                <div style="display: flex; align-items: center;">
-
-
-                                    <button class="fileChooser" mat-raised-button color="primary"
-                                        (click)="fileInput3.click()">
-                                        Choose File
-                                    </button>
-
-                                    <div *ngIf="selectedFile[emFile.HalfMap2]">
-                                        <mat-icon>attach_file</mat-icon>
-                                    </div>
-
-                                    <input type="file" #fileInput3 (change)="onFileSelected($event, emFile.HalfMap2)"
-                                        style="display: none;" />
-
-                                    <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile[emFile.HalfMap2]" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.HalfMap2].name }}
-                                        </p>
-                                    </div>
+                    <mat-card *ngFor="let fileType of fileTypes" class="fileCard">
+                        <mat-card-header>
+                            <mat-card-title>{{ fileType.header }}</mat-card-title>
+                        </mat-card-header>
+                        <mat-card-content>
+                            <div class="file-selection-container">
+                                <button class="fileChooser" mat-raised-button color="primary" (click)="onChooseFile(fileInput)">
+                                    Choose File
+                                </button>
+                                <div *ngIf="selectedFile[fileType.key]">
+                                    <mat-icon>attach_file</mat-icon>
                                 </div>
-                            </td>
-                        </tr>
-
-                        <!-- ADD THE MASK MAP  -->
-                        <tr>
-                            <th class="file-types">Mask Map </th>
-                            <td>
-                                <div style="display: flex; align-items: center;">
-
-
-                                    <button class="fileChooser" mat-raised-button color="primary"
-                                        (click)="fileInput4.click()">
-                                        Choose File
-                                    </button>
-
-                                    <div *ngIf="selectedFile[emFile.MaskMap]">
-                                        <mat-icon>attach_file</mat-icon>
-                                    </div>
-
-                                    <input type="file" #fileInput4 (change)="onFileSelected($event, emFile.MaskMap)"
-                                        style="display: none;" />
-
-                                    <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile[emFile.MaskMap]" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.MaskMap].name }}
-                                        </p>
-                                    </div>
+                                <input type="file" #fileInput (change)="onFileSelected($event, fileType.key)" style="display: none;" />
+                                <div *ngIf="selectedFile[fileType.key]" class="fileName">
+                                    <p>Selected File: {{ selectedFile[fileType.key].name }}</p>
                                 </div>
-                            </td>
-                        </tr>
-                        <!-- ADD THE ADDITIONAL MAP  -->
-                        <tr>
-                            <th class="file-types">Additional Map </th>
-                            <td>
-                                <div style="display: flex; align-items: center;">
-
-
-                                    <button class="fileChooser" mat-raised-button color="primary"
-                                        (click)="fileInput5.click()">
-                                        Choose File
-                                    </button>
-
-                                    <div *ngIf="selectedFile[emFile.AddMap]">
-                                        <mat-icon>attach_file</mat-icon>
-                                    </div>
-
-                                    <input type="file" #fileInput5
-                                        (change)="onFileSelected($event, emFile.AddMap)"
-                                        style="display: none;" />
-
-                                    <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile[emFile.AddMap]" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.AddMap].name
-                                            }}</p>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-                        <!-- ADD THE COORDINATES FILE  -->
-                        <tr *ngIf="form.get('deposingCoordinates')?.value === 'true'">
-                            <th class="file-types">Coordinates</th>
-                            <td>
-                                <div style="display: flex; align-items: center;">
-
-
-                                    <button class="fileChooser" mat-raised-button color="primary"
-                                        (click)="fileInput6.click()">
-                                        Choose File
-                                    </button>
-
-                                    <div *ngIf="selectedFile[emFile.Coordinates]">
-                                        <mat-icon>attach_file</mat-icon>
-                                    </div>
-
-                                    <input type="file" #fileInput6
-                                        (change)="onFileSelected($event, emFile.Coordinates)" style="display: none;" />
-
-                                    <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile[emFile.Coordinates]" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.Coordinates].name
-                                            }}</p>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-                        <!-- ADD THE IMAGE  -->
-                        <tr>
-                            <th class="file-types"> Public Image </th>
-                            <td>
-                                <div style="display: flex; align-items: center;">
-
-
-                                    <button class="fileChooser" mat-raised-button color="primary"
-                                        (click)="fileInput7.click()">
-                                        Choose File
-                                    </button>
-
-                                    <div *ngIf="selectedFile[emFile.Image]">
-                                        <mat-icon>attach_file</mat-icon>
-                                    </div>
-
-                                    <input type="file" #fileInput7 (change)="onFileSelected($event, emFile.Image)"
-                                        style="display: none;" />
-
-                                    <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile[emFile.Image]" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.Image].name }}</p>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-                        <!-- ADD THE FCS CURVE   -->
-                        <tr>
-                            <th class="file-types">FSC-XML</th>
-                            <td>
-                                <div style="display: flex; align-items: center;">
-
-
-                                    <button class="fileChooser" mat-raised-button color="primary"
-                                        (click)="fileInput8.click()">
-                                        Choose File
-                                    </button>
-
-                                    <div *ngIf="selectedFile[emFile.FSC]">
-                                        <mat-icon>attach_file</mat-icon>
-                                    </div>
-
-                                    <input type="file" #fileInput8 (change)="onFileSelected($event, emFile.FSC)"
-                                        style="display: none;" />
-
-                                    <!-- Selected file name (shown only when a file is selected) -->
-                                    <div *ngIf="selectedFile[emFile.FSC]" class="fileName">
-                                        <p style="margin: 0;">Selected File: {{ selectedFile[emFile.FSC].name }}</p>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-                        <!-- UPLOAD FILES DONE -->
-
-                 
-                        <button class="submitDep" mat-raised-button color="primary" (click)="onDepositClick()">
-                            Start Deposition
-                        </button>
-
-                    </table>
+                            </div>
+
+                            <div class="input-container">
+                                <ng-container *ngIf="files[fileType.key]?.contour !== undefined">
+                                    <mat-form-field appearance="outline" class="contour-level">
+                                        <mat-label>Contour Level</mat-label>
+                                        <input matInput type="number" placeholder="0.0" 
+                                        (input)="updateContourLevel($event, fileType.key)" 
+                                        pattern="^[+-]?(\d+([.,]\d+)$" 
+                                        />
+                                    </mat-form-field>
+                                </ng-container>
+                                <mat-form-field class="details">
+                                    <mat-label>Details</mat-label>
+                                    <textarea matInput placeholder="Enter details..." rows="1" (input)="updateDetails($event, fileType.key)"
+                                        (input)="autoGrow($event)" [style.overflow]="detailsOverflow"></textarea>
+                                </mat-form-field>
+                            </div>
+                        </mat-card-content>
+                    </mat-card>
+
+                    <!-- UPLOAD FILES DONE -->
+                    <button class="submitDep" mat-raised-button color="primary" (click)="onDepositClick()">
+                        Start Deposition
+                    </button>
                 </mat-card-content>
             </mat-card>
 
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index 71d65ed58e..617a0715ae 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -1,61 +1,146 @@
 mat-card {
-    margin: 1em;
-  
-    .section-icon {
-      height: auto !important;
-      width: auto !important;
-  
-      mat-icon {
-        vertical-align: middle;
-      }
+  margin: 1em;
+
+  .section-icon {
+    height: auto !important;
+    width: auto !important;
+
+    mat-icon {
+      vertical-align: middle;
     }
-  
-    table {
-      th {
-        .questionnaire{
-          min-width: 20rem;
-        }
-        min-width: 10rem;
-        padding-right: 0.5rem;
-        text-align: left;
+  }
+
+  table {
+    th {
+      .questionnaire {
+        min-width: 20rem;
       }
-  
-      td {
-        width: 100%;
-        padding: 0.5rem 0;
-  
-        .sample-edit {
-          padding-left: 0.5rem;
-  
-          mat-icon {
-            font-size: medium;
-          }
+
+      min-width: 10rem;
+      padding-right: 0.5rem;
+      text-align: left;
+    }
+
+    td {
+      width: 100%;
+      padding: 0.5rem 0;
+
+      .sample-edit {
+        padding-left: 0.5rem;
+
+        mat-icon {
+          font-size: medium;
         }
-  
-      }
-      .EMDB-ID{
-        width: 15%;
-      }
-      .method-name{
-        width: 25%;
-      }
-      .file-types{
-        width:10%;
-      }
-      .full-width {
-        width: 100%;
-      }
-      .fileChooser{
-        margin-left: 0px;
       }
+    }
+
+    .EMDB-ID {
+      width: 15%;
+    }
+
+    .method-name {
+      width: 25%;
+    }
+
+    .file-types {
+      width: 10%;
+    }
+
+    .full-width {
+      width: 100%;
+    }
+  }
+
+  .fileCard {
+    width: 80%;
+    margin: 10px 0 10px 0;
+    border: 1px solid #ddd;
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+
+    mat-card-header {
+      background-color: #B3D9AC;
+      height: 26px;
+      display: flex; // Use flexbox to align items
+      align-items: center; // Center content vertically
+      padding: 0 16px; // Optional: adjust padding as needed
+    }
+    mat-card-title{
+      font-size: 16px;
+    }
+
+    .file-selection-container {
+      display: flex; // Use flexbox for layout
+      align-items: center; // Center items vertically
+      gap: 10px; // Space between items
+
+      .fileChooser {
+        background-color: #CFE7CB;
+        color: #333;
+        margin: 5px 0 0 0; // Reset any margin
+    }
       .fileName {
-        margin-left: 10px; 
-        white-space: nowrap; 
-      }
-      .submitDep{
-        background-color: blueviolet;
+        font-size: 14px; // Adjust the font size as needed
+        color: #333; // Adjust the text color if needed
       }
     }
+
+    mat-card-content {
+      display: flex;
+      flex-direction: column;
+      gap: 5px;
+
+      .fileChooser {
+        margin: 3px auto;
+      }
+
+      .input-container {
+        display: flex; // Use flexbox for layout
+        align-items: flex-end; 
+        gap: 10px; // Space between the fields
+
+        .contour-level {
+          flex: 0 0 20%; // Set to take 20% of the width
+          min-width: 100px; // Optional: set a minimum width for usability
+               
+          /* Chrome, Safari, Edge, Opera */
+          input[matinput]::-webkit-outer-spin-button,
+          input[matinput]::-webkit-inner-spin-button {
+          -webkit-appearance: none;
+          margin: 0;
+          }
+        
+          /* Firefox */
+          input[matinput][type=number] {
+          -moz-appearance: textfield;
+          }
+        }
+
+        .details {
+          flex: 1; // Allow this field to take the remaining space
+          min-width: 200px; // Optional: set a minimum width for usability
     
+          mat-form-field {
+            textarea {
+              max-height: calc(5 * 1.5em); // 5 lines max height
+              overflow-y: hidden; // Hide overflow
+              resize: none; // Disable resizing
+              line-height: 1.5; // Set line height
+    
+              &:focus {
+                height: auto; // Allow height to grow as needed
+              }
+            }
+          }
+        }
+
+        mat-form-field {
+          width: 100%; // Ensure fields take full width of their flex container
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+  .submitDep {
+    background-color: #B3D9AC;
   }
- 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 3d506a8416..ac61cf2f6f 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -1,22 +1,23 @@
-import { Component, OnInit, ChangeDetectorRef } from "@angular/core";
-import { AppConfigService, HelpMessages } from "app-config.service";
+import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
+import { AppConfigService } from "app-config.service";
 import { HttpClient } from '@angular/common/http';
 import { ActivatedRoute, Router } from '@angular/router';
 import {
   FormBuilder,
   FormControl,
   FormGroup,
-  Validators,
+  FormArray,
 } from "@angular/forms";
 import { Store } from "@ngrx/store";
 import { Dataset } from "shared/sdk/models";
 import {
-
   selectCurrentDataset,
 } from "state-management/selectors/datasets.selectors";
-import { MethodsList, Experiment, EmFile,  EmFiles } from "./types/methods.enum"
-import { Subscription } from "rxjs";
-import { string } from "mathjs";
+import {selectCurrentUser
+} from "state-management/selectors/user.selectors";
+import { User } from "shared/sdk";
+import { MethodsList, OneDepExperiment, Experiments, EmFile, EmFiles } from "./types/methods.enum"
+import { Subscription, fromEvent } from "rxjs";
 
 
 @Component({
@@ -25,17 +26,34 @@ import { string } from "mathjs";
   styleUrls: ['./onedep.component.scss']
 })
 export class OneDepComponent implements OnInit {
+  private subscriptions: Subscription[] = [];
+  private _hasUnsavedChanges = false;
 
   appConfig = this.appConfigService.getConfig();
   dataset: Dataset | undefined;
+  user: User | undefined;
   form: FormGroup;
-  private subscriptions: Subscription[] = [];
   showAssociatedMapQuestion: boolean = false;
   methodsList = MethodsList;
-  experiment = Experiment;
+  experiments = Experiments;
+  experiment: OneDepExperiment
   selectedFile: { [key: string]: File | null } = {};
   emFile = EmFile;
   files = EmFiles;
+  detailsOverflow: string = 'hidden';
+
+  @ViewChild('fileInput') fileInput: ElementRef<HTMLInputElement> | undefined;
+
+  fileTypes = [
+    { header: 'Main Map', key: this.emFile.MainMap },
+    { header: 'Half Map (1)', key: this.emFile.HalfMap1 },
+    { header: 'Half Map (2)', key: this.emFile.HalfMap2 },
+    { header: 'Mask Map', key: this.emFile.MaskMap },
+    { header: 'Additional Map', key: this.emFile.AddMap },
+    { header: 'Coordinates', key: this.emFile.Coordinates },
+    { header: 'Public Image', key: this.emFile.Image },
+    { header: 'FSC-XML', key: this.emFile.FSC },
+  ];
 
   constructor(public appConfigService: AppConfigService,
     private store: Store,
@@ -50,46 +68,148 @@ export class OneDepComponent implements OnInit {
     this.store.select(selectCurrentDataset).subscribe((dataset) => {
       this.dataset = dataset;
     });
+    this.subscriptions.push(
+      this.store.select(selectCurrentUser).subscribe((user) => {
+        if (user) {
+          this.user = user;
+        }
+      }),
+    );
+    // Prevent user from reloading page if there are unsave changes
+    this.subscriptions.push(
+      fromEvent(window, "beforeunload").subscribe((event) => {
+        if (this.hasUnsavedChanges()) {
+          event.preventDefault();
+        }
+      }),
+    );
     this.form = this.fb.group({
-      datasetName: this.dataset.datasetName,
-      description: this.dataset.description,
-      keywords: this.fb.array(this.dataset.keywords),
       metadata: this.dataset.scientificMetadata,
+      experiments: this.fb.array([]),
       emMethod: new FormControl(""),
       deposingCoordinates: new FormControl(true),
       associatedMap: new FormControl(false),
       compositeMap: new FormControl(false),
       emdbId: new FormControl(""),
-      // files: this.fb.group({}),
-      
-    })
+      files: this.fb.array([]),
+      email: this.user.email
+    })    
+  }
+
+  hasUnsavedChanges() {
+    return this._hasUnsavedChanges;
+  }
+  onHasUnsavedChanges($event: boolean) {
+    this._hasUnsavedChanges = $event;
   }
 
+  autoGrow(event: Event): void {
+    const textarea = event.target as HTMLTextAreaElement;
+    const lineHeight = parseInt(getComputedStyle(textarea).lineHeight, 10);
+    const maxLines = 5;
 
-  onFileSelected(event: Event, controlName: string) {
-    const input = event.target as HTMLInputElement;
+    // Reset height to auto to calculate scrollHeight
+    textarea.style.height = 'auto';
+
+    // Set the height based on the scrollHeight but limit it
+    const newHeight = Math.min(textarea.scrollHeight, lineHeight * maxLines);
+    textarea.style.height = `${newHeight}px`;
 
+    // Update overflow property based on height
+    this.detailsOverflow = textarea.scrollHeight > newHeight ? 'auto' : 'hidden';
+  }
+  onChooseFile(fileInput: HTMLInputElement): void {
+    fileInput.click();
+  }
+  onFileSelected(event: Event, controlName: EmFile) {
+    const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
       this.selectedFile[controlName] = input.files[0];
       this.files[controlName].file = this.selectedFile[controlName];
       this.files[controlName].name = this.selectedFile[controlName].name;
     }
-    console.log(this.files);
   }
+  updateContourLevel(event: Event, controlName: EmFile) {
+    const input = (event.target as HTMLInputElement).value.trim();
+    const normalizedInput = input.replace(',', '.');
+    const parsedValue = parseFloat(normalizedInput);
+    if (!isNaN(parsedValue)) {
+      this.files[controlName].contour = parsedValue;
+    } else {
+      console.warn('Invalid number format:', input);
+    }
+  }
+  updateDetails(event: Event, controlName: EmFile) {
+    const textarea = event.target as HTMLTextAreaElement; // Cast to HTMLTextAreaElement
+    const value = textarea.value;
+    if (this.files[controlName]) {
+      this.files[controlName].details = value;
+    }
+  }
+  onDepositClick() {
+  //   const filesArray = this.form.get('files') as FormArray;
+  //   filesArray.clear();
+  //   for (const key in this.files) {
+  //     if (this.files[key].file) { // e.g coordinates or add-map might not be present
+  //       filesArray.push(new FormControl(this.files[key]));
+  //     }
+  //   }
+  
+  //   const expArray = this.form.get('experiments') as FormArray;
+  //   expArray.clear();
+  //   expArray.push(new FormControl(this.form.get('emMethod')));
 
+  //   const formDataToSend = {
+  //     email: this.form.value.email,
+  //     experiments: this.form.value.experiments, 
+  //     metadata: this.form.value.metadata, 
+  //     // emdbId: this.form.value.emdbId,
+  //     files: this.form.value.files.map(file => file.file),
+  //   };
+    
 
-  onDepositClick() {
-    const formData = this.form.value;
-    // need to properly catch the dataset details
-    console.log("creating deposition", formData)
-    this.http.post("http://localhost:8080/onedep", formData).subscribe(
-      response => {
-        console.log('created deposition in OneDep', response);
-      },
-      error => {
-        console.error('Request failed esf', error);
+  //   // const formData = this.form.value;
+  //   // need to properly catch the dataset details
+  //   console.log("creating deposition", formDataToSend);
+  //   console.log(JSON.stringify(formDataToSend));
+
+  const filesArray = this.form.get('files') as FormArray;
+  filesArray.clear();
+  const formData = new FormData();
+
+  // Append the email
+  formData.append('email', this.form.value.email);
+
+  // Append metadata
+  formData.append('metadata', JSON.stringify(this.form.value.metadata));
+
+  // Append experiments
+  
+  const experiments = this.form.value.experiments.map(exp => {
+      return {
+          type: exp.type, // adjust based on your experiment structure
+          subtype: exp.subtype // adjust based on your experiment structure
+      };
+  });
+  formData.append('experiments', JSON.stringify(experiments));
+
+  // Append files
+  for (const key in this.files) {
+      if (this.files[key].file) { // e.g coordinates or add-map might not be present
+        formData.append('files', this.files[key].file); 
       }
-    );
-  }
+    }
+
 
+  console.log("Creating deposition", formData);
+  console.log('Files to send:', this.files);
+  this.http.post("http://localhost:8080/onedep", formData).subscribe(
+    response => {
+        console.log('Created deposition in OneDep', response);
+    },
+    error => {
+        console.error('Request failed', error);
+    }
+);
+  }
 }
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index 5cefb55be2..fee0239705 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -15,10 +15,8 @@ export enum EmFile {
     Coordinates = 'co-cif',
     Image = 'img-emdb',
     FSC = 'fsc-xml',
-
 };
 
-
 export const EmFiles: { [f in EmFile]: OneDepFile } = {
     [EmFile.MainMap]: {
         name: "",
@@ -88,12 +86,14 @@ export const MethodsList: EmMethod[] = [
     { value: EmType.Tomogram, viewValue: 'Tomogram' },
     { value: EmType.ElectronCristallography, viewValue: 'Electron Crystallography' },
 ];
-interface OneDepExperiment {
+
+
+export interface OneDepExperiment {
     type: string;
     subtype?: string;
 }
 
-export const Experiment: { [e in EmType]: OneDepExperiment } = {
+export const Experiments: { [e in EmType]: OneDepExperiment } = {
     [EmType.Helical]: { type: "em", subtype: "helical" },
     [EmType.SingleParticle]: { type: "em", subtype: "single" },
     [EmType.SubtomogramAveraging]: { type: "em", subtype: "subtomogram" },

From 66acf3866f54b648d453b3261701611857cb892d Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 6 Nov 2024 17:48:42 +0100
Subject: [PATCH 029/245] pass all forms to backend, need input for orcid

---
 src/app/datasets/onedep/onedep.component.html |  2 +-
 src/app/datasets/onedep/onedep.component.ts   | 94 ++++++-------------
 2 files changed, 30 insertions(+), 66 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 5a8b368d58..ca292ea3ab 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -64,7 +64,7 @@
                         <mat-form-field class="method-name">
                             <mat-label>experimental method</mat-label>
                             <mat-select formControlName="emMethod" name="method">
-                                <mat-option *ngFor="let method of methodsList" [value]="experiments[method.value]">
+                                <mat-option *ngFor="let method of methodsList" [value]="method.value">
                                     {{ method.viewValue }}
                                 </mat-option>
                             </mat-select>
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index ac61cf2f6f..d47c5b0f06 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
 import { AppConfigService } from "app-config.service";
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { ActivatedRoute, Router } from '@angular/router';
 import {
   FormBuilder,
@@ -13,7 +13,8 @@ import { Dataset } from "shared/sdk/models";
 import {
   selectCurrentDataset,
 } from "state-management/selectors/datasets.selectors";
-import {selectCurrentUser
+import {
+  selectCurrentUser
 } from "state-management/selectors/user.selectors";
 import { User } from "shared/sdk";
 import { MethodsList, OneDepExperiment, Experiments, EmFile, EmFiles } from "./types/methods.enum"
@@ -35,7 +36,7 @@ export class OneDepComponent implements OnInit {
   form: FormGroup;
   showAssociatedMapQuestion: boolean = false;
   methodsList = MethodsList;
-  experiments = Experiments;
+  // experiments = Experiments;
   experiment: OneDepExperiment
   selectedFile: { [key: string]: File | null } = {};
   emFile = EmFile;
@@ -91,9 +92,8 @@ export class OneDepComponent implements OnInit {
       associatedMap: new FormControl(false),
       compositeMap: new FormControl(false),
       emdbId: new FormControl(""),
-      files: this.fb.array([]),
       email: this.user.email
-    })    
+    })
   }
 
   hasUnsavedChanges() {
@@ -147,69 +147,33 @@ export class OneDepComponent implements OnInit {
     }
   }
   onDepositClick() {
-  //   const filesArray = this.form.get('files') as FormArray;
-  //   filesArray.clear();
-  //   for (const key in this.files) {
-  //     if (this.files[key].file) { // e.g coordinates or add-map might not be present
-  //       filesArray.push(new FormControl(this.files[key]));
-  //     }
-  //   }
-  
-  //   const expArray = this.form.get('experiments') as FormArray;
-  //   expArray.clear();
-  //   expArray.push(new FormControl(this.form.get('emMethod')));
-
-  //   const formDataToSend = {
-  //     email: this.form.value.email,
-  //     experiments: this.form.value.experiments, 
-  //     metadata: this.form.value.metadata, 
-  //     // emdbId: this.form.value.emdbId,
-  //     files: this.form.value.files.map(file => file.file),
-  //   };
-    
-
-  //   // const formData = this.form.value;
-  //   // need to properly catch the dataset details
-  //   console.log("creating deposition", formDataToSend);
-  //   console.log(JSON.stringify(formDataToSend));
-
-  const filesArray = this.form.get('files') as FormArray;
-  filesArray.clear();
-  const formData = new FormData();
-
-  // Append the email
-  formData.append('email', this.form.value.email);
-
-  // Append metadata
-  formData.append('metadata', JSON.stringify(this.form.value.metadata));
-
-  // Append experiments
-  
-  const experiments = this.form.value.experiments.map(exp => {
-      return {
-          type: exp.type, // adjust based on your experiment structure
-          subtype: exp.subtype // adjust based on your experiment structure
-      };
-  });
-  formData.append('experiments', JSON.stringify(experiments));
-
-  // Append files
-  for (const key in this.files) {
-      if (this.files[key].file) { // e.g coordinates or add-map might not be present
-        formData.append('files', this.files[key].file); 
+    const formDataToSend = new FormData();
+    formDataToSend.append('email', this.form.value.email);
+    formDataToSend.append('metadata', JSON.stringify(this.form.value.metadata));
+    formDataToSend.append('experiments', this.form.value.emMethod);
+    // emdbId: this.form.value.emdbId, 
+
+    const fileMeta = Object.entries(this.files).reduce((acc, [key, file]) => {
+      if (file.file) {
+        formDataToSend.append('file', file.file);
+        acc[file.name] = { type: file.type, contour: file.contour, details: file.details };
       }
-    }
+      return acc;
+    }, {});
+    formDataToSend.append('fileMetadata', JSON.stringify(fileMeta));
 
 
-  console.log("Creating deposition", formData);
-  console.log('Files to send:', this.files);
-  this.http.post("http://localhost:8080/onedep", formData).subscribe(
-    response => {
+    console.log("Creating deposition", formDataToSend);
+    this.http.post("http://localhost:8080/onedep", formDataToSend, {
+      headers: { }
+    }).subscribe(
+      response => {
         console.log('Created deposition in OneDep', response);
-    },
-    error => {
-        console.error('Request failed', error);
-    }
-);
+      },
+      error => {
+        console.error('Request failed', error.error);
+      }
+    );
+
   }
 }

From 212fea69b3bb0945ba0f124365e6a1481345af84 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 11 Nov 2024 15:21:05 +0100
Subject: [PATCH 030/245] wip: send data to onedep api

---
 src/app/datasets/onedep/onedep.component.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index d47c5b0f06..ad3e6059f4 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -152,20 +152,21 @@ export class OneDepComponent implements OnInit {
     formDataToSend.append('metadata', JSON.stringify(this.form.value.metadata));
     formDataToSend.append('experiments', this.form.value.emMethod);
     // emdbId: this.form.value.emdbId, 
+    var fileMetadata = []
 
-    const fileMeta = Object.entries(this.files).reduce((acc, [key, file]) => {
-      if (file.file) {
-        formDataToSend.append('file', file.file);
-        acc[file.name] = { type: file.type, contour: file.contour, details: file.details };
+    for (const key in this.files) {
+      if (this.files[key].file) {
+        formDataToSend.append('file', this.files[key].file);
+        fileMetadata.push({ name: this.files[key].name, type: this.files[key].type, contour: this.files[key].contour, details: this.files[key].details });
       }
-      return acc;
-    }, {});
-    formDataToSend.append('fileMetadata', JSON.stringify(fileMeta));
+    }
+    console.log(fileMetadata);
+    formDataToSend.append('fileMetadata', JSON.stringify(fileMetadata));
 
 
     console.log("Creating deposition", formDataToSend);
     this.http.post("http://localhost:8080/onedep", formDataToSend, {
-      headers: { }
+      headers: {}
     }).subscribe(
       response => {
         console.log('Created deposition in OneDep', response);

From d1baed81db3b8eb861f109fffc2e53214b85adcd Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 21 Nov 2024 16:12:49 +0000
Subject: [PATCH 031/245] add contour level propagates

---
 src/app/datasets/onedep/onedep.component.html |   9 +-
 src/app/datasets/onedep/onedep.component.ts   |  16 +-
 src/assets/config.json                        | 164 +++++++-----------
 3 files changed, 78 insertions(+), 111 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index ca292ea3ab..0d9cc8efe9 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -160,9 +160,12 @@
                                 <ng-container *ngIf="files[fileType.key]?.contour !== undefined">
                                     <mat-form-field appearance="outline" class="contour-level">
                                         <mat-label>Contour Level</mat-label>
-                                        <input matInput type="number" placeholder="0.0" 
-                                        (input)="updateContourLevel($event, fileType.key)" 
-                                        pattern="^[+-]?(\d+([.,]\d+)$" 
+                                        <input
+                                            matInput
+                                            type="number"
+                                            placeholder="e.g. 0.0"
+                                            [value]="files[fileType.key]?.contour || ''"
+                                            (input)="fileType.key === 'vo-map' ? updateContourLevelMain($event) : updateContourLevel($event, fileType.key)"
                                         />
                                     </mat-form-field>
                                 </ng-container>
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index ad3e6059f4..ba92fbc1fa 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -129,6 +129,20 @@ export class OneDepComponent implements OnInit {
       this.files[controlName].name = this.selectedFile[controlName].name;
     }
   }
+  updateContourLevelMain(event: Event) {
+    const input = (event.target as HTMLInputElement).value.trim();
+    const normalizedInput = input.replace(',', '.');
+    const parsedValue = parseFloat(normalizedInput);
+    if (!isNaN(parsedValue)) {
+      [EmFile.MainMap, EmFile.HalfMap1, EmFile.HalfMap2].forEach((key) => {
+        if (this.files[key]) {
+          this.files[key].contour = parsedValue;
+        }
+      });
+    } else {
+      console.warn('Invalid number format:', input);
+    }
+  }
   updateContourLevel(event: Event, controlName: EmFile) {
     const input = (event.target as HTMLInputElement).value.trim();
     const normalizedInput = input.replace(',', '.');
@@ -160,11 +174,9 @@ export class OneDepComponent implements OnInit {
         fileMetadata.push({ name: this.files[key].name, type: this.files[key].type, contour: this.files[key].contour, details: this.files[key].details });
       }
     }
-    console.log(fileMetadata);
     formDataToSend.append('fileMetadata', JSON.stringify(fileMetadata));
 
 
-    console.log("Creating deposition", formDataToSend);
     this.http.post("http://localhost:8080/onedep", formDataToSend, {
       headers: {}
     }).subscribe(
diff --git a/src/assets/config.json b/src/assets/config.json
index 96518ad9d4..a71270c0ee 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -1,119 +1,79 @@
 {
-  "accessTokenPrefix": "Bearer ",
-  "addDatasetEnabled": true,
+  "addDatasetEnabled": false,
   "archiveWorkflowEnabled": false,
   "datasetReduceEnabled": true,
-  "datasetJsonScientificMetadata": true,
   "editDatasetSampleEnabled": true,
   "editMetadataEnabled": true,
-  "editPublishedData": false,
-  "addSampleEnabled": true,
-  "externalAuthEndpoint": "/auth/msad",
-  "facility": "Local",
-  "siteIcon": "site-header-logo.png",
-  "loginFacilityLabel": "ESS",
-  "loginLdapLabel": "Ldap",
-  "loginLocalLabel": "Local",
-  "loginFacilityEnabled": true,
-  "loginLdapEnabled": false,
-  "loginLocalEnabled": true,
+  "editPublishedData": true,
+  "editSampleEnabled": true,
+  "facility": "SAMPLE-SITE",
   "fileColorEnabled": true,
   "fileDownloadEnabled": true,
   "gettingStarted": null,
   "ingestManual": null,
-  "jobsEnabled": true,
+  "jobsEnabled": false,
   "jsonMetadataEnabled": true,
-  "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
-  "landingPage": "doi.ess.eu/detail/",
+  "jupyterHubUrl": "",
+  "landingPage": "",
   "lbBaseURL": "http://127.0.0.1:3000",
-  "logbookEnabled": true,
-  "loginFormEnabled": true,
-  "maxDirectDownloadSize": 5000000000,
-  "metadataPreviewEnabled": true,
-  "metadataStructure": "",
-  "multipleDownloadAction": "http://localhost:3012/zip",
-  "multipleDownloadEnabled": true,
-  "oAuth2Endpoints": [
+  "localColumns": [
     {
-      "authURL": "api/v3/auth/oidc",
-      "displayText": "ESS One Identity"
-    }
-  ],
-  "policiesEnabled": true,
-  "retrieveDestinations": [],
-  "riotBaseUrl": "http://scichat.swap.ess.eu",
-  "scienceSearchEnabled": false,
-  "scienceSearchUnitsEnabled": true,
-  "searchPublicDataEnabled": true,
-  "searchSamples": true,
-  "sftpHost": "login.esss.dk",
-  "shareEnabled": true,
-  "shoppingCartEnabled": true,
-  "shoppingCartOnHeader": true,
-  "tableSciDataEnabled": true,
-  "datasetDetailsShowMissingProposalId": false,
-  "notificationInterceptorEnabled": true,
-  "datafilesActionsEnabled": true,
-  "datafilesActions": [
+      "name": "datasetName",
+      "order": 1,
+      "type": "standard",
+      "enabled": true
+    },
     {
-      "id": "eed8efec-4354-11ef-a3b5-d75573a5d37f",
-      "order": 4,
-      "label": "Download All",
-      "files": "all",
-      "mat_icon": "download",
-      "type": "form",
-      "url": "https://www.scicat.info/download/all",
-      "target": "_blank",
-      "enabled": "#SizeLimit",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
+      "name": "type",
+      "order": 2,
+      "type": "standard",
+      "enabled": true
     },
     {
-      "id": "3072fafc-4363-11ef-b9f9-ebf568222d26",
+      "name": "creationTime",
       "order": 3,
-      "label": "Download Selected",
-      "files": "selected",
-      "mat_icon": "download",
-      "type": "form",
-      "url": "https://www.scicat.info/download/selected",
-      "target": "_blank",
-      "enabled": "#Selected && #SizeLimit",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
+      "type": "standard",
+      "enabled": true
     },
     {
-      "id": "4f974f0e-4364-11ef-9c63-03d19f813f4e",
-      "order": 2,
-      "label": "Notebook All",
-      "files": "all",
-      "icon": "/assets/icons/jupyter_logo.png",
-      "type": "form",
-      "url": "https://www.scicat.info/notebook/all",
-      "target": "_blank",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
+      "name": "proposalId",
+      "order": 6,
+      "type": "standard",
+      "enabled": true
     },
     {
-      "id": "fa3ce6ee-482d-11ef-95e9-ff2c80dd50bd",
-      "order": 1,
-      "label": "Notebook Selected",
-      "files": "selected",
-      "icon": "/assets/icons/jupyter_logo.png",
-      "type": "form",
-      "url": "https://www.scicat.info/notebook/selected",
-      "target": "_blank",
-      "enabled": "#Selected",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
+      "name": "image",
+      "order": 7,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "sourceFolder",
+      "order": 8,
+      "type": "standard",
+      "enabled": true
     }
   ],
-  "labelMaps": {
-    "filters": {
-      "LocationFilter": "Location",
-      "PidFilter": "Pid",
-      "GroupFilter": "Group",
-      "TypeFilter": "Type",
-      "KeywordFilter": "Keyword",
-      "DateRangeFilter": "Start Date - End Date",
-      "TextFilter": "Text"
-    }
-  },
+  "logbookEnabled": false,
+  "loginFormEnabled": true,
+  "oAuth2Endpoints": [],
+  "maxDirectDownloadSize": 5000000000,
+  "metadataPreviewEnabled": true,
+  "metadataStructure": "tree",
+  "multipleDownloadAction": "",
+  "multipleDownloadEnabled": false,
+  "policiesEnabled": true,
+  "retrieveDestinations": [],
+  "riotBaseUrl": "",
+  "scienceSearchEnabled": true,
+  "scienceSearchUnitsEnabled": true,
+  "searchPublicDataEnabled": true,
+  "searchSamples": true,
+  "sftpHost": "",
+  "shareEnabled": false,
+  "shoppingCartEnabled": false,
+  "shoppingCartOnHeader": false,
+  "tableSciDataEnabled": true,
   "defaultDatasetsListSettings": {
     "columns": [
       {
@@ -194,16 +154,8 @@
         "type": "standard",
         "enabled": false
       }
-    ],
-    "filters": [
-      { "LocationFilter": true },
-      { "PidFilter": true },
-      { "GroupFilter": true },
-      { "TypeFilter": true },
-      { "KeywordFilter": true },
-      { "DateRangeFilter": true },
-      { "TextFilter": true }
-    ],
-    "conditions": []
-  }
+    ]
+  },
+  "accessTokenPrefix": "Bearer ",
+  "externalAuthEndpoint": "/api/v3/auth/ldap"
 }

From 8bb84d824de46fa71da72ce3279a307aef7d3d5d Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 25 Nov 2024 16:54:21 +0000
Subject: [PATCH 032/245] add list of ORCID IDs, token not passed yet

---
 src/app/datasets/datasets.module.ts           |   2 +
 src/app/datasets/onedep/onedep.component.html | 145 ++++++++++++++----
 src/app/datasets/onedep/onedep.component.scss |  79 ++++++++--
 src/app/datasets/onedep/onedep.component.ts   |  21 ++-
 src/app/datasets/onedep/onedep.directive.ts   |  38 +++++
 5 files changed, 241 insertions(+), 44 deletions(-)
 create mode 100644 src/app/datasets/onedep/onedep.directive.ts

diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 8f8d905a14..2c007619cd 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -91,6 +91,7 @@ import { FiltersModule } from "shared/modules/filters/filters.module";
 import { userReducer } from "state-management/reducers/user.reducer";
 import { MatSnackBarModule } from "@angular/material/snack-bar";
 import { OneDepComponent } from "./onedep/onedep.component";
+import { OrcidFormatterDirective } from "./onedep/onedep.directive";
 
 @NgModule({
   imports: [
@@ -181,6 +182,7 @@ import { OneDepComponent } from "./onedep/onedep.component";
     DatafilesActionComponent,
     DatasetsFilterSettingsComponent,
     OneDepComponent,
+    OrcidFormatterDirective,
   ],
   providers: [
     ArchivingService,
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 0d9cc8efe9..99c0aa40e5 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -18,7 +18,8 @@
                         <tr>
                             <th>Description</th>
                             <td>
-                                <span [innerHTML]="dataset.description || '-' | linky"></span>
+                                <span
+                                    [innerHTML]="dataset.description || '-' | linky"></span>
                             </td>
                         </tr>
                         <tr>
@@ -39,7 +40,8 @@
                         <tr class="keywords-row">
                             <th>Keywords</th>
                             <mat-chip-set role="list" #keywordChips>
-                                <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
+                                <mat-chip role="listitem"
+                                    *ngFor="let keyword of dataset.keywords">
                                     {{ keyword }}
                                 </mat-chip>
                             </mat-chip-set>
@@ -63,8 +65,10 @@
                             Method</th>
                         <mat-form-field class="method-name">
                             <mat-label>experimental method</mat-label>
-                            <mat-select formControlName="emMethod" name="method">
-                                <mat-option *ngFor="let method of methodsList" [value]="method.value">
+                            <mat-select formControlName="emMethod"
+                                name="method">
+                                <mat-option *ngFor="let method of methodsList"
+                                    [value]="method.value">
                                     {{ method.viewValue }}
                                 </mat-option>
                             </mat-select>
@@ -73,28 +77,36 @@
 
                         <!-- Question 2: PDB Deposition -->
                         <tr>
-                            <th class="questionnaire">Are you deposing coordinates with this
+                            <th class="questionnaire">Are you deposing
+                                coordinates with this
                                 submission? (for PDB)</th>
                             <td>
-                                <mat-radio-group formControlName="deposingCoordinates">
-                                    <mat-radio-button name="deposingCoordinates" value=true checked>
+                                <mat-radio-group
+                                    formControlName="deposingCoordinates">
+                                    <mat-radio-button name="deposingCoordinates"
+                                        value=true checked>
                                         Yes
                                     </mat-radio-button>
-                                    <mat-radio-button name="deposingCoordinates" value=false>
+                                    <mat-radio-button name="deposingCoordinates"
+                                        value=false>
                                         No
                                     </mat-radio-button>
                                 </mat-radio-group>
                             </td>
                         </tr>
-                        <tr *ngIf="form.get('deposingCoordinates')?.value === 'true'">
+                        <tr
+                            *ngIf="form.get('deposingCoordinates')?.value === 'true'">
                             <th>Has an associated map been deposited to EMDB?
                             </th>
                             <td>
-                                <mat-radio-group formControlName="associatedMap">
-                                    <mat-radio-button name="associatedMap" value=true checked>
+                                <mat-radio-group
+                                    formControlName="associatedMap">
+                                    <mat-radio-button name="associatedMap"
+                                        value=true checked>
                                         Yes
                                     </mat-radio-button>
-                                    <mat-radio-button name="associatedMap" value=false>
+                                    <mat-radio-button name="associatedMap"
+                                        value=false>
                                         No
                                     </mat-radio-button>
                                 </mat-radio-group>
@@ -114,13 +126,16 @@
 
                         <!-- Final Question: Composite Map -->
                         <tr>
-                            <th class="questionnaire">Is this a composite map?</th>
+                            <th class="questionnaire">Is this a composite map?
+                            </th>
                             <td>
                                 <mat-radio-group formControlName="compositeMap">
-                                    <mat-radio-button name="compositeMap" value=true>
+                                    <mat-radio-button name="compositeMap"
+                                        value=true>
                                         Yes
                                     </mat-radio-button>
-                                    <mat-radio-button name="compositeMap" value=false checked>
+                                    <mat-radio-button name="compositeMap"
+                                        value=false checked>
                                         No
                                     </mat-radio-button>
                                 </mat-radio-group>
@@ -129,57 +144,123 @@
                     </table>
                 </mat-card-content>
             </mat-card>
+            <mat-card>
+                <mat-card-header class="related-header">
+                    <div mat-card-avatar class="section-icon">
+                        <mat-icon>assignment_ind</mat-icon>
+                    </div>
+                    <span>Administrative</span>
+                </mat-card-header>
+
+                <div class="card-container">
+                    <!-- Left Section -->
+                    <div class="card-left">
+                        <h2>Obtain OneDep Token</h2>
+                        <p class="instruction">Add instruction how to get it</p>
+                        <mat-form-field class="token-field"
+                            appearance="outline">
+                            <mat-label>Token</mat-label>
+                            <input matInput type="text"
+                                placeholder="Generated token will appear here"
+                                formControlName="jwtToken" />
+                        </mat-form-field>
+                    </div>
+
+                    <!-- Right Section -->
+                    <div class="card-right">
+                        <h2>Enter 16-digit ORCID iD</h2>
+                        <p class="instruction">Owners of these ORCIDs iDs are
+                            allowed to access this deposition.</p>
+                        <form [formGroup]="form">
+                            <!-- Link the orcid FormArray -->
+                            <div formArrayName="orcid">
+                                <ng-container
+                                    *ngFor="let field of orcidArray.controls; let i = index">
+                                    <div [formGroupName]="i">
+                                        <mat-form-field class="data-field"
+                                            appearance="outline">
+                                            <mat-label>Enter 16-digits ORCID iD</mat-label>
+                                            <input matInput type="text"
+                                                maxlength="19"
+                                                placeholder="xxxx-xxxx-xxxx-xxxx"
+                                                formControlName="orcidId"
+                                                orcidFormatter>
+                                        </mat-form-field>
+                                    </div>
+                                </ng-container>
+                            </div>
+                            <button mat-icon-button class="add-field-btn" (click)="addOrcidField()">
+                                <mat-icon>add</mat-icon>
+                              </button>
+                        </form>
+                    </div>
+                </div>
+            </mat-card>
+
+
+            
 
             <mat-card>
                 <mat-card-header class="file-header">
                     <div mat-card-avatar class="section-icon">
-                        <mat-icon> folder </mat-icon>
+                        <mat-icon> attachment </mat-icon>
                     </div>
                     Choose files for deposition
                 </mat-card-header>
                 <mat-card-content>
-                    <mat-card *ngFor="let fileType of fileTypes" class="fileCard">
+                    <mat-card *ngFor="let fileType of fileTypes"
+                        class="fileCard">
                         <mat-card-header>
-                            <mat-card-title>{{ fileType.header }}</mat-card-title>
+                            <mat-card-title>{{ fileType.header
+                                }}</mat-card-title>
                         </mat-card-header>
                         <mat-card-content>
                             <div class="file-selection-container">
-                                <button class="fileChooser" mat-raised-button color="primary" (click)="onChooseFile(fileInput)">
+                                <button class="fileChooser" mat-raised-button
+                                    color="primary"
+                                    (click)="onChooseFile(fileInput)">
                                     Choose File
                                 </button>
                                 <div *ngIf="selectedFile[fileType.key]">
                                     <mat-icon>attach_file</mat-icon>
                                 </div>
-                                <input type="file" #fileInput (change)="onFileSelected($event, fileType.key)" style="display: none;" />
-                                <div *ngIf="selectedFile[fileType.key]" class="fileName">
-                                    <p>Selected File: {{ selectedFile[fileType.key].name }}</p>
+                                <input type="file" #fileInput
+                                    (change)="onFileSelected($event, fileType.key)"
+                                    style="display: none;" />
+                                <div *ngIf="selectedFile[fileType.key]"
+                                    class="fileName">
+                                    <p>Selected File: {{
+                                        selectedFile[fileType.key].name }}</p>
                                 </div>
                             </div>
 
                             <div class="input-container">
-                                <ng-container *ngIf="files[fileType.key]?.contour !== undefined">
-                                    <mat-form-field appearance="outline" class="contour-level">
+                                <ng-container
+                                    *ngIf="files[fileType.key]?.contour !== undefined">
+                                    <mat-form-field appearance="outline"
+                                        class="contour-level">
                                         <mat-label>Contour Level</mat-label>
-                                        <input
-                                            matInput
-                                            type="number"
+                                        <input matInput type="number"
                                             placeholder="e.g. 0.0"
                                             [value]="files[fileType.key]?.contour || ''"
-                                            (input)="fileType.key === 'vo-map' ? updateContourLevelMain($event) : updateContourLevel($event, fileType.key)"
-                                        />
+                                            (input)="fileType.key === 'vo-map' ? updateContourLevelMain($event) : updateContourLevel($event, fileType.key)" />
                                     </mat-form-field>
                                 </ng-container>
                                 <mat-form-field class="details">
                                     <mat-label>Details</mat-label>
-                                    <textarea matInput placeholder="Enter details..." rows="1" (input)="updateDetails($event, fileType.key)"
-                                        (input)="autoGrow($event)" [style.overflow]="detailsOverflow"></textarea>
+                                    <textarea matInput
+                                        placeholder="Enter details..." rows="1"
+                                        (input)="updateDetails($event, fileType.key)"
+                                        (input)="autoGrow($event)"
+                                        [style.overflow]="detailsOverflow"></textarea>
                                 </mat-form-field>
                             </div>
                         </mat-card-content>
                     </mat-card>
 
                     <!-- UPLOAD FILES DONE -->
-                    <button class="submitDep" mat-raised-button color="primary" (click)="onDepositClick()">
+                    <button class="submitDep" mat-raised-button color="primary"
+                        (click)="onDepositClick()">
                         Start Deposition
                     </button>
                 </mat-card-content>
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index 617a0715ae..ad555adaff 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -10,6 +10,62 @@ mat-card {
     }
   }
 
+  .card-container {
+    display: flex;
+    justify-content: space-between;
+    align-items: start;
+    padding: 16px;
+  }
+
+  .card-left {
+    flex: 1;
+    margin-right: 16px;
+  }
+
+  .card-right {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    /* Stack fields vertically */
+  }
+
+
+  .file-header {
+    display: flex;
+    margin-bottom: 16px;
+  }
+
+  .instruction {
+    color: #555;
+  }
+
+  .token-field {
+    width: 100%;
+    height: 20px;
+    margin-bottom: 8px;
+    margin-top: 0;
+  }
+
+  .data-field {
+    width: 30%;
+    height: 20px;
+    margin-bottom: 40px;
+  }
+
+  .add-field-btn {
+    margin-top: 16px;
+    color: rgba(0, 0, 0, 0.6);
+    transition: color 0.3s ease;
+  }
+
+  .add-field-btn:hover {
+    color: rgba(0, 0, 0, 0.9);
+  }
+
+  .add-field-btn mat-icon {
+    font-size: 24px;
+  }
+
   table {
     th {
       .questionnaire {
@@ -64,7 +120,8 @@ mat-card {
       align-items: center; // Center content vertically
       padding: 0 16px; // Optional: adjust padding as needed
     }
-    mat-card-title{
+
+    mat-card-title {
       font-size: 16px;
     }
 
@@ -77,7 +134,8 @@ mat-card {
         background-color: #CFE7CB;
         color: #333;
         margin: 5px 0 0 0; // Reset any margin
-    }
+      }
+
       .fileName {
         font-size: 14px; // Adjust the font size as needed
         color: #333; // Adjust the text color if needed
@@ -95,37 +153,37 @@ mat-card {
 
       .input-container {
         display: flex; // Use flexbox for layout
-        align-items: flex-end; 
+        align-items: flex-end;
         gap: 10px; // Space between the fields
 
         .contour-level {
           flex: 0 0 20%; // Set to take 20% of the width
           min-width: 100px; // Optional: set a minimum width for usability
-               
+
           /* Chrome, Safari, Edge, Opera */
           input[matinput]::-webkit-outer-spin-button,
           input[matinput]::-webkit-inner-spin-button {
-          -webkit-appearance: none;
-          margin: 0;
+            -webkit-appearance: none;
+            margin: 0;
           }
-        
+
           /* Firefox */
           input[matinput][type=number] {
-          -moz-appearance: textfield;
+            -moz-appearance: textfield;
           }
         }
 
         .details {
           flex: 1; // Allow this field to take the remaining space
           min-width: 200px; // Optional: set a minimum width for usability
-    
+
           mat-form-field {
             textarea {
               max-height: calc(5 * 1.5em); // 5 lines max height
               overflow-y: hidden; // Hide overflow
               resize: none; // Disable resizing
               line-height: 1.5; // Set line height
-    
+
               &:focus {
                 height: auto; // Allow height to grow as needed
               }
@@ -140,6 +198,7 @@ mat-card {
       }
     }
   }
+
   .submitDep {
     background-color: #B3D9AC;
   }
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index ba92fbc1fa..5cea0d5a7d 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -7,6 +7,7 @@ import {
   FormControl,
   FormGroup,
   FormArray,
+  Validators,
 } from "@angular/forms";
 import { Store } from "@ngrx/store";
 import { Dataset } from "shared/sdk/models";
@@ -43,6 +44,7 @@ export class OneDepComponent implements OnInit {
   files = EmFiles;
   detailsOverflow: string = 'hidden';
 
+
   @ViewChild('fileInput') fileInput: ElementRef<HTMLInputElement> | undefined;
 
   fileTypes = [
@@ -92,16 +94,31 @@ export class OneDepComponent implements OnInit {
       associatedMap: new FormControl(false),
       compositeMap: new FormControl(false),
       emdbId: new FormControl(""),
-      email: this.user.email
+      email: this.user.email,
+      jwtToken: new FormControl(""),
+      orcid: this.fb.array([]),
     })
   }
 
+  get orcidArray(): FormArray {
+    return this.form.get('orcid') as FormArray;
+  }
+
   hasUnsavedChanges() {
     return this._hasUnsavedChanges;
   }
   onHasUnsavedChanges($event: boolean) {
     this._hasUnsavedChanges = $event;
   }
+  addOrcidField(): void {
+    const orcidField = this.fb.group({
+      orcidId: ['', [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)]],
+    });
+    this.orcidArray.push(orcidField);
+  }
+  removeOrcidField(index: number): void {
+    this.orcidArray.removeAt(index);
+  }
 
   autoGrow(event: Event): void {
     const textarea = event.target as HTMLTextAreaElement;
@@ -163,6 +180,7 @@ export class OneDepComponent implements OnInit {
   onDepositClick() {
     const formDataToSend = new FormData();
     formDataToSend.append('email', this.form.value.email);
+    formDataToSend.append('orcidIds', this.form.value.orcidArray);
     formDataToSend.append('metadata', JSON.stringify(this.form.value.metadata));
     formDataToSend.append('experiments', this.form.value.emMethod);
     // emdbId: this.form.value.emdbId, 
@@ -176,7 +194,6 @@ export class OneDepComponent implements OnInit {
     }
     formDataToSend.append('fileMetadata', JSON.stringify(fileMetadata));
 
-
     this.http.post("http://localhost:8080/onedep", formDataToSend, {
       headers: {}
     }).subscribe(
diff --git a/src/app/datasets/onedep/onedep.directive.ts b/src/app/datasets/onedep/onedep.directive.ts
new file mode 100644
index 0000000000..d54b0a2502
--- /dev/null
+++ b/src/app/datasets/onedep/onedep.directive.ts
@@ -0,0 +1,38 @@
+import { Directive, HostListener, ElementRef, OnInit } from "@angular/core";
+
+@Directive({ selector: "[orcidFormatter]" })
+export class OrcidFormatterDirective {
+
+  private readonly maxRawLength = 16;
+
+  constructor(private el: ElementRef) {}
+
+  @HostListener('input', ['$event'])
+  onInput(event: InputEvent): void {
+    const inputElement = this.el.nativeElement as HTMLInputElement;
+
+    // Remove all existing dashes and limit to the max length
+    const rawValue = inputElement.value.replace(/-/g, '').slice(0, this.maxRawLength);
+
+    // Format with dashes
+    const formattedValue = this.formatWithDashes(rawValue);
+
+    // Update the input's visible value
+    inputElement.value = formattedValue;
+
+    // Preserve the cursor position
+    const cursorPosition = this.getAdjustedCursorPosition(rawValue, inputElement.selectionStart || 0);
+    inputElement.setSelectionRange(cursorPosition, cursorPosition);
+  }
+
+  private formatWithDashes(value: string): string {
+    return value.match(/.{1,4}/g)?.join('-') || value;
+  }
+
+  private getAdjustedCursorPosition(rawValue: string, originalPosition: number): number {
+    const rawCursorPosition = rawValue.slice(0, originalPosition).length;
+    const dashCountBeforeCursor = Math.floor(rawCursorPosition / 4);
+    return rawCursorPosition + dashCountBeforeCursor;
+  }
+
+}
\ No newline at end of file

From 0692b18ba4b28d9e9168c5d776c0b2f019430b81 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 26 Nov 2024 14:49:47 +0000
Subject: [PATCH 033/245] wip: token and orcid entries working; need to
 refactor files

---
 src/app/datasets/onedep/onedep.component.html | 175 +++++++++++-------
 src/app/datasets/onedep/onedep.component.scss |  21 +++
 src/app/datasets/onedep/onedep.component.ts   |  11 +-
 3 files changed, 132 insertions(+), 75 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 99c0aa40e5..c96828f1d7 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -65,13 +65,19 @@
                             Method</th>
                         <mat-form-field class="method-name">
                             <mat-label>experimental method</mat-label>
-                            <mat-select formControlName="emMethod"
+                            <mat-select 
+                                required
+                                formControlName="emMethod"
                                 name="method">
                                 <mat-option *ngFor="let method of methodsList"
                                     [value]="method.value">
                                     {{ method.viewValue }}
                                 </mat-option>
                             </mat-select>
+                            <!-- Error Message -->
+                            <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error">
+                                You must specify the experimental method
+                            </div>
                         </mat-form-field>
 
 
@@ -82,13 +88,17 @@
                                 submission? (for PDB)</th>
                             <td>
                                 <mat-radio-group
+                                    reuired
                                     formControlName="deposingCoordinates">
-                                    <mat-radio-button name="deposingCoordinates"
-                                        value=true checked>
+                                    <mat-radio-button 
+                                        name="deposingCoordinates"
+                                        value=true >
                                         Yes
                                     </mat-radio-button>
-                                    <mat-radio-button name="deposingCoordinates"
-                                        value=false>
+                                    <mat-radio-button 
+                                        name="deposingCoordinates"
+                                        value=false
+                                        checked>
                                         No
                                     </mat-radio-button>
                                 </mat-radio-group>
@@ -100,12 +110,16 @@
                             </th>
                             <td>
                                 <mat-radio-group
+                                    reuired
                                     formControlName="associatedMap">
-                                    <mat-radio-button name="associatedMap"
-                                        value=true checked>
+                                    <mat-radio-button 
+                                        name="associatedMap"
+                                        value=true 
+                                        >
                                         Yes
                                     </mat-radio-button>
-                                    <mat-radio-button name="associatedMap"
+                                    <mat-radio-button 
+                                        name="associatedMap"
                                         value=false>
                                         No
                                     </mat-radio-button>
@@ -114,12 +128,15 @@
                         </tr>
 
                         <!-- EMDB Identifier Field -->
-                        <tr *ngIf="form.get('associatedMap').value === 'true'">
+                        <tr *ngIf="form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
                             <th>EMDB Identifier</th>
                             <td>
                                 <mat-form-field class="EMDB-ID">
                                     <mat-label>EMDB ID</mat-label>
-                                    <input matInput formControlName="emdbId" />
+                                    <input 
+                                        required
+                                        matInput 
+                                        formControlName="emdbId" />
                                 </mat-form-field>
                             </td>
                         </tr>
@@ -129,13 +146,17 @@
                             <th class="questionnaire">Is this a composite map?
                             </th>
                             <td>
-                                <mat-radio-group formControlName="compositeMap">
+                                <mat-radio-group 
+                                    required
+                                    formControlName="compositeMap">
                                     <mat-radio-button name="compositeMap"
                                         value=true>
                                         Yes
                                     </mat-radio-button>
-                                    <mat-radio-button name="compositeMap"
-                                        value=false checked>
+                                    <mat-radio-button 
+                                        name="compositeMap"
+                                        value=false 
+                                        checked>
                                         No
                                     </mat-radio-button>
                                 </mat-radio-group>
@@ -144,7 +165,8 @@
                     </table>
                 </mat-card-content>
             </mat-card>
-            <mat-card>
+            <mat-card >
+                <form [formGroup]="form">
                 <mat-card-header class="related-header">
                     <div mat-card-avatar class="section-icon">
                         <mat-icon>assignment_ind</mat-icon>
@@ -157,11 +179,14 @@
                     <div class="card-left">
                         <h2>Obtain OneDep Token</h2>
                         <p class="instruction">Add instruction how to get it</p>
-                        <mat-form-field class="token-field"
+                        <mat-form-field 
+                            class="token-field"
                             appearance="outline">
                             <mat-label>Token</mat-label>
-                            <input matInput type="text"
-                                placeholder="Generated token will appear here"
+                            <input 
+                                required
+                                matInput
+                                placeholder="copy the token text here"
                                 formControlName="jwtToken" />
                         </mat-form-field>
                     </div>
@@ -171,30 +196,45 @@ <h2>Obtain OneDep Token</h2>
                         <h2>Enter 16-digit ORCID iD</h2>
                         <p class="instruction">Owners of these ORCIDs iDs are
                             allowed to access this deposition.</p>
-                        <form [formGroup]="form">
+                        
                             <!-- Link the orcid FormArray -->
                             <div formArrayName="orcid">
                                 <ng-container
                                     *ngFor="let field of orcidArray.controls; let i = index">
                                     <div [formGroupName]="i">
-                                        <mat-form-field class="data-field"
+                                        <mat-form-field 
+                                            class="data-field"
                                             appearance="outline">
                                             <mat-label>Enter 16-digits ORCID iD</mat-label>
-                                            <input matInput type="text"
+                                            <div class="input-container">
+                                            <input 
+                                                matInput 
+                                                type="text"
                                                 maxlength="19"
                                                 placeholder="xxxx-xxxx-xxxx-xxxx"
                                                 formControlName="orcidId"
                                                 orcidFormatter>
+                                                <button 
+                                                mat-icon-button 
+                                                class="remove-field-btn" 
+                                                (click)="removeOrcidField(i)">
+                                                <mat-icon>clear</mat-icon>    
+                                            </button>                                    
+                                            </div>
                                         </mat-form-field>
                                     </div>
                                 </ng-container>
                             </div>
-                            <button mat-icon-button class="add-field-btn" (click)="addOrcidField()">
+                            <button 
+                                mat-icon-button 
+                                class="add-field-btn" 
+                                (click)="addOrcidField()">
                                 <mat-icon>add</mat-icon>
-                              </button>
-                        </form>
+                            </button>
+                        
                     </div>
                 </div>
+                </form>
             </mat-card>
 
 
@@ -208,55 +248,52 @@ <h2>Enter 16-digit ORCID iD</h2>
                     Choose files for deposition
                 </mat-card-header>
                 <mat-card-content>
-                    <mat-card *ngFor="let fileType of fileTypes"
-                        class="fileCard">
-                        <mat-card-header>
-                            <mat-card-title>{{ fileType.header
-                                }}</mat-card-title>
-                        </mat-card-header>
-                        <mat-card-content>
-                            <div class="file-selection-container">
-                                <button class="fileChooser" mat-raised-button
-                                    color="primary"
-                                    (click)="onChooseFile(fileInput)">
-                                    Choose File
-                                </button>
-                                <div *ngIf="selectedFile[fileType.key]">
-                                    <mat-icon>attach_file</mat-icon>
-                                </div>
-                                <input type="file" #fileInput
-                                    (change)="onFileSelected($event, fileType.key)"
-                                    style="display: none;" />
-                                <div *ngIf="selectedFile[fileType.key]"
-                                    class="fileName">
-                                    <p>Selected File: {{
-                                        selectedFile[fileType.key].name }}</p>
+                    <mat-card *ngFor="let fileType of fileTypes" class="fileCard">
+                        <ng-container *ngIf="fileType.key !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
+                            <mat-card-header>
+                                <mat-card-title>{{ fileType.header }}</mat-card-title>
+                            </mat-card-header>
+                            <mat-card-content>
+                                <div class="file-selection-container">
+                                    <button class="fileChooser" mat-raised-button color="primary" (click)="onChooseFile(fileInput)">
+                                        Choose File
+                                    </button>
+                                    <div *ngIf="selectedFile[fileType.key]">
+                                        <mat-icon>attach_file</mat-icon>
+                                    </div>
+                                    <input type="file" #fileInput (change)="onFileSelected($event, fileType.key)" style="display: none;" />
+                                    <div *ngIf="selectedFile[fileType.key]" class="fileName">
+                                        <p>Selected File: {{ selectedFile[fileType.key].name }}</p>
+                                    </div>
                                 </div>
-                            </div>
-
-                            <div class="input-container">
-                                <ng-container
-                                    *ngIf="files[fileType.key]?.contour !== undefined">
-                                    <mat-form-field appearance="outline"
-                                        class="contour-level">
-                                        <mat-label>Contour Level</mat-label>
-                                        <input matInput type="number"
-                                            placeholder="e.g. 0.0"
-                                            [value]="files[fileType.key]?.contour || ''"
-                                            (input)="fileType.key === 'vo-map' ? updateContourLevelMain($event) : updateContourLevel($event, fileType.key)" />
+                    
+                                <div class="input-container">
+                                    <ng-container *ngIf="files[fileType.key]?.contour !== undefined">
+                                        <mat-form-field appearance="outline" class="contour-level">
+                                            <mat-label>Contour Level</mat-label>
+                                            <input 
+                                                matInput type="number" 
+                                                placeholder="e.g. 0.0"
+                                                required
+                                                [value]="files[fileType.key]?.contour || ''"
+                                                (input)="fileType.key === 'vo-map' ? updateContourLevelMain($event) : updateContourLevel($event, fileType.key)" />
+                                        </mat-form-field>
+                                        <!-- Error Message -->
+                                        <!-- FIX ME -->
+                                        <!-- <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error">
+                                            You must specify the experimental method
+                                        </div> -->
+                                    </ng-container>
+                                    <mat-form-field class="details">
+                                        <mat-label>Details</mat-label>
+                                        <textarea matInput placeholder="Enter details..." rows="1" (input)="updateDetails($event, fileType.key)"
+                                                  (input)="autoGrow($event)" [style.overflow]="detailsOverflow"></textarea>
                                     </mat-form-field>
-                                </ng-container>
-                                <mat-form-field class="details">
-                                    <mat-label>Details</mat-label>
-                                    <textarea matInput
-                                        placeholder="Enter details..." rows="1"
-                                        (input)="updateDetails($event, fileType.key)"
-                                        (input)="autoGrow($event)"
-                                        [style.overflow]="detailsOverflow"></textarea>
-                                </mat-form-field>
-                            </div>
-                        </mat-card-content>
+                                </div>
+                            </mat-card-content>
+                        </ng-container>
                     </mat-card>
+                    
 
                     <!-- UPLOAD FILES DONE -->
                     <button class="submitDep" mat-raised-button color="primary"
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index ad555adaff..c6a24f75f1 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -51,6 +51,13 @@ mat-card {
     height: 20px;
     margin-bottom: 40px;
   }
+  .remove-field-btn {
+    position: absolute;
+    top: 50%;
+    right: 0;
+    transform: translateY(-50%);
+    margin-left: 8px; 
+}
 
   .add-field-btn {
     margin-top: 16px;
@@ -89,7 +96,21 @@ mat-card {
         }
       }
     }
+    mat-radio-group {
+      display: flex;
+      flex-direction: column;
+      gap: 0;
+    }
+
+    mat-radio-button {
+      display: block;
+      margin-bottom: -0.7rem;
+      /* Optional: Adds spacing between buttons */
+    }
 
+    // .error{
+    //   color: red;
+    // }
     .EMDB-ID {
       width: 15%;
     }
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 5cea0d5a7d..fe3b5beb56 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -87,15 +87,15 @@ export class OneDepComponent implements OnInit {
       }),
     );
     this.form = this.fb.group({
+      email: this.user.email,
+      jwtToken: new FormControl(""),
       metadata: this.dataset.scientificMetadata,
       experiments: this.fb.array([]),
       emMethod: new FormControl(""),
-      deposingCoordinates: new FormControl(true),
-      associatedMap: new FormControl(false),
-      compositeMap: new FormControl(false),
+      deposingCoordinates: new FormControl(null, Validators.required),
+      associatedMap: new FormControl(null, Validators.required),
+      compositeMap: new FormControl(null, Validators.required),
       emdbId: new FormControl(""),
-      email: this.user.email,
-      jwtToken: new FormControl(""),
       orcid: this.fb.array([]),
     })
   }
@@ -193,7 +193,6 @@ export class OneDepComponent implements OnInit {
       }
     }
     formDataToSend.append('fileMetadata', JSON.stringify(fileMetadata));
-
     this.http.post("http://localhost:8080/onedep", formDataToSend, {
       headers: {}
     }).subscribe(

From e4c96a994115aae754e4f94da9660705ba06e93f Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 28 Nov 2024 11:33:59 +0000
Subject: [PATCH 034/245] wip: make calls to oneDepAPI from frontend

---
 src/app/datasets/onedep/onedep.component.html | 244 +++++++++---------
 src/app/datasets/onedep/onedep.component.scss | 109 ++++----
 src/app/datasets/onedep/onedep.component.ts   |  35 ++-
 3 files changed, 209 insertions(+), 179 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index c96828f1d7..b1f021585f 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -55,19 +55,77 @@
                     <div mat-card-avatar class="section-icon">
                         <mat-icon> blur_linear </mat-icon>
                     </div>
-                    Method Information:
+                    Administrative and Method Information:
                 </mat-card-header>
 
-                <mat-card-content>
-                    <table>
+                <div class="card-container">
+                    <div class="card-left">
+                        <h2>Obtain OneDep Token</h2>
+                        <p class="instruction">Add instruction how to get it</p>
+                        <mat-form-field 
+                            class="token-field"
+                            appearance="outline">
+                            <mat-label>Token</mat-label>
+                            <textarea 
+                                matInput
+                                required
+                                placeholder="copy the token here"
+                                rows="1"
+                                formControlName="jwtToken" 
+                                (input)="autoGrow($event)"
+                                [style.overflow]="detailsOverflow"></textarea>
+                        </mat-form-field>
+                    </div>
+                    <div class="card-middle">
+                        <h2>Enter 16-digit ORCID iD</h2>
+                        <p class="instruction">Owners of these ORCIDs iDs are
+                            allowed to access this deposition.</p>
+                        
+                            <!-- Link the orcid FormArray -->
+                            <div formArrayName="orcid">
+                                <ng-container
+                                    *ngFor="let field of orcidArray.controls; let i = index">
+                                    <div [formGroupName]="i">
+                                        <mat-form-field 
+                                            class="data-field"
+                                            appearance="outline">
+                                            <mat-label>Enter 16-digits ORCID iD</mat-label>
+                                            <div class="input-container">
+                                            <input 
+                                                matInput 
+                                                type="text"
+                                                maxlength="19"
+                                                placeholder="xxxx-xxxx-xxxx-xxxx"
+                                                formControlName="orcidId"
+                                                orcidFormatter>
+                                                <button 
+                                                mat-icon-button 
+                                                class="remove-field-btn" 
+                                                (click)="removeOrcidField(i)">
+                                                <mat-icon>clear</mat-icon>    
+                                            </button>                                    
+                                            </div>
+                                        </mat-form-field>
+                                    </div>
+                                </ng-container>
+                            </div>
+                            <button 
+                                mat-icon-button 
+                                class="add-field-btn" 
+                                (click)="addOrcidField()">
+                                <mat-icon>add</mat-icon>
+                            </button>
+                        
+                    </div>
+                    
+                    <div class="card-right">
+                    
                         <!-- Question 1: Electron Microscopy Method -->
-                        <th class="questionnaire">Choose Electron Microscopy
-                            Method</th>
+                        <h2>Choose Electron Microscopy
+                            Method</h2>
                         <mat-form-field class="method-name">
                             <mat-label>experimental method</mat-label>
-                            <mat-select 
-                                required
-                                formControlName="emMethod"
+                            <mat-select required formControlName="emMethod"
                                 name="method">
                                 <mat-option *ngFor="let method of methodsList"
                                     [value]="method.value">
@@ -75,7 +133,8 @@
                                 </mat-option>
                             </mat-select>
                             <!-- Error Message -->
-                            <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error">
+                            <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched"
+                                class="error">
                                 You must specify the experimental method
                             </div>
                         </mat-form-field>
@@ -87,18 +146,14 @@
                                 coordinates with this
                                 submission? (for PDB)</th>
                             <td>
-                                <mat-radio-group
-                                    reuired
+                                <mat-radio-group reuired
                                     formControlName="deposingCoordinates">
-                                    <mat-radio-button 
-                                        name="deposingCoordinates"
-                                        value=true >
+                                    <mat-radio-button name="deposingCoordinates"
+                                        value=true>
                                         Yes
                                     </mat-radio-button>
-                                    <mat-radio-button 
-                                        name="deposingCoordinates"
-                                        value=false
-                                        checked>
+                                    <mat-radio-button name="deposingCoordinates"
+                                        value=false checked>
                                         No
                                     </mat-radio-button>
                                 </mat-radio-group>
@@ -109,17 +164,13 @@
                             <th>Has an associated map been deposited to EMDB?
                             </th>
                             <td>
-                                <mat-radio-group
-                                    reuired
+                                <mat-radio-group reuired
                                     formControlName="associatedMap">
-                                    <mat-radio-button 
-                                        name="associatedMap"
-                                        value=true 
-                                        >
+                                    <mat-radio-button name="associatedMap"
+                                        value=true>
                                         Yes
                                     </mat-radio-button>
-                                    <mat-radio-button 
-                                        name="associatedMap"
+                                    <mat-radio-button name="associatedMap"
                                         value=false>
                                         No
                                     </mat-radio-button>
@@ -128,14 +179,13 @@
                         </tr>
 
                         <!-- EMDB Identifier Field -->
-                        <tr *ngIf="form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
+                        <tr
+                            *ngIf="form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
                             <th>EMDB Identifier</th>
                             <td>
                                 <mat-form-field class="EMDB-ID">
                                     <mat-label>EMDB ID</mat-label>
-                                    <input 
-                                        required
-                                        matInput 
+                                    <input required matInput
                                         formControlName="emdbId" />
                                 </mat-form-field>
                             </td>
@@ -146,100 +196,28 @@
                             <th class="questionnaire">Is this a composite map?
                             </th>
                             <td>
-                                <mat-radio-group 
-                                    required
+                                <mat-radio-group required
                                     formControlName="compositeMap">
                                     <mat-radio-button name="compositeMap"
                                         value=true>
                                         Yes
                                     </mat-radio-button>
-                                    <mat-radio-button 
-                                        name="compositeMap"
-                                        value=false 
-                                        checked>
+                                    <mat-radio-button name="compositeMap"
+                                        value=false checked>
                                         No
                                     </mat-radio-button>
                                 </mat-radio-group>
                             </td>
                         </tr>
-                    </table>
-                </mat-card-content>
-            </mat-card>
-            <mat-card >
-                <form [formGroup]="form">
-                <mat-card-header class="related-header">
-                    <div mat-card-avatar class="section-icon">
-                        <mat-icon>assignment_ind</mat-icon>
-                    </div>
-                    <span>Administrative</span>
-                </mat-card-header>
-
-                <div class="card-container">
-                    <!-- Left Section -->
-                    <div class="card-left">
-                        <h2>Obtain OneDep Token</h2>
-                        <p class="instruction">Add instruction how to get it</p>
-                        <mat-form-field 
-                            class="token-field"
-                            appearance="outline">
-                            <mat-label>Token</mat-label>
-                            <input 
-                                required
-                                matInput
-                                placeholder="copy the token text here"
-                                formControlName="jwtToken" />
-                        </mat-form-field>
-                    </div>
-
-                    <!-- Right Section -->
-                    <div class="card-right">
-                        <h2>Enter 16-digit ORCID iD</h2>
-                        <p class="instruction">Owners of these ORCIDs iDs are
-                            allowed to access this deposition.</p>
-                        
-                            <!-- Link the orcid FormArray -->
-                            <div formArrayName="orcid">
-                                <ng-container
-                                    *ngFor="let field of orcidArray.controls; let i = index">
-                                    <div [formGroupName]="i">
-                                        <mat-form-field 
-                                            class="data-field"
-                                            appearance="outline">
-                                            <mat-label>Enter 16-digits ORCID iD</mat-label>
-                                            <div class="input-container">
-                                            <input 
-                                                matInput 
-                                                type="text"
-                                                maxlength="19"
-                                                placeholder="xxxx-xxxx-xxxx-xxxx"
-                                                formControlName="orcidId"
-                                                orcidFormatter>
-                                                <button 
-                                                mat-icon-button 
-                                                class="remove-field-btn" 
-                                                (click)="removeOrcidField(i)">
-                                                <mat-icon>clear</mat-icon>    
-                                            </button>                                    
-                                            </div>
-                                        </mat-form-field>
-                                    </div>
-                                </ng-container>
-                            </div>
-                            <button 
-                                mat-icon-button 
-                                class="add-field-btn" 
-                                (click)="addOrcidField()">
-                                <mat-icon>add</mat-icon>
-                            </button>
-                        
                     </div>
                 </div>
-                </form>
+                <button class="submitDep" mat-raised-button color="primary"
+                (click)="onCreateClick()">
+                Create Deposition
+                </button>
             </mat-card>
 
 
-            
-
             <mat-card>
                 <mat-card-header class="file-header">
                     <div mat-card-avatar class="section-icon">
@@ -248,33 +226,43 @@ <h2>Enter 16-digit ORCID iD</h2>
                     Choose files for deposition
                 </mat-card-header>
                 <mat-card-content>
-                    <mat-card *ngFor="let fileType of fileTypes" class="fileCard">
-                        <ng-container *ngIf="fileType.key !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
+                    <mat-card *ngFor="let fileType of fileTypes"
+                        class="fileCard">
+                        <ng-container
+                            *ngIf="fileType.key !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
                             <mat-card-header>
-                                <mat-card-title>{{ fileType.header }}</mat-card-title>
+                                <mat-card-title>{{ fileType.header
+                                    }}</mat-card-title>
                             </mat-card-header>
                             <mat-card-content>
                                 <div class="file-selection-container">
-                                    <button class="fileChooser" mat-raised-button color="primary" (click)="onChooseFile(fileInput)">
+                                    <button class="fileChooser"
+                                        mat-raised-button color="primary"
+                                        (click)="onChooseFile(fileInput)">
                                         Choose File
                                     </button>
                                     <div *ngIf="selectedFile[fileType.key]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
-                                    <input type="file" #fileInput (change)="onFileSelected($event, fileType.key)" style="display: none;" />
-                                    <div *ngIf="selectedFile[fileType.key]" class="fileName">
-                                        <p>Selected File: {{ selectedFile[fileType.key].name }}</p>
+                                    <input type="file" #fileInput
+                                        (change)="onFileSelected($event, fileType.key)"
+                                        style="display: none;" />
+                                    <div *ngIf="selectedFile[fileType.key]"
+                                        class="fileName">
+                                        <p>Selected File: {{
+                                            selectedFile[fileType.key].name }}
+                                        </p>
                                     </div>
                                 </div>
-                    
+
                                 <div class="input-container">
-                                    <ng-container *ngIf="files[fileType.key]?.contour !== undefined">
-                                        <mat-form-field appearance="outline" class="contour-level">
+                                    <ng-container
+                                        *ngIf="files[fileType.key]?.contour !== undefined">
+                                        <mat-form-field appearance="outline"
+                                            class="contour-level">
                                             <mat-label>Contour Level</mat-label>
-                                            <input 
-                                                matInput type="number" 
-                                                placeholder="e.g. 0.0"
-                                                required
+                                            <input matInput type="number"
+                                                placeholder="e.g. 0.0" required
                                                 [value]="files[fileType.key]?.contour || ''"
                                                 (input)="fileType.key === 'vo-map' ? updateContourLevelMain($event) : updateContourLevel($event, fileType.key)" />
                                         </mat-form-field>
@@ -286,14 +274,18 @@ <h2>Enter 16-digit ORCID iD</h2>
                                     </ng-container>
                                     <mat-form-field class="details">
                                         <mat-label>Details</mat-label>
-                                        <textarea matInput placeholder="Enter details..." rows="1" (input)="updateDetails($event, fileType.key)"
-                                                  (input)="autoGrow($event)" [style.overflow]="detailsOverflow"></textarea>
+                                        <textarea matInput
+                                            placeholder="Enter details..."
+                                            rows="1"
+                                            (input)="updateDetails($event, fileType.key)"
+                                            (input)="autoGrow($event)"
+                                            [style.overflow]="detailsOverflow"></textarea>
                                     </mat-form-field>
                                 </div>
                             </mat-card-content>
                         </ng-container>
                     </mat-card>
-                    
+
 
                     <!-- UPLOAD FILES DONE -->
                     <button class="submitDep" mat-raised-button color="primary"
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index c6a24f75f1..5f2bd34f19 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -13,11 +13,19 @@ mat-card {
   .card-container {
     display: flex;
     justify-content: space-between;
-    align-items: start;
+    align-items: flex-start;
+    gap: 16px;
     padding: 16px;
+    margin-bottom: 16px;
   }
 
   .card-left {
+    flex: 1;
+    margin-left: 20px;
+    margin-right: 16px;
+  }
+
+  .card-middle {
     flex: 1;
     margin-right: 16px;
   }
@@ -26,10 +34,8 @@ mat-card {
     flex: 1;
     display: flex;
     flex-direction: column;
-    /* Stack fields vertically */
   }
 
-
   .file-header {
     display: flex;
     margin-bottom: 16px;
@@ -40,27 +46,28 @@ mat-card {
   }
 
   .token-field {
-    width: 100%;
+    width: 70%;
     height: 20px;
     margin-bottom: 8px;
     margin-top: 0;
   }
 
-  .data-field {
-    width: 30%;
+  .orcid-field {
+    width: 40%;
     height: 20px;
     margin-bottom: 40px;
   }
+
   .remove-field-btn {
     position: absolute;
     top: 50%;
-    right: 0;
+    right: -30%;
     transform: translateY(-50%);
-    margin-left: 8px; 
-}
+    margin-left: 8px;
+  }
 
   .add-field-btn {
-    margin-top: 16px;
+    margin-top: 5px;
     color: rgba(0, 0, 0, 0.6);
     transition: color 0.3s ease;
   }
@@ -73,61 +80,60 @@ mat-card {
     font-size: 24px;
   }
 
-  table {
-    th {
-      .questionnaire {
-        min-width: 20rem;
-      }
 
-      min-width: 10rem;
-      padding-right: 0.5rem;
-      text-align: left;
+  th {
+    .questionnaire {
+      min-width: 20rem;
     }
 
-    td {
-      width: 100%;
-      padding: 0.5rem 0;
+    min-width: 10rem;
+    padding-right: 0.5rem;
+    text-align: left;
+  }
 
-      .sample-edit {
-        padding-left: 0.5rem;
+  td {
+    width: 100%;
+    padding: 0.5rem 0;
 
-        mat-icon {
-          font-size: medium;
-        }
+    .sample-edit {
+      padding-left: 0.5rem;
+
+      mat-icon {
+        font-size: medium;
       }
     }
-    mat-radio-group {
-      display: flex;
-      flex-direction: column;
-      gap: 0;
-    }
+  }
 
-    mat-radio-button {
-      display: block;
-      margin-bottom: -0.7rem;
-      /* Optional: Adds spacing between buttons */
-    }
+  mat-radio-group {
+    display: flex;
+    flex-direction: column;
+    gap: 0;
+  }
 
-    // .error{
-    //   color: red;
-    // }
-    .EMDB-ID {
-      width: 15%;
-    }
+  mat-radio-button {
+    display: block;
+    margin-bottom: -0.7rem;
+    /* Optional: Adds spacing between buttons */
+  }
 
-    .method-name {
-      width: 25%;
-    }
 
-    .file-types {
-      width: 10%;
-    }
+  .EMDB-ID {
+    width: 50%;
+  }
 
-    .full-width {
-      width: 100%;
-    }
+  .method-name {
+    width: 50%;
+  }
+
+  .file-types {
+    width: 10%;
   }
 
+  .full-width {
+    width: 100%;
+  }
+
+
   .fileCard {
     width: 80%;
     margin: 10px 0 10px 0;
@@ -222,5 +228,6 @@ mat-card {
 
   .submitDep {
     background-color: #B3D9AC;
+    color:black;
   }
 }
\ No newline at end of file
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index fe3b5beb56..68ada646ef 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -37,7 +37,6 @@ export class OneDepComponent implements OnInit {
   form: FormGroup;
   showAssociatedMapQuestion: boolean = false;
   methodsList = MethodsList;
-  // experiments = Experiments;
   experiment: OneDepExperiment
   selectedFile: { [key: string]: File | null } = {};
   emFile = EmFile;
@@ -96,7 +95,7 @@ export class OneDepComponent implements OnInit {
       associatedMap: new FormControl(null, Validators.required),
       compositeMap: new FormControl(null, Validators.required),
       emdbId: new FormControl(""),
-      orcid: this.fb.array([]),
+      orcid: this.fb.array(['']),
     })
   }
 
@@ -205,4 +204,36 @@ export class OneDepComponent implements OnInit {
     );
 
   }
+
+  onCreateClick(){
+    let bearer = 'Bearer ' + this.form.value['jwtToken'];
+    const headers = new HttpHeaders()
+    .append(
+      'Content-Type',
+      'application/json'
+    )
+    .append( 
+      'Authorization', 
+      bearer
+    );
+
+    const body=JSON.stringify(
+      { 
+        "email": "sofya.laskina@epfl.ch",
+        "users": ["0009-0003-3665-5367"],
+        "country": "United States",
+        "experiments": [Experiments[this.form.value.emMethod]],
+      }
+    );
+
+    this.http
+      .post('https://onedep-depui-test.wwpdb.org/deposition/api/v1/depositions/new', body, {
+        headers: headers,
+      })
+      .subscribe((res) => console.log(res));
+
+  }
+
 }
+
+

From 81dff2e13a92eb353a5dedb3c3efe14418506ac3 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 3 Dec 2024 13:42:30 +0000
Subject: [PATCH 035/245] functions well

---
 src/app/datasets/onedep/onedep.component.html |  49 +--
 src/app/datasets/onedep/onedep.component.scss |   2 +-
 src/app/datasets/onedep/onedep.component.ts   | 182 +++++++----
 src/app/datasets/onedep/types/methods.enum.ts | 282 +++++++++++++-----
 4 files changed, 348 insertions(+), 167 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index b1f021585f..54aecdb542 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -84,7 +84,7 @@ <h2>Enter 16-digit ORCID iD</h2>
                             <!-- Link the orcid FormArray -->
                             <div formArrayName="orcid">
                                 <ng-container
-                                    *ngFor="let field of orcidArray.controls; let i = index">
+                                    *ngFor="let field of orcidArray().controls; let i = index">
                                     <div [formGroupName]="i">
                                         <mat-form-field 
                                             class="data-field"
@@ -125,13 +125,17 @@ <h2>Choose Electron Microscopy
                             Method</h2>
                         <mat-form-field class="method-name">
                             <mat-label>experimental method</mat-label>
-                            <mat-select required formControlName="emMethod"
-                                name="method">
+                            <mat-select 
+                                required
+                                formControlName="emMethod"
+                                name="method"
+                                (selectionChange)="onMethodChange()">
                                 <mat-option *ngFor="let method of methodsList"
                                     [value]="method.value">
                                     {{ method.viewValue }}
                                 </mat-option>
                             </mat-select>
+                            
                             <!-- Error Message -->
                             <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched"
                                 class="error">
@@ -141,13 +145,14 @@ <h2>Choose Electron Microscopy
 
 
                         <!-- Question 2: PDB Deposition -->
-                        <tr>
+                        <tr *ngIf="form.value['emMethod'] && form.value['emMethod'] !== 'tomogram'">
                             <th class="questionnaire">Are you deposing
                                 coordinates with this
                                 submission? (for PDB)</th>
                             <td>
                                 <mat-radio-group reuired
-                                    formControlName="deposingCoordinates">
+                                    formControlName="deposingCoordinates"
+                                    (change)="onPDB($event)">
                                     <mat-radio-button name="deposingCoordinates"
                                         value=true>
                                         Yes
@@ -160,7 +165,7 @@ <h2>Choose Electron Microscopy
                             </td>
                         </tr>
                         <tr
-                            *ngIf="form.get('deposingCoordinates')?.value === 'true'">
+                            *ngIf="form.value['emMethod'] && form.get('deposingCoordinates')?.value === 'true'">
                             <th>Has an associated map been deposited to EMDB?
                             </th>
                             <td>
@@ -180,7 +185,7 @@ <h2>Choose Electron Microscopy
 
                         <!-- EMDB Identifier Field -->
                         <tr
-                            *ngIf="form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
+                            *ngIf="form.value['emMethod'] && form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
                             <th>EMDB Identifier</th>
                             <td>
                                 <mat-form-field class="EMDB-ID">
@@ -192,7 +197,7 @@ <h2>Choose Electron Microscopy
                         </tr>
 
                         <!-- Final Question: Composite Map -->
-                        <tr>
+                        <tr *ngIf=" form.value['emMethod']">
                             <th class="questionnaire">Is this a composite map?
                             </th>
                             <td>
@@ -211,13 +216,13 @@ <h2>Choose Electron Microscopy
                         </tr>
                     </div>
                 </div>
-                <button class="submitDep" mat-raised-button color="primary"
+                <!-- <button class="submitDep" mat-raised-button color="primary"
                 (click)="onCreateClick()">
                 Create Deposition
-                </button>
+                </button> -->
             </mat-card>
 
-
+            <!-- Attachments -->
             <mat-card>
                 <mat-card-header class="file-header">
                     <div mat-card-avatar class="section-icon">
@@ -229,10 +234,10 @@ <h2>Choose Electron Microscopy
                     <mat-card *ngFor="let fileType of fileTypes"
                         class="fileCard">
                         <ng-container
-                            *ngIf="fileType.key !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
+                            *ngIf="fileType.emName !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
                             <mat-card-header>
-                                <mat-card-title>{{ fileType.header
-                                    }}</mat-card-title>
+                                <mat-card-title>{{ fileType.nameFE}} <span class="required-asterisk" *ngIf="isRequired(fileType.emName)"> *</span></mat-card-title>
+                                
                             </mat-card-header>
                             <mat-card-content>
                                 <div class="file-selection-container">
@@ -241,30 +246,30 @@ <h2>Choose Electron Microscopy
                                         (click)="onChooseFile(fileInput)">
                                         Choose File
                                     </button>
-                                    <div *ngIf="selectedFile[fileType.key]">
+                                    <div *ngIf="selectedFile[fileType.emName]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
                                     <input type="file" #fileInput
-                                        (change)="onFileSelected($event, fileType.key)"
+                                        (change)="onFileSelected($event, fileType.emName)"
                                         style="display: none;" />
-                                    <div *ngIf="selectedFile[fileType.key]"
+                                    <div *ngIf="selectedFile[fileType.emName]"
                                         class="fileName">
                                         <p>Selected File: {{
-                                            selectedFile[fileType.key].name }}
+                                            selectedFile[fileType.emName].name }}
                                         </p>
                                     </div>
                                 </div>
 
                                 <div class="input-container">
                                     <ng-container
-                                        *ngIf="files[fileType.key]?.contour !== undefined">
+                                        *ngIf="fileType.contour !== undefined">
                                         <mat-form-field appearance="outline"
                                             class="contour-level">
                                             <mat-label>Contour Level</mat-label>
                                             <input matInput type="number"
                                                 placeholder="e.g. 0.0" required
-                                                [value]="files[fileType.key]?.contour || ''"
-                                                (input)="fileType.key === 'vo-map' ? updateContourLevelMain($event) : updateContourLevel($event, fileType.key)" />
+                                                [value]="fileType.contour || ''"
+                                                (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : updateContourLevel($event, fileType.emName)" />
                                         </mat-form-field>
                                         <!-- Error Message -->
                                         <!-- FIX ME -->
@@ -277,7 +282,7 @@ <h2>Choose Electron Microscopy
                                         <textarea matInput
                                             placeholder="Enter details..."
                                             rows="1"
-                                            (input)="updateDetails($event, fileType.key)"
+                                            (input)="updateDetails($event, fileType.emName)"
                                             (input)="autoGrow($event)"
                                             [style.overflow]="detailsOverflow"></textarea>
                                     </mat-form-field>
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index 5f2bd34f19..8b16ccae5d 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -61,7 +61,7 @@ mat-card {
   .remove-field-btn {
     position: absolute;
     top: 50%;
-    right: -30%;
+    right: -40%;
     transform: translateY(-50%);
     margin-left: 8px;
   }
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 68ada646ef..050444632d 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -18,7 +18,7 @@ import {
   selectCurrentUser
 } from "state-management/selectors/user.selectors";
 import { User } from "shared/sdk";
-import { MethodsList, OneDepExperiment, Experiments, EmFile, EmFiles } from "./types/methods.enum"
+import { MethodsList, OneDepExperiment, EmFile, DepositionFiles } from "./types/methods.enum"
 import { Subscription, fromEvent } from "rxjs";
 
 
@@ -40,23 +40,12 @@ export class OneDepComponent implements OnInit {
   experiment: OneDepExperiment
   selectedFile: { [key: string]: File | null } = {};
   emFile = EmFile;
-  files = EmFiles;
+  fileTypes: DepositionFiles[];
   detailsOverflow: string = 'hidden';
 
 
   @ViewChild('fileInput') fileInput: ElementRef<HTMLInputElement> | undefined;
 
-  fileTypes = [
-    { header: 'Main Map', key: this.emFile.MainMap },
-    { header: 'Half Map (1)', key: this.emFile.HalfMap1 },
-    { header: 'Half Map (2)', key: this.emFile.HalfMap2 },
-    { header: 'Mask Map', key: this.emFile.MaskMap },
-    { header: 'Additional Map', key: this.emFile.AddMap },
-    { header: 'Coordinates', key: this.emFile.Coordinates },
-    { header: 'Public Image', key: this.emFile.Image },
-    { header: 'FSC-XML', key: this.emFile.FSC },
-  ];
-
   constructor(public appConfigService: AppConfigService,
     private store: Store,
     private http: HttpClient,
@@ -95,31 +84,74 @@ export class OneDepComponent implements OnInit {
       associatedMap: new FormControl(null, Validators.required),
       compositeMap: new FormControl(null, Validators.required),
       emdbId: new FormControl(""),
-      orcid: this.fb.array(['']),
+      orcid: this.fb.array([
+        this.fb.group({
+          orcidId: ['', [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)]],
+        })
+      ]),
     })
   }
-
-  get orcidArray(): FormArray {
-    return this.form.get('orcid') as FormArray;
-  }
-
   hasUnsavedChanges() {
     return this._hasUnsavedChanges;
   }
   onHasUnsavedChanges($event: boolean) {
     this._hasUnsavedChanges = $event;
   }
-  addOrcidField(): void {
+  orcidArray(): FormArray {
+    return this.form.get('orcid') as FormArray;
+  }
+  addOrcidField() {
     const orcidField = this.fb.group({
       orcidId: ['', [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)]],
     });
-    this.orcidArray.push(orcidField);
+    this.orcidArray().push(orcidField);
+  }
+  removeOrcidField(index: number) {
+    if (this.orcidArray().length > 1) { 
+      this.orcidArray().removeAt(index);
+    }
+  }
+  onMethodChange() {
+    this.fileTypes = this.methodsList.find(mL => mL.value === this.form.value['emMethod']).files;
+    console.log("files", this.fileTypes)
+    this.fileTypes.forEach((fT) => {
+      if (fT.emName === this.emFile.MainMap || fT.emName === this.emFile.Image) {
+        fT.required = true;
+      }else{
+        fT.required = false;
+      }
+    });
+    switch (this.form.value['emMethod']) {
+      case 'helical':
+        this.fileTypes.forEach((fT) => {
+          if (fT.emName === this.emFile.HalfMap1 || fT.emName === this.emFile.HalfMap2) {
+            fT.required = true;
+          }
+        });
+        break;
+      case "single-particle":
+        this.fileTypes.forEach((fT) => {
+          if (fT.emName === this.emFile.HalfMap1 || fT.emName === this.emFile.HalfMap2 || fT.emName === this.emFile.MaskMap) {
+            fT.required = true;
+          }
+        });
+        break;
+    }
+
   }
-  removeOrcidField(index: number): void {
-    this.orcidArray.removeAt(index);
+
+  onPDB(event: any) {
+    const input = event.value;
+    if (input === 'true') {
+      this.fileTypes.forEach((fT) => {
+        if (fT.emName === this.emFile.Coordinates ) {
+          fT.required = true;
+        }
+      });
+    }
   }
 
-  autoGrow(event: Event): void {
+  autoGrow(event: Event) {
     const textarea = event.target as HTMLTextAreaElement;
     const lineHeight = parseInt(getComputedStyle(textarea).lineHeight, 10);
     const maxLines = 5;
@@ -134,25 +166,38 @@ export class OneDepComponent implements OnInit {
     // Update overflow property based on height
     this.detailsOverflow = textarea.scrollHeight > newHeight ? 'auto' : 'hidden';
   }
-  onChooseFile(fileInput: HTMLInputElement): void {
+  onChooseFile(fileInput: HTMLInputElement) {
     fileInput.click();
   }
   onFileSelected(event: Event, controlName: EmFile) {
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
       this.selectedFile[controlName] = input.files[0];
-      this.files[controlName].file = this.selectedFile[controlName];
-      this.files[controlName].name = this.selectedFile[controlName].name;
+      this.fileTypes.forEach((fT) => {
+        if (fT.emName === controlName) {
+          fT.file = this.selectedFile[controlName];
+          fT.fileName = this.selectedFile[controlName].name;
+        }
+      });
     }
   }
+  isRequired(controlName: string): boolean {
+    let value: boolean;
+    this.fileTypes.forEach((fT) => {
+      if (fT.emName === controlName) {
+        value = fT.required;
+      }
+    });
+    return value;
+  }
   updateContourLevelMain(event: Event) {
     const input = (event.target as HTMLInputElement).value.trim();
     const normalizedInput = input.replace(',', '.');
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
-      [EmFile.MainMap, EmFile.HalfMap1, EmFile.HalfMap2].forEach((key) => {
-        if (this.files[key]) {
-          this.files[key].contour = parsedValue;
+      this.fileTypes.forEach((fT) => {
+        if (fT.emName === EmFile.MainMap || fT.emName === EmFile.HalfMap1 || fT.emName === EmFile.HalfMap2) {
+          fT.contour = parsedValue;
         }
       });
     } else {
@@ -164,7 +209,11 @@ export class OneDepComponent implements OnInit {
     const normalizedInput = input.replace(',', '.');
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
-      this.files[controlName].contour = parsedValue;
+      this.fileTypes.forEach((fT) => {
+        if (fT.emName === controlName) {
+          fT.contour = parsedValue;
+        }
+      });
     } else {
       console.warn('Invalid number format:', input);
     }
@@ -172,10 +221,14 @@ export class OneDepComponent implements OnInit {
   updateDetails(event: Event, controlName: EmFile) {
     const textarea = event.target as HTMLTextAreaElement; // Cast to HTMLTextAreaElement
     const value = textarea.value;
-    if (this.files[controlName]) {
-      this.files[controlName].details = value;
-    }
+    this.fileTypes.forEach((fT) => {
+      if (fT.emName === controlName) {
+        fT.details = value;
+      }
+    });
+
   }
+
   onDepositClick() {
     const formDataToSend = new FormData();
     formDataToSend.append('email', this.form.value.email);
@@ -185,12 +238,13 @@ export class OneDepComponent implements OnInit {
     // emdbId: this.form.value.emdbId, 
     var fileMetadata = []
 
-    for (const key in this.files) {
-      if (this.files[key].file) {
-        formDataToSend.append('file', this.files[key].file);
-        fileMetadata.push({ name: this.files[key].name, type: this.files[key].type, contour: this.files[key].contour, details: this.files[key].details });
+    // for (const fI in this.fileTypes) {
+    this.fileTypes.forEach((fT) => {
+      if (fT.file) {
+        formDataToSend.append('file', fT.file);
+        fileMetadata.push({ name: fT.fileName, type: fT.type, contour: fT.contour, details: fT.details });
       }
-    }
+    });
     formDataToSend.append('fileMetadata', JSON.stringify(fileMetadata));
     this.http.post("http://localhost:8080/onedep", formDataToSend, {
       headers: {}
@@ -205,34 +259,34 @@ export class OneDepComponent implements OnInit {
 
   }
 
-  onCreateClick(){
-    let bearer = 'Bearer ' + this.form.value['jwtToken'];
-    const headers = new HttpHeaders()
-    .append(
-      'Content-Type',
-      'application/json'
-    )
-    .append( 
-      'Authorization', 
-      bearer
-    );
+  //   onCreateClick() {
+  //     let bearer = 'Bearer ' + this.form.value['jwtToken'];
+  //     const headers = new HttpHeaders()
+  //       .append(
+  //         'Content-Type',
+  //         'application/json'
+  //       )
+  //       .append(
+  //         'Authorization',
+  //         bearer
+  //       );
 
-    const body=JSON.stringify(
-      { 
-        "email": "sofya.laskina@epfl.ch",
-        "users": ["0009-0003-3665-5367"],
-        "country": "United States",
-        "experiments": [Experiments[this.form.value.emMethod]],
-      }
-    );
+  //     const body = JSON.stringify(
+  //       {
+  //         "email": "sofya.laskina@epfl.ch",
+  //         "users": ["0009-0003-3665-5367"],
+  //         "country": "United States",
+  //         "experiments": [Experiments[this.form.value.emMethod]],
+  //       }
+  //     );
 
-    this.http
-      .post('https://onedep-depui-test.wwpdb.org/deposition/api/v1/depositions/new', body, {
-        headers: headers,
-      })
-      .subscribe((res) => console.log(res));
+  //     this.http
+  //       .post('https://onedep-depui-test.wwpdb.org/deposition/api/v1/depositions/new', body, {
+  //         headers: headers,
+  //       })
+  //       .subscribe((res) => console.log(res));
 
-  }
+  //   }
 
 }
 
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index fee0239705..008503e18d 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -15,96 +15,218 @@ export enum EmFile {
     Coordinates = 'co-cif',
     Image = 'img-emdb',
     FSC = 'fsc-xml',
+    LayerLines = "layer-lines",
+    StructureFactors = "xs-cif",
+    MTZ = "xs-mtz",
 };
 
-export const EmFiles: { [f in EmFile]: OneDepFile } = {
-    [EmFile.MainMap]: {
-        name: "",
-        type: "vo-map",
-        file: null,
-        contour: 0.0,
-        details: "",
-    },
-    [EmFile.HalfMap1]: {
-        name: "",
-        type: "half-map",
-        file: null,
-        contour: 0.0,
-        details: "",
-    },
-    [EmFile.HalfMap2]: {
-        name: "",
-        type: "half-map",
-        file: null,
-        contour: 0.0,
-        details: "",
-    },
-    [EmFile.MaskMap]: {
-        name: "",
-        type: "mask-map",
-        file: null,
-        contour: 0.0,
-        details: "",
-    },
-    [EmFile.AddMap]: {
-        name: "",
-        type: "add-map",
-        file: null,
-        contour: 0.0,
-        details: "",
-    },
-    [EmFile.Coordinates]: {
-        name: "",
-        type: "co-cif",
-        file: null,
-        details: "",
-    },
-    [EmFile.Image]: {
-        name: "",
-        type: "img-emdb",
-        file: null,
-        details: "",
-    },
-    [EmFile.FSC]: {
-        name: "",
-        type: "fsc-xml",
-        file: null,
-        details: "",
-    },
-};
-
-interface EmMethod {
-    value: EmType;
-    viewValue: string;
-}
-
-
-export const MethodsList: EmMethod[] = [
-    { value: EmType.Helical, viewValue: 'Helical' },
-    { value: EmType.SingleParticle, viewValue: 'Single Particle' },
-    { value: EmType.SubtomogramAveraging, viewValue: 'Subtomogram Averaging' },
-    { value: EmType.Tomogram, viewValue: 'Tomogram' },
-    { value: EmType.ElectronCristallography, viewValue: 'Electron Crystallography' },
-];
-
-
 export interface OneDepExperiment {
     type: string;
     subtype?: string;
 }
 
-export const Experiments: { [e in EmType]: OneDepExperiment } = {
-    [EmType.Helical]: { type: "em", subtype: "helical" },
-    [EmType.SingleParticle]: { type: "em", subtype: "single" },
-    [EmType.SubtomogramAveraging]: { type: "em", subtype: "subtomogram" },
-    [EmType.Tomogram]: { type: "em", subtype: "tomography" },
-    [EmType.ElectronCristallography]: { type: "ec" }
-};
-export interface OneDepFile {
-    name: string,
+export interface DepositionFiles {
+    emName: EmFile;
+    nameFE: string;
     type: string,
+    fileName: string,
     file: File,
     contour?: number,
     details?: string,
+    required: boolean,
+}
+
+interface EmMethod {
+    value: EmType;
+    viewValue: string;
+    experiment: OneDepExperiment;
+    files:  DepositionFiles[];
+}
+
+export const DepositionImage: DepositionFiles ={
+    emName: EmFile.Image,
+    nameFE: 'Public Image',
+    type: "img-emdb",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+}
+export const DepositionMainMap:DepositionFiles ={
+    emName: EmFile.MainMap,
+    nameFE: 'Main Map',
+    type: "vo-map",
+    fileName: "",
+    file: null,
+    contour: 0.0,
+    details: "",
+    required: false,
+}
+export const DepositionHalfMap1:DepositionFiles ={
+    emName: EmFile.HalfMap1,
+    nameFE: 'Half Map (1)',
+    type: "half-map",
+    fileName: "",
+    file: null,
+    contour: 0.0,
+    details: "",
+    required: false,
+}
+export const DepositionHalfMap2:DepositionFiles ={
+    emName: EmFile.HalfMap2,
+    nameFE: 'Half Map (2)',
+    type: "half-map",
+    fileName: "",
+    file: null,
+    contour: 0.0,
+    details: "",
+    required: false,
+}
+export const DepositionMaskMap:DepositionFiles ={
+    emName: EmFile.MaskMap,
+    nameFE: 'Mask Map',
+    type: "mask-map",
+    fileName: "",
+    file: null,
+    contour: 0.0,
+    details: "",
+    required: false,
+}
+export const DepositionAddMap:DepositionFiles ={
+    emName: EmFile.AddMap,
+    nameFE: 'Additional Map',
+    type: "add-map",
+    fileName: "",
+    file: null,
+    contour: 0.0,
+    details: "",
+    required: false,
+}
+export const DepositionFSC:DepositionFiles ={
+    emName: EmFile.FSC,
+    nameFE: 'FSC-XML',
+    type: "fsc-xml",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
 }
+export const DepositionLayerLines:DepositionFiles ={
+    emName: EmFile.LayerLines,
+    nameFE: 'Other: Layer Lines Data ',
+    type: "layer-lines",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+}
+export const DepositionCoordinates: DepositionFiles = {
+    emName: EmFile.Coordinates,
+    nameFE: 'Coordinates',
+    type: "co-cif",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+}
+export const DepositionStructureFactors: DepositionFiles = {
+    emName: EmFile.StructureFactors,
+    nameFE: 'Structure Factors',
+    type: "xs-cif",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+}
+export const DepositionMTZ: DepositionFiles = {
+    emName: EmFile.MTZ,
+    nameFE: 'MTZ',
+    type: "xs-mtz",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+}
+
 
+export const MethodsList: EmMethod[] = [
+    {
+        value: EmType.Helical,
+        viewValue: 'Helical',
+        experiment: { type: "em", subtype: "helical" },
+        files: [
+            DepositionMainMap, 
+            DepositionMaskMap, 
+            DepositionHalfMap1, 
+            DepositionHalfMap2, 
+            DepositionAddMap, 
+            DepositionCoordinates, 
+            DepositionImage, 
+            DepositionFSC,
+            DepositionLayerLines,
+        ],
+    },
+    {
+        value: EmType.SingleParticle,
+        viewValue: 'Single Particle',
+        experiment: { type: "em", subtype: "single" },
+        files: [
+            DepositionMainMap, 
+            DepositionMaskMap, 
+            DepositionHalfMap1, 
+            DepositionHalfMap2, 
+            DepositionAddMap, 
+            DepositionCoordinates, 
+            DepositionImage, 
+            DepositionFSC,
+            DepositionLayerLines,
+        ],
+    },
+    {
+        value: EmType.SubtomogramAveraging,
+        viewValue: 'Subtomogram Averaging',
+        experiment: { type: "em", subtype: "subtomogram" },
+        files:[
+            DepositionMainMap, 
+            DepositionMaskMap, 
+            DepositionHalfMap1, 
+            DepositionHalfMap2, 
+            DepositionAddMap, 
+            DepositionCoordinates, 
+            DepositionImage, 
+            DepositionFSC,
+            DepositionLayerLines,
+        ],
+    },
+    {
+        value: EmType.Tomogram,
+        viewValue: 'Tomogram',
+        experiment: { type: "em", subtype: "tomography" },
+        files: [
+            DepositionMainMap, 
+            DepositionMaskMap, 
+            DepositionAddMap, 
+            DepositionImage, 
+            DepositionFSC,
+            DepositionLayerLines,
+        ],
+    },
+    {
+        value: EmType.ElectronCristallography,
+        viewValue: 'Electron Crystallography',
+        experiment: { type: "ec" },
+        files: [
+            DepositionMainMap, 
+            DepositionMaskMap, 
+            DepositionHalfMap1, 
+            DepositionHalfMap2, 
+            DepositionStructureFactors,
+            DepositionMTZ,
+            DepositionAddMap, 
+            DepositionCoordinates, 
+            DepositionImage, 
+            DepositionFSC,
+            DepositionLayerLines,
+        ],
+    },
+];
\ No newline at end of file

From 2986ab1c6f164c47b9932118b1592982dff012e2 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 3 Dec 2024 16:27:02 +0000
Subject: [PATCH 036/245] specify many add maps

---
 src/app/datasets/onedep/onedep.component.html | 35 ++++++++---
 src/app/datasets/onedep/onedep.component.scss |  4 ++
 src/app/datasets/onedep/onedep.component.ts   | 60 ++++++++++++++++++-
 src/app/datasets/onedep/types/methods.enum.ts | 30 +++++-----
 4 files changed, 106 insertions(+), 23 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 54aecdb542..abb7adc38a 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -249,15 +249,23 @@ <h2>Choose Electron Microscopy
                                     <div *ngIf="selectedFile[fileType.emName]">
                                         <mat-icon>attach_file</mat-icon>
                                     </div>
+
+                                    <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]">
+                                        <mat-icon>attach_file</mat-icon>
+                                    </div>
                                     <input type="file" #fileInput
-                                        (change)="onFileSelected($event, fileType.emName)"
+                                        (change)="fileType.emName === 'add-map' ? onFileAddMapSelected($event, fileType.id) : onFileSelected($event, fileType.emName)"
                                         style="display: none;" />
-                                    <div *ngIf="selectedFile[fileType.emName]"
+                                    <div 
+                                        *ngIf="fileType.emName !== 'add-map' && selectedFile[fileType.emName]"
+                                        class="fileName">
+                                        <p>Selected File: {{ selectedFile[fileType.emName]?.name }}</p>
+                                    </div>
+                                    <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]"
                                         class="fileName">
-                                        <p>Selected File: {{
-                                            selectedFile[fileType.emName].name }}
-                                        </p>
+                                        <p>Selected File: {{ selectedFile['add-map-' + fileType.id]?.name }}</p>
                                     </div>
+                                    
                                 </div>
 
                                 <div class="input-container">
@@ -269,7 +277,11 @@ <h2>Choose Electron Microscopy
                                             <input matInput type="number"
                                                 placeholder="e.g. 0.0" required
                                                 [value]="fileType.contour || ''"
-                                                (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : updateContourLevel($event, fileType.emName)" />
+                                                (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : 
+                                                         fileType.emName === 'add-map' ? updateContourLevelAddMap($event, fileType.id) : 
+                                                         updateContourLevel($event, fileType.emName)" />
+
+                                                         
                                         </mat-form-field>
                                         <!-- Error Message -->
                                         <!-- FIX ME -->
@@ -282,13 +294,22 @@ <h2>Choose Electron Microscopy
                                         <textarea matInput
                                             placeholder="Enter details..."
                                             rows="1"
-                                            (input)="updateDetails($event, fileType.emName)"
+                                            (input)="fileType.emName === 'add-map' ? updateDetailsAddMap($event, fileType.id) : updateDetails($event,fileType.emName)"
                                             (input)="autoGrow($event)"
                                             [style.overflow]="detailsOverflow"></textarea>
                                     </mat-form-field>
                                 </div>
                             </mat-card-content>
                         </ng-container>
+                        <div *ngIf="fileType.emName === 'add-map' && fileType.id ===0">
+                            <button 
+                                mat-icon-button 
+                                matTooltip="Add more maps" 
+                                aria-label="Add another map" 
+                                (click)="addMap()">
+                                <mat-icon>add</mat-icon>
+                            </button>
+                        </div>
                     </mat-card>
 
 
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index 8b16ccae5d..2118ed5cd3 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -64,6 +64,7 @@ mat-card {
     right: -40%;
     transform: translateY(-50%);
     margin-left: 8px;
+    color: rgba(0, 0, 0, 0.6);
   }
 
   .add-field-btn {
@@ -72,6 +73,9 @@ mat-card {
     transition: color 0.3s ease;
   }
 
+  button[mat-icon-button]:hover {
+      background-color: rgba(56, 178, 73, 0.1); /* Subtle background highlight on hover */
+  }
   .add-field-btn:hover {
     color: rgba(0, 0, 0, 0.9);
   }
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 050444632d..ffbbcd77ec 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -18,7 +18,7 @@ import {
   selectCurrentUser
 } from "state-management/selectors/user.selectors";
 import { User } from "shared/sdk";
-import { MethodsList, OneDepExperiment, EmFile, DepositionFiles } from "./types/methods.enum"
+import { MethodsList, OneDepExperiment, EmFile, DepositionFiles, DepositionAddMap } from "./types/methods.enum"
 import { Subscription, fromEvent } from "rxjs";
 
 
@@ -42,6 +42,7 @@ export class OneDepComponent implements OnInit {
   emFile = EmFile;
   fileTypes: DepositionFiles[];
   detailsOverflow: string = 'hidden';
+  additionalMaps = 0;
 
 
   @ViewChild('fileInput') fileInput: ElementRef<HTMLInputElement> | undefined;
@@ -113,7 +114,6 @@ export class OneDepComponent implements OnInit {
   }
   onMethodChange() {
     this.fileTypes = this.methodsList.find(mL => mL.value === this.form.value['emMethod']).files;
-    console.log("files", this.fileTypes)
     this.fileTypes.forEach((fT) => {
       if (fT.emName === this.emFile.MainMap || fT.emName === this.emFile.Image) {
         fT.required = true;
@@ -181,6 +181,19 @@ export class OneDepComponent implements OnInit {
       });
     }
   }
+  onFileAddMapSelected(event: Event, id: number) {
+    const input = event.target as HTMLInputElement;
+    if (input.files && input.files.length > 0) {
+        // Use the ID to store the file uniquely for each "add-map"
+        this.selectedFile[`add-map-${id}`] = input.files[0];
+        this.fileTypes.forEach((fT) => {
+            if (fT.emName === this.emFile.AddMap && fT.id === id) {
+                fT.file = this.selectedFile[`add-map-${id}`];
+                fT.fileName = this.selectedFile[`add-map-${id}`].name;
+            }
+        });
+    }
+}
   isRequired(controlName: string): boolean {
     let value: boolean;
     this.fileTypes.forEach((fT) => {
@@ -204,6 +217,20 @@ export class OneDepComponent implements OnInit {
       console.warn('Invalid number format:', input);
     }
   }
+  updateContourLevelAddMap(event: Event, id: number) {
+    const input = (event.target as HTMLInputElement).value.trim();
+    const normalizedInput = input.replace(',', '.');
+    const parsedValue = parseFloat(normalizedInput);
+    if (!isNaN(parsedValue)) {
+      this.fileTypes.forEach((fT) => {
+        if (fT.emName === this.emFile.AddMap && fT.id === id) {
+          fT.contour = parsedValue;
+        }
+      });
+    } else {
+      console.warn('Invalid number format:', input);
+    }
+  }
   updateContourLevel(event: Event, controlName: EmFile) {
     const input = (event.target as HTMLInputElement).value.trim();
     const normalizedInput = input.replace(',', '.');
@@ -228,6 +255,35 @@ export class OneDepComponent implements OnInit {
     });
 
   }
+  updateDetailsAddMap(event: Event, id:number) {
+    const textarea = event.target as HTMLTextAreaElement; // Cast to HTMLTextAreaElement
+    const value = textarea.value;
+    this.fileTypes.forEach((fT) => {
+      if (fT.emName === this.emFile.AddMap && fT.id === id) {
+        fT.details = value;
+      }
+    });
+
+  }
+  addMap(){
+    const nextId = this.fileTypes
+    .filter(file => file.emName === EmFile.AddMap)
+    .reduce((maxId, file) => (file.id > maxId ? file.id : maxId), 0) + 1;
+
+    const newMap: DepositionFiles = {
+        emName: EmFile.AddMap,
+        id: nextId,
+        nameFE: 'Additional Map ( ' + (nextId+1).toString() + ' )',
+        type: "add-map",
+        fileName: "",
+        file: null,
+        contour: 0.0,
+        details: "",
+        required: false,
+    };
+
+    this.fileTypes.push(newMap);
+  }
 
   onDepositClick() {
     const formDataToSend = new FormData();
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index 008503e18d..388d089b3f 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -27,6 +27,7 @@ export interface OneDepExperiment {
 
 export interface DepositionFiles {
     emName: EmFile;
+    id?: number, 
     nameFE: string;
     type: string,
     fileName: string,
@@ -94,6 +95,7 @@ export const DepositionMaskMap:DepositionFiles ={
 }
 export const DepositionAddMap:DepositionFiles ={
     emName: EmFile.AddMap,
+    id:0,
     nameFE: 'Additional Map',
     type: "add-map",
     fileName: "",
@@ -155,15 +157,15 @@ export const MethodsList: EmMethod[] = [
         viewValue: 'Helical',
         experiment: { type: "em", subtype: "helical" },
         files: [
+            DepositionImage, 
+            DepositionCoordinates, 
             DepositionMainMap, 
             DepositionMaskMap, 
             DepositionHalfMap1, 
             DepositionHalfMap2, 
-            DepositionAddMap, 
-            DepositionCoordinates, 
-            DepositionImage, 
             DepositionFSC,
             DepositionLayerLines,
+            DepositionAddMap, 
         ],
     },
     {
@@ -171,15 +173,15 @@ export const MethodsList: EmMethod[] = [
         viewValue: 'Single Particle',
         experiment: { type: "em", subtype: "single" },
         files: [
+            DepositionImage, 
+            DepositionCoordinates, 
             DepositionMainMap, 
             DepositionMaskMap, 
             DepositionHalfMap1, 
             DepositionHalfMap2, 
-            DepositionAddMap, 
-            DepositionCoordinates, 
-            DepositionImage, 
             DepositionFSC,
             DepositionLayerLines,
+            DepositionAddMap, 
         ],
     },
     {
@@ -187,15 +189,15 @@ export const MethodsList: EmMethod[] = [
         viewValue: 'Subtomogram Averaging',
         experiment: { type: "em", subtype: "subtomogram" },
         files:[
+            DepositionImage, 
+            DepositionCoordinates, 
             DepositionMainMap, 
             DepositionMaskMap, 
             DepositionHalfMap1, 
             DepositionHalfMap2, 
-            DepositionAddMap, 
-            DepositionCoordinates, 
-            DepositionImage, 
             DepositionFSC,
             DepositionLayerLines,
+            DepositionAddMap, 
         ],
     },
     {
@@ -203,12 +205,12 @@ export const MethodsList: EmMethod[] = [
         viewValue: 'Tomogram',
         experiment: { type: "em", subtype: "tomography" },
         files: [
+            DepositionImage, 
             DepositionMainMap, 
             DepositionMaskMap, 
-            DepositionAddMap, 
-            DepositionImage, 
             DepositionFSC,
             DepositionLayerLines,
+            DepositionAddMap, 
         ],
     },
     {
@@ -216,17 +218,17 @@ export const MethodsList: EmMethod[] = [
         viewValue: 'Electron Crystallography',
         experiment: { type: "ec" },
         files: [
+            DepositionImage, 
+            DepositionCoordinates, 
             DepositionMainMap, 
             DepositionMaskMap, 
             DepositionHalfMap1, 
             DepositionHalfMap2, 
             DepositionStructureFactors,
             DepositionMTZ,
-            DepositionAddMap, 
-            DepositionCoordinates, 
-            DepositionImage, 
             DepositionFSC,
             DepositionLayerLines,
+            DepositionAddMap, 
         ],
     },
 ];
\ No newline at end of file

From 6b8f2e67178b5b1bd0536a2cfca20a50f9350179 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 4 Dec 2024 16:43:00 +0000
Subject: [PATCH 037/245] restruct sending requests

---
 src/app/datasets/onedep/onedep.component.html |   3 +-
 src/app/datasets/onedep/onedep.component.ts   | 135 +++++++++++-------
 src/app/datasets/onedep/types/methods.enum.ts |  10 --
 3 files changed, 85 insertions(+), 63 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index abb7adc38a..b02eaa1013 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -275,7 +275,8 @@ <h2>Choose Electron Microscopy
                                             class="contour-level">
                                             <mat-label>Contour Level</mat-label>
                                             <input matInput type="number"
-                                                placeholder="e.g. 0.0" required
+                                                placeholder="e.g. 0.0" 
+                                                [required]="fileType.file && fileType.required"
                                                 [value]="fileType.contour || ''"
                                                 (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : 
                                                          fileType.emName === 'add-map' ? updateContourLevelAddMap($event, fileType.id) : 
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index ffbbcd77ec..a85036002c 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -18,7 +18,7 @@ import {
   selectCurrentUser
 } from "state-management/selectors/user.selectors";
 import { User } from "shared/sdk";
-import { MethodsList, OneDepExperiment, EmFile, DepositionFiles, DepositionAddMap } from "./types/methods.enum"
+import { MethodsList, EmFile, DepositionFiles, DepositionAddMap } from "./types/methods.enum"
 import { Subscription, fromEvent } from "rxjs";
 
 
@@ -37,7 +37,6 @@ export class OneDepComponent implements OnInit {
   form: FormGroup;
   showAssociatedMapQuestion: boolean = false;
   methodsList = MethodsList;
-  experiment: OneDepExperiment
   selectedFile: { [key: string]: File | null } = {};
   emFile = EmFile;
   fileTypes: DepositionFiles[];
@@ -79,7 +78,6 @@ export class OneDepComponent implements OnInit {
       email: this.user.email,
       jwtToken: new FormControl(""),
       metadata: this.dataset.scientificMetadata,
-      experiments: this.fb.array([]),
       emMethod: new FormControl(""),
       deposingCoordinates: new FormControl(null, Validators.required),
       associatedMap: new FormControl(null, Validators.required),
@@ -108,7 +106,7 @@ export class OneDepComponent implements OnInit {
     this.orcidArray().push(orcidField);
   }
   removeOrcidField(index: number) {
-    if (this.orcidArray().length > 1) { 
+    if (this.orcidArray().length > 1) {
       this.orcidArray().removeAt(index);
     }
   }
@@ -117,7 +115,7 @@ export class OneDepComponent implements OnInit {
     this.fileTypes.forEach((fT) => {
       if (fT.emName === this.emFile.MainMap || fT.emName === this.emFile.Image) {
         fT.required = true;
-      }else{
+      } else {
         fT.required = false;
       }
     });
@@ -144,7 +142,7 @@ export class OneDepComponent implements OnInit {
     const input = event.value;
     if (input === 'true') {
       this.fileTypes.forEach((fT) => {
-        if (fT.emName === this.emFile.Coordinates ) {
+        if (fT.emName === this.emFile.Coordinates) {
           fT.required = true;
         }
       });
@@ -184,16 +182,16 @@ export class OneDepComponent implements OnInit {
   onFileAddMapSelected(event: Event, id: number) {
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
-        // Use the ID to store the file uniquely for each "add-map"
-        this.selectedFile[`add-map-${id}`] = input.files[0];
-        this.fileTypes.forEach((fT) => {
-            if (fT.emName === this.emFile.AddMap && fT.id === id) {
-                fT.file = this.selectedFile[`add-map-${id}`];
-                fT.fileName = this.selectedFile[`add-map-${id}`].name;
-            }
-        });
+      // Use the ID to store the file uniquely for each "add-map"
+      this.selectedFile[`add-map-${id}`] = input.files[0];
+      this.fileTypes.forEach((fT) => {
+        if (fT.emName === this.emFile.AddMap && fT.id === id) {
+          fT.file = this.selectedFile[`add-map-${id}`];
+          fT.fileName = this.selectedFile[`add-map-${id}`].name;
+        }
+      });
     }
-}
+  }
   isRequired(controlName: string): boolean {
     let value: boolean;
     this.fileTypes.forEach((fT) => {
@@ -255,7 +253,7 @@ export class OneDepComponent implements OnInit {
     });
 
   }
-  updateDetailsAddMap(event: Event, id:number) {
+  updateDetailsAddMap(event: Event, id: number) {
     const textarea = event.target as HTMLTextAreaElement; // Cast to HTMLTextAreaElement
     const value = textarea.value;
     this.fileTypes.forEach((fT) => {
@@ -265,53 +263,86 @@ export class OneDepComponent implements OnInit {
     });
 
   }
-  addMap(){
+  addMap() {
     const nextId = this.fileTypes
-    .filter(file => file.emName === EmFile.AddMap)
-    .reduce((maxId, file) => (file.id > maxId ? file.id : maxId), 0) + 1;
+      .filter(file => file.emName === EmFile.AddMap)
+      .reduce((maxId, file) => (file.id > maxId ? file.id : maxId), 0) + 1;
 
     const newMap: DepositionFiles = {
-        emName: EmFile.AddMap,
-        id: nextId,
-        nameFE: 'Additional Map ( ' + (nextId+1).toString() + ' )',
-        type: "add-map",
-        fileName: "",
-        file: null,
-        contour: 0.0,
-        details: "",
-        required: false,
+      emName: EmFile.AddMap,
+      id: nextId,
+      nameFE: 'Additional Map ( ' + (nextId + 1).toString() + ' )',
+      type: "add-map",
+      fileName: "",
+      file: null,
+      contour: 0.0,
+      details: "",
+      required: false,
     };
 
     this.fileTypes.push(newMap);
   }
-
+  sendFollowUpRequests(depID: string, form: FormData) {
+    this.http.post("http://localhost:8080/onedep/${depID}", form ).subscribe({
+      next: (res) => console.log('Uploaded File and Metadata', res),
+      error: (error) => console.error('Could not upload File and Metadata', error),
+    });
+  }
   onDepositClick() {
-    const formDataToSend = new FormData();
-    formDataToSend.append('email', this.form.value.email);
-    formDataToSend.append('orcidIds', this.form.value.orcidArray);
-    formDataToSend.append('metadata', JSON.stringify(this.form.value.metadata));
-    formDataToSend.append('experiments', this.form.value.emMethod);
-    // emdbId: this.form.value.emdbId, 
-    var fileMetadata = []
-
-    // for (const fI in this.fileTypes) {
-    this.fileTypes.forEach((fT) => {
-      if (fT.file) {
-        formDataToSend.append('file', fT.file);
-        fileMetadata.push({ name: fT.fileName, type: fT.type, contour: fT.contour, details: fT.details });
+    //  Create a deposition
+    console.log(this.orcidArray().value.map(item => item.orcidId));
+    const body = JSON.stringify(
+      {
+        "email": "sofya.laskina@epfl.ch",  // for now
+        "orcidIds": this.orcidArray().value.map(item => item.orcidId),
+        "country": "United States",
+        "method": this.form.value.emMethod,
+        "jwtToken": this.form.value.jwtToken,
       }
-    });
-    formDataToSend.append('fileMetadata', JSON.stringify(fileMetadata));
-    this.http.post("http://localhost:8080/onedep", formDataToSend, {
+    );
+    let depID: string;
+    this.http.post("http://localhost:8080/onedep", body, {
       headers: {}
-    }).subscribe(
-      response => {
-        console.log('Created deposition in OneDep', response);
+    }).subscribe({
+      next: (response: any) => {
+        depID = response.depID; // Update the outer variable
+        console.log('Created deposition in OneDep', depID);
+        
+        // Call subsequent requests
+        this.fileTypes.forEach((fT) => {
+            if (fT.file) {
+              const formDataFile = new FormData()
+              formDataFile.append('jwtToken', this.form.value.jwtToken )
+              formDataFile.append('file', fT.file);
+              formDataFile.append('fileMetadata', JSON.stringify({ name: fT.fileName, type: fT.type, contour: fT.contour, details: fT.details }))
+              console.log(formDataFile)
+              this.sendFollowUpRequests(depID, formDataFile);
+            }
+          });
+        
       },
-      error => {
-        console.error('Request failed', error.error);
-      }
-    );
+      error: (error) => console.error('Request failed', error.error),
+    });
+    
+    depID
+    // const formDataFile = new FormData();
+    // formDataToSend.append('jwtToken', this.form.value.jwtToken);
+    // formDataToSend.append('metadata', JSON.stringify(this.form.value.metadata));
+
+    // var fileMetadata = []
+    // // for (const fI in this.fileTypes) {
+    // 
+    // formDataToSend.append('fileMetadata', JSON.stringify(fileMetadata));
+    // this.http.post("http://localhost:8080/onedep", formDataToSend, {
+    //   headers: {}
+    // }).subscribe(
+    //   response => {
+    //     console.log('Created deposition in OneDep', response);
+    //   },
+    //   error => {
+    //     console.error('Request failed', error.error);
+    //   }
+    // );
 
   }
 
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index 388d089b3f..ab39c9a87e 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -20,10 +20,6 @@ export enum EmFile {
     MTZ = "xs-mtz",
 };
 
-export interface OneDepExperiment {
-    type: string;
-    subtype?: string;
-}
 
 export interface DepositionFiles {
     emName: EmFile;
@@ -40,7 +36,6 @@ export interface DepositionFiles {
 interface EmMethod {
     value: EmType;
     viewValue: string;
-    experiment: OneDepExperiment;
     files:  DepositionFiles[];
 }
 
@@ -155,7 +150,6 @@ export const MethodsList: EmMethod[] = [
     {
         value: EmType.Helical,
         viewValue: 'Helical',
-        experiment: { type: "em", subtype: "helical" },
         files: [
             DepositionImage, 
             DepositionCoordinates, 
@@ -171,7 +165,6 @@ export const MethodsList: EmMethod[] = [
     {
         value: EmType.SingleParticle,
         viewValue: 'Single Particle',
-        experiment: { type: "em", subtype: "single" },
         files: [
             DepositionImage, 
             DepositionCoordinates, 
@@ -187,7 +180,6 @@ export const MethodsList: EmMethod[] = [
     {
         value: EmType.SubtomogramAveraging,
         viewValue: 'Subtomogram Averaging',
-        experiment: { type: "em", subtype: "subtomogram" },
         files:[
             DepositionImage, 
             DepositionCoordinates, 
@@ -203,7 +195,6 @@ export const MethodsList: EmMethod[] = [
     {
         value: EmType.Tomogram,
         viewValue: 'Tomogram',
-        experiment: { type: "em", subtype: "tomography" },
         files: [
             DepositionImage, 
             DepositionMainMap, 
@@ -216,7 +207,6 @@ export const MethodsList: EmMethod[] = [
     {
         value: EmType.ElectronCristallography,
         viewValue: 'Electron Crystallography',
-        experiment: { type: "ec" },
         files: [
             DepositionImage, 
             DepositionCoordinates, 

From 2b9750c718c5f03eaef402e6c08c54f85511e395 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 5 Dec 2024 10:03:02 +0000
Subject: [PATCH 038/245] communication with OneDep works

---
 src/app/datasets/onedep/onedep.component.ts | 82 ++++++++++++++-------
 1 file changed, 54 insertions(+), 28 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index a85036002c..aece4d008c 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -282,15 +282,29 @@ export class OneDepComponent implements OnInit {
 
     this.fileTypes.push(newMap);
   }
-  sendFollowUpRequests(depID: string, form: FormData) {
-    this.http.post("http://localhost:8080/onedep/${depID}", form ).subscribe({
-      next: (res) => console.log('Uploaded File and Metadata', res),
+  sendFile(depID: string, form: FormData) {
+    this.http.post("http://localhost:8080/onedep/" + depID + "/file", form).subscribe({
+      next: (res) => console.log('Uploaded', this.emFile[form.get("fileMetadata")["type"]],res),
       error: (error) => console.error('Could not upload File and Metadata', error),
     });
   }
+  sendCoordFile(depID: string, form: FormData) {
+    this.http.post("http://localhost:8080/onedep/" + depID + "/pdb", form).subscribe({
+      next: (res) => console.log('Uploaded Coordinates and Metadata', res),
+      error: (error) => console.error('Could not upload Coordinates and Metadata', error),
+    });
+  }
+  sendMetadata(depID: string, body: string) {
+    // missing token!
+    this.http.post("http://localhost:8080/onedep/" + depID + "/metadata", body, {
+      headers: { 'Content-Type': 'application/json' },
+    }).subscribe({
+      next: (res) => console.log('Uploaded Metadata', res),
+      error: (error) => console.error('Could not upload Metadata', error),
+    });
+  }
   onDepositClick() {
     //  Create a deposition
-    console.log(this.orcidArray().value.map(item => item.orcidId));
     const body = JSON.stringify(
       {
         "email": "sofya.laskina@epfl.ch",  // for now
@@ -301,33 +315,45 @@ export class OneDepComponent implements OnInit {
       }
     );
     let depID: string;
-    this.http.post("http://localhost:8080/onedep", body, {
-      headers: {}
-    }).subscribe({
-      next: (response: any) => {
-        depID = response.depID; // Update the outer variable
-        console.log('Created deposition in OneDep', depID);
-        
-        // Call subsequent requests
-        this.fileTypes.forEach((fT) => {
-            if (fT.file) {
-              const formDataFile = new FormData()
-              formDataFile.append('jwtToken', this.form.value.jwtToken )
-              formDataFile.append('file', fT.file);
-              formDataFile.append('fileMetadata', JSON.stringify({ name: fT.fileName, type: fT.type, contour: fT.contour, details: fT.details }))
-              console.log(formDataFile)
-              this.sendFollowUpRequests(depID, formDataFile);
-            }
-          });
-        
-      },
-      error: (error) => console.error('Request failed', error.error),
+    let metadataAdded = false;
+    depID = "D_800043";
+    // this.http.post("http://localhost:8080/onedep", body, {
+    //  headers: { 'Content-Type': 'application/json' },
+    // }).subscribe({
+    //   next: (response: any) => {
+    //     depID = response.depID; // Update the outer variable
+    //     console.log('Created deposition in OneDep', depID);
+
+    //     // Call subsequent requests
+    this.fileTypes.forEach((fT) => { 
+      if (fT.file) {
+        const formDataFile = new FormData()
+        formDataFile.append('jwtToken', this.form.value.jwtToken)
+        formDataFile.append('file', fT.file);
+        formDataFile.append('fileMetadata', JSON.stringify({ name: fT.fileName, type: fT.type, contour: fT.contour, details: fT.details }))
+        if (fT.emName === this.emFile.Coordinates) {
+          formDataFile.append('metadata', JSON.stringify(this.form.value.metadata));
+          this.sendCoordFile(depID, formDataFile);
+          metadataAdded = true
+        } else {
+          this.sendFile(depID, formDataFile);
+        }
+      }
     });
-    
-    depID
+    if (! metadataAdded){
+      const metadataBody = JSON.stringify({
+        metadata: this.form.value.metadata,
+        jwtToken: this.form.value.jwtToken ,
+      });
+      this.sendMetadata(depID, metadataBody);
+    }
+    //   },
+    //   error: (error) => console.error('Request failed', error.error),
+    // });
+
     // const formDataFile = new FormData();
     // formDataToSend.append('jwtToken', this.form.value.jwtToken);
-    // formDataToSend.append('metadata', JSON.stringify(this.form.value.metadata));
+    // 
 
     // var fileMetadata = []
     // // for (const fI in this.fileTypes) {

From 18f5cf0a0dbd002bb7274414abd77d0c4bd7ba08 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 9 Dec 2024 09:27:49 +0000
Subject: [PATCH 039/245] ORCID field of same size no matter window size

---
 src/app/datasets/onedep/onedep.component.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index 2118ed5cd3..b81300843a 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -181,7 +181,11 @@ mat-card {
       .fileChooser {
         margin: 3px auto;
       }
-
+      .data-field {
+        width: 350px; /* Fixed width to accommodate 16 digits, 3 dashes, and button */
+        margin-bottom: 40px;
+        position: relative; /* Necessary for child positioning */
+    }
       .input-container {
         display: flex; // Use flexbox for layout
         align-items: flex-end;

From d2ed3818ce6832882ba16080c0c5706271880a5f Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 9 Dec 2024 16:52:20 +0000
Subject: [PATCH 040/245] added comments to input file on hover

---
 src/app/datasets/onedep/onedep.component.html | 11 +++----
 src/app/datasets/onedep/onedep.component.scss | 29 +++++++------------
 src/app/datasets/onedep/onedep.component.ts   |  1 +
 src/app/datasets/onedep/types/methods.enum.ts |  9 ++++++
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index b02eaa1013..85dbf9397e 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -1,7 +1,7 @@
 <ng-template [ngIf]="dataset">
     <div style="clear: both"></div>
-    <div fxLayout="row" fxLayout.xs="column" *ngIf="dataset">
-        <div fxFlex="80%">
+    <div>
+        <div>
             <mat-card [formGroup]="form" data-cy="general-info">
                 <mat-card-header class="general-header">
                     <div mat-card-avatar class="section-icon">
@@ -97,8 +97,9 @@ <h2>Enter 16-digit ORCID iD</h2>
                                                 maxlength="19"
                                                 placeholder="xxxx-xxxx-xxxx-xxxx"
                                                 formControlName="orcidId"
-                                                orcidFormatter>
-                                                <button 
+                                                orcidFormatter
+                                            >
+                                            <button 
                                                 mat-icon-button 
                                                 class="remove-field-btn" 
                                                 (click)="removeOrcidField(i)">
@@ -235,7 +236,7 @@ <h2>Choose Electron Microscopy
                         class="fileCard">
                         <ng-container
                             *ngIf="fileType.emName !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
-                            <mat-card-header>
+                            <mat-card-header matTooltip="{{fileType.explanation}}" matTooltipPosition="above">
                                 <mat-card-title>{{ fileType.nameFE}} <span class="required-asterisk" *ngIf="isRequired(fileType.emName)"> *</span></mat-card-title>
                                 
                             </mat-card-header>
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index b81300843a..d1efd128dc 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -21,19 +21,14 @@ mat-card {
 
   .card-left {
     flex: 1;
-    margin-left: 20px;
-    margin-right: 16px;
   }
 
   .card-middle {
     flex: 1;
-    margin-right: 16px;
   }
 
   .card-right {
     flex: 1;
-    display: flex;
-    flex-direction: column;
   }
 
   .file-header {
@@ -48,16 +43,11 @@ mat-card {
   .token-field {
     width: 70%;
     height: 20px;
+    min-width: 12rem;
     margin-bottom: 8px;
     margin-top: 0;
   }
 
-  .orcid-field {
-    width: 40%;
-    height: 20px;
-    margin-bottom: 40px;
-  }
-
   .remove-field-btn {
     position: absolute;
     top: 50%;
@@ -117,7 +107,6 @@ mat-card {
   mat-radio-button {
     display: block;
     margin-bottom: -0.7rem;
-    /* Optional: Adds spacing between buttons */
   }
 
 
@@ -126,6 +115,7 @@ mat-card {
   }
 
   .method-name {
+    min-width: 12rem;
     width: 50%;
   }
 
@@ -176,15 +166,15 @@ mat-card {
     mat-card-content {
       display: flex;
       flex-direction: column;
-      gap: 5px;
+      margin-bottom: 40px;
 
       .fileChooser {
         margin: 3px auto;
       }
       .data-field {
-        width: 350px; /* Fixed width to accommodate 16 digits, 3 dashes, and button */
-        margin-bottom: 40px;
-        position: relative; /* Necessary for child positioning */
+        width: 350px; 
+        min-width: 320px; 
+        position: relative; 
     }
       .input-container {
         display: flex; // Use flexbox for layout
@@ -193,14 +183,13 @@ mat-card {
 
         .contour-level {
           flex: 0 0 20%; // Set to take 20% of the width
-          min-width: 100px; // Optional: set a minimum width for usability
+          min-width: 150px; // Optional: set a minimum width for usability
 
           /* Chrome, Safari, Edge, Opera */
           input[matinput]::-webkit-outer-spin-button,
           input[matinput]::-webkit-inner-spin-button {
             -webkit-appearance: none;
-            margin: 0;
-          }
+            margin: 0;          }
 
           /* Firefox */
           input[matinput][type=number] {
@@ -209,6 +198,8 @@ mat-card {
         }
 
         .details {
+
+          margin-top:  10px;
           flex: 1; // Allow this field to take the remaining space
           min-width: 200px; // Optional: set a minimum width for usability
 
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index aece4d008c..716837399c 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -9,6 +9,7 @@ import {
   FormArray,
   Validators,
 } from "@angular/forms";
+
 import { Store } from "@ngrx/store";
 import { Dataset } from "shared/sdk/models";
 import {
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index ab39c9a87e..971433d610 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -31,6 +31,7 @@ export interface DepositionFiles {
     contour?: number,
     details?: string,
     required: boolean,
+    explanation?: string, 
 }
 
 interface EmMethod {
@@ -47,6 +48,7 @@ export const DepositionImage: DepositionFiles ={
     file: null,
     details: "",
     required: false,
+    explanation: "Image of the map (500 x 500 pixels in .jpg, .png, etc. format)",
 }
 export const DepositionMainMap:DepositionFiles ={
     emName: EmFile.MainMap,
@@ -57,6 +59,7 @@ export const DepositionMainMap:DepositionFiles ={
     contour: 0.0,
     details: "",
     required: false,
+    explanation: "Primary map (.mrc or .ccp4 format, may use gzip or bzip2 compression) along with recommended contour level", 
 }
 export const DepositionHalfMap1:DepositionFiles ={
     emName: EmFile.HalfMap1,
@@ -67,6 +70,7 @@ export const DepositionHalfMap1:DepositionFiles ={
     contour: 0.0,
     details: "",
     required: false,
+    explanation:"Half maps (as used for FSC calculation; two maps must be uploaded)",
 }
 export const DepositionHalfMap2:DepositionFiles ={
     emName: EmFile.HalfMap2,
@@ -77,6 +81,7 @@ export const DepositionHalfMap2:DepositionFiles ={
     contour: 0.0,
     details: "",
     required: false,
+    explanation:"Half maps (as used for FSC calculation; two maps must be uploaded)",
 }
 export const DepositionMaskMap:DepositionFiles ={
     emName: EmFile.MaskMap,
@@ -87,6 +92,7 @@ export const DepositionMaskMap:DepositionFiles ={
     contour: 0.0,
     details: "",
     required: false,
+    explanation:"Primary/raw map mask, segmentation/focused refinement mask and half-map mask",
 }
 export const DepositionAddMap:DepositionFiles ={
     emName: EmFile.AddMap,
@@ -98,6 +104,7 @@ export const DepositionAddMap:DepositionFiles ={
     contour: 0.0,
     details: "",
     required: false,
+    explanation:"Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)", 
 }
 export const DepositionFSC:DepositionFiles ={
     emName: EmFile.FSC,
@@ -107,6 +114,7 @@ export const DepositionFSC:DepositionFiles ={
     file: null,
     details: "",
     required: false,
+    explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs", 
 }
 export const DepositionLayerLines:DepositionFiles ={
     emName: EmFile.LayerLines,
@@ -125,6 +133,7 @@ export const DepositionCoordinates: DepositionFiles = {
     file: null,
     details: "",
     required: false,
+    explanation: "mmCIF or PDB format",
 }
 export const DepositionStructureFactors: DepositionFiles = {
     emName: EmFile.StructureFactors,

From 272765ab775987fec14d41f6e21baeb875bb5266 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 11 Dec 2024 11:29:15 +0000
Subject: [PATCH 041/245] working version

---
 src/app/datasets/onedep/onedep.component.ts | 29 ++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 716837399c..773c36ffa4 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -283,9 +283,9 @@ export class OneDepComponent implements OnInit {
 
     this.fileTypes.push(newMap);
   }
-  sendFile(depID: string, form: FormData) {
+  sendFile(depID: string, form: FormData, fileType: string) {
     this.http.post("http://localhost:8080/onedep/" + depID + "/file", form).subscribe({
-      next: (res) => console.log('Uploaded', this.emFile[form.get("fileMetadata")["type"]],res),
+      next: (res) => console.log('Uploaded', fileType, res),
       error: (error) => console.error('Could not upload File and Metadata', error),
     });
   }
@@ -317,13 +317,12 @@ export class OneDepComponent implements OnInit {
     );
     let depID: string;
     let metadataAdded = false;
-    depID = "D_800043";
-    // this.http.post("http://localhost:8080/onedep", body, {
-    //  headers: { 'Content-Type': 'application/json' },
-    // }).subscribe({
-    //   next: (response: any) => {
-    //     depID = response.depID; // Update the outer variable
-    //     console.log('Created deposition in OneDep', depID);
+    this.http.post("http://localhost:8080/onedep", body, {
+     headers: { 'Content-Type': 'application/json' },
+    }).subscribe({
+      next: (response: any) => {
+        depID = response.depID; // Update the outer variable
+        console.log('Created deposition in OneDep', depID);
 
     //     // Call subsequent requests
     this.fileTypes.forEach((fT) => { 
@@ -331,13 +330,13 @@ export class OneDepComponent implements OnInit {
         const formDataFile = new FormData()
         formDataFile.append('jwtToken', this.form.value.jwtToken)
         formDataFile.append('file', fT.file);
-        formDataFile.append('fileMetadata', JSON.stringify({ name: fT.fileName, type: fT.type, contour: fT.contour, details: fT.details }))
         if (fT.emName === this.emFile.Coordinates) {
-          formDataFile.append('metadata', JSON.stringify(this.form.value.metadata));
+          formDataFile.append('scientificMetadata', JSON.stringify(this.form.value.metadata));
           this.sendCoordFile(depID, formDataFile);
           metadataAdded = true
         } else {
-          this.sendFile(depID, formDataFile);
+          formDataFile.append('fileMetadata', JSON.stringify({ name: fT.fileName, type: fT.type, contour: fT.contour, details: fT.details }))
+          this.sendFile(depID, formDataFile, fT.type);
         }
       }
     });
@@ -348,9 +347,9 @@ export class OneDepComponent implements OnInit {
       });
       this.sendMetadata(depID, metadataBody);
     }
-    //   },
-    //   error: (error) => console.error('Request failed', error.error),
-    // });
+      },
+      error: (error) => console.error('Request failed', error.error),
+    });
 
     // const formDataFile = new FormData();
     // formDataToSend.append('jwtToken', this.form.value.jwtToken);

From e8fd4c8da33a69dd6ba70e26c71abbc243e9b3c0 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 13 Dec 2024 15:27:11 +0000
Subject: [PATCH 042/245] uploads all file categories

---
 src/app/datasets/onedep/onedep.component.ts | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 773c36ffa4..34c1b2232f 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -295,11 +295,9 @@ export class OneDepComponent implements OnInit {
       error: (error) => console.error('Could not upload Coordinates and Metadata', error),
     });
   }
-  sendMetadata(depID: string, body: string) {
+  sendMetadata(depID: string, form: FormData) {
     // missing token!
-    this.http.post("http://localhost:8080/onedep/" + depID + "/metadata", body, {
-      headers: { 'Content-Type': 'application/json' },
-    }).subscribe({
+    this.http.post("http://localhost:8080/onedep/" + depID + "/metadata", form).subscribe({
       next: (res) => console.log('Uploaded Metadata', res),
       error: (error) => console.error('Could not upload Metadata', error),
     });
@@ -341,11 +339,11 @@ export class OneDepComponent implements OnInit {
       }
     });
     if (! metadataAdded){
-      const metadataBody = JSON.stringify({
-        metadata: this.form.value.metadata,
-        jwtToken: this.form.value.jwtToken ,
-      });
-      this.sendMetadata(depID, metadataBody);
+      const formDataFile = new FormData()
+
+      formDataFile.append('jwtToken', this.form.value.jwtToken)
+      formDataFile.append('scientificMetadata', JSON.stringify(this.form.value.metadata));
+      this.sendMetadata(depID, formDataFile);
     }
       },
       error: (error) => console.error('Request failed', error.error),

From 985db56d6d2994cfb9c4061a9e5b2fe40954d8a0 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 16 Dec 2024 14:00:23 +0000
Subject: [PATCH 043/245] add field for password

---
 CI/e2e/frontend.config.e2e.json               |   2 +-
 src/app/datasets/onedep/onedep.component.html |  16 ++-
 src/app/datasets/onedep/onedep.component.scss |  50 ++++++--
 src/app/datasets/onedep/onedep.component.ts   | 109 +++++++-----------
 4 files changed, 96 insertions(+), 81 deletions(-)

diff --git a/CI/e2e/frontend.config.e2e.json b/CI/e2e/frontend.config.e2e.json
index 633624b991..da87bca32d 100644
--- a/CI/e2e/frontend.config.e2e.json
+++ b/CI/e2e/frontend.config.e2e.json
@@ -2,7 +2,7 @@
   "accessTokenPrefix": "Bearer ",
   "addDatasetEnabled": false,
   "archiveWorkflowEnabled": false,
-  "datasetReduceEnabled": true,
+  "datasetReduceEnabled": false,
   "datasetJsonScientificMetadata": true,
   "editDatasetSampleEnabled": true,
   "editMetadataEnabled": true,
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 85dbf9397e..c8e12289ab 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -61,7 +61,7 @@
                 <div class="card-container">
                     <div class="card-left">
                         <h2>Obtain OneDep Token</h2>
-                        <p class="instruction">Add instruction how to get it</p>
+                        <p class="instruction">Go to <a href="https://onedep-depui-test.wwpdb.org" target="_blank" >OneDep API</a> and choose option to sign in with ORCID. After the authorization you will be redirected back to OneDep. In the left bar below the map, tick the Deposition API option and click "Generate Key". Copy the token in the field below.    </p>
                         <mat-form-field 
                             class="token-field"
                             appearance="outline">
@@ -75,6 +75,20 @@ <h2>Obtain OneDep Token</h2>
                                 (input)="autoGrow($event)"
                                 [style.overflow]="detailsOverflow"></textarea>
                         </mat-form-field>
+                        <!-- Password Field -->
+                        <h2 class="password">Password</h2>
+                        <p class="instruction">You can provide a password, which will be confirmed in the email and sent to all provided ORCID users.</p>
+                        <mat-form-field class="password-field" appearance="outline">
+                            <mat-label>Password</mat-label>
+                            <input 
+                                matInput
+                                [type]="showPassword ? 'text' : 'password'"
+                                placeholder="enter your password"
+                                formControlName="password">
+                            <button mat-icon-button matSuffix (click)="togglePasswordVisibility()">
+                                <mat-icon>{{ showPassword ? 'visibility_off' : 'visibility' }}</mat-icon>
+                            </button>
+                        </mat-form-field>
                     </div>
                     <div class="card-middle">
                         <h2>Enter 16-digit ORCID iD</h2>
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index d1efd128dc..1884b5fec2 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -1,6 +1,5 @@
 mat-card {
   margin: 1em;
-
   .section-icon {
     height: auto !important;
     width: auto !important;
@@ -16,21 +15,31 @@ mat-card {
     align-items: flex-start;
     gap: 16px;
     padding: 16px;
-    margin-bottom: 16px;
+    margin-bottom: 20px;
   }
 
-  .card-left {
-    flex: 1;
-  }
+  .card-left, 
+  .card-middle,
+  .card-right {
+    flex: 0 0 33%;
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    box-sizing: border-box;
+    padding: 1rem; 
 
-  .card-middle {
-    flex: 1;
   }
 
-  .card-right {
-    flex: 1;
+  .card-left {
+    overflow-y: auto; /* Allows content to scroll if it overflows */
+  }
+  h2 {
+    font-size: 1.2rem;
+    margin-top: 0;
+  }
+  h2.password{
+    margin-top:3rem;
   }
-
   .file-header {
     display: flex;
     margin-bottom: 16px;
@@ -38,14 +47,31 @@ mat-card {
 
   .instruction {
     color: #555;
+    width: 80%;
   }
 
   .token-field {
-    width: 70%;
+    width: 80%;
     height: 20px;
     min-width: 12rem;
     margin-bottom: 8px;
     margin-top: 0;
+    box-sizing: border-box
+  }
+  .token-field 
+    textarea {
+      width: 100%;              
+      max-height: calc(3 * 1.5em); // Allow up to 5 lines of text
+      overflow-y: auto;          // Show scrollbar only when needed
+      resize: none;              // Prevent manual resizing
+      box-sizing: border-box;    // Padding doesn't affect the size
+      line-height: 1.5;          // Match text line height
+      border: none;              // Remove textarea border
+      padding: 0;                // Remove padding
+    
+  }
+  .password-field{
+    width:40%;
   }
 
   .remove-field-btn {
@@ -205,7 +231,7 @@ mat-card {
 
           mat-form-field {
             textarea {
-              max-height: calc(5 * 1.5em); // 5 lines max height
+              max-height: calc(3 * 1.5em); // 5 lines max height
               overflow-y: hidden; // Hide overflow
               resize: none; // Disable resizing
               line-height: 1.5; // Set line height
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 34c1b2232f..0557ace15d 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -1,7 +1,7 @@
-import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
+import { Component, OnInit, ViewChild, ElementRef, OnDestroy } from "@angular/core";
 import { AppConfigService } from "app-config.service";
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { ActivatedRoute, Router } from '@angular/router';
+import { HttpClient } from '@angular/common/http';
+import { Router } from '@angular/router';
 import {
   FormBuilder,
   FormControl,
@@ -19,7 +19,7 @@ import {
   selectCurrentUser
 } from "state-management/selectors/user.selectors";
 import { User } from "shared/sdk";
-import { MethodsList, EmFile, DepositionFiles, DepositionAddMap } from "./types/methods.enum"
+import { MethodsList, EmFile, DepositionFiles } from "./types/methods.enum"
 import { Subscription, fromEvent } from "rxjs";
 
 
@@ -28,7 +28,7 @@ import { Subscription, fromEvent } from "rxjs";
   templateUrl: './onedep.component.html',
   styleUrls: ['./onedep.component.scss']
 })
-export class OneDepComponent implements OnInit {
+export class OneDepComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   private _hasUnsavedChanges = false;
 
@@ -43,6 +43,7 @@ export class OneDepComponent implements OnInit {
   fileTypes: DepositionFiles[];
   detailsOverflow: string = 'hidden';
   additionalMaps = 0;
+  showPassword = false;
 
 
   @ViewChild('fileInput') fileInput: ElementRef<HTMLInputElement> | undefined;
@@ -50,7 +51,6 @@ export class OneDepComponent implements OnInit {
   constructor(public appConfigService: AppConfigService,
     private store: Store,
     private http: HttpClient,
-    private route: ActivatedRoute,
     private router: Router,
     private fb: FormBuilder,
   ) { }
@@ -78,6 +78,7 @@ export class OneDepComponent implements OnInit {
     this.form = this.fb.group({
       email: this.user.email,
       jwtToken: new FormControl(""),
+      password: new FormControl(),
       metadata: this.dataset.scientificMetadata,
       emMethod: new FormControl(""),
       deposingCoordinates: new FormControl(null, Validators.required),
@@ -91,12 +92,21 @@ export class OneDepComponent implements OnInit {
       ]),
     })
   }
+
+  ngOnDestroy() {
+    this.subscriptions.forEach((subscription) => {
+      subscription.unsubscribe();
+    });
+  }
   hasUnsavedChanges() {
     return this._hasUnsavedChanges;
   }
   onHasUnsavedChanges($event: boolean) {
     this._hasUnsavedChanges = $event;
   }
+  togglePasswordVisibility() {
+    this.showPassword = !this.showPassword;
+  }
   orcidArray(): FormArray {
     return this.form.get('orcid') as FormArray;
   }
@@ -140,6 +150,7 @@ export class OneDepComponent implements OnInit {
   }
 
   onPDB(event: any) {
+    console.log(this.form.get('password'))
     const input = event.value;
     if (input === 'true') {
       this.fileTypes.forEach((fT) => {
@@ -153,7 +164,7 @@ export class OneDepComponent implements OnInit {
   autoGrow(event: Event) {
     const textarea = event.target as HTMLTextAreaElement;
     const lineHeight = parseInt(getComputedStyle(textarea).lineHeight, 10);
-    const maxLines = 5;
+    const maxLines = 3;
 
     // Reset height to auto to calculate scrollHeight
     textarea.style.height = 'auto';
@@ -304,15 +315,29 @@ export class OneDepComponent implements OnInit {
   }
   onDepositClick() {
     //  Create a deposition
-    const body = JSON.stringify(
-      {
-        "email": "sofya.laskina@epfl.ch",  // for now
-        "orcidIds": this.orcidArray().value.map(item => item.orcidId),
-        "country": "United States",
-        "method": this.form.value.emMethod,
-        "jwtToken": this.form.value.jwtToken,
-      }
-    );
+    let body: string; 
+    if (this.form.value.password){
+      body = JSON.stringify(
+        {
+          "email": "sofya.laskina@epfl.ch",  // for now
+          "orcidIds": this.orcidArray().value.map(item => item.orcidId),
+          "country": "United States",
+          "method": this.form.value.emMethod,
+          "jwtToken": this.form.value.jwtToken,
+          "password": this.form.value.password,
+        }
+      );
+    }else{
+      body = JSON.stringify(
+        {
+          "email": "sofya.laskina@epfl.ch",  // for now
+          "orcidIds": this.orcidArray().value.map(item => item.orcidId),
+          "country": "United States",
+          "method": this.form.value.emMethod,
+          "jwtToken": this.form.value.jwtToken,
+        }
+      );
+    }
     let depID: string;
     let metadataAdded = false;
     this.http.post("http://localhost:8080/onedep", body, {
@@ -322,7 +347,7 @@ export class OneDepComponent implements OnInit {
         depID = response.depID; // Update the outer variable
         console.log('Created deposition in OneDep', depID);
 
-    //     // Call subsequent requests
+    // Call subsequent requests
     this.fileTypes.forEach((fT) => { 
       if (fT.file) {
         const formDataFile = new FormData()
@@ -348,57 +373,7 @@ export class OneDepComponent implements OnInit {
       },
       error: (error) => console.error('Request failed', error.error),
     });
-
-    // const formDataFile = new FormData();
-    // formDataToSend.append('jwtToken', this.form.value.jwtToken);
-    // 
-
-    // var fileMetadata = []
-    // // for (const fI in this.fileTypes) {
-    // 
-    // formDataToSend.append('fileMetadata', JSON.stringify(fileMetadata));
-    // this.http.post("http://localhost:8080/onedep", formDataToSend, {
-    //   headers: {}
-    // }).subscribe(
-    //   response => {
-    //     console.log('Created deposition in OneDep', response);
-    //   },
-    //   error => {
-    //     console.error('Request failed', error.error);
-    //   }
-    // );
-
   }
-
-  //   onCreateClick() {
-  //     let bearer = 'Bearer ' + this.form.value['jwtToken'];
-  //     const headers = new HttpHeaders()
-  //       .append(
-  //         'Content-Type',
-  //         'application/json'
-  //       )
-  //       .append(
-  //         'Authorization',
-  //         bearer
-  //       );
-
-  //     const body = JSON.stringify(
-  //       {
-  //         "email": "sofya.laskina@epfl.ch",
-  //         "users": ["0009-0003-3665-5367"],
-  //         "country": "United States",
-  //         "experiments": [Experiments[this.form.value.emMethod]],
-  //       }
-  //     );
-
-  //     this.http
-  //       .post('https://onedep-depui-test.wwpdb.org/deposition/api/v1/depositions/new', body, {
-  //         headers: headers,
-  //       })
-  //       .subscribe((res) => console.log(res));
-
-  //   }
-
 }
 
 

From 8a8f5e303629cb9bd4331f0b7912651295cc1573 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 16 Dec 2024 20:32:22 +0000
Subject: [PATCH 044/245] onedep component can be turned off

---
 .eslintrc.json                                |   2 +-
 CI/e2e/frontend.config.e2e.json               |   2 +-
 src/app/app-config.service.ts                 |   2 +
 ...ataset-details-dashboard.routing.module.ts |  13 +
 .../datasets.routing.module.ts                |   5 -
 src/app/app-routing/service.guard.ts          |   3 +
 .../dataset-detail.component.html             |  18 -
 .../dataset-detail.component.scss             |   5 -
 .../dataset-detail.component.ts               |  67 +--
 .../dataset-details-dashboard.component.ts    |  11 +
 src/app/datasets/onedep/onedep.component.ts   | 319 ++++++++-----
 src/app/datasets/onedep/onedep.directive.ts   |  22 +-
 src/app/datasets/onedep/types/methods.enum.ts | 447 +++++++++---------
 src/app/empiar/empiar.component.html          |   4 -
 src/app/empiar/empiar.component.scss          |   0
 src/app/empiar/empiar.component.ts            |  18 -
 src/assets/config.json                        |   4 +-
 17 files changed, 487 insertions(+), 455 deletions(-)
 delete mode 100644 src/app/empiar/empiar.component.html
 delete mode 100644 src/app/empiar/empiar.component.scss
 delete mode 100644 src/app/empiar/empiar.component.ts

diff --git a/.eslintrc.json b/.eslintrc.json
index 2f22b56243..862f21e381 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -9,7 +9,7 @@
   "plugins": ["@typescript-eslint/eslint-plugin"],
   "overrides": [
     {
-      "files": ["*.ts"],
+      "files": ["onedep*.ts"],
       "parserOptions": {
         "project": ["tsconfig.json"],
         "createDefaultProgram": true
diff --git a/CI/e2e/frontend.config.e2e.json b/CI/e2e/frontend.config.e2e.json
index da87bca32d..633624b991 100644
--- a/CI/e2e/frontend.config.e2e.json
+++ b/CI/e2e/frontend.config.e2e.json
@@ -2,7 +2,7 @@
   "accessTokenPrefix": "Bearer ",
   "addDatasetEnabled": false,
   "archiveWorkflowEnabled": false,
-  "datasetReduceEnabled": false,
+  "datasetReduceEnabled": true,
   "datasetJsonScientificMetadata": true,
   "editDatasetSampleEnabled": true,
   "editMetadataEnabled": true,
diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index 7dec6effdf..ea5714c926 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -41,6 +41,7 @@ export interface AppConfig {
   datasetJsonScientificMetadata: boolean;
   datasetReduceEnabled: boolean;
   datasetDetailsShowMissingProposalId: boolean;
+  datasetOneDepIntegration: boolean;
   datafilesActionsEnabled: boolean;
   datafilesActions: any[];
   editDatasetSampleEnabled: boolean;
@@ -64,6 +65,7 @@ export interface AppConfig {
   jupyterHubUrl: string | null;
   landingPage: string | null;
   lbBaseURL: string;
+  depositorURL: string;
   localColumns?: TableColumn[]; // localColumns is deprecated and should be removed in the future
   logbookEnabled: boolean;
   loginFormEnabled: boolean;
diff --git a/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts b/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
index 0f3f81e434..1bf09da064 100644
--- a/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
+++ b/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
@@ -11,6 +11,7 @@ import { DatasetDetailComponent } from "datasets/dataset-detail/dataset-detail.c
 import { DatasetFileUploaderComponent } from "datasets/dataset-file-uploader/dataset-file-uploader.component";
 import { DatasetLifecycleComponent } from "datasets/dataset-lifecycle/dataset-lifecycle.component";
 import { ReduceComponent } from "datasets/reduce/reduce.component";
+import { OneDepComponent } from "datasets/onedep/onedep.component";
 import { RelatedDatasetsComponent } from "datasets/related-datasets/related-datasets.component";
 import { LogbooksDashboardComponent } from "logbooks/logbooks-dashboard/logbooks-dashboard.component";
 const routes: Routes = [
@@ -71,6 +72,18 @@ const routes: Routes = [
     component: AdminTabComponent,
     canActivate: [AuthGuard, AdminGuard],
   },
+  {
+    path: "onedep",
+    canActivate: [ServiceGuard],
+    children: [
+      {
+        path: "",
+        component: OneDepComponent,
+        canActivate: [AuthGuard],
+      },
+    ],
+    data: { service: "onedep" },
+  },
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
index 14feaf6945..d1637dbd59 100644
--- a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
+++ b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
@@ -6,7 +6,6 @@ import { DashboardComponent } from "datasets/dashboard/dashboard.component";
 import { DatablocksComponent } from "datasets/datablocks-table/datablocks-table.component";
 import { DatasetDetailsDashboardComponent } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
 import { PublishComponent } from "datasets/publish/publish.component";
-import { OneDepComponent } from "datasets/onedep/onedep.component";
 
 const routes: Routes = [
   {
@@ -36,10 +35,6 @@ const routes: Routes = [
     component: DatablocksComponent,
     canActivate: [AuthGuard],
   },
-  { 
-    path: ":id/onedep", 
-    component: OneDepComponent, 
-  }, 
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/app-routing/service.guard.ts b/src/app/app-routing/service.guard.ts
index fddb5db54b..5f3ec55dce 100644
--- a/src/app/app-routing/service.guard.ts
+++ b/src/app/app-routing/service.guard.ts
@@ -31,6 +31,9 @@ export class ServiceGuard implements CanActivate {
       case "reduce":
         shouldActivate = this.appConfig.datasetReduceEnabled;
         break;
+      case "onedep":
+        shouldActivate = this.appConfig.datasetOneDepIntegration;
+        break;
     }
     if (!shouldActivate) {
       this.router.navigate(["/404"], {
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail.component.html
index c5c6d58335..0df999dc2e 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.html
@@ -12,24 +12,6 @@
         Jupyter Hub
       </a>
     </div>
-    <button
-          mat-raised-button
-          id="onedepBtn"
-          class="emexport-button"
-          *ngIf="hasOpenEMKeyword()"
-          (click)="onOneDepClick()"
-        >
-          OneDep
-    </button>
-    <button
-          mat-raised-button
-          id="onedepBtn"
-          class="emexport-button"
-          *ngIf="hasOpenEMKeyword()"
-          (click)="onEMPIARclick()"
-        >
-          EMPIAR
-    </button>
     <div fxFlex="auto" *ngIf="editingAllowed">
       <mat-slide-toggle
         class="public-toggle"
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.scss b/src/app/datasets/dataset-detail/dataset-detail.component.scss
index 4ceac42898..14d17981ed 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.scss
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.scss
@@ -51,11 +51,6 @@ mat-card {
 .jupyter-button {
   margin: 1em 0 0 1em;
 }
-.emexport-button {
-  margin: 1em 0 0 1em;
-  background-color: hsla(185, 43%, 45%, 0.858);
-  color: white;
-}
 .public-toggle {
   margin: 1em 1em 0 0;
   float: right;
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index 67f706479c..17b7985915 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -1,4 +1,12 @@
-import { Component, OnInit, OnDestroy, Inject } from "@angular/core";
+import {
+  Component,
+  OnInit,
+  Output,
+  EventEmitter,
+  OnDestroy,
+  Inject,
+} from "@angular/core";
+import { Dataset, Proposal, Sample } from "shared/sdk/models";
 import { ENTER, COMMA, SPACE } from "@angular/cdk/keycodes";
 import { MatChipInputEvent } from "@angular/material/chips";
 
@@ -7,7 +15,7 @@ import { MatDialog } from "@angular/material/dialog";
 import { DialogComponent } from "shared/modules/dialog/dialog.component";
 import { combineLatest, fromEvent, Observable, Subscription } from "rxjs";
 import { Store } from "@ngrx/store";
-import { HttpClient } from '@angular/common/http';
+import { HttpClient } from "@angular/common/http";
 
 import { showMessageAction } from "state-management/actions/user.actions";
 import {
@@ -66,7 +74,8 @@ import { AttachmentService } from "shared/services/attachment.service";
   standalone: false,
 })
 export class DatasetDetailComponent
-  implements OnInit, OnDestroy, EditableComponent {
+  implements OnInit, OnDestroy, EditableComponent
+{
   private subscriptions: Subscription[] = [];
   private _hasUnsavedChanges = false;
   form: FormGroup;
@@ -90,16 +99,6 @@ export class DatasetDetailComponent
   editEnabled = false;
   show = false;
 
-
-  connectedDepositionBackend: string = '';
-  connectedDepositionBackendVersion: string = '';
-  connectingToDepositionBackend: boolean = false;
-  lastUsedDepositionBackends: string[] = [];
-  forwardDepositionBackend: string = '';
-  errorMessage: string = '';
-
-  @Output() emClick = new EventEmitter<Dataset>();
-
   readonly separatorKeyCodes: number[] = [ENTER, COMMA, SPACE];
 
   constructor(
@@ -111,11 +110,9 @@ export class DatasetDetailComponent
     private http: HttpClient,
     private router: Router,
     private fb: FormBuilder,
-  ) { }
+  ) {}
 
   ngOnInit() {
-    this.connectingToDepositionBackend = true;
-
     this.form = this.fb.group({
       datasetName: new FormControl("", [Validators.required]),
       description: new FormControl("", [Validators.required]),
@@ -329,42 +326,4 @@ export class DatasetDetailComponent
   openAttachment(encoded: string) {
     this.attachmentService.openAttachment(encoded);
   }
-  onEMPIARclick() {
-    const id = encodeURIComponent(this.dataset.pid);
-    this.router.navigateByUrl("/datasets/" + id + "/empiar");
-  }
-
-
-  connectToDepositionBackend(): boolean {
-    var DepositionBackendUrl = "http://localhost:8080"
-    let DepositionBackendUrlCleaned = DepositionBackendUrl.slice();
-    // Check if last symbol is a slash and add version endpoint
-    if (!DepositionBackendUrlCleaned.endsWith('/')) {
-      DepositionBackendUrlCleaned += '/';
-    }
-
-    let DepositionBackendUrlVersion = DepositionBackendUrlCleaned + 'version';
-
-    // Try to connect to the facility backend/version to check if it is available
-    console.log('Connecting to OneDep backend: ' + DepositionBackendUrlVersion);
-    this.http.get(DepositionBackendUrlVersion).subscribe(
-      response => {
-        console.log('Connected to OneDep backend', response);
-        // If the connection is successful, store the connected facility backend URL
-        this.connectedDepositionBackend = DepositionBackendUrlCleaned;
-        this.connectingToDepositionBackend = false;
-        this.connectedDepositionBackendVersion = response['version'];
-      },
-      error => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-        console.error('Request failed', error);
-        this.connectedDepositionBackend = '';
-        this.connectingToDepositionBackend = false;
-      }
-    );
-
-    return true;
-  }
-
 }
-
diff --git a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
index c857094866..9a8326095f 100644
--- a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
+++ b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
@@ -62,6 +62,7 @@ enum TAB {
   attachments = "Attachments",
   admin = "Admin",
   lifecycle = "Lifecycle",
+  onedep = "OneDep",
 }
 @Component({
   selector: "dataset-details-dashboard",
@@ -104,6 +105,7 @@ export class DatasetDetailsDashboardComponent
     [TAB.logbook]: { action: fetchDatasetLogbookAction, loaded: false },
     [TAB.attachments]: { action: fetchAttachmentsAction, loaded: false },
     [TAB.admin]: { action: fetchDatablocksAction, loaded: false },
+    [TAB.onedep]: { action: fetchDatasetAction, loaded: false },
   };
   userProfile$ = this.store.select(selectProfile);
   isAdmin$ = this.store.select(selectIsAdmin);
@@ -146,6 +148,9 @@ export class DatasetDetailsDashboardComponent
             const hasAccessToLogbook =
               isInOwnerGroup ||
               this.dataset.accessGroups.some((g) => groups.includes(g));
+            const hasOpenEMKeyword = this.dataset.keywords.some(
+              (k) => k.toLowerCase() === "openem",
+            );
             this.navLinks = [
               {
                 location: "./",
@@ -208,6 +213,12 @@ export class DatasetDetailsDashboardComponent
                 icon: "settings",
                 enabled: isLoggedIn && isAdmin,
               },
+              {
+                location: "./onedep",
+                label: TAB.onedep,
+                icon: "file_upload",
+                enabled: isLoggedIn && hasOpenEMKeyword,
+              },
             ];
           })
           .unsubscribe();
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 0557ace15d..df0ad54227 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -1,7 +1,13 @@
-import { Component, OnInit, ViewChild, ElementRef, OnDestroy } from "@angular/core";
-import { AppConfigService } from "app-config.service";
-import { HttpClient } from '@angular/common/http';
-import { Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+  ViewChild,
+  ElementRef,
+  OnDestroy,
+} from "@angular/core";
+import { AppConfigService, AppConfig } from "app-config.service";
+import { HttpClient } from "@angular/common/http";
+import { Router } from "@angular/router";
 import {
   FormBuilder,
   FormControl,
@@ -12,51 +18,59 @@ import {
 
 import { Store } from "@ngrx/store";
 import { Dataset } from "shared/sdk/models";
-import {
-  selectCurrentDataset,
-} from "state-management/selectors/datasets.selectors";
-import {
-  selectCurrentUser
-} from "state-management/selectors/user.selectors";
+import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
+import { selectCurrentUser } from "state-management/selectors/user.selectors";
 import { User } from "shared/sdk";
-import { MethodsList, EmFile, DepositionFiles } from "./types/methods.enum"
+import { methodsList, EmFile, DepositionFiles } from "./types/methods.enum";
 import { Subscription, fromEvent } from "rxjs";
 
-
 @Component({
-  selector: 'onedep',
-  templateUrl: './onedep.component.html',
-  styleUrls: ['./onedep.component.scss']
+  selector: "onedep",
+  templateUrl: "./onedep.component.html",
+  styleUrls: ["./onedep.component.scss"],
 })
 export class OneDepComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   private _hasUnsavedChanges = false;
 
-  appConfig = this.appConfigService.getConfig();
+  config: AppConfig;
+
   dataset: Dataset | undefined;
   user: User | undefined;
   form: FormGroup;
-  showAssociatedMapQuestion: boolean = false;
-  methodsList = MethodsList;
+  showAssociatedMapQuestion = false;
+  methodsList = methodsList;
   selectedFile: { [key: string]: File | null } = {};
   emFile = EmFile;
   fileTypes: DepositionFiles[];
-  detailsOverflow: string = 'hidden';
+  detailsOverflow = "hidden";
   additionalMaps = 0;
   showPassword = false;
 
+  connectedDepositionBackend = "";
+  connectedDepositionBackendVersion = "";
+  connectingToDepositionBackend = false;
+  lastUsedDepositionBackends: string[] = [];
+  forwardDepositionBackend = "";
+  errorMessage = "";
 
-  @ViewChild('fileInput') fileInput: ElementRef<HTMLInputElement> | undefined;
+  @ViewChild("fileInput") fileInput: ElementRef<HTMLInputElement> | undefined;
 
-  constructor(public appConfigService: AppConfigService,
+  constructor(
+    public appConfigService: AppConfigService,
     private store: Store,
     private http: HttpClient,
     private router: Router,
     private fb: FormBuilder,
-  ) { }
-
+  ) {
+    this.config = this.appConfigService.getConfig();
+  }
 
   ngOnInit() {
+    //  connect to the depositor
+    this.connectingToDepositionBackend = true;
+    this.connectToDepositionBackend();
+
     this.store.select(selectCurrentDataset).subscribe((dataset) => {
       this.dataset = dataset;
     });
@@ -87,10 +101,13 @@ export class OneDepComponent implements OnInit, OnDestroy {
       emdbId: new FormControl(""),
       orcid: this.fb.array([
         this.fb.group({
-          orcidId: ['', [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)]],
-        })
+          orcidId: [
+            "",
+            [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)],
+          ],
+        }),
       ]),
-    })
+    });
   }
 
   ngOnDestroy() {
@@ -108,11 +125,14 @@ export class OneDepComponent implements OnInit, OnDestroy {
     this.showPassword = !this.showPassword;
   }
   orcidArray(): FormArray {
-    return this.form.get('orcid') as FormArray;
+    return this.form.get("orcid") as FormArray;
   }
   addOrcidField() {
     const orcidField = this.fb.group({
-      orcidId: ['', [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)]],
+      orcidId: [
+        "",
+        [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)],
+      ],
     });
     this.orcidArray().push(orcidField);
   }
@@ -122,37 +142,48 @@ export class OneDepComponent implements OnInit, OnDestroy {
     }
   }
   onMethodChange() {
-    this.fileTypes = this.methodsList.find(mL => mL.value === this.form.value['emMethod']).files;
+    this.fileTypes = this.methodsList.find(
+      (mL) => mL.value === this.form.value["emMethod"],
+    ).files;
     this.fileTypes.forEach((fT) => {
-      if (fT.emName === this.emFile.MainMap || fT.emName === this.emFile.Image) {
+      if (
+        fT.emName === this.emFile.MainMap ||
+        fT.emName === this.emFile.Image
+      ) {
         fT.required = true;
       } else {
         fT.required = false;
       }
     });
-    switch (this.form.value['emMethod']) {
-      case 'helical':
+    switch (this.form.value["emMethod"]) {
+      case "helical":
         this.fileTypes.forEach((fT) => {
-          if (fT.emName === this.emFile.HalfMap1 || fT.emName === this.emFile.HalfMap2) {
+          if (
+            fT.emName === this.emFile.HalfMap1 ||
+            fT.emName === this.emFile.HalfMap2
+          ) {
             fT.required = true;
           }
         });
         break;
       case "single-particle":
         this.fileTypes.forEach((fT) => {
-          if (fT.emName === this.emFile.HalfMap1 || fT.emName === this.emFile.HalfMap2 || fT.emName === this.emFile.MaskMap) {
+          if (
+            fT.emName === this.emFile.HalfMap1 ||
+            fT.emName === this.emFile.HalfMap2 ||
+            fT.emName === this.emFile.MaskMap
+          ) {
             fT.required = true;
           }
         });
         break;
     }
-
   }
 
-  onPDB(event: any) {
-    console.log(this.form.get('password'))
+  onPDB(event: any) { // FIXME specify type
+    console.log(this.form.get("password"));
     const input = event.value;
-    if (input === 'true') {
+    if (input === "true") {
       this.fileTypes.forEach((fT) => {
         if (fT.emName === this.emFile.Coordinates) {
           fT.required = true;
@@ -167,14 +198,15 @@ export class OneDepComponent implements OnInit, OnDestroy {
     const maxLines = 3;
 
     // Reset height to auto to calculate scrollHeight
-    textarea.style.height = 'auto';
+    textarea.style.height = "auto";
 
     // Set the height based on the scrollHeight but limit it
     const newHeight = Math.min(textarea.scrollHeight, lineHeight * maxLines);
     textarea.style.height = `${newHeight}px`;
 
     // Update overflow property based on height
-    this.detailsOverflow = textarea.scrollHeight > newHeight ? 'auto' : 'hidden';
+    this.detailsOverflow =
+      textarea.scrollHeight > newHeight ? "auto" : "hidden";
   }
   onChooseFile(fileInput: HTMLInputElement) {
     fileInput.click();
@@ -215,21 +247,25 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
   updateContourLevelMain(event: Event) {
     const input = (event.target as HTMLInputElement).value.trim();
-    const normalizedInput = input.replace(',', '.');
+    const normalizedInput = input.replace(",", ".");
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
       this.fileTypes.forEach((fT) => {
-        if (fT.emName === EmFile.MainMap || fT.emName === EmFile.HalfMap1 || fT.emName === EmFile.HalfMap2) {
+        if (
+          fT.emName === EmFile.MainMap ||
+          fT.emName === EmFile.HalfMap1 ||
+          fT.emName === EmFile.HalfMap2
+        ) {
           fT.contour = parsedValue;
         }
       });
     } else {
-      console.warn('Invalid number format:', input);
+      console.warn("Invalid number format:", input);
     }
   }
   updateContourLevelAddMap(event: Event, id: number) {
     const input = (event.target as HTMLInputElement).value.trim();
-    const normalizedInput = input.replace(',', '.');
+    const normalizedInput = input.replace(",", ".");
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
       this.fileTypes.forEach((fT) => {
@@ -238,12 +274,12 @@ export class OneDepComponent implements OnInit, OnDestroy {
         }
       });
     } else {
-      console.warn('Invalid number format:', input);
+      console.warn("Invalid number format:", input);
     }
   }
   updateContourLevel(event: Event, controlName: EmFile) {
     const input = (event.target as HTMLInputElement).value.trim();
-    const normalizedInput = input.replace(',', '.');
+    const normalizedInput = input.replace(",", ".");
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
       this.fileTypes.forEach((fT) => {
@@ -252,7 +288,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
         }
       });
     } else {
-      console.warn('Invalid number format:', input);
+      console.warn("Invalid number format:", input);
     }
   }
   updateDetails(event: Event, controlName: EmFile) {
@@ -263,7 +299,6 @@ export class OneDepComponent implements OnInit, OnDestroy {
         fT.details = value;
       }
     });
-
   }
   updateDetailsAddMap(event: Event, id: number) {
     const textarea = event.target as HTMLTextAreaElement; // Cast to HTMLTextAreaElement
@@ -273,17 +308,17 @@ export class OneDepComponent implements OnInit, OnDestroy {
         fT.details = value;
       }
     });
-
   }
   addMap() {
-    const nextId = this.fileTypes
-      .filter(file => file.emName === EmFile.AddMap)
-      .reduce((maxId, file) => (file.id > maxId ? file.id : maxId), 0) + 1;
+    const nextId =
+      this.fileTypes
+        .filter((file) => file.emName === EmFile.AddMap)
+        .reduce((maxId, file) => (file.id > maxId ? file.id : maxId), 0) + 1;
 
     const newMap: DepositionFiles = {
       emName: EmFile.AddMap,
       id: nextId,
-      nameFE: 'Additional Map ( ' + (nextId + 1).toString() + ' )',
+      nameFE: "Additional Map ( " + (nextId + 1).toString() + " )",
       type: "add-map",
       fileName: "",
       file: null,
@@ -295,85 +330,133 @@ export class OneDepComponent implements OnInit, OnDestroy {
     this.fileTypes.push(newMap);
   }
   sendFile(depID: string, form: FormData, fileType: string) {
-    this.http.post("http://localhost:8080/onedep/" + depID + "/file", form).subscribe({
-      next: (res) => console.log('Uploaded', fileType, res),
-      error: (error) => console.error('Could not upload File and Metadata', error),
-    });
+    this.http
+      .post("http://localhost:8080/onedep/" + depID + "/file", form)
+      .subscribe({
+        next: (res) => console.log("Uploaded", fileType, res),
+        error: (error) =>
+          console.error("Could not upload File and Metadata", error),
+      });
   }
   sendCoordFile(depID: string, form: FormData) {
-    this.http.post("http://localhost:8080/onedep/" + depID + "/pdb", form).subscribe({
-      next: (res) => console.log('Uploaded Coordinates and Metadata', res),
-      error: (error) => console.error('Could not upload Coordinates and Metadata', error),
-    });
+    this.http
+      .post("http://localhost:8080/onedep/" + depID + "/pdb", form)
+      .subscribe({
+        next: (res) => console.log("Uploaded Coordinates and Metadata", res),
+        error: (error) =>
+          console.error("Could not upload Coordinates and Metadata", error),
+      });
   }
   sendMetadata(depID: string, form: FormData) {
     // missing token!
-    this.http.post("http://localhost:8080/onedep/" + depID + "/metadata", form).subscribe({
-      next: (res) => console.log('Uploaded Metadata', res),
-      error: (error) => console.error('Could not upload Metadata', error),
-    });
+    this.http
+      .post("http://localhost:8080/onedep/" + depID + "/metadata", form)
+      .subscribe({
+        next: (res) => console.log("Uploaded Metadata", res),
+        error: (error) => console.error("Could not upload Metadata", error),
+      });
   }
   onDepositClick() {
     //  Create a deposition
-    let body: string; 
-    if (this.form.value.password){
-      body = JSON.stringify(
-        {
-          "email": "sofya.laskina@epfl.ch",  // for now
-          "orcidIds": this.orcidArray().value.map(item => item.orcidId),
-          "country": "United States",
-          "method": this.form.value.emMethod,
-          "jwtToken": this.form.value.jwtToken,
-          "password": this.form.value.password,
-        }
-      );
-    }else{
-      body = JSON.stringify(
-        {
-          "email": "sofya.laskina@epfl.ch",  // for now
-          "orcidIds": this.orcidArray().value.map(item => item.orcidId),
-          "country": "United States",
-          "method": this.form.value.emMethod,
-          "jwtToken": this.form.value.jwtToken,
-        }
-      );
+    let body: string;
+    if (this.form.value.password) {
+      body = JSON.stringify({
+        email: "sofya.laskina@epfl.ch", // for now
+        orcidIds: this.orcidArray().value.map((item) => item.orcidId),
+        country: "United States",
+        method: this.form.value.emMethod,
+        jwtToken: this.form.value.jwtToken,
+        password: this.form.value.password,
+      });
+    } else {
+      body = JSON.stringify({
+        email: "sofya.laskina@epfl.ch", // for now
+        orcidIds: this.orcidArray().value.map((item) => item.orcidId),
+        country: "United States",
+        method: this.form.value.emMethod,
+        jwtToken: this.form.value.jwtToken,
+      });
     }
     let depID: string;
     let metadataAdded = false;
-    this.http.post("http://localhost:8080/onedep", body, {
-     headers: { 'Content-Type': 'application/json' },
-    }).subscribe({
-      next: (response: any) => {
-        depID = response.depID; // Update the outer variable
-        console.log('Created deposition in OneDep', depID);
+    this.http
+      .post("http://localhost:8080/onedep", body, {
+        headers: { "Content-Type": "application/json" },
+      })
+      .subscribe({
+        next: (response: any) => { // FIX ME specify type
+          depID = response.depID; // Update the outer variable
+          console.log("Created deposition in OneDep", depID);
 
-    // Call subsequent requests
-    this.fileTypes.forEach((fT) => { 
-      if (fT.file) {
-        const formDataFile = new FormData()
-        formDataFile.append('jwtToken', this.form.value.jwtToken)
-        formDataFile.append('file', fT.file);
-        if (fT.emName === this.emFile.Coordinates) {
-          formDataFile.append('scientificMetadata', JSON.stringify(this.form.value.metadata));
-          this.sendCoordFile(depID, formDataFile);
-          metadataAdded = true
-        } else {
-          formDataFile.append('fileMetadata', JSON.stringify({ name: fT.fileName, type: fT.type, contour: fT.contour, details: fT.details }))
-          this.sendFile(depID, formDataFile, fT.type);
-        }
-      }
-    });
-    if (! metadataAdded){
-      const formDataFile = new FormData()
+          // Call subsequent requests
+          this.fileTypes.forEach((fT) => {
+            if (fT.file) {
+              const formDataFile = new FormData();
+              formDataFile.append("jwtToken", this.form.value.jwtToken);
+              formDataFile.append("file", fT.file);
+              if (fT.emName === this.emFile.Coordinates) {
+                formDataFile.append(
+                  "scientificMetadata",
+                  JSON.stringify(this.form.value.metadata),
+                );
+                this.sendCoordFile(depID, formDataFile);
+                metadataAdded = true;
+              } else {
+                formDataFile.append(
+                  "fileMetadata",
+                  JSON.stringify({
+                    name: fT.fileName,
+                    type: fT.type,
+                    contour: fT.contour,
+                    details: fT.details,
+                  }),
+                );
+                this.sendFile(depID, formDataFile, fT.type);
+              }
+            }
+          });
+          if (!metadataAdded) {
+            const formDataFile = new FormData();
 
-      formDataFile.append('jwtToken', this.form.value.jwtToken)
-      formDataFile.append('scientificMetadata', JSON.stringify(this.form.value.metadata));
-      this.sendMetadata(depID, formDataFile);
+            formDataFile.append("jwtToken", this.form.value.jwtToken);
+            formDataFile.append(
+              "scientificMetadata",
+              JSON.stringify(this.form.value.metadata),
+            );
+            this.sendMetadata(depID, formDataFile);
+          }
+        },
+        error: (error) => console.error("Request failed", error.error),
+      });
+  }
+  connectToDepositionBackend(): boolean {
+    const depositionBackendUrl = this.config.depositorURL;
+    let depositionBackendUrlCleaned = depositionBackendUrl.slice();
+    // Check if last symbol is a slash and add version endpoint
+    if (!depositionBackendUrlCleaned.endsWith("/")) {
+      depositionBackendUrlCleaned += "/";
     }
+
+    const depositionBackendUrlVersion = depositionBackendUrlCleaned + "version";
+
+    // Try to connect to the facility backend/version to check if it is available
+    console.log("Connecting to OneDep backend: " + depositionBackendUrlVersion);
+    this.http.get(depositionBackendUrlVersion).subscribe(
+      (response) => {
+        console.log("Connected to OneDep backend", response);
+        // If the connection is successful, store the connected facility backend URL
+        this.connectedDepositionBackend = depositionBackendUrlCleaned;
+        this.connectingToDepositionBackend = false;
+        this.connectedDepositionBackendVersion = response["version"];
       },
-      error: (error) => console.error('Request failed', error.error),
-    });
+      (error) => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+        console.error("Request failed", error);
+        this.connectedDepositionBackend = "";
+        this.connectingToDepositionBackend = false;
+      },
+    );
+
+    return true;
   }
 }
-
-
diff --git a/src/app/datasets/onedep/onedep.directive.ts b/src/app/datasets/onedep/onedep.directive.ts
index d54b0a2502..7928e65520 100644
--- a/src/app/datasets/onedep/onedep.directive.ts
+++ b/src/app/datasets/onedep/onedep.directive.ts
@@ -2,17 +2,18 @@ import { Directive, HostListener, ElementRef, OnInit } from "@angular/core";
 
 @Directive({ selector: "[orcidFormatter]" })
 export class OrcidFormatterDirective {
-
   private readonly maxRawLength = 16;
 
   constructor(private el: ElementRef) {}
 
-  @HostListener('input', ['$event'])
+  @HostListener("input", ["$event"])
   onInput(event: InputEvent): void {
     const inputElement = this.el.nativeElement as HTMLInputElement;
 
     // Remove all existing dashes and limit to the max length
-    const rawValue = inputElement.value.replace(/-/g, '').slice(0, this.maxRawLength);
+    const rawValue = inputElement.value
+      .replace(/-/g, "")
+      .slice(0, this.maxRawLength);
 
     // Format with dashes
     const formattedValue = this.formatWithDashes(rawValue);
@@ -21,18 +22,23 @@ export class OrcidFormatterDirective {
     inputElement.value = formattedValue;
 
     // Preserve the cursor position
-    const cursorPosition = this.getAdjustedCursorPosition(rawValue, inputElement.selectionStart || 0);
+    const cursorPosition = this.getAdjustedCursorPosition(
+      rawValue,
+      inputElement.selectionStart || 0,
+    );
     inputElement.setSelectionRange(cursorPosition, cursorPosition);
   }
 
   private formatWithDashes(value: string): string {
-    return value.match(/.{1,4}/g)?.join('-') || value;
+    return value.match(/.{1,4}/g)?.join("-") || value;
   }
 
-  private getAdjustedCursorPosition(rawValue: string, originalPosition: number): number {
+  private getAdjustedCursorPosition(
+    rawValue: string,
+    originalPosition: number,
+  ): number {
     const rawCursorPosition = rawValue.slice(0, originalPosition).length;
     const dashCountBeforeCursor = Math.floor(rawCursorPosition / 4);
     return rawCursorPosition + dashCountBeforeCursor;
   }
-
-}
\ No newline at end of file
+}
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index 971433d610..e5748c9f09 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -1,233 +1,236 @@
 export enum EmType {
-    Helical = "helical",
-    SingleParticle = "single-particle",
-    SubtomogramAveraging = "subtomogram-averaging",
-    Tomogram = "tomogram",
-    ElectronCristallography = "electron-cristallography"
-};
+  Helical = "helical",
+  SingleParticle = "single-particle",
+  SubtomogramAveraging = "subtomogram-averaging",
+  Tomogram = "tomogram",
+  ElectronCristallography = "electron-cristallography",
+}
 
 export enum EmFile {
-    MainMap = 'vo-map',
-    HalfMap1 = 'half-map1',
-    HalfMap2 = 'half-map2',
-    MaskMap = 'mask-map',
-    AddMap = 'add-map',
-    Coordinates = 'co-cif',
-    Image = 'img-emdb',
-    FSC = 'fsc-xml',
-    LayerLines = "layer-lines",
-    StructureFactors = "xs-cif",
-    MTZ = "xs-mtz",
-};
-
+  MainMap = "vo-map",
+  HalfMap1 = "half-map1",
+  HalfMap2 = "half-map2",
+  MaskMap = "mask-map",
+  AddMap = "add-map",
+  Coordinates = "co-cif",
+  Image = "img-emdb",
+  FSC = "fsc-xml",
+  LayerLines = "layer-lines",
+  StructureFactors = "xs-cif",
+  MTZ = "xs-mtz",
+}
 
 export interface DepositionFiles {
-    emName: EmFile;
-    id?: number, 
-    nameFE: string;
-    type: string,
-    fileName: string,
-    file: File,
-    contour?: number,
-    details?: string,
-    required: boolean,
-    explanation?: string, 
+  emName: EmFile;
+  id?: number;
+  nameFE: string;
+  type: string;
+  fileName: string;
+  file: File;
+  contour?: number;
+  details?: string;
+  required: boolean;
+  explanation?: string;
 }
 
 interface EmMethod {
-    value: EmType;
-    viewValue: string;
-    files:  DepositionFiles[];
-}
-
-export const DepositionImage: DepositionFiles ={
-    emName: EmFile.Image,
-    nameFE: 'Public Image',
-    type: "img-emdb",
-    fileName: "",
-    file: null,
-    details: "",
-    required: false,
-    explanation: "Image of the map (500 x 500 pixels in .jpg, .png, etc. format)",
-}
-export const DepositionMainMap:DepositionFiles ={
-    emName: EmFile.MainMap,
-    nameFE: 'Main Map',
-    type: "vo-map",
-    fileName: "",
-    file: null,
-    contour: 0.0,
-    details: "",
-    required: false,
-    explanation: "Primary map (.mrc or .ccp4 format, may use gzip or bzip2 compression) along with recommended contour level", 
-}
-export const DepositionHalfMap1:DepositionFiles ={
-    emName: EmFile.HalfMap1,
-    nameFE: 'Half Map (1)',
-    type: "half-map",
-    fileName: "",
-    file: null,
-    contour: 0.0,
-    details: "",
-    required: false,
-    explanation:"Half maps (as used for FSC calculation; two maps must be uploaded)",
-}
-export const DepositionHalfMap2:DepositionFiles ={
-    emName: EmFile.HalfMap2,
-    nameFE: 'Half Map (2)',
-    type: "half-map",
-    fileName: "",
-    file: null,
-    contour: 0.0,
-    details: "",
-    required: false,
-    explanation:"Half maps (as used for FSC calculation; two maps must be uploaded)",
-}
-export const DepositionMaskMap:DepositionFiles ={
-    emName: EmFile.MaskMap,
-    nameFE: 'Mask Map',
-    type: "mask-map",
-    fileName: "",
-    file: null,
-    contour: 0.0,
-    details: "",
-    required: false,
-    explanation:"Primary/raw map mask, segmentation/focused refinement mask and half-map mask",
-}
-export const DepositionAddMap:DepositionFiles ={
-    emName: EmFile.AddMap,
-    id:0,
-    nameFE: 'Additional Map',
-    type: "add-map",
-    fileName: "",
-    file: null,
-    contour: 0.0,
-    details: "",
-    required: false,
-    explanation:"Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)", 
-}
-export const DepositionFSC:DepositionFiles ={
-    emName: EmFile.FSC,
-    nameFE: 'FSC-XML',
-    type: "fsc-xml",
-    fileName: "",
-    file: null,
-    details: "",
-    required: false,
-    explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs", 
-}
-export const DepositionLayerLines:DepositionFiles ={
-    emName: EmFile.LayerLines,
-    nameFE: 'Other: Layer Lines Data ',
-    type: "layer-lines",
-    fileName: "",
-    file: null,
-    details: "",
-    required: false,
-}
-export const DepositionCoordinates: DepositionFiles = {
-    emName: EmFile.Coordinates,
-    nameFE: 'Coordinates',
-    type: "co-cif",
-    fileName: "",
-    file: null,
-    details: "",
-    required: false,
-    explanation: "mmCIF or PDB format",
-}
-export const DepositionStructureFactors: DepositionFiles = {
-    emName: EmFile.StructureFactors,
-    nameFE: 'Structure Factors',
-    type: "xs-cif",
-    fileName: "",
-    file: null,
-    details: "",
-    required: false,
-}
-export const DepositionMTZ: DepositionFiles = {
-    emName: EmFile.MTZ,
-    nameFE: 'MTZ',
-    type: "xs-mtz",
-    fileName: "",
-    file: null,
-    details: "",
-    required: false,
+  value: EmType;
+  viewValue: string;
+  files: DepositionFiles[];
 }
 
+export const depositionImage: DepositionFiles = {
+  emName: EmFile.Image,
+  nameFE: "Public Image",
+  type: "img-emdb",
+  fileName: "",
+  file: null,
+  details: "",
+  required: false,
+  explanation: "Image of the map (500 x 500 pixels in .jpg, .png, etc. format)",
+};
+export const depositionMainMap: DepositionFiles = {
+  emName: EmFile.MainMap,
+  nameFE: "Main Map",
+  type: "vo-map",
+  fileName: "",
+  file: null,
+  contour: 0.0,
+  details: "",
+  required: false,
+  explanation:
+    "Primary map (.mrc or .ccp4 format, may use gzip or bzip2 compression) along with recommended contour level",
+};
+export const depositionHalfMap1: DepositionFiles = {
+  emName: EmFile.HalfMap1,
+  nameFE: "Half Map (1)",
+  type: "half-map",
+  fileName: "",
+  file: null,
+  contour: 0.0,
+  details: "",
+  required: false,
+  explanation:
+    "Half maps (as used for FSC calculation; two maps must be uploaded)",
+};
+export const depositionHalfMap2: DepositionFiles = {
+  emName: EmFile.HalfMap2,
+  nameFE: "Half Map (2)",
+  type: "half-map",
+  fileName: "",
+  file: null,
+  contour: 0.0,
+  details: "",
+  required: false,
+  explanation:
+    "Half maps (as used for FSC calculation; two maps must be uploaded)",
+};
+export const depositionMaskMap: DepositionFiles = {
+  emName: EmFile.MaskMap,
+  nameFE: "Mask Map",
+  type: "mask-map",
+  fileName: "",
+  file: null,
+  contour: 0.0,
+  details: "",
+  required: false,
+  explanation:
+    "Primary/raw map mask, segmentation/focused refinement mask and half-map mask",
+};
+export const depositionAddMap: DepositionFiles = {
+  emName: EmFile.AddMap,
+  id: 0,
+  nameFE: "Additional Map",
+  type: "add-map",
+  fileName: "",
+  file: null,
+  contour: 0.0,
+  details: "",
+  required: false,
+  explanation:
+    "Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)",
+};
+export const depositionFSC: DepositionFiles = {
+  emName: EmFile.FSC,
+  nameFE: "FSC-XML",
+  type: "fsc-xml",
+  fileName: "",
+  file: null,
+  details: "",
+  required: false,
+  explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs",
+};
+export const depositionLayerLines: DepositionFiles = {
+  emName: EmFile.LayerLines,
+  nameFE: "Other: Layer Lines Data ",
+  type: "layer-lines",
+  fileName: "",
+  file: null,
+  details: "",
+  required: false,
+};
+export const depositionCoordinates: DepositionFiles = {
+  emName: EmFile.Coordinates,
+  nameFE: "Coordinates",
+  type: "co-cif",
+  fileName: "",
+  file: null,
+  details: "",
+  required: false,
+  explanation: "mmCIF or PDB format",
+};
+export const depositionStructureFactors: DepositionFiles = {
+  emName: EmFile.StructureFactors,
+  nameFE: "Structure Factors",
+  type: "xs-cif",
+  fileName: "",
+  file: null,
+  details: "",
+  required: false,
+};
+export const depositionMTZ: DepositionFiles = {
+  emName: EmFile.MTZ,
+  nameFE: "MTZ",
+  type: "xs-mtz",
+  fileName: "",
+  file: null,
+  details: "",
+  required: false,
+};
 
-export const MethodsList: EmMethod[] = [
-    {
-        value: EmType.Helical,
-        viewValue: 'Helical',
-        files: [
-            DepositionImage, 
-            DepositionCoordinates, 
-            DepositionMainMap, 
-            DepositionMaskMap, 
-            DepositionHalfMap1, 
-            DepositionHalfMap2, 
-            DepositionFSC,
-            DepositionLayerLines,
-            DepositionAddMap, 
-        ],
-    },
-    {
-        value: EmType.SingleParticle,
-        viewValue: 'Single Particle',
-        files: [
-            DepositionImage, 
-            DepositionCoordinates, 
-            DepositionMainMap, 
-            DepositionMaskMap, 
-            DepositionHalfMap1, 
-            DepositionHalfMap2, 
-            DepositionFSC,
-            DepositionLayerLines,
-            DepositionAddMap, 
-        ],
-    },
-    {
-        value: EmType.SubtomogramAveraging,
-        viewValue: 'Subtomogram Averaging',
-        files:[
-            DepositionImage, 
-            DepositionCoordinates, 
-            DepositionMainMap, 
-            DepositionMaskMap, 
-            DepositionHalfMap1, 
-            DepositionHalfMap2, 
-            DepositionFSC,
-            DepositionLayerLines,
-            DepositionAddMap, 
-        ],
-    },
-    {
-        value: EmType.Tomogram,
-        viewValue: 'Tomogram',
-        files: [
-            DepositionImage, 
-            DepositionMainMap, 
-            DepositionMaskMap, 
-            DepositionFSC,
-            DepositionLayerLines,
-            DepositionAddMap, 
-        ],
-    },
-    {
-        value: EmType.ElectronCristallography,
-        viewValue: 'Electron Crystallography',
-        files: [
-            DepositionImage, 
-            DepositionCoordinates, 
-            DepositionMainMap, 
-            DepositionMaskMap, 
-            DepositionHalfMap1, 
-            DepositionHalfMap2, 
-            DepositionStructureFactors,
-            DepositionMTZ,
-            DepositionFSC,
-            DepositionLayerLines,
-            DepositionAddMap, 
-        ],
-    },
-];
\ No newline at end of file
+export const methodsList: EmMethod[] = [
+  {
+    value: EmType.Helical,
+    viewValue: "Helical",
+    files: [
+      depositionImage,
+      depositionCoordinates,
+      depositionMainMap,
+      depositionMaskMap,
+      depositionHalfMap1,
+      depositionHalfMap2,
+      depositionFSC,
+      depositionLayerLines,
+      depositionAddMap,
+    ],
+  },
+  {
+    value: EmType.SingleParticle,
+    viewValue: "Single Particle",
+    files: [
+      depositionImage,
+      depositionCoordinates,
+      depositionMainMap,
+      depositionMaskMap,
+      depositionHalfMap1,
+      depositionHalfMap2,
+      depositionFSC,
+      depositionLayerLines,
+      depositionAddMap,
+    ],
+  },
+  {
+    value: EmType.SubtomogramAveraging,
+    viewValue: "Subtomogram Averaging",
+    files: [
+      depositionImage,
+      depositionCoordinates,
+      depositionMainMap,
+      depositionMaskMap,
+      depositionHalfMap1,
+      depositionHalfMap2,
+      depositionFSC,
+      depositionLayerLines,
+      depositionAddMap,
+    ],
+  },
+  {
+    value: EmType.Tomogram,
+    viewValue: "Tomogram",
+    files: [
+      depositionImage,
+      depositionMainMap,
+      depositionMaskMap,
+      depositionFSC,
+      depositionLayerLines,
+      depositionAddMap,
+    ],
+  },
+  {
+    value: EmType.ElectronCristallography,
+    viewValue: "Electron Crystallography",
+    files: [
+      depositionImage,
+      depositionCoordinates,
+      depositionMainMap,
+      depositionMaskMap,
+      depositionHalfMap1,
+      depositionHalfMap2,
+      depositionStructureFactors,
+      depositionMTZ,
+      depositionFSC,
+      depositionLayerLines,
+      depositionAddMap,
+    ],
+  },
+];
diff --git a/src/app/empiar/empiar.component.html b/src/app/empiar/empiar.component.html
deleted file mode 100644
index 7fe6bedc3a..0000000000
--- a/src/app/empiar/empiar.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- onedep.component.html -->
-<div>
-    <h1>EMPIAR here!</h1>
-</div>
\ No newline at end of file
diff --git a/src/app/empiar/empiar.component.scss b/src/app/empiar/empiar.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/empiar/empiar.component.ts b/src/app/empiar/empiar.component.ts
deleted file mode 100644
index ae9b3eba27..0000000000
--- a/src/app/empiar/empiar.component.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
-import { AppConfigService, HelpMessages } from "app-config.service";
-import { HttpClient } from '@angular/common/http';
-import { ActivatedRoute, Router } from '@angular/router';
-
-@Component({
-  selector: 'empiar',
-  templateUrl: './empiar.component.html',
-  styleUrls: ['./empiar.component.scss']
-})
-export class EmpiarComponent implements OnInit {
-
-    empiar : boolean;
-
-    ngOnInit() {
-        this.empiar = true;
-    }
-}
\ No newline at end of file
diff --git a/src/assets/config.json b/src/assets/config.json
index a71270c0ee..b5c7e35a6a 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -1,7 +1,8 @@
 {
   "addDatasetEnabled": false,
   "archiveWorkflowEnabled": false,
-  "datasetReduceEnabled": true,
+  "datasetReduceEnabled": false,
+  "datasetOneDepIntegration": true,
   "editDatasetSampleEnabled": true,
   "editMetadataEnabled": true,
   "editPublishedData": true,
@@ -16,6 +17,7 @@
   "jupyterHubUrl": "",
   "landingPage": "",
   "lbBaseURL": "http://127.0.0.1:3000",
+  "depositorURL": "http://127.0.0.1:8080",
   "localColumns": [
     {
       "name": "datasetName",

From 8a93987c01f93d2d108acb1762d60852e12cb9c4 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 17 Dec 2024 11:15:47 +0000
Subject: [PATCH 045/245] option to download files

---
 src/app/datasets/onedep/onedep.component.html |  4 +
 src/app/datasets/onedep/onedep.component.ts   | 74 +++++++++++++++++--
 src/app/datasets/onedep/types/methods.enum.ts |  1 +
 3 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index c8e12289ab..163cf8ab6a 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -334,6 +334,10 @@ <h2>Choose Electron Microscopy
                         (click)="onDepositClick()">
                         Start Deposition
                     </button>
+                    <button class="submitDep" mat-raised-button color="primary"
+                        (click)="onDownloadClick()">
+                        Download mmCIF
+                    </button>
                 </mat-card-content>
             </mat-card>
 
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index df0ad54227..65f2cbbf8b 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -5,6 +5,7 @@ import {
   ElementRef,
   OnDestroy,
 } from "@angular/core";
+import { MatRadioChange } from "@angular/material/radio";
 import { AppConfigService, AppConfig } from "app-config.service";
 import { HttpClient } from "@angular/common/http";
 import { Router } from "@angular/router";
@@ -180,8 +181,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
     }
   }
 
-  onPDB(event: any) { // FIXME specify type
-    console.log(this.form.get("password"));
+  onPDB(event: MatRadioChange) {
     const input = event.value;
     if (input === "true") {
       this.fileTypes.forEach((fT) => {
@@ -331,7 +331,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
   sendFile(depID: string, form: FormData, fileType: string) {
     this.http
-      .post("http://localhost:8080/onedep/" + depID + "/file", form)
+      .post(this.connectedDepositionBackend + "onedep/" + depID + "/file", form)
       .subscribe({
         next: (res) => console.log("Uploaded", fileType, res),
         error: (error) =>
@@ -340,7 +340,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
   sendCoordFile(depID: string, form: FormData) {
     this.http
-      .post("http://localhost:8080/onedep/" + depID + "/pdb", form)
+      .post(this.connectedDepositionBackend + "onedep/" + depID + "/pdb", form)
       .subscribe({
         next: (res) => console.log("Uploaded Coordinates and Metadata", res),
         error: (error) =>
@@ -350,7 +350,10 @@ export class OneDepComponent implements OnInit, OnDestroy {
   sendMetadata(depID: string, form: FormData) {
     // missing token!
     this.http
-      .post("http://localhost:8080/onedep/" + depID + "/metadata", form)
+      .post(
+        this.connectedDepositionBackend + "onedep/" + depID + "/metadata",
+        form,
+      )
       .subscribe({
         next: (res) => console.log("Uploaded Metadata", res),
         error: (error) => console.error("Could not upload Metadata", error),
@@ -379,13 +382,17 @@ export class OneDepComponent implements OnInit, OnDestroy {
     }
     let depID: string;
     let metadataAdded = false;
+
+    interface OneDepCreate {
+      depID: string;
+    }
     this.http
-      .post("http://localhost:8080/onedep", body, {
+      .post(this.connectedDepositionBackend + "onedep", body, {
         headers: { "Content-Type": "application/json" },
       })
       .subscribe({
-        next: (response: any) => { // FIX ME specify type
-          depID = response.depID; // Update the outer variable
+        next: (response: OneDepCreate) => {
+          depID = response.depID;
           console.log("Created deposition in OneDep", depID);
 
           // Call subsequent requests
@@ -429,6 +436,57 @@ export class OneDepComponent implements OnInit, OnDestroy {
         error: (error) => console.error("Request failed", error.error),
       });
   }
+  onDownloadClick() {
+    console.log("download data");
+    if (this.form.value.deposingCoordinates === true) {
+      const formDataFile = new FormData();
+      const fT = this.fileTypes.find(
+        (fileType) => fileType.emName === this.emFile.Coordinates,
+      );
+      formDataFile.append("file", fT.file);
+      formDataFile.append(
+        "scientificMetadata",
+        JSON.stringify(this.form.value.metadata),
+      );
+      this.http
+        .post(this.connectedDepositionBackend + "onedep/pdb", formDataFile, {
+          responseType: "blob",
+        })
+        .subscribe({
+          next: (response: Blob) => {
+            this.triggerDownload(response, "coordinatesWithMmetadata.cif");
+          },
+          error: (error) => {
+            console.error("Error downloading file from onedep/pdb", error);
+          },
+        });
+    } else {
+      const body = JSON.stringify(this.form.value.metadata);
+      this.http
+        .post(this.connectedDepositionBackend + "onedep/metadata", body, {
+          headers: { "Content-Type": "application/json" },
+          responseType: "blob",
+        })
+        .subscribe({
+          next: (response: Blob) => {
+            this.triggerDownload(response, "metadata.cif");
+          },
+          error: (error) => {
+            console.error("Error downloading file from onedep/metadata", error);
+          },
+        });
+    }
+  }
+  triggerDownload(response: Blob, filename: string) {
+    const downloadUrl = window.URL.createObjectURL(response);
+    const a = document.createElement("a");
+    a.href = downloadUrl;
+    a.download = filename; // Set the file name here
+    document.body.appendChild(a);
+    a.click();
+    document.body.removeChild(a);
+  }
+
   connectToDepositionBackend(): boolean {
     const depositionBackendUrl = this.config.depositorURL;
     let depositionBackendUrlCleaned = depositionBackendUrl.slice();
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index e5748c9f09..f2c8b8bdfa 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -234,3 +234,4 @@ export const methodsList: EmMethod[] = [
     ],
   },
 ];
+

From 2ce4ad137a94e45fc95a419d7e1bc45f1d85d3ea Mon Sep 17 00:00:00 2001
From: martintrajanovski <martin.trajanovski@gmail.com>
Date: Fri, 15 Nov 2024 12:41:23 +0100
Subject: [PATCH 046/245] add some improvements and reduce number of requests
 for proposal details page

---
 .../effects/proposals.effects.ts              | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/app/state-management/effects/proposals.effects.ts b/src/app/state-management/effects/proposals.effects.ts
index 216eae775f..dfba4fb676 100644
--- a/src/app/state-management/effects/proposals.effects.ts
+++ b/src/app/state-management/effects/proposals.effects.ts
@@ -1,10 +1,6 @@
 import { Injectable } from "@angular/core";
 import { Actions, createEffect, ofType, concatLatestFrom } from "@ngrx/effects";
-import {
-  DatasetsService,
-  ProposalClass,
-  ProposalsService,
-} from "@scicatproject/scicat-sdk-ts";
+import { DatasetApi, ProposalApi, Proposal, Dataset } from "shared/sdk";
 import { Action, Store } from "@ngrx/store";
 import * as fromActions from "state-management/actions/proposals.actions";
 import {
@@ -13,6 +9,7 @@ import {
 } from "state-management/selectors/proposals.selectors";
 import { map, mergeMap, catchError, switchMap, filter } from "rxjs/operators";
 import { ObservableInput, of } from "rxjs";
+import { ObservableInput, of } from "rxjs";
 import {
   loadingAction,
   loadingCompleteAction,
@@ -66,6 +63,12 @@ export class ProposalEffects {
     );
   });
 
+  fetchProposal$ = this.createProposalFetchEffect(
+    fromActions.fetchProposalAction.type,
+    fromActions.fetchProposalCompleteAction,
+    fromActions.fetchProposalFailedAction,
+    fromActions.fetchProposalAccessFailedAction,
+  );
   fetchProposal$ = this.createProposalFetchEffect(
     fromActions.fetchProposalAction.type,
     fromActions.fetchProposalCompleteAction,
@@ -73,6 +76,12 @@ export class ProposalEffects {
     fromActions.fetchProposalAccessFailedAction,
   );
 
+  fetchParentProposal$ = this.createProposalFetchEffect(
+    fromActions.fetchParentProposalAction.type,
+    fromActions.fetchParentProposalCompleteAction,
+    fromActions.fetchParentProposalFailedAction,
+    fromActions.fetchParentProposalAccessFailedAction,
+  );
   fetchParentProposal$ = this.createProposalFetchEffect(
     fromActions.fetchParentProposalAction.type,
     fromActions.fetchParentProposalCompleteAction,
@@ -262,28 +271,28 @@ export class ProposalEffects {
 
   private createProposalFetchEffect(
     triggerAction: string,
-    completeAction: (props: { proposal: ProposalClass }) => Action,
+    completeAction: (props: { proposal: Proposal }) => Action,
     failedAction: () => Action,
     accessFailedAction: () => Action,
   ) {
     return createEffect(() => {
       return this.actions$.pipe(
         ofType(triggerAction),
-        switchMap<ProposalClass, ObservableInput<Action>>(({ proposalId }) =>
-          this.proposalsService
-            .proposalsControllerFindByIdAccess(proposalId)
-            .pipe(
-              filter((permission) => permission.canAccess),
-              switchMap(() =>
-                this.proposalsService
-                  .proposalsControllerFindById(proposalId)
-                  .pipe(
-                    map((proposal) => completeAction({ proposal })),
-                    catchError(() => of(failedAction())),
-                  ),
-              ),
-              catchError(() => of(accessFailedAction())),
+        switchMap<Proposal, ObservableInput<Action>>(({ proposalId }) =>
+          this.proposalApi.findByIdAccess(encodeURIComponent(proposalId)).pipe(
+            filter(
+              (permission: { canAccess: boolean }) => permission.canAccess,
             ),
+            switchMap(() =>
+              this.proposalApi
+                .findById<Proposal>(encodeURIComponent(proposalId))
+                .pipe(
+                  map((proposal) => completeAction({ proposal })),
+                  catchError(() => of(failedAction())),
+                ),
+            ),
+            catchError(() => of(accessFailedAction())),
+          ),
         ),
       );
     });

From 151892a82ceaa18759be11b13d8e56d1d69f4215 Mon Sep 17 00:00:00 2001
From: Jay <b331998513@gmail.com>
Date: Fri, 29 Nov 2024 14:30:40 +0100
Subject: [PATCH 047/245] fix: optimize condition editing logic in
 DatasetsFilterSettingsComponent (#1673)

* fix: optimize condition editing logic in DatasetsFilterSettingsComponent

* if user creates duplicated condition, do nothing

* add snackbar notification for duplicate condition in DatasetsFilterSettingsComponent

* remove unused import

* remove panelClass from snackBar

* added e2e test for the change
---
 src/app/datasets/datasets.module.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 2c007619cd..7b11366efa 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -92,6 +92,7 @@ import { userReducer } from "state-management/reducers/user.reducer";
 import { MatSnackBarModule } from "@angular/material/snack-bar";
 import { OneDepComponent } from "./onedep/onedep.component";
 import { OrcidFormatterDirective } from "./onedep/onedep.directive";
+import { MatSnackBarModule } from "@angular/material/snack-bar";
 
 @NgModule({
   imports: [

From c2548b8f05afcae710f13d4348b4046b2cc9450e Mon Sep 17 00:00:00 2001
From: Max Novelli <Max.Novelli@ess.eu>
Date: Wed, 4 Dec 2024 11:13:31 +0100
Subject: [PATCH 048/245] BREAKING CHANGE: new sdk release (#1658)

* feat: add the new auth service to prepare for the new sdk

* try to fix some ai-bot review suggestions

* add the note for the good review suggestion from ai-bot

* remove old sdk and adjust types against the new one

* fix more types and issues against the new sdk

* finalize type error fixes

* remove prefix

* add the new sdk generation script for local development

* start fixing TODOs after newly generated sdk

* fixed sdk local generation for linux

* update the sdk package version and fix some more types

* detect the OS and use the right current directory path

* improve types and fix more TODOs

* improve types and fix TODOs after backend improvements

* finalize TODOs and FIXMEs fixes and type improvements with the new sdk

* fix some sourcery-ai comments

* fix some of the last TODOs

* adapted sdk generation to unix environment

* ignore the @scicatproject that is generated with the sdk

* start fixing tests with the new sdk

* add needed stub classes and fix some more tests

* continue fixing unit tests

* try to fix e2e tests and revert some changes that need more attention for now

* changes to just run the tests

* use latest sdk

* update package-lock file

* fixing unit tests

* fix more unit tests

* continue fixing tests

* update the sdk

* fix last e2e test

* fix thumbnail unit tests

* revert some change

* finalize fixing unit tests

* revert the backend image changes after the tests pass

* add some improvements in the mocked objects for unit tests based on ai bot suggestion

* remove encodeURIComponent in the effects as it seems redundant

* fix test files after some changes

* try to use mock objects as much as possible

* update the sdk version

* update package-lock file

* update the sdk to latest

* BREAKING CHANGE: new sdk release

---------

Co-authored-by: martintrajanovski <martin.trajanovski@gmail.com>
Co-authored-by: Jay <b331998513@gmail.com>
---
 .../dataset-detail.component.ts               | 10 +-----
 .../effects/proposals.effects.ts              | 36 ++++++++++---------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index 17b7985915..eca8887ea8 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -1,12 +1,4 @@
-import {
-  Component,
-  OnInit,
-  Output,
-  EventEmitter,
-  OnDestroy,
-  Inject,
-} from "@angular/core";
-import { Dataset, Proposal, Sample } from "shared/sdk/models";
+import { Component, OnInit, OnDestroy, Inject } from "@angular/core";
 import { ENTER, COMMA, SPACE } from "@angular/cdk/keycodes";
 import { MatChipInputEvent } from "@angular/material/chips";
 
diff --git a/src/app/state-management/effects/proposals.effects.ts b/src/app/state-management/effects/proposals.effects.ts
index dfba4fb676..150f79dcdb 100644
--- a/src/app/state-management/effects/proposals.effects.ts
+++ b/src/app/state-management/effects/proposals.effects.ts
@@ -1,6 +1,10 @@
 import { Injectable } from "@angular/core";
 import { Actions, createEffect, ofType, concatLatestFrom } from "@ngrx/effects";
-import { DatasetApi, ProposalApi, Proposal, Dataset } from "shared/sdk";
+import {
+  DatasetsService,
+  ProposalClass,
+  ProposalsService,
+} from "@scicatproject/scicat-sdk-ts";
 import { Action, Store } from "@ngrx/store";
 import * as fromActions from "state-management/actions/proposals.actions";
 import {
@@ -271,28 +275,28 @@ export class ProposalEffects {
 
   private createProposalFetchEffect(
     triggerAction: string,
-    completeAction: (props: { proposal: Proposal }) => Action,
+    completeAction: (props: { proposal: ProposalClass }) => Action,
     failedAction: () => Action,
     accessFailedAction: () => Action,
   ) {
     return createEffect(() => {
       return this.actions$.pipe(
         ofType(triggerAction),
-        switchMap<Proposal, ObservableInput<Action>>(({ proposalId }) =>
-          this.proposalApi.findByIdAccess(encodeURIComponent(proposalId)).pipe(
-            filter(
-              (permission: { canAccess: boolean }) => permission.canAccess,
-            ),
-            switchMap(() =>
-              this.proposalApi
-                .findById<Proposal>(encodeURIComponent(proposalId))
-                .pipe(
-                  map((proposal) => completeAction({ proposal })),
-                  catchError(() => of(failedAction())),
-                ),
+        switchMap<ProposalClass, ObservableInput<Action>>(({ proposalId }) =>
+          this.proposalsService
+            .proposalsControllerFindByIdAccess(proposalId)
+            .pipe(
+              filter((permission) => permission.canAccess),
+              switchMap(() =>
+                this.proposalsService
+                  .proposalsControllerFindById(proposalId)
+                  .pipe(
+                    map((proposal) => completeAction({ proposal })),
+                    catchError(() => of(failedAction())),
+                  ),
+              ),
+              catchError(() => of(accessFailedAction())),
             ),
-            catchError(() => of(accessFailedAction())),
-          ),
         ),
       );
     });

From 2889aaddeb08844e2ca7e628a0026737660b68fa Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 16 Oct 2024 17:09:54 +0200
Subject: [PATCH 049/245] OneDep from dataset

---
 .../datasets-routing/datasets.routing.module.ts |  5 +++++
 .../dataset-detail.component.html               | 17 +++++++++++++++++
 .../dataset-detail.component.scss               |  4 ++++
 .../dataset-detail/dataset-detail.component.ts  |  6 ++++++
 src/app/datasets/datasets.module.ts             |  1 +
 src/app/empiar/empiar.component.scss            |  0
 6 files changed, 33 insertions(+)
 create mode 100644 src/app/empiar/empiar.component.scss

diff --git a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
index d1637dbd59..14feaf6945 100644
--- a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
+++ b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
@@ -6,6 +6,7 @@ import { DashboardComponent } from "datasets/dashboard/dashboard.component";
 import { DatablocksComponent } from "datasets/datablocks-table/datablocks-table.component";
 import { DatasetDetailsDashboardComponent } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
 import { PublishComponent } from "datasets/publish/publish.component";
+import { OneDepComponent } from "datasets/onedep/onedep.component";
 
 const routes: Routes = [
   {
@@ -35,6 +36,10 @@ const routes: Routes = [
     component: DatablocksComponent,
     canActivate: [AuthGuard],
   },
+  { 
+    path: ":id/onedep", 
+    component: OneDepComponent, 
+  }, 
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail.component.html
index 0df999dc2e..f9c575b4f7 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.html
@@ -21,6 +21,23 @@
         Public
       </mat-slide-toggle>
     </div>
+    <button
+          mat-raised-button
+          id="onedepBtn"
+          class="emexport-button"
+          (click)="onOneDepClick()"
+        >
+          OneDep
+    </button>
+    <div fxFlex="auto">
+      <a
+        mat-raised-button
+        [routerLink]="['/empiar']"
+        class="emexport-button"
+      >
+        EMPIAR
+      </a>
+    </div>
   </div>
 
   <div style="clear: both"></div>
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.scss b/src/app/datasets/dataset-detail/dataset-detail.component.scss
index 14d17981ed..5eb33c71ce 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.scss
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.scss
@@ -51,6 +51,10 @@ mat-card {
 .jupyter-button {
   margin: 1em 0 0 1em;
 }
+.emexport-button {
+  margin: 1em 0 0 3em;
+  color: hsla(185, 43%, 45%, 0.458);
+}
 .public-toggle {
   margin: 1em 1em 0 0;
   float: right;
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index eca8887ea8..3a0e3b0616 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -318,4 +318,10 @@ export class DatasetDetailComponent
   openAttachment(encoded: string) {
     this.attachmentService.openAttachment(encoded);
   }
+
+  onOneDepClick() {
+    const id = encodeURIComponent(this.dataset.pid);
+    this.router.navigateByUrl("/datasets/" + id + "/onedep");
+  }
+
 }
diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 7b11366efa..9f23144951 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -93,6 +93,7 @@ import { MatSnackBarModule } from "@angular/material/snack-bar";
 import { OneDepComponent } from "./onedep/onedep.component";
 import { OrcidFormatterDirective } from "./onedep/onedep.directive";
 import { MatSnackBarModule } from "@angular/material/snack-bar";
+import { OneDepComponent } from "./onedep/onedep.component";
 
 @NgModule({
   imports: [
diff --git a/src/app/empiar/empiar.component.scss b/src/app/empiar/empiar.component.scss
new file mode 100644
index 0000000000..e69de29bb2

From a0682c00cdefd53b66b3fc4416a82de8d69f92fa Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 17 Oct 2024 17:56:02 +0200
Subject: [PATCH 050/245] OneDep component recieves dataset - turned off
 cleaning in dataset-details dashboard onDestroy

---
 .../dataset-detail.component.html             | 31 ++++++++++++-------
 .../dataset-detail.component.scss             |  2 +-
 .../dataset-detail.component.ts               |  6 +++-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail.component.html
index f9c575b4f7..ba5b6e7f24 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.html
@@ -12,23 +12,23 @@
         Jupyter Hub
       </a>
     </div>
-    <div fxFlex="auto" *ngIf="editingAllowed">
-      <mat-slide-toggle
-        class="public-toggle"
-        [checked]="dataset.isPublished"
-        (change)="onSlidePublic($event)"
-      >
-        Public
-      </mat-slide-toggle>
-    </div>
-    <button
+    <!-- <button
           mat-raised-button
           id="onedepBtn"
           class="emexport-button"
           (click)="onOneDepClick()"
         >
           OneDep
-    </button>
+    </button> -->
+    <div fxFlex="auto">
+      <a
+      mat-raised-button
+      [routerLink]="['/datasets', dataset.pid, 'onedep']"
+      class="emexport-button"
+      >
+        OneDep
+      </a>
+    </div>
     <div fxFlex="auto">
       <a
         mat-raised-button
@@ -38,6 +38,15 @@
         EMPIAR
       </a>
     </div>
+    <div fxFlex="auto" *ngIf="editingAllowed">
+      <mat-slide-toggle
+        class="public-toggle"
+        [checked]="dataset.isPublished"
+        (change)="onSlidePublic($event)"
+      >
+        Public
+      </mat-slide-toggle>
+    </div>
   </div>
 
   <div style="clear: both"></div>
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.scss b/src/app/datasets/dataset-detail/dataset-detail.component.scss
index 5eb33c71ce..efb4f1bdce 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.scss
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.scss
@@ -53,7 +53,7 @@ mat-card {
 }
 .emexport-button {
   margin: 1em 0 0 3em;
-  color: hsla(185, 43%, 45%, 0.458);
+  background-color: hsla(185, 43%, 45%, 0.458);
 }
 .public-toggle {
   margin: 1em 1em 0 0;
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index 3a0e3b0616..3da1109e8b 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit, OnDestroy, Inject } from "@angular/core";
+import { Component, OnInit, Output, EventEmitter, OnDestroy, Inject } from "@angular/core";
+import { Dataset, Proposal, Sample } from "shared/sdk/models";
 import { ENTER, COMMA, SPACE } from "@angular/cdk/keycodes";
 import { MatChipInputEvent } from "@angular/material/chips";
 
@@ -320,8 +321,11 @@ export class DatasetDetailComponent
   }
 
   onOneDepClick() {
+    console.log('started one dep click');
     const id = encodeURIComponent(this.dataset.pid);
     this.router.navigateByUrl("/datasets/" + id + "/onedep");
+    console.log("my datset in the details:", this.dataset);
+    // this.store.dispatch(selectDatasetAction({ dataset: this.dataset  }));
   }
 
 }

From deb7666b4e0a2abb0b5243889f085f7b120e755b Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 31 Oct 2024 17:55:14 +0100
Subject: [PATCH 051/245] prepared dields for OneDep export

---
 .../dataset-detail/dataset-detail.component.html     |  1 +
 .../dataset-detail/dataset-detail.component.ts       | 12 ++++++++++++
 src/app/datasets/onedep/onedep.component.html        |  6 ++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail.component.html
index ba5b6e7f24..aabc10c2d6 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.html
@@ -16,6 +16,7 @@
           mat-raised-button
           id="onedepBtn"
           class="emexport-button"
+          *ngIf="hasOpenEMKeyword()"
           (click)="onOneDepClick()"
         >
           OneDep
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index 3da1109e8b..9b801fd7de 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -160,6 +160,7 @@ export class DatasetDetailComponent
         }
       }),
     );
+    console.log("the keywords:" , this.dataset.keywords);
   }
 
   onEditModeEnable() {
@@ -319,6 +320,13 @@ export class DatasetDetailComponent
   openAttachment(encoded: string) {
     this.attachmentService.openAttachment(encoded);
   }
+  
+  hasOpenEMKeyword(): boolean {
+    const keywordsArray = this.dataset.keywords;
+    return keywordsArray.some((keyword: string) =>
+      keyword.toLowerCase() === 'openem'
+    );
+  }
 
   onOneDepClick() {
     console.log('started one dep click');
@@ -327,5 +335,9 @@ export class DatasetDetailComponent
     console.log("my datset in the details:", this.dataset);
     // this.store.dispatch(selectDatasetAction({ dataset: this.dataset  }));
   }
+  onEMPIARclick(){
+    const id = encodeURIComponent(this.dataset.pid);
+    this.router.navigateByUrl("/datasets/" + id + "/empiar");
+  }
 
 }
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 163cf8ab6a..294e0d39fa 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -18,8 +18,7 @@
                         <tr>
                             <th>Description</th>
                             <td>
-                                <span
-                                    [innerHTML]="dataset.description || '-' | linky"></span>
+                                <span [innerHTML]="dataset.description || '-' | linky"></span>
                             </td>
                         </tr>
                         <tr>
@@ -40,8 +39,7 @@
                         <tr class="keywords-row">
                             <th>Keywords</th>
                             <mat-chip-set role="list" #keywordChips>
-                                <mat-chip role="listitem"
-                                    *ngFor="let keyword of dataset.keywords">
+                                <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
                                     {{ keyword }}
                                 </mat-chip>
                             </mat-chip-set>

From 3e78908ac47701d4ae476a9f69f7f5d28db44f5b Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 1 Nov 2024 16:34:27 +0100
Subject: [PATCH 052/245] connect to OneDep backend when going to onedep

---
 .../dataset-detail.component.ts               | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index 9b801fd7de..58830f8c25 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -92,6 +92,16 @@ export class DatasetDetailComponent
   editEnabled = false;
   show = false;
 
+
+  connectedDepositionBackend: string = '';
+  connectedDepositionBackendVersion: string = '';
+  connectingToDepositionBackend: boolean = false;
+  lastUsedDepositionBackends: string[] = [];
+  forwardDepositionBackend: string = '';
+  errorMessage: string = '';
+
+  @Output() emClick = new EventEmitter<Dataset>();
+
   readonly separatorKeyCodes: number[] = [ENTER, COMMA, SPACE];
 
   constructor(
@@ -101,11 +111,14 @@ export class DatasetDetailComponent
     public dialog: MatDialog,
     private store: Store,
     private http: HttpClient,
+    private http: HttpClient,
     private router: Router,
     private fb: FormBuilder,
   ) {}
 
   ngOnInit() {
+    this.connectingToDepositionBackend = true;
+
     this.form = this.fb.group({
       datasetName: new FormControl("", [Validators.required]),
       description: new FormControl("", [Validators.required]),
@@ -340,4 +353,37 @@ export class DatasetDetailComponent
     this.router.navigateByUrl("/datasets/" + id + "/empiar");
   }
 
+
+  connectToDepositionBackend(): boolean {
+    var DepositionBackendUrl = "http://localhost:8080"
+    let DepositionBackendUrlCleaned = DepositionBackendUrl.slice();
+    // Check if last symbol is a slash and add version endpoint
+    if (!DepositionBackendUrlCleaned.endsWith('/')) {
+      DepositionBackendUrlCleaned += '/';
+    }
+
+    let DepositionBackendUrlVersion = DepositionBackendUrlCleaned;
+
+    // Try to connect to the facility backend/version to check if it is available
+    console.log('Connecting to facility backend: ' + DepositionBackendUrlVersion);
+    this.http.get(DepositionBackendUrlVersion).subscribe(
+      response => {
+        console.log('Connected to facility backend', response);
+        // If the connection is successful, store the connected facility backend URL
+        this.connectedDepositionBackend = DepositionBackendUrlCleaned;
+        this.connectingToDepositionBackend = false;
+        this.connectedDepositionBackendVersion = response['version'];
+      },
+      error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+        console.error('Request failed', error);
+        this.connectedDepositionBackend = '';
+        this.connectingToDepositionBackend = false;
+      }
+    );
+
+    return true;
+  }
+
 }
+

From 5010076cf6731db11ca04c8ae8622d4f9ff59c55 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 4 Nov 2024 17:56:56 +0100
Subject: [PATCH 053/245] adding restrictions to deposition types

---
 .../dataset-detail/dataset-detail.component.ts    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index 58830f8c25..2f47246783 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -67,8 +67,7 @@ import { AttachmentService } from "shared/services/attachment.service";
   standalone: false,
 })
 export class DatasetDetailComponent
-  implements OnInit, OnDestroy, EditableComponent
-{
+  implements OnInit, OnDestroy, EditableComponent {
   private subscriptions: Subscription[] = [];
   private _hasUnsavedChanges = false;
   form: FormGroup;
@@ -114,7 +113,7 @@ export class DatasetDetailComponent
     private http: HttpClient,
     private router: Router,
     private fb: FormBuilder,
-  ) {}
+  ) { }
 
   ngOnInit() {
     this.connectingToDepositionBackend = true;
@@ -173,7 +172,6 @@ export class DatasetDetailComponent
         }
       }),
     );
-    console.log("the keywords:" , this.dataset.keywords);
   }
 
   onEditModeEnable() {
@@ -344,11 +342,12 @@ export class DatasetDetailComponent
   onOneDepClick() {
     console.log('started one dep click');
     const id = encodeURIComponent(this.dataset.pid);
+    this.connectToDepositionBackend();
     this.router.navigateByUrl("/datasets/" + id + "/onedep");
     console.log("my datset in the details:", this.dataset);
     // this.store.dispatch(selectDatasetAction({ dataset: this.dataset  }));
   }
-  onEMPIARclick(){
+  onEMPIARclick() {
     const id = encodeURIComponent(this.dataset.pid);
     this.router.navigateByUrl("/datasets/" + id + "/empiar");
   }
@@ -362,13 +361,13 @@ export class DatasetDetailComponent
       DepositionBackendUrlCleaned += '/';
     }
 
-    let DepositionBackendUrlVersion = DepositionBackendUrlCleaned;
+    let DepositionBackendUrlVersion = DepositionBackendUrlCleaned + 'version';
 
     // Try to connect to the facility backend/version to check if it is available
-    console.log('Connecting to facility backend: ' + DepositionBackendUrlVersion);
+    console.log('Connecting to OneDep backend: ' + DepositionBackendUrlVersion);
     this.http.get(DepositionBackendUrlVersion).subscribe(
       response => {
-        console.log('Connected to facility backend', response);
+        console.log('Connected to OneDep backend', response);
         // If the connection is successful, store the connected facility backend URL
         this.connectedDepositionBackend = DepositionBackendUrlCleaned;
         this.connectingToDepositionBackend = false;

From 32ab70dab3923457fec4df13a1375d3ecde60bbf Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 25 Nov 2024 16:54:21 +0000
Subject: [PATCH 054/245] add list of ORCID IDs, token not passed yet

---
 src/app/datasets/datasets.module.ts           | 1 +
 src/app/datasets/onedep/onedep.component.html | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 9f23144951..d1d05db717 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -94,6 +94,7 @@ import { OneDepComponent } from "./onedep/onedep.component";
 import { OrcidFormatterDirective } from "./onedep/onedep.directive";
 import { MatSnackBarModule } from "@angular/material/snack-bar";
 import { OneDepComponent } from "./onedep/onedep.component";
+import { OrcidFormatterDirective } from "./onedep/onedep.directive";
 
 @NgModule({
   imports: [
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 294e0d39fa..163cf8ab6a 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -18,7 +18,8 @@
                         <tr>
                             <th>Description</th>
                             <td>
-                                <span [innerHTML]="dataset.description || '-' | linky"></span>
+                                <span
+                                    [innerHTML]="dataset.description || '-' | linky"></span>
                             </td>
                         </tr>
                         <tr>
@@ -39,7 +40,8 @@
                         <tr class="keywords-row">
                             <th>Keywords</th>
                             <mat-chip-set role="list" #keywordChips>
-                                <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
+                                <mat-chip role="listitem"
+                                    *ngFor="let keyword of dataset.keywords">
                                     {{ keyword }}
                                 </mat-chip>
                             </mat-chip-set>

From 3260b87fa1594a4e62b19bd2fa973219f7498c56 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 16 Dec 2024 20:32:22 +0000
Subject: [PATCH 055/245] onedep component can be turned off

---
 .../datasets.routing.module.ts                |  5 ----
 .../dataset-detail.component.scss             |  4 ---
 .../dataset-detail.component.ts               | 26 ++++++++-----------
 src/app/empiar/empiar.component.scss          |  0
 4 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100644 src/app/empiar/empiar.component.scss

diff --git a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
index 14feaf6945..d1637dbd59 100644
--- a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
+++ b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
@@ -6,7 +6,6 @@ import { DashboardComponent } from "datasets/dashboard/dashboard.component";
 import { DatablocksComponent } from "datasets/datablocks-table/datablocks-table.component";
 import { DatasetDetailsDashboardComponent } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
 import { PublishComponent } from "datasets/publish/publish.component";
-import { OneDepComponent } from "datasets/onedep/onedep.component";
 
 const routes: Routes = [
   {
@@ -36,10 +35,6 @@ const routes: Routes = [
     component: DatablocksComponent,
     canActivate: [AuthGuard],
   },
-  { 
-    path: ":id/onedep", 
-    component: OneDepComponent, 
-  }, 
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.scss b/src/app/datasets/dataset-detail/dataset-detail.component.scss
index efb4f1bdce..14d17981ed 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.scss
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.scss
@@ -51,10 +51,6 @@ mat-card {
 .jupyter-button {
   margin: 1em 0 0 1em;
 }
-.emexport-button {
-  margin: 1em 0 0 3em;
-  background-color: hsla(185, 43%, 45%, 0.458);
-}
 .public-toggle {
   margin: 1em 1em 0 0;
   float: right;
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index 2f47246783..308b7f684f 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -1,4 +1,11 @@
-import { Component, OnInit, Output, EventEmitter, OnDestroy, Inject } from "@angular/core";
+import {
+  Component,
+  OnInit,
+  Output,
+  EventEmitter,
+  OnDestroy,
+  Inject,
+} from "@angular/core";
 import { Dataset, Proposal, Sample } from "shared/sdk/models";
 import { ENTER, COMMA, SPACE } from "@angular/cdk/keycodes";
 import { MatChipInputEvent } from "@angular/material/chips";
@@ -67,7 +74,8 @@ import { AttachmentService } from "shared/services/attachment.service";
   standalone: false,
 })
 export class DatasetDetailComponent
-  implements OnInit, OnDestroy, EditableComponent {
+  implements OnInit, OnDestroy, EditableComponent
+{
   private subscriptions: Subscription[] = [];
   private _hasUnsavedChanges = false;
   form: FormGroup;
@@ -91,16 +99,6 @@ export class DatasetDetailComponent
   editEnabled = false;
   show = false;
 
-
-  connectedDepositionBackend: string = '';
-  connectedDepositionBackendVersion: string = '';
-  connectingToDepositionBackend: boolean = false;
-  lastUsedDepositionBackends: string[] = [];
-  forwardDepositionBackend: string = '';
-  errorMessage: string = '';
-
-  @Output() emClick = new EventEmitter<Dataset>();
-
   readonly separatorKeyCodes: number[] = [ENTER, COMMA, SPACE];
 
   constructor(
@@ -113,11 +111,9 @@ export class DatasetDetailComponent
     private http: HttpClient,
     private router: Router,
     private fb: FormBuilder,
-  ) { }
+  ) {}
 
   ngOnInit() {
-    this.connectingToDepositionBackend = true;
-
     this.form = this.fb.group({
       datasetName: new FormControl("", [Validators.required]),
       description: new FormControl("", [Validators.required]),
diff --git a/src/app/empiar/empiar.component.scss b/src/app/empiar/empiar.component.scss
deleted file mode 100644
index e69de29bb2..0000000000

From c3d30af3aab32cd4c855dcdb620aaf8673dafcc7 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Tue, 17 Dec 2024 15:42:10 +0100
Subject: [PATCH 056/245] Frontend updates to match the backend release-jobs
 branch

This commit rebases and squashes #1585 (7d2a87208d1b780683026e0a769be03e9e4b156c).
It contains the following commits:
- update job view to match release-jobs
- update job schema and timestamp fields
- update jobs-detail page
- fix testing and linting
---
 .../datasets/admin-tab/admin-tab.component.ts |  16 +-
 src/app/datasets/archiving.service.spec.ts    |  13 +-
 src/app/datasets/archiving.service.ts         |   8 +-
 .../datafiles-action.component.spec.ts        |   4 +-
 .../datasets/datafiles/datafiles.component.ts |  13 +-
 .../jobs-dashboard-new.component.ts           |  19 +-
 .../jobs-dashboard.component.spec.ts          |   4 +-
 .../jobs-dashboard.component.ts               |  21 +-
 .../jobs-detail/jobs-detail.component.html    | 203 +++++++++++-------
 .../jobs-detail/jobs-detail.component.scss    |  33 +--
 .../shared-table/_shared-table-theme.scss     |   1 +
 src/app/shared/sdk/models/Job.ts              | 149 +++++++++++++
 .../effects/jobs.effects.spec.ts              |   9 +-
 .../reducers/jobs.reducer.spec.ts             |   9 +-
 .../selectors/jobs.selectors.spec.ts          |  15 +-
 15 files changed, 358 insertions(+), 159 deletions(-)
 create mode 100644 src/app/shared/sdk/models/Job.ts

diff --git a/src/app/datasets/admin-tab/admin-tab.component.ts b/src/app/datasets/admin-tab/admin-tab.component.ts
index 19b77893c0..e612e490a1 100644
--- a/src/app/datasets/admin-tab/admin-tab.component.ts
+++ b/src/app/datasets/admin-tab/admin-tab.component.ts
@@ -50,23 +50,23 @@ export class AdminTabComponent implements OnInit, OnDestroy {
             const job: CreateJobDto = {
               emailJobInitiator: user.email,
               type: "reset",
+              createdBy: user.username,
+              createdAt: new Date(),
               datasetList: [],
               jobParams: {},
             };
-            job.jobParams["username"] = user.username;
-            const fileObj: FileObject = {
-              pid: "",
-              files: [],
-            };
+
             const fileList: string[] = [];
-            fileObj.pid = this.dataset["pid"];
             if (this.dataset["datablocks"]) {
               this.dataset["datablocks"].map((d) => {
                 fileList.push(d["archiveId"]);
               });
             }
-            fileObj.files = fileList;
-            job.datasetList = [fileObj];
+            const fileObj: FileObject = {
+              pid: this.dataset["pid"],
+              files: fileList,
+            };
+            job.jobParams.datasetList = [fileObj];
             this.store.dispatch(submitJobAction({ job }));
           }
         });
diff --git a/src/app/datasets/archiving.service.spec.ts b/src/app/datasets/archiving.service.spec.ts
index 8d15983323..683992c735 100644
--- a/src/app/datasets/archiving.service.spec.ts
+++ b/src/app/datasets/archiving.service.spec.ts
@@ -70,10 +70,9 @@ describe("ArchivingService", () => {
         destinationPath,
       );
 
-      // expect(job).toBeInstanceOf(Job);
-      expect(job["emailJobInitiator"]).toEqual("test@email.com");
-      expect(job["jobParams"]["username"]).toEqual("testName");
-      expect(job["datasetList"]).toEqual(datasetList);
+      expect(job).toBeInstanceOf(Job);
+      expect(job["createdBy"]).toEqual("testName");
+      expect(job["jobParams"]["datasetList"]).toEqual(datasetList);
       expect(job["type"]).toEqual("archive");
     });
   });
@@ -104,9 +103,9 @@ describe("ArchivingService", () => {
       }));
       const archive = true;
       const job = createMock<CreateJobDto>({
-        jobParams: { username: user.username },
-        emailJobInitiator: user.email,
-        datasetList,
+        jobParams: { datasetList },
+        createdBy: user.username,
+        createdAt: new Date(),
         type: "archive",
         executionTime: "",
         jobResultObject: {},
diff --git a/src/app/datasets/archiving.service.ts b/src/app/datasets/archiving.service.ts
index fcf68c4a12..99cfb094f2 100644
--- a/src/app/datasets/archiving.service.ts
+++ b/src/app/datasets/archiving.service.ts
@@ -30,7 +30,7 @@ export class ArchivingService {
   ) {
     const extra = archive ? {} : destinationPath;
     const jobParams = {
-      username: user.username,
+      datasetIds: datasets.map((dataset) => dataset.pid),
       ...extra,
     };
 
@@ -40,12 +40,8 @@ export class ArchivingService {
 
     const data = {
       jobParams,
-      emailJobInitiator: user.email,
+      createdBy: user.username,
       // Revise this, files == []...? See earlier version of this method in dataset-table component for context
-      datasetList: datasets.map((dataset) => ({
-        pid: dataset.pid,
-        files: [],
-      })),
       type: archive ? "archive" : "retrieve",
     };
 
diff --git a/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts b/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
index 46e362e2b5..0919c32cc0 100644
--- a/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
+++ b/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
@@ -185,7 +185,7 @@ describe("1000: DatafilesActionComponent", () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(DatafilesActionComponent);
     component = fixture.componentInstance;
-    component.files = structuredClone(actionFiles);
+    component.files = JSON.parse(JSON.stringify(actionFiles));
     component.actionConfig = actionsConfig[0];
     component.actionDataset = actionDataset;
     component.maxFileSize = lowerMaxFileSizeLimit;
@@ -484,7 +484,7 @@ describe("1000: DatafilesActionComponent", () => {
         component.maxFileSize = lowerMaxFileSizeLimit;
         break;
     }
-    component.files = structuredClone(actionFiles);
+    component.files = JSON.parse(JSON.stringify(actionFiles));
     switch (selectedFiles) {
       case selectedFilesType.file1:
         component.files[0].selected = true;
diff --git a/src/app/datasets/datafiles/datafiles.component.ts b/src/app/datasets/datafiles/datafiles.component.ts
index d807d09145..91da0d4b1e 100644
--- a/src/app/datasets/datafiles/datafiles.component.ts
+++ b/src/app/datasets/datafiles/datafiles.component.ts
@@ -304,15 +304,12 @@ export class DatafilesComponent
       if (email) {
         this.getSelectedFiles();
         const data = {
-          emailJobInitiator: email,
-          creationTime: new Date(),
+          createdBy: email,
+          createdAt: new Date(),
           type: "public",
-          datasetList: [
-            {
-              pid: this.datasetPid,
-              files: this.getSelectedFiles(),
-            },
-          ],
+          jobParams: {
+            datasetIds: [this.datasetPid],
+          },
         };
         this.store.dispatch(submitJobAction({ job: data }));
       }
diff --git a/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts b/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
index 611ee66cec..11dee7b735 100644
--- a/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
+++ b/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
@@ -4,6 +4,7 @@ import {
   Component,
   OnDestroy,
 } from "@angular/core";
+import { Router } from "@angular/router";
 import { SciCatDataSource } from "../../shared/services/scicat.datasource";
 import { ScicatDataService } from "../../shared/services/scicat-data-service";
 import { ExportExcelService } from "../../shared/services/export-excel.service";
@@ -30,11 +31,11 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 0,
     },
     {
-      id: "emailJobInitiator",
-      label: "Initiator",
+      id: "createdBy",
+      label: "Creator",
       icon: "person",
       canSort: true,
-      matchMode: "contains",
+      matchMode: "is",
       hideOrder: 1,
     },
     {
@@ -46,7 +47,7 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 2,
     },
     {
-      id: "creationTime",
+      id: "createdAt",
       icon: "schedule",
       label: "Created at local time",
       format: "date medium ",
@@ -64,10 +65,9 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 4,
     },
     {
-      id: "jobStatusMessage",
+      id: "statusCode",
       icon: "traffic",
       label: "Status",
-      format: "json",
       canSort: true,
       matchMode: "contains",
       hideOrder: 5,
@@ -102,6 +102,7 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
     private cdRef: ChangeDetectorRef,
     private dataService: ScicatDataService,
     private exportService: ExportExcelService,
+    private router: Router,
   ) {
     this.dataSource = new SciCatDataSource(
       this.appConfigService,
@@ -119,10 +120,8 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
     this.dataSource.disconnectExportData();
   }
 
-  onRowClick(job: JobsTableData) {
-    // currently deactivated, no extra data available
-    /*     console.log("Row clicked:", job);
+  onRowClick(job: Job) {
     const id = encodeURIComponent(job.id);
-    this.router.navigateByUrl("/user/jobs/" + id); */
+    this.router.navigateByUrl("/user/jobs/" + id);
   }
 }
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
index 0084ef2f6c..4e50368af3 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
@@ -100,8 +100,8 @@ describe("JobsDashboardComponent", () => {
       dispatchSpy = spyOn(store, "dispatch");
 
       const mode = JobViewMode.myJobs;
-      component.email = "test@email.com";
-      const viewMode = { emailJobInitiator: component.email };
+      component.username = "testName";
+      const viewMode = { createdBy: component.username };
       component.onModeChange(mode);
 
       expect(dispatchSpy).toHaveBeenCalledTimes(1);
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
index 2033ad245a..3a8b41ff3a 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
@@ -48,7 +48,7 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
 
   jobs: JobsTableData[] = [];
   profile: any;
-  email = "";
+  username = "";
 
   subscriptions: Subscription[] = [];
 
@@ -96,13 +96,10 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
     if (jobs) {
       tableData = jobs.map((job) => ({
         id: job._id,
-        initiator: job.emailJobInitiator,
+        initiator: job.createdBy,
         type: job.type,
-        createdAt: this.datePipe.transform(
-          job.creationTime,
-          "yyyy-MM-dd HH:mm",
-        ),
-        statusMessage: job.jobStatusMessage,
+        createdAt: this.datePipe.transform(job.createdAt, "yyyy-MM-dd HH:mm"),
+        statusMessage: job.statusMessage,
       }));
     }
     return tableData;
@@ -129,7 +126,7 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
         break;
       }
       case JobViewMode.myJobs: {
-        viewMode = { emailJobInitiator: this.email };
+        viewMode = { createdBy: this.username };
         break;
       }
       default: {
@@ -154,11 +151,11 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
     // map column names back to original names
     switch (event.active) {
       case "statusMessage": {
-        event.active = "jobStatusMessage";
+        event.active = "statusMessage";
         break;
       }
       case "initiator": {
-        event.active = "emailJobInitiator";
+        event.active = "createdBy";
         break;
       }
       default: {
@@ -181,13 +178,13 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
     this.subscriptions.push(
       this.store.select(selectCurrentUser).subscribe((current) => {
         if (current) {
-          this.email = current.email;
+          this.username = current.username;
 
           if (!current.realm) {
             this.store.select(selectProfile).subscribe((profile) => {
               if (profile) {
                 this.profile = profile;
-                this.email = profile.email;
+                this.username = profile.username;
               }
               this.onModeChange(JobViewMode.myJobs);
             });
diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.html b/src/app/jobs/jobs-detail/jobs-detail.component.html
index ac46789303..42b3234ba6 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.html
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.html
@@ -1,73 +1,132 @@
-<div *ngIf="job$ | async as job" class="job-detail">
-  <mat-card>
-    <mat-card-content>
-      <table>
-        <tr>
-          <th>
-            <mat-icon> mail </mat-icon>
-            Email Job Initiator
-          </th>
-          <td>{{ job.emailJobInitiator }}</td>
-        </tr>
-        <tr *ngIf="job.type as value">
-          <th>
-            <mat-icon> bubble_chart </mat-icon>
-            Type
-          </th>
-          <td>{{ value }}</td>
-        </tr>
-        <tr *ngIf="job.creationTime as value">
-          <th>
-            <mat-icon> brightness_high </mat-icon>
-            Creation Time
-          </th>
-          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-        </tr>
-        <tr *ngIf="job.executionTime as value">
-          <th>
-            <mat-icon> gavel </mat-icon>
-            Execution Time
-          </th>
-          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-        </tr>
-        <tr *ngIf="job.jobParams as value">
-          <th>
-            <mat-icon> settings </mat-icon>
-            Job Params
-          </th>
-          <td>{{ value | json }}</td>
-        </tr>
-        <tr *ngIf="job.updatedAt as value">
-          <th>
-            <mat-icon> markunread </mat-icon>
-            Date Of Last Message
-          </th>
-          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-        </tr>
-        <tr *ngIf="job.datasetList as value">
-          <th>
-            <mat-icon> folder </mat-icon>
-            Dataset List
-          </th>
-          <div *ngFor="let daSet of value">
-            {{ daSet.pid | json }}
+  <div fxLayout="row" fxLayout.xs="column" *ngIf="job$ | async as job">
+    <div fxFlex="100%">
+      <mat-card>
+        <mat-card-header class="general-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> description </mat-icon>
           </div>
-        </tr>
-        <tr *ngIf="job.createdAt as value">
-          <th>
-            <mat-icon> calendar_today </mat-icon>
-            Created At
-          </th>
-          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-        </tr>
-        <tr *ngIf="job.updatedAt as value">
-          <th>
-            <mat-icon> calendar_today </mat-icon>
-            Updated At
-          </th>
-          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-        </tr>
-      </table>
-    </mat-card-content>
-  </mat-card>
-</div>
+          General Information
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr *ngIf="job.id as value">
+              <th>ID</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.type as value">
+              <th>Type</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.createdAt as value">
+              <th>Created At</th>
+              <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
+            </tr>
+          </table>
+        </mat-card-content>
+      </mat-card>
+      <mat-card>
+        <mat-card-header class="creator-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> person </mat-icon>
+          </div>
+          Users and Ownership
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr *ngIf="job.createdBy as value">
+              <th>Created By</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.contactEmail as value">
+              <th>Contact Email</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.ownerUser as value">
+              <th>Owner User</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.ownerGroup as value">
+              <th>Owner Group</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.accessGroups as value">
+              <th>Access Groups</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.updatedBy as value">
+              <th>Updated By</th>
+              <td>{{ value }}</td>
+            </tr>
+          </table>
+        </mat-card-content>
+      </mat-card>
+      <mat-card>
+        <mat-card-header class="derived-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> analytics </mat-icon>
+          </div>
+          Status
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr *ngIf="job.statusCode as value">
+              <th>Status Code</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.statusMessage as value">
+              <th>Status Message</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.updatedAt as value">
+              <th>Updated At</th>
+              <td>{{ value }}</td>
+            </tr>
+          </table>
+        </mat-card-content>
+      </mat-card>
+      <mat-card>
+        <mat-card-header class="related-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> library_books </mat-icon>
+          </div>
+          Parameters and Configuration
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr *ngIf="job.jobParams as value">
+              <th>Job Parameters</th>
+              <td>{{ value | json }}</td>
+            </tr>
+            <tr *ngIf="job.configVersion as value">
+              <th>Configuration Version</th>
+              <td>{{ value }}</td>
+            </tr>
+            <tr *ngIf="job.jobResultObject as value">
+              <th>Job Result Object</th>
+              <td>{{ value | json }}</td>
+            </tr>
+            <tr *ngIf="!job.datasetsValidation; elseBlockDatasetsValidation">
+              <th>Datasets Validation</th>
+              <td>No</td>
+            </tr>
+            <ng-template #elseBlockDatasetsValidation>
+              <tr>
+                <th>Datasets Validation</th>
+                <td>Yes</td>
+              </tr>
+            </ng-template>
+            <tr *ngIf="!job.isPublished; elseBlockIsPublished">
+              <th>Is Published</th>
+              <td>No</td>
+            </tr>
+            <ng-template #elseBlockIsPublished>
+              <tr>
+                <th>Is Published</th>
+                <td>Yes</td>
+              </tr>
+            </ng-template>
+          </table>
+        </mat-card-content>
+      </mat-card>
+    </div>
+  </div>
diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.scss b/src/app/jobs/jobs-detail/jobs-detail.component.scss
index 2687093ee7..2d1be484f3 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.scss
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.scss
@@ -1,20 +1,25 @@
-.job-detail {
-  mat-card {
-    margin: 1em;
+mat-card {
+  margin: 1em;
 
-    table {
-      td {
-        padding: 0.3em;
-      }
+  .section-icon {
+    height: auto !important;
+    width: auto !important;
 
-      th {
-        text-align: left;
-        padding-right: 0.5em;
+    mat-icon {
+      vertical-align: middle;
+    }
+  }
+
+  table {
+    th {
+      min-width: 10rem;
+      padding-right: 0.5rem;
+      text-align: left;
+    }
 
-        mat-icon {
-          vertical-align: middle;
-        }
-      }
+    td {
+      width: 100%;
+      padding: 0.5rem 0;
     }
   }
 }
diff --git a/src/app/shared/modules/shared-table/_shared-table-theme.scss b/src/app/shared/modules/shared-table/_shared-table-theme.scss
index 4124c88a0c..735cd85127 100644
--- a/src/app/shared/modules/shared-table/_shared-table-theme.scss
+++ b/src/app/shared/modules/shared-table/_shared-table-theme.scss
@@ -31,6 +31,7 @@
 
     mat-row:hover {
       background-color: mat.get-color-from-palette($hover, "lighter");
+      cursor: pointer;
     }
 
     .mat-form-field-appearance-outline {
diff --git a/src/app/shared/sdk/models/Job.ts b/src/app/shared/sdk/models/Job.ts
new file mode 100644
index 0000000000..778938bec9
--- /dev/null
+++ b/src/app/shared/sdk/models/Job.ts
@@ -0,0 +1,149 @@
+/* eslint-disable */
+
+declare var Object: any;
+export interface JobInterface {
+  id?: string;
+  ownerUser?: string;
+  type?: string;
+  statusCode?: string;
+  statusMessage?: string;
+  jobParams?: any;
+  datasetsValidation?: boolean;
+  contactEmail?: string;
+  configVersion?: string;
+  jobResultObject?: any;
+  createdBy?: string;
+  updatedBy?: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+  ownerGroup?: string;
+  accessGroups?: any;
+  isPublished?: boolean;
+}
+
+export class Job implements JobInterface {
+  "id": string;
+  "ownerUser": string;
+  "type": string;
+  "statusCode": string;
+  "statusMessage": string;
+  "jobParams": any;
+  "datasetsValidation": boolean;
+  "contactEmail": string;
+  "configVersion": string;
+  "jobResultObject": any;
+  "createdBy": string;
+  "updatedBy": string;
+  "createdAt": Date;
+  "updatedAt": Date;
+  "ownerGroup": string;
+  "accessGroups": any;
+  "isPublished": boolean;
+
+  constructor(data?: JobInterface) {
+    Object.assign(this, data);
+  }
+  /**
+   * The name of the model represented by this $resource,
+   * i.e. `Job`.
+   */
+  public static getModelName() {
+    return "Job";
+  }
+  /**
+   * @method factory
+   * @author Jonathan Casarrubias
+   * @license MIT
+   * This method creates an instance of Job for dynamic purposes.
+   **/
+  public static factory(data: JobInterface): Job {
+    return new Job(data);
+  }
+  /**
+   * @method getModelDefinition
+   * @author Julien Ledun
+   * @license MIT
+   * This method returns an object that represents some of the model
+   * definitions.
+   **/
+  public static getModelDefinition() {
+    return {
+      name: "Job",
+      plural: "Jobs",
+      path: "Jobs",
+      idName: "id",
+      properties: {
+        id: {
+          name: "id",
+          type: "string",
+        },
+        ownerUser: {
+          name: "ownerUser",
+          type: "string",
+        },
+        type: {
+          name: "type",
+          type: "string",
+          default: "retrieve",
+        },
+        statusCode: {
+          name: "statusCode",
+          type: "string",
+        },
+        statusMessage: {
+          name: "statusMessage",
+          type: "string",
+        },
+        jobParams: {
+          name: "jobParams",
+          type: "any",
+        },
+        datasetsValidation: {
+          name: "datasetsValidation",
+          type: "boolean",
+        },
+        contactEmail: {
+          name: "contactEmail",
+          type: "string",
+        },
+        configVersion: {
+          name: "configVersion",
+          type: "string",
+        },
+        jobResultObject: {
+          name: "jobResultObject",
+          type: "any",
+        },
+        createdBy: {
+          name: "createdBy",
+          type: "string",
+        },
+        updatedBy: {
+          name: "updatedBy",
+          type: "string",
+        },
+        createdAt: {
+          name: "createdAt",
+          type: "Date",
+        },
+        updatedAt: {
+          name: "updatedAt",
+          type: "Date",
+        },
+        ownerGroup: {
+          name: "ownerGroup",
+          type: "string",
+        },
+        accessGroups: {
+          name: "accessGroups",
+          type: "any",
+        },
+        isPublished: {
+          name: "isPublished",
+          type: "boolean",
+        },
+      },
+      relations: {},
+    };
+  }
+}
diff --git a/src/app/state-management/effects/jobs.effects.spec.ts b/src/app/state-management/effects/jobs.effects.spec.ts
index 1390740160..b4e673e373 100644
--- a/src/app/state-management/effects/jobs.effects.spec.ts
+++ b/src/app/state-management/effects/jobs.effects.spec.ts
@@ -24,12 +24,11 @@ import { createMock } from "shared/MockStubs";
 const job = createMock<JobClass>({
   _id: "testId",
   id: "testId",
-  emailJobInitiator: "test@email.com",
+  createdBy: "testName",
   type: "archive",
-  datasetList: [],
-  creationTime: "",
-  executionTime: "",
-  jobParams: {},
+  jobParams: {
+    datasetList: [],
+  },
   jobResultObject: {},
   jobStatusMessage: "",
   ownerGroup: "",
diff --git a/src/app/state-management/reducers/jobs.reducer.spec.ts b/src/app/state-management/reducers/jobs.reducer.spec.ts
index 4a0157e02d..8eb3420209 100644
--- a/src/app/state-management/reducers/jobs.reducer.spec.ts
+++ b/src/app/state-management/reducers/jobs.reducer.spec.ts
@@ -7,12 +7,11 @@ import { JobClass } from "@scicatproject/scicat-sdk-ts";
 const job = createMock<JobClass>({
   _id: "testId",
   id: "testId",
-  emailJobInitiator: "test@email.com",
+  createdBy: "testName",
   type: "archive",
-  datasetList: [],
-  creationTime: "",
-  executionTime: "",
-  jobParams: {},
+  jobParams: {
+    datasetList: []
+  },
   jobResultObject: {},
   jobStatusMessage: "",
   ownerGroup: "",
diff --git a/src/app/state-management/selectors/jobs.selectors.spec.ts b/src/app/state-management/selectors/jobs.selectors.spec.ts
index 7f866bd6fd..a2c3098b4e 100644
--- a/src/app/state-management/selectors/jobs.selectors.spec.ts
+++ b/src/app/state-management/selectors/jobs.selectors.spec.ts
@@ -4,18 +4,17 @@ import { JobsState } from "../state/jobs.store";
 import { createMock } from "shared/MockStubs";
 import { JobClass } from "@scicatproject/scicat-sdk-ts";
 
-const job = createMock<JobClass>({
-  emailJobInitiator: "test@email.com",
+const data: JobInterface = {
+  _id: "testId",
+  id: "testId",
+  createdBy: "testName",
   type: "archive",
-  _id: "",
-  id: "",
-  creationTime: "",
-  executionTime: "",
-  jobParams: {},
+  jobParams: {
+    datasetList: [],
+  },
   jobResultObject: {},
   jobStatusMessage: "",
   ownerGroup: "",
-  datasetList: [],
 });
 
 const jobFilters = {

From 5f372b007afe438d28afff898568fd5289b5bce5 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 17 Dec 2024 16:59:37 +0000
Subject: [PATCH 057/245] just to be safe

---
 src/app/datasets/onedep/onedep.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 163cf8ab6a..4887573eef 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -18,7 +18,7 @@
                         <tr>
                             <th>Description</th>
                             <td>
-                                <span
+                                <span 
                                     [innerHTML]="dataset.description || '-' | linky"></span>
                             </td>
                         </tr>

From 19b59bd85087ec9061c33aa172f1de6f4d302864 Mon Sep 17 00:00:00 2001
From: Despina <despoina.adamopoulou@empa.ch>
Date: Wed, 18 Dec 2024 09:35:00 +0100
Subject: [PATCH 058/245] solving conflicts

---
 .../datasets/admin-tab/admin-tab.component.ts    | 12 +++++-------
 src/app/datasets/archiving.service.spec.ts       |  8 ++++----
 src/app/datasets/archiving.service.ts            |  5 ++++-
 .../datasets/datafiles/datafiles.component.ts    | 14 ++++++++++----
 .../jobs-dashboard-new.component.ts              | 11 ++---------
 .../jobs-dashboard.component.spec.ts             |  3 ++-
 .../jobs-dashboard/jobs-dashboard.component.ts   |  5 +++--
 .../jobs/jobs-detail/jobs-detail.component.ts    |  4 +++-
 src/app/shared/MockStubs.ts                      |  3 ++-
 src/app/shared/sdk/models/Job.ts                 | 16 ++++++++--------
 src/app/state-management/actions/jobs.actions.ts |  9 +++++----
 .../effects/jobs.effects.spec.ts                 | 10 ++++------
 src/app/state-management/effects/jobs.effects.ts | 12 +++++++++---
 .../reducers/jobs.reducer.spec.ts                | 12 +++++-------
 .../selectors/jobs.selectors.spec.ts             |  9 +++------
 src/app/state-management/state/jobs.store.ts     |  5 +++--
 16 files changed, 72 insertions(+), 66 deletions(-)

diff --git a/src/app/datasets/admin-tab/admin-tab.component.ts b/src/app/datasets/admin-tab/admin-tab.component.ts
index e612e490a1..878cfdf0dc 100644
--- a/src/app/datasets/admin-tab/admin-tab.component.ts
+++ b/src/app/datasets/admin-tab/admin-tab.component.ts
@@ -17,6 +17,7 @@ import {
   selectIsAdmin,
   selectIsLoading,
 } from "state-management/selectors/user.selectors";
+import { Job } from "shared/sdk/models/Job";
 
 @Component({
   selector: "app-admin-tab",
@@ -47,15 +48,12 @@ export class AdminTabComponent implements OnInit, OnDestroy {
         .pipe(take(1))
         .subscribe((user) => {
           if (user && this.dataset) {
-            const job: CreateJobDto = {
-              emailJobInitiator: user.email,
-              type: "reset",
+            const job = new Job({
               createdBy: user.username,
-              createdAt: new Date(),
-              datasetList: [],
+              createdAt: new Date().toDateString(),
+              type: "reset",
               jobParams: {},
-            };
-
+            });
             const fileList: string[] = [];
             if (this.dataset["datablocks"]) {
               this.dataset["datablocks"].map((d) => {
diff --git a/src/app/datasets/archiving.service.spec.ts b/src/app/datasets/archiving.service.spec.ts
index 683992c735..0ad6e1a77b 100644
--- a/src/app/datasets/archiving.service.spec.ts
+++ b/src/app/datasets/archiving.service.spec.ts
@@ -11,6 +11,7 @@ import { JobsState } from "state-management/state/jobs.store";
 import { ArchivingService } from "./archiving.service";
 import { createMock, mockDataset } from "shared/MockStubs";
 import { CreateJobDto, ReturnedUserDto } from "@scicatproject/scicat-sdk-ts";
+import { Job } from "shared/sdk/models/Job";
 
 describe("ArchivingService", () => {
   let service: ArchivingService;
@@ -102,14 +103,13 @@ describe("ArchivingService", () => {
         files: [],
       }));
       const archive = true;
-      const job = createMock<CreateJobDto>({
+      const job = createMock<Job>({
         jobParams: { datasetList },
         createdBy: user.username,
-        createdAt: new Date(),
+        createdAt: new Date().toDateString(),
         type: "archive",
-        executionTime: "",
         jobResultObject: {},
-        jobStatusMessage: "",
+        statusMessage: "",
       });
       const createJobSpy = spyOn<any, string>(
         service,
diff --git a/src/app/datasets/archiving.service.ts b/src/app/datasets/archiving.service.ts
index 99cfb094f2..eb4374a44d 100644
--- a/src/app/datasets/archiving.service.ts
+++ b/src/app/datasets/archiving.service.ts
@@ -30,7 +30,10 @@ export class ArchivingService {
   ) {
     const extra = archive ? {} : destinationPath;
     const jobParams = {
-      datasetIds: datasets.map((dataset) => dataset.pid),
+      datasetList: datasets.map((dataset) => ({
+        pid: dataset.pid,
+        files: [],
+      })),
       ...extra,
     };
 
diff --git a/src/app/datasets/datafiles/datafiles.component.ts b/src/app/datasets/datafiles/datafiles.component.ts
index 91da0d4b1e..de9f38d88e 100644
--- a/src/app/datasets/datafiles/datafiles.component.ts
+++ b/src/app/datasets/datafiles/datafiles.component.ts
@@ -33,6 +33,7 @@ import { NgForm } from "@angular/forms";
 import { DataFiles_File } from "./datafiles.interfaces";
 import { ActionDataset } from "datasets/datafiles-actions/datafiles-action.interfaces";
 import { AuthService } from "shared/services/auth/auth.service";
+import { Job } from "shared/sdk/models/Job";
 
 @Component({
   selector: "datafiles",
@@ -302,16 +303,21 @@ export class DatafilesComponent
     });
     dialogRef.afterClosed().subscribe((email) => {
       if (email) {
-        this.getSelectedFiles();
+        const selectedFiles = this.getSelectedFiles();
         const data = {
           createdBy: email,
-          createdAt: new Date(),
+          createdAt: new Date().toDateString(),
           type: "public",
           jobParams: {
-            datasetIds: [this.datasetPid],
+            datasetList: [
+              {
+                pid: this.datasetPid,
+                files: selectedFiles,
+              },
+            ],
           },
         };
-        this.store.dispatch(submitJobAction({ job: data }));
+        this.store.dispatch(submitJobAction({ job: data as Job }));
       }
     });
   }
diff --git a/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts b/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
index 11dee7b735..210586cfa1 100644
--- a/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
+++ b/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
@@ -11,6 +11,7 @@ import { ExportExcelService } from "../../shared/services/export-excel.service";
 import { Column } from "shared/modules/shared-table/shared-table.module";
 import { AppConfigService } from "app-config.service";
 import { JobsTableData } from "jobs/jobs-dashboard/jobs-dashboard.component";
+import { Job } from "shared/sdk/models/Job";
 
 @Component({
   selector: "app-jobs-new-dashboard",
@@ -72,21 +73,13 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       matchMode: "contains",
       hideOrder: 5,
     },
-    {
-      id: "datasetList",
-      icon: "list",
-      label: "Datasets",
-      format: "json",
-      canSort: true,
-      hideOrder: 6,
-    },
     {
       id: "jobResultObject",
       icon: "work_outline",
       label: "Result",
       format: "json",
       canSort: true,
-      hideOrder: 7,
+      hideOrder: 6,
     },
   ];
 
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
index 4e50368af3..ee5315f7e7 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
@@ -24,6 +24,7 @@ import { MatCardModule } from "@angular/material/card";
 import { MatIconModule } from "@angular/material/icon";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { JobClass } from "@scicatproject/scicat-sdk-ts";
+import { JobInterface } from "shared/sdk/models/Job";
 
 describe("JobsDashboardComponent", () => {
   let component: JobsDashboardComponent;
@@ -144,7 +145,7 @@ describe("JobsDashboardComponent", () => {
 
   describe("#onRowClick()", () => {
     it("should navigate to a job", () => {
-      const job = createMock<JobClass>({ id: "test" });
+      const job = createMock<JobInterface>({ id: "test" });
       component.onRowClick({
         ...job,
         initiator: "",
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
index 3a8b41ff3a..8c374bfecf 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
@@ -27,6 +27,7 @@ import {
   selectCurrentUser,
   selectProfile,
 } from "state-management/selectors/user.selectors";
+import { Job, JobInterface } from "shared/sdk/models/Job";
 
 export interface JobsTableData {
   id: string;
@@ -91,11 +92,11 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
     );
   }
 
-  formatTableData(jobs: JobClass[]): JobsTableData[] {
+  formatTableData(jobs: JobInterface[]): JobsTableData[] {
     let tableData: JobsTableData[] = [];
     if (jobs) {
       tableData = jobs.map((job) => ({
-        id: job._id,
+        id: job.id,
         initiator: job.createdBy,
         type: job.type,
         createdAt: this.datePipe.transform(job.createdAt, "yyyy-MM-dd HH:mm"),
diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.ts b/src/app/jobs/jobs-detail/jobs-detail.component.ts
index 910febb145..8142f27e90 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.ts
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.ts
@@ -5,6 +5,7 @@ import { ActivatedRoute } from "@angular/router";
 import { selectCurrentJob } from "state-management/selectors/jobs.selectors";
 import { Observable, Subscription } from "rxjs";
 import { JobClass } from "@scicatproject/scicat-sdk-ts";
+import { JobInterface } from "shared/sdk/models/Job";
 
 @Component({
   selector: "app-jobs-detail",
@@ -14,7 +15,8 @@ import { JobClass } from "@scicatproject/scicat-sdk-ts";
 export class JobsDetailComponent implements OnInit, OnDestroy {
   // TODO: We should extract the response dto with the right properties instead of using the schema for ApiResponse in the backend
   job$ = this.store.select(selectCurrentJob) as Observable<
-    JobClass & { createdAt: string; updatedAt: string }
+    // JobClass & { createdAt: string; updatedAt: string }
+    JobInterface
   >;
   routeSubscription: Subscription = new Subscription();
 
diff --git a/src/app/shared/MockStubs.ts b/src/app/shared/MockStubs.ts
index 3060e7ce8c..600de0b6b0 100644
--- a/src/app/shared/MockStubs.ts
+++ b/src/app/shared/MockStubs.ts
@@ -22,6 +22,7 @@ import {
   ReturnedUserDto,
 } from "@scicatproject/scicat-sdk-ts";
 import { SDKToken } from "./services/auth/auth.service";
+import { JobInterface } from "./sdk/models/Job";
 
 export class MockUserApi {
   getCurrentId() {
@@ -325,7 +326,7 @@ export const mockAttachment = createMock<Attachment>({});
 export const mockSample = createMock<SampleClass>({});
 export const mockProposal = createMock<ProposalClass>({});
 export const mockInstrument = createMock<Instrument>({});
-export const mockJob = createMock<JobClass>({});
+export const mockJob = createMock<JobInterface>({});
 export const mockLogbook = createMock<Logbook>({});
 export const mockPolicy = createMock<Policy>({});
 export const mockPublishedData = createMock<PublishedData>({});
diff --git a/src/app/shared/sdk/models/Job.ts b/src/app/shared/sdk/models/Job.ts
index 778938bec9..ba6e9ad142 100644
--- a/src/app/shared/sdk/models/Job.ts
+++ b/src/app/shared/sdk/models/Job.ts
@@ -4,18 +4,18 @@ declare var Object: any;
 export interface JobInterface {
   id?: string;
   ownerUser?: string;
-  type?: string;
+  type: string;
   statusCode?: string;
   statusMessage?: string;
-  jobParams?: any;
+  jobParams: any;
   datasetsValidation?: boolean;
   contactEmail?: string;
   configVersion?: string;
   jobResultObject?: any;
   createdBy?: string;
   updatedBy?: string;
-  createdAt?: Date;
-  updatedAt?: Date;
+  createdAt?: string;
+  updatedAt?: string;
   ownerGroup?: string;
   accessGroups?: any;
   isPublished?: boolean;
@@ -34,8 +34,8 @@ export class Job implements JobInterface {
   "jobResultObject": any;
   "createdBy": string;
   "updatedBy": string;
-  "createdAt": Date;
-  "updatedAt": Date;
+  "createdAt": string;
+  "updatedAt": string;
   "ownerGroup": string;
   "accessGroups": any;
   "isPublished": boolean;
@@ -124,11 +124,11 @@ export class Job implements JobInterface {
         },
         createdAt: {
           name: "createdAt",
-          type: "Date",
+          type: "string",
         },
         updatedAt: {
           name: "updatedAt",
-          type: "Date",
+          type: "string",
         },
         ownerGroup: {
           name: "ownerGroup",
diff --git a/src/app/state-management/actions/jobs.actions.ts b/src/app/state-management/actions/jobs.actions.ts
index 993a057778..fdeecbd8a0 100644
--- a/src/app/state-management/actions/jobs.actions.ts
+++ b/src/app/state-management/actions/jobs.actions.ts
@@ -1,10 +1,11 @@
 import { createAction, props } from "@ngrx/store";
 import { CreateJobDto, JobClass } from "@scicatproject/scicat-sdk-ts";
+import { Job, JobInterface } from "shared/sdk/models/Job";
 
 export const fetchJobsAction = createAction("[Job] Fetch Jobs");
 export const fetchJobsCompleteAction = createAction(
   "[Job] Fetch Jobs Complete",
-  props<{ jobs: JobClass[] }>(),
+  props<{ jobs: JobInterface[] }>(),
 );
 export const fetchJobsFailedAction = createAction("[Job] Fetch Jobs Failed");
 
@@ -21,17 +22,17 @@ export const fetchJobAction = createAction(
 );
 export const fetchJobCompleteAction = createAction(
   "[Job] Fetch Job Complete",
-  props<{ job: JobClass }>(),
+  props<{ job: JobInterface }>(),
 );
 export const fetchJobFailedAction = createAction("[Job] Fetch Job Failed");
 
 export const submitJobAction = createAction(
   "[Job] Submit Job",
-  props<{ job: CreateJobDto }>(),
+  props<{ job: Job }>(),
 );
 export const submitJobCompleteAction = createAction(
   "[Job] Submit Job Complete",
-  props<{ job: JobClass }>(),
+  props<{ job: JobInterface }>(),
 );
 export const submitJobFailedAction = createAction(
   "[Job] Submit Job Failed",
diff --git a/src/app/state-management/effects/jobs.effects.spec.ts b/src/app/state-management/effects/jobs.effects.spec.ts
index b4e673e373..ac902ae6a5 100644
--- a/src/app/state-management/effects/jobs.effects.spec.ts
+++ b/src/app/state-management/effects/jobs.effects.spec.ts
@@ -20,19 +20,17 @@ import {
 } from "@scicatproject/scicat-sdk-ts";
 import { TestObservable } from "jasmine-marbles/src/test-observables";
 import { createMock } from "shared/MockStubs";
+import { Job, JobInterface } from "shared/sdk/models/Job";
 
-const job = createMock<JobClass>({
-  _id: "testId",
+const data: JobInterface = {
   id: "testId",
   createdBy: "testName",
   type: "archive",
   jobParams: {
     datasetList: [],
   },
-  jobResultObject: {},
-  jobStatusMessage: "",
-  ownerGroup: "",
-});
+};
+const job = new Job(data);
 
 describe("JobEffects", () => {
   let actions: TestObservable;
diff --git a/src/app/state-management/effects/jobs.effects.ts b/src/app/state-management/effects/jobs.effects.ts
index e1e32fb2fc..b8e139bf90 100644
--- a/src/app/state-management/effects/jobs.effects.ts
+++ b/src/app/state-management/effects/jobs.effects.ts
@@ -17,6 +17,8 @@ import {
   loadingCompleteAction,
   updateUserSettingsAction,
 } from "state-management/actions/user.actions";
+import { JobInterface } from "shared/sdk/models/Job";
+import { datasets } from "state-management/selectors";
 
 @Injectable()
 export class JobEffects {
@@ -58,7 +60,7 @@ export class JobEffects {
       ofType(fromActions.fetchJobAction),
       switchMap(({ jobId }) =>
         this.jobsService.jobsControllerFindOne(jobId).pipe(
-          map((job: JobClass) => fromActions.fetchJobCompleteAction({ job })),
+          map((job: JobInterface) => fromActions.fetchJobCompleteAction({ job })),
           catchError(() => of(fromActions.fetchJobFailedAction())),
         ),
       ),
@@ -69,8 +71,12 @@ export class JobEffects {
     return this.actions$.pipe(
       ofType(fromActions.submitJobAction),
       switchMap(({ job }) =>
-        this.jobsService.jobsControllerCreate(job).pipe(
-          map((res) => fromActions.submitJobCompleteAction({ job: res })),
+        this.jobsService.jobsControllerCreate({
+          ...job,
+          emailJobInitiator: job.createdBy,
+          datasetList: job.jobParams.datasetList,
+        } as CreateJobDto).pipe(
+          map((res) => fromActions.submitJobCompleteAction({ job: res as JobInterface })),
           catchError((err) => of(fromActions.submitJobFailedAction({ err }))),
         ),
       ),
diff --git a/src/app/state-management/reducers/jobs.reducer.spec.ts b/src/app/state-management/reducers/jobs.reducer.spec.ts
index 8eb3420209..80981a7e7c 100644
--- a/src/app/state-management/reducers/jobs.reducer.spec.ts
+++ b/src/app/state-management/reducers/jobs.reducer.spec.ts
@@ -3,19 +3,17 @@ import * as fromActions from "../actions/jobs.actions";
 import { initialJobsState } from "state-management/state/jobs.store";
 import { createMock } from "shared/MockStubs";
 import { JobClass } from "@scicatproject/scicat-sdk-ts";
+import { Job, JobInterface } from "shared/sdk/models/Job";
 
-const job = createMock<JobClass>({
-  _id: "testId",
+const data: JobInterface = {
   id: "testId",
   createdBy: "testName",
   type: "archive",
   jobParams: {
-    datasetList: []
+    datasetList: [],
   },
-  jobResultObject: {},
-  jobStatusMessage: "",
-  ownerGroup: "",
-});
+};
+const job = new Job(data);
 
 describe("jobsReducer", () => {
   describe("on fetchJobsCompleteAction", () => {
diff --git a/src/app/state-management/selectors/jobs.selectors.spec.ts b/src/app/state-management/selectors/jobs.selectors.spec.ts
index a2c3098b4e..040366483a 100644
--- a/src/app/state-management/selectors/jobs.selectors.spec.ts
+++ b/src/app/state-management/selectors/jobs.selectors.spec.ts
@@ -1,21 +1,18 @@
 import * as fromSelectors from "./jobs.selectors";
-
 import { JobsState } from "../state/jobs.store";
 import { createMock } from "shared/MockStubs";
 import { JobClass } from "@scicatproject/scicat-sdk-ts";
+import { Job, JobInterface } from "shared/sdk/models/Job";
 
 const data: JobInterface = {
-  _id: "testId",
   id: "testId",
   createdBy: "testName",
   type: "archive",
   jobParams: {
     datasetList: [],
   },
-  jobResultObject: {},
-  jobStatusMessage: "",
-  ownerGroup: "",
-});
+};
+const job = new Job(data);
 
 const jobFilters = {
   mode: null,
diff --git a/src/app/state-management/state/jobs.store.ts b/src/app/state-management/state/jobs.store.ts
index 365e0ede3b..d9e891e835 100644
--- a/src/app/state-management/state/jobs.store.ts
+++ b/src/app/state-management/state/jobs.store.ts
@@ -1,9 +1,10 @@
 import { JobClass } from "@scicatproject/scicat-sdk-ts";
+import { JobInterface } from "shared/sdk/models/Job";
 import { JobFilters } from "state-management/models";
 
 export interface JobsState {
-  jobs: JobClass[];
-  currentJob: JobClass | undefined;
+  jobs: JobInterface[];
+  currentJob: JobInterface | undefined;
 
   totalCount: number;
 

From 5900467228ff236cb1cfe6a1f13d74204b32d5c9 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 18 Dec 2024 09:05:26 +0000
Subject: [PATCH 059/245] cleanup messes after rebase

---
 .eslintrc.json                                |   2 +-
 .../app-header/app-header.component.html      |  11 +-
 src/app/app-routing/app-routing.module.ts     |   7 -
 .../ingestor.feature.module.ts                |   8 -
 .../ingestor.routing.module.ts                |  15 --
 src/app/datasets/archiving.service.ts         |   8 +-
 .../datafiles-action.component.spec.ts        |   4 +-
 .../datasets/datafiles/datafiles.component.ts |  13 +-
 .../dataset-detail.component.html             |  27 ---
 .../dataset-detail.component.ts               |  71 +-----
 .../dataset-details-dashboard.component.ts    |   2 +-
 src/app/datasets/datasets.module.ts           |   3 -
 .../ingestor-metadata-editor.component.html   |   4 -
 .../ingestor-metadata-editor.component.scss   |   3 -
 .../ingestor-metadata-editor.component.ts     |  18 --
 src/app/ingestor/ingestor.module.ts           |  33 ---
 .../ingestor/ingestor-api-endpoints.ts        |   7 -
 .../ingestor/ingestor/ingestor.component.html | 105 ---------
 .../ingestor/ingestor/ingestor.component.scss |  16 --
 .../ingestor/ingestor.component.spec.ts       |  24 ---
 .../ingestor/ingestor/ingestor.component.ts   | 153 -------------
 .../jobs-dashboard-new.component.ts           |  23 +-
 .../jobs-dashboard.component.spec.ts          |   3 +-
 .../jobs-dashboard.component.ts               |  19 +-
 .../jobs-detail/jobs-detail.component.html    | 203 +++++++-----------
 .../jobs-detail/jobs-detail.component.scss    |  35 ++-
 .../shared-table/_shared-table-theme.scss     |   1 -
 .../effects/proposals.effects.ts              |  13 --
 28 files changed, 136 insertions(+), 695 deletions(-)
 delete mode 100644 src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
 delete mode 100644 src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
 delete mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
 delete mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
 delete mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
 delete mode 100644 src/app/ingestor/ingestor.module.ts
 delete mode 100644 src/app/ingestor/ingestor/ingestor-api-endpoints.ts
 delete mode 100644 src/app/ingestor/ingestor/ingestor.component.html
 delete mode 100644 src/app/ingestor/ingestor/ingestor.component.scss
 delete mode 100644 src/app/ingestor/ingestor/ingestor.component.spec.ts
 delete mode 100644 src/app/ingestor/ingestor/ingestor.component.ts

diff --git a/.eslintrc.json b/.eslintrc.json
index 862f21e381..2f22b56243 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -9,7 +9,7 @@
   "plugins": ["@typescript-eslint/eslint-plugin"],
   "overrides": [
     {
-      "files": ["onedep*.ts"],
+      "files": ["*.ts"],
       "parserOptions": {
         "project": ["tsconfig.json"],
         "createDefaultProgram": true
diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index dced69ad42..b844e86598 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -67,16 +67,7 @@ <h3>{{ status }}</h3>
     </a>
 
     <span class="spacer"></span>
-    
-    <span>
-      <h6>
-        <a class="toplink" [routerLink]="['/ingestor']">
-          <mat-icon> cloud_upload  </mat-icon>
-          <span class="large-screen-text">Ingestor (OpenEM)</span></a
-        >
-      </h6>
-    </span>
-    
+
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/help']">
diff --git a/src/app/app-routing/app-routing.module.ts b/src/app/app-routing/app-routing.module.ts
index 2f95ca27e5..3310f2c053 100644
--- a/src/app/app-routing/app-routing.module.ts
+++ b/src/app/app-routing/app-routing.module.ts
@@ -105,13 +105,6 @@ export const routes: Routes = [
                 (m) => m.HelpFeatureModule,
               ),
           },
-          {
-            path: "ingestor",
-            loadChildren: () =>
-              import("./lazy/ingestor-routing/ingestor.feature.module").then(
-                (m) => m.IngestorFeatureModule,
-              ),
-          },
           {
             path: "logbooks",
             loadChildren: () =>
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
deleted file mode 100644
index 8796c9c34e..0000000000
--- a/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { NgModule } from "@angular/core";
-import { IngestorRoutingModule } from "./ingestor.routing.module";
-import { IngestorModule } from "ingestor/ingestor.module";
-
-@NgModule({
-  imports: [IngestorModule, IngestorRoutingModule],
-})
-export class IngestorFeatureModule {}
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
deleted file mode 100644
index c1a5b047d5..0000000000
--- a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { NgModule } from "@angular/core";
-import { RouterModule, Routes } from "@angular/router";
-import { IngestorComponent } from "ingestor/ingestor/ingestor.component";
-
-const routes: Routes = [
-  {
-    path: "",
-    component: IngestorComponent,
-  },
-];
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class IngestorRoutingModule {}
diff --git a/src/app/datasets/archiving.service.ts b/src/app/datasets/archiving.service.ts
index 99cfb094f2..fcf68c4a12 100644
--- a/src/app/datasets/archiving.service.ts
+++ b/src/app/datasets/archiving.service.ts
@@ -30,7 +30,7 @@ export class ArchivingService {
   ) {
     const extra = archive ? {} : destinationPath;
     const jobParams = {
-      datasetIds: datasets.map((dataset) => dataset.pid),
+      username: user.username,
       ...extra,
     };
 
@@ -40,8 +40,12 @@ export class ArchivingService {
 
     const data = {
       jobParams,
-      createdBy: user.username,
+      emailJobInitiator: user.email,
       // Revise this, files == []...? See earlier version of this method in dataset-table component for context
+      datasetList: datasets.map((dataset) => ({
+        pid: dataset.pid,
+        files: [],
+      })),
       type: archive ? "archive" : "retrieve",
     };
 
diff --git a/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts b/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
index 0919c32cc0..46e362e2b5 100644
--- a/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
+++ b/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
@@ -185,7 +185,7 @@ describe("1000: DatafilesActionComponent", () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(DatafilesActionComponent);
     component = fixture.componentInstance;
-    component.files = JSON.parse(JSON.stringify(actionFiles));
+    component.files = structuredClone(actionFiles);
     component.actionConfig = actionsConfig[0];
     component.actionDataset = actionDataset;
     component.maxFileSize = lowerMaxFileSizeLimit;
@@ -484,7 +484,7 @@ describe("1000: DatafilesActionComponent", () => {
         component.maxFileSize = lowerMaxFileSizeLimit;
         break;
     }
-    component.files = JSON.parse(JSON.stringify(actionFiles));
+    component.files = structuredClone(actionFiles);
     switch (selectedFiles) {
       case selectedFilesType.file1:
         component.files[0].selected = true;
diff --git a/src/app/datasets/datafiles/datafiles.component.ts b/src/app/datasets/datafiles/datafiles.component.ts
index 91da0d4b1e..d807d09145 100644
--- a/src/app/datasets/datafiles/datafiles.component.ts
+++ b/src/app/datasets/datafiles/datafiles.component.ts
@@ -304,12 +304,15 @@ export class DatafilesComponent
       if (email) {
         this.getSelectedFiles();
         const data = {
-          createdBy: email,
-          createdAt: new Date(),
+          emailJobInitiator: email,
+          creationTime: new Date(),
           type: "public",
-          jobParams: {
-            datasetIds: [this.datasetPid],
-          },
+          datasetList: [
+            {
+              pid: this.datasetPid,
+              files: this.getSelectedFiles(),
+            },
+          ],
         };
         this.store.dispatch(submitJobAction({ job: data }));
       }
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail.component.html
index aabc10c2d6..0df999dc2e 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.html
@@ -12,33 +12,6 @@
         Jupyter Hub
       </a>
     </div>
-    <!-- <button
-          mat-raised-button
-          id="onedepBtn"
-          class="emexport-button"
-          *ngIf="hasOpenEMKeyword()"
-          (click)="onOneDepClick()"
-        >
-          OneDep
-    </button> -->
-    <div fxFlex="auto">
-      <a
-      mat-raised-button
-      [routerLink]="['/datasets', dataset.pid, 'onedep']"
-      class="emexport-button"
-      >
-        OneDep
-      </a>
-    </div>
-    <div fxFlex="auto">
-      <a
-        mat-raised-button
-        [routerLink]="['/empiar']"
-        class="emexport-button"
-      >
-        EMPIAR
-      </a>
-    </div>
     <div fxFlex="auto" *ngIf="editingAllowed">
       <mat-slide-toggle
         class="public-toggle"
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index 308b7f684f..f433387948 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -1,12 +1,4 @@
-import {
-  Component,
-  OnInit,
-  Output,
-  EventEmitter,
-  OnDestroy,
-  Inject,
-} from "@angular/core";
-import { Dataset, Proposal, Sample } from "shared/sdk/models";
+import { Component, OnInit, OnDestroy, Inject } from "@angular/core";
 import { ENTER, COMMA, SPACE } from "@angular/cdk/keycodes";
 import { MatChipInputEvent } from "@angular/material/chips";
 
@@ -15,7 +7,6 @@ import { MatDialog } from "@angular/material/dialog";
 import { DialogComponent } from "shared/modules/dialog/dialog.component";
 import { combineLatest, fromEvent, Observable, Subscription } from "rxjs";
 import { Store } from "@ngrx/store";
-import { HttpClient } from "@angular/common/http";
 
 import { showMessageAction } from "state-management/actions/user.actions";
 import {
@@ -34,7 +25,6 @@ import {
   addKeywordFilterAction,
   clearFacetsAction,
   updatePropertyAction,
-  selectDatasetAction,
 } from "state-management/actions/datasets.actions";
 import { Router } from "@angular/router";
 import { selectCurrentProposal } from "state-management/selectors/proposals.selectors";
@@ -98,7 +88,6 @@ export class DatasetDetailComponent
   editingAllowed = false;
   editEnabled = false;
   show = false;
-
   readonly separatorKeyCodes: number[] = [ENTER, COMMA, SPACE];
 
   constructor(
@@ -107,8 +96,6 @@ export class DatasetDetailComponent
     private attachmentService: AttachmentService,
     public dialog: MatDialog,
     private store: Store,
-    private http: HttpClient,
-    private http: HttpClient,
     private router: Router,
     private fb: FormBuilder,
   ) {}
@@ -327,58 +314,4 @@ export class DatasetDetailComponent
   openAttachment(encoded: string) {
     this.attachmentService.openAttachment(encoded);
   }
-  
-  hasOpenEMKeyword(): boolean {
-    const keywordsArray = this.dataset.keywords;
-    return keywordsArray.some((keyword: string) =>
-      keyword.toLowerCase() === 'openem'
-    );
-  }
-
-  onOneDepClick() {
-    console.log('started one dep click');
-    const id = encodeURIComponent(this.dataset.pid);
-    this.connectToDepositionBackend();
-    this.router.navigateByUrl("/datasets/" + id + "/onedep");
-    console.log("my datset in the details:", this.dataset);
-    // this.store.dispatch(selectDatasetAction({ dataset: this.dataset  }));
-  }
-  onEMPIARclick() {
-    const id = encodeURIComponent(this.dataset.pid);
-    this.router.navigateByUrl("/datasets/" + id + "/empiar");
-  }
-
-
-  connectToDepositionBackend(): boolean {
-    var DepositionBackendUrl = "http://localhost:8080"
-    let DepositionBackendUrlCleaned = DepositionBackendUrl.slice();
-    // Check if last symbol is a slash and add version endpoint
-    if (!DepositionBackendUrlCleaned.endsWith('/')) {
-      DepositionBackendUrlCleaned += '/';
-    }
-
-    let DepositionBackendUrlVersion = DepositionBackendUrlCleaned + 'version';
-
-    // Try to connect to the facility backend/version to check if it is available
-    console.log('Connecting to OneDep backend: ' + DepositionBackendUrlVersion);
-    this.http.get(DepositionBackendUrlVersion).subscribe(
-      response => {
-        console.log('Connected to OneDep backend', response);
-        // If the connection is successful, store the connected facility backend URL
-        this.connectedDepositionBackend = DepositionBackendUrlCleaned;
-        this.connectingToDepositionBackend = false;
-        this.connectedDepositionBackendVersion = response['version'];
-      },
-      error => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-        console.error('Request failed', error);
-        this.connectedDepositionBackend = '';
-        this.connectingToDepositionBackend = false;
-      }
-    );
-
-    return true;
-  }
-
-}
-
+}
\ No newline at end of file
diff --git a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
index 9a8326095f..ae48fc5457 100644
--- a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
+++ b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
@@ -300,7 +300,7 @@ export class DatasetDetailsDashboardComponent
   }
 
   ngOnDestroy() {
-    //this.store.dispatch(clearCurrentDatasetStateAction());
+    this.store.dispatch(clearCurrentDatasetStateAction());
     this.store.dispatch(clearCurrentProposalStateAction());
     this.store.dispatch(clearCurrentSampleStateAction());
     this.subscriptions.forEach((subscription) => {
diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index d1d05db717..2c007619cd 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -92,9 +92,6 @@ import { userReducer } from "state-management/reducers/user.reducer";
 import { MatSnackBarModule } from "@angular/material/snack-bar";
 import { OneDepComponent } from "./onedep/onedep.component";
 import { OrcidFormatterDirective } from "./onedep/onedep.directive";
-import { MatSnackBarModule } from "@angular/material/snack-bar";
-import { OneDepComponent } from "./onedep/onedep.component";
-import { OrcidFormatterDirective } from "./onedep/onedep.directive";
 
 @NgModule({
   imports: [
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
deleted file mode 100644
index 2e2b11f4ef..0000000000
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="ingestor-metadata-editor">
-  <textarea class="ingestor-metadata-editor" matInput placeholder="Edit Metadata" rows="10"
-    [(ngModel)]="metadata"></textarea>
-</div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
deleted file mode 100644
index 89fe8050d3..0000000000
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.ingestor-metadata-editor {
-  width: 100%;
-}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
deleted file mode 100644
index 19b7d76c4a..0000000000
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Component, EventEmitter, Output } from '@angular/core';
-
-@Component({
-  selector: 'app-metadata-editor',
-  templateUrl: './ingestor-metadata-editor.component.html',
-  styleUrls: ['./ingestor-metadata-editor.component.scss']
-})
-export class IngestorMetadataEditorComponent {
-  metadata: string = '';
-
-    // Optional: EventEmitter, um Änderungen an der Metadata zu melden
-    @Output() metadataChange = new EventEmitter<string>();
-
-    onMetadataChange(newMetadata: string) {
-      this.metadata = newMetadata;
-      this.metadataChange.emit(this.metadata);
-    }
-}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
deleted file mode 100644
index bd04008153..0000000000
--- a/src/app/ingestor/ingestor.module.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { NgModule } from "@angular/core";
-import { CommonModule } from "@angular/common";
-import { IngestorComponent } from "./ingestor/ingestor.component";
-import { MatCardModule } from "@angular/material/card";
-import { RouterModule } from "@angular/router";
-import { IngestorMetadataEditorComponent } from "./ingestor-metadata-editor/ingestor-metadata-editor.component";
-import { MatButtonModule } from "@angular/material/button";
-import { MatFormFieldModule } from "@angular/material/form-field";
-import { MatInputModule } from "@angular/material/input";
-import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
-import { FormsModule } from "@angular/forms";
-import { MatListModule } from '@angular/material/list';
-import { MatIconModule } from '@angular/material/icon';
-
-@NgModule({
-  declarations: [
-    IngestorComponent,
-    IngestorMetadataEditorComponent
-  ],
-  imports: [
-    CommonModule, 
-    MatCardModule, 
-    FormsModule, 
-    MatFormFieldModule, 
-    MatInputModule, 
-    MatButtonModule, 
-    MatProgressSpinnerModule, 
-    RouterModule,
-    MatListModule,
-    MatIconModule
-  ],
-})
-export class IngestorModule { }
diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
deleted file mode 100644
index aa0ee1e755..0000000000
--- a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const INGESTOR_API_ENDPOINTS_V1 = {
-  DATASET: "dataset",
-  TRANSFER: "transfer",
-  OTHER: {
-    VERSION: 'version',
-  },
-};
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
deleted file mode 100644
index a61b5ca5ba..0000000000
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<p>
-  <mat-card class="ingestor-card">
-    <mat-card-header>
-      <mat-card-title>Ingestor-Connection</mat-card-title>
-    </mat-card-header>
-    <mat-card-content class="ingestor-vertical-layout">
-      <div *ngIf="connectingToFacilityBackend">
-        <mat-progress-spinner diameter="20"
-          mode="indeterminate"></mat-progress-spinner>
-      </div>
-      <div *ngIf="!connectingToFacilityBackend">
-        <ng-container *ngIf="connectedFacilityBackend === ''">
-          <p style="color: red;">No Backend connected</p>
-
-          <p>Please provide a valid Backend URL</p>
-          <mat-form-field>
-            <input matInput placeholder="Backend URL"
-              [(ngModel)]="forwardFacilityBackend">
-          </mat-form-field>
-          <button mat-raised-button color="primary"
-            (click)="forwardToIngestorPage()">Connect</button>
-
-          <div>
-            <ul>
-              <li *ngFor="let backend of lastUsedFacilityBackends">
-                <a (click)="selectFacilityBackend(backend)">{{ backend }}</a>
-              </li>
-            </ul>
-          </div>
-
-        </ng-container>
-        <ng-container *ngIf="connectedFacilityBackend !== ''">
-          <!-- Mat List with the most important information about the backend connection -->
-          <mat-list>
-            <mat-list-item>
-              <span matListItemTitle>Backend URL</span>
-              <span matListItemLine>{{ connectedFacilityBackend }} <a
-                  (click)="disconnectIngestor()">change</a></span>
-            </mat-list-item>
-            <mat-list-item>
-              <span matListItemTitle>Connection Status</span>
-              <span matListItemLine style="color: green;">Connected</span>
-            </mat-list-item>
-            <mat-list-item>
-              <span matListItemTitle>Version</span>
-              <span matListItemLine>{{ connectedFacilityBackendVersion }}</span>
-            </mat-list-item>
-          </mat-list>
-        </ng-container>
-      </div>
-    </mat-card-content>
-  </mat-card>
-</p>
-
-<p *ngIf="connectedFacilityBackend !== ''">
-  <mat-card class="ingestor-card">
-    <mat-card-header>
-      <mat-card-title>Ingest Dataset</mat-card-title>
-    </mat-card-header>
-    <mat-card-content class="ingestor-vertical-layout">
-      <div>
-      </div>
-      <app-metadata-editor></app-metadata-editor>
-      <div>
-        <button mat-raised-button color="primary" (click)="upload()"
-          [disabled]="loading">
-          <span *ngIf="!loading">Upload</span>
-          <mat-progress-spinner *ngIf="loading" diameter="20"
-            mode="indeterminate"></mat-progress-spinner>
-        </button>
-      </div>
-    </mat-card-content>
-  </mat-card>
-</p>
-
-<p *ngIf="returnValue !== ''">
-  <mat-card class="ingestor-card">
-    <mat-card-header>
-      <mat-card-title>Return Value</mat-card-title>
-    </mat-card-header>
-    <mat-card-content class="ingestor-vertical-layout">
-      <div>
-      </div>
-      <div>
-        <p>{{returnValue}}</p>
-      </div>
-    </mat-card-content>
-  </mat-card>
-</p>
-
-<p *ngIf="errorMessage !== ''">
-  <mat-card class="ingestor-card">
-    <mat-card-header class="ingestor-mixed-header">
-      <mat-card-title>Error message</mat-card-title>
-      <button mat-icon-button class="ingestor-close-button" (click)="clearErrorMessage()">
-        <mat-icon>close</mat-icon>
-      </button>
-    </mat-card-header>
-    <mat-card-content class="ingestor-vertical-layout">
-      <div>
-        <p style="color: red" [innerHTML]="errorMessage"></p>
-      </div>
-    </mat-card-content>
-  </mat-card>
-</p>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
deleted file mode 100644
index 96cdeec1ba..0000000000
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-.ingestor-vertical-layout {
-  display: flex;
-  flex-direction: column;
-  gap: 1em;
-}
-
-/* src/app/ingestor/ingestor.component.scss */
-.ingestor-mixed-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.ingestor-close-button {
-  margin-left: auto;
-}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.spec.ts b/src/app/ingestor/ingestor/ingestor.component.spec.ts
deleted file mode 100644
index 52186b1077..0000000000
--- a/src/app/ingestor/ingestor/ingestor.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { IngestorComponent } from './ingestor.component';
-
-describe('IngestorComponent', () => {
-  let component: IngestorComponent;
-  let fixture: ComponentFixture<IngestorComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ IngestorComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(IngestorComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
deleted file mode 100644
index 99cf89e0f0..0000000000
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
-import { AppConfigService, HelpMessages } from "app-config.service";
-import { HttpClient } from '@angular/common/http';
-import { IngestorMetadataEditorComponent } from '../ingestor-metadata-editor/ingestor-metadata-editor.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
-
-@Component({
-  selector: "ingestor",
-  templateUrl: "./ingestor.component.html",
-  styleUrls: ["./ingestor.component.scss"],
-})
-export class IngestorComponent implements OnInit {
-
-  @ViewChild(IngestorMetadataEditorComponent) metadataEditor: IngestorMetadataEditorComponent;
-
-  appConfig = this.appConfigService.getConfig();
-  facility: string | null = null;
-  ingestManual: string | null = null;
-  gettingStarted: string | null = null;
-  shoppingCartEnabled = false;
-  helpMessages: HelpMessages;
-
-  filePath: string = '';
-  loading: boolean = false;
-  forwardFacilityBackend: string = '';
-
-  connectedFacilityBackend: string = '';
-  connectedFacilityBackendVersion: string = '';
-  connectingToFacilityBackend: boolean = false;
-  lastUsedFacilityBackends: string[] = [];
-
-  errorMessage: string = '';
-  returnValue: string = '';
-
-  constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
-
-  ngOnInit() {
-    this.facility = this.appConfig.facility;
-    this.ingestManual = this.appConfig.ingestManual;
-    this.helpMessages = new HelpMessages(
-      this.appConfig.helpMessages?.gettingStarted,
-      this.appConfig.helpMessages?.ingestManual,
-    );
-    this.gettingStarted = this.appConfig.gettingStarted;
-    this.connectingToFacilityBackend = true;
-    this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-    // Get the GET parameter 'backendUrl' from the URL
-    this.route.queryParams.subscribe(params => {
-      const backendUrl = params['backendUrl'];
-      if (backendUrl) {
-        this.connectToFacilityBackend(backendUrl);
-      }
-      else {
-        this.connectingToFacilityBackend = false;
-      }
-    });
-  }
-
-  connectToFacilityBackend(facilityBackendUrl: string): boolean {
-    let facilityBackendUrlCleaned = facilityBackendUrl.slice();
-    // Check if last symbol is a slash and add version endpoint
-    if (!facilityBackendUrlCleaned.endsWith('/')) {
-      facilityBackendUrlCleaned += '/';
-    }
-
-    let facilityBackendUrlVersion = facilityBackendUrlCleaned + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION;
-
-    // Try to connect to the facility backend/version to check if it is available
-    console.log('Connecting to facility backend: ' + facilityBackendUrlVersion);
-    this.http.get(facilityBackendUrlVersion).subscribe(
-      response => {
-        console.log('Connected to facility backend', response);
-        // If the connection is successful, store the connected facility backend URL
-        this.connectedFacilityBackend = facilityBackendUrlCleaned;
-        this.connectingToFacilityBackend = false;
-        this.connectedFacilityBackendVersion = response['version'];
-      },
-      error => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-        console.error('Request failed', error);
-        this.connectedFacilityBackend = '';
-        this.connectingToFacilityBackend = false;
-        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-      }
-    );
-
-    return true;
-  }
-
-  upload() {
-    this.loading = true;
-    this.returnValue = '';
-    const payload = {
-      filePath: this.filePath,
-      metaData: this.metadataEditor.metadata
-    };
-
-    console.log('Uploading', payload);
-
-    this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET, payload).subscribe(
-      response => {
-        console.log('Upload successful', response);
-        this.returnValue = JSON.stringify(response);
-        this.loading = false;
-      },
-      error => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-        console.error('Upload failed', error);
-        this.loading = false;
-      }
-    );
-  }
-
-  forwardToIngestorPage() {
-    if (this.forwardFacilityBackend) {
-      this.connectingToFacilityBackend = true;
-
-      // If current route is equal to the forward route, the router will not navigate to the new route
-      if (this.connectedFacilityBackend === this.forwardFacilityBackend) {
-        this.connectToFacilityBackend(this.forwardFacilityBackend);
-        return;
-      }
-
-      this.router.navigate(['/ingestor'], { queryParams: { backendUrl: this.forwardFacilityBackend } });
-    }
-  }
-
-  disconnectIngestor() {
-    this.returnValue = '';
-    this.connectedFacilityBackend = '';
-    // Remove the GET parameter 'backendUrl' from the URL
-    this.router.navigate(['/ingestor']);
-  }
-
-  // Helper functions
-  selectFacilityBackend(facilityBackend: string) {
-    this.forwardFacilityBackend = facilityBackend;
-  }
-
-  loadLastUsedFacilityBackends(): string[] {
-    // Load the list from the local Storage
-    const lastUsedFacilityBackends = '["http://localhost:8000", "http://localhost:8888"]';
-    if (lastUsedFacilityBackends) {
-      return JSON.parse(lastUsedFacilityBackends);
-    }
-    return [];
-  }
-
-  clearErrorMessage(): void {
-    this.errorMessage = '';
-  }
-}
\ No newline at end of file
diff --git a/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts b/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
index fb6689b8c8..611ee66cec 100644
--- a/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
+++ b/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
@@ -4,7 +4,6 @@ import {
   Component,
   OnDestroy,
 } from "@angular/core";
-import { Router } from "@angular/router";
 import { SciCatDataSource } from "../../shared/services/scicat.datasource";
 import { ScicatDataService } from "../../shared/services/scicat-data-service";
 import { ExportExcelService } from "../../shared/services/export-excel.service";
@@ -31,11 +30,11 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 0,
     },
     {
-      id: "createdBy",
-      label: "Creator",
+      id: "emailJobInitiator",
+      label: "Initiator",
       icon: "person",
       canSort: true,
-      matchMode: "is",
+      matchMode: "contains",
       hideOrder: 1,
     },
     {
@@ -47,7 +46,7 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 2,
     },
     {
-      id: "createdAt",
+      id: "creationTime",
       icon: "schedule",
       label: "Created at local time",
       format: "date medium ",
@@ -65,13 +64,22 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 4,
     },
     {
-      id: "statusCode",
+      id: "jobStatusMessage",
       icon: "traffic",
       label: "Status",
+      format: "json",
       canSort: true,
       matchMode: "contains",
       hideOrder: 5,
     },
+    {
+      id: "datasetList",
+      icon: "list",
+      label: "Datasets",
+      format: "json",
+      canSort: true,
+      hideOrder: 6,
+    },
     {
       id: "jobResultObject",
       icon: "work_outline",
@@ -94,7 +102,6 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
     private cdRef: ChangeDetectorRef,
     private dataService: ScicatDataService,
     private exportService: ExportExcelService,
-    private router: Router,
   ) {
     this.dataSource = new SciCatDataSource(
       this.appConfigService,
@@ -118,4 +125,4 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
     const id = encodeURIComponent(job.id);
     this.router.navigateByUrl("/user/jobs/" + id); */
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
index 4e50368af3..f3c32b5117 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
@@ -100,7 +100,8 @@ describe("JobsDashboardComponent", () => {
       dispatchSpy = spyOn(store, "dispatch");
 
       const mode = JobViewMode.myJobs;
-      component.username = "testName";
+      component.email = "test@email.com";
+      const viewMode = { emailJobInitiator: component.email };
       const viewMode = { createdBy: component.username };
       component.onModeChange(mode);
 
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
index cc1ae02dd7..2033ad245a 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
@@ -48,7 +48,7 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
 
   jobs: JobsTableData[] = [];
   profile: any;
-  username = "";
+  email = "";
 
   subscriptions: Subscription[] = [];
 
@@ -98,8 +98,11 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
         id: job._id,
         initiator: job.emailJobInitiator,
         type: job.type,
-        createdAt: this.datePipe.transform(job.createdAt, "yyyy-MM-dd HH:mm"),
-        statusMessage: job.statusMessage,
+        createdAt: this.datePipe.transform(
+          job.creationTime,
+          "yyyy-MM-dd HH:mm",
+        ),
+        statusMessage: job.jobStatusMessage,
       }));
     }
     return tableData;
@@ -126,7 +129,7 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
         break;
       }
       case JobViewMode.myJobs: {
-        viewMode = { createdBy: this.username };
+        viewMode = { emailJobInitiator: this.email };
         break;
       }
       default: {
@@ -151,11 +154,11 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
     // map column names back to original names
     switch (event.active) {
       case "statusMessage": {
-        event.active = "statusMessage";
+        event.active = "jobStatusMessage";
         break;
       }
       case "initiator": {
-        event.active = "createdBy";
+        event.active = "emailJobInitiator";
         break;
       }
       default: {
@@ -178,13 +181,13 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
     this.subscriptions.push(
       this.store.select(selectCurrentUser).subscribe((current) => {
         if (current) {
-          this.username = current.username;
+          this.email = current.email;
 
           if (!current.realm) {
             this.store.select(selectProfile).subscribe((profile) => {
               if (profile) {
                 this.profile = profile;
-                this.username = profile.username;
+                this.email = profile.email;
               }
               this.onModeChange(JobViewMode.myJobs);
             });
diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.html b/src/app/jobs/jobs-detail/jobs-detail.component.html
index 42b3234ba6..a41a60800d 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.html
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.html
@@ -1,132 +1,73 @@
-  <div fxLayout="row" fxLayout.xs="column" *ngIf="job$ | async as job">
-    <div fxFlex="100%">
-      <mat-card>
-        <mat-card-header class="general-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> description </mat-icon>
+<div *ngIf="job$ | async as job" class="job-detail">
+  <mat-card>
+    <mat-card-content>
+      <table>
+        <tr>
+          <th>
+            <mat-icon> mail </mat-icon>
+            Email Job Initiator
+          </th>
+          <td>{{ job.emailJobInitiator }}</td>
+        </tr>
+        <tr *ngIf="job.type as value">
+          <th>
+            <mat-icon> bubble_chart </mat-icon>
+            Type
+          </th>
+          <td>{{ value }}</td>
+        </tr>
+        <tr *ngIf="job.creationTime as value">
+          <th>
+            <mat-icon> brightness_high </mat-icon>
+            Creation Time
+          </th>
+          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
+        </tr>
+        <tr *ngIf="job.executionTime as value">
+          <th>
+            <mat-icon> gavel </mat-icon>
+            Execution Time
+          </th>
+          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
+        </tr>
+        <tr *ngIf="job.jobParams as value">
+          <th>
+            <mat-icon> settings </mat-icon>
+            Job Params
+          </th>
+          <td>{{ value | json }}</td>
+        </tr>
+        <tr *ngIf="job.updatedAt as value">
+          <th>
+            <mat-icon> markunread </mat-icon>
+            Date Of Last Message
+          </th>
+          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
+        </tr>
+        <tr *ngIf="job.datasetList as value">
+          <th>
+            <mat-icon> folder </mat-icon>
+            Dataset List
+          </th>
+          <div *ngFor="let daSet of value">
+            {{ daSet.pid | json }}
           </div>
-          General Information
-        </mat-card-header>
-        <mat-card-content>
-          <table>
-            <tr *ngIf="job.id as value">
-              <th>ID</th>
-              <td>{{ value }}</td>
-            </tr>
-            <tr *ngIf="job.type as value">
-              <th>Type</th>
-              <td>{{ value }}</td>
-            </tr>
-            <tr *ngIf="job.createdAt as value">
-              <th>Created At</th>
-              <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
-            </tr>
-          </table>
-        </mat-card-content>
-      </mat-card>
-      <mat-card>
-        <mat-card-header class="creator-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> person </mat-icon>
-          </div>
-          Users and Ownership
-        </mat-card-header>
-        <mat-card-content>
-          <table>
-            <tr *ngIf="job.createdBy as value">
-              <th>Created By</th>
-              <td>{{ value }}</td>
-            </tr>
-            <tr *ngIf="job.contactEmail as value">
-              <th>Contact Email</th>
-              <td>{{ value }}</td>
-            </tr>
-            <tr *ngIf="job.ownerUser as value">
-              <th>Owner User</th>
-              <td>{{ value }}</td>
-            </tr>
-            <tr *ngIf="job.ownerGroup as value">
-              <th>Owner Group</th>
-              <td>{{ value }}</td>
-            </tr>
-            <tr *ngIf="job.accessGroups as value">
-              <th>Access Groups</th>
-              <td>{{ value }}</td>
-            </tr>
-            <tr *ngIf="job.updatedBy as value">
-              <th>Updated By</th>
-              <td>{{ value }}</td>
-            </tr>
-          </table>
-        </mat-card-content>
-      </mat-card>
-      <mat-card>
-        <mat-card-header class="derived-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> analytics </mat-icon>
-          </div>
-          Status
-        </mat-card-header>
-        <mat-card-content>
-          <table>
-            <tr *ngIf="job.statusCode as value">
-              <th>Status Code</th>
-              <td>{{ value }}</td>
-            </tr>
-            <tr *ngIf="job.statusMessage as value">
-              <th>Status Message</th>
-              <td>{{ value }}</td>
-            </tr>
-            <tr *ngIf="job.updatedAt as value">
-              <th>Updated At</th>
-              <td>{{ value }}</td>
-            </tr>
-          </table>
-        </mat-card-content>
-      </mat-card>
-      <mat-card>
-        <mat-card-header class="related-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> library_books </mat-icon>
-          </div>
-          Parameters and Configuration
-        </mat-card-header>
-        <mat-card-content>
-          <table>
-            <tr *ngIf="job.jobParams as value">
-              <th>Job Parameters</th>
-              <td>{{ value | json }}</td>
-            </tr>
-            <tr *ngIf="job.configVersion as value">
-              <th>Configuration Version</th>
-              <td>{{ value }}</td>
-            </tr>
-            <tr *ngIf="job.jobResultObject as value">
-              <th>Job Result Object</th>
-              <td>{{ value | json }}</td>
-            </tr>
-            <tr *ngIf="!job.datasetsValidation; elseBlockDatasetsValidation">
-              <th>Datasets Validation</th>
-              <td>No</td>
-            </tr>
-            <ng-template #elseBlockDatasetsValidation>
-              <tr>
-                <th>Datasets Validation</th>
-                <td>Yes</td>
-              </tr>
-            </ng-template>
-            <tr *ngIf="!job.isPublished; elseBlockIsPublished">
-              <th>Is Published</th>
-              <td>No</td>
-            </tr>
-            <ng-template #elseBlockIsPublished>
-              <tr>
-                <th>Is Published</th>
-                <td>Yes</td>
-              </tr>
-            </ng-template>
-          </table>
-        </mat-card-content>
-      </mat-card>
-    </div>
-  </div>
+        </tr>
+        <tr *ngIf="job.createdAt as value">
+          <th>
+            <mat-icon> calendar_today </mat-icon>
+            Created At
+          </th>
+          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
+        </tr>
+        <tr *ngIf="job.updatedAt as value">
+          <th>
+            <mat-icon> calendar_today </mat-icon>
+            Updated At
+          </th>
+          <td>{{ value | date: "yyyy-MM-dd HH:mm" }}</td>
+        </tr>
+      </table>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.scss b/src/app/jobs/jobs-detail/jobs-detail.component.scss
index 2d1be484f3..8ce5c5b903 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.scss
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.scss
@@ -1,25 +1,20 @@
-mat-card {
-  margin: 1em;
+.job-detail {
+  mat-card {
+    margin: 1em;
 
-  .section-icon {
-    height: auto !important;
-    width: auto !important;
+    table {
+      td {
+        padding: 0.3em;
+      }
 
-    mat-icon {
-      vertical-align: middle;
-    }
-  }
-
-  table {
-    th {
-      min-width: 10rem;
-      padding-right: 0.5rem;
-      text-align: left;
-    }
+      th {
+        text-align: left;
+        padding-right: 0.5em;
 
-    td {
-      width: 100%;
-      padding: 0.5rem 0;
+        mat-icon {
+          vertical-align: middle;
+        }
+      }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/shared/modules/shared-table/_shared-table-theme.scss b/src/app/shared/modules/shared-table/_shared-table-theme.scss
index 735cd85127..4124c88a0c 100644
--- a/src/app/shared/modules/shared-table/_shared-table-theme.scss
+++ b/src/app/shared/modules/shared-table/_shared-table-theme.scss
@@ -31,7 +31,6 @@
 
     mat-row:hover {
       background-color: mat.get-color-from-palette($hover, "lighter");
-      cursor: pointer;
     }
 
     .mat-form-field-appearance-outline {
diff --git a/src/app/state-management/effects/proposals.effects.ts b/src/app/state-management/effects/proposals.effects.ts
index 150f79dcdb..216eae775f 100644
--- a/src/app/state-management/effects/proposals.effects.ts
+++ b/src/app/state-management/effects/proposals.effects.ts
@@ -13,7 +13,6 @@ import {
 } from "state-management/selectors/proposals.selectors";
 import { map, mergeMap, catchError, switchMap, filter } from "rxjs/operators";
 import { ObservableInput, of } from "rxjs";
-import { ObservableInput, of } from "rxjs";
 import {
   loadingAction,
   loadingCompleteAction,
@@ -67,12 +66,6 @@ export class ProposalEffects {
     );
   });
 
-  fetchProposal$ = this.createProposalFetchEffect(
-    fromActions.fetchProposalAction.type,
-    fromActions.fetchProposalCompleteAction,
-    fromActions.fetchProposalFailedAction,
-    fromActions.fetchProposalAccessFailedAction,
-  );
   fetchProposal$ = this.createProposalFetchEffect(
     fromActions.fetchProposalAction.type,
     fromActions.fetchProposalCompleteAction,
@@ -80,12 +73,6 @@ export class ProposalEffects {
     fromActions.fetchProposalAccessFailedAction,
   );
 
-  fetchParentProposal$ = this.createProposalFetchEffect(
-    fromActions.fetchParentProposalAction.type,
-    fromActions.fetchParentProposalCompleteAction,
-    fromActions.fetchParentProposalFailedAction,
-    fromActions.fetchParentProposalAccessFailedAction,
-  );
   fetchParentProposal$ = this.createProposalFetchEffect(
     fromActions.fetchParentProposalAction.type,
     fromActions.fetchParentProposalCompleteAction,

From b94ba2e85d5abb4450e2666b1d6b75033a8e364e Mon Sep 17 00:00:00 2001
From: Despina <despoina.adamopoulou@empa.ch>
Date: Wed, 18 Dec 2024 13:13:21 +0100
Subject: [PATCH 060/245] create JobsServiceV4

---
 src/app/app.module.ts                         |  2 +
 .../datasets/admin-tab/admin-tab.component.ts |  5 +-
 src/app/datasets/archiving.service.spec.ts    |  2 +-
 .../share-dialog.component.spec.ts            |  2 +
 .../jobs-dashboard.component.spec.ts          |  1 -
 .../jobs-dashboard.component.ts               |  3 +-
 .../jobs/jobs-detail/jobs-detail.component.ts |  4 +-
 src/app/shared/MockStubs.ts                   |  1 -
 src/app/shared/sdk/apis/JobsService.ts        | 59 +++++++++++++++++++
 .../actions/jobs.actions.spec.ts              |  4 +-
 .../state-management/actions/jobs.actions.ts  |  1 -
 .../effects/jobs.effects.spec.ts              | 24 ++++----
 .../state-management/effects/jobs.effects.ts  | 17 ++----
 .../reducers/jobs.reducer.spec.ts             |  2 -
 .../selectors/jobs.selectors.spec.ts          |  2 -
 src/app/state-management/state/jobs.store.ts  |  1 -
 16 files changed, 86 insertions(+), 44 deletions(-)
 create mode 100644 src/app/shared/sdk/apis/JobsService.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 093937260a..73a9c0b923 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -28,6 +28,7 @@ import { SnackbarInterceptor } from "shared/interceptors/snackbar.interceptor";
 import { AuthService } from "shared/services/auth/auth.service";
 import { InternalStorage, SDKStorage } from "shared/services/auth/base.storage";
 import { CookieService } from "ngx-cookie-service";
+import { JobsServiceV4 } from 'shared/sdk/apis/JobsService';
 
 const appConfigInitializerFn = (appConfig: AppConfigService) => {
   return () => appConfig.loadAppConfig();
@@ -81,6 +82,7 @@ const apiConfigurationFn = (
   exports: [MatNativeDateModule],
   providers: [
     AppConfigService,
+    JobsServiceV4,
     {
       provide: APP_INITIALIZER,
       useFactory: appConfigInitializerFn,
diff --git a/src/app/datasets/admin-tab/admin-tab.component.ts b/src/app/datasets/admin-tab/admin-tab.component.ts
index 878cfdf0dc..123910ced4 100644
--- a/src/app/datasets/admin-tab/admin-tab.component.ts
+++ b/src/app/datasets/admin-tab/admin-tab.component.ts
@@ -3,10 +3,7 @@ import { Store } from "@ngrx/store";
 import { FileObject } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
 import { Subscription } from "rxjs";
 import { take } from "rxjs/operators";
-import {
-  CreateJobDto,
-  OutputDatasetObsoleteDto,
-} from "@scicatproject/scicat-sdk-ts";
+import { OutputDatasetObsoleteDto } from "@scicatproject/scicat-sdk-ts";
 import { submitJobAction } from "state-management/actions/jobs.actions";
 import {
   selectCurrentDatablocks,
diff --git a/src/app/datasets/archiving.service.spec.ts b/src/app/datasets/archiving.service.spec.ts
index 0ad6e1a77b..0f6824a6bf 100644
--- a/src/app/datasets/archiving.service.spec.ts
+++ b/src/app/datasets/archiving.service.spec.ts
@@ -10,7 +10,7 @@ import {
 import { JobsState } from "state-management/state/jobs.store";
 import { ArchivingService } from "./archiving.service";
 import { createMock, mockDataset } from "shared/MockStubs";
-import { CreateJobDto, ReturnedUserDto } from "@scicatproject/scicat-sdk-ts";
+import { ReturnedUserDto } from "@scicatproject/scicat-sdk-ts";
 import { Job } from "shared/sdk/models/Job";
 
 describe("ArchivingService", () => {
diff --git a/src/app/datasets/share-dialog/share-dialog.component.spec.ts b/src/app/datasets/share-dialog/share-dialog.component.spec.ts
index 9acc15820f..701a6f3a46 100644
--- a/src/app/datasets/share-dialog/share-dialog.component.spec.ts
+++ b/src/app/datasets/share-dialog/share-dialog.component.spec.ts
@@ -43,6 +43,7 @@ import { AuthService } from "shared/services/auth/auth.service";
 import { InternalStorage } from "shared/services/auth/base.storage";
 import { cold } from "jasmine-marbles";
 import { of } from "rxjs";
+import { JobsServiceV4 } from "shared/sdk/apis/JobsService";
 
 const data = {
   infoMessage: "",
@@ -77,6 +78,7 @@ describe("ShareDialogComponent", () => {
         { provide: UsersService, useClass: MockUserApi },
         { provide: InstrumentsService, useValue: {} },
         { provide: JobsService, useValue: {} },
+        { provide: JobsServiceV4, useValue: {} },
         { provide: ProposalsService, useValue: {} },
         { provide: SamplesService, useValue: {} },
         { provide: PublishedDataService, useClass: MockPublishedDataApi },
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
index ee5315f7e7..31efaf81ca 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
@@ -23,7 +23,6 @@ import { FlexLayoutModule } from "@ngbracket/ngx-layout";
 import { MatCardModule } from "@angular/material/card";
 import { MatIconModule } from "@angular/material/icon";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
-import { JobClass } from "@scicatproject/scicat-sdk-ts";
 import { JobInterface } from "shared/sdk/models/Job";
 
 describe("JobsDashboardComponent", () => {
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
index 8c374bfecf..8eeb995db0 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
@@ -1,7 +1,6 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
 import { Router } from "@angular/router";
-import { Store } from "@ngrx/store";
-import { JobClass } from "@scicatproject/scicat-sdk-ts";
+import { Store } from "@ngrx/store";;
 import { Subscription } from "rxjs";
 import {
   selectJobs,
diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.ts b/src/app/jobs/jobs-detail/jobs-detail.component.ts
index 8142f27e90..a803b8fa64 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.ts
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.ts
@@ -4,7 +4,6 @@ import { Store } from "@ngrx/store";
 import { ActivatedRoute } from "@angular/router";
 import { selectCurrentJob } from "state-management/selectors/jobs.selectors";
 import { Observable, Subscription } from "rxjs";
-import { JobClass } from "@scicatproject/scicat-sdk-ts";
 import { JobInterface } from "shared/sdk/models/Job";
 
 @Component({
@@ -15,8 +14,7 @@ import { JobInterface } from "shared/sdk/models/Job";
 export class JobsDetailComponent implements OnInit, OnDestroy {
   // TODO: We should extract the response dto with the right properties instead of using the schema for ApiResponse in the backend
   job$ = this.store.select(selectCurrentJob) as Observable<
-    // JobClass & { createdAt: string; updatedAt: string }
-    JobInterface
+    JobInterface // sdk JobClass & { createdAt: string; updatedAt: string }
   >;
   routeSubscription: Subscription = new Subscription();
 
diff --git a/src/app/shared/MockStubs.ts b/src/app/shared/MockStubs.ts
index 600de0b6b0..88e7f89502 100644
--- a/src/app/shared/MockStubs.ts
+++ b/src/app/shared/MockStubs.ts
@@ -12,7 +12,6 @@ import { DataFiles_File } from "datasets/datafiles/datafiles.interfaces";
 import {
   Attachment,
   Instrument,
-  JobClass,
   OutputDatasetObsoleteDto,
   ProposalClass,
   PublishedData,
diff --git a/src/app/shared/sdk/apis/JobsService.ts b/src/app/shared/sdk/apis/JobsService.ts
new file mode 100644
index 0000000000..0dd46a908e
--- /dev/null
+++ b/src/app/shared/sdk/apis/JobsService.ts
@@ -0,0 +1,59 @@
+import { Injectable } from "@angular/core";
+import { HttpClient, HttpHeaders, HttpResponse, HttpEvent, HttpParameterCodec, HttpContext } from "@angular/common/http";
+import { Observable } from "rxjs";
+import { Configuration } from "@scicatproject/scicat-sdk-ts";
+import { Job, JobInterface } from "../models/Job";
+
+interface JobsServiceInterfaceV4 {
+  defaultHeaders: HttpHeaders;
+  configuration: Configuration;
+  /**
+   *
+   *
+   * @param createJobDto
+   */
+  jobsControllerCreateV4(createJobDto: Job, extraHttpRequestParams?: any): Observable<JobInterface>;
+}
+
+@Injectable({
+  providedIn: "root",
+})
+export class JobsServiceV4 implements JobsServiceInterfaceV4 {
+  protected httpClient: HttpClient;
+  defaultHeaders: HttpHeaders;
+  configuration: Configuration;
+  encoder: HttpParameterCodec;
+
+  constructor(httpClient: HttpClient, configuration: Configuration) {
+    this.httpClient = httpClient;
+    this.configuration = configuration;
+  };
+
+  jobsControllerCreateV4(createJobDto: Job, observe?: "body", reportProgress?: boolean, options?: {
+      httpHeaderAccept?: "application/json";
+      context?: HttpContext;
+  }): Observable<JobInterface>;
+  jobsControllerCreateV4(createJobDto: Job, observe?: "response", reportProgress?: boolean, options?: {
+      httpHeaderAccept?: "application/json";
+      context?: HttpContext;
+  }): Observable<HttpResponse<JobInterface>>;
+  jobsControllerCreateV4(createJobDto: Job, observe?: "events", reportProgress?: boolean, options?: {
+      httpHeaderAccept?: "application/json";
+      context?: HttpContext;
+  }): Observable<HttpEvent<JobInterface>>;
+
+  jobsControllerCreateV4(createJobDto: Job, observe: any = "body", reportProgress: boolean = false, options: {
+    httpHeaderAccept?: "application/json";
+    context?: HttpContext;
+  } = {}): Observable<any> {
+    const headers = this.defaultHeaders;
+    const url = `${this.configuration.basePath}/jobs`;
+
+    return this.httpClient.post<JobInterface>(url, createJobDto, {
+      headers: headers,
+      observe: observe,
+      reportProgress: reportProgress,
+      ...options
+    });
+  }
+}
diff --git a/src/app/state-management/actions/jobs.actions.spec.ts b/src/app/state-management/actions/jobs.actions.spec.ts
index 216a5f85d1..00dcd5792a 100644
--- a/src/app/state-management/actions/jobs.actions.spec.ts
+++ b/src/app/state-management/actions/jobs.actions.spec.ts
@@ -1,4 +1,3 @@
-import { CreateJobDto } from "@scicatproject/scicat-sdk-ts";
 import * as fromActions from "./jobs.actions";
 import { mockJob as job } from "shared/MockStubs";
 
@@ -78,8 +77,7 @@ describe("Job Actions", () => {
 
   describe("submitJobAction", () => {
     it("should create an action", () => {
-      const newJob = { ...job } as CreateJobDto;
-      const action = fromActions.submitJobAction({ job: newJob });
+      const action = fromActions.submitJobAction({ job });
       expect({ ...action }).toEqual({ type: "[Job] Submit Job", job: newJob });
     });
   });
diff --git a/src/app/state-management/actions/jobs.actions.ts b/src/app/state-management/actions/jobs.actions.ts
index fdeecbd8a0..4a5ca645d8 100644
--- a/src/app/state-management/actions/jobs.actions.ts
+++ b/src/app/state-management/actions/jobs.actions.ts
@@ -1,5 +1,4 @@
 import { createAction, props } from "@ngrx/store";
-import { CreateJobDto, JobClass } from "@scicatproject/scicat-sdk-ts";
 import { Job, JobInterface } from "shared/sdk/models/Job";
 
 export const fetchJobsAction = createAction("[Job] Fetch Jobs");
diff --git a/src/app/state-management/effects/jobs.effects.spec.ts b/src/app/state-management/effects/jobs.effects.spec.ts
index ac902ae6a5..93cbd25811 100644
--- a/src/app/state-management/effects/jobs.effects.spec.ts
+++ b/src/app/state-management/effects/jobs.effects.spec.ts
@@ -13,14 +13,10 @@ import {
 } from "state-management/actions/user.actions";
 import { MessageType } from "state-management/models";
 import { Type } from "@angular/core";
-import {
-  CreateJobDto,
-  JobClass,
-  JobsService,
-} from "@scicatproject/scicat-sdk-ts";
+import { JobsService } from "@scicatproject/scicat-sdk-ts";
 import { TestObservable } from "jasmine-marbles/src/test-observables";
-import { createMock } from "shared/MockStubs";
 import { Job, JobInterface } from "shared/sdk/models/Job";
+import { JobsServiceV4 } from "shared/sdk/apis/JobsService";
 
 const data: JobInterface = {
   id: "testId",
@@ -36,6 +32,7 @@ describe("JobEffects", () => {
   let actions: TestObservable;
   let effects: JobEffects;
   let jobApi: jasmine.SpyObj<JobsService>;
+  let jobApiV4: jasmine.SpyObj<JobsServiceV4>;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -53,11 +50,18 @@ describe("JobEffects", () => {
             "jobsControllerCreate",
           ]),
         },
+        {
+          provide: JobsServiceV4,
+          useValue: jasmine.createSpyObj("jobApiV4", [
+            "jobsControllerCreateV4",
+          ]),
+        },
       ],
     });
 
     effects = TestBed.inject(JobEffects);
     jobApi = injectedStub(JobsService);
+    jobApiV4 = injectedStub(JobsServiceV4);
   });
 
   const injectedStub = <S>(service: Type<S>): jasmine.SpyObj<S> =>
@@ -230,12 +234,12 @@ describe("JobEffects", () => {
 
   describe("submitJob$", () => {
     it("should result in a submitJobCompleteAction", () => {
-      const action = fromActions.submitJobAction({ job: job as CreateJobDto });
+      const action = fromActions.submitJobAction({ job });
       const outcome = fromActions.submitJobCompleteAction({ job });
 
       actions = hot("-a", { a: action });
       const response = cold("-a|", { a: job });
-      jobApi.jobsControllerCreate.and.returnValue(response);
+      jobApiV4.jobsControllerCreateV4.and.returnValue(response);
 
       const expected = cold("--b", { b: outcome });
       expect(effects.submitJob$).toBeObservable(expected);
@@ -317,9 +321,7 @@ describe("JobEffects", () => {
 
     describe("ofType submitJobAction", () => {
       it("should dispatch a loadingAction", () => {
-        const action = fromActions.submitJobAction({
-          job: job as CreateJobDto,
-        });
+        const action = fromActions.submitJobAction({ job });
         const outcome = loadingAction();
 
         actions = hot("-a", { a: action });
diff --git a/src/app/state-management/effects/jobs.effects.ts b/src/app/state-management/effects/jobs.effects.ts
index b8e139bf90..16251775d7 100644
--- a/src/app/state-management/effects/jobs.effects.ts
+++ b/src/app/state-management/effects/jobs.effects.ts
@@ -1,10 +1,6 @@
 import { Injectable } from "@angular/core";
 import { Actions, createEffect, ofType, concatLatestFrom } from "@ngrx/effects";
-import {
-  CreateJobDto,
-  JobClass,
-  JobsService,
-} from "@scicatproject/scicat-sdk-ts";
+import { JobsService } from "@scicatproject/scicat-sdk-ts";
 import { Store } from "@ngrx/store";
 import { selectQueryParams } from "state-management/selectors/jobs.selectors";
 import * as fromActions from "state-management/actions/jobs.actions";
@@ -17,8 +13,8 @@ import {
   loadingCompleteAction,
   updateUserSettingsAction,
 } from "state-management/actions/user.actions";
-import { JobInterface } from "shared/sdk/models/Job";
-import { datasets } from "state-management/selectors";
+import { Job, JobInterface } from "shared/sdk/models/Job";
+import { JobsServiceV4 } from "shared/sdk/apis/JobsService";
 
 @Injectable()
 export class JobEffects {
@@ -71,11 +67,7 @@ export class JobEffects {
     return this.actions$.pipe(
       ofType(fromActions.submitJobAction),
       switchMap(({ job }) =>
-        this.jobsService.jobsControllerCreate({
-          ...job,
-          emailJobInitiator: job.createdBy,
-          datasetList: job.jobParams.datasetList,
-        } as CreateJobDto).pipe(
+        this.jobsServiceV4.jobsControllerCreateV4(job as Job).pipe(
           map((res) => fromActions.submitJobCompleteAction({ job: res as JobInterface })),
           catchError((err) => of(fromActions.submitJobFailedAction({ err }))),
         ),
@@ -141,6 +133,7 @@ export class JobEffects {
   constructor(
     private actions$: Actions,
     private jobsService: JobsService,
+    private jobsServiceV4: JobsServiceV4,
     private store: Store,
   ) {}
 }
diff --git a/src/app/state-management/reducers/jobs.reducer.spec.ts b/src/app/state-management/reducers/jobs.reducer.spec.ts
index 80981a7e7c..f9f5738dec 100644
--- a/src/app/state-management/reducers/jobs.reducer.spec.ts
+++ b/src/app/state-management/reducers/jobs.reducer.spec.ts
@@ -1,8 +1,6 @@
 import { jobsReducer } from "./jobs.reducer";
 import * as fromActions from "../actions/jobs.actions";
 import { initialJobsState } from "state-management/state/jobs.store";
-import { createMock } from "shared/MockStubs";
-import { JobClass } from "@scicatproject/scicat-sdk-ts";
 import { Job, JobInterface } from "shared/sdk/models/Job";
 
 const data: JobInterface = {
diff --git a/src/app/state-management/selectors/jobs.selectors.spec.ts b/src/app/state-management/selectors/jobs.selectors.spec.ts
index 040366483a..3fdae792a2 100644
--- a/src/app/state-management/selectors/jobs.selectors.spec.ts
+++ b/src/app/state-management/selectors/jobs.selectors.spec.ts
@@ -1,7 +1,5 @@
 import * as fromSelectors from "./jobs.selectors";
 import { JobsState } from "../state/jobs.store";
-import { createMock } from "shared/MockStubs";
-import { JobClass } from "@scicatproject/scicat-sdk-ts";
 import { Job, JobInterface } from "shared/sdk/models/Job";
 
 const data: JobInterface = {
diff --git a/src/app/state-management/state/jobs.store.ts b/src/app/state-management/state/jobs.store.ts
index d9e891e835..cc5017089e 100644
--- a/src/app/state-management/state/jobs.store.ts
+++ b/src/app/state-management/state/jobs.store.ts
@@ -1,4 +1,3 @@
-import { JobClass } from "@scicatproject/scicat-sdk-ts";
 import { JobInterface } from "shared/sdk/models/Job";
 import { JobFilters } from "state-management/models";
 

From 0f989cdf0c833326132188e99ba01a9332295b95 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Wed, 18 Dec 2024 13:50:33 +0000
Subject: [PATCH 061/245] Remove createdBy from POST /job

and fix endpoint
---
 src/app/shared/sdk/apis/JobsService.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/sdk/apis/JobsService.ts b/src/app/shared/sdk/apis/JobsService.ts
index 0dd46a908e..b39d7a0152 100644
--- a/src/app/shared/sdk/apis/JobsService.ts
+++ b/src/app/shared/sdk/apis/JobsService.ts
@@ -47,9 +47,13 @@ export class JobsServiceV4 implements JobsServiceInterfaceV4 {
     context?: HttpContext;
   } = {}): Observable<any> {
     const headers = this.defaultHeaders;
-    const url = `${this.configuration.basePath}/jobs`;
+    const url = `${this.configuration.basePath}/api/v3/jobs`;
 
-    return this.httpClient.post<JobInterface>(url, createJobDto, {
+    return this.httpClient.post<JobInterface>(url,
+      {
+        ...createJobDto,
+        createdBy: undefined,
+      }, {
       headers: headers,
       observe: observe,
       reportProgress: reportProgress,

From bd72c4d1ea7f37b2a2e70b621b364530bbbbd5c0 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 18 Dec 2024 14:14:43 +0000
Subject: [PATCH 062/245] frontend functional for alpha

---
 src/app/datasets/onedep/onedep.component.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 65f2cbbf8b..aeee5e3e5f 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -18,10 +18,12 @@ import {
 } from "@angular/forms";
 
 import { Store } from "@ngrx/store";
-import { Dataset } from "shared/sdk/models";
+import {
+  OutputDatasetObsoleteDto,
+  ReturnedUserDto,
+} from "@scicatproject/scicat-sdk-ts";
 import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
 import { selectCurrentUser } from "state-management/selectors/user.selectors";
-import { User } from "shared/sdk";
 import { methodsList, EmFile, DepositionFiles } from "./types/methods.enum";
 import { Subscription, fromEvent } from "rxjs";
 
@@ -36,8 +38,8 @@ export class OneDepComponent implements OnInit, OnDestroy {
 
   config: AppConfig;
 
-  dataset: Dataset | undefined;
-  user: User | undefined;
+  dataset: OutputDatasetObsoleteDto | undefined;
+  user: ReturnedUserDto | undefined;
   form: FormGroup;
   showAssociatedMapQuestion = false;
   methodsList = methodsList;
@@ -437,8 +439,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
       });
   }
   onDownloadClick() {
-    console.log("download data");
-    if (this.form.value.deposingCoordinates === true) {
+    if (this.form.value.deposingCoordinates === "true") {
       const formDataFile = new FormData();
       const fT = this.fileTypes.find(
         (fileType) => fileType.emName === this.emFile.Coordinates,

From 96609a5242be9ebcc2bdd84c58aae77a8fa5b817 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 18 Dec 2024 15:10:55 +0000
Subject: [PATCH 063/245] new psi-deployment with openem changes rebased on
 master

---
 src/assets/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/config.json b/src/assets/config.json
index 96518ad9d4..996dd1a935 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -1,7 +1,7 @@
 {
   "accessTokenPrefix": "Bearer ",
   "addDatasetEnabled": true,
-  "archiveWorkflowEnabled": false,
+  "archiveWorkflowEnabled": true,
   "datasetReduceEnabled": true,
   "datasetJsonScientificMetadata": true,
   "editDatasetSampleEnabled": true,

From 8c40aac7997c9030eeddae8dd8fd13baeee6ff4f Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 19 Dec 2024 08:49:29 +0000
Subject: [PATCH 064/245] remove email

---
 src/app/datasets/onedep/onedep.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index aeee5e3e5f..af13dc9f06 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -366,7 +366,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
     let body: string;
     if (this.form.value.password) {
       body = JSON.stringify({
-        email: "sofya.laskina@epfl.ch", // for now
+        email: this.form.value.email,
         orcidIds: this.orcidArray().value.map((item) => item.orcidId),
         country: "United States",
         method: this.form.value.emMethod,
@@ -375,7 +375,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
       });
     } else {
       body = JSON.stringify({
-        email: "sofya.laskina@epfl.ch", // for now
+        email: this.form.value.email,
         orcidIds: this.orcidArray().value.map((item) => item.orcidId),
         country: "United States",
         method: this.form.value.emMethod,

From ad4ec208d831ee025e4db56afde4146674f25749 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 19 Dec 2024 14:02:55 +0100
Subject: [PATCH 065/245] =?UTF-8?q?Update=20the=20=E2=80=9CRemote-Ingestor?=
 =?UTF-8?q?-OpenEM=E2=80=9D=20in=20the=20PSI=20Deployment=20OpenEM=20branc?=
 =?UTF-8?q?h=20(#1693)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Prepare ingestor frontend minimal ui

* Update API

* static list of backends

* Remove unused file path input field in ingestor component

* Extend ui and adjust api calls

* Change back to localhost:3000 instead of backend.localhost

* Change back the files to original state

* fix ingestor endpoint

* fix sonarcube issues

* Prepare showing the transfer list

* json-forms poc

* frontend update - improved json form integration

* Assignment of the input menus to the appropriate metadata

* fix package.json for json-forms

* Embedding ingestor backend part 1

* Embedding ingestor backend part 2

* Embedding ingestor backend part 3

---------

Co-authored-by: David Wiessner <david.wiessner@indema.ch>
---
 package.json                                  |   2 +
 .../app-header/app-header.component.html      |  10 +-
 src/app/app-routing/app-routing.module.ts     |   7 +
 .../ingestor.feature.module.ts                |   8 +
 .../ingestor.routing.module.ts                |  15 +
 .../customRenderer/all-of-renderer.ts         |  14 +
 .../customRenderer/any-of-renderer.ts         |  70 +++
 .../customRenderer/custom-renderers.ts        |  20 +
 .../customRenderer/one-of-renderer.ts         |  69 +++
 .../ingestor-metadata-editor-helper.ts        |  32 ++
 .../ingestor-metadata-editor-schema_demo.ts   | 483 ++++++++++++++++++
 .../ingestor-metadata-editor.component.html   |   4 +
 .../ingestor-metadata-editor.component.scss   |   3 +
 .../ingestor-metadata-editor.component.ts     |  28 +
 src/app/ingestor/ingestor.module.ts           |  67 +++
 .../ingestor/ingestor/_ingestor-theme.scss    |  39 ++
 ...estor.confirm-transfer-dialog.component.ts |  61 +++
 .../ingestor.confirm-transfer-dialog.html     |  22 +
 ...stor.dialog-stepper.component.component.ts |  10 +
 .../ingestor.dialog-stepper.component.css     |  17 +
 .../ingestor.dialog-stepper.component.html    |  16 +
 ...tor.extractor-metadata-dialog.component.ts |  62 +++
 .../ingestor.extractor-metadata-dialog.html   |  73 +++
 .../ingestor.new-transfer-dialog.component.ts | 124 +++++
 .../dialog/ingestor.new-transfer-dialog.html  |  45 ++
 ...ingestor.user-metadata-dialog.component.ts |  67 +++
 .../dialog/ingestor.user-metadata-dialog.html |  67 +++
 .../ingestor/ingestor-api-endpoints.ts        |  17 +
 .../ingestor/ingestor.component-helper.ts     | 104 ++++
 .../ingestor/ingestor/ingestor.component.html | 144 ++++++
 .../ingestor/ingestor/ingestor.component.scss |  62 +++
 .../ingestor/ingestor.component.spec.ts       |  24 +
 .../ingestor/ingestor/ingestor.component.ts   | 282 ++++++++++
 src/styles.scss                               |   2 +
 34 files changed, 2069 insertions(+), 1 deletion(-)
 create mode 100644 src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
 create mode 100644 src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
 create mode 100644 src/app/ingestor/ingestor.module.ts
 create mode 100644 src/app/ingestor/ingestor/_ingestor-theme.scss
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
 create mode 100644 src/app/ingestor/ingestor/ingestor-api-endpoints.ts
 create mode 100644 src/app/ingestor/ingestor/ingestor.component-helper.ts
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.html
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.scss
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.spec.ts
 create mode 100644 src/app/ingestor/ingestor/ingestor.component.ts

diff --git a/package.json b/package.json
index 91c79ee627..6404306d19 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,8 @@
     "@angular/platform-server": "^16",
     "@angular/router": "^16",
     "@angular/service-worker": "^16",
+    "@jsonforms/angular": "3.2.*",
+    "@jsonforms/angular-material": "3.2.*",
     "@ngbracket/ngx-layout": "^16.0.0",
     "@ngrx/effects": "^16",
     "@ngrx/router-store": "^16",
diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index b844e86598..88baab4099 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -67,7 +67,15 @@ <h3>{{ status }}</h3>
     </a>
 
     <span class="spacer"></span>
-
+    
+    <span>
+      <h6>
+        <a class="toplink" [routerLink]="['/ingestor']">
+          <mat-icon> cloud_upload  </mat-icon>
+          <span class="large-screen-text">Ingestor (OpenEM)</span></a
+        >
+      </h6>
+    </span>
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/help']">
diff --git a/src/app/app-routing/app-routing.module.ts b/src/app/app-routing/app-routing.module.ts
index 3310f2c053..2f95ca27e5 100644
--- a/src/app/app-routing/app-routing.module.ts
+++ b/src/app/app-routing/app-routing.module.ts
@@ -105,6 +105,13 @@ export const routes: Routes = [
                 (m) => m.HelpFeatureModule,
               ),
           },
+          {
+            path: "ingestor",
+            loadChildren: () =>
+              import("./lazy/ingestor-routing/ingestor.feature.module").then(
+                (m) => m.IngestorFeatureModule,
+              ),
+          },
           {
             path: "logbooks",
             loadChildren: () =>
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
new file mode 100644
index 0000000000..8796c9c34e
--- /dev/null
+++ b/src/app/app-routing/lazy/ingestor-routing/ingestor.feature.module.ts
@@ -0,0 +1,8 @@
+import { NgModule } from "@angular/core";
+import { IngestorRoutingModule } from "./ingestor.routing.module";
+import { IngestorModule } from "ingestor/ingestor.module";
+
+@NgModule({
+  imports: [IngestorModule, IngestorRoutingModule],
+})
+export class IngestorFeatureModule {}
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
new file mode 100644
index 0000000000..c1a5b047d5
--- /dev/null
+++ b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
+import { IngestorComponent } from "ingestor/ingestor/ingestor.component";
+
+const routes: Routes = [
+  {
+    path: "",
+    component: IngestorComponent,
+  },
+];
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class IngestorRoutingModule {}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
new file mode 100644
index 0000000000..91085fbaf7
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import { JsonFormsControl } from '@jsonforms/angular';
+
+@Component({
+  selector: 'AllOfRenderer',
+  template: `<div>AllOf Renderer</div>`
+})
+export class AllOfRenderer extends JsonFormsControl {
+  data: any[] = [];
+
+  ngOnInit() {
+    this.data = this.uischema?.options?.items || [];
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
new file mode 100644
index 0000000000..530d762196
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -0,0 +1,70 @@
+import { Component } from '@angular/core';
+import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
+import { ControlProps, JsonSchema } from '@jsonforms/core';
+import { configuredRenderer } from '../ingestor-metadata-editor-helper';
+
+@Component({
+    selector: 'app-anyof-renderer',
+    template: `
+    <div class="anyof-group">
+    <mat-card-title>{{anyOfTitle}}</mat-card-title>
+
+    <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
+        <mat-tab *ngFor="let option of options" label="{{option}}">
+            <div style="margin: 20px auto; width: 85%" *ngIf="option !== 'null'">
+                <jsonforms [schema]="getTabSchema(option)" [data]="passedProps.data" [renderers]="defaultRenderer" (dataChange)=onInnerJsonFormsChange($event)></jsonforms>
+            </div>
+        </mat-tab>
+    </mat-tab-group>
+    </div>
+  `
+})
+export class AnyOfRenderer extends JsonFormsControl {
+
+    dataAsString: string;
+    options: string[] = [];
+    anyOfTitle: string;
+    selectedTabIndex: number = 0; // default value 
+
+    rendererService: JsonFormsAngularService;
+
+    defaultRenderer = configuredRenderer;
+    passedProps: ControlProps;
+
+    constructor(service: JsonFormsAngularService) {
+        super(service);
+        this.rendererService = service;
+    }
+
+    public mapAdditionalProps(props: ControlProps) {
+        this.passedProps = props;
+        this.anyOfTitle = props.label || 'AnyOf';
+        this.options = props.schema.anyOf.map((option: any) => option.title || option.type || JSON.stringify(option));
+    
+        if (this.options.includes("null") && !props.data) {
+            this.selectedTabIndex = this.options.indexOf("null");
+        }
+    }
+
+    public getTabSchema(tabOption: string): JsonSchema {
+        const selectedSchema = (this.passedProps.schema.anyOf as any).find((option: any) => option.title === tabOption || option.type === tabOption || JSON.stringify(option) === tabOption);
+        return selectedSchema;
+    }
+
+    public onInnerJsonFormsChange(event: any) {
+        // Check if data is equal to the passedProps.data
+        if (event !== this.passedProps.data) {
+            const updatedData = this.rendererService.getState().jsonforms.core.data;
+
+            // aktualisiere das aktuelle Datenobjekt
+            const pathSegments = this.passedProps.path.split('.');
+            let current = updatedData;
+            for (let i = 0; i < pathSegments.length - 1; i++) {
+                current = current[pathSegments[i]];
+            }
+            current[pathSegments[pathSegments.length - 1]] = event;
+
+            this.rendererService.setData(updatedData);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
new file mode 100644
index 0000000000..8b807f113b
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -0,0 +1,20 @@
+import { isAllOfControl, isAnyOfControl, isOneOfControl, JsonFormsRendererRegistryEntry } from '@jsonforms/core';
+import { OneOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer';
+import { AllOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer';
+import { AnyOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer';
+import { isRangeControl, RankedTester, rankWith } from '@jsonforms/core';
+
+export const customRenderers: JsonFormsRendererRegistryEntry[] = [
+  {
+    tester: rankWith(4, isOneOfControl),
+    renderer: OneOfRenderer
+  },
+  {
+    tester: rankWith(4, isAllOfControl),
+    renderer: AllOfRenderer
+  },
+  {
+    tester: rankWith(4, isAnyOfControl),
+    renderer: AnyOfRenderer
+  }
+];
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
new file mode 100644
index 0000000000..42665d5c62
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
@@ -0,0 +1,69 @@
+import { Component } from '@angular/core';
+import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
+import { ControlProps, JsonSchema } from '@jsonforms/core';
+import { configuredRenderer } from '../ingestor-metadata-editor-helper';
+
+@Component({
+    selector: 'app-oneof-component',
+    template: `
+    <div class="anyof-group">
+      <p>{{anyOfTitle}}</p>
+      <mat-radio-group [(ngModel)]="selectedOption" (change)="onOptionChange()">
+        <mat-radio-button *ngFor="let option of options" [value]="option" style="margin-right: 10px;">
+          {{option}}
+        </mat-radio-button>
+      </mat-radio-group>
+      <div style="margin-top: 20px;" *ngIf="selectedAnyOption && selectedOption !== 'null'">
+        <jsonforms [schema]="selectedAnyOption" [data]="passedProps.data" [renderers]="defaultRenderer" (dataChange)=onInnerJsonFormsChange($event)></jsonforms>
+      </div>
+    </div>
+  `
+})
+export class OneOfRenderer extends JsonFormsControl {
+
+    dataAsString: string;
+    options: string[] = [];
+    anyOfTitle: string;
+    selectedOption: string;
+    selectedAnyOption: JsonSchema;
+
+    rendererService: JsonFormsAngularService;
+
+    defaultRenderer = configuredRenderer;
+    passedProps: ControlProps;
+
+    constructor(service: JsonFormsAngularService) {
+        super(service);
+        this.rendererService = service;
+    }
+
+    public mapAdditionalProps(props: ControlProps) {
+        this.passedProps = props;
+        this.anyOfTitle = props.label || 'AnyOf';
+        this.options = props.schema.anyOf.map((option: any) => option.title || option.type || JSON.stringify(option));
+        if (!props.data) {
+            this.selectedOption = 'null'; // Auf "null" setzen, wenn die Daten leer sind
+        }
+    }
+
+    public onOptionChange() {
+        this.selectedAnyOption = (this.passedProps.schema.anyOf as any).find((option: any) => option.title === this.selectedOption || option.type === this.selectedOption || JSON.stringify(option) === this.selectedOption);
+    }
+
+    public onInnerJsonFormsChange(event: any) {
+        // Check if data is equal to the passedProps.data
+        if (event !== this.passedProps.data) {
+            const updatedData = this.rendererService.getState().jsonforms.core.data;
+
+            // aktualisiere das aktuelle Datenobjekt
+            const pathSegments = this.passedProps.path.split('.');
+            let current = updatedData;
+            for (let i = 0; i < pathSegments.length - 1; i++) {
+                current = current[pathSegments[i]];
+            }
+            current[pathSegments[pathSegments.length - 1]] = event;
+
+            this.rendererService.setData(updatedData);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
new file mode 100644
index 0000000000..65c4d640d3
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -0,0 +1,32 @@
+import { angularMaterialRenderers } from "@jsonforms/angular-material";
+import { customRenderers } from "./customRenderer/custom-renderers";
+
+export const configuredRenderer = [
+  ...angularMaterialRenderers,
+  ...customRenderers,
+];
+
+export class IngestorMetadataEditorHelper {
+  // Resolve all $ref in a schema
+  static resolveRefs(schema: any, rootSchema: any): any {
+    if (schema === null || schema === undefined) {
+      return schema;
+    }
+
+    if (schema.$ref) {
+      const refPath = schema.$ref.replace('#/', '').split('/');
+      let ref = rootSchema;
+      refPath.forEach((part) => {
+        ref = ref[part];
+      });
+      return IngestorMetadataEditorHelper.resolveRefs(ref, rootSchema);
+    } else if (typeof schema === 'object') {
+      for (const key in schema) {
+        if (schema.hasOwnProperty(key)) {
+          schema[key] = IngestorMetadataEditorHelper.resolveRefs(schema[key], rootSchema);
+        }
+      }
+    }
+    return schema;
+  };
+};
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
new file mode 100644
index 0000000000..5874d74d42
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
@@ -0,0 +1,483 @@
+export const demo_organizational_schema = {
+  type: 'object',
+  properties: {
+    grants: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          grant_name: {
+            type: 'string',
+            description: 'name of the grant',
+          },
+          start_date: {
+            type: 'string',
+            format: 'date',
+            description: 'start date',
+          },
+          end_date: {
+            type: 'string',
+            format: 'date',
+            description: 'end date',
+          },
+          budget: {
+            type: 'number',
+            description: 'budget',
+          },
+          project_id: {
+            type: 'string',
+            description: 'project id',
+          },
+          country: {
+            type: 'string',
+            description: 'Country of the institution',
+          },
+        },
+      },
+      description: 'List of grants associated with the project',
+    },
+    authors: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          first_name: {
+            type: 'string',
+            description: 'first name',
+          },
+          work_status: {
+            type: 'boolean',
+            description: 'work status',
+          },
+          email: {
+            type: 'string',
+            description: 'email',
+            pattern: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$',
+          },
+          work_phone: {
+            type: 'string',
+            description: 'work phone',
+          },
+          name: {
+            type: 'string',
+            description: 'name',
+          },
+          name_org: {
+            type: 'string',
+            description: 'Name of the organization',
+          },
+          type_org: {
+            type: 'string',
+            description: 'Type of organization, academic, commercial, governmental, etc.',
+            enum: ['Academic', 'Commercial', 'Government', 'Other'],
+          },
+          country: {
+            type: 'string',
+            description: 'Country of the institution',
+          },
+          role: {
+            type: 'string',
+            description: 'Role of the author, for example principal investigator',
+          },
+          orcid: {
+            type: 'string',
+            description: 'ORCID of the author, a type of unique identifier',
+          },
+        },
+      },
+      description: 'List of authors associated with the project',
+    },
+    funder: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          funder_name: {
+            type: 'string',
+            description: 'funding organization/person.',
+          },
+          type_org: {
+            type: 'string',
+            description: 'Type of organization, academic, commercial, governmental, etc.',
+            enum: ['Academic', 'Commercial', 'Government', 'Other'],
+          },
+          country: {
+            type: 'string',
+            description: 'Country of the institution',
+          },
+        },
+      },
+      description: 'Description of the project funding',
+    },
+  },
+  required: ['authors', 'funder'],
+};
+
+export const demo_acquisition_schema = {
+  type: 'object',
+  properties: {
+    nominal_defocus: {
+      type: 'object',
+      description: 'Target defocus set, min and max values in µm.',
+    },
+    calibrated_defocus: {
+      type: 'object',
+      description: 'Machine estimated defocus, min and max values in µm. Has a tendency to be off.',
+    },
+    nominal_magnification: {
+      type: 'integer',
+      description: 'Magnification level as indicated by the instrument, no unit',
+    },
+    calibrated_magnification: {
+      type: 'integer',
+      description: 'Calculated magnification, no unit',
+    },
+    holder: {
+      type: 'string',
+      description: 'Speciman holder model',
+    },
+    holder_cryogen: {
+      type: 'string',
+      description: 'Type of cryogen used in the holder - if the holder is cooled seperately',
+    },
+    temperature_range: {
+      type: 'object',
+      description: 'Temperature during data collection, in K with min and max values.',
+    },
+    microscope_software: {
+      type: 'string',
+      description: 'Software used for instrument control',
+    },
+    detector: {
+      type: 'string',
+      description: 'Make and model of the detector used',
+    },
+    detector_mode: {
+      type: 'string',
+      description: 'Operating mode of the detector',
+    },
+    dose_per_movie: {
+      type: 'object',
+      description: 'Average dose per image/movie/tilt - given in electrons per square Angstrom',
+    },
+    energy_filter: {
+      type: 'object',
+      description: 'Whether an energy filter was used and its specifics.',
+    },
+    image_size: {
+      type: 'object',
+      description: 'The size of the image in pixels, height and width given.',
+    },
+    date_time: {
+      type: 'string',
+      description: 'Time and date of the data acquisition',
+    },
+    exposure_time: {
+      type: 'object',
+      description: 'Time of data acquisition per movie/tilt - in s',
+    },
+    cryogen: {
+      type: 'string',
+      description: 'Cryogen used in cooling the instrument and sample, usually nitrogen',
+    },
+    frames_per_movie: {
+      type: 'integer',
+      description: 'Number of frames that on average constitute a full movie, can be a bit hard to define for some detectors',
+    },
+    grids_imaged: {
+      type: 'integer',
+      description: 'Number of grids imaged for this project - here with qualifier during this data acquisition',
+    },
+    images_generated: {
+      type: 'integer',
+      description: 'Number of images generated total for this data collection - might need a qualifier for tilt series to determine whether full series or individual tilts are counted',
+    },
+    binning_camera: {
+      type: 'number',
+      description: 'Level of binning on the images applied during data collection',
+    },
+    pixel_size: {
+      type: 'object',
+      description: 'Pixel size, in Angstrom',
+    },
+    specialist_optics: {
+      type: 'object',
+      description: 'Any type of special optics, such as a phaseplate',
+    },
+    beamshift: {
+      type: 'object',
+      description: 'Movement of the beam above the sample for data collection purposes that does not require movement of the stage. Given in mrad.',
+    },
+    beamtilt: {
+      type: 'object',
+      description: 'Another way to move the beam above the sample for data collection purposes that does not require movement of the stage. Given in mrad.',
+    },
+    imageshift: {
+      type: 'object',
+      description: 'Movement of the Beam below the image in order to shift the image on the detector. Given in µm.',
+    },
+    beamtiltgroups: {
+      type: 'integer',
+      description: 'Number of Beamtilt groups present in this dataset - for optimized processing split dataset into groups of same tilt angle. Despite its name Beamshift is often used to achieve this result.',
+    },
+    gainref_flip_rotate: {
+      type: 'string',
+      description: 'Whether and how you have to flip or rotate the gainref in order to align with your acquired images',
+    },
+  },
+  required: ['detector', 'dose_per_movie', 'date_time', 'binning_camera', 'pixel_size'],
+};
+
+export const demo_sample_schema = {
+  type: 'object',
+  properties: {
+    overall_molecule: {
+      type: 'object',
+      description: 'Description of the overall molecule',
+      properties: {
+        molecular_type: {
+          type: 'string',
+          description: 'Description of the overall molecular type, i.e., a complex',
+        },
+        name_sample: {
+          type: 'string',
+          description: 'Name of the full sample',
+        },
+        source: {
+          type: 'string',
+          description: 'Where the sample was taken from, i.e., natural host, recombinantly expressed, etc.',
+        },
+        molecular_weight: {
+          type: 'object',
+          description: 'Molecular weight in Da',
+        },
+        assembly: {
+          type: 'string',
+          description: 'What type of higher order structure your sample forms - if any.',
+          enum: ['FILAMENT', 'HELICAL ARRAY', 'PARTICLE'],
+        },
+      },
+      required: ['molecular_type', 'name_sample', 'source', 'assembly'],
+    },
+    molecule: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          name_mol: {
+            type: 'string',
+            description: 'Name of an individual molecule (often protein) in the sample',
+          },
+          molecular_type: {
+            type: 'string',
+            description: 'Description of the overall molecular type, i.e., a complex',
+          },
+          molecular_class: {
+            type: 'string',
+            description: 'Class of the molecule',
+            enum: ['Antibiotic', 'Carbohydrate', 'Chimera', 'None of these'],
+          },
+          sequence: {
+            type: 'string',
+            description: 'Full sequence of the sample as in the data, i.e., cleaved tags should also be removed from sequence here',
+          },
+          natural_source: {
+            type: 'string',
+            description: 'Scientific name of the natural host organism',
+          },
+          taxonomy_id_source: {
+            type: 'string',
+            description: 'Taxonomy ID of the natural source organism',
+          },
+          expression_system: {
+            type: 'string',
+            description: 'Scientific name of the organism used to produce the molecule of interest',
+          },
+          taxonomy_id_expression: {
+            type: 'string',
+            description: 'Taxonomy ID of the expression system organism',
+          },
+          gene_name: {
+            type: 'string',
+            description: 'Name of the gene of interest',
+          },
+        },
+      },
+      required: ['name_mol', 'molecular_type', 'molecular_class', 'sequence', 'natural_source', 'taxonomy_id_source', 'expression_system', 'taxonomy_id_expression'],
+    },
+    ligands: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          present: {
+            type: 'boolean',
+            description: 'Whether the model contains any ligands',
+          },
+          smiles: {
+            type: 'string',
+            description: 'Provide a valid SMILES string of your ligand',
+          },
+          reference: {
+            type: 'string',
+            description: 'Link to a reference of your ligand, i.e., CCD, PubChem, etc.',
+          },
+        },
+      },
+      description: 'List of ligands associated with the sample',
+    },
+    specimen: {
+      type: 'object',
+      description: 'Description of the specimen',
+      properties: {
+        buffer: {
+          type: 'string',
+          description: 'Name/composition of the (chemical) sample buffer during grid preparation',
+        },
+        concentration: {
+          type: 'object',
+          description: 'Concentration of the (supra)molecule in the sample, in mg/ml',
+        },
+        ph: {
+          type: 'number',
+          description: 'pH of the sample buffer',
+        },
+        vitrification: {
+          type: 'boolean',
+          description: 'Whether the sample was vitrified',
+        },
+        vitrification_cryogen: {
+          type: 'string',
+          description: 'Which cryogen was used for vitrification',
+        },
+        humidity: {
+          type: 'object',
+          description: 'Environmental humidity just before vitrification, in %',
+        },
+        temperature: {
+          type: 'object',
+          description: 'Environmental temperature just before vitrification, in K',
+          minimum: 0.0,
+        },
+        staining: {
+          type: 'boolean',
+          description: 'Whether the sample was stained',
+        },
+        embedding: {
+          type: 'boolean',
+          description: 'Whether the sample was embedded',
+        },
+        shadowing: {
+          type: 'boolean',
+          description: 'Whether the sample was shadowed',
+        },
+      },
+      required: ['ph', 'vitrification', 'vitrification_cryogen', 'staining', 'embedding', 'shadowing'],
+    },
+    grid: {
+      type: 'object',
+      description: 'Description of the grid used',
+      properties: {
+        manufacturer: {
+          type: 'string',
+          description: 'Grid manufacturer',
+        },
+        material: {
+          type: 'string',
+          description: 'Material out of which the grid is made',
+        },
+        mesh: {
+          type: 'number',
+          description: 'Grid mesh in lines per inch',
+        },
+        film_support: {
+          type: 'boolean',
+          description: 'Whether a support film was used',
+        },
+        film_material: {
+          type: 'string',
+          description: 'Type of material the support film is made of',
+        },
+        film_topology: {
+          type: 'string',
+          description: 'Topology of the support film',
+        },
+        film_thickness: {
+          type: 'string',
+          description: 'Thickness of the support film',
+        },
+        pretreatment_type: {
+          type: 'string',
+          description: 'Type of pretreatment of the grid, i.e., glow discharge',
+        },
+        pretreatment_time: {
+          type: 'object',
+          description: 'Length of time of the pretreatment in s',
+        },
+        pretreatment_pressure: {
+          type: 'object',
+          description: 'Pressure of the chamber during pretreatment, in Pa',
+        },
+        pretreatment_atmosphere: {
+          type: 'string',
+          description: 'Atmospheric conditions in the chamber during pretreatment, i.e., addition of specific gases, etc.',
+        },
+      },
+    },
+  },
+  required: ['overall_molecule', 'molecule', 'specimen', 'grid'],
+};
+
+export const demo_instrument_schema = { 
+  type: 'object',
+  properties: {
+    microscope: {
+      type: 'string',
+      description: 'Name/Type of the Microscope',
+    },
+    illumination: {
+      type: 'string',
+      description: 'Mode of illumination used during data collection',
+    },
+    imaging: {
+      type: 'string',
+      description: 'Mode of imaging used during data collection',
+    },
+    electron_source: {
+      type: 'string',
+      description: 'Type of electron source used in the microscope, such as FEG',
+    },
+    acceleration_voltage: {
+      type: 'object',
+      description: 'Voltage used for the electron acceleration, in kV',
+    },
+    c2_aperture: {
+      type: 'object',
+      description: 'C2 aperture size used in data acquisition, in µm',
+    },
+    cs: {
+      type: 'object',
+      description: 'Spherical aberration of the instrument, in mm',
+    },
+  },
+  required: ['microscope', 'illumination', 'imaging', 'electron_source', 'acceleration_voltage', 'cs'],
+};
+
+export const demo_scicatheader_schema = {
+  type: "object",
+  properties: {
+    datasetName: { type: "string" },
+    description: { type: "string" },
+    creationLocation: { type: "string" },
+    dataFormat: { type: "string" },
+    ownerGroup: { type: "string" },
+    type: { type: "string" },
+    license: { type: "string" },
+    keywords: {
+      type: "array",
+      items: { type: "string" }
+    },
+    scientificMetadata: { type: "string" }
+  },
+  required: ["datasetName", "description", "creationLocation", "dataFormat", "ownerGroup", "type", "license", "keywords", "scientificMetadata"]
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
new file mode 100644
index 0000000000..2e2b11f4ef
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
@@ -0,0 +1,4 @@
+<div class="ingestor-metadata-editor">
+  <textarea class="ingestor-metadata-editor" matInput placeholder="Edit Metadata" rows="10"
+    [(ngModel)]="metadata"></textarea>
+</div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
new file mode 100644
index 0000000000..89fe8050d3
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -0,0 +1,3 @@
+.ingestor-metadata-editor {
+  width: 100%;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
new file mode 100644
index 0000000000..308a64143b
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -0,0 +1,28 @@
+import { Component, EventEmitter, Output, Input } from '@angular/core';
+import { JsonSchema } from '@jsonforms/core';
+import { configuredRenderer } from './ingestor-metadata-editor-helper';
+
+@Component({
+  selector: 'app-metadata-editor',
+  template: `<jsonforms
+  [data]="data"
+  [schema]="schema"
+  [renderers]="combinedRenderers"
+  (dataChange)="onDataChange($event)"
+></jsonforms>`,
+})
+
+export class IngestorMetadataEditorComponent {
+  @Input() data: Object;
+  @Input() schema: JsonSchema;
+
+  @Output() dataChange = new EventEmitter<string>();
+
+  get combinedRenderers() {
+    return configuredRenderer;
+  }
+
+  onDataChange(event: any) {
+    this.dataChange.emit(event);
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
new file mode 100644
index 0000000000..eb79e0e644
--- /dev/null
+++ b/src/app/ingestor/ingestor.module.ts
@@ -0,0 +1,67 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+import { IngestorComponent } from "./ingestor/ingestor.component";
+import { MatCardModule } from "@angular/material/card";
+import { RouterModule } from "@angular/router";
+import { IngestorMetadataEditorComponent } from "./ingestor-metadata-editor/ingestor-metadata-editor.component";
+import { MatButtonModule } from "@angular/material/button";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatInputModule } from "@angular/material/input";
+import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
+import { FormsModule } from "@angular/forms";
+import { MatListModule } from '@angular/material/list';
+import { MatIconModule } from '@angular/material/icon';
+import { MatTabsModule } from "@angular/material/tabs";
+import { MatTableModule } from "@angular/material/table";
+import { MatDialogModule } from "@angular/material/dialog";
+import { MatSelectModule } from "@angular/material/select";
+import { MatOptionModule } from "@angular/material/core";
+import { MatAutocompleteModule } from "@angular/material/autocomplete";
+import { IngestorNewTransferDialogComponent } from "./ingestor/dialog/ingestor.new-transfer-dialog.component";
+import { IngestorUserMetadataDialog } from "./ingestor/dialog/ingestor.user-metadata-dialog.component";
+import { JsonFormsModule } from '@jsonforms/angular';
+import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
+import { IngestorExtractorMetadataDialog } from "./ingestor/dialog/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialog } from "./ingestor/dialog/ingestor.confirm-transfer-dialog.component";
+import { MatStepperModule } from "@angular/material/stepper";
+import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialog-stepper.component.component";
+import { AnyOfRenderer } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
+import { OneOfRenderer } from "./ingestor-metadata-editor/customRenderer/one-of-renderer";
+import { MatRadioModule } from "@angular/material/radio";
+
+@NgModule({
+  declarations: [
+    IngestorComponent,
+    IngestorMetadataEditorComponent,
+    IngestorNewTransferDialogComponent,
+    IngestorUserMetadataDialog,
+    IngestorExtractorMetadataDialog,
+    IngestorConfirmTransferDialog,
+    IngestorDialogStepperComponent,
+    AnyOfRenderer,
+    OneOfRenderer,
+  ],
+  imports: [
+    CommonModule, 
+    MatCardModule, 
+    FormsModule, 
+    MatFormFieldModule, 
+    MatInputModule, 
+    MatButtonModule, 
+    MatProgressSpinnerModule, 
+    RouterModule,
+    MatListModule,
+    MatIconModule,
+    MatTabsModule,
+    MatTableModule,
+    MatDialogModule,
+    MatSelectModule,
+    MatOptionModule,
+    MatStepperModule,
+    MatRadioModule,
+    MatAutocompleteModule,
+    JsonFormsModule,
+    JsonFormsAngularMaterialModule,
+  ],
+})
+export class IngestorModule { }
diff --git a/src/app/ingestor/ingestor/_ingestor-theme.scss b/src/app/ingestor/ingestor/_ingestor-theme.scss
new file mode 100644
index 0000000000..39875ec92b
--- /dev/null
+++ b/src/app/ingestor/ingestor/_ingestor-theme.scss
@@ -0,0 +1,39 @@
+@use "sass:map";
+@use "@angular/material" as mat;
+
+@mixin color($theme) {
+  $color-config: map-get($theme, "color");
+  $primary: map-get($color-config, "primary");
+  $header-1: map-get($color-config, "header-1");
+  $header-2: map-get($color-config, "header-2");
+  $header-3: map-get($color-config, "header-3");
+  $accent: map-get($color-config, "accent");
+  mat-card {
+    .scicat-header {
+      background-color: mat.get-color-from-palette($primary, "lighter");
+    }
+
+    .organizational-header {
+      background-color: mat.get-color-from-palette($header-1, "lighter");
+    }
+
+    .sample-header {
+      background-color: mat.get-color-from-palette($header-2, "lighter");
+    }
+
+    .instrument-header {
+      background-color: mat.get-color-from-palette($header-3, "lighter");
+    }
+
+    .acquisition-header {
+      background-color: mat.get-color-from-palette($accent, "lighter");
+    }
+  }
+}
+
+@mixin theme($theme) {
+  $color-config: mat.get-color-config($theme);
+  @if $color-config != null {
+    @include color($theme);
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
new file mode 100644
index 0000000000..52285fca6b
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -0,0 +1,61 @@
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper, ISciCatHeader } from '../ingestor.component-helper';
+
+@Component({
+  selector: 'ingestor.confirm-transfer-dialog',
+  templateUrl: 'ingestor.confirm-transfer-dialog.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  styleUrls: ['../ingestor.component.scss'],
+})
+
+export class IngestorConfirmTransferDialog {
+  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+  provideMergeMetaData: string = '';
+  backendURL: string = '';
+
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
+    this.createNewTransferData = data.createNewTransferData;
+    this.backendURL = data.backendURL;
+  }
+
+  ngOnInit() {
+    this.provideMergeMetaData = this.createMetaDataString();
+  }
+
+  createMetaDataString(): string {
+    const space = 2;
+    const scicatMetadata: ISciCatHeader = {
+      datasetName: this.createNewTransferData.scicatHeader['datasetName'],
+      description: this.createNewTransferData.scicatHeader['description'],
+      creationLocation: this.createNewTransferData.scicatHeader['creationLocation'],
+      dataFormat: this.createNewTransferData.scicatHeader['dataFormat'],
+      ownerGroup: this.createNewTransferData.scicatHeader['ownerGroup'],
+      type: this.createNewTransferData.scicatHeader['type'],
+      license: this.createNewTransferData.scicatHeader['license'],
+      keywords: this.createNewTransferData.scicatHeader['keywords'],
+      filePath: this.createNewTransferData.scicatHeader['filePath'],
+      scientificMetadata: {
+        organizational: this.createNewTransferData.userMetaData['organizational'],
+        sample: this.createNewTransferData.userMetaData['sample'],
+        acquisition: this.createNewTransferData.extractorMetaData['acquisition'],
+        instrument: this.createNewTransferData.extractorMetaData['instrument'],
+      },
+    };
+
+    return JSON.stringify(scicatMetadata, null, space);
+  }
+
+  onClickBack(): void {
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(2); // Beispielwert für den Schritt
+    }
+  }
+
+  onClickConfirm(): void {
+    if (this.data && this.data.onClickNext) {
+      this.createNewTransferData.mergedMetaDataString = this.provideMergeMetaData;
+      this.data.onClickNext(4);
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
new file mode 100644
index 0000000000..52dfdddc6a
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
@@ -0,0 +1,22 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Confirm transfer
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close" class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography">
+  <ingestor-dialog-stepper [activeStep]="3"></ingestor-dialog-stepper>
+
+  <p>Confirm Metadata</p>
+
+  <mat-form-field class="form-full-width">
+    <textarea class="metadata-preview" matInput readonly>{{ provideMergeMetaData }}</textarea>
+  </mat-form-field>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" (click)="onClickConfirm()">Ingest</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
new file mode 100644
index 0000000000..cda2927a18
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
@@ -0,0 +1,10 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'ingestor-dialog-stepper',
+  templateUrl: './ingestor.dialog-stepper.component.html',
+  styleUrls: ['./ingestor.dialog-stepper.component.css']
+})
+export class IngestorDialogStepperComponent {
+  @Input() activeStep: number = 0;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css
new file mode 100644
index 0000000000..8e114ace88
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css
@@ -0,0 +1,17 @@
+.stepper {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.stepper div {
+  margin: 5px;
+}
+
+.stepper div.active {
+  font-weight: bold;
+}
+
+button {
+  margin: 5px;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html
new file mode 100644
index 0000000000..9902301bb8
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html
@@ -0,0 +1,16 @@
+<div class="stepper">
+  <mat-stepper [linear]="true" [selectedIndex]="activeStep" #stepper>
+    <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Select your ingestion method</ng-template>
+    </mat-step>
+    <mat-step [completed]="activeStep > 1" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Fill out user-specific metadata</ng-template>
+    </mat-step>
+    <mat-step [completed]="activeStep > 2" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Correct dataset-specific metadata</ng-template>
+    </mat-step>
+    <mat-step [completed]="activeStep > 3" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Confirm inputs</ng-template>
+    </mat-step>
+  </mat-stepper>
+</div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
new file mode 100644
index 0000000000..97ba8e811d
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -0,0 +1,62 @@
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { JsonSchema } from '@jsonforms/core';
+import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper } from '../ingestor.component-helper';
+
+@Component({
+  selector: 'ingestor.extractor-metadata-dialog',
+  templateUrl: 'ingestor.extractor-metadata-dialog.html',
+  styleUrls: ['../ingestor.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+
+export class IngestorExtractorMetadataDialog {
+  metadataSchemaInstrument: JsonSchema;
+  metadataSchemaAcquisition: JsonSchema;
+  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+
+  backendURL: string = '';
+  extractorMetaDataReady: boolean = false;
+  extractorMetaDataError: boolean = false;
+
+  isCardContentVisible = {
+    instrument: true,
+    acquisition: true
+  };
+
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
+        this.createNewTransferData = data.createNewTransferData;
+        this.backendURL = data.backendURL;
+        const instrumentSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.instrument;
+        const acqusitionSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.acquisition;
+        
+        this.metadataSchemaInstrument = instrumentSchema;
+        this.metadataSchemaAcquisition = acqusitionSchema;
+        this.extractorMetaDataReady = this.createNewTransferData.extractorMetaDataReady;
+        this.extractorMetaDataError = this.createNewTransferData.apiErrorInformation.metaDataExtraction;
+  }
+
+  onClickBack(): void {
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(1); // Beispielwert für den Schritt
+    }
+  }
+
+  onClickNext(): void {
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(3); // Beispielwert für den Schritt
+    }
+  }
+
+  onDataChangeExtractorMetadataInstrument(event: Object) {
+    this.createNewTransferData.extractorMetaData['instrument'] = event;
+  }
+
+  onDataChangeExtractorMetadataAcquisition(event: Object) {
+    this.createNewTransferData.extractorMetaData['acquisition'] = event;
+  }
+
+  toggleCardContent(card: string): void {
+    this.isCardContentVisible[card] = !this.isCardContentVisible[card];
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
new file mode 100644
index 0000000000..fe985f0d6a
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -0,0 +1,73 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Correct dataset-specific metadata
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography">
+
+  <div *ngIf="!extractorMetaDataReady" class="spinner-container">
+    <mat-progress-spinner diameter="20"
+      mode="indeterminate"></mat-progress-spinner>
+    <div class="spinner-text">
+      <span>Wait for the Ingestor...</span>
+    </div>
+  </div>
+
+  <div *ngIf="extractorMetaDataReady">
+    <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
+    <div *ngIf="extractorMetaDataError" class="error-message">
+      <mat-card class="error-card">
+        <mat-card-header>
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> error </mat-icon>
+          </div>
+          The automatic metadata extraction was not successful. Please enter
+          the data manually.
+        </mat-card-header>
+      </mat-card>
+    </div>
+    <div fxLayout="row" fxLayout.xs="column">
+      <div fxFlex="80%">
+        <mat-card>
+          <mat-card-header class="instrument-header" (click)="toggleCardContent('instrument')">
+            <div mat-card-avatar class="section-icon">
+              <mat-icon> biotech </mat-icon>
+            </div>
+            Instrument Information
+            <span class="spacer"></span>
+            <mat-icon class="toggle-icon">{{ isCardContentVisible.instrument ? 'expand_less' : 'expand_more' }}</mat-icon>
+          </mat-card-header>
+          <mat-card-content *ngIf="isCardContentVisible.instrument">
+            <app-metadata-editor [schema]="metadataSchemaInstrument"
+              [data]="createNewTransferData.extractorMetaData['instrument']"
+              (dataChange)="onDataChangeExtractorMetadataInstrument($event)"></app-metadata-editor>
+          </mat-card-content>
+        </mat-card>
+        <mat-card>
+          <mat-card-header class="acquisition-header" (click)="toggleCardContent('acquisition')">
+            <div mat-card-avatar class="section-icon">
+              <mat-icon> category-search </mat-icon>
+            </div>
+            Acquisition Information
+            <span class="spacer"></span>
+            <mat-icon class="toggle-icon">{{ isCardContentVisible.acquisition ? 'expand_less' : 'expand_more' }}</mat-icon>
+          </mat-card-header>
+          <mat-card-content *ngIf="isCardContentVisible.acquisition">
+            <app-metadata-editor [schema]="metadataSchemaAcquisition"
+              [data]="createNewTransferData.extractorMetaData['acquisition']"
+              (dataChange)="onDataChangeExtractorMetadataAcquisition($event)"></app-metadata-editor>
+          </mat-card-content>
+        </mat-card>
+      </div>
+    </div>
+  </div>
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+    (click)="onClickNext()" [disabled]="!extractorMetaDataReady">Next</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
new file mode 100644
index 0000000000..198b11fdfd
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -0,0 +1,124 @@
+import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
+import { HttpClient } from '@angular/common/http';
+import { INGESTOR_API_ENDPOINTS_V1 } from '../ingestor-api-endpoints';
+import { IDialogDataObject, IExtractionMethod, IIngestionRequestInformation, IngestorHelper } from '../ingestor.component-helper';
+import { IngestorMetadataEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+
+@Component({
+  selector: 'ingestor.new-transfer-dialog',
+  templateUrl: 'ingestor.new-transfer-dialog.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  styleUrls: ['../ingestor.component.scss']
+})
+
+export class IngestorNewTransferDialogComponent implements OnInit {
+  extractionMethods: IExtractionMethod[] = [];
+  availableFilePaths: string[] = [];
+  backendURL: string = '';
+  extractionMethodsError: string = '';
+  availableFilePathsError: string = '';
+
+  uiNextButtonReady: boolean = false;
+
+  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject, private http: HttpClient) {
+    this.createNewTransferData = data.createNewTransferData;
+    this.backendURL = data.backendURL;
+  }
+
+  ngOnInit(): void {
+    this.apiGetExtractionMethods();
+    this.apiGetAvailableFilePaths();
+  }
+
+  set selectedPath(value: string) {
+    this.createNewTransferData.selectedPath = value;
+    this.validateNextButton();
+  }
+
+  get selectedPath(): string {
+    return this.createNewTransferData.selectedPath;
+  }
+
+  set selectedMethod(value: IExtractionMethod) {
+    this.createNewTransferData.selectedMethod = value;
+    this.validateNextButton();
+  }
+
+  get selectedMethod(): IExtractionMethod {
+    return this.createNewTransferData.selectedMethod;
+  }
+
+  apiGetExtractionMethods(): void {
+    this.http.get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR).subscribe(
+      (response: any) => {
+        if (response.methods && response.methods.length > 0) {
+          this.extractionMethods = response.methods;
+        }
+        else {
+          this.extractionMethodsError = 'No extraction methods found.';
+        }
+      },
+      (error: any) => {
+        this.extractionMethodsError = error.message;
+        console.error(this.extractionMethodsError);
+      }
+    );
+  }
+
+  apiGetAvailableFilePaths(): void {
+    this.http.get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET).subscribe(
+      (response: any) => {
+        if (response.datasets && response.datasets.length > 0) {
+          this.availableFilePaths = response.datasets;
+        }
+        else {
+          this.availableFilePathsError = 'No datasets found.';
+        }
+      },
+      (error: any) => {
+        this.availableFilePathsError = error.message;
+        console.error(this.availableFilePathsError);
+      }
+    );
+  }
+
+  generateExampleDataForSciCatHeader(): void {
+    this.data.createNewTransferData.scicatHeader['filePath'] = this.createNewTransferData.selectedPath;
+    this.data.createNewTransferData.scicatHeader['keywords'] = ['OpenEM'];
+
+    const nameWithoutPath = this.createNewTransferData.selectedPath.split('/|\\')[-1] ?? this.createNewTransferData.selectedPath;
+    this.data.createNewTransferData.scicatHeader['datasetName'] = nameWithoutPath;
+    this.data.createNewTransferData.scicatHeader['license'] = 'MIT License';
+    this.data.createNewTransferData.scicatHeader['type'] = 'raw';
+    this.data.createNewTransferData.scicatHeader['dataFormat'] = 'root';
+    this.data.createNewTransferData.scicatHeader['owner'] = 'User';
+  }
+
+  prepareSchemaForProcessing(): void {
+    const encodedSchema = this.createNewTransferData.selectedMethod.schema;
+    const decodedSchema = atob(encodedSchema);
+    const schema = JSON.parse(decodedSchema);
+    const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(schema, schema);
+    this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
+  }
+
+  onClickRetryRequests(): void {
+    this.apiGetExtractionMethods();
+    this.apiGetAvailableFilePaths();
+  }
+
+  onClickNext(): void {
+    if (this.data && this.data.onClickNext) {
+      this.generateExampleDataForSciCatHeader();
+      this.prepareSchemaForProcessing();
+      this.data.onClickNext(1); // Open next dialog
+    }
+  }
+
+  validateNextButton(): void {
+    this.uiNextButtonReady = !!this.createNewTransferData.selectedPath && !!this.createNewTransferData.selectedMethod?.name;
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
new file mode 100644
index 0000000000..a80e8c4d8a
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -0,0 +1,45 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Select your ingestion method
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close" class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+  <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
+
+  <p>Please select the dataset to be uploaded and the appropriate metadata extractor method.</p>
+
+  <div>
+    <mat-form-field class="form-full-width">
+      <mat-label>File Path</mat-label>
+      <input matInput [(ngModel)]="selectedPath" [matAutocomplete]="auto">
+      <mat-autocomplete #auto="matAutocomplete">
+        <mat-option *ngFor="let filePath of availableFilePaths" [value]="filePath">
+          {{ filePath }}
+        </mat-option>
+      </mat-autocomplete>
+    </mat-form-field>
+    <mat-error *ngIf="availableFilePathsError">{{ availableFilePathsError }}</mat-error>
+  </div>
+
+  <div>
+    <mat-form-field class="form-full-width">
+      <mat-label>Extraction Method</mat-label>
+      <mat-select [(ngModel)]="selectedMethod">
+        <mat-option *ngFor="let method of extractionMethods" [value]="method">
+          {{ method.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError }}</mat-error>
+  </div>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button *ngIf="availableFilePathsError || extractionMethodsError" mat-button color="warn" (click)="onClickRetryRequests()">Retry</button>
+  <button mat-button mat-dialog-close>Cancel</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" [disabled]="!uiNextButtonReady"
+    (click)="onClickNext()">Next</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
new file mode 100644
index 0000000000..427bacd801
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -0,0 +1,67 @@
+import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
+import { IngestorMetadataEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import { JsonSchema } from '@jsonforms/core';
+import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper, SciCatHeader_Schema } from '../ingestor.component-helper';
+
+@Component({
+  selector: 'ingestor.user-metadata-dialog',
+  templateUrl: 'ingestor.user-metadata-dialog.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  styleUrls: ['../ingestor.component.scss'],
+})
+
+export class IngestorUserMetadataDialog {
+  metadataSchemaOrganizational: JsonSchema;
+  metadataSchemaSample: JsonSchema;
+  scicatHeaderSchema: JsonSchema;
+  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+  backendURL: string = '';
+
+  uiNextButtonReady: boolean = true; // Change to false when dev is ready
+
+  isCardContentVisible = {
+    scicat: true,
+    organizational: true,
+    sample: true
+  };
+
+  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
+    this.createNewTransferData = data.createNewTransferData;
+    this.backendURL = data.backendURL;
+    const organizationalSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.organizational;
+    const sampleSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
+    
+    this.metadataSchemaOrganizational = organizationalSchema;
+    this.metadataSchemaSample = sampleSchema;
+    this.scicatHeaderSchema = SciCatHeader_Schema;
+  }
+
+  onClickBack(): void {
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(0); // Beispielwert für den Schritt
+    }
+  }
+
+  onClickNext(): void {
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(2); // Beispielwert für den Schritt
+    }
+  }
+
+  onDataChangeUserMetadataOrganization(event: Object) {
+    this.createNewTransferData.userMetaData['organizational'] = event;
+  }
+
+  onDataChangeUserMetadataSample(event: Object) {
+    this.createNewTransferData.userMetaData['sample'] = event;
+  }
+
+  onDataChangeUserScicatHeader(event: Object) {
+    this.createNewTransferData.scicatHeader = event;
+  }
+
+  toggleCardContent(card: string): void {
+    this.isCardContentVisible[card] = !this.isCardContentVisible[card];
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
new file mode 100644
index 0000000000..39fbf41a49
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
@@ -0,0 +1,67 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Fill out user-specific metadata
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+  <ingestor-dialog-stepper [activeStep]="1"></ingestor-dialog-stepper>
+  
+  <div fxLayout="row" fxLayout.xs="column">
+    <div fxFlex="80%">
+      <mat-card>
+        <mat-card-header class="scicat-header" (click)="toggleCardContent('scicat')">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> info </mat-icon>
+          </div>
+          SciCat Information
+          <span class="spacer"></span>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ? 'expand_less' : 'expand_more' }}</mat-icon>
+        </mat-card-header>
+        <mat-card-content *ngIf="isCardContentVisible.scicat">
+          <app-metadata-editor [schema]="scicatHeaderSchema" [data]="createNewTransferData.scicatHeader"
+          (dataChange)="onDataChangeUserScicatHeader($event)"></app-metadata-editor>
+        </mat-card-content>
+      </mat-card>
+
+      <mat-card>
+        <mat-card-header class="organizational-header" (click)="toggleCardContent('organizational')">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> person </mat-icon>
+          </div>
+          Organizational Information
+          <span class="spacer"></span>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ? 'expand_less' : 'expand_more' }}</mat-icon>
+        </mat-card-header>
+        <mat-card-content *ngIf="isCardContentVisible.organizational">
+          <app-metadata-editor [schema]="metadataSchemaOrganizational" [data]="createNewTransferData.userMetaData['organizational']"
+          (dataChange)="onDataChangeUserMetadataOrganization($event)"></app-metadata-editor>
+        </mat-card-content>
+      </mat-card>
+
+      <mat-card>
+        <mat-card-header class="sample-header" (click)="toggleCardContent('sample')">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> description </mat-icon>
+          </div>
+          Sample Information
+          <span class="spacer"></span>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ? 'expand_less' : 'expand_more' }}</mat-icon>
+        </mat-card-header>
+        <mat-card-content *ngIf="isCardContentVisible.sample">
+          <app-metadata-editor [schema]="metadataSchemaSample" [data]="createNewTransferData.userMetaData['sample']"
+          (dataChange)="onDataChangeUserMetadataSample($event)"></app-metadata-editor>
+        </mat-card-content>
+      </mat-card>
+    </div>
+  </div>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" [disabled]="!uiNextButtonReady"
+    (click)="onClickNext()">Next</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
new file mode 100644
index 0000000000..df2d088330
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
@@ -0,0 +1,17 @@
+export const INGESTOR_API_ENDPOINTS_V1 = {
+  DATASET: "dataset",
+  TRANSFER: "transfer",
+  OTHER: {
+    VERSION: 'version',
+  },
+  EXTRACTOR: 'extractor',
+};
+
+export interface IPostExtractorEndpoint {
+  filePath: string,
+  methodName: string,
+}
+
+export interface IPostDatasetEndpoint {
+  metaData: string
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component-helper.ts b/src/app/ingestor/ingestor/ingestor.component-helper.ts
new file mode 100644
index 0000000000..1d31525d57
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component-helper.ts
@@ -0,0 +1,104 @@
+import { JsonSchema } from '@jsonforms/core';
+
+export interface IExtractionMethod {
+  name: string;
+  schema: string; // Base64 encoded JSON schema
+};
+
+export interface IIngestionRequestInformation {
+  selectedPath: string;
+  selectedMethod: IExtractionMethod;
+  selectedResolvedDecodedSchema: JsonSchema;
+  scicatHeader: Object;
+  userMetaData: {
+    organizational: Object,
+    sample: Object,
+  };
+  extractorMetaData: {
+    instrument: Object,
+    acquisition: Object,
+  };
+  extractorMetaDataReady: boolean;
+  extractMetaDataRequested: boolean;
+  mergedMetaDataString: string;
+
+  apiErrorInformation: {
+    metaDataExtraction: boolean;
+  }
+}
+
+// There are many more... see DerivedDataset.ts
+export interface ISciCatHeader {
+  datasetName: string;
+  description: string;
+  creationLocation: string;
+  dataFormat: string;
+  ownerGroup: string;
+  type: string;
+  license: string;
+  keywords: string[];
+  filePath: string;
+  scientificMetadata: IScientificMetadata;
+}
+
+export interface IScientificMetadata {
+  organizational: Object;
+  sample: Object;
+  acquisition: Object;
+  instrument: Object;
+}
+
+export interface IDialogDataObject {
+  createNewTransferData: IIngestionRequestInformation;
+  backendURL: string;
+  onClickNext: (step: number) => void;
+}
+
+export class IngestorHelper {
+  static createEmptyRequestInformation = (): IIngestionRequestInformation => {
+    return {
+      selectedPath: '',
+      selectedMethod: { name: '', schema: '' },
+      selectedResolvedDecodedSchema: {},
+      scicatHeader: {},
+      userMetaData: {
+        organizational: {},
+        sample: {},
+      },
+      extractorMetaData: {
+        instrument: {},
+        acquisition: {},
+      },
+      extractorMetaDataReady: false,
+      extractMetaDataRequested: false,
+      mergedMetaDataString: '',
+      apiErrorInformation: {
+        metaDataExtraction: false,
+      },
+    };
+  };
+
+  static mergeUserAndExtractorMetadata(userMetadata: Object, extractorMetadata: Object, space: number): string {
+    return JSON.stringify({ ...userMetadata, ...extractorMetadata }, null, space);
+  };
+}
+
+export const SciCatHeader_Schema: JsonSchema = {
+  type: "object",
+  properties: {
+    datasetName: { type: "string" },
+    description: { type: "string" },
+    creationLocation: { type: "string" },
+    dataFormat: { type: "string" },
+    ownerGroup: { type: "string" },
+    filePath: { type: "string", readOnly: true }, // disabled, because its selected in the first step
+    type: { type: "string" },
+    license: { type: "string" },
+    keywords: {
+      type: "array",
+      items: { type: "string" }
+    },
+    // scientificMetadata: { type: "string" } ; is created during the ingestor process
+  },
+  required: ["datasetName", "creationLocation", "dataFormat", "ownerGroup", "type", "license", "keywords", "scientificMetadata", "filePath"]
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
new file mode 100644
index 0000000000..187f6f2f76
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -0,0 +1,144 @@
+<p>
+  <mat-card class="ingestor-card">
+    <mat-card-header>
+      <mat-card-title>Control center</mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div *ngIf="connectingToFacilityBackend">
+        <mat-progress-spinner diameter="20"
+          mode="indeterminate"></mat-progress-spinner>
+      </div>
+      <div *ngIf="!connectingToFacilityBackend">
+        <ng-container *ngIf="connectedFacilityBackend === ''">
+          <p style="color: red;">No Backend connected</p>
+
+          <p>Please provide a valid Backend URL</p>
+          <mat-form-field>
+            <input matInput placeholder="Backend URL"
+              [(ngModel)]="forwardFacilityBackend">
+          </mat-form-field>
+          <button mat-raised-button color="primary"
+            (click)="onClickForwardToIngestorPage()">Connect</button>
+
+          <div>
+            <ul>
+              <li *ngFor="let backend of lastUsedFacilityBackends">
+                <a (click)="onClickSelectFacilityBackend(backend)">{{ backend }}</a>
+              </li>
+            </ul>
+          </div>
+
+        </ng-container>
+        <ng-container *ngIf="connectedFacilityBackend !== ''">
+          <mat-tab-group animationDuration="0ms">
+            <mat-tab label="Transfers">
+              <button mat-button aria-label="Refresh transfer list"
+                (click)="onClickRefreshTransferList()">
+                <mat-icon>refresh</mat-icon>
+              </button>
+              <table mat-table [dataSource]="transferDataSource"
+                class="mat-elevation-z8">
+                <ng-container matColumnDef="transferId">
+                  <th mat-header-cell *matHeaderCellDef><b>ID</b> </th>
+                  <td mat-cell *matCellDef="let element"> {{element.transferId}}
+                  </td>
+                </ng-container>
+
+                <ng-container matColumnDef="status">
+                  <th mat-header-cell *matHeaderCellDef><b>Status</b> </th>
+                  <td mat-cell *matCellDef="let element"> {{element.status}}
+                  </td>
+                </ng-container>
+
+                <ng-container matColumnDef="actions">
+                  <th mat-header-cell *matHeaderCellDef class="text-right">
+                    <b>Action</b>
+                  </th>
+                  <td mat-cell *matCellDef="let element" class="text-right">
+                    <button mat-button aria-label="Delete transfer"
+                      (click)="onCancelTransfer(element.transferId)">
+                      <mat-icon>delete</mat-icon>
+                    </button>
+                    <button mat-button aria-label="Pause transfer">
+                      <mat-icon>pause_circle</mat-icon>
+                    </button>
+                  </td>
+                </ng-container>
+
+                <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+                <tr mat-row *matRowDef="let row; columns: displayedColumns;">
+                </tr>
+              </table>
+            </mat-tab>
+            <mat-tab label="Connection information">
+              <!-- Mat List with the most important information about the backend connection -->
+              <mat-list>
+                <mat-list-item>
+                  <span matListItemTitle>Backend URL</span>
+                  <span matListItemLine>{{ connectedFacilityBackend }} <a
+                      (click)="onClickDisconnectIngestor()">change</a></span>
+                </mat-list-item>
+                <mat-list-item>
+                  <span matListItemTitle>Connection Status</span>
+                  <span matListItemLine style="color: green;">Connected</span>
+                </mat-list-item>
+                <mat-list-item>
+                  <span matListItemTitle>Version</span>
+                  <span matListItemLine>{{ connectedFacilityBackendVersion
+                    }}</span>
+                </mat-list-item>
+              </mat-list>
+            </mat-tab>
+          </mat-tab-group>
+          <br><br>
+        </ng-container>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</p>
+
+<p *ngIf="connectedFacilityBackend !== ''">
+  <mat-card class="ingestor-card">
+    <mat-card-header>
+      <mat-card-title>New transfer</mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <button mat-fab aria-label="Add a new dataset transfer" color="primary"
+        (click)="onClickAddIngestion()">
+        <mat-icon>add</mat-icon>
+      </button>
+    </mat-card-content>
+  </mat-card>
+</p>
+
+<p *ngIf="returnValue !== ''">
+  <mat-card class="ingestor-card">
+    <mat-card-header>
+      <mat-card-title>Return Value</mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div>
+      </div>
+      <div>
+        <p>{{returnValue}}</p>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</p>
+
+<p *ngIf="errorMessage !== ''">
+  <mat-card class="ingestor-card">
+    <mat-card-header class="ingestor-mixed-header">
+      <mat-card-title>Error message</mat-card-title>
+      <button mat-icon-button class="ingestor-close-button"
+        (click)="clearErrorMessage()">
+        <mat-icon>close</mat-icon>
+      </button>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <div>
+        <p style="color: red" [innerHTML]="errorMessage"></p>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</p>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
new file mode 100644
index 0000000000..a5c5dcad67
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -0,0 +1,62 @@
+.ingestor-vertical-layout {
+  display: flex;
+  flex-direction: column;
+  gap: 1em;
+}
+
+.ingestor-mixed-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.ingestor-close-button {
+  margin-left: auto;
+}
+
+.form-full-width {
+  width: 100%;
+}
+
+.metadata-preview {
+  height: 50vh !important;
+}
+
+mat-card {
+  margin: 1em;
+
+  .mat-mdc-card-content {
+    padding: 16px;
+  }
+
+  .section-icon {
+    height: auto !important;
+    width: auto !important;
+
+    mat-icon {
+      vertical-align: middle;
+    }
+  }
+}
+
+.spinner-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+}
+
+.spinner-text {
+  margin-top: 10px;
+  font-size: 16px;
+  text-align: center;
+}
+
+.spacer {
+  flex: 1 1 auto;
+}
+
+.error-message {
+  color: red;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.spec.ts b/src/app/ingestor/ingestor/ingestor.component.spec.ts
new file mode 100644
index 0000000000..52186b1077
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { IngestorComponent } from './ingestor.component';
+
+describe('IngestorComponent', () => {
+  let component: IngestorComponent;
+  let fixture: ComponentFixture<IngestorComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ IngestorComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(IngestorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
new file mode 100644
index 0000000000..2b49f2f90a
--- /dev/null
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -0,0 +1,282 @@
+import { Component, inject, OnInit } from "@angular/core";
+import { AppConfigService } from "app-config.service";
+import { HttpClient } from '@angular/common/http';
+import { ActivatedRoute, Router } from '@angular/router';
+import { INGESTOR_API_ENDPOINTS_V1, IPostDatasetEndpoint, IPostExtractorEndpoint } from "./ingestor-api-endpoints";
+import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog.component";
+import { MatDialog } from "@angular/material/dialog";
+import { IngestorUserMetadataDialog } from "./dialog/ingestor.user-metadata-dialog.component";
+import { IngestorExtractorMetadataDialog } from "./dialog/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialog } from "./dialog/ingestor.confirm-transfer-dialog.component";
+import { IIngestionRequestInformation, IngestorHelper } from "./ingestor.component-helper";
+
+interface ITransferDataListEntry {
+  transferId: string;
+  status: string;
+}
+
+@Component({
+  selector: "ingestor",
+  templateUrl: "./ingestor.component.html",
+  styleUrls: ["./ingestor.component.scss"],
+})
+export class IngestorComponent implements OnInit {
+  readonly dialog = inject(MatDialog);
+
+  filePath: string = '';
+  loading: boolean = false;
+  forwardFacilityBackend: string = '';
+
+  connectedFacilityBackend: string = '';
+  connectedFacilityBackendVersion: string = '';
+  connectingToFacilityBackend: boolean = false;
+
+  lastUsedFacilityBackends: string[] = [];
+
+  transferDataSource: ITransferDataListEntry[] = []; // List of files to be transferred
+  displayedColumns: string[] = ['transferId', 'status', 'actions'];
+
+  errorMessage: string = '';
+  returnValue: string = '';
+
+  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+
+  constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
+
+  ngOnInit() {
+    this.connectingToFacilityBackend = true;
+    this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+    this.transferDataSource = [];
+    // Get the GET parameter 'backendUrl' from the URL
+    this.route.queryParams.subscribe(params => {
+      const backendUrl = params['backendUrl'];
+      if (backendUrl) {
+        this.apiConnectToFacilityBackend(backendUrl);
+      }
+      else {
+        this.connectingToFacilityBackend = false;
+      }
+    });
+  }
+
+  apiConnectToFacilityBackend(facilityBackendUrl: string): boolean {
+    let facilityBackendUrlCleaned = facilityBackendUrl.slice();
+    // Check if last symbol is a slash and add version endpoint
+    if (!facilityBackendUrlCleaned.endsWith('/')) {
+      facilityBackendUrlCleaned += '/';
+    }
+
+    let facilityBackendUrlVersion = facilityBackendUrlCleaned + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION;
+
+    // Try to connect to the facility backend/version to check if it is available
+    console.log('Connecting to facility backend: ' + facilityBackendUrlVersion);
+    this.http.get(facilityBackendUrlVersion).subscribe(
+      response => {
+        console.log('Connected to facility backend', response);
+        // If the connection is successful, store the connected facility backend URL
+        this.connectedFacilityBackend = facilityBackendUrlCleaned;
+        this.connectingToFacilityBackend = false;
+        this.connectedFacilityBackendVersion = response['version'];
+      },
+      error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+        console.error('Request failed', error);
+        this.connectedFacilityBackend = '';
+        this.connectingToFacilityBackend = false;
+        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+      }
+    );
+
+    return true;
+  }
+
+  apiGetTransferList(page: number, pageSize: number, transferId?: string): void {
+    const params: any = {
+      page: page.toString(),
+      pageSize: pageSize.toString(),
+    };
+    if (transferId) {
+      params.transferId = transferId;
+    }
+    this.http.get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER, { params }).subscribe(
+      response => {
+        console.log('Transfer list received', response);
+        this.transferDataSource = response['transfers'];
+      },
+      error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+        console.error('Request failed', error);
+      }
+    );
+  }
+
+  apiUpload() {
+    this.loading = true;
+
+    const payload: IPostDatasetEndpoint = {
+      metaData: this.createNewTransferData.mergedMetaDataString,
+    };
+
+    this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET, payload).subscribe(
+      response => {
+        console.log('Upload successfully started', response);
+        this.returnValue = JSON.stringify(response);
+        this.loading = false;
+      },
+      error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+        console.error('Upload failed', error);
+        this.loading = false;
+      }
+    );
+  }
+
+  async apiStartMetadataExtraction(): Promise<boolean> {
+    this.createNewTransferData.apiErrorInformation.metaDataExtraction = false;
+
+    if (this.createNewTransferData.extractMetaDataRequested) {
+      console.log(this.createNewTransferData.extractMetaDataRequested, ' already requested'); // Debugging
+      return false;
+    }
+
+    this.createNewTransferData.extractorMetaDataReady = false;
+    this.createNewTransferData.extractMetaDataRequested = true;
+
+    const payload: IPostExtractorEndpoint = {
+      filePath: this.createNewTransferData.selectedPath,
+      methodName: this.createNewTransferData.selectedMethod.name,
+    };
+
+    return new Promise<boolean>((resolve) => {
+      this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, payload).subscribe(
+        response => {
+          console.log('Metadata extraction result', response);
+          this.createNewTransferData.extractorMetaData.instrument = (response as any).instrument ?? {};
+          this.createNewTransferData.extractorMetaData.acquisition = (response as any).acquisition ?? {};
+          this.createNewTransferData.extractorMetaDataReady = true;
+          resolve(true);
+        },
+        error => {
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+          console.error('Metadata extraction failed', error);
+          this.createNewTransferData.extractorMetaDataReady = true;
+          this.createNewTransferData.apiErrorInformation.metaDataExtraction = true;
+          resolve(false);
+        }
+      );
+    });
+  }
+
+  onClickForwardToIngestorPage() {
+    if (this.forwardFacilityBackend) {
+      this.connectingToFacilityBackend = true;
+
+      // If current route is equal to the forward route, the router will not navigate to the new route
+      if (this.connectedFacilityBackend === this.forwardFacilityBackend) {
+        this.apiConnectToFacilityBackend(this.forwardFacilityBackend);
+        return;
+      }
+
+      this.router.navigate(['/ingestor'], { queryParams: { backendUrl: this.forwardFacilityBackend } });
+    }
+  }
+
+  onClickDisconnectIngestor() {
+    this.returnValue = '';
+    this.connectedFacilityBackend = '';
+    // Remove the GET parameter 'backendUrl' from the URL
+    this.router.navigate(['/ingestor']);
+  }
+
+  // Helper functions
+  onClickSelectFacilityBackend(facilityBackend: string) {
+    this.forwardFacilityBackend = facilityBackend;
+  }
+
+  loadLastUsedFacilityBackends(): string[] {
+    // Load the list from the local Storage
+    const lastUsedFacilityBackends = '["http://localhost:8000", "http://localhost:8888"]';
+    if (lastUsedFacilityBackends) {
+      return JSON.parse(lastUsedFacilityBackends);
+    }
+    return [];
+  }
+
+  clearErrorMessage(): void {
+    this.errorMessage = '';
+  }
+
+  onClickAddIngestion(): void {
+    this.createNewTransferData = IngestorHelper.createEmptyRequestInformation();
+    this.onClickNext(0); // Open first dialog to start the ingestion process
+  }
+
+  onClickNext(step: number): void {
+    this.dialog.closeAll();
+
+    let dialogRef = null;
+
+    switch (step) {
+      case 0:
+        this.createNewTransferData.extractMetaDataRequested = false;
+        this.createNewTransferData.extractorMetaDataReady = false;
+        dialogRef = this.dialog.open(IngestorNewTransferDialogComponent, {
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
+          disableClose: true
+        });
+
+        break;
+      case 1:
+        this.apiStartMetadataExtraction().then((response: boolean) => {
+          if (response) console.log('Metadata extraction finished');
+          else console.error('Metadata extraction failed');
+        }).catch(error => {
+          console.error('Metadata extraction error', error);
+        });
+
+        dialogRef = this.dialog.open(IngestorUserMetadataDialog, {
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
+          disableClose: true
+        });
+        break;
+      case 2:
+        dialogRef = this.dialog.open(IngestorExtractorMetadataDialog, {
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
+          disableClose: true
+        });
+        break;
+      case 3:
+        dialogRef = this.dialog.open(IngestorConfirmTransferDialog, {
+          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
+          disableClose: true
+        });
+        break;
+      case 4:
+        this.apiUpload();
+        break;
+      default:
+        console.error('Unknown step', step);
+    }
+
+    // Error if the dialog reference is not set
+    if (dialogRef === null) return;
+  }
+
+  onClickRefreshTransferList(): void {
+    this.apiGetTransferList(1, 100);
+  }
+
+  onCancelTransfer(transferId: string) {
+    console.log('Cancel transfer', transferId);
+    this.http.delete(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER + '/' + transferId).subscribe(
+      response => {
+        console.log('Transfer cancelled', response);
+        this.apiGetTransferList(1, 100);
+      },
+      error => {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+        console.error('Cancel transfer failed', error);
+      }
+    );
+  }
+}
\ No newline at end of file
diff --git a/src/styles.scss b/src/styles.scss
index 9aee94e724..150dc3ab4c 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -29,6 +29,7 @@
 @use "./app/shared/modules/shared-table/shared-table-theme" as shared-table;
 @use "./app/shared/modules/table/table-theme" as table;
 @use "./app/users/user-settings/user-settings-theme" as user-settings;
+@use "./app/ingestor/ingestor/ingestor-theme" as ingestor;
 
 $my-custom-button-level: mat.define-typography-level(
   $font-weight: 400,
@@ -221,6 +222,7 @@ $theme: map-merge(
 @include shared-table.theme($theme);
 @include table.theme($theme);
 @include user-settings.theme($theme);
+@include ingestor.theme($theme);
 @include mat.button-density(0);
 @include mat.icon-button-density(0);
 

From 3a9f1b0809220ab50b08305fba03d49efe752d30 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 19 Dec 2024 13:20:37 +0000
Subject: [PATCH 066/245] wip:adding effects

---
 src/app/datasets/datasets.module.ts           |   5 +
 src/app/datasets/empiar/empiar.component.html |   1 +
 src/app/datasets/empiar/empiar.component.scss |   0
 .../datasets/empiar/empiar.component.spec.ts  |  21 +++
 src/app/datasets/empiar/empiar.component.ts   |  10 ++
 src/app/datasets/onedep/onedep.component.ts   |  16 +--
 .../datasets/onedep/onedep.components.spec.ts |  21 +++
 src/app/shared/sdk/apis/JobsService.ts        |   9 +-
 .../sdk/apis/onedep-depositor.service.spec.ts |  16 +++
 .../sdk/apis/onedep-depositor.service.ts      |  43 +++++++
 .../actions/onedep.actions.ts                 |  62 +++++++++
 .../effects/onedep.effects.ts                 | 121 ++++++++++++++++++
 12 files changed, 316 insertions(+), 9 deletions(-)
 create mode 100644 src/app/datasets/empiar/empiar.component.html
 create mode 100644 src/app/datasets/empiar/empiar.component.scss
 create mode 100644 src/app/datasets/empiar/empiar.component.spec.ts
 create mode 100644 src/app/datasets/empiar/empiar.component.ts
 create mode 100644 src/app/datasets/onedep/onedep.components.spec.ts
 create mode 100644 src/app/shared/sdk/apis/onedep-depositor.service.spec.ts
 create mode 100644 src/app/shared/sdk/apis/onedep-depositor.service.ts
 create mode 100644 src/app/state-management/actions/onedep.actions.ts
 create mode 100644 src/app/state-management/effects/onedep.effects.ts

diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 2c007619cd..bf79aab65f 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -92,6 +92,9 @@ import { userReducer } from "state-management/reducers/user.reducer";
 import { MatSnackBarModule } from "@angular/material/snack-bar";
 import { OneDepComponent } from "./onedep/onedep.component";
 import { OrcidFormatterDirective } from "./onedep/onedep.directive";
+import { EmpiarComponent } from "./empiar/empiar.component";
+import { OneDepEffects } from "./state-management/effects/onedep.effects";
+
 
 @NgModule({
   imports: [
@@ -139,6 +142,7 @@ import { OrcidFormatterDirective } from "./onedep/onedep.directive";
       SampleEffects,
       PublishedDataEffects,
       LogbookEffects,
+      OneDepEffects,
     ]),
     StoreModule.forFeature("datasets", datasetsReducer),
     StoreModule.forFeature("instruments", instrumentsReducer),
@@ -183,6 +187,7 @@ import { OrcidFormatterDirective } from "./onedep/onedep.directive";
     DatasetsFilterSettingsComponent,
     OneDepComponent,
     OrcidFormatterDirective,
+    EmpiarComponent,
   ],
   providers: [
     ArchivingService,
diff --git a/src/app/datasets/empiar/empiar.component.html b/src/app/datasets/empiar/empiar.component.html
new file mode 100644
index 0000000000..4f527d88ca
--- /dev/null
+++ b/src/app/datasets/empiar/empiar.component.html
@@ -0,0 +1 @@
+<p>empiar works!</p>
diff --git a/src/app/datasets/empiar/empiar.component.scss b/src/app/datasets/empiar/empiar.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/datasets/empiar/empiar.component.spec.ts b/src/app/datasets/empiar/empiar.component.spec.ts
new file mode 100644
index 0000000000..24c4b1d590
--- /dev/null
+++ b/src/app/datasets/empiar/empiar.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { EmpiarComponent } from "./empiar.component";
+
+describe("EmpiarComponent", () => {
+  let component: EmpiarComponent;
+  let fixture: ComponentFixture<EmpiarComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [EmpiarComponent],
+    });
+    fixture = TestBed.createComponent(EmpiarComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
new file mode 100644
index 0000000000..c7e535f5dc
--- /dev/null
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-empiar',
+  templateUrl: './empiar.component.html',
+  styleUrls: ['./empiar.component.scss']
+})
+export class EmpiarComponent {
+
+}
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index af13dc9f06..7e98091306 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -25,6 +25,7 @@ import {
 import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
 import { selectCurrentUser } from "state-management/selectors/user.selectors";
 import { methodsList, EmFile, DepositionFiles } from "./types/methods.enum";
+import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
 import { Subscription, fromEvent } from "rxjs";
 
 @Component({
@@ -65,6 +66,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
     private http: HttpClient,
     private router: Router,
     private fb: FormBuilder,
+    private depositor: Depositor,
   ) {
     this.config = this.appConfigService.getConfig();
   }
@@ -111,12 +113,14 @@ export class OneDepComponent implements OnInit, OnDestroy {
         }),
       ]),
     });
+    console.log(this.form);
   }
 
   ngOnDestroy() {
     this.subscriptions.forEach((subscription) => {
       subscription.unsubscribe();
     });
+    this.fileTypes = [];
   }
   hasUnsavedChanges() {
     return this._hasUnsavedChanges;
@@ -388,14 +392,10 @@ export class OneDepComponent implements OnInit, OnDestroy {
     interface OneDepCreate {
       depID: string;
     }
-    this.http
-      .post(this.connectedDepositionBackend + "onedep", body, {
-        headers: { "Content-Type": "application/json" },
-      })
-      .subscribe({
-        next: (response: OneDepCreate) => {
-          depID = response.depID;
-          console.log("Created deposition in OneDep", depID);
+    this.depositor.createDep(body).subscribe({
+      next: (response: OneDepCreate) => {
+        // depID = response.depID;
+        console.log("Created deposition in OneDep", response);
 
           // Call subsequent requests
           this.fileTypes.forEach((fT) => {
diff --git a/src/app/datasets/onedep/onedep.components.spec.ts b/src/app/datasets/onedep/onedep.components.spec.ts
new file mode 100644
index 0000000000..39c765d51b
--- /dev/null
+++ b/src/app/datasets/onedep/onedep.components.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { OneDepComponent } from "./onedep.component";
+
+describe("OneDepComponent", () => {
+  let component: OneDepComponent;
+  let fixture: ComponentFixture<OneDepComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [OneDepComponent],
+    });
+    fixture = TestBed.createComponent(OneDepComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/sdk/apis/JobsService.ts b/src/app/shared/sdk/apis/JobsService.ts
index b39d7a0152..a762e12af3 100644
--- a/src/app/shared/sdk/apis/JobsService.ts
+++ b/src/app/shared/sdk/apis/JobsService.ts
@@ -1,5 +1,12 @@
 import { Injectable } from "@angular/core";
-import { HttpClient, HttpHeaders, HttpResponse, HttpEvent, HttpParameterCodec, HttpContext } from "@angular/common/http";
+import {
+  HttpClient,
+  HttpHeaders,
+  HttpResponse,
+  HttpEvent,
+  HttpParameterCodec,
+  HttpContext,
+} from "@angular/common/http";
 import { Observable } from "rxjs";
 import { Configuration } from "@scicatproject/scicat-sdk-ts";
 import { Job, JobInterface } from "../models/Job";
diff --git a/src/app/shared/sdk/apis/onedep-depositor.service.spec.ts b/src/app/shared/sdk/apis/onedep-depositor.service.spec.ts
new file mode 100644
index 0000000000..ff57d2901d
--- /dev/null
+++ b/src/app/shared/sdk/apis/onedep-depositor.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { OnedepDepositorService } from './onedep-depositor.service';
+
+describe('OnedepDepositorService', () => {
+  let service: OnedepDepositorService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(OnedepDepositorService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/sdk/apis/onedep-depositor.service.ts b/src/app/shared/sdk/apis/onedep-depositor.service.ts
new file mode 100644
index 0000000000..aa10a96f92
--- /dev/null
+++ b/src/app/shared/sdk/apis/onedep-depositor.service.ts
@@ -0,0 +1,43 @@
+import { Injectable } from "@angular/core";
+import { HttpClient, HttpHeaders, HttpResponse } from "@angular/common/http";
+import { Observable } from "rxjs";
+import { AppConfigService, AppConfig } from "app-config.service";
+
+interface OneDepCreate {
+  depID: string;
+}
+
+@Injectable({
+  providedIn: "root",
+})
+export class Depositor {
+  config: AppConfig;
+  constructor(
+    private http: HttpClient,
+    public appConfigService: AppConfigService,
+  ) {
+    this.config = this.appConfigService.getConfig();
+  }
+
+  // create deposition
+  createDep(body: string): Observable<OneDepCreate> {
+    return this.http.post<OneDepCreate>(
+      `${this.config.depositorURL}/onedep`,
+      body,
+      {
+        headers: { "Content-Type": "application/json" },
+      },
+    );
+  }
+
+  // // Example POST request
+  // createItem(item: any): Observable<any> {
+  //   const headers = new HttpHeaders({ "Content-Type": "application/json" });
+  //   return this.http.post(`${this.apiUrl}/items`, item, { headers });
+  // }
+
+  // // Example DELETE request
+  // deleteItem(id: string): Observable<any> {
+  //   return this.http.delete(`${this.apiUrl}/items/${id}`);
+  // }
+}
diff --git a/src/app/state-management/actions/onedep.actions.ts b/src/app/state-management/actions/onedep.actions.ts
new file mode 100644
index 0000000000..2d68b5d7ab
--- /dev/null
+++ b/src/app/state-management/actions/onedep.actions.ts
@@ -0,0 +1,62 @@
+import { createAction, props } from "@ngrx/store";
+
+export const createDeposition = createAction("[OneDep] Create Deposition");
+
+export const createDepositionSuccess = createAction(
+  "[OneDep] Create Deposition Complete",
+  props<{ depID: string }>(),
+);
+
+export const createDepositionFailure = createAction(
+  "[OneDep] Create Deposition Failure",
+);
+
+// export const sendFile = createAction(
+//   "[OneDep] Send File",
+//   props<{ depID: string; form: FormData; fileType: string }>()
+// );
+
+// export const sendFile = createAction(
+//   "[OneDep] Send File",
+//   props<{ depID: string; form: FormData; fileType: string }>()
+// );
+
+// export const sendFileSuccess = createAction(
+//   "[OneDep] Send File Success",
+//   props<{ fileType: string; res: any }>()
+// );
+
+// export const sendFileFailure = createAction(
+//   "[OneDep] Send File Failure",
+//   props<{ error: any }>()
+// );
+
+// export const sendCoordFile = createAction(
+//   "[OneDep] Send Coord File",
+//   props<{ depID: string; form: FormData }>()
+// );
+
+// export const sendCoordFileSuccess = createAction(
+//   "[OneDep] Send Coord File Success",
+//   props<{ res: any }>()
+// );
+
+// export const sendCoordFileFailure = createAction(
+//   "[OneDep] Send Coord File Failure",
+//   props<{ error: any }>()
+// );
+
+// export const sendMetadata = createAction(
+//   "[OneDep] Send Metadata",
+//   props<{ depID: string; form: FormData }>()
+// );
+
+// export const sendMetadataSuccess = createAction(
+//   "[OneDep] Send Metadata Success",
+//   props<{ res: any }>()
+// );
+
+// export const sendMetadataFailure = createAction(
+//   "[OneDep] Send Metadata Failure",
+//   props<{ error: any }>()
+// );
diff --git a/src/app/state-management/effects/onedep.effects.ts b/src/app/state-management/effects/onedep.effects.ts
new file mode 100644
index 0000000000..8ed164759d
--- /dev/null
+++ b/src/app/state-management/effects/onedep.effects.ts
@@ -0,0 +1,121 @@
+import { Injectable } from "@angular/core";
+import { Actions, createEffect, ofType } from "@ngrx/effects";
+import { of } from "rxjs";
+import { catchError, map, mergeMap } from "rxjs/operators";
+import { HttpClient } from "@angular/common/http";
+import * as fromActions from "state-management/actions/onedep.actions";
+import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
+import { Store } from "@ngrx/store";
+
+@Injectable()
+export class OneDepEffects {
+
+  submitJob$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.submitJobAction),
+      switchMap(({ job }) =>
+        this.jobsServiceV4.jobsControllerCreateV4(job as Job).pipe(
+          map((res) => fromActions.submitJobCompleteAction({ job: res as JobInterface })),
+          catchError((err) => of(fromActions.submitJobFailedAction({ err }))),
+        ),
+      ),
+    );
+  });
+
+  submitJobCompleteMessage$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.submitJobCompleteAction),
+      switchMap(() => {
+        const message = {
+          type: MessageType.Success,
+          content: "Job Created Successfully",
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+
+  submitJobFailedMessage$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.submitJobFailedAction),
+      switchMap(({ err }) => {
+        const message = {
+          type: MessageType.Error,
+          content: "Job Not Submitted: " + err.message,
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+  
+
+  // sendFile$ = createEffect(() =>
+  //   this.actions$.pipe(
+  //     ofType(OneDepActions.sendFile),
+  //     mergeMap((action) =>
+  //       this.http
+  //         .post(
+  //           `${this.connectedDepositionBackend}onedep/${action.depID}/file`,
+  //           action.form
+  //         )
+  //         .pipe(
+  //           map((res) =>
+  //             OneDepActions.sendFileSuccess({ fileType: action.fileType, res })
+  //           ),
+  //           catchError((error) =>
+  //             of(OneDepActions.sendFileFailure({ error }))
+  //           )
+  //         )
+  //     )
+  //   )
+  // );
+
+  // sendCoordFile$ = createEffect(() =>
+  //   this.actions$.pipe(
+  //     ofType(OneDepActions.sendCoordFile),
+  //     mergeMap((action) =>
+  //       this.http
+  //         .post(
+  //           `${this.connectedDepositionBackend}onedep/${action.depID}/pdb`,
+  //           action.form
+  //         )
+  //         .pipe(
+  //           map((res) =>
+  //             OneDepActions.sendCoordFileSuccess({ res })
+  //           ),
+  //           catchError((error) =>
+  //             of(OneDepActions.sendCoordFileFailure({ error }))
+  //           )
+  //         )
+  //     )
+  //   )
+  // );
+
+  // sendMetadata$ = createEffect(() =>
+  //   this.actions$.pipe(
+  //     ofType(OneDepActions.sendMetadata),
+  //     mergeMap((action) =>
+  //       this.http
+  //         .post(
+  //           `${this.connectedDepositionBackend}onedep/${action.depID}/metadata`,
+  //           action.form
+  //         )
+  //         .pipe(
+  //           map((res) =>
+  //             OneDepActions.sendMetadataSuccess({ res })
+  //           ),
+  //           catchError((error) =>
+  //             of(OneDepActions.sendMetadataFailure({ error }))
+  //           )
+  //         )
+  //     )
+  //   )
+  // );
+  constructor(
+    private actions$: Actions,
+    private onedepDepositor: Depositor,
+    private store: Store,
+  ) {}
+}

From 665fb1e3683867bce5f64ba3ce10f171891fb9e3 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 19 Dec 2024 13:36:51 +0000
Subject: [PATCH 067/245] add @jsonforms/angular and
 @jsonforms/angular-material dependencies

---
 package-lock.json | 75 +++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 62 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ab451f69cf..b4978fa094 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,8 @@
         "@angular/platform-server": "^16",
         "@angular/router": "^16",
         "@angular/service-worker": "^16",
+        "@jsonforms/angular": "3.2.*",
+        "@jsonforms/angular-material": "3.2.*",
         "@ngbracket/ngx-layout": "^16.0.0",
         "@ngrx/effects": "^16",
         "@ngrx/router-store": "^16",
@@ -3619,6 +3621,54 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@jsonforms/angular": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@jsonforms/angular/-/angular-3.2.1.tgz",
+      "integrity": "sha512-Kv9dxSttXZ2zXeHM+VEAtpkNoJbEqk6a1FrPv4Ol/p53EDNu7lyyuaWQ5B+YuqaRhpdq8yLce5zpkSk5P2Z2nw==",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "@angular/core": "^16.0.0 || ^17.0.0",
+        "@angular/forms": "^16.0.0 || ^17.0.0",
+        "@jsonforms/core": "3.2.1",
+        "rxjs": "^6.6.0 || ^7.4.0"
+      }
+    },
+    "node_modules/@jsonforms/angular-material": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@jsonforms/angular-material/-/angular-material-3.2.1.tgz",
+      "integrity": "sha512-qkhOL3oZaaNfcwxkO6HUzQerd7SWK93dTGIT29SO8frY1vjcnnw1qmRMIplDtaX+zR+/GJuCJfKP690bVCp3EA==",
+      "dependencies": {
+        "hammerjs": "2.0.8",
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "@angular/animations": "^16.0.0 || ^17.0.0",
+        "@angular/cdk": "^16.0.0 || ^17.0.0",
+        "@angular/common": "^16.0.0 || ^17.0.0",
+        "@angular/core": "^16.0.0 || ^17.0.0",
+        "@angular/forms": "^16.0.0 || ^17.0.0",
+        "@angular/material": "^16.0.0 || ^17.0.0",
+        "@angular/platform-browser": "^16.0.0 || ^17.0.0",
+        "@angular/router": "^16.0.0 || ^17.0.0",
+        "@jsonforms/angular": "3.2.1",
+        "@jsonforms/core": "3.2.1",
+        "rxjs": "^6.6.0 || ^7.4.0"
+      }
+    },
+    "node_modules/@jsonforms/core": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-3.2.1.tgz",
+      "integrity": "sha512-G5ldiWM2e5Vh5WrbjDKb0QJ1SG/39kxC48x2ufFKhfpDHibqhPaXegg5jmSBTNcB0ldE9jMmpKwxF6fi5VBCEA==",
+      "peer": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "ajv": "^8.6.1",
+        "ajv-formats": "^2.1.0",
+        "lodash": "^4.17.21"
+      }
+    },
     "node_modules/@kwsites/file-exists": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
@@ -5350,8 +5400,7 @@
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
     },
     "node_modules/@types/lodash": {
       "version": "4.17.13",
@@ -6454,7 +6503,6 @@
       "version": "8.12.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
       "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -6470,7 +6518,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -10152,8 +10199,7 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-diff": {
       "version": "1.3.0",
@@ -10850,6 +10896,14 @@
         "typescript": ">=3.7.5"
       }
     },
+    "node_modules/hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -12593,8 +12647,7 @@
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -13246,8 +13299,7 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
@@ -15979,7 +16031,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -16405,7 +16456,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18691,7 +18741,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }

From 753ccd6209bb373230b687ff380022e44cdfed8c Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 19 Dec 2024 13:37:51 +0000
Subject: [PATCH 068/245] Added @jsonforms/angular and
 @jsonforms/angular-material in package-lock.json

---
 package-lock.json | 75 +++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 62 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ab451f69cf..b4978fa094 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,8 @@
         "@angular/platform-server": "^16",
         "@angular/router": "^16",
         "@angular/service-worker": "^16",
+        "@jsonforms/angular": "3.2.*",
+        "@jsonforms/angular-material": "3.2.*",
         "@ngbracket/ngx-layout": "^16.0.0",
         "@ngrx/effects": "^16",
         "@ngrx/router-store": "^16",
@@ -3619,6 +3621,54 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@jsonforms/angular": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@jsonforms/angular/-/angular-3.2.1.tgz",
+      "integrity": "sha512-Kv9dxSttXZ2zXeHM+VEAtpkNoJbEqk6a1FrPv4Ol/p53EDNu7lyyuaWQ5B+YuqaRhpdq8yLce5zpkSk5P2Z2nw==",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "@angular/core": "^16.0.0 || ^17.0.0",
+        "@angular/forms": "^16.0.0 || ^17.0.0",
+        "@jsonforms/core": "3.2.1",
+        "rxjs": "^6.6.0 || ^7.4.0"
+      }
+    },
+    "node_modules/@jsonforms/angular-material": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@jsonforms/angular-material/-/angular-material-3.2.1.tgz",
+      "integrity": "sha512-qkhOL3oZaaNfcwxkO6HUzQerd7SWK93dTGIT29SO8frY1vjcnnw1qmRMIplDtaX+zR+/GJuCJfKP690bVCp3EA==",
+      "dependencies": {
+        "hammerjs": "2.0.8",
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "@angular/animations": "^16.0.0 || ^17.0.0",
+        "@angular/cdk": "^16.0.0 || ^17.0.0",
+        "@angular/common": "^16.0.0 || ^17.0.0",
+        "@angular/core": "^16.0.0 || ^17.0.0",
+        "@angular/forms": "^16.0.0 || ^17.0.0",
+        "@angular/material": "^16.0.0 || ^17.0.0",
+        "@angular/platform-browser": "^16.0.0 || ^17.0.0",
+        "@angular/router": "^16.0.0 || ^17.0.0",
+        "@jsonforms/angular": "3.2.1",
+        "@jsonforms/core": "3.2.1",
+        "rxjs": "^6.6.0 || ^7.4.0"
+      }
+    },
+    "node_modules/@jsonforms/core": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-3.2.1.tgz",
+      "integrity": "sha512-G5ldiWM2e5Vh5WrbjDKb0QJ1SG/39kxC48x2ufFKhfpDHibqhPaXegg5jmSBTNcB0ldE9jMmpKwxF6fi5VBCEA==",
+      "peer": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "ajv": "^8.6.1",
+        "ajv-formats": "^2.1.0",
+        "lodash": "^4.17.21"
+      }
+    },
     "node_modules/@kwsites/file-exists": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
@@ -5350,8 +5400,7 @@
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
     },
     "node_modules/@types/lodash": {
       "version": "4.17.13",
@@ -6454,7 +6503,6 @@
       "version": "8.12.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
       "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -6470,7 +6518,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -10152,8 +10199,7 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-diff": {
       "version": "1.3.0",
@@ -10850,6 +10896,14 @@
         "typescript": ">=3.7.5"
       }
     },
+    "node_modules/hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -12593,8 +12647,7 @@
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -13246,8 +13299,7 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
@@ -15979,7 +16031,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -16405,7 +16456,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18691,7 +18741,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }

From ef50ac9e40457a28a67269e1168fc645b81181a7 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 19 Dec 2024 14:28:51 +0000
Subject: [PATCH 069/245] fix eslint complains

---
 .../customRenderer/all-of-renderer.ts         |  10 +-
 .../customRenderer/any-of-renderer.ts         | 115 +++--
 .../customRenderer/custom-renderers.ts        |  25 +-
 .../customRenderer/one-of-renderer.ts         | 118 +++--
 .../ingestor-metadata-editor-helper.ts        |  15 +-
 .../ingestor-metadata-editor-schema_demo.ts   | 483 ------------------
 .../ingestor-metadata-editor.component.ts     |  23 +-
 src/app/ingestor/ingestor.module.ts           |  42 +-
 ...estor.confirm-transfer-dialog.component.ts |  73 ++-
 ...stor.dialog-stepper.component.component.ts |  12 +-
 ...tor.extractor-metadata-dialog.component.ts |  71 +--
 .../ingestor.new-transfer-dialog.component.ts | 143 +++---
 ...ingestor.user-metadata-dialog.component.ts |  59 ++-
 .../ingestor/ingestor-api-endpoints.ts        |  16 +-
 .../ingestor/ingestor.component-helper.ts     |  84 +--
 .../ingestor/ingestor.component.spec.ts       |  15 +-
 .../ingestor/ingestor/ingestor.component.ts   | 297 ++++++-----
 17 files changed, 651 insertions(+), 950 deletions(-)
 delete mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
index 91085fbaf7..0eeefb6796 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
@@ -1,11 +1,11 @@
-import { Component } from '@angular/core';
-import { JsonFormsControl } from '@jsonforms/angular';
+import { Component, OnInit } from "@angular/core";
+import { JsonFormsControl } from "@jsonforms/angular";
 
 @Component({
-  selector: 'AllOfRenderer',
-  template: `<div>AllOf Renderer</div>`
+  selector: "AllOfRenderer",
+  template: `<div>AllOf Renderer</div>`,
 })
-export class AllOfRenderer extends JsonFormsControl {
+export class AllOfRendererComponent extends JsonFormsControl implements OnInit {
   data: any[] = [];
 
   ngOnInit() {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 530d762196..1df486fff0 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -1,70 +1,79 @@
-import { Component } from '@angular/core';
-import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
-import { ControlProps, JsonSchema } from '@jsonforms/core';
-import { configuredRenderer } from '../ingestor-metadata-editor-helper';
+import { Component } from "@angular/core";
+import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
+import { ControlProps, JsonSchema } from "@jsonforms/core";
+import { configuredRenderer } from "../ingestor-metadata-editor-helper";
 
 @Component({
-    selector: 'app-anyof-renderer',
-    template: `
+  selector: "app-anyof-renderer",
+  template: `
     <div class="anyof-group">
-    <mat-card-title>{{anyOfTitle}}</mat-card-title>
-
-    <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
-        <mat-tab *ngFor="let option of options" label="{{option}}">
-            <div style="margin: 20px auto; width: 85%" *ngIf="option !== 'null'">
-                <jsonforms [schema]="getTabSchema(option)" [data]="passedProps.data" [renderers]="defaultRenderer" (dataChange)=onInnerJsonFormsChange($event)></jsonforms>
-            </div>
+      <mat-card-title>{{ anyOfTitle }}</mat-card-title>
+      <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
+        <mat-tab *ngFor="let option of options" label="{{ option }}">
+          <div style="margin: 20px auto; width: 85%" *ngIf="option !== 'null'">
+            <jsonforms
+              [schema]="getTabSchema(option)"
+              [data]="passedProps.data"
+              [renderers]="defaultRenderer"
+              (dataChange)="onInnerJsonFormsChange($event)"
+            ></jsonforms>
+          </div>
         </mat-tab>
-    </mat-tab-group>
+      </mat-tab-group>
     </div>
-  `
+  `,
 })
-export class AnyOfRenderer extends JsonFormsControl {
+export class AnyOfRendererComponent extends JsonFormsControl {
+  dataAsString: string;
+  options: string[] = [];
+  anyOfTitle: string;
+  selectedTabIndex = 0; // default value
 
-    dataAsString: string;
-    options: string[] = [];
-    anyOfTitle: string;
-    selectedTabIndex: number = 0; // default value 
+  rendererService: JsonFormsAngularService;
 
-    rendererService: JsonFormsAngularService;
+  defaultRenderer = configuredRenderer;
+  passedProps: ControlProps;
 
-    defaultRenderer = configuredRenderer;
-    passedProps: ControlProps;
+  constructor(service: JsonFormsAngularService) {
+    super(service);
+    this.rendererService = service;
+  }
 
-    constructor(service: JsonFormsAngularService) {
-        super(service);
-        this.rendererService = service;
-    }
+  public mapAdditionalProps(props: ControlProps) {
+    this.passedProps = props;
+    this.anyOfTitle = props.label || "AnyOf";
+    this.options = props.schema.anyOf.map(
+      (option: any) => option.title || option.type || JSON.stringify(option),
+    );
 
-    public mapAdditionalProps(props: ControlProps) {
-        this.passedProps = props;
-        this.anyOfTitle = props.label || 'AnyOf';
-        this.options = props.schema.anyOf.map((option: any) => option.title || option.type || JSON.stringify(option));
-    
-        if (this.options.includes("null") && !props.data) {
-            this.selectedTabIndex = this.options.indexOf("null");
-        }
+    if (this.options.includes("null") && !props.data) {
+      this.selectedTabIndex = this.options.indexOf("null");
     }
+  }
 
-    public getTabSchema(tabOption: string): JsonSchema {
-        const selectedSchema = (this.passedProps.schema.anyOf as any).find((option: any) => option.title === tabOption || option.type === tabOption || JSON.stringify(option) === tabOption);
-        return selectedSchema;
-    }
+  public getTabSchema(tabOption: string): JsonSchema {
+    const selectedSchema = (this.passedProps.schema.anyOf as any).find(
+      (option: any) =>
+        option.title === tabOption ||
+        option.type === tabOption ||
+        JSON.stringify(option) === tabOption,
+    );
+    return selectedSchema;
+  }
 
-    public onInnerJsonFormsChange(event: any) {
-        // Check if data is equal to the passedProps.data
-        if (event !== this.passedProps.data) {
-            const updatedData = this.rendererService.getState().jsonforms.core.data;
+  public onInnerJsonFormsChange(event: any) {
+    if (event !== this.passedProps.data) {
+      const updatedData = this.rendererService.getState().jsonforms.core.data;
 
-            // aktualisiere das aktuelle Datenobjekt
-            const pathSegments = this.passedProps.path.split('.');
-            let current = updatedData;
-            for (let i = 0; i < pathSegments.length - 1; i++) {
-                current = current[pathSegments[i]];
-            }
-            current[pathSegments[pathSegments.length - 1]] = event;
+      // Update the data in the correct path
+      const pathSegments = this.passedProps.path.split(".");
+      let current = updatedData;
+      for (let i = 0; i < pathSegments.length - 1; i++) {
+        current = current[pathSegments[i]];
+      }
+      current[pathSegments[pathSegments.length - 1]] = event;
 
-            this.rendererService.setData(updatedData);
-        }
+      this.rendererService.setData(updatedData);
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index 8b807f113b..67f76f65d9 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -1,20 +1,25 @@
-import { isAllOfControl, isAnyOfControl, isOneOfControl, JsonFormsRendererRegistryEntry } from '@jsonforms/core';
-import { OneOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer';
-import { AllOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer';
-import { AnyOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer';
-import { isRangeControl, RankedTester, rankWith } from '@jsonforms/core';
+import {
+  isAllOfControl,
+  isAnyOfControl,
+  isOneOfControl,
+  JsonFormsRendererRegistryEntry,
+} from "@jsonforms/core";
+import { OneOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer";
+import { AllOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer";
+import { AnyOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer";
+import { rankWith } from "@jsonforms/core";
 
 export const customRenderers: JsonFormsRendererRegistryEntry[] = [
   {
     tester: rankWith(4, isOneOfControl),
-    renderer: OneOfRenderer
+    renderer: OneOfRendererComponent,
   },
   {
     tester: rankWith(4, isAllOfControl),
-    renderer: AllOfRenderer
+    renderer: AllOfRendererComponent,
   },
   {
     tester: rankWith(4, isAnyOfControl),
-    renderer: AnyOfRenderer
-  }
-];
\ No newline at end of file
+    renderer: AnyOfRendererComponent,
+  },
+];
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
index 42665d5c62..3f863aa3b1 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
@@ -1,69 +1,87 @@
-import { Component } from '@angular/core';
-import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
-import { ControlProps, JsonSchema } from '@jsonforms/core';
-import { configuredRenderer } from '../ingestor-metadata-editor-helper';
+import { Component } from "@angular/core";
+import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
+import { ControlProps, JsonSchema } from "@jsonforms/core";
+import { configuredRenderer } from "../ingestor-metadata-editor-helper";
 
 @Component({
-    selector: 'app-oneof-component',
-    template: `
+  selector: "app-oneof-component",
+  template: `
     <div class="anyof-group">
-      <p>{{anyOfTitle}}</p>
+      <p>{{ anyOfTitle }}</p>
       <mat-radio-group [(ngModel)]="selectedOption" (change)="onOptionChange()">
-        <mat-radio-button *ngFor="let option of options" [value]="option" style="margin-right: 10px;">
-          {{option}}
+        <mat-radio-button
+          *ngFor="let option of options"
+          [value]="option"
+          style="margin-right: 10px;"
+        >
+          {{ option }}
         </mat-radio-button>
       </mat-radio-group>
-      <div style="margin-top: 20px;" *ngIf="selectedAnyOption && selectedOption !== 'null'">
-        <jsonforms [schema]="selectedAnyOption" [data]="passedProps.data" [renderers]="defaultRenderer" (dataChange)=onInnerJsonFormsChange($event)></jsonforms>
+      <div
+        style="margin-top: 20px;"
+        *ngIf="selectedAnyOption && selectedOption !== 'null'"
+      >
+        <jsonforms
+          [schema]="selectedAnyOption"
+          [data]="passedProps.data"
+          [renderers]="defaultRenderer"
+          (dataChange)="onInnerJsonFormsChange($event)"
+        ></jsonforms>
       </div>
     </div>
-  `
+  `,
 })
-export class OneOfRenderer extends JsonFormsControl {
+export class OneOfRendererComponent extends JsonFormsControl {
+  dataAsString: string;
+  options: string[] = [];
+  anyOfTitle: string;
+  selectedOption: string;
+  selectedAnyOption: JsonSchema;
 
-    dataAsString: string;
-    options: string[] = [];
-    anyOfTitle: string;
-    selectedOption: string;
-    selectedAnyOption: JsonSchema;
+  rendererService: JsonFormsAngularService;
 
-    rendererService: JsonFormsAngularService;
+  defaultRenderer = configuredRenderer;
+  passedProps: ControlProps;
 
-    defaultRenderer = configuredRenderer;
-    passedProps: ControlProps;
+  constructor(service: JsonFormsAngularService) {
+    super(service);
+    this.rendererService = service;
+  }
 
-    constructor(service: JsonFormsAngularService) {
-        super(service);
-        this.rendererService = service;
+  public mapAdditionalProps(props: ControlProps) {
+    this.passedProps = props;
+    this.anyOfTitle = props.label || "AnyOf";
+    this.options = props.schema.anyOf.map(
+      (option: any) => option.title || option.type || JSON.stringify(option),
+    );
+    if (!props.data) {
+      this.selectedOption = "null"; // Auf "null" setzen, wenn die Daten leer sind
     }
+  }
 
-    public mapAdditionalProps(props: ControlProps) {
-        this.passedProps = props;
-        this.anyOfTitle = props.label || 'AnyOf';
-        this.options = props.schema.anyOf.map((option: any) => option.title || option.type || JSON.stringify(option));
-        if (!props.data) {
-            this.selectedOption = 'null'; // Auf "null" setzen, wenn die Daten leer sind
-        }
-    }
-
-    public onOptionChange() {
-        this.selectedAnyOption = (this.passedProps.schema.anyOf as any).find((option: any) => option.title === this.selectedOption || option.type === this.selectedOption || JSON.stringify(option) === this.selectedOption);
-    }
+  public onOptionChange() {
+    this.selectedAnyOption = (this.passedProps.schema.anyOf as any).find(
+      (option: any) =>
+        option.title === this.selectedOption ||
+        option.type === this.selectedOption ||
+        JSON.stringify(option) === this.selectedOption,
+    );
+  }
 
-    public onInnerJsonFormsChange(event: any) {
-        // Check if data is equal to the passedProps.data
-        if (event !== this.passedProps.data) {
-            const updatedData = this.rendererService.getState().jsonforms.core.data;
+  public onInnerJsonFormsChange(event: any) {
+    // Check if data is equal to the passedProps.data
+    if (event !== this.passedProps.data) {
+      const updatedData = this.rendererService.getState().jsonforms.core.data;
 
-            // aktualisiere das aktuelle Datenobjekt
-            const pathSegments = this.passedProps.path.split('.');
-            let current = updatedData;
-            for (let i = 0; i < pathSegments.length - 1; i++) {
-                current = current[pathSegments[i]];
-            }
-            current[pathSegments[pathSegments.length - 1]] = event;
+      // aktualisiere das aktuelle Datenobjekt
+      const pathSegments = this.passedProps.path.split(".");
+      let current = updatedData;
+      for (let i = 0; i < pathSegments.length - 1; i++) {
+        current = current[pathSegments[i]];
+      }
+      current[pathSegments[pathSegments.length - 1]] = event;
 
-            this.rendererService.setData(updatedData);
-        }
+      this.rendererService.setData(updatedData);
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index 65c4d640d3..5eb5a4964f 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -14,19 +14,22 @@ export class IngestorMetadataEditorHelper {
     }
 
     if (schema.$ref) {
-      const refPath = schema.$ref.replace('#/', '').split('/');
+      const refPath = schema.$ref.replace("#/", "").split("/");
       let ref = rootSchema;
       refPath.forEach((part) => {
         ref = ref[part];
       });
       return IngestorMetadataEditorHelper.resolveRefs(ref, rootSchema);
-    } else if (typeof schema === 'object') {
+    } else if (typeof schema === "object") {
       for (const key in schema) {
-        if (schema.hasOwnProperty(key)) {
-          schema[key] = IngestorMetadataEditorHelper.resolveRefs(schema[key], rootSchema);
+        if (Object.prototype.hasOwnProperty.call(schema, key)) {
+          schema[key] = IngestorMetadataEditorHelper.resolveRefs(
+            schema[key],
+            rootSchema,
+          );
         }
       }
     }
     return schema;
-  };
-};
\ No newline at end of file
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
deleted file mode 100644
index 5874d74d42..0000000000
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
+++ /dev/null
@@ -1,483 +0,0 @@
-export const demo_organizational_schema = {
-  type: 'object',
-  properties: {
-    grants: {
-      type: 'array',
-      items: {
-        type: 'object',
-        properties: {
-          grant_name: {
-            type: 'string',
-            description: 'name of the grant',
-          },
-          start_date: {
-            type: 'string',
-            format: 'date',
-            description: 'start date',
-          },
-          end_date: {
-            type: 'string',
-            format: 'date',
-            description: 'end date',
-          },
-          budget: {
-            type: 'number',
-            description: 'budget',
-          },
-          project_id: {
-            type: 'string',
-            description: 'project id',
-          },
-          country: {
-            type: 'string',
-            description: 'Country of the institution',
-          },
-        },
-      },
-      description: 'List of grants associated with the project',
-    },
-    authors: {
-      type: 'array',
-      items: {
-        type: 'object',
-        properties: {
-          first_name: {
-            type: 'string',
-            description: 'first name',
-          },
-          work_status: {
-            type: 'boolean',
-            description: 'work status',
-          },
-          email: {
-            type: 'string',
-            description: 'email',
-            pattern: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$',
-          },
-          work_phone: {
-            type: 'string',
-            description: 'work phone',
-          },
-          name: {
-            type: 'string',
-            description: 'name',
-          },
-          name_org: {
-            type: 'string',
-            description: 'Name of the organization',
-          },
-          type_org: {
-            type: 'string',
-            description: 'Type of organization, academic, commercial, governmental, etc.',
-            enum: ['Academic', 'Commercial', 'Government', 'Other'],
-          },
-          country: {
-            type: 'string',
-            description: 'Country of the institution',
-          },
-          role: {
-            type: 'string',
-            description: 'Role of the author, for example principal investigator',
-          },
-          orcid: {
-            type: 'string',
-            description: 'ORCID of the author, a type of unique identifier',
-          },
-        },
-      },
-      description: 'List of authors associated with the project',
-    },
-    funder: {
-      type: 'array',
-      items: {
-        type: 'object',
-        properties: {
-          funder_name: {
-            type: 'string',
-            description: 'funding organization/person.',
-          },
-          type_org: {
-            type: 'string',
-            description: 'Type of organization, academic, commercial, governmental, etc.',
-            enum: ['Academic', 'Commercial', 'Government', 'Other'],
-          },
-          country: {
-            type: 'string',
-            description: 'Country of the institution',
-          },
-        },
-      },
-      description: 'Description of the project funding',
-    },
-  },
-  required: ['authors', 'funder'],
-};
-
-export const demo_acquisition_schema = {
-  type: 'object',
-  properties: {
-    nominal_defocus: {
-      type: 'object',
-      description: 'Target defocus set, min and max values in µm.',
-    },
-    calibrated_defocus: {
-      type: 'object',
-      description: 'Machine estimated defocus, min and max values in µm. Has a tendency to be off.',
-    },
-    nominal_magnification: {
-      type: 'integer',
-      description: 'Magnification level as indicated by the instrument, no unit',
-    },
-    calibrated_magnification: {
-      type: 'integer',
-      description: 'Calculated magnification, no unit',
-    },
-    holder: {
-      type: 'string',
-      description: 'Speciman holder model',
-    },
-    holder_cryogen: {
-      type: 'string',
-      description: 'Type of cryogen used in the holder - if the holder is cooled seperately',
-    },
-    temperature_range: {
-      type: 'object',
-      description: 'Temperature during data collection, in K with min and max values.',
-    },
-    microscope_software: {
-      type: 'string',
-      description: 'Software used for instrument control',
-    },
-    detector: {
-      type: 'string',
-      description: 'Make and model of the detector used',
-    },
-    detector_mode: {
-      type: 'string',
-      description: 'Operating mode of the detector',
-    },
-    dose_per_movie: {
-      type: 'object',
-      description: 'Average dose per image/movie/tilt - given in electrons per square Angstrom',
-    },
-    energy_filter: {
-      type: 'object',
-      description: 'Whether an energy filter was used and its specifics.',
-    },
-    image_size: {
-      type: 'object',
-      description: 'The size of the image in pixels, height and width given.',
-    },
-    date_time: {
-      type: 'string',
-      description: 'Time and date of the data acquisition',
-    },
-    exposure_time: {
-      type: 'object',
-      description: 'Time of data acquisition per movie/tilt - in s',
-    },
-    cryogen: {
-      type: 'string',
-      description: 'Cryogen used in cooling the instrument and sample, usually nitrogen',
-    },
-    frames_per_movie: {
-      type: 'integer',
-      description: 'Number of frames that on average constitute a full movie, can be a bit hard to define for some detectors',
-    },
-    grids_imaged: {
-      type: 'integer',
-      description: 'Number of grids imaged for this project - here with qualifier during this data acquisition',
-    },
-    images_generated: {
-      type: 'integer',
-      description: 'Number of images generated total for this data collection - might need a qualifier for tilt series to determine whether full series or individual tilts are counted',
-    },
-    binning_camera: {
-      type: 'number',
-      description: 'Level of binning on the images applied during data collection',
-    },
-    pixel_size: {
-      type: 'object',
-      description: 'Pixel size, in Angstrom',
-    },
-    specialist_optics: {
-      type: 'object',
-      description: 'Any type of special optics, such as a phaseplate',
-    },
-    beamshift: {
-      type: 'object',
-      description: 'Movement of the beam above the sample for data collection purposes that does not require movement of the stage. Given in mrad.',
-    },
-    beamtilt: {
-      type: 'object',
-      description: 'Another way to move the beam above the sample for data collection purposes that does not require movement of the stage. Given in mrad.',
-    },
-    imageshift: {
-      type: 'object',
-      description: 'Movement of the Beam below the image in order to shift the image on the detector. Given in µm.',
-    },
-    beamtiltgroups: {
-      type: 'integer',
-      description: 'Number of Beamtilt groups present in this dataset - for optimized processing split dataset into groups of same tilt angle. Despite its name Beamshift is often used to achieve this result.',
-    },
-    gainref_flip_rotate: {
-      type: 'string',
-      description: 'Whether and how you have to flip or rotate the gainref in order to align with your acquired images',
-    },
-  },
-  required: ['detector', 'dose_per_movie', 'date_time', 'binning_camera', 'pixel_size'],
-};
-
-export const demo_sample_schema = {
-  type: 'object',
-  properties: {
-    overall_molecule: {
-      type: 'object',
-      description: 'Description of the overall molecule',
-      properties: {
-        molecular_type: {
-          type: 'string',
-          description: 'Description of the overall molecular type, i.e., a complex',
-        },
-        name_sample: {
-          type: 'string',
-          description: 'Name of the full sample',
-        },
-        source: {
-          type: 'string',
-          description: 'Where the sample was taken from, i.e., natural host, recombinantly expressed, etc.',
-        },
-        molecular_weight: {
-          type: 'object',
-          description: 'Molecular weight in Da',
-        },
-        assembly: {
-          type: 'string',
-          description: 'What type of higher order structure your sample forms - if any.',
-          enum: ['FILAMENT', 'HELICAL ARRAY', 'PARTICLE'],
-        },
-      },
-      required: ['molecular_type', 'name_sample', 'source', 'assembly'],
-    },
-    molecule: {
-      type: 'array',
-      items: {
-        type: 'object',
-        properties: {
-          name_mol: {
-            type: 'string',
-            description: 'Name of an individual molecule (often protein) in the sample',
-          },
-          molecular_type: {
-            type: 'string',
-            description: 'Description of the overall molecular type, i.e., a complex',
-          },
-          molecular_class: {
-            type: 'string',
-            description: 'Class of the molecule',
-            enum: ['Antibiotic', 'Carbohydrate', 'Chimera', 'None of these'],
-          },
-          sequence: {
-            type: 'string',
-            description: 'Full sequence of the sample as in the data, i.e., cleaved tags should also be removed from sequence here',
-          },
-          natural_source: {
-            type: 'string',
-            description: 'Scientific name of the natural host organism',
-          },
-          taxonomy_id_source: {
-            type: 'string',
-            description: 'Taxonomy ID of the natural source organism',
-          },
-          expression_system: {
-            type: 'string',
-            description: 'Scientific name of the organism used to produce the molecule of interest',
-          },
-          taxonomy_id_expression: {
-            type: 'string',
-            description: 'Taxonomy ID of the expression system organism',
-          },
-          gene_name: {
-            type: 'string',
-            description: 'Name of the gene of interest',
-          },
-        },
-      },
-      required: ['name_mol', 'molecular_type', 'molecular_class', 'sequence', 'natural_source', 'taxonomy_id_source', 'expression_system', 'taxonomy_id_expression'],
-    },
-    ligands: {
-      type: 'array',
-      items: {
-        type: 'object',
-        properties: {
-          present: {
-            type: 'boolean',
-            description: 'Whether the model contains any ligands',
-          },
-          smiles: {
-            type: 'string',
-            description: 'Provide a valid SMILES string of your ligand',
-          },
-          reference: {
-            type: 'string',
-            description: 'Link to a reference of your ligand, i.e., CCD, PubChem, etc.',
-          },
-        },
-      },
-      description: 'List of ligands associated with the sample',
-    },
-    specimen: {
-      type: 'object',
-      description: 'Description of the specimen',
-      properties: {
-        buffer: {
-          type: 'string',
-          description: 'Name/composition of the (chemical) sample buffer during grid preparation',
-        },
-        concentration: {
-          type: 'object',
-          description: 'Concentration of the (supra)molecule in the sample, in mg/ml',
-        },
-        ph: {
-          type: 'number',
-          description: 'pH of the sample buffer',
-        },
-        vitrification: {
-          type: 'boolean',
-          description: 'Whether the sample was vitrified',
-        },
-        vitrification_cryogen: {
-          type: 'string',
-          description: 'Which cryogen was used for vitrification',
-        },
-        humidity: {
-          type: 'object',
-          description: 'Environmental humidity just before vitrification, in %',
-        },
-        temperature: {
-          type: 'object',
-          description: 'Environmental temperature just before vitrification, in K',
-          minimum: 0.0,
-        },
-        staining: {
-          type: 'boolean',
-          description: 'Whether the sample was stained',
-        },
-        embedding: {
-          type: 'boolean',
-          description: 'Whether the sample was embedded',
-        },
-        shadowing: {
-          type: 'boolean',
-          description: 'Whether the sample was shadowed',
-        },
-      },
-      required: ['ph', 'vitrification', 'vitrification_cryogen', 'staining', 'embedding', 'shadowing'],
-    },
-    grid: {
-      type: 'object',
-      description: 'Description of the grid used',
-      properties: {
-        manufacturer: {
-          type: 'string',
-          description: 'Grid manufacturer',
-        },
-        material: {
-          type: 'string',
-          description: 'Material out of which the grid is made',
-        },
-        mesh: {
-          type: 'number',
-          description: 'Grid mesh in lines per inch',
-        },
-        film_support: {
-          type: 'boolean',
-          description: 'Whether a support film was used',
-        },
-        film_material: {
-          type: 'string',
-          description: 'Type of material the support film is made of',
-        },
-        film_topology: {
-          type: 'string',
-          description: 'Topology of the support film',
-        },
-        film_thickness: {
-          type: 'string',
-          description: 'Thickness of the support film',
-        },
-        pretreatment_type: {
-          type: 'string',
-          description: 'Type of pretreatment of the grid, i.e., glow discharge',
-        },
-        pretreatment_time: {
-          type: 'object',
-          description: 'Length of time of the pretreatment in s',
-        },
-        pretreatment_pressure: {
-          type: 'object',
-          description: 'Pressure of the chamber during pretreatment, in Pa',
-        },
-        pretreatment_atmosphere: {
-          type: 'string',
-          description: 'Atmospheric conditions in the chamber during pretreatment, i.e., addition of specific gases, etc.',
-        },
-      },
-    },
-  },
-  required: ['overall_molecule', 'molecule', 'specimen', 'grid'],
-};
-
-export const demo_instrument_schema = { 
-  type: 'object',
-  properties: {
-    microscope: {
-      type: 'string',
-      description: 'Name/Type of the Microscope',
-    },
-    illumination: {
-      type: 'string',
-      description: 'Mode of illumination used during data collection',
-    },
-    imaging: {
-      type: 'string',
-      description: 'Mode of imaging used during data collection',
-    },
-    electron_source: {
-      type: 'string',
-      description: 'Type of electron source used in the microscope, such as FEG',
-    },
-    acceleration_voltage: {
-      type: 'object',
-      description: 'Voltage used for the electron acceleration, in kV',
-    },
-    c2_aperture: {
-      type: 'object',
-      description: 'C2 aperture size used in data acquisition, in µm',
-    },
-    cs: {
-      type: 'object',
-      description: 'Spherical aberration of the instrument, in mm',
-    },
-  },
-  required: ['microscope', 'illumination', 'imaging', 'electron_source', 'acceleration_voltage', 'cs'],
-};
-
-export const demo_scicatheader_schema = {
-  type: "object",
-  properties: {
-    datasetName: { type: "string" },
-    description: { type: "string" },
-    creationLocation: { type: "string" },
-    dataFormat: { type: "string" },
-    ownerGroup: { type: "string" },
-    type: { type: "string" },
-    license: { type: "string" },
-    keywords: {
-      type: "array",
-      items: { type: "string" }
-    },
-    scientificMetadata: { type: "string" }
-  },
-  required: ["datasetName", "description", "creationLocation", "dataFormat", "ownerGroup", "type", "license", "keywords", "scientificMetadata"]
-}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 308a64143b..d4bf2a72e1 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -1,19 +1,18 @@
-import { Component, EventEmitter, Output, Input } from '@angular/core';
-import { JsonSchema } from '@jsonforms/core';
-import { configuredRenderer } from './ingestor-metadata-editor-helper';
+import { Component, EventEmitter, Output, Input } from "@angular/core";
+import { JsonSchema } from "@jsonforms/core";
+import { configuredRenderer } from "./ingestor-metadata-editor-helper";
 
 @Component({
-  selector: 'app-metadata-editor',
+  selector: "app-metadata-editor",
   template: `<jsonforms
-  [data]="data"
-  [schema]="schema"
-  [renderers]="combinedRenderers"
-  (dataChange)="onDataChange($event)"
-></jsonforms>`,
+    [data]="data"
+    [schema]="schema"
+    [renderers]="combinedRenderers"
+    (dataChange)="onDataChange($event)"
+  ></jsonforms>`,
 })
-
 export class IngestorMetadataEditorComponent {
-  @Input() data: Object;
+  @Input() data: object;
   @Input() schema: JsonSchema;
 
   @Output() dataChange = new EventEmitter<string>();
@@ -25,4 +24,4 @@ export class IngestorMetadataEditorComponent {
   onDataChange(event: any) {
     this.dataChange.emit(event);
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index eb79e0e644..1dfd044bf2 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -9,8 +9,8 @@ import { MatFormFieldModule } from "@angular/material/form-field";
 import { MatInputModule } from "@angular/material/input";
 import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
 import { FormsModule } from "@angular/forms";
-import { MatListModule } from '@angular/material/list';
-import { MatIconModule } from '@angular/material/icon';
+import { MatListModule } from "@angular/material/list";
+import { MatIconModule } from "@angular/material/icon";
 import { MatTabsModule } from "@angular/material/tabs";
 import { MatTableModule } from "@angular/material/table";
 import { MatDialogModule } from "@angular/material/dialog";
@@ -18,15 +18,15 @@ import { MatSelectModule } from "@angular/material/select";
 import { MatOptionModule } from "@angular/material/core";
 import { MatAutocompleteModule } from "@angular/material/autocomplete";
 import { IngestorNewTransferDialogComponent } from "./ingestor/dialog/ingestor.new-transfer-dialog.component";
-import { IngestorUserMetadataDialog } from "./ingestor/dialog/ingestor.user-metadata-dialog.component";
-import { JsonFormsModule } from '@jsonforms/angular';
+import { IngestorUserMetadataDialogComponent } from "./ingestor/dialog/ingestor.user-metadata-dialog.component";
+import { JsonFormsModule } from "@jsonforms/angular";
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
-import { IngestorExtractorMetadataDialog } from "./ingestor/dialog/ingestor.extractor-metadata-dialog.component";
-import { IngestorConfirmTransferDialog } from "./ingestor/dialog/ingestor.confirm-transfer-dialog.component";
+import { IngestorExtractorMetadataDialogComponent } from "./ingestor/dialog/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialogComponent } from "./ingestor/dialog/ingestor.confirm-transfer-dialog.component";
 import { MatStepperModule } from "@angular/material/stepper";
 import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialog-stepper.component.component";
-import { AnyOfRenderer } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
-import { OneOfRenderer } from "./ingestor-metadata-editor/customRenderer/one-of-renderer";
+import { AnyOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
+import { OneOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/one-of-renderer";
 import { MatRadioModule } from "@angular/material/radio";
 
 @NgModule({
@@ -34,21 +34,21 @@ import { MatRadioModule } from "@angular/material/radio";
     IngestorComponent,
     IngestorMetadataEditorComponent,
     IngestorNewTransferDialogComponent,
-    IngestorUserMetadataDialog,
-    IngestorExtractorMetadataDialog,
-    IngestorConfirmTransferDialog,
+    IngestorUserMetadataDialogComponent,
+    IngestorExtractorMetadataDialogComponent,
+    IngestorConfirmTransferDialogComponent,
     IngestorDialogStepperComponent,
-    AnyOfRenderer,
-    OneOfRenderer,
+    AnyOfRendererComponent,
+    OneOfRendererComponent,
   ],
   imports: [
-    CommonModule, 
-    MatCardModule, 
-    FormsModule, 
-    MatFormFieldModule, 
-    MatInputModule, 
-    MatButtonModule, 
-    MatProgressSpinnerModule, 
+    CommonModule,
+    MatCardModule,
+    FormsModule,
+    MatFormFieldModule,
+    MatInputModule,
+    MatButtonModule,
+    MatProgressSpinnerModule,
     RouterModule,
     MatListModule,
     MatIconModule,
@@ -64,4 +64,4 @@ import { MatRadioModule } from "@angular/material/radio";
     JsonFormsAngularMaterialModule,
   ],
 })
-export class IngestorModule { }
+export class IngestorModule {}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 52285fca6b..36b22feb0d 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -1,20 +1,33 @@
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper, ISciCatHeader } from '../ingestor.component-helper';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnInit,
+} from "@angular/core";
+import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
+import {
+  DialogDataObject,
+  IngestionRequestInformation,
+  IngestorHelper,
+  SciCatHeader,
+} from "../ingestor.component-helper";
 
 @Component({
-  selector: 'ingestor.confirm-transfer-dialog',
-  templateUrl: 'ingestor.confirm-transfer-dialog.html',
+  selector: "ingestor.confirm-transfer-dialog",
+  templateUrl: "ingestor.confirm-transfer-dialog.html",
   changeDetection: ChangeDetectionStrategy.OnPush,
-  styleUrls: ['../ingestor.component.scss'],
+  styleUrls: ["../ingestor.component.scss"],
 })
+export class IngestorConfirmTransferDialogComponent implements OnInit {
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+  provideMergeMetaData = "";
+  backendURL = "";
 
-export class IngestorConfirmTransferDialog {
-  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
-  provideMergeMetaData: string = '';
-  backendURL: string = '';
-
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
+  constructor(
+    public dialog: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+  ) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
   }
@@ -25,21 +38,24 @@ export class IngestorConfirmTransferDialog {
 
   createMetaDataString(): string {
     const space = 2;
-    const scicatMetadata: ISciCatHeader = {
-      datasetName: this.createNewTransferData.scicatHeader['datasetName'],
-      description: this.createNewTransferData.scicatHeader['description'],
-      creationLocation: this.createNewTransferData.scicatHeader['creationLocation'],
-      dataFormat: this.createNewTransferData.scicatHeader['dataFormat'],
-      ownerGroup: this.createNewTransferData.scicatHeader['ownerGroup'],
-      type: this.createNewTransferData.scicatHeader['type'],
-      license: this.createNewTransferData.scicatHeader['license'],
-      keywords: this.createNewTransferData.scicatHeader['keywords'],
-      filePath: this.createNewTransferData.scicatHeader['filePath'],
+    const scicatMetadata: SciCatHeader = {
+      datasetName: this.createNewTransferData.scicatHeader["datasetName"],
+      description: this.createNewTransferData.scicatHeader["description"],
+      creationLocation:
+        this.createNewTransferData.scicatHeader["creationLocation"],
+      dataFormat: this.createNewTransferData.scicatHeader["dataFormat"],
+      ownerGroup: this.createNewTransferData.scicatHeader["ownerGroup"],
+      type: this.createNewTransferData.scicatHeader["type"],
+      license: this.createNewTransferData.scicatHeader["license"],
+      keywords: this.createNewTransferData.scicatHeader["keywords"],
+      filePath: this.createNewTransferData.scicatHeader["filePath"],
       scientificMetadata: {
-        organizational: this.createNewTransferData.userMetaData['organizational'],
-        sample: this.createNewTransferData.userMetaData['sample'],
-        acquisition: this.createNewTransferData.extractorMetaData['acquisition'],
-        instrument: this.createNewTransferData.extractorMetaData['instrument'],
+        organizational:
+          this.createNewTransferData.userMetaData["organizational"],
+        sample: this.createNewTransferData.userMetaData["sample"],
+        acquisition:
+          this.createNewTransferData.extractorMetaData["acquisition"],
+        instrument: this.createNewTransferData.extractorMetaData["instrument"],
       },
     };
 
@@ -54,8 +70,9 @@ export class IngestorConfirmTransferDialog {
 
   onClickConfirm(): void {
     if (this.data && this.data.onClickNext) {
-      this.createNewTransferData.mergedMetaDataString = this.provideMergeMetaData;
+      this.createNewTransferData.mergedMetaDataString =
+        this.provideMergeMetaData;
       this.data.onClickNext(4);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
index cda2927a18..1531c5404f 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
@@ -1,10 +1,10 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input } from "@angular/core";
 
 @Component({
-  selector: 'ingestor-dialog-stepper',
-  templateUrl: './ingestor.dialog-stepper.component.html',
-  styleUrls: ['./ingestor.dialog-stepper.component.css']
+  selector: "ingestor-dialog-stepper",
+  templateUrl: "./ingestor.dialog-stepper.component.html",
+  styleUrls: ["./ingestor.dialog-stepper.component.css"],
 })
 export class IngestorDialogStepperComponent {
-  @Input() activeStep: number = 0;
-}
\ No newline at end of file
+  @Input() activeStep = 0;
+}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index 97ba8e811d..9fa86aa138 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -1,39 +1,52 @@
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { JsonSchema } from '@jsonforms/core';
-import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper } from '../ingestor.component-helper';
+import { ChangeDetectionStrategy, Component, Inject } from "@angular/core";
+import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
+import { JsonSchema } from "@jsonforms/core";
+import {
+  DialogDataObject,
+  IngestionRequestInformation,
+  IngestorHelper,
+} from "../ingestor.component-helper";
 
 @Component({
-  selector: 'ingestor.extractor-metadata-dialog',
-  templateUrl: 'ingestor.extractor-metadata-dialog.html',
-  styleUrls: ['../ingestor.component.scss'],
+  selector: "ingestor.extractor-metadata-dialog",
+  templateUrl: "ingestor.extractor-metadata-dialog.html",
+  styleUrls: ["../ingestor.component.scss"],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-
-export class IngestorExtractorMetadataDialog {
+export class IngestorExtractorMetadataDialogComponent {
   metadataSchemaInstrument: JsonSchema;
   metadataSchemaAcquisition: JsonSchema;
-  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
 
-  backendURL: string = '';
-  extractorMetaDataReady: boolean = false;
-  extractorMetaDataError: boolean = false;
+  backendURL = "";
+  extractorMetaDataReady = false;
+  extractorMetaDataError = false;
 
   isCardContentVisible = {
     instrument: true,
-    acquisition: true
+    acquisition: true,
   };
 
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
-        this.createNewTransferData = data.createNewTransferData;
-        this.backendURL = data.backendURL;
-        const instrumentSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.instrument;
-        const acqusitionSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.acquisition;
-        
-        this.metadataSchemaInstrument = instrumentSchema;
-        this.metadataSchemaAcquisition = acqusitionSchema;
-        this.extractorMetaDataReady = this.createNewTransferData.extractorMetaDataReady;
-        this.extractorMetaDataError = this.createNewTransferData.apiErrorInformation.metaDataExtraction;
+  constructor(
+    public dialog: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+  ) {
+    this.createNewTransferData = data.createNewTransferData;
+    this.backendURL = data.backendURL;
+    const instrumentSchema =
+      this.createNewTransferData.selectedResolvedDecodedSchema.properties
+        .instrument;
+    const acqusitionSchema =
+      this.createNewTransferData.selectedResolvedDecodedSchema.properties
+        .acquisition;
+
+    this.metadataSchemaInstrument = instrumentSchema;
+    this.metadataSchemaAcquisition = acqusitionSchema;
+    this.extractorMetaDataReady =
+      this.createNewTransferData.extractorMetaDataReady;
+    this.extractorMetaDataError =
+      this.createNewTransferData.apiErrorInformation.metaDataExtraction;
   }
 
   onClickBack(): void {
@@ -48,15 +61,15 @@ export class IngestorExtractorMetadataDialog {
     }
   }
 
-  onDataChangeExtractorMetadataInstrument(event: Object) {
-    this.createNewTransferData.extractorMetaData['instrument'] = event;
+  onDataChangeExtractorMetadataInstrument(event: any) {
+    this.createNewTransferData.extractorMetaData["instrument"] = event;
   }
 
-  onDataChangeExtractorMetadataAcquisition(event: Object) {
-    this.createNewTransferData.extractorMetaData['acquisition'] = event;
+  onDataChangeExtractorMetadataAcquisition(event: any) {
+    this.createNewTransferData.extractorMetaData["acquisition"] = event;
   }
 
   toggleCardContent(card: string): void {
     this.isCardContentVisible[card] = !this.isCardContentVisible[card];
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 198b11fdfd..ba4cae3bef 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -1,29 +1,43 @@
-import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
-import { HttpClient } from '@angular/common/http';
-import { INGESTOR_API_ENDPOINTS_V1 } from '../ingestor-api-endpoints';
-import { IDialogDataObject, IExtractionMethod, IIngestionRequestInformation, IngestorHelper } from '../ingestor.component-helper';
-import { IngestorMetadataEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnInit,
+} from "@angular/core";
+import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
+import { HttpClient } from "@angular/common/http";
+import { INGESTOR_API_ENDPOINTS_V1 } from "../ingestor-api-endpoints";
+import {
+  DialogDataObject,
+  ExtractionMethod,
+  IngestionRequestInformation,
+  IngestorHelper,
+} from "../ingestor.component-helper";
+import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 @Component({
-  selector: 'ingestor.new-transfer-dialog',
-  templateUrl: 'ingestor.new-transfer-dialog.html',
+  selector: "ingestor.new-transfer-dialog",
+  templateUrl: "ingestor.new-transfer-dialog.html",
   changeDetection: ChangeDetectionStrategy.OnPush,
-  styleUrls: ['../ingestor.component.scss']
+  styleUrls: ["../ingestor.component.scss"],
 })
-
 export class IngestorNewTransferDialogComponent implements OnInit {
-  extractionMethods: IExtractionMethod[] = [];
+  extractionMethods: ExtractionMethod[] = [];
   availableFilePaths: string[] = [];
-  backendURL: string = '';
-  extractionMethodsError: string = '';
-  availableFilePathsError: string = '';
+  backendURL = "";
+  extractionMethodsError = "";
+  availableFilePathsError = "";
 
-  uiNextButtonReady: boolean = false;
+  uiNextButtonReady = false;
 
-  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
 
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject, private http: HttpClient) {
+  constructor(
+    public dialog: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+    private http: HttpClient,
+  ) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
   }
@@ -42,66 +56,75 @@ export class IngestorNewTransferDialogComponent implements OnInit {
     return this.createNewTransferData.selectedPath;
   }
 
-  set selectedMethod(value: IExtractionMethod) {
+  set selectedMethod(value: ExtractionMethod) {
     this.createNewTransferData.selectedMethod = value;
     this.validateNextButton();
   }
 
-  get selectedMethod(): IExtractionMethod {
+  get selectedMethod(): ExtractionMethod {
     return this.createNewTransferData.selectedMethod;
   }
 
   apiGetExtractionMethods(): void {
-    this.http.get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR).subscribe(
-      (response: any) => {
-        if (response.methods && response.methods.length > 0) {
-          this.extractionMethods = response.methods;
-        }
-        else {
-          this.extractionMethodsError = 'No extraction methods found.';
-        }
-      },
-      (error: any) => {
-        this.extractionMethodsError = error.message;
-        console.error(this.extractionMethodsError);
-      }
-    );
+    this.http
+      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR)
+      .subscribe(
+        (response: any) => {
+          if (response.methods && response.methods.length > 0) {
+            this.extractionMethods = response.methods;
+          } else {
+            this.extractionMethodsError = "No extraction methods found.";
+          }
+        },
+        (error: any) => {
+          this.extractionMethodsError = error.message;
+          console.error(this.extractionMethodsError);
+        },
+      );
   }
 
   apiGetAvailableFilePaths(): void {
-    this.http.get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET).subscribe(
-      (response: any) => {
-        if (response.datasets && response.datasets.length > 0) {
-          this.availableFilePaths = response.datasets;
-        }
-        else {
-          this.availableFilePathsError = 'No datasets found.';
-        }
-      },
-      (error: any) => {
-        this.availableFilePathsError = error.message;
-        console.error(this.availableFilePathsError);
-      }
-    );
+    this.http
+      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET)
+      .subscribe(
+        (response: any) => {
+          if (response.datasets && response.datasets.length > 0) {
+            this.availableFilePaths = response.datasets;
+          } else {
+            this.availableFilePathsError = "No datasets found.";
+          }
+        },
+        (error: any) => {
+          this.availableFilePathsError = error.message;
+          console.error(this.availableFilePathsError);
+        },
+      );
   }
 
   generateExampleDataForSciCatHeader(): void {
-    this.data.createNewTransferData.scicatHeader['filePath'] = this.createNewTransferData.selectedPath;
-    this.data.createNewTransferData.scicatHeader['keywords'] = ['OpenEM'];
-
-    const nameWithoutPath = this.createNewTransferData.selectedPath.split('/|\\')[-1] ?? this.createNewTransferData.selectedPath;
-    this.data.createNewTransferData.scicatHeader['datasetName'] = nameWithoutPath;
-    this.data.createNewTransferData.scicatHeader['license'] = 'MIT License';
-    this.data.createNewTransferData.scicatHeader['type'] = 'raw';
-    this.data.createNewTransferData.scicatHeader['dataFormat'] = 'root';
-    this.data.createNewTransferData.scicatHeader['owner'] = 'User';
+    this.data.createNewTransferData.scicatHeader["filePath"] =
+      this.createNewTransferData.selectedPath;
+    this.data.createNewTransferData.scicatHeader["keywords"] = ["OpenEM"];
+
+    const nameWithoutPath =
+      this.createNewTransferData.selectedPath.split("/|\\")[-1] ??
+      this.createNewTransferData.selectedPath;
+    this.data.createNewTransferData.scicatHeader["datasetName"] =
+      nameWithoutPath;
+    this.data.createNewTransferData.scicatHeader["license"] = "MIT License";
+    this.data.createNewTransferData.scicatHeader["type"] = "raw";
+    this.data.createNewTransferData.scicatHeader["dataFormat"] = "root";
+    this.data.createNewTransferData.scicatHeader["owner"] = "User";
   }
 
   prepareSchemaForProcessing(): void {
     const encodedSchema = this.createNewTransferData.selectedMethod.schema;
     const decodedSchema = atob(encodedSchema);
     const schema = JSON.parse(decodedSchema);
-    const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(schema, schema);
+    const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
+      schema,
+      schema,
+    );
     this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
   }
 
@@ -119,6 +142,8 @@ export class IngestorNewTransferDialogComponent implements OnInit {
   }
 
   validateNextButton(): void {
-    this.uiNextButtonReady = !!this.createNewTransferData.selectedPath && !!this.createNewTransferData.selectedMethod?.name;
+    this.uiNextButtonReady =
+      !!this.createNewTransferData.selectedPath &&
+      !!this.createNewTransferData.selectedMethod?.name;
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 427bacd801..896033c8a0 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -1,37 +1,48 @@
-import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
-import { IngestorMetadataEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
-import { JsonSchema } from '@jsonforms/core';
-import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper, SciCatHeader_Schema } from '../ingestor.component-helper';
+import { ChangeDetectionStrategy, Component, Inject } from "@angular/core";
+import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
+import { JsonSchema } from "@jsonforms/core";
+import {
+  DialogDataObject,
+  IngestionRequestInformation,
+  IngestorHelper,
+  SciCatHeader_Schema,
+} from "../ingestor.component-helper";
 
 @Component({
-  selector: 'ingestor.user-metadata-dialog',
-  templateUrl: 'ingestor.user-metadata-dialog.html',
+  selector: "ingestor.user-metadata-dialog",
+  templateUrl: "ingestor.user-metadata-dialog.html",
   changeDetection: ChangeDetectionStrategy.OnPush,
-  styleUrls: ['../ingestor.component.scss'],
+  styleUrls: ["../ingestor.component.scss"],
 })
-
-export class IngestorUserMetadataDialog {
+export class IngestorUserMetadataDialogComponent {
   metadataSchemaOrganizational: JsonSchema;
   metadataSchemaSample: JsonSchema;
   scicatHeaderSchema: JsonSchema;
-  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
-  backendURL: string = '';
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+  backendURL = "";
 
-  uiNextButtonReady: boolean = true; // Change to false when dev is ready
+  uiNextButtonReady = true; // Change to false when dev is ready
 
   isCardContentVisible = {
     scicat: true,
     organizational: true,
-    sample: true
+    sample: true,
   };
 
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
+  constructor(
+    public dialog: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+  ) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
-    const organizationalSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.organizational;
-    const sampleSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
-    
+    const organizationalSchema =
+      this.createNewTransferData.selectedResolvedDecodedSchema.properties
+        .organizational;
+    const sampleSchema =
+      this.createNewTransferData.selectedResolvedDecodedSchema.properties
+        .sample;
+
     this.metadataSchemaOrganizational = organizationalSchema;
     this.metadataSchemaSample = sampleSchema;
     this.scicatHeaderSchema = SciCatHeader_Schema;
@@ -49,19 +60,19 @@ export class IngestorUserMetadataDialog {
     }
   }
 
-  onDataChangeUserMetadataOrganization(event: Object) {
-    this.createNewTransferData.userMetaData['organizational'] = event;
+  onDataChangeUserMetadataOrganization(event: any) {
+    this.createNewTransferData.userMetaData["organizational"] = event;
   }
 
-  onDataChangeUserMetadataSample(event: Object) {
-    this.createNewTransferData.userMetaData['sample'] = event;
+  onDataChangeUserMetadataSample(event: any) {
+    this.createNewTransferData.userMetaData["sample"] = event;
   }
 
-  onDataChangeUserScicatHeader(event: Object) {
+  onDataChangeUserScicatHeader(event: any) {
     this.createNewTransferData.scicatHeader = event;
   }
 
   toggleCardContent(card: string): void {
     this.isCardContentVisible[card] = !this.isCardContentVisible[card];
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
index df2d088330..acd08c0177 100644
--- a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
+++ b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
@@ -2,16 +2,16 @@ export const INGESTOR_API_ENDPOINTS_V1 = {
   DATASET: "dataset",
   TRANSFER: "transfer",
   OTHER: {
-    VERSION: 'version',
+    VERSION: "version",
   },
-  EXTRACTOR: 'extractor',
+  EXTRACTOR: "extractor",
 };
 
-export interface IPostExtractorEndpoint {
-  filePath: string,
-  methodName: string,
+export interface PostExtractorEndpoint {
+  filePath: string;
+  methodName: string;
 }
 
-export interface IPostDatasetEndpoint {
-  metaData: string
-}
\ No newline at end of file
+export interface PostDatasetEndpoint {
+  metaData: string;
+}
diff --git a/src/app/ingestor/ingestor/ingestor.component-helper.ts b/src/app/ingestor/ingestor/ingestor.component-helper.ts
index 1d31525d57..8191b9069b 100644
--- a/src/app/ingestor/ingestor/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/ingestor.component-helper.ts
@@ -1,22 +1,22 @@
-import { JsonSchema } from '@jsonforms/core';
+import { JsonSchema } from "@jsonforms/core";
 
-export interface IExtractionMethod {
+export interface ExtractionMethod {
   name: string;
   schema: string; // Base64 encoded JSON schema
-};
+}
 
-export interface IIngestionRequestInformation {
+export interface IngestionRequestInformation {
   selectedPath: string;
-  selectedMethod: IExtractionMethod;
+  selectedMethod: ExtractionMethod;
   selectedResolvedDecodedSchema: JsonSchema;
-  scicatHeader: Object;
+  scicatHeader: object;
   userMetaData: {
-    organizational: Object,
-    sample: Object,
+    organizational: object;
+    sample: object;
   };
   extractorMetaData: {
-    instrument: Object,
-    acquisition: Object,
+    instrument: object;
+    acquisition: object;
   };
   extractorMetaDataReady: boolean;
   extractMetaDataRequested: boolean;
@@ -24,11 +24,16 @@ export interface IIngestionRequestInformation {
 
   apiErrorInformation: {
     metaDataExtraction: boolean;
-  }
+  };
+}
+
+export interface TransferDataListEntry {
+  transferId: string;
+  status: string;
 }
 
 // There are many more... see DerivedDataset.ts
-export interface ISciCatHeader {
+export interface SciCatHeader {
   datasetName: string;
   description: string;
   creationLocation: string;
@@ -38,27 +43,27 @@ export interface ISciCatHeader {
   license: string;
   keywords: string[];
   filePath: string;
-  scientificMetadata: IScientificMetadata;
+  scientificMetadata: ScientificMetadata;
 }
 
-export interface IScientificMetadata {
-  organizational: Object;
-  sample: Object;
-  acquisition: Object;
-  instrument: Object;
+export interface ScientificMetadata {
+  organizational: object;
+  sample: object;
+  acquisition: object;
+  instrument: object;
 }
 
-export interface IDialogDataObject {
-  createNewTransferData: IIngestionRequestInformation;
+export interface DialogDataObject {
+  createNewTransferData: IngestionRequestInformation;
   backendURL: string;
   onClickNext: (step: number) => void;
 }
 
 export class IngestorHelper {
-  static createEmptyRequestInformation = (): IIngestionRequestInformation => {
+  static createEmptyRequestInformation = (): IngestionRequestInformation => {
     return {
-      selectedPath: '',
-      selectedMethod: { name: '', schema: '' },
+      selectedPath: "",
+      selectedMethod: { name: "", schema: "" },
       selectedResolvedDecodedSchema: {},
       scicatHeader: {},
       userMetaData: {
@@ -71,18 +76,27 @@ export class IngestorHelper {
       },
       extractorMetaDataReady: false,
       extractMetaDataRequested: false,
-      mergedMetaDataString: '',
+      mergedMetaDataString: "",
       apiErrorInformation: {
         metaDataExtraction: false,
       },
     };
   };
 
-  static mergeUserAndExtractorMetadata(userMetadata: Object, extractorMetadata: Object, space: number): string {
-    return JSON.stringify({ ...userMetadata, ...extractorMetadata }, null, space);
-  };
+  static mergeUserAndExtractorMetadata(
+    userMetadata: object,
+    extractorMetadata: object,
+    space: number,
+  ): string {
+    return JSON.stringify(
+      { ...userMetadata, ...extractorMetadata },
+      null,
+      space,
+    );
+  }
 }
 
+// eslint-disable-next-line @typescript-eslint/naming-convention
 export const SciCatHeader_Schema: JsonSchema = {
   type: "object",
   properties: {
@@ -96,9 +110,19 @@ export const SciCatHeader_Schema: JsonSchema = {
     license: { type: "string" },
     keywords: {
       type: "array",
-      items: { type: "string" }
+      items: { type: "string" },
     },
     // scientificMetadata: { type: "string" } ; is created during the ingestor process
   },
-  required: ["datasetName", "creationLocation", "dataFormat", "ownerGroup", "type", "license", "keywords", "scientificMetadata", "filePath"]
-}
\ No newline at end of file
+  required: [
+    "datasetName",
+    "creationLocation",
+    "dataFormat",
+    "ownerGroup",
+    "type",
+    "license",
+    "keywords",
+    "scientificMetadata",
+    "filePath",
+  ],
+};
diff --git a/src/app/ingestor/ingestor/ingestor.component.spec.ts b/src/app/ingestor/ingestor/ingestor.component.spec.ts
index 52186b1077..dd70900334 100644
--- a/src/app/ingestor/ingestor/ingestor.component.spec.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.spec.ts
@@ -1,15 +1,14 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { IngestorComponent } from './ingestor.component';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { IngestorComponent } from "./ingestor.component";
 
-describe('IngestorComponent', () => {
+describe("IngestorComponent", () => {
   let component: IngestorComponent;
   let fixture: ComponentFixture<IngestorComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ IngestorComponent ]
-    })
-    .compileComponents();
+      declarations: [IngestorComponent],
+    }).compileComponents();
   });
 
   beforeEach(() => {
@@ -18,7 +17,7 @@ describe('IngestorComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create', () => {
+  it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 2b49f2f90a..33210529ec 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -1,19 +1,22 @@
 import { Component, inject, OnInit } from "@angular/core";
 import { AppConfigService } from "app-config.service";
-import { HttpClient } from '@angular/common/http';
-import { ActivatedRoute, Router } from '@angular/router';
-import { INGESTOR_API_ENDPOINTS_V1, IPostDatasetEndpoint, IPostExtractorEndpoint } from "./ingestor-api-endpoints";
+import { HttpClient } from "@angular/common/http";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  INGESTOR_API_ENDPOINTS_V1,
+  PostDatasetEndpoint,
+  PostExtractorEndpoint,
+} from "./ingestor-api-endpoints";
 import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog.component";
 import { MatDialog } from "@angular/material/dialog";
-import { IngestorUserMetadataDialog } from "./dialog/ingestor.user-metadata-dialog.component";
-import { IngestorExtractorMetadataDialog } from "./dialog/ingestor.extractor-metadata-dialog.component";
-import { IngestorConfirmTransferDialog } from "./dialog/ingestor.confirm-transfer-dialog.component";
-import { IIngestionRequestInformation, IngestorHelper } from "./ingestor.component-helper";
-
-interface ITransferDataListEntry {
-  transferId: string;
-  status: string;
-}
+import { IngestorUserMetadataDialogComponent } from "./dialog/ingestor.user-metadata-dialog.component";
+import { IngestorExtractorMetadataDialogComponent } from "./dialog/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialogComponent } from "./dialog/ingestor.confirm-transfer-dialog.component";
+import {
+  IngestionRequestInformation,
+  IngestorHelper,
+  TransferDataListEntry,
+} from "./ingestor.component-helper";
 
 @Component({
   selector: "ingestor",
@@ -23,37 +26,42 @@ interface ITransferDataListEntry {
 export class IngestorComponent implements OnInit {
   readonly dialog = inject(MatDialog);
 
-  filePath: string = '';
-  loading: boolean = false;
-  forwardFacilityBackend: string = '';
+  filePath = "";
+  loading = false;
+  forwardFacilityBackend = "";
 
-  connectedFacilityBackend: string = '';
-  connectedFacilityBackendVersion: string = '';
-  connectingToFacilityBackend: boolean = false;
+  connectedFacilityBackend = "";
+  connectedFacilityBackendVersion = "";
+  connectingToFacilityBackend = false;
 
   lastUsedFacilityBackends: string[] = [];
 
-  transferDataSource: ITransferDataListEntry[] = []; // List of files to be transferred
-  displayedColumns: string[] = ['transferId', 'status', 'actions'];
+  transferDataSource: TransferDataListEntry[] = []; // List of files to be transferred
+  displayedColumns: string[] = ["transferId", "status", "actions"];
 
-  errorMessage: string = '';
-  returnValue: string = '';
+  errorMessage = "";
+  returnValue = "";
 
-  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
 
-  constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
+  constructor(
+    public appConfigService: AppConfigService,
+    private http: HttpClient,
+    private route: ActivatedRoute,
+    private router: Router,
+  ) {}
 
   ngOnInit() {
     this.connectingToFacilityBackend = true;
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
     this.transferDataSource = [];
     // Get the GET parameter 'backendUrl' from the URL
-    this.route.queryParams.subscribe(params => {
-      const backendUrl = params['backendUrl'];
+    this.route.queryParams.subscribe((params) => {
+      const backendUrl = params["backendUrl"];
       if (backendUrl) {
         this.apiConnectToFacilityBackend(backendUrl);
-      }
-      else {
+      } else {
         this.connectingToFacilityBackend = false;
       }
     });
@@ -62,35 +70,40 @@ export class IngestorComponent implements OnInit {
   apiConnectToFacilityBackend(facilityBackendUrl: string): boolean {
     let facilityBackendUrlCleaned = facilityBackendUrl.slice();
     // Check if last symbol is a slash and add version endpoint
-    if (!facilityBackendUrlCleaned.endsWith('/')) {
-      facilityBackendUrlCleaned += '/';
+    if (!facilityBackendUrlCleaned.endsWith("/")) {
+      facilityBackendUrlCleaned += "/";
     }
 
-    let facilityBackendUrlVersion = facilityBackendUrlCleaned + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION;
+    const facilityBackendUrlVersion =
+      facilityBackendUrlCleaned + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION;
 
     // Try to connect to the facility backend/version to check if it is available
-    console.log('Connecting to facility backend: ' + facilityBackendUrlVersion);
+    console.log("Connecting to facility backend: " + facilityBackendUrlVersion);
     this.http.get(facilityBackendUrlVersion).subscribe(
-      response => {
-        console.log('Connected to facility backend', response);
+      (response) => {
+        console.log("Connected to facility backend", response);
         // If the connection is successful, store the connected facility backend URL
         this.connectedFacilityBackend = facilityBackendUrlCleaned;
         this.connectingToFacilityBackend = false;
-        this.connectedFacilityBackendVersion = response['version'];
+        this.connectedFacilityBackendVersion = response["version"];
       },
-      error => {
+      (error) => {
         this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-        console.error('Request failed', error);
-        this.connectedFacilityBackend = '';
+        console.error("Request failed", error);
+        this.connectedFacilityBackend = "";
         this.connectingToFacilityBackend = false;
         this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-      }
+      },
     );
 
     return true;
   }
 
-  apiGetTransferList(page: number, pageSize: number, transferId?: string): void {
+  apiGetTransferList(
+    page: number,
+    pageSize: number,
+    transferId?: string,
+  ): void {
     const params: any = {
       page: page.toString(),
       pageSize: pageSize.toString(),
@@ -98,72 +111,92 @@ export class IngestorComponent implements OnInit {
     if (transferId) {
       params.transferId = transferId;
     }
-    this.http.get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER, { params }).subscribe(
-      response => {
-        console.log('Transfer list received', response);
-        this.transferDataSource = response['transfers'];
-      },
-      error => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-        console.error('Request failed', error);
-      }
-    );
+    this.http
+      .get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {
+        params,
+      })
+      .subscribe(
+        (response) => {
+          console.log("Transfer list received", response);
+          this.transferDataSource = response["transfers"];
+        },
+        (error) => {
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+          console.error("Request failed", error);
+        },
+      );
   }
 
   apiUpload() {
     this.loading = true;
 
-    const payload: IPostDatasetEndpoint = {
+    const payload: PostDatasetEndpoint = {
       metaData: this.createNewTransferData.mergedMetaDataString,
     };
 
-    this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET, payload).subscribe(
-      response => {
-        console.log('Upload successfully started', response);
-        this.returnValue = JSON.stringify(response);
-        this.loading = false;
-      },
-      error => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-        console.error('Upload failed', error);
-        this.loading = false;
-      }
-    );
+    this.http
+      .post(
+        this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET,
+        payload,
+      )
+      .subscribe(
+        (response) => {
+          console.log("Upload successfully started", response);
+          this.returnValue = JSON.stringify(response);
+          this.loading = false;
+        },
+        (error) => {
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+          console.error("Upload failed", error);
+          this.loading = false;
+        },
+      );
   }
 
   async apiStartMetadataExtraction(): Promise<boolean> {
     this.createNewTransferData.apiErrorInformation.metaDataExtraction = false;
 
     if (this.createNewTransferData.extractMetaDataRequested) {
-      console.log(this.createNewTransferData.extractMetaDataRequested, ' already requested'); // Debugging
+      console.log(
+        this.createNewTransferData.extractMetaDataRequested,
+        " already requested",
+      ); // Debugging
       return false;
     }
 
     this.createNewTransferData.extractorMetaDataReady = false;
     this.createNewTransferData.extractMetaDataRequested = true;
 
-    const payload: IPostExtractorEndpoint = {
+    const payload: PostExtractorEndpoint = {
       filePath: this.createNewTransferData.selectedPath,
       methodName: this.createNewTransferData.selectedMethod.name,
     };
 
     return new Promise<boolean>((resolve) => {
-      this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, payload).subscribe(
-        response => {
-          console.log('Metadata extraction result', response);
-          this.createNewTransferData.extractorMetaData.instrument = (response as any).instrument ?? {};
-          this.createNewTransferData.extractorMetaData.acquisition = (response as any).acquisition ?? {};
-          this.createNewTransferData.extractorMetaDataReady = true;
-          resolve(true);
-        },
-        error => {
-          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-          console.error('Metadata extraction failed', error);
-          this.createNewTransferData.extractorMetaDataReady = true;
-          this.createNewTransferData.apiErrorInformation.metaDataExtraction = true;
-          resolve(false);
-        }
-      );
+      this.http
+        .post(
+          this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR,
+          payload,
+        )
+        .subscribe(
+          (response) => {
+            console.log("Metadata extraction result", response);
+            this.createNewTransferData.extractorMetaData.instrument =
+              (response as any).instrument ?? {};
+            this.createNewTransferData.extractorMetaData.acquisition =
+              (response as any).acquisition ?? {};
+            this.createNewTransferData.extractorMetaDataReady = true;
+            resolve(true);
+          },
+          (error) => {
+            this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+            console.error("Metadata extraction failed", error);
+            this.createNewTransferData.extractorMetaDataReady = true;
+            this.createNewTransferData.apiErrorInformation.metaDataExtraction =
+              true;
+            resolve(false);
+          },
+        );
     });
   }
 
@@ -177,15 +210,17 @@ export class IngestorComponent implements OnInit {
         return;
       }
 
-      this.router.navigate(['/ingestor'], { queryParams: { backendUrl: this.forwardFacilityBackend } });
+      this.router.navigate(["/ingestor"], {
+        queryParams: { backendUrl: this.forwardFacilityBackend },
+      });
     }
   }
 
   onClickDisconnectIngestor() {
-    this.returnValue = '';
-    this.connectedFacilityBackend = '';
+    this.returnValue = "";
+    this.connectedFacilityBackend = "";
     // Remove the GET parameter 'backendUrl' from the URL
-    this.router.navigate(['/ingestor']);
+    this.router.navigate(["/ingestor"]);
   }
 
   // Helper functions
@@ -195,7 +230,8 @@ export class IngestorComponent implements OnInit {
 
   loadLastUsedFacilityBackends(): string[] {
     // Load the list from the local Storage
-    const lastUsedFacilityBackends = '["http://localhost:8000", "http://localhost:8888"]';
+    const lastUsedFacilityBackends =
+      '["http://localhost:8000", "http://localhost:8888"]';
     if (lastUsedFacilityBackends) {
       return JSON.parse(lastUsedFacilityBackends);
     }
@@ -203,7 +239,7 @@ export class IngestorComponent implements OnInit {
   }
 
   clearErrorMessage(): void {
-    this.errorMessage = '';
+    this.errorMessage = "";
   }
 
   onClickAddIngestion(): void {
@@ -221,41 +257,59 @@ export class IngestorComponent implements OnInit {
         this.createNewTransferData.extractMetaDataRequested = false;
         this.createNewTransferData.extractorMetaDataReady = false;
         dialogRef = this.dialog.open(IngestorNewTransferDialogComponent, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
-          disableClose: true
+          data: {
+            onClickNext: this.onClickNext.bind(this),
+            createNewTransferData: this.createNewTransferData,
+            backendURL: this.connectedFacilityBackend,
+          },
+          disableClose: true,
         });
 
         break;
       case 1:
-        this.apiStartMetadataExtraction().then((response: boolean) => {
-          if (response) console.log('Metadata extraction finished');
-          else console.error('Metadata extraction failed');
-        }).catch(error => {
-          console.error('Metadata extraction error', error);
-        });
-
-        dialogRef = this.dialog.open(IngestorUserMetadataDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
-          disableClose: true
+        this.apiStartMetadataExtraction()
+          .then((response: boolean) => {
+            if (response) console.log("Metadata extraction finished");
+            else console.error("Metadata extraction failed");
+          })
+          .catch((error) => {
+            console.error("Metadata extraction error", error);
+          });
+
+        dialogRef = this.dialog.open(IngestorUserMetadataDialogComponent, {
+          data: {
+            onClickNext: this.onClickNext.bind(this),
+            createNewTransferData: this.createNewTransferData,
+            backendURL: this.connectedFacilityBackend,
+          },
+          disableClose: true,
         });
         break;
       case 2:
-        dialogRef = this.dialog.open(IngestorExtractorMetadataDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
-          disableClose: true
+        dialogRef = this.dialog.open(IngestorExtractorMetadataDialogComponent, {
+          data: {
+            onClickNext: this.onClickNext.bind(this),
+            createNewTransferData: this.createNewTransferData,
+            backendURL: this.connectedFacilityBackend,
+          },
+          disableClose: true,
         });
         break;
       case 3:
-        dialogRef = this.dialog.open(IngestorConfirmTransferDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
-          disableClose: true
+        dialogRef = this.dialog.open(IngestorConfirmTransferDialogComponent, {
+          data: {
+            onClickNext: this.onClickNext.bind(this),
+            createNewTransferData: this.createNewTransferData,
+            backendURL: this.connectedFacilityBackend,
+          },
+          disableClose: true,
         });
         break;
       case 4:
         this.apiUpload();
         break;
       default:
-        console.error('Unknown step', step);
+        console.error("Unknown step", step);
     }
 
     // Error if the dialog reference is not set
@@ -267,16 +321,23 @@ export class IngestorComponent implements OnInit {
   }
 
   onCancelTransfer(transferId: string) {
-    console.log('Cancel transfer', transferId);
-    this.http.delete(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER + '/' + transferId).subscribe(
-      response => {
-        console.log('Transfer cancelled', response);
-        this.apiGetTransferList(1, 100);
-      },
-      error => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-        console.error('Cancel transfer failed', error);
-      }
-    );
+    console.log("Cancel transfer", transferId);
+    this.http
+      .delete(
+        this.connectedFacilityBackend +
+          INGESTOR_API_ENDPOINTS_V1.TRANSFER +
+          "/" +
+          transferId,
+      )
+      .subscribe(
+        (response) => {
+          console.log("Transfer cancelled", response);
+          this.apiGetTransferList(1, 100);
+        },
+        (error) => {
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+          console.error("Cancel transfer failed", error);
+        },
+      );
   }
-}
\ No newline at end of file
+}

From 994851f4466917a527b213194a74ec9372bc921d Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 6 Jan 2025 16:45:55 +0000
Subject: [PATCH 070/245] messages added on onedep deposition creation

---
 src/app/datasets/datasets.module.ts           |   2 +-
 src/app/datasets/onedep/onedep.component.ts   | 101 +++++++-------
 src/app/datasets/onedep/types/methods.enum.ts |  12 ++
 .../sdk/apis/onedep-depositor.service.spec.ts |  12 +-
 .../sdk/apis/onedep-depositor.service.ts      |  30 ++---
 src/app/shared/sdk/models/OneDep.ts           |  17 +++
 .../actions/onedep.actions.ts                 |  42 +++---
 .../effects/onedep.effects.ts                 | 123 ++++++++++++------
 8 files changed, 210 insertions(+), 129 deletions(-)
 create mode 100644 src/app/shared/sdk/models/OneDep.ts

diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index bf79aab65f..34a955f4cd 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -93,7 +93,7 @@ import { MatSnackBarModule } from "@angular/material/snack-bar";
 import { OneDepComponent } from "./onedep/onedep.component";
 import { OrcidFormatterDirective } from "./onedep/onedep.directive";
 import { EmpiarComponent } from "./empiar/empiar.component";
-import { OneDepEffects } from "./state-management/effects/onedep.effects";
+import { OneDepEffects } from "state-management/effects/onedep.effects";
 
 
 @NgModule({
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 7e98091306..3c0d393bae 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -24,7 +24,14 @@ import {
 } from "@scicatproject/scicat-sdk-ts";
 import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
 import { selectCurrentUser } from "state-management/selectors/user.selectors";
-import { methodsList, EmFile, DepositionFiles } from "./types/methods.enum";
+import * as fromActions from "state-management/actions/onedep.actions";
+import {
+  methodsList,
+  EmFile,
+  DepositionFiles,
+  OneDepUserInfo,
+  OneDepCreate,
+} from "./types/methods.enum";
 import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
 import { Subscription, fromEvent } from "rxjs";
 
@@ -113,7 +120,6 @@ export class OneDepComponent implements OnInit, OnDestroy {
         }),
       ]),
     });
-    console.log(this.form);
   }
 
   ngOnDestroy() {
@@ -367,73 +373,76 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
   onDepositClick() {
     //  Create a deposition
-    let body: string;
+    let body: OneDepUserInfo;
     if (this.form.value.password) {
-      body = JSON.stringify({
+      body = {
         email: this.form.value.email,
         orcidIds: this.orcidArray().value.map((item) => item.orcidId),
         country: "United States",
         method: this.form.value.emMethod,
         jwtToken: this.form.value.jwtToken,
         password: this.form.value.password,
-      });
+      };
     } else {
-      body = JSON.stringify({
+      body = {
         email: this.form.value.email,
         orcidIds: this.orcidArray().value.map((item) => item.orcidId),
         country: "United States",
         method: this.form.value.emMethod,
         jwtToken: this.form.value.jwtToken,
-      });
+      };
     }
     let depID: string;
     let metadataAdded = false;
 
-    interface OneDepCreate {
-      depID: string;
-    }
+    this.store.dispatch(
+      fromActions.createDepositionAction({
+        deposition: body as OneDepUserInfo,
+      }),
+    );
+
     this.depositor.createDep(body).subscribe({
       next: (response: OneDepCreate) => {
-        // depID = response.depID;
-        console.log("Created deposition in OneDep", response);
+        depID = response.depID;
 
-          // Call subsequent requests
-          this.fileTypes.forEach((fT) => {
-            if (fT.file) {
-              const formDataFile = new FormData();
-              formDataFile.append("jwtToken", this.form.value.jwtToken);
-              formDataFile.append("file", fT.file);
-              if (fT.emName === this.emFile.Coordinates) {
-                formDataFile.append(
-                  "scientificMetadata",
-                  JSON.stringify(this.form.value.metadata),
-                );
-                this.sendCoordFile(depID, formDataFile);
-                metadataAdded = true;
-              } else {
-                formDataFile.append(
-                  "fileMetadata",
-                  JSON.stringify({
-                    name: fT.fileName,
-                    type: fT.type,
-                    contour: fT.contour,
-                    details: fT.details,
-                  }),
-                );
-                this.sendFile(depID, formDataFile, fT.type);
-              }
-            }
-          });
-          if (!metadataAdded) {
+        // Call subsequent requests
+        this.fileTypes.forEach((fT) => {
+          if (fT.file) {
             const formDataFile = new FormData();
-
             formDataFile.append("jwtToken", this.form.value.jwtToken);
-            formDataFile.append(
-              "scientificMetadata",
-              JSON.stringify(this.form.value.metadata),
-            );
-            this.sendMetadata(depID, formDataFile);
+            formDataFile.append("file", fT.file);
+            if (fT.emName === this.emFile.Coordinates) {
+              formDataFile.append(
+                "scientificMetadata",
+                JSON.stringify(this.form.value.metadata),
+              );
+              this.sendCoordFile(depID, formDataFile);
+              metadataAdded = true;
+            } else {
+              formDataFile.append(
+                "fileMetadata",
+                JSON.stringify({
+                  name: fT.fileName,
+                  type: fT.type,
+                  contour: fT.contour,
+                  details: fT.details,
+                }),
+              );
+              // log that into message fT.type
+              this.depositor.sendFile(depID, formDataFile);
+            }
           }
+        });
+          // if (!metadataAdded) {
+          //   const formDataFile = new FormData();
+
+          //   formDataFile.append("jwtToken", this.form.value.jwtToken);
+          //   formDataFile.append(
+          //     "scientificMetadata",
+          //     JSON.stringify(this.form.value.metadata),
+          //   );
+          //   this.sendMetadata(depID, formDataFile);
+          // }
         },
         error: (error) => console.error("Request failed", error.error),
       });
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index f2c8b8bdfa..fce5bc7ee6 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -20,6 +20,18 @@ export enum EmFile {
   MTZ = "xs-mtz",
 }
 
+export interface OneDepUserInfo {
+  email: string;
+  orcidIds: string[];
+  country: string;
+  method: string;
+  jwtToken: string;
+  password?: string;
+}
+
+export interface OneDepCreate {
+  depID: string;
+}
 export interface DepositionFiles {
   emName: EmFile;
   id?: number;
diff --git a/src/app/shared/sdk/apis/onedep-depositor.service.spec.ts b/src/app/shared/sdk/apis/onedep-depositor.service.spec.ts
index ff57d2901d..bbf5cd5690 100644
--- a/src/app/shared/sdk/apis/onedep-depositor.service.spec.ts
+++ b/src/app/shared/sdk/apis/onedep-depositor.service.spec.ts
@@ -1,16 +1,16 @@
-import { TestBed } from '@angular/core/testing';
+import { TestBed } from "@angular/core/testing";
 
-import { OnedepDepositorService } from './onedep-depositor.service';
+import { Depositor } from "./onedep-depositor.service";
 
-describe('OnedepDepositorService', () => {
-  let service: OnedepDepositorService;
+describe("OnedepDepositorService", () => {
+  let service: Depositor;
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
-    service = TestBed.inject(OnedepDepositorService);
+    service = TestBed.inject(Depositor);
   });
 
-  it('should be created', () => {
+  it("should be created", () => {
     expect(service).toBeTruthy();
   });
 });
diff --git a/src/app/shared/sdk/apis/onedep-depositor.service.ts b/src/app/shared/sdk/apis/onedep-depositor.service.ts
index aa10a96f92..2382847092 100644
--- a/src/app/shared/sdk/apis/onedep-depositor.service.ts
+++ b/src/app/shared/sdk/apis/onedep-depositor.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from "@angular/core";
+import { Store } from "@ngrx/store";
+import { take } from "rxjs/operators";
 import { HttpClient, HttpHeaders, HttpResponse } from "@angular/common/http";
 import { Observable } from "rxjs";
 import { AppConfigService, AppConfig } from "app-config.service";
-
-interface OneDepCreate {
-  depID: string;
-}
+import { OneDepUserInfo, OneDepCreated, UploadedFile } from "../models/OneDep";
+import * as fromActions from "state-management/actions/onedep.actions";
 
 @Injectable({
   providedIn: "root",
@@ -14,14 +14,15 @@ export class Depositor {
   config: AppConfig;
   constructor(
     private http: HttpClient,
+    private store: Store,
     public appConfigService: AppConfigService,
   ) {
     this.config = this.appConfigService.getConfig();
   }
 
   // create deposition
-  createDep(body: string): Observable<OneDepCreate> {
-    return this.http.post<OneDepCreate>(
+  createDep(body: OneDepUserInfo): Observable<OneDepCreated> {
+    return this.http.post<OneDepCreated>(
       `${this.config.depositorURL}/onedep`,
       body,
       {
@@ -29,15 +30,10 @@ export class Depositor {
       },
     );
   }
-
-  // // Example POST request
-  // createItem(item: any): Observable<any> {
-  //   const headers = new HttpHeaders({ "Content-Type": "application/json" });
-  //   return this.http.post(`${this.apiUrl}/items`, item, { headers });
-  // }
-
-  // // Example DELETE request
-  // deleteItem(id: string): Observable<any> {
-  //   return this.http.delete(`${this.apiUrl}/items/${id}`);
-  // }
+  sendFile(depID: string, form: FormData): Observable<UploadedFile> {
+    return this.http.post<UploadedFile>(
+      `${this.config.depositorURL}/onedep/${depID}/file`,
+      form,
+    );
+  }
 }
diff --git a/src/app/shared/sdk/models/OneDep.ts b/src/app/shared/sdk/models/OneDep.ts
new file mode 100644
index 0000000000..1721eedc4e
--- /dev/null
+++ b/src/app/shared/sdk/models/OneDep.ts
@@ -0,0 +1,17 @@
+export interface OneDepCreated {
+  depID: string;
+}
+
+export interface OneDepUserInfo {
+  email: string;
+  orcidIds: string[];
+  country: string;
+  method: string;
+  jwtToken: string;
+  password?: string;
+}
+
+export interface UploadedFile {
+  depID: string;
+  FileID: string;
+}
diff --git a/src/app/state-management/actions/onedep.actions.ts b/src/app/state-management/actions/onedep.actions.ts
index 2d68b5d7ab..0f8910e0d2 100644
--- a/src/app/state-management/actions/onedep.actions.ts
+++ b/src/app/state-management/actions/onedep.actions.ts
@@ -1,35 +1,39 @@
 import { createAction, props } from "@ngrx/store";
+import {
+  OneDepUserInfo,
+  OneDepCreated,
+  UploadedFile,
+} from "shared/sdk/models/OneDep";
 
-export const createDeposition = createAction("[OneDep] Create Deposition");
+export const createDepositionAction = createAction(
+  "[OneDep] Create Deposition",
+  props<{ deposition: OneDepUserInfo }>(),
+);
 
 export const createDepositionSuccess = createAction(
   "[OneDep] Create Deposition Complete",
-  props<{ depID: string }>(),
+  props<{ deposition: OneDepCreated }>(),
 );
 
 export const createDepositionFailure = createAction(
   "[OneDep] Create Deposition Failure",
+  props<{ err: Error }>(),
 );
 
-// export const sendFile = createAction(
-//   "[OneDep] Send File",
-//   props<{ depID: string; form: FormData; fileType: string }>()
-// );
-
-// export const sendFile = createAction(
-//   "[OneDep] Send File",
-//   props<{ depID: string; form: FormData; fileType: string }>()
-// );
+export const sendFile = createAction(
+  "[OneDep] Send File",
+  props<{ depID: string; form: FormData }>(),
+);
 
-// export const sendFileSuccess = createAction(
-//   "[OneDep] Send File Success",
-//   props<{ fileType: string; res: any }>()
-// );
+export const sendFileSuccess = createAction(
+  "[OneDep] Send File Success",
+  props<{ uploadedFile: UploadedFile }>(),
+);
 
-// export const sendFileFailure = createAction(
-//   "[OneDep] Send File Failure",
-//   props<{ error: any }>()
-// );
+export const sendFileFailure = createAction(
+  "[OneDep] Send File Failure",
+  props<{ err: Error }>(),
+);
 
 // export const sendCoordFile = createAction(
 //   "[OneDep] Send Coord File",
diff --git a/src/app/state-management/effects/onedep.effects.ts b/src/app/state-management/effects/onedep.effects.ts
index 8ed164759d..169b9c796c 100644
--- a/src/app/state-management/effects/onedep.effects.ts
+++ b/src/app/state-management/effects/onedep.effects.ts
@@ -1,34 +1,45 @@
 import { Injectable } from "@angular/core";
 import { Actions, createEffect, ofType } from "@ngrx/effects";
 import { of } from "rxjs";
-import { catchError, map, mergeMap } from "rxjs/operators";
-import { HttpClient } from "@angular/common/http";
+import { catchError, map, switchMap } from "rxjs/operators";
+import { HttpErrorResponse } from "@angular/common/http";
+import { MessageType } from "state-management/models";
+import { showMessageAction } from "state-management/actions/user.actions";
 import * as fromActions from "state-management/actions/onedep.actions";
 import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
-import { Store } from "@ngrx/store";
+import {
+  OneDepUserInfo,
+  OneDepCreated,
+  UploadedFile,
+} from "shared/sdk/models/OneDep";
 
 @Injectable()
 export class OneDepEffects {
-
-  submitJob$ = createEffect(() => {
+  createDeposition$ = createEffect(() => {
     return this.actions$.pipe(
-      ofType(fromActions.submitJobAction),
-      switchMap(({ job }) =>
-        this.jobsServiceV4.jobsControllerCreateV4(job as Job).pipe(
-          map((res) => fromActions.submitJobCompleteAction({ job: res as JobInterface })),
-          catchError((err) => of(fromActions.submitJobFailedAction({ err }))),
+      ofType(fromActions.createDepositionAction),
+      switchMap(({ deposition }) =>
+        this.onedepDepositor.createDep(deposition as OneDepUserInfo).pipe(
+          map((res) =>
+            fromActions.createDepositionSuccess({
+              deposition: res as OneDepCreated,
+            }),
+          ),
+          catchError((err) => of(fromActions.createDepositionFailure({ err }))),
         ),
       ),
     );
   });
 
-  submitJobCompleteMessage$ = createEffect(() => {
+  createDepositionSuccessMessage$ = createEffect(() => {
     return this.actions$.pipe(
-      ofType(fromActions.submitJobCompleteAction),
-      switchMap(() => {
+      ofType(fromActions.createDepositionSuccess),
+      switchMap(({ deposition }) => {
         const message = {
           type: MessageType.Success,
-          content: "Job Created Successfully",
+          content:
+            "Deposition Created Successfully. Deposition ID: " +
+            deposition.depID,
           duration: 5000,
         };
         return of(showMessageAction({ message }));
@@ -36,42 +47,75 @@ export class OneDepEffects {
     );
   });
 
-  submitJobFailedMessage$ = createEffect(() => {
+  createDepositionFailureMessage$ = createEffect(() => {
     return this.actions$.pipe(
-      ofType(fromActions.submitJobFailedAction),
+      ofType(fromActions.createDepositionFailure),
       switchMap(({ err }) => {
+        const errorMessage =
+          err instanceof HttpErrorResponse
+            ? (err.error?.message ?? err.message ?? "Unknown error")
+            : err.message || "Unknown error";
         const message = {
           type: MessageType.Error,
-          content: "Job Not Submitted: " + err.message,
-          duration: 5000,
+          content: "Deposition to OneDep failed: " + errorMessage,
+          duration: 10000,
         };
         return of(showMessageAction({ message }));
       }),
     );
   });
-  
 
-  // sendFile$ = createEffect(() =>
-  //   this.actions$.pipe(
-  //     ofType(OneDepActions.sendFile),
-  //     mergeMap((action) =>
-  //       this.http
-  //         .post(
-  //           `${this.connectedDepositionBackend}onedep/${action.depID}/file`,
-  //           action.form
-  //         )
-  //         .pipe(
-  //           map((res) =>
-  //             OneDepActions.sendFileSuccess({ fileType: action.fileType, res })
-  //           ),
-  //           catchError((error) =>
-  //             of(OneDepActions.sendFileFailure({ error }))
-  //           )
-  //         )
-  //     )
-  //   )
-  // );
+  sendFile$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.sendFile),
+      switchMap(({ depID, form }) =>
+        this.onedepDepositor.sendFile(depID, form).pipe(
+          map((res) =>
+            fromActions.sendFileSuccess({
+              uploadedFile: res as UploadedFile,
+            }),
+          ),
+          catchError((err) => of(fromActions.sendFileFailure({ err }))),
+        ),
+      ),
+    );
+  });
+
+  sendFileSuccessMessage$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.sendFileSuccess),
+      switchMap(({ uploadedFile }) => {
+        const message = {
+          type: MessageType.Success,
+          content:
+            "File Upladed to Deposition ID: " +
+            uploadedFile.depID +
+            " with File ID: " +
+            uploadedFile.FileID,
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
 
+  sendFileFailureMessage$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.sendFileFailure),
+      switchMap(({ err }) => {
+        const errorMessage =
+          err instanceof HttpErrorResponse
+            ? (err.error?.message ?? err.message ?? "Unknown error")
+            : err.message || "Unknown error";
+        const message = {
+          type: MessageType.Error,
+          content: "Deposition to OneDep failed: " + errorMessage,
+          duration: 10000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
   // sendCoordFile$ = createEffect(() =>
   //   this.actions$.pipe(
   //     ofType(OneDepActions.sendCoordFile),
@@ -116,6 +160,5 @@ export class OneDepEffects {
   constructor(
     private actions$: Actions,
     private onedepDepositor: Depositor,
-    private store: Store,
   ) {}
 }

From a86748e9f44b85e435f47a2c7e2a5b357fcfa2e6 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Tue, 7 Jan 2025 13:31:16 +0000
Subject: [PATCH 071/245] Further development of metadata editor

---
 .../customRenderer/all-of-renderer.ts         |   1 +
 .../customRenderer/any-of-renderer.ts         |  60 ++++--
 .../customRenderer/array-renderer.ts          | 194 ++++++++++++++++++
 .../customRenderer/custom-renderers.ts        |   9 +
 .../customRenderer/one-of-renderer.ts         |   1 +
 .../ingestor-metadata-editor-helper.ts        |   2 +-
 .../ingestor-metadata-editor.component.scss   |  36 ++++
 src/app/ingestor/ingestor.module.ts           |   6 +
 ...ingestor.user-metadata-dialog.component.ts |   4 +
 .../ingestor/ingestor.component-helper.ts     |   6 +
 .../ingestor/ingestor/ingestor.component.ts   |  11 +-
 11 files changed, 312 insertions(+), 18 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
index 0eeefb6796..bc0df73f5e 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
@@ -3,6 +3,7 @@ import { JsonFormsControl } from "@jsonforms/angular";
 
 @Component({
   selector: "AllOfRenderer",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
   template: `<div>AllOf Renderer</div>`,
 })
 export class AllOfRendererComponent extends JsonFormsControl implements OnInit {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 1df486fff0..663d693217 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -5,29 +5,55 @@ import { configuredRenderer } from "../ingestor-metadata-editor-helper";
 
 @Component({
   selector: "app-anyof-renderer",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
   template: `
-    <div class="anyof-group">
-      <mat-card-title>{{ anyOfTitle }}</mat-card-title>
-      <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
-        <mat-tab *ngFor="let option of options" label="{{ option }}">
-          <div style="margin: 20px auto; width: 85%" *ngIf="option !== 'null'">
-            <jsonforms
-              [schema]="getTabSchema(option)"
-              [data]="passedProps.data"
-              [renderers]="defaultRenderer"
-              (dataChange)="onInnerJsonFormsChange($event)"
-            ></jsonforms>
-          </div>
-        </mat-tab>
-      </mat-tab-group>
-    </div>
+    <mat-card class="anyof-group">
+      <mat-card-title
+        >{{ anyOfTitle }}
+        <span class="spacer"></span>
+        <mat-checkbox
+          *ngIf="options.includes('null')"
+          [(ngModel)]="!nullOptionSelected"
+          (change)="nullOptionSelected = !nullOptionSelected"
+        >
+          Enabled
+        </mat-checkbox></mat-card-title
+      >
+      <mat-card-content *ngIf="!nullOptionSelected">
+        <mat-tab-group *ngIf="tabAmount > 1">
+          animationDuration="0ms" [selectedIndex]="selectedTabIndex" >
+          <mat-tab *ngFor="let option of filteredOptions" label="{{ option }}">
+            <div *ngIf="option !== 'null'">
+              <jsonforms
+                [schema]="getTabSchema(option)"
+                [data]="passedProps.data"
+                [renderers]="defaultRenderer"
+                (dataChange)="onInnerJsonFormsChange($event)"
+              ></jsonforms>
+            </div>
+          </mat-tab>
+        </mat-tab-group>
+
+        <div *ngIf="tabAmount === 1">
+          <jsonforms
+            [schema]="getTabSchema(options[0])"
+            [data]="passedProps.data"
+            [renderers]="defaultRenderer"
+            (dataChange)="onInnerJsonFormsChange($event)"
+          ></jsonforms>
+        </div>
+      </mat-card-content>
+    </mat-card>
   `,
 })
 export class AnyOfRendererComponent extends JsonFormsControl {
   dataAsString: string;
   options: string[] = [];
+  filteredOptions: string[] = [];
   anyOfTitle: string;
+  nullOptionSelected = false;
   selectedTabIndex = 0; // default value
+  tabAmount = 0; // max tabs
 
   rendererService: JsonFormsAngularService;
 
@@ -48,7 +74,11 @@ export class AnyOfRendererComponent extends JsonFormsControl {
 
     if (this.options.includes("null") && !props.data) {
       this.selectedTabIndex = this.options.indexOf("null");
+      this.nullOptionSelected = true;
     }
+
+    this.filteredOptions = this.options.filter((option) => option !== "null");
+    this.tabAmount = this.filteredOptions.length;
   }
 
   public getTabSchema(tabOption: string): JsonSchema {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
new file mode 100644
index 0000000000..49dedb6987
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
@@ -0,0 +1,194 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnDestroy,
+  OnInit,
+} from "@angular/core";
+import {
+  JsonFormsAngularService,
+  JsonFormsAbstractControl,
+} from "@jsonforms/angular";
+import {
+  ArrayLayoutProps,
+  ArrayTranslations,
+  createDefaultValue,
+  findUISchema,
+  JsonFormsState,
+  mapDispatchToArrayControlProps,
+  mapStateToArrayLayoutProps,
+  OwnPropsOfRenderer,
+  Paths,
+  setReadonly,
+  StatePropsOfArrayLayout,
+  UISchemaElement,
+  UISchemaTester,
+  unsetReadonly,
+} from "@jsonforms/core";
+
+@Component({
+  selector: "app-array-layout-renderer-custom",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
+  template: `
+    <mat-card
+      [ngStyle]="{ display: hidden ? 'none' : '' }"
+      class="array-layout"
+    >
+      <mat-card-title class="array-layout-toolbar">
+        <h2 class="mat-h2 array-layout-title">{{ label }}</h2>
+        <span></span>
+        <mat-icon
+          *ngIf="this.error?.length"
+          color="warn"
+          matBadgeColor="warn"
+          matTooltip="{{ this.error }}"
+          matTooltipClass="error-message-tooltip"
+        >
+          error_outline
+        </mat-icon>
+        <span></span>
+        <button
+          mat-button
+          matTooltip="{{ translations.addTooltip }}"
+          [disabled]="!isEnabled()"
+          (click)="add()"
+          attr.aria-label="{{ translations.addAriaLabel }}"
+        >
+          <mat-icon>add</mat-icon>
+        </button>
+      </mat-card-title>
+      <mat-card-content *ngIf="noData">
+        <p>{{ translations.noDataMessage }}</p>
+      </mat-card-content>
+      <mat-card-content
+        *ngFor="
+          let item of [].constructor(data);
+          let idx = index;
+          trackBy: trackByFn;
+          last as last;
+          first as first
+        "
+      >
+        <mat-card class="array-item" appearance="outlined">
+          <mat-card-content>
+            <jsonforms-outlet [renderProps]="getProps(idx)"></jsonforms-outlet>
+          </mat-card-content>
+          <mat-card-actions *ngIf="isEnabled()">
+            <button
+              *ngIf="uischema?.options?.showSortButtons"
+              class="item-up"
+              mat-button
+              [disabled]="first"
+              (click)="up(idx)"
+              attr.aria-label="{{ translations.upAriaLabel }}"
+              matTooltip="{{ translations.up }}"
+              matTooltipPosition="right"
+            >
+              <mat-icon>arrow_upward</mat-icon>
+            </button>
+            <button
+              *ngIf="uischema?.options?.showSortButtons"
+              class="item-down"
+              mat-button
+              [disabled]="last"
+              (click)="down(idx)"
+              attr.aria-label="{{ translations.downAriaLabel }}"
+              matTooltip="{{ translations.down }}"
+              matTooltipPosition="right"
+            >
+              <mat-icon>arrow_downward</mat-icon>
+            </button>
+            <button
+              mat-button
+              color="warn"
+              (click)="remove(idx)"
+              attr.aria-label="{{ translations.removeAriaLabel }}"
+              matTooltip="{{ translations.removeTooltip }}"
+              matTooltipPosition="right"
+            >
+              <mat-icon>delete</mat-icon>
+            </button>
+          </mat-card-actions>
+        </mat-card>
+      </mat-card-content>
+    </mat-card>
+  `,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+// eslint-disable-next-line @angular-eslint/component-class-suffix
+export class ArrayLayoutRendererCustom
+  extends JsonFormsAbstractControl<StatePropsOfArrayLayout>
+  implements OnInit, OnDestroy
+{
+  noData: boolean;
+  translations: ArrayTranslations;
+  addItem: (path: string, value: any) => () => void;
+  moveItemUp: (path: string, index: number) => () => void;
+  moveItemDown: (path: string, index: number) => () => void;
+  removeItems: (path: string, toDelete: number[]) => () => void;
+  uischemas: {
+    tester: UISchemaTester;
+    uischema: UISchemaElement;
+  }[];
+  constructor(jsonFormsService: JsonFormsAngularService) {
+    super(jsonFormsService);
+  }
+  mapToProps(state: JsonFormsState): StatePropsOfArrayLayout {
+    const props = mapStateToArrayLayoutProps(state, this.getOwnProps());
+    return { ...props };
+  }
+  remove(index: number): void {
+    this.removeItems(this.propsPath, [index])();
+  }
+  add(): void {
+    this.addItem(
+      this.propsPath,
+      createDefaultValue(this.scopedSchema, this.rootSchema)
+    )();
+  }
+  up(index: number): void {
+    this.moveItemUp(this.propsPath, index)();
+  }
+  down(index: number): void {
+    this.moveItemDown(this.propsPath, index)();
+  }
+  ngOnInit() {
+    super.ngOnInit();
+    const { addItem, removeItems, moveUp, moveDown } =
+      mapDispatchToArrayControlProps(
+        this.jsonFormsService.updateCore.bind(this.jsonFormsService),
+      );
+    this.addItem = addItem;
+    this.moveItemUp = moveUp;
+    this.moveItemDown = moveDown;
+    this.removeItems = removeItems;
+  }
+  mapAdditionalProps(props: ArrayLayoutProps) {
+    this.translations = props.translations;
+    this.noData = !props.data || props.data === 0;
+    this.uischemas = props.uischemas;
+  }
+  getProps(index: number): OwnPropsOfRenderer {
+    const uischema = findUISchema(
+      this.uischemas,
+      this.scopedSchema,
+      this.uischema.scope,
+      this.propsPath,
+      undefined,
+      this.uischema,
+      this.rootSchema,
+    );
+    if (this.isEnabled()) {
+      unsetReadonly(uischema);
+    } else {
+      setReadonly(uischema);
+    }
+    return {
+      schema: this.scopedSchema,
+      path: Paths.compose(this.propsPath, `${index}`),
+      uischema,
+    };
+  }
+  trackByFn(index: number) {
+    return index;
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index 67f76f65d9..04b118182c 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -1,6 +1,7 @@
 import {
   isAllOfControl,
   isAnyOfControl,
+  isObjectArrayWithNesting,
   isOneOfControl,
   JsonFormsRendererRegistryEntry,
 } from "@jsonforms/core";
@@ -8,6 +9,8 @@ import { OneOfRendererComponent } from "ingestor/ingestor-metadata-editor/custom
 import { AllOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer";
 import { AnyOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer";
 import { rankWith } from "@jsonforms/core";
+import { TableRendererTester } from "@jsonforms/angular-material";
+import { ArrayLayoutRendererCustom } from "./array-renderer";
 
 export const customRenderers: JsonFormsRendererRegistryEntry[] = [
   {
@@ -22,4 +25,10 @@ export const customRenderers: JsonFormsRendererRegistryEntry[] = [
     tester: rankWith(4, isAnyOfControl),
     renderer: AnyOfRendererComponent,
   },
+  // other
+  {
+    tester: rankWith(4, isObjectArrayWithNesting),
+    renderer: ArrayLayoutRendererCustom,
+  },
+  { tester: TableRendererTester, renderer: ArrayLayoutRendererCustom },
 ];
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
index 3f863aa3b1..76324cab20 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
@@ -5,6 +5,7 @@ import { configuredRenderer } from "../ingestor-metadata-editor-helper";
 
 @Component({
   selector: "app-oneof-component",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
   template: `
     <div class="anyof-group">
       <p>{{ anyOfTitle }}</p>
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index 5eb5a4964f..404a614e90 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -2,8 +2,8 @@ import { angularMaterialRenderers } from "@jsonforms/angular-material";
 import { customRenderers } from "./customRenderer/custom-renderers";
 
 export const configuredRenderer = [
-  ...angularMaterialRenderers,
   ...customRenderers,
+  ...angularMaterialRenderers,
 ];
 
 export class IngestorMetadataEditorHelper {
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
index 89fe8050d3..b41bf4ab35 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -1,3 +1,39 @@
 .ingestor-metadata-editor {
   width: 100%;
+}
+
+.spacer {
+  flex: 1 1 auto;
+}
+
+mat-card {
+  .mat-mdc-card-title {
+    display: flex;
+    padding: 16px;
+  }
+}
+
+.array-layout {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+.array-layout > * {
+  flex: 1 1 auto;
+}
+.array-layout-toolbar {
+  display: flex;
+  align-items: center;
+}
+.array-layout-title {
+  margin: 0;
+}
+.array-layout-toolbar > span {
+  flex: 1 1 auto;
+}
+.array-item {
+  padding: 16px;
+}
+::ng-deep .error-message-tooltip {
+  white-space: pre-line;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 1dfd044bf2..9e9b54d6e1 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -28,6 +28,9 @@ import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialo
 import { AnyOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
 import { OneOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/one-of-renderer";
 import { MatRadioModule } from "@angular/material/radio";
+import { ArrayLayoutRendererCustom } from "./ingestor-metadata-editor/customRenderer/array-renderer";
+import { MatBadgeModule } from "@angular/material/badge";
+import { MatTooltipModule } from "@angular/material/tooltip";
 
 @NgModule({
   declarations: [
@@ -40,6 +43,7 @@ import { MatRadioModule } from "@angular/material/radio";
     IngestorDialogStepperComponent,
     AnyOfRendererComponent,
     OneOfRendererComponent,
+    ArrayLayoutRendererCustom,
   ],
   imports: [
     CommonModule,
@@ -55,11 +59,13 @@ import { MatRadioModule } from "@angular/material/radio";
     MatTabsModule,
     MatTableModule,
     MatDialogModule,
+    MatTooltipModule,
     MatSelectModule,
     MatOptionModule,
     MatStepperModule,
     MatRadioModule,
     MatAutocompleteModule,
+    MatBadgeModule,
     JsonFormsModule,
     JsonFormsAngularMaterialModule,
   ],
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 896033c8a0..39f6298523 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -44,6 +44,10 @@ export class IngestorUserMetadataDialogComponent {
         .sample;
 
     this.metadataSchemaOrganizational = organizationalSchema;
+
+    // TODO Remove after debug
+    console.log("organizationalSchema", organizationalSchema);
+
     this.metadataSchemaSample = sampleSchema;
     this.scicatHeaderSchema = SciCatHeader_Schema;
   }
diff --git a/src/app/ingestor/ingestor/ingestor.component-helper.ts b/src/app/ingestor/ingestor/ingestor.component-helper.ts
index 8191b9069b..c022782eae 100644
--- a/src/app/ingestor/ingestor/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/ingestor.component-helper.ts
@@ -53,6 +53,12 @@ export interface ScientificMetadata {
   instrument: object;
 }
 
+export interface MetadataExtractorResult {
+  cmdStdErr: string;
+  cmdStdOut: string;
+  result: string;
+}
+
 export interface DialogDataObject {
   createNewTransferData: IngestionRequestInformation;
   backendURL: string;
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 33210529ec..637cf7f949 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -15,6 +15,8 @@ import { IngestorConfirmTransferDialogComponent } from "./dialog/ingestor.confir
 import {
   IngestionRequestInformation,
   IngestorHelper,
+  MetadataExtractorResult,
+  ScientificMetadata,
   TransferDataListEntry,
 } from "./ingestor.component-helper";
 
@@ -181,10 +183,15 @@ export class IngestorComponent implements OnInit {
         .subscribe(
           (response) => {
             console.log("Metadata extraction result", response);
+            const extractedMetadata = response as MetadataExtractorResult;
+            const extractedScientificMetadata = JSON.parse(
+              extractedMetadata.result,
+            ) as ScientificMetadata;
+
             this.createNewTransferData.extractorMetaData.instrument =
-              (response as any).instrument ?? {};
+              extractedScientificMetadata.instrument ?? {};
             this.createNewTransferData.extractorMetaData.acquisition =
-              (response as any).acquisition ?? {};
+              extractedScientificMetadata.acquisition ?? {};
             this.createNewTransferData.extractorMetaDataReady = true;
             resolve(true);
           },

From 7189d05ef93d444486be9b1e6ee4e7739ad43ab5 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 7 Jan 2025 15:46:41 +0000
Subject: [PATCH 072/245] deposition submission effects, improve to include
 more info

---
 src/app/datasets/onedep/onedep.component.ts   | 146 ++++++------
 src/app/datasets/onedep/types/methods.enum.ts |   1 -
 .../sdk/apis/onedep-depositor.service.ts      |  15 +-
 src/app/shared/sdk/models/OneDep.ts           |   9 +-
 .../actions/onedep.actions.ts                 |  68 ++++--
 .../effects/onedep.effects.spec.ts            |  29 +++
 .../effects/onedep.effects.ts                 | 210 ++++++++++++------
 .../reducers/onedep.reducer.spec.ts           |   0
 .../reducers/onedep.reducer.ts                |  35 +++
 .../selectors/onedep.selectors.ts             |  19 ++
 .../state-management/state/onedep.store.ts    |  21 ++
 11 files changed, 379 insertions(+), 174 deletions(-)
 create mode 100644 src/app/state-management/effects/onedep.effects.spec.ts
 create mode 100644 src/app/state-management/reducers/onedep.reducer.spec.ts
 create mode 100644 src/app/state-management/reducers/onedep.reducer.ts
 create mode 100644 src/app/state-management/selectors/onedep.selectors.ts
 create mode 100644 src/app/state-management/state/onedep.store.ts

diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 3c0d393bae..f2280d8b46 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -24,6 +24,7 @@ import {
 } from "@scicatproject/scicat-sdk-ts";
 import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
 import { selectCurrentUser } from "state-management/selectors/user.selectors";
+import { selectDepID } from "state-management/selectors/onedep.selectors";
 import * as fromActions from "state-management/actions/onedep.actions";
 import {
   methodsList,
@@ -33,7 +34,8 @@ import {
   OneDepCreate,
 } from "./types/methods.enum";
 import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
-import { Subscription, fromEvent } from "rxjs";
+import { Observable, Subscription, fromEvent } from "rxjs";
+import { filter, map, take } from "rxjs/operators";
 
 @Component({
   selector: "onedep",
@@ -64,7 +66,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   lastUsedDepositionBackends: string[] = [];
   forwardDepositionBackend = "";
   errorMessage = "";
-
+  depID$: Observable<string>;
   @ViewChild("fileInput") fileInput: ElementRef<HTMLInputElement> | undefined;
 
   constructor(
@@ -341,38 +343,29 @@ export class OneDepComponent implements OnInit, OnDestroy {
 
     this.fileTypes.push(newMap);
   }
-  sendFile(depID: string, form: FormData, fileType: string) {
-    this.http
-      .post(this.connectedDepositionBackend + "onedep/" + depID + "/file", form)
-      .subscribe({
-        next: (res) => console.log("Uploaded", fileType, res),
-        error: (error) =>
-          console.error("Could not upload File and Metadata", error),
-      });
-  }
-  sendCoordFile(depID: string, form: FormData) {
-    this.http
-      .post(this.connectedDepositionBackend + "onedep/" + depID + "/pdb", form)
-      .subscribe({
-        next: (res) => console.log("Uploaded Coordinates and Metadata", res),
-        error: (error) =>
-          console.error("Could not upload Coordinates and Metadata", error),
-      });
-  }
-  sendMetadata(depID: string, form: FormData) {
-    // missing token!
-    this.http
-      .post(
-        this.connectedDepositionBackend + "onedep/" + depID + "/metadata",
-        form,
-      )
-      .subscribe({
-        next: (res) => console.log("Uploaded Metadata", res),
-        error: (error) => console.error("Could not upload Metadata", error),
-      });
-  }
+  // sendFile(depID: string, form: FormData, fileType: string) {
+  //   this.http
+  //     .post(this.connectedDepositionBackend + "onedep/" + depID + "/file", form)
+  //     .subscribe({
+  //       next: (res) => console.log("Uploaded", fileType, res),
+  //       error: (error) =>
+  //         console.error("Could not upload File and Metadata", error),
+  //     });
+  // }
+
+  // sendMetadata(depID: string, form: FormData) {
+  //   // missing token!
+  //   this.http
+  //     .post(
+  //       this.connectedDepositionBackend + "onedep/" + depID + "/metadata",
+  //       form,
+  //     )
+  //     .subscribe({
+  //       next: (res) => console.log("Uploaded Metadata", res),
+  //       error: (error) => console.error("Could not upload Metadata", error),
+  //     });
+  // }
   onDepositClick() {
-    //  Create a deposition
     let body: OneDepUserInfo;
     if (this.form.value.password) {
       body = {
@@ -392,60 +385,51 @@ export class OneDepComponent implements OnInit, OnDestroy {
         jwtToken: this.form.value.jwtToken,
       };
     }
-    let depID: string;
     let metadataAdded = false;
 
+    const filesToUpload = this.fileTypes
+      .filter((fT) => fT.file)
+      .map((fT) => {
+        const formDataFile = new FormData();
+        formDataFile.append("jwtToken", this.form.value.jwtToken);
+        formDataFile.append("file", fT.file);
+        if (fT.emName === this.emFile.Coordinates) {
+          formDataFile.append(
+            "scientificMetadata",
+            JSON.stringify(this.form.value.metadata),
+          );
+          metadataAdded = true;
+        } else {
+          formDataFile.append(
+            "fileMetadata",
+            JSON.stringify({
+              name: fT.fileName,
+              type: fT.type,
+              contour: fT.contour,
+              details: fT.details,
+            }),
+          );
+        }
+        return { form: formDataFile, fileType: fT.emName };
+      });
+    // if (!metadataAdded) {
+    //   const formDataFile = new FormData();
+
+    //   formDataFile.append("jwtToken", this.form.value.jwtToken);
+    //   formDataFile.append(
+    //     "scientificMetadata",
+    //     JSON.stringify(this.form.value.metadata),
+    //   );
+    //   // FIXME: This is a temporary fix, the metadata fileType should be specified as such, once supported by OneDep API
+    //   filesToUpload.push({ form: formDataFile, fileType: EmFile.Coordinates });
+    // }
+
     this.store.dispatch(
-      fromActions.createDepositionAction({
+      fromActions.submitDeposition({
         deposition: body as OneDepUserInfo,
+        files: filesToUpload,
       }),
     );
-
-    this.depositor.createDep(body).subscribe({
-      next: (response: OneDepCreate) => {
-        depID = response.depID;
-
-        // Call subsequent requests
-        this.fileTypes.forEach((fT) => {
-          if (fT.file) {
-            const formDataFile = new FormData();
-            formDataFile.append("jwtToken", this.form.value.jwtToken);
-            formDataFile.append("file", fT.file);
-            if (fT.emName === this.emFile.Coordinates) {
-              formDataFile.append(
-                "scientificMetadata",
-                JSON.stringify(this.form.value.metadata),
-              );
-              this.sendCoordFile(depID, formDataFile);
-              metadataAdded = true;
-            } else {
-              formDataFile.append(
-                "fileMetadata",
-                JSON.stringify({
-                  name: fT.fileName,
-                  type: fT.type,
-                  contour: fT.contour,
-                  details: fT.details,
-                }),
-              );
-              // log that into message fT.type
-              this.depositor.sendFile(depID, formDataFile);
-            }
-          }
-        });
-          // if (!metadataAdded) {
-          //   const formDataFile = new FormData();
-
-          //   formDataFile.append("jwtToken", this.form.value.jwtToken);
-          //   formDataFile.append(
-          //     "scientificMetadata",
-          //     JSON.stringify(this.form.value.metadata),
-          //   );
-          //   this.sendMetadata(depID, formDataFile);
-          // }
-        },
-        error: (error) => console.error("Request failed", error.error),
-      });
   }
   onDownloadClick() {
     if (this.form.value.deposingCoordinates === "true") {
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index fce5bc7ee6..1895a716ce 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -246,4 +246,3 @@ export const methodsList: EmMethod[] = [
     ],
   },
 ];
-
diff --git a/src/app/shared/sdk/apis/onedep-depositor.service.ts b/src/app/shared/sdk/apis/onedep-depositor.service.ts
index 2382847092..8391e4a3a7 100644
--- a/src/app/shared/sdk/apis/onedep-depositor.service.ts
+++ b/src/app/shared/sdk/apis/onedep-depositor.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 import { Store } from "@ngrx/store";
-import { take } from "rxjs/operators";
+import { tap } from "rxjs/operators";
 import { HttpClient, HttpHeaders, HttpResponse } from "@angular/common/http";
 import { Observable } from "rxjs";
 import { AppConfigService, AppConfig } from "app-config.service";
@@ -20,7 +20,6 @@ export class Depositor {
     this.config = this.appConfigService.getConfig();
   }
 
-  // create deposition
   createDep(body: OneDepUserInfo): Observable<OneDepCreated> {
     return this.http.post<OneDepCreated>(
       `${this.config.depositorURL}/onedep`,
@@ -36,4 +35,16 @@ export class Depositor {
       form,
     );
   }
+  sendCoordFile(depID: string, form: FormData): Observable<UploadedFile> {
+    return this.http.post<UploadedFile>(
+      `${this.config.depositorURL}/onedep/${depID}/pdb`,
+      form,
+    );
+  }
+  sendMetadata(depID: string, form: FormData): Observable<UploadedFile> {
+    return this.http.post<UploadedFile>(
+      `${this.config.depositorURL}/onedep/${depID}/metadata`,
+      form,
+    );
+  }
 }
diff --git a/src/app/shared/sdk/models/OneDep.ts b/src/app/shared/sdk/models/OneDep.ts
index 1721eedc4e..cd7ddbb337 100644
--- a/src/app/shared/sdk/models/OneDep.ts
+++ b/src/app/shared/sdk/models/OneDep.ts
@@ -1,3 +1,5 @@
+import { EmFile } from "../../../datasets/onedep/types/methods.enum";
+
 export interface OneDepCreated {
   depID: string;
 }
@@ -13,5 +15,10 @@ export interface OneDepUserInfo {
 
 export interface UploadedFile {
   depID: string;
-  FileID: string;
+  fileID: string;
+}
+
+export interface FileUpload {
+  form: FormData;
+  fileType: EmFile;
 }
diff --git a/src/app/state-management/actions/onedep.actions.ts b/src/app/state-management/actions/onedep.actions.ts
index 0f8910e0d2..acffdeb40a 100644
--- a/src/app/state-management/actions/onedep.actions.ts
+++ b/src/app/state-management/actions/onedep.actions.ts
@@ -3,64 +3,84 @@ import {
   OneDepUserInfo,
   OneDepCreated,
   UploadedFile,
+  FileUpload,
 } from "shared/sdk/models/OneDep";
 
-export const createDepositionAction = createAction(
-  "[OneDep] Create Deposition",
-  props<{ deposition: OneDepUserInfo }>(),
+export const submitDeposition = createAction(
+  "[OneDep] Submit Deposition",
+  props<{ deposition: OneDepUserInfo; files: FileUpload[] }>(),
 );
-
-export const createDepositionSuccess = createAction(
+export const submitDepositionSuccess = createAction(
   "[OneDep] Create Deposition Complete",
   props<{ deposition: OneDepCreated }>(),
 );
 
-export const createDepositionFailure = createAction(
+export const submitDepositionFailure = createAction(
   "[OneDep] Create Deposition Failure",
   props<{ err: Error }>(),
 );
 
-export const sendFile = createAction(
-  "[OneDep] Send File",
-  props<{ depID: string; form: FormData }>(),
-);
+// export const createDepositionAction = createAction(
+//   "[OneDep] Create Deposition",
+//   props<{ deposition: OneDepUserInfo }>(),
+// );
 
-export const sendFileSuccess = createAction(
-  "[OneDep] Send File Success",
-  props<{ uploadedFile: UploadedFile }>(),
-);
+// export const createDepositionSuccess = createAction(
+//   "[OneDep] Create Deposition Complete",
+//   props<{ deposition: OneDepCreated }>(),
+// );
 
-export const sendFileFailure = createAction(
-  "[OneDep] Send File Failure",
-  props<{ err: Error }>(),
-);
+// export const createDepositionFailure = createAction(
+//   "[OneDep] Create Deposition Failure",
+//   props<{ err: Error }>(),
+// );
+
+// export const sendFile = createAction(
+//   "[OneDep] Send File",
+//   props<{ depID: string; form: FormData }>(),
+// );
+
+// export const sendFileSuccess = createAction(
+//   "[OneDep] Send File Success",
+//   props<{ uploadedFile: UploadedFile }>(),
+// );
+
+// export const sendFileFailure = createAction(
+//   "[OneDep] Send File Failure",
+//   props<{ err: Error }>(),
+// );
 
 // export const sendCoordFile = createAction(
 //   "[OneDep] Send Coord File",
-//   props<{ depID: string; form: FormData }>()
+//   props<{ depID: string; form: FormData }>(),
+// );
+
+// export const uploadFilesAction = createAction(
+//   "[OneDep] Upload Files",
+//   props<{ depID: string; files: FileUpload[] }>(),
 // );
 
 // export const sendCoordFileSuccess = createAction(
 //   "[OneDep] Send Coord File Success",
-//   props<{ res: any }>()
+//   props<{ uploadedFile: UploadedFile }>(),
 // );
 
 // export const sendCoordFileFailure = createAction(
 //   "[OneDep] Send Coord File Failure",
-//   props<{ error: any }>()
+//   props<{ error: Error }>(),
 // );
 
 // export const sendMetadata = createAction(
 //   "[OneDep] Send Metadata",
-//   props<{ depID: string; form: FormData }>()
+//   props<{ depID: string; form: FormData }>(),
 // );
 
 // export const sendMetadataSuccess = createAction(
 //   "[OneDep] Send Metadata Success",
-//   props<{ res: any }>()
+//   props<{ uploadedFile: UploadedFile }>(),
 // );
 
 // export const sendMetadataFailure = createAction(
 //   "[OneDep] Send Metadata Failure",
-//   props<{ error: any }>()
+//   props<{ error: Error }>(),
 // );
diff --git a/src/app/state-management/effects/onedep.effects.spec.ts b/src/app/state-management/effects/onedep.effects.spec.ts
new file mode 100644
index 0000000000..5264d83aa2
--- /dev/null
+++ b/src/app/state-management/effects/onedep.effects.spec.ts
@@ -0,0 +1,29 @@
+import { TestBed } from "@angular/core/testing";
+import { provideMockActions } from "@ngrx/effects/testing";
+import { provideMockStore } from "@ngrx/store/testing";
+import { HttpClientTestingModule } from "@angular/common/http/testing";
+import { Observable } from "rxjs";
+import { OneDepEffects } from "./onedep.effects";
+import { Actions } from "@ngrx/effects";
+
+describe("OneDepEffects", () => {
+  let actions$: Observable<any>;
+  let effects: OneDepEffects;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        OneDepEffects,
+        provideMockActions(() => actions$),
+        provideMockStore(),
+      ],
+    });
+
+    effects = TestBed.inject(OneDepEffects);
+  });
+
+  it("should be created", () => {
+    expect(effects).toBeTruthy();
+  });
+});
\ No newline at end of file
diff --git a/src/app/state-management/effects/onedep.effects.ts b/src/app/state-management/effects/onedep.effects.ts
index 169b9c796c..d1f654d2c5 100644
--- a/src/app/state-management/effects/onedep.effects.ts
+++ b/src/app/state-management/effects/onedep.effects.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Actions, createEffect, ofType } from "@ngrx/effects";
-import { of } from "rxjs";
-import { catchError, map, switchMap } from "rxjs/operators";
+import { of, from } from "rxjs";
+import { catchError, map, switchMap, concatMap, last } from "rxjs/operators";
 import { HttpErrorResponse } from "@angular/common/http";
 import { MessageType } from "state-management/models";
 import { showMessageAction } from "state-management/actions/user.actions";
@@ -12,28 +12,39 @@ import {
   OneDepCreated,
   UploadedFile,
 } from "shared/sdk/models/OneDep";
-
+import { EmFile } from "../../datasets/onedep/types/methods.enum";
 @Injectable()
 export class OneDepEffects {
-  createDeposition$ = createEffect(() => {
+  submitDeposition$ = createEffect(() => {
     return this.actions$.pipe(
-      ofType(fromActions.createDepositionAction),
-      switchMap(({ deposition }) =>
-        this.onedepDepositor.createDep(deposition as OneDepUserInfo).pipe(
-          map((res) =>
-            fromActions.createDepositionSuccess({
-              deposition: res as OneDepCreated,
-            }),
+      ofType(fromActions.submitDeposition),
+      switchMap(({ deposition, files }) =>
+        this.onedepDepositor.createDep(deposition).pipe(
+          switchMap((dep) =>
+            from(files).pipe(
+              concatMap((file) =>
+                file.fileType === EmFile.Coordinates
+                  ? this.onedepDepositor.sendCoordFile(dep.depID, file.form)
+                  : this.onedepDepositor.sendFile(dep.depID, file.form),
+              ),
+
+              last(), // Ensures the final emission happens only after all uploads are complete
+              map(() =>
+                fromActions.submitDepositionSuccess({
+                  deposition: dep as OneDepCreated,
+                }),
+              ),
+            ),
           ),
-          catchError((err) => of(fromActions.createDepositionFailure({ err }))),
+          catchError((err) => of(fromActions.submitDepositionFailure({ err }))),
         ),
       ),
     );
   });
 
-  createDepositionSuccessMessage$ = createEffect(() => {
+  submitDepositionSuccess$ = createEffect(() => {
     return this.actions$.pipe(
-      ofType(fromActions.createDepositionSuccess),
+      ofType(fromActions.submitDepositionSuccess),
       switchMap(({ deposition }) => {
         const message = {
           type: MessageType.Success,
@@ -47,9 +58,9 @@ export class OneDepEffects {
     );
   });
 
-  createDepositionFailureMessage$ = createEffect(() => {
+  submitDepositionFailure$ = createEffect(() => {
     return this.actions$.pipe(
-      ofType(fromActions.createDepositionFailure),
+      ofType(fromActions.submitDepositionFailure),
       switchMap(({ err }) => {
         const errorMessage =
           err instanceof HttpErrorResponse
@@ -65,57 +76,126 @@ export class OneDepEffects {
     );
   });
 
-  sendFile$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.sendFile),
-      switchMap(({ depID, form }) =>
-        this.onedepDepositor.sendFile(depID, form).pipe(
-          map((res) =>
-            fromActions.sendFileSuccess({
-              uploadedFile: res as UploadedFile,
-            }),
-          ),
-          catchError((err) => of(fromActions.sendFileFailure({ err }))),
-        ),
-      ),
-    );
-  });
+  // createDeposition$ = createEffect(() => {
+  //   return this.actions$.pipe(
+  //     ofType(fromActions.createDepositionAction),
+  //     switchMap(({ deposition }) =>
+  //       this.onedepDepositor.createDep(deposition as OneDepUserInfo).pipe(
+  //         map((res) =>
+  //           fromActions.createDepositionSuccess({
+  //             deposition: res as OneDepCreated,
+  //           }),
+  //         ),
+  //         catchError((err) => of(fromActions.createDepositionFailure({ err }))),
+  //       ),
+  //     ),
+  //   );
+  // });
 
-  sendFileSuccessMessage$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.sendFileSuccess),
-      switchMap(({ uploadedFile }) => {
-        const message = {
-          type: MessageType.Success,
-          content:
-            "File Upladed to Deposition ID: " +
-            uploadedFile.depID +
-            " with File ID: " +
-            uploadedFile.FileID,
-          duration: 5000,
-        };
-        return of(showMessageAction({ message }));
-      }),
-    );
-  });
+  // createDepositionSuccessMessage$ = createEffect(() => {
+  //   return this.actions$.pipe(
+  //     ofType(fromActions.createDepositionSuccess),
+  //     switchMap(({ deposition }) => {
+  //       const message = {
+  //         type: MessageType.Success,
+  //         content:
+  //           "Deposition Created Successfully. Deposition ID: " +
+  //           deposition.depID,
+  //         duration: 5000,
+  //       };
+  //       return of(showMessageAction({ message }));
+  //     }),
+  //   );
+  // });
+
+  // createDepositionFailureMessage$ = createEffect(() => {
+  //   return this.actions$.pipe(
+  //     ofType(fromActions.createDepositionFailure),
+  //     switchMap(({ err }) => {
+  //       const errorMessage =
+  //         err instanceof HttpErrorResponse
+  //           ? (err.error?.message ?? err.message ?? "Unknown error")
+  //           : err.message || "Unknown error";
+  //       const message = {
+  //         type: MessageType.Error,
+  //         content: "Deposition to OneDep failed: " + errorMessage,
+  //         duration: 10000,
+  //       };
+  //       return of(showMessageAction({ message }));
+  //     }),
+  //   );
+  // });
+  // uploadFiles$ = createEffect(() => {
+  //   return this.actions$.pipe(
+  //     ofType(fromActions.uploadFilesAction),
+  //     mergeMap(({ depID, files }) =>
+  //       from(files).pipe(
+  //         mergeMap((file) =>
+  //           this.onedepDepositor.sendFile(depID, file.form).pipe(
+  //             map((res) =>
+  //               fromActions.sendFileSuccess({
+  //                 uploadedFile: res as UploadedFile,
+  //               }),
+  //             ),
+  //             catchError((err) => of(fromActions.sendFileFailure({ err }))),
+  //           ),
+  //         ),
+  //       ),
+  //     ),
+  //   );
+  // });
+  // sendFile$ = createEffect(() => {
+  //   return this.actions$.pipe(
+  //     ofType(fromActions.sendFile),
+  //     switchMap(({ depID, form }) =>
+  //       this.onedepDepositor.sendFile(depID, form).pipe(
+  //         map((res) =>
+  //           fromActions.sendFileSuccess({
+  //             uploadedFile: res as UploadedFile,
+  //           }),
+  //         ),
+  //         catchError((err) => of(fromActions.sendFileFailure({ err }))),
+  //       ),
+  //     ),
+  //   );
+  // });
+
+  // sendFileSuccessMessage$ = createEffect(() => {
+  //   return this.actions$.pipe(
+  //     ofType(fromActions.sendFileSuccess),
+  //     switchMap(({ uploadedFile }) => {
+  //       const message = {
+  //         type: MessageType.Success,
+  //         content:
+  //           "File Upladed to Deposition ID: " +
+  //           uploadedFile.depID +
+  //           " with File ID: " +
+  //           uploadedFile.fileID,
+  //         duration: 5000,
+  //       };
+  //       return of(showMessageAction({ message }));
+  //     }),
+  //   );
+  // });
+
+  // sendFileFailureMessage$ = createEffect(() => {
+  //   return this.actions$.pipe(
+  //     ofType(fromActions.sendFileFailure),
+  //     switchMap(({ err }) => {
+  //       const errorMessage =
+  //         err instanceof HttpErrorResponse
+  //           ? (err.error?.message ?? err.message ?? "Unknown error")
+  //           : err.message || "Unknown error";
+  //       const message = {
+  //         type: MessageType.Error,
+  //         content: "Deposition to OneDep failed: " + errorMessage,
+  //         duration: 10000,
+  //       };
+  //       return of(showMessageAction({ message }));
+  //     }),
+  //   );
+  // });
 
-  sendFileFailureMessage$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.sendFileFailure),
-      switchMap(({ err }) => {
-        const errorMessage =
-          err instanceof HttpErrorResponse
-            ? (err.error?.message ?? err.message ?? "Unknown error")
-            : err.message || "Unknown error";
-        const message = {
-          type: MessageType.Error,
-          content: "Deposition to OneDep failed: " + errorMessage,
-          duration: 10000,
-        };
-        return of(showMessageAction({ message }));
-      }),
-    );
-  });
   // sendCoordFile$ = createEffect(() =>
   //   this.actions$.pipe(
   //     ofType(OneDepActions.sendCoordFile),
diff --git a/src/app/state-management/reducers/onedep.reducer.spec.ts b/src/app/state-management/reducers/onedep.reducer.spec.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/state-management/reducers/onedep.reducer.ts b/src/app/state-management/reducers/onedep.reducer.ts
new file mode 100644
index 0000000000..516e8bf8be
--- /dev/null
+++ b/src/app/state-management/reducers/onedep.reducer.ts
@@ -0,0 +1,35 @@
+import { createReducer, Action, on } from "@ngrx/store";
+import * as fromActions from "state-management/actions/onedep.actions";
+import {
+  OneDepState,
+  initialOneDepState,
+} from "state-management/state/onedep.store";
+
+const reducer = createReducer(
+  initialOneDepState,
+  on(
+    fromActions.submitDepositionSuccess,
+    (state, { deposition }): OneDepState => ({
+      ...state,
+      depositionCreated: deposition,
+      oneDepInteractionError: undefined,
+    }),
+  ),
+  on(
+    fromActions.submitDepositionFailure,
+    (state, { err }): OneDepState => ({
+      ...state,
+      oneDepInteractionError: err,
+    }),
+  ),
+);
+
+export const onedepReducer = (
+  state: OneDepState | undefined,
+  action: Action,
+) => {
+  if (action.type.indexOf("[OneDep]") !== -1) {
+    console.log("Action came in! " + action.type);
+  }
+  return reducer(state, action);
+};
diff --git a/src/app/state-management/selectors/onedep.selectors.ts b/src/app/state-management/selectors/onedep.selectors.ts
new file mode 100644
index 0000000000..0b58a25878
--- /dev/null
+++ b/src/app/state-management/selectors/onedep.selectors.ts
@@ -0,0 +1,19 @@
+import { createFeatureSelector, createSelector } from "@ngrx/store";
+import { OneDepState } from "state-management/state/onedep.store";
+
+export const selectOneDepState = createFeatureSelector<OneDepState>("onedep");
+
+export const selectDeposition = createSelector(
+  selectOneDepState,
+  (state) => state.depositionCreated,
+);
+
+export const selectDepID = createSelector(
+  selectDeposition,
+  (deposition) => deposition?.depID,
+);
+
+export const selectCurrentFileID = createSelector(
+  selectOneDepState,
+  (state) => state.currentFileID,
+);
diff --git a/src/app/state-management/state/onedep.store.ts b/src/app/state-management/state/onedep.store.ts
new file mode 100644
index 0000000000..32aa33be30
--- /dev/null
+++ b/src/app/state-management/state/onedep.store.ts
@@ -0,0 +1,21 @@
+import { OneDepCreated, OneDepUserInfo } from "shared/sdk/models/OneDep";
+
+export interface OneDepState {
+  // depositionInfo: OneDepUserInfo | undefined;
+
+  depositionCreated: OneDepCreated | undefined;
+
+  oneDepInteractionError: Error | undefined;
+
+  fileIDs: string[] | undefined;
+
+  currentFileID: string | undefined;
+}
+
+export const initialOneDepState: OneDepState = {
+  // depositionInfo: undefined,
+  depositionCreated: undefined,
+  oneDepInteractionError: undefined,
+  fileIDs: [],
+  currentFileID: undefined,
+};

From f4815a1875aa225328bbc892a2b98e1ce73e62b6 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 9 Jan 2025 07:17:07 +0000
Subject: [PATCH 073/245] Update Changes and Bugfixes in psi-deployment-openem

---
 .../customRenderer/all-of-renderer.ts         |  11 +-
 .../customRenderer/any-of-renderer.ts         | 149 +++++----
 .../customRenderer/array-renderer.ts          | 194 +++++++++++
 .../customRenderer/custom-renderers.ts        |  34 +-
 .../customRenderer/one-of-renderer.ts         | 119 ++++---
 .../ingestor-metadata-editor-helper.ts        |  17 +-
 .../ingestor-metadata-editor.component.scss   |  36 +++
 .../ingestor-metadata-editor.component.ts     |  23 +-
 src/app/ingestor/ingestor.module.ts           |  48 +--
 ...estor.confirm-transfer-dialog.component.ts |  73 +++--
 ...stor.dialog-stepper.component.component.ts |  12 +-
 ...tor.extractor-metadata-dialog.component.ts |  71 ++--
 .../ingestor.new-transfer-dialog.component.ts | 143 ++++----
 ...ingestor.user-metadata-dialog.component.ts |  63 ++--
 .../ingestor/ingestor-api-endpoints.ts        |  16 +-
 .../ingestor/ingestor.component-helper.ts     |  90 ++++--
 .../ingestor/ingestor.component.spec.ts       |  15 +-
 .../ingestor/ingestor/ingestor.component.ts   | 304 +++++++++++-------
 18 files changed, 948 insertions(+), 470 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
index 91085fbaf7..bc0df73f5e 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
@@ -1,11 +1,12 @@
-import { Component } from '@angular/core';
-import { JsonFormsControl } from '@jsonforms/angular';
+import { Component, OnInit } from "@angular/core";
+import { JsonFormsControl } from "@jsonforms/angular";
 
 @Component({
-  selector: 'AllOfRenderer',
-  template: `<div>AllOf Renderer</div>`
+  selector: "AllOfRenderer",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
+  template: `<div>AllOf Renderer</div>`,
 })
-export class AllOfRenderer extends JsonFormsControl {
+export class AllOfRendererComponent extends JsonFormsControl implements OnInit {
   data: any[] = [];
 
   ngOnInit() {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 530d762196..663d693217 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -1,70 +1,109 @@
-import { Component } from '@angular/core';
-import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
-import { ControlProps, JsonSchema } from '@jsonforms/core';
-import { configuredRenderer } from '../ingestor-metadata-editor-helper';
+import { Component } from "@angular/core";
+import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
+import { ControlProps, JsonSchema } from "@jsonforms/core";
+import { configuredRenderer } from "../ingestor-metadata-editor-helper";
 
 @Component({
-    selector: 'app-anyof-renderer',
-    template: `
-    <div class="anyof-group">
-    <mat-card-title>{{anyOfTitle}}</mat-card-title>
-
-    <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTabIndex">
-        <mat-tab *ngFor="let option of options" label="{{option}}">
-            <div style="margin: 20px auto; width: 85%" *ngIf="option !== 'null'">
-                <jsonforms [schema]="getTabSchema(option)" [data]="passedProps.data" [renderers]="defaultRenderer" (dataChange)=onInnerJsonFormsChange($event)></jsonforms>
+  selector: "app-anyof-renderer",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
+  template: `
+    <mat-card class="anyof-group">
+      <mat-card-title
+        >{{ anyOfTitle }}
+        <span class="spacer"></span>
+        <mat-checkbox
+          *ngIf="options.includes('null')"
+          [(ngModel)]="!nullOptionSelected"
+          (change)="nullOptionSelected = !nullOptionSelected"
+        >
+          Enabled
+        </mat-checkbox></mat-card-title
+      >
+      <mat-card-content *ngIf="!nullOptionSelected">
+        <mat-tab-group *ngIf="tabAmount > 1">
+          animationDuration="0ms" [selectedIndex]="selectedTabIndex" >
+          <mat-tab *ngFor="let option of filteredOptions" label="{{ option }}">
+            <div *ngIf="option !== 'null'">
+              <jsonforms
+                [schema]="getTabSchema(option)"
+                [data]="passedProps.data"
+                [renderers]="defaultRenderer"
+                (dataChange)="onInnerJsonFormsChange($event)"
+              ></jsonforms>
             </div>
-        </mat-tab>
-    </mat-tab-group>
-    </div>
-  `
+          </mat-tab>
+        </mat-tab-group>
+
+        <div *ngIf="tabAmount === 1">
+          <jsonforms
+            [schema]="getTabSchema(options[0])"
+            [data]="passedProps.data"
+            [renderers]="defaultRenderer"
+            (dataChange)="onInnerJsonFormsChange($event)"
+          ></jsonforms>
+        </div>
+      </mat-card-content>
+    </mat-card>
+  `,
 })
-export class AnyOfRenderer extends JsonFormsControl {
+export class AnyOfRendererComponent extends JsonFormsControl {
+  dataAsString: string;
+  options: string[] = [];
+  filteredOptions: string[] = [];
+  anyOfTitle: string;
+  nullOptionSelected = false;
+  selectedTabIndex = 0; // default value
+  tabAmount = 0; // max tabs
 
-    dataAsString: string;
-    options: string[] = [];
-    anyOfTitle: string;
-    selectedTabIndex: number = 0; // default value 
+  rendererService: JsonFormsAngularService;
 
-    rendererService: JsonFormsAngularService;
+  defaultRenderer = configuredRenderer;
+  passedProps: ControlProps;
 
-    defaultRenderer = configuredRenderer;
-    passedProps: ControlProps;
+  constructor(service: JsonFormsAngularService) {
+    super(service);
+    this.rendererService = service;
+  }
 
-    constructor(service: JsonFormsAngularService) {
-        super(service);
-        this.rendererService = service;
-    }
+  public mapAdditionalProps(props: ControlProps) {
+    this.passedProps = props;
+    this.anyOfTitle = props.label || "AnyOf";
+    this.options = props.schema.anyOf.map(
+      (option: any) => option.title || option.type || JSON.stringify(option),
+    );
 
-    public mapAdditionalProps(props: ControlProps) {
-        this.passedProps = props;
-        this.anyOfTitle = props.label || 'AnyOf';
-        this.options = props.schema.anyOf.map((option: any) => option.title || option.type || JSON.stringify(option));
-    
-        if (this.options.includes("null") && !props.data) {
-            this.selectedTabIndex = this.options.indexOf("null");
-        }
+    if (this.options.includes("null") && !props.data) {
+      this.selectedTabIndex = this.options.indexOf("null");
+      this.nullOptionSelected = true;
     }
 
-    public getTabSchema(tabOption: string): JsonSchema {
-        const selectedSchema = (this.passedProps.schema.anyOf as any).find((option: any) => option.title === tabOption || option.type === tabOption || JSON.stringify(option) === tabOption);
-        return selectedSchema;
-    }
+    this.filteredOptions = this.options.filter((option) => option !== "null");
+    this.tabAmount = this.filteredOptions.length;
+  }
+
+  public getTabSchema(tabOption: string): JsonSchema {
+    const selectedSchema = (this.passedProps.schema.anyOf as any).find(
+      (option: any) =>
+        option.title === tabOption ||
+        option.type === tabOption ||
+        JSON.stringify(option) === tabOption,
+    );
+    return selectedSchema;
+  }
 
-    public onInnerJsonFormsChange(event: any) {
-        // Check if data is equal to the passedProps.data
-        if (event !== this.passedProps.data) {
-            const updatedData = this.rendererService.getState().jsonforms.core.data;
+  public onInnerJsonFormsChange(event: any) {
+    if (event !== this.passedProps.data) {
+      const updatedData = this.rendererService.getState().jsonforms.core.data;
 
-            // aktualisiere das aktuelle Datenobjekt
-            const pathSegments = this.passedProps.path.split('.');
-            let current = updatedData;
-            for (let i = 0; i < pathSegments.length - 1; i++) {
-                current = current[pathSegments[i]];
-            }
-            current[pathSegments[pathSegments.length - 1]] = event;
+      // Update the data in the correct path
+      const pathSegments = this.passedProps.path.split(".");
+      let current = updatedData;
+      for (let i = 0; i < pathSegments.length - 1; i++) {
+        current = current[pathSegments[i]];
+      }
+      current[pathSegments[pathSegments.length - 1]] = event;
 
-            this.rendererService.setData(updatedData);
-        }
+      this.rendererService.setData(updatedData);
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
new file mode 100644
index 0000000000..49dedb6987
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
@@ -0,0 +1,194 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnDestroy,
+  OnInit,
+} from "@angular/core";
+import {
+  JsonFormsAngularService,
+  JsonFormsAbstractControl,
+} from "@jsonforms/angular";
+import {
+  ArrayLayoutProps,
+  ArrayTranslations,
+  createDefaultValue,
+  findUISchema,
+  JsonFormsState,
+  mapDispatchToArrayControlProps,
+  mapStateToArrayLayoutProps,
+  OwnPropsOfRenderer,
+  Paths,
+  setReadonly,
+  StatePropsOfArrayLayout,
+  UISchemaElement,
+  UISchemaTester,
+  unsetReadonly,
+} from "@jsonforms/core";
+
+@Component({
+  selector: "app-array-layout-renderer-custom",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
+  template: `
+    <mat-card
+      [ngStyle]="{ display: hidden ? 'none' : '' }"
+      class="array-layout"
+    >
+      <mat-card-title class="array-layout-toolbar">
+        <h2 class="mat-h2 array-layout-title">{{ label }}</h2>
+        <span></span>
+        <mat-icon
+          *ngIf="this.error?.length"
+          color="warn"
+          matBadgeColor="warn"
+          matTooltip="{{ this.error }}"
+          matTooltipClass="error-message-tooltip"
+        >
+          error_outline
+        </mat-icon>
+        <span></span>
+        <button
+          mat-button
+          matTooltip="{{ translations.addTooltip }}"
+          [disabled]="!isEnabled()"
+          (click)="add()"
+          attr.aria-label="{{ translations.addAriaLabel }}"
+        >
+          <mat-icon>add</mat-icon>
+        </button>
+      </mat-card-title>
+      <mat-card-content *ngIf="noData">
+        <p>{{ translations.noDataMessage }}</p>
+      </mat-card-content>
+      <mat-card-content
+        *ngFor="
+          let item of [].constructor(data);
+          let idx = index;
+          trackBy: trackByFn;
+          last as last;
+          first as first
+        "
+      >
+        <mat-card class="array-item" appearance="outlined">
+          <mat-card-content>
+            <jsonforms-outlet [renderProps]="getProps(idx)"></jsonforms-outlet>
+          </mat-card-content>
+          <mat-card-actions *ngIf="isEnabled()">
+            <button
+              *ngIf="uischema?.options?.showSortButtons"
+              class="item-up"
+              mat-button
+              [disabled]="first"
+              (click)="up(idx)"
+              attr.aria-label="{{ translations.upAriaLabel }}"
+              matTooltip="{{ translations.up }}"
+              matTooltipPosition="right"
+            >
+              <mat-icon>arrow_upward</mat-icon>
+            </button>
+            <button
+              *ngIf="uischema?.options?.showSortButtons"
+              class="item-down"
+              mat-button
+              [disabled]="last"
+              (click)="down(idx)"
+              attr.aria-label="{{ translations.downAriaLabel }}"
+              matTooltip="{{ translations.down }}"
+              matTooltipPosition="right"
+            >
+              <mat-icon>arrow_downward</mat-icon>
+            </button>
+            <button
+              mat-button
+              color="warn"
+              (click)="remove(idx)"
+              attr.aria-label="{{ translations.removeAriaLabel }}"
+              matTooltip="{{ translations.removeTooltip }}"
+              matTooltipPosition="right"
+            >
+              <mat-icon>delete</mat-icon>
+            </button>
+          </mat-card-actions>
+        </mat-card>
+      </mat-card-content>
+    </mat-card>
+  `,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+// eslint-disable-next-line @angular-eslint/component-class-suffix
+export class ArrayLayoutRendererCustom
+  extends JsonFormsAbstractControl<StatePropsOfArrayLayout>
+  implements OnInit, OnDestroy
+{
+  noData: boolean;
+  translations: ArrayTranslations;
+  addItem: (path: string, value: any) => () => void;
+  moveItemUp: (path: string, index: number) => () => void;
+  moveItemDown: (path: string, index: number) => () => void;
+  removeItems: (path: string, toDelete: number[]) => () => void;
+  uischemas: {
+    tester: UISchemaTester;
+    uischema: UISchemaElement;
+  }[];
+  constructor(jsonFormsService: JsonFormsAngularService) {
+    super(jsonFormsService);
+  }
+  mapToProps(state: JsonFormsState): StatePropsOfArrayLayout {
+    const props = mapStateToArrayLayoutProps(state, this.getOwnProps());
+    return { ...props };
+  }
+  remove(index: number): void {
+    this.removeItems(this.propsPath, [index])();
+  }
+  add(): void {
+    this.addItem(
+      this.propsPath,
+      createDefaultValue(this.scopedSchema, this.rootSchema)
+    )();
+  }
+  up(index: number): void {
+    this.moveItemUp(this.propsPath, index)();
+  }
+  down(index: number): void {
+    this.moveItemDown(this.propsPath, index)();
+  }
+  ngOnInit() {
+    super.ngOnInit();
+    const { addItem, removeItems, moveUp, moveDown } =
+      mapDispatchToArrayControlProps(
+        this.jsonFormsService.updateCore.bind(this.jsonFormsService),
+      );
+    this.addItem = addItem;
+    this.moveItemUp = moveUp;
+    this.moveItemDown = moveDown;
+    this.removeItems = removeItems;
+  }
+  mapAdditionalProps(props: ArrayLayoutProps) {
+    this.translations = props.translations;
+    this.noData = !props.data || props.data === 0;
+    this.uischemas = props.uischemas;
+  }
+  getProps(index: number): OwnPropsOfRenderer {
+    const uischema = findUISchema(
+      this.uischemas,
+      this.scopedSchema,
+      this.uischema.scope,
+      this.propsPath,
+      undefined,
+      this.uischema,
+      this.rootSchema,
+    );
+    if (this.isEnabled()) {
+      unsetReadonly(uischema);
+    } else {
+      setReadonly(uischema);
+    }
+    return {
+      schema: this.scopedSchema,
+      path: Paths.compose(this.propsPath, `${index}`),
+      uischema,
+    };
+  }
+  trackByFn(index: number) {
+    return index;
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index 8b807f113b..04b118182c 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -1,20 +1,34 @@
-import { isAllOfControl, isAnyOfControl, isOneOfControl, JsonFormsRendererRegistryEntry } from '@jsonforms/core';
-import { OneOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer';
-import { AllOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer';
-import { AnyOfRenderer } from 'ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer';
-import { isRangeControl, RankedTester, rankWith } from '@jsonforms/core';
+import {
+  isAllOfControl,
+  isAnyOfControl,
+  isObjectArrayWithNesting,
+  isOneOfControl,
+  JsonFormsRendererRegistryEntry,
+} from "@jsonforms/core";
+import { OneOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer";
+import { AllOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer";
+import { AnyOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer";
+import { rankWith } from "@jsonforms/core";
+import { TableRendererTester } from "@jsonforms/angular-material";
+import { ArrayLayoutRendererCustom } from "./array-renderer";
 
 export const customRenderers: JsonFormsRendererRegistryEntry[] = [
   {
     tester: rankWith(4, isOneOfControl),
-    renderer: OneOfRenderer
+    renderer: OneOfRendererComponent,
   },
   {
     tester: rankWith(4, isAllOfControl),
-    renderer: AllOfRenderer
+    renderer: AllOfRendererComponent,
   },
   {
     tester: rankWith(4, isAnyOfControl),
-    renderer: AnyOfRenderer
-  }
-];
\ No newline at end of file
+    renderer: AnyOfRendererComponent,
+  },
+  // other
+  {
+    tester: rankWith(4, isObjectArrayWithNesting),
+    renderer: ArrayLayoutRendererCustom,
+  },
+  { tester: TableRendererTester, renderer: ArrayLayoutRendererCustom },
+];
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
index 42665d5c62..76324cab20 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
@@ -1,69 +1,88 @@
-import { Component } from '@angular/core';
-import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
-import { ControlProps, JsonSchema } from '@jsonforms/core';
-import { configuredRenderer } from '../ingestor-metadata-editor-helper';
+import { Component } from "@angular/core";
+import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
+import { ControlProps, JsonSchema } from "@jsonforms/core";
+import { configuredRenderer } from "../ingestor-metadata-editor-helper";
 
 @Component({
-    selector: 'app-oneof-component',
-    template: `
+  selector: "app-oneof-component",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
+  template: `
     <div class="anyof-group">
-      <p>{{anyOfTitle}}</p>
+      <p>{{ anyOfTitle }}</p>
       <mat-radio-group [(ngModel)]="selectedOption" (change)="onOptionChange()">
-        <mat-radio-button *ngFor="let option of options" [value]="option" style="margin-right: 10px;">
-          {{option}}
+        <mat-radio-button
+          *ngFor="let option of options"
+          [value]="option"
+          style="margin-right: 10px;"
+        >
+          {{ option }}
         </mat-radio-button>
       </mat-radio-group>
-      <div style="margin-top: 20px;" *ngIf="selectedAnyOption && selectedOption !== 'null'">
-        <jsonforms [schema]="selectedAnyOption" [data]="passedProps.data" [renderers]="defaultRenderer" (dataChange)=onInnerJsonFormsChange($event)></jsonforms>
+      <div
+        style="margin-top: 20px;"
+        *ngIf="selectedAnyOption && selectedOption !== 'null'"
+      >
+        <jsonforms
+          [schema]="selectedAnyOption"
+          [data]="passedProps.data"
+          [renderers]="defaultRenderer"
+          (dataChange)="onInnerJsonFormsChange($event)"
+        ></jsonforms>
       </div>
     </div>
-  `
+  `,
 })
-export class OneOfRenderer extends JsonFormsControl {
+export class OneOfRendererComponent extends JsonFormsControl {
+  dataAsString: string;
+  options: string[] = [];
+  anyOfTitle: string;
+  selectedOption: string;
+  selectedAnyOption: JsonSchema;
 
-    dataAsString: string;
-    options: string[] = [];
-    anyOfTitle: string;
-    selectedOption: string;
-    selectedAnyOption: JsonSchema;
+  rendererService: JsonFormsAngularService;
 
-    rendererService: JsonFormsAngularService;
+  defaultRenderer = configuredRenderer;
+  passedProps: ControlProps;
 
-    defaultRenderer = configuredRenderer;
-    passedProps: ControlProps;
+  constructor(service: JsonFormsAngularService) {
+    super(service);
+    this.rendererService = service;
+  }
 
-    constructor(service: JsonFormsAngularService) {
-        super(service);
-        this.rendererService = service;
+  public mapAdditionalProps(props: ControlProps) {
+    this.passedProps = props;
+    this.anyOfTitle = props.label || "AnyOf";
+    this.options = props.schema.anyOf.map(
+      (option: any) => option.title || option.type || JSON.stringify(option),
+    );
+    if (!props.data) {
+      this.selectedOption = "null"; // Auf "null" setzen, wenn die Daten leer sind
     }
+  }
 
-    public mapAdditionalProps(props: ControlProps) {
-        this.passedProps = props;
-        this.anyOfTitle = props.label || 'AnyOf';
-        this.options = props.schema.anyOf.map((option: any) => option.title || option.type || JSON.stringify(option));
-        if (!props.data) {
-            this.selectedOption = 'null'; // Auf "null" setzen, wenn die Daten leer sind
-        }
-    }
-
-    public onOptionChange() {
-        this.selectedAnyOption = (this.passedProps.schema.anyOf as any).find((option: any) => option.title === this.selectedOption || option.type === this.selectedOption || JSON.stringify(option) === this.selectedOption);
-    }
+  public onOptionChange() {
+    this.selectedAnyOption = (this.passedProps.schema.anyOf as any).find(
+      (option: any) =>
+        option.title === this.selectedOption ||
+        option.type === this.selectedOption ||
+        JSON.stringify(option) === this.selectedOption,
+    );
+  }
 
-    public onInnerJsonFormsChange(event: any) {
-        // Check if data is equal to the passedProps.data
-        if (event !== this.passedProps.data) {
-            const updatedData = this.rendererService.getState().jsonforms.core.data;
+  public onInnerJsonFormsChange(event: any) {
+    // Check if data is equal to the passedProps.data
+    if (event !== this.passedProps.data) {
+      const updatedData = this.rendererService.getState().jsonforms.core.data;
 
-            // aktualisiere das aktuelle Datenobjekt
-            const pathSegments = this.passedProps.path.split('.');
-            let current = updatedData;
-            for (let i = 0; i < pathSegments.length - 1; i++) {
-                current = current[pathSegments[i]];
-            }
-            current[pathSegments[pathSegments.length - 1]] = event;
+      // aktualisiere das aktuelle Datenobjekt
+      const pathSegments = this.passedProps.path.split(".");
+      let current = updatedData;
+      for (let i = 0; i < pathSegments.length - 1; i++) {
+        current = current[pathSegments[i]];
+      }
+      current[pathSegments[pathSegments.length - 1]] = event;
 
-            this.rendererService.setData(updatedData);
-        }
+      this.rendererService.setData(updatedData);
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index 65c4d640d3..404a614e90 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -2,8 +2,8 @@ import { angularMaterialRenderers } from "@jsonforms/angular-material";
 import { customRenderers } from "./customRenderer/custom-renderers";
 
 export const configuredRenderer = [
-  ...angularMaterialRenderers,
   ...customRenderers,
+  ...angularMaterialRenderers,
 ];
 
 export class IngestorMetadataEditorHelper {
@@ -14,19 +14,22 @@ export class IngestorMetadataEditorHelper {
     }
 
     if (schema.$ref) {
-      const refPath = schema.$ref.replace('#/', '').split('/');
+      const refPath = schema.$ref.replace("#/", "").split("/");
       let ref = rootSchema;
       refPath.forEach((part) => {
         ref = ref[part];
       });
       return IngestorMetadataEditorHelper.resolveRefs(ref, rootSchema);
-    } else if (typeof schema === 'object') {
+    } else if (typeof schema === "object") {
       for (const key in schema) {
-        if (schema.hasOwnProperty(key)) {
-          schema[key] = IngestorMetadataEditorHelper.resolveRefs(schema[key], rootSchema);
+        if (Object.prototype.hasOwnProperty.call(schema, key)) {
+          schema[key] = IngestorMetadataEditorHelper.resolveRefs(
+            schema[key],
+            rootSchema,
+          );
         }
       }
     }
     return schema;
-  };
-};
\ No newline at end of file
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
index 89fe8050d3..b41bf4ab35 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -1,3 +1,39 @@
 .ingestor-metadata-editor {
   width: 100%;
+}
+
+.spacer {
+  flex: 1 1 auto;
+}
+
+mat-card {
+  .mat-mdc-card-title {
+    display: flex;
+    padding: 16px;
+  }
+}
+
+.array-layout {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+.array-layout > * {
+  flex: 1 1 auto;
+}
+.array-layout-toolbar {
+  display: flex;
+  align-items: center;
+}
+.array-layout-title {
+  margin: 0;
+}
+.array-layout-toolbar > span {
+  flex: 1 1 auto;
+}
+.array-item {
+  padding: 16px;
+}
+::ng-deep .error-message-tooltip {
+  white-space: pre-line;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 308a64143b..d4bf2a72e1 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -1,19 +1,18 @@
-import { Component, EventEmitter, Output, Input } from '@angular/core';
-import { JsonSchema } from '@jsonforms/core';
-import { configuredRenderer } from './ingestor-metadata-editor-helper';
+import { Component, EventEmitter, Output, Input } from "@angular/core";
+import { JsonSchema } from "@jsonforms/core";
+import { configuredRenderer } from "./ingestor-metadata-editor-helper";
 
 @Component({
-  selector: 'app-metadata-editor',
+  selector: "app-metadata-editor",
   template: `<jsonforms
-  [data]="data"
-  [schema]="schema"
-  [renderers]="combinedRenderers"
-  (dataChange)="onDataChange($event)"
-></jsonforms>`,
+    [data]="data"
+    [schema]="schema"
+    [renderers]="combinedRenderers"
+    (dataChange)="onDataChange($event)"
+  ></jsonforms>`,
 })
-
 export class IngestorMetadataEditorComponent {
-  @Input() data: Object;
+  @Input() data: object;
   @Input() schema: JsonSchema;
 
   @Output() dataChange = new EventEmitter<string>();
@@ -25,4 +24,4 @@ export class IngestorMetadataEditorComponent {
   onDataChange(event: any) {
     this.dataChange.emit(event);
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index eb79e0e644..9e9b54d6e1 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -9,8 +9,8 @@ import { MatFormFieldModule } from "@angular/material/form-field";
 import { MatInputModule } from "@angular/material/input";
 import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
 import { FormsModule } from "@angular/forms";
-import { MatListModule } from '@angular/material/list';
-import { MatIconModule } from '@angular/material/icon';
+import { MatListModule } from "@angular/material/list";
+import { MatIconModule } from "@angular/material/icon";
 import { MatTabsModule } from "@angular/material/tabs";
 import { MatTableModule } from "@angular/material/table";
 import { MatDialogModule } from "@angular/material/dialog";
@@ -18,50 +18,56 @@ import { MatSelectModule } from "@angular/material/select";
 import { MatOptionModule } from "@angular/material/core";
 import { MatAutocompleteModule } from "@angular/material/autocomplete";
 import { IngestorNewTransferDialogComponent } from "./ingestor/dialog/ingestor.new-transfer-dialog.component";
-import { IngestorUserMetadataDialog } from "./ingestor/dialog/ingestor.user-metadata-dialog.component";
-import { JsonFormsModule } from '@jsonforms/angular';
+import { IngestorUserMetadataDialogComponent } from "./ingestor/dialog/ingestor.user-metadata-dialog.component";
+import { JsonFormsModule } from "@jsonforms/angular";
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
-import { IngestorExtractorMetadataDialog } from "./ingestor/dialog/ingestor.extractor-metadata-dialog.component";
-import { IngestorConfirmTransferDialog } from "./ingestor/dialog/ingestor.confirm-transfer-dialog.component";
+import { IngestorExtractorMetadataDialogComponent } from "./ingestor/dialog/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialogComponent } from "./ingestor/dialog/ingestor.confirm-transfer-dialog.component";
 import { MatStepperModule } from "@angular/material/stepper";
 import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialog-stepper.component.component";
-import { AnyOfRenderer } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
-import { OneOfRenderer } from "./ingestor-metadata-editor/customRenderer/one-of-renderer";
+import { AnyOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
+import { OneOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/one-of-renderer";
 import { MatRadioModule } from "@angular/material/radio";
+import { ArrayLayoutRendererCustom } from "./ingestor-metadata-editor/customRenderer/array-renderer";
+import { MatBadgeModule } from "@angular/material/badge";
+import { MatTooltipModule } from "@angular/material/tooltip";
 
 @NgModule({
   declarations: [
     IngestorComponent,
     IngestorMetadataEditorComponent,
     IngestorNewTransferDialogComponent,
-    IngestorUserMetadataDialog,
-    IngestorExtractorMetadataDialog,
-    IngestorConfirmTransferDialog,
+    IngestorUserMetadataDialogComponent,
+    IngestorExtractorMetadataDialogComponent,
+    IngestorConfirmTransferDialogComponent,
     IngestorDialogStepperComponent,
-    AnyOfRenderer,
-    OneOfRenderer,
+    AnyOfRendererComponent,
+    OneOfRendererComponent,
+    ArrayLayoutRendererCustom,
   ],
   imports: [
-    CommonModule, 
-    MatCardModule, 
-    FormsModule, 
-    MatFormFieldModule, 
-    MatInputModule, 
-    MatButtonModule, 
-    MatProgressSpinnerModule, 
+    CommonModule,
+    MatCardModule,
+    FormsModule,
+    MatFormFieldModule,
+    MatInputModule,
+    MatButtonModule,
+    MatProgressSpinnerModule,
     RouterModule,
     MatListModule,
     MatIconModule,
     MatTabsModule,
     MatTableModule,
     MatDialogModule,
+    MatTooltipModule,
     MatSelectModule,
     MatOptionModule,
     MatStepperModule,
     MatRadioModule,
     MatAutocompleteModule,
+    MatBadgeModule,
     JsonFormsModule,
     JsonFormsAngularMaterialModule,
   ],
 })
-export class IngestorModule { }
+export class IngestorModule {}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 52285fca6b..36b22feb0d 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -1,20 +1,33 @@
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper, ISciCatHeader } from '../ingestor.component-helper';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnInit,
+} from "@angular/core";
+import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
+import {
+  DialogDataObject,
+  IngestionRequestInformation,
+  IngestorHelper,
+  SciCatHeader,
+} from "../ingestor.component-helper";
 
 @Component({
-  selector: 'ingestor.confirm-transfer-dialog',
-  templateUrl: 'ingestor.confirm-transfer-dialog.html',
+  selector: "ingestor.confirm-transfer-dialog",
+  templateUrl: "ingestor.confirm-transfer-dialog.html",
   changeDetection: ChangeDetectionStrategy.OnPush,
-  styleUrls: ['../ingestor.component.scss'],
+  styleUrls: ["../ingestor.component.scss"],
 })
+export class IngestorConfirmTransferDialogComponent implements OnInit {
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+  provideMergeMetaData = "";
+  backendURL = "";
 
-export class IngestorConfirmTransferDialog {
-  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
-  provideMergeMetaData: string = '';
-  backendURL: string = '';
-
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
+  constructor(
+    public dialog: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+  ) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
   }
@@ -25,21 +38,24 @@ export class IngestorConfirmTransferDialog {
 
   createMetaDataString(): string {
     const space = 2;
-    const scicatMetadata: ISciCatHeader = {
-      datasetName: this.createNewTransferData.scicatHeader['datasetName'],
-      description: this.createNewTransferData.scicatHeader['description'],
-      creationLocation: this.createNewTransferData.scicatHeader['creationLocation'],
-      dataFormat: this.createNewTransferData.scicatHeader['dataFormat'],
-      ownerGroup: this.createNewTransferData.scicatHeader['ownerGroup'],
-      type: this.createNewTransferData.scicatHeader['type'],
-      license: this.createNewTransferData.scicatHeader['license'],
-      keywords: this.createNewTransferData.scicatHeader['keywords'],
-      filePath: this.createNewTransferData.scicatHeader['filePath'],
+    const scicatMetadata: SciCatHeader = {
+      datasetName: this.createNewTransferData.scicatHeader["datasetName"],
+      description: this.createNewTransferData.scicatHeader["description"],
+      creationLocation:
+        this.createNewTransferData.scicatHeader["creationLocation"],
+      dataFormat: this.createNewTransferData.scicatHeader["dataFormat"],
+      ownerGroup: this.createNewTransferData.scicatHeader["ownerGroup"],
+      type: this.createNewTransferData.scicatHeader["type"],
+      license: this.createNewTransferData.scicatHeader["license"],
+      keywords: this.createNewTransferData.scicatHeader["keywords"],
+      filePath: this.createNewTransferData.scicatHeader["filePath"],
       scientificMetadata: {
-        organizational: this.createNewTransferData.userMetaData['organizational'],
-        sample: this.createNewTransferData.userMetaData['sample'],
-        acquisition: this.createNewTransferData.extractorMetaData['acquisition'],
-        instrument: this.createNewTransferData.extractorMetaData['instrument'],
+        organizational:
+          this.createNewTransferData.userMetaData["organizational"],
+        sample: this.createNewTransferData.userMetaData["sample"],
+        acquisition:
+          this.createNewTransferData.extractorMetaData["acquisition"],
+        instrument: this.createNewTransferData.extractorMetaData["instrument"],
       },
     };
 
@@ -54,8 +70,9 @@ export class IngestorConfirmTransferDialog {
 
   onClickConfirm(): void {
     if (this.data && this.data.onClickNext) {
-      this.createNewTransferData.mergedMetaDataString = this.provideMergeMetaData;
+      this.createNewTransferData.mergedMetaDataString =
+        this.provideMergeMetaData;
       this.data.onClickNext(4);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
index cda2927a18..1531c5404f 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
@@ -1,10 +1,10 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input } from "@angular/core";
 
 @Component({
-  selector: 'ingestor-dialog-stepper',
-  templateUrl: './ingestor.dialog-stepper.component.html',
-  styleUrls: ['./ingestor.dialog-stepper.component.css']
+  selector: "ingestor-dialog-stepper",
+  templateUrl: "./ingestor.dialog-stepper.component.html",
+  styleUrls: ["./ingestor.dialog-stepper.component.css"],
 })
 export class IngestorDialogStepperComponent {
-  @Input() activeStep: number = 0;
-}
\ No newline at end of file
+  @Input() activeStep = 0;
+}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index 97ba8e811d..9fa86aa138 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -1,39 +1,52 @@
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { JsonSchema } from '@jsonforms/core';
-import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper } from '../ingestor.component-helper';
+import { ChangeDetectionStrategy, Component, Inject } from "@angular/core";
+import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
+import { JsonSchema } from "@jsonforms/core";
+import {
+  DialogDataObject,
+  IngestionRequestInformation,
+  IngestorHelper,
+} from "../ingestor.component-helper";
 
 @Component({
-  selector: 'ingestor.extractor-metadata-dialog',
-  templateUrl: 'ingestor.extractor-metadata-dialog.html',
-  styleUrls: ['../ingestor.component.scss'],
+  selector: "ingestor.extractor-metadata-dialog",
+  templateUrl: "ingestor.extractor-metadata-dialog.html",
+  styleUrls: ["../ingestor.component.scss"],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-
-export class IngestorExtractorMetadataDialog {
+export class IngestorExtractorMetadataDialogComponent {
   metadataSchemaInstrument: JsonSchema;
   metadataSchemaAcquisition: JsonSchema;
-  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
 
-  backendURL: string = '';
-  extractorMetaDataReady: boolean = false;
-  extractorMetaDataError: boolean = false;
+  backendURL = "";
+  extractorMetaDataReady = false;
+  extractorMetaDataError = false;
 
   isCardContentVisible = {
     instrument: true,
-    acquisition: true
+    acquisition: true,
   };
 
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
-        this.createNewTransferData = data.createNewTransferData;
-        this.backendURL = data.backendURL;
-        const instrumentSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.instrument;
-        const acqusitionSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.acquisition;
-        
-        this.metadataSchemaInstrument = instrumentSchema;
-        this.metadataSchemaAcquisition = acqusitionSchema;
-        this.extractorMetaDataReady = this.createNewTransferData.extractorMetaDataReady;
-        this.extractorMetaDataError = this.createNewTransferData.apiErrorInformation.metaDataExtraction;
+  constructor(
+    public dialog: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+  ) {
+    this.createNewTransferData = data.createNewTransferData;
+    this.backendURL = data.backendURL;
+    const instrumentSchema =
+      this.createNewTransferData.selectedResolvedDecodedSchema.properties
+        .instrument;
+    const acqusitionSchema =
+      this.createNewTransferData.selectedResolvedDecodedSchema.properties
+        .acquisition;
+
+    this.metadataSchemaInstrument = instrumentSchema;
+    this.metadataSchemaAcquisition = acqusitionSchema;
+    this.extractorMetaDataReady =
+      this.createNewTransferData.extractorMetaDataReady;
+    this.extractorMetaDataError =
+      this.createNewTransferData.apiErrorInformation.metaDataExtraction;
   }
 
   onClickBack(): void {
@@ -48,15 +61,15 @@ export class IngestorExtractorMetadataDialog {
     }
   }
 
-  onDataChangeExtractorMetadataInstrument(event: Object) {
-    this.createNewTransferData.extractorMetaData['instrument'] = event;
+  onDataChangeExtractorMetadataInstrument(event: any) {
+    this.createNewTransferData.extractorMetaData["instrument"] = event;
   }
 
-  onDataChangeExtractorMetadataAcquisition(event: Object) {
-    this.createNewTransferData.extractorMetaData['acquisition'] = event;
+  onDataChangeExtractorMetadataAcquisition(event: any) {
+    this.createNewTransferData.extractorMetaData["acquisition"] = event;
   }
 
   toggleCardContent(card: string): void {
     this.isCardContentVisible[card] = !this.isCardContentVisible[card];
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 198b11fdfd..ba4cae3bef 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -1,29 +1,43 @@
-import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
-import { HttpClient } from '@angular/common/http';
-import { INGESTOR_API_ENDPOINTS_V1 } from '../ingestor-api-endpoints';
-import { IDialogDataObject, IExtractionMethod, IIngestionRequestInformation, IngestorHelper } from '../ingestor.component-helper';
-import { IngestorMetadataEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnInit,
+} from "@angular/core";
+import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
+import { HttpClient } from "@angular/common/http";
+import { INGESTOR_API_ENDPOINTS_V1 } from "../ingestor-api-endpoints";
+import {
+  DialogDataObject,
+  ExtractionMethod,
+  IngestionRequestInformation,
+  IngestorHelper,
+} from "../ingestor.component-helper";
+import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 @Component({
-  selector: 'ingestor.new-transfer-dialog',
-  templateUrl: 'ingestor.new-transfer-dialog.html',
+  selector: "ingestor.new-transfer-dialog",
+  templateUrl: "ingestor.new-transfer-dialog.html",
   changeDetection: ChangeDetectionStrategy.OnPush,
-  styleUrls: ['../ingestor.component.scss']
+  styleUrls: ["../ingestor.component.scss"],
 })
-
 export class IngestorNewTransferDialogComponent implements OnInit {
-  extractionMethods: IExtractionMethod[] = [];
+  extractionMethods: ExtractionMethod[] = [];
   availableFilePaths: string[] = [];
-  backendURL: string = '';
-  extractionMethodsError: string = '';
-  availableFilePathsError: string = '';
+  backendURL = "";
+  extractionMethodsError = "";
+  availableFilePathsError = "";
 
-  uiNextButtonReady: boolean = false;
+  uiNextButtonReady = false;
 
-  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
 
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject, private http: HttpClient) {
+  constructor(
+    public dialog: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+    private http: HttpClient,
+  ) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
   }
@@ -42,66 +56,75 @@ export class IngestorNewTransferDialogComponent implements OnInit {
     return this.createNewTransferData.selectedPath;
   }
 
-  set selectedMethod(value: IExtractionMethod) {
+  set selectedMethod(value: ExtractionMethod) {
     this.createNewTransferData.selectedMethod = value;
     this.validateNextButton();
   }
 
-  get selectedMethod(): IExtractionMethod {
+  get selectedMethod(): ExtractionMethod {
     return this.createNewTransferData.selectedMethod;
   }
 
   apiGetExtractionMethods(): void {
-    this.http.get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR).subscribe(
-      (response: any) => {
-        if (response.methods && response.methods.length > 0) {
-          this.extractionMethods = response.methods;
-        }
-        else {
-          this.extractionMethodsError = 'No extraction methods found.';
-        }
-      },
-      (error: any) => {
-        this.extractionMethodsError = error.message;
-        console.error(this.extractionMethodsError);
-      }
-    );
+    this.http
+      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR)
+      .subscribe(
+        (response: any) => {
+          if (response.methods && response.methods.length > 0) {
+            this.extractionMethods = response.methods;
+          } else {
+            this.extractionMethodsError = "No extraction methods found.";
+          }
+        },
+        (error: any) => {
+          this.extractionMethodsError = error.message;
+          console.error(this.extractionMethodsError);
+        },
+      );
   }
 
   apiGetAvailableFilePaths(): void {
-    this.http.get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET).subscribe(
-      (response: any) => {
-        if (response.datasets && response.datasets.length > 0) {
-          this.availableFilePaths = response.datasets;
-        }
-        else {
-          this.availableFilePathsError = 'No datasets found.';
-        }
-      },
-      (error: any) => {
-        this.availableFilePathsError = error.message;
-        console.error(this.availableFilePathsError);
-      }
-    );
+    this.http
+      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET)
+      .subscribe(
+        (response: any) => {
+          if (response.datasets && response.datasets.length > 0) {
+            this.availableFilePaths = response.datasets;
+          } else {
+            this.availableFilePathsError = "No datasets found.";
+          }
+        },
+        (error: any) => {
+          this.availableFilePathsError = error.message;
+          console.error(this.availableFilePathsError);
+        },
+      );
   }
 
   generateExampleDataForSciCatHeader(): void {
-    this.data.createNewTransferData.scicatHeader['filePath'] = this.createNewTransferData.selectedPath;
-    this.data.createNewTransferData.scicatHeader['keywords'] = ['OpenEM'];
-
-    const nameWithoutPath = this.createNewTransferData.selectedPath.split('/|\\')[-1] ?? this.createNewTransferData.selectedPath;
-    this.data.createNewTransferData.scicatHeader['datasetName'] = nameWithoutPath;
-    this.data.createNewTransferData.scicatHeader['license'] = 'MIT License';
-    this.data.createNewTransferData.scicatHeader['type'] = 'raw';
-    this.data.createNewTransferData.scicatHeader['dataFormat'] = 'root';
-    this.data.createNewTransferData.scicatHeader['owner'] = 'User';
+    this.data.createNewTransferData.scicatHeader["filePath"] =
+      this.createNewTransferData.selectedPath;
+    this.data.createNewTransferData.scicatHeader["keywords"] = ["OpenEM"];
+
+    const nameWithoutPath =
+      this.createNewTransferData.selectedPath.split("/|\\")[-1] ??
+      this.createNewTransferData.selectedPath;
+    this.data.createNewTransferData.scicatHeader["datasetName"] =
+      nameWithoutPath;
+    this.data.createNewTransferData.scicatHeader["license"] = "MIT License";
+    this.data.createNewTransferData.scicatHeader["type"] = "raw";
+    this.data.createNewTransferData.scicatHeader["dataFormat"] = "root";
+    this.data.createNewTransferData.scicatHeader["owner"] = "User";
   }
 
   prepareSchemaForProcessing(): void {
     const encodedSchema = this.createNewTransferData.selectedMethod.schema;
     const decodedSchema = atob(encodedSchema);
     const schema = JSON.parse(decodedSchema);
-    const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(schema, schema);
+    const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
+      schema,
+      schema,
+    );
     this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
   }
 
@@ -119,6 +142,8 @@ export class IngestorNewTransferDialogComponent implements OnInit {
   }
 
   validateNextButton(): void {
-    this.uiNextButtonReady = !!this.createNewTransferData.selectedPath && !!this.createNewTransferData.selectedMethod?.name;
+    this.uiNextButtonReady =
+      !!this.createNewTransferData.selectedPath &&
+      !!this.createNewTransferData.selectedMethod?.name;
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 427bacd801..39f6298523 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -1,38 +1,53 @@
-import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
-import { IngestorMetadataEditorHelper } from 'ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper';
-import { JsonSchema } from '@jsonforms/core';
-import { IDialogDataObject, IIngestionRequestInformation, IngestorHelper, SciCatHeader_Schema } from '../ingestor.component-helper';
+import { ChangeDetectionStrategy, Component, Inject } from "@angular/core";
+import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
+import { JsonSchema } from "@jsonforms/core";
+import {
+  DialogDataObject,
+  IngestionRequestInformation,
+  IngestorHelper,
+  SciCatHeader_Schema,
+} from "../ingestor.component-helper";
 
 @Component({
-  selector: 'ingestor.user-metadata-dialog',
-  templateUrl: 'ingestor.user-metadata-dialog.html',
+  selector: "ingestor.user-metadata-dialog",
+  templateUrl: "ingestor.user-metadata-dialog.html",
   changeDetection: ChangeDetectionStrategy.OnPush,
-  styleUrls: ['../ingestor.component.scss'],
+  styleUrls: ["../ingestor.component.scss"],
 })
-
-export class IngestorUserMetadataDialog {
+export class IngestorUserMetadataDialogComponent {
   metadataSchemaOrganizational: JsonSchema;
   metadataSchemaSample: JsonSchema;
   scicatHeaderSchema: JsonSchema;
-  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
-  backendURL: string = '';
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+  backendURL = "";
 
-  uiNextButtonReady: boolean = true; // Change to false when dev is ready
+  uiNextButtonReady = true; // Change to false when dev is ready
 
   isCardContentVisible = {
     scicat: true,
     organizational: true,
-    sample: true
+    sample: true,
   };
 
-  constructor(public dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: IDialogDataObject) {
+  constructor(
+    public dialog: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+  ) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
-    const organizationalSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.organizational;
-    const sampleSchema = this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
-    
+    const organizationalSchema =
+      this.createNewTransferData.selectedResolvedDecodedSchema.properties
+        .organizational;
+    const sampleSchema =
+      this.createNewTransferData.selectedResolvedDecodedSchema.properties
+        .sample;
+
     this.metadataSchemaOrganizational = organizationalSchema;
+
+    // TODO Remove after debug
+    console.log("organizationalSchema", organizationalSchema);
+
     this.metadataSchemaSample = sampleSchema;
     this.scicatHeaderSchema = SciCatHeader_Schema;
   }
@@ -49,19 +64,19 @@ export class IngestorUserMetadataDialog {
     }
   }
 
-  onDataChangeUserMetadataOrganization(event: Object) {
-    this.createNewTransferData.userMetaData['organizational'] = event;
+  onDataChangeUserMetadataOrganization(event: any) {
+    this.createNewTransferData.userMetaData["organizational"] = event;
   }
 
-  onDataChangeUserMetadataSample(event: Object) {
-    this.createNewTransferData.userMetaData['sample'] = event;
+  onDataChangeUserMetadataSample(event: any) {
+    this.createNewTransferData.userMetaData["sample"] = event;
   }
 
-  onDataChangeUserScicatHeader(event: Object) {
+  onDataChangeUserScicatHeader(event: any) {
     this.createNewTransferData.scicatHeader = event;
   }
 
   toggleCardContent(card: string): void {
     this.isCardContentVisible[card] = !this.isCardContentVisible[card];
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
index df2d088330..acd08c0177 100644
--- a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
+++ b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
@@ -2,16 +2,16 @@ export const INGESTOR_API_ENDPOINTS_V1 = {
   DATASET: "dataset",
   TRANSFER: "transfer",
   OTHER: {
-    VERSION: 'version',
+    VERSION: "version",
   },
-  EXTRACTOR: 'extractor',
+  EXTRACTOR: "extractor",
 };
 
-export interface IPostExtractorEndpoint {
-  filePath: string,
-  methodName: string,
+export interface PostExtractorEndpoint {
+  filePath: string;
+  methodName: string;
 }
 
-export interface IPostDatasetEndpoint {
-  metaData: string
-}
\ No newline at end of file
+export interface PostDatasetEndpoint {
+  metaData: string;
+}
diff --git a/src/app/ingestor/ingestor/ingestor.component-helper.ts b/src/app/ingestor/ingestor/ingestor.component-helper.ts
index 1d31525d57..c022782eae 100644
--- a/src/app/ingestor/ingestor/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/ingestor.component-helper.ts
@@ -1,22 +1,22 @@
-import { JsonSchema } from '@jsonforms/core';
+import { JsonSchema } from "@jsonforms/core";
 
-export interface IExtractionMethod {
+export interface ExtractionMethod {
   name: string;
   schema: string; // Base64 encoded JSON schema
-};
+}
 
-export interface IIngestionRequestInformation {
+export interface IngestionRequestInformation {
   selectedPath: string;
-  selectedMethod: IExtractionMethod;
+  selectedMethod: ExtractionMethod;
   selectedResolvedDecodedSchema: JsonSchema;
-  scicatHeader: Object;
+  scicatHeader: object;
   userMetaData: {
-    organizational: Object,
-    sample: Object,
+    organizational: object;
+    sample: object;
   };
   extractorMetaData: {
-    instrument: Object,
-    acquisition: Object,
+    instrument: object;
+    acquisition: object;
   };
   extractorMetaDataReady: boolean;
   extractMetaDataRequested: boolean;
@@ -24,11 +24,16 @@ export interface IIngestionRequestInformation {
 
   apiErrorInformation: {
     metaDataExtraction: boolean;
-  }
+  };
+}
+
+export interface TransferDataListEntry {
+  transferId: string;
+  status: string;
 }
 
 // There are many more... see DerivedDataset.ts
-export interface ISciCatHeader {
+export interface SciCatHeader {
   datasetName: string;
   description: string;
   creationLocation: string;
@@ -38,27 +43,33 @@ export interface ISciCatHeader {
   license: string;
   keywords: string[];
   filePath: string;
-  scientificMetadata: IScientificMetadata;
+  scientificMetadata: ScientificMetadata;
 }
 
-export interface IScientificMetadata {
-  organizational: Object;
-  sample: Object;
-  acquisition: Object;
-  instrument: Object;
+export interface ScientificMetadata {
+  organizational: object;
+  sample: object;
+  acquisition: object;
+  instrument: object;
 }
 
-export interface IDialogDataObject {
-  createNewTransferData: IIngestionRequestInformation;
+export interface MetadataExtractorResult {
+  cmdStdErr: string;
+  cmdStdOut: string;
+  result: string;
+}
+
+export interface DialogDataObject {
+  createNewTransferData: IngestionRequestInformation;
   backendURL: string;
   onClickNext: (step: number) => void;
 }
 
 export class IngestorHelper {
-  static createEmptyRequestInformation = (): IIngestionRequestInformation => {
+  static createEmptyRequestInformation = (): IngestionRequestInformation => {
     return {
-      selectedPath: '',
-      selectedMethod: { name: '', schema: '' },
+      selectedPath: "",
+      selectedMethod: { name: "", schema: "" },
       selectedResolvedDecodedSchema: {},
       scicatHeader: {},
       userMetaData: {
@@ -71,18 +82,27 @@ export class IngestorHelper {
       },
       extractorMetaDataReady: false,
       extractMetaDataRequested: false,
-      mergedMetaDataString: '',
+      mergedMetaDataString: "",
       apiErrorInformation: {
         metaDataExtraction: false,
       },
     };
   };
 
-  static mergeUserAndExtractorMetadata(userMetadata: Object, extractorMetadata: Object, space: number): string {
-    return JSON.stringify({ ...userMetadata, ...extractorMetadata }, null, space);
-  };
+  static mergeUserAndExtractorMetadata(
+    userMetadata: object,
+    extractorMetadata: object,
+    space: number,
+  ): string {
+    return JSON.stringify(
+      { ...userMetadata, ...extractorMetadata },
+      null,
+      space,
+    );
+  }
 }
 
+// eslint-disable-next-line @typescript-eslint/naming-convention
 export const SciCatHeader_Schema: JsonSchema = {
   type: "object",
   properties: {
@@ -96,9 +116,19 @@ export const SciCatHeader_Schema: JsonSchema = {
     license: { type: "string" },
     keywords: {
       type: "array",
-      items: { type: "string" }
+      items: { type: "string" },
     },
     // scientificMetadata: { type: "string" } ; is created during the ingestor process
   },
-  required: ["datasetName", "creationLocation", "dataFormat", "ownerGroup", "type", "license", "keywords", "scientificMetadata", "filePath"]
-}
\ No newline at end of file
+  required: [
+    "datasetName",
+    "creationLocation",
+    "dataFormat",
+    "ownerGroup",
+    "type",
+    "license",
+    "keywords",
+    "scientificMetadata",
+    "filePath",
+  ],
+};
diff --git a/src/app/ingestor/ingestor/ingestor.component.spec.ts b/src/app/ingestor/ingestor/ingestor.component.spec.ts
index 52186b1077..dd70900334 100644
--- a/src/app/ingestor/ingestor/ingestor.component.spec.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.spec.ts
@@ -1,15 +1,14 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { IngestorComponent } from './ingestor.component';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { IngestorComponent } from "./ingestor.component";
 
-describe('IngestorComponent', () => {
+describe("IngestorComponent", () => {
   let component: IngestorComponent;
   let fixture: ComponentFixture<IngestorComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ IngestorComponent ]
-    })
-    .compileComponents();
+      declarations: [IngestorComponent],
+    }).compileComponents();
   });
 
   beforeEach(() => {
@@ -18,7 +17,7 @@ describe('IngestorComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create', () => {
+  it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 2b49f2f90a..637cf7f949 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -1,19 +1,24 @@
 import { Component, inject, OnInit } from "@angular/core";
 import { AppConfigService } from "app-config.service";
-import { HttpClient } from '@angular/common/http';
-import { ActivatedRoute, Router } from '@angular/router';
-import { INGESTOR_API_ENDPOINTS_V1, IPostDatasetEndpoint, IPostExtractorEndpoint } from "./ingestor-api-endpoints";
+import { HttpClient } from "@angular/common/http";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  INGESTOR_API_ENDPOINTS_V1,
+  PostDatasetEndpoint,
+  PostExtractorEndpoint,
+} from "./ingestor-api-endpoints";
 import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog.component";
 import { MatDialog } from "@angular/material/dialog";
-import { IngestorUserMetadataDialog } from "./dialog/ingestor.user-metadata-dialog.component";
-import { IngestorExtractorMetadataDialog } from "./dialog/ingestor.extractor-metadata-dialog.component";
-import { IngestorConfirmTransferDialog } from "./dialog/ingestor.confirm-transfer-dialog.component";
-import { IIngestionRequestInformation, IngestorHelper } from "./ingestor.component-helper";
-
-interface ITransferDataListEntry {
-  transferId: string;
-  status: string;
-}
+import { IngestorUserMetadataDialogComponent } from "./dialog/ingestor.user-metadata-dialog.component";
+import { IngestorExtractorMetadataDialogComponent } from "./dialog/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialogComponent } from "./dialog/ingestor.confirm-transfer-dialog.component";
+import {
+  IngestionRequestInformation,
+  IngestorHelper,
+  MetadataExtractorResult,
+  ScientificMetadata,
+  TransferDataListEntry,
+} from "./ingestor.component-helper";
 
 @Component({
   selector: "ingestor",
@@ -23,37 +28,42 @@ interface ITransferDataListEntry {
 export class IngestorComponent implements OnInit {
   readonly dialog = inject(MatDialog);
 
-  filePath: string = '';
-  loading: boolean = false;
-  forwardFacilityBackend: string = '';
+  filePath = "";
+  loading = false;
+  forwardFacilityBackend = "";
 
-  connectedFacilityBackend: string = '';
-  connectedFacilityBackendVersion: string = '';
-  connectingToFacilityBackend: boolean = false;
+  connectedFacilityBackend = "";
+  connectedFacilityBackendVersion = "";
+  connectingToFacilityBackend = false;
 
   lastUsedFacilityBackends: string[] = [];
 
-  transferDataSource: ITransferDataListEntry[] = []; // List of files to be transferred
-  displayedColumns: string[] = ['transferId', 'status', 'actions'];
+  transferDataSource: TransferDataListEntry[] = []; // List of files to be transferred
+  displayedColumns: string[] = ["transferId", "status", "actions"];
 
-  errorMessage: string = '';
-  returnValue: string = '';
+  errorMessage = "";
+  returnValue = "";
 
-  createNewTransferData: IIngestionRequestInformation = IngestorHelper.createEmptyRequestInformation();
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
 
-  constructor(public appConfigService: AppConfigService, private http: HttpClient, private route: ActivatedRoute, private router: Router) { }
+  constructor(
+    public appConfigService: AppConfigService,
+    private http: HttpClient,
+    private route: ActivatedRoute,
+    private router: Router,
+  ) {}
 
   ngOnInit() {
     this.connectingToFacilityBackend = true;
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
     this.transferDataSource = [];
     // Get the GET parameter 'backendUrl' from the URL
-    this.route.queryParams.subscribe(params => {
-      const backendUrl = params['backendUrl'];
+    this.route.queryParams.subscribe((params) => {
+      const backendUrl = params["backendUrl"];
       if (backendUrl) {
         this.apiConnectToFacilityBackend(backendUrl);
-      }
-      else {
+      } else {
         this.connectingToFacilityBackend = false;
       }
     });
@@ -62,35 +72,40 @@ export class IngestorComponent implements OnInit {
   apiConnectToFacilityBackend(facilityBackendUrl: string): boolean {
     let facilityBackendUrlCleaned = facilityBackendUrl.slice();
     // Check if last symbol is a slash and add version endpoint
-    if (!facilityBackendUrlCleaned.endsWith('/')) {
-      facilityBackendUrlCleaned += '/';
+    if (!facilityBackendUrlCleaned.endsWith("/")) {
+      facilityBackendUrlCleaned += "/";
     }
 
-    let facilityBackendUrlVersion = facilityBackendUrlCleaned + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION;
+    const facilityBackendUrlVersion =
+      facilityBackendUrlCleaned + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION;
 
     // Try to connect to the facility backend/version to check if it is available
-    console.log('Connecting to facility backend: ' + facilityBackendUrlVersion);
+    console.log("Connecting to facility backend: " + facilityBackendUrlVersion);
     this.http.get(facilityBackendUrlVersion).subscribe(
-      response => {
-        console.log('Connected to facility backend', response);
+      (response) => {
+        console.log("Connected to facility backend", response);
         // If the connection is successful, store the connected facility backend URL
         this.connectedFacilityBackend = facilityBackendUrlCleaned;
         this.connectingToFacilityBackend = false;
-        this.connectedFacilityBackendVersion = response['version'];
+        this.connectedFacilityBackendVersion = response["version"];
       },
-      error => {
+      (error) => {
         this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-        console.error('Request failed', error);
-        this.connectedFacilityBackend = '';
+        console.error("Request failed", error);
+        this.connectedFacilityBackend = "";
         this.connectingToFacilityBackend = false;
         this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-      }
+      },
     );
 
     return true;
   }
 
-  apiGetTransferList(page: number, pageSize: number, transferId?: string): void {
+  apiGetTransferList(
+    page: number,
+    pageSize: number,
+    transferId?: string,
+  ): void {
     const params: any = {
       page: page.toString(),
       pageSize: pageSize.toString(),
@@ -98,72 +113,97 @@ export class IngestorComponent implements OnInit {
     if (transferId) {
       params.transferId = transferId;
     }
-    this.http.get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER, { params }).subscribe(
-      response => {
-        console.log('Transfer list received', response);
-        this.transferDataSource = response['transfers'];
-      },
-      error => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-        console.error('Request failed', error);
-      }
-    );
+    this.http
+      .get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {
+        params,
+      })
+      .subscribe(
+        (response) => {
+          console.log("Transfer list received", response);
+          this.transferDataSource = response["transfers"];
+        },
+        (error) => {
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+          console.error("Request failed", error);
+        },
+      );
   }
 
   apiUpload() {
     this.loading = true;
 
-    const payload: IPostDatasetEndpoint = {
+    const payload: PostDatasetEndpoint = {
       metaData: this.createNewTransferData.mergedMetaDataString,
     };
 
-    this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET, payload).subscribe(
-      response => {
-        console.log('Upload successfully started', response);
-        this.returnValue = JSON.stringify(response);
-        this.loading = false;
-      },
-      error => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-        console.error('Upload failed', error);
-        this.loading = false;
-      }
-    );
+    this.http
+      .post(
+        this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET,
+        payload,
+      )
+      .subscribe(
+        (response) => {
+          console.log("Upload successfully started", response);
+          this.returnValue = JSON.stringify(response);
+          this.loading = false;
+        },
+        (error) => {
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+          console.error("Upload failed", error);
+          this.loading = false;
+        },
+      );
   }
 
   async apiStartMetadataExtraction(): Promise<boolean> {
     this.createNewTransferData.apiErrorInformation.metaDataExtraction = false;
 
     if (this.createNewTransferData.extractMetaDataRequested) {
-      console.log(this.createNewTransferData.extractMetaDataRequested, ' already requested'); // Debugging
+      console.log(
+        this.createNewTransferData.extractMetaDataRequested,
+        " already requested",
+      ); // Debugging
       return false;
     }
 
     this.createNewTransferData.extractorMetaDataReady = false;
     this.createNewTransferData.extractMetaDataRequested = true;
 
-    const payload: IPostExtractorEndpoint = {
+    const payload: PostExtractorEndpoint = {
       filePath: this.createNewTransferData.selectedPath,
       methodName: this.createNewTransferData.selectedMethod.name,
     };
 
     return new Promise<boolean>((resolve) => {
-      this.http.post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, payload).subscribe(
-        response => {
-          console.log('Metadata extraction result', response);
-          this.createNewTransferData.extractorMetaData.instrument = (response as any).instrument ?? {};
-          this.createNewTransferData.extractorMetaData.acquisition = (response as any).acquisition ?? {};
-          this.createNewTransferData.extractorMetaDataReady = true;
-          resolve(true);
-        },
-        error => {
-          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-          console.error('Metadata extraction failed', error);
-          this.createNewTransferData.extractorMetaDataReady = true;
-          this.createNewTransferData.apiErrorInformation.metaDataExtraction = true;
-          resolve(false);
-        }
-      );
+      this.http
+        .post(
+          this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR,
+          payload,
+        )
+        .subscribe(
+          (response) => {
+            console.log("Metadata extraction result", response);
+            const extractedMetadata = response as MetadataExtractorResult;
+            const extractedScientificMetadata = JSON.parse(
+              extractedMetadata.result,
+            ) as ScientificMetadata;
+
+            this.createNewTransferData.extractorMetaData.instrument =
+              extractedScientificMetadata.instrument ?? {};
+            this.createNewTransferData.extractorMetaData.acquisition =
+              extractedScientificMetadata.acquisition ?? {};
+            this.createNewTransferData.extractorMetaDataReady = true;
+            resolve(true);
+          },
+          (error) => {
+            this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+            console.error("Metadata extraction failed", error);
+            this.createNewTransferData.extractorMetaDataReady = true;
+            this.createNewTransferData.apiErrorInformation.metaDataExtraction =
+              true;
+            resolve(false);
+          },
+        );
     });
   }
 
@@ -177,15 +217,17 @@ export class IngestorComponent implements OnInit {
         return;
       }
 
-      this.router.navigate(['/ingestor'], { queryParams: { backendUrl: this.forwardFacilityBackend } });
+      this.router.navigate(["/ingestor"], {
+        queryParams: { backendUrl: this.forwardFacilityBackend },
+      });
     }
   }
 
   onClickDisconnectIngestor() {
-    this.returnValue = '';
-    this.connectedFacilityBackend = '';
+    this.returnValue = "";
+    this.connectedFacilityBackend = "";
     // Remove the GET parameter 'backendUrl' from the URL
-    this.router.navigate(['/ingestor']);
+    this.router.navigate(["/ingestor"]);
   }
 
   // Helper functions
@@ -195,7 +237,8 @@ export class IngestorComponent implements OnInit {
 
   loadLastUsedFacilityBackends(): string[] {
     // Load the list from the local Storage
-    const lastUsedFacilityBackends = '["http://localhost:8000", "http://localhost:8888"]';
+    const lastUsedFacilityBackends =
+      '["http://localhost:8000", "http://localhost:8888"]';
     if (lastUsedFacilityBackends) {
       return JSON.parse(lastUsedFacilityBackends);
     }
@@ -203,7 +246,7 @@ export class IngestorComponent implements OnInit {
   }
 
   clearErrorMessage(): void {
-    this.errorMessage = '';
+    this.errorMessage = "";
   }
 
   onClickAddIngestion(): void {
@@ -221,41 +264,59 @@ export class IngestorComponent implements OnInit {
         this.createNewTransferData.extractMetaDataRequested = false;
         this.createNewTransferData.extractorMetaDataReady = false;
         dialogRef = this.dialog.open(IngestorNewTransferDialogComponent, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
-          disableClose: true
+          data: {
+            onClickNext: this.onClickNext.bind(this),
+            createNewTransferData: this.createNewTransferData,
+            backendURL: this.connectedFacilityBackend,
+          },
+          disableClose: true,
         });
 
         break;
       case 1:
-        this.apiStartMetadataExtraction().then((response: boolean) => {
-          if (response) console.log('Metadata extraction finished');
-          else console.error('Metadata extraction failed');
-        }).catch(error => {
-          console.error('Metadata extraction error', error);
-        });
-
-        dialogRef = this.dialog.open(IngestorUserMetadataDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
-          disableClose: true
+        this.apiStartMetadataExtraction()
+          .then((response: boolean) => {
+            if (response) console.log("Metadata extraction finished");
+            else console.error("Metadata extraction failed");
+          })
+          .catch((error) => {
+            console.error("Metadata extraction error", error);
+          });
+
+        dialogRef = this.dialog.open(IngestorUserMetadataDialogComponent, {
+          data: {
+            onClickNext: this.onClickNext.bind(this),
+            createNewTransferData: this.createNewTransferData,
+            backendURL: this.connectedFacilityBackend,
+          },
+          disableClose: true,
         });
         break;
       case 2:
-        dialogRef = this.dialog.open(IngestorExtractorMetadataDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
-          disableClose: true
+        dialogRef = this.dialog.open(IngestorExtractorMetadataDialogComponent, {
+          data: {
+            onClickNext: this.onClickNext.bind(this),
+            createNewTransferData: this.createNewTransferData,
+            backendURL: this.connectedFacilityBackend,
+          },
+          disableClose: true,
         });
         break;
       case 3:
-        dialogRef = this.dialog.open(IngestorConfirmTransferDialog, {
-          data: { onClickNext: this.onClickNext.bind(this), createNewTransferData: this.createNewTransferData, backendURL: this.connectedFacilityBackend },
-          disableClose: true
+        dialogRef = this.dialog.open(IngestorConfirmTransferDialogComponent, {
+          data: {
+            onClickNext: this.onClickNext.bind(this),
+            createNewTransferData: this.createNewTransferData,
+            backendURL: this.connectedFacilityBackend,
+          },
+          disableClose: true,
         });
         break;
       case 4:
         this.apiUpload();
         break;
       default:
-        console.error('Unknown step', step);
+        console.error("Unknown step", step);
     }
 
     // Error if the dialog reference is not set
@@ -267,16 +328,23 @@ export class IngestorComponent implements OnInit {
   }
 
   onCancelTransfer(transferId: string) {
-    console.log('Cancel transfer', transferId);
-    this.http.delete(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER + '/' + transferId).subscribe(
-      response => {
-        console.log('Transfer cancelled', response);
-        this.apiGetTransferList(1, 100);
-      },
-      error => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-        console.error('Cancel transfer failed', error);
-      }
-    );
+    console.log("Cancel transfer", transferId);
+    this.http
+      .delete(
+        this.connectedFacilityBackend +
+          INGESTOR_API_ENDPOINTS_V1.TRANSFER +
+          "/" +
+          transferId,
+      )
+      .subscribe(
+        (response) => {
+          console.log("Transfer cancelled", response);
+          this.apiGetTransferList(1, 100);
+        },
+        (error) => {
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+          console.error("Cancel transfer failed", error);
+        },
+      );
   }
-}
\ No newline at end of file
+}

From 52a45e60434ad17f83bd81e76beb5d87bd616c6c Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 9 Jan 2025 16:10:07 +0000
Subject: [PATCH 074/245] reloading page works as intended

---
 src/app/datasets/onedep/onedep.component.html |   6 +-
 src/app/datasets/onedep/onedep.component.ts   | 107 +++--
 src/app/datasets/onedep/types/methods.enum.ts | 390 +++++++++---------
 .../effects/onedep.effects.ts                 |   2 +-
 src/app/state-management/models/index.ts      |   1 +
 5 files changed, 251 insertions(+), 255 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 4887573eef..8c33b6b819 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -113,6 +113,7 @@ <h2>Enter 16-digit ORCID iD</h2>
                                                 formControlName="orcidId"
                                                 orcidFormatter
                                             >
+                                            
                                             <button 
                                                 mat-icon-button 
                                                 class="remove-field-btn" 
@@ -291,13 +292,12 @@ <h2>Choose Electron Microscopy
                                             <mat-label>Contour Level</mat-label>
                                             <input matInput type="number"
                                                 placeholder="e.g. 0.0" 
-                                                [required]="fileType.file && fileType.required"
+                                                [required]="!!fileType.file"
                                                 [value]="fileType.contour || ''"
                                                 (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : 
                                                          fileType.emName === 'add-map' ? updateContourLevelAddMap($event, fileType.id) : 
                                                          updateContourLevel($event, fileType.emName)" />
-
-                                                         
+                                       
                                         </mat-form-field>
                                         <!-- Error Message -->
                                         <!-- FIX ME -->
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index f2280d8b46..6e71a94d0e 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -27,7 +27,7 @@ import { selectCurrentUser } from "state-management/selectors/user.selectors";
 import { selectDepID } from "state-management/selectors/onedep.selectors";
 import * as fromActions from "state-management/actions/onedep.actions";
 import {
-  methodsList,
+  createMethodsList,
   EmFile,
   DepositionFiles,
   OneDepUserInfo,
@@ -52,14 +52,14 @@ export class OneDepComponent implements OnInit, OnDestroy {
   user: ReturnedUserDto | undefined;
   form: FormGroup;
   showAssociatedMapQuestion = false;
-  methodsList = methodsList;
+  methodsList = createMethodsList();
   selectedFile: { [key: string]: File | null } = {};
   emFile = EmFile;
-  fileTypes: DepositionFiles[];
   detailsOverflow = "hidden";
   additionalMaps = 0;
   showPassword = false;
-
+  fileTypes: DepositionFiles[];
+  mainContour = 0.0;
   connectedDepositionBackend = "";
   connectedDepositionBackendVersion = "";
   connectingToDepositionBackend = false;
@@ -78,57 +78,59 @@ export class OneDepComponent implements OnInit, OnDestroy {
     private depositor: Depositor,
   ) {
     this.config = this.appConfigService.getConfig();
+    this.form = this.fb.group({
+      email: "",
+      jwtToken: new FormControl(""),
+      password: new FormControl(""),
+      metadata: "",
+      orcid: this.fb.array([
+        this.fb.group({
+          orcidId: [
+            "",
+            [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)],
+          ],
+        }),
+      ]),
+      emMethod: new FormControl(""),
+      deposingCoordinates: new FormControl(null, Validators.required),
+      associatedMap: new FormControl(null, Validators.required),
+      compositeMap: new FormControl(null, Validators.required),
+      emdbId: new FormControl(""),
+    });
   }
 
   ngOnInit() {
+    // initialize an array for the files to be uploaded
+    this.fileTypes = [];
+    this.mainContour = 0.0;
     //  connect to the depositor
     this.connectingToDepositionBackend = true;
     this.connectToDepositionBackend();
 
     this.store.select(selectCurrentDataset).subscribe((dataset) => {
       this.dataset = dataset;
+      if (dataset) {
+        this.form.patchValue({
+          metadata: this.dataset.scientificMetadata,
+        });
+      }
     });
     this.subscriptions.push(
       this.store.select(selectCurrentUser).subscribe((user) => {
         if (user) {
           this.user = user;
+          this.form.patchValue({
+            email: this.user?.email || "",
+          });
         }
       }),
     );
-    // Prevent user from reloading page if there are unsave changes
-    this.subscriptions.push(
-      fromEvent(window, "beforeunload").subscribe((event) => {
-        if (this.hasUnsavedChanges()) {
-          event.preventDefault();
-        }
-      }),
-    );
-    this.form = this.fb.group({
-      email: this.user.email,
-      jwtToken: new FormControl(""),
-      password: new FormControl(),
-      metadata: this.dataset.scientificMetadata,
-      emMethod: new FormControl(""),
-      deposingCoordinates: new FormControl(null, Validators.required),
-      associatedMap: new FormControl(null, Validators.required),
-      compositeMap: new FormControl(null, Validators.required),
-      emdbId: new FormControl(""),
-      orcid: this.fb.array([
-        this.fb.group({
-          orcidId: [
-            "",
-            [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)],
-          ],
-        }),
-      ]),
-    });
   }
 
   ngOnDestroy() {
     this.subscriptions.forEach((subscription) => {
       subscription.unsubscribe();
     });
-    this.fileTypes = [];
   }
   hasUnsavedChanges() {
     return this._hasUnsavedChanges;
@@ -157,6 +159,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
     }
   }
   onMethodChange() {
+    this.methodsList = createMethodsList(); // Reset the methods list to be empty
     this.fileTypes = this.methodsList.find(
       (mL) => mL.value === this.form.value["emMethod"],
     ).files;
@@ -233,10 +236,19 @@ export class OneDepComponent implements OnInit, OnDestroy {
         if (fT.emName === controlName) {
           fT.file = this.selectedFile[controlName];
           fT.fileName = this.selectedFile[controlName].name;
+          if (
+            this.mainContour !== 0.0 &&
+            (fT.emName === EmFile.MainMap ||
+              fT.emName === EmFile.HalfMap1 ||
+              fT.emName === EmFile.HalfMap2)
+          ) {
+            fT.contour = this.mainContour;
+          }
         }
       });
     }
   }
+
   onFileAddMapSelected(event: Event, id: number) {
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
@@ -264,13 +276,15 @@ export class OneDepComponent implements OnInit, OnDestroy {
     const normalizedInput = input.replace(",", ".");
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
+      this.mainContour = parsedValue;
       this.fileTypes.forEach((fT) => {
         if (
-          fT.emName === EmFile.MainMap ||
-          fT.emName === EmFile.HalfMap1 ||
-          fT.emName === EmFile.HalfMap2
+          fT.file &&
+          (fT.emName === EmFile.MainMap ||
+            fT.emName === EmFile.HalfMap1 ||
+            fT.emName === EmFile.HalfMap2)
         ) {
-          fT.contour = parsedValue;
+          fT.contour = this.mainContour;
         }
       });
     } else {
@@ -343,28 +357,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
 
     this.fileTypes.push(newMap);
   }
-  // sendFile(depID: string, form: FormData, fileType: string) {
-  //   this.http
-  //     .post(this.connectedDepositionBackend + "onedep/" + depID + "/file", form)
-  //     .subscribe({
-  //       next: (res) => console.log("Uploaded", fileType, res),
-  //       error: (error) =>
-  //         console.error("Could not upload File and Metadata", error),
-  //     });
-  // }
 
-  // sendMetadata(depID: string, form: FormData) {
-  //   // missing token!
-  //   this.http
-  //     .post(
-  //       this.connectedDepositionBackend + "onedep/" + depID + "/metadata",
-  //       form,
-  //     )
-  //     .subscribe({
-  //       next: (res) => console.log("Uploaded Metadata", res),
-  //       error: (error) => console.error("Could not upload Metadata", error),
-  //     });
-  // }
   onDepositClick() {
     let body: OneDepUserInfo;
     if (this.form.value.password) {
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index 1895a716ce..a8bc13a2dd 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -51,198 +51,200 @@ interface EmMethod {
   files: DepositionFiles[];
 }
 
-export const depositionImage: DepositionFiles = {
-  emName: EmFile.Image,
-  nameFE: "Public Image",
-  type: "img-emdb",
-  fileName: "",
-  file: null,
-  details: "",
-  required: false,
-  explanation: "Image of the map (500 x 500 pixels in .jpg, .png, etc. format)",
+export const createMethodsList = (): EmMethod[] => {
+  const depositionImage: DepositionFiles = {
+    emName: EmFile.Image,
+    nameFE: "Public Image",
+    type: "img-emdb",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+    explanation:
+      "Image of the map (500 x 500 pixels in .jpg, .png, etc. format)",
+  };
+  const depositionMainMap: DepositionFiles = {
+    emName: EmFile.MainMap,
+    nameFE: "Main Map",
+    type: "vo-map",
+    fileName: "",
+    file: null,
+    contour: 0.0,
+    details: "",
+    required: false,
+    explanation:
+      "Primary map (.mrc or .ccp4 format, may use gzip or bzip2 compression) along with recommended contour level",
+  };
+  const depositionHalfMap1: DepositionFiles = {
+    emName: EmFile.HalfMap1,
+    nameFE: "Half Map (1)",
+    type: "half-map",
+    fileName: "",
+    file: null,
+    contour: 0.0,
+    details: "",
+    required: false,
+    explanation:
+      "Half maps (as used for FSC calculation; two maps must be uploaded)",
+  };
+  const depositionHalfMap2: DepositionFiles = {
+    emName: EmFile.HalfMap2,
+    nameFE: "Half Map (2)",
+    type: "half-map",
+    fileName: "",
+    file: null,
+    contour: 0.0,
+    details: "",
+    required: false,
+    explanation:
+      "Half maps (as used for FSC calculation; two maps must be uploaded)",
+  };
+  const depositionMaskMap: DepositionFiles = {
+    emName: EmFile.MaskMap,
+    nameFE: "Mask Map",
+    type: "mask-map",
+    fileName: "",
+    file: null,
+    contour: 0.0,
+    details: "",
+    required: false,
+    explanation:
+      "Primary/raw map mask, segmentation/focused refinement mask and half-map mask",
+  };
+  const depositionAddMap: DepositionFiles = {
+    emName: EmFile.AddMap,
+    id: 0,
+    nameFE: "Additional Map",
+    type: "add-map",
+    fileName: "",
+    file: null,
+    contour: 0.0,
+    details: "",
+    required: false,
+    explanation:
+      "Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)",
+  };
+  const depositionFSC: DepositionFiles = {
+    emName: EmFile.FSC,
+    nameFE: "FSC-XML",
+    type: "fsc-xml",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+    explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs",
+  };
+  const depositionLayerLines: DepositionFiles = {
+    emName: EmFile.LayerLines,
+    nameFE: "Other: Layer Lines Data ",
+    type: "layer-lines",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+  };
+  const depositionCoordinates: DepositionFiles = {
+    emName: EmFile.Coordinates,
+    nameFE: "Coordinates",
+    type: "co-cif",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+    explanation: "mmCIF or PDB format",
+  };
+  const depositionStructureFactors: DepositionFiles = {
+    emName: EmFile.StructureFactors,
+    nameFE: "Structure Factors",
+    type: "xs-cif",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+  };
+  const depositionMTZ: DepositionFiles = {
+    emName: EmFile.MTZ,
+    nameFE: "MTZ",
+    type: "xs-mtz",
+    fileName: "",
+    file: null,
+    details: "",
+    required: false,
+  };
+  return [
+    {
+      value: EmType.Helical,
+      viewValue: "Helical",
+      files: [
+        depositionImage,
+        depositionCoordinates,
+        depositionMainMap,
+        depositionMaskMap,
+        depositionHalfMap1,
+        depositionHalfMap2,
+        depositionFSC,
+        depositionLayerLines,
+        depositionAddMap,
+      ],
+    },
+    {
+      value: EmType.SingleParticle,
+      viewValue: "Single Particle",
+      files: [
+        depositionImage,
+        depositionCoordinates,
+        depositionMainMap,
+        depositionMaskMap,
+        depositionHalfMap1,
+        depositionHalfMap2,
+        depositionFSC,
+        depositionLayerLines,
+        depositionAddMap,
+      ],
+    },
+    {
+      value: EmType.SubtomogramAveraging,
+      viewValue: "Subtomogram Averaging",
+      files: [
+        depositionImage,
+        depositionCoordinates,
+        depositionMainMap,
+        depositionMaskMap,
+        depositionHalfMap1,
+        depositionHalfMap2,
+        depositionFSC,
+        depositionLayerLines,
+        depositionAddMap,
+      ],
+    },
+    {
+      value: EmType.Tomogram,
+      viewValue: "Tomogram",
+      files: [
+        depositionImage,
+        depositionMainMap,
+        depositionMaskMap,
+        depositionFSC,
+        depositionLayerLines,
+        depositionAddMap,
+      ],
+    },
+    {
+      value: EmType.ElectronCristallography,
+      viewValue: "Electron Crystallography",
+      files: [
+        depositionImage,
+        depositionCoordinates,
+        depositionMainMap,
+        depositionMaskMap,
+        depositionHalfMap1,
+        depositionHalfMap2,
+        depositionStructureFactors,
+        depositionMTZ,
+        depositionFSC,
+        depositionLayerLines,
+        depositionAddMap,
+      ],
+    },
+  ];
 };
-export const depositionMainMap: DepositionFiles = {
-  emName: EmFile.MainMap,
-  nameFE: "Main Map",
-  type: "vo-map",
-  fileName: "",
-  file: null,
-  contour: 0.0,
-  details: "",
-  required: false,
-  explanation:
-    "Primary map (.mrc or .ccp4 format, may use gzip or bzip2 compression) along with recommended contour level",
-};
-export const depositionHalfMap1: DepositionFiles = {
-  emName: EmFile.HalfMap1,
-  nameFE: "Half Map (1)",
-  type: "half-map",
-  fileName: "",
-  file: null,
-  contour: 0.0,
-  details: "",
-  required: false,
-  explanation:
-    "Half maps (as used for FSC calculation; two maps must be uploaded)",
-};
-export const depositionHalfMap2: DepositionFiles = {
-  emName: EmFile.HalfMap2,
-  nameFE: "Half Map (2)",
-  type: "half-map",
-  fileName: "",
-  file: null,
-  contour: 0.0,
-  details: "",
-  required: false,
-  explanation:
-    "Half maps (as used for FSC calculation; two maps must be uploaded)",
-};
-export const depositionMaskMap: DepositionFiles = {
-  emName: EmFile.MaskMap,
-  nameFE: "Mask Map",
-  type: "mask-map",
-  fileName: "",
-  file: null,
-  contour: 0.0,
-  details: "",
-  required: false,
-  explanation:
-    "Primary/raw map mask, segmentation/focused refinement mask and half-map mask",
-};
-export const depositionAddMap: DepositionFiles = {
-  emName: EmFile.AddMap,
-  id: 0,
-  nameFE: "Additional Map",
-  type: "add-map",
-  fileName: "",
-  file: null,
-  contour: 0.0,
-  details: "",
-  required: false,
-  explanation:
-    "Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)",
-};
-export const depositionFSC: DepositionFiles = {
-  emName: EmFile.FSC,
-  nameFE: "FSC-XML",
-  type: "fsc-xml",
-  fileName: "",
-  file: null,
-  details: "",
-  required: false,
-  explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs",
-};
-export const depositionLayerLines: DepositionFiles = {
-  emName: EmFile.LayerLines,
-  nameFE: "Other: Layer Lines Data ",
-  type: "layer-lines",
-  fileName: "",
-  file: null,
-  details: "",
-  required: false,
-};
-export const depositionCoordinates: DepositionFiles = {
-  emName: EmFile.Coordinates,
-  nameFE: "Coordinates",
-  type: "co-cif",
-  fileName: "",
-  file: null,
-  details: "",
-  required: false,
-  explanation: "mmCIF or PDB format",
-};
-export const depositionStructureFactors: DepositionFiles = {
-  emName: EmFile.StructureFactors,
-  nameFE: "Structure Factors",
-  type: "xs-cif",
-  fileName: "",
-  file: null,
-  details: "",
-  required: false,
-};
-export const depositionMTZ: DepositionFiles = {
-  emName: EmFile.MTZ,
-  nameFE: "MTZ",
-  type: "xs-mtz",
-  fileName: "",
-  file: null,
-  details: "",
-  required: false,
-};
-
-export const methodsList: EmMethod[] = [
-  {
-    value: EmType.Helical,
-    viewValue: "Helical",
-    files: [
-      depositionImage,
-      depositionCoordinates,
-      depositionMainMap,
-      depositionMaskMap,
-      depositionHalfMap1,
-      depositionHalfMap2,
-      depositionFSC,
-      depositionLayerLines,
-      depositionAddMap,
-    ],
-  },
-  {
-    value: EmType.SingleParticle,
-    viewValue: "Single Particle",
-    files: [
-      depositionImage,
-      depositionCoordinates,
-      depositionMainMap,
-      depositionMaskMap,
-      depositionHalfMap1,
-      depositionHalfMap2,
-      depositionFSC,
-      depositionLayerLines,
-      depositionAddMap,
-    ],
-  },
-  {
-    value: EmType.SubtomogramAveraging,
-    viewValue: "Subtomogram Averaging",
-    files: [
-      depositionImage,
-      depositionCoordinates,
-      depositionMainMap,
-      depositionMaskMap,
-      depositionHalfMap1,
-      depositionHalfMap2,
-      depositionFSC,
-      depositionLayerLines,
-      depositionAddMap,
-    ],
-  },
-  {
-    value: EmType.Tomogram,
-    viewValue: "Tomogram",
-    files: [
-      depositionImage,
-      depositionMainMap,
-      depositionMaskMap,
-      depositionFSC,
-      depositionLayerLines,
-      depositionAddMap,
-    ],
-  },
-  {
-    value: EmType.ElectronCristallography,
-    viewValue: "Electron Crystallography",
-    files: [
-      depositionImage,
-      depositionCoordinates,
-      depositionMainMap,
-      depositionMaskMap,
-      depositionHalfMap1,
-      depositionHalfMap2,
-      depositionStructureFactors,
-      depositionMTZ,
-      depositionFSC,
-      depositionLayerLines,
-      depositionAddMap,
-    ],
-  },
-];
diff --git a/src/app/state-management/effects/onedep.effects.ts b/src/app/state-management/effects/onedep.effects.ts
index d1f654d2c5..3b02c8e34c 100644
--- a/src/app/state-management/effects/onedep.effects.ts
+++ b/src/app/state-management/effects/onedep.effects.ts
@@ -28,7 +28,7 @@ export class OneDepEffects {
                   : this.onedepDepositor.sendFile(dep.depID, file.form),
               ),
 
-              last(), // Ensures the final emission happens only after all uploads are complete
+              last(),
               map(() =>
                 fromActions.submitDepositionSuccess({
                   deposition: dep as OneDepCreated,
diff --git a/src/app/state-management/models/index.ts b/src/app/state-management/models/index.ts
index 08fd5021cf..b3db1bf6bd 100644
--- a/src/app/state-management/models/index.ts
+++ b/src/app/state-management/models/index.ts
@@ -30,6 +30,7 @@ export interface DatasetsListSettings {
 export enum MessageType {
   Success = "success",
   Error = "error",
+  Info = "info",
 }
 
 export interface Message {

From 6a220b1d8b7b257c215b2f2ef2a24e5b702e3723 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Mon, 13 Jan 2025 19:14:24 +0000
Subject: [PATCH 075/245] alpha-release: quick fix for minimal scicat metadata

---
 ...estor.confirm-transfer-dialog.component.ts | 11 +------
 .../ingestor.new-transfer-dialog.component.ts |  2 +-
 .../dialog/ingestor.new-transfer-dialog.html  |  4 +--
 ...ingestor.user-metadata-dialog.component.ts |  3 --
 .../ingestor/ingestor.component-helper.ts     | 31 ++++++++++++++-----
 .../ingestor/ingestor/ingestor.component.ts   |  2 +-
 6 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 36b22feb0d..5c3c74f974 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -39,16 +39,7 @@ export class IngestorConfirmTransferDialogComponent implements OnInit {
   createMetaDataString(): string {
     const space = 2;
     const scicatMetadata: SciCatHeader = {
-      datasetName: this.createNewTransferData.scicatHeader["datasetName"],
-      description: this.createNewTransferData.scicatHeader["description"],
-      creationLocation:
-        this.createNewTransferData.scicatHeader["creationLocation"],
-      dataFormat: this.createNewTransferData.scicatHeader["dataFormat"],
-      ownerGroup: this.createNewTransferData.scicatHeader["ownerGroup"],
-      type: this.createNewTransferData.scicatHeader["type"],
-      license: this.createNewTransferData.scicatHeader["license"],
-      keywords: this.createNewTransferData.scicatHeader["keywords"],
-      filePath: this.createNewTransferData.scicatHeader["filePath"],
+      ...(this.createNewTransferData.scicatHeader as SciCatHeader),
       scientificMetadata: {
         organizational:
           this.createNewTransferData.userMetaData["organizational"],
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index ba4cae3bef..471c8e15f1 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -102,7 +102,7 @@ export class IngestorNewTransferDialogComponent implements OnInit {
   }
 
   generateExampleDataForSciCatHeader(): void {
-    this.data.createNewTransferData.scicatHeader["filePath"] =
+    this.data.createNewTransferData.scicatHeader["sourceFolder"] =
       this.createNewTransferData.selectedPath;
     this.data.createNewTransferData.scicatHeader["keywords"] = ["OpenEM"];
 
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
index a80e8c4d8a..e3d6ba2a30 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -16,8 +16,8 @@ <h2 mat-dialog-title>
       <mat-label>File Path</mat-label>
       <input matInput [(ngModel)]="selectedPath" [matAutocomplete]="auto">
       <mat-autocomplete #auto="matAutocomplete">
-        <mat-option *ngFor="let filePath of availableFilePaths" [value]="filePath">
-          {{ filePath }}
+        <mat-option *ngFor="let sourceFolder of availableFilePaths" [value]="sourceFolder">
+          {{ sourceFolder }}
         </mat-option>
       </mat-autocomplete>
     </mat-form-field>
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 39f6298523..1f57b6ab8a 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -45,9 +45,6 @@ export class IngestorUserMetadataDialogComponent {
 
     this.metadataSchemaOrganizational = organizationalSchema;
 
-    // TODO Remove after debug
-    console.log("organizationalSchema", organizationalSchema);
-
     this.metadataSchemaSample = sampleSchema;
     this.scicatHeaderSchema = SciCatHeader_Schema;
   }
diff --git a/src/app/ingestor/ingestor/ingestor.component-helper.ts b/src/app/ingestor/ingestor/ingestor.component-helper.ts
index c022782eae..910b2fbe35 100644
--- a/src/app/ingestor/ingestor/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/ingestor.component-helper.ts
@@ -42,8 +42,15 @@ export interface SciCatHeader {
   type: string;
   license: string;
   keywords: string[];
-  filePath: string;
+  sourceFolder: string;
   scientificMetadata: ScientificMetadata;
+  principalInvestigator: string;
+  ownerEmail: string;
+  contactEmail: string;
+  sourceFolderHost: string;
+  investigator: string;
+  creationTime: string;
+  owner: string;
 }
 
 export interface ScientificMetadata {
@@ -111,14 +118,20 @@ export const SciCatHeader_Schema: JsonSchema = {
     creationLocation: { type: "string" },
     dataFormat: { type: "string" },
     ownerGroup: { type: "string" },
-    filePath: { type: "string", readOnly: true }, // disabled, because its selected in the first step
     type: { type: "string" },
     license: { type: "string" },
     keywords: {
       type: "array",
       items: { type: "string" },
     },
-    // scientificMetadata: { type: "string" } ; is created during the ingestor process
+    sourceFolder: { type: "string", readOnly: true }, // disabled, because its selected in the first step
+    principalInvestigator: { type: "string" },
+    ownerEmail: { type: "string" },
+    contactEmail: { type: "string" },
+    sourceFolderHost: { type: "string" },
+    investigator: { type: "string" },
+    creationTime: { type: "string" },
+    owner: { type: "string" },
   },
   required: [
     "datasetName",
@@ -126,9 +139,13 @@ export const SciCatHeader_Schema: JsonSchema = {
     "dataFormat",
     "ownerGroup",
     "type",
-    "license",
-    "keywords",
-    "scientificMetadata",
-    "filePath",
+    "sourceFolder",
+    "principalInvestigator",
+    "ownerEmail",
+    "contactEmail",
+    "sourceFolderHost",
+    "investigator",
+    "creationTime",
+    "owner",
   ],
 };
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 637cf7f949..71604d540d 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -28,7 +28,7 @@ import {
 export class IngestorComponent implements OnInit {
   readonly dialog = inject(MatDialog);
 
-  filePath = "";
+  sourceFolder = "";
   loading = false;
   forwardFacilityBackend = "";
 

From 56d874a1df3cb4af57c1411f92e15d7cd86bcc45 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Mon, 13 Jan 2025 19:14:24 +0000
Subject: [PATCH 076/245] alpha-release: quick fix for minimal scicat metadata

---
 ...estor.confirm-transfer-dialog.component.ts | 11 +------
 .../ingestor.new-transfer-dialog.component.ts |  2 +-
 .../dialog/ingestor.new-transfer-dialog.html  |  4 +--
 ...ingestor.user-metadata-dialog.component.ts |  3 --
 .../ingestor/ingestor.component-helper.ts     | 31 ++++++++++++++-----
 .../ingestor/ingestor/ingestor.component.ts   |  2 +-
 6 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 36b22feb0d..5c3c74f974 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -39,16 +39,7 @@ export class IngestorConfirmTransferDialogComponent implements OnInit {
   createMetaDataString(): string {
     const space = 2;
     const scicatMetadata: SciCatHeader = {
-      datasetName: this.createNewTransferData.scicatHeader["datasetName"],
-      description: this.createNewTransferData.scicatHeader["description"],
-      creationLocation:
-        this.createNewTransferData.scicatHeader["creationLocation"],
-      dataFormat: this.createNewTransferData.scicatHeader["dataFormat"],
-      ownerGroup: this.createNewTransferData.scicatHeader["ownerGroup"],
-      type: this.createNewTransferData.scicatHeader["type"],
-      license: this.createNewTransferData.scicatHeader["license"],
-      keywords: this.createNewTransferData.scicatHeader["keywords"],
-      filePath: this.createNewTransferData.scicatHeader["filePath"],
+      ...(this.createNewTransferData.scicatHeader as SciCatHeader),
       scientificMetadata: {
         organizational:
           this.createNewTransferData.userMetaData["organizational"],
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index ba4cae3bef..471c8e15f1 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -102,7 +102,7 @@ export class IngestorNewTransferDialogComponent implements OnInit {
   }
 
   generateExampleDataForSciCatHeader(): void {
-    this.data.createNewTransferData.scicatHeader["filePath"] =
+    this.data.createNewTransferData.scicatHeader["sourceFolder"] =
       this.createNewTransferData.selectedPath;
     this.data.createNewTransferData.scicatHeader["keywords"] = ["OpenEM"];
 
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
index a80e8c4d8a..e3d6ba2a30 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -16,8 +16,8 @@ <h2 mat-dialog-title>
       <mat-label>File Path</mat-label>
       <input matInput [(ngModel)]="selectedPath" [matAutocomplete]="auto">
       <mat-autocomplete #auto="matAutocomplete">
-        <mat-option *ngFor="let filePath of availableFilePaths" [value]="filePath">
-          {{ filePath }}
+        <mat-option *ngFor="let sourceFolder of availableFilePaths" [value]="sourceFolder">
+          {{ sourceFolder }}
         </mat-option>
       </mat-autocomplete>
     </mat-form-field>
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 39f6298523..1f57b6ab8a 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -45,9 +45,6 @@ export class IngestorUserMetadataDialogComponent {
 
     this.metadataSchemaOrganizational = organizationalSchema;
 
-    // TODO Remove after debug
-    console.log("organizationalSchema", organizationalSchema);
-
     this.metadataSchemaSample = sampleSchema;
     this.scicatHeaderSchema = SciCatHeader_Schema;
   }
diff --git a/src/app/ingestor/ingestor/ingestor.component-helper.ts b/src/app/ingestor/ingestor/ingestor.component-helper.ts
index c022782eae..910b2fbe35 100644
--- a/src/app/ingestor/ingestor/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/ingestor.component-helper.ts
@@ -42,8 +42,15 @@ export interface SciCatHeader {
   type: string;
   license: string;
   keywords: string[];
-  filePath: string;
+  sourceFolder: string;
   scientificMetadata: ScientificMetadata;
+  principalInvestigator: string;
+  ownerEmail: string;
+  contactEmail: string;
+  sourceFolderHost: string;
+  investigator: string;
+  creationTime: string;
+  owner: string;
 }
 
 export interface ScientificMetadata {
@@ -111,14 +118,20 @@ export const SciCatHeader_Schema: JsonSchema = {
     creationLocation: { type: "string" },
     dataFormat: { type: "string" },
     ownerGroup: { type: "string" },
-    filePath: { type: "string", readOnly: true }, // disabled, because its selected in the first step
     type: { type: "string" },
     license: { type: "string" },
     keywords: {
       type: "array",
       items: { type: "string" },
     },
-    // scientificMetadata: { type: "string" } ; is created during the ingestor process
+    sourceFolder: { type: "string", readOnly: true }, // disabled, because its selected in the first step
+    principalInvestigator: { type: "string" },
+    ownerEmail: { type: "string" },
+    contactEmail: { type: "string" },
+    sourceFolderHost: { type: "string" },
+    investigator: { type: "string" },
+    creationTime: { type: "string" },
+    owner: { type: "string" },
   },
   required: [
     "datasetName",
@@ -126,9 +139,13 @@ export const SciCatHeader_Schema: JsonSchema = {
     "dataFormat",
     "ownerGroup",
     "type",
-    "license",
-    "keywords",
-    "scientificMetadata",
-    "filePath",
+    "sourceFolder",
+    "principalInvestigator",
+    "ownerEmail",
+    "contactEmail",
+    "sourceFolderHost",
+    "investigator",
+    "creationTime",
+    "owner",
   ],
 };
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 637cf7f949..71604d540d 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -28,7 +28,7 @@ import {
 export class IngestorComponent implements OnInit {
   readonly dialog = inject(MatDialog);
 
-  filePath = "";
+  sourceFolder = "";
   loading = false;
   forwardFacilityBackend = "";
 

From 082910a8d0c2cbfd7943df72df0f09c05536598c Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 14 Jan 2025 07:25:27 +0000
Subject: [PATCH 077/245] format html

---
 src/app/datasets/onedep/onedep.component.html | 659 +++++++++---------
 1 file changed, 321 insertions(+), 338 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 8c33b6b819..99ea99d158 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -1,347 +1,330 @@
 <ng-template [ngIf]="dataset">
     <div style="clear: both"></div>
     <div>
-        <div>
-            <mat-card [formGroup]="form" data-cy="general-info">
-                <mat-card-header class="general-header">
-                    <div mat-card-avatar class="section-icon">
-                        <mat-icon> assignment </mat-icon>
-                    </div>
-                    General information
-                </mat-card-header>
-                <mat-card-content>
-                    <table>
-                        <tr>
-                            <th>Name</th>
-                            <td>{{ dataset.datasetName || "-" }}</td>
-                        </tr>
-                        <tr>
-                            <th>Description</th>
-                            <td>
-                                <span 
-                                    [innerHTML]="dataset.description || '-' | linky"></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <th>PID</th>
-                            <td>
-                                {{ dataset.pid }}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th>Type</th>
-                            <td>{{dataset.type }}</td>
-                        </tr>
-                        <tr>
-                            <th>Creation Time</th>
-                            <td>{{ dataset.creationTime | date: "yyyy-MM-dd
-                                HH:mm" }}</td>
-                        </tr>
-                        <tr class="keywords-row">
-                            <th>Keywords</th>
-                            <mat-chip-set role="list" #keywordChips>
-                                <mat-chip role="listitem"
-                                    *ngFor="let keyword of dataset.keywords">
-                                    {{ keyword }}
-                                </mat-chip>
-                            </mat-chip-set>
-                        </tr>
-                    </table>
-                </mat-card-content>
-
-            </mat-card>
-            <mat-card [formGroup]="form">
-                <mat-card-header class="creator-header">
-                    <div mat-card-avatar class="section-icon">
-                        <mat-icon> blur_linear </mat-icon>
-                    </div>
-                    Administrative and Method Information:
-                </mat-card-header>
-
-                <div class="card-container">
-                    <div class="card-left">
-                        <h2>Obtain OneDep Token</h2>
-                        <p class="instruction">Go to <a href="https://onedep-depui-test.wwpdb.org" target="_blank" >OneDep API</a> and choose option to sign in with ORCID. After the authorization you will be redirected back to OneDep. In the left bar below the map, tick the Deposition API option and click "Generate Key". Copy the token in the field below.    </p>
-                        <mat-form-field 
-                            class="token-field"
-                            appearance="outline">
-                            <mat-label>Token</mat-label>
-                            <textarea 
-                                matInput
-                                required
-                                placeholder="copy the token here"
-                                rows="1"
-                                formControlName="jwtToken" 
-                                (input)="autoGrow($event)"
-                                [style.overflow]="detailsOverflow"></textarea>
-                        </mat-form-field>
-                        <!-- Password Field -->
-                        <h2 class="password">Password</h2>
-                        <p class="instruction">You can provide a password, which will be confirmed in the email and sent to all provided ORCID users.</p>
-                        <mat-form-field class="password-field" appearance="outline">
-                            <mat-label>Password</mat-label>
-                            <input 
-                                matInput
-                                [type]="showPassword ? 'text' : 'password'"
-                                placeholder="enter your password"
-                                formControlName="password">
-                            <button mat-icon-button matSuffix (click)="togglePasswordVisibility()">
-                                <mat-icon>{{ showPassword ? 'visibility_off' : 'visibility' }}</mat-icon>
-                            </button>
-                        </mat-form-field>
-                    </div>
-                    <div class="card-middle">
-                        <h2>Enter 16-digit ORCID iD</h2>
-                        <p class="instruction">Owners of these ORCIDs iDs are
-                            allowed to access this deposition.</p>
-                        
-                            <!-- Link the orcid FormArray -->
-                            <div formArrayName="orcid">
-                                <ng-container
-                                    *ngFor="let field of orcidArray().controls; let i = index">
-                                    <div [formGroupName]="i">
-                                        <mat-form-field 
-                                            class="data-field"
-                                            appearance="outline">
-                                            <mat-label>Enter 16-digits ORCID iD</mat-label>
-                                            <div class="input-container">
-                                            <input 
-                                                matInput 
-                                                type="text"
-                                                maxlength="19"
-                                                placeholder="xxxx-xxxx-xxxx-xxxx"
-                                                formControlName="orcidId"
-                                                orcidFormatter
-                                            >
-                                            
-                                            <button 
-                                                mat-icon-button 
-                                                class="remove-field-btn" 
-                                                (click)="removeOrcidField(i)">
-                                                <mat-icon>clear</mat-icon>    
-                                            </button>                                    
-                                            </div>
-                                        </mat-form-field>
-                                    </div>
-                                </ng-container>
-                            </div>
-                            <button 
-                                mat-icon-button 
-                                class="add-field-btn" 
-                                (click)="addOrcidField()">
-                                <mat-icon>add</mat-icon>
-                            </button>
-                        
-                    </div>
-                    
-                    <div class="card-right">
-                    
-                        <!-- Question 1: Electron Microscopy Method -->
-                        <h2>Choose Electron Microscopy
-                            Method</h2>
-                        <mat-form-field class="method-name">
-                            <mat-label>experimental method</mat-label>
-                            <mat-select 
-                                required
-                                formControlName="emMethod"
-                                name="method"
-                                (selectionChange)="onMethodChange()">
-                                <mat-option *ngFor="let method of methodsList"
-                                    [value]="method.value">
-                                    {{ method.viewValue }}
-                                </mat-option>
-                            </mat-select>
-                            
-                            <!-- Error Message -->
-                            <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched"
-                                class="error">
-                                You must specify the experimental method
-                            </div>
-                        </mat-form-field>
-
-
-                        <!-- Question 2: PDB Deposition -->
-                        <tr *ngIf="form.value['emMethod'] && form.value['emMethod'] !== 'tomogram'">
-                            <th class="questionnaire">Are you deposing
-                                coordinates with this
-                                submission? (for PDB)</th>
-                            <td>
-                                <mat-radio-group reuired
-                                    formControlName="deposingCoordinates"
-                                    (change)="onPDB($event)">
-                                    <mat-radio-button name="deposingCoordinates"
-                                        value=true>
-                                        Yes
-                                    </mat-radio-button>
-                                    <mat-radio-button name="deposingCoordinates"
-                                        value=false checked>
-                                        No
-                                    </mat-radio-button>
-                                </mat-radio-group>
-                            </td>
-                        </tr>
-                        <tr
-                            *ngIf="form.value['emMethod'] && form.get('deposingCoordinates')?.value === 'true'">
-                            <th>Has an associated map been deposited to EMDB?
-                            </th>
-                            <td>
-                                <mat-radio-group reuired
-                                    formControlName="associatedMap">
-                                    <mat-radio-button name="associatedMap"
-                                        value=true>
-                                        Yes
-                                    </mat-radio-button>
-                                    <mat-radio-button name="associatedMap"
-                                        value=false>
-                                        No
-                                    </mat-radio-button>
-                                </mat-radio-group>
-                            </td>
-                        </tr>
-
-                        <!-- EMDB Identifier Field -->
-                        <tr
-                            *ngIf="form.value['emMethod'] && form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
-                            <th>EMDB Identifier</th>
-                            <td>
-                                <mat-form-field class="EMDB-ID">
-                                    <mat-label>EMDB ID</mat-label>
-                                    <input required matInput
-                                        formControlName="emdbId" />
-                                </mat-form-field>
-                            </td>
-                        </tr>
-
-                        <!-- Final Question: Composite Map -->
-                        <tr *ngIf=" form.value['emMethod']">
-                            <th class="questionnaire">Is this a composite map?
-                            </th>
-                            <td>
-                                <mat-radio-group required
-                                    formControlName="compositeMap">
-                                    <mat-radio-button name="compositeMap"
-                                        value=true>
-                                        Yes
-                                    </mat-radio-button>
-                                    <mat-radio-button name="compositeMap"
-                                        value=false checked>
-                                        No
-                                    </mat-radio-button>
-                                </mat-radio-group>
-                            </td>
-                        </tr>
-                    </div>
+       <div>
+          <mat-card [formGroup]="form" data-cy="general-info">
+             <mat-card-header class="general-header">
+                <div mat-card-avatar class="section-icon">
+                   <mat-icon> assignment </mat-icon>
+                </div>
+                General information
+             </mat-card-header>
+             <mat-card-content>
+                <table>
+                   <tr>
+                      <th>Name</th>
+                      <td>{{ dataset.datasetName || "-" }}</td>
+                   </tr>
+                   <tr>
+                      <th>Description</th>
+                      <td>
+                         <span 
+                            [innerHTML]="dataset.description || '-' | linky"></span>
+                      </td>
+                   </tr>
+                   <tr>
+                      <th>PID</th>
+                      <td>
+                         {{ dataset.pid }}
+                      </td>
+                   </tr>
+                   <tr>
+                      <th>Type</th>
+                      <td>{{dataset.type }}</td>
+                   </tr>
+                   <tr>
+                      <th>Creation Time</th>
+                      <td>{{ dataset.creationTime | date: "yyyy-MM-dd
+                         HH:mm" }}
+                      </td>
+                   </tr>
+                   <tr class="keywords-row">
+                      <th>Keywords</th>
+                      <mat-chip-set role="list" #keywordChips>
+                         <mat-chip role="listitem"
+                            *ngFor="let keyword of dataset.keywords">
+                            {{ keyword }}
+                         </mat-chip>
+                      </mat-chip-set>
+                   </tr>
+                </table>
+             </mat-card-content>
+          </mat-card>
+          <mat-card [formGroup]="form">
+             <mat-card-header class="creator-header">
+                <div mat-card-avatar class="section-icon">
+                   <mat-icon> blur_linear </mat-icon>
+                </div>
+                Administrative and Method Information:
+             </mat-card-header>
+             <div class="card-container">
+                <div class="card-left">
+                   <h2>Obtain OneDep Token</h2>
+                   <p class="instruction">Go to <a href="https://onedep-depui-test.wwpdb.org" target="_blank" >OneDep API</a> and choose option to sign in with ORCID. After the authorization you will be redirected back to OneDep. In the left bar below the map, tick the Deposition API option and click "Generate Key". Copy the token in the field below.    </p>
+                   <mat-form-field 
+                      class="token-field"
+                      appearance="outline">
+                      <mat-label>Token</mat-label>
+                      <textarea 
+                      matInput
+                      required
+                      placeholder="copy the token here"
+                      rows="1"
+                      formControlName="jwtToken" 
+                      (input)="autoGrow($event)"
+                      [style.overflow]="detailsOverflow"></textarea>
+                   </mat-form-field>
+                   <!-- Password Field -->
+                   <h2 class="password">Password</h2>
+                   <p class="instruction">You can provide a password, which will be confirmed in the email and sent to all provided ORCID users.</p>
+                   <mat-form-field class="password-field" appearance="outline">
+                      <mat-label>Password</mat-label>
+                      <input 
+                         matInput
+                         [type]="showPassword ? 'text' : 'password'"
+                         placeholder="enter your password"
+                         formControlName="password">
+                      <button mat-icon-button matSuffix (click)="togglePasswordVisibility()">
+                         <mat-icon>{{ showPassword ? 'visibility_off' : 'visibility' }}</mat-icon>
+                      </button>
+                   </mat-form-field>
+                </div>
+                <div class="card-middle">
+                   <h2>Enter 16-digit ORCID iD</h2>
+                   <p class="instruction">Owners of these ORCIDs iDs are
+                      allowed to access this deposition.
+                   </p>
+                   <!-- Link the orcid FormArray -->
+                   <div formArrayName="orcid">
+                      <ng-container
+                         *ngFor="let field of orcidArray().controls; let i = index">
+                         <div [formGroupName]="i">
+                            <mat-form-field 
+                               class="data-field"
+                               appearance="outline">
+                               <mat-label>Enter 16-digits ORCID iD</mat-label>
+                               <div class="input-container">
+                                  <input 
+                                     matInput 
+                                     type="text"
+                                     maxlength="19"
+                                     placeholder="xxxx-xxxx-xxxx-xxxx"
+                                     formControlName="orcidId"
+                                     orcidFormatter
+                                     >
+                                  <button 
+                                     mat-icon-button 
+                                     class="remove-field-btn" 
+                                     (click)="removeOrcidField(i)">
+                                     <mat-icon>clear</mat-icon>
+                                  </button>
+                               </div>
+                            </mat-form-field>
+                         </div>
+                      </ng-container>
+                   </div>
+                   <button 
+                      mat-icon-button 
+                      class="add-field-btn" 
+                      (click)="addOrcidField()">
+                      <mat-icon>add</mat-icon>
+                   </button>
                 </div>
-                <!-- <button class="submitDep" mat-raised-button color="primary"
+                <div class="card-right">
+                   <!-- Question 1: Electron Microscopy Method -->
+                   <h2>Choose Electron Microscopy
+                      Method
+                   </h2>
+                   <mat-form-field class="method-name">
+                      <mat-label>experimental method</mat-label>
+                      <mat-select 
+                         required
+                         formControlName="emMethod"
+                         name="method"
+                         (selectionChange)="onMethodChange()">
+                         <mat-option *ngFor="let method of methodsList"
+                         [value]="method.value">
+                         {{ method.viewValue }}
+                         </mat-option>
+                      </mat-select>
+                      <!-- Error Message -->
+                      <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched"
+                         class="error">
+                         You must specify the experimental method
+                      </div>
+                   </mat-form-field>
+                   <!-- Question 2: PDB Deposition -->
+                   <tr *ngIf="form.value['emMethod'] && form.value['emMethod'] !== 'tomogram'">
+                      <th class="questionnaire">Are you deposing
+                         coordinates with this
+                         submission? (for PDB)
+                      </th>
+                      <td>
+                         <mat-radio-group reuired
+                            formControlName="deposingCoordinates"
+                            (change)="onPDB($event)">
+                            <mat-radio-button name="deposingCoordinates"
+                               value=true>
+                               Yes
+                            </mat-radio-button>
+                            <mat-radio-button name="deposingCoordinates"
+                               value=false checked>
+                               No
+                            </mat-radio-button>
+                         </mat-radio-group>
+                      </td>
+                   </tr>
+                   <tr
+                      *ngIf="form.value['emMethod'] && form.get('deposingCoordinates')?.value === 'true'">
+                      <th>Has an associated map been deposited to EMDB?
+                      </th>
+                      <td>
+                         <mat-radio-group reuired
+                            formControlName="associatedMap">
+                            <mat-radio-button name="associatedMap"
+                               value=true>
+                               Yes
+                            </mat-radio-button>
+                            <mat-radio-button name="associatedMap"
+                               value=false>
+                               No
+                            </mat-radio-button>
+                         </mat-radio-group>
+                      </td>
+                   </tr>
+                   <!-- EMDB Identifier Field -->
+                   <tr
+                      *ngIf="form.value['emMethod'] && form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
+                      <th>EMDB Identifier</th>
+                      <td>
+                         <mat-form-field class="EMDB-ID">
+                            <mat-label>EMDB ID</mat-label>
+                            <input required matInput
+                               formControlName="emdbId" />
+                         </mat-form-field>
+                      </td>
+                   </tr>
+                   <!-- Final Question: Composite Map -->
+                   <tr *ngIf=" form.value['emMethod']">
+                      <th class="questionnaire">Is this a composite map?
+                      </th>
+                      <td>
+                         <mat-radio-group required
+                            formControlName="compositeMap">
+                            <mat-radio-button name="compositeMap"
+                               value=true>
+                               Yes
+                            </mat-radio-button>
+                            <mat-radio-button name="compositeMap"
+                               value=false checked>
+                               No
+                            </mat-radio-button>
+                         </mat-radio-group>
+                      </td>
+                   </tr>
+                </div>
+             </div>
+             <!-- <button class="submitDep" mat-raised-button color="primary"
                 (click)="onCreateClick()">
                 Create Deposition
                 </button> -->
-            </mat-card>
-
-            <!-- Attachments -->
-            <mat-card>
-                <mat-card-header class="file-header">
-                    <div mat-card-avatar class="section-icon">
-                        <mat-icon> attachment </mat-icon>
-                    </div>
-                    Choose files for deposition
-                </mat-card-header>
-                <mat-card-content>
-                    <mat-card *ngFor="let fileType of fileTypes"
-                        class="fileCard">
-                        <ng-container
-                            *ngIf="fileType.emName !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
-                            <mat-card-header matTooltip="{{fileType.explanation}}" matTooltipPosition="above">
-                                <mat-card-title>{{ fileType.nameFE}} <span class="required-asterisk" *ngIf="isRequired(fileType.emName)"> *</span></mat-card-title>
-                                
-                            </mat-card-header>
-                            <mat-card-content>
-                                <div class="file-selection-container">
-                                    <button class="fileChooser"
-                                        mat-raised-button color="primary"
-                                        (click)="onChooseFile(fileInput)">
-                                        Choose File
-                                    </button>
-                                    <div *ngIf="selectedFile[fileType.emName]">
-                                        <mat-icon>attach_file</mat-icon>
-                                    </div>
-
-                                    <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]">
-                                        <mat-icon>attach_file</mat-icon>
-                                    </div>
-                                    <input type="file" #fileInput
-                                        (change)="fileType.emName === 'add-map' ? onFileAddMapSelected($event, fileType.id) : onFileSelected($event, fileType.emName)"
-                                        style="display: none;" />
-                                    <div 
-                                        *ngIf="fileType.emName !== 'add-map' && selectedFile[fileType.emName]"
-                                        class="fileName">
-                                        <p>Selected File: {{ selectedFile[fileType.emName]?.name }}</p>
-                                    </div>
-                                    <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]"
-                                        class="fileName">
-                                        <p>Selected File: {{ selectedFile['add-map-' + fileType.id]?.name }}</p>
-                                    </div>
-                                    
-                                </div>
-
-                                <div class="input-container">
-                                    <ng-container
-                                        *ngIf="fileType.contour !== undefined">
-                                        <mat-form-field appearance="outline"
-                                            class="contour-level">
-                                            <mat-label>Contour Level</mat-label>
-                                            <input matInput type="number"
-                                                placeholder="e.g. 0.0" 
-                                                [required]="!!fileType.file"
-                                                [value]="fileType.contour || ''"
-                                                (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : 
-                                                         fileType.emName === 'add-map' ? updateContourLevelAddMap($event, fileType.id) : 
-                                                         updateContourLevel($event, fileType.emName)" />
-                                       
-                                        </mat-form-field>
-                                        <!-- Error Message -->
-                                        <!-- FIX ME -->
-                                        <!-- <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error">
-                                            You must specify the experimental method
-                                        </div> -->
-                                    </ng-container>
-                                    <mat-form-field class="details">
-                                        <mat-label>Details</mat-label>
-                                        <textarea matInput
-                                            placeholder="Enter details..."
-                                            rows="1"
-                                            (input)="fileType.emName === 'add-map' ? updateDetailsAddMap($event, fileType.id) : updateDetails($event,fileType.emName)"
-                                            (input)="autoGrow($event)"
-                                            [style.overflow]="detailsOverflow"></textarea>
-                                    </mat-form-field>
-                                </div>
-                            </mat-card-content>
-                        </ng-container>
-                        <div *ngIf="fileType.emName === 'add-map' && fileType.id ===0">
-                            <button 
-                                mat-icon-button 
-                                matTooltip="Add more maps" 
-                                aria-label="Add another map" 
-                                (click)="addMap()">
-                                <mat-icon>add</mat-icon>
+          </mat-card>
+          <!-- Attachments -->
+          <mat-card>
+             <mat-card-header class="file-header">
+                <div mat-card-avatar class="section-icon">
+                   <mat-icon> attachment </mat-icon>
+                </div>
+                Choose files for deposition
+             </mat-card-header>
+             <mat-card-content>
+                <mat-card *ngFor="let fileType of fileTypes"
+                   class="fileCard">
+                   <ng-container
+                      *ngIf="fileType.emName !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
+                      <mat-card-header matTooltip="{{fileType.explanation}}" matTooltipPosition="above">
+                         <mat-card-title>{{ fileType.nameFE}} <span class="required-asterisk" *ngIf="isRequired(fileType.emName)"> *</span></mat-card-title>
+                      </mat-card-header>
+                      <mat-card-content>
+                         <div class="file-selection-container">
+                            <button class="fileChooser"
+                               mat-raised-button color="primary"
+                               (click)="onChooseFile(fileInput)">
+                            Choose File
                             </button>
-                        </div>
-                    </mat-card>
-
-
-                    <!-- UPLOAD FILES DONE -->
-                    <button class="submitDep" mat-raised-button color="primary"
-                        (click)="onDepositClick()">
-                        Start Deposition
-                    </button>
-                    <button class="submitDep" mat-raised-button color="primary"
-                        (click)="onDownloadClick()">
-                        Download mmCIF
-                    </button>
-                </mat-card-content>
-            </mat-card>
-
-
-        </div>
+                            <div *ngIf="selectedFile[fileType.emName]">
+                               <mat-icon>attach_file</mat-icon>
+                            </div>
+                            <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]">
+                               <mat-icon>attach_file</mat-icon>
+                            </div>
+                            <input type="file" #fileInput
+                            (change)="fileType.emName === 'add-map' ? onFileAddMapSelected($event, fileType.id) : onFileSelected($event, fileType.emName)"
+                            style="display: none;" />
+                            <div 
+                               *ngIf="fileType.emName !== 'add-map' && selectedFile[fileType.emName]"
+                               class="fileName">
+                               <p>Selected File: {{ selectedFile[fileType.emName]?.name }}</p>
+                            </div>
+                            <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]"
+                               class="fileName">
+                               <p>Selected File: {{ selectedFile['add-map-' + fileType.id]?.name }}</p>
+                            </div>
+                         </div>
+                         <div class="input-container">
+                            <ng-container
+                               *ngIf="fileType.contour !== undefined">
+                               <mat-form-field appearance="outline"
+                                  class="contour-level">
+                                  <mat-label>Contour Level</mat-label>
+                                  <input matInput type="number"
+                                  placeholder="e.g. 0.0" 
+                                  [required]="!!fileType.file"
+                                  [value]="fileType.contour || ''"
+                                  (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : 
+                                  fileType.emName === 'add-map' ? updateContourLevelAddMap($event, fileType.id) : 
+                                  updateContourLevel($event, fileType.emName)" />
+                               </mat-form-field>
+                               <!-- Error Message -->
+                               <!-- FIX ME -->
+                               <!-- <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error">
+                                  You must specify the experimental method
+                                  </div> -->
+                            </ng-container>
+                            <mat-form-field class="details">
+                               <mat-label>Details</mat-label>
+                               <textarea matInput
+                               placeholder="Enter details..."
+                               rows="1"
+                               (input)="fileType.emName === 'add-map' ? updateDetailsAddMap($event, fileType.id) : updateDetails($event,fileType.emName)"
+                               (input)="autoGrow($event)"
+                               [style.overflow]="detailsOverflow"></textarea>
+                            </mat-form-field>
+                         </div>
+                      </mat-card-content>
+                   </ng-container>
+                   <div *ngIf="fileType.emName === 'add-map' && fileType.id ===0">
+                      <button 
+                         mat-icon-button 
+                         matTooltip="Add more maps" 
+                         aria-label="Add another map" 
+                         (click)="addMap()">
+                         <mat-icon>add</mat-icon>
+                      </button>
+                   </div>
+                </mat-card>
+                <!-- UPLOAD FILES DONE -->
+                <button class="submitDep" mat-raised-button color="primary"
+                   (click)="onDepositClick()">
+                Start Deposition
+                </button>
+                <button class="submitDep" mat-raised-button color="primary"
+                   (click)="onDownloadClick()">
+                Download mmCIF
+                </button>
+             </mat-card-content>
+          </mat-card>
+       </div>
     </div>
-</ng-template>
\ No newline at end of file
+ </ng-template>
+ 
\ No newline at end of file

From 65219b29dcdf62d976a04091dddd40ae62bab68e Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 14 Jan 2025 17:04:50 +0000
Subject: [PATCH 078/245] orcid entry shows messages and can be corrected

---
 src/app/datasets/onedep/onedep.component.html | 54 +++++++++--------
 src/app/datasets/onedep/onedep.component.ts   | 26 +++++---
 src/app/datasets/onedep/onedep.directive.ts   | 60 ++++++++++++-------
 src/assets/config.json                        |  7 ++-
 4 files changed, 91 insertions(+), 56 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 99ea99d158..94a216605a 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -96,32 +96,34 @@ <h2>Enter 16-digit ORCID iD</h2>
                    </p>
                    <!-- Link the orcid FormArray -->
                    <div formArrayName="orcid">
-                      <ng-container
-                         *ngFor="let field of orcidArray().controls; let i = index">
-                         <div [formGroupName]="i">
-                            <mat-form-field 
-                               class="data-field"
-                               appearance="outline">
-                               <mat-label>Enter 16-digits ORCID iD</mat-label>
-                               <div class="input-container">
-                                  <input 
-                                     matInput 
-                                     type="text"
-                                     maxlength="19"
-                                     placeholder="xxxx-xxxx-xxxx-xxxx"
-                                     formControlName="orcidId"
-                                     orcidFormatter
-                                     >
-                                  <button 
-                                     mat-icon-button 
-                                     class="remove-field-btn" 
-                                     (click)="removeOrcidField(i)">
-                                     <mat-icon>clear</mat-icon>
-                                  </button>
-                               </div>
-                            </mat-form-field>
-                         </div>
-                      </ng-container>
+                     <ng-container
+                        *ngFor="let field of orcidArray().controls; let i = index">
+                        <div [formGroupName]="i">
+                           <mat-form-field 
+                              class="data-field"
+                              appearance="outline">
+                              <mat-label>Enter 16-digits ORCID iD</mat-label>
+                              <div class="input-container">
+                                 <input 
+                                    matInput 
+                                    type="text"
+                                    maxlength="19"
+                                    placeholder="xxxx-xxxx-xxxx-xxxx"
+                                    formControlName="orcidId"
+                                    orcidFormatter>
+                                 <button 
+                                    mat-icon-button 
+                                    class="remove-field-btn" 
+                                    (click)="removeOrcidField(i)">
+                                    <mat-icon>clear</mat-icon>
+                                 </button>
+                              </div>
+                           </mat-form-field>
+                           <div class="error-text" *ngIf="field.get('orcidId')?.hasError('notNumeric')">
+                              ORCID ID must contain only numbers.
+                           </div>
+                        </div>
+                     </ng-container>
                    </div>
                    <button 
                       mat-icon-button 
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 6e71a94d0e..69ea12fed3 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -15,6 +15,8 @@ import {
   FormGroup,
   FormArray,
   Validators,
+  AbstractControl,
+  ValidationErrors,
 } from "@angular/forms";
 
 import { Store } from "@ngrx/store";
@@ -85,10 +87,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
       metadata: "",
       orcid: this.fb.array([
         this.fb.group({
-          orcidId: [
-            "",
-            [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)],
-          ],
+          orcidId: ["", [Validators.required, this.orcidValidator()]],
         }),
       ]),
       emMethod: new FormControl(""),
@@ -141,20 +140,29 @@ export class OneDepComponent implements OnInit, OnDestroy {
   togglePasswordVisibility() {
     this.showPassword = !this.showPassword;
   }
+  orcidValidator(): (control: AbstractControl) => ValidationErrors | null {
+    return (control: AbstractControl): ValidationErrors | null => {
+      const value = control.value.replace(/-/g, "");
+      if (!value) {
+        return null;
+      }
+      const isValid = /^\d+$/.test(value);
+      return isValid ? null : { notNumeric: true };
+    };
+  }
   orcidArray(): FormArray {
     return this.form.get("orcid") as FormArray;
   }
   addOrcidField() {
     const orcidField = this.fb.group({
-      orcidId: [
-        "",
-        [Validators.required, Validators.pattern(/^(\d{4}-){3}\d{4}$/)],
-      ],
+      orcidId: ["", [Validators.required, this.orcidValidator()]],
     });
     this.orcidArray().push(orcidField);
   }
   removeOrcidField(index: number) {
-    if (this.orcidArray().length > 1) {
+    if (index === 0) {
+      this.orcidArray().at(0).reset({ orcidId: "" });
+    } else if (this.orcidArray().length > 1) {
       this.orcidArray().removeAt(index);
     }
   }
diff --git a/src/app/datasets/onedep/onedep.directive.ts b/src/app/datasets/onedep/onedep.directive.ts
index 7928e65520..f6a70fcada 100644
--- a/src/app/datasets/onedep/onedep.directive.ts
+++ b/src/app/datasets/onedep/onedep.directive.ts
@@ -6,39 +6,59 @@ export class OrcidFormatterDirective {
 
   constructor(private el: ElementRef) {}
 
+  private formatWithDashes(value: string): string {
+    return value.match(/.{1,4}/g)?.join("-") || value;
+  }
+
+  private getAdjustedCursorPosition(
+    rawValue: string,
+    originalPosition: number,
+  ): number {
+    const rawCursorPosition = rawValue.slice(0, originalPosition).length;
+    const dashCountBeforeCursor = Math.floor(rawCursorPosition / 4);
+    return rawCursorPosition + dashCountBeforeCursor;
+  }
+
+  private calculateCursorAdjustment(
+    previousValue: string,
+    newValue: string,
+    cursorPosition: number,
+  ): number {
+    const removedChar = previousValue.length > newValue.length;
+    const addedDash = newValue.charAt(cursorPosition - 1) === "-";
+    if (removedChar && addedDash) {
+      return -1;
+    }
+    if (addedDash) {
+      return +1;
+    }
+
+    return 0;
+  }
   @HostListener("input", ["$event"])
   onInput(event: InputEvent): void {
     const inputElement = this.el.nativeElement as HTMLInputElement;
 
-    // Remove all existing dashes and limit to the max length
     const rawValue = inputElement.value
       .replace(/-/g, "")
       .slice(0, this.maxRawLength);
 
-    // Format with dashes
     const formattedValue = this.formatWithDashes(rawValue);
 
+    // Calculate the new cursor position
+    const previousValue = inputElement.value;
+    const previousCursorPosition = inputElement.selectionStart || 0;
+    const adjustment = this.calculateCursorAdjustment(
+      previousValue,
+      formattedValue,
+      previousCursorPosition,
+    );
+
     // Update the input's visible value
     inputElement.value = formattedValue;
 
-    // Preserve the cursor position
-    const cursorPosition = this.getAdjustedCursorPosition(
-      rawValue,
-      inputElement.selectionStart || 0,
-    );
+    // Set the cursor to the adjusted position
+    const cursorPosition = previousCursorPosition + adjustment;
     inputElement.setSelectionRange(cursorPosition, cursorPosition);
   }
-
-  private formatWithDashes(value: string): string {
-    return value.match(/.{1,4}/g)?.join("-") || value;
-  }
-
-  private getAdjustedCursorPosition(
-    rawValue: string,
-    originalPosition: number,
-  ): number {
-    const rawCursorPosition = rawValue.slice(0, originalPosition).length;
-    const dashCountBeforeCursor = Math.floor(rawCursorPosition / 4);
-    return rawCursorPosition + dashCountBeforeCursor;
-  }
 }
diff --git a/src/assets/config.json b/src/assets/config.json
index df05384fcb..9eeb694a07 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -58,7 +58,12 @@
   ],
   "logbookEnabled": false,
   "loginFormEnabled": true,
-  "oAuth2Endpoints": [],
+  "oAuth2Endpoints": [
+    {
+      "authURL": "api/v3/auth/oidc",
+      "displayText": "Login with OIDC"
+    }
+  ],
   "maxDirectDownloadSize": 5000000000,
   "metadataPreviewEnabled": true,
   "metadataStructure": "tree",

From 60644c249c667c891152f02c91f9af1c2279aaa1 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 15 Jan 2025 17:01:48 +0000
Subject: [PATCH 079/245] refactor finished

---
 .finished                                     |   0
 src/app/datasets/onedep/onedep.component.html | 139 +++++-----
 src/app/datasets/onedep/onedep.component.scss |   8 +-
 src/app/datasets/onedep/onedep.component.ts   | 245 ++++++++----------
 .../sdk/apis/onedep-depositor.service.ts      |  40 ++-
 src/app/shared/sdk/models/OneDep.ts           |   4 +
 .../actions/onedep.actions.ts                 |  11 +
 .../effects/onedep.effects.ts                 |  55 ++++
 8 files changed, 288 insertions(+), 214 deletions(-)
 create mode 100644 .finished

diff --git a/.finished b/.finished
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 94a216605a..d573c8d76c 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -176,6 +176,7 @@ <h2>Choose Electron Microscopy
                          </mat-radio-group>
                       </td>
                    </tr>
+                   <!-- Question 3: Associated map -->
                    <tr
                       *ngIf="form.value['emMethod'] && form.get('deposingCoordinates')?.value === 'true'">
                       <th>Has an associated map been deposited to EMDB?
@@ -194,7 +195,7 @@ <h2>Choose Electron Microscopy
                          </mat-radio-group>
                       </td>
                    </tr>
-                   <!-- EMDB Identifier Field -->
+                   <!-- Question 4: EMDB Identifier Field -->
                    <tr
                       *ngIf="form.value['emMethod'] && form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
                       <th>EMDB Identifier</th>
@@ -232,7 +233,7 @@ <h2>Choose Electron Microscopy
                 </button> -->
           </mat-card>
           <!-- Attachments -->
-          <mat-card>
+          <mat-card [formGroup]="form">
              <mat-card-header class="file-header">
                 <div mat-card-avatar class="section-icon">
                    <mat-icon> attachment </mat-icon>
@@ -240,90 +241,74 @@ <h2>Choose Electron Microscopy
                 Choose files for deposition
              </mat-card-header>
              <mat-card-content>
-                <mat-card *ngFor="let fileType of fileTypes"
-                   class="fileCard">
-                   <ng-container
-                      *ngIf="fileType.emName !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
-                      <mat-card-header matTooltip="{{fileType.explanation}}" matTooltipPosition="above">
-                         <mat-card-title>{{ fileType.nameFE}} <span class="required-asterisk" *ngIf="isRequired(fileType.emName)"> *</span></mat-card-title>
-                      </mat-card-header>
-                      <mat-card-content>
-                         <div class="file-selection-container">
-                            <button class="fileChooser"
-                               mat-raised-button color="primary"
-                               (click)="onChooseFile(fileInput)">
-                            Choose File
-                            </button>
-                            <div *ngIf="selectedFile[fileType.emName]">
-                               <mat-icon>attach_file</mat-icon>
-                            </div>
-                            <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]">
-                               <mat-icon>attach_file</mat-icon>
-                            </div>
-                            <input type="file" #fileInput
-                            (change)="fileType.emName === 'add-map' ? onFileAddMapSelected($event, fileType.id) : onFileSelected($event, fileType.emName)"
-                            style="display: none;" />
-                            <div 
-                               *ngIf="fileType.emName !== 'add-map' && selectedFile[fileType.emName]"
-                               class="fileName">
-                               <p>Selected File: {{ selectedFile[fileType.emName]?.name }}</p>
-                            </div>
-                            <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]"
-                               class="fileName">
-                               <p>Selected File: {{ selectedFile['add-map-' + fileType.id]?.name }}</p>
-                            </div>
-                         </div>
-                         <div class="input-container">
-                            <ng-container
-                               *ngIf="fileType.contour !== undefined">
-                               <mat-form-field appearance="outline"
-                                  class="contour-level">
-                                  <mat-label>Contour Level</mat-label>
-                                  <input matInput type="number"
-                                  placeholder="e.g. 0.0" 
-                                  [required]="!!fileType.file"
-                                  [value]="fileType.contour || ''"
-                                  (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : 
-                                  fileType.emName === 'add-map' ? updateContourLevelAddMap($event, fileType.id) : 
-                                  updateContourLevel($event, fileType.emName)" />
-                               </mat-form-field>
-                               <!-- Error Message -->
-                               <!-- FIX ME -->
-                               <!-- <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error">
-                                  You must specify the experimental method
-                                  </div> -->
-                            </ng-container>
-                            <mat-form-field class="details">
-                               <mat-label>Details</mat-label>
-                               <textarea matInput
-                               placeholder="Enter details..."
-                               rows="1"
-                               (input)="fileType.emName === 'add-map' ? updateDetailsAddMap($event, fileType.id) : updateDetails($event,fileType.emName)"
-                               (input)="autoGrow($event)"
-                               [style.overflow]="detailsOverflow"></textarea>
-                            </mat-form-field>
-                         </div>
-                      </mat-card-content>
-                   </ng-container>
-                   <div *ngIf="fileType.emName === 'add-map' && fileType.id ===0">
-                      <button 
-                         mat-icon-button 
-                         matTooltip="Add more maps" 
-                         aria-label="Add another map" 
-                         (click)="addMap()">
-                         <mat-icon>add</mat-icon>
-                      </button>
-                   </div>
+               <mat-card *ngFor="let fileType of form.get('files').value; let i = index" class="fileCard">
+                  <ng-container *ngIf="fileType.emName !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
+                    <mat-card-header matTooltip="{{ fileType.explanation }}" matTooltipPosition="above">
+                      <mat-card-title>{{ fileType.nameFE }} 
+                        <span class="required-asterisk" *ngIf="isRequired(fileType.emName)"> *</span>
+                      </mat-card-title>
+                    </mat-card-header>
+                    <mat-card-content>
+                      <div class="file-selection-container">
+                        <button class="fileChooser" mat-raised-button color="primary" (click)="onChooseFile(fileInput)">
+                          Choose File
+                        </button>
+                        <div *ngIf="selectedFile[fileType.emName]">
+                          <mat-icon>attach_file</mat-icon>
+                        </div>
+                        <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]">
+                          <mat-icon>attach_file</mat-icon>
+                        </div>
+                        <input type="file" #fileInput
+                               (change)="fileType.emName === 'add-map' ? onFileAddMapSelected($event, fileType.id) : onFileSelected($event, fileType.emName)"
+                               style="display: none;" />
+                        <div *ngIf="fileType.emName !== 'add-map' && selectedFile[fileType.emName]" class="fileName">
+                          <p>Selected File: {{ selectedFile[fileType.emName]?.name }}</p>
+                        </div>
+                        <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]" class="fileName">
+                          <p>Selected File: {{ selectedFile['add-map-' + fileType.id]?.name }}</p>
+                        </div>
+                      </div>
+                      <div class="input-container">
+                        <ng-container *ngIf="fileType.contour !== null">
+                          <mat-form-field appearance="outline" class="contour-level">
+                            <mat-label>Contour Level</mat-label>
+                            <input matInput type="number" placeholder="e.g. 0.0" 
+                                   [required]="!!fileType.file"
+                                   [value]="fileType.contour || ''"
+                                   (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : 
+                                   fileType.emName === 'add-map' ? updateContourLevelAddMap($event, fileType.id) : 
+                                   updateContourLevel($event, fileType.emName)" />
+                          </mat-form-field>
+                        </ng-container>
+                        <mat-form-field class="details">
+                          <mat-label>Details</mat-label>
+                          <textarea matInput placeholder="Enter details..." rows="1"
+                                    (input)="fileType.emName === 'add-map' ? updateDetailsAddMap($event, fileType.id) : updateDetails($event, fileType.emName)"
+                                    (input)="autoGrow($event)" [style.overflow]="detailsOverflow"></textarea>
+                        </mat-form-field>
+                      </div>
+                    </mat-card-content>
+                  </ng-container>
+                  <div *ngIf="fileType.emName === 'add-map' && fileType.id === 0">
+                    <button mat-icon-button matTooltip="Add more maps" aria-label="Add another map" (click)="addMap()">
+                      <mat-icon>add</mat-icon>
+                    </button>
+                  </div>
                 </mat-card>
+                
                 <!-- UPLOAD FILES DONE -->
+                 <div class ="button-container">
                 <button class="submitDep" mat-raised-button color="primary"
-                   (click)="onDepositClick()">
+                   (click)="onDepositClick()"
+                   >
                 Start Deposition
                 </button>
                 <button class="submitDep" mat-raised-button color="primary"
                    (click)="onDownloadClick()">
                 Download mmCIF
                 </button>
+               </div>
              </mat-card-content>
           </mat-card>
        </div>
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index 1884b5fec2..9978746543 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -244,15 +244,19 @@ mat-card {
         }
 
         mat-form-field {
-          width: 100%; // Ensure fields take full width of their flex container
+          width: 100%;
           margin-bottom: 0;
         }
       }
     }
   }
-
+  .button-container {
+    display: flex;          
+    gap: 20px; 
+  }
   .submitDep {
     background-color: #B3D9AC;
     color:black;
+    // padding: 10px 20px;
   }
 }
\ No newline at end of file
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 69ea12fed3..992f83dc4a 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -81,20 +81,21 @@ export class OneDepComponent implements OnInit, OnDestroy {
   ) {
     this.config = this.appConfigService.getConfig();
     this.form = this.fb.group({
-      email: "",
-      jwtToken: new FormControl(""),
+      email: ["", [Validators.required, Validators.email]],
+      jwtToken: ["", Validators.required],
       password: new FormControl(""),
-      metadata: "",
+      metadata: ["", Validators.required],
       orcid: this.fb.array([
         this.fb.group({
           orcidId: ["", [Validators.required, this.orcidValidator()]],
         }),
       ]),
-      emMethod: new FormControl(""),
-      deposingCoordinates: new FormControl(null, Validators.required),
-      associatedMap: new FormControl(null, Validators.required),
-      compositeMap: new FormControl(null, Validators.required),
+      emMethod: ["", Validators.required],
+      deposingCoordinates: new FormControl("false", Validators.required),
+      associatedMap: new FormControl("false", Validators.required),
+      compositeMap: new FormControl("false", Validators.required),
       emdbId: new FormControl(""),
+      files: this.fb.array([]),
     });
   }
 
@@ -103,8 +104,8 @@ export class OneDepComponent implements OnInit, OnDestroy {
     this.fileTypes = [];
     this.mainContour = 0.0;
     //  connect to the depositor
-    this.connectingToDepositionBackend = true;
-    this.connectToDepositionBackend();
+
+    this.store.dispatch(fromActions.connectToDepositor());
 
     this.store.select(selectCurrentDataset).subscribe((dataset) => {
       this.dataset = dataset;
@@ -166,20 +167,34 @@ export class OneDepComponent implements OnInit, OnDestroy {
       this.orcidArray().removeAt(index);
     }
   }
+  addFilesToForm(files: DepositionFiles[]) {
+    const filesArray = this.form.get("files") as FormArray;
+    filesArray.clear();
+    files.forEach((file) => {
+      filesArray.push(
+        this.fb.group({
+          emName: [file.emName],
+          id: [file.id],
+          nameFE: [file.nameFE],
+          type: [file.type],
+          fileName: [file.fileName],
+          file: [file.file],
+          required: [file.required],
+          contour: [file.contour],
+          details: [file.details],
+          explanation: [file.explanation],
+        }),
+      );
+    });
+  }
   onMethodChange() {
     this.methodsList = createMethodsList(); // Reset the methods list to be empty
     this.fileTypes = this.methodsList.find(
       (mL) => mL.value === this.form.value["emMethod"],
     ).files;
     this.fileTypes.forEach((fT) => {
-      if (
-        fT.emName === this.emFile.MainMap ||
-        fT.emName === this.emFile.Image
-      ) {
-        fT.required = true;
-      } else {
-        fT.required = false;
-      }
+      fT.required =
+        fT.emName === this.emFile.MainMap || fT.emName === this.emFile.Image;
     });
     switch (this.form.value["emMethod"]) {
       case "helical":
@@ -203,7 +218,15 @@ export class OneDepComponent implements OnInit, OnDestroy {
           }
         });
         break;
+      case "tomogram":
+        this.form.get("deposingCoordinates")?.setValue("false");
+        this.form.get("associatedMap")?.setValue("false");
+        break;
     }
+    this.addFilesToForm(this.fileTypes);
+  }
+  get files() {
+    return (this.form.get("files") as FormArray).controls;
   }
 
   onPDB(event: MatRadioChange) {
@@ -215,6 +238,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
         }
       });
     }
+    this.addFilesToForm(this.fileTypes); // update the co-cif required status
   }
 
   autoGrow(event: Event) {
@@ -240,23 +264,24 @@ export class OneDepComponent implements OnInit, OnDestroy {
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
       this.selectedFile[controlName] = input.files[0];
-      this.fileTypes.forEach((fT) => {
-        if (fT.emName === controlName) {
-          fT.file = this.selectedFile[controlName];
-          fT.fileName = this.selectedFile[controlName].name;
+      this.files.forEach((fT) => {
+        if (fT.value.emName === controlName) {
+          fT.value.file = this.selectedFile[controlName];
+          fT.value.fileName = this.selectedFile[controlName].name;
           if (
             this.mainContour !== 0.0 &&
-            (fT.emName === EmFile.MainMap ||
-              fT.emName === EmFile.HalfMap1 ||
-              fT.emName === EmFile.HalfMap2)
+            (fT.value.emName === EmFile.MainMap ||
+              fT.value.emName === EmFile.HalfMap1 ||
+              fT.value.emName === EmFile.HalfMap2)
           ) {
-            fT.contour = this.mainContour;
+            fT.value.contour = this.mainContour;
           }
         }
       });
     }
   }
 
+  // FIX ME needs refac
   onFileAddMapSelected(event: Event, id: number) {
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
@@ -272,9 +297,9 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
   isRequired(controlName: string): boolean {
     let value: boolean;
-    this.fileTypes.forEach((fT) => {
-      if (fT.emName === controlName) {
-        value = fT.required;
+    this.files.forEach((fT) => {
+      if (fT.value.emName === controlName) {
+        value = fT.value.required;
       }
     });
     return value;
@@ -285,18 +310,16 @@ export class OneDepComponent implements OnInit, OnDestroy {
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
       this.mainContour = parsedValue;
-      this.fileTypes.forEach((fT) => {
+      this.files.forEach((fT) => {
         if (
-          fT.file &&
-          (fT.emName === EmFile.MainMap ||
-            fT.emName === EmFile.HalfMap1 ||
-            fT.emName === EmFile.HalfMap2)
+          fT.value.file &&
+          (fT.value.emName === EmFile.MainMap ||
+            fT.value.emName === EmFile.HalfMap1 ||
+            fT.value.emName === EmFile.HalfMap2)
         ) {
-          fT.contour = this.mainContour;
+          fT.value.contour = this.mainContour;
         }
       });
-    } else {
-      console.warn("Invalid number format:", input);
     }
   }
   updateContourLevelAddMap(event: Event, id: number) {
@@ -304,13 +327,11 @@ export class OneDepComponent implements OnInit, OnDestroy {
     const normalizedInput = input.replace(",", ".");
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
-      this.fileTypes.forEach((fT) => {
-        if (fT.emName === this.emFile.AddMap && fT.id === id) {
-          fT.contour = parsedValue;
+      this.files.forEach((fT) => {
+        if (fT.value.emName === this.emFile.AddMap && fT.value.id === id) {
+          fT.value.contour = parsedValue;
         }
       });
-    } else {
-      console.warn("Invalid number format:", input);
     }
   }
   updateContourLevel(event: Event, controlName: EmFile) {
@@ -318,38 +339,40 @@ export class OneDepComponent implements OnInit, OnDestroy {
     const normalizedInput = input.replace(",", ".");
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
-      this.fileTypes.forEach((fT) => {
-        if (fT.emName === controlName) {
-          fT.contour = parsedValue;
+      this.files.forEach((fT) => {
+        if (fT.value.emName === controlName) {
+          fT.value.contour = parsedValue;
         }
       });
-    } else {
-      console.warn("Invalid number format:", input);
     }
   }
   updateDetails(event: Event, controlName: EmFile) {
     const textarea = event.target as HTMLTextAreaElement; // Cast to HTMLTextAreaElement
     const value = textarea.value;
-    this.fileTypes.forEach((fT) => {
-      if (fT.emName === controlName) {
-        fT.details = value;
+    this.files.forEach((fT) => {
+      if (fT.value.emName === controlName) {
+        fT.value.details = value;
       }
     });
   }
   updateDetailsAddMap(event: Event, id: number) {
     const textarea = event.target as HTMLTextAreaElement; // Cast to HTMLTextAreaElement
     const value = textarea.value;
-    this.fileTypes.forEach((fT) => {
-      if (fT.emName === this.emFile.AddMap && fT.id === id) {
-        fT.details = value;
+    this.files.forEach((fT) => {
+      if (fT.value.emName === this.emFile.AddMap && fT.value.id === id) {
+        fT.value.details = value;
       }
     });
   }
   addMap() {
+    // FIX ME
     const nextId =
-      this.fileTypes
-        .filter((file) => file.emName === EmFile.AddMap)
-        .reduce((maxId, file) => (file.id > maxId ? file.id : maxId), 0) + 1;
+      this.files
+        .filter((file) => file.value.emName === EmFile.AddMap)
+        .reduce(
+          (maxId, file) => (file.value.id > maxId ? file.value.id : maxId),
+          0,
+        ) + 1;
 
     const newMap: DepositionFiles = {
       emName: EmFile.AddMap,
@@ -363,7 +386,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
       required: false,
     };
 
-    this.fileTypes.push(newMap);
+    // this.files.push(newMap);
   }
 
   onDepositClick() {
@@ -388,13 +411,13 @@ export class OneDepComponent implements OnInit, OnDestroy {
     }
     let metadataAdded = false;
 
-    const filesToUpload = this.fileTypes
-      .filter((fT) => fT.file)
+    const filesToUpload = this.files
+      .filter((fT) => fT.value.file)
       .map((fT) => {
         const formDataFile = new FormData();
         formDataFile.append("jwtToken", this.form.value.jwtToken);
-        formDataFile.append("file", fT.file);
-        if (fT.emName === this.emFile.Coordinates) {
+        formDataFile.append("file", fT.value.file);
+        if (fT.value.emName === this.emFile.Coordinates) {
           formDataFile.append(
             "scientificMetadata",
             JSON.stringify(this.form.value.metadata),
@@ -404,14 +427,14 @@ export class OneDepComponent implements OnInit, OnDestroy {
           formDataFile.append(
             "fileMetadata",
             JSON.stringify({
-              name: fT.fileName,
-              type: fT.type,
-              contour: fT.contour,
-              details: fT.details,
+              name: fT.value.fileName,
+              type: fT.value.type,
+              contour: fT.value.contour,
+              details: fT.value.details,
             }),
           );
         }
-        return { form: formDataFile, fileType: fT.emName };
+        return { form: formDataFile, fileType: fT.value.emName };
       });
     // if (!metadataAdded) {
     //   const formDataFile = new FormData();
@@ -434,82 +457,42 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
   onDownloadClick() {
     if (this.form.value.deposingCoordinates === "true") {
-      const formDataFile = new FormData();
-      const fT = this.fileTypes.find(
-        (fileType) => fileType.emName === this.emFile.Coordinates,
+      const fileEntry = this.files.find(
+        (fileType) => fileType.value.emName === this.emFile.Coordinates,
       );
-      formDataFile.append("file", fT.file);
-      formDataFile.append(
-        "scientificMetadata",
-        JSON.stringify(this.form.value.metadata),
-      );
-      this.http
-        .post(this.connectedDepositionBackend + "onedep/pdb", formDataFile, {
-          responseType: "blob",
-        })
-        .subscribe({
-          next: (response: Blob) => {
-            this.triggerDownload(response, "coordinatesWithMmetadata.cif");
-          },
-          error: (error) => {
-            console.error("Error downloading file from onedep/pdb", error);
-          },
-        });
+
+      if (fileEntry) {
+        const file = fileEntry.value.file;
+        this.depositor
+          .downloadCoordinatesWithMetadata(file, this.form.value.metadata)
+          .subscribe({
+            next: (response: Blob) => {
+              this.triggerDownload(response, "coordinatesWithMetadata.cif");
+            },
+            // error: (error) => {
+            //   console.error("Error downloading file from /onedep/pdb", error);
+            // },
+          });
+      }
     } else {
-      const body = JSON.stringify(this.form.value.metadata);
-      this.http
-        .post(this.connectedDepositionBackend + "onedep/metadata", body, {
-          headers: { "Content-Type": "application/json" },
-          responseType: "blob",
-        })
-        .subscribe({
-          next: (response: Blob) => {
-            this.triggerDownload(response, "metadata.cif");
-          },
-          error: (error) => {
-            console.error("Error downloading file from onedep/metadata", error);
-          },
-        });
+      this.depositor.downloadMetadata(this.form.value.metadata).subscribe({
+        next: (response: Blob) => {
+          this.triggerDownload(response, "metadata.cif");
+        },
+        // error: (error) => {
+        //   console.error("Error downloading file from /onedep/metadata", error);
+        // },
+      });
     }
   }
+
   triggerDownload(response: Blob, filename: string) {
     const downloadUrl = window.URL.createObjectURL(response);
     const a = document.createElement("a");
     a.href = downloadUrl;
-    a.download = filename; // Set the file name here
+    a.download = filename;
     document.body.appendChild(a);
     a.click();
     document.body.removeChild(a);
   }
-
-  connectToDepositionBackend(): boolean {
-    const depositionBackendUrl = this.config.depositorURL;
-    let depositionBackendUrlCleaned = depositionBackendUrl.slice();
-    // Check if last symbol is a slash and add version endpoint
-    if (!depositionBackendUrlCleaned.endsWith("/")) {
-      depositionBackendUrlCleaned += "/";
-    }
-
-    const depositionBackendUrlVersion = depositionBackendUrlCleaned + "version";
-
-    // Try to connect to the facility backend/version to check if it is available
-    console.log("Connecting to OneDep backend: " + depositionBackendUrlVersion);
-    this.http.get(depositionBackendUrlVersion).subscribe(
-      (response) => {
-        console.log("Connected to OneDep backend", response);
-        // If the connection is successful, store the connected facility backend URL
-        this.connectedDepositionBackend = depositionBackendUrlCleaned;
-        this.connectingToDepositionBackend = false;
-        this.connectedDepositionBackendVersion = response["version"];
-      },
-      (error) => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-        console.error("Request failed", error);
-        this.connectedDepositionBackend = "";
-        this.connectingToDepositionBackend = false;
-      },
-    );
-
-    return true;
-  }
 }
diff --git a/src/app/shared/sdk/apis/onedep-depositor.service.ts b/src/app/shared/sdk/apis/onedep-depositor.service.ts
index 8391e4a3a7..889760c66c 100644
--- a/src/app/shared/sdk/apis/onedep-depositor.service.ts
+++ b/src/app/shared/sdk/apis/onedep-depositor.service.ts
@@ -1,11 +1,14 @@
 import { Injectable } from "@angular/core";
 import { Store } from "@ngrx/store";
-import { tap } from "rxjs/operators";
-import { HttpClient, HttpHeaders, HttpResponse } from "@angular/common/http";
+import { HttpClient, HttpHeaders } from "@angular/common/http";
 import { Observable } from "rxjs";
 import { AppConfigService, AppConfig } from "app-config.service";
-import { OneDepUserInfo, OneDepCreated, UploadedFile } from "../models/OneDep";
-import * as fromActions from "state-management/actions/onedep.actions";
+import {
+  DepBackendVersion,
+  OneDepUserInfo,
+  OneDepCreated,
+  UploadedFile,
+} from "../models/OneDep";
 
 @Injectable({
   providedIn: "root",
@@ -20,6 +23,11 @@ export class Depositor {
     this.config = this.appConfigService.getConfig();
   }
 
+  getVersion(): Observable<DepBackendVersion> {
+    return this.http.get<DepBackendVersion>(
+      `${this.config.depositorURL}/version`,
+    );
+  }
   createDep(body: OneDepUserInfo): Observable<OneDepCreated> {
     return this.http.post<OneDepCreated>(
       `${this.config.depositorURL}/onedep`,
@@ -47,4 +55,28 @@ export class Depositor {
       form,
     );
   }
+
+  downloadCoordinatesWithMetadata(file: File, metadata: any) {
+    const formDataFile = new FormData();
+    formDataFile.append("file", file);
+    formDataFile.append("scientificMetadata", JSON.stringify(metadata));
+
+    return this.http.post(
+      `${this.config.depositorURL}/onedep/pdb`,
+      formDataFile,
+      {
+        responseType: "blob",
+      },
+    );
+  }
+
+  downloadMetadata(metadata: any) {
+    const headers = new HttpHeaders({ "Content-Type": "application/json" });
+    const body = JSON.stringify(metadata);
+
+    return this.http.post(`${this.config.depositorURL}/onedep/metadata`, body, {
+      headers,
+      responseType: "blob",
+    });
+  }
 }
diff --git a/src/app/shared/sdk/models/OneDep.ts b/src/app/shared/sdk/models/OneDep.ts
index cd7ddbb337..d7d0c5c11e 100644
--- a/src/app/shared/sdk/models/OneDep.ts
+++ b/src/app/shared/sdk/models/OneDep.ts
@@ -1,5 +1,9 @@
 import { EmFile } from "../../../datasets/onedep/types/methods.enum";
 
+export interface DepBackendVersion {
+  version: string;
+}
+
 export interface OneDepCreated {
   depID: string;
 }
diff --git a/src/app/state-management/actions/onedep.actions.ts b/src/app/state-management/actions/onedep.actions.ts
index acffdeb40a..3d381f110b 100644
--- a/src/app/state-management/actions/onedep.actions.ts
+++ b/src/app/state-management/actions/onedep.actions.ts
@@ -4,8 +4,19 @@ import {
   OneDepCreated,
   UploadedFile,
   FileUpload,
+  DepBackendVersion,
 } from "shared/sdk/models/OneDep";
 
+export const connectToDepositor = createAction("[OneDep] Connect to Depositor");
+export const connectToDepositorSuccess = createAction(
+  "[OneDep] Connect To Depositor Success",
+  props<{ depositor: DepBackendVersion }>(),
+);
+
+export const connectToDepositorFailure = createAction(
+  "[OneDep] Connect To Depositor Failure",
+  props<{ err: Error }>(),
+);
 export const submitDeposition = createAction(
   "[OneDep] Submit Deposition",
   props<{ deposition: OneDepUserInfo; files: FileUpload[] }>(),
diff --git a/src/app/state-management/effects/onedep.effects.ts b/src/app/state-management/effects/onedep.effects.ts
index 3b02c8e34c..ca1792f4ea 100644
--- a/src/app/state-management/effects/onedep.effects.ts
+++ b/src/app/state-management/effects/onedep.effects.ts
@@ -11,10 +11,65 @@ import {
   OneDepUserInfo,
   OneDepCreated,
   UploadedFile,
+  DepBackendVersion,
 } from "shared/sdk/models/OneDep";
 import { EmFile } from "../../datasets/onedep/types/methods.enum";
 @Injectable()
 export class OneDepEffects {
+  createDeposition$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.connectToDepositor),
+      switchMap(() =>
+        this.onedepDepositor.getVersion().pipe(
+          map((res) =>
+            fromActions.connectToDepositorSuccess({
+              depositor: res as DepBackendVersion,
+            }),
+          ),
+          catchError((err) =>
+            of(fromActions.connectToDepositorFailure({ err })),
+          ),
+        ),
+      ),
+    );
+  });
+
+  connectToDepositorSuccess$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.connectToDepositorSuccess),
+      switchMap(({ depositor }) => {
+        const message = {
+          type: MessageType.Success,
+          content:
+            "Successfully connected to depositor version " + depositor.version,
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+
+  connectToDepositorFailure$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.connectToDepositorFailure),
+      switchMap(({ err }) => {
+        const errorMessage =
+          err instanceof HttpErrorResponse
+            ? (err.error?.message ?? err.message ?? "Unknown error")
+            : err.message || "Unknown error";
+        const message = {
+          type: MessageType.Error,
+          content:
+            "Failed to connect to the depositor service: " +
+            errorMessage +
+            " Are you sure service is running?",
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+
   submitDeposition$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(fromActions.submitDeposition),

From 065bfa6bb358f1389da6bffadbaabf39932cb189 Mon Sep 17 00:00:00 2001
From: root <sofyalaskina@gmail.com>
Date: Tue, 21 Jan 2025 11:39:06 +0000
Subject: [PATCH 080/245] adding more add-maps fixed

---
 src/app/datasets/onedep/onedep.component.ts | 46 ++++++++++++++++-----
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 992f83dc4a..f159cb4d7f 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -187,6 +187,23 @@ export class OneDepComponent implements OnInit, OnDestroy {
       );
     });
   }
+  addFileToForm(file: DepositionFiles) {
+    const filesArray = this.form.get("files") as FormArray;
+    filesArray.push(
+      this.fb.group({
+        emName: [file.emName],
+        id: [file.id],
+        nameFE: [file.nameFE],
+        type: [file.type],
+        fileName: [file.fileName],
+        file: [file.file],
+        required: [file.required],
+        contour: [file.contour],
+        details: [file.details],
+        explanation: [file.explanation],
+      }),
+    );
+  }
   onMethodChange() {
     this.methodsList = createMethodsList(); // Reset the methods list to be empty
     this.fileTypes = this.methodsList.find(
@@ -223,7 +240,11 @@ export class OneDepComponent implements OnInit, OnDestroy {
         this.form.get("associatedMap")?.setValue("false");
         break;
     }
-    this.addFilesToForm(this.fileTypes);
+    const filesArray = this.form.get("files") as FormArray;
+    filesArray.clear();
+    this.fileTypes.forEach((file) => {
+      this.addFileToForm(file);
+    });
   }
   get files() {
     return (this.form.get("files") as FormArray).controls;
@@ -234,11 +255,11 @@ export class OneDepComponent implements OnInit, OnDestroy {
     if (input === "true") {
       this.fileTypes.forEach((fT) => {
         if (fT.emName === this.emFile.Coordinates) {
-          fT.required = true;
+          fT.required = true; // update the co-cif required status
+          this.addFileToForm(fT)
         }
       });
     }
-    this.addFilesToForm(this.fileTypes); // update the co-cif required status
   }
 
   autoGrow(event: Event) {
@@ -281,19 +302,21 @@ export class OneDepComponent implements OnInit, OnDestroy {
     }
   }
 
-  // FIX ME needs refac
+
   onFileAddMapSelected(event: Event, id: number) {
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
       // Use the ID to store the file uniquely for each "add-map"
       this.selectedFile[`add-map-${id}`] = input.files[0];
-      this.fileTypes.forEach((fT) => {
-        if (fT.emName === this.emFile.AddMap && fT.id === id) {
-          fT.file = this.selectedFile[`add-map-${id}`];
-          fT.fileName = this.selectedFile[`add-map-${id}`].name;
+      this.files.forEach((fT) => {
+      
+        if (fT.value.emName === this.emFile.AddMap && fT.value.id === id) {
+          fT.value.file = this.selectedFile[`add-map-${id}`];
+          fT.value.fileName = this.selectedFile[`add-map-${id}`].name;
         }
       });
     }
+    console.log(this.files);
   }
   isRequired(controlName: string): boolean {
     let value: boolean;
@@ -365,7 +388,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
     });
   }
   addMap() {
-    // FIX ME
+    console.log("addMaps() was called. files before:", this.files);
     const nextId =
       this.files
         .filter((file) => file.value.emName === EmFile.AddMap)
@@ -385,8 +408,9 @@ export class OneDepComponent implements OnInit, OnDestroy {
       details: "",
       required: false,
     };
-
-    // this.files.push(newMap);
+    // update the co-cif required status
+    this.addFileToForm(newMap);
+    console.log("addMaps() files after:", this.files);
   }
 
   onDepositClick() {

From e862637de7c2f1baf06cc22cf4219892ef08b477 Mon Sep 17 00:00:00 2001
From: consolethinks <consolethinks@gmail.com>
Date: Tue, 21 Jan 2025 14:51:02 +0100
Subject: [PATCH 081/245] add auth to the first dialog box for ingestion

---
 .../ingestor/dialog/ingestor.new-transfer-dialog.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 471c8e15f1..4c582288a6 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -67,7 +67,7 @@ export class IngestorNewTransferDialogComponent implements OnInit {
 
   apiGetExtractionMethods(): void {
     this.http
-      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR)
+      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, {withCredentials: true})
       .subscribe(
         (response: any) => {
           if (response.methods && response.methods.length > 0) {
@@ -85,7 +85,7 @@ export class IngestorNewTransferDialogComponent implements OnInit {
 
   apiGetAvailableFilePaths(): void {
     this.http
-      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET)
+      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET, {withCredentials: true})
       .subscribe(
         (response: any) => {
           if (response.datasets && response.datasets.length > 0) {

From a36898826ce1d10b28ebd661893e386d66fc7126 Mon Sep 17 00:00:00 2001
From: consolethinks <consolethinks@gmail.com>
Date: Tue, 21 Jan 2025 16:43:35 +0100
Subject: [PATCH 082/245] add withCredentials to all backend calls

---
 src/app/ingestor/ingestor/ingestor.component.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 71604d540d..e052fda843 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -81,7 +81,7 @@ export class IngestorComponent implements OnInit {
 
     // Try to connect to the facility backend/version to check if it is available
     console.log("Connecting to facility backend: " + facilityBackendUrlVersion);
-    this.http.get(facilityBackendUrlVersion).subscribe(
+    this.http.get(facilityBackendUrlVersion, {withCredentials: true}).subscribe(
       (response) => {
         console.log("Connected to facility backend", response);
         // If the connection is successful, store the connected facility backend URL
@@ -115,7 +115,7 @@ export class IngestorComponent implements OnInit {
     }
     this.http
       .get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {
-        params,
+        params, withCredentials: true
       })
       .subscribe(
         (response) => {
@@ -139,7 +139,7 @@ export class IngestorComponent implements OnInit {
     this.http
       .post(
         this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET,
-        payload,
+        {payload, withCredentials: true},
       )
       .subscribe(
         (response) => {
@@ -178,7 +178,7 @@ export class IngestorComponent implements OnInit {
       this.http
         .post(
           this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR,
-          payload,
+          {payload, withCredentials: true},
         )
         .subscribe(
           (response) => {
@@ -334,7 +334,8 @@ export class IngestorComponent implements OnInit {
         this.connectedFacilityBackend +
           INGESTOR_API_ENDPOINTS_V1.TRANSFER +
           "/" +
-          transferId,
+          transferId, 
+          {withCredentials: true}
       )
       .subscribe(
         (response) => {

From 16a3dc68ef77df89cbd1ab3bf11bcf1b035de031 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 21 Jan 2025 16:29:42 +0000
Subject: [PATCH 083/245] optional number of fsc and add-maps

---
 src/app/datasets/onedep/onedep.component.html | 575 ++++++++----------
 src/app/datasets/onedep/onedep.component.scss |  26 +-
 src/app/datasets/onedep/onedep.component.ts   |  31 +-
 src/app/datasets/onedep/types/methods.enum.ts |   7 +-
 4 files changed, 304 insertions(+), 335 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index d573c8d76c..7bce94c628 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -1,317 +1,274 @@
 <ng-template [ngIf]="dataset">
-    <div style="clear: both"></div>
-    <div>
-       <div>
-          <mat-card [formGroup]="form" data-cy="general-info">
-             <mat-card-header class="general-header">
-                <div mat-card-avatar class="section-icon">
-                   <mat-icon> assignment </mat-icon>
-                </div>
-                General information
-             </mat-card-header>
-             <mat-card-content>
-                <table>
-                   <tr>
-                      <th>Name</th>
-                      <td>{{ dataset.datasetName || "-" }}</td>
-                   </tr>
-                   <tr>
-                      <th>Description</th>
-                      <td>
-                         <span 
-                            [innerHTML]="dataset.description || '-' | linky"></span>
-                      </td>
-                   </tr>
-                   <tr>
-                      <th>PID</th>
-                      <td>
-                         {{ dataset.pid }}
-                      </td>
-                   </tr>
-                   <tr>
-                      <th>Type</th>
-                      <td>{{dataset.type }}</td>
-                   </tr>
-                   <tr>
-                      <th>Creation Time</th>
-                      <td>{{ dataset.creationTime | date: "yyyy-MM-dd
-                         HH:mm" }}
-                      </td>
-                   </tr>
-                   <tr class="keywords-row">
-                      <th>Keywords</th>
-                      <mat-chip-set role="list" #keywordChips>
-                         <mat-chip role="listitem"
-                            *ngFor="let keyword of dataset.keywords">
-                            {{ keyword }}
-                         </mat-chip>
-                      </mat-chip-set>
-                   </tr>
-                </table>
-             </mat-card-content>
-          </mat-card>
-          <mat-card [formGroup]="form">
-             <mat-card-header class="creator-header">
-                <div mat-card-avatar class="section-icon">
-                   <mat-icon> blur_linear </mat-icon>
-                </div>
-                Administrative and Method Information:
-             </mat-card-header>
-             <div class="card-container">
-                <div class="card-left">
-                   <h2>Obtain OneDep Token</h2>
-                   <p class="instruction">Go to <a href="https://onedep-depui-test.wwpdb.org" target="_blank" >OneDep API</a> and choose option to sign in with ORCID. After the authorization you will be redirected back to OneDep. In the left bar below the map, tick the Deposition API option and click "Generate Key". Copy the token in the field below.    </p>
-                   <mat-form-field 
-                      class="token-field"
-                      appearance="outline">
-                      <mat-label>Token</mat-label>
-                      <textarea 
-                      matInput
-                      required
-                      placeholder="copy the token here"
-                      rows="1"
-                      formControlName="jwtToken" 
-                      (input)="autoGrow($event)"
-                      [style.overflow]="detailsOverflow"></textarea>
-                   </mat-form-field>
-                   <!-- Password Field -->
-                   <h2 class="password">Password</h2>
-                   <p class="instruction">You can provide a password, which will be confirmed in the email and sent to all provided ORCID users.</p>
-                   <mat-form-field class="password-field" appearance="outline">
-                      <mat-label>Password</mat-label>
-                      <input 
-                         matInput
-                         [type]="showPassword ? 'text' : 'password'"
-                         placeholder="enter your password"
-                         formControlName="password">
-                      <button mat-icon-button matSuffix (click)="togglePasswordVisibility()">
-                         <mat-icon>{{ showPassword ? 'visibility_off' : 'visibility' }}</mat-icon>
-                      </button>
+   <div style="clear: both;"></div>
+   <div>
+     <div>
+       <mat-card [formGroup]="form" data-cy="general-info">
+         <mat-card-header class="general-header">
+           <div mat-card-avatar class="section-icon">
+             <mat-icon> assignment </mat-icon>
+           </div>
+           General information
+         </mat-card-header>
+         <mat-card-content>
+           <table>
+             <tr>
+               <th>Name</th>
+               <td>{{ dataset.datasetName || "-" }}</td>
+             </tr>
+             <tr>
+               <th>Description</th>
+               <td>
+                 <span [innerHTML]="dataset.description || '-' | linky"></span>
+               </td>
+             </tr>
+             <tr>
+               <th>PID</th>
+               <td>
+                 {{ dataset.pid }}
+               </td>
+             </tr>
+             <tr>
+               <th>Type</th>
+               <td>{{dataset.type }}</td>
+             </tr>
+             <tr>
+               <th>Creation Time</th>
+               <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
+             </tr>
+             <tr class="keywords-row">
+               <th>Keywords</th>
+               <mat-chip-set role="list" #keywordChips>
+                 <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
+                   {{ keyword }}
+                 </mat-chip>
+               </mat-chip-set>
+             </tr>
+           </table>
+         </mat-card-content>
+       </mat-card>
+       <mat-card [formGroup]="form">
+         <mat-card-header class="creator-header">
+           <div mat-card-avatar class="section-icon">
+             <mat-icon> blur_linear </mat-icon>
+           </div>
+           Administrative and Method Information:
+         </mat-card-header>
+         <div class="card-container">
+           <div class="card-left">
+             <h2>Obtain OneDep Token</h2>
+             <p class="instruction">
+               Go to <a href="https://onedep-depui-test.wwpdb.org" target="_blank">OneDep API</a> and choose option to sign in with ORCID. After the authorization you will be redirected back to OneDep. In the left bar below the map, tick the
+               Deposition API option and click "Generate Key". Copy the token in the field below.
+             </p>
+             <mat-form-field class="token-field" appearance="outline">
+               <mat-label>Token</mat-label>
+               <textarea matInput required placeholder="copy the token here" rows="1" formControlName="jwtToken" (input)="autoGrow($event)" [style.overflow]="detailsOverflow"></textarea>
+             </mat-form-field>
+             <!-- Password Field -->
+             <h2 class="password">Password</h2>
+             <p class="instruction">You can provide a password, which will be confirmed in the email and sent to all provided ORCID users.</p>
+             <mat-form-field class="password-field" appearance="outline">
+               <mat-label>Password</mat-label>
+               <input matInput [type]="showPassword ? 'text' : 'password'" placeholder="enter your password" formControlName="password" />
+               <button mat-icon-button matSuffix (click)="togglePasswordVisibility()">
+                 <mat-icon>{{ showPassword ? 'visibility_off' : 'visibility' }}</mat-icon>
+               </button>
+             </mat-form-field>
+           </div>
+           <div class="card-middle">
+             <h2>Enter 16-digit ORCID iD</h2>
+             <p class="instruction">Owners of these ORCIDs iDs are allowed to access this deposition.</p>
+             <!-- Link the orcid FormArray -->
+             <div formArrayName="orcid">
+               <ng-container *ngFor="let field of orcidArray().controls; let i = index">
+                 <div [formGroupName]="i">
+                   <mat-form-field class="data-field" appearance="outline">
+                     <mat-label>Enter 16-digits ORCID iD</mat-label>
+                     <div class="input-container">
+                       <input matInput type="text" maxlength="19" placeholder="xxxx-xxxx-xxxx-xxxx" formControlName="orcidId" orcidFormatter />
+                       <button mat-icon-button class="remove-field-btn" (click)="removeOrcidField(i)">
+                         <mat-icon>clear</mat-icon>
+                       </button>
+                     </div>
                    </mat-form-field>
-                </div>
-                <div class="card-middle">
-                   <h2>Enter 16-digit ORCID iD</h2>
-                   <p class="instruction">Owners of these ORCIDs iDs are
-                      allowed to access this deposition.
-                   </p>
-                   <!-- Link the orcid FormArray -->
-                   <div formArrayName="orcid">
-                     <ng-container
-                        *ngFor="let field of orcidArray().controls; let i = index">
-                        <div [formGroupName]="i">
-                           <mat-form-field 
-                              class="data-field"
-                              appearance="outline">
-                              <mat-label>Enter 16-digits ORCID iD</mat-label>
-                              <div class="input-container">
-                                 <input 
-                                    matInput 
-                                    type="text"
-                                    maxlength="19"
-                                    placeholder="xxxx-xxxx-xxxx-xxxx"
-                                    formControlName="orcidId"
-                                    orcidFormatter>
-                                 <button 
-                                    mat-icon-button 
-                                    class="remove-field-btn" 
-                                    (click)="removeOrcidField(i)">
-                                    <mat-icon>clear</mat-icon>
-                                 </button>
-                              </div>
-                           </mat-form-field>
-                           <div class="error-text" *ngIf="field.get('orcidId')?.hasError('notNumeric')">
-                              ORCID ID must contain only numbers.
-                           </div>
-                        </div>
-                     </ng-container>
+                   <div class="error-text" *ngIf="field.get('orcidId')?.hasError('notNumeric')">
+                     ORCID ID must contain only numbers.
                    </div>
-                   <button 
-                      mat-icon-button 
-                      class="add-field-btn" 
-                      (click)="addOrcidField()">
-                      <mat-icon>add</mat-icon>
+                 </div>
+               </ng-container>
+             </div>
+             <button mat-icon-button class="add-field-btn" (click)="addOrcidField()">
+               <mat-icon>add</mat-icon>
+             </button>
+           </div>
+           <div class="card-right">
+             <!-- Question 1: Electron Microscopy Method -->
+             <h2>Choose Electron Microscopy Method</h2>
+             <mat-form-field class="method-name">
+               <mat-label>experimental method</mat-label>
+               <mat-select required formControlName="emMethod" name="method" (selectionChange)="onMethodChange()">
+                 <mat-option *ngFor="let method of methodsList" [value]="method.value">
+                   {{ method.viewValue }}
+                 </mat-option>
+               </mat-select>
+               <!-- Error Message -->
+               <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error">
+                 You must specify the experimental method
+               </div>
+             </mat-form-field>
+             <!-- Question 2: PDB Deposition -->
+             <tr *ngIf="form.value['emMethod'] && form.value['emMethod'] !== 'tomogram'">
+               <th class="questionnaire">Are you deposing coordinates with this submission? (for PDB)</th>
+               <td>
+                 <mat-radio-group reuired formControlName="deposingCoordinates" (change)="onPDB($event)">
+                   <mat-radio-button name="deposingCoordinates" value="true">
+                     Yes
+                   </mat-radio-button>
+                   <mat-radio-button name="deposingCoordinates" value="false" checked>
+                     No
+                   </mat-radio-button>
+                 </mat-radio-group>
+               </td>
+             </tr>
+             <!-- Question 3: Associated map -->
+             <tr *ngIf="form.value['emMethod'] && form.get('deposingCoordinates')?.value === 'true'">
+               <th>Has an associated map been deposited to EMDB?</th>
+               <td>
+                 <mat-radio-group reuired formControlName="associatedMap">
+                   <mat-radio-button name="associatedMap" value="true">
+                     Yes
+                   </mat-radio-button>
+                   <mat-radio-button name="associatedMap" value="false">
+                     No
+                   </mat-radio-button>
+                 </mat-radio-group>
+               </td>
+             </tr>
+             <!-- Question 4: EMDB Identifier Field -->
+             <tr *ngIf="form.value['emMethod'] && form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
+               <th>EMDB Identifier</th>
+               <td>
+                 <mat-form-field class="EMDB-ID">
+                   <mat-label>EMDB ID</mat-label>
+                   <input required matInput formControlName="emdbId" />
+                 </mat-form-field>
+               </td>
+             </tr>
+             <!-- Final Question: Composite Map -->
+             <tr *ngIf=" form.value['emMethod']">
+               <th class="questionnaire">Is this a composite map?</th>
+               <td>
+                 <mat-radio-group required formControlName="compositeMap">
+                   <mat-radio-button name="compositeMap" value="true">
+                     Yes
+                   </mat-radio-button>
+                   <mat-radio-button name="compositeMap" value="false" checked>
+                     No
+                   </mat-radio-button>
+                 </mat-radio-group>
+               </td>
+             </tr>
+           </div>
+         </div>
+         <!-- <button class="submitDep" mat-raised-button color="primary"
+                 (click)="onCreateClick()">
+                 Create Deposition
+                 </button> -->
+       </mat-card>
+       <!-- Attachments -->
+       <mat-card [formGroup]="form">
+         <mat-card-header class="file-header">
+           <div mat-card-avatar class="section-icon">
+             <mat-icon> attachment </mat-icon>
+           </div>
+           Choose files for deposition
+         </mat-card-header>
+         <mat-card-content>
+           <mat-card *ngFor="let fileType of form.get('files').value; let i = index" class="fileCard">
+             <ng-container *ngIf="fileType.emName !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
+               <mat-card-header matTooltip="{{ fileType.explanation }}" matTooltipPosition="above">
+                 <mat-card-title>
+                   {{ fileType.nameFE }}
+                   <span class="required-asterisk" *ngIf="isRequired(fileType.emName)"> *</span>
+                 </mat-card-title>
+               </mat-card-header>
+               <mat-card-content>
+                 <div class="file-selection-container">
+                   <button class="fileChooser" mat-raised-button color="primary" (click)="onChooseFile(fileInput)">
+                     Choose File
                    </button>
+                   <div *ngIf="selectedFile[fileType.emName]">
+                     <mat-icon>attach_file</mat-icon>
+                   </div>
+                   <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]">
+                     <mat-icon>attach_file</mat-icon>
+                   </div>
+                   <input type="file" #fileInput (change)="fileType.emName === 'add-map' ? onFileAddMapSelected($event, fileType.id) : onFileSelected($event, fileType.emName)" style="display: none;" />
+                   <div *ngIf="fileType.emName !== 'add-map' && selectedFile[fileType.emName]" class="fileName">
+                     <p>Selected File: {{ selectedFile[fileType.emName]?.name }}</p>
+                   </div>
+                   <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]" class="fileName">
+                     <p>Selected File: {{ selectedFile['add-map-' + fileType.id]?.name }}</p>
+                   </div>
+                 </div>
+                 <ng-container *ngIf="fileType.contour !== null || fileType.details !== null">
+                   <div class="input-container">
+                     <ng-container *ngIf="fileType.contour !== null">
+                       <mat-form-field appearance="outline" class="contour-level">
+                         <mat-label>Contour Level</mat-label>
+                         <input
+                           matInput
+                           type="number"
+                           placeholder="e.g. 0.0"
+                           [required]="!!fileType.file"
+                           [value]="fileType.contour || ''"
+                           (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : 
+                                    fileType.emName === 'add-map' ? updateContourLevelAddMap($event, fileType.id) : 
+                                    updateContourLevel($event, fileType.emName)"
+                         />
+                       </mat-form-field>
+                     </ng-container>
+                     <ng-container *ngIf="fileType.details !== null">
+                       <mat-form-field class="details">
+                         <mat-label>Short description</mat-label>
+                         <textarea
+                           matInput
+                           placeholder="Enter details..."
+                           rows="1"
+                           (input)="fileType.emName === 'add-map' ? updateDetailsAddMap($event, fileType.id) : updateDetails($event, fileType.emName)"
+                           (input)="autoGrow($event)"
+                           [style.overflow]="detailsOverflow"
+                         ></textarea>
+                       </mat-form-field>
+                     </ng-container>
+                   </div>
+                 </ng-container>
+               </mat-card-content>
+               <div *ngIf="fileType.emName === 'add-map' && fileType.id === 0">
+                  <button mat-icon-button matTooltip="Add more maps" aria-label="Add another map" (click)="addMap()">
+                    <mat-icon>add</mat-icon>
+                  </button>
                 </div>
-                <div class="card-right">
-                   <!-- Question 1: Electron Microscopy Method -->
-                   <h2>Choose Electron Microscopy
-                      Method
-                   </h2>
-                   <mat-form-field class="method-name">
-                      <mat-label>experimental method</mat-label>
-                      <mat-select 
-                         required
-                         formControlName="emMethod"
-                         name="method"
-                         (selectionChange)="onMethodChange()">
-                         <mat-option *ngFor="let method of methodsList"
-                         [value]="method.value">
-                         {{ method.viewValue }}
-                         </mat-option>
-                      </mat-select>
-                      <!-- Error Message -->
-                      <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched"
-                         class="error">
-                         You must specify the experimental method
-                      </div>
-                   </mat-form-field>
-                   <!-- Question 2: PDB Deposition -->
-                   <tr *ngIf="form.value['emMethod'] && form.value['emMethod'] !== 'tomogram'">
-                      <th class="questionnaire">Are you deposing
-                         coordinates with this
-                         submission? (for PDB)
-                      </th>
-                      <td>
-                         <mat-radio-group reuired
-                            formControlName="deposingCoordinates"
-                            (change)="onPDB($event)">
-                            <mat-radio-button name="deposingCoordinates"
-                               value=true>
-                               Yes
-                            </mat-radio-button>
-                            <mat-radio-button name="deposingCoordinates"
-                               value=false checked>
-                               No
-                            </mat-radio-button>
-                         </mat-radio-group>
-                      </td>
-                   </tr>
-                   <!-- Question 3: Associated map -->
-                   <tr
-                      *ngIf="form.value['emMethod'] && form.get('deposingCoordinates')?.value === 'true'">
-                      <th>Has an associated map been deposited to EMDB?
-                      </th>
-                      <td>
-                         <mat-radio-group reuired
-                            formControlName="associatedMap">
-                            <mat-radio-button name="associatedMap"
-                               value=true>
-                               Yes
-                            </mat-radio-button>
-                            <mat-radio-button name="associatedMap"
-                               value=false>
-                               No
-                            </mat-radio-button>
-                         </mat-radio-group>
-                      </td>
-                   </tr>
-                   <!-- Question 4: EMDB Identifier Field -->
-                   <tr
-                      *ngIf="form.value['emMethod'] && form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
-                      <th>EMDB Identifier</th>
-                      <td>
-                         <mat-form-field class="EMDB-ID">
-                            <mat-label>EMDB ID</mat-label>
-                            <input required matInput
-                               formControlName="emdbId" />
-                         </mat-form-field>
-                      </td>
-                   </tr>
-                   <!-- Final Question: Composite Map -->
-                   <tr *ngIf=" form.value['emMethod']">
-                      <th class="questionnaire">Is this a composite map?
-                      </th>
-                      <td>
-                         <mat-radio-group required
-                            formControlName="compositeMap">
-                            <mat-radio-button name="compositeMap"
-                               value=true>
-                               Yes
-                            </mat-radio-button>
-                            <mat-radio-button name="compositeMap"
-                               value=false checked>
-                               No
-                            </mat-radio-button>
-                         </mat-radio-group>
-                      </td>
-                   </tr>
-                </div>
-             </div>
-             <!-- <button class="submitDep" mat-raised-button color="primary"
-                (click)="onCreateClick()">
-                Create Deposition
-                </button> -->
-          </mat-card>
-          <!-- Attachments -->
-          <mat-card [formGroup]="form">
-             <mat-card-header class="file-header">
-                <div mat-card-avatar class="section-icon">
-                   <mat-icon> attachment </mat-icon>
+                <div *ngIf="fileType.emName === 'fsc-xml' && fileType.id === 0">
+                  <button mat-icon-button matTooltip="Add more FSC" aria-label="Add another FSC xml" (click)="addFSC()">
+                    <mat-icon>add</mat-icon>
+                  </button>
                 </div>
-                Choose files for deposition
-             </mat-card-header>
-             <mat-card-content>
-               <mat-card *ngFor="let fileType of form.get('files').value; let i = index" class="fileCard">
-                  <ng-container *ngIf="fileType.emName !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
-                    <mat-card-header matTooltip="{{ fileType.explanation }}" matTooltipPosition="above">
-                      <mat-card-title>{{ fileType.nameFE }} 
-                        <span class="required-asterisk" *ngIf="isRequired(fileType.emName)"> *</span>
-                      </mat-card-title>
-                    </mat-card-header>
-                    <mat-card-content>
-                      <div class="file-selection-container">
-                        <button class="fileChooser" mat-raised-button color="primary" (click)="onChooseFile(fileInput)">
-                          Choose File
-                        </button>
-                        <div *ngIf="selectedFile[fileType.emName]">
-                          <mat-icon>attach_file</mat-icon>
-                        </div>
-                        <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]">
-                          <mat-icon>attach_file</mat-icon>
-                        </div>
-                        <input type="file" #fileInput
-                               (change)="fileType.emName === 'add-map' ? onFileAddMapSelected($event, fileType.id) : onFileSelected($event, fileType.emName)"
-                               style="display: none;" />
-                        <div *ngIf="fileType.emName !== 'add-map' && selectedFile[fileType.emName]" class="fileName">
-                          <p>Selected File: {{ selectedFile[fileType.emName]?.name }}</p>
-                        </div>
-                        <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]" class="fileName">
-                          <p>Selected File: {{ selectedFile['add-map-' + fileType.id]?.name }}</p>
-                        </div>
-                      </div>
-                      <div class="input-container">
-                        <ng-container *ngIf="fileType.contour !== null">
-                          <mat-form-field appearance="outline" class="contour-level">
-                            <mat-label>Contour Level</mat-label>
-                            <input matInput type="number" placeholder="e.g. 0.0" 
-                                   [required]="!!fileType.file"
-                                   [value]="fileType.contour || ''"
-                                   (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : 
-                                   fileType.emName === 'add-map' ? updateContourLevelAddMap($event, fileType.id) : 
-                                   updateContourLevel($event, fileType.emName)" />
-                          </mat-form-field>
-                        </ng-container>
-                        <mat-form-field class="details">
-                          <mat-label>Details</mat-label>
-                          <textarea matInput placeholder="Enter details..." rows="1"
-                                    (input)="fileType.emName === 'add-map' ? updateDetailsAddMap($event, fileType.id) : updateDetails($event, fileType.emName)"
-                                    (input)="autoGrow($event)" [style.overflow]="detailsOverflow"></textarea>
-                        </mat-form-field>
-                      </div>
-                    </mat-card-content>
-                  </ng-container>
-                  <div *ngIf="fileType.emName === 'add-map' && fileType.id === 0">
-                    <button mat-icon-button matTooltip="Add more maps" aria-label="Add another map" (click)="addMap()">
-                      <mat-icon>add</mat-icon>
-                    </button>
-                  </div>
-                </mat-card>
-                
-                <!-- UPLOAD FILES DONE -->
-                 <div class ="button-container">
-                <button class="submitDep" mat-raised-button color="primary"
-                   (click)="onDepositClick()"
-                   >
-                Start Deposition
-                </button>
-                <button class="submitDep" mat-raised-button color="primary"
-                   (click)="onDownloadClick()">
-                Download mmCIF
-                </button>
-               </div>
-             </mat-card-content>
-          </mat-card>
-       </div>
-    </div>
+             </ng-container>
+           </mat-card>
+ 
+           <!-- UPLOAD FILES DONE -->
+           <div class="button-container">
+             <button class="submitDep" mat-raised-button color="primary" (click)="onDepositClick()">
+               Start Deposition
+             </button>
+             <button class="submitDep" mat-raised-button color="primary" (click)="onDownloadClick()">
+               Download mmCIF
+             </button>
+           </div>
+         </mat-card-content>
+       </mat-card>
+     </div>
+   </div>
  </ng-template>
  
\ No newline at end of file
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index 9978746543..9fec0412ea 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -14,8 +14,7 @@ mat-card {
     justify-content: space-between;
     align-items: flex-start;
     gap: 16px;
-    padding: 16px;
-    margin-bottom: 20px;
+    padding: 8px 16px 8px;
   }
 
   .card-left, 
@@ -40,7 +39,7 @@ mat-card {
   h2.password{
     margin-top:3rem;
   }
-  .file-header {
+  .file-header {/* space after the main Attachments card */
     display: flex;
     margin-bottom: 16px;
   }
@@ -156,7 +155,7 @@ mat-card {
 
   .fileCard {
     width: 80%;
-    margin: 10px 0 10px 0;
+    margin: 16px 0 0 0; /* Space between attachment cards */
     border: 1px solid #ddd;
     box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
 
@@ -175,12 +174,12 @@ mat-card {
     .file-selection-container {
       display: flex; // Use flexbox for layout
       align-items: center; // Center items vertically
-      gap: 10px; // Space between items
+      gap: 16px; // Space between items
 
       .fileChooser {
         background-color: #CFE7CB;
         color: #333;
-        margin: 5px 0 0 0; // Reset any margin
+        margin: 16px 0 0 0; // Reset any margin
       }
 
       .fileName {
@@ -192,20 +191,18 @@ mat-card {
     mat-card-content {
       display: flex;
       flex-direction: column;
-      margin-bottom: 40px;
-
-      .fileChooser {
-        margin: 3px auto;
-      }
+      margin-bottom: 0px;
+      
       .data-field {
         width: 350px; 
         min-width: 320px; 
         position: relative; 
     }
+      
       .input-container {
         display: flex; // Use flexbox for layout
         align-items: flex-end;
-        gap: 10px; // Space between the fields
+        gap: 16px; // Space between the fields
 
         .contour-level {
           flex: 0 0 20%; // Set to take 20% of the width
@@ -225,7 +222,7 @@ mat-card {
 
         .details {
 
-          margin-top:  10px;
+          margin-top:  16px;
           flex: 1; // Allow this field to take the remaining space
           min-width: 200px; // Optional: set a minimum width for usability
 
@@ -253,10 +250,11 @@ mat-card {
   .button-container {
     display: flex;          
     gap: 20px; 
+    margin-top: 16px;
   }
   .submitDep {
     background-color: #B3D9AC;
     color:black;
-    // padding: 10px 20px;
   }
+
 }
\ No newline at end of file
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index f159cb4d7f..8242c813c4 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -251,12 +251,13 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
 
   onPDB(event: MatRadioChange) {
+    // fix me : add removal on
     const input = event.value;
     if (input === "true") {
       this.fileTypes.forEach((fT) => {
         if (fT.emName === this.emFile.Coordinates) {
           fT.required = true; // update the co-cif required status
-          this.addFileToForm(fT)
+          this.addFileToForm(fT);
         }
       });
     }
@@ -302,21 +303,18 @@ export class OneDepComponent implements OnInit, OnDestroy {
     }
   }
 
-
   onFileAddMapSelected(event: Event, id: number) {
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
       // Use the ID to store the file uniquely for each "add-map"
       this.selectedFile[`add-map-${id}`] = input.files[0];
       this.files.forEach((fT) => {
-      
         if (fT.value.emName === this.emFile.AddMap && fT.value.id === id) {
           fT.value.file = this.selectedFile[`add-map-${id}`];
           fT.value.fileName = this.selectedFile[`add-map-${id}`].name;
         }
       });
     }
-    console.log(this.files);
   }
   isRequired(controlName: string): boolean {
     let value: boolean;
@@ -388,7 +386,6 @@ export class OneDepComponent implements OnInit, OnDestroy {
     });
   }
   addMap() {
-    console.log("addMaps() was called. files before:", this.files);
     const nextId =
       this.files
         .filter((file) => file.value.emName === EmFile.AddMap)
@@ -410,7 +407,29 @@ export class OneDepComponent implements OnInit, OnDestroy {
     };
     // update the co-cif required status
     this.addFileToForm(newMap);
-    console.log("addMaps() files after:", this.files);
+  }
+  addFSC() {
+    const nextId =
+      this.files
+        .filter((file) => file.value.emName === EmFile.FSC)
+        .reduce(
+          (maxId, file) => (file.value.id > maxId ? file.value.id : maxId),
+          0,
+        ) + 1;
+
+    const newFSC: DepositionFiles = {
+      emName: EmFile.FSC,
+      id: nextId,
+      nameFE: "FSC-XML ( " + (nextId + 1).toString() + " )",
+      type: "fsc-xml",
+      fileName: "",
+      file: null,
+      contour: 0.0,
+      details: "",
+      required: false,
+    };
+    // update the co-cif required status
+    this.addFileToForm(newFSC);
   }
 
   onDepositClick() {
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index a8bc13a2dd..0925e9a764 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -58,7 +58,6 @@ export const createMethodsList = (): EmMethod[] => {
     type: "img-emdb",
     fileName: "",
     file: null,
-    details: "",
     required: false,
     explanation:
       "Image of the map (500 x 500 pixels in .jpg, .png, etc. format)",
@@ -126,11 +125,11 @@ export const createMethodsList = (): EmMethod[] => {
   };
   const depositionFSC: DepositionFiles = {
     emName: EmFile.FSC,
+    id: 0,
     nameFE: "FSC-XML",
     type: "fsc-xml",
     fileName: "",
     file: null,
-    details: "",
     required: false,
     explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs",
   };
@@ -140,7 +139,6 @@ export const createMethodsList = (): EmMethod[] => {
     type: "layer-lines",
     fileName: "",
     file: null,
-    details: "",
     required: false,
   };
   const depositionCoordinates: DepositionFiles = {
@@ -149,7 +147,6 @@ export const createMethodsList = (): EmMethod[] => {
     type: "co-cif",
     fileName: "",
     file: null,
-    details: "",
     required: false,
     explanation: "mmCIF or PDB format",
   };
@@ -159,7 +156,6 @@ export const createMethodsList = (): EmMethod[] => {
     type: "xs-cif",
     fileName: "",
     file: null,
-    details: "",
     required: false,
   };
   const depositionMTZ: DepositionFiles = {
@@ -168,7 +164,6 @@ export const createMethodsList = (): EmMethod[] => {
     type: "xs-mtz",
     fileName: "",
     file: null,
-    details: "",
     required: false,
   };
   return [

From 8a168851e30ba69d3de40d86012220e8832e36ce Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 22 Jan 2025 17:44:39 +0000
Subject: [PATCH 084/245] add many files and clean entered file

---
 src/app/datasets/onedep/onedep.component.html | 25 +++--
 src/app/datasets/onedep/onedep.component.scss | 37 ++++---
 src/app/datasets/onedep/onedep.component.ts   | 98 ++++++++++++-------
 3 files changed, 105 insertions(+), 55 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 7bce94c628..049b74eeb2 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -86,7 +86,7 @@ <h2>Enter 16-digit ORCID iD</h2>
                      <mat-label>Enter 16-digits ORCID iD</mat-label>
                      <div class="input-container">
                        <input matInput type="text" maxlength="19" placeholder="xxxx-xxxx-xxxx-xxxx" formControlName="orcidId" orcidFormatter />
-                       <button mat-icon-button class="remove-field-btn" (click)="removeOrcidField(i)">
+                       <button mat-icon-button class="remove-orcid-btn" (click)="removeOrcidField(i)">
                          <mat-icon>clear</mat-icon>
                        </button>
                      </div>
@@ -185,7 +185,6 @@ <h2>Choose Electron Microscopy Method</h2>
          </mat-card-header>
          <mat-card-content>
            <mat-card *ngFor="let fileType of form.get('files').value; let i = index" class="fileCard">
-             <ng-container *ngIf="fileType.emName !== 'co-cif' || form.get('deposingCoordinates').value === 'true'">
                <mat-card-header matTooltip="{{ fileType.explanation }}" matTooltipPosition="above">
                  <mat-card-title>
                    {{ fileType.nameFE }}
@@ -200,16 +199,31 @@ <h2>Choose Electron Microscopy Method</h2>
                    <div *ngIf="selectedFile[fileType.emName]">
                      <mat-icon>attach_file</mat-icon>
                    </div>
-                   <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]">
+                   <div *ngIf="(fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]) || (fileType.emName === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.id])">
                      <mat-icon>attach_file</mat-icon>
                    </div>
-                   <input type="file" #fileInput (change)="fileType.emName === 'add-map' ? onFileAddMapSelected($event, fileType.id) : onFileSelected($event, fileType.emName)" style="display: none;" />
-                   <div *ngIf="fileType.emName !== 'add-map' && selectedFile[fileType.emName]" class="fileName">
+                   <input type="file" #fileInput (change)="fileType.emName === 'add-map' ? onFileAddMore($event, fileType.id, 'add-map') : fileType.emName === 'fsc-xml' ? onFileAddMore($event, fileType.id, 'fsc-xml') : onFileSelected($event, fileType.emName)" style="display: none;" />
+                   <div *ngIf="(fileType.emName !== 'add-map' && selectedFile[fileType.emName]) || (fileType.emName === 'fsc-xml' && selectedFile['fsc-xml' + fileType.id])" class="fileName">
                      <p>Selected File: {{ selectedFile[fileType.emName]?.name }}</p>
                    </div>
                    <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]" class="fileName">
                      <p>Selected File: {{ selectedFile['add-map-' + fileType.id]?.name }}</p>
                    </div>
+                   <div *ngIf="fileType.emName === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.id]" class="fileName">
+                    <p>Selected File: {{ selectedFile['fsc-xml-' + fileType.id]?.name }}</p>
+                  </div>
+                  <div *ngIf=
+                      "(fileType.emName !== 'add-map' && fileType.emName !== 'fsc-xml' && selectedFile[fileType.emName]) ||
+                      (fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]) ||
+                      (fileType.emName === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.id])">
+                    <button
+                      mat-icon-button
+                      class="remove-field-btn"
+                      (click)="clearFile(fileType.emName, fileType.id)"
+                    >
+                      <mat-icon>clear</mat-icon>
+                    </button>
+                  </div>
                  </div>
                  <ng-container *ngIf="fileType.contour !== null || fileType.details !== null">
                    <div class="input-container">
@@ -254,7 +268,6 @@ <h2>Choose Electron Microscopy Method</h2>
                     <mat-icon>add</mat-icon>
                   </button>
                 </div>
-             </ng-container>
            </mat-card>
  
            <!-- UPLOAD FILES DONE -->
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index 9fec0412ea..b131c8afcf 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -73,7 +73,7 @@ mat-card {
     width:40%;
   }
 
-  .remove-field-btn {
+  .remove-orcid-btn {
     position: absolute;
     top: 50%;
     right: -40%;
@@ -82,6 +82,12 @@ mat-card {
     color: rgba(0, 0, 0, 0.6);
   }
 
+  .remove-file-btn {
+    position: absolute;
+    margin-left: 16px;
+    color: rgba(0, 0, 0, 0.6);
+  }
+
   .add-field-btn {
     margin-top: 5px;
     color: rgba(0, 0, 0, 0.6);
@@ -162,9 +168,9 @@ mat-card {
     mat-card-header {
       background-color: #B3D9AC;
       height: 26px;
-      display: flex; // Use flexbox to align items
-      align-items: center; // Center content vertically
-      padding: 0 16px; // Optional: adjust padding as needed
+      display: flex; 
+      align-items: center; 
+      padding: 0 16px; 
     }
 
     mat-card-title {
@@ -172,19 +178,20 @@ mat-card {
     }
 
     .file-selection-container {
-      display: flex; // Use flexbox for layout
-      align-items: center; // Center items vertically
-      gap: 16px; // Space between items
+      display: flex; 
+      align-items: center; 
+      gap: 16px;
 
       .fileChooser {
         background-color: #CFE7CB;
         color: #333;
-        margin: 16px 0 0 0; // Reset any margin
+        margin: 16px 0 0 0;
       }
 
       .fileName {
-        font-size: 14px; // Adjust the font size as needed
-        color: #333; // Adjust the text color if needed
+        font-size: 16px; 
+        transform: translateY(15%);
+        color: #333; 
       }
     }
 
@@ -200,13 +207,13 @@ mat-card {
     }
       
       .input-container {
-        display: flex; // Use flexbox for layout
+        display: flex; 
         align-items: flex-end;
-        gap: 16px; // Space between the fields
+        gap: 16px;
 
         .contour-level {
           flex: 0 0 20%; // Set to take 20% of the width
-          min-width: 150px; // Optional: set a minimum width for usability
+          min-width: 150px;
 
           /* Chrome, Safari, Edge, Opera */
           input[matinput]::-webkit-outer-spin-button,
@@ -223,8 +230,8 @@ mat-card {
         .details {
 
           margin-top:  16px;
-          flex: 1; // Allow this field to take the remaining space
-          min-width: 200px; // Optional: set a minimum width for usability
+          flex: 1;
+          min-width: 200px;
 
           mat-form-field {
             textarea {
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 8242c813c4..db2aa083bd 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -167,26 +167,6 @@ export class OneDepComponent implements OnInit, OnDestroy {
       this.orcidArray().removeAt(index);
     }
   }
-  addFilesToForm(files: DepositionFiles[]) {
-    const filesArray = this.form.get("files") as FormArray;
-    filesArray.clear();
-    files.forEach((file) => {
-      filesArray.push(
-        this.fb.group({
-          emName: [file.emName],
-          id: [file.id],
-          nameFE: [file.nameFE],
-          type: [file.type],
-          fileName: [file.fileName],
-          file: [file.file],
-          required: [file.required],
-          contour: [file.contour],
-          details: [file.details],
-          explanation: [file.explanation],
-        }),
-      );
-    });
-  }
   addFileToForm(file: DepositionFiles) {
     const filesArray = this.form.get("files") as FormArray;
     filesArray.push(
@@ -204,7 +184,19 @@ export class OneDepComponent implements OnInit, OnDestroy {
       }),
     );
   }
+  removeFileFromForm(fileCat: EmFile) {
+    const filesArray = this.form.get("files") as FormArray;
+    const index = filesArray.value.findIndex(
+      (file: DepositionFiles) => file.emName === fileCat,
+    );
+    if (index > -1) {
+      filesArray.removeAt(index);
+    }
+  }
   onMethodChange() {
+    const filesArray = this.form.get("files") as FormArray;
+    filesArray.clear();
+
     this.methodsList = createMethodsList(); // Reset the methods list to be empty
     this.fileTypes = this.methodsList.find(
       (mL) => mL.value === this.form.value["emMethod"],
@@ -240,10 +232,10 @@ export class OneDepComponent implements OnInit, OnDestroy {
         this.form.get("associatedMap")?.setValue("false");
         break;
     }
-    const filesArray = this.form.get("files") as FormArray;
-    filesArray.clear();
     this.fileTypes.forEach((file) => {
-      this.addFileToForm(file);
+      if (file.emName !== this.emFile.Coordinates) {
+        this.addFileToForm(file);
+      }
     });
   }
   get files() {
@@ -251,7 +243,6 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
 
   onPDB(event: MatRadioChange) {
-    // fix me : add removal on
     const input = event.value;
     if (input === "true") {
       this.fileTypes.forEach((fT) => {
@@ -260,6 +251,8 @@ export class OneDepComponent implements OnInit, OnDestroy {
           this.addFileToForm(fT);
         }
       });
+    } else {
+      this.removeFileFromForm(this.emFile.Coordinates);
     }
   }
 
@@ -302,18 +295,57 @@ export class OneDepComponent implements OnInit, OnDestroy {
       });
     }
   }
+  clearFile(fileCat: EmFile, id?: number) {
+    const key =
+      fileCat === "add-map" || fileCat === "fsc-xml"
+        ? `${fileCat}-${id}`
+        : fileCat;
+    this.selectedFile[key] = null;
 
-  onFileAddMapSelected(event: Event, id: number) {
+    let index = -1;
+    const filesArray = this.form.get("files") as FormArray;
+    if (fileCat !== "add-map" && fileCat !== "fsc-xml") {
+      index = filesArray.value.findIndex(
+        (file: DepositionFiles) => file.emName === fileCat,
+      );
+    } else {
+      for (let i = 0; i < filesArray.length; i++) {
+        if (
+          filesArray.at(i).value.emName === fileCat &&
+          filesArray.at(i).value.id === id
+        ) {
+          index = i;
+          break;
+        }
+      }
+    }
+    if (index > -1) {
+      filesArray.at(index).patchValue({ file: null });
+    }
+  }
+  onFileAddMore(event: Event, id: number, fileType: string) {
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
-      // Use the ID to store the file uniquely for each "add-map"
-      this.selectedFile[`add-map-${id}`] = input.files[0];
-      this.files.forEach((fT) => {
-        if (fT.value.emName === this.emFile.AddMap && fT.value.id === id) {
-          fT.value.file = this.selectedFile[`add-map-${id}`];
-          fT.value.fileName = this.selectedFile[`add-map-${id}`].name;
+      this.selectedFile[`${fileType}-${id}`] = input.files[0];
+      for (let i = 0; i < this.files.length; i++) {
+        if (
+          this.files.at(i).value.emName === this.emFile.AddMap &&
+          this.files.at(i).value.id === id &&
+          fileType === "add-map"
+        ) {
+          this.files.at(i).value.file = this.selectedFile[`${fileType}-${id}`];
+          this.files.at(i).value.fileName =
+            this.selectedFile[`${fileType}-${id}`].name;
+        } else if (
+          this.files.at(i).value.emName === this.emFile.FSC &&
+          this.files.at(i).value.id === id &&
+          fileType === "fsc-xml"
+        ) {
+          this.files.at(i).value.file = this.selectedFile[`${fileType}-${id}`];
+          this.files.at(i).value.fileName =
+            this.selectedFile[`${fileType}-${id}`].name;
         }
-      });
+      }
     }
   }
   isRequired(controlName: string): boolean {
@@ -424,8 +456,6 @@ export class OneDepComponent implements OnInit, OnDestroy {
       type: "fsc-xml",
       fileName: "",
       file: null,
-      contour: 0.0,
-      details: "",
       required: false,
     };
     // update the co-cif required status

From 63fb9dccfb948178a6583bd75fa787b72866d1b6 Mon Sep 17 00:00:00 2001
From: David Wiessner <david.wiessner@indema.ch>
Date: Thu, 23 Jan 2025 10:29:15 +0000
Subject: [PATCH 085/245] Prepare optical improvements and adding control
 mechanisms

---
 ...stor.dialog-stepper.component.component.ts | 10 ++++
 .../ingestor.dialog-stepper.component.css     | 26 +++++++---
 .../ingestor.dialog-stepper.component.html    |  7 ++-
 ...tor.extractor-metadata-dialog.component.ts |  3 ++
 .../ingestor.extractor-metadata-dialog.html   |  8 +++
 ...ingestor.user-metadata-dialog.component.ts |  3 ++
 .../dialog/ingestor.user-metadata-dialog.html | 51 +++++++++++++------
 .../ingestor/ingestor-api-endpoints.ts        |  4 ++
 .../ingestor/ingestor/ingestor.component.html | 14 ++++-
 .../ingestor/ingestor/ingestor.component.scss |  8 +++
 .../ingestor/ingestor/ingestor.component.ts   |  5 ++
 11 files changed, 115 insertions(+), 24 deletions(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
index 1531c5404f..8b665406d5 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
@@ -7,4 +7,14 @@ import { Component, Input } from "@angular/core";
 })
 export class IngestorDialogStepperComponent {
   @Input() activeStep = 0;
+
+  // Save a template of metadata
+  onSave() {
+    console.log("Save action triggered");
+  }
+
+  // Upload a template of metadata
+  onUpload() {
+    console.log("Upload action triggered");
+  }
 }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css
index 8e114ace88..215e47f1c4 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css
@@ -4,14 +4,28 @@
   align-items: center;
 }
 
-.stepper div {
-  margin: 5px;
+.ingestor-stepper {
+  max-width: 100%;
 }
 
-.stepper div.active {
-  font-weight: bold;
+.dialog-control-buttons {
+  display: flex;
+  justify-content: flex-end;
+  gap: 1em;
+}
+
+.control-button-icon {
+  margin: auto;
 }
 
-button {
-  margin: 5px;
+@media (max-width: 768px) {
+  .stepper {
+    flex-direction: column;
+    width: 100%;
+  }
+
+  .stepper div {
+    width: 100%;
+    text-align: center;
+  }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html
index 9902301bb8..f5498dd673 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html
@@ -1,5 +1,10 @@
+<div class="dialog-control-buttons">
+  <button mat-button matTooltip="Save the current values." [disabled]="activeStep < 1" (click)="onSave()"><mat-icon class="control-button-icon">save</mat-icon></button>
+  <button mat-button matTooltip="Upload a template." [disabled]="activeStep < 1" (click)="onUpload()"><mat-icon class="control-button-icon">upload</mat-icon></button>
+</div>
+
 <div class="stepper">
-  <mat-stepper [linear]="true" [selectedIndex]="activeStep" #stepper>
+  <mat-stepper [linear]="true" [selectedIndex]="activeStep" class="ingestor-stepper">
     <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
       <ng-template matStepLabel>Select your ingestion method</ng-template>
     </mat-step>
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index 9fa86aa138..fd91e68979 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -23,6 +23,9 @@ export class IngestorExtractorMetadataDialogComponent {
   extractorMetaDataReady = false;
   extractorMetaDataError = false;
 
+  isAcquisitionMetadataOk = false; // TODO IMPLEMENT VALUE CHECK
+  isInstrumentMetadataOk = false; // TODO IMPLEMENT VALUE CHECK
+
   isCardContentVisible = {
     instrument: true,
     acquisition: true,
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
index fe985f0d6a..2674b3d860 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -39,6 +39,10 @@ <h2 mat-dialog-title>
             </div>
             Instrument Information
             <span class="spacer"></span>
+            <mat-icon
+            matTooltip="TODO - Check if everything is filled out correctly"
+            [ngClass]="isInstrumentMetadataOk ? 'success-icon' : 'error-icon'">{{
+            isInstrumentMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
             <mat-icon class="toggle-icon">{{ isCardContentVisible.instrument ? 'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.instrument">
@@ -54,6 +58,10 @@ <h2 mat-dialog-title>
             </div>
             Acquisition Information
             <span class="spacer"></span>
+            <mat-icon
+            matTooltip="TODO - Check if everything is filled out correctly"
+            [ngClass]="isAcquisitionMetadataOk ? 'success-icon' : 'error-icon'">{{
+            isAcquisitionMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
             <mat-icon class="toggle-icon">{{ isCardContentVisible.acquisition ? 'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.acquisition">
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 1f57b6ab8a..bf9a2c2d74 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -23,6 +23,9 @@ export class IngestorUserMetadataDialogComponent {
   backendURL = "";
 
   uiNextButtonReady = true; // Change to false when dev is ready
+  isSciCatHeaderOk = false; // TODO IMPLEMENT VALUE CHECK
+  isOrganizationalMetadataOk = false; // TODO IMPLEMENT VALUE CHECK
+  isSampleInformationOk = false; // TODO IMPLEMENT VALUE CHECK
 
   isCardContentVisible = {
     scicat: true,
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
index 39fbf41a49..c124c91feb 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
@@ -9,51 +9,72 @@ <h2 mat-dialog-title>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
   <ingestor-dialog-stepper [activeStep]="1"></ingestor-dialog-stepper>
-  
+
   <div fxLayout="row" fxLayout.xs="column">
     <div fxFlex="80%">
       <mat-card>
-        <mat-card-header class="scicat-header" (click)="toggleCardContent('scicat')">
+        <mat-card-header class="scicat-header"
+          (click)="toggleCardContent('scicat')">
           <div mat-card-avatar class="section-icon">
             <mat-icon> info </mat-icon>
           </div>
           SciCat Information
           <span class="spacer"></span>
-          <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ? 'expand_less' : 'expand_more' }}</mat-icon>
+            <mat-icon
+            matTooltip="TODO - Check if everything is filled out correctly"
+            [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'">{{
+            isSciCatHeaderOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ?
+            'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.scicat">
-          <app-metadata-editor [schema]="scicatHeaderSchema" [data]="createNewTransferData.scicatHeader"
-          (dataChange)="onDataChangeUserScicatHeader($event)"></app-metadata-editor>
+          <app-metadata-editor [schema]="scicatHeaderSchema"
+            [data]="createNewTransferData.scicatHeader"
+            (dataChange)="onDataChangeUserScicatHeader($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
 
       <mat-card>
-        <mat-card-header class="organizational-header" (click)="toggleCardContent('organizational')">
+        <mat-card-header class="organizational-header"
+          (click)="toggleCardContent('organizational')">
           <div mat-card-avatar class="section-icon">
             <mat-icon> person </mat-icon>
           </div>
           Organizational Information
           <span class="spacer"></span>
-          <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ? 'expand_less' : 'expand_more' }}</mat-icon>
+          <mat-icon
+            matTooltip="TODO - Check if everything is filled out correctly"
+            [ngClass]="isOrganizationalMetadataOk ? 'success-icon' : 'error-icon'">{{
+            isOrganizationalMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ?
+            'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.organizational">
-          <app-metadata-editor [schema]="metadataSchemaOrganizational" [data]="createNewTransferData.userMetaData['organizational']"
-          (dataChange)="onDataChangeUserMetadataOrganization($event)"></app-metadata-editor>
+          <app-metadata-editor [schema]="metadataSchemaOrganizational"
+            [data]="createNewTransferData.userMetaData['organizational']"
+            (dataChange)="onDataChangeUserMetadataOrganization($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
 
       <mat-card>
-        <mat-card-header class="sample-header" (click)="toggleCardContent('sample')">
+        <mat-card-header class="sample-header"
+          (click)="toggleCardContent('sample')">
           <div mat-card-avatar class="section-icon">
             <mat-icon> description </mat-icon>
           </div>
           Sample Information
           <span class="spacer"></span>
-          <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ? 'expand_less' : 'expand_more' }}</mat-icon>
+          <mat-icon
+            matTooltip="TODO - Check if everything is filled out correctly"
+            [ngClass]="isSampleInformationOk ? 'success-icon' : 'error-icon'">{{
+            isSampleInformationOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ?
+            'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.sample">
-          <app-metadata-editor [schema]="metadataSchemaSample" [data]="createNewTransferData.userMetaData['sample']"
-          (dataChange)="onDataChangeUserMetadataSample($event)"></app-metadata-editor>
+          <app-metadata-editor [schema]="metadataSchemaSample"
+            [data]="createNewTransferData.userMetaData['sample']"
+            (dataChange)="onDataChangeUserMetadataSample($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
     </div>
@@ -62,6 +83,6 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" [disabled]="!uiNextButtonReady"
-    (click)="onClickNext()">Next</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
index acd08c0177..d237ef4fd9 100644
--- a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
+++ b/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
@@ -15,3 +15,7 @@ export interface PostExtractorEndpoint {
 export interface PostDatasetEndpoint {
   metaData: string;
 }
+
+export const apiGetHealth = () => {
+  console.log("Health check"); // TODO IMPLEMENT
+};
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index 187f6f2f76..454f273f4a 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -23,7 +23,8 @@
           <div>
             <ul>
               <li *ngFor="let backend of lastUsedFacilityBackends">
-                <a (click)="onClickSelectFacilityBackend(backend)">{{ backend }}</a>
+                <a (click)="onClickSelectFacilityBackend(backend)">{{ backend
+                  }}</a>
               </li>
             </ul>
           </div>
@@ -32,7 +33,7 @@
         <ng-container *ngIf="connectedFacilityBackend !== ''">
           <mat-tab-group animationDuration="0ms">
             <mat-tab label="Transfers">
-              <button mat-button aria-label="Refresh transfer list"
+              <button matTooltip="Refresh transfer list" mat-button aria-label="Refresh transfer list"
                 (click)="onClickRefreshTransferList()">
                 <mat-icon>refresh</mat-icon>
               </button>
@@ -87,6 +88,15 @@
                   <span matListItemLine>{{ connectedFacilityBackendVersion
                     }}</span>
                 </mat-list-item>
+                <mat-list-item>
+                  <span matListItemTitle>Health Status</span>
+                  <ng-container *ngFor="let status of ingestorHealthStatus">
+                    <mat-list-item>
+                      <span matListItemTitle>{{ status.title }}</span>
+                      <span matListItemLine>{{ status.value }}</span>
+                    </mat-list-item>
+                  </ng-container>
+                </mat-list-item>
               </mat-list>
             </mat-tab>
           </mat-tab-group>
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index a5c5dcad67..1fb107fe37 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -59,4 +59,12 @@ mat-card {
 
 .error-message {
   color: red;
+}
+
+.error-icon {
+  color: red;
+}
+
+.success-icon {
+  color: green;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index e052fda843..d082da9173 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -3,6 +3,7 @@ import { AppConfigService } from "app-config.service";
 import { HttpClient } from "@angular/common/http";
 import { ActivatedRoute, Router } from "@angular/router";
 import {
+  apiGetHealth,
   INGESTOR_API_ENDPOINTS_V1,
   PostDatasetEndpoint,
   PostExtractorEndpoint,
@@ -35,6 +36,7 @@ export class IngestorComponent implements OnInit {
   connectedFacilityBackend = "";
   connectedFacilityBackendVersion = "";
   connectingToFacilityBackend = false;
+  ingestorHealthStatus = [];
 
   lastUsedFacilityBackends: string[] = [];
 
@@ -88,6 +90,9 @@ export class IngestorComponent implements OnInit {
         this.connectedFacilityBackend = facilityBackendUrlCleaned;
         this.connectingToFacilityBackend = false;
         this.connectedFacilityBackendVersion = response["version"];
+
+        // TODO Do Health check
+        apiGetHealth();
       },
       (error) => {
         this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;

From 6fc8a31de72a189c4fa54e105647bad38d44a50e Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 23 Jan 2025 11:22:35 +0000
Subject: [PATCH 086/245] wip: error messages on questionnaire

---
 src/app/datasets/onedep/onedep.component.html | 560 +++++++++---------
 src/app/datasets/onedep/onedep.component.scss |   5 +
 src/app/datasets/onedep/onedep.component.ts   | 134 +++--
 src/app/datasets/onedep/types/methods.enum.ts |  45 +-
 4 files changed, 402 insertions(+), 342 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 049b74eeb2..59cef57ede 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -1,287 +1,285 @@
 <ng-template [ngIf]="dataset">
-   <div style="clear: both;"></div>
-   <div>
-     <div>
-       <mat-card [formGroup]="form" data-cy="general-info">
-         <mat-card-header class="general-header">
-           <div mat-card-avatar class="section-icon">
-             <mat-icon> assignment </mat-icon>
-           </div>
-           General information
-         </mat-card-header>
-         <mat-card-content>
-           <table>
-             <tr>
-               <th>Name</th>
-               <td>{{ dataset.datasetName || "-" }}</td>
-             </tr>
-             <tr>
-               <th>Description</th>
-               <td>
-                 <span [innerHTML]="dataset.description || '-' | linky"></span>
-               </td>
-             </tr>
-             <tr>
-               <th>PID</th>
-               <td>
-                 {{ dataset.pid }}
-               </td>
-             </tr>
-             <tr>
-               <th>Type</th>
-               <td>{{dataset.type }}</td>
-             </tr>
-             <tr>
-               <th>Creation Time</th>
-               <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
-             </tr>
-             <tr class="keywords-row">
-               <th>Keywords</th>
-               <mat-chip-set role="list" #keywordChips>
-                 <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
-                   {{ keyword }}
-                 </mat-chip>
-               </mat-chip-set>
-             </tr>
-           </table>
-         </mat-card-content>
-       </mat-card>
-       <mat-card [formGroup]="form">
-         <mat-card-header class="creator-header">
-           <div mat-card-avatar class="section-icon">
-             <mat-icon> blur_linear </mat-icon>
-           </div>
-           Administrative and Method Information:
-         </mat-card-header>
-         <div class="card-container">
-           <div class="card-left">
-             <h2>Obtain OneDep Token</h2>
-             <p class="instruction">
-               Go to <a href="https://onedep-depui-test.wwpdb.org" target="_blank">OneDep API</a> and choose option to sign in with ORCID. After the authorization you will be redirected back to OneDep. In the left bar below the map, tick the
-               Deposition API option and click "Generate Key". Copy the token in the field below.
-             </p>
-             <mat-form-field class="token-field" appearance="outline">
-               <mat-label>Token</mat-label>
-               <textarea matInput required placeholder="copy the token here" rows="1" formControlName="jwtToken" (input)="autoGrow($event)" [style.overflow]="detailsOverflow"></textarea>
-             </mat-form-field>
-             <!-- Password Field -->
-             <h2 class="password">Password</h2>
-             <p class="instruction">You can provide a password, which will be confirmed in the email and sent to all provided ORCID users.</p>
-             <mat-form-field class="password-field" appearance="outline">
-               <mat-label>Password</mat-label>
-               <input matInput [type]="showPassword ? 'text' : 'password'" placeholder="enter your password" formControlName="password" />
-               <button mat-icon-button matSuffix (click)="togglePasswordVisibility()">
-                 <mat-icon>{{ showPassword ? 'visibility_off' : 'visibility' }}</mat-icon>
-               </button>
-             </mat-form-field>
-           </div>
-           <div class="card-middle">
-             <h2>Enter 16-digit ORCID iD</h2>
-             <p class="instruction">Owners of these ORCIDs iDs are allowed to access this deposition.</p>
-             <!-- Link the orcid FormArray -->
-             <div formArrayName="orcid">
-               <ng-container *ngFor="let field of orcidArray().controls; let i = index">
-                 <div [formGroupName]="i">
-                   <mat-form-field class="data-field" appearance="outline">
-                     <mat-label>Enter 16-digits ORCID iD</mat-label>
-                     <div class="input-container">
-                       <input matInput type="text" maxlength="19" placeholder="xxxx-xxxx-xxxx-xxxx" formControlName="orcidId" orcidFormatter />
-                       <button mat-icon-button class="remove-orcid-btn" (click)="removeOrcidField(i)">
-                         <mat-icon>clear</mat-icon>
-                       </button>
-                     </div>
-                   </mat-form-field>
-                   <div class="error-text" *ngIf="field.get('orcidId')?.hasError('notNumeric')">
-                     ORCID ID must contain only numbers.
-                   </div>
-                 </div>
-               </ng-container>
-             </div>
-             <button mat-icon-button class="add-field-btn" (click)="addOrcidField()">
-               <mat-icon>add</mat-icon>
-             </button>
-           </div>
-           <div class="card-right">
-             <!-- Question 1: Electron Microscopy Method -->
-             <h2>Choose Electron Microscopy Method</h2>
-             <mat-form-field class="method-name">
-               <mat-label>experimental method</mat-label>
-               <mat-select required formControlName="emMethod" name="method" (selectionChange)="onMethodChange()">
-                 <mat-option *ngFor="let method of methodsList" [value]="method.value">
-                   {{ method.viewValue }}
-                 </mat-option>
-               </mat-select>
-               <!-- Error Message -->
-               <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error">
-                 You must specify the experimental method
-               </div>
-             </mat-form-field>
-             <!-- Question 2: PDB Deposition -->
-             <tr *ngIf="form.value['emMethod'] && form.value['emMethod'] !== 'tomogram'">
-               <th class="questionnaire">Are you deposing coordinates with this submission? (for PDB)</th>
-               <td>
-                 <mat-radio-group reuired formControlName="deposingCoordinates" (change)="onPDB($event)">
-                   <mat-radio-button name="deposingCoordinates" value="true">
-                     Yes
-                   </mat-radio-button>
-                   <mat-radio-button name="deposingCoordinates" value="false" checked>
-                     No
-                   </mat-radio-button>
-                 </mat-radio-group>
-               </td>
-             </tr>
-             <!-- Question 3: Associated map -->
-             <tr *ngIf="form.value['emMethod'] && form.get('deposingCoordinates')?.value === 'true'">
-               <th>Has an associated map been deposited to EMDB?</th>
-               <td>
-                 <mat-radio-group reuired formControlName="associatedMap">
-                   <mat-radio-button name="associatedMap" value="true">
-                     Yes
-                   </mat-radio-button>
-                   <mat-radio-button name="associatedMap" value="false">
-                     No
-                   </mat-radio-button>
-                 </mat-radio-group>
-               </td>
-             </tr>
-             <!-- Question 4: EMDB Identifier Field -->
-             <tr *ngIf="form.value['emMethod'] && form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
-               <th>EMDB Identifier</th>
-               <td>
-                 <mat-form-field class="EMDB-ID">
-                   <mat-label>EMDB ID</mat-label>
-                   <input required matInput formControlName="emdbId" />
-                 </mat-form-field>
-               </td>
-             </tr>
-             <!-- Final Question: Composite Map -->
-             <tr *ngIf=" form.value['emMethod']">
-               <th class="questionnaire">Is this a composite map?</th>
-               <td>
-                 <mat-radio-group required formControlName="compositeMap">
-                   <mat-radio-button name="compositeMap" value="true">
-                     Yes
-                   </mat-radio-button>
-                   <mat-radio-button name="compositeMap" value="false" checked>
-                     No
-                   </mat-radio-button>
-                 </mat-radio-group>
-               </td>
-             </tr>
-           </div>
-         </div>
-         <!-- <button class="submitDep" mat-raised-button color="primary"
-                 (click)="onCreateClick()">
-                 Create Deposition
-                 </button> -->
-       </mat-card>
-       <!-- Attachments -->
-       <mat-card [formGroup]="form">
-         <mat-card-header class="file-header">
-           <div mat-card-avatar class="section-icon">
-             <mat-icon> attachment </mat-icon>
-           </div>
-           Choose files for deposition
-         </mat-card-header>
-         <mat-card-content>
-           <mat-card *ngFor="let fileType of form.get('files').value; let i = index" class="fileCard">
-               <mat-card-header matTooltip="{{ fileType.explanation }}" matTooltipPosition="above">
-                 <mat-card-title>
-                   {{ fileType.nameFE }}
-                   <span class="required-asterisk" *ngIf="isRequired(fileType.emName)"> *</span>
-                 </mat-card-title>
-               </mat-card-header>
-               <mat-card-content>
-                 <div class="file-selection-container">
-                   <button class="fileChooser" mat-raised-button color="primary" (click)="onChooseFile(fileInput)">
-                     Choose File
-                   </button>
-                   <div *ngIf="selectedFile[fileType.emName]">
-                     <mat-icon>attach_file</mat-icon>
-                   </div>
-                   <div *ngIf="(fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]) || (fileType.emName === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.id])">
-                     <mat-icon>attach_file</mat-icon>
-                   </div>
-                   <input type="file" #fileInput (change)="fileType.emName === 'add-map' ? onFileAddMore($event, fileType.id, 'add-map') : fileType.emName === 'fsc-xml' ? onFileAddMore($event, fileType.id, 'fsc-xml') : onFileSelected($event, fileType.emName)" style="display: none;" />
-                   <div *ngIf="(fileType.emName !== 'add-map' && selectedFile[fileType.emName]) || (fileType.emName === 'fsc-xml' && selectedFile['fsc-xml' + fileType.id])" class="fileName">
-                     <p>Selected File: {{ selectedFile[fileType.emName]?.name }}</p>
-                   </div>
-                   <div *ngIf="fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]" class="fileName">
-                     <p>Selected File: {{ selectedFile['add-map-' + fileType.id]?.name }}</p>
-                   </div>
-                   <div *ngIf="fileType.emName === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.id]" class="fileName">
-                    <p>Selected File: {{ selectedFile['fsc-xml-' + fileType.id]?.name }}</p>
+  <div style="clear: both;"></div>
+  <div>
+    <div>
+      <mat-card [formGroup]="form" data-cy="general-info">
+        <mat-card-header class="general-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> assignment </mat-icon>
+          </div>
+          General information
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr>
+              <th>Name</th>
+              <td>{{ dataset.datasetName || "-" }}</td>
+            </tr>
+            <tr>
+              <th>Description</th>
+              <td>
+                <span [innerHTML]="dataset.description || '-' | linky"></span>
+              </td>
+            </tr>
+            <tr>
+              <th>PID</th>
+              <td>
+                {{ dataset.pid }}
+              </td>
+            </tr>
+            <tr>
+              <th>Type</th>
+              <td>{{dataset.type }}</td>
+            </tr>
+            <tr>
+              <th>Creation Time</th>
+              <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
+            </tr>
+            <tr class="keywords-row">
+              <th>Keywords</th>
+              <mat-chip-set role="list" #keywordChips>
+                <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
+                  {{ keyword }}
+                </mat-chip>
+              </mat-chip-set>
+            </tr>
+          </table>
+        </mat-card-content>
+      </mat-card>
+      <mat-card [formGroup]="form">
+        <mat-card-header class="creator-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> blur_linear </mat-icon>
+          </div>
+          Administrative and Method Information:
+        </mat-card-header>
+        <div class="card-container">
+          <div class="card-left">
+            <h2>Obtain OneDep Token</h2>
+            <p class="instruction">
+              Go to <a href="https://onedep-depui-test.wwpdb.org" target="_blank">OneDep API</a> and choose option to sign in with ORCID. After the authorization you will be redirected back to OneDep. In the left bar below the map, tick the
+              Deposition API option and click "Generate Key". Copy the token in the field below.
+            </p>
+            <mat-form-field class="token-field" appearance="outline">
+              <mat-label>Token</mat-label>
+              <textarea matInput required placeholder="copy the token here" rows="1" formControlName="jwtToken" (input)="autoGrow($event)" [style.overflow]="detailsOverflow"></textarea>
+            </mat-form-field>
+            <!-- Password Field -->
+            <h2 class="password">Password</h2>
+            <p class="instruction">You can provide a password, which will be confirmed in the email and sent to all provided ORCID users.</p>
+            <mat-form-field class="password-field" appearance="outline">
+              <mat-label>Password</mat-label>
+              <input matInput [type]="showPassword ? 'text' : 'password'" placeholder="enter your password" formControlName="password" />
+              <button mat-icon-button matSuffix (click)="togglePasswordVisibility()">
+                <mat-icon>{{ showPassword ? 'visibility_off' : 'visibility' }}</mat-icon>
+              </button>
+            </mat-form-field>
+          </div>
+          <div class="card-middle">
+            <h2>Enter 16-digit ORCID iD</h2>
+            <p class="instruction">Owners of these ORCIDs iDs are allowed to access this deposition.</p>
+            <!-- Link the orcid FormArray -->
+            <div formArrayName="orcid">
+              <ng-container *ngFor="let field of orcidArray().controls; let i = index">
+                <div [formGroupName]="i">
+                  <mat-form-field class="data-field" appearance="outline">
+                    <mat-label>Enter 16-digits ORCID iD</mat-label>
+                    <div class="input-container">
+                      <input matInput type="text" maxlength="19" placeholder="xxxx-xxxx-xxxx-xxxx" formControlName="orcidId" orcidFormatter />
+                      <button mat-icon-button class="remove-orcid-btn" (click)="removeOrcidField(i)">
+                        <mat-icon>clear</mat-icon>
+                      </button>
+                    </div>
+                  </mat-form-field>
+                  <div class="error-text" *ngIf="field.get('orcidId')?.hasError('notNumeric')">
+                    ORCID ID must contain only numbers.
                   </div>
-                  <div *ngIf=
-                      "(fileType.emName !== 'add-map' && fileType.emName !== 'fsc-xml' && selectedFile[fileType.emName]) ||
-                      (fileType.emName === 'add-map' && selectedFile['add-map-' + fileType.id]) ||
-                      (fileType.emName === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.id])">
-                    <button
-                      mat-icon-button
-                      class="remove-field-btn"
-                      (click)="clearFile(fileType.emName, fileType.id)"
+                </div>
+              </ng-container>
+            </div>
+            <button mat-icon-button class="add-field-btn" (click)="addOrcidField()">
+              <mat-icon>add</mat-icon>
+            </button>
+          </div>
+          <div class="card-right">
+            <!-- Question 1: Electron Microscopy Method -->
+            <h2>Choose Electron Microscopy Method</h2>
+            <mat-form-field class="method-name">
+              <mat-label>experimental method</mat-label>
+              <mat-select required formControlName="emMethod" name="method" (selectionChange)="onMethodChange()">
+                <mat-option *ngFor="let method of methodsList" [value]="method.value">
+                {{ method.viewValue }}
+                </mat-option>
+              </mat-select>
+              <!-- Error Message -->
+              <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error">
+                You must specify the experimental method
+              </div>
+            </mat-form-field>
+            <!-- Question 2: PDB Deposition -->
+            <tr *ngIf="form.value['emMethod'] && form.value['emMethod'] !== 'tomogram'">
+              <th class="questionnaire">Are you deposing coordinates with this submission? (for PDB)</th>
+              <td>
+                <mat-radio-group reuired formControlName="deposingCoordinates" (change)="onPDB($event)">
+                  <mat-radio-button name="deposingCoordinates" value="true">
+                    Yes
+                  </mat-radio-button>
+                  <mat-radio-button name="deposingCoordinates" value="false" checked>
+                    No
+                  </mat-radio-button>
+                </mat-radio-group>
+              </td>
+            </tr>
+            <!-- Question 3: Associated map -->
+            <tr *ngIf="form.value['emMethod'] && form.get('deposingCoordinates')?.value === 'true'">
+              <th>Has an associated map been deposited to EMDB?</th>
+              <td>
+                <mat-radio-group reuired formControlName="associatedMap">
+                  <mat-radio-button name="associatedMap" value="true">
+                    Yes
+                  </mat-radio-button>
+                  <mat-radio-button name="associatedMap" value="false">
+                    No
+                  </mat-radio-button>
+                </mat-radio-group>
+              </td>
+            </tr>
+            <!-- Question 4: EMDB Identifier Field -->
+            <tr *ngIf="form.value['emMethod'] && form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
+              <th>EMDB Identifier</th>
+              <td>
+                <mat-form-field class="EMDB-ID">
+                  <mat-label>EMDB ID</mat-label>
+                  <input required matInput formControlName="emdbId" />
+                </mat-form-field>
+              </td>
+            </tr>
+            <!-- Final Question: Composite Map -->
+            <tr *ngIf=" form.value['emMethod']">
+              <th class="questionnaire">Is this a composite map?</th>
+              <td>
+                <mat-radio-group required formControlName="compositeMap">
+                  <mat-radio-button name="compositeMap" value="true">
+                    Yes
+                  </mat-radio-button>
+                  <mat-radio-button name="compositeMap" value="false" checked>
+                    No
+                  </mat-radio-button>
+                </mat-radio-group>
+              </td>
+            </tr>
+          </div>
+        </div>
+      </mat-card>
+      <!-- Attachments -->
+      <mat-card [formGroup]="form">
+        <mat-card-header class="file-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> attachment </mat-icon>
+          </div>
+          Choose files for deposition
+        </mat-card-header>
+        <mat-card-content>
+          <mat-card *ngFor="let fileType of files; let i = index" class="fileCard">
+            <mat-card-header matTooltip="{{ fileType.get('explanation').value }}" matTooltipPosition="above">
+              <mat-card-title>
+                {{ fileType.get('nameFE').value }}
+                <span class="required-asterisk" *ngIf="isRequired(fileType.get('emName').value)"> *</span>
+              </mat-card-title>
+            </mat-card-header>
+            <mat-card-content>
+              <div class="file-selection-container">
+                <button class="fileChooser" mat-raised-button color="primary" (click)="onChooseFile(fileInput)">
+                Choose File
+                </button>
+                <div *ngIf="selectedFile[fileType.get('emName').value]">
+                  <mat-icon>attach_file</mat-icon>
+                </div>
+                <div *ngIf="(fileType.get('emName').value === 'add-map' && selectedFile['add-map-' + fileType.get('id').value]) || (fileType.get('emName').value === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.get('id').value])">
+                  <mat-icon>attach_file</mat-icon>
+                </div>
+                <input type="file" #fileInput (change)="fileType.get('emName').value === 'add-map' ? onFileAddMore($event, fileType.get('id').value, 'add-map') : fileType.get('emName').value === 'fsc-xml' ? onFileAddMore($event, fileType.get('id').value, 'fsc-xml') : onFileSelected($event, fileType.get('emName').value)" style="display: none;" />
+                <div *ngIf="(fileType.get('emName').value !== 'add-map' && selectedFile[fileType.get('emName').value]) || (fileType.get('emName').value === 'fsc-xml' && selectedFile['fsc-xml' + fileType.get('id').value])" class="fileName">
+                  <p>Selected File: {{ selectedFile[fileType.get('emName').value]?.name }}</p>
+                </div>
+                <div *ngIf="fileType.get('emName').value === 'add-map' && selectedFile['add-map-' + fileType.get('id').value]" class="fileName">
+                  <p>Selected File: {{ selectedFile['add-map-' + fileType.get('id').value]?.name }}</p>
+                </div>
+                <div *ngIf="fileType.get('emName').value === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.get('id').value]" class="fileName">
+                  <p>Selected File: {{ selectedFile['fsc-xml-' + fileType.get('id').value]?.name }}</p>
+                </div>
+                <div *ngIf=
+                  "(fileType.get('emName').value !== 'add-map' && fileType.get('emName').value !== 'fsc-xml' && selectedFile[fileType.get('emName').value]) ||
+                  (fileType.get('emName').value === 'add-map' && selectedFile['add-map-' + fileType.get('id').value]) ||
+                  (fileType.get('emName').value === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.get('id').value])">
+                  <button
+                    mat-icon-button
+                    class="remove-field-btn"
+                    (click)="clearFile(fileType.get('emName').value, fileType.get('id').value)"
                     >
-                      <mat-icon>clear</mat-icon>
-                    </button>
-                  </div>
-                 </div>
-                 <ng-container *ngIf="fileType.contour !== null || fileType.details !== null">
-                   <div class="input-container">
-                     <ng-container *ngIf="fileType.contour !== null">
-                       <mat-form-field appearance="outline" class="contour-level">
-                         <mat-label>Contour Level</mat-label>
-                         <input
-                           matInput
-                           type="number"
-                           placeholder="e.g. 0.0"
-                           [required]="!!fileType.file"
-                           [value]="fileType.contour || ''"
-                           (input)="fileType.emName === 'vo-map' ? updateContourLevelMain($event) : 
-                                    fileType.emName === 'add-map' ? updateContourLevelAddMap($event, fileType.id) : 
-                                    updateContourLevel($event, fileType.emName)"
-                         />
-                       </mat-form-field>
-                     </ng-container>
-                     <ng-container *ngIf="fileType.details !== null">
-                       <mat-form-field class="details">
-                         <mat-label>Short description</mat-label>
-                         <textarea
-                           matInput
-                           placeholder="Enter details..."
-                           rows="1"
-                           (input)="fileType.emName === 'add-map' ? updateDetailsAddMap($event, fileType.id) : updateDetails($event, fileType.emName)"
-                           (input)="autoGrow($event)"
-                           [style.overflow]="detailsOverflow"
-                         ></textarea>
-                       </mat-form-field>
-                     </ng-container>
-                   </div>
-                 </ng-container>
-               </mat-card-content>
-               <div *ngIf="fileType.emName === 'add-map' && fileType.id === 0">
-                  <button mat-icon-button matTooltip="Add more maps" aria-label="Add another map" (click)="addMap()">
-                    <mat-icon>add</mat-icon>
+                    <mat-icon>clear</mat-icon>
                   </button>
                 </div>
-                <div *ngIf="fileType.emName === 'fsc-xml' && fileType.id === 0">
-                  <button mat-icon-button matTooltip="Add more FSC" aria-label="Add another FSC xml" (click)="addFSC()">
-                    <mat-icon>add</mat-icon>
-                  </button>
+                <div *ngIf="fileType.get('file').invalid" class="error-text">
+                  Invalid file format. Allowed formats: {{ fileType.get('fileFormat').value }}
+                </div>
+               
+              </div>
+              <ng-container *ngIf="fileType.get('contour').value !== null || fileType.get('details').value !== null">
+                <div class="input-container">
+                  <ng-container *ngIf="fileType.get('contour').value !== null">
+                    <mat-form-field appearance="outline" class="contour-level">
+                      <mat-label>Contour Level</mat-label>
+                      <input
+                      matInput
+                      type="number"
+                      placeholder="e.g. 0.0"
+                      [required]="!!fileType.get('file')"
+                      [value]="fileType.get('contour').value || ''"
+                      (input)="fileType.get('emName').value === 'vo-map' ? updateContourLevelMain($event) : 
+                      fileType.get('emName').value === 'add-map' ? updateContourLevelAddMap($event, fileType.get('id').value) : 
+                      updateContourLevel($event, fileType.get('emName').value)"
+                      />
+                    </mat-form-field>
+                  </ng-container>
+                  <ng-container *ngIf="fileType.get('details') !== null">
+                    <mat-form-field class="details">
+                      <mat-label>Short description</mat-label>
+                      <textarea
+                      matInput
+                      placeholder="Enter details..."
+                      rows="1"
+                      (input)="fileType.get('emName').value === 'add-map' ? updateDetailsAddMap($event, fileType.get('id').value) : updateDetails($event, fileType.get('emName').value)"
+                      (input)="autoGrow($event)"
+                      [style.overflow]="detailsOverflow"
+                      ></textarea>
+                    </mat-form-field>
+                  </ng-container>
                 </div>
-           </mat-card>
- 
-           <!-- UPLOAD FILES DONE -->
-           <div class="button-container">
-             <button class="submitDep" mat-raised-button color="primary" (click)="onDepositClick()">
-               Start Deposition
-             </button>
-             <button class="submitDep" mat-raised-button color="primary" (click)="onDownloadClick()">
-               Download mmCIF
-             </button>
-           </div>
-         </mat-card-content>
-       </mat-card>
-     </div>
-   </div>
- </ng-template>
- 
\ No newline at end of file
+              </ng-container>
+            </mat-card-content>
+            <div *ngIf="fileType.get('emName').value === 'add-map' && fileType.get('id').value === 0">
+              <button mat-icon-button matTooltip="Add more maps" aria-label="Add another map" (click)="addMap()">
+                <mat-icon>add</mat-icon>
+              </button>
+            </div>
+            <div *ngIf="fileType.get('emName').value === 'fsc-xml' && fileType.get('id').value === 0">
+              <button mat-icon-button matTooltip="Add more FSC" aria-label="Add another FSC xml" (click)="addFSC()">
+                <mat-icon>add</mat-icon>
+              </button>
+            </div>
+          </mat-card>
+          <!-- UPLOAD FILES DONE -->
+          <div class="button-container">
+            <button class="submitDep" mat-raised-button color="primary" (click)="onDepositClick()">
+            Start Deposition
+            </button>
+            <button class="submitDep" mat-raised-button color="primary" (click)="onDownloadClick()">
+            Download mmCIF
+            </button>
+          </div>
+        </mat-card-content>
+      </mat-card>
+    </div>
+  </div>
+</ng-template>
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index b131c8afcf..fdc7578840 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -263,5 +263,10 @@ mat-card {
     background-color: #B3D9AC;
     color:black;
   }
+  .error-text {
+    color: red;
+    font-size: 0.8rem;
+    margin-top: 0;
+  }
 
 }
\ No newline at end of file
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index db2aa083bd..4f22e13c41 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -31,7 +31,7 @@ import * as fromActions from "state-management/actions/onedep.actions";
 import {
   createMethodsList,
   EmFile,
-  DepositionFiles,
+  DepositionFile,
   OneDepUserInfo,
   OneDepCreate,
 } from "./types/methods.enum";
@@ -60,7 +60,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   detailsOverflow = "hidden";
   additionalMaps = 0;
   showPassword = false;
-  fileTypes: DepositionFiles[];
+  fileTypes: DepositionFile[];
   mainContour = 0.0;
   connectedDepositionBackend = "";
   connectedDepositionBackendVersion = "";
@@ -167,7 +167,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
       this.orcidArray().removeAt(index);
     }
   }
-  addFileToForm(file: DepositionFiles) {
+  addFileToForm(file: DepositionFile) {
     const filesArray = this.form.get("files") as FormArray;
     filesArray.push(
       this.fb.group({
@@ -176,10 +176,11 @@ export class OneDepComponent implements OnInit, OnDestroy {
         nameFE: [file.nameFE],
         type: [file.type],
         fileName: [file.fileName],
-        file: [file.file],
+        file: [file.file, [this.correctExtension]],
         required: [file.required],
         contour: [file.contour],
         details: [file.details],
+        fileFormat: [file.fileFormat],
         explanation: [file.explanation],
       }),
     );
@@ -187,7 +188,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   removeFileFromForm(fileCat: EmFile) {
     const filesArray = this.form.get("files") as FormArray;
     const index = filesArray.value.findIndex(
-      (file: DepositionFiles) => file.emName === fileCat,
+      (file: DepositionFile) => file.emName === fileCat,
     );
     if (index > -1) {
       filesArray.removeAt(index);
@@ -275,27 +276,64 @@ export class OneDepComponent implements OnInit, OnDestroy {
   onChooseFile(fileInput: HTMLInputElement) {
     fileInput.click();
   }
-  onFileSelected(event: Event, controlName: EmFile) {
+  onFileSelected(event: Event, emCat: EmFile) {
+    // once the file is selected, adds it to the form
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
-      this.selectedFile[controlName] = input.files[0];
-      this.files.forEach((fT) => {
-        if (fT.value.emName === controlName) {
-          fT.value.file = this.selectedFile[controlName];
-          fT.value.fileName = this.selectedFile[controlName].name;
-          if (
-            this.mainContour !== 0.0 &&
-            (fT.value.emName === EmFile.MainMap ||
-              fT.value.emName === EmFile.HalfMap1 ||
-              fT.value.emName === EmFile.HalfMap2)
-          ) {
-            fT.value.contour = this.mainContour;
-          }
+      this.selectedFile[emCat] = input.files[0];
+
+      const filesArray = this.form.get("files") as FormArray;
+      const fileTypeControl = filesArray.controls.find(
+        (control) => control.get("emName")?.value === emCat,
+      );
+      if (fileTypeControl) {
+        fileTypeControl.get("file")?.setValue(this.selectedFile[emCat]);
+        fileTypeControl
+          .get("fileName")
+          ?.setValue(this.selectedFile[emCat].name);
+        if (
+          this.mainContour !== 0.0 &&
+          [EmFile.MainMap, EmFile.HalfMap1, EmFile.HalfMap2].includes(emCat)
+        ) {
+          fileTypeControl.get("contour").setValue(this.mainContour);
         }
-      });
+      }
     }
   }
+  onFileAddMore(event: Event, id: number, fileType: string) {
+    // once the file is selected, adds it to the form. Only for additional maps and FSC inputs, as they can include multiple files
+    const input = event.target as HTMLInputElement;
+    let fileTypeControl;
+    if (input.files && input.files.length > 0) {
+      this.selectedFile[`${fileType}-${id}`] = input.files[0];
+
+      const filesArray = this.form.get("files") as FormArray;
+      if (fileType === "add-map") {
+        fileTypeControl = filesArray.controls.find(
+          (control) =>
+            control.get("emName")?.value === this.emFile.AddMap &&
+            control.get("id")?.value === id,
+        );
+      } else {
+        fileTypeControl = filesArray.controls.find(
+          (control) =>
+            control.get("emName")?.value === this.emFile.FSC &&
+            control.get("id")?.value === id,
+        );
+      }
+      if (fileTypeControl) {
+        fileTypeControl
+          .get("file")
+          ?.setValue(this.selectedFile[`${fileType}-${id}`]);
+        fileTypeControl
+          .get("fileName")
+          ?.setValue(this.selectedFile[`${fileType}-${id}`].name);
+      }
+    }
+  }
+
   clearFile(fileCat: EmFile, id?: number) {
+    // clear the selected file
     const key =
       fileCat === "add-map" || fileCat === "fsc-xml"
         ? `${fileCat}-${id}`
@@ -306,7 +344,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
     const filesArray = this.form.get("files") as FormArray;
     if (fileCat !== "add-map" && fileCat !== "fsc-xml") {
       index = filesArray.value.findIndex(
-        (file: DepositionFiles) => file.emName === fileCat,
+        (file: DepositionFile) => file.emName === fileCat,
       );
     } else {
       for (let i = 0; i < filesArray.length; i++) {
@@ -323,32 +361,9 @@ export class OneDepComponent implements OnInit, OnDestroy {
       filesArray.at(index).patchValue({ file: null });
     }
   }
-  onFileAddMore(event: Event, id: number, fileType: string) {
-    const input = event.target as HTMLInputElement;
-    if (input.files && input.files.length > 0) {
-      this.selectedFile[`${fileType}-${id}`] = input.files[0];
-      for (let i = 0; i < this.files.length; i++) {
-        if (
-          this.files.at(i).value.emName === this.emFile.AddMap &&
-          this.files.at(i).value.id === id &&
-          fileType === "add-map"
-        ) {
-          this.files.at(i).value.file = this.selectedFile[`${fileType}-${id}`];
-          this.files.at(i).value.fileName =
-            this.selectedFile[`${fileType}-${id}`].name;
-        } else if (
-          this.files.at(i).value.emName === this.emFile.FSC &&
-          this.files.at(i).value.id === id &&
-          fileType === "fsc-xml"
-        ) {
-          this.files.at(i).value.file = this.selectedFile[`${fileType}-${id}`];
-          this.files.at(i).value.fileName =
-            this.selectedFile[`${fileType}-${id}`].name;
-        }
-      }
-    }
-  }
   isRequired(controlName: string): boolean {
+    // for a given file extracts the "required" status for the chosen EM method
+    // FIX me subject to change
     let value: boolean;
     this.files.forEach((fT) => {
       if (fT.value.emName === controlName) {
@@ -426,7 +441,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
           0,
         ) + 1;
 
-    const newMap: DepositionFiles = {
+    const newMap: DepositionFile = {
       emName: EmFile.AddMap,
       id: nextId,
       nameFE: "Additional Map ( " + (nextId + 1).toString() + " )",
@@ -436,6 +451,9 @@ export class OneDepComponent implements OnInit, OnDestroy {
       contour: 0.0,
       details: "",
       required: false,
+      fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
+      explanation:
+        "Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)",
     };
     // update the co-cif required status
     this.addFileToForm(newMap);
@@ -449,7 +467,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
           0,
         ) + 1;
 
-    const newFSC: DepositionFiles = {
+    const newFSC: DepositionFile = {
       emName: EmFile.FSC,
       id: nextId,
       nameFE: "FSC-XML ( " + (nextId + 1).toString() + " )",
@@ -457,11 +475,31 @@ export class OneDepComponent implements OnInit, OnDestroy {
       fileName: "",
       file: null,
       required: false,
+      fileFormat: [".xml"],
+      explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs",
     };
     // update the co-cif required status
     this.addFileToForm(newFSC);
   }
 
+  correctExtension(control: AbstractControl) {
+    console.log("calling validator");
+    const fileValue = control.value;
+    if (!fileValue) {
+      return null;
+    }
+    const allowedExtensions = control.parent?.get("fileFormat")?.value;
+    const fileName = fileValue.name || fileValue;
+    const fileExtension = fileName.endsWith(".gz")
+      ? "." + fileName.split(".").slice(-2).join(".")
+      : "." + fileName.split(".").pop();
+
+    if (allowedExtensions && allowedExtensions.includes(fileExtension)) {
+      return null;
+    }
+    return { correctExtension: false };
+  }
+
   onDepositClick() {
     let body: OneDepUserInfo;
     if (this.form.value.password) {
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index 0925e9a764..7f26e06f6d 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -32,7 +32,7 @@ export interface OneDepUserInfo {
 export interface OneDepCreate {
   depID: string;
 }
-export interface DepositionFiles {
+export interface DepositionFile {
   emName: EmFile;
   id?: number;
   nameFE: string;
@@ -42,27 +42,29 @@ export interface DepositionFiles {
   contour?: number;
   details?: string;
   required: boolean;
+  fileFormat?: string[];
   explanation?: string;
 }
 
 interface EmMethod {
   value: EmType;
   viewValue: string;
-  files: DepositionFiles[];
+  files: DepositionFile[];
 }
 
 export const createMethodsList = (): EmMethod[] => {
-  const depositionImage: DepositionFiles = {
+  const depositionImage: DepositionFile = {
     emName: EmFile.Image,
     nameFE: "Public Image",
     type: "img-emdb",
     fileName: "",
     file: null,
     required: false,
+    fileFormat: [".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tiff"],
     explanation:
       "Image of the map (500 x 500 pixels in .jpg, .png, etc. format)",
   };
-  const depositionMainMap: DepositionFiles = {
+  const depositionMainMap: DepositionFile = {
     emName: EmFile.MainMap,
     nameFE: "Main Map",
     type: "vo-map",
@@ -71,10 +73,11 @@ export const createMethodsList = (): EmMethod[] => {
     contour: 0.0,
     details: "",
     required: false,
+    fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
     explanation:
       "Primary map (.mrc or .ccp4 format, may use gzip or bzip2 compression) along with recommended contour level",
   };
-  const depositionHalfMap1: DepositionFiles = {
+  const depositionHalfMap1: DepositionFile = {
     emName: EmFile.HalfMap1,
     nameFE: "Half Map (1)",
     type: "half-map",
@@ -83,10 +86,11 @@ export const createMethodsList = (): EmMethod[] => {
     contour: 0.0,
     details: "",
     required: false,
+    fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
     explanation:
       "Half maps (as used for FSC calculation; two maps must be uploaded)",
   };
-  const depositionHalfMap2: DepositionFiles = {
+  const depositionHalfMap2: DepositionFile = {
     emName: EmFile.HalfMap2,
     nameFE: "Half Map (2)",
     type: "half-map",
@@ -95,10 +99,11 @@ export const createMethodsList = (): EmMethod[] => {
     contour: 0.0,
     details: "",
     required: false,
+    fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
     explanation:
       "Half maps (as used for FSC calculation; two maps must be uploaded)",
   };
-  const depositionMaskMap: DepositionFiles = {
+  const depositionMaskMap: DepositionFile = {
     emName: EmFile.MaskMap,
     nameFE: "Mask Map",
     type: "mask-map",
@@ -107,10 +112,11 @@ export const createMethodsList = (): EmMethod[] => {
     contour: 0.0,
     details: "",
     required: false,
+    fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
     explanation:
       "Primary/raw map mask, segmentation/focused refinement mask and half-map mask",
   };
-  const depositionAddMap: DepositionFiles = {
+  const depositionAddMap: DepositionFile = {
     emName: EmFile.AddMap,
     id: 0,
     nameFE: "Additional Map",
@@ -120,20 +126,22 @@ export const createMethodsList = (): EmMethod[] => {
     contour: 0.0,
     details: "",
     required: false,
+    fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
     explanation:
       "Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)",
   };
-  const depositionFSC: DepositionFiles = {
+  const depositionFSC: DepositionFile = {
     emName: EmFile.FSC,
     id: 0,
     nameFE: "FSC-XML",
     type: "fsc-xml",
     fileName: "",
     file: null,
+    fileFormat: [".xml"],
     required: false,
     explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs",
   };
-  const depositionLayerLines: DepositionFiles = {
+  const depositionLayerLines: DepositionFile = {
     emName: EmFile.LayerLines,
     nameFE: "Other: Layer Lines Data ",
     type: "layer-lines",
@@ -141,24 +149,35 @@ export const createMethodsList = (): EmMethod[] => {
     file: null,
     required: false,
   };
-  const depositionCoordinates: DepositionFiles = {
+  const depositionCoordinates: DepositionFile = {
     emName: EmFile.Coordinates,
     nameFE: "Coordinates",
     type: "co-cif",
     fileName: "",
     file: null,
     required: false,
+    fileFormat: [
+      ".cif",
+      ".pdb",
+      ".ent",
+      ".brk",
+      ".cif.gz",
+      ".pdb.gz",
+      ".ent.gz",
+      ".brk.gz",
+    ],
     explanation: "mmCIF or PDB format",
   };
-  const depositionStructureFactors: DepositionFiles = {
+  const depositionStructureFactors: DepositionFile = {
     emName: EmFile.StructureFactors,
     nameFE: "Structure Factors",
     type: "xs-cif",
     fileName: "",
     file: null,
     required: false,
+    fileFormat: [".cif", ".mtz", ".cif.gz", ".mtz.gz"],
   };
-  const depositionMTZ: DepositionFiles = {
+  const depositionMTZ: DepositionFile = {
     emName: EmFile.MTZ,
     nameFE: "MTZ",
     type: "xs-mtz",

From 5f51a5b3fd628313499d4e262d51b4756a8edb37 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 23 Jan 2025 14:12:01 +0000
Subject: [PATCH 087/245] update function descriptions

---
 src/app/datasets/onedep/onedep.component.ts | 153 +++++++++++---------
 1 file changed, 86 insertions(+), 67 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 4f22e13c41..2932a3750c 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -26,18 +26,16 @@ import {
 } from "@scicatproject/scicat-sdk-ts";
 import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
 import { selectCurrentUser } from "state-management/selectors/user.selectors";
-import { selectDepID } from "state-management/selectors/onedep.selectors";
 import * as fromActions from "state-management/actions/onedep.actions";
 import {
   createMethodsList,
   EmFile,
   DepositionFile,
   OneDepUserInfo,
-  OneDepCreate,
 } from "./types/methods.enum";
 import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
-import { Observable, Subscription, fromEvent } from "rxjs";
-import { filter, map, take } from "rxjs/operators";
+import { Observable, Subscription } from "rxjs";
+import { runInThisContext } from "vm";
 
 @Component({
   selector: "onedep",
@@ -60,7 +58,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   detailsOverflow = "hidden";
   additionalMaps = 0;
   showPassword = false;
-  fileTypes: DepositionFile[];
+  fileTypes: DepositionFile[]; // required to keep the initial set of files based on EM method
   mainContour = 0.0;
   connectedDepositionBackend = "";
   connectedDepositionBackendVersion = "";
@@ -132,15 +130,11 @@ export class OneDepComponent implements OnInit, OnDestroy {
       subscription.unsubscribe();
     });
   }
-  hasUnsavedChanges() {
-    return this._hasUnsavedChanges;
-  }
-  onHasUnsavedChanges($event: boolean) {
-    this._hasUnsavedChanges = $event;
-  }
+
   togglePasswordVisibility() {
     this.showPassword = !this.showPassword;
   }
+  // custom validator of the ORCID ids
   orcidValidator(): (control: AbstractControl) => ValidationErrors | null {
     return (control: AbstractControl): ValidationErrors | null => {
       const value = control.value.replace(/-/g, "");
@@ -155,12 +149,14 @@ export class OneDepComponent implements OnInit, OnDestroy {
     return this.form.get("orcid") as FormArray;
   }
   addOrcidField() {
+    // adds an empty ORCID field to the form
     const orcidField = this.fb.group({
       orcidId: ["", [Validators.required, this.orcidValidator()]],
     });
     this.orcidArray().push(orcidField);
   }
   removeOrcidField(index: number) {
+    // removes an ORCID field from the form; if it's first entry, just wipes the field
     if (index === 0) {
       this.orcidArray().at(0).reset({ orcidId: "" });
     } else if (this.orcidArray().length > 1) {
@@ -168,6 +164,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
     }
   }
   addFileToForm(file: DepositionFile) {
+    // adds a depositionFile to the form
     const filesArray = this.form.get("files") as FormArray;
     filesArray.push(
       this.fb.group({
@@ -185,18 +182,20 @@ export class OneDepComponent implements OnInit, OnDestroy {
       }),
     );
   }
-  removeFileFromForm(fileCat: EmFile) {
+  //remove a file from the form; only used for co-cif (yes/no toggle). On method change a new files array will be generated
+  removeFileFromForm(controlName: EmFile) {
     const filesArray = this.form.get("files") as FormArray;
     const index = filesArray.value.findIndex(
-      (file: DepositionFile) => file.emName === fileCat,
+      (file: DepositionFile) => file.emName === controlName,
     );
     if (index > -1) {
       filesArray.removeAt(index);
     }
   }
   onMethodChange() {
+    // generates a form array with predefined types of depositionFiles with empty peoperties and specified required tag
     const filesArray = this.form.get("files") as FormArray;
-    filesArray.clear();
+    filesArray.clear(); // clear files form
 
     this.methodsList = createMethodsList(); // Reset the methods list to be empty
     this.fileTypes = this.methodsList.find(
@@ -229,6 +228,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
         });
         break;
       case "tomogram":
+        // these questions in questionnaire are not relevant for tomogram but required for other methods
         this.form.get("deposingCoordinates")?.setValue("false");
         this.form.get("associatedMap")?.setValue("false");
         break;
@@ -258,44 +258,44 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
 
   autoGrow(event: Event) {
+    // function to auto-grow the textarea
     const textarea = event.target as HTMLTextAreaElement;
     const lineHeight = parseInt(getComputedStyle(textarea).lineHeight, 10);
     const maxLines = 3;
 
-    // Reset height to auto to calculate scrollHeight
     textarea.style.height = "auto";
 
-    // Set the height based on the scrollHeight but limit it
     const newHeight = Math.min(textarea.scrollHeight, lineHeight * maxLines);
     textarea.style.height = `${newHeight}px`;
 
-    // Update overflow property based on height
     this.detailsOverflow =
       textarea.scrollHeight > newHeight ? "auto" : "hidden";
   }
   onChooseFile(fileInput: HTMLInputElement) {
     fileInput.click();
   }
-  onFileSelected(event: Event, emCat: EmFile) {
+  onFileSelected(event: Event, controlName: EmFile) {
     // once the file is selected, adds it to the form
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
-      this.selectedFile[emCat] = input.files[0];
+      this.selectedFile[controlName] = input.files[0];
 
       const filesArray = this.form.get("files") as FormArray;
-      const fileTypeControl = filesArray.controls.find(
-        (control) => control.get("emName")?.value === emCat,
+      const fileControl = filesArray.controls.find(
+        (control) => control.get("emName")?.value === controlName,
       );
-      if (fileTypeControl) {
-        fileTypeControl.get("file")?.setValue(this.selectedFile[emCat]);
-        fileTypeControl
+      if (fileControl) {
+        fileControl.get("file")?.setValue(this.selectedFile[controlName]);
+        fileControl
           .get("fileName")
-          ?.setValue(this.selectedFile[emCat].name);
+          ?.setValue(this.selectedFile[controlName].name);
         if (
           this.mainContour !== 0.0 &&
-          [EmFile.MainMap, EmFile.HalfMap1, EmFile.HalfMap2].includes(emCat)
+          [EmFile.MainMap, EmFile.HalfMap1, EmFile.HalfMap2].includes(
+            controlName,
+          )
         ) {
-          fileTypeControl.get("contour").setValue(this.mainContour);
+          fileControl.get("contour").setValue(this.mainContour);
         }
       }
     }
@@ -303,53 +303,53 @@ export class OneDepComponent implements OnInit, OnDestroy {
   onFileAddMore(event: Event, id: number, fileType: string) {
     // once the file is selected, adds it to the form. Only for additional maps and FSC inputs, as they can include multiple files
     const input = event.target as HTMLInputElement;
-    let fileTypeControl;
+    let fileControl;
     if (input.files && input.files.length > 0) {
       this.selectedFile[`${fileType}-${id}`] = input.files[0];
 
       const filesArray = this.form.get("files") as FormArray;
       if (fileType === "add-map") {
-        fileTypeControl = filesArray.controls.find(
+        fileControl = filesArray.controls.find(
           (control) =>
             control.get("emName")?.value === this.emFile.AddMap &&
             control.get("id")?.value === id,
         );
       } else {
-        fileTypeControl = filesArray.controls.find(
+        fileControl = filesArray.controls.find(
           (control) =>
             control.get("emName")?.value === this.emFile.FSC &&
             control.get("id")?.value === id,
         );
       }
-      if (fileTypeControl) {
-        fileTypeControl
+      if (fileControl) {
+        fileControl
           .get("file")
           ?.setValue(this.selectedFile[`${fileType}-${id}`]);
-        fileTypeControl
+        fileControl
           .get("fileName")
           ?.setValue(this.selectedFile[`${fileType}-${id}`].name);
       }
     }
   }
 
-  clearFile(fileCat: EmFile, id?: number) {
-    // clear the selected file
+  clearFile(controlName: EmFile, id?: number) {
+    // clear the selected file from form
     const key =
-      fileCat === "add-map" || fileCat === "fsc-xml"
-        ? `${fileCat}-${id}`
-        : fileCat;
+      controlName === "add-map" || controlName === "fsc-xml"
+        ? `${controlName}-${id}`
+        : controlName;
     this.selectedFile[key] = null;
 
     let index = -1;
     const filesArray = this.form.get("files") as FormArray;
-    if (fileCat !== "add-map" && fileCat !== "fsc-xml") {
+    if (controlName !== "add-map" && controlName !== "fsc-xml") {
       index = filesArray.value.findIndex(
-        (file: DepositionFile) => file.emName === fileCat,
+        (file: DepositionFile) => file.emName === controlName,
       );
     } else {
       for (let i = 0; i < filesArray.length; i++) {
         if (
-          filesArray.at(i).value.emName === fileCat &&
+          filesArray.at(i).value.emName === controlName &&
           filesArray.at(i).value.id === id
         ) {
           index = i;
@@ -365,6 +365,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
     // for a given file extracts the "required" status for the chosen EM method
     // FIX me subject to change
     let value: boolean;
+
     this.files.forEach((fT) => {
       if (fT.value.emName === controlName) {
         value = fT.value.required;
@@ -395,11 +396,15 @@ export class OneDepComponent implements OnInit, OnDestroy {
     const normalizedInput = input.replace(",", ".");
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
-      this.files.forEach((fT) => {
-        if (fT.value.emName === this.emFile.AddMap && fT.value.id === id) {
-          fT.value.contour = parsedValue;
-        }
-      });
+      const filesArray = this.form.get("files") as FormArray;
+      const fileControl = filesArray.controls.find(
+        (control) =>
+          control.get("emName")?.value === this.emFile.AddMap &&
+          control.get("id")?.value === id,
+      );
+      if (fileControl) {
+        fileControl.get("contour")?.patchValue(parsedValue);
+      }
     }
   }
   updateContourLevel(event: Event, controlName: EmFile) {
@@ -407,32 +412,44 @@ export class OneDepComponent implements OnInit, OnDestroy {
     const normalizedInput = input.replace(",", ".");
     const parsedValue = parseFloat(normalizedInput);
     if (!isNaN(parsedValue)) {
-      this.files.forEach((fT) => {
-        if (fT.value.emName === controlName) {
-          fT.value.contour = parsedValue;
-        }
-      });
+      const filesArray = this.form.get("files") as FormArray;
+      const fileControl = filesArray.controls.find(
+        (control) => control.get("emName")?.value === controlName,
+      );
+      if (fileControl) {
+        fileControl.get("contour")?.patchValue(parsedValue);
+      }
     }
   }
   updateDetails(event: Event, controlName: EmFile) {
-    const textarea = event.target as HTMLTextAreaElement; // Cast to HTMLTextAreaElement
+    // function to update details for a map
+    const textarea = event.target as HTMLTextAreaElement;
     const value = textarea.value;
-    this.files.forEach((fT) => {
-      if (fT.value.emName === controlName) {
-        fT.value.details = value;
-      }
-    });
+
+    const filesArray = this.form.get("files") as FormArray;
+    const fileControl = filesArray.controls.find(
+      (control) => control.get("emName")?.value === controlName,
+    );
+    if (fileControl) {
+      fileControl.get("details")?.patchValue(value);
+    }
   }
   updateDetailsAddMap(event: Event, id: number) {
-    const textarea = event.target as HTMLTextAreaElement; // Cast to HTMLTextAreaElement
+    // function to update details for additional maps
+    const textarea = event.target as HTMLTextAreaElement;
     const value = textarea.value;
-    this.files.forEach((fT) => {
-      if (fT.value.emName === this.emFile.AddMap && fT.value.id === id) {
-        fT.value.details = value;
-      }
-    });
+    const filesArray = this.form.get("files") as FormArray;
+    const fileControl = filesArray.controls.find(
+      (control) =>
+        control.get("emName")?.value === this.emFile.AddMap &&
+        control.get("id")?.value === id,
+    );
+    if (fileControl) {
+      fileControl.get("details")?.patchValue(value);
+    }
   }
   addMap() {
+    // adds an empty DepositionFile of type Add-Map to the form
     const nextId =
       this.files
         .filter((file) => file.value.emName === EmFile.AddMap)
@@ -459,6 +476,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
     this.addFileToForm(newMap);
   }
   addFSC() {
+    // adds an empty DepositionFile of type FSC to the form
     const nextId =
       this.files
         .filter((file) => file.value.emName === EmFile.FSC)
@@ -482,13 +500,13 @@ export class OneDepComponent implements OnInit, OnDestroy {
     this.addFileToForm(newFSC);
   }
 
-  correctExtension(control: AbstractControl) {
-    console.log("calling validator");
-    const fileValue = control.value;
+  correctExtension(controlFile: AbstractControl) {
+    // checks if the provided files has a correct extension
+    const fileValue = controlFile.value;
     if (!fileValue) {
       return null;
     }
-    const allowedExtensions = control.parent?.get("fileFormat")?.value;
+    const allowedExtensions = controlFile.parent?.get("fileFormat")?.value;
     const fileName = fileValue.name || fileValue;
     const fileExtension = fileName.endsWith(".gz")
       ? "." + fileName.split(".").slice(-2).join(".")
@@ -501,6 +519,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
 
   onDepositClick() {
+    console.log(this.files);
     let body: OneDepUserInfo;
     if (this.form.value.password) {
       body = {

From 6d5182b5c8bb3626bf60cbb74dfb5f09a2bd2665 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 23 Jan 2025 17:16:37 +0000
Subject: [PATCH 088/245] validators on required files working

---
 src/app/datasets/onedep/onedep.component.html |  4 +-
 src/app/datasets/onedep/onedep.component.scss |  2 +-
 src/app/datasets/onedep/onedep.component.ts   | 40 ++++++++++---------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 59cef57ede..8926488e98 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -112,7 +112,7 @@ <h2>Choose Electron Microscopy Method</h2>
                 </mat-option>
               </mat-select>
               <!-- Error Message -->
-              <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error">
+              <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error-text">
                 You must specify the experimental method
               </div>
             </mat-form-field>
@@ -220,7 +220,7 @@ <h2>Choose Electron Microscopy Method</h2>
                     <mat-icon>clear</mat-icon>
                   </button>
                 </div>
-                <div *ngIf="fileType.get('file').invalid" class="error-text">
+                <div *ngIf="fileType.get('file').hasError('correctExtension')" class="error-text">
                   Invalid file format. Allowed formats: {{ fileType.get('fileFormat').value }}
                 </div>
                
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index fdc7578840..a444911664 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -264,7 +264,7 @@ mat-card {
     color:black;
   }
   .error-text {
-    color: red;
+    color: #c81919;
     font-size: 0.8rem;
     margin-top: 0;
   }
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 2932a3750c..26e042ff67 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -36,6 +36,7 @@ import {
 import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
 import { Observable, Subscription } from "rxjs";
 import { runInThisContext } from "vm";
+import { FlexAlignDirective } from "@ngbracket/ngx-layout";
 
 @Component({
   selector: "onedep",
@@ -165,22 +166,26 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
   addFileToForm(file: DepositionFile) {
     // adds a depositionFile to the form
+    const validators = [this.correctExtension];
+    if (file.required) {
+      validators.push(Validators.required); // Add required dynamically
+    }
+
     const filesArray = this.form.get("files") as FormArray;
-    filesArray.push(
-      this.fb.group({
-        emName: [file.emName],
-        id: [file.id],
-        nameFE: [file.nameFE],
-        type: [file.type],
-        fileName: [file.fileName],
-        file: [file.file, [this.correctExtension]],
-        required: [file.required],
-        contour: [file.contour],
-        details: [file.details],
-        fileFormat: [file.fileFormat],
-        explanation: [file.explanation],
-      }),
-    );
+    const fileGroup = this.fb.group({
+      emName: [file.emName],
+      id: [file.id],
+      nameFE: [file.nameFE],
+      type: [file.type],
+      fileName: [file.fileName],
+      file: [file.file, validators],
+      required: [file.required],
+      contour: [file.contour],
+      details: [file.details],
+      fileFormat: [file.fileFormat],
+      explanation: [file.explanation],
+    });
+    filesArray.push(fileGroup);
   }
   //remove a file from the form; only used for co-cif (yes/no toggle). On method change a new files array will be generated
   removeFileFromForm(controlName: EmFile) {
@@ -500,7 +505,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
     this.addFileToForm(newFSC);
   }
 
-  correctExtension(controlFile: AbstractControl) {
+  correctExtension(controlFile: AbstractControl): ValidationErrors | null {
     // checks if the provided files has a correct extension
     const fileValue = controlFile.value;
     if (!fileValue) {
@@ -515,11 +520,10 @@ export class OneDepComponent implements OnInit, OnDestroy {
     if (allowedExtensions && allowedExtensions.includes(fileExtension)) {
       return null;
     }
-    return { correctExtension: false };
+    return { correctExtension: true };
   }
 
   onDepositClick() {
-    console.log(this.files);
     let body: OneDepUserInfo;
     if (this.form.value.password) {
       body = {

From 3496fec2c5510fca8900514055c8c770209353cf Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 24 Jan 2025 08:54:32 +0000
Subject: [PATCH 089/245] wip add validators on contour level

---
 src/app/datasets/onedep/onedep.component.html |  6 +++---
 src/app/datasets/onedep/onedep.component.ts   | 18 +++++++++++------
 src/app/datasets/onedep/types/methods.enum.ts | 20 ++++++++++++++-----
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 8926488e98..a07f777293 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -225,9 +225,9 @@ <h2>Choose Electron Microscopy Method</h2>
                 </div>
                
               </div>
-              <ng-container *ngIf="fileType.get('contour').value !== null || fileType.get('details').value !== null">
+              <ng-container *ngIf="isMap(fileType.get('emName').value)">
                 <div class="input-container">
-                  <ng-container *ngIf="fileType.get('contour').value !== null">
+                  <ng-container>  <!--  *ngIf="fileType.get('contour').value !== null"  details and contour come together-->
                     <mat-form-field appearance="outline" class="contour-level">
                       <mat-label>Contour Level</mat-label>
                       <input
@@ -242,7 +242,7 @@ <h2>Choose Electron Microscopy Method</h2>
                       />
                     </mat-form-field>
                   </ng-container>
-                  <ng-container *ngIf="fileType.get('details') !== null">
+                  <ng-container> <!--  *ngIf="fileType.get('details') !== null" -->  
                     <mat-form-field class="details">
                       <mat-label>Short description</mat-label>
                       <textarea
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 26e042ff67..a97e6dc64f 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -32,11 +32,10 @@ import {
   EmFile,
   DepositionFile,
   OneDepUserInfo,
+  isMap,
 } from "./types/methods.enum";
 import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
 import { Observable, Subscription } from "rxjs";
-import { runInThisContext } from "vm";
-import { FlexAlignDirective } from "@ngbracket/ngx-layout";
 
 @Component({
   selector: "onedep",
@@ -61,6 +60,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   showPassword = false;
   fileTypes: DepositionFile[]; // required to keep the initial set of files based on EM method
   mainContour = 0.0;
+  isMap = isMap;
   connectedDepositionBackend = "";
   connectedDepositionBackendVersion = "";
   connectingToDepositionBackend = false;
@@ -166,9 +166,14 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
   addFileToForm(file: DepositionFile) {
     // adds a depositionFile to the form
-    const validators = [this.correctExtension];
+    const fileValidators = [this.correctExtension];
+    const contourValidators = [];
     if (file.required) {
-      validators.push(Validators.required); // Add required dynamically
+      if (this.isMap(file.emName)) {
+        contourValidators.push(Validators.required);
+        contourValidators.push(Validators.pattern(/^[0-9]+(\.[0-9]+)?$/));
+      }
+      fileValidators.push(Validators.required);
     }
 
     const filesArray = this.form.get("files") as FormArray;
@@ -178,9 +183,9 @@ export class OneDepComponent implements OnInit, OnDestroy {
       nameFE: [file.nameFE],
       type: [file.type],
       fileName: [file.fileName],
-      file: [file.file, validators],
+      file: [file.file, fileValidators],
       required: [file.required],
-      contour: [file.contour],
+      contour: [file.contour, contourValidators],
       details: [file.details],
       fileFormat: [file.fileFormat],
       explanation: [file.explanation],
@@ -524,6 +529,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
 
   onDepositClick() {
+    console.log(this.files);
     let body: OneDepUserInfo;
     if (this.form.value.password) {
       body = {
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index 7f26e06f6d..71b827d2fc 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -20,6 +20,16 @@ export enum EmFile {
   MTZ = "xs-mtz",
 }
 
+export function isMap(emFile: EmFile): boolean {
+  return (
+    emFile === EmFile.MainMap ||
+    emFile === EmFile.HalfMap1 ||
+    emFile === EmFile.HalfMap2 ||
+    emFile === EmFile.MaskMap ||
+    emFile === EmFile.AddMap
+  );
+}
+
 export interface OneDepUserInfo {
   email: string;
   orcidIds: string[];
@@ -70,7 +80,7 @@ export const createMethodsList = (): EmMethod[] => {
     type: "vo-map",
     fileName: "",
     file: null,
-    contour: 0.0,
+    contour: null,
     details: "",
     required: false,
     fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
@@ -83,7 +93,7 @@ export const createMethodsList = (): EmMethod[] => {
     type: "half-map",
     fileName: "",
     file: null,
-    contour: 0.0,
+    contour: null,
     details: "",
     required: false,
     fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
@@ -96,7 +106,7 @@ export const createMethodsList = (): EmMethod[] => {
     type: "half-map",
     fileName: "",
     file: null,
-    contour: 0.0,
+    contour: null,
     details: "",
     required: false,
     fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
@@ -109,7 +119,7 @@ export const createMethodsList = (): EmMethod[] => {
     type: "mask-map",
     fileName: "",
     file: null,
-    contour: 0.0,
+    contour: null,
     details: "",
     required: false,
     fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
@@ -123,7 +133,7 @@ export const createMethodsList = (): EmMethod[] => {
     type: "add-map",
     fileName: "",
     file: null,
-    contour: 0.0,
+    contour: null,
     details: "",
     required: false,
     fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],

From ecfecda9c350b27744a94f7c2d7468ffcda93482 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 24 Jan 2025 12:35:37 +0000
Subject: [PATCH 090/245] wip: add validators to contour

---
 src/app/datasets/onedep/onedep.component.html |  5 ++++-
 src/app/datasets/onedep/onedep.component.ts   | 20 +++++++++++++++----
 src/app/datasets/onedep/onedep.directive.ts   |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index a07f777293..147b31c6aa 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -235,12 +235,15 @@ <h2>Choose Electron Microscopy Method</h2>
                       type="number"
                       placeholder="e.g. 0.0"
                       [required]="!!fileType.get('file')"
-                      [value]="fileType.get('contour').value || ''"
+                      [formControl]="getContourControl(fileType)"
                       (input)="fileType.get('emName').value === 'vo-map' ? updateContourLevelMain($event) : 
                       fileType.get('emName').value === 'add-map' ? updateContourLevelAddMap($event, fileType.get('id').value) : 
                       updateContourLevel($event, fileType.get('emName').value)"
                       />
                     </mat-form-field>
+                    <div *ngIf="fileType.get('contour').invalid && fileType.get('contour').touched" class="error-text">
+                      Invalid Contour level, please enter  numeric value.
+                    </div>
                   </ng-container>
                   <ng-container> <!--  *ngIf="fileType.get('details') !== null" -->  
                     <mat-form-field class="details">
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index a97e6dc64f..131aaf9848 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -169,9 +169,10 @@ export class OneDepComponent implements OnInit, OnDestroy {
     const fileValidators = [this.correctExtension];
     const contourValidators = [];
     if (file.required) {
-      if (this.isMap(file.emName)) {
+      // add-map is not required
+      if (this.isMap(file.emName) && file.emName !== this.emFile.AddMap) {
+        console.log("file is map", file.emName);
         contourValidators.push(Validators.required);
-        contourValidators.push(Validators.pattern(/^[0-9]+(\.[0-9]+)?$/));
       }
       fileValidators.push(Validators.required);
     }
@@ -252,7 +253,9 @@ export class OneDepComponent implements OnInit, OnDestroy {
   get files() {
     return (this.form.get("files") as FormArray).controls;
   }
-
+  getContourControl(fileType: AbstractControl): FormControl {
+    return fileType.get("contour") as FormControl;
+  }
   onPDB(event: MatRadioChange) {
     const input = event.value;
     if (input === "true") {
@@ -324,6 +327,14 @@ export class OneDepComponent implements OnInit, OnDestroy {
             control.get("emName")?.value === this.emFile.AddMap &&
             control.get("id")?.value === id,
         );
+        if (fileControl) {
+          const contourControl = fileControl.get("contour");
+          contourControl.setValidators([
+            Validators.required,
+            ...(contourControl?.validator ? [contourControl.validator] : []),
+          ]);
+          // contourControl?.updateValueAndValidity();
+        }
       } else {
         fileControl = filesArray.controls.find(
           (control) =>
@@ -400,6 +411,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
         }
       });
     }
+    console.log("main contour:", this.mainContour, parsedValue, typeof parsedValue);
   }
   updateContourLevelAddMap(event: Event, id: number) {
     const input = (event.target as HTMLInputElement).value.trim();
@@ -475,7 +487,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
       type: "add-map",
       fileName: "",
       file: null,
-      contour: 0.0,
+      contour: null,
       details: "",
       required: false,
       fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
diff --git a/src/app/datasets/onedep/onedep.directive.ts b/src/app/datasets/onedep/onedep.directive.ts
index f6a70fcada..5643e31511 100644
--- a/src/app/datasets/onedep/onedep.directive.ts
+++ b/src/app/datasets/onedep/onedep.directive.ts
@@ -1,4 +1,4 @@
-import { Directive, HostListener, ElementRef, OnInit } from "@angular/core";
+import { Directive, HostListener, ElementRef } from "@angular/core";
 
 @Directive({ selector: "[orcidFormatter]" })
 export class OrcidFormatterDirective {

From b94d98f32dbba787838f9ddee04b9142ad6b624e Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 27 Jan 2025 07:38:05 +0000
Subject: [PATCH 091/245] validator on contour level works

---
 src/app/datasets/onedep/onedep.component.html |  1 -
 src/app/datasets/onedep/onedep.component.ts   | 22 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index 147b31c6aa..d93e760285 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -234,7 +234,6 @@ <h2>Choose Electron Microscopy Method</h2>
                       matInput
                       type="number"
                       placeholder="e.g. 0.0"
-                      [required]="!!fileType.get('file')"
                       [formControl]="getContourControl(fileType)"
                       (input)="fileType.get('emName').value === 'vo-map' ? updateContourLevelMain($event) : 
                       fileType.get('emName').value === 'add-map' ? updateContourLevelAddMap($event, fileType.get('id').value) : 
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 131aaf9848..7c7a35d5a0 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -36,6 +36,7 @@ import {
 } from "./types/methods.enum";
 import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
 import { Observable, Subscription } from "rxjs";
+import { isNumeric } from "mathjs";
 
 @Component({
   selector: "onedep",
@@ -167,11 +168,10 @@ export class OneDepComponent implements OnInit, OnDestroy {
   addFileToForm(file: DepositionFile) {
     // adds a depositionFile to the form
     const fileValidators = [this.correctExtension];
-    const contourValidators = [];
+    const contourValidators = [this.numericContourValidator];
     if (file.required) {
       // add-map is not required
-      if (this.isMap(file.emName) && file.emName !== this.emFile.AddMap) {
-        console.log("file is map", file.emName);
+      if (this.isMap(file.emName)) {
         contourValidators.push(Validators.required);
       }
       fileValidators.push(Validators.required);
@@ -333,7 +333,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
             Validators.required,
             ...(contourControl?.validator ? [contourControl.validator] : []),
           ]);
-          // contourControl?.updateValueAndValidity();
+          contourControl?.updateValueAndValidity();
         }
       } else {
         fileControl = filesArray.controls.find(
@@ -411,7 +411,6 @@ export class OneDepComponent implements OnInit, OnDestroy {
         }
       });
     }
-    console.log("main contour:", this.mainContour, parsedValue, typeof parsedValue);
   }
   updateContourLevelAddMap(event: Event, id: number) {
     const input = (event.target as HTMLInputElement).value.trim();
@@ -540,8 +539,19 @@ export class OneDepComponent implements OnInit, OnDestroy {
     return { correctExtension: true };
   }
 
+  numericContourValidator(
+    controlFile: AbstractControl,
+  ): ValidationErrors | null {
+    const value = controlFile.value;
+
+    if (value === null || value === undefined) {
+      return null;
+    }
+
+    return isNumeric(value) ? null : { notNumeric: true };
+  }
+
   onDepositClick() {
-    console.log(this.files);
     let body: OneDepUserInfo;
     if (this.form.value.password) {
       body = {

From 4f6cf4c9b709d26dd3ff71e583752bcef6fbaf97 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 27 Jan 2025 10:54:42 +0000
Subject: [PATCH 092/245] validation works

---
 src/app/datasets/onedep/onedep.component.html | 87 +++++++++++++------
 src/app/datasets/onedep/onedep.component.scss | 46 ++++++----
 src/app/datasets/onedep/onedep.component.ts   | 87 ++++++++++++++-----
 src/app/datasets/onedep/types/methods.enum.ts | 20 ++++-
 4 files changed, 168 insertions(+), 72 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index d93e760285..eb17714b8b 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -91,9 +91,12 @@ <h2>Enter 16-digit ORCID iD</h2>
                       </button>
                     </div>
                   </mat-form-field>
-                  <div class="error-text" *ngIf="field.get('orcidId')?.hasError('notNumeric')">
+                  <mat-error *ngIf="field.get('orcidId')?.hasError('notNumeric')">
                     ORCID ID must contain only numbers.
-                  </div>
+                  </mat-error>
+                  <mat-error *ngIf="field.get('orcidId')?.touched  && field.get('orcidId')?.hasError('not16digits')">
+                    ORCID ID must contain 16 digits.
+                  </mat-error>
                 </div>
               </ng-container>
             </div>
@@ -112,9 +115,9 @@ <h2>Choose Electron Microscopy Method</h2>
                 </mat-option>
               </mat-select>
               <!-- Error Message -->
-              <div *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched" class="error-text">
+              <mat-error *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched">
                 You must specify the experimental method
-              </div>
+              </mat-error>
             </mat-form-field>
             <!-- Question 2: PDB Deposition -->
             <tr *ngIf="form.value['emMethod'] && form.value['emMethod'] !== 'tomogram'">
@@ -184,7 +187,7 @@ <h2>Choose Electron Microscopy Method</h2>
             <mat-card-header matTooltip="{{ fileType.get('explanation').value }}" matTooltipPosition="above">
               <mat-card-title>
                 {{ fileType.get('nameFE').value }}
-                <span class="required-asterisk" *ngIf="isRequired(fileType.get('emName').value)"> *</span>
+                <span class="required-asterisk" *ngIf="fileType.get('required').value"> *</span>
               </mat-card-title>
             </mat-card-header>
             <mat-card-content>
@@ -220,30 +223,33 @@ <h2>Choose Electron Microscopy Method</h2>
                     <mat-icon>clear</mat-icon>
                   </button>
                 </div>
-                <div *ngIf="fileType.get('file').hasError('correctExtension')" class="error-text">
+                <mat-error *ngIf="fileType.get('file').hasError('correctExtension')">
                   Invalid file format. Allowed formats: {{ fileType.get('fileFormat').value }}
-                </div>
+                </mat-error>
                
               </div>
               <ng-container *ngIf="isMap(fileType.get('emName').value)">
                 <div class="input-container">
-                  <ng-container>  <!--  *ngIf="fileType.get('contour').value !== null"  details and contour come together-->
-                    <mat-form-field appearance="outline" class="contour-level">
-                      <mat-label>Contour Level</mat-label>
-                      <input
-                      matInput
-                      type="number"
-                      placeholder="e.g. 0.0"
-                      [formControl]="getContourControl(fileType)"
-                      (input)="fileType.get('emName').value === 'vo-map' ? updateContourLevelMain($event) : 
-                      fileType.get('emName').value === 'add-map' ? updateContourLevelAddMap($event, fileType.get('id').value) : 
-                      updateContourLevel($event, fileType.get('emName').value)"
-                      />
-                    </mat-form-field>
-                    <div *ngIf="fileType.get('contour').invalid && fileType.get('contour').touched" class="error-text">
-                      Invalid Contour level, please enter  numeric value.
-                    </div>
-                  </ng-container>
+                  <div class="contour-field-wrapper">  <!-- wrap into column the contour level and it's error message -->
+                    <ng-container>  <!--  *ngIf="fileType.get('contour').value !== null"  details and contour come together-->
+                      <mat-form-field appearance="outline" class="contour-level">
+                        <mat-label>Contour Level</mat-label>
+                        <input
+                        matInput
+                        type="number"
+                        placeholder="e.g. 0.0"
+                        [formControl]="getContourControl(fileType)"
+                        (input)="fileType.get('emName').value === 'vo-map' ? updateContourLevelMain($event) : 
+                        fileType.get('emName').value === 'add-map' ? updateContourLevelAddMap($event, fileType.get('id').value) : 
+                        updateContourLevel($event, fileType.get('emName').value)"
+                        />
+                      </mat-form-field>
+                      
+                      <mat-error *ngIf="fileType.get('contour').invalid && fileType.get('contour').touched" class="contour-error">
+                        Invalid contour level, must be numeric.
+                      </mat-error>
+                    </ng-container>
+                  </div>
                   <ng-container> <!--  *ngIf="fileType.get('details') !== null" -->  
                     <mat-form-field class="details">
                       <mat-label>Short description</mat-label>
@@ -273,9 +279,36 @@ <h2>Choose Electron Microscopy Method</h2>
           </mat-card>
           <!-- UPLOAD FILES DONE -->
           <div class="button-container">
-            <button class="submitDep" mat-raised-button color="primary" (click)="onDepositClick()">
-            Start Deposition
-            </button>
+            <div class="button-wrapper">
+              <div *ngIf="depositClicked && !form.valid">
+                <button 
+                  class="submitDep" 
+                  mat-raised-button 
+                  color="primary" 
+                  (click)="onDepositClick()"
+                  [disabled]="!form.valid"
+                  >
+                  Start Deposition
+                </button>
+                <mat-error *ngIf="!form.valid && form.touched" class="form-error">
+                  Please complete the form before starting deposition!
+                </mat-error>
+              </div>
+              <div *ngIf="!depositClicked || (depositClicked && form.valid)">
+                
+                <button 
+                  class="submitDep" 
+                  mat-raised-button 
+                  color="primary" 
+                  (click)="onDepositClick()"
+                  >
+                  Start Deposition
+                </button>
+                <mat-error *ngIf="!form.valid && form.touched" class="form-error">
+                  Please complete the form before starting deposition!
+                </mat-error>
+              </div>
+            </div>
             <button class="submitDep" mat-raised-button color="primary" (click)="onDownloadClick()">
             Download mmCIF
             </button>
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/onedep/onedep.component.scss
index a444911664..939b46578c 100644
--- a/src/app/datasets/onedep/onedep.component.scss
+++ b/src/app/datasets/onedep/onedep.component.scss
@@ -120,12 +120,8 @@ mat-card {
     width: 100%;
     padding: 0.5rem 0;
 
-    .sample-edit {
-      padding-left: 0.5rem;
-
-      mat-icon {
-        font-size: medium;
-      }
+    mat-icon {
+      font-size: medium;
     }
   }
 
@@ -181,11 +177,12 @@ mat-card {
       display: flex; 
       align-items: center; 
       gap: 16px;
+      
 
       .fileChooser {
         background-color: #CFE7CB;
         color: #333;
-        margin: 16px 0 0 0;
+        margin: 16px 0 2px 0;
       }
 
       .fileName {
@@ -210,9 +207,10 @@ mat-card {
         display: flex; 
         align-items: flex-end;
         gap: 16px;
+        margin-top: 0px;
 
         .contour-level {
-          flex: 0 0 20%; // Set to take 20% of the width
+          flex: 0 0 12%; // Set to take 12% of the width
           min-width: 150px;
 
           /* Chrome, Safari, Edge, Opera */
@@ -226,7 +224,16 @@ mat-card {
             -moz-appearance: textfield;
           }
         }
-
+        .contour-field-wrapper {
+          display: flex;
+          flex-direction: column;
+        }
+        
+        .mat-error {
+          flex: 1;
+          font-size: 0.75rem; /* Angular Material error size */
+          color: #f44336; /* Default error color */
+        }
         .details {
 
           margin-top:  16px;
@@ -246,27 +253,28 @@ mat-card {
             }
           }
         }
-
-        mat-form-field {
-          width: 100%;
-          margin-bottom: 0;
-        }
       }
     }
   }
   .button-container {
-    display: flex;          
+    display: flex;       
+    align-items: flex-start; 
     gap: 20px; 
     margin-top: 16px;
+
+    .button-wrapper {
+      display: flex;
+      flex-direction: column;
+    }
   }
   .submitDep {
+    width: 300px;  
+    flex-direction: column;
     background-color: #B3D9AC;
     color:black;
   }
-  .error-text {
-    color: #c81919;
-    font-size: 0.8rem;
-    margin-top: 0;
+  .form-error{
+    margin-top: 16px;
   }
 
 }
\ No newline at end of file
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 7c7a35d5a0..dc4c3c53e7 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -68,6 +68,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   lastUsedDepositionBackends: string[] = [];
   forwardDepositionBackend = "";
   errorMessage = "";
+  depositClicked = false;
   depID$: Observable<string>;
   @ViewChild("fileInput") fileInput: ElementRef<HTMLInputElement> | undefined;
 
@@ -87,7 +88,14 @@ export class OneDepComponent implements OnInit, OnDestroy {
       metadata: ["", Validators.required],
       orcid: this.fb.array([
         this.fb.group({
-          orcidId: ["", [Validators.required, this.orcidValidator()]],
+          orcidId: [
+            "",
+            [
+              Validators.required,
+              this.orcidValidatorNumeric(),
+              this.orcidValidator16digits(),
+            ],
+          ],
         }),
       ]),
       emMethod: ["", Validators.required],
@@ -137,7 +145,9 @@ export class OneDepComponent implements OnInit, OnDestroy {
     this.showPassword = !this.showPassword;
   }
   // custom validator of the ORCID ids
-  orcidValidator(): (control: AbstractControl) => ValidationErrors | null {
+  orcidValidatorNumeric(): (
+    control: AbstractControl,
+  ) => ValidationErrors | null {
     return (control: AbstractControl): ValidationErrors | null => {
       const value = control.value.replace(/-/g, "");
       if (!value) {
@@ -147,13 +157,31 @@ export class OneDepComponent implements OnInit, OnDestroy {
       return isValid ? null : { notNumeric: true };
     };
   }
+  orcidValidator16digits(): (
+    control: AbstractControl,
+  ) => ValidationErrors | null {
+    return (control: AbstractControl): ValidationErrors | null => {
+      const value = control.value.replace(/-/g, "");
+      if (!value) {
+        return null;
+      }
+      return value.length === 16 ? null : { not16digits: true };
+    };
+  }
   orcidArray(): FormArray {
     return this.form.get("orcid") as FormArray;
   }
   addOrcidField() {
     // adds an empty ORCID field to the form
     const orcidField = this.fb.group({
-      orcidId: ["", [Validators.required, this.orcidValidator()]],
+      orcidId: [
+        "",
+        [
+          Validators.required,
+          this.orcidValidatorNumeric(),
+          this.orcidValidator16digits(),
+        ],
+      ],
     });
     this.orcidArray().push(orcidField);
   }
@@ -165,12 +193,12 @@ export class OneDepComponent implements OnInit, OnDestroy {
       this.orcidArray().removeAt(index);
     }
   }
-  addFileToForm(file: DepositionFile) {
+  addFileToForm(file: DepositionFile, index?: number) {
     // adds a depositionFile to the form
     const fileValidators = [this.correctExtension];
     const contourValidators = [this.numericContourValidator];
     if (file.required) {
-      // add-map is not required
+      // add-map is not required and hence excluded
       if (this.isMap(file.emName)) {
         contourValidators.push(Validators.required);
       }
@@ -191,8 +219,13 @@ export class OneDepComponent implements OnInit, OnDestroy {
       fileFormat: [file.fileFormat],
       explanation: [file.explanation],
     });
-    filesArray.push(fileGroup);
+    if (index !== undefined) {
+      filesArray.insert(index, fileGroup);
+    } else {
+      filesArray.push(fileGroup);
+    }
   }
+
   //remove a file from the form; only used for co-cif (yes/no toggle). On method change a new files array will be generated
   removeFileFromForm(controlName: EmFile) {
     const filesArray = this.form.get("files") as FormArray;
@@ -244,6 +277,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
         this.form.get("associatedMap")?.setValue("false");
         break;
     }
+    // let sortedfileType = new Array<DepositionFile>(this.fileTypes.length);
     this.fileTypes.forEach((file) => {
       if (file.emName !== this.emFile.Coordinates) {
         this.addFileToForm(file);
@@ -253,6 +287,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   get files() {
     return (this.form.get("files") as FormArray).controls;
   }
+
   getContourControl(fileType: AbstractControl): FormControl {
     return fileType.get("contour") as FormControl;
   }
@@ -262,7 +297,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
       this.fileTypes.forEach((fT) => {
         if (fT.emName === this.emFile.Coordinates) {
           fT.required = true; // update the co-cif required status
-          this.addFileToForm(fT);
+          this.addFileToForm(fT, 1);
         }
       });
     } else {
@@ -382,18 +417,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
       filesArray.at(index).patchValue({ file: null });
     }
   }
-  isRequired(controlName: string): boolean {
-    // for a given file extracts the "required" status for the chosen EM method
-    // FIX me subject to change
-    let value: boolean;
 
-    this.files.forEach((fT) => {
-      if (fT.value.emName === controlName) {
-        value = fT.value.required;
-      }
-    });
-    return value;
-  }
   updateContourLevelMain(event: Event) {
     const input = (event.target as HTMLInputElement).value.trim();
     const normalizedInput = input.replace(",", ".");
@@ -493,8 +517,13 @@ export class OneDepComponent implements OnInit, OnDestroy {
       explanation:
         "Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)",
     };
-    // update the co-cif required status
-    this.addFileToForm(newMap);
+    // get the index of last map in the files array and insert as next
+    const filesArray = this.form.get("files") as FormArray;
+    const index = filesArray.value.findIndex(
+      (file: DepositionFile) =>
+        file.emName === EmFile.AddMap && file.id === nextId - 1,
+    );
+    this.addFileToForm(newMap, index + 1);
   }
   addFSC() {
     // adds an empty DepositionFile of type FSC to the form
@@ -517,8 +546,13 @@ export class OneDepComponent implements OnInit, OnDestroy {
       fileFormat: [".xml"],
       explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs",
     };
-    // update the co-cif required status
-    this.addFileToForm(newFSC);
+    // get the index of last fsc in the files array and insert as next
+    const filesArray = this.form.get("files") as FormArray;
+    const index = filesArray.value.findIndex(
+      (file: DepositionFile) =>
+        file.emName === EmFile.FSC && file.id === nextId - 1,
+    );
+    this.addFileToForm(newFSC, index + 1);
   }
 
   correctExtension(controlFile: AbstractControl): ValidationErrors | null {
@@ -552,6 +586,15 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
 
   onDepositClick() {
+    // Mark the form as submitted (trigger validation)
+    this.depositClicked = true;
+    this.form.markAllAsTouched();
+    if (this.form.invalid) {
+      return;
+    }
+    this.submit();
+  }
+  submit() {
     let body: OneDepUserInfo;
     if (this.form.value.password) {
       body = {
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/onedep/types/methods.enum.ts
index 71b827d2fc..0ff45a1915 100644
--- a/src/app/datasets/onedep/types/methods.enum.ts
+++ b/src/app/datasets/onedep/types/methods.enum.ts
@@ -53,6 +53,7 @@ export interface DepositionFile {
   details?: string;
   required: boolean;
   fileFormat?: string[];
+  prioritySort?: number; // additional fsc and xml may have no value, sort will be exequted based on id
   explanation?: string;
 }
 
@@ -71,6 +72,7 @@ export const createMethodsList = (): EmMethod[] => {
     file: null,
     required: false,
     fileFormat: [".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tiff"],
+    prioritySort: 0,
     explanation:
       "Image of the map (500 x 500 pixels in .jpg, .png, etc. format)",
   };
@@ -84,6 +86,7 @@ export const createMethodsList = (): EmMethod[] => {
     details: "",
     required: false,
     fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
+    prioritySort: 2,
     explanation:
       "Primary map (.mrc or .ccp4 format, may use gzip or bzip2 compression) along with recommended contour level",
   };
@@ -97,6 +100,7 @@ export const createMethodsList = (): EmMethod[] => {
     details: "",
     required: false,
     fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
+    prioritySort: 4,
     explanation:
       "Half maps (as used for FSC calculation; two maps must be uploaded)",
   };
@@ -110,6 +114,7 @@ export const createMethodsList = (): EmMethod[] => {
     details: "",
     required: false,
     fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
+    prioritySort: 5,
     explanation:
       "Half maps (as used for FSC calculation; two maps must be uploaded)",
   };
@@ -123,6 +128,7 @@ export const createMethodsList = (): EmMethod[] => {
     details: "",
     required: false,
     fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
+    prioritySort: 3,
     explanation:
       "Primary/raw map mask, segmentation/focused refinement mask and half-map mask",
   };
@@ -137,6 +143,7 @@ export const createMethodsList = (): EmMethod[] => {
     details: "",
     required: false,
     fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
+    prioritySort: 10,
     explanation:
       "Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)",
   };
@@ -149,6 +156,7 @@ export const createMethodsList = (): EmMethod[] => {
     file: null,
     fileFormat: [".xml"],
     required: false,
+    prioritySort: 7,
     explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs",
   };
   const depositionLayerLines: DepositionFile = {
@@ -158,6 +166,7 @@ export const createMethodsList = (): EmMethod[] => {
     fileName: "",
     file: null,
     required: false,
+    prioritySort: 9,
   };
   const depositionCoordinates: DepositionFile = {
     emName: EmFile.Coordinates,
@@ -176,6 +185,7 @@ export const createMethodsList = (): EmMethod[] => {
       ".ent.gz",
       ".brk.gz",
     ],
+    prioritySort: 1,
     explanation: "mmCIF or PDB format",
   };
   const depositionStructureFactors: DepositionFile = {
@@ -185,6 +195,7 @@ export const createMethodsList = (): EmMethod[] => {
     fileName: "",
     file: null,
     required: false,
+    prioritySort: 8,
     fileFormat: [".cif", ".mtz", ".cif.gz", ".mtz.gz"],
   };
   const depositionMTZ: DepositionFile = {
@@ -194,6 +205,7 @@ export const createMethodsList = (): EmMethod[] => {
     fileName: "",
     file: null,
     required: false,
+    prioritySort: 6,
   };
   return [
     {
@@ -203,9 +215,9 @@ export const createMethodsList = (): EmMethod[] => {
         depositionImage,
         depositionCoordinates,
         depositionMainMap,
-        depositionMaskMap,
         depositionHalfMap1,
         depositionHalfMap2,
+        depositionMaskMap,
         depositionFSC,
         depositionLayerLines,
         depositionAddMap,
@@ -218,9 +230,9 @@ export const createMethodsList = (): EmMethod[] => {
         depositionImage,
         depositionCoordinates,
         depositionMainMap,
-        depositionMaskMap,
         depositionHalfMap1,
         depositionHalfMap2,
+        depositionMaskMap,
         depositionFSC,
         depositionLayerLines,
         depositionAddMap,
@@ -233,9 +245,9 @@ export const createMethodsList = (): EmMethod[] => {
         depositionImage,
         depositionCoordinates,
         depositionMainMap,
-        depositionMaskMap,
         depositionHalfMap1,
         depositionHalfMap2,
+        depositionMaskMap,
         depositionFSC,
         depositionLayerLines,
         depositionAddMap,
@@ -260,9 +272,9 @@ export const createMethodsList = (): EmMethod[] => {
         depositionImage,
         depositionCoordinates,
         depositionMainMap,
-        depositionMaskMap,
         depositionHalfMap1,
         depositionHalfMap2,
+        depositionMaskMap,
         depositionStructureFactors,
         depositionMTZ,
         depositionFSC,

From 4e2c0e4fc5e07711ccf8b8be8159c3062eccd44c Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 27 Jan 2025 15:29:41 +0000
Subject: [PATCH 093/245] add tick for 'have read the policy of wwPDB'

---
 src/app/datasets/onedep/onedep.component.html | 9 ++++++++-
 src/app/datasets/onedep/onedep.component.ts   | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index eb17714b8b..b920f4ec98 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -278,6 +278,14 @@ <h2>Choose Electron Microscopy Method</h2>
             </div>
           </mat-card>
           <!-- UPLOAD FILES DONE -->
+          <div>
+            <mat-checkbox
+            formControlName="privacyTermsTicked"
+            >
+            Tick to indicate that you have read and accepted the wwPDB policy on personal data privacy, including what data wwPDB collects, how the data is stored and shared.
+            <a href="https://www.wwpdb.org/about/privacy" target="_blank">www.wwpdb.org/about/privacy</a>
+            </mat-checkbox>            
+          </div>
           <div class="button-container">
             <div class="button-wrapper">
               <div *ngIf="depositClicked && !form.valid">
@@ -295,7 +303,6 @@ <h2>Choose Electron Microscopy Method</h2>
                 </mat-error>
               </div>
               <div *ngIf="!depositClicked || (depositClicked && form.valid)">
-                
                 <button 
                   class="submitDep" 
                   mat-raised-button 
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index dc4c3c53e7..b0905132e8 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -69,6 +69,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   forwardDepositionBackend = "";
   errorMessage = "";
   depositClicked = false;
+  privacyTermsTicked = false;
   depID$: Observable<string>;
   @ViewChild("fileInput") fileInput: ElementRef<HTMLInputElement> | undefined;
 
@@ -82,6 +83,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   ) {
     this.config = this.appConfigService.getConfig();
     this.form = this.fb.group({
+      privacyTermsTicked: new FormControl(false, Validators.requiredTrue),
       email: ["", [Validators.required, Validators.email]],
       jwtToken: ["", Validators.required],
       password: new FormControl(""),
@@ -586,6 +588,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
 
   onDepositClick() {
+    console.log(this.form);
     // Mark the form as submitted (trigger validation)
     this.depositClicked = true;
     this.form.markAllAsTouched();

From d8f2825094a61b78060506158334f3be9aa6148c Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 28 Jan 2025 17:03:02 +0000
Subject: [PATCH 094/245] (still dev stage): support sse for metadata
 extraction

---
 src/app/ingestor/ingestor.module.ts           |   4 +
 .../dialog/checkbox/checkbox.component.ts     |  21 +++
 .../ingestor.confirmation-dialog.component.ts |  34 +++++
 .../ingestor.confirmation-dialog.html         |  21 +++
 ...estor.confirm-transfer-dialog.component.ts |   2 +-
 ...stor.dialog-stepper.component.component.ts |  73 ++++++++-
 ...tor.extractor-metadata-dialog.component.ts |   2 +-
 .../ingestor.new-transfer-dialog.component.ts |   4 +-
 ...ingestor.user-metadata-dialog.component.ts |   7 +-
 .../dialog/ingestor.user-metadata-dialog.html |   2 +-
 .../{ => helper}/ingestor-api-endpoints.ts    |   7 +
 .../{ => helper}/ingestor.component-helper.ts |   0
 .../helper/ingestor.metadata-sse-service.ts   |  83 ++++++++++
 .../ingestor/ingestor/ingestor.component.html |  12 ++
 .../ingestor/ingestor/ingestor.component.ts   | 143 +++++++++---------
 15 files changed, 338 insertions(+), 77 deletions(-)
 create mode 100644 src/app/ingestor/ingestor/dialog/checkbox/checkbox.component.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.html
 rename src/app/ingestor/ingestor/{ => helper}/ingestor-api-endpoints.ts (75%)
 rename src/app/ingestor/ingestor/{ => helper}/ingestor.component-helper.ts (100%)
 create mode 100644 src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts

diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 9e9b54d6e1..5568b48b06 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -31,6 +31,8 @@ import { MatRadioModule } from "@angular/material/radio";
 import { ArrayLayoutRendererCustom } from "./ingestor-metadata-editor/customRenderer/array-renderer";
 import { MatBadgeModule } from "@angular/material/badge";
 import { MatTooltipModule } from "@angular/material/tooltip";
+import { IngestorConfirmationDialogComponent } from "./ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component";
+import { ExportTemplateHelperComponent } from "./ingestor/dialog/checkbox/checkbox.component";
 
 @NgModule({
   declarations: [
@@ -44,6 +46,8 @@ import { MatTooltipModule } from "@angular/material/tooltip";
     AnyOfRendererComponent,
     OneOfRendererComponent,
     ArrayLayoutRendererCustom,
+    IngestorConfirmationDialogComponent,
+    ExportTemplateHelperComponent,
   ],
   imports: [
     CommonModule,
diff --git a/src/app/ingestor/ingestor/dialog/checkbox/checkbox.component.ts b/src/app/ingestor/ingestor/dialog/checkbox/checkbox.component.ts
new file mode 100644
index 0000000000..eedae41b92
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/checkbox/checkbox.component.ts
@@ -0,0 +1,21 @@
+import { Component } from "@angular/core";
+
+@Component({
+  selector: "export-tempalte-checkbox",
+  template: `
+    <div>
+      <mat-checkbox>Export SciCat</mat-checkbox>
+      <mat-checkbox>Export Organizational</mat-checkbox>
+      <mat-checkbox>Export Sample</mat-checkbox>
+    </div>
+  `,
+  styles: [
+    `
+      div {
+        display: flex;
+        flex-direction: column;
+      }
+    `,
+  ],
+})
+export class ExportTemplateHelperComponent {}
diff --git a/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts b/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts
new file mode 100644
index 0000000000..0c49cc789b
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts
@@ -0,0 +1,34 @@
+import { Component, Inject, Type } from "@angular/core";
+import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
+
+@Component({
+  selector: "app-ingestor-confirmation-dialog",
+  templateUrl: "./ingestor.confirmation-dialog.html",
+  styleUrls: ["../../ingestor.component.scss"],
+})
+export class IngestorConfirmationDialogComponent {
+  constructor(
+    public dialogRef: MatDialogRef<IngestorConfirmationDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: any,
+  ) {}
+
+  get message(): string {
+    return this.data.message || "Are you sure?";
+  }
+
+  get header(): string {
+    return this.data.header || "Confirmation";
+  }
+
+  get messageComponent(): Type<any> | null {
+    return this.data.messageComponent || null;
+  }
+
+  onConfirm(): void {
+    this.dialogRef.close(true);
+  }
+
+  onCancel(): void {
+    this.dialogRef.close(false);
+  }
+}
diff --git a/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.html b/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.html
new file mode 100644
index 0000000000..85ad8a3236
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.html
@@ -0,0 +1,21 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    {{ header }}
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+  <div class="confirmation-dialog">
+    <p>{{ message }}</p>
+    <ng-container *ngComponentOutlet="messageComponent"></ng-container>
+  </div>
+</mat-dialog-content>
+
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close (click)="onCancel()">Cancel</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+    (click)="onConfirm()">Confirm</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 5c3c74f974..4857d111e2 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -10,7 +10,7 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
   SciCatHeader,
-} from "../ingestor.component-helper";
+} from "../helper/ingestor.component-helper";
 
 @Component({
   selector: "ingestor.confirm-transfer-dialog",
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
index 8b665406d5..248e87ee75 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
@@ -1,4 +1,8 @@
-import { Component, Input } from "@angular/core";
+import { Component, Input, Output, EventEmitter } from "@angular/core";
+import { MatDialog } from "@angular/material/dialog";
+import { IngestionRequestInformation } from "../helper/ingestor.component-helper";
+import { IngestorConfirmationDialogComponent } from "./confirmation-dialog/ingestor.confirmation-dialog.component";
+import { ExportTemplateHelperComponent } from "./checkbox/checkbox.component";
 
 @Component({
   selector: "ingestor-dialog-stepper",
@@ -7,14 +11,77 @@ import { Component, Input } from "@angular/core";
 })
 export class IngestorDialogStepperComponent {
   @Input() activeStep = 0;
+  @Input() createNewTransferData: IngestionRequestInformation;
+  @Output() createNewTransferDataChange =
+    new EventEmitter<IngestionRequestInformation>();
+
+  constructor(private dialog: MatDialog) {}
 
   // Save a template of metadata
   onSave() {
-    console.log("Save action triggered");
+    const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
+      data: {
+        header: "Confirm template",
+        message: "Do you really want to apply the following values?",
+        messageComponent: ExportTemplateHelperComponent,
+      },
+    });
+    dialogRef.afterClosed().subscribe((result) => {
+      if (result) {
+        if (this.createNewTransferData) {
+          const dataStr =
+            "data:text/json;charset=utf-8," +
+            encodeURIComponent(JSON.stringify(this.createNewTransferData));
+          const downloadAnchorNode = document.createElement("a");
+          downloadAnchorNode.setAttribute("href", dataStr);
+          downloadAnchorNode.setAttribute("download", "ingestor-template.json");
+          document.body.appendChild(downloadAnchorNode);
+          downloadAnchorNode.click();
+          downloadAnchorNode.remove();
+        }
+      }
+    });
   }
 
   // Upload a template of metadata
   onUpload() {
-    console.log("Upload action triggered");
+    const input = document.createElement("input");
+    input.type = "file";
+    input.accept = ".json";
+    input.onchange = (event: any) => {
+      const file = event.target.files[0];
+      if (file) {
+        const reader = new FileReader();
+        reader.onload = (e) => {
+          const content = e.target.result;
+
+          const dialogRef = this.dialog.open(
+            IngestorConfirmationDialogComponent,
+            {
+              data: {
+                header: "Confirm template",
+                message: "Do you really want to apply the following values?",
+                //messageComponent: CheckboxComponent,
+              },
+            },
+          );
+          dialogRef.afterClosed().subscribe((result) => {
+            if (result) {
+              try {
+                this.createNewTransferData = JSON.parse(content as string);
+                console.log(this.createNewTransferData.scicatHeader);
+                this.createNewTransferDataChange.emit(
+                  this.createNewTransferData,
+                );
+              } catch (error) {
+                console.error("Error parsing JSON file:", error);
+              }
+            }
+          });
+        };
+        reader.readAsText(file);
+      }
+    };
+    input.click();
   }
 }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index fd91e68979..b7b310a9d2 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -5,7 +5,7 @@ import {
   DialogDataObject,
   IngestionRequestInformation,
   IngestorHelper,
-} from "../ingestor.component-helper";
+} from "../helper/ingestor.component-helper";
 
 @Component({
   selector: "ingestor.extractor-metadata-dialog",
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 4c582288a6..7c0d08c7fe 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -6,13 +6,13 @@ import {
 } from "@angular/core";
 import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
 import { HttpClient } from "@angular/common/http";
-import { INGESTOR_API_ENDPOINTS_V1 } from "../ingestor-api-endpoints";
+import { INGESTOR_API_ENDPOINTS_V1 } from "../helper/ingestor-api-endpoints";
 import {
   DialogDataObject,
   ExtractionMethod,
   IngestionRequestInformation,
   IngestorHelper,
-} from "../ingestor.component-helper";
+} from "../helper/ingestor.component-helper";
 import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 @Component({
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index bf9a2c2d74..195146cfb9 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -6,7 +6,7 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
   SciCatHeader_Schema,
-} from "../ingestor.component-helper";
+} from "../helper/ingestor.component-helper";
 
 @Component({
   selector: "ingestor.user-metadata-dialog",
@@ -76,6 +76,11 @@ export class IngestorUserMetadataDialogComponent {
     this.createNewTransferData.scicatHeader = event;
   }
 
+  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
+    this.createNewTransferData = updatedData;
+    console.log("Transfer data updated:", this.createNewTransferData);
+  }
+
   toggleCardContent(card: string): void {
     this.isCardContentVisible[card] = !this.isCardContentVisible[card];
   }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
index c124c91feb..cfc0e961c7 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
@@ -8,7 +8,7 @@ <h2 mat-dialog-title>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
-  <ingestor-dialog-stepper [activeStep]="1"></ingestor-dialog-stepper>
+  <ingestor-dialog-stepper [activeStep]="1" [createNewTransferData]="createNewTransferData" (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
 
   <div fxLayout="row" fxLayout.xs="column">
     <div fxFlex="80%">
diff --git a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
similarity index 75%
rename from src/app/ingestor/ingestor/ingestor-api-endpoints.ts
rename to src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
index d237ef4fd9..98a98c484f 100644
--- a/src/app/ingestor/ingestor/ingestor-api-endpoints.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
@@ -1,10 +1,17 @@
 export const INGESTOR_API_ENDPOINTS_V1 = {
+  AUTH: {
+    LOGIN: "login",
+    LOGOUT: "logout",
+    USERINFO: "userinfo",
+  },
   DATASET: "dataset",
   TRANSFER: "transfer",
   OTHER: {
     VERSION: "version",
+    HEALTH: "health",
   },
   EXTRACTOR: "extractor",
+  METADATA: "metadata",
 };
 
 export interface PostExtractorEndpoint {
diff --git a/src/app/ingestor/ingestor/ingestor.component-helper.ts b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
similarity index 100%
rename from src/app/ingestor/ingestor/ingestor.component-helper.ts
rename to src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
diff --git a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
new file mode 100644
index 0000000000..28f4ec68b2
--- /dev/null
+++ b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
@@ -0,0 +1,83 @@
+import { Injectable } from "@angular/core";
+import { Subject } from "rxjs";
+
+interface IngestorMetadataEvent {
+  message: string;
+  progress: number;
+  result: boolean;
+  resultMessage: string;
+}
+
+interface ProgressMessage {
+  result?: string;
+  std_err: string;
+  std_out: string;
+}
+
+@Injectable({
+  providedIn: "root",
+})
+export class IngestorMetadataSSEService {
+  private eventSource: EventSource;
+  private messageSubject: Subject<IngestorMetadataEvent> =
+    new Subject<IngestorMetadataEvent>();
+
+  constructor() {}
+
+  public connect(url: string): void {
+    this.eventSource = new EventSource(url);
+
+    this.eventSource.onmessage = (event) => {
+      const messageData = event.data;
+      this.messageSubject.next({
+        message: messageData,
+        progress: 0,
+        result: false,
+        resultMessage: "",
+      });
+    };
+
+    this.eventSource.addEventListener("progress", (event) => {
+      // Decode from base64 and parse JSON
+      const encodedData = atob(event.data.replace(/"/g, ""));
+      const data = JSON.parse(encodedData) as ProgressMessage;
+
+      const progressMessage = data.std_out.toLowerCase();
+      let progress = 0;
+      // Check if data contains the string progress
+      if (progressMessage.includes("progress")) {
+        // extract numbers, point and komma from string using regex
+        const extractedNumbers =
+          progressMessage.match(/[\d.,]+/g)?.join("") || "0";
+        progress = parseFloat(extractedNumbers);
+        progress = isNaN(progress) ? 0 : progress;
+      }
+
+      this.messageSubject.next({
+        message: data.std_out,
+        progress: progress,
+        result: data.result !== undefined,
+        resultMessage: data.result !== undefined ? data.result : "",
+      });
+      // Check if data contains result then close connection
+      if (data.result) {
+        this.disconnect();
+      }
+    });
+
+    this.eventSource.onerror = (error) => {
+      console.error("SSE Fehler:", error);
+      this.eventSource.close();
+    };
+  }
+
+  public getMessages(): Subject<IngestorMetadataEvent> {
+    return this.messageSubject;
+  }
+
+  public disconnect(): void {
+    if (this.eventSource) {
+      this.eventSource.close();
+    }
+  }
+}
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index 454f273f4a..fd585b1831 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -71,6 +71,18 @@
                 </tr>
               </table>
             </mat-tab>
+            <mat-tab label="User information">
+              <!-- Mat List with the most important information about the user connection -->
+              <mat-list>
+                <mat-list-item>
+                  <span matListItemTitle>Username</span>
+                  <span matListItemLine>Name</span>
+                </mat-list-item>
+                <mat-list-item>
+                  <button mat-button (click)="openIngestorLogin()">Login</button>
+                </mat-list-item>
+              </mat-list>
+            </mat-tab>
             <mat-tab label="Connection information">
               <!-- Mat List with the most important information about the backend connection -->
               <mat-list>
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index d082da9173..1671524fef 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -1,13 +1,12 @@
 import { Component, inject, OnInit } from "@angular/core";
 import { AppConfigService } from "app-config.service";
-import { HttpClient } from "@angular/common/http";
+import { HttpClient, HttpParams } from "@angular/common/http";
 import { ActivatedRoute, Router } from "@angular/router";
 import {
   apiGetHealth,
   INGESTOR_API_ENDPOINTS_V1,
   PostDatasetEndpoint,
-  PostExtractorEndpoint,
-} from "./ingestor-api-endpoints";
+} from "./helper/ingestor-api-endpoints";
 import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog.component";
 import { MatDialog } from "@angular/material/dialog";
 import { IngestorUserMetadataDialogComponent } from "./dialog/ingestor.user-metadata-dialog.component";
@@ -16,10 +15,10 @@ import { IngestorConfirmTransferDialogComponent } from "./dialog/ingestor.confir
 import {
   IngestionRequestInformation,
   IngestorHelper,
-  MetadataExtractorResult,
   ScientificMetadata,
   TransferDataListEntry,
-} from "./ingestor.component-helper";
+} from "./helper/ingestor.component-helper";
+import { IngestorMetadataSSEService } from "./helper/ingestor.metadata-sse-service";
 
 @Component({
   selector: "ingestor",
@@ -49,11 +48,14 @@ export class IngestorComponent implements OnInit {
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
+  metadataExtractionStatus = "";
+
   constructor(
     public appConfigService: AppConfigService,
     private http: HttpClient,
     private route: ActivatedRoute,
     private router: Router,
+    private sseService: IngestorMetadataSSEService,
   ) {}
 
   ngOnInit() {
@@ -83,25 +85,27 @@ export class IngestorComponent implements OnInit {
 
     // Try to connect to the facility backend/version to check if it is available
     console.log("Connecting to facility backend: " + facilityBackendUrlVersion);
-    this.http.get(facilityBackendUrlVersion, {withCredentials: true}).subscribe(
-      (response) => {
-        console.log("Connected to facility backend", response);
-        // If the connection is successful, store the connected facility backend URL
-        this.connectedFacilityBackend = facilityBackendUrlCleaned;
-        this.connectingToFacilityBackend = false;
-        this.connectedFacilityBackendVersion = response["version"];
-
-        // TODO Do Health check
-        apiGetHealth();
-      },
-      (error) => {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-        console.error("Request failed", error);
-        this.connectedFacilityBackend = "";
-        this.connectingToFacilityBackend = false;
-        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-      },
-    );
+    this.http
+      .get(facilityBackendUrlVersion, { withCredentials: true })
+      .subscribe(
+        (response) => {
+          console.log("Connected to facility backend", response);
+          // If the connection is successful, store the connected facility backend URL
+          this.connectedFacilityBackend = facilityBackendUrlCleaned;
+          this.connectingToFacilityBackend = false;
+          this.connectedFacilityBackendVersion = response["version"];
+
+          // TODO Do Health check
+          apiGetHealth();
+        },
+        (error) => {
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+          console.error("Request failed", error);
+          this.connectedFacilityBackend = "";
+          this.connectingToFacilityBackend = false;
+          this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+        },
+      );
 
     return true;
   }
@@ -120,7 +124,8 @@ export class IngestorComponent implements OnInit {
     }
     this.http
       .get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {
-        params, withCredentials: true
+        params,
+        withCredentials: true,
       })
       .subscribe(
         (response) => {
@@ -128,7 +133,7 @@ export class IngestorComponent implements OnInit {
           this.transferDataSource = response["transfers"];
         },
         (error) => {
-          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+          this.errorMessage += `${new Date().toLocaleString()}: ${error.type}]<br>`;
           console.error("Request failed", error);
         },
       );
@@ -142,10 +147,10 @@ export class IngestorComponent implements OnInit {
     };
 
     this.http
-      .post(
-        this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET,
-        {payload, withCredentials: true},
-      )
+      .post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET, {
+        payload,
+        withCredentials: true,
+      })
       .subscribe(
         (response) => {
           console.log("Upload successfully started", response);
@@ -174,42 +179,39 @@ export class IngestorComponent implements OnInit {
     this.createNewTransferData.extractorMetaDataReady = false;
     this.createNewTransferData.extractMetaDataRequested = true;
 
-    const payload: PostExtractorEndpoint = {
-      filePath: this.createNewTransferData.selectedPath,
-      methodName: this.createNewTransferData.selectedMethod.name,
-    };
+    const params = new HttpParams()
+      .set("filePath", this.createNewTransferData.selectedPath)
+      .set("methodName", this.createNewTransferData.selectedMethod.name);
+
+    const sseUrl = `${this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.METADATA}?${params.toString()}`;
+
+    this.sseService.connect(sseUrl);
+
+    this.sseService.getMessages().subscribe(
+      (data) => {
+        // TODO Remove logging
+        console.log("Received SSE data:", data);
+        if (data.result) {
+          this.createNewTransferData.extractorMetaDataReady = true;
+          const extractedScientificMetadata = JSON.parse(
+            data.resultMessage,
+          ) as ScientificMetadata;
+
+          this.createNewTransferData.extractorMetaData.instrument =
+            extractedScientificMetadata.instrument ?? {};
+          this.createNewTransferData.extractorMetaData.acquisition =
+            extractedScientificMetadata.acquisition ?? {};
+          this.createNewTransferData.extractorMetaDataReady = true;
+        }
+      },
+      (error) => {
+        console.error("Error receiving SSE data:", error);
+        this.createNewTransferData.apiErrorInformation.metaDataExtraction =
+          true;
+      },
+    );
 
-    return new Promise<boolean>((resolve) => {
-      this.http
-        .post(
-          this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR,
-          {payload, withCredentials: true},
-        )
-        .subscribe(
-          (response) => {
-            console.log("Metadata extraction result", response);
-            const extractedMetadata = response as MetadataExtractorResult;
-            const extractedScientificMetadata = JSON.parse(
-              extractedMetadata.result,
-            ) as ScientificMetadata;
-
-            this.createNewTransferData.extractorMetaData.instrument =
-              extractedScientificMetadata.instrument ?? {};
-            this.createNewTransferData.extractorMetaData.acquisition =
-              extractedScientificMetadata.acquisition ?? {};
-            this.createNewTransferData.extractorMetaDataReady = true;
-            resolve(true);
-          },
-          (error) => {
-            this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-            console.error("Metadata extraction failed", error);
-            this.createNewTransferData.extractorMetaDataReady = true;
-            this.createNewTransferData.apiErrorInformation.metaDataExtraction =
-              true;
-            resolve(false);
-          },
-        );
-    });
+    return true;
   }
 
   onClickForwardToIngestorPage() {
@@ -281,7 +283,7 @@ export class IngestorComponent implements OnInit {
       case 1:
         this.apiStartMetadataExtraction()
           .then((response: boolean) => {
-            if (response) console.log("Metadata extraction finished");
+            if (response) console.log("Metadata extraction started");
             else console.error("Metadata extraction failed");
           })
           .catch((error) => {
@@ -339,8 +341,8 @@ export class IngestorComponent implements OnInit {
         this.connectedFacilityBackend +
           INGESTOR_API_ENDPOINTS_V1.TRANSFER +
           "/" +
-          transferId, 
-          {withCredentials: true}
+          transferId,
+        { withCredentials: true },
       )
       .subscribe(
         (response) => {
@@ -353,4 +355,9 @@ export class IngestorComponent implements OnInit {
         },
       );
   }
+
+  openIngestorLogin(): void {
+    window.location.href =
+      this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.AUTH.LOGIN;
+  }
 }

From e7a440364f83446833a17e3a0ffec89aa1fb0763 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 29 Jan 2025 16:41:06 +0000
Subject: [PATCH 095/245] minor change in effects

---
 src/app/datasets/onedep/onedep.component.ts     |  1 -
 src/app/shared/sdk/models/OneDep.ts             | 17 ++++++++++++++++-
 .../state-management/effects/onedep.effects.ts  |  7 +++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index b0905132e8..4065add83f 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -588,7 +588,6 @@ export class OneDepComponent implements OnInit, OnDestroy {
   }
 
   onDepositClick() {
-    console.log(this.form);
     // Mark the form as submitted (trigger validation)
     this.depositClicked = true;
     this.form.markAllAsTouched();
diff --git a/src/app/shared/sdk/models/OneDep.ts b/src/app/shared/sdk/models/OneDep.ts
index d7d0c5c11e..428c7d31ab 100644
--- a/src/app/shared/sdk/models/OneDep.ts
+++ b/src/app/shared/sdk/models/OneDep.ts
@@ -5,7 +5,22 @@ export interface DepBackendVersion {
 }
 
 export interface OneDepCreated {
-  depID: string;
+  email: string;
+  id: string;
+  pdb_id: string;
+  emdb_id: string;
+  bmrb_id: string;
+  title: string;
+  hold_exp_date: string;
+  created: string;
+  last_login: string;
+  site: string;
+  site_url: string;
+  // Status: Status;
+  experiments: any;
+  // Errors      :OneDepError
+  code: string;
+  message: string;
 }
 
 export interface OneDepUserInfo {
diff --git a/src/app/state-management/effects/onedep.effects.ts b/src/app/state-management/effects/onedep.effects.ts
index ca1792f4ea..28652ba4e0 100644
--- a/src/app/state-management/effects/onedep.effects.ts
+++ b/src/app/state-management/effects/onedep.effects.ts
@@ -79,8 +79,8 @@ export class OneDepEffects {
             from(files).pipe(
               concatMap((file) =>
                 file.fileType === EmFile.Coordinates
-                  ? this.onedepDepositor.sendCoordFile(dep.depID, file.form)
-                  : this.onedepDepositor.sendFile(dep.depID, file.form),
+                  ? this.onedepDepositor.sendCoordFile(dep.id, file.form)
+                  : this.onedepDepositor.sendFile(dep.id, file.form),
               ),
 
               last(),
@@ -104,8 +104,7 @@ export class OneDepEffects {
         const message = {
           type: MessageType.Success,
           content:
-            "Deposition Created Successfully. Deposition ID: " +
-            deposition.depID,
+            "Deposition Created Successfully. Deposition ID: " + deposition.id,
           duration: 5000,
         };
         return of(showMessageAction({ message }));

From 86d0cf21789bc854d8207e165af714c7d1bb619c Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 31 Jan 2025 08:50:38 +0000
Subject: [PATCH 096/245] (still dev stage): fixed templates

---
 src/app/ingestor/ingestor.module.ts           |  3 +-
 .../dialog/checkbox/checkbox.component.ts     | 21 -----
 .../ingestor.confirmation-dialog.component.ts |  6 +-
 .../ingestor.confirmation-dialog.html         |  2 +-
 .../ingestor.export-helper.component.ts       | 35 ++++++++
 ...stor.dialog-stepper.component.component.ts | 82 +++++++++++++++++--
 .../helper/ingestor.metadata-sse-service.ts   |  4 +-
 .../ingestor/ingestor/ingestor.component.html | 29 ++++---
 .../ingestor/ingestor/ingestor.component.scss | 17 ++++
 .../ingestor/ingestor/ingestor.component.ts   | 26 +++---
 10 files changed, 167 insertions(+), 58 deletions(-)
 delete mode 100644 src/app/ingestor/ingestor/dialog/checkbox/checkbox.component.ts
 create mode 100644 src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component.ts

diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 5568b48b06..89e3e0a2d4 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -32,7 +32,7 @@ import { ArrayLayoutRendererCustom } from "./ingestor-metadata-editor/customRend
 import { MatBadgeModule } from "@angular/material/badge";
 import { MatTooltipModule } from "@angular/material/tooltip";
 import { IngestorConfirmationDialogComponent } from "./ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component";
-import { ExportTemplateHelperComponent } from "./ingestor/dialog/checkbox/checkbox.component";
+import { ExportTemplateHelperComponent } from "./ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component";
 
 @NgModule({
   declarations: [
@@ -72,6 +72,7 @@ import { ExportTemplateHelperComponent } from "./ingestor/dialog/checkbox/checkb
     MatBadgeModule,
     JsonFormsModule,
     JsonFormsAngularMaterialModule,
+    CommonModule,
   ],
 })
 export class IngestorModule {}
diff --git a/src/app/ingestor/ingestor/dialog/checkbox/checkbox.component.ts b/src/app/ingestor/ingestor/dialog/checkbox/checkbox.component.ts
deleted file mode 100644
index eedae41b92..0000000000
--- a/src/app/ingestor/ingestor/dialog/checkbox/checkbox.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "export-tempalte-checkbox",
-  template: `
-    <div>
-      <mat-checkbox>Export SciCat</mat-checkbox>
-      <mat-checkbox>Export Organizational</mat-checkbox>
-      <mat-checkbox>Export Sample</mat-checkbox>
-    </div>
-  `,
-  styles: [
-    `
-      div {
-        display: flex;
-        flex-direction: column;
-      }
-    `,
-  ],
-})
-export class ExportTemplateHelperComponent {}
diff --git a/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts b/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts
index 0c49cc789b..c6d174fded 100644
--- a/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, Type } from "@angular/core";
+import { Component, Inject, Injector, Type } from "@angular/core";
 import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
 
 @Component({
@@ -20,6 +20,10 @@ export class IngestorConfirmationDialogComponent {
     return this.data.header || "Confirmation";
   }
 
+  get injector(): Injector {
+    return this.data.injector || null;
+  }
+
   get messageComponent(): Type<any> | null {
     return this.data.messageComponent || null;
   }
diff --git a/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.html b/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.html
index 85ad8a3236..cdcac49b21 100644
--- a/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.html
@@ -10,7 +10,7 @@ <h2 mat-dialog-title>
 <mat-dialog-content class="mat-typography" disableClose="true">
   <div class="confirmation-dialog">
     <p>{{ message }}</p>
-    <ng-container *ngComponentOutlet="messageComponent"></ng-container>
+    <ng-container *ngComponentOutlet="messageComponent; injector: injector"></ng-container>
   </div>
 </mat-dialog-content>
 
diff --git a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component.ts b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component.ts
new file mode 100644
index 0000000000..fcd215d5c2
--- /dev/null
+++ b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component.ts
@@ -0,0 +1,35 @@
+import { Component, Injector } from "@angular/core";
+
+export interface ExportOptions {
+  exportSciCat: boolean;
+  exportOrganizational: boolean;
+  exportSample: boolean;
+}
+
+@Component({
+  selector: "export-template-checkbox",
+  template: `
+    <div>
+      <mat-checkbox [(ngModel)]="data.exportSciCat">Export SciCat</mat-checkbox>
+      <mat-checkbox [(ngModel)]="data.exportOrganizational"
+        >Export Organizational</mat-checkbox
+      >
+      <mat-checkbox [(ngModel)]="data.exportSample">Export Sample</mat-checkbox>
+    </div>
+  `,
+  styles: [
+    `
+      div {
+        display: flex;
+        flex-direction: column;
+      }
+    `,
+  ],
+})
+export class ExportTemplateHelperComponent {
+  data: ExportOptions;
+
+  constructor(public injector: Injector) {
+    this.data = injector.get("data");
+  }
+}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
index 248e87ee75..3a86285cfd 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
@@ -1,8 +1,20 @@
-import { Component, Input, Output, EventEmitter } from "@angular/core";
+import {
+  Component,
+  Input,
+  Output,
+  EventEmitter,
+  Injector,
+} from "@angular/core";
 import { MatDialog } from "@angular/material/dialog";
-import { IngestionRequestInformation } from "../helper/ingestor.component-helper";
+import {
+  IngestionRequestInformation,
+  SciCatHeader,
+} from "../helper/ingestor.component-helper";
 import { IngestorConfirmationDialogComponent } from "./confirmation-dialog/ingestor.confirmation-dialog.component";
-import { ExportTemplateHelperComponent } from "./checkbox/checkbox.component";
+import {
+  ExportOptions,
+  ExportTemplateHelperComponent,
+} from "./dialog-mounting-components/ingestor.export-helper.component";
 
 @Component({
   selector: "ingestor-dialog-stepper",
@@ -15,6 +27,23 @@ export class IngestorDialogStepperComponent {
   @Output() createNewTransferDataChange =
     new EventEmitter<IngestionRequestInformation>();
 
+  testMessageComponent = ExportTemplateHelperComponent;
+
+  exportValueOptions: ExportOptions = {
+    exportSciCat: true,
+    exportOrganizational: false,
+    exportSample: false,
+  };
+
+  injector = Injector.create({
+    providers: [
+      {
+        provide: "data",
+        useValue: this.exportValueOptions,
+      },
+    ],
+  });
+
   constructor(private dialog: MatDialog) {}
 
   // Save a template of metadata
@@ -23,15 +52,45 @@ export class IngestorDialogStepperComponent {
       data: {
         header: "Confirm template",
         message: "Do you really want to apply the following values?",
-        messageComponent: ExportTemplateHelperComponent,
+        messageComponent: this.testMessageComponent,
+        injector: this.injector,
       },
     });
     dialogRef.afterClosed().subscribe((result) => {
       if (result) {
         if (this.createNewTransferData) {
+          const sciCatHeaderWithoutSourcePath = {
+            ...this.createNewTransferData.scicatHeader,
+          } as SciCatHeader;
+          delete sciCatHeaderWithoutSourcePath.sourceFolder;
+
+          const exportData = {};
+          if (this.exportValueOptions.exportSciCat) {
+            exportData["scicatHeader"] = { ...sciCatHeaderWithoutSourcePath };
+          }
+
+          if (
+            this.exportValueOptions.exportOrganizational ||
+            this.exportValueOptions.exportSample
+          ) {
+            exportData["userMetaData"] = {};
+          }
+
+          if (this.exportValueOptions.exportOrganizational) {
+            exportData["userMetaData"]["organizational"] = {
+              ...this.createNewTransferData.userMetaData.organizational,
+            };
+          }
+
+          if (this.exportValueOptions.exportSample) {
+            exportData["userMetaData"]["sample"] = {
+              ...this.createNewTransferData.userMetaData.sample,
+            };
+          }
+
           const dataStr =
             "data:text/json;charset=utf-8," +
-            encodeURIComponent(JSON.stringify(this.createNewTransferData));
+            encodeURIComponent(JSON.stringify(exportData));
           const downloadAnchorNode = document.createElement("a");
           downloadAnchorNode.setAttribute("href", dataStr);
           downloadAnchorNode.setAttribute("download", "ingestor-template.json");
@@ -68,7 +127,18 @@ export class IngestorDialogStepperComponent {
           dialogRef.afterClosed().subscribe((result) => {
             if (result) {
               try {
-                this.createNewTransferData = JSON.parse(content as string);
+                const parsedData = JSON.parse(content as string);
+                this.createNewTransferData = {
+                  ...this.createNewTransferData,
+                  scicatHeader: {
+                    ...this.createNewTransferData.scicatHeader,
+                    ...parsedData.scicatHeader,
+                  },
+                  userMetaData: {
+                    ...this.createNewTransferData.userMetaData,
+                    ...parsedData.userMetaData,
+                  },
+                };
                 console.log(this.createNewTransferData.scicatHeader);
                 this.createNewTransferDataChange.emit(
                   this.createNewTransferData,
diff --git a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
index 28f4ec68b2..0ba7c59aad 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
@@ -24,8 +24,8 @@ export class IngestorMetadataSSEService {
 
   constructor() {}
 
-  public connect(url: string): void {
-    this.eventSource = new EventSource(url);
+  public connect(url: string, withCredentials = true): void {
+    this.eventSource = new EventSource(url, { withCredentials });
 
     this.eventSource.onmessage = (event) => {
       const messageData = event.data;
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index fd585b1831..15131a2579 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -31,9 +31,23 @@
 
         </ng-container>
         <ng-container *ngIf="connectedFacilityBackend !== ''">
+          <mat-divider></mat-divider>
+          <div class="user-info">
+            <div class="user-icon-container">
+              <mat-icon>account_circle</mat-icon>
+              <p>username</p>
+            </div>
+            <button mat-stroked-button
+              (click)="openIngestorLogin()">Login</button>
+            <button mat-stroked-button
+              (click)="openIngestorLogin()">Logout</button>
+          </div>
+          <mat-divider class="divider-down"></mat-divider>
+
           <mat-tab-group animationDuration="0ms">
             <mat-tab label="Transfers">
-              <button matTooltip="Refresh transfer list" mat-button aria-label="Refresh transfer list"
+              <button matTooltip="Refresh transfer list" mat-button
+                aria-label="Refresh transfer list"
                 (click)="onClickRefreshTransferList()">
                 <mat-icon>refresh</mat-icon>
               </button>
@@ -71,18 +85,7 @@
                 </tr>
               </table>
             </mat-tab>
-            <mat-tab label="User information">
-              <!-- Mat List with the most important information about the user connection -->
-              <mat-list>
-                <mat-list-item>
-                  <span matListItemTitle>Username</span>
-                  <span matListItemLine>Name</span>
-                </mat-list-item>
-                <mat-list-item>
-                  <button mat-button (click)="openIngestorLogin()">Login</button>
-                </mat-list-item>
-              </mat-list>
-            </mat-tab>
+
             <mat-tab label="Connection information">
               <!-- Mat List with the most important information about the backend connection -->
               <mat-list>
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index 1fb107fe37..565a8750a5 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -67,4 +67,21 @@ mat-card {
 
 .success-icon {
   color: green;
+}
+
+.user-info {
+  padding: 1em;
+}
+
+.user-info .user-icon-container {
+  display: flex;
+  align-items: center;
+}
+
+.user-info .user-icon-container p {
+  margin: auto 0;
+}
+
+.divider-down {
+  margin-bottom: 1em;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 1671524fef..6efa0f6144 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -129,7 +129,7 @@ export class IngestorComponent implements OnInit {
       })
       .subscribe(
         (response) => {
-          console.log("Transfer list received", response);
+          //console.log("Transfer list received", response);
           this.transferDataSource = response["transfers"];
         },
         (error) => {
@@ -153,7 +153,7 @@ export class IngestorComponent implements OnInit {
       })
       .subscribe(
         (response) => {
-          console.log("Upload successfully started", response);
+          //console.log("Upload successfully started", response);
           this.returnValue = JSON.stringify(response);
           this.loading = false;
         },
@@ -189,8 +189,7 @@ export class IngestorComponent implements OnInit {
 
     this.sseService.getMessages().subscribe(
       (data) => {
-        // TODO Remove logging
-        console.log("Received SSE data:", data);
+        //console.log("Received SSE data:", data);
         if (data.result) {
           this.createNewTransferData.extractorMetaDataReady = true;
           const extractedScientificMetadata = JSON.parse(
@@ -205,7 +204,8 @@ export class IngestorComponent implements OnInit {
         }
       },
       (error) => {
-        console.error("Error receiving SSE data:", error);
+        //console.error("Error receiving SSE data:", error);
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
         this.createNewTransferData.apiErrorInformation.metaDataExtraction =
           true;
       },
@@ -281,14 +281,9 @@ export class IngestorComponent implements OnInit {
 
         break;
       case 1:
-        this.apiStartMetadataExtraction()
-          .then((response: boolean) => {
-            if (response) console.log("Metadata extraction started");
-            else console.error("Metadata extraction failed");
-          })
-          .catch((error) => {
-            console.error("Metadata extraction error", error);
-          });
+        this.apiStartMetadataExtraction().catch((error) => {
+          console.error("Metadata extraction error", error);
+        });
 
         dialogRef = this.dialog.open(IngestorUserMetadataDialogComponent, {
           data: {
@@ -360,4 +355,9 @@ export class IngestorComponent implements OnInit {
     window.location.href =
       this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.AUTH.LOGIN;
   }
+
+  openIngestorLogout(): void {
+    window.location.href =
+      this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.AUTH.LOGOUT;
+  }
 }

From f0394c5eb070490d3053e5c947710a2e195362e6 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 31 Jan 2025 12:18:38 +0000
Subject: [PATCH 097/245] (still dev stage): implemented field checks

---
 .../ingestor-metadata-editor.component.ts     | 10 ++++
 src/app/ingestor/ingestor.module.ts           |  2 +-
 .../ingestor.dialog-stepper.component.css     |  0
 .../ingestor.dialog-stepper.component.html    |  0
 .../ingestor.dialog-stepper.component.ts}     |  6 +--
 ...tor.extractor-metadata-dialog.component.ts | 41 +++++++++++++-
 .../ingestor.extractor-metadata-dialog.html   | 10 ++--
 .../ingestor.new-transfer-dialog.component.ts |  8 ++-
 ...ingestor.user-metadata-dialog.component.ts | 54 +++++++++++++++++--
 .../dialog/ingestor.user-metadata-dialog.html | 12 ++---
 10 files changed, 120 insertions(+), 23 deletions(-)
 rename src/app/ingestor/ingestor/dialog/{ => dialog-mounting-components}/ingestor.dialog-stepper.component.css (100%)
 rename src/app/ingestor/ingestor/dialog/{ => dialog-mounting-components}/ingestor.dialog-stepper.component.html (100%)
 rename src/app/ingestor/ingestor/dialog/{ingestor.dialog-stepper.component.component.ts => dialog-mounting-components/ingestor.dialog-stepper.component.ts} (95%)

diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index d4bf2a72e1..5080180e65 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -9,6 +9,7 @@ import { configuredRenderer } from "./ingestor-metadata-editor-helper";
     [schema]="schema"
     [renderers]="combinedRenderers"
     (dataChange)="onDataChange($event)"
+    (errors)="onErrors($event)"
   ></jsonforms>`,
 })
 export class IngestorMetadataEditorComponent {
@@ -16,6 +17,7 @@ export class IngestorMetadataEditorComponent {
   @Input() schema: JsonSchema;
 
   @Output() dataChange = new EventEmitter<string>();
+  @Output() errors = new EventEmitter<any[]>();
 
   get combinedRenderers() {
     return configuredRenderer;
@@ -24,4 +26,12 @@ export class IngestorMetadataEditorComponent {
   onDataChange(event: any) {
     this.dataChange.emit(event);
   }
+
+  onErrors(errors: any[]) {
+    this.errors.emit(errors);
+  }
+
+  hasErrors(): boolean {
+    return this.errors.length > 0;
+  }
 }
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 89e3e0a2d4..566389dd42 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -24,7 +24,7 @@ import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
 import { IngestorExtractorMetadataDialogComponent } from "./ingestor/dialog/ingestor.extractor-metadata-dialog.component";
 import { IngestorConfirmTransferDialogComponent } from "./ingestor/dialog/ingestor.confirm-transfer-dialog.component";
 import { MatStepperModule } from "@angular/material/stepper";
-import { IngestorDialogStepperComponent } from "./ingestor/dialog/ingestor.dialog-stepper.component.component";
+import { IngestorDialogStepperComponent } from "./ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component";
 import { AnyOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
 import { OneOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/one-of-renderer";
 import { MatRadioModule } from "@angular/material/radio";
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.css
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.css
rename to src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.css
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.html
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.html
rename to src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.html
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
similarity index 95%
rename from src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
rename to src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 3a86285cfd..fd3371a4e5 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.dialog-stepper.component.component.ts
+++ b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -9,12 +9,12 @@ import { MatDialog } from "@angular/material/dialog";
 import {
   IngestionRequestInformation,
   SciCatHeader,
-} from "../helper/ingestor.component-helper";
-import { IngestorConfirmationDialogComponent } from "./confirmation-dialog/ingestor.confirmation-dialog.component";
+} from "../../helper/ingestor.component-helper";
+import { IngestorConfirmationDialogComponent } from "../confirmation-dialog/ingestor.confirmation-dialog.component";
 import {
   ExportOptions,
   ExportTemplateHelperComponent,
-} from "./dialog-mounting-components/ingestor.export-helper.component";
+} from "./ingestor.export-helper.component";
 
 @Component({
   selector: "ingestor-dialog-stepper",
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index b7b310a9d2..466e7c97aa 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -23,8 +23,11 @@ export class IngestorExtractorMetadataDialogComponent {
   extractorMetaDataReady = false;
   extractorMetaDataError = false;
 
-  isAcquisitionMetadataOk = false; // TODO IMPLEMENT VALUE CHECK
-  isInstrumentMetadataOk = false; // TODO IMPLEMENT VALUE CHECK
+  uiNextButtonReady = false;
+  isAcquisitionMetadataOk = false;
+  acquisitionErrors = "";
+  isInstrumentMetadataOk = false;
+  instrumentErrors = "";
 
   isCardContentVisible = {
     instrument: true,
@@ -75,4 +78,38 @@ export class IngestorExtractorMetadataDialogComponent {
   toggleCardContent(card: string): void {
     this.isCardContentVisible[card] = !this.isCardContentVisible[card];
   }
+
+  instrumentErrorsHandler(errors: any[]) {
+    this.isInstrumentMetadataOk = errors.length === 0;
+    this.instrumentErrors = "";
+    errors.forEach((error, number) => {
+      if (error.message) {
+        const ctrNum = number + 1;
+        this.instrumentErrors += ctrNum + ": " + error.message + "\n";
+      }
+    });
+    this.validateNextButton();
+  }
+
+  acquisitionErrorsHandler(errors: any[]) {
+    this.isAcquisitionMetadataOk = errors.length === 0;
+    this.acquisitionErrors = "";
+    errors.forEach((error, number) => {
+      if (error.message) {
+        const ctrNum = number + 1;
+        this.acquisitionErrors += ctrNum + ": " + error.message + "\n";
+      }
+    });
+    this.validateNextButton();
+  }
+
+  validateNextButton(): void {
+    /*this.uiNextButtonReady =
+      this.isInstrumentMetadataOk &&
+      this.isAcquisitionMetadataOk &&
+      this.extractorMetaDataReady;*/
+
+    // TODO: Use upper line if schema values are fine
+    this.uiNextButtonReady = this.extractorMetaDataReady;
+  }
 }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
index 2674b3d860..f4caa06dba 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -40,7 +40,7 @@ <h2 mat-dialog-title>
             Instrument Information
             <span class="spacer"></span>
             <mat-icon
-            matTooltip="TODO - Check if everything is filled out correctly"
+            [matTooltip]="isInstrumentMetadataOk ? 'Your input is correct.' : instrumentErrors"
             [ngClass]="isInstrumentMetadataOk ? 'success-icon' : 'error-icon'">{{
             isInstrumentMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
             <mat-icon class="toggle-icon">{{ isCardContentVisible.instrument ? 'expand_less' : 'expand_more' }}</mat-icon>
@@ -48,7 +48,7 @@ <h2 mat-dialog-title>
           <mat-card-content *ngIf="isCardContentVisible.instrument">
             <app-metadata-editor [schema]="metadataSchemaInstrument"
               [data]="createNewTransferData.extractorMetaData['instrument']"
-              (dataChange)="onDataChangeExtractorMetadataInstrument($event)"></app-metadata-editor>
+              (dataChange)="onDataChangeExtractorMetadataInstrument($event)" (errors)="instrumentErrorsHandler($event)"></app-metadata-editor>
           </mat-card-content>
         </mat-card>
         <mat-card>
@@ -59,7 +59,7 @@ <h2 mat-dialog-title>
             Acquisition Information
             <span class="spacer"></span>
             <mat-icon
-            matTooltip="TODO - Check if everything is filled out correctly"
+            [matTooltip]="isAcquisitionMetadataOk ? 'Your input is correct.' : acquisitionErrors"
             [ngClass]="isAcquisitionMetadataOk ? 'success-icon' : 'error-icon'">{{
             isAcquisitionMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
             <mat-icon class="toggle-icon">{{ isCardContentVisible.acquisition ? 'expand_less' : 'expand_more' }}</mat-icon>
@@ -67,7 +67,7 @@ <h2 mat-dialog-title>
           <mat-card-content *ngIf="isCardContentVisible.acquisition">
             <app-metadata-editor [schema]="metadataSchemaAcquisition"
               [data]="createNewTransferData.extractorMetaData['acquisition']"
-              (dataChange)="onDataChangeExtractorMetadataAcquisition($event)"></app-metadata-editor>
+              (dataChange)="onDataChangeExtractorMetadataAcquisition($event)" (errors)="acquisitionErrorsHandler($event)"></app-metadata-editor>
           </mat-card-content>
         </mat-card>
       </div>
@@ -77,5 +77,5 @@ <h2 mat-dialog-title>
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
   <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
-    (click)="onClickNext()" [disabled]="!extractorMetaDataReady">Next</button>
+    (click)="onClickNext()" [disabled]="!uiNextButtonReady">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 7c0d08c7fe..1d93906636 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -67,7 +67,9 @@ export class IngestorNewTransferDialogComponent implements OnInit {
 
   apiGetExtractionMethods(): void {
     this.http
-      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, {withCredentials: true})
+      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, {
+        withCredentials: true,
+      })
       .subscribe(
         (response: any) => {
           if (response.methods && response.methods.length > 0) {
@@ -85,7 +87,9 @@ export class IngestorNewTransferDialogComponent implements OnInit {
 
   apiGetAvailableFilePaths(): void {
     this.http
-      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET, {withCredentials: true})
+      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET, {
+        withCredentials: true,
+      })
       .subscribe(
         (response: any) => {
           if (response.datasets && response.datasets.length > 0) {
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 195146cfb9..7b20d3fac4 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -22,10 +22,13 @@ export class IngestorUserMetadataDialogComponent {
     IngestorHelper.createEmptyRequestInformation();
   backendURL = "";
 
-  uiNextButtonReady = true; // Change to false when dev is ready
-  isSciCatHeaderOk = false; // TODO IMPLEMENT VALUE CHECK
-  isOrganizationalMetadataOk = false; // TODO IMPLEMENT VALUE CHECK
-  isSampleInformationOk = false; // TODO IMPLEMENT VALUE CHECK
+  uiNextButtonReady = false;
+  isSciCatHeaderOk = false;
+  scicatHeaderErrors = "";
+  isOrganizationalMetadataOk = false;
+  organizationalErrors = "";
+  isSampleInformationOk = false;
+  sampleErrors = "";
 
   isCardContentVisible = {
     scicat: true,
@@ -84,4 +87,47 @@ export class IngestorUserMetadataDialogComponent {
   toggleCardContent(card: string): void {
     this.isCardContentVisible[card] = !this.isCardContentVisible[card];
   }
+
+  scicatHeaderErrorsHandler(errors: any[]) {
+    this.isSciCatHeaderOk = errors.length === 0;
+    this.scicatHeaderErrors = "";
+    errors.forEach((error, number) => {
+      if (error.message) {
+        const ctrNum = number + 1;
+        this.scicatHeaderErrors += ctrNum + ": " + error.message + "\n";
+      }
+    });
+    this.validateNextButton();
+  }
+
+  organizationalErrorsHandler(errors: any[]) {
+    this.isOrganizationalMetadataOk = errors.length === 0;
+    this.organizationalErrors = "";
+    errors.forEach((error, number) => {
+      if (error.message) {
+        const ctrNum = number + 1;
+        this.organizationalErrors += ctrNum + ": " + error.message + "\n";
+      }
+    });
+    this.validateNextButton();
+  }
+
+  sampleErrorsHandler(errors: any[]) {
+    this.isSampleInformationOk = errors.length === 0;
+    this.sampleErrors = "";
+    errors.forEach((error, number) => {
+      if (error.message) {
+        const ctrNum = number + 1;
+        this.sampleErrors += ctrNum + ": " + error.message + "\n";
+      }
+    });
+    this.validateNextButton();
+  }
+
+  validateNextButton(): void {
+    this.uiNextButtonReady =
+      this.isSciCatHeaderOk &&
+      this.isOrganizationalMetadataOk &&
+      this.isSampleInformationOk;
+  }
 }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
index cfc0e961c7..8316d0c900 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
@@ -21,7 +21,7 @@ <h2 mat-dialog-title>
           SciCat Information
           <span class="spacer"></span>
             <mat-icon
-            matTooltip="TODO - Check if everything is filled out correctly"
+            [matTooltip]="isSciCatHeaderOk ? 'Your input is correct.' : scicatHeaderErrors"
             [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'">{{
             isSciCatHeaderOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
           <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ?
@@ -30,7 +30,7 @@ <h2 mat-dialog-title>
         <mat-card-content *ngIf="isCardContentVisible.scicat">
           <app-metadata-editor [schema]="scicatHeaderSchema"
             [data]="createNewTransferData.scicatHeader"
-            (dataChange)="onDataChangeUserScicatHeader($event)"></app-metadata-editor>
+            (dataChange)="onDataChangeUserScicatHeader($event)" (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
 
@@ -43,7 +43,7 @@ <h2 mat-dialog-title>
           Organizational Information
           <span class="spacer"></span>
           <mat-icon
-            matTooltip="TODO - Check if everything is filled out correctly"
+            [matTooltip]="isOrganizationalMetadataOk ? 'Your input is correct.' : organizationalErrors"
             [ngClass]="isOrganizationalMetadataOk ? 'success-icon' : 'error-icon'">{{
             isOrganizationalMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
           <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ?
@@ -52,7 +52,7 @@ <h2 mat-dialog-title>
         <mat-card-content *ngIf="isCardContentVisible.organizational">
           <app-metadata-editor [schema]="metadataSchemaOrganizational"
             [data]="createNewTransferData.userMetaData['organizational']"
-            (dataChange)="onDataChangeUserMetadataOrganization($event)"></app-metadata-editor>
+            (dataChange)="onDataChangeUserMetadataOrganization($event)" (errors)="organizationalErrorsHandler($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
 
@@ -65,7 +65,7 @@ <h2 mat-dialog-title>
           Sample Information
           <span class="spacer"></span>
           <mat-icon
-            matTooltip="TODO - Check if everything is filled out correctly"
+            [matTooltip]="isSampleInformationOk ? 'Your input is correct.' : sampleErrors"
             [ngClass]="isSampleInformationOk ? 'success-icon' : 'error-icon'">{{
             isSampleInformationOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
           <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ?
@@ -74,7 +74,7 @@ <h2 mat-dialog-title>
         <mat-card-content *ngIf="isCardContentVisible.sample">
           <app-metadata-editor [schema]="metadataSchemaSample"
             [data]="createNewTransferData.userMetaData['sample']"
-            (dataChange)="onDataChangeUserMetadataSample($event)"></app-metadata-editor>
+            (dataChange)="onDataChangeUserMetadataSample($event)" (errors)="sampleErrorsHandler($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
     </div>

From 8f15eb4e26b7fe0df7904af9af382cc10ea57bf3 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 31 Jan 2025 12:52:30 +0000
Subject: [PATCH 098/245] (still dev stage): bugfixes

---
 .../customRenderer/any-of-renderer.ts         | 20 ++++++++++++++++++-
 ...estor.confirm-transfer-dialog.component.ts |  4 ++++
 .../ingestor.confirm-transfer-dialog.html     |  2 +-
 ...tor.extractor-metadata-dialog.component.ts |  4 ++++
 .../ingestor.extractor-metadata-dialog.html   |  2 +-
 ...ingestor.user-metadata-dialog.component.ts |  3 +--
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 663d693217..6eaf66a1f3 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -2,6 +2,7 @@ import { Component } from "@angular/core";
 import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
 import { ControlProps, JsonSchema } from "@jsonforms/core";
 import { configuredRenderer } from "../ingestor-metadata-editor-helper";
+import { MatCheckboxChange } from "@angular/material/checkbox";
 
 @Component({
   selector: "app-anyof-renderer",
@@ -14,7 +15,7 @@ import { configuredRenderer } from "../ingestor-metadata-editor-helper";
         <mat-checkbox
           *ngIf="options.includes('null')"
           [(ngModel)]="!nullOptionSelected"
-          (change)="nullOptionSelected = !nullOptionSelected"
+          (change)="onEnableCheckboxChange($event)"
         >
           Enabled
         </mat-checkbox></mat-card-title
@@ -91,6 +92,23 @@ export class AnyOfRendererComponent extends JsonFormsControl {
     return selectedSchema;
   }
 
+  public onEnableCheckboxChange(event: MatCheckboxChange) {
+    this.nullOptionSelected = !event.checked;
+
+    if (this.nullOptionSelected) {
+      const updatedData = this.rendererService.getState().jsonforms.core.data;
+      // Update the data in the correct path
+      const pathSegments = this.passedProps.path.split(".");
+      let current = updatedData;
+      for (let i = 0; i < pathSegments.length - 1; i++) {
+        current = current[pathSegments[i]];
+      }
+      current[pathSegments[pathSegments.length - 1]] = null;
+
+      this.rendererService.setData(updatedData);
+    }
+  }
+
   public onInnerJsonFormsChange(event: any) {
     if (event !== this.passedProps.data) {
       const updatedData = this.rendererService.getState().jsonforms.core.data;
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 4857d111e2..2f5f0bde80 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -53,6 +53,10 @@ export class IngestorConfirmTransferDialogComponent implements OnInit {
     return JSON.stringify(scicatMetadata, null, space);
   }
 
+  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
+    Object.assign(this.createNewTransferData, updatedData);
+  }
+
   onClickBack(): void {
     if (this.data && this.data.onClickNext) {
       this.data.onClickNext(2); // Beispielwert für den Schritt
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
index 52dfdddc6a..6b35db73eb 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
@@ -7,7 +7,7 @@ <h2 mat-dialog-title>
   </button>
 </div>
 <mat-dialog-content class="mat-typography">
-  <ingestor-dialog-stepper [activeStep]="3"></ingestor-dialog-stepper>
+  <ingestor-dialog-stepper [activeStep]="3" [createNewTransferData]="createNewTransferData" (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
 
   <p>Confirm Metadata</p>
 
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index 466e7c97aa..aeb389d2e4 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -75,6 +75,10 @@ export class IngestorExtractorMetadataDialogComponent {
     this.createNewTransferData.extractorMetaData["acquisition"] = event;
   }
 
+  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
+    Object.assign(this.createNewTransferData, updatedData);
+  }
+
   toggleCardContent(card: string): void {
     this.isCardContentVisible[card] = !this.isCardContentVisible[card];
   }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
index f4caa06dba..8a7979052b 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -18,7 +18,7 @@ <h2 mat-dialog-title>
   </div>
 
   <div *ngIf="extractorMetaDataReady">
-    <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
+    <ingestor-dialog-stepper [activeStep]="2" [createNewTransferData]="createNewTransferData" (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
     <div *ngIf="extractorMetaDataError" class="error-message">
       <mat-card class="error-card">
         <mat-card-header>
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 7b20d3fac4..709b145d70 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -80,8 +80,7 @@ export class IngestorUserMetadataDialogComponent {
   }
 
   onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
-    this.createNewTransferData = updatedData;
-    console.log("Transfer data updated:", this.createNewTransferData);
+    Object.assign(this.createNewTransferData, updatedData);
   }
 
   toggleCardContent(card: string): void {

From f483aae269452fb2b5e319e0c19bc5947181836b Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 31 Jan 2025 13:41:26 +0000
Subject: [PATCH 099/245] (still dev stage): improved error handling

---
 ...estor.confirm-transfer-dialog.component.ts | 32 +++++++++++--
 .../ingestor.confirm-transfer-dialog.html     | 27 +++++++++--
 .../helper/ingestor.component-helper.ts       |  1 +
 .../ingestor/ingestor/ingestor.component.ts   | 45 +++++++++++--------
 4 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 2f5f0bde80..7dc979cb60 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -11,6 +11,7 @@ import {
   IngestorHelper,
   SciCatHeader,
 } from "../helper/ingestor.component-helper";
+import { IngestorConfirmationDialogComponent } from "./confirmation-dialog/ingestor.confirmation-dialog.component";
 
 @Component({
   selector: "ingestor.confirm-transfer-dialog",
@@ -23,6 +24,7 @@ export class IngestorConfirmTransferDialogComponent implements OnInit {
     IngestorHelper.createEmptyRequestInformation();
   provideMergeMetaData = "";
   backendURL = "";
+  errorMessage = "";
 
   constructor(
     public dialog: MatDialog,
@@ -57,17 +59,39 @@ export class IngestorConfirmTransferDialogComponent implements OnInit {
     Object.assign(this.createNewTransferData, updatedData);
   }
 
+  clearErrorMessage(): void {
+    this.errorMessage = "";
+  }
+
   onClickBack(): void {
     if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(2); // Beispielwert für den Schritt
+      this.data.onClickNext(2);
     }
   }
 
   onClickConfirm(): void {
+    this.errorMessage = "";
     if (this.data && this.data.onClickNext) {
-      this.createNewTransferData.mergedMetaDataString =
-        this.provideMergeMetaData;
-      this.data.onClickNext(4);
+      const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
+        data: {
+          header: "Confirm ingestion",
+          message: "Create a new dataset and start data transfer?",
+        },
+      });
+      dialogRef.afterClosed().subscribe(async (result) => {
+        if (result) {
+          this.createNewTransferData.mergedMetaDataString =
+            this.provideMergeMetaData;
+          try {
+            const success = await this.data.onStartUpload();
+            if (success) {
+              this.data.onClickNext(4);
+            }
+          } catch (error) {
+            this.errorMessage = error.message;
+          }
+        }
+      });
     }
   }
 }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
index 6b35db73eb..d836e88838 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
@@ -2,21 +2,40 @@
   <h2 mat-dialog-title>
     Confirm transfer
   </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close" class="ingestor-close-button">
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
     <mat-icon>close</mat-icon>
   </button>
 </div>
 <mat-dialog-content class="mat-typography">
-  <ingestor-dialog-stepper [activeStep]="3" [createNewTransferData]="createNewTransferData" (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
+  <ingestor-dialog-stepper [activeStep]="3"
+    [createNewTransferData]="createNewTransferData"
+    (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
+
+  <p *ngIf="errorMessage !== ''">
+    <mat-card class="ingestor-card">
+      <mat-card-header class="ingestor-mixed-header">
+        <mat-card-title>
+          <p style="color: red" [innerHTML]="errorMessage"></p>
+        </mat-card-title>
+        <button mat-icon-button class="ingestor-close-button"
+          (click)="clearErrorMessage()">
+          <mat-icon>close</mat-icon>
+        </button>
+      </mat-card-header>
+    </mat-card>
+  </p>
 
   <p>Confirm Metadata</p>
 
   <mat-form-field class="form-full-width">
-    <textarea class="metadata-preview" matInput readonly>{{ provideMergeMetaData }}</textarea>
+    <textarea class="metadata-preview" matInput
+      readonly>{{ provideMergeMetaData }}</textarea>
   </mat-form-field>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" (click)="onClickConfirm()">Ingest</button>
+  <button mat-button color="primary" cdkFocusInitial
+    (click)="onClickConfirm()">Ingest</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
index 910b2fbe35..e53f2967e1 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
@@ -70,6 +70,7 @@ export interface DialogDataObject {
   createNewTransferData: IngestionRequestInformation;
   backendURL: string;
   onClickNext: (step: number) => void;
+  onStartUpload: () => Promise<boolean>;
 }
 
 export class IngestorHelper {
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 6efa0f6144..976da9db0d 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -139,30 +139,37 @@ export class IngestorComponent implements OnInit {
       );
   }
 
-  apiUpload() {
+  apiUpload(): Promise<boolean> {
     this.loading = true;
 
     const payload: PostDatasetEndpoint = {
       metaData: this.createNewTransferData.mergedMetaDataString,
     };
 
-    this.http
-      .post(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET, {
-        payload,
-        withCredentials: true,
-      })
-      .subscribe(
-        (response) => {
-          //console.log("Upload successfully started", response);
-          this.returnValue = JSON.stringify(response);
-          this.loading = false;
-        },
-        (error) => {
-          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-          console.error("Upload failed", error);
-          this.loading = false;
-        },
-      );
+    return new Promise((resolve, reject) => {
+      this.http
+        .post(
+          this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET,
+          {
+            payload,
+            withCredentials: true,
+          },
+        )
+        .subscribe(
+          (response) => {
+            //console.log("Upload successfully started", response);
+            this.returnValue = JSON.stringify(response);
+            this.loading = false;
+            resolve(true);
+          },
+          (error) => {
+            this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
+            console.error("Upload failed", error);
+            this.loading = false;
+            reject(error);
+          },
+        );
+    });
   }
 
   async apiStartMetadataExtraction(): Promise<boolean> {
@@ -308,6 +315,7 @@ export class IngestorComponent implements OnInit {
         dialogRef = this.dialog.open(IngestorConfirmTransferDialogComponent, {
           data: {
             onClickNext: this.onClickNext.bind(this),
+            onStartUpload: this.apiUpload.bind(this),
             createNewTransferData: this.createNewTransferData,
             backendURL: this.connectedFacilityBackend,
           },
@@ -315,7 +323,6 @@ export class IngestorComponent implements OnInit {
         });
         break;
       case 4:
-        this.apiUpload();
         break;
       default:
         console.error("Unknown step", step);

From 84208dad9e9075a5a420b6e7860934a3ce9f44e9 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 31 Jan 2025 17:01:13 +0000
Subject: [PATCH 100/245] Bug Fixes, auto generated models and support of user
 info

---
 .../customRenderer/array-renderer.ts          |   1 -
 .../ingestor/ingestor/_ingestor-theme.scss    |  15 +-
 .../ingestor.dialog-stepper.component.ts      |  11 +-
 ...estor.confirm-transfer-dialog.component.ts |   1 -
 .../ingestor.confirm-transfer-dialog.html     |  20 +-
 ...tor.extractor-metadata-dialog.component.ts |   6 +-
 .../ingestor.new-transfer-dialog.component.ts |   1 -
 ...ingestor.user-metadata-dialog.component.ts |   8 +-
 .../ingestor/helper/ingestor-api-endpoints.ts |  14 +-
 .../ingestor/helper/ingestor-api-manager.ts   | 155 ++++++++++++++
 .../ingestor/ingestor/ingestor.component.html |  34 +--
 .../ingestor/ingestor/ingestor.component.scss |  34 +--
 .../ingestor/ingestor/ingestor.component.ts   | 201 +++++++-----------
 .../ingestor/model/deleteTransferRequest.ts   |  18 ++
 .../ingestor/model/deleteTransferResponse.ts  |  22 ++
 src/app/ingestor/model/getDatasetResponse.ts  |  19 ++
 .../ingestor/model/getExtractorResponse.ts    |  23 ++
 src/app/ingestor/model/getTransferResponse.ts |  20 ++
 src/app/ingestor/model/methodItem.ts          |  19 ++
 src/app/ingestor/model/modelError.ts          |  16 ++
 src/app/ingestor/model/models.ts              |  16 ++
 src/app/ingestor/model/oidcCallbackOk.ts      |  18 ++
 .../model/oidcCallbackOkOAuth2Token.ts        |  22 ++
 .../ingestor/model/oidcCallbackOkUserInfo.ts  |  24 +++
 src/app/ingestor/model/otherHealthResponse.ts |  19 ++
 .../ingestor/model/otherVersionResponse.ts    |  18 ++
 src/app/ingestor/model/postDatasetRequest.ts  |  18 ++
 src/app/ingestor/model/postDatasetResponse.ts |  22 ++
 src/app/ingestor/model/transferItem.ts        |  16 ++
 src/app/ingestor/model/userInfo.ts            |  24 +++
 30 files changed, 641 insertions(+), 194 deletions(-)
 create mode 100644 src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
 create mode 100644 src/app/ingestor/model/deleteTransferRequest.ts
 create mode 100644 src/app/ingestor/model/deleteTransferResponse.ts
 create mode 100644 src/app/ingestor/model/getDatasetResponse.ts
 create mode 100644 src/app/ingestor/model/getExtractorResponse.ts
 create mode 100644 src/app/ingestor/model/getTransferResponse.ts
 create mode 100644 src/app/ingestor/model/methodItem.ts
 create mode 100644 src/app/ingestor/model/modelError.ts
 create mode 100644 src/app/ingestor/model/models.ts
 create mode 100644 src/app/ingestor/model/oidcCallbackOk.ts
 create mode 100644 src/app/ingestor/model/oidcCallbackOkOAuth2Token.ts
 create mode 100644 src/app/ingestor/model/oidcCallbackOkUserInfo.ts
 create mode 100644 src/app/ingestor/model/otherHealthResponse.ts
 create mode 100644 src/app/ingestor/model/otherVersionResponse.ts
 create mode 100644 src/app/ingestor/model/postDatasetRequest.ts
 create mode 100644 src/app/ingestor/model/postDatasetResponse.ts
 create mode 100644 src/app/ingestor/model/transferItem.ts
 create mode 100644 src/app/ingestor/model/userInfo.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
index 49dedb6987..a14d18e241 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
@@ -112,7 +112,6 @@ import {
       </mat-card-content>
     </mat-card>
   `,
-  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 // eslint-disable-next-line @angular-eslint/component-class-suffix
 export class ArrayLayoutRendererCustom
diff --git a/src/app/ingestor/ingestor/_ingestor-theme.scss b/src/app/ingestor/ingestor/_ingestor-theme.scss
index 39875ec92b..8e48d16b6e 100644
--- a/src/app/ingestor/ingestor/_ingestor-theme.scss
+++ b/src/app/ingestor/ingestor/_ingestor-theme.scss
@@ -8,6 +8,7 @@
   $header-2: map-get($color-config, "header-2");
   $header-3: map-get($color-config, "header-3");
   $accent: map-get($color-config, "accent");
+  $warn: map-get($color-config, "warn");
   mat-card {
     .scicat-header {
       background-color: mat.get-color-from-palette($primary, "lighter");
@@ -29,6 +30,18 @@
       background-color: mat.get-color-from-palette($accent, "lighter");
     }
   }
+
+  .error-message {
+    color: mat.get-color-from-palette($warn, "default");
+  }
+
+  .error-icon {
+    color: mat.get-color-from-palette($warn, "default");
+  }
+
+  .success-icon {
+    color: green;
+  }
 }
 
 @mixin theme($theme) {
@@ -36,4 +49,4 @@
   @if $color-config != null {
     @include color($theme);
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index fd3371a4e5..8242dd5b50 100644
--- a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -107,12 +107,13 @@ export class IngestorDialogStepperComponent {
     const input = document.createElement("input");
     input.type = "file";
     input.accept = ".json";
-    input.onchange = (event: any) => {
-      const file = event.target.files[0];
+    input.onchange = (event: Event) => {
+      const target = event.target as HTMLInputElement;
+      const file = target.files?.[0];
       if (file) {
         const reader = new FileReader();
         reader.onload = (e) => {
-          const content = e.target.result;
+          const content = e.target?.result as string;
 
           const dialogRef = this.dialog.open(
             IngestorConfirmationDialogComponent,
@@ -120,14 +121,13 @@ export class IngestorDialogStepperComponent {
               data: {
                 header: "Confirm template",
                 message: "Do you really want to apply the following values?",
-                //messageComponent: CheckboxComponent,
               },
             },
           );
           dialogRef.afterClosed().subscribe((result) => {
             if (result) {
               try {
-                const parsedData = JSON.parse(content as string);
+                const parsedData = JSON.parse(content);
                 this.createNewTransferData = {
                   ...this.createNewTransferData,
                   scicatHeader: {
@@ -139,7 +139,6 @@ export class IngestorDialogStepperComponent {
                     ...parsedData.userMetaData,
                   },
                 };
-                console.log(this.createNewTransferData.scicatHeader);
                 this.createNewTransferDataChange.emit(
                   this.createNewTransferData,
                 );
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 7dc979cb60..1e61f0894f 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -16,7 +16,6 @@ import { IngestorConfirmationDialogComponent } from "./confirmation-dialog/inges
 @Component({
   selector: "ingestor.confirm-transfer-dialog",
   templateUrl: "ingestor.confirm-transfer-dialog.html",
-  changeDetection: ChangeDetectionStrategy.OnPush,
   styleUrls: ["../ingestor.component.scss"],
 })
 export class IngestorConfirmTransferDialogComponent implements OnInit {
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
index d836e88838..0226b835a5 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
@@ -15,23 +15,29 @@ <h2 mat-dialog-title>
   <p *ngIf="errorMessage !== ''">
     <mat-card class="ingestor-card">
       <mat-card-header class="ingestor-mixed-header">
-        <mat-card-title>
-          <p style="color: red" [innerHTML]="errorMessage"></p>
-        </mat-card-title>
+        <mat-card-title>Error message</mat-card-title>
         <button mat-icon-button class="ingestor-close-button"
           (click)="clearErrorMessage()">
           <mat-icon>close</mat-icon>
         </button>
       </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <div>
+          <p style="color: red" [innerHTML]="errorMessage"></p>
+        </div>
+      </mat-card-content>
     </mat-card>
   </p>
 
   <p>Confirm Metadata</p>
 
-  <mat-form-field class="form-full-width">
-    <textarea class="metadata-preview" matInput
-      readonly>{{ provideMergeMetaData }}</textarea>
-  </mat-form-field>
+  <div class="code-editor">
+    <pre class="code">
+    <div *ngFor="let line of provideMergeMetaData.split('\n')">
+      <code>{{ line }}</code>
+    </div>
+    </pre>
+  </div>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end">
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index aeb389d2e4..bb1ae2f823 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Inject } from "@angular/core";
+import { ChangeDetectorRef, Component, Inject } from "@angular/core";
 import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
 import { JsonSchema } from "@jsonforms/core";
 import {
@@ -11,7 +11,6 @@ import {
   selector: "ingestor.extractor-metadata-dialog",
   templateUrl: "ingestor.extractor-metadata-dialog.html",
   styleUrls: ["../ingestor.component.scss"],
-  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class IngestorExtractorMetadataDialogComponent {
   metadataSchemaInstrument: JsonSchema;
@@ -37,6 +36,7 @@ export class IngestorExtractorMetadataDialogComponent {
   constructor(
     public dialog: MatDialog,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+    private cdr: ChangeDetectorRef,
   ) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
@@ -93,6 +93,7 @@ export class IngestorExtractorMetadataDialogComponent {
       }
     });
     this.validateNextButton();
+    this.cdr.detectChanges();
   }
 
   acquisitionErrorsHandler(errors: any[]) {
@@ -105,6 +106,7 @@ export class IngestorExtractorMetadataDialogComponent {
       }
     });
     this.validateNextButton();
+    this.cdr.detectChanges();
   }
 
   validateNextButton(): void {
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 1d93906636..60df4e0005 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -18,7 +18,6 @@ import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/
 @Component({
   selector: "ingestor.new-transfer-dialog",
   templateUrl: "ingestor.new-transfer-dialog.html",
-  changeDetection: ChangeDetectionStrategy.OnPush,
   styleUrls: ["../ingestor.component.scss"],
 })
 export class IngestorNewTransferDialogComponent implements OnInit {
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 709b145d70..58f1e74726 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Inject } from "@angular/core";
+import { ChangeDetectorRef, Component, Inject } from "@angular/core";
 import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
 import { JsonSchema } from "@jsonforms/core";
 import {
@@ -11,7 +11,6 @@ import {
 @Component({
   selector: "ingestor.user-metadata-dialog",
   templateUrl: "ingestor.user-metadata-dialog.html",
-  changeDetection: ChangeDetectionStrategy.OnPush,
   styleUrls: ["../ingestor.component.scss"],
 })
 export class IngestorUserMetadataDialogComponent {
@@ -39,6 +38,7 @@ export class IngestorUserMetadataDialogComponent {
   constructor(
     public dialog: MatDialog,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+    private cdr: ChangeDetectorRef,
   ) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
@@ -50,7 +50,6 @@ export class IngestorUserMetadataDialogComponent {
         .sample;
 
     this.metadataSchemaOrganizational = organizationalSchema;
-
     this.metadataSchemaSample = sampleSchema;
     this.scicatHeaderSchema = SciCatHeader_Schema;
   }
@@ -97,6 +96,7 @@ export class IngestorUserMetadataDialogComponent {
       }
     });
     this.validateNextButton();
+    this.cdr.detectChanges();
   }
 
   organizationalErrorsHandler(errors: any[]) {
@@ -109,6 +109,7 @@ export class IngestorUserMetadataDialogComponent {
       }
     });
     this.validateNextButton();
+    this.cdr.detectChanges();
   }
 
   sampleErrorsHandler(errors: any[]) {
@@ -121,6 +122,7 @@ export class IngestorUserMetadataDialogComponent {
       }
     });
     this.validateNextButton();
+    this.cdr.detectChanges();
   }
 
   validateNextButton(): void {
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
index 98a98c484f..753d3710f7 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
@@ -14,15 +14,5 @@ export const INGESTOR_API_ENDPOINTS_V1 = {
   METADATA: "metadata",
 };
 
-export interface PostExtractorEndpoint {
-  filePath: string;
-  methodName: string;
-}
-
-export interface PostDatasetEndpoint {
-  metaData: string;
-}
-
-export const apiGetHealth = () => {
-  console.log("Health check"); // TODO IMPLEMENT
-};
+export const LAST_USED_FALLBACK =
+  '["http://localhost:8000", "http://localhost:8888"]';
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
new file mode 100644
index 0000000000..6f2a76ce73
--- /dev/null
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -0,0 +1,155 @@
+import { HttpClient, HttpParams } from "@angular/common/http";
+import { Injectable } from "@angular/core";
+import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
+import { TransferDataListEntry } from "./ingestor.component-helper";
+import {
+  DeleteTransferResponse,
+  OtherHealthResponse,
+  OtherVersionResponse,
+  PostDatasetRequest,
+  UserInfo,
+} from "ingestor/model/models";
+
+@Injectable({
+  providedIn: "root",
+})
+export class IngestorAPIManager {
+  private connectUrl: string;
+  private connectOptions: object;
+
+  constructor(private http: HttpClient) { }
+
+  public connect(url: string, withCredentials = true): void {
+    this.connectUrl = url;
+    this.connectOptions = { withCredentials: withCredentials };
+  }
+
+  public getVersion(): Promise<OtherVersionResponse> {
+    const params = new HttpParams();
+    return new Promise((resolve, reject) => {
+      this.http
+        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION, {
+          params,
+          ...this.connectOptions,
+        })
+        .subscribe(
+          (response) => {
+            resolve(response as OtherVersionResponse);
+          },
+          (error) => {
+            reject(error);
+          },
+        );
+    });
+  }
+
+  public getUserInfo(): Promise<UserInfo> {
+    const params = new HttpParams();
+    return new Promise((resolve, reject) => {
+      this.http
+        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.AUTH.USERINFO, {
+          params,
+          ...this.connectOptions,
+        })
+        .subscribe(
+          (response) => {
+            resolve(response as UserInfo);
+          },
+          (error) => {
+            reject(error);
+          },
+        );
+    });
+  }
+
+  public getHealth(): Promise<OtherHealthResponse> {
+    const params = new HttpParams();
+    return new Promise((resolve, reject) => {
+      this.http
+        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.OTHER.HEALTH, {
+          params,
+          ...this.connectOptions,
+        })
+        .subscribe(
+          (response) => {
+            resolve(response as OtherHealthResponse);
+          },
+          (error) => {
+            reject(error);
+          },
+        );
+    });
+  }
+
+  public cancelTransfer(transferId: string): Promise<DeleteTransferResponse> {
+    const params = new HttpParams().set("transferId", transferId);
+
+    console.log("Cancel transfer", transferId);
+    return new Promise((resolve, reject) => {
+      this.http
+        .delete(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {
+          params,
+          ...this.connectOptions,
+        })
+        .subscribe(
+          (response) => {
+            resolve(response as DeleteTransferResponse);
+          },
+          (error) => {
+            reject(error);
+          },
+        );
+    });
+  }
+
+  public getTransferList(
+    page: number,
+    pageSize: number,
+    transferId?: string,
+  ): Promise<TransferDataListEntry[]> {
+    const params: any = {
+      page: page.toString(),
+      pageSize: pageSize.toString(),
+    };
+    if (transferId) {
+      params.transferId = transferId;
+    }
+    return new Promise((resolve, reject) => {
+      this.http
+        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {
+          params,
+          ...this.connectOptions,
+        })
+        .subscribe(
+          (response) => {
+            const transferDataList: TransferDataListEntry[] =
+              response["transfers"];
+            resolve(transferDataList);
+          },
+          (error) => {
+            reject(error);
+          },
+        );
+    });
+  }
+
+  public startIngestion(payload: PostDatasetRequest): Promise<string> {
+    return new Promise((resolve, reject) => {
+      this.http
+        .post(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET, {
+          payload,
+          ...this.connectOptions,
+        })
+        .subscribe(
+          (response) => {
+            const returnValue = JSON.stringify(response);
+            resolve(returnValue);
+          },
+          (error) => {
+            console.error("Upload failed", error);
+            reject(error);
+          },
+        );
+    });
+  }
+}
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index 15131a2579..597aa00a5a 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -32,14 +32,14 @@
         </ng-container>
         <ng-container *ngIf="connectedFacilityBackend !== ''">
           <mat-divider></mat-divider>
-          <div class="user-info">
-            <div class="user-icon-container">
+          <div *ngIf="userInfo !== null" class="user-info">
+            <div *ngIf="userInfo.logged_in" class="user-icon-container">
               <mat-icon>account_circle</mat-icon>
-              <p>username</p>
+              <p>Hello, {{ userInfo.name }}</p>
             </div>
-            <button mat-stroked-button
+            <button *ngIf="!userInfo.logged_in" mat-stroked-button
               (click)="openIngestorLogin()">Login</button>
-            <button mat-stroked-button
+            <button *ngIf="userInfo.logged_in" mat-stroked-button
               (click)="openIngestorLogin()">Logout</button>
           </div>
           <mat-divider class="divider-down"></mat-divider>
@@ -100,17 +100,12 @@
                 </mat-list-item>
                 <mat-list-item>
                   <span matListItemTitle>Version</span>
-                  <span matListItemLine>{{ connectedFacilityBackendVersion
+                  <span matListItemLine>{{ versionInfo.version
                     }}</span>
                 </mat-list-item>
                 <mat-list-item>
                   <span matListItemTitle>Health Status</span>
-                  <ng-container *ngFor="let status of ingestorHealthStatus">
-                    <mat-list-item>
-                      <span matListItemTitle>{{ status.title }}</span>
-                      <span matListItemLine>{{ status.value }}</span>
-                    </mat-list-item>
-                  </ng-container>
+                  <span matListItemLine>{{ healthInfo.status }}</span>
                 </mat-list-item>
               </mat-list>
             </mat-tab>
@@ -136,21 +131,6 @@
   </mat-card>
 </p>
 
-<p *ngIf="returnValue !== ''">
-  <mat-card class="ingestor-card">
-    <mat-card-header>
-      <mat-card-title>Return Value</mat-card-title>
-    </mat-card-header>
-    <mat-card-content class="ingestor-vertical-layout">
-      <div>
-      </div>
-      <div>
-        <p>{{returnValue}}</p>
-      </div>
-    </mat-card-content>
-  </mat-card>
-</p>
-
 <p *ngIf="errorMessage !== ''">
   <mat-card class="ingestor-card">
     <mat-card-header class="ingestor-mixed-header">
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index 565a8750a5..1b2e344634 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -57,18 +57,6 @@ mat-card {
   flex: 1 1 auto;
 }
 
-.error-message {
-  color: red;
-}
-
-.error-icon {
-  color: red;
-}
-
-.success-icon {
-  color: green;
-}
-
 .user-info {
   padding: 1em;
 }
@@ -76,6 +64,7 @@ mat-card {
 .user-info .user-icon-container {
   display: flex;
   align-items: center;
+  margin-bottom: 0.5em;
 }
 
 .user-info .user-icon-container p {
@@ -84,4 +73,23 @@ mat-card {
 
 .divider-down {
   margin-bottom: 1em;
-}
\ No newline at end of file
+}
+
+.code-editor pre.code {
+  white-space: pre-wrap;
+  counter-reset: listing; 
+  line-height: 0.1;
+}
+.code-editor pre.code code {
+  counter-increment: listing; 
+  display: flex;
+  line-height: 1;
+}
+
+.code-editor pre.code code::before {
+  content: counter(listing) " ";
+  display: inline-block;
+  width: 2em; /* Breite für die Zeilennummern */
+  text-align: right; /* Rechtsbündige Zeilennummern */
+  margin-right: 0.5em; /* Abstand zwischen Zeilennummer und Code */
+}
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 976da9db0d..ea7083bff3 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -2,11 +2,7 @@ import { Component, inject, OnInit } from "@angular/core";
 import { AppConfigService } from "app-config.service";
 import { HttpClient, HttpParams } from "@angular/common/http";
 import { ActivatedRoute, Router } from "@angular/router";
-import {
-  apiGetHealth,
-  INGESTOR_API_ENDPOINTS_V1,
-  PostDatasetEndpoint,
-} from "./helper/ingestor-api-endpoints";
+import { INGESTOR_API_ENDPOINTS_V1 } from "./helper/ingestor-api-endpoints";
 import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog.component";
 import { MatDialog } from "@angular/material/dialog";
 import { IngestorUserMetadataDialogComponent } from "./dialog/ingestor.user-metadata-dialog.component";
@@ -19,6 +15,13 @@ import {
   TransferDataListEntry,
 } from "./helper/ingestor.component-helper";
 import { IngestorMetadataSSEService } from "./helper/ingestor.metadata-sse-service";
+import { IngestorAPIManager } from "./helper/ingestor-api-manager";
+import {
+  UserInfo,
+  OtherHealthResponse,
+  OtherVersionResponse,
+  PostDatasetRequest,
+} from "ingestor/model/models";
 
 @Component({
   selector: "ingestor",
@@ -33,17 +36,18 @@ export class IngestorComponent implements OnInit {
   forwardFacilityBackend = "";
 
   connectedFacilityBackend = "";
-  connectedFacilityBackendVersion = "";
-  connectingToFacilityBackend = false;
-  ingestorHealthStatus = [];
+  connectingToFacilityBackend = true;
 
   lastUsedFacilityBackends: string[] = [];
 
   transferDataSource: TransferDataListEntry[] = []; // List of files to be transferred
   displayedColumns: string[] = ["transferId", "status", "actions"];
 
+  versionInfo: OtherVersionResponse = null;
+  userInfo: UserInfo = null;
+  healthInfo: OtherHealthResponse = null;
+
   errorMessage = "";
-  returnValue = "";
 
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
@@ -55,124 +59,90 @@ export class IngestorComponent implements OnInit {
     private http: HttpClient,
     private route: ActivatedRoute,
     private router: Router,
+    private apiManager: IngestorAPIManager,
     private sseService: IngestorMetadataSSEService,
-  ) {}
+  ) { }
 
   ngOnInit() {
-    this.connectingToFacilityBackend = true;
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
     this.transferDataSource = [];
+
     // Get the GET parameter 'backendUrl' from the URL
     this.route.queryParams.subscribe((params) => {
       const backendUrl = params["backendUrl"];
       if (backendUrl) {
-        this.apiConnectToFacilityBackend(backendUrl);
+        this.initializeIngestorConnection(backendUrl);
       } else {
         this.connectingToFacilityBackend = false;
       }
     });
   }
 
-  apiConnectToFacilityBackend(facilityBackendUrl: string): boolean {
+  async initializeIngestorConnection(
+    facilityBackendUrl: string,
+  ): Promise<boolean> {
+    this.connectingToFacilityBackend = true;
     let facilityBackendUrlCleaned = facilityBackendUrl.slice();
     // Check if last symbol is a slash and add version endpoint
     if (!facilityBackendUrlCleaned.endsWith("/")) {
       facilityBackendUrlCleaned += "/";
     }
 
-    const facilityBackendUrlVersion =
-      facilityBackendUrlCleaned + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION;
-
-    // Try to connect to the facility backend/version to check if it is available
-    console.log("Connecting to facility backend: " + facilityBackendUrlVersion);
-    this.http
-      .get(facilityBackendUrlVersion, { withCredentials: true })
-      .subscribe(
-        (response) => {
-          console.log("Connected to facility backend", response);
-          // If the connection is successful, store the connected facility backend URL
-          this.connectedFacilityBackend = facilityBackendUrlCleaned;
-          this.connectingToFacilityBackend = false;
-          this.connectedFacilityBackendVersion = response["version"];
-
-          // TODO Do Health check
-          apiGetHealth();
-        },
-        (error) => {
-          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-          console.error("Request failed", error);
-          this.connectedFacilityBackend = "";
-          this.connectingToFacilityBackend = false;
-          this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-        },
-      );
+    this.apiManager.connect(facilityBackendUrlCleaned);
 
-    return true;
-  }
+    this.connectedFacilityBackend = facilityBackendUrlCleaned;
 
-  apiGetTransferList(
-    page: number,
-    pageSize: number,
-    transferId?: string,
-  ): void {
-    const params: any = {
-      page: page.toString(),
-      pageSize: pageSize.toString(),
-    };
-    if (transferId) {
-      params.transferId = transferId;
+    try {
+      this.versionInfo = await this.apiManager.getVersion();
+    } catch (error) {
+      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+      this.connectedFacilityBackend = "";
+      this.connectingToFacilityBackend = false;
+      this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+      return false;
     }
-    this.http
-      .get(this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {
-        params,
-        withCredentials: true,
-      })
-      .subscribe(
-        (response) => {
-          //console.log("Transfer list received", response);
-          this.transferDataSource = response["transfers"];
-        },
-        (error) => {
-          this.errorMessage += `${new Date().toLocaleString()}: ${error.type}]<br>`;
-          console.error("Request failed", error);
-        },
-      );
+
+    try {
+      this.userInfo = await this.apiManager.getUserInfo();
+    } catch (error) {
+      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+    }
+
+    try {
+      this.healthInfo = await this.apiManager.getHealth();
+    } catch (error) {
+      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+    }
+
+    this.connectingToFacilityBackend = false;
+    return true;
   }
 
-  apiUpload(): Promise<boolean> {
+  async ingestDataset(): Promise<boolean> {
     this.loading = true;
 
-    const payload: PostDatasetEndpoint = {
+    const payload: PostDatasetRequest = {
       metaData: this.createNewTransferData.mergedMetaDataString,
     };
 
-    return new Promise((resolve, reject) => {
-      this.http
-        .post(
-          this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.DATASET,
-          {
-            payload,
-            withCredentials: true,
-          },
-        )
-        .subscribe(
-          (response) => {
-            //console.log("Upload successfully started", response);
-            this.returnValue = JSON.stringify(response);
-            this.loading = false;
-            resolve(true);
-          },
-          (error) => {
-            this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-            console.error("Upload failed", error);
-            this.loading = false;
-            reject(error);
-          },
-        );
-    });
+    try {
+      const result = await this.apiManager.startIngestion(payload);
+      if (result) {
+        this.loading = false;
+        this.onClickRefreshTransferList();
+        return true;
+      }
+    } catch (error) {
+      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+      this.loading = false;
+      throw error;
+    }
+
+    this.loading = false;
+    return false;
   }
 
-  async apiStartMetadataExtraction(): Promise<boolean> {
+  async startMetadataExtraction(): Promise<boolean> {
     this.createNewTransferData.apiErrorInformation.metaDataExtraction = false;
 
     if (this.createNewTransferData.extractMetaDataRequested) {
@@ -227,7 +197,7 @@ export class IngestorComponent implements OnInit {
 
       // If current route is equal to the forward route, the router will not navigate to the new route
       if (this.connectedFacilityBackend === this.forwardFacilityBackend) {
-        this.apiConnectToFacilityBackend(this.forwardFacilityBackend);
+        this.initializeIngestorConnection(this.forwardFacilityBackend);
         return;
       }
 
@@ -238,7 +208,6 @@ export class IngestorComponent implements OnInit {
   }
 
   onClickDisconnectIngestor() {
-    this.returnValue = "";
     this.connectedFacilityBackend = "";
     // Remove the GET parameter 'backendUrl' from the URL
     this.router.navigate(["/ingestor"]);
@@ -288,7 +257,7 @@ export class IngestorComponent implements OnInit {
 
         break;
       case 1:
-        this.apiStartMetadataExtraction().catch((error) => {
+        this.startMetadataExtraction().catch((error) => {
           console.error("Metadata extraction error", error);
         });
 
@@ -315,7 +284,7 @@ export class IngestorComponent implements OnInit {
         dialogRef = this.dialog.open(IngestorConfirmTransferDialogComponent, {
           data: {
             onClickNext: this.onClickNext.bind(this),
-            onStartUpload: this.apiUpload.bind(this),
+            onStartUpload: this.ingestDataset.bind(this),
             createNewTransferData: this.createNewTransferData,
             backendURL: this.connectedFacilityBackend,
           },
@@ -332,30 +301,22 @@ export class IngestorComponent implements OnInit {
     if (dialogRef === null) return;
   }
 
-  onClickRefreshTransferList(): void {
-    this.apiGetTransferList(1, 100);
+  async onClickRefreshTransferList(): Promise<void> {
+    try {
+      const transferList = await this.apiManager.getTransferList(1, 100);
+      this.transferDataSource = transferList;
+    } catch (error) {
+      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+    }
   }
 
-  onCancelTransfer(transferId: string) {
-    console.log("Cancel transfer", transferId);
-    this.http
-      .delete(
-        this.connectedFacilityBackend +
-          INGESTOR_API_ENDPOINTS_V1.TRANSFER +
-          "/" +
-          transferId,
-        { withCredentials: true },
-      )
-      .subscribe(
-        (response) => {
-          console.log("Transfer cancelled", response);
-          this.apiGetTransferList(1, 100);
-        },
-        (error) => {
-          this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-          console.error("Cancel transfer failed", error);
-        },
-      );
+  async onCancelTransfer(transferId: string) {
+    try {
+      await this.apiManager.cancelTransfer(transferId);
+      this.onClickRefreshTransferList();
+    } catch (error) {
+      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+    }
   }
 
   openIngestorLogin(): void {
diff --git a/src/app/ingestor/model/deleteTransferRequest.ts b/src/app/ingestor/model/deleteTransferRequest.ts
new file mode 100644
index 0000000000..d8f2b4a25b
--- /dev/null
+++ b/src/app/ingestor/model/deleteTransferRequest.ts
@@ -0,0 +1,18 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface DeleteTransferRequest { 
+    /**
+     * Ingestion id to abort the ingestion
+     */
+    ingestId?: string;
+}
+
diff --git a/src/app/ingestor/model/deleteTransferResponse.ts b/src/app/ingestor/model/deleteTransferResponse.ts
new file mode 100644
index 0000000000..786c3b8ea2
--- /dev/null
+++ b/src/app/ingestor/model/deleteTransferResponse.ts
@@ -0,0 +1,22 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface DeleteTransferResponse { 
+    /**
+     * Ingestion id to abort the ingestion
+     */
+    ingestId?: string;
+    /**
+     * New status of the ingestion.
+     */
+    status?: string;
+}
+
diff --git a/src/app/ingestor/model/getDatasetResponse.ts b/src/app/ingestor/model/getDatasetResponse.ts
new file mode 100644
index 0000000000..1f51aca662
--- /dev/null
+++ b/src/app/ingestor/model/getDatasetResponse.ts
@@ -0,0 +1,19 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface GetDatasetResponse { 
+    datasets: Array<string>;
+    /**
+     * Total number of datasets.
+     */
+    total: number;
+}
+
diff --git a/src/app/ingestor/model/getExtractorResponse.ts b/src/app/ingestor/model/getExtractorResponse.ts
new file mode 100644
index 0000000000..dcb0fe81c1
--- /dev/null
+++ b/src/app/ingestor/model/getExtractorResponse.ts
@@ -0,0 +1,23 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { MethodItem } from './methodItem';
+
+
+export interface GetExtractorResponse { 
+    /**
+     * List of the metadata extraction method names configured in the ingestor
+     */
+    methods: Array<MethodItem>;
+    /**
+     * Total number of methods
+     */
+    total: number;
+}
+
diff --git a/src/app/ingestor/model/getTransferResponse.ts b/src/app/ingestor/model/getTransferResponse.ts
new file mode 100644
index 0000000000..d4ced9554c
--- /dev/null
+++ b/src/app/ingestor/model/getTransferResponse.ts
@@ -0,0 +1,20 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { TransferItem } from './transferItem';
+
+
+export interface GetTransferResponse { 
+    transfers?: Array<TransferItem>;
+    /**
+     * Total number of transfers.
+     */
+    total?: number;
+}
+
diff --git a/src/app/ingestor/model/methodItem.ts b/src/app/ingestor/model/methodItem.ts
new file mode 100644
index 0000000000..a627161859
--- /dev/null
+++ b/src/app/ingestor/model/methodItem.ts
@@ -0,0 +1,19 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+/**
+ * a method item describes the method\'s name and schema
+ */
+export interface MethodItem { 
+    name: string;
+    schema: string;
+}
+
diff --git a/src/app/ingestor/model/modelError.ts b/src/app/ingestor/model/modelError.ts
new file mode 100644
index 0000000000..0661161548
--- /dev/null
+++ b/src/app/ingestor/model/modelError.ts
@@ -0,0 +1,16 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface ModelError { 
+    code: string;
+    message: string;
+}
+
diff --git a/src/app/ingestor/model/models.ts b/src/app/ingestor/model/models.ts
new file mode 100644
index 0000000000..80b7aa2695
--- /dev/null
+++ b/src/app/ingestor/model/models.ts
@@ -0,0 +1,16 @@
+export * from './deleteTransferRequest';
+export * from './deleteTransferResponse';
+export * from './getDatasetResponse';
+export * from './getExtractorResponse';
+export * from './getTransferResponse';
+export * from './methodItem';
+export * from './modelError';
+export * from './oidcCallbackOk';
+export * from './oidcCallbackOkOAuth2Token';
+export * from './oidcCallbackOkUserInfo';
+export * from './otherHealthResponse';
+export * from './otherVersionResponse';
+export * from './postDatasetRequest';
+export * from './postDatasetResponse';
+export * from './transferItem';
+export * from './userInfo';
diff --git a/src/app/ingestor/model/oidcCallbackOk.ts b/src/app/ingestor/model/oidcCallbackOk.ts
new file mode 100644
index 0000000000..9dbbd2a8e1
--- /dev/null
+++ b/src/app/ingestor/model/oidcCallbackOk.ts
@@ -0,0 +1,18 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { OidcCallbackOkUserInfo } from './oidcCallbackOkUserInfo';
+import { OidcCallbackOkOAuth2Token } from './oidcCallbackOkOAuth2Token';
+
+
+export interface OidcCallbackOk { 
+    OAuth2Token: OidcCallbackOkOAuth2Token;
+    UserInfo: OidcCallbackOkUserInfo;
+}
+
diff --git a/src/app/ingestor/model/oidcCallbackOkOAuth2Token.ts b/src/app/ingestor/model/oidcCallbackOkOAuth2Token.ts
new file mode 100644
index 0000000000..5c4258d153
--- /dev/null
+++ b/src/app/ingestor/model/oidcCallbackOkOAuth2Token.ts
@@ -0,0 +1,22 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+/**
+ * Oauth2 Token object
+ */
+export interface OidcCallbackOkOAuth2Token { 
+    access_token: string;
+    token_type?: string;
+    refresh_token?: string;
+    expiry?: string;
+    expires_in?: number;
+}
+
diff --git a/src/app/ingestor/model/oidcCallbackOkUserInfo.ts b/src/app/ingestor/model/oidcCallbackOkUserInfo.ts
new file mode 100644
index 0000000000..c9326e6812
--- /dev/null
+++ b/src/app/ingestor/model/oidcCallbackOkUserInfo.ts
@@ -0,0 +1,24 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+/**
+ * OIDC UserInfo object
+ */
+export interface OidcCallbackOkUserInfo { 
+    /**
+     * subject of user
+     */
+    sub: string;
+    profile: string;
+    email: string;
+    email_verified: boolean;
+}
+
diff --git a/src/app/ingestor/model/otherHealthResponse.ts b/src/app/ingestor/model/otherHealthResponse.ts
new file mode 100644
index 0000000000..73e42ab54b
--- /dev/null
+++ b/src/app/ingestor/model/otherHealthResponse.ts
@@ -0,0 +1,19 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface OtherHealthResponse { 
+    /**
+     * Status of the ingestor.
+     */
+    status: string;
+    errors?: { [key: string]: string; };
+}
+
diff --git a/src/app/ingestor/model/otherVersionResponse.ts b/src/app/ingestor/model/otherVersionResponse.ts
new file mode 100644
index 0000000000..ca66142d50
--- /dev/null
+++ b/src/app/ingestor/model/otherVersionResponse.ts
@@ -0,0 +1,18 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface OtherVersionResponse { 
+    /**
+     * Version of the ingestor.
+     */
+    version?: string;
+}
+
diff --git a/src/app/ingestor/model/postDatasetRequest.ts b/src/app/ingestor/model/postDatasetRequest.ts
new file mode 100644
index 0000000000..bbfb835e1a
--- /dev/null
+++ b/src/app/ingestor/model/postDatasetRequest.ts
@@ -0,0 +1,18 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface PostDatasetRequest { 
+    /**
+     * The metadata of the dataset.
+     */
+    metaData: string;
+}
+
diff --git a/src/app/ingestor/model/postDatasetResponse.ts b/src/app/ingestor/model/postDatasetResponse.ts
new file mode 100644
index 0000000000..1fbc4e15ab
--- /dev/null
+++ b/src/app/ingestor/model/postDatasetResponse.ts
@@ -0,0 +1,22 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface PostDatasetResponse { 
+    /**
+     * The unique ingestion id of the dataset.
+     */
+    ingestId?: string;
+    /**
+     * The status of the ingestion. Can be used to send a message back to the ui.
+     */
+    status?: string;
+}
+
diff --git a/src/app/ingestor/model/transferItem.ts b/src/app/ingestor/model/transferItem.ts
new file mode 100644
index 0000000000..78b9e45a47
--- /dev/null
+++ b/src/app/ingestor/model/transferItem.ts
@@ -0,0 +1,16 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface TransferItem { 
+    transferId?: string;
+    status?: string;
+}
+
diff --git a/src/app/ingestor/model/userInfo.ts b/src/app/ingestor/model/userInfo.ts
new file mode 100644
index 0000000000..9bb3df47c8
--- /dev/null
+++ b/src/app/ingestor/model/userInfo.ts
@@ -0,0 +1,24 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface UserInfo { 
+    logged_in: boolean;
+    subject?: string;
+    profile?: string;
+    email?: string;
+    roles?: Array<string>;
+    preferred_username?: string;
+    name?: string;
+    family_name?: string;
+    given_name?: string;
+    expires_at?: string;
+}
+

From 1c0a9534da859664340471d53f1db19a0eae9b66 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 31 Jan 2025 17:25:06 +0000
Subject: [PATCH 101/245] Support no_auth mode

---
 .../ingestor/ingestor/ingestor.component.html | 159 ++++++++++--------
 .../ingestor/ingestor/ingestor.component.ts   |  12 +-
 2 files changed, 94 insertions(+), 77 deletions(-)

diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index 597aa00a5a..97188c6a35 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -31,85 +31,97 @@
 
         </ng-container>
         <ng-container *ngIf="connectedFacilityBackend !== ''">
-          <mat-divider></mat-divider>
-          <div *ngIf="userInfo !== null" class="user-info">
-            <div *ngIf="userInfo.logged_in" class="user-icon-container">
-              <mat-icon>account_circle</mat-icon>
-              <p>Hello, {{ userInfo.name }}</p>
+          <div *ngIf="!authIsDisabled">
+            <mat-divider></mat-divider>
+            <div *ngIf="userInfo !== null" class="user-info">
+              <div *ngIf="userInfo.logged_in" class="user-icon-container">
+                <mat-icon>account_circle</mat-icon>
+                <p>Hello, {{ userInfo.name }}</p>
+              </div>
+              <div *ngIf="!userInfo.logged_in">
+                <button  mat-stroked-button
+                  (click)="openIngestorLogin()">Login</button>
+                  <br><br>
+                  <div class="user-icon-container">
+                    <mat-icon>error</mat-icon>
+                    <p>Please log in to the Ingestor to start a transfer. </p>
+                  </div>
+              </div>
+              <div *ngIf="userInfo.logged_in">
+                <button mat-stroked-button
+                  (click)="openIngestorLogin()">Logout</button>
+              </div>
             </div>
-            <button *ngIf="!userInfo.logged_in" mat-stroked-button
-              (click)="openIngestorLogin()">Login</button>
-            <button *ngIf="userInfo.logged_in" mat-stroked-button
-              (click)="openIngestorLogin()">Logout</button>
+            <mat-divider class="divider-down"></mat-divider>
           </div>
-          <mat-divider class="divider-down"></mat-divider>
 
-          <mat-tab-group animationDuration="0ms">
-            <mat-tab label="Transfers">
-              <button matTooltip="Refresh transfer list" mat-button
-                aria-label="Refresh transfer list"
-                (click)="onClickRefreshTransferList()">
-                <mat-icon>refresh</mat-icon>
-              </button>
-              <table mat-table [dataSource]="transferDataSource"
-                class="mat-elevation-z8">
-                <ng-container matColumnDef="transferId">
-                  <th mat-header-cell *matHeaderCellDef><b>ID</b> </th>
-                  <td mat-cell *matCellDef="let element"> {{element.transferId}}
-                  </td>
-                </ng-container>
+            <mat-tab-group animationDuration="0ms">
+              <mat-tab *ngIf="authIsDisabled || userInfo?.logged_in" label="Transfers">
+                <button matTooltip="Refresh transfer list" mat-button
+                  aria-label="Refresh transfer list"
+                  (click)="onClickRefreshTransferList()">
+                  <mat-icon>refresh</mat-icon>
+                </button>
+                <table mat-table [dataSource]="transferDataSource"
+                  class="mat-elevation-z8">
+                  <ng-container matColumnDef="transferId">
+                    <th mat-header-cell *matHeaderCellDef><b>ID</b> </th>
+                    <td mat-cell *matCellDef="let element">
+                      {{element.transferId}}
+                    </td>
+                  </ng-container>
 
-                <ng-container matColumnDef="status">
-                  <th mat-header-cell *matHeaderCellDef><b>Status</b> </th>
-                  <td mat-cell *matCellDef="let element"> {{element.status}}
-                  </td>
-                </ng-container>
+                  <ng-container matColumnDef="status">
+                    <th mat-header-cell *matHeaderCellDef><b>Status</b> </th>
+                    <td mat-cell *matCellDef="let element"> {{element.status}}
+                    </td>
+                  </ng-container>
 
-                <ng-container matColumnDef="actions">
-                  <th mat-header-cell *matHeaderCellDef class="text-right">
-                    <b>Action</b>
-                  </th>
-                  <td mat-cell *matCellDef="let element" class="text-right">
-                    <button mat-button aria-label="Delete transfer"
-                      (click)="onCancelTransfer(element.transferId)">
-                      <mat-icon>delete</mat-icon>
-                    </button>
-                    <button mat-button aria-label="Pause transfer">
-                      <mat-icon>pause_circle</mat-icon>
-                    </button>
-                  </td>
-                </ng-container>
+                  <ng-container matColumnDef="actions">
+                    <th mat-header-cell *matHeaderCellDef class="text-right">
+                      <b>Action</b>
+                    </th>
+                    <td mat-cell *matCellDef="let element" class="text-right">
+                      <button mat-button aria-label="Delete transfer"
+                        (click)="onCancelTransfer(element.transferId)">
+                        <mat-icon>delete</mat-icon>
+                      </button>
+                      <button mat-button aria-label="Pause transfer">
+                        <mat-icon>pause_circle</mat-icon>
+                      </button>
+                    </td>
+                  </ng-container>
 
-                <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-                <tr mat-row *matRowDef="let row; columns: displayedColumns;">
-                </tr>
-              </table>
-            </mat-tab>
+                  <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+                  <tr mat-row *matRowDef="let row; columns: displayedColumns;">
+                  </tr>
+                </table>
+              </mat-tab>
 
-            <mat-tab label="Connection information">
-              <!-- Mat List with the most important information about the backend connection -->
-              <mat-list>
-                <mat-list-item>
-                  <span matListItemTitle>Backend URL</span>
-                  <span matListItemLine>{{ connectedFacilityBackend }} <a
-                      (click)="onClickDisconnectIngestor()">change</a></span>
-                </mat-list-item>
-                <mat-list-item>
-                  <span matListItemTitle>Connection Status</span>
-                  <span matListItemLine style="color: green;">Connected</span>
-                </mat-list-item>
-                <mat-list-item>
-                  <span matListItemTitle>Version</span>
-                  <span matListItemLine>{{ versionInfo.version
-                    }}</span>
-                </mat-list-item>
-                <mat-list-item>
-                  <span matListItemTitle>Health Status</span>
-                  <span matListItemLine>{{ healthInfo.status }}</span>
-                </mat-list-item>
-              </mat-list>
-            </mat-tab>
-          </mat-tab-group>
+              <mat-tab label="Connection information">
+                <!-- Mat List with the most important information about the backend connection -->
+                <mat-list>
+                  <mat-list-item>
+                    <span matListItemTitle>Backend URL</span>
+                    <span matListItemLine>{{ connectedFacilityBackend }} <a
+                        (click)="onClickDisconnectIngestor()">change</a></span>
+                  </mat-list-item>
+                  <mat-list-item>
+                    <span matListItemTitle>Connection Status</span>
+                    <span matListItemLine style="color: green;">Connected</span>
+                  </mat-list-item>
+                  <mat-list-item>
+                    <span matListItemTitle>Version</span>
+                    <span matListItemLine>{{ versionInfo.version
+                      }}</span>
+                  </mat-list-item>
+                  <mat-list-item>
+                    <span matListItemTitle>Health Status</span>
+                    <span matListItemLine>{{ healthInfo.status }}</span>
+                  </mat-list-item>
+                </mat-list>
+              </mat-tab>
+            </mat-tab-group>
           <br><br>
         </ng-container>
       </div>
@@ -117,7 +129,8 @@
   </mat-card>
 </p>
 
-<p *ngIf="connectedFacilityBackend !== ''">
+<p *ngIf="connectedFacilityBackend !== '' && (authIsDisabled ||
+  userInfo?.logged_in)">
   <mat-card class="ingestor-card">
     <mat-card-header>
       <mat-card-title>New transfer</mat-card-title>
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index ea7083bff3..69aa383f42 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -1,6 +1,6 @@
 import { Component, inject, OnInit } from "@angular/core";
 import { AppConfigService } from "app-config.service";
-import { HttpClient, HttpParams } from "@angular/common/http";
+import { HttpParams } from "@angular/common/http";
 import { ActivatedRoute, Router } from "@angular/router";
 import { INGESTOR_API_ENDPOINTS_V1 } from "./helper/ingestor-api-endpoints";
 import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog.component";
@@ -45,6 +45,7 @@ export class IngestorComponent implements OnInit {
 
   versionInfo: OtherVersionResponse = null;
   userInfo: UserInfo = null;
+  authIsDisabled = false;
   healthInfo: OtherHealthResponse = null;
 
   errorMessage = "";
@@ -56,7 +57,6 @@ export class IngestorComponent implements OnInit {
 
   constructor(
     public appConfigService: AppConfigService,
-    private http: HttpClient,
     private route: ActivatedRoute,
     private router: Router,
     private apiManager: IngestorAPIManager,
@@ -88,7 +88,7 @@ export class IngestorComponent implements OnInit {
       facilityBackendUrlCleaned += "/";
     }
 
-    this.apiManager.connect(facilityBackendUrlCleaned);
+    this.apiManager.connect(facilityBackendUrlCleaned, !this.authIsDisabled);
 
     this.connectedFacilityBackend = facilityBackendUrlCleaned;
 
@@ -105,7 +105,11 @@ export class IngestorComponent implements OnInit {
     try {
       this.userInfo = await this.apiManager.getUserInfo();
     } catch (error) {
-      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+      if (String(error.error).includes("disabled")) {
+        this.authIsDisabled = true;
+      } else {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+      }
     }
 
     try {

From 8821fb0abe95b93fbd49c2bd9434e4c3d9afff36 Mon Sep 17 00:00:00 2001
From: Philipp Wissmann <philipp.wissmann@ethz.ch>
Date: Mon, 3 Feb 2025 11:41:15 +0100
Subject: [PATCH 102/245] Fix: payload not passed correctly in POST /dataset
 request

---
 src/app/ingestor/ingestor/helper/ingestor-api-manager.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index 6f2a76ce73..04a4e57ed1 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -136,10 +136,12 @@ export class IngestorAPIManager {
   public startIngestion(payload: PostDatasetRequest): Promise<string> {
     return new Promise((resolve, reject) => {
       this.http
-        .post(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET, {
+        .post(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET, 
           payload,
+          {
           ...this.connectOptions,
-        })
+          }
+        )
         .subscribe(
           (response) => {
             const returnValue = JSON.stringify(response);

From d6a36533daf51bea40ce00eb8d79bfbd6249abd9 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 6 Feb 2025 16:15:11 +0000
Subject: [PATCH 103/245] (dev-stage): Use scicat token for dataset request;
 started using pagination; bugfixes

---
 src/app/ingestor/ingestor.module.ts           |   2 +
 .../ingestor.new-transfer-dialog.component.ts |  17 +-
 .../dialog/ingestor.new-transfer-dialog.html  |  30 ++-
 .../ingestor/helper/ingestor-api-manager.ts   |  65 ++++--
 .../ingestor/ingestor/ingestor.component.html | 202 ++++++++++--------
 .../ingestor/ingestor/ingestor.component.scss |   4 +
 .../ingestor/ingestor/ingestor.component.ts   |  60 +++++-
 .../ingestor/model/deleteTransferRequest.ts   |   4 +-
 .../ingestor/model/deleteTransferResponse.ts  |   6 +-
 src/app/ingestor/model/postDatasetRequest.ts  |   4 +
 src/app/ingestor/model/postDatasetResponse.ts |   6 +-
 11 files changed, 265 insertions(+), 135 deletions(-)

diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 566389dd42..0a0c40fe33 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -33,6 +33,7 @@ import { MatBadgeModule } from "@angular/material/badge";
 import { MatTooltipModule } from "@angular/material/tooltip";
 import { IngestorConfirmationDialogComponent } from "./ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component";
 import { ExportTemplateHelperComponent } from "./ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component";
+import { MatPaginatorModule } from "@angular/material/paginator";
 
 @NgModule({
   declarations: [
@@ -73,6 +74,7 @@ import { ExportTemplateHelperComponent } from "./ingestor/dialog/dialog-mounting
     JsonFormsModule,
     JsonFormsAngularMaterialModule,
     CommonModule,
+    MatPaginatorModule,
   ],
 })
 export class IngestorModule {}
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 60df4e0005..4150a02105 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -1,9 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Inject,
-  OnInit,
-} from "@angular/core";
+import { Component, Inject, OnInit } from "@angular/core";
 import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
 import { HttpClient } from "@angular/common/http";
 import { INGESTOR_API_ENDPOINTS_V1 } from "../helper/ingestor-api-endpoints";
@@ -65,6 +60,16 @@ export class IngestorNewTransferDialogComponent implements OnInit {
   }
 
   apiGetExtractionMethods(): void {
+    /*try {
+      this.transferDataInformation = await this.apiManager.getTransferList(
+        this.transferDataPageIndex + 1,
+        this.transferDataPageSize,
+      );
+    } catch (error) {
+      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+    }*/
+
+
     this.http
       .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, {
         withCredentials: true,
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
index e3d6ba2a30..b2eb4a0436 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -2,26 +2,34 @@
   <h2 mat-dialog-title>
     Select your ingestion method
   </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close" class="ingestor-close-button">
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
     <mat-icon>close</mat-icon>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
   <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
 
-  <p>Please select the dataset to be uploaded and the appropriate metadata extractor method.</p>
+  <p>Please select the dataset to be uploaded and the appropriate metadata
+    extractor method.</p>
 
   <div>
     <mat-form-field class="form-full-width">
       <mat-label>File Path</mat-label>
       <input matInput [(ngModel)]="selectedPath" [matAutocomplete]="auto">
       <mat-autocomplete #auto="matAutocomplete">
-        <mat-option *ngFor="let sourceFolder of availableFilePaths" [value]="sourceFolder">
+        <mat-option *ngFor="let sourceFolder of availableFilePaths"
+          [value]="sourceFolder">
           {{ sourceFolder }}
         </mat-option>
       </mat-autocomplete>
     </mat-form-field>
-    <mat-error *ngIf="availableFilePathsError">{{ availableFilePathsError }}</mat-error>
+    <mat-error *ngIf="availableFilePathsError">{{ availableFilePathsError
+      }}</mat-error>
+
+    <!-- <mat-paginator [length]="100" [pageSize]="25" aria-label="Select page"
+      [hidePageSize]="true" [showFirstLastButtons]="false">
+    </mat-paginator> -->
   </div>
 
   <div>
@@ -33,13 +41,19 @@ <h2 mat-dialog-title>
         </mat-option>
       </mat-select>
     </mat-form-field>
-    <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError }}</mat-error>
+    <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError
+      }}</mat-error>
+
+    <!--<mat-paginator [length]="100" [pageSize]="25" aria-label="Select page"
+      [hidePageSize]="true" [showFirstLastButtons]="false">
+    </mat-paginator>-->
   </div>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button *ngIf="availableFilePathsError || extractionMethodsError" mat-button color="warn" (click)="onClickRetryRequests()">Retry</button>
+  <button *ngIf="availableFilePathsError || extractionMethodsError" mat-button
+    color="warn" (click)="onClickRetryRequests()">Retry</button>
   <button mat-button mat-dialog-close>Cancel</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true" [disabled]="!uiNextButtonReady"
-    (click)="onClickNext()">Next</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index 04a4e57ed1..f2cc2d9313 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -1,9 +1,11 @@
 import { HttpClient, HttpParams } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
-import { TransferDataListEntry } from "./ingestor.component-helper";
 import {
   DeleteTransferResponse,
+  GetDatasetResponse,
+  GetExtractorResponse,
+  GetTransferResponse,
   OtherHealthResponse,
   OtherVersionResponse,
   PostDatasetRequest,
@@ -17,7 +19,7 @@ export class IngestorAPIManager {
   private connectUrl: string;
   private connectOptions: object;
 
-  constructor(private http: HttpClient) { }
+  constructor(private http: HttpClient) {}
 
   public connect(url: string, withCredentials = true): void {
     this.connectUrl = url;
@@ -82,13 +84,13 @@ export class IngestorAPIManager {
   }
 
   public cancelTransfer(transferId: string): Promise<DeleteTransferResponse> {
-    const params = new HttpParams().set("transferId", transferId);
+    const body = { ingestId: transferId };
 
     console.log("Cancel transfer", transferId);
     return new Promise((resolve, reject) => {
       this.http
         .delete(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {
-          params,
+          body,
           ...this.connectOptions,
         })
         .subscribe(
@@ -106,7 +108,7 @@ export class IngestorAPIManager {
     page: number,
     pageSize: number,
     transferId?: string,
-  ): Promise<TransferDataListEntry[]> {
+  ): Promise<GetTransferResponse> {
     const params: any = {
       page: page.toString(),
       pageSize: pageSize.toString(),
@@ -122,9 +124,7 @@ export class IngestorAPIManager {
         })
         .subscribe(
           (response) => {
-            const transferDataList: TransferDataListEntry[] =
-              response["transfers"];
-            resolve(transferDataList);
+            resolve(response as GetTransferResponse);
           },
           (error) => {
             reject(error);
@@ -136,12 +136,9 @@ export class IngestorAPIManager {
   public startIngestion(payload: PostDatasetRequest): Promise<string> {
     return new Promise((resolve, reject) => {
       this.http
-        .post(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET, 
-          payload,
-          {
+        .post(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET, payload, {
           ...this.connectOptions,
-          }
-        )
+        })
         .subscribe(
           (response) => {
             const returnValue = JSON.stringify(response);
@@ -154,4 +151,46 @@ export class IngestorAPIManager {
         );
     });
   }
+
+  public getExtractionMethods(): Promise<GetExtractorResponse> {
+    const params = new HttpParams();
+
+    return new Promise((resolve, reject) => {
+      this.http
+        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, {
+          params,
+          ...this.connectOptions,
+        })
+        .subscribe(
+          (response: GetExtractorResponse) => {
+            resolve(response as GetExtractorResponse);
+          },
+          (error) => {
+            console.error(error);
+            reject(error);
+          },
+        );
+    });
+  }
+
+  public getAvailableFilePaths(): Promise<GetDatasetResponse> {
+    const params = new HttpParams();
+
+    return new Promise((resolve, reject) => {
+      this.http
+        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET, {
+          params,
+          ...this.connectOptions,
+        })
+        .subscribe(
+          (response: GetDatasetResponse) => {
+            resolve(response as GetDatasetResponse);
+          },
+          (error) => {
+            console.error(error);
+            reject(error);
+          },
+        );
+    });
+  }
 }
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index 97188c6a35..71c83820c1 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -1,82 +1,96 @@
-<p>
+<p *ngIf="(this.sciCatLoggedIn$ | async) === false">
   <mat-card class="ingestor-card">
     <mat-card-header>
-      <mat-card-title>Control center</mat-card-title>
+      <mat-card-title>Log-In to SciCat</mat-card-title>
     </mat-card-header>
     <mat-card-content class="ingestor-vertical-layout">
-      <div *ngIf="connectingToFacilityBackend">
-        <mat-progress-spinner diameter="20"
-          mode="indeterminate"></mat-progress-spinner>
-      </div>
-      <div *ngIf="!connectingToFacilityBackend">
-        <ng-container *ngIf="connectedFacilityBackend === ''">
-          <p style="color: red;">No Backend connected</p>
-
-          <p>Please provide a valid Backend URL</p>
-          <mat-form-field>
-            <input matInput placeholder="Backend URL"
-              [(ngModel)]="forwardFacilityBackend">
-          </mat-form-field>
-          <button mat-raised-button color="primary"
-            (click)="onClickForwardToIngestorPage()">Connect</button>
-
-          <div>
-            <ul>
-              <li *ngFor="let backend of lastUsedFacilityBackends">
-                <a (click)="onClickSelectFacilityBackend(backend)">{{ backend
-                  }}</a>
-              </li>
-            </ul>
-          </div>
+      <p>
+        Please Log in to SciCat first.
+      </p>
+    </mat-card-content>
+  </mat-card>
+</p>
 
-        </ng-container>
-        <ng-container *ngIf="connectedFacilityBackend !== ''">
-          <div *ngIf="!authIsDisabled">
-            <mat-divider></mat-divider>
-            <div *ngIf="userInfo !== null" class="user-info">
-              <div *ngIf="userInfo.logged_in" class="user-icon-container">
-                <mat-icon>account_circle</mat-icon>
-                <p>Hello, {{ userInfo.name }}</p>
-              </div>
-              <div *ngIf="!userInfo.logged_in">
-                <button  mat-stroked-button
-                  (click)="openIngestorLogin()">Login</button>
+<div *ngIf="(this.sciCatLoggedIn$ | async) === true">
+  <p>
+    <mat-card class="ingestor-card">
+      <mat-card-header>
+        <mat-card-title>Control center</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <div *ngIf="connectingToFacilityBackend">
+          <mat-progress-spinner diameter="20"
+            mode="indeterminate"></mat-progress-spinner>
+        </div>
+        <div *ngIf="!connectingToFacilityBackend">
+          <ng-container *ngIf="connectedFacilityBackend === ''">
+            <p style="color: red;">No Backend connected</p>
+  
+            <p>Please provide a valid Backend URL</p>
+            <mat-form-field>
+              <input matInput placeholder="Backend URL"
+                [(ngModel)]="forwardFacilityBackend">
+            </mat-form-field>
+            <button mat-raised-button color="primary"
+              (click)="onClickForwardToIngestorPage()">Connect</button>
+  
+            <div>
+              <ul>
+                <li *ngFor="let backend of lastUsedFacilityBackends">
+                  <a (click)="onClickSelectFacilityBackend(backend)">{{ backend
+                    }}</a>
+                </li>
+              </ul>
+            </div>
+  
+          </ng-container>
+          <ng-container *ngIf="connectedFacilityBackend !== ''">
+            <div *ngIf="!authIsDisabled">
+              <mat-divider></mat-divider>
+              <div *ngIf="userInfo !== null" class="user-info">
+                <div *ngIf="userInfo.logged_in" class="user-icon-container">
+                  <mat-icon>account_circle</mat-icon>
+                  <p>Hello, {{ userInfo.name }}</p>
+                </div>
+                <div *ngIf="!userInfo.logged_in">
+                  <button mat-stroked-button
+                    (click)="openIngestorLogin()">Login</button>
                   <br><br>
                   <div class="user-icon-container">
                     <mat-icon>error</mat-icon>
                     <p>Please log in to the Ingestor to start a transfer. </p>
                   </div>
+                </div>
+                <div *ngIf="userInfo.logged_in">
+                  <button mat-stroked-button
+                    (click)="openIngestorLogin()">Logout</button>
+                </div>
               </div>
-              <div *ngIf="userInfo.logged_in">
-                <button mat-stroked-button
-                  (click)="openIngestorLogin()">Logout</button>
-              </div>
+              <mat-divider class="divider-down"></mat-divider>
             </div>
-            <mat-divider class="divider-down"></mat-divider>
-          </div>
-
+  
             <mat-tab-group animationDuration="0ms">
-              <mat-tab *ngIf="authIsDisabled || userInfo?.logged_in" label="Transfers">
+              <mat-tab *ngIf="authIsDisabled || userInfo?.logged_in"
+                label="Transfers">
                 <button matTooltip="Refresh transfer list" mat-button
                   aria-label="Refresh transfer list"
-                  (click)="onClickRefreshTransferList()">
+                  (click)="doRefreshTransferList()">
                   <mat-icon>refresh</mat-icon>
                 </button>
-                <table mat-table [dataSource]="transferDataSource"
-                  class="mat-elevation-z8">
+                <table *ngIf="transferDataInformation !== null" mat-table [dataSource]="transferDataInformation.transfers">
                   <ng-container matColumnDef="transferId">
                     <th mat-header-cell *matHeaderCellDef><b>ID</b> </th>
                     <td mat-cell *matCellDef="let element">
                       {{element.transferId}}
                     </td>
                   </ng-container>
-
+  
                   <ng-container matColumnDef="status">
                     <th mat-header-cell *matHeaderCellDef><b>Status</b> </th>
                     <td mat-cell *matCellDef="let element"> {{element.status}}
                     </td>
                   </ng-container>
-
+  
                   <ng-container matColumnDef="actions">
                     <th mat-header-cell *matHeaderCellDef class="text-right">
                       <b>Action</b>
@@ -91,13 +105,18 @@
                       </button>
                     </td>
                   </ng-container>
-
+  
                   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                   <tr mat-row *matRowDef="let row; columns: displayedColumns;">
                   </tr>
                 </table>
+  
+                <mat-paginator *ngIf="transferDataInformation !== null" class="transferPaginator" [length]="transferDataInformation.total"
+                  [pageSize]="transferDataPageSize" [pageSizeOptions]="transferDataPageSizeOptions" [pageIndex]="transferDataPageIndex" (page)="onTransferPageChange($event)"
+                  aria-label="Select page">
+                </mat-paginator>
               </mat-tab>
-
+  
               <mat-tab label="Connection information">
                 <!-- Mat List with the most important information about the backend connection -->
                 <mat-list>
@@ -122,41 +141,42 @@
                 </mat-list>
               </mat-tab>
             </mat-tab-group>
-          <br><br>
-        </ng-container>
-      </div>
-    </mat-card-content>
-  </mat-card>
-</p>
-
-<p *ngIf="connectedFacilityBackend !== '' && (authIsDisabled ||
-  userInfo?.logged_in)">
-  <mat-card class="ingestor-card">
-    <mat-card-header>
-      <mat-card-title>New transfer</mat-card-title>
-    </mat-card-header>
-    <mat-card-content class="ingestor-vertical-layout">
-      <button mat-fab aria-label="Add a new dataset transfer" color="primary"
-        (click)="onClickAddIngestion()">
-        <mat-icon>add</mat-icon>
-      </button>
-    </mat-card-content>
-  </mat-card>
-</p>
-
-<p *ngIf="errorMessage !== ''">
-  <mat-card class="ingestor-card">
-    <mat-card-header class="ingestor-mixed-header">
-      <mat-card-title>Error message</mat-card-title>
-      <button mat-icon-button class="ingestor-close-button"
-        (click)="clearErrorMessage()">
-        <mat-icon>close</mat-icon>
-      </button>
-    </mat-card-header>
-    <mat-card-content class="ingestor-vertical-layout">
-      <div>
-        <p style="color: red" [innerHTML]="errorMessage"></p>
-      </div>
-    </mat-card-content>
-  </mat-card>
-</p>
\ No newline at end of file
+            <br><br>
+          </ng-container>
+        </div>
+      </mat-card-content>
+    </mat-card>
+  </p>
+  
+  <p *ngIf="connectedFacilityBackend !== '' && (authIsDisabled ||
+    userInfo?.logged_in)">
+    <mat-card class="ingestor-card">
+      <mat-card-header>
+        <mat-card-title>New transfer</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <button mat-fab aria-label="Add a new dataset transfer" color="primary"
+          (click)="onClickAddIngestion()">
+          <mat-icon>add</mat-icon>
+        </button>
+      </mat-card-content>
+    </mat-card>
+  </p>
+  
+  <p *ngIf="errorMessage !== ''">
+    <mat-card class="ingestor-card">
+      <mat-card-header class="ingestor-mixed-header">
+        <mat-card-title>Error message</mat-card-title>
+        <button mat-icon-button class="ingestor-close-button"
+          (click)="clearErrorMessage()">
+          <mat-icon>close</mat-icon>
+        </button>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <div>
+          <p style="color: red" [innerHTML]="errorMessage"></p>
+        </div>
+      </mat-card-content>
+    </mat-card>
+  </p>
+</div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index 1b2e344634..52d7526d4f 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -93,3 +93,7 @@ mat-card {
   text-align: right; /* Rechtsbündige Zeilennummern */
   margin-right: 0.5em; /* Abstand zwischen Zeilennummer und Code */
 }
+
+.transferPaginator {
+  margin-top: 1.5em;
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 69aa383f42..657932dd89 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -12,7 +12,6 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
   ScientificMetadata,
-  TransferDataListEntry,
 } from "./helper/ingestor.component-helper";
 import { IngestorMetadataSSEService } from "./helper/ingestor.metadata-sse-service";
 import { IngestorAPIManager } from "./helper/ingestor-api-manager";
@@ -21,7 +20,18 @@ import {
   OtherHealthResponse,
   OtherVersionResponse,
   PostDatasetRequest,
+  GetTransferResponse,
 } from "ingestor/model/models";
+import { PageChangeEvent } from "shared/modules/table/table.component";
+import { Store } from "@ngrx/store";
+import {
+  selectIsLoggedIn,
+  selectUserSettingsPageViewModel,
+} from "state-management/selectors/user.selectors";
+import {
+  fetchCurrentUserAction,
+  fetchScicatTokenAction,
+} from "state-management/actions/user.actions";
 
 @Component({
   selector: "ingestor",
@@ -31,6 +41,10 @@ import {
 export class IngestorComponent implements OnInit {
   readonly dialog = inject(MatDialog);
 
+  vm$ = this.store.select(selectUserSettingsPageViewModel);
+  sciCatLoggedIn$ = this.store.select(selectIsLoggedIn);
+  tokenValue: string;
+
   sourceFolder = "";
   loading = false;
   forwardFacilityBackend = "";
@@ -40,7 +54,10 @@ export class IngestorComponent implements OnInit {
 
   lastUsedFacilityBackends: string[] = [];
 
-  transferDataSource: TransferDataListEntry[] = []; // List of files to be transferred
+  transferDataInformation: GetTransferResponse = null;
+  transferDataPageSize = 100;
+  transferDataPageIndex = 0;
+  transferDataPageSizeOptions = [5, 10, 25, 100];
   displayedColumns: string[] = ["transferId", "status", "actions"];
 
   versionInfo: OtherVersionResponse = null;
@@ -61,11 +78,11 @@ export class IngestorComponent implements OnInit {
     private router: Router,
     private apiManager: IngestorAPIManager,
     private sseService: IngestorMetadataSSEService,
-  ) { }
+    private store: Store,
+  ) {}
 
   ngOnInit() {
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-    this.transferDataSource = [];
 
     // Get the GET parameter 'backendUrl' from the URL
     this.route.queryParams.subscribe((params) => {
@@ -76,6 +93,19 @@ export class IngestorComponent implements OnInit {
         this.connectingToFacilityBackend = false;
       }
     });
+
+    // Move that part TODO
+    // Fetch the API token that the ingestor can authenticate to scicat as the user
+    this.vm$.subscribe((settings) => {
+      this.tokenValue = settings.scicatToken;
+
+      if (this.tokenValue === "") {
+        this.store.dispatch(fetchScicatTokenAction());
+      }
+    });
+    this.store.dispatch(fetchCurrentUserAction());
+
+    console.log(this.sciCatLoggedIn$);
   }
 
   async initializeIngestorConnection(
@@ -104,6 +134,7 @@ export class IngestorComponent implements OnInit {
 
     try {
       this.userInfo = await this.apiManager.getUserInfo();
+      this.doRefreshTransferList();
     } catch (error) {
       if (String(error.error).includes("disabled")) {
         this.authIsDisabled = true;
@@ -125,15 +156,18 @@ export class IngestorComponent implements OnInit {
   async ingestDataset(): Promise<boolean> {
     this.loading = true;
 
+    console.log("Token value: ", this.tokenValue);
+
     const payload: PostDatasetRequest = {
       metaData: this.createNewTransferData.mergedMetaDataString,
+      userToken: this.tokenValue,
     };
 
     try {
       const result = await this.apiManager.startIngestion(payload);
       if (result) {
         this.loading = false;
-        this.onClickRefreshTransferList();
+        this.doRefreshTransferList();
         return true;
       }
     } catch (error) {
@@ -305,10 +339,12 @@ export class IngestorComponent implements OnInit {
     if (dialogRef === null) return;
   }
 
-  async onClickRefreshTransferList(): Promise<void> {
+  async doRefreshTransferList(): Promise<void> {
     try {
-      const transferList = await this.apiManager.getTransferList(1, 100);
-      this.transferDataSource = transferList;
+      this.transferDataInformation = await this.apiManager.getTransferList(
+        this.transferDataPageIndex + 1,
+        this.transferDataPageSize,
+      );
     } catch (error) {
       this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
     }
@@ -317,12 +353,18 @@ export class IngestorComponent implements OnInit {
   async onCancelTransfer(transferId: string) {
     try {
       await this.apiManager.cancelTransfer(transferId);
-      this.onClickRefreshTransferList();
+      this.doRefreshTransferList();
     } catch (error) {
       this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
     }
   }
 
+  onTransferPageChange(event: PageChangeEvent): void {
+    this.transferDataPageIndex = event.pageIndex;
+    this.transferDataPageSize = event.pageSize;
+    this.doRefreshTransferList();
+  }
+
   openIngestorLogin(): void {
     window.location.href =
       this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.AUTH.LOGIN;
diff --git a/src/app/ingestor/model/deleteTransferRequest.ts b/src/app/ingestor/model/deleteTransferRequest.ts
index d8f2b4a25b..2735d12dfa 100644
--- a/src/app/ingestor/model/deleteTransferRequest.ts
+++ b/src/app/ingestor/model/deleteTransferRequest.ts
@@ -11,8 +11,8 @@
 
 export interface DeleteTransferRequest { 
     /**
-     * Ingestion id to abort the ingestion
+     * id of the transfer that should be cancelled
      */
-    ingestId?: string;
+    transferId: string;
 }
 
diff --git a/src/app/ingestor/model/deleteTransferResponse.ts b/src/app/ingestor/model/deleteTransferResponse.ts
index 786c3b8ea2..67ad02709e 100644
--- a/src/app/ingestor/model/deleteTransferResponse.ts
+++ b/src/app/ingestor/model/deleteTransferResponse.ts
@@ -11,11 +11,11 @@
 
 export interface DeleteTransferResponse { 
     /**
-     * Ingestion id to abort the ingestion
+     * Transfer id affected
      */
-    ingestId?: string;
+    transferId: string;
     /**
-     * New status of the ingestion.
+     * New status of the transfer.
      */
     status?: string;
 }
diff --git a/src/app/ingestor/model/postDatasetRequest.ts b/src/app/ingestor/model/postDatasetRequest.ts
index bbfb835e1a..cd2311c2f8 100644
--- a/src/app/ingestor/model/postDatasetRequest.ts
+++ b/src/app/ingestor/model/postDatasetRequest.ts
@@ -14,5 +14,9 @@ export interface PostDatasetRequest {
      * The metadata of the dataset.
      */
     metaData: string;
+    /**
+     * the scicat token for acting on behalf of the user
+     */
+    userToken: string;
 }
 
diff --git a/src/app/ingestor/model/postDatasetResponse.ts b/src/app/ingestor/model/postDatasetResponse.ts
index 1fbc4e15ab..9eb8f838f1 100644
--- a/src/app/ingestor/model/postDatasetResponse.ts
+++ b/src/app/ingestor/model/postDatasetResponse.ts
@@ -11,11 +11,11 @@
 
 export interface PostDatasetResponse { 
     /**
-     * The unique ingestion id of the dataset.
+     * The unique transfer id of the dataset transfer job.
      */
-    ingestId?: string;
+    transferId: string;
     /**
-     * The status of the ingestion. Can be used to send a message back to the ui.
+     * The status of the transfer. Can be used to send a message back to the ui.
      */
     status?: string;
 }

From 2ddf628657eb81b1db76b129bd25b526a2e13cfc Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 6 Feb 2025 17:04:14 +0000
Subject: [PATCH 104/245] (dev-stage): support pagination

---
 .../ingestor.new-transfer-dialog.component.ts | 100 +++++++++---------
 .../dialog/ingestor.new-transfer-dialog.html  |  20 ++--
 .../ingestor/helper/ingestor-api-manager.ts   |  18 +++-
 3 files changed, 72 insertions(+), 66 deletions(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 4150a02105..2170c33c91 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -1,7 +1,5 @@
 import { Component, Inject, OnInit } from "@angular/core";
 import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
-import { HttpClient } from "@angular/common/http";
-import { INGESTOR_API_ENDPOINTS_V1 } from "../helper/ingestor-api-endpoints";
 import {
   DialogDataObject,
   ExtractionMethod,
@@ -9,6 +7,12 @@ import {
   IngestorHelper,
 } from "../helper/ingestor.component-helper";
 import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import { IngestorAPIManager } from "../helper/ingestor-api-manager";
+import {
+  GetDatasetResponse,
+  GetExtractorResponse,
+} from "ingestor/model/models";
+import { PageChangeEvent } from "shared/modules/table/table.component";
 
 @Component({
   selector: "ingestor.new-transfer-dialog",
@@ -16,8 +20,12 @@ import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/
   styleUrls: ["../ingestor.component.scss"],
 })
 export class IngestorNewTransferDialogComponent implements OnInit {
-  extractionMethods: ExtractionMethod[] = [];
-  availableFilePaths: string[] = [];
+  extractionMethods: GetExtractorResponse = null;
+  availableFilePaths: GetDatasetResponse = null;
+  dropdownPageSize = 50;
+  extractionMethodsPage = 0;
+  availableFilePathsPage = 0;
+
   backendURL = "";
   extractionMethodsError = "";
   availableFilePathsError = "";
@@ -30,15 +38,16 @@ export class IngestorNewTransferDialogComponent implements OnInit {
   constructor(
     public dialog: MatDialog,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
-    private http: HttpClient,
+    private apiManager: IngestorAPIManager,
   ) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
+    this.apiManager.connect(this.backendURL);
   }
 
   ngOnInit(): void {
-    this.apiGetExtractionMethods();
-    this.apiGetAvailableFilePaths();
+    this.loadExtractionMethods();
+    this.loadAvailableFilePaths();
   }
 
   set selectedPath(value: string) {
@@ -59,54 +68,31 @@ export class IngestorNewTransferDialogComponent implements OnInit {
     return this.createNewTransferData.selectedMethod;
   }
 
-  apiGetExtractionMethods(): void {
-    /*try {
-      this.transferDataInformation = await this.apiManager.getTransferList(
-        this.transferDataPageIndex + 1,
-        this.transferDataPageSize,
+  async loadExtractionMethods(): Promise<void> {
+    try {
+      this.extractionMethods = await this.apiManager.getExtractionMethods(
+        this.extractionMethodsPage + 1, // 1-based
+        this.dropdownPageSize,
       );
     } catch (error) {
-      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-    }*/
-
-
-    this.http
-      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, {
-        withCredentials: true,
-      })
-      .subscribe(
-        (response: any) => {
-          if (response.methods && response.methods.length > 0) {
-            this.extractionMethods = response.methods;
-          } else {
-            this.extractionMethodsError = "No extraction methods found.";
-          }
-        },
-        (error: any) => {
-          this.extractionMethodsError = error.message;
-          console.error(this.extractionMethodsError);
-        },
-      );
+      this.extractionMethodsError = error.message;
+      console.error(this.extractionMethodsError);
+    }
   }
 
-  apiGetAvailableFilePaths(): void {
-    this.http
-      .get(this.backendURL + INGESTOR_API_ENDPOINTS_V1.DATASET, {
-        withCredentials: true,
-      })
-      .subscribe(
-        (response: any) => {
-          if (response.datasets && response.datasets.length > 0) {
-            this.availableFilePaths = response.datasets;
-          } else {
-            this.availableFilePathsError = "No datasets found.";
-          }
-        },
-        (error: any) => {
-          this.availableFilePathsError = error.message;
-          console.error(this.availableFilePathsError);
-        },
+  async loadAvailableFilePaths(): Promise<void> {
+    try {
+      this.availableFilePaths = await this.apiManager.getAvailableFilePaths(
+        this.availableFilePathsPage + 1, // 1-based
+        this.dropdownPageSize,
       );
+      if (this.availableFilePaths.total === 0) {
+        this.availableFilePathsError = "No datasets found.";
+      }
+    } catch (error) {
+      this.availableFilePathsError = error.message;
+      console.error(this.extractionMethodsError);
+    }
   }
 
   generateExampleDataForSciCatHeader(): void {
@@ -137,8 +123,8 @@ export class IngestorNewTransferDialogComponent implements OnInit {
   }
 
   onClickRetryRequests(): void {
-    this.apiGetExtractionMethods();
-    this.apiGetAvailableFilePaths();
+    this.loadExtractionMethods();
+    this.loadAvailableFilePaths();
   }
 
   onClickNext(): void {
@@ -154,4 +140,14 @@ export class IngestorNewTransferDialogComponent implements OnInit {
       !!this.createNewTransferData.selectedPath &&
       !!this.createNewTransferData.selectedMethod?.name;
   }
+
+  onAvailablePathPageChange(event: PageChangeEvent) {
+    this.availableFilePathsPage = event.pageIndex; // 0-based
+    this.loadAvailableFilePaths();
+  }
+
+  onExtractorMethodsPageChange(event: PageChangeEvent) {
+    this.extractionMethodsPage = event.pageIndex; // 0-based
+    this.loadExtractionMethods();
+  }
 }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
index b2eb4a0436..c93e6e5ffb 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -13,12 +13,12 @@ <h2 mat-dialog-title>
   <p>Please select the dataset to be uploaded and the appropriate metadata
     extractor method.</p>
 
-  <div>
+  <div *ngIf="availableFilePaths !== null">
     <mat-form-field class="form-full-width">
       <mat-label>File Path</mat-label>
       <input matInput [(ngModel)]="selectedPath" [matAutocomplete]="auto">
       <mat-autocomplete #auto="matAutocomplete">
-        <mat-option *ngFor="let sourceFolder of availableFilePaths"
+        <mat-option *ngFor="let sourceFolder of availableFilePaths.datasets"
           [value]="sourceFolder">
           {{ sourceFolder }}
         </mat-option>
@@ -27,16 +27,16 @@ <h2 mat-dialog-title>
     <mat-error *ngIf="availableFilePathsError">{{ availableFilePathsError
       }}</mat-error>
 
-    <!-- <mat-paginator [length]="100" [pageSize]="25" aria-label="Select page"
-      [hidePageSize]="true" [showFirstLastButtons]="false">
-    </mat-paginator> -->
+    <mat-paginator *ngIf="availableFilePaths.total > dropdownPageSize" [length]="availableFilePaths.total" [pageSize]="dropdownPageSize" aria-label="Select page"
+      [hidePageSize]="true" [showFirstLastButtons]="false" [pageIndex]="availableFilePathsPage" (page)="onAvailablePathPageChange($event)">
+    </mat-paginator>
   </div>
 
-  <div>
+  <div *ngIf="extractionMethods !== null">
     <mat-form-field class="form-full-width">
       <mat-label>Extraction Method</mat-label>
       <mat-select [(ngModel)]="selectedMethod">
-        <mat-option *ngFor="let method of extractionMethods" [value]="method">
+        <mat-option *ngFor="let method of extractionMethods.methods" [value]="method">
           {{ method.name }}
         </mat-option>
       </mat-select>
@@ -44,9 +44,9 @@ <h2 mat-dialog-title>
     <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError
       }}</mat-error>
 
-    <!--<mat-paginator [length]="100" [pageSize]="25" aria-label="Select page"
-      [hidePageSize]="true" [showFirstLastButtons]="false">
-    </mat-paginator>-->
+    <mat-paginator *ngIf="extractionMethods.total > dropdownPageSize" [length]="extractionMethods.total" [pageSize]="dropdownPageSize" aria-label="Select page"
+      [hidePageSize]="true" [showFirstLastButtons]="false" [pageIndex]="extractionMethodsPage" (page)="onExtractorMethodsPageChange($event)">
+    </mat-paginator>
   </div>
 
 </mat-dialog-content>
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index f2cc2d9313..d49fd2128d 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -152,8 +152,13 @@ export class IngestorAPIManager {
     });
   }
 
-  public getExtractionMethods(): Promise<GetExtractorResponse> {
-    const params = new HttpParams();
+  public getExtractionMethods(
+    page: number,
+    pageSize: number,
+  ): Promise<GetExtractorResponse> {
+    const params = new HttpParams()
+      .set("page", page.toString())
+      .set("pageSize", pageSize.toString());
 
     return new Promise((resolve, reject) => {
       this.http
@@ -173,8 +178,13 @@ export class IngestorAPIManager {
     });
   }
 
-  public getAvailableFilePaths(): Promise<GetDatasetResponse> {
-    const params = new HttpParams();
+  public getAvailableFilePaths(
+    page: number,
+    pageSize: number,
+  ): Promise<GetDatasetResponse> {
+    const params = new HttpParams()
+      .set("page", page.toString())
+      .set("pageSize", pageSize.toString());
 
     return new Promise((resolve, reject) => {
       this.http

From d5f9a0086401935b828e1b2feaae5192b7e36e6c Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 6 Feb 2025 17:14:47 +0000
Subject: [PATCH 105/245] (dev-stage) force login to scicat

---
 .../ingestor/ingestor/ingestor.component.html | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index 71c83820c1..a7f4ea794c 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -1,12 +1,16 @@
 <p *ngIf="(this.sciCatLoggedIn$ | async) === false">
   <mat-card class="ingestor-card">
     <mat-card-header>
-      <mat-card-title>Log-In to SciCat</mat-card-title>
+      <mat-card-title>
+        Log in
+      </mat-card-title>
     </mat-card-header>
     <mat-card-content class="ingestor-vertical-layout">
       <p>
-        Please Log in to SciCat first.
+        Before a transfer can be started, please <a href="/login">log in to
+          SciCat</a>.
       </p>
+      <a href="/login"><mat-icon>login</mat-icon></a>
     </mat-card-content>
   </mat-card>
 </p>
@@ -25,7 +29,7 @@
         <div *ngIf="!connectingToFacilityBackend">
           <ng-container *ngIf="connectedFacilityBackend === ''">
             <p style="color: red;">No Backend connected</p>
-  
+
             <p>Please provide a valid Backend URL</p>
             <mat-form-field>
               <input matInput placeholder="Backend URL"
@@ -33,7 +37,7 @@
             </mat-form-field>
             <button mat-raised-button color="primary"
               (click)="onClickForwardToIngestorPage()">Connect</button>
-  
+
             <div>
               <ul>
                 <li *ngFor="let backend of lastUsedFacilityBackends">
@@ -42,7 +46,7 @@
                 </li>
               </ul>
             </div>
-  
+
           </ng-container>
           <ng-container *ngIf="connectedFacilityBackend !== ''">
             <div *ngIf="!authIsDisabled">
@@ -68,7 +72,7 @@
               </div>
               <mat-divider class="divider-down"></mat-divider>
             </div>
-  
+
             <mat-tab-group animationDuration="0ms">
               <mat-tab *ngIf="authIsDisabled || userInfo?.logged_in"
                 label="Transfers">
@@ -77,20 +81,21 @@
                   (click)="doRefreshTransferList()">
                   <mat-icon>refresh</mat-icon>
                 </button>
-                <table *ngIf="transferDataInformation !== null" mat-table [dataSource]="transferDataInformation.transfers">
+                <table *ngIf="transferDataInformation !== null" mat-table
+                  [dataSource]="transferDataInformation.transfers">
                   <ng-container matColumnDef="transferId">
                     <th mat-header-cell *matHeaderCellDef><b>ID</b> </th>
                     <td mat-cell *matCellDef="let element">
                       {{element.transferId}}
                     </td>
                   </ng-container>
-  
+
                   <ng-container matColumnDef="status">
                     <th mat-header-cell *matHeaderCellDef><b>Status</b> </th>
                     <td mat-cell *matCellDef="let element"> {{element.status}}
                     </td>
                   </ng-container>
-  
+
                   <ng-container matColumnDef="actions">
                     <th mat-header-cell *matHeaderCellDef class="text-right">
                       <b>Action</b>
@@ -105,18 +110,23 @@
                       </button>
                     </td>
                   </ng-container>
-  
+
                   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                   <tr mat-row *matRowDef="let row; columns: displayedColumns;">
                   </tr>
                 </table>
-  
-                <mat-paginator *ngIf="transferDataInformation !== null" class="transferPaginator" [length]="transferDataInformation.total"
-                  [pageSize]="transferDataPageSize" [pageSizeOptions]="transferDataPageSizeOptions" [pageIndex]="transferDataPageIndex" (page)="onTransferPageChange($event)"
+
+                <mat-paginator *ngIf="transferDataInformation !== null"
+                  class="transferPaginator"
+                  [length]="transferDataInformation.total"
+                  [pageSize]="transferDataPageSize"
+                  [pageSizeOptions]="transferDataPageSizeOptions"
+                  [pageIndex]="transferDataPageIndex"
+                  (page)="onTransferPageChange($event)"
                   aria-label="Select page">
                 </mat-paginator>
               </mat-tab>
-  
+
               <mat-tab label="Connection information">
                 <!-- Mat List with the most important information about the backend connection -->
                 <mat-list>
@@ -147,7 +157,7 @@
       </mat-card-content>
     </mat-card>
   </p>
-  
+
   <p *ngIf="connectedFacilityBackend !== '' && (authIsDisabled ||
     userInfo?.logged_in)">
     <mat-card class="ingestor-card">
@@ -162,7 +172,7 @@
       </mat-card-content>
     </mat-card>
   </p>
-  
+
   <p *ngIf="errorMessage !== ''">
     <mat-card class="ingestor-card">
       <mat-card-header class="ingestor-mixed-header">

From 24209cea1071052f392af330701cd611ccf0e14a Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 6 Feb 2025 18:24:59 +0000
Subject: [PATCH 106/245] (dev-stage) frontend displays metadata error

---
 ...tor.extractor-metadata-dialog.component.ts |  7 ++-
 .../ingestor.extractor-metadata-dialog.html   | 48 +++++++++++-------
 .../helper/ingestor.component-helper.ts       | 18 ++++---
 .../helper/ingestor.metadata-sse-service.ts   | 17 +++++--
 .../ingestor/ingestor/ingestor.component.ts   | 49 ++++++++++---------
 5 files changed, 86 insertions(+), 53 deletions(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index bb1ae2f823..907139f496 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -20,6 +20,7 @@ export class IngestorExtractorMetadataDialogComponent {
 
   backendURL = "";
   extractorMetaDataReady = false;
+  extractorMetaDataStatus = "";
   extractorMetaDataError = false;
 
   uiNextButtonReady = false;
@@ -50,9 +51,11 @@ export class IngestorExtractorMetadataDialogComponent {
     this.metadataSchemaInstrument = instrumentSchema;
     this.metadataSchemaAcquisition = acqusitionSchema;
     this.extractorMetaDataReady =
-      this.createNewTransferData.extractorMetaDataReady;
+      this.createNewTransferData.apiInformation.extractorMetaDataReady;
     this.extractorMetaDataError =
-      this.createNewTransferData.apiErrorInformation.metaDataExtraction;
+      this.createNewTransferData.apiInformation.metaDataExtractionFailed;
+    this.extractorMetaDataStatus =
+      this.createNewTransferData.apiInformation.extractorMetaDataStatus;
   }
 
   onClickBack(): void {
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
index 8a7979052b..8d4275886f 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -9,16 +9,22 @@ <h2 mat-dialog-title>
 </div>
 <mat-dialog-content class="mat-typography">
 
-  <div *ngIf="!extractorMetaDataReady" class="spinner-container">
-    <mat-progress-spinner diameter="20"
-      mode="indeterminate"></mat-progress-spinner>
+  <div *ngIf="!extractorMetaDataReady || extractorMetaDataError" class="spinner-container">
+    <ng-container *ngIf="!extractorMetaDataError; else errorIcon">
+      <mat-progress-spinner diameter="20" mode="indeterminate"></mat-progress-spinner>
+    </ng-container>
+    <ng-template #errorIcon>
+      <mat-icon color="warn">error</mat-icon>
+    </ng-template>
     <div class="spinner-text">
-      <span>Wait for the Ingestor...</span>
+      <span>{{extractorMetaDataStatus}}</span>
     </div>
   </div>
 
   <div *ngIf="extractorMetaDataReady">
-    <ingestor-dialog-stepper [activeStep]="2" [createNewTransferData]="createNewTransferData" (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
+    <ingestor-dialog-stepper [activeStep]="2"
+      [createNewTransferData]="createNewTransferData"
+      (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
     <div *ngIf="extractorMetaDataError" class="error-message">
       <mat-card class="error-card">
         <mat-card-header>
@@ -33,41 +39,49 @@ <h2 mat-dialog-title>
     <div fxLayout="row" fxLayout.xs="column">
       <div fxFlex="80%">
         <mat-card>
-          <mat-card-header class="instrument-header" (click)="toggleCardContent('instrument')">
+          <mat-card-header class="instrument-header"
+            (click)="toggleCardContent('instrument')">
             <div mat-card-avatar class="section-icon">
               <mat-icon> biotech </mat-icon>
             </div>
             Instrument Information
             <span class="spacer"></span>
             <mat-icon
-            [matTooltip]="isInstrumentMetadataOk ? 'Your input is correct.' : instrumentErrors"
-            [ngClass]="isInstrumentMetadataOk ? 'success-icon' : 'error-icon'">{{
-            isInstrumentMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
-            <mat-icon class="toggle-icon">{{ isCardContentVisible.instrument ? 'expand_less' : 'expand_more' }}</mat-icon>
+              [matTooltip]="isInstrumentMetadataOk ? 'Your input is correct.' : instrumentErrors"
+              [ngClass]="isInstrumentMetadataOk ? 'success-icon' : 'error-icon'">{{
+              isInstrumentMetadataOk ? 'check_circle_outline' :
+              'error_outline'}}</mat-icon>
+            <mat-icon class="toggle-icon">{{ isCardContentVisible.instrument ?
+              'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.instrument">
             <app-metadata-editor [schema]="metadataSchemaInstrument"
               [data]="createNewTransferData.extractorMetaData['instrument']"
-              (dataChange)="onDataChangeExtractorMetadataInstrument($event)" (errors)="instrumentErrorsHandler($event)"></app-metadata-editor>
+              (dataChange)="onDataChangeExtractorMetadataInstrument($event)"
+              (errors)="instrumentErrorsHandler($event)"></app-metadata-editor>
           </mat-card-content>
         </mat-card>
         <mat-card>
-          <mat-card-header class="acquisition-header" (click)="toggleCardContent('acquisition')">
+          <mat-card-header class="acquisition-header"
+            (click)="toggleCardContent('acquisition')">
             <div mat-card-avatar class="section-icon">
               <mat-icon> category-search </mat-icon>
             </div>
             Acquisition Information
             <span class="spacer"></span>
             <mat-icon
-            [matTooltip]="isAcquisitionMetadataOk ? 'Your input is correct.' : acquisitionErrors"
-            [ngClass]="isAcquisitionMetadataOk ? 'success-icon' : 'error-icon'">{{
-            isAcquisitionMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
-            <mat-icon class="toggle-icon">{{ isCardContentVisible.acquisition ? 'expand_less' : 'expand_more' }}</mat-icon>
+              [matTooltip]="isAcquisitionMetadataOk ? 'Your input is correct.' : acquisitionErrors"
+              [ngClass]="isAcquisitionMetadataOk ? 'success-icon' : 'error-icon'">{{
+              isAcquisitionMetadataOk ? 'check_circle_outline' :
+              'error_outline'}}</mat-icon>
+            <mat-icon class="toggle-icon">{{ isCardContentVisible.acquisition ?
+              'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.acquisition">
             <app-metadata-editor [schema]="metadataSchemaAcquisition"
               [data]="createNewTransferData.extractorMetaData['acquisition']"
-              (dataChange)="onDataChangeExtractorMetadataAcquisition($event)" (errors)="acquisitionErrorsHandler($event)"></app-metadata-editor>
+              (dataChange)="onDataChangeExtractorMetadataAcquisition($event)"
+              (errors)="acquisitionErrorsHandler($event)"></app-metadata-editor>
           </mat-card-content>
         </mat-card>
       </div>
diff --git a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
index e53f2967e1..e1237e4f02 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
@@ -18,12 +18,13 @@ export interface IngestionRequestInformation {
     instrument: object;
     acquisition: object;
   };
-  extractorMetaDataReady: boolean;
-  extractMetaDataRequested: boolean;
   mergedMetaDataString: string;
 
-  apiErrorInformation: {
-    metaDataExtraction: boolean;
+  apiInformation: {
+    extractMetaDataRequested: boolean;
+    extractorMetaDataReady: boolean;
+    metaDataExtractionFailed: boolean;
+    extractorMetaDataStatus: string;
   };
 }
 
@@ -88,11 +89,12 @@ export class IngestorHelper {
         instrument: {},
         acquisition: {},
       },
-      extractorMetaDataReady: false,
-      extractMetaDataRequested: false,
       mergedMetaDataString: "",
-      apiErrorInformation: {
-        metaDataExtraction: false,
+      apiInformation: {
+        metaDataExtractionFailed: false,
+        extractMetaDataRequested: false,
+        extractorMetaDataReady: false,
+        extractorMetaDataStatus: "",
       },
     };
   };
diff --git a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
index 0ba7c59aad..d1c03d651c 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
@@ -6,10 +6,12 @@ interface IngestorMetadataEvent {
   progress: number;
   result: boolean;
   resultMessage: string;
+  error: boolean;
 }
 
 interface ProgressMessage {
   result?: string;
+  err?: string;
   std_err: string;
   std_out: string;
 }
@@ -34,6 +36,7 @@ export class IngestorMetadataSSEService {
         progress: 0,
         result: false,
         resultMessage: "",
+        error: false,
       });
     };
 
@@ -54,20 +57,28 @@ export class IngestorMetadataSSEService {
       }
 
       this.messageSubject.next({
-        message: data.std_out,
+        message: data.err ?? data.std_out,
         progress: progress,
         result: data.result !== undefined,
         resultMessage: data.result !== undefined ? data.result : "",
+        error: data.err !== undefined,
       });
       // Check if data contains result then close connection
-      if (data.result) {
+      if (data.result || data.err !== undefined) {
         this.disconnect();
       }
     });
 
     this.eventSource.onerror = (error) => {
-      console.error("SSE Fehler:", error);
+      console.error("SSE Error:", error);
       this.eventSource.close();
+      this.messageSubject.next({
+        message: "An error occurred while extracting metadata.",
+        progress: 0,
+        result: false,
+        resultMessage: "",
+        error: true,
+      });
     };
   }
 
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 657932dd89..e06cb39e4f 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -1,5 +1,4 @@
 import { Component, inject, OnInit } from "@angular/core";
-import { AppConfigService } from "app-config.service";
 import { HttpParams } from "@angular/common/http";
 import { ActivatedRoute, Router } from "@angular/router";
 import { INGESTOR_API_ENDPOINTS_V1 } from "./helper/ingestor-api-endpoints";
@@ -70,10 +69,7 @@ export class IngestorComponent implements OnInit {
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
-  metadataExtractionStatus = "";
-
   constructor(
-    public appConfigService: AppConfigService,
     private route: ActivatedRoute,
     private router: Router,
     private apiManager: IngestorAPIManager,
@@ -94,7 +90,6 @@ export class IngestorComponent implements OnInit {
       }
     });
 
-    // Move that part TODO
     // Fetch the API token that the ingestor can authenticate to scicat as the user
     this.vm$.subscribe((settings) => {
       this.tokenValue = settings.scicatToken;
@@ -104,8 +99,6 @@ export class IngestorComponent implements OnInit {
       }
     });
     this.store.dispatch(fetchCurrentUserAction());
-
-    console.log(this.sciCatLoggedIn$);
   }
 
   async initializeIngestorConnection(
@@ -156,8 +149,6 @@ export class IngestorComponent implements OnInit {
   async ingestDataset(): Promise<boolean> {
     this.loading = true;
 
-    console.log("Token value: ", this.tokenValue);
-
     const payload: PostDatasetRequest = {
       metaData: this.createNewTransferData.mergedMetaDataString,
       userToken: this.tokenValue,
@@ -181,18 +172,14 @@ export class IngestorComponent implements OnInit {
   }
 
   async startMetadataExtraction(): Promise<boolean> {
-    this.createNewTransferData.apiErrorInformation.metaDataExtraction = false;
+    this.createNewTransferData.apiInformation.metaDataExtractionFailed = false;
 
-    if (this.createNewTransferData.extractMetaDataRequested) {
-      console.log(
-        this.createNewTransferData.extractMetaDataRequested,
-        " already requested",
-      ); // Debugging
+    if (this.createNewTransferData.apiInformation.extractMetaDataRequested) {
       return false;
     }
 
-    this.createNewTransferData.extractorMetaDataReady = false;
-    this.createNewTransferData.extractMetaDataRequested = true;
+    this.createNewTransferData.apiInformation.extractorMetaDataReady = false;
+    this.createNewTransferData.apiInformation.extractMetaDataRequested = true;
 
     const params = new HttpParams()
       .set("filePath", this.createNewTransferData.selectedPath)
@@ -205,8 +192,12 @@ export class IngestorComponent implements OnInit {
     this.sseService.getMessages().subscribe(
       (data) => {
         //console.log("Received SSE data:", data);
+        this.createNewTransferData.apiInformation.extractorMetaDataStatus =
+          data.message;
+
         if (data.result) {
-          this.createNewTransferData.extractorMetaDataReady = true;
+          this.createNewTransferData.apiInformation.extractorMetaDataReady =
+            true;
           const extractedScientificMetadata = JSON.parse(
             data.resultMessage,
           ) as ScientificMetadata;
@@ -215,14 +206,24 @@ export class IngestorComponent implements OnInit {
             extractedScientificMetadata.instrument ?? {};
           this.createNewTransferData.extractorMetaData.acquisition =
             extractedScientificMetadata.acquisition ?? {};
-          this.createNewTransferData.extractorMetaDataReady = true;
+          this.createNewTransferData.apiInformation.extractorMetaDataReady =
+            true;
+        } else if (data.error) {
+          this.createNewTransferData.apiInformation.metaDataExtractionFailed =
+            true;
+          this.createNewTransferData.apiInformation.extractMetaDataRequested =
+            false;
+          this.createNewTransferData.apiInformation.extractorMetaDataStatus =
+            data.message;
         }
       },
       (error) => {
-        //console.error("Error receiving SSE data:", error);
+        console.error("Error receiving SSE data:", error);
         this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-        this.createNewTransferData.apiErrorInformation.metaDataExtraction =
+        this.createNewTransferData.apiInformation.metaDataExtractionFailed =
           true;
+        this.createNewTransferData.apiInformation.extractMetaDataRequested =
+          false;
       },
     );
 
@@ -282,8 +283,10 @@ export class IngestorComponent implements OnInit {
 
     switch (step) {
       case 0:
-        this.createNewTransferData.extractMetaDataRequested = false;
-        this.createNewTransferData.extractorMetaDataReady = false;
+        this.createNewTransferData.apiInformation.extractMetaDataRequested =
+          false;
+        this.createNewTransferData.apiInformation.extractorMetaDataReady =
+          false;
         dialogRef = this.dialog.open(IngestorNewTransferDialogComponent, {
           data: {
             onClickNext: this.onClickNext.bind(this),

From 8baecfb7ec61c9eb5c75360dcb6b13647ffb3371 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Mon, 10 Feb 2025 09:03:36 +0000
Subject: [PATCH 107/245] workshop version: show error message when trying to
 ingest

---
 .../dialog/ingestor.confirm-transfer-dialog.component.ts | 4 ++++
 src/app/ingestor/ingestor/ingestor.component.ts          | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 1e61f0894f..51a01d7d17 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -88,6 +88,10 @@ export class IngestorConfirmTransferDialogComponent implements OnInit {
             }
           } catch (error) {
             this.errorMessage = error.message;
+
+            if (error.error) {
+              this.errorMessage += ": " + error.error;
+            }
           }
         }
       });
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index e06cb39e4f..f0378020ca 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -115,6 +115,7 @@ export class IngestorComponent implements OnInit {
 
     this.connectedFacilityBackend = facilityBackendUrlCleaned;
 
+    // Try to connect - get ingestor version
     try {
       this.versionInfo = await this.apiManager.getVersion();
     } catch (error) {
@@ -125,9 +126,9 @@ export class IngestorComponent implements OnInit {
       return false;
     }
 
+    // If connected, get User Info
     try {
       this.userInfo = await this.apiManager.getUserInfo();
-      this.doRefreshTransferList();
     } catch (error) {
       if (String(error.error).includes("disabled")) {
         this.authIsDisabled = true;
@@ -136,6 +137,12 @@ export class IngestorComponent implements OnInit {
       }
     }
 
+    // Only refresh if the user is logged in or the auth is disabled
+    if (this.authIsDisabled || this.userInfo.logged_in) {
+      this.doRefreshTransferList();
+    }
+
+    // Get health state
     try {
       this.healthInfo = await this.apiManager.getHealth();
     } catch (error) {

From 5d6a26104c3c9d9b3c84326ccbddbdd96812ac7b Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Mon, 10 Feb 2025 12:42:18 +0000
Subject: [PATCH 108/245] Prefill information from user info

---
 .../dialog/ingestor.new-transfer-dialog.component.ts  | 11 +++++++++++
 .../ingestor/helper/ingestor.component-helper.ts      |  2 ++
 src/app/ingestor/ingestor/ingestor.component.ts       |  4 ++++
 3 files changed, 17 insertions(+)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 2170c33c91..6c75a53a7e 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -109,6 +109,17 @@ export class IngestorNewTransferDialogComponent implements OnInit {
     this.data.createNewTransferData.scicatHeader["type"] = "raw";
     this.data.createNewTransferData.scicatHeader["dataFormat"] = "root";
     this.data.createNewTransferData.scicatHeader["owner"] = "User";
+
+    this.data.createNewTransferData.scicatHeader["principalInvestigator"] =
+      this.data.userInfo?.name ?? "";
+    this.data.createNewTransferData.scicatHeader["investigator"] =
+      this.data.userInfo?.name ?? "";
+    this.data.createNewTransferData.scicatHeader["ownerEmail"] =
+      this.data.userInfo?.email ?? "";
+    this.data.createNewTransferData.scicatHeader["contactEmail"] =
+      this.data.userInfo?.email ?? "";
+    this.data.createNewTransferData.scicatHeader["creationTime"] =
+      new Date().toDateString();
   }
 
   prepareSchemaForProcessing(): void {
diff --git a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
index e1237e4f02..8f71a854d9 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
@@ -1,4 +1,5 @@
 import { JsonSchema } from "@jsonforms/core";
+import { UserInfo } from "ingestor/model/userInfo";
 
 export interface ExtractionMethod {
   name: string;
@@ -69,6 +70,7 @@ export interface MetadataExtractorResult {
 
 export interface DialogDataObject {
   createNewTransferData: IngestionRequestInformation;
+  userInfo: UserInfo;
   backendURL: string;
   onClickNext: (step: number) => void;
   onStartUpload: () => Promise<boolean>;
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index f0378020ca..210f63e502 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -299,6 +299,7 @@ export class IngestorComponent implements OnInit {
             onClickNext: this.onClickNext.bind(this),
             createNewTransferData: this.createNewTransferData,
             backendURL: this.connectedFacilityBackend,
+            userInfo: this.userInfo,
           },
           disableClose: true,
         });
@@ -314,6 +315,7 @@ export class IngestorComponent implements OnInit {
             onClickNext: this.onClickNext.bind(this),
             createNewTransferData: this.createNewTransferData,
             backendURL: this.connectedFacilityBackend,
+            userInfo: this.userInfo,
           },
           disableClose: true,
         });
@@ -324,6 +326,7 @@ export class IngestorComponent implements OnInit {
             onClickNext: this.onClickNext.bind(this),
             createNewTransferData: this.createNewTransferData,
             backendURL: this.connectedFacilityBackend,
+            userInfo: this.userInfo,
           },
           disableClose: true,
         });
@@ -335,6 +338,7 @@ export class IngestorComponent implements OnInit {
             onStartUpload: this.ingestDataset.bind(this),
             createNewTransferData: this.createNewTransferData,
             backendURL: this.connectedFacilityBackend,
+            userInfo: this.userInfo,
           },
           disableClose: true,
         });

From 1589d3171d599847f13369f62ae57606eaad00d8 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Mon, 10 Feb 2025 12:49:01 +0000
Subject: [PATCH 109/245] Show Progress in percent

---
 .../dialog/ingestor.extractor-metadata-dialog.component.ts  | 2 ++
 .../ingestor/dialog/ingestor.extractor-metadata-dialog.html | 3 +++
 .../ingestor/ingestor/helper/ingestor.component-helper.ts   | 2 ++
 src/app/ingestor/ingestor/ingestor.component.ts             | 6 ++++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index 907139f496..3d159c532e 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -22,6 +22,7 @@ export class IngestorExtractorMetadataDialogComponent {
   extractorMetaDataReady = false;
   extractorMetaDataStatus = "";
   extractorMetaDataError = false;
+  process = 0;
 
   uiNextButtonReady = false;
   isAcquisitionMetadataOk = false;
@@ -56,6 +57,7 @@ export class IngestorExtractorMetadataDialogComponent {
       this.createNewTransferData.apiInformation.metaDataExtractionFailed;
     this.extractorMetaDataStatus =
       this.createNewTransferData.apiInformation.extractorMetaDataStatus;
+    this.process = this.createNewTransferData.apiInformation.extractorMetadataProgress;
   }
 
   onClickBack(): void {
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
index 8d4275886f..9218779c2c 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
@@ -12,6 +12,9 @@ <h2 mat-dialog-title>
   <div *ngIf="!extractorMetaDataReady || extractorMetaDataError" class="spinner-container">
     <ng-container *ngIf="!extractorMetaDataError; else errorIcon">
       <mat-progress-spinner diameter="20" mode="indeterminate"></mat-progress-spinner>
+      <div *ngIf="process > 0" class="progress-percentage">
+        <span>{{process}}%</span>
+      </div>
     </ng-container>
     <ng-template #errorIcon>
       <mat-icon color="warn">error</mat-icon>
diff --git a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
index 8f71a854d9..0a54cf96c9 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
@@ -25,6 +25,7 @@ export interface IngestionRequestInformation {
     extractMetaDataRequested: boolean;
     extractorMetaDataReady: boolean;
     metaDataExtractionFailed: boolean;
+    extractorMetadataProgress: number;
     extractorMetaDataStatus: string;
   };
 }
@@ -96,6 +97,7 @@ export class IngestorHelper {
         metaDataExtractionFailed: false,
         extractMetaDataRequested: false,
         extractorMetaDataReady: false,
+        extractorMetadataProgress: 0,
         extractorMetaDataStatus: "",
       },
     };
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 210f63e502..0915ca00e4 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -201,6 +201,8 @@ export class IngestorComponent implements OnInit {
         //console.log("Received SSE data:", data);
         this.createNewTransferData.apiInformation.extractorMetaDataStatus =
           data.message;
+        this.createNewTransferData.apiInformation.extractorMetadataProgress =
+          data.progress;
 
         if (data.result) {
           this.createNewTransferData.apiInformation.extractorMetaDataReady =
@@ -213,8 +215,6 @@ export class IngestorComponent implements OnInit {
             extractedScientificMetadata.instrument ?? {};
           this.createNewTransferData.extractorMetaData.acquisition =
             extractedScientificMetadata.acquisition ?? {};
-          this.createNewTransferData.apiInformation.extractorMetaDataReady =
-            true;
         } else if (data.error) {
           this.createNewTransferData.apiInformation.metaDataExtractionFailed =
             true;
@@ -222,6 +222,8 @@ export class IngestorComponent implements OnInit {
             false;
           this.createNewTransferData.apiInformation.extractorMetaDataStatus =
             data.message;
+          this.createNewTransferData.apiInformation.extractorMetadataProgress =
+            data.progress;
         }
       },
       (error) => {

From 39975b8ca175bbbea1df11bd7a737fa4e1c682c0 Mon Sep 17 00:00:00 2001
From: Despina <despoina.adamopoulou@empa.ch>
Date: Tue, 11 Feb 2025 10:38:55 +0100
Subject: [PATCH 110/245] Fix (temp): loading the frontend config from local
 files

---
 src/app/app-config.service.ts               |  9 +-
 src/assets/defaultDatasetsListSettings.json | 92 +++++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/defaultDatasetsListSettings.json

diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index ea5714c926..b736bdaf60 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -122,7 +122,14 @@ export class AppConfigService {
       console.log("No config available in backend, trying with local config.");
       try {
         const config = await this.http.get("/assets/config.json").toPromise();
-        this.appConfig = Object.assign({}, this.appConfig, config);
+        const defaultDatasetsListSettings = await this.http.get("/assets/defaultDatasetsListSettings.json").toPromise();
+
+        const appConfig = {
+          ...config,
+          defaultDatasetsListSettings,
+        } as AppConfig;
+
+        this.appConfig = Object.assign({}, this.appConfig, appConfig);
       } catch (err) {
         console.error("No config provided.");
       }
diff --git a/src/assets/defaultDatasetsListSettings.json b/src/assets/defaultDatasetsListSettings.json
new file mode 100644
index 0000000000..0e1d466700
--- /dev/null
+++ b/src/assets/defaultDatasetsListSettings.json
@@ -0,0 +1,92 @@
+{
+  "columns": [
+    {
+      "name": "select",
+      "order": 0,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "pid",
+      "order": 1,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "datasetName",
+      "order": 2,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "runNumber",
+      "order": 3,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "sourceFolder",
+      "order": 4,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "size",
+      "order": 5,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "creationTime",
+      "order": 6,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "type",
+      "order": 7,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "image",
+      "order": 8,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "metadata",
+      "order": 9,
+      "type": "standard",
+      "enabled": false
+    },
+    {
+      "name": "proposalId",
+      "order": 10,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "ownerGroup",
+      "order": 11,
+      "type": "standard",
+      "enabled": false
+    },
+    {
+      "name": "dataStatus",
+      "order": 12,
+      "type": "standard",
+      "enabled": false
+    }
+  ],
+  "filters": [
+    { "LocationFilter": true },
+    { "PidFilter": true },
+    { "GroupFilter": true },
+    { "TypeFilter": true },
+    { "KeywordFilter": true },
+    { "DateRangeFilter": true },
+    { "TextFilter": true }
+  ],
+  "conditions": []
+}

From c154bb568ffe7cb3ab0143b22711f62090b47149 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 12 Feb 2025 14:35:06 +0000
Subject: [PATCH 111/245] workshop: enable discovery, next button, utf8

---
 src/app/_layout/app-header/app-header.component.html   |  2 +-
 .../dialog/ingestor.user-metadata-dialog.component.ts  |  7 +++++--
 .../ingestor/ingestor/helper/ingestor-api-manager.ts   |  9 +++++++--
 src/app/ingestor/ingestor/ingestor.component.ts        | 10 +++++++++-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index 88baab4099..251532aee5 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -70,7 +70,7 @@ <h3>{{ status }}</h3>
     
     <span>
       <h6>
-        <a class="toplink" [routerLink]="['/ingestor']">
+        <a class="toplink" [routerLink]="['/ingestor']" [queryParams]="{ discovery: true }">
           <mat-icon> cloud_upload  </mat-icon>
           <span class="large-screen-text">Ingestor (OpenEM)</span></a
         >
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 58f1e74726..4bd5399f30 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -126,9 +126,12 @@ export class IngestorUserMetadataDialogComponent {
   }
 
   validateNextButton(): void {
-    this.uiNextButtonReady =
+    this.uiNextButtonReady = true;
+
+    // Uncomment if prod
+    /*this.uiNextButtonReady =
       this.isSciCatHeaderOk &&
       this.isOrganizationalMetadataOk &&
-      this.isSampleInformationOk;
+      this.isSampleInformationOk;*/
   }
 }
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index d49fd2128d..dd470b7df8 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpParams } from "@angular/common/http";
+import { HttpClient, HttpHeaders, HttpParams } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
 import {
@@ -23,7 +23,12 @@ export class IngestorAPIManager {
 
   public connect(url: string, withCredentials = true): void {
     this.connectUrl = url;
-    this.connectOptions = { withCredentials: withCredentials };
+    this.connectOptions = {
+      withCredentials: withCredentials,
+      headers: new HttpHeaders({
+        "Content-Type": "application/json;charset=UTF-8",
+      }),
+    };
   }
 
   public getVersion(): Promise<OtherVersionResponse> {
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 0915ca00e4..4ab7460667 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -83,6 +83,14 @@ export class IngestorComponent implements OnInit {
     // Get the GET parameter 'backendUrl' from the URL
     this.route.queryParams.subscribe((params) => {
       const backendUrl = params["backendUrl"];
+      const discovery = params["discovery"];
+
+      if (discovery && !backendUrl) {
+        // TODO REMOVE HARDCODED AND DO AUTODISCOVERY
+        const psiUrl = 'https://ingestor.development.psi.ch';
+        this.initializeIngestorConnection(psiUrl);
+      }
+
       if (backendUrl) {
         this.initializeIngestorConnection(backendUrl);
       } else {
@@ -269,7 +277,7 @@ export class IngestorComponent implements OnInit {
   loadLastUsedFacilityBackends(): string[] {
     // Load the list from the local Storage
     const lastUsedFacilityBackends =
-      '["http://localhost:8000", "http://localhost:8888"]';
+      '["http://localhost:8000", "http://localhost:8888", "https://ingestor.development.psi.ch"]';
     if (lastUsedFacilityBackends) {
       return JSON.parse(lastUsedFacilityBackends);
     }

From 5668b44f050ba82fa8cf404fbe6af22c192dc27d Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Wed, 12 Feb 2025 16:25:28 +0100
Subject: [PATCH 112/245] Add UNIBA ingestor URL

---
 src/app/ingestor/ingestor/ingestor.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 4ab7460667..bd8b8fd2a9 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -277,7 +277,7 @@ export class IngestorComponent implements OnInit {
   loadLastUsedFacilityBackends(): string[] {
     // Load the list from the local Storage
     const lastUsedFacilityBackends =
-      '["http://localhost:8000", "http://localhost:8888", "https://ingestor.development.psi.ch"]';
+      '["https://ingestor.development.psi.ch", "http://localhost:8800", "http://localhost:8000", "http://localhost:8888", ]';
     if (lastUsedFacilityBackends) {
       return JSON.parse(lastUsedFacilityBackends);
     }

From cdf3deece311655fd47e6a163d522e04654a5732 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 12 Feb 2025 16:20:06 +0000
Subject: [PATCH 113/245] workaround for demo

---
 src/app/ingestor/ingestor/helper/ingestor-api-manager.ts | 5 +++--
 src/app/ingestor/ingestor/ingestor.component.ts          | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index dd470b7df8..35b03ed06b 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -161,9 +161,10 @@ export class IngestorAPIManager {
     page: number,
     pageSize: number,
   ): Promise<GetExtractorResponse> {
-    const params = new HttpParams()
+    // TODO ACTIVATE PAGING PARAMETERS IF FIXED BY INGESTOR
+    const params = {};/*; new HttpParams()
       .set("page", page.toString())
-      .set("pageSize", pageSize.toString());
+      .set("pageSize", pageSize.toString());*/
 
     return new Promise((resolve, reject) => {
       this.http
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index bd8b8fd2a9..b025f8f6bb 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -87,7 +87,7 @@ export class IngestorComponent implements OnInit {
 
       if (discovery && !backendUrl) {
         // TODO REMOVE HARDCODED AND DO AUTODISCOVERY
-        const psiUrl = 'https://ingestor.development.psi.ch';
+        const psiUrl = "https://ingestor.development.psi.ch";
         this.initializeIngestorConnection(psiUrl);
       }
 
@@ -277,7 +277,7 @@ export class IngestorComponent implements OnInit {
   loadLastUsedFacilityBackends(): string[] {
     // Load the list from the local Storage
     const lastUsedFacilityBackends =
-      '["https://ingestor.development.psi.ch", "http://localhost:8800", "http://localhost:8000", "http://localhost:8888", ]';
+      '["https://ingestor.development.psi.ch", "http://localhost:8800", "http://localhost:8000", "http://localhost:8888" ]';
     if (lastUsedFacilityBackends) {
       return JSON.parse(lastUsedFacilityBackends);
     }

From 99e79edf0e8e58996778abd2eb326f310c4e0faa Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 13 Feb 2025 13:19:12 +0000
Subject: [PATCH 114/245] fix delete transfer

---
 src/app/ingestor/ingestor/helper/ingestor-api-manager.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index 35b03ed06b..8a311e1458 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -2,6 +2,7 @@ import { HttpClient, HttpHeaders, HttpParams } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
 import {
+  DeleteTransferRequest,
   DeleteTransferResponse,
   GetDatasetResponse,
   GetExtractorResponse,
@@ -89,7 +90,7 @@ export class IngestorAPIManager {
   }
 
   public cancelTransfer(transferId: string): Promise<DeleteTransferResponse> {
-    const body = { ingestId: transferId };
+    const body: DeleteTransferRequest = { transferId: transferId };
 
     console.log("Cancel transfer", transferId);
     return new Promise((resolve, reject) => {

From f4d99980844c392f6fc7e553d61c58f4a708d6d2 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 20 Feb 2025 09:26:48 +0000
Subject: [PATCH 115/245] revert workshop workarounds

---
 src/app/_layout/app-header/app-header.component.html     | 2 +-
 src/app/ingestor/ingestor/helper/ingestor-api-manager.ts | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index 251532aee5..804e9e071c 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -70,7 +70,7 @@ <h3>{{ status }}</h3>
     
     <span>
       <h6>
-        <a class="toplink" [routerLink]="['/ingestor']" [queryParams]="{ discovery: true }">
+        <a class="toplink" [routerLink]="['/ingestor']" [queryParams]="{ discovery: false }">
           <mat-icon> cloud_upload  </mat-icon>
           <span class="large-screen-text">Ingestor (OpenEM)</span></a
         >
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index 8a311e1458..805b622de7 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -162,10 +162,9 @@ export class IngestorAPIManager {
     page: number,
     pageSize: number,
   ): Promise<GetExtractorResponse> {
-    // TODO ACTIVATE PAGING PARAMETERS IF FIXED BY INGESTOR
-    const params = {};/*; new HttpParams()
+    const params = new HttpParams()
       .set("page", page.toString())
-      .set("pageSize", pageSize.toString());*/
+      .set("pageSize", pageSize.toString());
 
     return new Promise((resolve, reject) => {
       this.http

From d037ce0b7fe4be6f51f67fd338823fbaf73fb54b Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 20 Feb 2025 12:26:15 +0000
Subject: [PATCH 116/245] detail view for transfer task

---
 .../helper/ingestor.component-helper.ts       |  3 -
 .../ingestor/ingestor/ingestor.component.html | 25 +++++-
 .../ingestor/ingestor/ingestor.component.ts   | 82 ++++++++++++++++++-
 src/app/ingestor/model/transferItem.ts        | 21 ++++-
 4 files changed, 120 insertions(+), 11 deletions(-)

diff --git a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
index 0a54cf96c9..8ab5669df4 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
@@ -50,7 +50,6 @@ export interface SciCatHeader {
   principalInvestigator: string;
   ownerEmail: string;
   contactEmail: string;
-  sourceFolderHost: string;
   investigator: string;
   creationTime: string;
   owner: string;
@@ -135,7 +134,6 @@ export const SciCatHeader_Schema: JsonSchema = {
     principalInvestigator: { type: "string" },
     ownerEmail: { type: "string" },
     contactEmail: { type: "string" },
-    sourceFolderHost: { type: "string" },
     investigator: { type: "string" },
     creationTime: { type: "string" },
     owner: { type: "string" },
@@ -150,7 +148,6 @@ export const SciCatHeader_Schema: JsonSchema = {
     "principalInvestigator",
     "ownerEmail",
     "contactEmail",
-    "sourceFolderHost",
     "investigator",
     "creationTime",
     "owner",
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index a7f4ea794c..c0b23d1f32 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -81,8 +81,10 @@
                   (click)="doRefreshTransferList()">
                   <mat-icon>refresh</mat-icon>
                 </button>
-                <table *ngIf="transferDataInformation !== null" mat-table
-                  [dataSource]="transferDataInformation.transfers">
+                <table
+                  *ngIf="transferDataInformation !== null && transferDataInformation.transfers.length > 0"
+                  mat-table [dataSource]="transferDataInformation.transfers">
+
                   <ng-container matColumnDef="transferId">
                     <th mat-header-cell *matHeaderCellDef><b>ID</b> </th>
                     <td mat-cell *matCellDef="let element">
@@ -96,6 +98,25 @@
                     </td>
                   </ng-container>
 
+                  <ng-container matColumnDef="message">
+                    <th mat-header-cell *matHeaderCellDef><b>Message</b> </th>
+                    <td mat-cell *matCellDef="let element"> {{element.message ??
+                      ""}}
+                    </td>
+                  </ng-container>
+
+                  <ng-container matColumnDef="progress">
+                    <th mat-header-cell *matHeaderCellDef><b>Progress</b> </th>
+                    <td mat-cell *matCellDef="let element">
+                      <mat-icon
+                        [matTooltip]="getTransferDetailInformation(element.transferId)"
+                        (mouseover)="startAutoRefresh(element.transferId)"
+                        (mouseout)="stopAutoRefresh()">
+                        info
+                      </mat-icon>
+                    </td>
+                  </ng-container>
+
                   <ng-container matColumnDef="actions">
                     <th mat-header-cell *matHeaderCellDef class="text-right">
                       <b>Action</b>
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index b025f8f6bb..e9ad736354 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -20,6 +20,7 @@ import {
   OtherVersionResponse,
   PostDatasetRequest,
   GetTransferResponse,
+  TransferItem,
 } from "ingestor/model/models";
 import { PageChangeEvent } from "shared/modules/table/table.component";
 import { Store } from "@ngrx/store";
@@ -54,10 +55,18 @@ export class IngestorComponent implements OnInit {
   lastUsedFacilityBackends: string[] = [];
 
   transferDataInformation: GetTransferResponse = null;
+  transferDetailInformation: TransferItem[] = [];
+  transferAutoRefreshIntervalDetail = 3000;
   transferDataPageSize = 100;
   transferDataPageIndex = 0;
   transferDataPageSizeOptions = [5, 10, 25, 100];
-  displayedColumns: string[] = ["transferId", "status", "actions"];
+  displayedColumns: string[] = [
+    "transferId",
+    "status",
+    "message",
+    "progress",
+    "actions",
+  ];
 
   versionInfo: OtherVersionResponse = null;
   userInfo: UserInfo = null;
@@ -69,13 +78,15 @@ export class IngestorComponent implements OnInit {
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
+  autoRefreshInterval: NodeJS.Timeout = null;
+
   constructor(
     private route: ActivatedRoute,
     private router: Router,
     private apiManager: IngestorAPIManager,
     private sseService: IngestorMetadataSSEService,
     private store: Store,
-  ) {}
+  ) { }
 
   ngOnInit() {
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
@@ -363,12 +374,19 @@ export class IngestorComponent implements OnInit {
     if (dialogRef === null) return;
   }
 
-  async doRefreshTransferList(): Promise<void> {
+  async doRefreshTransferList(transferId?: string): Promise<void> {
     try {
-      this.transferDataInformation = await this.apiManager.getTransferList(
+      const response = await this.apiManager.getTransferList(
         this.transferDataPageIndex + 1,
         this.transferDataPageSize,
+        transferId,
       );
+
+      if (transferId && response.transfers.length > 0) {
+        this.transferDetailInformation.push(response.transfers[0]);
+      } else {
+        this.transferDataInformation = response;
+      }
     } catch (error) {
       this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
     }
@@ -398,4 +416,60 @@ export class IngestorComponent implements OnInit {
     window.location.href =
       this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.AUTH.LOGOUT;
   }
+
+  getTransferDetailInformation(transferId: string): string {
+    const detailItem = this.transferDetailInformation.find(
+      (item) => item.transferId === transferId,
+    );
+    if (detailItem) {
+      let progressState = "";
+      let progressPercent = 0;
+      let fileState = "";
+
+      if (detailItem.bytesTransferred && detailItem.bytesTotal) {
+        const bytesToGB = (bytes: number) => (bytes / 1024 ** 3).toFixed();
+        progressState = `${bytesToGB(detailItem.bytesTransferred)} / ${bytesToGB(detailItem.bytesTotal)} GB`;
+        progressPercent =
+          (detailItem.bytesTransferred / detailItem.bytesTotal) * 100;
+      }
+
+      if (
+        detailItem.filesTransferred &&
+        detailItem.filesTotal &&
+        detailItem.filesTotal > 0
+      ) {
+        fileState = `${detailItem.filesTransferred} / ${detailItem.filesTotal} Files`;
+      }
+
+      return (
+        "Progress: " +
+        progressPercent +
+        "%" +
+        " - Data: " +
+        progressState +
+        " - Files: " +
+        fileState
+      );
+    }
+    return "No further information available.";
+  }
+
+  reloadTransferDetailInformation(transferId: string): void {
+    this.doRefreshTransferList(transferId);
+  }
+
+  startAutoRefresh(transferId: string): void {
+    this.reloadTransferDetailInformation(transferId);
+    this.stopAutoRefresh();
+    this.autoRefreshInterval = setInterval(() => {
+      this.reloadTransferDetailInformation(transferId);
+    }, this.transferAutoRefreshIntervalDetail);
+  }
+
+  stopAutoRefresh(): void {
+    if (this.autoRefreshInterval) {
+      clearInterval(this.autoRefreshInterval);
+      this.autoRefreshInterval = null;
+    }
+  }
 }
diff --git a/src/app/ingestor/model/transferItem.ts b/src/app/ingestor/model/transferItem.ts
index 78b9e45a47..12b08c2def 100644
--- a/src/app/ingestor/model/transferItem.ts
+++ b/src/app/ingestor/model/transferItem.ts
@@ -10,7 +10,24 @@
 
 
 export interface TransferItem { 
-    transferId?: string;
-    status?: string;
+    transferId: string;
+    status: TransferItem.StatusEnum;
+    message?: string;
+    bytesTransferred?: number;
+    bytesTotal?: number;
+    filesTransferred?: number;
+    filesTotal?: number;
 }
+export namespace TransferItem {
+    export type StatusEnum = 'waiting' | 'transferring' | 'finished' | 'failed' | 'cancelled' | 'invalid status';
+    export const StatusEnum = {
+        Waiting: 'waiting' as StatusEnum,
+        Transferring: 'transferring' as StatusEnum,
+        Finished: 'finished' as StatusEnum,
+        Failed: 'failed' as StatusEnum,
+        Cancelled: 'cancelled' as StatusEnum,
+        InvalidStatus: 'invalid status' as StatusEnum
+    };
+}
+
 

From 768e9112ea45c8de9e0ff912c1b9d839be7f492e Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 20 Feb 2025 12:33:12 +0000
Subject: [PATCH 117/245] added documentation to generate api models

---
 src/app/ingestor/model/_generateModel.md | 59 ++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/app/ingestor/model/_generateModel.md

diff --git a/src/app/ingestor/model/_generateModel.md b/src/app/ingestor/model/_generateModel.md
new file mode 100644
index 0000000000..daec444b95
--- /dev/null
+++ b/src/app/ingestor/model/_generateModel.md
@@ -0,0 +1,59 @@
+# OpenAPI Generator - What is that?
+The OpenAPI Generator is an open source tool that provides code generators to generate client libraries, server stubs and API documentation from an OpenAPI specification (e.g. *openapi.yaml* or *open-api.json*).
+The tool works as follows:
+* Input: It takes an OpenAPI specification file (e.g. *openapi.yaml* or *openapi.json*) that describes how the API works, including endpoints, parameters, response structures and data models.
+* Generator selection: You choose a generator (e.g. for *TypeScript Angular*).
+* Output: The generator automatically creates source code that can be used to communicate with the API or as a framework for the API implementation.
+
+
+# How to install the OpenAPI Generator
+## Installation via Docker
+```
+docker pull openapitools/openapi-generator-cli
+```
+
+
+# How do I use the OpenAPI Generator for TypeScript Angular?
+## Prerequisites
+* OpenAPI Generator has been installed
+* openapi.yaml is available
+
+## Generation of Typescript Angular objects
+### Using Docker
+```
+docker run --rm -v ${PWD}:/local openapitools/openapi-generator-cli generate \
+-i /local/openapi.yaml \
+-g typescript-angular \
+-o /local/out
+```
+
+* -i: Path of the input file (openapi.yaml)
+* -g: Generator type (*typescript-angular*)
+* -o: target directory
+
+### Using the OpenAPI Generator CLI
+```
+openapi-generator-cli generate \
+
+-i openapi.yaml \
+-g typescript-angular \
+-o /local/out \
+```
+
+Optional specify angular version: 
+```
+--additional-properties=ngVersion=16
+```
+
+## Integration into an angular project
+* Copy the generated files from the *./local/out/model* folder into your Angular project (model folder).
+
+
+# openapi.yaml as input for OpenAPI Generator
+OpenAPI.yaml contains the following things:
+* Endpoints: Which URL routes are available and what they do.
+* HTTP methods: GET, POST, PUT, DELETE etc.
+* Parameters: Query parameters, body data, etc.
+* Responses: status codes and return data (e.g. JSON objects)
+
+

From 483c58fefddf582de045aedcf4c4d187bd4310a1 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 20 Feb 2025 16:11:28 +0000
Subject: [PATCH 118/245] bug fixes in renderer and prepare autodiscovery

---
 .../app-header/app-header.component.html      |  2 +-
 .../customRenderer/any-of-renderer.ts         | 11 ++-
 .../customRenderer/array-renderer.ts          | 16 ++--
 .../customRenderer/custom-renderers.ts        | 10 ++-
 .../customRenderer/object-group-renderer.ts   | 77 ++++++++++++++++++
 src/app/ingestor/ingestor.module.ts           |  2 +
 .../ingestor/helper/ingestor-api-endpoints.ts |  3 +
 .../ingestor/helper/ingestor-api-manager.ts   | 78 +++++++++++--------
 .../ingestor/ingestor/ingestor.component.html |  5 +-
 .../ingestor/ingestor/ingestor.component.ts   | 61 +++++++++++----
 10 files changed, 200 insertions(+), 65 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index 804e9e071c..251532aee5 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -70,7 +70,7 @@ <h3>{{ status }}</h3>
     
     <span>
       <h6>
-        <a class="toplink" [routerLink]="['/ingestor']" [queryParams]="{ discovery: false }">
+        <a class="toplink" [routerLink]="['/ingestor']" [queryParams]="{ discovery: true }">
           <mat-icon> cloud_upload  </mat-icon>
           <span class="large-screen-text">Ingestor (OpenEM)</span></a
         >
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 6eaf66a1f3..859d02031f 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -96,10 +96,12 @@ export class AnyOfRendererComponent extends JsonFormsControl {
     this.nullOptionSelected = !event.checked;
 
     if (this.nullOptionSelected) {
-      const updatedData = this.rendererService.getState().jsonforms.core.data;
+      const updatedData =
+        this.rendererService.getState().jsonforms.core.data ?? {};
+
       // Update the data in the correct path
       const pathSegments = this.passedProps.path.split(".");
-      let current = updatedData;
+      let current = updatedData ?? {};
       for (let i = 0; i < pathSegments.length - 1; i++) {
         current = current[pathSegments[i]];
       }
@@ -111,11 +113,12 @@ export class AnyOfRendererComponent extends JsonFormsControl {
 
   public onInnerJsonFormsChange(event: any) {
     if (event !== this.passedProps.data) {
-      const updatedData = this.rendererService.getState().jsonforms.core.data;
+      const updatedData =
+        this.rendererService.getState().jsonforms.core.data ?? {};
 
       // Update the data in the correct path
       const pathSegments = this.passedProps.path.split(".");
-      let current = updatedData;
+      let current = updatedData ?? {};
       for (let i = 0; i < pathSegments.length - 1; i++) {
         current = current[pathSegments[i]];
       }
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
index a14d18e241..48f05695d9 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
@@ -1,9 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  OnDestroy,
-  OnInit,
-} from "@angular/core";
+import { Component, OnDestroy, OnInit } from "@angular/core";
 import {
   JsonFormsAngularService,
   JsonFormsAbstractControl,
@@ -45,7 +40,6 @@ import {
         >
           error_outline
         </mat-icon>
-        <span></span>
         <button
           mat-button
           matTooltip="{{ translations.addTooltip }}"
@@ -98,6 +92,7 @@ import {
               <mat-icon>arrow_downward</mat-icon>
             </button>
             <button
+              *ngIf="(minOne && [].constructor(data).length > 1) || !minOne"
               mat-button
               color="warn"
               (click)="remove(idx)"
@@ -116,9 +111,9 @@ import {
 // eslint-disable-next-line @angular-eslint/component-class-suffix
 export class ArrayLayoutRendererCustom
   extends JsonFormsAbstractControl<StatePropsOfArrayLayout>
-  implements OnInit, OnDestroy
-{
+  implements OnInit, OnDestroy {
   noData: boolean;
+  minOne: boolean;
   translations: ArrayTranslations;
   addItem: (path: string, value: any) => () => void;
   moveItemUp: (path: string, index: number) => () => void;
@@ -141,7 +136,7 @@ export class ArrayLayoutRendererCustom
   add(): void {
     this.addItem(
       this.propsPath,
-      createDefaultValue(this.scopedSchema, this.rootSchema)
+      createDefaultValue(this.scopedSchema, this.rootSchema),
     )();
   }
   up(index: number): void {
@@ -165,6 +160,7 @@ export class ArrayLayoutRendererCustom
     this.translations = props.translations;
     this.noData = !props.data || props.data === 0;
     this.uischemas = props.uischemas;
+    this.minOne = props.required;
   }
   getProps(index: number): OwnPropsOfRenderer {
     const uischema = findUISchema(
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index 04b118182c..83669a64d4 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -9,8 +9,12 @@ import { OneOfRendererComponent } from "ingestor/ingestor-metadata-editor/custom
 import { AllOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer";
 import { AnyOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer";
 import { rankWith } from "@jsonforms/core";
-import { TableRendererTester } from "@jsonforms/angular-material";
+import {
+  ObjectControlRendererTester,
+  TableRendererTester,
+} from "@jsonforms/angular-material";
 import { ArrayLayoutRendererCustom } from "./array-renderer";
+import { CustomObjectControlRendererComponent } from "./object-group-renderer";
 
 export const customRenderers: JsonFormsRendererRegistryEntry[] = [
   {
@@ -31,4 +35,8 @@ export const customRenderers: JsonFormsRendererRegistryEntry[] = [
     renderer: ArrayLayoutRendererCustom,
   },
   { tester: TableRendererTester, renderer: ArrayLayoutRendererCustom },
+  {
+    tester: ObjectControlRendererTester,
+    renderer: CustomObjectControlRendererComponent,
+  },
 ];
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
new file mode 100644
index 0000000000..308a22f945
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -0,0 +1,77 @@
+import { Component } from "@angular/core";
+import {
+  JsonFormsAngularService,
+  JsonFormsControlWithDetail,
+} from "@jsonforms/angular";
+import { ControlProps } from "@jsonforms/core";
+import { configuredRenderer } from "../ingestor-metadata-editor-helper";
+
+@Component({
+  selector: "app-object-group-renderer",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
+  template: `
+    <mat-card class="anyof-group">
+      <mat-card-title
+        >{{ objectTitle }}
+        <span class="spacer"></span>
+        <mat-icon
+          *ngIf="this.error?.length"
+          color="warn"
+          matBadgeColor="warn"
+          matTooltip="{{ this.error }}"
+          matTooltipClass="error-message-tooltip"
+        >
+          error_outline
+        </mat-icon>
+      </mat-card-title>
+      <mat-card-content>
+        <jsonforms
+          [schema]="passedProps.schema"
+          [data]="passedProps.data"
+          [renderers]="defaultRenderer"
+          (dataChange)="onInnerJsonFormsChange($event)"
+        ></jsonforms>
+      </mat-card-content>
+    </mat-card>
+  `,
+})
+export class CustomObjectControlRendererComponent extends JsonFormsControlWithDetail {
+  rendererService: JsonFormsAngularService;
+
+  defaultRenderer = configuredRenderer;
+  passedProps: ControlProps;
+  objectTitle: string;
+
+  constructor(service: JsonFormsAngularService) {
+    super(service);
+    this.rendererService = service;
+  }
+
+  public mapAdditionalProps(props: ControlProps) {
+    this.passedProps = props;
+    const pathTitle = props.path || "Object";
+
+    this.objectTitle = pathTitle
+      .replaceAll("_", " ")
+      .split(" ")
+      .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+      .join(" ");
+  }
+
+  public onInnerJsonFormsChange(event: any) {
+    if (event !== this.passedProps.data) {
+      const updatedData =
+        this.rendererService.getState().jsonforms.core.data ?? {};
+
+      // Update the data in the correct path
+      const pathSegments = this.passedProps.path.split(".");
+      let current = updatedData ?? {};
+      for (let i = 0; i < pathSegments.length - 1; i++) {
+        current = current[pathSegments[i]];
+      }
+      current[pathSegments[pathSegments.length - 1]] = event;
+
+      this.rendererService.setData(updatedData);
+    }
+  }
+}
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 0a0c40fe33..9d070f023a 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -34,6 +34,7 @@ import { MatTooltipModule } from "@angular/material/tooltip";
 import { IngestorConfirmationDialogComponent } from "./ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component";
 import { ExportTemplateHelperComponent } from "./ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component";
 import { MatPaginatorModule } from "@angular/material/paginator";
+import { CustomObjectControlRendererComponent } from "./ingestor-metadata-editor/customRenderer/object-group-renderer";
 
 @NgModule({
   declarations: [
@@ -47,6 +48,7 @@ import { MatPaginatorModule } from "@angular/material/paginator";
     AnyOfRendererComponent,
     OneOfRendererComponent,
     ArrayLayoutRendererCustom,
+    CustomObjectControlRendererComponent,
     IngestorConfirmationDialogComponent,
     ExportTemplateHelperComponent,
   ],
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
index 753d3710f7..fa2b7d3f0c 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
@@ -14,5 +14,8 @@ export const INGESTOR_API_ENDPOINTS_V1 = {
   METADATA: "metadata",
 };
 
+/*export const AUTODISCOVERY_ENDPOINT =
+  "http://localhost:4000/assets/discovery/discovery.txt";*/
+
 export const LAST_USED_FALLBACK =
   '["http://localhost:8000", "http://localhost:8888"]';
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index 805b622de7..74d054fbc1 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -40,14 +40,14 @@ export class IngestorAPIManager {
           params,
           ...this.connectOptions,
         })
-        .subscribe(
-          (response) => {
+        .subscribe({
+          next: (response) => {
             resolve(response as OtherVersionResponse);
           },
-          (error) => {
+          error: (error) => {
             reject(error);
           },
-        );
+        });
     });
   }
 
@@ -59,14 +59,14 @@ export class IngestorAPIManager {
           params,
           ...this.connectOptions,
         })
-        .subscribe(
-          (response) => {
+        .subscribe({
+          next: (response) => {
             resolve(response as UserInfo);
           },
-          (error) => {
+          error: (error) => {
             reject(error);
           },
-        );
+        });
     });
   }
 
@@ -78,14 +78,14 @@ export class IngestorAPIManager {
           params,
           ...this.connectOptions,
         })
-        .subscribe(
-          (response) => {
+        .subscribe({
+          next: (response) => {
             resolve(response as OtherHealthResponse);
           },
-          (error) => {
+          error: (error) => {
             reject(error);
           },
-        );
+        });
     });
   }
 
@@ -99,14 +99,14 @@ export class IngestorAPIManager {
           body,
           ...this.connectOptions,
         })
-        .subscribe(
-          (response) => {
+        .subscribe({
+          next: (response) => {
             resolve(response as DeleteTransferResponse);
           },
-          (error) => {
+          error: (error) => {
             reject(error);
           },
-        );
+        });
     });
   }
 
@@ -128,14 +128,14 @@ export class IngestorAPIManager {
           params,
           ...this.connectOptions,
         })
-        .subscribe(
-          (response) => {
+        .subscribe({
+          next: (response) => {
             resolve(response as GetTransferResponse);
           },
-          (error) => {
+          error: (error) => {
             reject(error);
           },
-        );
+        });
     });
   }
 
@@ -145,16 +145,16 @@ export class IngestorAPIManager {
         .post(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET, payload, {
           ...this.connectOptions,
         })
-        .subscribe(
-          (response) => {
+        .subscribe({
+          next: (response) => {
             const returnValue = JSON.stringify(response);
             resolve(returnValue);
           },
-          (error) => {
+          error: (error) => {
             console.error("Upload failed", error);
             reject(error);
           },
-        );
+        });
     });
   }
 
@@ -172,15 +172,15 @@ export class IngestorAPIManager {
           params,
           ...this.connectOptions,
         })
-        .subscribe(
-          (response: GetExtractorResponse) => {
+        .subscribe({
+          next: (response: GetExtractorResponse) => {
             resolve(response as GetExtractorResponse);
           },
-          (error) => {
+          error: (error) => {
             console.error(error);
             reject(error);
           },
-        );
+        });
     });
   }
 
@@ -198,15 +198,29 @@ export class IngestorAPIManager {
           params,
           ...this.connectOptions,
         })
-        .subscribe(
-          (response: GetDatasetResponse) => {
+        .subscribe({
+          next: (response: GetDatasetResponse) => {
             resolve(response as GetDatasetResponse);
           },
-          (error) => {
+          error: (error) => {
             console.error(error);
             reject(error);
           },
-        );
+        });
     });
   }
+
+  /*public getAutodiscoveryList(): Promise<string> {
+    return new Promise((resolve, reject) => {
+      this.http.get(AUTODISCOVERY_ENDPOINT, {}).subscribe({
+        next: (data) => {
+          console.log(data);
+          resolve(data as string);
+        },
+        error: (error) => {
+          console.error("Fetch error:", error);
+          reject(error);
+        },
+      });
+    }); }*/
 }
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor/ingestor.component.html
index c0b23d1f32..6843d6929b 100644
--- a/src/app/ingestor/ingestor/ingestor.component.html
+++ b/src/app/ingestor/ingestor/ingestor.component.html
@@ -94,7 +94,8 @@
 
                   <ng-container matColumnDef="status">
                     <th mat-header-cell *matHeaderCellDef><b>Status</b> </th>
-                    <td mat-cell *matCellDef="let element"> {{element.status}}
+                    <td mat-cell *matCellDef="let element"> {{element.status ??
+                      ""}}
                     </td>
                   </ng-container>
 
@@ -162,7 +163,7 @@
                   </mat-list-item>
                   <mat-list-item>
                     <span matListItemTitle>Version</span>
-                    <span matListItemLine>{{ versionInfo.version
+                    <span matListItemLine>{{ versionInfo.version ?? ""
                       }}</span>
                   </mat-list-item>
                   <mat-list-item>
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index e9ad736354..2cf3a2e682 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -70,6 +70,7 @@ export class IngestorComponent implements OnInit {
 
   versionInfo: OtherVersionResponse = null;
   userInfo: UserInfo = null;
+  scicatUserProfile: any = null;
   authIsDisabled = false;
   healthInfo: OtherHealthResponse = null;
 
@@ -91,15 +92,34 @@ export class IngestorComponent implements OnInit {
   ngOnInit() {
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
 
+    // Fetch the API token that the ingestor can authenticate to scicat as the user
+    this.vm$.subscribe((settings) => {
+      this.scicatUserProfile = settings.profile;
+      this.tokenValue = settings.scicatToken;
+      this.loadIngestorConfiguration();
+
+      if (this.tokenValue === "") {
+        this.store.dispatch(fetchScicatTokenAction());
+      }
+    });
+    this.store.dispatch(fetchCurrentUserAction());
+  }
+
+  loadIngestorConfiguration(): void {
     // Get the GET parameter 'backendUrl' from the URL
-    this.route.queryParams.subscribe((params) => {
+    this.route.queryParams.subscribe(async (params) => {
       const backendUrl = params["backendUrl"];
       const discovery = params["discovery"];
 
-      if (discovery && !backendUrl) {
-        // TODO REMOVE HARDCODED AND DO AUTODISCOVERY
-        const psiUrl = "https://ingestor.development.psi.ch";
-        this.initializeIngestorConnection(psiUrl);
+      if (discovery === "true" && !backendUrl) {
+        const facilityUrl = await this.getFacilityURLByUserInfo();
+        if (facilityUrl != null) {
+          this.router.navigate([], {
+            relativeTo: this.route,
+            queryParams: { backendUrl: facilityUrl },
+            queryParamsHandling: "",
+          });
+        }
       }
 
       if (backendUrl) {
@@ -108,16 +128,6 @@ export class IngestorComponent implements OnInit {
         this.connectingToFacilityBackend = false;
       }
     });
-
-    // Fetch the API token that the ingestor can authenticate to scicat as the user
-    this.vm$.subscribe((settings) => {
-      this.tokenValue = settings.scicatToken;
-
-      if (this.tokenValue === "") {
-        this.store.dispatch(fetchScicatTokenAction());
-      }
-    });
-    this.store.dispatch(fetchCurrentUserAction());
   }
 
   async initializeIngestorConnection(
@@ -472,4 +482,25 @@ export class IngestorComponent implements OnInit {
       this.autoRefreshInterval = null;
     }
   }
+
+  async getFacilityURLByUserInfo(): Promise<string | null> {
+    if (this.scicatUserProfile && this.scicatUserProfile.email) {
+      const facilityEmail = this.scicatUserProfile.email;
+      const facility = facilityEmail.split("@")[1] as string;
+
+      try {
+        const facilityName = facility.toLowerCase();
+        //const discoveryJson = await this.apiManager.getAutodiscoveryList();
+        //const discoveryList = JSON.parse(discoveryJson);
+        console.log(facilityName);
+        // TODO
+        if (facilityName === "unibe.ch") {
+          return "http://localhost:8888";
+        }
+      } catch (error) {
+        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+      }
+    }
+    return null;
+  }
 }

From fc8af20b72e0a74eaf5ead86d61bf14e64ca15df Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 25 Feb 2025 14:05:05 +0000
Subject: [PATCH 119/245] bug fix - only initialize one time

---
 .../ingestor/helper/ingestor.metadata-sse-service.ts       | 1 +
 src/app/ingestor/ingestor/ingestor.component.ts            | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
index d1c03d651c..b2848dbb92 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
@@ -42,6 +42,7 @@ export class IngestorMetadataSSEService {
 
     this.eventSource.addEventListener("progress", (event) => {
       // Decode from base64 and parse JSON
+      //console.log(event);
       const encodedData = atob(event.data.replace(/"/g, ""));
       const data = JSON.parse(encodedData) as ProgressMessage;
 
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 2cf3a2e682..365dab0858 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -43,6 +43,7 @@ export class IngestorComponent implements OnInit {
 
   vm$ = this.store.select(selectUserSettingsPageViewModel);
   sciCatLoggedIn$ = this.store.select(selectIsLoggedIn);
+  ingestorInitialized = false;
   tokenValue: string;
 
   sourceFolder = "";
@@ -96,7 +97,11 @@ export class IngestorComponent implements OnInit {
     this.vm$.subscribe((settings) => {
       this.scicatUserProfile = settings.profile;
       this.tokenValue = settings.scicatToken;
-      this.loadIngestorConfiguration();
+
+      if (!this.ingestorInitialized) {
+        this.ingestorInitialized = true;
+        this.loadIngestorConfiguration();
+      }
 
       if (this.tokenValue === "") {
         this.store.dispatch(fetchScicatTokenAction());

From 2ef48c11f2716cedb6abbe130b79b28dbdc5f3d1 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 25 Feb 2025 14:10:31 +0000
Subject: [PATCH 120/245] check for valid base64

---
 .../ingestor/helper/ingestor.component-helper.ts      | 10 ++++++++++
 .../ingestor/helper/ingestor.metadata-sse-service.ts  | 11 ++++++++---
 src/app/ingestor/ingestor/ingestor.component.ts       |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
index 8ab5669df4..9b3de0b329 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
@@ -153,3 +153,13 @@ export const SciCatHeader_Schema: JsonSchema = {
     "owner",
   ],
 };
+
+export const isBase64 = (str: string) => {
+  try {
+    return btoa(atob(str)) === str;
+  } catch (err) {
+    console.error(err);
+    console.error("Not a valid base64 string; try to parse plain text as JSON");
+    return false;
+  }
+};
diff --git a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
index b2848dbb92..63bd19a43d 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from "@angular/core";
 import { Subject } from "rxjs";
+import { isBase64 } from "./ingestor.component-helper";
 
 interface IngestorMetadataEvent {
   message: string;
@@ -42,9 +43,13 @@ export class IngestorMetadataSSEService {
 
     this.eventSource.addEventListener("progress", (event) => {
       // Decode from base64 and parse JSON
-      //console.log(event);
-      const encodedData = atob(event.data.replace(/"/g, ""));
-      const data = JSON.parse(encodedData) as ProgressMessage;
+      // Check if event is a valid base64 string
+      let eventData = event.data;
+      if (isBase64(event.data.replace(/"/g, ""))) {
+        eventData = atob(event.data.replace(/"/g, ""));
+      }
+
+      const data = JSON.parse(eventData) as ProgressMessage;
 
       const progressMessage = data.std_out.toLowerCase();
       let progress = 0;
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 365dab0858..de94283cd9 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -88,7 +88,7 @@ export class IngestorComponent implements OnInit {
     private apiManager: IngestorAPIManager,
     private sseService: IngestorMetadataSSEService,
     private store: Store,
-  ) { }
+  ) {}
 
   ngOnInit() {
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();

From d19bedd4da2b8a3aba895df68d98664bb8f6abd1 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 27 Feb 2025 07:34:30 +0000
Subject: [PATCH 121/245] Improved behvaiour

---
 .../customRenderer/object-group-renderer.ts   | 26 +++++++++++++----
 .../ingestor-metadata-editor.component.ts     | 28 +++++++++++++++++--
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
index 308a22f945..5af5f614ca 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -1,4 +1,4 @@
-import { Component } from "@angular/core";
+import { ChangeDetectorRef, Component } from "@angular/core";
 import {
   JsonFormsAngularService,
   JsonFormsControlWithDetail,
@@ -7,7 +7,7 @@ import { ControlProps } from "@jsonforms/core";
 import { configuredRenderer } from "../ingestor-metadata-editor-helper";
 
 @Component({
-  selector: "app-object-group-renderer",
+  selector: "app-objec==t-group-renderer",
   styleUrls: ["../ingestor-metadata-editor.component.scss"],
   template: `
     <mat-card class="anyof-group">
@@ -15,10 +15,10 @@ import { configuredRenderer } from "../ingestor-metadata-editor-helper";
         >{{ objectTitle }}
         <span class="spacer"></span>
         <mat-icon
-          *ngIf="this.error?.length"
+          *ngIf="this.innerErrors?.length"
           color="warn"
           matBadgeColor="warn"
-          matTooltip="{{ this.error }}"
+          matTooltip="{{ this.innerErrors }}"
           matTooltipClass="error-message-tooltip"
         >
           error_outline
@@ -30,6 +30,7 @@ import { configuredRenderer } from "../ingestor-metadata-editor-helper";
           [data]="passedProps.data"
           [renderers]="defaultRenderer"
           (dataChange)="onInnerJsonFormsChange($event)"
+          (errors)="onInnerErrors($event)"
         ></jsonforms>
       </mat-card-content>
     </mat-card>
@@ -41,8 +42,12 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
   defaultRenderer = configuredRenderer;
   passedProps: ControlProps;
   objectTitle: string;
+  innerErrors: string;
 
-  constructor(service: JsonFormsAngularService) {
+  constructor(
+    service: JsonFormsAngularService,
+    private cdr: ChangeDetectorRef,
+  ) {
     super(service);
     this.rendererService = service;
   }
@@ -74,4 +79,15 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
       this.rendererService.setData(updatedData);
     }
   }
+
+  onInnerErrors(errors: any[]) {
+    this.innerErrors = "";
+    errors.forEach((error, number) => {
+      if (error.message) {
+        const ctrNum = number + 1;
+        this.innerErrors += ctrNum + ": " + error.message + "\n";
+      }
+    });
+    this.cdr.detectChanges();
+  }
 }
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 5080180e65..f4959aec56 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -1,24 +1,46 @@
-import { Component, EventEmitter, Output, Input } from "@angular/core";
+import { Component, EventEmitter, Output, Input, OnInit } from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import { configuredRenderer } from "./ingestor-metadata-editor-helper";
 
 @Component({
   selector: "app-metadata-editor",
   template: `<jsonforms
-    [data]="data"
+    [data]="visualData"
     [schema]="schema"
     [renderers]="combinedRenderers"
     (dataChange)="onDataChange($event)"
     (errors)="onErrors($event)"
   ></jsonforms>`,
 })
-export class IngestorMetadataEditorComponent {
+export class IngestorMetadataEditorComponent implements OnInit {
   @Input() data: object;
   @Input() schema: JsonSchema;
 
   @Output() dataChange = new EventEmitter<string>();
   @Output() errors = new EventEmitter<any[]>();
 
+  visualData: object = {};
+
+  ngOnInit() {
+    // Do a deep clone
+    this.visualData = JSON.parse(JSON.stringify(this.data));
+
+    // Update the data with the same keys as the schema, including nested properties
+    const initializeVisualData = (schema: JsonSchema, target: any) => {
+      Object.keys(schema.properties).forEach((key) => {
+        const property = schema.properties[key];
+        if (property.type === "object") {
+          if (target[key] === undefined || target[key] === null) {
+            target[key] = {};
+          }
+          initializeVisualData(property, target[key]);
+        }
+      });
+    };
+
+    initializeVisualData(this.schema, this.visualData);
+  }
+
   get combinedRenderers() {
     return configuredRenderer;
   }

From 99247319d48804242d0c8a42aa83ec165bd0d90c Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 27 Feb 2025 07:52:44 +0000
Subject: [PATCH 122/245] Fix Angstrom-Unit and remove old components

---
 .../customRenderer/all-of-renderer.ts         | 15 ----
 .../customRenderer/custom-renderers.ts        |  8 +-
 .../customRenderer/one-of-renderer.ts         | 88 -------------------
 src/app/ingestor/ingestor.module.ts           |  2 -
 .../helper/ingestor.component-helper.ts       | 15 +++-
 .../helper/ingestor.metadata-sse-service.ts   |  5 +-
 .../ingestor/ingestor/ingestor.component.ts   | 10 +--
 7 files changed, 21 insertions(+), 122 deletions(-)
 delete mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
 delete mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
deleted file mode 100644
index bc0df73f5e..0000000000
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-import { JsonFormsControl } from "@jsonforms/angular";
-
-@Component({
-  selector: "AllOfRenderer",
-  styleUrls: ["../ingestor-metadata-editor.component.scss"],
-  template: `<div>AllOf Renderer</div>`,
-})
-export class AllOfRendererComponent extends JsonFormsControl implements OnInit {
-  data: any[] = [];
-
-  ngOnInit() {
-    this.data = this.uischema?.options?.items || [];
-  }
-}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index 83669a64d4..75afaf9e45 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -1,12 +1,8 @@
 import {
-  isAllOfControl,
   isAnyOfControl,
   isObjectArrayWithNesting,
-  isOneOfControl,
   JsonFormsRendererRegistryEntry,
 } from "@jsonforms/core";
-import { OneOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer";
-import { AllOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer";
 import { AnyOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer";
 import { rankWith } from "@jsonforms/core";
 import {
@@ -17,14 +13,14 @@ import { ArrayLayoutRendererCustom } from "./array-renderer";
 import { CustomObjectControlRendererComponent } from "./object-group-renderer";
 
 export const customRenderers: JsonFormsRendererRegistryEntry[] = [
-  {
+  /*{
     tester: rankWith(4, isOneOfControl),
     renderer: OneOfRendererComponent,
   },
   {
     tester: rankWith(4, isAllOfControl),
     renderer: AllOfRendererComponent,
-  },
+  },*/
   {
     tester: rankWith(4, isAnyOfControl),
     renderer: AnyOfRendererComponent,
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
deleted file mode 100644
index 76324cab20..0000000000
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { Component } from "@angular/core";
-import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
-import { ControlProps, JsonSchema } from "@jsonforms/core";
-import { configuredRenderer } from "../ingestor-metadata-editor-helper";
-
-@Component({
-  selector: "app-oneof-component",
-  styleUrls: ["../ingestor-metadata-editor.component.scss"],
-  template: `
-    <div class="anyof-group">
-      <p>{{ anyOfTitle }}</p>
-      <mat-radio-group [(ngModel)]="selectedOption" (change)="onOptionChange()">
-        <mat-radio-button
-          *ngFor="let option of options"
-          [value]="option"
-          style="margin-right: 10px;"
-        >
-          {{ option }}
-        </mat-radio-button>
-      </mat-radio-group>
-      <div
-        style="margin-top: 20px;"
-        *ngIf="selectedAnyOption && selectedOption !== 'null'"
-      >
-        <jsonforms
-          [schema]="selectedAnyOption"
-          [data]="passedProps.data"
-          [renderers]="defaultRenderer"
-          (dataChange)="onInnerJsonFormsChange($event)"
-        ></jsonforms>
-      </div>
-    </div>
-  `,
-})
-export class OneOfRendererComponent extends JsonFormsControl {
-  dataAsString: string;
-  options: string[] = [];
-  anyOfTitle: string;
-  selectedOption: string;
-  selectedAnyOption: JsonSchema;
-
-  rendererService: JsonFormsAngularService;
-
-  defaultRenderer = configuredRenderer;
-  passedProps: ControlProps;
-
-  constructor(service: JsonFormsAngularService) {
-    super(service);
-    this.rendererService = service;
-  }
-
-  public mapAdditionalProps(props: ControlProps) {
-    this.passedProps = props;
-    this.anyOfTitle = props.label || "AnyOf";
-    this.options = props.schema.anyOf.map(
-      (option: any) => option.title || option.type || JSON.stringify(option),
-    );
-    if (!props.data) {
-      this.selectedOption = "null"; // Auf "null" setzen, wenn die Daten leer sind
-    }
-  }
-
-  public onOptionChange() {
-    this.selectedAnyOption = (this.passedProps.schema.anyOf as any).find(
-      (option: any) =>
-        option.title === this.selectedOption ||
-        option.type === this.selectedOption ||
-        JSON.stringify(option) === this.selectedOption,
-    );
-  }
-
-  public onInnerJsonFormsChange(event: any) {
-    // Check if data is equal to the passedProps.data
-    if (event !== this.passedProps.data) {
-      const updatedData = this.rendererService.getState().jsonforms.core.data;
-
-      // aktualisiere das aktuelle Datenobjekt
-      const pathSegments = this.passedProps.path.split(".");
-      let current = updatedData;
-      for (let i = 0; i < pathSegments.length - 1; i++) {
-        current = current[pathSegments[i]];
-      }
-      current[pathSegments[pathSegments.length - 1]] = event;
-
-      this.rendererService.setData(updatedData);
-    }
-  }
-}
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 9d070f023a..6e88377f6d 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -26,7 +26,6 @@ import { IngestorConfirmTransferDialogComponent } from "./ingestor/dialog/ingest
 import { MatStepperModule } from "@angular/material/stepper";
 import { IngestorDialogStepperComponent } from "./ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component";
 import { AnyOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
-import { OneOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/one-of-renderer";
 import { MatRadioModule } from "@angular/material/radio";
 import { ArrayLayoutRendererCustom } from "./ingestor-metadata-editor/customRenderer/array-renderer";
 import { MatBadgeModule } from "@angular/material/badge";
@@ -46,7 +45,6 @@ import { CustomObjectControlRendererComponent } from "./ingestor-metadata-editor
     IngestorConfirmTransferDialogComponent,
     IngestorDialogStepperComponent,
     AnyOfRendererComponent,
-    OneOfRendererComponent,
     ArrayLayoutRendererCustom,
     CustomObjectControlRendererComponent,
     IngestorConfirmationDialogComponent,
diff --git a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
index 9b3de0b329..9a93848c95 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
@@ -157,9 +157,18 @@ export const SciCatHeader_Schema: JsonSchema = {
 export const isBase64 = (str: string) => {
   try {
     return btoa(atob(str)) === str;
-  } catch (err) {
-    console.error(err);
-    console.error("Not a valid base64 string; try to parse plain text as JSON");
+  } catch {
     return false;
   }
 };
+
+export const decodeBase64ToUTF8 = (base64: string) => {
+  const text = atob(base64);
+  const length = text.length;
+  const bytes = new Uint8Array(length);
+  for (let i = 0; i < length; i++) {
+    bytes[i] = text.charCodeAt(i);
+  }
+  const decoder = new TextDecoder(); // default is utf-8
+  return decoder.decode(bytes);
+};
diff --git a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
index 63bd19a43d..d2c09af9ba 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 import { Subject } from "rxjs";
-import { isBase64 } from "./ingestor.component-helper";
+import { decodeBase64ToUTF8, isBase64 } from "./ingestor.component-helper";
 
 interface IngestorMetadataEvent {
   message: string;
@@ -44,9 +44,10 @@ export class IngestorMetadataSSEService {
     this.eventSource.addEventListener("progress", (event) => {
       // Decode from base64 and parse JSON
       // Check if event is a valid base64 string
+
       let eventData = event.data;
       if (isBase64(event.data.replace(/"/g, ""))) {
-        eventData = atob(event.data.replace(/"/g, ""));
+        eventData = decodeBase64ToUTF8(event.data.replace(/"/g, ""));
       }
 
       const data = JSON.parse(eventData) as ProgressMessage;
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index de94283cd9..871f7cf99a 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -227,11 +227,9 @@ export class IngestorComponent implements OnInit {
       .set("methodName", this.createNewTransferData.selectedMethod.name);
 
     const sseUrl = `${this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.METADATA}?${params.toString()}`;
-
     this.sseService.connect(sseUrl);
-
-    this.sseService.getMessages().subscribe(
-      (data) => {
+    this.sseService.getMessages().subscribe({
+      next: (data) => {
         //console.log("Received SSE data:", data);
         this.createNewTransferData.apiInformation.extractorMetaDataStatus =
           data.message;
@@ -260,7 +258,7 @@ export class IngestorComponent implements OnInit {
             data.progress;
         }
       },
-      (error) => {
+      error: (error) => {
         console.error("Error receiving SSE data:", error);
         this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
         this.createNewTransferData.apiInformation.metaDataExtractionFailed =
@@ -268,7 +266,7 @@ export class IngestorComponent implements OnInit {
         this.createNewTransferData.apiInformation.extractMetaDataRequested =
           false;
       },
-    );
+    });
 
     return true;
   }

From 110786ed0d7fad8c70e73d9e39b9811081eff48c Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 27 Feb 2025 12:20:21 +0000
Subject: [PATCH 123/245] Improved error handling, bug fix when unchecking
 any-of

---
 .../customRenderer/any-of-renderer.ts         | 26 +++++++++----------
 .../customRenderer/object-group-renderer.ts   | 13 ++++------
 .../ingestor-metadata-editor-helper.ts        | 13 ++++++++++
 ...tor.extractor-metadata-dialog.component.ts | 20 ++++----------
 ...ingestor.user-metadata-dialog.component.ts | 17 +++---------
 5 files changed, 39 insertions(+), 50 deletions(-)

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 859d02031f..d051a7921e 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -95,20 +95,20 @@ export class AnyOfRendererComponent extends JsonFormsControl {
   public onEnableCheckboxChange(event: MatCheckboxChange) {
     this.nullOptionSelected = !event.checked;
 
-    if (this.nullOptionSelected) {
-      const updatedData =
-        this.rendererService.getState().jsonforms.core.data ?? {};
-
-      // Update the data in the correct path
-      const pathSegments = this.passedProps.path.split(".");
-      let current = updatedData ?? {};
-      for (let i = 0; i < pathSegments.length - 1; i++) {
-        current = current[pathSegments[i]];
-      }
-      current[pathSegments[pathSegments.length - 1]] = null;
-
-      this.rendererService.setData(updatedData);
+    const updatedData =
+      this.rendererService.getState().jsonforms.core.data ?? {};
+
+    // Update the data in the correct path
+    const pathSegments = this.passedProps.path.split(".");
+    let current = updatedData ?? {};
+    for (let i = 0; i < pathSegments.length - 1; i++) {
+      current = current[pathSegments[i]];
     }
+    current[pathSegments[pathSegments.length - 1]] = this.nullOptionSelected
+      ? null
+      : {};
+
+    this.rendererService.setData(updatedData);
   }
 
   public onInnerJsonFormsChange(event: any) {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
index 5af5f614ca..0073e49950 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -4,7 +4,10 @@ import {
   JsonFormsControlWithDetail,
 } from "@jsonforms/angular";
 import { ControlProps } from "@jsonforms/core";
-import { configuredRenderer } from "../ingestor-metadata-editor-helper";
+import {
+  configuredRenderer,
+  convertJSONFormsErrorToString,
+} from "../ingestor-metadata-editor-helper";
 
 @Component({
   selector: "app-objec==t-group-renderer",
@@ -81,13 +84,7 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
   }
 
   onInnerErrors(errors: any[]) {
-    this.innerErrors = "";
-    errors.forEach((error, number) => {
-      if (error.message) {
-        const ctrNum = number + 1;
-        this.innerErrors += ctrNum + ": " + error.message + "\n";
-      }
-    });
+    this.innerErrors = convertJSONFormsErrorToString(errors);
     this.cdr.detectChanges();
   }
 }
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index 404a614e90..30fcbde251 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -33,3 +33,16 @@ export class IngestorMetadataEditorHelper {
     return schema;
   }
 }
+
+export const convertJSONFormsErrorToString = (error: any): string => {
+  let errorString = "";
+
+  error.forEach((error, number) => {
+    if (error.message) {
+      const ctrNum = number + 1;
+      errorString += ctrNum + ": " + error.message + "\n";
+    }
+  });
+
+  return errorString;
+};
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
index 3d159c532e..33c7673ffc 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -6,6 +6,7 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
 } from "../helper/ingestor.component-helper";
+import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 @Component({
   selector: "ingestor.extractor-metadata-dialog",
@@ -57,7 +58,8 @@ export class IngestorExtractorMetadataDialogComponent {
       this.createNewTransferData.apiInformation.metaDataExtractionFailed;
     this.extractorMetaDataStatus =
       this.createNewTransferData.apiInformation.extractorMetaDataStatus;
-    this.process = this.createNewTransferData.apiInformation.extractorMetadataProgress;
+    this.process =
+      this.createNewTransferData.apiInformation.extractorMetadataProgress;
   }
 
   onClickBack(): void {
@@ -90,26 +92,14 @@ export class IngestorExtractorMetadataDialogComponent {
 
   instrumentErrorsHandler(errors: any[]) {
     this.isInstrumentMetadataOk = errors.length === 0;
-    this.instrumentErrors = "";
-    errors.forEach((error, number) => {
-      if (error.message) {
-        const ctrNum = number + 1;
-        this.instrumentErrors += ctrNum + ": " + error.message + "\n";
-      }
-    });
+    this.instrumentErrors = convertJSONFormsErrorToString(errors);
     this.validateNextButton();
     this.cdr.detectChanges();
   }
 
   acquisitionErrorsHandler(errors: any[]) {
     this.isAcquisitionMetadataOk = errors.length === 0;
-    this.acquisitionErrors = "";
-    errors.forEach((error, number) => {
-      if (error.message) {
-        const ctrNum = number + 1;
-        this.acquisitionErrors += ctrNum + ": " + error.message + "\n";
-      }
-    });
+    this.acquisitionErrors = convertJSONFormsErrorToString(errors);
     this.validateNextButton();
     this.cdr.detectChanges();
   }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
index 4bd5399f30..2271fd6ede 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
@@ -7,6 +7,7 @@ import {
   IngestorHelper,
   SciCatHeader_Schema,
 } from "../helper/ingestor.component-helper";
+import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 @Component({
   selector: "ingestor.user-metadata-dialog",
@@ -88,26 +89,14 @@ export class IngestorUserMetadataDialogComponent {
 
   scicatHeaderErrorsHandler(errors: any[]) {
     this.isSciCatHeaderOk = errors.length === 0;
-    this.scicatHeaderErrors = "";
-    errors.forEach((error, number) => {
-      if (error.message) {
-        const ctrNum = number + 1;
-        this.scicatHeaderErrors += ctrNum + ": " + error.message + "\n";
-      }
-    });
+    this.scicatHeaderErrors = convertJSONFormsErrorToString(errors);
     this.validateNextButton();
     this.cdr.detectChanges();
   }
 
   organizationalErrorsHandler(errors: any[]) {
     this.isOrganizationalMetadataOk = errors.length === 0;
-    this.organizationalErrors = "";
-    errors.forEach((error, number) => {
-      if (error.message) {
-        const ctrNum = number + 1;
-        this.organizationalErrors += ctrNum + ": " + error.message + "\n";
-      }
-    });
+    this.organizationalErrors = convertJSONFormsErrorToString(errors);
     this.validateNextButton();
     this.cdr.detectChanges();
   }

From 66490930b46244df554e629f02f26ec43ce57371 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 27 Feb 2025 12:37:47 +0000
Subject: [PATCH 124/245] fix creation time

---
 .../ingestor/dialog/ingestor.new-transfer-dialog.component.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 6c75a53a7e..9e64c7d493 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -118,8 +118,10 @@ export class IngestorNewTransferDialogComponent implements OnInit {
       this.data.userInfo?.email ?? "";
     this.data.createNewTransferData.scicatHeader["contactEmail"] =
       this.data.userInfo?.email ?? "";
+    const creationTime = new Date();
+    const formattedCreationTime = creationTime.toISOString().split("T")[0];
     this.data.createNewTransferData.scicatHeader["creationTime"] =
-      new Date().toDateString();
+      formattedCreationTime;
   }
 
   prepareSchemaForProcessing(): void {

From 7bdd3f7f070bc405176826b3141cb799a200a438 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 28 Feb 2025 17:11:13 +0000
Subject: [PATCH 125/245] wip: add routes for many possible deposition options

---
 ...ataset-details-dashboard.routing.module.ts |   7 +-
 .../datasets.routing.module.ts                |  11 ++
 .../dataset-detail.component.ts               |   2 +-
 .../dataset-details-dashboard.component.ts    |   8 +-
 src/app/datasets/datasets.module.ts           |   3 +-
 .../depositor/depositor.component.html        |  69 ++++++++++++
 .../depositor/depositor.component.scss        |  58 ++++++++++
 .../depositor/depositor.component.spec.ts     |  21 ++++
 .../datasets/depositor/depositor.component.ts | 102 ++++++++++++++++++
 src/app/datasets/onedep/onedep.component.ts   |  10 +-
 10 files changed, 279 insertions(+), 12 deletions(-)
 create mode 100644 src/app/datasets/depositor/depositor.component.html
 create mode 100644 src/app/datasets/depositor/depositor.component.scss
 create mode 100644 src/app/datasets/depositor/depositor.component.spec.ts
 create mode 100644 src/app/datasets/depositor/depositor.component.ts

diff --git a/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts b/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
index 1bf09da064..3e4434545b 100644
--- a/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
+++ b/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
@@ -11,9 +11,10 @@ import { DatasetDetailComponent } from "datasets/dataset-detail/dataset-detail.c
 import { DatasetFileUploaderComponent } from "datasets/dataset-file-uploader/dataset-file-uploader.component";
 import { DatasetLifecycleComponent } from "datasets/dataset-lifecycle/dataset-lifecycle.component";
 import { ReduceComponent } from "datasets/reduce/reduce.component";
-import { OneDepComponent } from "datasets/onedep/onedep.component";
+import { DepositorComponent } from "datasets/depositor/depositor.component";
 import { RelatedDatasetsComponent } from "datasets/related-datasets/related-datasets.component";
 import { LogbooksDashboardComponent } from "logbooks/logbooks-dashboard/logbooks-dashboard.component";
+
 const routes: Routes = [
   {
     path: "",
@@ -73,12 +74,12 @@ const routes: Routes = [
     canActivate: [AuthGuard, AdminGuard],
   },
   {
-    path: "onedep",
+    path: "depositor",
     canActivate: [ServiceGuard],
     children: [
       {
         path: "",
-        component: OneDepComponent,
+        component: DepositorComponent,
         canActivate: [AuthGuard],
       },
     ],
diff --git a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
index d1637dbd59..2fbf72df2c 100644
--- a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
+++ b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
@@ -5,6 +5,7 @@ import { BatchViewComponent } from "datasets/batch-view/batch-view.component";
 import { DashboardComponent } from "datasets/dashboard/dashboard.component";
 import { DatablocksComponent } from "datasets/datablocks-table/datablocks-table.component";
 import { DatasetDetailsDashboardComponent } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
+import { OneDepComponent } from "datasets/onedep/onedep.component";
 import { PublishComponent } from "datasets/publish/publish.component";
 
 const routes: Routes = [
@@ -35,6 +36,16 @@ const routes: Routes = [
     component: DatablocksComponent,
     canActivate: [AuthGuard],
   },
+  {
+    path: ":id/onedep",
+    component: OneDepComponent,
+    canActivate: [AuthGuard],
+  },
+  // {
+  //   path: ":id/empiar",
+  //   component: EmpiarComponent,
+  //   canActivate: [AuthGuard],
+  // },
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/datasets/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail.component.ts
index f433387948..c13db28b0f 100644
--- a/src/app/datasets/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail.component.ts
@@ -314,4 +314,4 @@ export class DatasetDetailComponent
   openAttachment(encoded: string) {
     this.attachmentService.openAttachment(encoded);
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
index ae48fc5457..6aa7e6f60a 100644
--- a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
+++ b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
@@ -62,7 +62,7 @@ enum TAB {
   attachments = "Attachments",
   admin = "Admin",
   lifecycle = "Lifecycle",
-  onedep = "OneDep",
+  depositor = "Depositor",
 }
 @Component({
   selector: "dataset-details-dashboard",
@@ -105,7 +105,7 @@ export class DatasetDetailsDashboardComponent
     [TAB.logbook]: { action: fetchDatasetLogbookAction, loaded: false },
     [TAB.attachments]: { action: fetchAttachmentsAction, loaded: false },
     [TAB.admin]: { action: fetchDatablocksAction, loaded: false },
-    [TAB.onedep]: { action: fetchDatasetAction, loaded: false },
+    [TAB.depositor]: { action: fetchDatasetAction, loaded: false },
   };
   userProfile$ = this.store.select(selectProfile);
   isAdmin$ = this.store.select(selectIsAdmin);
@@ -214,8 +214,8 @@ export class DatasetDetailsDashboardComponent
                 enabled: isLoggedIn && isAdmin,
               },
               {
-                location: "./onedep",
-                label: TAB.onedep,
+                location: "./depositor",
+                label: TAB.depositor,
                 icon: "file_upload",
                 enabled: isLoggedIn && hasOpenEMKeyword,
               },
diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 34a955f4cd..d7f44e4b06 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -94,7 +94,7 @@ import { OneDepComponent } from "./onedep/onedep.component";
 import { OrcidFormatterDirective } from "./onedep/onedep.directive";
 import { EmpiarComponent } from "./empiar/empiar.component";
 import { OneDepEffects } from "state-management/effects/onedep.effects";
-
+import { DepositorComponent } from "./depositor/depositor.component";
 
 @NgModule({
   imports: [
@@ -188,6 +188,7 @@ import { OneDepEffects } from "state-management/effects/onedep.effects";
     OneDepComponent,
     OrcidFormatterDirective,
     EmpiarComponent,
+    DepositorComponent,
   ],
   providers: [
     ArchivingService,
diff --git a/src/app/datasets/depositor/depositor.component.html b/src/app/datasets/depositor/depositor.component.html
new file mode 100644
index 0000000000..be7bb76cc5
--- /dev/null
+++ b/src/app/datasets/depositor/depositor.component.html
@@ -0,0 +1,69 @@
+<ng-template [ngIf]="dataset">
+  <div style="clear: both;"></div>
+  <div>
+    <div>
+      <mat-card [formGroup]="form" data-cy="general-info">
+        <mat-card-header class="general-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> assignment </mat-icon>
+          </div>
+          General information
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr>
+              <th>Name</th>
+              <td>{{ dataset.datasetName || "-" }}</td>
+            </tr>
+            <tr>
+              <th>Description</th>
+              <td>
+                <span [innerHTML]="dataset.description || '-' | linky"></span>
+              </td>
+            </tr>
+            <tr>
+              <th>PID</th>
+              <td>
+                {{ dataset.pid }}
+              </td>
+            </tr>
+            <tr>
+              <th>Type</th>
+              <td>{{dataset.type }}</td>
+            </tr>
+            <tr>
+              <th>Creation Time</th>
+              <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
+            </tr>
+            <tr class="keywords-row">
+              <th>Keywords</th>
+              <mat-chip-set role="list" #keywordChips>
+                <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
+                  {{ keyword }}
+                </mat-chip>
+              </mat-chip-set>
+            </tr>
+          </table>
+        </mat-card-content>
+      </mat-card>
+      <mat-card>
+        <mat-card-header class="creator-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon>blur_linear</mat-icon>
+          </div>
+          Select Deposition Repository:
+        </mat-card-header>
+      
+        <mat-form-field class="method-name">
+          <mat-label>Experimental Method</mat-label>
+          <mat-select required [formControl]="depositionRepository" (selectionChange)="onChooseRepo()">
+            <mat-option *ngFor="let repo of supportedDepositionList" [value]="repo.value">
+              {{ repo.viewValue }}
+            </mat-option>
+          </mat-select>
+         
+        </mat-form-field>
+      </mat-card>
+    </div>
+  </div>
+</ng-template>
diff --git a/src/app/datasets/depositor/depositor.component.scss b/src/app/datasets/depositor/depositor.component.scss
new file mode 100644
index 0000000000..7beca09cfc
--- /dev/null
+++ b/src/app/datasets/depositor/depositor.component.scss
@@ -0,0 +1,58 @@
+mat-card {
+  margin: 1em;
+
+  .section-icon {
+    height: auto !important;
+    width: auto !important;
+
+    mat-icon {
+      vertical-align: middle;
+    }
+  }
+  .caption-text {
+    word-break: break-all;
+  }
+
+  .method-name {
+    min-width: 12rem;
+    align-self: left;
+    margin: 3rem;
+    width: 20%;
+  }
+
+  table {
+    th {
+      min-width: 10rem;
+      padding-right: 0.5rem;
+      text-align: left;
+    }
+
+    td {
+      width: 100%;
+      padding: 0.5rem 0;
+
+      .sample-edit {
+        padding-left: 0.5rem;
+
+        mat-icon {
+          font-size: medium;
+        }
+      }
+
+      .sample-edit:hover {
+        cursor: pointer;
+      }
+    }
+
+    .full-width {
+      width: 100%;
+    }
+
+    .keywords-row {
+      .add-keyword-chip:hover {
+        cursor: pointer;
+      }
+    }
+  }
+}
+
diff --git a/src/app/datasets/depositor/depositor.component.spec.ts b/src/app/datasets/depositor/depositor.component.spec.ts
new file mode 100644
index 0000000000..f1bd7b3ba2
--- /dev/null
+++ b/src/app/datasets/depositor/depositor.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DepositorComponent } from './depositor.component';
+
+describe('DepositorComponent', () => {
+  let component: DepositorComponent;
+  let fixture: ComponentFixture<DepositorComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [DepositorComponent]
+    });
+    fixture = TestBed.createComponent(DepositorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/datasets/depositor/depositor.component.ts b/src/app/datasets/depositor/depositor.component.ts
new file mode 100644
index 0000000000..5179349be5
--- /dev/null
+++ b/src/app/datasets/depositor/depositor.component.ts
@@ -0,0 +1,102 @@
+import { Component, OnInit, OnDestroy } from "@angular/core";
+import {
+  FormControl,
+  FormGroup,
+  FormBuilder,
+  Validators,
+} from "@angular/forms";
+import { AppConfigService, AppConfig } from "app-config.service";
+import { ActivatedRoute } from "@angular/router";
+
+import { Store } from "@ngrx/store";
+import {
+  OutputDatasetObsoleteDto,
+  ReturnedUserDto,
+} from "@scicatproject/scicat-sdk-ts";
+import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
+// import {
+//   selectIsAdmin,
+//   selectIsLoading,
+//   selectIsLoggedIn,
+//   selectProfile,
+// } from "state-management/selectors/user.selectors";
+import {
+  selectCurrentUser,
+  selectIsLoggedIn,
+} from "state-management/selectors/user.selectors";
+import * as fromActions from "state-management/actions/onedep.actions";
+
+import { Subscription, combineLatest } from "rxjs";
+import { Router } from "@angular/router";
+
+interface DepositionRepository {
+  value: string;
+  viewValue: string;
+}
+
+@Component({
+  selector: "depositor",
+  templateUrl: "./depositor.component.html",
+  styleUrls: ["./depositor.component.scss"],
+})
+export class DepositorComponent implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
+  form: FormGroup;
+
+  config: AppConfig;
+  supportedDepositionList: DepositionRepository[] = [
+    { value: "onedep", viewValue: "OneDep" },
+    { value: "empiar", viewValue: "EMPIAR" },
+  ];
+  depositionRepository: FormControl;
+  dataset: OutputDatasetObsoleteDto | undefined;
+  user: ReturnedUserDto | undefined;
+  selectedMethod: string | null = null;
+  onedepLink: {
+    location: string;
+    enabled: boolean;
+  } | null = null;
+
+  constructor(
+    public appConfigService: AppConfigService,
+    private store: Store,
+    private fb: FormBuilder,
+    private router: Router,
+  ) {
+    this.config = this.appConfigService.getConfig();
+    this.depositionRepository = new FormControl("");
+    this.form = this.fb.group({
+      datasetName: new FormControl("", [Validators.required]),
+      description: new FormControl("", [Validators.required]),
+      keywords: this.fb.array([]),
+    });
+  }
+  ngOnInit() {
+    this.store.dispatch(fromActions.connectToDepositor());
+
+    this.store.select(selectCurrentDataset).subscribe((dataset) => {
+      this.dataset = dataset;
+    });
+    this.subscriptions.push(
+      this.store.select(selectCurrentUser).subscribe((user) => {
+        if (user) {
+          this.user = user;
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy() {
+    this.subscriptions.forEach((subscription) => {
+      subscription.unsubscribe();
+    });
+  }
+
+  onChooseRepo() {
+    const id = encodeURIComponent(this.dataset.pid);
+    this.router.navigate(["/datasets", id, "onedep"], {
+      state: { pid: this.dataset.pid },
+    });
+    // this.router.navigateByUrl("/datasets/" + id + "/empiar");
+  }
+}
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index 4065add83f..a17567c3b2 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -8,7 +8,7 @@ import {
 import { MatRadioChange } from "@angular/material/radio";
 import { AppConfigService, AppConfig } from "app-config.service";
 import { HttpClient } from "@angular/common/http";
-import { Router } from "@angular/router";
+import { ActivatedRoute } from "@angular/router";
 import {
   FormBuilder,
   FormControl,
@@ -27,6 +27,7 @@ import {
 import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
 import { selectCurrentUser } from "state-management/selectors/user.selectors";
 import * as fromActions from "state-management/actions/onedep.actions";
+import * as datasetActions from "state-management/actions/datasets.actions";
 import {
   createMethodsList,
   EmFile,
@@ -71,13 +72,14 @@ export class OneDepComponent implements OnInit, OnDestroy {
   depositClicked = false;
   privacyTermsTicked = false;
   depID$: Observable<string>;
+  pid$: Observable<object>;
   @ViewChild("fileInput") fileInput: ElementRef<HTMLInputElement> | undefined;
 
   constructor(
     public appConfigService: AppConfigService,
     private store: Store,
     private http: HttpClient,
-    private router: Router,
+    private route: ActivatedRoute,
     private fb: FormBuilder,
     private depositor: Depositor,
   ) {
@@ -111,10 +113,11 @@ export class OneDepComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     // initialize an array for the files to be uploaded
+    const pid = history.state.pid;
+    this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
     this.fileTypes = [];
     this.mainContour = 0.0;
     //  connect to the depositor
-
     this.store.dispatch(fromActions.connectToDepositor());
 
     this.store.select(selectCurrentDataset).subscribe((dataset) => {
@@ -125,6 +128,7 @@ export class OneDepComponent implements OnInit, OnDestroy {
         });
       }
     });
+
     this.subscriptions.push(
       this.store.select(selectCurrentUser).subscribe((user) => {
         if (user) {

From 498f705c6e50abaf6c0367c02236db200140df5e Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 6 Mar 2025 10:23:39 +0000
Subject: [PATCH 126/245] file-browser: alpha version with list view

---
 .../ingestor.file-browser.component.html      |  51 ++++++
 .../ingestor.file-browser.component.ts        | 157 ++++++++++++++++++
 .../customRenderer/array-renderer.ts          |   3 +-
 src/app/ingestor/ingestor.module.ts           |   4 +
 ...estor.confirm-transfer-dialog.component.ts |   7 +-
 .../ingestor.new-transfer-dialog.component.ts |  10 ++
 .../dialog/ingestor.new-transfer-dialog.html  |  10 +-
 .../ingestor/helper/ingestor-api-endpoints.ts |   1 +
 .../ingestor/helper/ingestor-api-manager.ts   |  29 ++++
 .../ingestor/ingestor/ingestor.component.scss |  13 ++
 src/app/ingestor/model/folderNode.ts          |  21 +++
 .../model/getBrowseDatasetResponse.ts         |  20 +++
 src/app/ingestor/model/models.ts              |   2 +
 13 files changed, 318 insertions(+), 10 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html
 create mode 100644 src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
 create mode 100644 src/app/ingestor/model/folderNode.ts
 create mode 100644 src/app/ingestor/model/getBrowseDatasetResponse.ts

diff --git a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html
new file mode 100644
index 0000000000..e2a5bfd28d
--- /dev/null
+++ b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html
@@ -0,0 +1,51 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Ingestor Dataset Browser
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+  <div class="file-browser-view-toggle">
+    <button mat-button disabled="true" (click)="toggleView()" [matTooltip]="isListView ? 'Switch to Tree View' : 'Switch to List View'">
+      <mat-icon *ngIf="isListView">account_tree</mat-icon>
+      <mat-icon *ngIf="!isListView">list</mat-icon>
+    </button>
+  </div>
+  <div *ngIf="isListView && activeNode !== null">
+    <mat-list class="ingestor-file-list">
+      <div mat-subheader>Selected Path</div>
+      <mat-list-item class="mat-elevation-z2">
+        <mat-icon matListItemIcon>folder_open</mat-icon>
+        <div matListItemTitle>{{activeNode.path}}</div>
+      </mat-list-item>
+      <div mat-subheader>Children</div>
+      <mat-list-item *ngIf="!goBackNode.isRootNode" (click)='onItemClick(goBackNode.name, goBackNode.path)' 
+        class="mat-elevation-z2 mat-list-item-hover">
+        <mat-icon matListItemIcon>folder</mat-icon>
+        <div matListItemTitle>{{goBackNode.name}}</div>
+        <div matListItemLine>{{goBackNode.path}}</div>
+      </mat-list-item>
+      <ng-container
+        *ngFor="let folder of activeNode.childrenNodes; trackBy: trackByFn">
+        <mat-list-item (click)="onItemClick(folder.name, folder.path)"
+          class="mat-elevation-z2 mat-list-item-hover">
+          <mat-icon matListItemIcon>folder</mat-icon>
+          <div matListItemTitle>{{folder.name}}</div>
+          <div matListItemLine>{{folder.path}}</div>
+        </mat-list-item>
+      </ng-container>
+    </mat-list>
+  </div>
+  <div *ngIf="!isListView && activeNode !== null">
+    <!-- Tree view content goes here -->
+  </div>
+</mat-dialog-content>
+
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close (click)="onCancel()">Cancel</button>
+  <button mat-button color="primary" cdkFocusInitial (click)="onConfirm()"
+    [mat-dialog-close]="true">Confirm</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
new file mode 100644
index 0000000000..9f8f44e0df
--- /dev/null
+++ b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -0,0 +1,157 @@
+import { Component, Inject, OnInit } from "@angular/core";
+import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
+import { IngestorAPIManager } from "ingestor/ingestor/helper/ingestor-api-manager";
+import {
+  IngestionRequestInformation,
+  IngestorHelper,
+  DialogDataObject,
+} from "ingestor/ingestor/helper/ingestor.component-helper";
+import { FolderNode } from "ingestor/model/folderNode";
+import { GetBrowseDatasetResponse } from "ingestor/model/models";
+
+export interface BrowsableNode extends FolderNode {
+  childrenNodes?: BrowsableNode[];
+  isExpanded?: boolean;
+  isChildrenLoaded?: boolean;
+  isLoading?: boolean;
+}
+
+export interface GoBackNode extends FolderNode {
+  isRootNode: boolean;
+}
+
+@Component({
+  selector: "ingestor.file-browser.component",
+  templateUrl: "ingestor.file-browser.component.html",
+  styleUrls: ["../ingestor/ingestor.component.scss"],
+})
+export class IngestorFileBrowserComponent implements OnInit {
+  private _activeNode: BrowsableNode | null = null;
+
+  isListView = true;
+  backendURL = "";
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+
+  availableNodes: BrowsableNode | null = null;
+  goBackNode: GoBackNode | null = null;
+  rootNode: FolderNode | null = null;
+
+  constructor(
+    public dialog: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+    private apiManager: IngestorAPIManager,
+  ) {
+    this.createNewTransferData = data.createNewTransferData;
+    this.backendURL = data.backendURL;
+    this.apiManager.connect(this.backendURL);
+  }
+
+  get activeNode(): BrowsableNode | null {
+    return this._activeNode;
+  }
+
+  set activeNode(node: BrowsableNode | null) {
+    this._activeNode = node;
+
+    let backNodePath = "/";
+    let isRootNode = false;
+
+    if (node != null) {
+      backNodePath = node?.path.split("/").slice(0, -1).join("/");
+      if (backNodePath === "") {
+        backNodePath = "/";
+      }
+
+      isRootNode = node?.path === "/";
+    }
+
+    this.goBackNode = {
+      name: "...",
+      path: backNodePath,
+      children: true,
+      isRootNode: isRootNode,
+    };
+  }
+
+  async ngOnInit(): Promise<void> {
+    const rootNode: FolderNode = {
+      name: "Root",
+      path: "/",
+      children: false,
+    };
+
+    const rootNodeChildren = await this.onLoadFilePath(rootNode.path);
+    this.setExtendedNodeActive(rootNode, rootNodeChildren);
+  }
+
+  setExtendedNodeActive(
+    newNode: FolderNode,
+    requestResponse: GetBrowseDatasetResponse,
+  ): void {
+    if (
+      requestResponse &&
+      requestResponse.folders &&
+      requestResponse.folders.length > 0
+    ) {
+      const rootNodeExtended: BrowsableNode = {
+        ...newNode,
+        children: true,
+        childrenNodes: requestResponse.folders,
+      };
+
+      this.activeNode = rootNodeExtended;
+    } else {
+      this.activeNode = newNode;
+    }
+  }
+
+  onCancel = (): void => {};
+
+  onConfirm = (): void => {
+    if (this.activeNode) {
+      this.createNewTransferData.selectedPath = this.activeNode.path;
+    }
+  };
+
+  toggleView = (): void => {
+    this.isListView = !this.isListView;
+  };
+
+  trackByFn(index: number, item: any): number {
+    return item.id; // or any unique identifier for the items
+  }
+
+  async onItemClick(itemName: string, itemPath: string): Promise<void> {
+    const newActiveNode: BrowsableNode = {
+      name: itemName,
+      path: itemPath,
+      children: false,
+    };
+    const newActiveNodeChildren = await this.onLoadFilePath(itemPath);
+    this.setExtendedNodeActive(newActiveNode, newActiveNodeChildren);
+  }
+
+  async onLoadFilePath(path: string): Promise<GetBrowseDatasetResponse | null> {
+    const page = 1;
+    const pageSize = 50;
+
+    try {
+      const folderNodeResponse = await this.apiManager.getBrowseFilePath(
+        page,
+        pageSize,
+        path,
+      );
+
+      return folderNodeResponse;
+    } catch (error) {
+      console.error("Error loading path:", path, error);
+      return null;
+    }
+  }
+}
+
+export interface Section {
+  name: string;
+  updated?: Date;
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
index 48f05695d9..1b62441b69 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
@@ -111,7 +111,8 @@ import {
 // eslint-disable-next-line @angular-eslint/component-class-suffix
 export class ArrayLayoutRendererCustom
   extends JsonFormsAbstractControl<StatePropsOfArrayLayout>
-  implements OnInit, OnDestroy {
+  implements OnInit, OnDestroy
+{
   noData: boolean;
   minOne: boolean;
   translations: ArrayTranslations;
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 6e88377f6d..b9bf5a23a8 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -34,6 +34,8 @@ import { IngestorConfirmationDialogComponent } from "./ingestor/dialog/confirmat
 import { ExportTemplateHelperComponent } from "./ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component";
 import { MatPaginatorModule } from "@angular/material/paginator";
 import { CustomObjectControlRendererComponent } from "./ingestor-metadata-editor/customRenderer/object-group-renderer";
+import { IngestorFileBrowserComponent } from "./ingestor-file-browser/ingestor.file-browser.component";
+import { MatTreeModule } from "@angular/material/tree";
 
 @NgModule({
   declarations: [
@@ -49,6 +51,7 @@ import { CustomObjectControlRendererComponent } from "./ingestor-metadata-editor
     CustomObjectControlRendererComponent,
     IngestorConfirmationDialogComponent,
     ExportTemplateHelperComponent,
+    IngestorFileBrowserComponent,
   ],
   imports: [
     CommonModule,
@@ -71,6 +74,7 @@ import { CustomObjectControlRendererComponent } from "./ingestor-metadata-editor
     MatRadioModule,
     MatAutocompleteModule,
     MatBadgeModule,
+    MatTreeModule,
     JsonFormsModule,
     JsonFormsAngularMaterialModule,
     CommonModule,
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 51a01d7d17..9d5b92d303 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -1,9 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Inject,
-  OnInit,
-} from "@angular/core";
+import { Component, Inject, OnInit } from "@angular/core";
 import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
 import {
   DialogDataObject,
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 9e64c7d493..fc6fba9454 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -13,6 +13,7 @@ import {
   GetExtractorResponse,
 } from "ingestor/model/models";
 import { PageChangeEvent } from "shared/modules/table/table.component";
+import { IngestorFileBrowserComponent } from "ingestor/ingestor-file-browser/ingestor.file-browser.component";
 
 @Component({
   selector: "ingestor.new-transfer-dialog",
@@ -163,4 +164,13 @@ export class IngestorNewTransferDialogComponent implements OnInit {
     this.extractionMethodsPage = event.pageIndex; // 0-based
     this.loadExtractionMethods();
   }
+
+  onClickOpenFileBrowser(): void {
+    this.dialog.open(IngestorFileBrowserComponent, {
+      data: {
+        backendURL: this.backendURL,
+        createNewTransferData: this.createNewTransferData,
+      },
+    });
+  }
 }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
index c93e6e5ffb..78c0fa42da 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -16,13 +16,17 @@ <h2 mat-dialog-title>
   <div *ngIf="availableFilePaths !== null">
     <mat-form-field class="form-full-width">
       <mat-label>File Path</mat-label>
-      <input matInput [(ngModel)]="selectedPath" [matAutocomplete]="auto">
-      <mat-autocomplete #auto="matAutocomplete">
+      <input matInput [(ngModel)]="selectedPath" (click)="onClickOpenFileBrowser()" readonly>
+      <!-- [matAutocomplete]="auto" -->
+      <button mat-icon-button matSuffix (click)="onClickOpenFileBrowser()">
+        <mat-icon>folder</mat-icon>
+      </button>
+      <!--<mat-autocomplete #auto="matAutocomplete">
         <mat-option *ngFor="let sourceFolder of availableFilePaths.datasets"
           [value]="sourceFolder">
           {{ sourceFolder }}
         </mat-option>
-      </mat-autocomplete>
+      </mat-autocomplete> -->
     </mat-form-field>
     <mat-error *ngIf="availableFilePathsError">{{ availableFilePathsError
       }}</mat-error>
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
index fa2b7d3f0c..a3c8458dc6 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
@@ -5,6 +5,7 @@ export const INGESTOR_API_ENDPOINTS_V1 = {
     USERINFO: "userinfo",
   },
   DATASET: "dataset",
+  DATASET_BROWSE: "dataset/browse",
   TRANSFER: "transfer",
   OTHER: {
     VERSION: "version",
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index 74d054fbc1..0b22307831 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -4,6 +4,7 @@ import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
 import {
   DeleteTransferRequest,
   DeleteTransferResponse,
+  GetBrowseDatasetResponse,
   GetDatasetResponse,
   GetExtractorResponse,
   GetTransferResponse,
@@ -210,6 +211,34 @@ export class IngestorAPIManager {
     });
   }
 
+  public getBrowseFilePath(
+    page: number,
+    pageSize: number,
+    path: string,
+  ): Promise<GetBrowseDatasetResponse> {
+    const params = new HttpParams()
+      .set("page", page.toString())
+      .set("pageSize", pageSize.toString())
+      .set("path", path.toString());
+
+    return new Promise((resolve, reject) => {
+      this.http
+        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET_BROWSE, {
+          params,
+          ...this.connectOptions,
+        })
+        .subscribe({
+          next: (response: GetBrowseDatasetResponse) => {
+            resolve(response as GetBrowseDatasetResponse);
+          },
+          error: (error) => {
+            console.error(error);
+            reject(error);
+          },
+        });
+    });
+  }
+
   /*public getAutodiscoveryList(): Promise<string> {
     return new Promise((resolve, reject) => {
       this.http.get(AUTODISCOVERY_ENDPOINT, {}).subscribe({
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor/ingestor.component.scss
index 52d7526d4f..a091e5c47a 100644
--- a/src/app/ingestor/ingestor/ingestor.component.scss
+++ b/src/app/ingestor/ingestor/ingestor.component.scss
@@ -96,4 +96,17 @@ mat-card {
 
 .transferPaginator {
   margin-top: 1.5em;
+}
+
+.ingestor-file-list .mat-list-item-hover:hover {
+  background-color: rgba(0, 0, 0, 0.04);
+}
+
+.ingestor-file-list .mat-list-item-hover:active {
+  background-color: rgba(0, 0, 0, 0.08);
+}
+
+.file-browser-view-toggle {
+  display: flex;
+  justify-content: flex-end;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/model/folderNode.ts b/src/app/ingestor/model/folderNode.ts
new file mode 100644
index 0000000000..4d30662a9e
--- /dev/null
+++ b/src/app/ingestor/model/folderNode.ts
@@ -0,0 +1,21 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+/**
+ * a method item describes the method\'s name and schema
+ */
+export interface FolderNode { 
+    name: string;
+    path: string;
+    children: boolean;
+    probablyDataset?: boolean;
+}
+
diff --git a/src/app/ingestor/model/getBrowseDatasetResponse.ts b/src/app/ingestor/model/getBrowseDatasetResponse.ts
new file mode 100644
index 0000000000..6526a62b67
--- /dev/null
+++ b/src/app/ingestor/model/getBrowseDatasetResponse.ts
@@ -0,0 +1,20 @@
+/**
+ * SciCat Ingestor API
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { FolderNode } from './folderNode';
+
+
+export interface GetBrowseDatasetResponse { 
+    folders?: Array<FolderNode>;
+    /**
+     * Total number of folders.
+     */
+    total?: number;
+}
+
diff --git a/src/app/ingestor/model/models.ts b/src/app/ingestor/model/models.ts
index 80b7aa2695..698ebb07a6 100644
--- a/src/app/ingestor/model/models.ts
+++ b/src/app/ingestor/model/models.ts
@@ -1,5 +1,7 @@
 export * from './deleteTransferRequest';
 export * from './deleteTransferResponse';
+export * from './folderNode';
+export * from './getBrowseDatasetResponse';
 export * from './getDatasetResponse';
 export * from './getExtractorResponse';
 export * from './getTransferResponse';

From acf229e23a9946432e17c7ee6988e7f461ee0e8c Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 6 Mar 2025 11:00:40 +0000
Subject: [PATCH 127/245] file-browser: improvements

---
 .../ingestor.file-browser.component.html      |  9 +++---
 .../ingestor.file-browser.component.ts        | 16 ++++++----
 .../ingestor.new-transfer-dialog.component.ts | 30 +------------------
 .../dialog/ingestor.new-transfer-dialog.html  | 16 ++--------
 4 files changed, 18 insertions(+), 53 deletions(-)

diff --git a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html
index e2a5bfd28d..e6b65a80c2 100644
--- a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html
+++ b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html
@@ -18,11 +18,12 @@ <h2 mat-dialog-title>
     <mat-list class="ingestor-file-list">
       <div mat-subheader>Selected Path</div>
       <mat-list-item class="mat-elevation-z2">
-        <mat-icon matListItemIcon>folder_open</mat-icon>
+        <mat-icon matListItemIcon>{{activeNode.probablyDataset ? 'folder_special' : 'folder'}}</mat-icon>
         <div matListItemTitle>{{activeNode.path}}</div>
       </mat-list-item>
+      <i *ngIf="activeNode.probablyDataset">This node is probably a valid data set.</i>
       <div mat-subheader>Children</div>
-      <mat-list-item *ngIf="!goBackNode.isRootNode" (click)='onItemClick(goBackNode.name, goBackNode.path)' 
+      <mat-list-item *ngIf="!goBackNode.isRootNode" (click)='onItemClick(goBackNode)' 
         class="mat-elevation-z2 mat-list-item-hover">
         <mat-icon matListItemIcon>folder</mat-icon>
         <div matListItemTitle>{{goBackNode.name}}</div>
@@ -30,9 +31,9 @@ <h2 mat-dialog-title>
       </mat-list-item>
       <ng-container
         *ngFor="let folder of activeNode.childrenNodes; trackBy: trackByFn">
-        <mat-list-item (click)="onItemClick(folder.name, folder.path)"
+        <mat-list-item (click)="onItemClick(folder)"
           class="mat-elevation-z2 mat-list-item-hover">
-          <mat-icon matListItemIcon>folder</mat-icon>
+          <mat-icon matListItemIcon>{{folder.probablyDataset ? 'folder_special' : 'folder'}}</mat-icon>
           <div matListItemTitle>{{folder.name}}</div>
           <div matListItemLine>{{folder.path}}</div>
         </mat-list-item>
diff --git a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
index 9f8f44e0df..5ca0ea4ccd 100644
--- a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
+++ b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -76,8 +76,11 @@ export class IngestorFileBrowserComponent implements OnInit {
 
   async ngOnInit(): Promise<void> {
     const rootNode: FolderNode = {
-      name: "Root",
-      path: "/",
+      name: "",
+      path:
+        this.createNewTransferData.selectedPath !== ""
+          ? this.createNewTransferData.selectedPath
+          : "/",
       children: false,
     };
 
@@ -122,19 +125,20 @@ export class IngestorFileBrowserComponent implements OnInit {
     return item.id; // or any unique identifier for the items
   }
 
-  async onItemClick(itemName: string, itemPath: string): Promise<void> {
+  async onItemClick(item: BrowsableNode): Promise<void> {
     const newActiveNode: BrowsableNode = {
-      name: itemName,
-      path: itemPath,
+      ...item,
+      childrenNodes: [],
       children: false,
     };
-    const newActiveNodeChildren = await this.onLoadFilePath(itemPath);
+    const newActiveNodeChildren = await this.onLoadFilePath(item.path);
     this.setExtendedNodeActive(newActiveNode, newActiveNodeChildren);
   }
 
   async onLoadFilePath(path: string): Promise<GetBrowseDatasetResponse | null> {
     const page = 1;
     const pageSize = 50;
+    // TODO MAKE THIS DYNAMIC
 
     try {
       const folderNodeResponse = await this.apiManager.getBrowseFilePath(
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index fc6fba9454..a34ce7db5a 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -8,10 +8,7 @@ import {
 } from "../helper/ingestor.component-helper";
 import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 import { IngestorAPIManager } from "../helper/ingestor-api-manager";
-import {
-  GetDatasetResponse,
-  GetExtractorResponse,
-} from "ingestor/model/models";
+import { GetExtractorResponse } from "ingestor/model/models";
 import { PageChangeEvent } from "shared/modules/table/table.component";
 import { IngestorFileBrowserComponent } from "ingestor/ingestor-file-browser/ingestor.file-browser.component";
 
@@ -22,14 +19,11 @@ import { IngestorFileBrowserComponent } from "ingestor/ingestor-file-browser/ing
 })
 export class IngestorNewTransferDialogComponent implements OnInit {
   extractionMethods: GetExtractorResponse = null;
-  availableFilePaths: GetDatasetResponse = null;
   dropdownPageSize = 50;
   extractionMethodsPage = 0;
-  availableFilePathsPage = 0;
 
   backendURL = "";
   extractionMethodsError = "";
-  availableFilePathsError = "";
 
   uiNextButtonReady = false;
 
@@ -48,7 +42,6 @@ export class IngestorNewTransferDialogComponent implements OnInit {
 
   ngOnInit(): void {
     this.loadExtractionMethods();
-    this.loadAvailableFilePaths();
   }
 
   set selectedPath(value: string) {
@@ -81,21 +74,6 @@ export class IngestorNewTransferDialogComponent implements OnInit {
     }
   }
 
-  async loadAvailableFilePaths(): Promise<void> {
-    try {
-      this.availableFilePaths = await this.apiManager.getAvailableFilePaths(
-        this.availableFilePathsPage + 1, // 1-based
-        this.dropdownPageSize,
-      );
-      if (this.availableFilePaths.total === 0) {
-        this.availableFilePathsError = "No datasets found.";
-      }
-    } catch (error) {
-      this.availableFilePathsError = error.message;
-      console.error(this.extractionMethodsError);
-    }
-  }
-
   generateExampleDataForSciCatHeader(): void {
     this.data.createNewTransferData.scicatHeader["sourceFolder"] =
       this.createNewTransferData.selectedPath;
@@ -138,7 +116,6 @@ export class IngestorNewTransferDialogComponent implements OnInit {
 
   onClickRetryRequests(): void {
     this.loadExtractionMethods();
-    this.loadAvailableFilePaths();
   }
 
   onClickNext(): void {
@@ -155,11 +132,6 @@ export class IngestorNewTransferDialogComponent implements OnInit {
       !!this.createNewTransferData.selectedMethod?.name;
   }
 
-  onAvailablePathPageChange(event: PageChangeEvent) {
-    this.availableFilePathsPage = event.pageIndex; // 0-based
-    this.loadAvailableFilePaths();
-  }
-
   onExtractorMethodsPageChange(event: PageChangeEvent) {
     this.extractionMethodsPage = event.pageIndex; // 0-based
     this.loadExtractionMethods();
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
index 78c0fa42da..4672769e9e 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -13,7 +13,7 @@ <h2 mat-dialog-title>
   <p>Please select the dataset to be uploaded and the appropriate metadata
     extractor method.</p>
 
-  <div *ngIf="availableFilePaths !== null">
+  <div>
     <mat-form-field class="form-full-width">
       <mat-label>File Path</mat-label>
       <input matInput [(ngModel)]="selectedPath" (click)="onClickOpenFileBrowser()" readonly>
@@ -21,19 +21,7 @@ <h2 mat-dialog-title>
       <button mat-icon-button matSuffix (click)="onClickOpenFileBrowser()">
         <mat-icon>folder</mat-icon>
       </button>
-      <!--<mat-autocomplete #auto="matAutocomplete">
-        <mat-option *ngFor="let sourceFolder of availableFilePaths.datasets"
-          [value]="sourceFolder">
-          {{ sourceFolder }}
-        </mat-option>
-      </mat-autocomplete> -->
     </mat-form-field>
-    <mat-error *ngIf="availableFilePathsError">{{ availableFilePathsError
-      }}</mat-error>
-
-    <mat-paginator *ngIf="availableFilePaths.total > dropdownPageSize" [length]="availableFilePaths.total" [pageSize]="dropdownPageSize" aria-label="Select page"
-      [hidePageSize]="true" [showFirstLastButtons]="false" [pageIndex]="availableFilePathsPage" (page)="onAvailablePathPageChange($event)">
-    </mat-paginator>
   </div>
 
   <div *ngIf="extractionMethods !== null">
@@ -55,7 +43,7 @@ <h2 mat-dialog-title>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button *ngIf="availableFilePathsError || extractionMethodsError" mat-button
+  <button *ngIf="extractionMethodsError" mat-button
     color="warn" (click)="onClickRetryRequests()">Retry</button>
   <button mat-button mat-dialog-close>Cancel</button>
   <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"

From 1c44a45a62b880559d8709ac0151d2409e2a51b3 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 6 Mar 2025 11:15:52 +0000
Subject: [PATCH 128/245] file-browser: typo

---
 .../ingestor-file-browser/ingestor.file-browser.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
index 5ca0ea4ccd..9e27eb6b4c 100644
--- a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
+++ b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -67,7 +67,7 @@ export class IngestorFileBrowserComponent implements OnInit {
     }
 
     this.goBackNode = {
-      name: "...",
+      name: "..",
       path: backNodePath,
       children: true,
       isRootNode: isRootNode,

From 92ad717179e6018028f1f312b8113c7d8287490a Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 6 Mar 2025 14:13:25 +0000
Subject: [PATCH 129/245] file-browser: add pagination

---
 .../ingestor.file-browser.component.html      | 13 ++++--
 .../ingestor.file-browser.component.ts        | 43 ++++++++++++-------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html
index e6b65a80c2..f266ee009e 100644
--- a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html
+++ b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html
@@ -23,7 +23,12 @@ <h2 mat-dialog-title>
       </mat-list-item>
       <i *ngIf="activeNode.probablyDataset">This node is probably a valid data set.</i>
       <div mat-subheader>Children</div>
-      <mat-list-item *ngIf="!goBackNode.isRootNode" (click)='onItemClick(goBackNode)' 
+
+      <mat-paginator *ngIf="true" [length]="activeNodeChildrenTotal" [pageSize]="browseFolderPageSize" aria-label="Select page"
+        [hidePageSize]="true" [showFirstLastButtons]="false" [pageIndex]="browseFolderPage" (page)="onFileBrowserChildrenPageChange($event)">
+      </mat-paginator>
+
+      <mat-list-item *ngIf="!goBackNode.isRootNode" (click)='onLoadFolderNode(goBackNode)' 
         class="mat-elevation-z2 mat-list-item-hover">
         <mat-icon matListItemIcon>folder</mat-icon>
         <div matListItemTitle>{{goBackNode.name}}</div>
@@ -31,7 +36,7 @@ <h2 mat-dialog-title>
       </mat-list-item>
       <ng-container
         *ngFor="let folder of activeNode.childrenNodes; trackBy: trackByFn">
-        <mat-list-item (click)="onItemClick(folder)"
+        <mat-list-item (click)="onLoadFolderNode(folder)"
           class="mat-elevation-z2 mat-list-item-hover">
           <mat-icon matListItemIcon>{{folder.probablyDataset ? 'folder_special' : 'folder'}}</mat-icon>
           <div matListItemTitle>{{folder.name}}</div>
@@ -47,6 +52,6 @@ <h2 mat-dialog-title>
 
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onCancel()">Cancel</button>
-  <button mat-button color="primary" cdkFocusInitial (click)="onConfirm()"
-    [mat-dialog-close]="true">Confirm</button>
+  <button mat-button color="primary" cdkFocusInitial (click)="onSelect()"
+    [mat-dialog-close]="true">Select</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
index 9e27eb6b4c..07b4b1b4b1 100644
--- a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
+++ b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, OnInit } from "@angular/core";
+import { ChangeDetectorRef, Component, Inject, OnInit } from "@angular/core";
 import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
 import { IngestorAPIManager } from "ingestor/ingestor/helper/ingestor-api-manager";
 import {
@@ -8,6 +8,7 @@ import {
 } from "ingestor/ingestor/helper/ingestor.component-helper";
 import { FolderNode } from "ingestor/model/folderNode";
 import { GetBrowseDatasetResponse } from "ingestor/model/models";
+import { PageChangeEvent } from "shared/modules/table/table.component";
 
 export interface BrowsableNode extends FolderNode {
   childrenNodes?: BrowsableNode[];
@@ -27,12 +28,16 @@ export interface GoBackNode extends FolderNode {
 })
 export class IngestorFileBrowserComponent implements OnInit {
   private _activeNode: BrowsableNode | null = null;
+  activeNodeChildrenTotal = 0;
 
   isListView = true;
   backendURL = "";
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
+  browseFolderPageSize = 50;
+  browseFolderPage = 0;
+
   availableNodes: BrowsableNode | null = null;
   goBackNode: GoBackNode | null = null;
   rootNode: FolderNode | null = null;
@@ -41,6 +46,7 @@ export class IngestorFileBrowserComponent implements OnInit {
     public dialog: MatDialog,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
     private apiManager: IngestorAPIManager,
+    private cdr: ChangeDetectorRef,
   ) {
     this.createNewTransferData = data.createNewTransferData;
     this.backendURL = data.backendURL;
@@ -92,11 +98,9 @@ export class IngestorFileBrowserComponent implements OnInit {
     newNode: FolderNode,
     requestResponse: GetBrowseDatasetResponse,
   ): void {
-    if (
-      requestResponse &&
-      requestResponse.folders &&
-      requestResponse.folders.length > 0
-    ) {
+    this.activeNodeChildrenTotal = requestResponse.total;
+
+    if (requestResponse.folders.length > 0) {
       const rootNodeExtended: BrowsableNode = {
         ...newNode,
         children: true,
@@ -109,9 +113,9 @@ export class IngestorFileBrowserComponent implements OnInit {
     }
   }
 
-  onCancel = (): void => {};
+  onCancel = (): void => { };
 
-  onConfirm = (): void => {
+  onSelect = (): void => {
     if (this.activeNode) {
       this.createNewTransferData.selectedPath = this.activeNode.path;
     }
@@ -125,7 +129,12 @@ export class IngestorFileBrowserComponent implements OnInit {
     return item.id; // or any unique identifier for the items
   }
 
-  async onItemClick(item: BrowsableNode): Promise<void> {
+  async onLoadFolderNode(item: BrowsableNode, resetPage = true): Promise<void> {
+    if (resetPage) {
+      // Reset Page, when clicking on an item
+      this.browseFolderPage = 0;
+    }
+
     const newActiveNode: BrowsableNode = {
       ...item,
       childrenNodes: [],
@@ -133,17 +142,14 @@ export class IngestorFileBrowserComponent implements OnInit {
     };
     const newActiveNodeChildren = await this.onLoadFilePath(item.path);
     this.setExtendedNodeActive(newActiveNode, newActiveNodeChildren);
+    //this.cdr.detectChanges();
   }
 
   async onLoadFilePath(path: string): Promise<GetBrowseDatasetResponse | null> {
-    const page = 1;
-    const pageSize = 50;
-    // TODO MAKE THIS DYNAMIC
-
     try {
       const folderNodeResponse = await this.apiManager.getBrowseFilePath(
-        page,
-        pageSize,
+        this.browseFolderPage + 1, // 1-based
+        this.browseFolderPageSize,
         path,
       );
 
@@ -153,6 +159,13 @@ export class IngestorFileBrowserComponent implements OnInit {
       return null;
     }
   }
+
+  onFileBrowserChildrenPageChange(event: PageChangeEvent) {
+    this.browseFolderPage = event.pageIndex;
+
+    // Reload Active Node children
+    this.onLoadFolderNode(this.activeNode, false);
+  }
 }
 
 export interface Section {

From 89bd181615b6afec34a4801b04bacb6afa3b8a6c Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 6 Mar 2025 15:10:45 +0000
Subject: [PATCH 130/245] depositor frontend improements: * reducer fixed to
 distinguish betw depositor, onedep and empiar * empiar jsonforms missing
 renderer

---
 ...ataset-details-dashboard.routing.module.ts |   2 +-
 .../datasets.routing.module.ts                |  11 +-
 src/app/app-routing/service.guard.ts          |   2 +-
 src/app/app.module.ts                         |   2 +-
 src/app/datasets/datasets.module.ts           |  12 +-
 .../datasets/depositor/depositor.component.ts |  15 ++-
 .../questionnaire.component.html              |   1 +
 .../questionnaire.component.scss              |   0
 .../questionnaire.component.spec.ts           |  21 +++
 .../questionnaire/questionnaire.component.ts  |  37 ++++++
 src/app/datasets/empiar/empiar.component.html |  58 ++++++++-
 src/app/datasets/empiar/empiar.component.ts   | 120 +++++++++++++++++-
 src/app/datasets/onedep/onedep.component.ts   |  19 +--
 ...vice.spec.ts => depositor.service.spec.ts} |   2 +-
 ...ositor.service.ts => depositor.service.ts} |   8 +-
 ...onedep.actions.ts => depositor.actions.ts} |  23 +++-
 ...ects.spec.ts => depositor.effects.spec.ts} |   2 +-
 ...onedep.effects.ts => depositor.effects.ts} |  56 +++++++-
 .../reducers/depositor.reducer.ts             |  41 ++++++
 .../reducers/empiar.reducer.ts                |  34 +++++
 .../reducers/onedep.reducer.ts                |   4 +-
 .../selectors/depositor.selectors.ts          |  27 ++++
 .../selectors/onedep.selectors.ts             |  19 ---
 .../{onedep.store.ts => depositor.store.ts}   |  23 +++-
 24 files changed, 466 insertions(+), 73 deletions(-)
 create mode 100644 src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.html
 create mode 100644 src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.scss
 create mode 100644 src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.spec.ts
 create mode 100644 src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.ts
 rename src/app/shared/sdk/apis/{onedep-depositor.service.spec.ts => depositor.service.spec.ts} (84%)
 rename src/app/shared/sdk/apis/{onedep-depositor.service.ts => depositor.service.ts} (94%)
 rename src/app/state-management/actions/{onedep.actions.ts => depositor.actions.ts} (78%)
 rename src/app/state-management/effects/{onedep.effects.spec.ts => depositor.effects.spec.ts} (93%)
 rename src/app/state-management/effects/{onedep.effects.ts => depositor.effects.ts} (85%)
 create mode 100644 src/app/state-management/reducers/depositor.reducer.ts
 create mode 100644 src/app/state-management/reducers/empiar.reducer.ts
 create mode 100644 src/app/state-management/selectors/depositor.selectors.ts
 delete mode 100644 src/app/state-management/selectors/onedep.selectors.ts
 rename src/app/state-management/state/{onedep.store.ts => depositor.store.ts} (51%)

diff --git a/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts b/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
index 3e4434545b..d94d0c5e00 100644
--- a/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
+++ b/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
@@ -83,7 +83,7 @@ const routes: Routes = [
         canActivate: [AuthGuard],
       },
     ],
-    data: { service: "onedep" },
+    data: { service: "depositor" },
   },
 ];
 @NgModule({
diff --git a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
index 2fbf72df2c..da164d027e 100644
--- a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
+++ b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
@@ -6,6 +6,7 @@ import { DashboardComponent } from "datasets/dashboard/dashboard.component";
 import { DatablocksComponent } from "datasets/datablocks-table/datablocks-table.component";
 import { DatasetDetailsDashboardComponent } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
 import { OneDepComponent } from "datasets/onedep/onedep.component";
+import { EmpiarComponent } from "datasets/empiar/empiar.component";
 import { PublishComponent } from "datasets/publish/publish.component";
 
 const routes: Routes = [
@@ -41,11 +42,11 @@ const routes: Routes = [
     component: OneDepComponent,
     canActivate: [AuthGuard],
   },
-  // {
-  //   path: ":id/empiar",
-  //   component: EmpiarComponent,
-  //   canActivate: [AuthGuard],
-  // },
+  {
+    path: ":id/empiar",
+    component: EmpiarComponent,
+    canActivate: [AuthGuard],
+  },
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/app-routing/service.guard.ts b/src/app/app-routing/service.guard.ts
index 5f3ec55dce..225f35b292 100644
--- a/src/app/app-routing/service.guard.ts
+++ b/src/app/app-routing/service.guard.ts
@@ -31,7 +31,7 @@ export class ServiceGuard implements CanActivate {
       case "reduce":
         shouldActivate = this.appConfig.datasetReduceEnabled;
         break;
-      case "onedep":
+      case "depositor":
         shouldActivate = this.appConfig.datasetOneDepIntegration;
         break;
     }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 73a9c0b923..089856121e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -28,7 +28,7 @@ import { SnackbarInterceptor } from "shared/interceptors/snackbar.interceptor";
 import { AuthService } from "shared/services/auth/auth.service";
 import { InternalStorage, SDKStorage } from "shared/services/auth/base.storage";
 import { CookieService } from "ngx-cookie-service";
-import { JobsServiceV4 } from 'shared/sdk/apis/JobsService';
+import { JobsServiceV4 } from "shared/sdk/apis/JobsService";
 
 const appConfigInitializerFn = (appConfig: AppConfigService) => {
   return () => appConfig.loadAppConfig();
diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index d7f44e4b06..656994565e 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -93,8 +93,13 @@ import { MatSnackBarModule } from "@angular/material/snack-bar";
 import { OneDepComponent } from "./onedep/onedep.component";
 import { OrcidFormatterDirective } from "./onedep/onedep.directive";
 import { EmpiarComponent } from "./empiar/empiar.component";
-import { OneDepEffects } from "state-management/effects/onedep.effects";
+import { OneDepEffects } from "state-management/effects/depositor.effects";
 import { DepositorComponent } from "./depositor/depositor.component";
+import { QuestionnaireComponent } from "./depositor/empiar/questionnaire/questionnaire.component";
+import { onedepReducer } from "state-management/reducers/onedep.reducer";
+import { empiarReducer } from "state-management/reducers/empiar.reducer";
+import { JsonFormsModule } from "@jsonforms/angular";
+import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
 
 @NgModule({
   imports: [
@@ -103,6 +108,8 @@ import { DepositorComponent } from "./depositor/depositor.component";
     FlexLayoutModule,
     FormsModule,
     LinkyModule,
+    JsonFormsModule,
+    JsonFormsAngularMaterialModule,
     MatAutocompleteModule,
     MatButtonModule,
     MatButtonToggleModule,
@@ -152,6 +159,8 @@ import { DepositorComponent } from "./depositor/depositor.component";
     StoreModule.forFeature("publishedData", publishedDataReducer),
     StoreModule.forFeature("logbooks", logbooksReducer),
     StoreModule.forFeature("users", userReducer),
+    StoreModule.forFeature("onedep", onedepReducer),
+    StoreModule.forFeature("empiar", empiarReducer),
     LogbooksModule,
     FullTextSearchBarComponent,
     MatMenuModule,
@@ -189,6 +198,7 @@ import { DepositorComponent } from "./depositor/depositor.component";
     OrcidFormatterDirective,
     EmpiarComponent,
     DepositorComponent,
+    QuestionnaireComponent,
   ],
   providers: [
     ArchivingService,
diff --git a/src/app/datasets/depositor/depositor.component.ts b/src/app/datasets/depositor/depositor.component.ts
index 5179349be5..65ab924e85 100644
--- a/src/app/datasets/depositor/depositor.component.ts
+++ b/src/app/datasets/depositor/depositor.component.ts
@@ -24,7 +24,7 @@ import {
   selectCurrentUser,
   selectIsLoggedIn,
 } from "state-management/selectors/user.selectors";
-import * as fromActions from "state-management/actions/onedep.actions";
+import * as fromActions from "state-management/actions/depositor.actions";
 
 import { Subscription, combineLatest } from "rxjs";
 import { Router } from "@angular/router";
@@ -94,9 +94,14 @@ export class DepositorComponent implements OnInit, OnDestroy {
 
   onChooseRepo() {
     const id = encodeURIComponent(this.dataset.pid);
-    this.router.navigate(["/datasets", id, "onedep"], {
-      state: { pid: this.dataset.pid },
-    });
-    // this.router.navigateByUrl("/datasets/" + id + "/empiar");
+    if (this.depositionRepository.value === "onedep") {
+      this.router.navigate(["/datasets", id, "onedep"], {
+        state: { pid: this.dataset.pid },
+      });
+    } else if (this.depositionRepository.value === "empiar") {
+      this.router.navigate(["/datasets", id, "empiar"], {
+        state: { pid: this.dataset.pid },
+      });
+    }
   }
 }
diff --git a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.html b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.html
new file mode 100644
index 0000000000..0103a1386d
--- /dev/null
+++ b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.html
@@ -0,0 +1 @@
+<p>questionnaire works!</p>
diff --git a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.scss b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.spec.ts b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.spec.ts
new file mode 100644
index 0000000000..a82fa956ee
--- /dev/null
+++ b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { QuestionnaireComponent } from './questionnaire.component';
+
+describe('QuestionnaireComponent', () => {
+  let component: QuestionnaireComponent;
+  let fixture: ComponentFixture<QuestionnaireComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [QuestionnaireComponent]
+    });
+    fixture = TestBed.createComponent(QuestionnaireComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.ts b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.ts
new file mode 100644
index 0000000000..49bb07d8cb
--- /dev/null
+++ b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.ts
@@ -0,0 +1,37 @@
+import { Component } from "@angular/core";
+
+@Component({
+  selector: "app-questionnaire",
+  templateUrl: "./questionnaire.component.html",
+  styleUrls: ["./questionnaire.component.scss"]
+})
+export class QuestionnaireComponent {
+
+}
+// import { Component, EventEmitter, Output, Input } from "@angular/core";
+// import { JsonSchema } from "@jsonforms/core";
+// import { configuredRenderer } from "./ingestor-metadata-editor-helper";
+
+// @Component({
+//   selector: "app-metadata-editor",
+//   template: `<jsonforms
+//     [data]="data"
+//     [schema]="schema"
+//     [renderers]="combinedRenderers"
+//     (dataChange)="onDataChange($event)"
+//   ></jsonforms>`,
+// })
+// export class IngestorMetadataEditorComponent {
+//   @Input() data: object;
+//   @Input() schema: JsonSchema;
+
+//   @Output() dataChange = new EventEmitter<string>();
+
+//   get combinedRenderers() {
+//     return configuredRenderer;
+//   }
+
+//   onDataChange(event: any) {
+//     this.dataChange.emit(event);
+//   }
+// }
diff --git a/src/app/datasets/empiar/empiar.component.html b/src/app/datasets/empiar/empiar.component.html
index 4f527d88ca..324996c2b5 100644
--- a/src/app/datasets/empiar/empiar.component.html
+++ b/src/app/datasets/empiar/empiar.component.html
@@ -1 +1,57 @@
-<p>empiar works!</p>
+<ng-template [ngIf]="dataset">
+  <div style="clear: both;"></div>
+  <div>
+    <div>
+      <mat-card [formGroup]="form" data-cy="general-info">
+        <mat-card-header class="general-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> assignment </mat-icon>
+          </div>
+          General information
+        </mat-card-header>
+        <mat-card-content>
+          <table>
+            <tr>
+              <th>Name</th>
+              <td>{{ dataset.datasetName || "-" }}</td>
+            </tr>
+            <tr>
+              <th>Description</th>
+              <td>
+                <span [innerHTML]="dataset.description || '-' | linky"></span>
+              </td>
+            </tr>
+            <tr>
+              <th>PID</th>
+              <td>
+                {{ dataset.pid }}
+              </td>
+            </tr>
+            <tr>
+              <th>Type</th>
+              <td>{{dataset.type }}</td>
+            </tr>
+            <tr>
+              <th>Creation Time</th>
+              <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
+            </tr>
+            <tr class="keywords-row">
+              <th>Keywords</th>
+              <mat-chip-set role="list" #keywordChips>
+                <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
+                  {{ keyword }}
+                </mat-chip>
+              </mat-chip-set>
+            </tr>
+          </table>
+        </mat-card-content>
+      </mat-card>
+      <mat-card>
+        <jsonforms
+          [data]="data"
+          [schema]="schema"
+         ></jsonforms>
+      </mat-card>
+    </div>
+  </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index c7e535f5dc..b881795dcc 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -1,10 +1,120 @@
-import { Component } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from "@angular/core";
+import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
+import { JsonSchema } from "@jsonforms/core";
+import { AppConfigService, AppConfig } from "app-config.service";
+import { Store, select } from "@ngrx/store";
+import {
+  OutputDatasetObsoleteDto,
+  ReturnedUserDto,
+} from "@scicatproject/scicat-sdk-ts";
+import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
+import { selectCurrentUser } from "state-management/selectors/user.selectors";
+import { selectEmpiarSchema } from "state-management/selectors/depositor.selectors";
+import * as fromActions from "state-management/actions/depositor.actions";
+import { Subscription, Observable } from "rxjs";
+import * as datasetActions from "state-management/actions/datasets.actions";
+import { FormGroup, FormBuilder } from "@angular/forms";
 
 @Component({
-  selector: 'app-empiar',
-  templateUrl: './empiar.component.html',
-  styleUrls: ['./empiar.component.scss']
+  selector: "app-empiar",
+  templateUrl: "./empiar.component.html",
+  styleUrls: ["./empiar.component.scss"],
 })
-export class EmpiarComponent {
+export class EmpiarComponent implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
+  form: FormGroup;
+  config: AppConfig;
+  dataset: OutputDatasetObsoleteDto | undefined;
+  user: ReturnedUserDto | undefined;
 
+  empiarSchema$: Observable<string>;
+  empiarSchema: string;
+  data: JsonSchema = createEmptyInstance();
+  schema: JsonSchema;
+
+  constructor(
+    public appConfigService: AppConfigService,
+    private store: Store,
+    private fb: FormBuilder,
+  ) {
+    this.config = this.appConfigService.getConfig();
+    this.form = this.fb.group({
+      email: [""],
+    });
+  }
+
+  ngOnInit() {
+    // initialize an array for the files to be uploaded
+    const pid = history.state.pid;
+    this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
+
+    this.store.select(selectCurrentDataset).subscribe((dataset) => {
+      this.dataset = dataset;
+    });
+
+    this.subscriptions.push(
+      this.store.select(selectCurrentUser).subscribe((user) => {
+        if (user) {
+          this.user = user;
+        }
+      }),
+    );
+    //  connect to the depositor in the previous step
+    // this.store.dispatch(fromActions.connectToDepositor());
+
+    this.store.dispatch(fromActions.accessEmpiarSchema());
+    this.empiarSchema$ = this.store.pipe(select(selectEmpiarSchema));
+    this.empiarSchema$.subscribe((schema) => {
+      this.empiarSchema = schema;
+    });
+
+    const decodedSchema = atob(this.empiarSchema);
+    this.schema = JSON.parse(decodedSchema);
+  }
+
+  ngOnDestroy() {
+    this.subscriptions.forEach((subscription) => {
+      subscription.unsubscribe();
+    });
+  }
+}
+
+function createEmptyInstance() {
+  // not complete yet
+  return {
+    title: "",
+    release_date: "",
+    experiment_type: 0,
+    scale: "",
+    cross_references: [],
+    workflows: [],
+    authors: [],
+    corresponding_author: {
+      author_orcid: "",
+      middle_name: "",
+      organization: "",
+      street: "",
+      town_or_city: "",
+      state_or_province: "",
+      post_or_zip: "",
+      telephone: "",
+      fax: null,
+      first_name: "",
+      last_name: "",
+      email: "",
+      country: "",
+    },
+    principal_investigator: [],
+    workflow_file: {
+      path: "",
+    },
+    imagesets: [],
+    citation: [],
+  };
 }
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index a17567c3b2..ce1c1a9b10 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -7,8 +7,6 @@ import {
 } from "@angular/core";
 import { MatRadioChange } from "@angular/material/radio";
 import { AppConfigService, AppConfig } from "app-config.service";
-import { HttpClient } from "@angular/common/http";
-import { ActivatedRoute } from "@angular/router";
 import {
   FormBuilder,
   FormControl,
@@ -26,7 +24,7 @@ import {
 } from "@scicatproject/scicat-sdk-ts";
 import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
 import { selectCurrentUser } from "state-management/selectors/user.selectors";
-import * as fromActions from "state-management/actions/onedep.actions";
+import * as fromActions from "state-management/actions/depositor.actions";
 import * as datasetActions from "state-management/actions/datasets.actions";
 import {
   createMethodsList,
@@ -35,7 +33,7 @@ import {
   OneDepUserInfo,
   isMap,
 } from "./types/methods.enum";
-import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
+import { Depositor } from "shared/sdk/apis/depositor.service";
 import { Observable, Subscription } from "rxjs";
 import { isNumeric } from "mathjs";
 
@@ -46,7 +44,6 @@ import { isNumeric } from "mathjs";
 })
 export class OneDepComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
-  private _hasUnsavedChanges = false;
 
   config: AppConfig;
 
@@ -63,12 +60,6 @@ export class OneDepComponent implements OnInit, OnDestroy {
   fileTypes: DepositionFile[]; // required to keep the initial set of files based on EM method
   mainContour = 0.0;
   isMap = isMap;
-  connectedDepositionBackend = "";
-  connectedDepositionBackendVersion = "";
-  connectingToDepositionBackend = false;
-  lastUsedDepositionBackends: string[] = [];
-  forwardDepositionBackend = "";
-  errorMessage = "";
   depositClicked = false;
   privacyTermsTicked = false;
   depID$: Observable<string>;
@@ -78,8 +69,6 @@ export class OneDepComponent implements OnInit, OnDestroy {
   constructor(
     public appConfigService: AppConfigService,
     private store: Store,
-    private http: HttpClient,
-    private route: ActivatedRoute,
     private fb: FormBuilder,
     private depositor: Depositor,
   ) {
@@ -117,8 +106,8 @@ export class OneDepComponent implements OnInit, OnDestroy {
     this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
     this.fileTypes = [];
     this.mainContour = 0.0;
-    //  connect to the depositor
-    this.store.dispatch(fromActions.connectToDepositor());
+    //  connected in the depositor component
+    // this.store.dispatch(fromActions.connectToDepositor());
 
     this.store.select(selectCurrentDataset).subscribe((dataset) => {
       this.dataset = dataset;
diff --git a/src/app/shared/sdk/apis/onedep-depositor.service.spec.ts b/src/app/shared/sdk/apis/depositor.service.spec.ts
similarity index 84%
rename from src/app/shared/sdk/apis/onedep-depositor.service.spec.ts
rename to src/app/shared/sdk/apis/depositor.service.spec.ts
index bbf5cd5690..abb027b801 100644
--- a/src/app/shared/sdk/apis/onedep-depositor.service.spec.ts
+++ b/src/app/shared/sdk/apis/depositor.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from "@angular/core/testing";
 
-import { Depositor } from "./onedep-depositor.service";
+import { Depositor } from "./depositor.service";
 
 describe("OnedepDepositorService", () => {
   let service: Depositor;
diff --git a/src/app/shared/sdk/apis/onedep-depositor.service.ts b/src/app/shared/sdk/apis/depositor.service.ts
similarity index 94%
rename from src/app/shared/sdk/apis/onedep-depositor.service.ts
rename to src/app/shared/sdk/apis/depositor.service.ts
index 889760c66c..5e4eb239e0 100644
--- a/src/app/shared/sdk/apis/onedep-depositor.service.ts
+++ b/src/app/shared/sdk/apis/depositor.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from "@angular/core";
-import { Store } from "@ngrx/store";
 import { HttpClient, HttpHeaders } from "@angular/common/http";
 import { Observable } from "rxjs";
 import { AppConfigService, AppConfig } from "app-config.service";
@@ -17,7 +16,6 @@ export class Depositor {
   config: AppConfig;
   constructor(
     private http: HttpClient,
-    private store: Store,
     public appConfigService: AppConfigService,
   ) {
     this.config = this.appConfigService.getConfig();
@@ -79,4 +77,10 @@ export class Depositor {
       responseType: "blob",
     });
   }
+
+  getEmpiarSchema() {
+    return this.http.get<{ schema: string }>(
+      `${this.config.depositorURL}/empiar/schema`,
+    );
+  }
 }
diff --git a/src/app/state-management/actions/onedep.actions.ts b/src/app/state-management/actions/depositor.actions.ts
similarity index 78%
rename from src/app/state-management/actions/onedep.actions.ts
rename to src/app/state-management/actions/depositor.actions.ts
index 3d381f110b..47209316f6 100644
--- a/src/app/state-management/actions/onedep.actions.ts
+++ b/src/app/state-management/actions/depositor.actions.ts
@@ -7,14 +7,16 @@ import {
   DepBackendVersion,
 } from "shared/sdk/models/OneDep";
 
-export const connectToDepositor = createAction("[OneDep] Connect to Depositor");
+export const connectToDepositor = createAction(
+  "[Depositor] Connect to Depositor",
+);
 export const connectToDepositorSuccess = createAction(
-  "[OneDep] Connect To Depositor Success",
+  "[Depositor] Successfully connected to Depositor",
   props<{ depositor: DepBackendVersion }>(),
 );
 
 export const connectToDepositorFailure = createAction(
-  "[OneDep] Connect To Depositor Failure",
+  "[Depositor] Failed to connect to Depositor",
   props<{ err: Error }>(),
 );
 export const submitDeposition = createAction(
@@ -22,12 +24,23 @@ export const submitDeposition = createAction(
   props<{ deposition: OneDepUserInfo; files: FileUpload[] }>(),
 );
 export const submitDepositionSuccess = createAction(
-  "[OneDep] Create Deposition Complete",
+  "[OneDep] Completed Deposition Creation",
   props<{ deposition: OneDepCreated }>(),
 );
 
 export const submitDepositionFailure = createAction(
-  "[OneDep] Create Deposition Failure",
+  "[OneDep] Failed to complete Deposition ",
+  props<{ err: Error }>(),
+);
+
+export const accessEmpiarSchema = createAction("[EMPIAR] get EMPIAR schema");
+export const accessEmpiarSchemaSuccess = createAction(
+  "[EMPIAR] Successfully retrieved JSON schema for EMPIAR deposition",
+  props<{ schema: any }>(),
+);
+
+export const accessEmpiarSchemaFailure = createAction(
+  "[EMPIAR] Failed to retrieve JSON schema for EMPIAR deposition",
   props<{ err: Error }>(),
 );
 
diff --git a/src/app/state-management/effects/onedep.effects.spec.ts b/src/app/state-management/effects/depositor.effects.spec.ts
similarity index 93%
rename from src/app/state-management/effects/onedep.effects.spec.ts
rename to src/app/state-management/effects/depositor.effects.spec.ts
index 5264d83aa2..7a2fe21699 100644
--- a/src/app/state-management/effects/onedep.effects.spec.ts
+++ b/src/app/state-management/effects/depositor.effects.spec.ts
@@ -3,7 +3,7 @@ import { provideMockActions } from "@ngrx/effects/testing";
 import { provideMockStore } from "@ngrx/store/testing";
 import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { Observable } from "rxjs";
-import { OneDepEffects } from "./onedep.effects";
+import { OneDepEffects } from "./depositor.effects";
 import { Actions } from "@ngrx/effects";
 
 describe("OneDepEffects", () => {
diff --git a/src/app/state-management/effects/onedep.effects.ts b/src/app/state-management/effects/depositor.effects.ts
similarity index 85%
rename from src/app/state-management/effects/onedep.effects.ts
rename to src/app/state-management/effects/depositor.effects.ts
index 28652ba4e0..95837baef7 100644
--- a/src/app/state-management/effects/onedep.effects.ts
+++ b/src/app/state-management/effects/depositor.effects.ts
@@ -5,8 +5,8 @@ import { catchError, map, switchMap, concatMap, last } from "rxjs/operators";
 import { HttpErrorResponse } from "@angular/common/http";
 import { MessageType } from "state-management/models";
 import { showMessageAction } from "state-management/actions/user.actions";
-import * as fromActions from "state-management/actions/onedep.actions";
-import { Depositor } from "shared/sdk/apis/onedep-depositor.service";
+import * as fromActions from "state-management/actions/depositor.actions";
+import { Depositor } from "shared/sdk/apis/depositor.service";
 import {
   OneDepUserInfo,
   OneDepCreated,
@@ -16,7 +16,7 @@ import {
 import { EmFile } from "../../datasets/onedep/types/methods.enum";
 @Injectable()
 export class OneDepEffects {
-  createDeposition$ = createEffect(() => {
+  connectToDepositor$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(fromActions.connectToDepositor),
       switchMap(() =>
@@ -130,6 +130,56 @@ export class OneDepEffects {
     );
   });
 
+  accessEmpiarSchema$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.accessEmpiarSchema),
+      switchMap(() =>
+        this.onedepDepositor.getEmpiarSchema().pipe(
+          map((res) =>
+            fromActions.accessEmpiarSchemaSuccess({
+              schema: res.schema,
+            }),
+          ),
+          catchError((err) =>
+            of(fromActions.accessEmpiarSchemaFailure({ err })),
+          ),
+        ),
+      ),
+    );
+  });
+
+  accessEmpiarSchemaSuccess$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.accessEmpiarSchemaSuccess),
+      switchMap(() => {
+        const message = {
+          type: MessageType.Success,
+          content: "Successfully retrieved EMPIAR schema ",
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+
+  accessEmpiarSchemaFailure$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.accessEmpiarSchemaFailure),
+      switchMap(({ err }) => {
+        const errorMessage =
+          err instanceof HttpErrorResponse
+            ? (err.error?.message ?? err.message ?? "Unknown error")
+            : err.message || "Unknown error";
+        const message = {
+          type: MessageType.Error,
+          content: "Failed to retrieve EMPIAR schema: " + errorMessage,
+          duration: 10000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+
   // createDeposition$ = createEffect(() => {
   //   return this.actions$.pipe(
   //     ofType(fromActions.createDepositionAction),
diff --git a/src/app/state-management/reducers/depositor.reducer.ts b/src/app/state-management/reducers/depositor.reducer.ts
new file mode 100644
index 0000000000..f6f1cab24e
--- /dev/null
+++ b/src/app/state-management/reducers/depositor.reducer.ts
@@ -0,0 +1,41 @@
+import { createReducer, Action, on } from "@ngrx/store";
+import * as fromActions from "state-management/actions/depositor.actions";
+import {
+  DepositorState,
+  initialDepositorState,
+} from "state-management/state/depositor.store";
+
+export const depositorReducer = (
+  state: DepositorState | undefined,
+  action: Action,
+) => {
+  if (action.type.indexOf("[Depositor]") !== -1) {
+    console.log("Action came in! " + action.type);
+  }
+  return reducer(state, action);
+};
+
+const reducer = createReducer(
+  initialDepositorState,
+  on(
+    fromActions.connectToDepositor,
+    (state): DepositorState => ({
+      ...state,
+      interactionError: undefined,
+    }),
+  ),
+  on(
+    fromActions.connectToDepositorSuccess,
+    (state): DepositorState => ({
+      ...state,
+      interactionError: undefined,
+    }),
+  ),
+  on(
+    fromActions.connectToDepositorFailure,
+    (state, { err }): DepositorState => ({
+      ...state,
+      interactionError: err,
+    }),
+  ),
+);
diff --git a/src/app/state-management/reducers/empiar.reducer.ts b/src/app/state-management/reducers/empiar.reducer.ts
new file mode 100644
index 0000000000..0162b013c3
--- /dev/null
+++ b/src/app/state-management/reducers/empiar.reducer.ts
@@ -0,0 +1,34 @@
+import { createReducer, Action, on } from "@ngrx/store";
+import * as fromActions from "state-management/actions/depositor.actions";
+import {
+  EmpiarSchemaState,
+  initialEMPIARState,
+} from "state-management/state/depositor.store";
+
+export const empiarReducer = (
+  state: EmpiarSchemaState | undefined,
+  action: Action,
+) => {
+  if (action.type.indexOf("[Depositor]") !== -1) {
+    console.log("Action came in! " + action.type);
+  }
+  return schemaReducer(state, action);
+};
+
+const schemaReducer = createReducer(
+  initialEMPIARState,
+  on(
+    fromActions.accessEmpiarSchemaSuccess,
+    (state, { schema }): EmpiarSchemaState => ({
+      ...state,
+      schema,
+    }),
+  ),
+  on(
+    fromActions.accessEmpiarSchemaFailure,
+    (state, { err }): EmpiarSchemaState => ({
+      ...state,
+      empiarInteractionError: err,
+    }),
+  ),
+);
diff --git a/src/app/state-management/reducers/onedep.reducer.ts b/src/app/state-management/reducers/onedep.reducer.ts
index 516e8bf8be..5d4ac064e8 100644
--- a/src/app/state-management/reducers/onedep.reducer.ts
+++ b/src/app/state-management/reducers/onedep.reducer.ts
@@ -1,9 +1,9 @@
 import { createReducer, Action, on } from "@ngrx/store";
-import * as fromActions from "state-management/actions/onedep.actions";
+import * as fromActions from "state-management/actions/depositor.actions";
 import {
   OneDepState,
   initialOneDepState,
-} from "state-management/state/onedep.store";
+} from "state-management/state/depositor.store";
 
 const reducer = createReducer(
   initialOneDepState,
diff --git a/src/app/state-management/selectors/depositor.selectors.ts b/src/app/state-management/selectors/depositor.selectors.ts
new file mode 100644
index 0000000000..0a8f5bc85a
--- /dev/null
+++ b/src/app/state-management/selectors/depositor.selectors.ts
@@ -0,0 +1,27 @@
+import { createFeatureSelector, createSelector } from "@ngrx/store";
+import {
+  DepositorState,
+  OneDepState,
+  EmpiarSchemaState,
+} from "state-management/state/depositor.store";
+
+export const selectDepositorState =
+  createFeatureSelector<DepositorState>("depositor");
+export const selectOneDepState = createFeatureSelector<OneDepState>("onedep");
+export const selectEMPIARState =
+  createFeatureSelector<EmpiarSchemaState>("empiar");
+
+export const selectDeposition = createSelector(
+  selectOneDepState,
+  (state) => state.depositionCreated,
+);
+
+export const selectCurrentFileID = createSelector(
+  selectOneDepState,
+  (state) => state.currentFileID,
+);
+
+export const selectEmpiarSchema = createSelector(
+  selectEMPIARState,
+  (state) => state?.schema,
+);
diff --git a/src/app/state-management/selectors/onedep.selectors.ts b/src/app/state-management/selectors/onedep.selectors.ts
deleted file mode 100644
index 0b58a25878..0000000000
--- a/src/app/state-management/selectors/onedep.selectors.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { createFeatureSelector, createSelector } from "@ngrx/store";
-import { OneDepState } from "state-management/state/onedep.store";
-
-export const selectOneDepState = createFeatureSelector<OneDepState>("onedep");
-
-export const selectDeposition = createSelector(
-  selectOneDepState,
-  (state) => state.depositionCreated,
-);
-
-export const selectDepID = createSelector(
-  selectDeposition,
-  (deposition) => deposition?.depID,
-);
-
-export const selectCurrentFileID = createSelector(
-  selectOneDepState,
-  (state) => state.currentFileID,
-);
diff --git a/src/app/state-management/state/onedep.store.ts b/src/app/state-management/state/depositor.store.ts
similarity index 51%
rename from src/app/state-management/state/onedep.store.ts
rename to src/app/state-management/state/depositor.store.ts
index 32aa33be30..03905cdf9a 100644
--- a/src/app/state-management/state/onedep.store.ts
+++ b/src/app/state-management/state/depositor.store.ts
@@ -1,14 +1,18 @@
 import { OneDepCreated, OneDepUserInfo } from "shared/sdk/models/OneDep";
 
-export interface OneDepState {
-  // depositionInfo: OneDepUserInfo | undefined;
+export interface DepositorState {
+  depositor: string | undefined;
+  interactionError: Error | undefined;
+}
+export const initialDepositorState: DepositorState = {
+  depositor: undefined,
+  interactionError: undefined,
+};
 
+export interface OneDepState {
   depositionCreated: OneDepCreated | undefined;
-
   oneDepInteractionError: Error | undefined;
-
   fileIDs: string[] | undefined;
-
   currentFileID: string | undefined;
 }
 
@@ -19,3 +23,12 @@ export const initialOneDepState: OneDepState = {
   fileIDs: [],
   currentFileID: undefined,
 };
+
+export interface EmpiarSchemaState {
+  schema: string | undefined;
+  empiarInteractionError: Error | undefined;
+}
+export const initialEMPIARState: EmpiarSchemaState = {
+  schema: undefined,
+  empiarInteractionError: undefined,
+};

From e02316c0e7c3a245ea445223d29679f88cbf20a5 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 6 Mar 2025 15:48:05 +0000
Subject: [PATCH 131/245] renderer: support user choosing owner group

---
 .../ingestor.file-browser.component.ts        |   2 +-
 .../customRenderer/custom-renderers.ts        |   8 +
 .../owner-group-field-renderer.ts             | 140 ++++++++++++++++++
 .../customRenderer/quantity-value-renderer.ts |   0
 .../ingestor-metadata-editor.component.scss   |   4 +
 .../ingestor-metadata-editor.component.ts     |   1 +
 src/app/ingestor/ingestor.module.ts           |   2 +
 7 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts

diff --git a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
index 07b4b1b4b1..e0b0c7b31f 100644
--- a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
+++ b/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -113,7 +113,7 @@ export class IngestorFileBrowserComponent implements OnInit {
     }
   }
 
-  onCancel = (): void => { };
+  onCancel = (): void => {};
 
   onSelect = (): void => {
     if (this.activeNode) {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index 75afaf9e45..d981074344 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -11,6 +11,10 @@ import {
 } from "@jsonforms/angular-material";
 import { ArrayLayoutRendererCustom } from "./array-renderer";
 import { CustomObjectControlRendererComponent } from "./object-group-renderer";
+import {
+  OwnerGroupFieldComponent,
+  ownerGroupFieldTester,
+} from "./owner-group-field-renderer";
 
 export const customRenderers: JsonFormsRendererRegistryEntry[] = [
   /*{
@@ -35,4 +39,8 @@ export const customRenderers: JsonFormsRendererRegistryEntry[] = [
     tester: ObjectControlRendererTester,
     renderer: CustomObjectControlRendererComponent,
   },
+  {
+    tester: ownerGroupFieldTester,
+    renderer: OwnerGroupFieldComponent,
+  },
 ];
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
new file mode 100644
index 0000000000..837661d32e
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
@@ -0,0 +1,140 @@
+import { Component, OnInit, ChangeDetectionStrategy } from "@angular/core";
+import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
+import { RankedTester, rankWith, scopeEndsWith } from "@jsonforms/core";
+import { Store } from "@ngrx/store";
+import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
+import { fetchCurrentUserAction } from "state-management/actions/user.actions";
+import { MatAutocompleteSelectedEvent } from "@angular/material/autocomplete";
+
+@Component({
+  selector: "owner-group-renderer",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
+  template: `
+    <div>
+      <mat-form-field
+        [ngStyle]="{ display: hidden ? 'none' : '' }"
+        *ngIf="userOwnerGroups && userOwnerGroups.length > 0"
+        class="custom-input-box"
+      >
+        <mat-label>{{ label }}</mat-label>
+        <input
+          type="text"
+          class="custom-input-box"
+          matInput
+          [id]="id"
+          [matAutocomplete]="auto"
+          [formControl]="form"
+          (input)="onChange($event)"
+          (focus)="focused = true"
+          (focusout)="focused = false"
+        />
+        <mat-autocomplete
+          #auto="matAutocomplete"
+          (optionSelected)="onSelectAutocompleteValue($event)"
+        >
+          <mat-option
+            *ngFor="let ownerGroup of userOwnerGroups"
+            [value]="ownerGroup"
+          >
+            {{ ownerGroup }}
+          </mat-option>
+        </mat-autocomplete>
+        <mat-hint *ngIf="shouldShowUnfocusedDescription() || focused">{{
+          description
+        }}</mat-hint>
+        <mat-error>{{ error }}</mat-error>
+      </mat-form-field>
+
+      <mat-form-field
+        [ngStyle]="{ display: hidden ? 'none' : '' }"
+        *ngIf="!userOwnerGroups || userOwnerGroups.length === 0"
+        class="custom-input-box"
+      >
+        <mat-label>{{ label }}</mat-label>
+        <input
+          type="text"
+          class="custom-input-box"
+          matInput
+          [id]="id"
+          [formControl]="form"
+          (input)="onChange($event)"
+          (focus)="focused = true"
+          (focusout)="focused = false"
+        />
+      </mat-form-field>
+    </div>
+  `,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class OwnerGroupFieldComponent
+  extends JsonFormsControl
+  implements OnInit {
+  focused = false;
+  vm$ = this.store.select(selectUserSettingsPageViewModel);
+  userOwnerGroups = [];
+  groupFieldInitialized = false;
+
+  constructor(
+    jsonformsService: JsonFormsAngularService,
+    private store: Store,
+  ) {
+    super(jsonformsService);
+  }
+
+  getEventValue = (event: any) => event.target.value || undefined;
+
+  ngOnInit() {
+    // Call ngOnInit from super class
+    super.ngOnInit();
+
+    // Fetch the owner groups from the scicat user
+    this.vm$.subscribe((settings) => {
+      const getclaims = (profile: any): string[] => {
+        if (!profile) {
+          return [];
+        }
+
+        if (profile.oidcClaims !== undefined) {
+          return settings.profile.oidcClaims.accessGroups ?? [];
+        }
+
+        if (profile.accessGroups !== undefined) {
+          return settings.profile.accessGroups ?? [];
+        }
+
+        return [];
+      };
+
+      const claims = getclaims(settings.profile);
+      if (claims.length > 0) {
+        this.userOwnerGroups = claims;
+      }
+
+      if (!this.groupFieldInitialized) {
+        this.groupFieldInitialized = true;
+        this.store.dispatch(fetchCurrentUserAction());
+      }
+
+      // Überprüfen Sie den Status des formControl-Objekts und aktivieren Sie es, falls es deaktiviert ist
+      if (this.form.disabled) {
+        this.form.enable();
+      }
+    });
+  }
+
+  onSelectAutocompleteValue($event: MatAutocompleteSelectedEvent) {
+    const selectedValue = $event.option.value;
+    // Create a fake json from event
+    const fakeChangeEvent = {
+      target: {
+        value: selectedValue,
+      },
+    };
+    this.onChange(fakeChangeEvent);
+  }
+}
+
+export const ownerGroupFieldTester: RankedTester = rankWith(
+  2,
+  scopeEndsWith("ownerGroup"),
+);
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
index b41bf4ab35..c033f74ca6 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -36,4 +36,8 @@ mat-card {
 }
 ::ng-deep .error-message-tooltip {
   white-space: pre-line;
+}
+
+.custom-input-box {
+  width: 100%;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index f4959aec56..5eb016063a 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -47,6 +47,7 @@ export class IngestorMetadataEditorComponent implements OnInit {
 
   onDataChange(event: any) {
     this.dataChange.emit(event);
+    //console.log(this.schema);
   }
 
   onErrors(errors: any[]) {
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index b9bf5a23a8..1880d6797c 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -36,6 +36,7 @@ import { MatPaginatorModule } from "@angular/material/paginator";
 import { CustomObjectControlRendererComponent } from "./ingestor-metadata-editor/customRenderer/object-group-renderer";
 import { IngestorFileBrowserComponent } from "./ingestor-file-browser/ingestor.file-browser.component";
 import { MatTreeModule } from "@angular/material/tree";
+import { OwnerGroupFieldComponent } from "./ingestor-metadata-editor/customRenderer/owner-group-field-renderer";
 
 @NgModule({
   declarations: [
@@ -52,6 +53,7 @@ import { MatTreeModule } from "@angular/material/tree";
     IngestorConfirmationDialogComponent,
     ExportTemplateHelperComponent,
     IngestorFileBrowserComponent,
+    OwnerGroupFieldComponent,
   ],
   imports: [
     CommonModule,

From d18a3a0387943d049e7ecce8e5be745a3b5f76f7 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 6 Mar 2025 15:50:44 +0000
Subject: [PATCH 132/245] schema converter: use updated atob for conversion

---
 .../ingestor/dialog/ingestor.new-transfer-dialog.component.ts  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index a34ce7db5a..fdeb8f1afb 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -1,6 +1,7 @@
 import { Component, Inject, OnInit } from "@angular/core";
 import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
 import {
+  decodeBase64ToUTF8,
   DialogDataObject,
   ExtractionMethod,
   IngestionRequestInformation,
@@ -105,7 +106,7 @@ export class IngestorNewTransferDialogComponent implements OnInit {
 
   prepareSchemaForProcessing(): void {
     const encodedSchema = this.createNewTransferData.selectedMethod.schema;
-    const decodedSchema = atob(encodedSchema);
+    const decodedSchema = decodeBase64ToUTF8(encodedSchema);
     const schema = JSON.parse(decodedSchema);
     const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
       schema,

From 92d751f3e5cf622e4c3748715e0bd9a76e85de17 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 10 Mar 2025 17:39:03 +0000
Subject: [PATCH 133/245] wip jsonForms

---
 package-lock.json                             | 5458 ++++++++---------
 package.json                                  |    2 +
 src/app/datasets/empiar/empiar.component.html |    2 +
 src/app/datasets/empiar/empiar.component.ts   |   13 +-
 src/app/datasets/empiar/questionnaureUI.json  |   39 +
 src/app/datasets/empiar/renderer.ts           |   25 +
 6 files changed, 2780 insertions(+), 2759 deletions(-)
 create mode 100644 src/app/datasets/empiar/questionnaureUI.json
 create mode 100644 src/app/datasets/empiar/renderer.ts

diff --git a/package-lock.json b/package-lock.json
index b4978fa094..d57992d68f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,8 @@
         "@angular/service-worker": "^16",
         "@jsonforms/angular": "3.2.*",
         "@jsonforms/angular-material": "3.2.*",
+        "@jsonforms/core": "^3.2.*",
+        "@jsonforms/react": "3.2.*",
         "@ngbracket/ngx-layout": "^16.0.0",
         "@ngrx/effects": "^16",
         "@ngrx/router-store": "^16",
@@ -95,15 +97,6 @@
         "typescript": "^5.1.6"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
@@ -132,6 +125,15 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/architect/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular": {
       "version": "16.2.16",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.16.tgz",
@@ -254,21 +256,13 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
-      "version": "16.2.16",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.16.tgz",
-      "integrity": "sha512-4gm2allK0Pjy/Lxb9IGRnhEZNEOJSOTWwy09VOdHouV2ODRK7Tto2LgteaFJUUSLkuvWRsI7pfuA6yrz8KDfHw==",
+    "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^16.14.0 || >=18.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^16.0.0",
-        "typescript": ">=4.9.3 <5.2",
-        "webpack": "^5.54.0"
+      "dependencies": {
+        "tslib": "^2.1.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
@@ -296,6 +290,15 @@
         "webpack-dev-server": "^4.0.0"
       }
     },
+    "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/core": {
       "version": "16.2.16",
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.16.tgz",
@@ -323,6 +326,15 @@
         }
       }
     },
+    "node_modules/@angular-devkit/core/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/schematics": {
       "version": "16.2.16",
       "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.16.tgz",
@@ -341,6 +353,15 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-eslint/builder": {
       "version": "16.3.1",
       "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-16.3.1.tgz",
@@ -627,34 +648,47 @@
       }
     },
     "node_modules/@angular/compiler-cli/node_modules/@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
+      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@angular/compiler-cli/node_modules/@babel/template": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@angular/compiler-cli/node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@angular/core": {
       "version": "16.2.12",
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.12.tgz",
@@ -850,22 +884,23 @@
       "dev": true
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
+      "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -937,27 +972,15 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
-      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.15"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "browserslist": "^4.22.2",
+        "@babel/compat-data": "^7.26.5",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -975,19 +998,17 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.0.tgz",
-      "integrity": "sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.26.9.tgz",
+      "integrity": "sha512-ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.26.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -997,6 +1018,18 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -1007,13 +1040,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
+      "integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "regexpu-core": "^5.3.1",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1023,6 +1056,18 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -1033,9 +1078,9 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz",
-      "integrity": "sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+      "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -1049,88 +1094,52 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.23.0"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1140,35 +1149,35 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
-      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-wrap-function": "^7.22.20"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1177,42 +1186,43 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
+    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
+      "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1231,107 +1241,95 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.0.tgz",
-      "integrity": "sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
+      "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.0",
-        "@babel/types": "^7.24.0"
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers/node_modules/@babel/template": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+    "node_modules/@babel/parser": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
+      "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "@babel/types": "^7.26.9"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",
-      "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",
-      "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1340,12 +1338,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
-      "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1355,14 +1353,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
-      "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.23.3"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1483,12 +1481,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
-      "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1498,12 +1496,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
-      "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1655,12 +1653,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
-      "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1670,15 +1668,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz",
-      "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz",
+      "integrity": "sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-remap-async-to-generator": "^7.25.9",
+        "@babel/traverse": "^7.26.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1705,12 +1702,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
-      "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
+      "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1720,12 +1717,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
-      "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+      "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1735,13 +1732,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
-      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+      "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1751,14 +1748,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
-      "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+      "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1768,18 +1764,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.23.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz",
-      "integrity": "sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1789,14 +1783,26 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
-      "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.15"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1806,26 +1812,26 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties/node_modules/@babel/template": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
-      "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1835,13 +1841,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
-      "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1851,12 +1857,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
-      "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1866,13 +1872,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
-      "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+      "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1882,13 +1887,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
-      "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+      "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1898,13 +1902,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
-      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+      "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1914,13 +1917,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
-      "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.26.9.tgz",
+      "integrity": "sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1930,14 +1933,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
-      "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1947,13 +1950,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
-      "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+      "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1963,12 +1965,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
-      "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1978,13 +1980,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
-      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+      "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1994,12 +1995,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
-      "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2009,13 +2010,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
-      "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2025,14 +2026,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
-      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+      "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2042,15 +2042,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz",
-      "integrity": "sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2060,13 +2060,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
-      "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2076,13 +2076,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2092,12 +2092,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
-      "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2107,13 +2107,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
-      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
+      "version": "7.26.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
+      "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2123,13 +2122,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
-      "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+      "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2139,16 +2137,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.0.tgz",
-      "integrity": "sha512-y/yKMm7buHpFFXfxVFS4Vk1ToRJDilIa6fKRioB9Vjichv58TDGXTvqV0dN7plobAmTW5eSEGXDngE+Mm+uO+w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+      "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.23.3"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2158,13 +2154,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
-      "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2174,13 +2170,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
-      "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+      "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2190,14 +2185,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
-      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2207,12 +2201,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
-      "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2222,13 +2216,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
-      "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+      "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2238,15 +2232,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
-      "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+      "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2255,13 +2248,25 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
-      "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2271,12 +2276,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
-      "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+      "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.25.9",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -2287,12 +2292,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
-      "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2331,12 +2336,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
-      "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2346,13 +2351,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
-      "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2362,12 +2367,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
-      "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2377,12 +2382,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
-      "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz",
+      "integrity": "sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2392,12 +2397,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
-      "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz",
+      "integrity": "sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2407,12 +2412,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
-      "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2422,13 +2427,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
-      "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+      "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2438,13 +2443,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
-      "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2454,13 +2459,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
-      "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+      "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2588,12 +2593,6 @@
         "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-      "dev": true
-    },
     "node_modules/@babel/runtime": {
       "version": "7.22.6",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
@@ -2621,19 +2620,16 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.0.tgz",
-      "integrity": "sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
+      "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -2642,29 +2638,55 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
+      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/traverse/node_modules/@babel/template": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@babel/types": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
-      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
+      "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2753,115 +2775,45 @@
         "typescript": "^3 || ^4"
       }
     },
-    "node_modules/@betterer/cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@betterer/cli/node_modules/prettier": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
+      "bin": {
+        "prettier": "bin-prettier.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10.13.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
-    "node_modules/@betterer/cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@betterer/cli/node_modules/typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=4.2.0"
       }
     },
-    "node_modules/@betterer/cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@betterer/constraints": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@betterer/constraints/-/constraints-5.3.0.tgz",
+      "integrity": "sha512-YmaX30/S4PoYDqGspRmUBeBE1KkLbnSQCndqPar7ZH6sWOIo29d67B7as6ODEmwpJf+GGYfmrGtTJd5c69hTng==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "tslib": "^2.3.1"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@betterer/cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@betterer/cli/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@betterer/cli/node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "node_modules/@betterer/cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@betterer/cli/node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
-      "dev": true,
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/@betterer/constraints": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@betterer/constraints/-/constraints-5.3.0.tgz",
-      "integrity": "sha512-YmaX30/S4PoYDqGspRmUBeBE1KkLbnSQCndqPar7ZH6sWOIo29d67B7as6ODEmwpJf+GGYfmrGtTJd5c69hTng==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=12"
+        "node": ">=12"
       }
     },
     "node_modules/@betterer/errors": {
@@ -2930,76 +2882,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@betterer/tasks/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@betterer/tasks/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@betterer/tasks/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@betterer/tasks/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@betterer/tasks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@betterer/tasks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@betterer/typescript": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/@betterer/typescript/-/typescript-5.4.0.tgz",
@@ -3049,9 +2931,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.6.tgz",
-      "integrity": "sha512-fi0eVdCOtKu5Ed6+E8mYxUF6ZTFJDZvHogCBelM0xVXmrDEkyM22gRArQzq1YcHPm1V47Vf/iAD+WgVdUlJCGg==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.8.tgz",
+      "integrity": "sha512-h0NFgh1mJmm1nr4jCwkGHwKneVYKghUyWe6TMNrk0B9zsjAJxpg8C4/+BAcmLgCPa1vj1V8rNUaILl+zYRUWBQ==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -3067,7 +2949,7 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.13.0",
+        "qs": "6.14.0",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "^5.0.0",
         "tunnel-agent": "^0.6.0",
@@ -3077,95 +2959,408 @@
         "node": ">= 6"
       }
     },
-    "node_modules/@cypress/request/node_modules/form-data": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
-      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+    "node_modules/@cypress/xvfb": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
+      "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
       "dev": true,
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
+        "debug": "^3.1.0",
+        "lodash.once": "^4.1.1"
+      }
+    },
+    "node_modules/@cypress/xvfb/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.17.tgz",
+      "integrity": "sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz",
+      "integrity": "sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.17.tgz",
+      "integrity": "sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz",
+      "integrity": "sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz",
+      "integrity": "sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz",
+      "integrity": "sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz",
+      "integrity": "sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz",
+      "integrity": "sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz",
+      "integrity": "sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz",
+      "integrity": "sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz",
+      "integrity": "sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz",
+      "integrity": "sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz",
+      "integrity": "sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz",
+      "integrity": "sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz",
+      "integrity": "sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz",
+      "integrity": "sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz",
+      "integrity": "sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
       "engines": {
-        "node": ">= 6"
+        "node": ">=12"
       }
     },
-    "node_modules/@cypress/request/node_modules/tough-cookie": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.0.0.tgz",
-      "integrity": "sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==",
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz",
+      "integrity": "sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "tldts": "^6.1.32"
-      },
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
       "engines": {
-        "node": ">=16"
+        "node": ">=12"
       }
     },
-    "node_modules/@cypress/xvfb": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
-      "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz",
+      "integrity": "sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "debug": "^3.1.0",
-        "lodash.once": "^4.1.1"
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@cypress/xvfb/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz",
+      "integrity": "sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz",
+      "integrity": "sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@esbuild/linux-x64": {
+    "node_modules/@esbuild/win32-x64": {
       "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz",
-      "integrity": "sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz",
+      "integrity": "sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
       "optional": true,
       "os": [
-        "linux"
+        "win32"
       ],
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
       "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -3284,9 +3479,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3336,12 +3531,13 @@
       "dev": true
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+      "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -3385,9 +3581,10 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
-      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
       "dev": true
     },
     "node_modules/@isaacs/cliui": {
@@ -3408,9 +3605,9 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -3564,9 +3761,9 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
       "dev": true,
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
@@ -3606,9 +3803,9 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
@@ -3661,7 +3858,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-3.2.1.tgz",
       "integrity": "sha512-G5ldiWM2e5Vh5WrbjDKb0QJ1SG/39kxC48x2ufFKhfpDHibqhPaXegg5jmSBTNcB0ldE9jMmpKwxF6fi5VBCEA==",
-      "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.3",
         "ajv": "^8.6.1",
@@ -3669,6 +3865,18 @@
         "lodash": "^4.17.21"
       }
     },
+    "node_modules/@jsonforms/react": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@jsonforms/react/-/react-3.2.1.tgz",
+      "integrity": "sha512-MKDEXBHtaCZR7vjtlTa4JtyItgYxCPrShjLTgoZbwRL6dsi54d6gRJ08YvV3XuwPn0kempXj3RCMY/kw/5AYRQ==",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "@jsonforms/core": "3.2.1",
+        "react": "^16.12.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/@kwsites/file-exists": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
@@ -4516,6 +4724,22 @@
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
+    "node_modules/@ngtools/webpack": {
+      "version": "16.2.16",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.16.tgz",
+      "integrity": "sha512-4gm2allK0Pjy/Lxb9IGRnhEZNEOJSOTWwy09VOdHouV2ODRK7Tto2LgteaFJUUSLkuvWRsI7pfuA6yrz8KDfHw==",
+      "dev": true,
+      "engines": {
+        "node": "^16.14.0 || >=18.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^16.0.0",
+        "typescript": ">=4.9.3 <5.2",
+        "webpack": "^5.54.0"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4552,9 +4776,9 @@
       }
     },
     "node_modules/@npmcli/fs": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
-      "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
+      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
       "dev": true,
       "dependencies": {
         "semver": "^7.3.5"
@@ -4607,16 +4831,16 @@
       }
     },
     "node_modules/@npmcli/installed-package-contents": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz",
-      "integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz",
+      "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==",
       "dev": true,
       "dependencies": {
         "npm-bundled": "^3.0.0",
         "npm-normalize-package-bin": "^3.0.0"
       },
       "bin": {
-        "installed-package-contents": "lib/index.js"
+        "installed-package-contents": "bin/index.js"
       },
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -5143,9 +5367,9 @@
       }
     },
     "node_modules/@sigstore/sign/node_modules/minipass-fetch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz",
-      "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
+      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
       "dev": true,
       "dependencies": {
         "minipass": "^7.0.3",
@@ -5160,9 +5384,9 @@
       }
     },
     "node_modules/@sigstore/sign/node_modules/minipass-fetch/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -5182,9 +5406,9 @@
       }
     },
     "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA=="
     },
     "node_modules/@tootallnate/once": {
       "version": "1.1.2",
@@ -5196,9 +5420,9 @@
       }
     },
     "node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
       "dev": true
     },
     "node_modules/@tsconfig/node12": {
@@ -5242,9 +5466,9 @@
       }
     },
     "node_modules/@tufjs/models/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -5294,12 +5518,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
     "node_modules/@types/cors": {
       "version": "2.8.17",
       "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
@@ -5315,22 +5533,10 @@
       "integrity": "sha512-tqdiS4otQP4KmY0PR3u6KbZ5EWvhNdUoS/jc93UuK23C220lOZ/9TvjfxdPcKvqwwDVtmtSCrnr0p/2dirAxkA==",
       "dev": true
     },
-    "node_modules/@types/eslint": {
-      "version": "8.56.5",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.5.tgz",
-      "integrity": "sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true
     },
     "node_modules/@types/express": {
@@ -5346,9 +5552,9 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.0.tgz",
-      "integrity": "sha512-AbXMTZGt40T+KON9/Fdxx0B2WK5hsgxcfXJLr5bFpZ7b4JCex2WyQPTEKdXqfHiY5nKKBScZ7yCoO6Pvgxfvnw==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz",
+      "integrity": "sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -5382,20 +5588,19 @@
       "dev": true
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.15",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
-      "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
+      "version": "1.17.16",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
+      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/jasmine": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.5.tgz",
-      "integrity": "sha512-SaCZ3kM5NjOiJqMRYwHpLbTfUC2Dyk1KS3QanNFsUYPGTk70CWVK/J9ueun6zNhw/UkgV7xl8V4ZLQZNRbfnNw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.7.tgz",
+      "integrity": "sha512-DVOfk9FaClQfNFpSfaML15jjB5cjffDMvjtph525sroR5BEAW2uKnTOYUTqTFuZFjNvH0T5XMIydvIctnUKufw==",
+      "dev": true
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
@@ -5403,9 +5608,9 @@
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
-      "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
+      "version": "4.17.16",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.16.tgz",
+      "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==",
       "dev": true
     },
     "node_modules/@types/lodash-es": {
@@ -5413,7 +5618,6 @@
       "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
       "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/lodash": "*"
       }
@@ -5431,9 +5635,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.10.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz",
-      "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==",
+      "version": "22.13.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz",
+      "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==",
       "dev": true,
       "dependencies": {
         "undici-types": "~6.20.0"
@@ -5449,9 +5653,9 @@
       }
     },
     "node_modules/@types/qs": {
-      "version": "6.9.16",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz",
-      "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==",
+      "version": "6.9.18",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
+      "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==",
       "dev": true
     },
     "node_modules/@types/range-parser": {
@@ -5515,9 +5719,9 @@
       "dev": true
     },
     "node_modules/@types/sizzle": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
-      "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz",
+      "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==",
       "dev": true
     },
     "node_modules/@types/sockjs": {
@@ -5548,18 +5752,18 @@
       }
     },
     "node_modules/@types/ws": {
-      "version": "8.5.12",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz",
-      "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
@@ -5633,6 +5837,45 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.1.tgz",
+      "integrity": "sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.1.tgz",
@@ -5656,15 +5899,58 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "engines": {
         "node": ">= 4"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@typescript-eslint/experimental-utils": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz",
@@ -5684,17 +5970,84 @@
         "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@typescript-eslint/parser": {
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.26.0.tgz",
+      "integrity": "sha512-mNtXP9LTVBy14ZF3o7JG69gRPBK/2QWtQd0j0oH26HcY/foyJJau6pNUez7QrM5UHnSvwlQcJXKsk0I99B9pOA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.26.0",
+        "@typescript-eslint/types": "8.26.0",
+        "@typescript-eslint/typescript-estree": "8.26.0",
+        "@typescript-eslint/visitor-keys": "8.26.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.26.0.tgz",
+      "integrity": "sha512-E0ntLvsfPqnPwng8b8y4OGuzh/iIOm2z8U3S9zic2TeMLW61u5IH2Q1wu0oSTkfrSzwbDJIB/Lm8O3//8BWMPA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.26.0",
+        "@typescript-eslint/visitor-keys": "8.26.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.0.tgz",
+      "integrity": "sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.26.0",
+        "eslint-visitor-keys": "^4.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
       "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.1.tgz",
-      "integrity": "sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.1.tgz",
+      "integrity": "sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.18.1",
         "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/typescript-estree": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1",
-        "debug": "^4.3.4"
+        "@typescript-eslint/visitor-keys": "8.18.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5702,21 +6055,13 @@
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
+    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
       "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.1.tgz",
-      "integrity": "sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
       "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1"
-      },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -5809,10 +6154,39 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/type-utils/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
-      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
+      "version": "8.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.0.tgz",
+      "integrity": "sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5823,19 +6197,19 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.1.tgz",
-      "integrity": "sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==",
+      "version": "8.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.0.tgz",
+      "integrity": "sha512-tiJ1Hvy/V/oMVRTbEOIeemA2XoylimlDQ03CgPPNaHYZbpsc78Hmngnt+WXZfJX1pjQ711V7g0H7cSJThGYfPQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.18.1",
-        "@typescript-eslint/visitor-keys": "8.18.1",
+        "@typescript-eslint/types": "8.26.0",
+        "@typescript-eslint/visitor-keys": "8.26.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5845,20 +6219,49 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.8.0"
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.0.tgz",
+      "integrity": "sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.26.0",
+        "eslint-visitor-keys": "^4.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -5880,9 +6283,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
       "bin": {
         "semver": "bin/semver.js"
@@ -5891,6 +6294,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/ts-api-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
+      "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
+      "dev": true,
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
+      }
+    },
     "node_modules/@typescript-eslint/utils": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
@@ -6013,6 +6428,35 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/@typescript-eslint/utils/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.1.tgz",
@@ -6030,6 +6474,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
@@ -6043,9 +6500,9 @@
       }
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
       "dev": true
     },
     "node_modules/@vitejs/plugin-basic-ssl": {
@@ -6061,148 +6518,148 @@
       }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -6229,76 +6686,6 @@
         "typescript": ">=3.2.x || >= 4.x"
       }
     },
-    "node_modules/@wessberg/ts-evaluator/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@wessberg/ts-evaluator/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@wessberg/ts-evaluator/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@wessberg/ts-evaluator/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@wessberg/ts-evaluator/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wessberg/ts-evaluator/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -6374,10 +6761,19 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -6475,9 +6871,9 @@
       }
     },
     "node_modules/agentkeepalive": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
-      "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz",
+      "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==",
       "dev": true,
       "dependencies": {
         "humanize-ms": "^1.2.1"
@@ -6588,15 +6984,18 @@
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/anymatch": {
@@ -6711,6 +7110,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
       "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
+      "deprecated": "This package is no longer supported.",
       "dev": true,
       "dependencies": {
         "delegates": "^1.0.0",
@@ -6745,12 +7145,12 @@
       }
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6802,9 +7202,9 @@
       }
     },
     "node_modules/async": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
@@ -6822,11 +7222,11 @@
       }
     },
     "node_modules/autolinker": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-4.0.0.tgz",
-      "integrity": "sha512-fl5Kh6BmEEZx+IWBfEirnRUU5+cOiV0OK7PEt0RBKvJMJ8GaRseIOeDU3FKf4j3CE5HVefcjHmhYPOcaVt0bZw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-4.1.0.tgz",
+      "integrity": "sha512-mYzdZMei1zIXcHVS/LjnuCJG+C/hNi8O+5m0R8YWtrIBWGrjL8CVzEZXxOfH0l1kioEXHNpUJRkgZdyL4GgIHQ==",
       "dependencies": {
-        "tslib": "^2.3.0"
+        "tslib": "^2.8.1"
       }
     },
     "node_modules/autoprefixer": {
@@ -6886,15 +7286,15 @@
       }
     },
     "node_modules/aws4": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
-      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
+      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
       "dev": true
     },
     "node_modules/axios": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
-      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.2.tgz",
+      "integrity": "sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==",
       "dev": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -6902,20 +7302,6 @@
         "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/axios/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/axios/node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -6965,13 +7351,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz",
-      "integrity": "sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ==",
+      "version": "0.4.12",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
+      "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.1",
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -7188,16 +7574,31 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/body-parser/node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/bonjour-service": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
-      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+      "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -7237,9 +7638,9 @@
       "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.23.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
       "dev": true,
       "funding": [
         {
@@ -7256,10 +7657,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001587",
-        "electron-to-chromium": "^1.4.668",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -7321,15 +7722,6 @@
         "node": ">=0.2.0"
       }
     },
-    "node_modules/builtins": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.0.0"
-      }
-    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -7363,23 +7755,21 @@
       }
     },
     "node_modules/cacache/node_modules/glob": {
-      "version": "10.3.10",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.5",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
@@ -7394,9 +7784,9 @@
       }
     },
     "node_modules/cacache/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -7409,9 +7799,9 @@
       }
     },
     "node_modules/cacache/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -7427,15 +7817,41 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7472,9 +7888,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001599",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz",
-      "integrity": "sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==",
+      "version": "1.0.30001703",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001703.tgz",
+      "integrity": "sha512-kRlAGTRWgPsOj7oARC9m1okJEXdL/8fekFVcxA8Hl7GH4r/sN4OJn/i6Flde373T50KS7Y37oFbMwlE8+F42kQ==",
       "dev": true,
       "funding": [
         {
@@ -7509,17 +7925,19 @@
       }
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/chardet": {
@@ -7574,18 +7992,18 @@
       }
     },
     "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
       "dev": true,
       "engines": {
         "node": ">=6.0"
       }
     },
     "node_modules/ci-info": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.0.0.tgz",
-      "integrity": "sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz",
+      "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==",
       "dev": true,
       "funding": [
         {
@@ -7631,9 +8049,9 @@
       }
     },
     "node_modules/cli-table3": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
-      "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
+      "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
       "dev": true,
       "dependencies": {
         "string-width": "^4.2.0"
@@ -7705,18 +8123,21 @@
       }
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/color-support": {
@@ -7756,9 +8177,9 @@
       }
     },
     "node_modules/comlink": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/comlink/-/comlink-4.4.1.tgz",
-      "integrity": "sha512-+1dlx0aY5Jo1vHy/tSsIGpSkN4tS9rZSW8FIhG0JH/crs9wwweswIo/POr451r7bZww3hFbPAKnTpimzL/mm4Q==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/comlink/-/comlink-4.4.2.tgz",
+      "integrity": "sha512-OxGdvBmJuNKSCMO4NTl1L47VRp6xn2wG4F/2hYzB6tiCb709otOxtEYCSvK80PtjODfXXZu8ds+Nw5kVCjqd2g==",
       "dev": true
     },
     "node_modules/commander": {
@@ -7824,32 +8245,23 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
+      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
       "dev": true,
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
         "debug": "2.6.9",
+        "negotiator": "~0.6.4",
         "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
+        "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/compression/node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/compression/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -7865,12 +8277,6 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -8011,44 +8417,13 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
-      "dev": true,
-      "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.3.0",
-        "ignore": "^5.2.4",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/core-js-compat": {
-      "version": "3.36.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.0.tgz",
-      "integrity": "sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==",
+      "version": "3.41.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
+      "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.22.3"
+        "browserslist": "^4.24.4"
       },
       "funding": {
         "type": "opencollective",
@@ -8180,80 +8555,10 @@
         "pretty-bytes": "^5.3.0"
       }
     },
-    "node_modules/critters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/critters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/critters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/critters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
@@ -8361,9 +8666,9 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "13.16.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.16.1.tgz",
-      "integrity": "sha512-17FtCaz0cx7ssWYKXzGB0Vub8xHwpVPr+iPt2fHhLMDhVAPVrplD+rTQsZUsfb19LVBn5iwkEUFjQ1yVVJXsLA==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.17.0.tgz",
+      "integrity": "sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -8383,102 +8688,41 @@
         "cli-table3": "~0.6.1",
         "commander": "^6.2.1",
         "common-tags": "^1.8.0",
-        "dayjs": "^1.10.4",
-        "debug": "^4.3.4",
-        "enquirer": "^2.3.6",
-        "eventemitter2": "6.4.7",
-        "execa": "4.1.0",
-        "executable": "^4.1.1",
-        "extract-zip": "2.0.1",
-        "figures": "^3.2.0",
-        "fs-extra": "^9.1.0",
-        "getos": "^3.2.1",
-        "is-installed-globally": "~0.4.0",
-        "lazy-ass": "^1.6.0",
-        "listr2": "^3.8.3",
-        "lodash": "^4.17.21",
-        "log-symbols": "^4.0.0",
-        "minimist": "^1.2.8",
-        "ospath": "^1.2.2",
-        "pretty-bytes": "^5.6.0",
-        "process": "^0.11.10",
-        "proxy-from-env": "1.0.0",
-        "request-progress": "^3.0.0",
-        "semver": "^7.5.3",
-        "supports-color": "^8.1.1",
-        "tmp": "~0.2.3",
-        "tree-kill": "1.2.2",
-        "untildify": "^4.0.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "cypress": "bin/cypress"
-      },
-      "engines": {
-        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
-      }
-    },
-    "node_modules/cypress/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/cypress/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/cypress/node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
+        "dayjs": "^1.10.4",
+        "debug": "^4.3.4",
+        "enquirer": "^2.3.6",
+        "eventemitter2": "6.4.7",
+        "execa": "4.1.0",
+        "executable": "^4.1.1",
+        "extract-zip": "2.0.1",
+        "figures": "^3.2.0",
+        "fs-extra": "^9.1.0",
+        "getos": "^3.2.1",
+        "is-installed-globally": "~0.4.0",
+        "lazy-ass": "^1.6.0",
+        "listr2": "^3.8.3",
+        "lodash": "^4.17.21",
+        "log-symbols": "^4.0.0",
+        "minimist": "^1.2.8",
+        "ospath": "^1.2.2",
+        "pretty-bytes": "^5.6.0",
+        "process": "^0.11.10",
+        "proxy-from-env": "1.0.0",
+        "request-progress": "^3.0.0",
+        "semver": "^7.5.3",
+        "supports-color": "^8.1.1",
+        "tmp": "~0.2.3",
+        "tree-kill": "1.2.2",
+        "untildify": "^4.0.0",
+        "yauzl": "^2.10.0"
       },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cypress/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
+      "bin": {
+        "cypress": "bin/cypress"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
       }
     },
-    "node_modules/cypress/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/cypress/node_modules/commander": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
@@ -8488,15 +8732,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/cypress/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cypress/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -8557,16 +8792,17 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.10",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
-      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -8578,9 +8814,9 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
+      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw=="
     },
     "node_modules/deep-equal": {
       "version": "2.2.3",
@@ -8922,9 +9158,9 @@
       }
     },
     "node_modules/domutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
       "dev": true,
       "dependencies": {
         "dom-serializer": "^2.0.0",
@@ -8944,6 +9180,19 @@
         "node": ">=10"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -9034,9 +9283,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.708",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.708.tgz",
-      "integrity": "sha512-iWgEEvREL4GTXXHKohhh33+6Y8XkPI5eHihDmm8zUk5Zo7HICEW+wI/j5kJ2tbuNUCXJ/sNXa03ajW635DiJXA==",
+      "version": "1.5.114",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.114.tgz",
+      "integrity": "sha512-DFptFef3iktoKlFQK/afbo274/XNWD00Am0xa7M8FZUepHlHT8PEuiNBoRfFHbH1okqN58AlhbJ4QTkcnXorjA==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -9095,12 +9344,11 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
-      "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz",
+      "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==",
       "dev": true,
       "dependencies": {
-        "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
         "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
@@ -9116,9 +9364,9 @@
       }
     },
     "node_modules/engine.io-client": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.1.tgz",
-      "integrity": "sha512-aYuoak7I+R83M/BBPIOs2to51BmFIpC1wZe6zZzMrT2llVsHy5cvcmdsJgP2Qz6smHu+sD9oexiSUAVd8OfBPw==",
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz",
+      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
@@ -9127,6 +9375,22 @@
         "xmlhttprequest-ssl": "~2.1.1"
       }
     },
+    "node_modules/engine.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/engine.io-client/node_modules/ws": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
@@ -9148,13 +9412,30 @@
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.2.tgz",
-      "integrity": "sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
       "engines": {
         "node": ">=10.0.0"
       }
     },
+    "node_modules/engine.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/engine.io/node_modules/ws": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
@@ -9177,9 +9458,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "version": "5.18.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -9203,10 +9484,19 @@
       }
     },
     "node_modules/ent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
-      "dev": true
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.2.tgz",
+      "integrity": "sha512-kKvD1tO6BM+oK9HzCPpUdRb4vKFQY/FPTFmurMvh6LlN68VMrdj77w8yp51/kDbpkFOS9J8w5W6zIzgM2H8/hw==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "punycode": "^1.4.1",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/entities": {
       "version": "4.5.0",
@@ -9258,12 +9548,9 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "engines": {
         "node": ">= 0.4"
       }
@@ -9296,11 +9583,37 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
-      "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
       "dev": true
     },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/esbuild": {
       "version": "0.18.17",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz",
@@ -9351,9 +9664,9 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -9371,12 +9684,15 @@
       "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="
     },
     "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/escodegen": {
@@ -9411,16 +9727,17 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -9496,6 +9813,7 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/eslint-plugin-ngrx/-/eslint-plugin-ngrx-2.1.4.tgz",
       "integrity": "sha512-ynPPqguIpeiRPcqmkUBx+cZxzMKpx1W2T3bvraai+KZ+LZnkRouWhnr/9L0buN/Efrk7BkpAFKGy+OojPHo+ug==",
+      "deprecated": "This package is deprecated in favor of the official @ngrx/eslint-plugin.",
       "dev": true,
       "dependencies": {
         "@angular-devkit/schematics": "^13.0.3",
@@ -9613,9 +9931,9 @@
       "dev": true
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz",
-      "integrity": "sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.3.tgz",
+      "integrity": "sha512-qJ+y0FfCp/mQYQ/vWQ3s7eUlFEL4PyKfAJxsnYTJ4YT73nsJBWqmEpFryxV9OeUiqmsTsYJ5Y+KDNaeP31wrRw==",
       "dev": true,
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0",
@@ -9686,21 +10004,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/eslint/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -9717,52 +10020,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -9790,15 +10047,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -9829,18 +10077,6 @@
         "node": "*"
       }
     },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -9884,9 +10120,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -10016,15 +10252,15 @@
       }
     },
     "node_modules/exponential-backoff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
+      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==",
       "dev": true
     },
     "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.8",
@@ -10046,7 +10282,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -10061,6 +10297,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/cookie": {
@@ -10114,6 +10354,21 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/express/node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/express/node_modules/statuses": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -10242,9 +10497,9 @@
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -10286,6 +10541,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/figures/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -10433,15 +10697,15 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "dev": true,
       "funding": [
         {
@@ -10459,20 +10723,26 @@
       }
     },
     "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
       "dev": true,
       "dependencies": {
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -10504,17 +10774,18 @@
       }
     },
     "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "dev": true,
       "dependencies": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
         "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">= 0.12"
+        "node": ">= 6"
       }
     },
     "node_modules/forwarded": {
@@ -10581,18 +10852,18 @@
       }
     },
     "node_modules/fs-minipass/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/fs-monkey": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
-      "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
+      "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==",
       "dev": true
     },
     "node_modules/fs.realpath": {
@@ -10618,6 +10889,7 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
       "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "deprecated": "This package is no longer supported.",
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "inherits": "~2.0.0",
@@ -10632,6 +10904,7 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -10659,6 +10932,7 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
       "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
+      "deprecated": "This package is no longer supported.",
       "dev": true,
       "dependencies": {
         "aproba": "^1.0.3 || ^2.0.0",
@@ -10693,15 +10967,20 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10719,6 +10998,18 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -10756,6 +11047,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -10843,31 +11135,30 @@
       }
     },
     "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
       "dev": true,
       "dependencies": {
-        "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
+        "fast-glob": "^3.3.0",
+        "ignore": "^5.2.4",
         "merge2": "^1.4.1",
-        "slash": "^3.0.0"
+        "slash": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -10956,20 +11247,23 @@
       "dev": true
     },
     "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
@@ -10983,21 +11277,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -11054,9 +11337,9 @@
       "dev": true
     },
     "node_modules/hosted-git-info": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-      "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.3.tgz",
+      "integrity": "sha512-HVJyzUrLIL1c0QmviVh5E8VGyUS7xCFPS6yydaVd1UegW+ibV/CohqTH9MkOLDp5o+rb82DMo77PTuc9F/8GKw==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^7.5.1"
@@ -11213,9 +11496,9 @@
       }
     },
     "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.9.tgz",
+      "integrity": "sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw==",
       "dev": true
     },
     "node_modules/http-proxy": {
@@ -11368,9 +11651,9 @@
       }
     },
     "node_modules/ignore-walk": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.4.tgz",
-      "integrity": "sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz",
+      "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==",
       "dev": true,
       "dependencies": {
         "minimatch": "^9.0.0"
@@ -11380,9 +11663,9 @@
       }
     },
     "node_modules/ignore-walk/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -11413,15 +11696,15 @@
       "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
     },
     "node_modules/immutable": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz",
-      "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
       "dev": true
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
@@ -11471,6 +11754,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -11516,84 +11800,14 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/inquirer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/inquirer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inquirer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11628,12 +11842,12 @@
       }
     },
     "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
+      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11643,12 +11857,13 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11664,11 +11879,14 @@
       "dev": true
     },
     "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -11687,12 +11905,12 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11713,23 +11931,27 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11835,11 +12057,12 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11888,12 +12111,14 @@
       "dev": true
     },
     "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11914,11 +12139,11 @@
       }
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
       "dependencies": {
-        "call-bind": "^1.0.7"
+        "call-bound": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11940,11 +12165,12 @@
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11954,11 +12180,13 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11997,12 +12225,12 @@
       }
     },
     "node_modules/is-weakset": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz",
-      "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4"
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -12115,27 +12343,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
@@ -12173,107 +12380,46 @@
       }
     },
     "node_modules/jackspeak": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
-      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
-      "dev": true,
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
-    "node_modules/jake": {
-      "version": "10.8.7",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
-      "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
-      "dev": true,
-      "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
-        "filelist": "^1.0.4",
-        "minimatch": "^3.1.2"
-      },
-      "bin": {
-        "jake": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jake/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/jake/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jake": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/jake/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jake/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jake/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
     "node_modules/jake/node_modules/minimatch": {
@@ -12288,35 +12434,23 @@
         "node": "*"
       }
     },
-    "node_modules/jake/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jasmine": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-5.5.0.tgz",
-      "integrity": "sha512-JKlEVCVD5QBPYLsg/VE+IUtjyseDCrW8rMBu8la+9ysYashDgavMLM9Kotls1FhI6dCJLJ40dBCIfQjGLPZI1Q==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-5.6.0.tgz",
+      "integrity": "sha512-6frlW22jhgRjtlp68QY/DDVCUfrYqmSxDBWM13mrBzYQGx1XITfVcJltnY15bk8B5cRfN5IpKvemkDiDTSRCsA==",
       "dev": true,
       "dependencies": {
         "glob": "^10.2.2",
-        "jasmine-core": "~5.5.0"
+        "jasmine-core": "~5.6.0"
       },
       "bin": {
         "jasmine": "bin/jasmine.js"
       }
     },
     "node_modules/jasmine-core": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.5.0.tgz",
-      "integrity": "sha512-NHOvoPO6o9gVR6pwqEACTEpbgcH+JJ6QDypyymGbSUIFIFsMMbBJ/xsFNud8MSClfnWclXd7RQlAZBz7yVo5TQ==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.6.0.tgz",
+      "integrity": "sha512-niVlkeYVRwKFpmfWg6suo6H9CrNnydfBLEqefM5UjibYS+UoTjZdmvPJSiuyrRLGnFj1eYRhFd/ch+5hSlsFVA==",
       "dev": true
     },
     "node_modules/jasmine-marbles": {
@@ -12341,31 +12475,29 @@
       }
     },
     "node_modules/jasmine/node_modules/glob": {
-      "version": "10.3.10",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.5",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/jasmine/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -12377,6 +12509,15 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/jasmine/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/javascript-natural-sort": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
@@ -12397,76 +12538,6 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-get-type": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
@@ -12490,15 +12561,6 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -12515,9 +12577,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
-      "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "dev": true,
       "bin": {
         "jiti": "bin/jiti.js"
@@ -12526,8 +12588,7 @@
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "node_modules/js-yaml": {
       "version": "3.14.1",
@@ -12595,14 +12656,15 @@
       }
     },
     "node_modules/jsdom/node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz",
+      "integrity": "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==",
       "dev": true,
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.35"
       },
       "engines": {
         "node": ">= 6"
@@ -12614,6 +12676,39 @@
       "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
+    "node_modules/jsdom/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsdom/node_modules/tough-cookie": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsdom/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -12883,9 +12978,9 @@
       }
     },
     "node_modules/karma-jasmine/node_modules/jasmine-core": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.0.tgz",
-      "integrity": "sha512-O236+gd0ZXS8YAjFx8xKaJ94/erqUliEkJTDedyE7iHvv4ZVqi+q+8acJxu05/WJDKm512EUNn809In37nWlAQ==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.1.tgz",
+      "integrity": "sha512-VYz/BjjmC3klLJlLwA4Kw8ytk0zDSmbbDLNs794VnWmkcCB7I9aAL/D48VNQtmITyPvea2C3jdUMfc3kAoy0PQ==",
       "dev": true
     },
     "node_modules/karma-junit-reporter": {
@@ -13011,9 +13106,9 @@
       }
     },
     "node_modules/launch-editor": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz",
-      "integrity": "sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.10.0.tgz",
+      "integrity": "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==",
       "dev": true,
       "dependencies": {
         "picocolors": "^1.0.0",
@@ -13345,7 +13440,8 @@
     "node_modules/lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
+      "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead."
     },
     "node_modules/lodash.isfunction": {
       "version": "3.0.9",
@@ -13367,121 +13463,51 @@
       "resolved": "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz",
       "integrity": "sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA=="
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
-      "dev": true
-    },
-    "node_modules/lodash.union": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
-    },
-    "node_modules/log-driver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
-      "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.6"
-      }
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
     },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
       "dev": true
     },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/lodash.union": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
+      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
+    },
+    "node_modules/log-driver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
+      "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8.6"
       }
     },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/log-update": {
@@ -13502,39 +13528,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/log-update/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/log-update/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/log-update/node_modules/slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
@@ -13582,6 +13575,18 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "peer": true,
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -13726,6 +13731,7 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
       "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -13830,10 +13836,18 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/mathjs": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-14.0.1.tgz",
-      "integrity": "sha512-yyJgLwC6UXuve724np8tHRMYaTtb5UqiOGQkjwbSXgH8y1C/LcJ0pvdNDZLI2LT7r+iExh2Y5HwfAY+oZFtGIQ==",
+      "version": "14.3.1",
+      "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-14.3.1.tgz",
+      "integrity": "sha512-tgN2/TQXWVHegcl/Yw/Rkd/yhq0CagK5KnWmKUJ2/Cz/2JZoq4K2Ili9B3wZqvxaof7TVNoXbyKmA3CV3P9ZsA==",
       "dependencies": {
         "@babel/runtime": "^7.25.7",
         "complex.js": "^2.2.5",
@@ -13853,9 +13867,9 @@
       }
     },
     "node_modules/mathjs/node_modules/@babel/runtime": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
-      "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz",
+      "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -13935,12 +13949,12 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -14138,9 +14152,9 @@
       "dev": true
     },
     "node_modules/minipass-json-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
-      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz",
+      "integrity": "sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==",
       "dev": true,
       "dependencies": {
         "jsonparse": "^1.3.1",
@@ -14277,9 +14291,9 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
@@ -14301,10 +14315,9 @@
       "dev": true
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "dev": true,
+      "version": "3.3.9",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.9.tgz",
+      "integrity": "sha512-SppoicMGpZvbF1l3z4x7No3OlIjP7QJvC9XR7AhZr1kL133KHnKPztkKDc+Ir4aJ/1VhTySrtKhrsycmrMQfvg==",
       "funding": [
         {
           "type": "github",
@@ -14355,9 +14368,9 @@
       }
     },
     "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -14373,7 +14386,6 @@
       "version": "16.1.0",
       "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-16.1.0.tgz",
       "integrity": "sha512-FrzMjsGCHZCd2sEucigMaGyzImBL0l6gwWn6jmLBhcNVx0D7P8Yvtgk9aUptlqBrVKy4c2upglSa3Ogv3679bw==",
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -14473,9 +14485,9 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz",
-      "integrity": "sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==",
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
       "dev": true,
       "bin": {
         "node-gyp-build": "bin.js",
@@ -14484,9 +14496,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
       "dev": true
     },
     "node_modules/nopt": {
@@ -14537,9 +14549,9 @@
       }
     },
     "node_modules/npm-bundled": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz",
-      "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz",
+      "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==",
       "dev": true,
       "dependencies": {
         "npm-normalize-package-bin": "^3.0.0"
@@ -14688,9 +14700,9 @@
       }
     },
     "node_modules/npm-registry-fetch/node_modules/minipass-fetch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz",
-      "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
+      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
       "dev": true,
       "dependencies": {
         "minipass": "^7.0.3",
@@ -14705,9 +14717,9 @@
       }
     },
     "node_modules/npm-registry-fetch/node_modules/minipass-fetch/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -14729,6 +14741,7 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
       "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+      "deprecated": "This package is no longer supported.",
       "dev": true,
       "dependencies": {
         "are-we-there-yet": "^3.0.0",
@@ -14753,9 +14766,9 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
+      "version": "2.2.18",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.18.tgz",
+      "integrity": "sha512-p1TRH/edngVEHVbwqWnxUViEmq5znDvyB+Sik5cmuLpGOIfDf/39zLiq3swPF8Vakqn+gvNiOQAZu8djYlQILA==",
       "dev": true
     },
     "node_modules/nx": {
@@ -14828,21 +14841,6 @@
         }
       }
     },
-    "node_modules/nx/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/nx/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -14859,40 +14857,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/nx/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/nx/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/nx/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/nx/node_modules/enquirer": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
@@ -14922,9 +14886,9 @@
       }
     },
     "node_modules/nx/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
+      "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -14939,6 +14903,7 @@
       "version": "7.1.4",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
       "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -14952,15 +14917,6 @@
         "node": "*"
       }
     },
-    "node_modules/nx/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/nx/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -15012,18 +14968,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/nx/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/nx/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -15049,9 +14993,12 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -15089,13 +15036,15 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -15173,113 +15122,43 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-      "dev": true,
-      "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ora/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/ora/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/ora": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/os-tmpdir": {
@@ -15373,6 +15252,12 @@
         "node": ">=6"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true
+    },
     "node_modules/pacote": {
       "version": "15.2.0",
       "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz",
@@ -15456,12 +15341,12 @@
       }
     },
     "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
       "devOptional": true,
       "dependencies": {
-        "entities": "^4.4.0"
+        "entities": "^4.5.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
@@ -15535,34 +15420,31 @@
       "dev": true
     },
     "node_modules/path-scurry": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
-      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^9.1.1 || ^10.0.0",
+        "lru-cache": "^10.2.0",
         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
-      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
-      "dev": true,
-      "engines": {
-        "node": "14 || >=16.14"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
       "dev": true
     },
     "node_modules/path-type": {
@@ -15587,9 +15469,9 @@
       "dev": true
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "dev": true
     },
     "node_modules/picomatch": {
@@ -15713,9 +15595,9 @@
       }
     },
     "node_modules/pkg-dir/node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.0.tgz",
+      "integrity": "sha512-KHBC7z61OJeaMGnF3wqNZj+GGNXOyypZviiKpQeiHirG5Ib1ImwcLBH70rbMSkKfSmUNBsdf2PwaEJtKvgmkNw==",
       "dev": true,
       "engines": {
         "node": ">=12.20"
@@ -15725,9 +15607,9 @@
       }
     },
     "node_modules/possible-typed-array-names": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
-      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
       "engines": {
         "node": ">= 0.4"
       }
@@ -15783,9 +15665,9 @@
       }
     },
     "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
       "dev": true,
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -15795,13 +15677,13 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz",
-      "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
+        "postcss-selector-parser": "^7.0.0",
         "postcss-value-parser": "^4.1.0"
       },
       "engines": {
@@ -15812,12 +15694,12 @@
       }
     },
     "node_modules/postcss-modules-scope": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz",
-      "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
       "dev": true,
       "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
+        "postcss-selector-parser": "^7.0.0"
       },
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -15842,9 +15724,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.16",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
-      "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -15870,9 +15752,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
-      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
+      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -16012,29 +15894,42 @@
       "optional": true
     },
     "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
       "dev": true,
       "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
       }
     },
-    "node_modules/punycode": {
+    "node_modules/psl/node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/pump": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+      "dev": true
+    },
     "node_modules/qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
@@ -16045,12 +15940,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
       "dev": true,
       "dependencies": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -16118,6 +16013,18 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/react": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "peer": true,
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -16128,6 +16035,7 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz",
       "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==",
+      "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.",
       "dev": true,
       "dependencies": {
         "glob": "^10.2.2",
@@ -16153,49 +16061,47 @@
       }
     },
     "node_modules/read-package-json-fast/node_modules/json-parse-even-better-errors": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz",
-      "integrity": "sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
+      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
       "dev": true,
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/read-package-json/node_modules/glob": {
-      "version": "10.3.10",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.5",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/read-package-json/node_modules/json-parse-even-better-errors": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz",
-      "integrity": "sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
+      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
       "dev": true,
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/read-package-json/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -16207,6 +16113,15 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/read-package-json/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -16253,9 +16168,9 @@
       "dev": true
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+      "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
       "dev": true,
       "dependencies": {
         "regenerate": "^1.4.2"
@@ -16280,20 +16195,22 @@
       }
     },
     "node_modules/regex-parser": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
-      "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.1.tgz",
+      "integrity": "sha512-yXLRqatcCuKtVHsWrNg0JL3l1zGfdXeEvDa0bdu4tCDQw0RpMDZsqbkyRTUnKMR0tXF627V2oEWjBEaEdqTwtQ==",
       "dev": true
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16303,15 +16220,15 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+      "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
       "dev": true,
       "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
+        "regenerate-unicode-properties": "^10.2.0",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.12.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -16319,25 +16236,34 @@
         "node": ">=4"
       }
     },
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
+      "dev": true
+    },
     "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+      "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
       "dev": true,
       "dependencies": {
-        "jsesc": "~0.5.0"
+        "jsesc": "~3.0.2"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
     "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
       "dev": true,
       "bin": {
         "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/request": {
@@ -16381,6 +16307,20 @@
         "throttleit": "^1.0.0"
       }
     },
+    "node_modules/request/node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
     "node_modules/request/node_modules/http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -16411,6 +16351,15 @@
         "node": ">=0.6.0"
       }
     },
+    "node_modules/request/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/request/node_modules/qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
@@ -16554,9 +16503,9 @@
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "dev": true,
       "engines": {
         "iojs": ">=1.0.0",
@@ -16564,15 +16513,16 @@
       }
     },
     "node_modules/rfdc": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz",
-      "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "dev": true
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -16632,9 +16582,9 @@
       }
     },
     "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -16658,6 +16608,22 @@
         }
       ]
     },
+    "node_modules/safe-regex-test": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -16724,9 +16690,9 @@
       }
     },
     "node_modules/sax": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
-      "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
       "dev": true,
       "optional": true
     },
@@ -16742,9 +16708,9 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
@@ -16753,7 +16719,7 @@
         "ajv-keywords": "^5.1.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16868,12 +16834,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
     "node_modules/send/node_modules/statuses": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -17066,37 +17026,85 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+      "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/shortid": {
-      "version": "2.2.16",
-      "resolved": "https://registry.npmjs.org/shortid/-/shortid-2.2.16.tgz",
-      "integrity": "sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+      "version": "2.2.17",
+      "resolved": "https://registry.npmjs.org/shortid/-/shortid-2.2.17.tgz",
+      "integrity": "sha512-GpbM3gLF1UUXZvQw6MCyulHkWbRseNO4cyBEZresZRorwl1+SLu1ZdqgVtuwqz8mB6RpwPkm541mYSqrKyJSaA==",
       "dependencies": {
-        "nanoid": "^2.1.0"
+        "nanoid": "^3.3.8"
       }
     },
-    "node_modules/shortid/node_modules/nanoid": {
-      "version": "2.1.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz",
-      "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="
-    },
     "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dependencies": {
-        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17189,9 +17197,9 @@
       }
     },
     "node_modules/sigstore/node_modules/minipass-fetch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz",
-      "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
+      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
       "dev": true,
       "dependencies": {
         "minipass": "^7.0.3",
@@ -17206,23 +17214,23 @@
       }
     },
     "node_modules/sigstore/node_modules/minipass-fetch/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/simple-git": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.23.0.tgz",
-      "integrity": "sha512-P9ggTW8vb/21CAL/AmnACAhqBDfnqSSZVpV7WuFtsFR9HLunf5IqQvk+OXAQTfkcZep8pKnt3DV3o7w3TegEkQ==",
+      "version": "3.27.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.27.0.tgz",
+      "integrity": "sha512-ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA==",
       "dev": true,
       "dependencies": {
         "@kwsites/file-exists": "^1.1.1",
         "@kwsites/promise-deferred": "^1.1.1",
-        "debug": "^4.3.4"
+        "debug": "^4.3.5"
       },
       "funding": {
         "type": "github",
@@ -17230,12 +17238,15 @@
       }
     },
     "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/slice-ansi": {
@@ -17252,39 +17263,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@@ -17323,6 +17301,23 @@
         "ws": "~8.17.1"
       }
     },
+    "node_modules/socket.io-adapter/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/socket.io-adapter/node_modules/ws": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
@@ -17358,6 +17353,22 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/socket.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/socket.io-parser": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
@@ -17370,6 +17381,39 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/socket.io-parser/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/sockjs": {
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
@@ -17382,9 +17426,9 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.1.tgz",
-      "integrity": "sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
+      "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
       "dev": true,
       "dependencies": {
         "ip-address": "^9.0.5",
@@ -17419,9 +17463,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.1.0.tgz",
-      "integrity": "sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -17513,9 +17557,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
-      "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
+      "version": "3.0.21",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
+      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
       "dev": true
     },
     "node_modules/spdy": {
@@ -17586,9 +17630,9 @@
       "dev": true
     },
     "node_modules/ssri": {
-      "version": "10.0.5",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz",
-      "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==",
+      "version": "10.0.6",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
+      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
       "dev": true,
       "dependencies": {
         "minipass": "^7.0.3"
@@ -17598,9 +17642,9 @@
       }
     },
     "node_modules/ssri/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -17616,11 +17660,12 @@
       }
     },
     "node_modules/stop-iteration-iterator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
       "dependencies": {
-        "internal-slot": "^1.0.4"
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17782,15 +17827,15 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -17821,9 +17866,9 @@
       "dev": true
     },
     "node_modules/synckit": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
-      "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==",
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz",
+      "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==",
       "dev": true,
       "dependencies": {
         "@pkgr/core": "^0.1.0",
@@ -17846,9 +17891,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
       "dev": true,
       "dependencies": {
         "chownr": "^2.0.0",
@@ -17938,16 +17983,16 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "version": "5.3.14",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
+      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.20",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.26.0"
+        "schema-utils": "^4.3.0",
+        "serialize-javascript": "^6.0.2",
+        "terser": "^5.31.1"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -17971,65 +18016,16 @@
         }
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/terser-webpack-plugin/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
-    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/terser-webpack-plugin/node_modules/terser": {
-      "version": "5.29.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.2.tgz",
-      "integrity": "sha512-ZiGkhUBIM+7LwkNjXYJq8svgkd+QK3UUr0wJqY4MieaezBSAIPgbSPZyIx0idM6XWK5CMzSWa8MJIzmRcB8Caw==",
+      "version": "5.39.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
+      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -18119,21 +18115,21 @@
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
     "node_modules/tldts": {
-      "version": "6.1.60",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.60.tgz",
-      "integrity": "sha512-TYVHm7G9NCnhgqOsFalbX6MG1Po5F4efF+tLfoeiOGQq48Oqgwcgz8upY2R1BHWa4aDrj28RYx0dkYJ63qCFMg==",
+      "version": "6.1.84",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.84.tgz",
+      "integrity": "sha512-aRGIbCIF3teodtUFAYSdQONVmDRy21REM3o6JnqWn5ZkQBJJ4gHxhw6OfwQ+WkSAi3ASamrS4N4nyazWx6uTYg==",
       "dev": true,
       "dependencies": {
-        "tldts-core": "^6.1.60"
+        "tldts-core": "^6.1.84"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "6.1.60",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.60.tgz",
-      "integrity": "sha512-XHjoxak8SFQnHnmYHb3PcnW5TZ+9ErLZemZei3azuIRhQLw4IExsVbL3VZJdHcLeNaXq6NqawgpDPpjBOg4B5g==",
+      "version": "6.1.84",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.84.tgz",
+      "integrity": "sha512-NaQa1W76W2aCGjXybvnMYzGSM4x8fvG2AN/pla7qxcg0ZHbooOPhA8kctmOZUDfZyhDL27OGNbwAeig8P4p1vg==",
       "dev": true
     },
     "node_modules/tmp": {
@@ -18147,15 +18143,6 @@
         "node": ">=8.17.0"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -18178,27 +18165,15 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
       "dev": true,
       "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
+        "tldts": "^6.1.32"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
+        "node": ">=16"
       }
     },
     "node_modules/tr46": {
@@ -18213,6 +18188,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/tr46/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
@@ -18231,9 +18215,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
+      "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
       "dev": true,
       "engines": {
         "node": ">=16"
@@ -18286,10 +18270,13 @@
       }
     },
     "node_modules/ts-node/node_modules/acorn-walk": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
-      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "dev": true,
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
       "engines": {
         "node": ">=0.4.0"
       }
@@ -18425,9 +18412,9 @@
       }
     },
     "node_modules/tuf-js/node_modules/minipass-fetch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz",
-      "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
+      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
       "dev": true,
       "dependencies": {
         "minipass": "^7.0.3",
@@ -18442,9 +18429,9 @@
       }
     },
     "node_modules/tuf-js/node_modules/minipass-fetch/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -18533,9 +18520,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "0.7.37",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.37.tgz",
-      "integrity": "sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==",
+      "version": "0.7.40",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.40.tgz",
+      "integrity": "sha512-us1E3K+3jJppDBa3Tl0L3MOJiGhe1C6P0+nIvQAFYbxlMAx0h81eOwLmU57xgqToduDDPx3y5QsdjPfDu+FgOQ==",
       "dev": true,
       "funding": [
         {
@@ -18551,6 +18538,9 @@
           "url": "https://github.com/sponsors/faisalman"
         }
       ],
+      "bin": {
+        "ua-parser-js": "script/cli.js"
+      },
       "engines": {
         "node": "*"
       }
@@ -18559,13 +18549,12 @@
       "version": "6.20.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
       "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -18585,9 +18574,9 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+      "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -18708,9 +18697,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "dev": true,
       "funding": [
         {
@@ -18727,8 +18716,8 @@
         }
       ],
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -18745,6 +18734,14 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/uri-js/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -18800,13 +18797,10 @@
       }
     },
     "node_modules/validate-npm-package-name": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-      "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+      "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
       "dev": true,
-      "dependencies": {
-        "builtins": "^5.0.0"
-      },
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
@@ -18921,9 +18915,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
-      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
       "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -19117,9 +19111,9 @@
       }
     },
     "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
@@ -19319,15 +19313,18 @@
       }
     },
     "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -19351,14 +19348,16 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
+      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
         "has-tostringtag": "^1.0.2"
       },
       "engines": {
@@ -19383,6 +19382,15 @@
       "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
       "dev": true
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -19418,72 +19426,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -19539,9 +19481,9 @@
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
     "node_modules/xmlhttprequest-ssl": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.1.tgz",
-      "integrity": "sha512-ptjR8YSJIXoA3Mbv5po7RtSYHO6mZr8s7i5VGmEk7QY2pQWyT1o0N+W1gKbOyJPUCGXGnuw0wqe8f0L6Y0ny7g==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz",
+      "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==",
       "engines": {
         "node": ">=0.4.0"
       }
diff --git a/package.json b/package.json
index 6404306d19..6d281d0b33 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,8 @@
     "@angular/service-worker": "^16",
     "@jsonforms/angular": "3.2.*",
     "@jsonforms/angular-material": "3.2.*",
+    "@jsonforms/core": "^3.2.*",
+    "@jsonforms/react": "3.2.*",
     "@ngbracket/ngx-layout": "^16.0.0",
     "@ngrx/effects": "^16",
     "@ngrx/router-store": "^16",
diff --git a/src/app/datasets/empiar/empiar.component.html b/src/app/datasets/empiar/empiar.component.html
index 324996c2b5..c5463fc210 100644
--- a/src/app/datasets/empiar/empiar.component.html
+++ b/src/app/datasets/empiar/empiar.component.html
@@ -50,6 +50,8 @@
         <jsonforms
           [data]="data"
           [schema]="schema"
+          [uischema]="uischema"
+          [renderers]="configuredRenderer"
          ></jsonforms>
       </mat-card>
     </div>
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index b881795dcc..437239c9b9 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -5,8 +5,8 @@ import {
   OnDestroy,
   OnInit,
 } from "@angular/core";
-import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
 import { JsonSchema } from "@jsonforms/core";
+import { angularMaterialRenderers } from "@jsonforms/angular-material";
 import { AppConfigService, AppConfig } from "app-config.service";
 import { Store, select } from "@ngrx/store";
 import {
@@ -20,6 +20,9 @@ import * as fromActions from "state-management/actions/depositor.actions";
 import { Subscription, Observable } from "rxjs";
 import * as datasetActions from "state-management/actions/datasets.actions";
 import { FormGroup, FormBuilder } from "@angular/forms";
+import { releaseDateRendererEntry } from "./renderer";
+import uischemaAsset from "./questionnaureUI.json";
+
 
 @Component({
   selector: "app-empiar",
@@ -37,6 +40,13 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   empiarSchema: string;
   data: JsonSchema = createEmptyInstance();
   schema: JsonSchema;
+  materialRenderers = angularMaterialRenderers; 
+  uischema = uischemaAsset;
+  configuredRenderer = [
+    releaseDateRendererEntry,
+  ...angularMaterialRenderers,
+];
+
 
   constructor(
     public appConfigService: AppConfigService,
@@ -76,6 +86,7 @@ export class EmpiarComponent implements OnInit, OnDestroy {
 
     const decodedSchema = atob(this.empiarSchema);
     this.schema = JSON.parse(decodedSchema);
+    this.data = { ...this.data };
   }
 
   ngOnDestroy() {
diff --git a/src/app/datasets/empiar/questionnaureUI.json b/src/app/datasets/empiar/questionnaureUI.json
new file mode 100644
index 0000000000..f42b8932be
--- /dev/null
+++ b/src/app/datasets/empiar/questionnaureUI.json
@@ -0,0 +1,39 @@
+{
+  "type": "VerticalLayout",
+  "elements": [
+    {
+      "type":"Group", 
+      "label":"General Information",
+      "elements":[
+        {
+          "type": "Control",
+          "scope": "#/properties/title"
+        },
+        {
+          "type": "Control",
+          "scope": "#/properties/release_date"
+        },
+        {
+          "type": "Control",
+          "scope": "#/properties/experiment_type"
+        },
+        {
+          "type": "Control",
+          "scope": "#/properties/scale"
+        }, 
+
+        {
+          "type":"HorizontalLayout",
+          "label":"EMD-refernce",
+          "elements":[
+            {
+              "type":"Control",
+              "scope":"#/properties/cross_references/name"}
+          ]
+
+          
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/app/datasets/empiar/renderer.ts b/src/app/datasets/empiar/renderer.ts
new file mode 100644
index 0000000000..933a01fd5f
--- /dev/null
+++ b/src/app/datasets/empiar/renderer.ts
@@ -0,0 +1,25 @@
+import { JsonFormsControl } from "@jsonforms/angular";
+import {
+  JsonFormsRendererRegistryEntry,
+  rankWith,
+  isAnyOfControl,
+  scopeEndsWith,
+} from "@jsonforms/core";
+
+export class ReleaseDateRenderer extends JsonFormsControl {
+  options = [
+    { value: "RE", label: "Release after submission" },
+    { value: "EP", label: "Release after EMDB entry" },
+    { value: "HP", label: "Release after citation" },
+    { value: "HO", label: "Delay by one year" },
+  ];
+
+  onChange(value: any) {
+    this.onChange({ data: value });
+  }
+}
+
+export const releaseDateRendererEntry: JsonFormsRendererRegistryEntry = {
+  tester: rankWith(4, scopeEndsWith("release_date")),
+  renderer: ReleaseDateRenderer,
+};

From 635e980a56d7ec3439a93b71e176555850581130 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 11 Mar 2025 17:22:06 +0000
Subject: [PATCH 134/245] template is ready but needs proper renderring

---
 .../empiar/customRenderers/rendererEMDB.ts    |  50 +++++++++
 .../rendererRelease.ts}                       |   1 -
 src/app/datasets/empiar/depositionEMPIAR.ts   |   2 +
 src/app/datasets/empiar/empiar.component.html |  52 ++++++++-
 src/app/datasets/empiar/empiar.component.scss |  37 +++++++
 src/app/datasets/empiar/empiar.component.ts   |  49 ++++++---
 src/app/datasets/empiar/questionnaureUI.json  |  39 -------
 .../empiar/schemasUI/authorInfoUI.json        |  85 +++++++++++++++
 .../empiar/schemasUI/generalQuestionUI.json   | 103 ++++++++++++++++++
 .../empiar/schemasUI/imageSetsUI.json         |  74 +++++++++++++
 tsconfig.json                                 |   2 +-
 11 files changed, 434 insertions(+), 60 deletions(-)
 create mode 100644 src/app/datasets/empiar/customRenderers/rendererEMDB.ts
 rename src/app/datasets/empiar/{renderer.ts => customRenderers/rendererRelease.ts} (97%)
 create mode 100644 src/app/datasets/empiar/depositionEMPIAR.ts
 delete mode 100644 src/app/datasets/empiar/questionnaureUI.json
 create mode 100644 src/app/datasets/empiar/schemasUI/authorInfoUI.json
 create mode 100644 src/app/datasets/empiar/schemasUI/generalQuestionUI.json
 create mode 100644 src/app/datasets/empiar/schemasUI/imageSetsUI.json

diff --git a/src/app/datasets/empiar/customRenderers/rendererEMDB.ts b/src/app/datasets/empiar/customRenderers/rendererEMDB.ts
new file mode 100644
index 0000000000..ef98bf603a
--- /dev/null
+++ b/src/app/datasets/empiar/customRenderers/rendererEMDB.ts
@@ -0,0 +1,50 @@
+import { Component } from "@angular/core";
+import {
+  JsonFormsRendererRegistryEntry,
+  rankWith,
+  scopeEndsWith,
+} from "@jsonforms/core";
+import { FormsModule } from "@angular/forms"; // Import FormsModule here
+import { NgFor, NgIf } from "@angular/common";
+
+@Component({
+  selector: "app-cross-ref-component",
+  standalone: true,
+  imports: [FormsModule, NgIf, NgFor], // Ensure FormsModule is available in the standalone component
+  template: `
+    <div>
+      <p>EMDB reference</p>
+      <div *ngFor="let ref of data; let i = index">
+        <label for="name-{{ i }}">Reference {{ i + 1 }} </label>
+        <input
+          type="text"
+          id="name-{{ i }}"
+          [(ngModel)]="ref.name"
+          [placeholder]="'EMD-XXXX'"
+          [pattern]="pattern"
+          [attr.title]="title"
+        />
+        <div *ngIf="!isValid(i)" style="color: red;">
+          Invalid reference name
+        </div>
+      </div>
+    </div>
+  `,
+})
+export class CrossRefComponent {
+  pattern = "^(EMD)-[0-9]{4,}$";
+  title = "The Name Schema";
+
+  data = [{ name: "EMD-8001" }, { name: "EMD-8002" }];
+
+  isValid(index: number): boolean {
+    const ref = this.data[index];
+    const regex = new RegExp(this.pattern);
+    return regex.test(ref?.name);
+  }
+}
+
+export const emdbRefRendererEntry: JsonFormsRendererRegistryEntry = {
+  tester: rankWith(10, scopeEndsWith("cross_references")),
+  renderer: CrossRefComponent,
+};
diff --git a/src/app/datasets/empiar/renderer.ts b/src/app/datasets/empiar/customRenderers/rendererRelease.ts
similarity index 97%
rename from src/app/datasets/empiar/renderer.ts
rename to src/app/datasets/empiar/customRenderers/rendererRelease.ts
index 933a01fd5f..84354ec370 100644
--- a/src/app/datasets/empiar/renderer.ts
+++ b/src/app/datasets/empiar/customRenderers/rendererRelease.ts
@@ -2,7 +2,6 @@ import { JsonFormsControl } from "@jsonforms/angular";
 import {
   JsonFormsRendererRegistryEntry,
   rankWith,
-  isAnyOfControl,
   scopeEndsWith,
 } from "@jsonforms/core";
 
diff --git a/src/app/datasets/empiar/depositionEMPIAR.ts b/src/app/datasets/empiar/depositionEMPIAR.ts
new file mode 100644
index 0000000000..cb8e1d89bb
--- /dev/null
+++ b/src/app/datasets/empiar/depositionEMPIAR.ts
@@ -0,0 +1,2 @@
+export interface EmpiarJson {
+}
\ No newline at end of file
diff --git a/src/app/datasets/empiar/empiar.component.html b/src/app/datasets/empiar/empiar.component.html
index c5463fc210..f70306595b 100644
--- a/src/app/datasets/empiar/empiar.component.html
+++ b/src/app/datasets/empiar/empiar.component.html
@@ -47,13 +47,63 @@
         </mat-card-content>
       </mat-card>
       <mat-card>
+        <mat-card-header class="creator-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> assignment </mat-icon>
+          </div>
+          EMPIAR deposition Information
+        </mat-card-header>
+        <jsonforms
+          [data]="data"
+          [schema]="schema"
+          [uischema]="generalSchema"
+          [renderers]="configuredRenderer"
+          (dataChange)="onDataChange($event)"
+         ></jsonforms>
+      </mat-card>
+
+      <!-- Imagesets card -->
+
+      <mat-card>
+        <mat-card-header class="file-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> assignment </mat-icon>
+          </div>
+          Image sets
+        </mat-card-header>
+        <jsonforms
+          [data]="data"
+          [schema]="schema"
+          [uischema]="imageSets"
+          [renderers]="configuredRenderer"
+          (dataChange)="onDataChange($event)"
+         ></jsonforms>
+      </mat-card>
+
+      <!-- Authors card -->
+
+      <mat-card>
+        <mat-card-header class="file-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> assignment </mat-icon>
+          </div>
+          Author Information
+        </mat-card-header>
         <jsonforms
           [data]="data"
           [schema]="schema"
-          [uischema]="uischema"
+          [uischema]="schemaPI"
           [renderers]="configuredRenderer"
+          (dataChange)="onDataChange($event)"
          ></jsonforms>
       </mat-card>
+
+
+      <div class="button-container">
+        <button class="submitDep" mat-raised-button color="primary" (click)="onSubmitClick()">
+          Next
+        </button>
+      </div>
     </div>
   </div>
 </ng-template>
\ No newline at end of file
diff --git a/src/app/datasets/empiar/empiar.component.scss b/src/app/datasets/empiar/empiar.component.scss
index e69de29bb2..0fb6fd130e 100644
--- a/src/app/datasets/empiar/empiar.component.scss
+++ b/src/app/datasets/empiar/empiar.component.scss
@@ -0,0 +1,37 @@
+mat-card {
+  margin: 1em;
+  .section-icon {
+    height: auto !important;
+    width: auto !important;
+
+    mat-icon {
+      vertical-align: middle;
+    }
+  }
+
+  .card-container {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    gap: 16px;
+    padding: 8px 16px 8px;
+  }
+}
+
+.button-container {
+  display: flex;       
+  align-items: flex-start; 
+  gap: 20px; 
+  margin-top: 16px;
+
+  .button-wrapper {
+    display: flex;
+    flex-direction: column;
+  }
+}
+.submitDep {
+  width: 300px;  
+  flex-direction: column;
+  background-color: #B3D9AC;
+  color:black;
+}
\ No newline at end of file
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index 437239c9b9..27325eda13 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -20,9 +20,11 @@ import * as fromActions from "state-management/actions/depositor.actions";
 import { Subscription, Observable } from "rxjs";
 import * as datasetActions from "state-management/actions/datasets.actions";
 import { FormGroup, FormBuilder } from "@angular/forms";
-import { releaseDateRendererEntry } from "./renderer";
-import uischemaAsset from "./questionnaureUI.json";
-
+import { releaseDateRendererEntry } from "./customRenderers/rendererRelease";
+import { emdbRefRendererEntry } from "./customRenderers/rendererEMDB";
+import generalSchemaAsset from "./schemasUI/generalQuestionUI.json";
+import imageSetsAssets from "./schemasUI/imageSetsUI.json";
+import piAsset from "./schemasUI/authorInfoUI.json";
 
 @Component({
   selector: "app-empiar",
@@ -40,13 +42,15 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   empiarSchema: string;
   data: JsonSchema = createEmptyInstance();
   schema: JsonSchema;
-  materialRenderers = angularMaterialRenderers; 
-  uischema = uischemaAsset;
+  // materialRenderers = angularMaterialRenderers;
+  generalSchema = generalSchemaAsset;
+  imageSets = imageSetsAssets;
+  schemaPI = piAsset;
   configuredRenderer = [
-    releaseDateRendererEntry,
-  ...angularMaterialRenderers,
-];
-
+    // releaseDateRendererEntry,
+    // emdbRefRendererEntry,
+    ...angularMaterialRenderers,
+  ];
 
   constructor(
     public appConfigService: AppConfigService,
@@ -63,7 +67,6 @@ export class EmpiarComponent implements OnInit, OnDestroy {
     // initialize an array for the files to be uploaded
     const pid = history.state.pid;
     this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
-
     this.store.select(selectCurrentDataset).subscribe((dataset) => {
       this.dataset = dataset;
     });
@@ -75,17 +78,20 @@ export class EmpiarComponent implements OnInit, OnDestroy {
         }
       }),
     );
-    //  connect to the depositor in the previous step
-    // this.store.dispatch(fromActions.connectToDepositor());
-
     this.store.dispatch(fromActions.accessEmpiarSchema());
     this.empiarSchema$ = this.store.pipe(select(selectEmpiarSchema));
+
     this.empiarSchema$.subscribe((schema) => {
-      this.empiarSchema = schema;
+      if (schema) {
+        this.empiarSchema = schema;
+        try {
+          const decodedSchema = atob(this.empiarSchema);
+          this.schema = JSON.parse(decodedSchema);
+        } catch (error) {
+          console.error("Failed to decode schema:", error);
+        }
+      }
     });
-
-    const decodedSchema = atob(this.empiarSchema);
-    this.schema = JSON.parse(decodedSchema);
     this.data = { ...this.data };
   }
 
@@ -94,6 +100,13 @@ export class EmpiarComponent implements OnInit, OnDestroy {
       subscription.unsubscribe();
     });
   }
+  onDataChange(event: any) {
+    this.data = event;
+  }
+
+  onSubmitClick() {
+    console.log(this.data);
+  }
 }
 
 function createEmptyInstance() {
@@ -103,7 +116,7 @@ function createEmptyInstance() {
     release_date: "",
     experiment_type: 0,
     scale: "",
-    cross_references: [],
+    cross_references: [{ name: "" }],
     workflows: [],
     authors: [],
     corresponding_author: {
diff --git a/src/app/datasets/empiar/questionnaureUI.json b/src/app/datasets/empiar/questionnaureUI.json
deleted file mode 100644
index f42b8932be..0000000000
--- a/src/app/datasets/empiar/questionnaureUI.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "type": "VerticalLayout",
-  "elements": [
-    {
-      "type":"Group", 
-      "label":"General Information",
-      "elements":[
-        {
-          "type": "Control",
-          "scope": "#/properties/title"
-        },
-        {
-          "type": "Control",
-          "scope": "#/properties/release_date"
-        },
-        {
-          "type": "Control",
-          "scope": "#/properties/experiment_type"
-        },
-        {
-          "type": "Control",
-          "scope": "#/properties/scale"
-        }, 
-
-        {
-          "type":"HorizontalLayout",
-          "label":"EMD-refernce",
-          "elements":[
-            {
-              "type":"Control",
-              "scope":"#/properties/cross_references/name"}
-          ]
-
-          
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/app/datasets/empiar/schemasUI/authorInfoUI.json b/src/app/datasets/empiar/schemasUI/authorInfoUI.json
new file mode 100644
index 0000000000..1dd2783b6c
--- /dev/null
+++ b/src/app/datasets/empiar/schemasUI/authorInfoUI.json
@@ -0,0 +1,85 @@
+{
+  "type": "Group",
+  "elements": [
+    {
+      "type": "Control",
+      "label": "Principal Investigators",
+      "scope": "#/properties/principal_investigator",
+      "options": {
+        "elementLabelProp": "last_name",
+        "showSortButtons": true,
+        "detail": {
+          "type": "VerticalLayout",
+          "elements": [
+            {
+              "type": "Control",
+              "label": "ORCID",
+              "scope": "#/properties/author_orcid",
+              "description": "ORCID identifier of the author (format: 0000-0000-0000-000X)"
+            },
+            {
+              "type": "Control",
+              "label": "First Name",
+              "scope": "#/properties/first_name"
+            },
+            {
+              "type": "Control",
+              "label": "Middle Name",
+              "scope": "#/properties/middle_name"
+            },
+            {
+              "type": "Control",
+              "label": "Last Name",
+              "scope": "#/properties/last_name"
+            },
+            {
+              "type": "Control",
+              "label": "Organization",
+              "scope": "#/properties/organization"
+            },
+            {
+              "type": "Control",
+              "label": "Street",
+              "scope": "#/properties/street"
+            },
+            {
+              "type": "Control",
+              "label": "Town/City",
+              "scope": "#/properties/town_or_city"
+            },
+            {
+              "type": "Control",
+              "label": "State/Province",
+              "scope": "#/properties/state_or_province"
+            },
+            {
+              "type": "Control",
+              "label": "Postal/ZIP Code",
+              "scope": "#/properties/post_or_zip"
+            },
+            {
+              "type": "Control",
+              "label": "Telephone",
+              "scope": "#/properties/telephone"
+            },
+            {
+              "type": "Control",
+              "label": "Fax",
+              "scope": "#/properties/fax"
+            },
+            {
+              "type": "Control",
+              "label": "Email",
+              "scope": "#/properties/email"
+            },
+            {
+              "type": "Control",
+              "label": "Country",
+              "scope": "#/properties/country"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
new file mode 100644
index 0000000000..328018a677
--- /dev/null
+++ b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
@@ -0,0 +1,103 @@
+{
+  "type": "VerticalLayout",
+  "elements": [
+    {
+      "type":"Group", 
+      "elements":[
+        {
+          "type": "Control",
+          "label": "Title",
+          "scope": "#/properties/title",
+          "options":{
+            "multi":true
+          }
+        },
+        {
+          "type": "Control",
+          "label": "Release Date",
+          "scope": "#/properties/release_date",
+          "options": {
+            "format": "radio"
+          }
+        },
+        {
+          "type": "Control",
+          "label": "Experiment Type",
+          "scope": "#/properties/experiment_type",
+          "options": {
+            "format": "select"
+          }
+        },
+        {
+          "type": "Control",
+          "label":"Scope",
+          "scope": "#/properties/scale",
+          "options": {
+            "format": "select"
+          }
+        }, 
+        {
+          "type": "Group",
+          "elements": [
+            {
+              "type": "Label",
+              "text": "EMDB References"
+            },
+            {
+              "type": "Control",
+              "scope": "#/properties/cross_references",
+              "options": {
+                "elementLabelProp": "name"
+              }
+            },
+            {
+              "type": "Label",
+              "text": "BioStudies References"
+            },
+            {
+              "type": "Control",
+              "scope": "#/properties/biostudies_references",
+              "options": {
+                "elementLabelProp": "name"
+              }
+            },
+            {
+              "type": "Label",
+              "text": "IDR References"
+            },
+            {
+              "type": "Control",
+              "scope": "#/properties/idr_references",
+              "options": {
+                "elementLabelProp": "name"
+              }
+            },
+            {
+              "type": "Label",
+              "text": "EMPIAR References"
+            },
+            {
+              "type": "Control",
+              "scope": "#/properties/empiar_references",
+              "options": {
+                "elementLabelProp": "name"
+              }
+            },
+            {
+              "type": "Label",
+              "text": "Workflows"
+            },
+            {
+              "type": "Control",
+              "label": "Workflows",
+              "scope": "#/properties/workflows",
+              "options": {
+                "elementLabelProp": "url"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/app/datasets/empiar/schemasUI/imageSetsUI.json b/src/app/datasets/empiar/schemasUI/imageSetsUI.json
new file mode 100644
index 0000000000..3f1c8ea7b9
--- /dev/null
+++ b/src/app/datasets/empiar/schemasUI/imageSetsUI.json
@@ -0,0 +1,74 @@
+{
+  "type": "Group",
+  "elements": [
+    {
+      "type": "Control",
+      "label": "Image Sets",
+      "scope": "#/properties/imagesets",
+      "options": {
+        "elementLabelProp": "name",
+        "showSortButtons": true,
+        "detail": {
+          "type": "VerticalLayout",
+          "elements": [
+            {
+              "type": "Control",
+              "label": "Name",
+              "scope": "#/properties/name"
+            },
+            {
+              "type": "Control",
+              "label": "Directory",
+              "scope": "#/properties/directory"
+            },
+            {
+              "type": "Control",
+              "label": "Category",
+              "scope": "#/properties/category"
+            },
+            {
+              "type": "Control",
+              "label": "Header Format",
+              "scope": "#/properties/header_format"
+            },
+            {
+              "type": "Control",
+              "label": "Data Format",
+              "scope": "#/properties/data_format"
+            },
+            {
+              "type": "Control",
+              "label": "Number of Images/Tilt Series",
+              "scope": "#/properties/num_images_or_tilt_series"
+            },
+            {
+              "type": "Control",
+              "label": "Frames per Image",
+              "scope": "#/properties/frames_per_image"
+            },
+            {
+              "type": "Control",
+              "label": "Voxel Type",
+              "scope": "#/properties/voxel_type"
+            },
+            {
+              "type": "Control",
+              "label": "Pixel Width",
+              "scope": "#/properties/pixel_width"
+            },
+            {
+              "type": "Control",
+              "label": "Pixel Height",
+              "scope": "#/properties/pixel_height"
+            },
+            {
+              "type": "Control",
+              "label": "Details",
+              "scope": "#/properties/details"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/tsconfig.json b/tsconfig.json
index 35821dfd8c..0a79d6befa 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,7 @@
     "useDefineForClassFields": false,
     "target": "es2022",
     "module": "es2022",
-    "lib": ["es2022", "dom"]
+    "lib": ["es2022", "dom"], 
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,

From 75d52cb4c754efa982b813f775fbb08f8efae718 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 24 Mar 2025 11:46:13 +0000
Subject: [PATCH 135/245] add schema for citation

---
 src/app/datasets/empiar/empiar.component.html | 19 +++++++++++++
 src/app/datasets/empiar/empiar.component.ts   |  2 ++
 .../datasets/empiar/schemasUI/citationUI.json | 28 +++++++++++++++++++
 .../empiar/schemasUI/imageSetsUI.json         | 24 ++++++++++++++--
 src/app/shared/sdk/apis/depositor.service.ts  |  5 ++++
 5 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 src/app/datasets/empiar/schemasUI/citationUI.json

diff --git a/src/app/datasets/empiar/empiar.component.html b/src/app/datasets/empiar/empiar.component.html
index f70306595b..ed2ff6f834 100644
--- a/src/app/datasets/empiar/empiar.component.html
+++ b/src/app/datasets/empiar/empiar.component.html
@@ -99,6 +99,25 @@
       </mat-card>
 
 
+      <!-- Citation card -->
+
+      <mat-card>
+        <mat-card-header class="file-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> assignment </mat-icon>
+          </div>
+          Author Information
+        </mat-card-header>
+        <jsonforms
+          [data]="data"
+          [schema]="schema"
+          [uischema]="citationSchema"
+          [renderers]="configuredRenderer"
+          (dataChange)="onDataChange($event)"
+         ></jsonforms>
+      </mat-card>
+
+
       <div class="button-container">
         <button class="submitDep" mat-raised-button color="primary" (click)="onSubmitClick()">
           Next
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index 27325eda13..2c0cfe5708 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -25,6 +25,7 @@ import { emdbRefRendererEntry } from "./customRenderers/rendererEMDB";
 import generalSchemaAsset from "./schemasUI/generalQuestionUI.json";
 import imageSetsAssets from "./schemasUI/imageSetsUI.json";
 import piAsset from "./schemasUI/authorInfoUI.json";
+import citationAsset from "./schemasUI/citationUI.json";
 
 @Component({
   selector: "app-empiar",
@@ -46,6 +47,7 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   generalSchema = generalSchemaAsset;
   imageSets = imageSetsAssets;
   schemaPI = piAsset;
+  citationSchema = citationAsset;
   configuredRenderer = [
     // releaseDateRendererEntry,
     // emdbRefRendererEntry,
diff --git a/src/app/datasets/empiar/schemasUI/citationUI.json b/src/app/datasets/empiar/schemasUI/citationUI.json
new file mode 100644
index 0000000000..3dff99e877
--- /dev/null
+++ b/src/app/datasets/empiar/schemasUI/citationUI.json
@@ -0,0 +1,28 @@
+{
+  "type": "Group",
+  "elements": [
+    {
+      "type": "Control",
+      "label": "Citations",
+      "scope": "#/properties/citation",
+      "options": {
+        "elementLabelProp": "title",
+        "showSortButtons": true,
+        "detail": {
+          "type": "VerticalLayout",
+          "elements": [
+            { "type": "Control", "label": "Title", "scope": "#/properties/title" },
+            { "type": "Control", "label": "Published", "scope": "#/properties/published" },
+            { "type": "Control", "label": "Preprint", "scope": "#/properties/preprint" },
+            { "type": "Control", "label": "Journal Citation", "scope": "#/properties/j_or_nj_citation" },
+            { "type": "Control", "label": "Year", "scope": "#/properties/year" },
+            { "type": "Control", "label": "DOI", "scope": "#/properties/doi" },
+            { "type": "Control", "label": "Language", "scope": "#/properties/language" },
+            { "type": "Control", "label": "Country", "scope": "#/properties/country" },
+            { "type": "Control", "label": "Details", "scope": "#/properties/details" }
+          ]
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/app/datasets/empiar/schemasUI/imageSetsUI.json b/src/app/datasets/empiar/schemasUI/imageSetsUI.json
index 3f1c8ea7b9..95e44c50fc 100644
--- a/src/app/datasets/empiar/schemasUI/imageSetsUI.json
+++ b/src/app/datasets/empiar/schemasUI/imageSetsUI.json
@@ -63,8 +63,28 @@
             },
             {
               "type": "Control",
-              "label": "Details",
-              "scope": "#/properties/details"
+              "label": "micrographs file pattern",
+              "scope": "#/properties/micrographs_file_pattern"
+            },
+            {
+              "type": "Control",
+              "label": "picked particles file pattern",
+              "scope": "#/properties/picked_particles_file_pattern"
+            },
+            {
+              "type": "Control",
+              "label": "picked particles directory",
+              "scope": "#/properties/picked_particles_directory"
+            },
+            {
+              "type": "Control",
+              "label": "Image width",
+              "scope": "#/properties/image_width"
+            },
+            {
+              "type": "Control",
+              "label": "Image hight",
+              "scope": "#/properties/image_hight"
             }
           ]
         }
diff --git a/src/app/shared/sdk/apis/depositor.service.ts b/src/app/shared/sdk/apis/depositor.service.ts
index 5e4eb239e0..3b82094586 100644
--- a/src/app/shared/sdk/apis/depositor.service.ts
+++ b/src/app/shared/sdk/apis/depositor.service.ts
@@ -84,3 +84,8 @@ export class Depositor {
     );
   }
 }
+
+
+//  properly initialize instances
+// authors and pi render propoerly
+// good-looking renderers
\ No newline at end of file

From 21c7a98d27a3237570df0bd898298598a2b80800 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 25 Mar 2025 14:12:35 +0000
Subject: [PATCH 136/245] wip renderring

---
 src/app/datasets/empiar/depositionEMPIAR.ts   | 377 +++++++++++++++++-
 src/app/datasets/empiar/empiar.component.ts   |  74 +++-
 .../empiar/schemasUI/generalQuestionUI.json   |   6 +-
 src/app/shared/sdk/apis/depositor.service.ts  |   5 -
 4 files changed, 433 insertions(+), 29 deletions(-)

diff --git a/src/app/datasets/empiar/depositionEMPIAR.ts b/src/app/datasets/empiar/depositionEMPIAR.ts
index cb8e1d89bb..376831b7ed 100644
--- a/src/app/datasets/empiar/depositionEMPIAR.ts
+++ b/src/app/datasets/empiar/depositionEMPIAR.ts
@@ -1,2 +1,377 @@
 export interface EmpiarJson {
-}
\ No newline at end of file
+  title: string;
+  release_date: ReleaseDate;
+  experiment_type: ExperimentType;
+  scale?: Scale;
+  crossReferences?: References[]
+  biostudiesReferences?: References[]
+  idrReferences?: References[]
+  empiarReferences? : References[]
+  workflows?: Workflow[],
+  authors: Author[];
+  correspondingAuthor: AuthorExtended;
+  principalInvestigator: AuthorExtended[];
+  imagesets: ImageSet[];
+  citations: Citation[];
+}
+
+interface References {
+  name: string;
+}
+
+interface Workflow{
+  "url": string;
+  "type": number;
+}
+
+
+interface Author {
+  name: string;
+  order_id: number;
+  author_orcid?: string | null;
+}
+
+interface AuthorExtended {
+  author_orcid?: string | null;
+  first_name: string;
+  middle_name?: string | null;
+  last_name: string;
+  organization: string;
+  street?: string | null;
+  town_or_city: string;
+  state_or_province?: string | null;
+  post_or_zip: string;
+  telephone?: string | null;
+  fax?: string | null;
+  email: string;
+  country: CountryEnum;
+}
+
+interface ImageSet {
+  name: string;
+  directory: string;
+  category: string;
+  header_format: string;
+  data_format: string;
+  num_images_or_tilt_series: number;
+  frames_per_image: number;
+  frame_range_min?: number | null;
+  frame_range_max?: number | null;
+  voxel_type: string;
+  pixel_width?: number | null;
+  pixel_height?: number | null;
+  details?: string | null;
+  micrographs_file_pattern?: string | null;
+  picked_particles_file_pattern?: string | null;
+  picked_particles_directory?: string | null;
+  image_width?: number | null;
+  image_height?: number | null;
+}
+
+interface Citation {
+  authors: Author[];
+  editors?: Author[];
+  published: boolean;
+  preprint: boolean;
+  j_or_nj_citation: boolean;
+  title: string;
+  volume?: string | null;
+  country?: CountryEnum | null;
+  first_page?: string | null;
+  last_page?: string | null;
+  year?: number | null;
+  language?: string | null;
+  doi?: string | null;
+  pubmedid?: string | null;
+  details?: string | null;
+  book_chapter_title?: string | null;
+  publisher?: string | null;
+  publication_location?: string | null;
+  journal?: string | null;
+  journal_abbreviation?: string | null;
+  issue?: string | null;
+}
+export function GetEnumTitles(enumObj: any): string[] {
+  return Object.keys(enumObj).map(key => enumObj[key]);
+}
+
+export enum ReleaseDate{
+  RE = "directly after the submission has been processed",
+  EP = "after the related EMDB entry has been released",
+  HP = "after the related primary citation has been published",
+  HO = "delay release of entry by one year from the date of deposition"
+}
+
+export enum ExperimentType{
+  E1 = "image data collected using soft x-ray tomography",
+  E2 = "simulated data, for instance, created using InSilicoTEM (note: we only accept simulated data in special circumstances such as test/training sets for validation challenges: you need to ask for and be granted permission PRIOR to deposition otherwise the dataset will be rejected)",
+  E3 = "raw image data relating to structures deposited to the Electron Microscopy Data Bank",
+  E4 = "image data collected using serial block-face scanning electron microscopy (like the Gatan 3View system)", 
+  E5 = "image data collected using focused ion beam scanning electron microscopy",
+  E6 = "integrative hybrid modelling data",
+  E7 = "correlative light-electron microscopy", 
+  E8 = "correlative light X-ray microscopy",
+  E9 = "microcrystal electron diffraction", 
+  E11 = "ATUM-SEM",
+  E12 = "Hard X-ray/X-ray microCT",
+  E13 = "ssET",
+}
+enum Scale {
+  S1 = "molecule", 
+  S2 = "virus", 
+  S3 = "cell", 
+  S4 = "tissue", 
+  S5 = "organism",
+}
+
+enum CountryEnum{
+  AF="Afghanistan",
+  AL="Albania",
+  DZ="Algeria",
+  AS="American Samoa",
+  AD="Andorra",
+  AO="Angola",
+  AI="Anguilla",
+  AQ="Antarctica",
+  AG="Antigua and Barbuda",
+  AR="Argentina",
+  AM="Armenia",
+  AW="Aruba",
+  AU="Australia",
+  AT="Austria",
+  AZ="Azerbaijan",
+  BS="Bahamas (the)",
+  BH="Bahrain",
+  BD="Bangladesh",
+  BB="Barbados",
+  BY="Belarus",
+  BE="Belgium",
+  BZ="Belize",
+  BJ="Benin",
+  BM="Bermuda",
+  BT="Bhutan",
+  BO="Bolivia (Plurinational State of)",
+  BQ="Bonaire, Sint Eustatius and Saba",
+  BA="Bosnia and Herzegovina",
+  BW="Botswana",
+  BV="Bouvet Island",
+  BR="Brazil",
+  IO="British Indian Ocean Territory (the)",
+  BN="Brunei Darussalam",
+  BG="Bulgaria",
+  BF="Burkina Faso",
+  BI="Burundi",
+  CV="Cabo Verde",
+  KH="Cambodia",
+  CM="Cameroon",
+  CA="Canada",
+  KY="Cayman Islands (the)",
+  CF="Central African Republic (the)",
+  TD="Chad",
+  CL="Chile",
+  CN="China",
+  CX="Christmas Island",
+  CC="Cocos (Keeling) Islands (the)",
+  CO="Colombia",
+  KM="Comoros (the)",
+  CD="Congo (the Democratic Republic of the)",
+  CG="Congo (the)",
+  CK="Cook Islands (the)",
+  CR="Costa Rica",
+  HR="Croatia",
+  CU="Cuba",
+  CW="Curaçao",
+  CY="Cyprus",
+  CZ="Czechia",
+  CI="Côte d'Ivoire",
+  DK="Denmark",
+  DJ="Djibouti",
+  DM="Dominica",
+  DO="Dominican Republic (the)",
+  EC="Ecuador",
+  EG="Egypt",
+  SV="El Salvador",
+  GQ="Equatorial Guinea",
+  ER="Eritrea",
+  EE="Estonia",
+  SZ="Eswatini",
+  ET="Ethiopia",
+  FK="Falkland Islands (the) [Malvinas]",
+  FO="Faroe Islands (the)",
+  FJ="Fiji",
+  FI="Finland",
+  FR="France",
+  GF="French Guiana",
+  PF="French Polynesia",
+  TF="French Southern Territories (the)",
+  GA="Gabon",
+  GM="Gambia (the)",
+  GE="Georgia",
+  DE="Germany",
+  GH="Ghana",
+  GI="Gibraltar",
+  GR="Greece",
+  GL="Greenland",
+  GD="Grenada",
+  GP="Guadeloupe",
+  GU="Guam",
+  GT="Guatemala",
+  GG="Guernsey",
+  GN="Guinea",
+  GW="Guinea-Bissau",
+  GY="Guyana",
+  HT="Haiti",
+  HM="Heard Island and McDonald Islands",
+  VA="Holy See (the)",
+  HN="Honduras",
+  HK="Hong Kong",
+  HU="Hungary",
+  IS="Iceland",
+  IN="India",
+  ID="Indonesia",
+  IR="Iran (Islamic Republic of)",
+  IQ="Iraq",
+  IE="Ireland",
+  IM="Isle of Man",
+  IL="Israel",
+  IT="Italy",
+  JM="Jamaica",
+  JP="Japan",
+  JE="Jersey",
+  JO="Jordan",
+  KZ="Kazakhstan",
+  KE="Kenya",
+  KI="Kiribati",
+  KP="Korea (the Democratic People's Republic of)",
+  KR="Korea (the Republic of)",
+  KW="Kuwait",
+  KG="Kyrgyzstan",
+  LA="Lao People's Democratic Republic (the)",
+  LV="Latvia",
+  LB="Lebanon",
+  LS="Lesotho",
+  LR="Liberia",
+  LY="Libya",
+  LI="Liechtenstein",
+  LT="Lithuania",
+  LU="Luxembourg",
+  MO="Macao",
+  MG="Madagascar",
+  MW="Malawi",
+  MY="Malaysia",
+  MV="Maldives",
+  ML="Mali",
+  MT="Malta",
+  MH="Marshall Islands (the)",
+  MQ="Martinique",
+  MR="Mauritania",
+  MU="Mauritius",
+  YT="Mayotte",
+  MX="Mexico",
+  FM="Micronesia (Federated States of)",
+  MD="Moldova (the Republic of)",
+  MC="Monaco",
+  MN="Mongolia",
+  ME="Montenegro",
+  MS="Montserrat",
+  MA="Morocco",
+  MZ="Mozambique",
+  MM="Myanmar",
+  NA="Namibia",
+  NR="Nauru",
+  NP="Nepal",
+  NL="Netherlands (the)",
+  NC="New Caledonia",
+  NZ="New Zealand",
+  NI="Nicaragua",
+  NE="Niger (the)",
+  NG="Nigeria",
+  NU="Niue",
+  NF="Norfolk Island",
+  MP="Northern Mariana Islands (the)",
+  NO="Norway",
+  OM="Oman",
+  PK="Pakistan",
+  PW="Palau",
+  PS="Palestine, State of",
+  PA="Panama",
+  PG="Papua New Guinea",
+  PY="Paraguay",
+  PE="Peru",
+  PH="Philippines (the)",
+  PN="Pitcairn",
+  PL="Poland",
+  PT="Portugal",
+  PR="Puerto Rico",
+  QA="Qatar",
+  MK="Republic of North Macedonia",
+  RO="Romania",
+  RU="Russian Federation (the)",
+  RW="Rwanda",
+  RE="Réunion",
+  BL="Saint Barthélemy",
+  SH="Saint Helena, Ascension and Tristan da Cunha",
+  KN="Saint Kitts and Nevis",
+  LC="Saint Lucia",
+  MF="Saint Martin (French part)",
+  PM="Saint Pierre and Miquelon",
+  VC="Saint Vincent and the Grenadines",
+  WS="Samoa",
+  SM="San Marino",
+  ST="Sao Tome and Principe",
+  SA="Saudi Arabia",
+  SN="Senegal",
+  RS="Serbia",
+  SC="Seychelles",
+  SL="Sierra Leone",
+  SG="Singapore",
+  SX="Sint Maarten (Dutch part)",
+  SK="Slovakia",
+  SI="Slovenia",
+  SB="Solomon Islands",
+  SO="Somalia",
+  ZA="South Africa",
+  GS="South Georgia and the South Sandwich Islands",
+  SS="South Sudan",
+  ES="Spain",
+  LK="Sri Lanka",
+  SD="Sudan (the)",
+  SR="Suriname",
+  SJ="Svalbard and Jan Mayen",
+  SE="Sweden",
+  CH="Switzerland",
+  SY="Syrian Arab Republic",
+  TW="Taiwan (Province of China)",
+  TJ="Tajikistan",
+  TZ="Tanzania, United Republic of",
+  TH="Thailand",
+  TL="Timor-Leste",
+  TG="Togo",
+  TK="Tokelau",
+  TO="Tonga",
+  TT="Trinidad and Tobago",
+  TN="Tunisia",
+  TR="Turkey",
+  TM="Turkmenistan",
+  TC="Turks and Caicos Islands (the)",
+  TV="Tuvalu",
+  UG="Uganda",
+  UA="Ukraine",
+  AE="United Arab Emirates (the)",
+  GB="United Kingdom of Great Britain and Northern Ireland (the)",
+  UM="United States Minor Outlying Islands (the)",
+  US="United States of America (the)",
+  UY="Uruguay",
+  UZ="Uzbekistan",
+  VU="Vanuatu",
+  VE="Venezuela (Bolivarian Republic of)",
+  VN="Viet Nam",
+  VG="Virgin Islands (British)",
+  VI="Virgin Islands (U.S.)",
+  WF="Wallis and Futuna",
+  EH="Western Sahara",
+  YE="Yemen",
+  ZM="Zambia",
+  ZW="Zimbabwe",
+  AX="Åland Islands"
+}
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index 2c0cfe5708..ee439764eb 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -26,6 +26,7 @@ import generalSchemaAsset from "./schemasUI/generalQuestionUI.json";
 import imageSetsAssets from "./schemasUI/imageSetsUI.json";
 import piAsset from "./schemasUI/authorInfoUI.json";
 import citationAsset from "./schemasUI/citationUI.json";
+import {EmpiarJson, ReleaseDate, ExperimentType, GetEnumTitles} from "./depositionEMPIAR";
 
 @Component({
   selector: "app-empiar",
@@ -43,11 +44,14 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   empiarSchema: string;
   data: JsonSchema = createEmptyInstance();
   schema: JsonSchema;
+
   // materialRenderers = angularMaterialRenderers;
   generalSchema = generalSchemaAsset;
   imageSets = imageSetsAssets;
   schemaPI = piAsset;
   citationSchema = citationAsset;
+  releaseDateTitles = Object.values(ReleaseDate);  
+
   configuredRenderer = [
     // releaseDateRendererEntry,
     // emdbRefRendererEntry,
@@ -95,6 +99,7 @@ export class EmpiarComponent implements OnInit, OnDestroy {
       }
     });
     this.data = { ...this.data };
+    this.updateReleaseDateControl();
   }
 
   ngOnDestroy() {
@@ -104,43 +109,72 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   }
   onDataChange(event: any) {
     this.data = event;
+    console.log(event, this.data)
   }
 
   onSubmitClick() {
     console.log(this.data);
   }
+ 
+  updateReleaseDateControl() {
+    const releaseDateControl = this.findControlInSchema(this.generalSchema, '#/properties/release_date');
+
+    if (releaseDateControl) {
+      releaseDateControl.options = releaseDateControl.options || {};
+      releaseDateControl.options.enum = Object.keys(ReleaseDate); // Enum values (short codes)
+      releaseDateControl.options.enumTitles = Object.values(ReleaseDate); // Enum titles (human-readable)
+    }
+  }
+
+  findControlInSchema(schema: any, scope: string) {
+    // Recursive function to find the control based on scope
+    if (schema.scope === scope) {
+      return schema;
+    }
+    if (schema.elements) {
+      for (const element of schema.elements) {
+        const result = this.findControlInSchema(element, scope);
+        if (result) return result;
+      }
+    }
+    return null;
+  }
+
 }
 
-function createEmptyInstance() {
-  // not complete yet
+function createEmptyInstance(): EmpiarJson {
   return {
     title: "",
-    release_date: "",
-    experiment_type: 0,
-    scale: "",
-    cross_references: [{ name: "" }],
+    release_date: null,
+    experiment_type: null,
+    scale: undefined,
+    crossReferences: [],
+    biostudiesReferences: [],
+    idrReferences: [],
+    empiarReferences: [],
     workflows: [],
     authors: [],
-    corresponding_author: {
-      author_orcid: "",
-      middle_name: "",
+    correspondingAuthor: {
+      author_orcid: null,
+      first_name: "",
+      middle_name: null,
+      last_name: "",
       organization: "",
-      street: "",
+      street: null,
       town_or_city: "",
-      state_or_province: "",
+      state_or_province: null,
       post_or_zip: "",
-      telephone: "",
+      telephone: null,
       fax: null,
-      first_name: "",
-      last_name: "",
       email: "",
-      country: "",
-    },
-    principal_investigator: [],
-    workflow_file: {
-      path: "",
+      country: null, 
     },
+    principalInvestigator: [],
     imagesets: [],
-    citation: [],
+    citations: [],
   };
 }
+
+
+// authors and pi render propoerly
+// good-looking renderers
\ No newline at end of file
diff --git a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
index 328018a677..27afd077a9 100644
--- a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
+++ b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
@@ -17,7 +17,7 @@
           "label": "Release Date",
           "scope": "#/properties/release_date",
           "options": {
-            "format": "radio"
+            "format": "select"
           }
         },
         {
@@ -25,12 +25,12 @@
           "label": "Experiment Type",
           "scope": "#/properties/experiment_type",
           "options": {
-            "format": "select"
+            "format": "radio"
           }
         },
         {
           "type": "Control",
-          "label":"Scope",
+          "label":"Scale",
           "scope": "#/properties/scale",
           "options": {
             "format": "select"
diff --git a/src/app/shared/sdk/apis/depositor.service.ts b/src/app/shared/sdk/apis/depositor.service.ts
index 3b82094586..5e4eb239e0 100644
--- a/src/app/shared/sdk/apis/depositor.service.ts
+++ b/src/app/shared/sdk/apis/depositor.service.ts
@@ -84,8 +84,3 @@ export class Depositor {
     );
   }
 }
-
-
-//  properly initialize instances
-// authors and pi render propoerly
-// good-looking renderers
\ No newline at end of file

From a8e6fcae415ba474a36a6dfac8eff29aad3f2636 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 26 Mar 2025 16:19:39 +0000
Subject: [PATCH 137/245] introduced custom renderers

---
 src/app/datasets/datasets.module.ts           |  2 +
 .../empiar/customRenderers/rendererEMDB.ts    | 50 ------------------
 .../empiar/customRenderers/rendererGeneral.ts | 51 +++++++++++++++++++
 .../empiar/customRenderers/rendererRelease.ts | 24 ---------
 src/app/datasets/empiar/empiar.component.ts   |  4 +-
 .../empiar/schemasUI/generalQuestionUI.json   | 20 +++++++-
 6 files changed, 74 insertions(+), 77 deletions(-)
 delete mode 100644 src/app/datasets/empiar/customRenderers/rendererEMDB.ts
 create mode 100644 src/app/datasets/empiar/customRenderers/rendererGeneral.ts
 delete mode 100644 src/app/datasets/empiar/customRenderers/rendererRelease.ts

diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 656994565e..8507c0d5e3 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -100,6 +100,7 @@ import { onedepReducer } from "state-management/reducers/onedep.reducer";
 import { empiarReducer } from "state-management/reducers/empiar.reducer";
 import { JsonFormsModule } from "@jsonforms/angular";
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
+import { CustomEnumRenderer } from "./empiar/customRenderers/rendererGeneral";
 
 @NgModule({
   imports: [
@@ -199,6 +200,7 @@ import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
     EmpiarComponent,
     DepositorComponent,
     QuestionnaireComponent,
+    CustomEnumRenderer,
   ],
   providers: [
     ArchivingService,
diff --git a/src/app/datasets/empiar/customRenderers/rendererEMDB.ts b/src/app/datasets/empiar/customRenderers/rendererEMDB.ts
deleted file mode 100644
index ef98bf603a..0000000000
--- a/src/app/datasets/empiar/customRenderers/rendererEMDB.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Component } from "@angular/core";
-import {
-  JsonFormsRendererRegistryEntry,
-  rankWith,
-  scopeEndsWith,
-} from "@jsonforms/core";
-import { FormsModule } from "@angular/forms"; // Import FormsModule here
-import { NgFor, NgIf } from "@angular/common";
-
-@Component({
-  selector: "app-cross-ref-component",
-  standalone: true,
-  imports: [FormsModule, NgIf, NgFor], // Ensure FormsModule is available in the standalone component
-  template: `
-    <div>
-      <p>EMDB reference</p>
-      <div *ngFor="let ref of data; let i = index">
-        <label for="name-{{ i }}">Reference {{ i + 1 }} </label>
-        <input
-          type="text"
-          id="name-{{ i }}"
-          [(ngModel)]="ref.name"
-          [placeholder]="'EMD-XXXX'"
-          [pattern]="pattern"
-          [attr.title]="title"
-        />
-        <div *ngIf="!isValid(i)" style="color: red;">
-          Invalid reference name
-        </div>
-      </div>
-    </div>
-  `,
-})
-export class CrossRefComponent {
-  pattern = "^(EMD)-[0-9]{4,}$";
-  title = "The Name Schema";
-
-  data = [{ name: "EMD-8001" }, { name: "EMD-8002" }];
-
-  isValid(index: number): boolean {
-    const ref = this.data[index];
-    const regex = new RegExp(this.pattern);
-    return regex.test(ref?.name);
-  }
-}
-
-export const emdbRefRendererEntry: JsonFormsRendererRegistryEntry = {
-  tester: rankWith(10, scopeEndsWith("cross_references")),
-  renderer: CrossRefComponent,
-};
diff --git a/src/app/datasets/empiar/customRenderers/rendererGeneral.ts b/src/app/datasets/empiar/customRenderers/rendererGeneral.ts
new file mode 100644
index 0000000000..ee9b71334d
--- /dev/null
+++ b/src/app/datasets/empiar/customRenderers/rendererGeneral.ts
@@ -0,0 +1,51 @@
+import { Component } from "@angular/core";
+import { JsonFormsControl } from "@jsonforms/angular";
+import { rankWith, isEnumControl } from "@jsonforms/core";
+
+@Component({
+  selector: "app-custom-enum-renderer",
+  template: `
+    <mat-form-field appearance="outline">
+      <mat-label>{{ label }}</mat-label>
+      <mat-select [value]="data" (selectionChange)="onChange($event.value)">
+        <mat-option
+          *ngFor="let option of transformedOptions"
+          [value]="option.value"
+        >
+          {{ option.label }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+  `,
+})
+export class CustomEnumRenderer extends JsonFormsControl {
+  transformedOptions = [];
+
+  override ngOnInit() {
+    super.ngOnInit();
+    this.transformEnumOptions();
+  }
+
+  private transformEnumOptions() {
+    const valueMap = {
+      RE: "Directly after the submission has been processed",
+      EP: "After the related EMDB entry has been released",
+      HP: "After the related primary citation has been published",
+      HO: "Delay release of entry by one year from the date of deposition",
+    };
+
+    this.transformedOptions = this.scopedSchema.enum.map((val) => ({
+      value: val,
+      label: valueMap[val] || val,
+    }));
+  }
+
+  onChange(value: any) {
+    this.onChange({ value });
+  }
+}
+
+export const customEnumRenderer = {
+  renderer: CustomEnumRenderer,
+  tester: rankWith(3, isEnumControl),
+};
diff --git a/src/app/datasets/empiar/customRenderers/rendererRelease.ts b/src/app/datasets/empiar/customRenderers/rendererRelease.ts
deleted file mode 100644
index 84354ec370..0000000000
--- a/src/app/datasets/empiar/customRenderers/rendererRelease.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { JsonFormsControl } from "@jsonforms/angular";
-import {
-  JsonFormsRendererRegistryEntry,
-  rankWith,
-  scopeEndsWith,
-} from "@jsonforms/core";
-
-export class ReleaseDateRenderer extends JsonFormsControl {
-  options = [
-    { value: "RE", label: "Release after submission" },
-    { value: "EP", label: "Release after EMDB entry" },
-    { value: "HP", label: "Release after citation" },
-    { value: "HO", label: "Delay by one year" },
-  ];
-
-  onChange(value: any) {
-    this.onChange({ data: value });
-  }
-}
-
-export const releaseDateRendererEntry: JsonFormsRendererRegistryEntry = {
-  tester: rankWith(4, scopeEndsWith("release_date")),
-  renderer: ReleaseDateRenderer,
-};
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index ee439764eb..756fba2ab0 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -20,13 +20,12 @@ import * as fromActions from "state-management/actions/depositor.actions";
 import { Subscription, Observable } from "rxjs";
 import * as datasetActions from "state-management/actions/datasets.actions";
 import { FormGroup, FormBuilder } from "@angular/forms";
-import { releaseDateRendererEntry } from "./customRenderers/rendererRelease";
-import { emdbRefRendererEntry } from "./customRenderers/rendererEMDB";
 import generalSchemaAsset from "./schemasUI/generalQuestionUI.json";
 import imageSetsAssets from "./schemasUI/imageSetsUI.json";
 import piAsset from "./schemasUI/authorInfoUI.json";
 import citationAsset from "./schemasUI/citationUI.json";
 import {EmpiarJson, ReleaseDate, ExperimentType, GetEnumTitles} from "./depositionEMPIAR";
+import { customEnumRenderer } from "./customRenderers/rendererGeneral";
 
 @Component({
   selector: "app-empiar",
@@ -56,6 +55,7 @@ export class EmpiarComponent implements OnInit, OnDestroy {
     // releaseDateRendererEntry,
     // emdbRefRendererEntry,
     ...angularMaterialRenderers,
+    customEnumRenderer
   ];
 
   constructor(
diff --git a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
index 27afd077a9..ee1deb0f12 100644
--- a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
+++ b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
@@ -17,7 +17,25 @@
           "label": "Release Date",
           "scope": "#/properties/release_date",
           "options": {
-            "format": "select"
+            "format": "select",
+            "enum": [
+              {
+                "value": "RE",
+                "label": "Directly after the submission has been processed"
+              },
+              {
+                "value": "EP",
+                "label": "After the related EMDB entry has been released"
+              },
+              {
+                "value": "HP",
+                "label": "After the related primary citation has been published"
+              },
+              {
+                "value": "HO",
+                "label": "Delay release of entry by one year from the date of deposition"
+              }
+            ]
           }
         },
         {

From 294e7c14303a1d02111b7a0dae329b1f6061cab1 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 27 Mar 2025 10:16:47 +0000
Subject: [PATCH 138/245] enum renderers finished

---
 src/app/datasets/datasets.module.ts           |   4 +-
 .../empiar/customRenderers/enumRenderer.ts    |  73 +++
 .../customRenderers/renderer.styles.scss      |  14 +
 .../empiar/customRenderers/rendererGeneral.ts |  51 --
 src/app/datasets/empiar/depositionEMPIAR.ts   | 549 +++++++++---------
 src/app/datasets/empiar/empiar.component.ts   |  46 +-
 .../empiar/schemasUI/generalQuestionUI.json   |  20 +-
 7 files changed, 371 insertions(+), 386 deletions(-)
 create mode 100644 src/app/datasets/empiar/customRenderers/enumRenderer.ts
 create mode 100644 src/app/datasets/empiar/customRenderers/renderer.styles.scss
 delete mode 100644 src/app/datasets/empiar/customRenderers/rendererGeneral.ts

diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 8507c0d5e3..d749f8799c 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -100,7 +100,7 @@ import { onedepReducer } from "state-management/reducers/onedep.reducer";
 import { empiarReducer } from "state-management/reducers/empiar.reducer";
 import { JsonFormsModule } from "@jsonforms/angular";
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
-import { CustomEnumRenderer } from "./empiar/customRenderers/rendererGeneral";
+import { CustomEnumRendererComponent } from "./empiar/customRenderers/enumRenderer";
 
 @NgModule({
   imports: [
@@ -200,7 +200,7 @@ import { CustomEnumRenderer } from "./empiar/customRenderers/rendererGeneral";
     EmpiarComponent,
     DepositorComponent,
     QuestionnaireComponent,
-    CustomEnumRenderer,
+    CustomEnumRendererComponent,
   ],
   providers: [
     ArchivingService,
diff --git a/src/app/datasets/empiar/customRenderers/enumRenderer.ts b/src/app/datasets/empiar/customRenderers/enumRenderer.ts
new file mode 100644
index 0000000000..66012f5e70
--- /dev/null
+++ b/src/app/datasets/empiar/customRenderers/enumRenderer.ts
@@ -0,0 +1,73 @@
+import { Component } from "@angular/core";
+import { JsonFormsControl } from "@jsonforms/angular";
+import { rankWith, isEnumControl } from "@jsonforms/core";
+import {
+  ReleaseDate,
+  Scale,
+  ExperimentType,
+  CountryEnum,
+  ExtendedJsonSchema,
+} from "../depositionEMPIAR";
+
+@Component({
+  selector: "app-custom-enum-renderer",
+  styleUrls: ["./renderer.styles.scss"],
+
+  template: `
+    <mat-form-field appearance="outline" class="custom-dropdown">
+      <mat-label>{{ label }}</mat-label>
+      <mat-select [value]="data" (selectionChange)="onEnumChange($event.value)">
+        <mat-option
+          *ngFor="let option of transformedOptions"
+          [value]="option.value"
+        >
+          <span class="option-text">{{ option.label }}</span>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+  `,
+})
+export class CustomEnumRendererComponent extends JsonFormsControl {
+  transformedOptions = [];
+  $id?: string;
+
+  override ngOnInit() {
+    super.ngOnInit();
+    const propertyId = (this.scopedSchema as ExtendedJsonSchema).$id;
+    if (propertyId == "/properties/release_date") {
+      this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
+        value: val,
+        label: ReleaseDate[val] || val,
+      }));
+    } else if (propertyId == "/properties/scale") {
+      this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
+        value: val,
+        label: Scale["S" + val] || val,
+      }));
+    } else if (propertyId.split("/").at(-1) == "country") {
+      this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
+        value: val,
+        label: CountryEnum[val] || val,
+      }));
+    } else if (propertyId == "/properties/experiment_type") {
+      this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
+        value: val,
+        label: ExperimentType["E" + val] || val,
+      }));
+    } else {
+      this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
+        value: val,
+        label: val,
+      }));
+    }
+  }
+
+  onEnumChange(value: any) {
+    this.onChange({ value });
+  }
+}
+
+export const customEnumRenderer = {
+  renderer: CustomEnumRendererComponent,
+  tester: rankWith(3, isEnumControl),
+};
diff --git a/src/app/datasets/empiar/customRenderers/renderer.styles.scss b/src/app/datasets/empiar/customRenderers/renderer.styles.scss
new file mode 100644
index 0000000000..65c2bbfebf
--- /dev/null
+++ b/src/app/datasets/empiar/customRenderers/renderer.styles.scss
@@ -0,0 +1,14 @@
+.custom-dropdown {
+  width: 100%; 
+}
+
+.option-text {
+  white-space: normal;
+  display: block;
+  max-width:100%;
+  overflow-wrap: break-word;
+}
+
+::ng-deep .mat-option {
+  white-space: normal !important;
+}
\ No newline at end of file
diff --git a/src/app/datasets/empiar/customRenderers/rendererGeneral.ts b/src/app/datasets/empiar/customRenderers/rendererGeneral.ts
deleted file mode 100644
index ee9b71334d..0000000000
--- a/src/app/datasets/empiar/customRenderers/rendererGeneral.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Component } from "@angular/core";
-import { JsonFormsControl } from "@jsonforms/angular";
-import { rankWith, isEnumControl } from "@jsonforms/core";
-
-@Component({
-  selector: "app-custom-enum-renderer",
-  template: `
-    <mat-form-field appearance="outline">
-      <mat-label>{{ label }}</mat-label>
-      <mat-select [value]="data" (selectionChange)="onChange($event.value)">
-        <mat-option
-          *ngFor="let option of transformedOptions"
-          [value]="option.value"
-        >
-          {{ option.label }}
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-  `,
-})
-export class CustomEnumRenderer extends JsonFormsControl {
-  transformedOptions = [];
-
-  override ngOnInit() {
-    super.ngOnInit();
-    this.transformEnumOptions();
-  }
-
-  private transformEnumOptions() {
-    const valueMap = {
-      RE: "Directly after the submission has been processed",
-      EP: "After the related EMDB entry has been released",
-      HP: "After the related primary citation has been published",
-      HO: "Delay release of entry by one year from the date of deposition",
-    };
-
-    this.transformedOptions = this.scopedSchema.enum.map((val) => ({
-      value: val,
-      label: valueMap[val] || val,
-    }));
-  }
-
-  onChange(value: any) {
-    this.onChange({ value });
-  }
-}
-
-export const customEnumRenderer = {
-  renderer: CustomEnumRenderer,
-  tester: rankWith(3, isEnumControl),
-};
diff --git a/src/app/datasets/empiar/depositionEMPIAR.ts b/src/app/datasets/empiar/depositionEMPIAR.ts
index 376831b7ed..993a6e0a6e 100644
--- a/src/app/datasets/empiar/depositionEMPIAR.ts
+++ b/src/app/datasets/empiar/depositionEMPIAR.ts
@@ -1,13 +1,15 @@
+import { JsonSchema4 } from "@jsonforms/core";
+
 export interface EmpiarJson {
   title: string;
   release_date: ReleaseDate;
   experiment_type: ExperimentType;
   scale?: Scale;
-  crossReferences?: References[]
-  biostudiesReferences?: References[]
-  idrReferences?: References[]
-  empiarReferences? : References[]
-  workflows?: Workflow[],
+  crossReferences?: References[];
+  biostudiesReferences?: References[];
+  idrReferences?: References[];
+  empiarReferences?: References[];
+  workflows?: Workflow[];
   authors: Author[];
   correspondingAuthor: AuthorExtended;
   principalInvestigator: AuthorExtended[];
@@ -19,12 +21,11 @@ interface References {
   name: string;
 }
 
-interface Workflow{
-  "url": string;
-  "type": number;
+interface Workflow {
+  url: string;
+  type: number;
 }
 
-
 interface Author {
   name: string;
   order_id: number;
@@ -91,287 +92,291 @@ interface Citation {
   journal_abbreviation?: string | null;
   issue?: string | null;
 }
-export function GetEnumTitles(enumObj: any): string[] {
-  return Object.keys(enumObj).map(key => enumObj[key]);
+// export function GetEnumTitles(enumObj: any): string[] {
+//   return Object.keys(enumObj).map(key => enumObj[key]);
+// }
+
+export interface ExtendedJsonSchema extends JsonSchema4 {
+  $id?: string;
 }
 
-export enum ReleaseDate{
+export enum ReleaseDate {
   RE = "directly after the submission has been processed",
   EP = "after the related EMDB entry has been released",
   HP = "after the related primary citation has been published",
-  HO = "delay release of entry by one year from the date of deposition"
+  HO = "delay release of entry by one year from the date of deposition",
 }
 
-export enum ExperimentType{
+export enum ExperimentType {
   E1 = "image data collected using soft x-ray tomography",
   E2 = "simulated data, for instance, created using InSilicoTEM (note: we only accept simulated data in special circumstances such as test/training sets for validation challenges: you need to ask for and be granted permission PRIOR to deposition otherwise the dataset will be rejected)",
   E3 = "raw image data relating to structures deposited to the Electron Microscopy Data Bank",
-  E4 = "image data collected using serial block-face scanning electron microscopy (like the Gatan 3View system)", 
+  E4 = "image data collected using serial block-face scanning electron microscopy (like the Gatan 3View system)",
   E5 = "image data collected using focused ion beam scanning electron microscopy",
   E6 = "integrative hybrid modelling data",
-  E7 = "correlative light-electron microscopy", 
+  E7 = "correlative light-electron microscopy",
   E8 = "correlative light X-ray microscopy",
-  E9 = "microcrystal electron diffraction", 
+  E9 = "microcrystal electron diffraction",
   E11 = "ATUM-SEM",
   E12 = "Hard X-ray/X-ray microCT",
   E13 = "ssET",
 }
-enum Scale {
-  S1 = "molecule", 
-  S2 = "virus", 
-  S3 = "cell", 
-  S4 = "tissue", 
+export enum Scale {
+  S1 = "molecule",
+  S2 = "virus",
+  S3 = "cell",
+  S4 = "tissue",
   S5 = "organism",
 }
 
-enum CountryEnum{
-  AF="Afghanistan",
-  AL="Albania",
-  DZ="Algeria",
-  AS="American Samoa",
-  AD="Andorra",
-  AO="Angola",
-  AI="Anguilla",
-  AQ="Antarctica",
-  AG="Antigua and Barbuda",
-  AR="Argentina",
-  AM="Armenia",
-  AW="Aruba",
-  AU="Australia",
-  AT="Austria",
-  AZ="Azerbaijan",
-  BS="Bahamas (the)",
-  BH="Bahrain",
-  BD="Bangladesh",
-  BB="Barbados",
-  BY="Belarus",
-  BE="Belgium",
-  BZ="Belize",
-  BJ="Benin",
-  BM="Bermuda",
-  BT="Bhutan",
-  BO="Bolivia (Plurinational State of)",
-  BQ="Bonaire, Sint Eustatius and Saba",
-  BA="Bosnia and Herzegovina",
-  BW="Botswana",
-  BV="Bouvet Island",
-  BR="Brazil",
-  IO="British Indian Ocean Territory (the)",
-  BN="Brunei Darussalam",
-  BG="Bulgaria",
-  BF="Burkina Faso",
-  BI="Burundi",
-  CV="Cabo Verde",
-  KH="Cambodia",
-  CM="Cameroon",
-  CA="Canada",
-  KY="Cayman Islands (the)",
-  CF="Central African Republic (the)",
-  TD="Chad",
-  CL="Chile",
-  CN="China",
-  CX="Christmas Island",
-  CC="Cocos (Keeling) Islands (the)",
-  CO="Colombia",
-  KM="Comoros (the)",
-  CD="Congo (the Democratic Republic of the)",
-  CG="Congo (the)",
-  CK="Cook Islands (the)",
-  CR="Costa Rica",
-  HR="Croatia",
-  CU="Cuba",
-  CW="Curaçao",
-  CY="Cyprus",
-  CZ="Czechia",
-  CI="Côte d'Ivoire",
-  DK="Denmark",
-  DJ="Djibouti",
-  DM="Dominica",
-  DO="Dominican Republic (the)",
-  EC="Ecuador",
-  EG="Egypt",
-  SV="El Salvador",
-  GQ="Equatorial Guinea",
-  ER="Eritrea",
-  EE="Estonia",
-  SZ="Eswatini",
-  ET="Ethiopia",
-  FK="Falkland Islands (the) [Malvinas]",
-  FO="Faroe Islands (the)",
-  FJ="Fiji",
-  FI="Finland",
-  FR="France",
-  GF="French Guiana",
-  PF="French Polynesia",
-  TF="French Southern Territories (the)",
-  GA="Gabon",
-  GM="Gambia (the)",
-  GE="Georgia",
-  DE="Germany",
-  GH="Ghana",
-  GI="Gibraltar",
-  GR="Greece",
-  GL="Greenland",
-  GD="Grenada",
-  GP="Guadeloupe",
-  GU="Guam",
-  GT="Guatemala",
-  GG="Guernsey",
-  GN="Guinea",
-  GW="Guinea-Bissau",
-  GY="Guyana",
-  HT="Haiti",
-  HM="Heard Island and McDonald Islands",
-  VA="Holy See (the)",
-  HN="Honduras",
-  HK="Hong Kong",
-  HU="Hungary",
-  IS="Iceland",
-  IN="India",
-  ID="Indonesia",
-  IR="Iran (Islamic Republic of)",
-  IQ="Iraq",
-  IE="Ireland",
-  IM="Isle of Man",
-  IL="Israel",
-  IT="Italy",
-  JM="Jamaica",
-  JP="Japan",
-  JE="Jersey",
-  JO="Jordan",
-  KZ="Kazakhstan",
-  KE="Kenya",
-  KI="Kiribati",
-  KP="Korea (the Democratic People's Republic of)",
-  KR="Korea (the Republic of)",
-  KW="Kuwait",
-  KG="Kyrgyzstan",
-  LA="Lao People's Democratic Republic (the)",
-  LV="Latvia",
-  LB="Lebanon",
-  LS="Lesotho",
-  LR="Liberia",
-  LY="Libya",
-  LI="Liechtenstein",
-  LT="Lithuania",
-  LU="Luxembourg",
-  MO="Macao",
-  MG="Madagascar",
-  MW="Malawi",
-  MY="Malaysia",
-  MV="Maldives",
-  ML="Mali",
-  MT="Malta",
-  MH="Marshall Islands (the)",
-  MQ="Martinique",
-  MR="Mauritania",
-  MU="Mauritius",
-  YT="Mayotte",
-  MX="Mexico",
-  FM="Micronesia (Federated States of)",
-  MD="Moldova (the Republic of)",
-  MC="Monaco",
-  MN="Mongolia",
-  ME="Montenegro",
-  MS="Montserrat",
-  MA="Morocco",
-  MZ="Mozambique",
-  MM="Myanmar",
-  NA="Namibia",
-  NR="Nauru",
-  NP="Nepal",
-  NL="Netherlands (the)",
-  NC="New Caledonia",
-  NZ="New Zealand",
-  NI="Nicaragua",
-  NE="Niger (the)",
-  NG="Nigeria",
-  NU="Niue",
-  NF="Norfolk Island",
-  MP="Northern Mariana Islands (the)",
-  NO="Norway",
-  OM="Oman",
-  PK="Pakistan",
-  PW="Palau",
-  PS="Palestine, State of",
-  PA="Panama",
-  PG="Papua New Guinea",
-  PY="Paraguay",
-  PE="Peru",
-  PH="Philippines (the)",
-  PN="Pitcairn",
-  PL="Poland",
-  PT="Portugal",
-  PR="Puerto Rico",
-  QA="Qatar",
-  MK="Republic of North Macedonia",
-  RO="Romania",
-  RU="Russian Federation (the)",
-  RW="Rwanda",
-  RE="Réunion",
-  BL="Saint Barthélemy",
-  SH="Saint Helena, Ascension and Tristan da Cunha",
-  KN="Saint Kitts and Nevis",
-  LC="Saint Lucia",
-  MF="Saint Martin (French part)",
-  PM="Saint Pierre and Miquelon",
-  VC="Saint Vincent and the Grenadines",
-  WS="Samoa",
-  SM="San Marino",
-  ST="Sao Tome and Principe",
-  SA="Saudi Arabia",
-  SN="Senegal",
-  RS="Serbia",
-  SC="Seychelles",
-  SL="Sierra Leone",
-  SG="Singapore",
-  SX="Sint Maarten (Dutch part)",
-  SK="Slovakia",
-  SI="Slovenia",
-  SB="Solomon Islands",
-  SO="Somalia",
-  ZA="South Africa",
-  GS="South Georgia and the South Sandwich Islands",
-  SS="South Sudan",
-  ES="Spain",
-  LK="Sri Lanka",
-  SD="Sudan (the)",
-  SR="Suriname",
-  SJ="Svalbard and Jan Mayen",
-  SE="Sweden",
-  CH="Switzerland",
-  SY="Syrian Arab Republic",
-  TW="Taiwan (Province of China)",
-  TJ="Tajikistan",
-  TZ="Tanzania, United Republic of",
-  TH="Thailand",
-  TL="Timor-Leste",
-  TG="Togo",
-  TK="Tokelau",
-  TO="Tonga",
-  TT="Trinidad and Tobago",
-  TN="Tunisia",
-  TR="Turkey",
-  TM="Turkmenistan",
-  TC="Turks and Caicos Islands (the)",
-  TV="Tuvalu",
-  UG="Uganda",
-  UA="Ukraine",
-  AE="United Arab Emirates (the)",
-  GB="United Kingdom of Great Britain and Northern Ireland (the)",
-  UM="United States Minor Outlying Islands (the)",
-  US="United States of America (the)",
-  UY="Uruguay",
-  UZ="Uzbekistan",
-  VU="Vanuatu",
-  VE="Venezuela (Bolivarian Republic of)",
-  VN="Viet Nam",
-  VG="Virgin Islands (British)",
-  VI="Virgin Islands (U.S.)",
-  WF="Wallis and Futuna",
-  EH="Western Sahara",
-  YE="Yemen",
-  ZM="Zambia",
-  ZW="Zimbabwe",
-  AX="Åland Islands"
+export enum CountryEnum {
+  AF = "Afghanistan",
+  AL = "Albania",
+  DZ = "Algeria",
+  AS = "American Samoa",
+  AD = "Andorra",
+  AO = "Angola",
+  AI = "Anguilla",
+  AQ = "Antarctica",
+  AG = "Antigua and Barbuda",
+  AR = "Argentina",
+  AM = "Armenia",
+  AW = "Aruba",
+  AU = "Australia",
+  AT = "Austria",
+  AZ = "Azerbaijan",
+  BS = "Bahamas (the)",
+  BH = "Bahrain",
+  BD = "Bangladesh",
+  BB = "Barbados",
+  BY = "Belarus",
+  BE = "Belgium",
+  BZ = "Belize",
+  BJ = "Benin",
+  BM = "Bermuda",
+  BT = "Bhutan",
+  BO = "Bolivia (Plurinational State of)",
+  BQ = "Bonaire, Sint Eustatius and Saba",
+  BA = "Bosnia and Herzegovina",
+  BW = "Botswana",
+  BV = "Bouvet Island",
+  BR = "Brazil",
+  IO = "British Indian Ocean Territory (the)",
+  BN = "Brunei Darussalam",
+  BG = "Bulgaria",
+  BF = "Burkina Faso",
+  BI = "Burundi",
+  CV = "Cabo Verde",
+  KH = "Cambodia",
+  CM = "Cameroon",
+  CA = "Canada",
+  KY = "Cayman Islands (the)",
+  CF = "Central African Republic (the)",
+  TD = "Chad",
+  CL = "Chile",
+  CN = "China",
+  CX = "Christmas Island",
+  CC = "Cocos (Keeling) Islands (the)",
+  CO = "Colombia",
+  KM = "Comoros (the)",
+  CD = "Congo (the Democratic Republic of the)",
+  CG = "Congo (the)",
+  CK = "Cook Islands (the)",
+  CR = "Costa Rica",
+  HR = "Croatia",
+  CU = "Cuba",
+  CW = "Curaçao",
+  CY = "Cyprus",
+  CZ = "Czechia",
+  CI = "Côte d'Ivoire",
+  DK = "Denmark",
+  DJ = "Djibouti",
+  DM = "Dominica",
+  DO = "Dominican Republic (the)",
+  EC = "Ecuador",
+  EG = "Egypt",
+  SV = "El Salvador",
+  GQ = "Equatorial Guinea",
+  ER = "Eritrea",
+  EE = "Estonia",
+  SZ = "Eswatini",
+  ET = "Ethiopia",
+  FK = "Falkland Islands (the) [Malvinas]",
+  FO = "Faroe Islands (the)",
+  FJ = "Fiji",
+  FI = "Finland",
+  FR = "France",
+  GF = "French Guiana",
+  PF = "French Polynesia",
+  TF = "French Southern Territories (the)",
+  GA = "Gabon",
+  GM = "Gambia (the)",
+  GE = "Georgia",
+  DE = "Germany",
+  GH = "Ghana",
+  GI = "Gibraltar",
+  GR = "Greece",
+  GL = "Greenland",
+  GD = "Grenada",
+  GP = "Guadeloupe",
+  GU = "Guam",
+  GT = "Guatemala",
+  GG = "Guernsey",
+  GN = "Guinea",
+  GW = "Guinea-Bissau",
+  GY = "Guyana",
+  HT = "Haiti",
+  HM = "Heard Island and McDonald Islands",
+  VA = "Holy See (the)",
+  HN = "Honduras",
+  HK = "Hong Kong",
+  HU = "Hungary",
+  IS = "Iceland",
+  IN = "India",
+  ID = "Indonesia",
+  IR = "Iran (Islamic Republic of)",
+  IQ = "Iraq",
+  IE = "Ireland",
+  IM = "Isle of Man",
+  IL = "Israel",
+  IT = "Italy",
+  JM = "Jamaica",
+  JP = "Japan",
+  JE = "Jersey",
+  JO = "Jordan",
+  KZ = "Kazakhstan",
+  KE = "Kenya",
+  KI = "Kiribati",
+  KP = "Korea (the Democratic People's Republic of)",
+  KR = "Korea (the Republic of)",
+  KW = "Kuwait",
+  KG = "Kyrgyzstan",
+  LA = "Lao People's Democratic Republic (the)",
+  LV = "Latvia",
+  LB = "Lebanon",
+  LS = "Lesotho",
+  LR = "Liberia",
+  LY = "Libya",
+  LI = "Liechtenstein",
+  LT = "Lithuania",
+  LU = "Luxembourg",
+  MO = "Macao",
+  MG = "Madagascar",
+  MW = "Malawi",
+  MY = "Malaysia",
+  MV = "Maldives",
+  ML = "Mali",
+  MT = "Malta",
+  MH = "Marshall Islands (the)",
+  MQ = "Martinique",
+  MR = "Mauritania",
+  MU = "Mauritius",
+  YT = "Mayotte",
+  MX = "Mexico",
+  FM = "Micronesia (Federated States of)",
+  MD = "Moldova (the Republic of)",
+  MC = "Monaco",
+  MN = "Mongolia",
+  ME = "Montenegro",
+  MS = "Montserrat",
+  MA = "Morocco",
+  MZ = "Mozambique",
+  MM = "Myanmar",
+  NA = "Namibia",
+  NR = "Nauru",
+  NP = "Nepal",
+  NL = "Netherlands (the)",
+  NC = "New Caledonia",
+  NZ = "New Zealand",
+  NI = "Nicaragua",
+  NE = "Niger (the)",
+  NG = "Nigeria",
+  NU = "Niue",
+  NF = "Norfolk Island",
+  MP = "Northern Mariana Islands (the)",
+  NO = "Norway",
+  OM = "Oman",
+  PK = "Pakistan",
+  PW = "Palau",
+  PS = "Palestine, State of",
+  PA = "Panama",
+  PG = "Papua New Guinea",
+  PY = "Paraguay",
+  PE = "Peru",
+  PH = "Philippines (the)",
+  PN = "Pitcairn",
+  PL = "Poland",
+  PT = "Portugal",
+  PR = "Puerto Rico",
+  QA = "Qatar",
+  MK = "Republic of North Macedonia",
+  RO = "Romania",
+  RU = "Russian Federation (the)",
+  RW = "Rwanda",
+  RE = "Réunion",
+  BL = "Saint Barthélemy",
+  SH = "Saint Helena, Ascension and Tristan da Cunha",
+  KN = "Saint Kitts and Nevis",
+  LC = "Saint Lucia",
+  MF = "Saint Martin (French part)",
+  PM = "Saint Pierre and Miquelon",
+  VC = "Saint Vincent and the Grenadines",
+  WS = "Samoa",
+  SM = "San Marino",
+  ST = "Sao Tome and Principe",
+  SA = "Saudi Arabia",
+  SN = "Senegal",
+  RS = "Serbia",
+  SC = "Seychelles",
+  SL = "Sierra Leone",
+  SG = "Singapore",
+  SX = "Sint Maarten (Dutch part)",
+  SK = "Slovakia",
+  SI = "Slovenia",
+  SB = "Solomon Islands",
+  SO = "Somalia",
+  ZA = "South Africa",
+  GS = "South Georgia and the South Sandwich Islands",
+  SS = "South Sudan",
+  ES = "Spain",
+  LK = "Sri Lanka",
+  SD = "Sudan (the)",
+  SR = "Suriname",
+  SJ = "Svalbard and Jan Mayen",
+  SE = "Sweden",
+  CH = "Switzerland",
+  SY = "Syrian Arab Republic",
+  TW = "Taiwan (Province of China)",
+  TJ = "Tajikistan",
+  TZ = "Tanzania, United Republic of",
+  TH = "Thailand",
+  TL = "Timor-Leste",
+  TG = "Togo",
+  TK = "Tokelau",
+  TO = "Tonga",
+  TT = "Trinidad and Tobago",
+  TN = "Tunisia",
+  TR = "Turkey",
+  TM = "Turkmenistan",
+  TC = "Turks and Caicos Islands (the)",
+  TV = "Tuvalu",
+  UG = "Uganda",
+  UA = "Ukraine",
+  AE = "United Arab Emirates (the)",
+  GB = "United Kingdom of Great Britain and Northern Ireland (the)",
+  UM = "United States Minor Outlying Islands (the)",
+  US = "United States of America (the)",
+  UY = "Uruguay",
+  UZ = "Uzbekistan",
+  VU = "Vanuatu",
+  VE = "Venezuela (Bolivarian Republic of)",
+  VN = "Viet Nam",
+  VG = "Virgin Islands (British)",
+  VI = "Virgin Islands (U.S.)",
+  WF = "Wallis and Futuna",
+  EH = "Western Sahara",
+  YE = "Yemen",
+  ZM = "Zambia",
+  ZW = "Zimbabwe",
+  AX = "Åland Islands",
 }
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index 756fba2ab0..4f9362707f 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -24,8 +24,8 @@ import generalSchemaAsset from "./schemasUI/generalQuestionUI.json";
 import imageSetsAssets from "./schemasUI/imageSetsUI.json";
 import piAsset from "./schemasUI/authorInfoUI.json";
 import citationAsset from "./schemasUI/citationUI.json";
-import {EmpiarJson, ReleaseDate, ExperimentType, GetEnumTitles} from "./depositionEMPIAR";
-import { customEnumRenderer } from "./customRenderers/rendererGeneral";
+import { EmpiarJson } from "./depositionEMPIAR";
+import { customEnumRenderer } from "./customRenderers/enumRenderer";
 
 @Component({
   selector: "app-empiar",
@@ -44,19 +44,12 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   data: JsonSchema = createEmptyInstance();
   schema: JsonSchema;
 
-  // materialRenderers = angularMaterialRenderers;
   generalSchema = generalSchemaAsset;
   imageSets = imageSetsAssets;
   schemaPI = piAsset;
   citationSchema = citationAsset;
-  releaseDateTitles = Object.values(ReleaseDate);  
 
-  configuredRenderer = [
-    // releaseDateRendererEntry,
-    // emdbRefRendererEntry,
-    ...angularMaterialRenderers,
-    customEnumRenderer
-  ];
+  configuredRenderer = [...angularMaterialRenderers, customEnumRenderer];
 
   constructor(
     public appConfigService: AppConfigService,
@@ -99,7 +92,6 @@ export class EmpiarComponent implements OnInit, OnDestroy {
       }
     });
     this.data = { ...this.data };
-    this.updateReleaseDateControl();
   }
 
   ngOnDestroy() {
@@ -109,37 +101,11 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   }
   onDataChange(event: any) {
     this.data = event;
-    console.log(event, this.data)
   }
 
   onSubmitClick() {
     console.log(this.data);
   }
- 
-  updateReleaseDateControl() {
-    const releaseDateControl = this.findControlInSchema(this.generalSchema, '#/properties/release_date');
-
-    if (releaseDateControl) {
-      releaseDateControl.options = releaseDateControl.options || {};
-      releaseDateControl.options.enum = Object.keys(ReleaseDate); // Enum values (short codes)
-      releaseDateControl.options.enumTitles = Object.values(ReleaseDate); // Enum titles (human-readable)
-    }
-  }
-
-  findControlInSchema(schema: any, scope: string) {
-    // Recursive function to find the control based on scope
-    if (schema.scope === scope) {
-      return schema;
-    }
-    if (schema.elements) {
-      for (const element of schema.elements) {
-        const result = this.findControlInSchema(element, scope);
-        if (result) return result;
-      }
-    }
-    return null;
-  }
-
 }
 
 function createEmptyInstance(): EmpiarJson {
@@ -167,14 +133,10 @@ function createEmptyInstance(): EmpiarJson {
       telephone: null,
       fax: null,
       email: "",
-      country: null, 
+      country: null,
     },
     principalInvestigator: [],
     imagesets: [],
     citations: [],
   };
 }
-
-
-// authors and pi render propoerly
-// good-looking renderers
\ No newline at end of file
diff --git a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
index ee1deb0f12..3789566a69 100644
--- a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
+++ b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
@@ -17,25 +17,7 @@
           "label": "Release Date",
           "scope": "#/properties/release_date",
           "options": {
-            "format": "select",
-            "enum": [
-              {
-                "value": "RE",
-                "label": "Directly after the submission has been processed"
-              },
-              {
-                "value": "EP",
-                "label": "After the related EMDB entry has been released"
-              },
-              {
-                "value": "HP",
-                "label": "After the related primary citation has been published"
-              },
-              {
-                "value": "HO",
-                "label": "Delay release of entry by one year from the date of deposition"
-              }
-            ]
+            "format": "radio"
           }
         },
         {

From f896ed937993c35308c6b44c60214c800f1d4bab Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 28 Mar 2025 15:11:00 +0000
Subject: [PATCH 139/245] wip better renderring

---
 src/app/datasets/datasets.module.ts           |   5 +
 .../empiar/customRenderers/authorRenderer.ts  |  72 ++++++++++++
 .../empiar/customRenderers/enumRenderer.ts    |   4 +-
 .../customRenderers/referenceRenderer.ts      |  79 +++++++++++++
 src/app/datasets/empiar/depositionEMPIAR.ts   |  92 ++++++++++-----
 src/app/datasets/empiar/empiar.component.html |   1 +
 src/app/datasets/empiar/empiar.component.ts   |  45 +++++---
 .../empiar/schemasUI/authorInfoUI.json        |   2 +-
 .../datasets/empiar/schemasUI/citationUI.json |   2 +-
 .../empiar/schemasUI/generalQuestionUI.json   |  35 ++++++
 .../empiar/schemasUI/imageSetsUI.json         |   2 +-
 src/assets/config.json                        | 108 +-----------------
 12 files changed, 290 insertions(+), 157 deletions(-)
 create mode 100644 src/app/datasets/empiar/customRenderers/authorRenderer.ts
 create mode 100644 src/app/datasets/empiar/customRenderers/referenceRenderer.ts

diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 3d9c8f902e..61ea017677 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -101,8 +101,11 @@ import { empiarReducer } from "state-management/reducers/empiar.reducer";
 import { JsonFormsModule } from "@jsonforms/angular";
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
 import { CustomEnumRendererComponent } from "./empiar/customRenderers/enumRenderer";
+import { CustomAuthorNameControlComponent } from "./empiar/customRenderers/authorRenderer";
+import { CustomReferenceControlComponent } from "./empiar/customRenderers/referenceRenderer";
 import { DatasetDetailDynamicComponent } from "./dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component";
 import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-wrapper.component";
+
 @NgModule({
   imports: [
     CommonModule,
@@ -204,6 +207,8 @@ import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-w
     DepositorComponent,
     QuestionnaireComponent,
     CustomEnumRendererComponent,
+    CustomAuthorNameControlComponent,
+    CustomReferenceControlComponent,
   ],
   providers: [
     ArchivingService,
diff --git a/src/app/datasets/empiar/customRenderers/authorRenderer.ts b/src/app/datasets/empiar/customRenderers/authorRenderer.ts
new file mode 100644
index 0000000000..cd37c4a4f0
--- /dev/null
+++ b/src/app/datasets/empiar/customRenderers/authorRenderer.ts
@@ -0,0 +1,72 @@
+import { Component } from "@angular/core";
+import { JsonFormsControl } from "@jsonforms/angular";
+import { and, schemaTypeIs, rankWith, schemaMatches } from "@jsonforms/core";
+@Component({
+  selector: "custom-author-name-control",
+  template: `
+    <div>
+      <mat-form-field appearance="outline">
+        <mat-label>Last Name</mat-label>
+        <input
+          matInput
+          [(ngModel)]="lastName"
+          (ngModelChange)="onNameChange()"
+        />
+      </mat-form-field>
+
+      <mat-form-field appearance="outline">
+        <mat-label>First Name(s)</mat-label>
+        <input
+          matInput
+          [(ngModel)]="firstNames"
+          (ngModelChange)="onNameChange()"
+        />
+      </mat-form-field>
+    </div>
+  `,
+})
+export class CustomAuthorNameControlComponent extends JsonFormsControl {
+  lastName = "";
+  firstNames = "";
+
+  override ngOnInit() {
+    super.ngOnInit();
+    this.initializeValues();
+  }
+
+  initializeValues() {
+    if (this.data) {
+      const nameMatch = this.data?.match(/\('(.+)', '(.+)'\)/);
+      if (nameMatch) {
+        this.lastName = nameMatch[1];
+        this.firstNames = nameMatch[2];
+      }
+    }
+  }
+
+  onNameChange() {
+    const initials = this.firstNames
+      .split(" ")
+      .map((word) => word.charAt(0).toUpperCase())
+      .join("");
+
+    const formattedName = `('${this.lastName}', '${initials}')`;
+
+    if (this.onChange) {
+      this.onChange({
+        path: this.path,
+        value: formattedName,
+      });
+    }
+  }
+}
+export const customNameControlRenderer = {
+  tester: rankWith(
+    4,
+    and(
+      schemaTypeIs("string"),
+      schemaMatches((schema) => schema.title === "The Name Schema "), // careful with space at the end..
+    ),
+  ),
+  renderer: CustomAuthorNameControlComponent,
+};
diff --git a/src/app/datasets/empiar/customRenderers/enumRenderer.ts b/src/app/datasets/empiar/customRenderers/enumRenderer.ts
index 66012f5e70..6908d79953 100644
--- a/src/app/datasets/empiar/customRenderers/enumRenderer.ts
+++ b/src/app/datasets/empiar/customRenderers/enumRenderer.ts
@@ -10,7 +10,7 @@ import {
 } from "../depositionEMPIAR";
 
 @Component({
-  selector: "app-custom-enum-renderer",
+  selector: "custom-enum-renderer",
   styleUrls: ["./renderer.styles.scss"],
 
   template: `
@@ -62,7 +62,7 @@ export class CustomEnumRendererComponent extends JsonFormsControl {
     }
   }
 
-  onEnumChange(value: any) {
+  onEnumChange(value: string) {
     this.onChange({ value });
   }
 }
diff --git a/src/app/datasets/empiar/customRenderers/referenceRenderer.ts b/src/app/datasets/empiar/customRenderers/referenceRenderer.ts
new file mode 100644
index 0000000000..8bb81ec1ea
--- /dev/null
+++ b/src/app/datasets/empiar/customRenderers/referenceRenderer.ts
@@ -0,0 +1,79 @@
+import { Component } from "@angular/core";
+import { JsonFormsControl } from "@jsonforms/angular";
+import { and, rankWith, schemaTypeIs, schemaMatches } from "@jsonforms/core";
+import { ExtendedJsonSchema } from "../depositionEMPIAR";
+
+@Component({
+  selector: "custom-reference-control",
+  template: `
+    <div style="width: 20%;">
+      <mat-form-field appearance="outline" style="width: 100%;">
+        <input
+          matInput
+          [(ngModel)]="referenceValue"
+          (ngModelChange)="onReferenceChange()"
+          [required]="isRequired"
+          [pattern]="pattern"
+        />
+        <mat-error *ngIf="isRequired && !referenceValue"
+          >This field is required.</mat-error
+        >
+        <mat-error *ngIf="referenceValue && !referenceValue.match(pattern)">
+          Please enter a valid reference.
+        </mat-error>
+      </mat-form-field>
+    </div>
+  `,
+})
+export class CustomReferenceControlComponent extends JsonFormsControl {
+  referenceValue = "";
+  isRequired = false;
+  pattern: string | undefined;
+
+  override ngOnInit() {
+    super.ngOnInit();
+    this.initializeValue();
+    console.log(this.schema);
+    if (
+      this.schema.required &&
+      this.schema.required.includes(this.uischema.scope.split("/").pop())
+    ) {
+      this.isRequired = true;
+    }
+    if (this.schema?.properties?.name?.pattern) {
+      this.pattern = this.schema.properties.name.pattern;
+    }
+  }
+
+  initializeValue() {
+    if (this.data) {
+      this.referenceValue = this.data;
+    }
+  }
+
+  onReferenceChange() {
+    if (this.onChange) {
+      this.onChange({
+        path: this.path,
+        value: this.referenceValue,
+      });
+    }
+  }
+}
+
+export const customReferenceControlRenderer = {
+  tester: rankWith(
+    5,
+    and(
+      schemaTypeIs("string"),
+      schemaMatches((schema) => {
+        const schemaId = (schema as ExtendedJsonSchema).$id;
+        return schemaId.includes("reference");
+      }),
+      schemaMatches((schema) => {
+        return schema.title === "The Name Schema "; // careful with space at the end..
+      }),
+    ),
+  ),
+  renderer: CustomReferenceControlComponent,
+};
diff --git a/src/app/datasets/empiar/depositionEMPIAR.ts b/src/app/datasets/empiar/depositionEMPIAR.ts
index 993a6e0a6e..bb576dc841 100644
--- a/src/app/datasets/empiar/depositionEMPIAR.ts
+++ b/src/app/datasets/empiar/depositionEMPIAR.ts
@@ -2,8 +2,8 @@ import { JsonSchema4 } from "@jsonforms/core";
 
 export interface EmpiarJson {
   title: string;
-  release_date: ReleaseDate;
-  experiment_type: ExperimentType;
+  releaseDate: ReleaseDate;
+  experimentType: ExperimentType;
   scale?: Scale;
   crossReferences?: References[];
   biostudiesReferences?: References[];
@@ -28,20 +28,20 @@ interface Workflow {
 
 interface Author {
   name: string;
-  order_id: number;
-  author_orcid?: string | null;
+  orderId: number;
+  authorOrcid?: string | null;
 }
 
 interface AuthorExtended {
-  author_orcid?: string | null;
-  first_name: string;
-  middle_name?: string | null;
-  last_name: string;
+  authorOrcid?: string | null;
+  firstName: string;
+  middleName?: string | null;
+  lastName: string;
   organization: string;
   street?: string | null;
-  town_or_city: string;
-  state_or_province?: string | null;
-  post_or_zip: string;
+  townOrCity: string;
+  stateOrProvince?: string | null;
+  postOrZip: string;
   telephone?: string | null;
   fax?: string | null;
   email: string;
@@ -52,21 +52,21 @@ interface ImageSet {
   name: string;
   directory: string;
   category: string;
-  header_format: string;
-  data_format: string;
-  num_images_or_tilt_series: number;
-  frames_per_image: number;
-  frame_range_min?: number | null;
-  frame_range_max?: number | null;
-  voxel_type: string;
-  pixel_width?: number | null;
-  pixel_height?: number | null;
+  headerFormat: string;
+  dataFormat: string;
+  numImagesOrTiltSeries: number;
+  framesPerImage: number;
+  frameRangeMin?: number | null;
+  frameRangeMax?: number | null;
+  voxelType: string;
+  pixelWidth?: number | null;
+  pixelHeight?: number | null;
   details?: string | null;
-  micrographs_file_pattern?: string | null;
-  picked_particles_file_pattern?: string | null;
-  picked_particles_directory?: string | null;
-  image_width?: number | null;
-  image_height?: number | null;
+  micrographsFilePattern?: string | null;
+  pickedParticlesFilePattern?: string | null;
+  pickedParticlesDirectory?: string | null;
+  imageWidth?: number | null;
+  imageHeight?: number | null;
 }
 
 interface Citation {
@@ -74,28 +74,58 @@ interface Citation {
   editors?: Author[];
   published: boolean;
   preprint: boolean;
-  j_or_nj_citation: boolean;
+  jOrNjCitation: boolean;
   title: string;
   volume?: string | null;
   country?: CountryEnum | null;
-  first_page?: string | null;
-  last_page?: string | null;
+  firstPage?: string | null;
+  lastPage?: string | null;
   year?: number | null;
   language?: string | null;
   doi?: string | null;
   pubmedid?: string | null;
   details?: string | null;
-  book_chapter_title?: string | null;
+  bookChapterTitle?: string | null;
   publisher?: string | null;
-  publication_location?: string | null;
+  publicationLocation?: string | null;
   journal?: string | null;
-  journal_abbreviation?: string | null;
+  journalAbbreviation?: string | null;
   issue?: string | null;
 }
 // export function GetEnumTitles(enumObj: any): string[] {
 //   return Object.keys(enumObj).map(key => enumObj[key]);
 // }
 
+export function camelToSnake(obj: any): any {
+  if (Array.isArray(obj)) {
+    return obj.map(camelToSnake);
+  } else if (obj !== null && typeof obj === "object") {
+    return Object.keys(obj).reduce((acc, key) => {
+      const snakeKey = key.replace(
+        /[A-Z]/g,
+        (letter) => `_${letter.toLowerCase()}`,
+      );
+      acc[snakeKey] = camelToSnake(obj[key]);
+      return acc;
+    }, {} as any);
+  }
+  return obj;
+}
+export function snakeToCamel(obj: any): any {
+  if (Array.isArray(obj)) {
+    return obj.map(snakeToCamel);
+  } else if (obj !== null && typeof obj === "object") {
+    return Object.keys(obj).reduce((acc, key) => {
+      const camelKey = key.replace(/_([a-z])/g, (_, letter) =>
+        letter.toUpperCase(),
+      );
+      acc[camelKey] = snakeToCamel(obj[key]);
+      return acc;
+    }, {} as any);
+  }
+  return obj;
+}
+
 export interface ExtendedJsonSchema extends JsonSchema4 {
   $id?: string;
 }
diff --git a/src/app/datasets/empiar/empiar.component.html b/src/app/datasets/empiar/empiar.component.html
index ed2ff6f834..1ca96aa351 100644
--- a/src/app/datasets/empiar/empiar.component.html
+++ b/src/app/datasets/empiar/empiar.component.html
@@ -51,6 +51,7 @@
           <div mat-card-avatar class="section-icon">
             <mat-icon> assignment </mat-icon>
           </div>
+          <!-- General Info and references card -->
           EMPIAR deposition Information
         </mat-card-header>
         <jsonforms
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index 7f55fee8f8..f3417e64ca 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -18,8 +18,10 @@ import generalSchemaAsset from "./schemasUI/generalQuestionUI.json";
 import imageSetsAssets from "./schemasUI/imageSetsUI.json";
 import piAsset from "./schemasUI/authorInfoUI.json";
 import citationAsset from "./schemasUI/citationUI.json";
-import { EmpiarJson } from "./depositionEMPIAR";
+import { EmpiarJson, camelToSnake, snakeToCamel } from "./depositionEMPIAR";
 import { customEnumRenderer } from "./customRenderers/enumRenderer";
+import { customNameControlRenderer } from "./customRenderers/authorRenderer";
+import { customReferenceControlRenderer } from "./customRenderers/referenceRenderer";
 
 @Component({
   selector: "app-empiar",
@@ -42,8 +44,12 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   imageSets = imageSetsAssets;
   schemaPI = piAsset;
   citationSchema = citationAsset;
-
-  configuredRenderer = [...angularMaterialRenderers, customEnumRenderer];
+  configuredRenderer = [
+    ...angularMaterialRenderers,
+    customEnumRenderer,
+    customNameControlRenderer,
+    customReferenceControlRenderer,
+  ];
 
   constructor(
     public appConfigService: AppConfigService,
@@ -57,6 +63,7 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+    console.log("generalSchema", this.generalSchema);
     // initialize an array for the files to be uploaded
     const pid = history.state.pid;
     this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
@@ -85,6 +92,7 @@ export class EmpiarComponent implements OnInit, OnDestroy {
       }
     });
     this.data = { ...this.data };
+    this.data = camelToSnake(this.dataset || createEmptyInstance());
   }
 
   ngOnDestroy() {
@@ -92,11 +100,12 @@ export class EmpiarComponent implements OnInit, OnDestroy {
       subscription.unsubscribe();
     });
   }
-  onDataChange(event: any) {
+  onDataChange(event: EmpiarJson) {
     this.data = event;
   }
 
   onSubmitClick() {
+    this.data = snakeToCamel(this.data);
     console.log(this.data);
   }
 }
@@ -104,25 +113,31 @@ export class EmpiarComponent implements OnInit, OnDestroy {
 function createEmptyInstance(): EmpiarJson {
   return {
     title: "",
-    release_date: null,
-    experiment_type: null,
+    releaseDate: null,
+    experimentType: null,
     scale: undefined,
-    crossReferences: [],
+    crossReferences: [{ name: "EMD-" }],
     biostudiesReferences: [],
     idrReferences: [],
     empiarReferences: [],
     workflows: [],
-    authors: [],
+    authors: [
+      {
+        name: "",
+        orderId: 0,
+        authorOrcid: null,
+      },
+    ],
     correspondingAuthor: {
-      author_orcid: null,
-      first_name: "",
-      middle_name: null,
-      last_name: "",
+      authorOrcid: null,
+      firstName: "",
+      middleName: null,
+      lastName: "",
       organization: "",
       street: null,
-      town_or_city: "",
-      state_or_province: null,
-      post_or_zip: "",
+      townOrCity: "",
+      stateOrProvince: null,
+      postOrZip: "",
       telephone: null,
       fax: null,
       email: "",
diff --git a/src/app/datasets/empiar/schemasUI/authorInfoUI.json b/src/app/datasets/empiar/schemasUI/authorInfoUI.json
index 1dd2783b6c..1ccdc38c7e 100644
--- a/src/app/datasets/empiar/schemasUI/authorInfoUI.json
+++ b/src/app/datasets/empiar/schemasUI/authorInfoUI.json
@@ -7,7 +7,7 @@
       "scope": "#/properties/principal_investigator",
       "options": {
         "elementLabelProp": "last_name",
-        "showSortButtons": true,
+        "showSortButtons": false,
         "detail": {
           "type": "VerticalLayout",
           "elements": [
diff --git a/src/app/datasets/empiar/schemasUI/citationUI.json b/src/app/datasets/empiar/schemasUI/citationUI.json
index 3dff99e877..17b135b1ce 100644
--- a/src/app/datasets/empiar/schemasUI/citationUI.json
+++ b/src/app/datasets/empiar/schemasUI/citationUI.json
@@ -7,7 +7,7 @@
       "scope": "#/properties/citation",
       "options": {
         "elementLabelProp": "title",
-        "showSortButtons": true,
+        "showSortButtons": false,
         "detail": {
           "type": "VerticalLayout",
           "elements": [
diff --git a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
index 3789566a69..14a03644d3 100644
--- a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
+++ b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
@@ -96,6 +96,41 @@
               }
             }
           ]
+        },
+        {
+          "type": "Group",
+          "elements": [
+            {
+              "type": "Control",
+              "label": "Authors",
+              "scope": "#/properties/authors",
+              "options": {
+                "showSortButtons": false,
+                "detail": {
+                  "type": "VerticalLayout",
+                  "elements": [
+                    {
+                      "type": "Control",
+                      "label": "Author's Name",
+                      "scope": "#/properties/name",
+                      "description": "Format: ('Surname', 'Initials')",
+                      "renderer": "customNameControlRenderer"
+                    },
+                    {
+                      "type": "Control",
+                      "label": "Author's Order ID",
+                      "scope": "#/properties/order_id" 
+                    },
+                    {
+                      "type": "Control",
+                      "label": "Author ORCID",
+                      "scope": "#/properties/author_orcid"
+                    }
+                  ]
+                }
+              }
+            }
+          ]
         }
       ]
     }
diff --git a/src/app/datasets/empiar/schemasUI/imageSetsUI.json b/src/app/datasets/empiar/schemasUI/imageSetsUI.json
index 95e44c50fc..5acfa844c9 100644
--- a/src/app/datasets/empiar/schemasUI/imageSetsUI.json
+++ b/src/app/datasets/empiar/schemasUI/imageSetsUI.json
@@ -7,7 +7,7 @@
       "scope": "#/properties/imagesets",
       "options": {
         "elementLabelProp": "name",
-        "showSortButtons": true,
+        "showSortButtons": false,
         "detail": {
           "type": "VerticalLayout",
           "elements": [
diff --git a/src/assets/config.json b/src/assets/config.json
index c7afcf107e..9eeb694a07 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -81,69 +81,6 @@
   "shoppingCartEnabled": false,
   "shoppingCartOnHeader": false,
   "tableSciDataEnabled": true,
-  "datasetDetailsShowMissingProposalId": false,
-  "notificationInterceptorEnabled": true,
-  "datafilesActionsEnabled": true,
-  "datafilesActions": [
-    {
-      "id": "eed8efec-4354-11ef-a3b5-d75573a5d37f",
-      "order": 4,
-      "label": "Download All",
-      "files": "all",
-      "mat_icon": "download",
-      "type": "form",
-      "url": "https://www.scicat.info/download/all",
-      "target": "_blank",
-      "enabled": "#SizeLimit",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
-    },
-    {
-      "id": "3072fafc-4363-11ef-b9f9-ebf568222d26",
-      "order": 3,
-      "label": "Download Selected",
-      "files": "selected",
-      "mat_icon": "download",
-      "type": "form",
-      "url": "https://www.scicat.info/download/selected",
-      "target": "_blank",
-      "enabled": "#Selected && #SizeLimit",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
-    },
-    {
-      "id": "4f974f0e-4364-11ef-9c63-03d19f813f4e",
-      "order": 2,
-      "label": "Notebook All",
-      "files": "all",
-      "icon": "/assets/icons/jupyter_logo.png",
-      "type": "form",
-      "url": "https://www.scicat.info/notebook/all",
-      "target": "_blank",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
-    },
-    {
-      "id": "fa3ce6ee-482d-11ef-95e9-ff2c80dd50bd",
-      "order": 1,
-      "label": "Notebook Selected",
-      "files": "selected",
-      "icon": "/assets/icons/jupyter_logo.png",
-      "type": "form",
-      "url": "https://www.scicat.info/notebook/selected",
-      "target": "_blank",
-      "enabled": "#Selected",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
-    }
-  ],
-  "labelMaps": {
-    "filters": {
-      "LocationFilter": "Location",
-      "PidFilter": "Pid",
-      "GroupFilter": "Group",
-      "TypeFilter": "Type",
-      "KeywordFilter": "Keyword",
-      "DateRangeFilter": "Start Date - End Date",
-      "TextFilter": "Text"
-    }
-  },
   "defaultDatasetsListSettings": {
     "columns": [
       {
@@ -224,49 +161,8 @@
         "type": "standard",
         "enabled": false
       }
-    ],
-    "filters": [
-      { "LocationFilter": true },
-      { "PidFilter": true },
-      { "GroupFilter": true },
-      { "TypeFilter": true },
-      { "KeywordFilter": true },
-      { "DateRangeFilter": true },
-      { "TextFilter": true }
-    ],
-    "conditions": []
+    ]
   },
-
   "accessTokenPrefix": "Bearer ",
-  "externalAuthEndpoint": "/api/v3/auth/ldap",
-  "labelsLocalization": {
-    "currentLabelSet": "ess",
-    "labelSets": {
-      "ess": {
-        "dataset-default": {},
-        "dataset-custom" : {
-          "pid": "PID",
-          "description": "Description",
-          "principalInvestigator": "Principal Investigator",
-          "keywords": "Keywords",
-          "creationTime": "Creation Time",
-          "scientificMetadata": "Scientific Metadata",
-          "metadataJsonView": "Metadata JsonView"
-        },
-        "proposal" : {
-          "General Information": "Proposal Information",
-          "Abstract" : "Abstract",
-          "Proposal Id" : "Proposal Id",
-          "Proposal Type" : "Proposal Type",
-          "Parent Proposal" : "Parent Proposal",
-          "Start Time" : "Start Time",
-          "End Time" : "End Time",
-          "Creator Information" : "People",
-          "Main Proposer": "Proposal Submitted By",
-          "Principal Investigator" : "Principal Investigator",
-          "Metadata": "Additional Information"
-        }
-      }
-    }
-  }
+  "externalAuthEndpoint": "/api/v3/auth/ldap"
 }

From 82dd24faae114a2e90f94824aeb1e82fb486e93e Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 31 Mar 2025 11:02:19 +0000
Subject: [PATCH 140/245] custom renderer author

---
 .../empiar/customRenderers/authorRenderer.ts  | 27 ++++++++++++---
 .../customRenderers/referenceRenderer.ts      | 33 +++++++++++--------
 src/app/datasets/empiar/depositionEMPIAR.ts   |  2 +-
 src/app/datasets/empiar/empiar.component.ts   |  5 ++-
 .../empiar/schemasUI/generalQuestionUI.json   | 15 +++------
 5 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/src/app/datasets/empiar/customRenderers/authorRenderer.ts b/src/app/datasets/empiar/customRenderers/authorRenderer.ts
index cd37c4a4f0..d95a4dac45 100644
--- a/src/app/datasets/empiar/customRenderers/authorRenderer.ts
+++ b/src/app/datasets/empiar/customRenderers/authorRenderer.ts
@@ -1,26 +1,35 @@
 import { Component } from "@angular/core";
 import { JsonFormsControl } from "@jsonforms/angular";
-import { and, schemaTypeIs, rankWith, schemaMatches } from "@jsonforms/core";
+import {
+  and,
+  schemaTypeIs,
+  rankWith,
+  schemaMatches,
+  ControlElement,
+} from "@jsonforms/core";
+
 @Component({
   selector: "custom-author-name-control",
   template: `
     <div>
       <mat-form-field appearance="outline">
-        <mat-label>Last Name</mat-label>
+        <mat-label>Last Name<span *ngIf="isRequired">*</span></mat-label>
         <input
           matInput
           [(ngModel)]="lastName"
           (ngModelChange)="onNameChange()"
         />
+        <mat-error *ngIf="error">{{ error }}</mat-error>
       </mat-form-field>
 
       <mat-form-field appearance="outline">
-        <mat-label>First Name(s)</mat-label>
+        <mat-label>First Name(s)<span *ngIf="isRequired">*</span></mat-label>
         <input
           matInput
           [(ngModel)]="firstNames"
           (ngModelChange)="onNameChange()"
         />
+        <mat-error *ngIf="error">{{ error }}</mat-error>
       </mat-form-field>
     </div>
   `,
@@ -28,12 +37,13 @@ import { and, schemaTypeIs, rankWith, schemaMatches } from "@jsonforms/core";
 export class CustomAuthorNameControlComponent extends JsonFormsControl {
   lastName = "";
   firstNames = "";
+  isRequired = false;
 
   override ngOnInit() {
     super.ngOnInit();
     this.initializeValues();
+    this.checkIfRequired();
   }
-
   initializeValues() {
     if (this.data) {
       const nameMatch = this.data?.match(/\('(.+)', '(.+)'\)/);
@@ -44,6 +54,15 @@ export class CustomAuthorNameControlComponent extends JsonFormsControl {
     }
   }
 
+  checkIfRequired() {
+    const controlElement = this.uischema as ControlElement;
+    const schemaProperties = this.schema?.properties;
+    if (controlElement?.scope && schemaProperties) {
+      const propertyKey = controlElement.scope.replace("#/properties/", "");
+      this.isRequired = this.schema?.required?.includes(propertyKey);
+    }
+  }
+
   onNameChange() {
     const initials = this.firstNames
       .split(" ")
diff --git a/src/app/datasets/empiar/customRenderers/referenceRenderer.ts b/src/app/datasets/empiar/customRenderers/referenceRenderer.ts
index 8bb81ec1ea..290c7a8d66 100644
--- a/src/app/datasets/empiar/customRenderers/referenceRenderer.ts
+++ b/src/app/datasets/empiar/customRenderers/referenceRenderer.ts
@@ -1,6 +1,12 @@
 import { Component } from "@angular/core";
 import { JsonFormsControl } from "@jsonforms/angular";
-import { and, rankWith, schemaTypeIs, schemaMatches } from "@jsonforms/core";
+import {
+  and,
+  rankWith,
+  schemaTypeIs,
+  schemaMatches,
+  ControlElement,
+} from "@jsonforms/core";
 import { ExtendedJsonSchema } from "../depositionEMPIAR";
 
 @Component({
@@ -12,12 +18,9 @@ import { ExtendedJsonSchema } from "../depositionEMPIAR";
           matInput
           [(ngModel)]="referenceValue"
           (ngModelChange)="onReferenceChange()"
-          [required]="isRequired"
           [pattern]="pattern"
         />
-        <mat-error *ngIf="isRequired && !referenceValue"
-          >This field is required.</mat-error
-        >
+
         <mat-error *ngIf="referenceValue && !referenceValue.match(pattern)">
           Please enter a valid reference.
         </mat-error>
@@ -27,22 +30,15 @@ import { ExtendedJsonSchema } from "../depositionEMPIAR";
 })
 export class CustomReferenceControlComponent extends JsonFormsControl {
   referenceValue = "";
-  isRequired = false;
   pattern: string | undefined;
 
   override ngOnInit() {
     super.ngOnInit();
     this.initializeValue();
-    console.log(this.schema);
-    if (
-      this.schema.required &&
-      this.schema.required.includes(this.uischema.scope.split("/").pop())
-    ) {
-      this.isRequired = true;
-    }
     if (this.schema?.properties?.name?.pattern) {
       this.pattern = this.schema.properties.name.pattern;
     }
+    console.log(this);
   }
 
   initializeValue() {
@@ -51,6 +47,17 @@ export class CustomReferenceControlComponent extends JsonFormsControl {
     }
   }
 
+  addReference() {
+    const newReference = { name: "EMD-" };
+    const updatedData = this.data
+      ? [...this.data, newReference]
+      : [newReference];
+
+    this.onChange({
+      path: this.path,
+      value: updatedData,
+    });
+  }
   onReferenceChange() {
     if (this.onChange) {
       this.onChange({
diff --git a/src/app/datasets/empiar/depositionEMPIAR.ts b/src/app/datasets/empiar/depositionEMPIAR.ts
index bb576dc841..70158f3a09 100644
--- a/src/app/datasets/empiar/depositionEMPIAR.ts
+++ b/src/app/datasets/empiar/depositionEMPIAR.ts
@@ -26,7 +26,7 @@ interface Workflow {
   type: number;
 }
 
-interface Author {
+export interface Author {
   name: string;
   orderId: number;
   authorOrcid?: string | null;
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index f3417e64ca..aea580df9c 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -106,7 +106,10 @@ export class EmpiarComponent implements OnInit, OnDestroy {
 
   onSubmitClick() {
     this.data = snakeToCamel(this.data);
-    console.log(this.data);
+    this.data["authors"].map((author) => {
+      author["orderId"] = this.data["authors"].indexOf(author);
+    });
+    console.log("Data changed:", this.data);
   }
 }
 
diff --git a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
index 14a03644d3..00dc819a80 100644
--- a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
+++ b/src/app/datasets/empiar/schemasUI/generalQuestionUI.json
@@ -103,9 +103,10 @@
             {
               "type": "Control",
               "label": "Authors",
+              "description": "Please add authors in the order they should appear in the publication.",
               "scope": "#/properties/authors",
               "options": {
-                "showSortButtons": false,
+                "showSortButtons": true,
                 "detail": {
                   "type": "VerticalLayout",
                   "elements": [
@@ -113,13 +114,7 @@
                       "type": "Control",
                       "label": "Author's Name",
                       "scope": "#/properties/name",
-                      "description": "Format: ('Surname', 'Initials')",
-                      "renderer": "customNameControlRenderer"
-                    },
-                    {
-                      "type": "Control",
-                      "label": "Author's Order ID",
-                      "scope": "#/properties/order_id" 
+                      "description": "Format: ('Surname', 'Initials')"
                     },
                     {
                       "type": "Control",
@@ -129,9 +124,9 @@
                   ]
                 }
               }
-            }
+            }            
           ]
-        }
+        }        
       ]
     }
   ]

From ad5631c21a90f9e79dce6fac037d5d780f867dd8 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 1 Apr 2025 12:47:13 +0000
Subject: [PATCH 141/245] renderring finshed

---
 src/app/datasets/datasets.module.ts           |   2 +
 .../empiar/customRenderers/authorRenderer.ts  |   5 +
 .../empiar/customRenderers/enumRenderer.ts    |  11 +-
 .../customRenderers/imagesSetRenderer.ts      | 178 ++++++++++++++++++
 .../customRenderers/referenceRenderer.ts      |   9 +-
 .../customRenderers/renderer.styles.scss      |  19 ++
 src/app/datasets/empiar/depositionEMPIAR.ts   |   2 +-
 src/app/datasets/empiar/empiar.component.html |  40 ++--
 src/app/datasets/empiar/empiar.component.ts   |  88 ++++++++-
 .../datasets/empiar/schemasUI/citationUI.json | 152 +++++++++++++--
 .../schemasUI/correspondingAuthorUI.json      |  85 +++++++++
 .../empiar/schemasUI/imageSetsUI.json         |   2 +-
 .../{authorInfoUI.json => piInfoUI.json}      |   0
 13 files changed, 547 insertions(+), 46 deletions(-)
 create mode 100644 src/app/datasets/empiar/customRenderers/imagesSetRenderer.ts
 create mode 100644 src/app/datasets/empiar/schemasUI/correspondingAuthorUI.json
 rename src/app/datasets/empiar/schemasUI/{authorInfoUI.json => piInfoUI.json} (100%)

diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 61ea017677..137e391571 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -103,6 +103,7 @@ import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
 import { CustomEnumRendererComponent } from "./empiar/customRenderers/enumRenderer";
 import { CustomAuthorNameControlComponent } from "./empiar/customRenderers/authorRenderer";
 import { CustomReferenceControlComponent } from "./empiar/customRenderers/referenceRenderer";
+import { CustomSemiEnumControlComponent } from "./empiar/customRenderers/imagesSetRenderer";
 import { DatasetDetailDynamicComponent } from "./dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component";
 import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-wrapper.component";
 
@@ -209,6 +210,7 @@ import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-w
     CustomEnumRendererComponent,
     CustomAuthorNameControlComponent,
     CustomReferenceControlComponent,
+    CustomSemiEnumControlComponent,
   ],
   providers: [
     ArchivingService,
diff --git a/src/app/datasets/empiar/customRenderers/authorRenderer.ts b/src/app/datasets/empiar/customRenderers/authorRenderer.ts
index d95a4dac45..bb5588e6cb 100644
--- a/src/app/datasets/empiar/customRenderers/authorRenderer.ts
+++ b/src/app/datasets/empiar/customRenderers/authorRenderer.ts
@@ -7,6 +7,7 @@ import {
   schemaMatches,
   ControlElement,
 } from "@jsonforms/core";
+import { ExtendedJsonSchema } from "../depositionEMPIAR";
 
 @Component({
   selector: "custom-author-name-control",
@@ -84,6 +85,10 @@ export const customNameControlRenderer = {
     4,
     and(
       schemaTypeIs("string"),
+      schemaMatches((schema) => {
+        const schemaId = (schema as ExtendedJsonSchema).$id;
+        return schemaId.includes("authors") || schemaId.includes("editors");
+      }),
       schemaMatches((schema) => schema.title === "The Name Schema "), // careful with space at the end..
     ),
   ),
diff --git a/src/app/datasets/empiar/customRenderers/enumRenderer.ts b/src/app/datasets/empiar/customRenderers/enumRenderer.ts
index 6908d79953..001f48ded3 100644
--- a/src/app/datasets/empiar/customRenderers/enumRenderer.ts
+++ b/src/app/datasets/empiar/customRenderers/enumRenderer.ts
@@ -12,7 +12,6 @@ import {
 @Component({
   selector: "custom-enum-renderer",
   styleUrls: ["./renderer.styles.scss"],
-
   template: `
     <mat-form-field appearance="outline" class="custom-dropdown">
       <mat-label>{{ label }}</mat-label>
@@ -45,10 +44,12 @@ export class CustomEnumRendererComponent extends JsonFormsControl {
         label: Scale["S" + val] || val,
       }));
     } else if (propertyId.split("/").at(-1) == "country") {
-      this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
-        value: val,
-        label: CountryEnum[val] || val,
-      }));
+      this.transformedOptions = this.scopedSchema.enum
+        .map((val: string) => ({
+          value: val,
+          label: CountryEnum[val] || val,
+        }))
+        .sort((a, b) => a.label.localeCompare(b.label));
     } else if (propertyId == "/properties/experiment_type") {
       this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
         value: val,
diff --git a/src/app/datasets/empiar/customRenderers/imagesSetRenderer.ts b/src/app/datasets/empiar/customRenderers/imagesSetRenderer.ts
new file mode 100644
index 0000000000..7e479a46fc
--- /dev/null
+++ b/src/app/datasets/empiar/customRenderers/imagesSetRenderer.ts
@@ -0,0 +1,178 @@
+import { Component } from "@angular/core";
+import { JsonFormsControl } from "@jsonforms/angular";
+import {
+  and,
+  or,
+  rankWith,
+  schemaTypeIs,
+  schemaMatches,
+  scopeEndsWith,
+} from "@jsonforms/core";
+import { ExtendedJsonSchema } from "../depositionEMPIAR";
+@Component({
+  selector: "custom-semi-enum-control",
+  styleUrls: ["./renderer.styles.scss"],
+  template: `
+    <div class="voxel-type-container">
+      <label class="voxel-type-label">{{ title }}</label>
+      <mat-radio-group
+        [(ngModel)]="selectedType"
+        (change)="onVoxelTypeChange()"
+        class="voxel-type-radio-group"
+      >
+        <mat-radio-button
+          *ngFor="let option of options"
+          [value]="option.code"
+          class="voxel-type-radio-button"
+        >
+          {{ option.label }}
+        </mat-radio-button>
+        <mat-radio-button value="OT" class="voxel-type-radio-button"
+          >Other</mat-radio-button
+        >
+      </mat-radio-group>
+      <mat-form-field
+        *ngIf="selectedType === 'OT'"
+        appearance="outline"
+        class="voxel-type-input"
+      >
+        <mat-label>Specify Voxel Type</mat-label>
+        <input
+          matInput
+          [(ngModel)]="otherType"
+          (ngModelChange)="onVoxelTypeChange()"
+        />
+      </mat-form-field>
+    </div>
+  `,
+})
+export class CustomSemiEnumControlComponent extends JsonFormsControl {
+  voxelOptions = [
+    { code: "T1", label: "Unsigned Byte" },
+    { code: "T2", label: "Signed Byte" },
+    { code: "T3", label: "Unsigned 16-bit Integer" },
+    { code: "T4", label: "Signed 16-bit Integer" },
+    { code: "T5", label: "Unsigned 32-bit Integer" },
+    { code: "T6", label: "Signed 32-bit Integer" },
+    { code: "T7", label: "32-bit Float" },
+    { code: "T8", label: "Bit" },
+    { code: "T9", label: "4-bit Integer" },
+  ];
+  dataFormatOptions = [
+    { code: "T1", label: "MRC" },
+    { code: "T2", label: "MRCS" },
+    { code: "T3", label: "TIFF" },
+    { code: "T4", label: "IMAGIC" },
+    { code: "T5", label: "DM3" },
+    { code: "T6", label: "DM4" },
+    { code: "T7", label: "SPIDER" },
+    { code: "T8", label: "BIG DATA VIEWER HDF5" },
+    { code: "T9", label: "EER" },
+    { code: "T10", label: "PNG" },
+    { code: "T11", label: "JPEG" },
+    { code: "T12", label: "SMV" },
+    { code: "T13", label: "EM" },
+    { code: "T14", label: "TPX3" },
+  ];
+  headerFormatOptions = [
+    { code: "T1", label: "MRC" },
+    { code: "T2", label: "MRCS" },
+    { code: "T3", label: "TIFF" },
+    { code: "T4", label: "IMAGIC" },
+    { code: "T5", label: "DM3" },
+    { code: "T6", label: "DM4" },
+    { code: "T7", label: "SPIDER" },
+    { code: "T8", label: "XML" },
+    { code: "T9", label: "EER" },
+    { code: "T10", label: "PNG" },
+    { code: "T11", label: "JPEG" },
+    { code: "T12", label: "SMV" },
+    { code: "T13", label: "EM" },
+    { code: "T14", label: "TPX3" },
+  ];
+  categoryOptions = [
+    { code: "T1", label: "Micrographs - Single Frame" },
+    { code: "T2", label: "Micrographs - Multiframe" },
+    { code: "T3", label: "Micrographs - Focal Pairs - Unprocessed" },
+    { code: "T4", label: "Micrographs - Focal Pairs - Contrast Inverted" },
+    { code: "T5", label: "Picked Particles - Single Frame - Unprocessed" },
+    { code: "T6", label: "Picked Particles - Multiframe - Unprocessed" },
+    { code: "T7", label: "Picked Particles - Single Frame - Processed" },
+    { code: "T8", label: "Picked Particles - Multiframe - Processed" },
+    { code: "T9", label: "Tilt Series" },
+    { code: "T10", label: "Class Averages" },
+    { code: "T11", label: "Stitched Maps" },
+    { code: "T12", label: "Diffraction Images" },
+    { code: "T13", label: "Reconstructed Volumes" },
+    { code: "T14", label: "Subtomograms" },
+  ];
+
+  selectedType = "";
+  otherType = "";
+  $id = "";
+  options = [];
+  title = "";
+
+  override ngOnInit() {
+    super.ngOnInit();
+    const propertyId = (this.scopedSchema as ExtendedJsonSchema).$id;
+    this.title = (this.scopedSchema as ExtendedJsonSchema).title;
+    if (propertyId == "/properties/imagesets/items/properties/category") {
+      this.options = this.categoryOptions;
+    } else if (
+      propertyId == "/properties/imagesets/items/properties/header_format"
+    ) {
+      this.options = this.headerFormatOptions;
+    } else if (
+      propertyId == "/properties/imagesets/items/properties/data_format"
+    ) {
+      this.options = this.dataFormatOptions;
+    } else if (
+      propertyId == "/properties/imagesets/items/properties/voxel_type"
+    ) {
+      this.options = this.voxelOptions;
+    }
+    this.initializeValue();
+  }
+
+  initializeValue() {
+    if (this.data) {
+      const match = this.data.match(/\('(.+)', '([^']*)'\)/);
+      if (match) {
+        this.selectedType = match[1];
+        this.otherType = match[2] || "";
+      }
+    }
+  }
+
+  onVoxelTypeChange() {
+    const formattedValue =
+      this.selectedType === "OT"
+        ? `('OT', '${this.otherType}')`
+        : `('${this.selectedType}', '')`;
+
+    if (this.onChange) {
+      this.onChange({ path: this.path, value: formattedValue });
+    }
+  }
+}
+
+export const customSemiEnumControlRenderer = {
+  tester: rankWith(
+    5,
+    and(
+      schemaTypeIs("string"),
+      schemaMatches((schema) => {
+        const schemaId = (schema as ExtendedJsonSchema).$id;
+        return schemaId.includes("imagesets");
+      }),
+      or(
+        scopeEndsWith("category"),
+        scopeEndsWith("header_format"),
+        scopeEndsWith("data_format"),
+        scopeEndsWith("voxel_type"),
+      ),
+    ),
+  ),
+  renderer: CustomSemiEnumControlComponent,
+};
diff --git a/src/app/datasets/empiar/customRenderers/referenceRenderer.ts b/src/app/datasets/empiar/customRenderers/referenceRenderer.ts
index 290c7a8d66..65d1d1784a 100644
--- a/src/app/datasets/empiar/customRenderers/referenceRenderer.ts
+++ b/src/app/datasets/empiar/customRenderers/referenceRenderer.ts
@@ -1,12 +1,6 @@
 import { Component } from "@angular/core";
 import { JsonFormsControl } from "@jsonforms/angular";
-import {
-  and,
-  rankWith,
-  schemaTypeIs,
-  schemaMatches,
-  ControlElement,
-} from "@jsonforms/core";
+import { and, rankWith, schemaTypeIs, schemaMatches } from "@jsonforms/core";
 import { ExtendedJsonSchema } from "../depositionEMPIAR";
 
 @Component({
@@ -38,7 +32,6 @@ export class CustomReferenceControlComponent extends JsonFormsControl {
     if (this.schema?.properties?.name?.pattern) {
       this.pattern = this.schema.properties.name.pattern;
     }
-    console.log(this);
   }
 
   initializeValue() {
diff --git a/src/app/datasets/empiar/customRenderers/renderer.styles.scss b/src/app/datasets/empiar/customRenderers/renderer.styles.scss
index 65c2bbfebf..a7a08b0b93 100644
--- a/src/app/datasets/empiar/customRenderers/renderer.styles.scss
+++ b/src/app/datasets/empiar/customRenderers/renderer.styles.scss
@@ -11,4 +11,23 @@
 
 ::ng-deep .mat-option {
   white-space: normal !important;
+}
+
+.voxel-type-container {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+.voxel-type-label {
+  font-size: 1.2em;
+  font-weight: bold;
+}
+.voxel-type-radio-group {
+  gap: 5px;
+}
+.voxel-type-radio-button {
+  margin-bottom: 5px;
+}
+.voxel-type-input {
+  width: 100%;
 }
\ No newline at end of file
diff --git a/src/app/datasets/empiar/depositionEMPIAR.ts b/src/app/datasets/empiar/depositionEMPIAR.ts
index 70158f3a09..ec9ae61485 100644
--- a/src/app/datasets/empiar/depositionEMPIAR.ts
+++ b/src/app/datasets/empiar/depositionEMPIAR.ts
@@ -14,7 +14,7 @@ export interface EmpiarJson {
   correspondingAuthor: AuthorExtended;
   principalInvestigator: AuthorExtended[];
   imagesets: ImageSet[];
-  citations: Citation[];
+  citation: Citation[];
 }
 
 interface References {
diff --git a/src/app/datasets/empiar/empiar.component.html b/src/app/datasets/empiar/empiar.component.html
index 1ca96aa351..9b13145e51 100644
--- a/src/app/datasets/empiar/empiar.component.html
+++ b/src/app/datasets/empiar/empiar.component.html
@@ -63,51 +63,67 @@
          ></jsonforms>
       </mat-card>
 
-      <!-- Imagesets card -->
+      <!-- Authors card -->
+      <mat-card>
+        <mat-card-header class="file-header">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> contact_mail </mat-icon>
+          </div>
+          Corresponding Author Information
+        </mat-card-header>
+          <jsonforms
+          [data]="data"
+          [schema]="schema"
+          [uischema]="schemaCorrespondingAuthor"
+          [renderers]="configuredRenderer"
+          (dataChange)="onDataChange($event)"
+        ></jsonforms>
+      </mat-card>
 
       <mat-card>
         <mat-card-header class="file-header">
           <div mat-card-avatar class="section-icon">
-            <mat-icon> assignment </mat-icon>
+            <mat-icon> contacts </mat-icon>
           </div>
-          Image sets
+          Principal Investigators Information
         </mat-card-header>
         <jsonforms
           [data]="data"
           [schema]="schema"
-          [uischema]="imageSets"
+          [uischema]="schemaPI"
           [renderers]="configuredRenderer"
           (dataChange)="onDataChange($event)"
-         ></jsonforms>
+        ></jsonforms>
       </mat-card>
 
-      <!-- Authors card -->
+
+      <!-- Imagesets card -->
 
       <mat-card>
         <mat-card-header class="file-header">
           <div mat-card-avatar class="section-icon">
-            <mat-icon> assignment </mat-icon>
+            <mat-icon> biotech </mat-icon>
           </div>
-          Author Information
+          Image sets
         </mat-card-header>
         <jsonforms
           [data]="data"
           [schema]="schema"
-          [uischema]="schemaPI"
+          [uischema]="imageSets"
           [renderers]="configuredRenderer"
           (dataChange)="onDataChange($event)"
          ></jsonforms>
       </mat-card>
 
-
+    
       <!-- Citation card -->
 
       <mat-card>
         <mat-card-header class="file-header">
           <div mat-card-avatar class="section-icon">
-            <mat-icon> assignment </mat-icon>
+            <mat-icon> article </mat-icon>
           </div>
-          Author Information
+          Citation Information
         </mat-card-header>
         <jsonforms
           [data]="data"
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index aea580df9c..fad53cd7be 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -16,12 +16,14 @@ import * as datasetActions from "state-management/actions/datasets.actions";
 import { FormGroup, FormBuilder } from "@angular/forms";
 import generalSchemaAsset from "./schemasUI/generalQuestionUI.json";
 import imageSetsAssets from "./schemasUI/imageSetsUI.json";
-import piAsset from "./schemasUI/authorInfoUI.json";
+import piAsset from "./schemasUI/piInfoUI.json";
+import correspondingAuthorAsset from "./schemasUI/correspondingAuthorUI.json";
 import citationAsset from "./schemasUI/citationUI.json";
 import { EmpiarJson, camelToSnake, snakeToCamel } from "./depositionEMPIAR";
 import { customEnumRenderer } from "./customRenderers/enumRenderer";
 import { customNameControlRenderer } from "./customRenderers/authorRenderer";
 import { customReferenceControlRenderer } from "./customRenderers/referenceRenderer";
+import { customSemiEnumControlRenderer } from "./customRenderers/imagesSetRenderer";
 
 @Component({
   selector: "app-empiar",
@@ -43,12 +45,15 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   generalSchema = generalSchemaAsset;
   imageSets = imageSetsAssets;
   schemaPI = piAsset;
+  schemaCorrespondingAuthor = correspondingAuthorAsset;
   citationSchema = citationAsset;
+
   configuredRenderer = [
     ...angularMaterialRenderers,
     customEnumRenderer,
     customNameControlRenderer,
     customReferenceControlRenderer,
+    customSemiEnumControlRenderer,
   ];
 
   constructor(
@@ -63,7 +68,6 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    console.log("generalSchema", this.generalSchema);
     // initialize an array for the files to be uploaded
     const pid = history.state.pid;
     this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
@@ -78,7 +82,7 @@ export class EmpiarComponent implements OnInit, OnDestroy {
       }),
     );
     this.store.dispatch(fromActions.accessEmpiarSchema());
-    this.empiarSchema$ = this.store.pipe(select(selectEmpiarSchema));
+    this.empiarSchema$ = this.store.select(selectEmpiarSchema);
 
     this.empiarSchema$.subscribe((schema) => {
       if (schema) {
@@ -92,7 +96,7 @@ export class EmpiarComponent implements OnInit, OnDestroy {
       }
     });
     this.data = { ...this.data };
-    this.data = camelToSnake(this.dataset || createEmptyInstance());
+    this.data = camelToSnake(createEmptyInstance());
   }
 
   ngOnDestroy() {
@@ -109,7 +113,8 @@ export class EmpiarComponent implements OnInit, OnDestroy {
     this.data["authors"].map((author) => {
       author["orderId"] = this.data["authors"].indexOf(author);
     });
-    console.log("Data changed:", this.data);
+    // to do create a json file based on entered data
+    console.log(this.data);
   }
 }
 
@@ -146,8 +151,75 @@ function createEmptyInstance(): EmpiarJson {
       email: "",
       country: null,
     },
-    principalInvestigator: [],
-    imagesets: [],
-    citations: [],
+    principalInvestigator: [
+      {
+        authorOrcid: null,
+        firstName: "",
+        middleName: null,
+        lastName: "",
+        organization: "",
+        street: null,
+        townOrCity: "",
+        stateOrProvince: null,
+        postOrZip: "",
+        telephone: null,
+        fax: null,
+        email: "",
+        country: null,
+      },
+    ],
+    imagesets: [
+      {
+        name: "",
+        directory: "",
+        category: "",
+        headerFormat: "",
+        dataFormat: "",
+        numImagesOrTiltSeries: 0,
+        framesPerImage: 0,
+        // frameRangeMin?: 0,
+        // frameRangeMax?: 0,
+        voxelType: "",
+        // pixelWidth?: 0,
+        // pixelHeight?: 0,
+        // details?: "",
+        // micrographsFilePattern?: "",
+        // pickedParticlesFilePattern?: "",
+        // pickedParticlesDirectory?: "",
+        // imageWidth?: 0,
+        // imageHeight?: 0,
+      },
+    ],
+    citation: [
+      {
+        authors: [
+          {
+            name: "",
+            orderId: 0,
+            authorOrcid: "",
+          },
+        ],
+        editors: [],
+        published: false,
+        preprint: false,
+        jOrNjCitation: false,
+        title: "",
+        volume: null,
+        country: null,
+        firstPage: null,
+        lastPage: null,
+        year: null,
+        language: null,
+        doi: null,
+        pubmedid: null,
+        details: null,
+        bookChapterTitle: null,
+        publisher: null,
+        publicationLocation: null,
+        journal: null,
+        journalAbbreviation: null,
+        issue: null,
+      },
+    ],
   };
 }
diff --git a/src/app/datasets/empiar/schemasUI/citationUI.json b/src/app/datasets/empiar/schemasUI/citationUI.json
index 17b135b1ce..f4cfb89b1c 100644
--- a/src/app/datasets/empiar/schemasUI/citationUI.json
+++ b/src/app/datasets/empiar/schemasUI/citationUI.json
@@ -1,9 +1,9 @@
 {
   "type": "Group",
+  "label": "Citations",
   "elements": [
     {
       "type": "Control",
-      "label": "Citations",
       "scope": "#/properties/citation",
       "options": {
         "elementLabelProp": "title",
@@ -11,18 +11,148 @@
         "detail": {
           "type": "VerticalLayout",
           "elements": [
-            { "type": "Control", "label": "Title", "scope": "#/properties/title" },
-            { "type": "Control", "label": "Published", "scope": "#/properties/published" },
-            { "type": "Control", "label": "Preprint", "scope": "#/properties/preprint" },
-            { "type": "Control", "label": "Journal Citation", "scope": "#/properties/j_or_nj_citation" },
-            { "type": "Control", "label": "Year", "scope": "#/properties/year" },
-            { "type": "Control", "label": "DOI", "scope": "#/properties/doi" },
-            { "type": "Control", "label": "Language", "scope": "#/properties/language" },
-            { "type": "Control", "label": "Country", "scope": "#/properties/country" },
-            { "type": "Control", "label": "Details", "scope": "#/properties/details" }
+            {
+              "type": "Control",
+              "label": "Title",
+              "scope": "#/properties/title"
+            },
+            {
+              "type": "Control",
+              "label": "Published",
+              "scope": "#/properties/published",
+              "options": { "toggle": true }
+            },
+            {
+              "type": "Control",
+              "label": "Preprint",
+              "scope": "#/properties/preprint",
+              "options": { "toggle": true }
+            },
+            {
+              "type": "Control",
+              "label": "Journal Citation",
+              "scope": "#/properties/j_or_nj_citation",
+              "options": { "toggle": true }
+            },
+            {
+              "type": "Control",
+              "label": "Authors",
+              "scope": "#/properties/authors",
+              "options": {
+                "elementLabelProp": "name",
+                "detail": {
+                  "type": "VerticalLayout",
+                  "elements": [
+                    {
+                      "type": "Control",
+                      "label": "Name",
+                      "scope": "#/properties/name"
+                    },
+                    {
+                      "type": "Control",
+                      "label": "ORCID",
+                      "scope": "#/properties/author_orcid"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "type": "Control",
+              "label": "Editors",
+              "scope": "#/properties/editors",
+              "options": {
+                "elementLabelProp": "name",
+                "detail": {
+                  "type": "VerticalLayout",
+                  "elements": [
+                    {
+                      "type": "Control",
+                      "label": "Name",
+                      "scope": "#/properties/name"
+                    },
+                    {
+                      "type": "Control",
+                      "label": "ORCID",
+                      "scope": "#/properties/author_orcid"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "type": "Control",
+              "label": "Year",
+              "scope": "#/properties/year"
+            },
+            {
+              "type": "Control",
+              "label": "Volume",
+              "scope": "#/properties/volume"
+            },
+            {
+              "type": "Control",
+              "label": "Country",
+              "scope": "#/properties/country"
+            },
+            {
+              "type": "Control",
+              "label": "First Page",
+              "scope": "#/properties/first_page"
+            },
+            {
+              "type": "Control",
+              "label": "Last Page",
+              "scope": "#/properties/last_page"
+            },
+            {
+              "type": "Control",
+              "label": "DOI",
+              "scope": "#/properties/doi"
+            },
+            {
+              "type": "Control",
+              "label": "PubMed ID",
+              "scope": "#/properties/pubmedid"
+            },
+            {
+              "type": "Control",
+              "label": "Details",
+              "scope": "#/properties/details"
+            },
+            {
+              "type": "Control",
+              "label": "Book Chapter Title",
+              "scope": "#/properties/book_chapter_title"
+            },
+            {
+              "type": "Control",
+              "label": "Publisher",
+              "scope": "#/properties/publisher"
+            },
+            {
+              "type": "Control",
+              "label": "Publication Location",
+              "scope": "#/properties/publication_location"
+            },
+            {
+              "type": "Control",
+              "label": "Journal",
+              "scope": "#/properties/journal"
+            },
+            {
+              "type": "Control",
+              "label": "Journal Abbreviation",
+              "scope": "#/properties/journal_abbreviation"
+            },
+            {
+              "type": "Control",
+              "label": "Issue",
+              "scope": "#/properties/issue"
+            }
           ]
         }
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/app/datasets/empiar/schemasUI/correspondingAuthorUI.json b/src/app/datasets/empiar/schemasUI/correspondingAuthorUI.json
new file mode 100644
index 0000000000..7b1ed394bb
--- /dev/null
+++ b/src/app/datasets/empiar/schemasUI/correspondingAuthorUI.json
@@ -0,0 +1,85 @@
+{
+  "type": "Group",
+  "elements": [
+    {
+      "type": "Control",
+      "label": "Corresponding Author",
+      "scope": "#/properties/corresponding_author",
+      "options": {
+        "elementLabelProp": "last_name",
+        
+        "detail": {
+          "type": "VerticalLayout",
+          "elements": [
+            {
+              "type": "Control",
+              "label": "ORCID",
+              "scope": "#/properties/author_orcid",
+              "description": "ORCID identifier of the author (format: 0000-0000-0000-000X)"
+            },
+            {
+              "type": "Control",
+              "label": "First Name",
+              "scope": "#/properties/first_name"
+            },
+            {
+              "type": "Control",
+              "label": "Middle Name",
+              "scope": "#/properties/middle_name"
+            },
+            {
+              "type": "Control",
+              "label": "Last Name",
+              "scope": "#/properties/last_name"
+            },
+            {
+              "type": "Control",
+              "label": "Organization",
+              "scope": "#/properties/organization"
+            },
+            {
+              "type": "Control",
+              "label": "Street",
+              "scope": "#/properties/street"
+            },
+            {
+              "type": "Control",
+              "label": "Town/City",
+              "scope": "#/properties/town_or_city"
+            },
+            {
+              "type": "Control",
+              "label": "State/Province",
+              "scope": "#/properties/state_or_province"
+            },
+            {
+              "type": "Control",
+              "label": "Postal/ZIP Code",
+              "scope": "#/properties/post_or_zip"
+            },
+            {
+              "type": "Control",
+              "label": "Telephone",
+              "scope": "#/properties/telephone"
+            },
+            {
+              "type": "Control",
+              "label": "Fax",
+              "scope": "#/properties/fax"
+            },
+            {
+              "type": "Control",
+              "label": "Email",
+              "scope": "#/properties/email"
+            },
+            {
+              "type": "Control",
+              "label": "Country",
+              "scope": "#/properties/country"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/src/app/datasets/empiar/schemasUI/imageSetsUI.json b/src/app/datasets/empiar/schemasUI/imageSetsUI.json
index 5acfa844c9..4f4362c05a 100644
--- a/src/app/datasets/empiar/schemasUI/imageSetsUI.json
+++ b/src/app/datasets/empiar/schemasUI/imageSetsUI.json
@@ -84,7 +84,7 @@
             {
               "type": "Control",
               "label": "Image hight",
-              "scope": "#/properties/image_hight"
+              "scope": "#/properties/image_height"
             }
           ]
         }
diff --git a/src/app/datasets/empiar/schemasUI/authorInfoUI.json b/src/app/datasets/empiar/schemasUI/piInfoUI.json
similarity index 100%
rename from src/app/datasets/empiar/schemasUI/authorInfoUI.json
rename to src/app/datasets/empiar/schemasUI/piInfoUI.json

From 7ca79b956919db71ff44cd8b89b9e513665d7f94 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 4 Apr 2025 11:35:15 +0000
Subject: [PATCH 142/245] improved quantity value renderer

---
 .../customRenderer/any-of-renderer.ts         |  84 ++++++++-----
 .../customRenderer/custom-renderers.ts        |  25 +++-
 .../owner-group-field-renderer.ts             |   4 +-
 .../quantity-value-layout-renderer.ts         |  96 +++++++++++++++
 .../customRenderer/quantity-value-renderer.ts | 115 ++++++++++++++++++
 .../ingestor-metadata-editor.component.scss   |  10 ++
 .../ingestor-metadata-editor.component.ts     |   1 +
 src/app/ingestor/ingestor.module.ts           |   8 ++
 8 files changed, 308 insertions(+), 35 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index d051a7921e..6fcaefb483 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -1,8 +1,17 @@
 import { Component } from "@angular/core";
 import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
-import { ControlProps, JsonSchema } from "@jsonforms/core";
+import {
+  ControlProps,
+  findUISchema,
+  Generate,
+  GroupLayout,
+  JsonSchema,
+  setReadonly,
+  UISchemaElement,
+} from "@jsonforms/core";
 import { configuredRenderer } from "../ingestor-metadata-editor-helper";
 import { MatCheckboxChange } from "@angular/material/checkbox";
+import { cloneDeep, isEmpty, startCase } from "lodash-es";
 
 @Component({
   selector: "app-anyof-renderer",
@@ -25,23 +34,23 @@ import { MatCheckboxChange } from "@angular/material/checkbox";
           animationDuration="0ms" [selectedIndex]="selectedTabIndex" >
           <mat-tab *ngFor="let option of filteredOptions" label="{{ option }}">
             <div *ngIf="option !== 'null'">
-              <jsonforms
+              <jsonforms-outlet
+                [uischema]="getUISchema(option)"
                 [schema]="getTabSchema(option)"
-                [data]="passedProps.data"
-                [renderers]="defaultRenderer"
-                (dataChange)="onInnerJsonFormsChange($event)"
-              ></jsonforms>
+                [path]="propsPath"
+              >
+              </jsonforms-outlet>
             </div>
           </mat-tab>
         </mat-tab-group>
 
         <div *ngIf="tabAmount === 1">
-          <jsonforms
+          <jsonforms-outlet
+            [uischema]="getUISchema(options[0])"
             [schema]="getTabSchema(options[0])"
-            [data]="passedProps.data"
-            [renderers]="defaultRenderer"
-            (dataChange)="onInnerJsonFormsChange($event)"
-          ></jsonforms>
+            [path]="propsPath"
+          >
+          </jsonforms-outlet>
         </div>
       </mat-card-content>
     </mat-card>
@@ -82,6 +91,41 @@ export class AnyOfRendererComponent extends JsonFormsControl {
     this.tabAmount = this.filteredOptions.length;
   }
 
+  public getUISchema(tabOption: string): UISchemaElement {
+    const selectedSchema = this.getTabSchema(tabOption);
+
+
+    const isQuantityValue = selectedSchema.title == "QuantityValue";
+
+    const detailUiSchema = findUISchema(
+      undefined,
+      selectedSchema,
+      this.passedProps.uischema.scope,
+      this.passedProps.path,
+      () => {
+        const newSchema = cloneDeep(selectedSchema);
+        return Generate.uiSchema(
+          newSchema,
+          isQuantityValue ? "QuantityValueLayout" : "VerticalLayout",
+          undefined,
+          this.rootSchema,
+        );
+      },
+      this.passedProps.uischema,
+      this.passedProps.rootSchema,
+    );
+    if (isEmpty(this.passedProps.path)) {
+      detailUiSchema.type = "VerticalLayout";
+    } else {
+      (detailUiSchema as GroupLayout).label = startCase(this.passedProps.path);
+    }
+    if (!this.isEnabled()) {
+      setReadonly(detailUiSchema);
+    }
+
+    return detailUiSchema;
+  }
+
   public getTabSchema(tabOption: string): JsonSchema {
     const selectedSchema = (this.passedProps.schema.anyOf as any).find(
       (option: any) =>
@@ -89,6 +133,7 @@ export class AnyOfRendererComponent extends JsonFormsControl {
         option.type === tabOption ||
         JSON.stringify(option) === tabOption,
     );
+
     return selectedSchema;
   }
 
@@ -110,21 +155,4 @@ export class AnyOfRendererComponent extends JsonFormsControl {
 
     this.rendererService.setData(updatedData);
   }
-
-  public onInnerJsonFormsChange(event: any) {
-    if (event !== this.passedProps.data) {
-      const updatedData =
-        this.rendererService.getState().jsonforms.core.data ?? {};
-
-      // Update the data in the correct path
-      const pathSegments = this.passedProps.path.split(".");
-      let current = updatedData ?? {};
-      for (let i = 0; i < pathSegments.length - 1; i++) {
-        current = current[pathSegments[i]];
-      }
-      current[pathSegments[pathSegments.length - 1]] = event;
-
-      this.rendererService.setData(updatedData);
-    }
-  }
 }
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index d981074344..6d8624eb67 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -15,8 +15,28 @@ import {
   OwnerGroupFieldComponent,
   ownerGroupFieldTester,
 } from "./owner-group-field-renderer";
+import {
+  QuantityValueObjectComponent,
+  quantityValueTester,
+} from "./quantity-value-renderer";
+import {
+  QuantityValueLayoutRendererComponent,
+  quantityValueLayoutTester,
+} from "./quantity-value-layout-renderer";
 
 export const customRenderers: JsonFormsRendererRegistryEntry[] = [
+  {
+    tester: ownerGroupFieldTester,
+    renderer: OwnerGroupFieldComponent,
+  },
+  {
+    tester: quantityValueTester,
+    renderer: QuantityValueObjectComponent,
+  },
+  {
+    tester: quantityValueLayoutTester,
+    renderer: QuantityValueLayoutRendererComponent,
+  },
   /*{
     tester: rankWith(4, isOneOfControl),
     renderer: OneOfRendererComponent,
@@ -29,7 +49,6 @@ export const customRenderers: JsonFormsRendererRegistryEntry[] = [
     tester: rankWith(4, isAnyOfControl),
     renderer: AnyOfRendererComponent,
   },
-  // other
   {
     tester: rankWith(4, isObjectArrayWithNesting),
     renderer: ArrayLayoutRendererCustom,
@@ -39,8 +58,4 @@ export const customRenderers: JsonFormsRendererRegistryEntry[] = [
     tester: ObjectControlRendererTester,
     renderer: CustomObjectControlRendererComponent,
   },
-  {
-    tester: ownerGroupFieldTester,
-    renderer: OwnerGroupFieldComponent,
-  },
 ];
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
index 837661d32e..0782dc0808 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
@@ -68,7 +68,8 @@ import { MatAutocompleteSelectedEvent } from "@angular/material/autocomplete";
 })
 export class OwnerGroupFieldComponent
   extends JsonFormsControl
-  implements OnInit {
+  implements OnInit
+{
   focused = false;
   vm$ = this.store.select(selectUserSettingsPageViewModel);
   userOwnerGroups = [];
@@ -115,7 +116,6 @@ export class OwnerGroupFieldComponent
         this.store.dispatch(fetchCurrentUserAction());
       }
 
-      // Überprüfen Sie den Status des formControl-Objekts und aktivieren Sie es, falls es deaktiviert ist
       if (this.form.disabled) {
         this.form.enable();
       }
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
new file mode 100644
index 0000000000..f94d2157aa
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
@@ -0,0 +1,96 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  Pipe,
+  PipeTransform,
+} from "@angular/core";
+import {
+  JsonSchema,
+  Layout,
+  OwnPropsOfRenderer,
+  RankedTester,
+  rankWith,
+  UISchemaElement,
+  uiTypeIs,
+} from "@jsonforms/core";
+import { JsonFormsAngularService } from "@jsonforms/angular";
+import { LayoutRenderer } from "@jsonforms/angular-material";
+
+@Component({
+  selector: "QuantityValueLayoutRendererComponent",
+  template: `
+    <div
+      [ngStyle]="{ display: hidden ? 'none' : '' }"
+      class="quantity-value-box"
+    >
+      <div
+        class="quantity-value-element"
+        *ngFor="
+          let props of uischema
+            | customLayoutChildrenRenderProps: schema : path;
+          trackBy: trackElement
+        "
+      >
+        <jsonforms-outlet [renderProps]="props"></jsonforms-outlet>
+      </div>
+    </div>
+  `,
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class QuantityValueLayoutRendererComponent extends LayoutRenderer<QuantityValueLayout> {
+  constructor(
+    jsonFormsService: JsonFormsAngularService,
+    changeDetectionRef: ChangeDetectorRef,
+  ) {
+    super(jsonFormsService, changeDetectionRef);
+  }
+}
+export const quantityValueLayoutTester: RankedTester = rankWith(
+  6,
+  uiTypeIs("QuantityValueLayout"),
+);
+
+export interface QuantityValueLayout extends Layout {
+  type: "QuantityValueLayout";
+}
+
+@Pipe({ name: "customLayoutChildrenRenderProps" })
+export class CustomLayoutChildrenRenderPropsPipe implements PipeTransform {
+  transform(
+    uischema: Layout,
+    schema: JsonSchema,
+    path: string,
+  ): OwnPropsOfRenderer[] {
+    const elements = (uischema.elements || [])
+      .map((el: UISchemaElement) => ({
+        uischema: el,
+        schema: schema,
+        path: path,
+      }))
+      .sort((a: any, b: any) => {
+        const scopeA = a.uischema.scope || "";
+        const scopeB = b.uischema.scope || "";
+
+        // Check if one of the scopes contains "value" and the other contains "unit"
+        const isValueA = scopeA.includes("value");
+        const isUnitA = scopeA.includes("unit");
+        const isValueB = scopeB.includes("value");
+        const isUnitB = scopeB.includes("unit");
+
+        if (isValueA && isUnitB) {
+          return -1; // a comes before b
+        }
+        if (isValueB && isUnitA) {
+          return 1; // b comes before a
+        }
+
+        // Fallback to localeCompare if neither condition is met
+        return scopeA.localeCompare(scopeB);
+      });
+
+    console.log("elements", elements);
+    return elements;
+  }
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
index e69de29bb2..71e8b33ec3 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
@@ -0,0 +1,115 @@
+import { Component, OnInit, ChangeDetectionStrategy } from "@angular/core";
+import {
+  JsonFormsAngularService,
+  JsonFormsControlWithDetail,
+} from "@jsonforms/angular";
+import {
+  ControlProps,
+  ControlWithDetailProps,
+  findUISchema,
+  Generate,
+  GroupLayout,
+  JsonSchema,
+  OwnPropsOfRenderer,
+  RankedTester,
+  rankWith,
+  schemaMatches,
+  setReadonly,
+  UISchemaElement,
+} from "@jsonforms/core";
+import { cloneDeep, startCase } from "lodash-es";
+import isEmpty from "lodash/isEmpty";
+
+@Component({
+  selector: "quantity-value-renderer",
+  styleUrls: ["../ingestor-metadata-editor.component.scss"],
+  template: `
+    <mat-card class="anyof-group">
+      <mat-card-title>{{ objectTitle }}</mat-card-title>
+      <mat-card-content>
+        <jsonforms-outlet
+          [uischema]="detailUiSchema"
+          [schema]="scopedSchema"
+          [path]="propsPath"
+        >
+        </jsonforms-outlet>
+      </mat-card-content>
+    </mat-card>
+  `,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class QuantityValueObjectComponent
+  extends JsonFormsControlWithDetail
+  implements OnInit
+{
+  detailUiSchema: UISchemaElement;
+  focused = false;
+  objectTitle: string;
+
+  props: ControlProps;
+
+  constructor(jsonformsService: JsonFormsAngularService) {
+    super(jsonformsService);
+  }
+
+  public mapAdditionalProps(props: ControlWithDetailProps) {
+    super.mapAdditionalProps(props);
+    this.props = props;
+
+    const pathTitle = props.path || "Quantity Value";
+
+    this.objectTitle = pathTitle
+      .replaceAll("_", " ")
+      .split(" ")
+      .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+      .join(" ");
+
+    this.detailUiSchema = findUISchema(
+      props.uischemas,
+      props.schema,
+      props.uischema.scope,
+      props.path,
+      () => {
+        const newSchema = cloneDeep(props.schema);
+        return Generate.uiSchema(
+          newSchema,
+          "QuantityValueLayout",
+          undefined,
+          this.rootSchema,
+        );
+      },
+      props.uischema,
+      props.rootSchema,
+    );
+    if (isEmpty(props.path)) {
+      this.detailUiSchema.type = "VerticalLayout";
+    } else {
+      (this.detailUiSchema as GroupLayout).label = startCase(props.path);
+    }
+    if (!this.isEnabled()) {
+      setReadonly(this.detailUiSchema);
+    }
+  }
+
+  ngOnInit() {
+    // Call ngOnInit from super class
+    super.ngOnInit();
+    if (this.form.disabled) {
+      this.form.enable();
+    }
+  }
+
+  getProps(): OwnPropsOfRenderer {
+    const newProps: OwnPropsOfRenderer = {
+      ...this.props,
+    };
+    return newProps;
+  }
+}
+
+export const quantityValueTester: RankedTester = rankWith(
+  5,
+  schemaMatches((schema: JsonSchema) => {
+    return schema.title === "QuantityValue";
+  }),
+);
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
index c033f74ca6..44a95db72c 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -40,4 +40,14 @@ mat-card {
 
 .custom-input-box {
   width: 100%;
+}
+
+.quantity-value-box {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.quantity-value-element {
+  flex: 1;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 5eb016063a..8d8bfee040 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -26,6 +26,7 @@ export class IngestorMetadataEditorComponent implements OnInit {
     this.visualData = JSON.parse(JSON.stringify(this.data));
 
     // Update the data with the same keys as the schema, including nested properties
+    // This is necessary, otherwise the error checks will not work correctly
     const initializeVisualData = (schema: JsonSchema, target: any) => {
       Object.keys(schema.properties).forEach((key) => {
         const property = schema.properties[key];
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 1880d6797c..5e57f3b6d1 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -37,6 +37,11 @@ import { CustomObjectControlRendererComponent } from "./ingestor-metadata-editor
 import { IngestorFileBrowserComponent } from "./ingestor-file-browser/ingestor.file-browser.component";
 import { MatTreeModule } from "@angular/material/tree";
 import { OwnerGroupFieldComponent } from "./ingestor-metadata-editor/customRenderer/owner-group-field-renderer";
+import { QuantityValueObjectComponent } from "./ingestor-metadata-editor/customRenderer/quantity-value-renderer";
+import {
+  CustomLayoutChildrenRenderPropsPipe,
+  QuantityValueLayoutRendererComponent,
+} from "./ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer";
 
 @NgModule({
   declarations: [
@@ -54,6 +59,9 @@ import { OwnerGroupFieldComponent } from "./ingestor-metadata-editor/customRende
     ExportTemplateHelperComponent,
     IngestorFileBrowserComponent,
     OwnerGroupFieldComponent,
+    QuantityValueObjectComponent,
+    QuantityValueLayoutRendererComponent,
+    CustomLayoutChildrenRenderPropsPipe,
   ],
   imports: [
     CommonModule,

From 48212f6a892a0cc053779bbdc1233f27ae0e074d Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 4 Apr 2025 11:36:49 +0000
Subject: [PATCH 143/245] rm log

---
 .../customRenderer/quantity-value-layout-renderer.ts            | 1 -
 src/app/ingestor/ingestor/helper/ingestor-api-manager.ts        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
index f94d2157aa..a4b1eede24 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
@@ -90,7 +90,6 @@ export class CustomLayoutChildrenRenderPropsPipe implements PipeTransform {
         return scopeA.localeCompare(scopeB);
       });
 
-    console.log("elements", elements);
     return elements;
   }
 }
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index 0b22307831..f6c6d35661 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -93,7 +93,7 @@ export class IngestorAPIManager {
   public cancelTransfer(transferId: string): Promise<DeleteTransferResponse> {
     const body: DeleteTransferRequest = { transferId: transferId };
 
-    console.log("Cancel transfer", transferId);
+    //console.log("Cancel transfer", transferId);
     return new Promise((resolve, reject) => {
       this.http
         .delete(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {

From cc915fb969073104a3248386103f57b18c660661 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 8 Apr 2025 06:37:45 +0000
Subject: [PATCH 144/245] Implemented check for schema error

---
 .../customRenderer/any-of-renderer.ts         |  1 -
 .../customRenderer/object-group-renderer.ts   | 50 ++++++++++++++-----
 .../customRenderer/quantity-value-renderer.ts |  8 ---
 .../ingestor-metadata-editor.component.ts     |  8 ++-
 .../ingestor/helper/ingestor-api-manager.ts   |  1 -
 5 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 6fcaefb483..1869eac47f 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -94,7 +94,6 @@ export class AnyOfRendererComponent extends JsonFormsControl {
   public getUISchema(tabOption: string): UISchemaElement {
     const selectedSchema = this.getTabSchema(tabOption);
 
-
     const isQuantityValue = selectedSchema.title == "QuantityValue";
 
     const detailUiSchema = findUISchema(
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
index 0073e49950..68ab804f3a 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -10,7 +10,7 @@ import {
 } from "../ingestor-metadata-editor-helper";
 
 @Component({
-  selector: "app-objec==t-group-renderer",
+  selector: "app-object-group-renderer",
   styleUrls: ["../ingestor-metadata-editor.component.scss"],
   template: `
     <mat-card class="anyof-group">
@@ -28,13 +28,20 @@ import {
         </mat-icon>
       </mat-card-title>
       <mat-card-content>
-        <jsonforms
-          [schema]="passedProps.schema"
-          [data]="passedProps.data"
-          [renderers]="defaultRenderer"
-          (dataChange)="onInnerJsonFormsChange($event)"
-          (errors)="onInnerErrors($event)"
-        ></jsonforms>
+        <div *ngIf="errorRecursiveStructure === false">
+          <jsonforms
+            [schema]="scopedSchema"
+            [data]="data"
+            [renderers]="defaultRenderer"
+            (dataChange)="onInnerJsonFormsChange($event)"
+            (errors)="onInnerErrors($event)"
+          ></jsonforms>
+        </div>
+
+        <p *ngIf="errorRecursiveStructure">
+          <mat-icon color="warn">error_outline</mat-icon>
+          Recursive data structure in selected JSON Schema detected.
+        </p>
       </mat-card-content>
     </mat-card>
   `,
@@ -43,9 +50,9 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
   rendererService: JsonFormsAngularService;
 
   defaultRenderer = configuredRenderer;
-  passedProps: ControlProps;
   objectTitle: string;
   innerErrors: string;
+  errorRecursiveStructure: boolean;
 
   constructor(
     service: JsonFormsAngularService,
@@ -56,9 +63,10 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
   }
 
   public mapAdditionalProps(props: ControlProps) {
-    this.passedProps = props;
     const pathTitle = props.path || "Object";
 
+    this.errorRecursiveStructure = this.isRecursive();
+
     this.objectTitle = pathTitle
       .replaceAll("_", " ")
       .split(" ")
@@ -67,12 +75,12 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
   }
 
   public onInnerJsonFormsChange(event: any) {
-    if (event !== this.passedProps.data) {
+    if (event !== this.data) {
       const updatedData =
         this.rendererService.getState().jsonforms.core.data ?? {};
 
       // Update the data in the correct path
-      const pathSegments = this.passedProps.path.split(".");
+      const pathSegments = this.path.split(".");
       let current = updatedData ?? {};
       for (let i = 0; i < pathSegments.length - 1; i++) {
         current = current[pathSegments[i]];
@@ -87,4 +95,22 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
     this.innerErrors = convertJSONFormsErrorToString(errors);
     this.cdr.detectChanges();
   }
+
+  isRecursive(): boolean {
+    const rootSchemaAsString = JSON.stringify(this.scopedSchema);
+    const scopedSchemaAsString = JSON.stringify(this.rootSchema);
+
+    // Check if root and scoped schema are equal and if expected type is object
+    if (
+      rootSchemaAsString === scopedSchemaAsString &&
+      ((Array.isArray(this.scopedSchema.type) &&
+        this.scopedSchema.type.includes("object")) ||
+        (typeof this.scopedSchema.type === "string" &&
+          this.scopedSchema.type === "object"))
+    ) {
+      return true;
+    }
+
+    return false;
+  }
 }
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
index 71e8b33ec3..db73dda08e 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
@@ -10,7 +10,6 @@ import {
   Generate,
   GroupLayout,
   JsonSchema,
-  OwnPropsOfRenderer,
   RankedTester,
   rankWith,
   schemaMatches,
@@ -98,13 +97,6 @@ export class QuantityValueObjectComponent
       this.form.enable();
     }
   }
-
-  getProps(): OwnPropsOfRenderer {
-    const newProps: OwnPropsOfRenderer = {
-      ...this.props,
-    };
-    return newProps;
-  }
 }
 
 export const quantityValueTester: RankedTester = rankWith(
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 8d8bfee040..ab001574b9 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -27,6 +27,7 @@ export class IngestorMetadataEditorComponent implements OnInit {
 
     // Update the data with the same keys as the schema, including nested properties
     // This is necessary, otherwise the error checks will not work correctly
+    // Fill empty boolean with false to avoid undefined errors
     const initializeVisualData = (schema: JsonSchema, target: any) => {
       Object.keys(schema.properties).forEach((key) => {
         const property = schema.properties[key];
@@ -35,11 +36,17 @@ export class IngestorMetadataEditorComponent implements OnInit {
             target[key] = {};
           }
           initializeVisualData(property, target[key]);
+        } else if (property.type === "boolean") {
+          if (target[key] === undefined || target[key] === null) {
+            target[key] = false;
+          }
         }
       });
     };
 
     initializeVisualData(this.schema, this.visualData);
+
+    //console.log(this.schema);
   }
 
   get combinedRenderers() {
@@ -48,7 +55,6 @@ export class IngestorMetadataEditorComponent implements OnInit {
 
   onDataChange(event: any) {
     this.dataChange.emit(event);
-    //console.log(this.schema);
   }
 
   onErrors(errors: any[]) {
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
index f6c6d35661..b3e116149b 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
@@ -243,7 +243,6 @@ export class IngestorAPIManager {
     return new Promise((resolve, reject) => {
       this.http.get(AUTODISCOVERY_ENDPOINT, {}).subscribe({
         next: (data) => {
-          console.log(data);
           resolve(data as string);
         },
         error: (error) => {

From 2acd8f04a7d56465ee616891511a8cae1ac37f74 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 8 Apr 2025 14:39:00 +0000
Subject: [PATCH 145/245] Create JSON Mode

---
 src/app/ingestor/ingestor.module.ts           |  2 ++
 .../ingestor.dialog-stepper.component.html    |  8 +++++++
 .../ingestor.dialog-stepper.component.ts      | 21 +++++++++++++++++++
 ...estor.confirm-transfer-dialog.component.ts | 12 +++++++++++
 .../ingestor.confirm-transfer-dialog.html     |  6 +++++-
 .../ingestor.new-transfer-dialog.component.ts | 14 ++++++++++---
 .../dialog/ingestor.new-transfer-dialog.html  |  9 +++++---
 .../helper/ingestor.component-helper.ts       |  4 ++++
 .../ingestor/ingestor/ingestor.component.ts   | 21 +++++++++++++++----
 9 files changed, 86 insertions(+), 11 deletions(-)

diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 5e57f3b6d1..6c3891ff68 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -42,6 +42,7 @@ import {
   CustomLayoutChildrenRenderPropsPipe,
   QuantityValueLayoutRendererComponent,
 } from "./ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer";
+import { MatMenuModule } from "@angular/material/menu";
 
 @NgModule({
   declarations: [
@@ -89,6 +90,7 @@ import {
     JsonFormsAngularMaterialModule,
     CommonModule,
     MatPaginatorModule,
+    MatMenuModule,
   ],
 })
 export class IngestorModule {}
diff --git a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.html
index f5498dd673..84139aef31 100644
--- a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -1,8 +1,16 @@
 <div class="dialog-control-buttons">
   <button mat-button matTooltip="Save the current values." [disabled]="activeStep < 1" (click)="onSave()"><mat-icon class="control-button-icon">save</mat-icon></button>
   <button mat-button matTooltip="Upload a template." [disabled]="activeStep < 1" (click)="onUpload()"><mat-icon class="control-button-icon">upload</mat-icon></button>
+  <button *ngIf="this.createNewTransferData !== undefined" mat-button [matMenuTriggerFor]="settingsMenu" matTooltip="Customize the metadata editor" [disabled]="activeStep > 0"><mat-icon class="control-button-icon">settings</mat-icon></button>
 </div>
 
+<mat-menu #settingsMenu="matMenu">
+  <button *ngIf="this.createNewTransferData !== undefined" mat-menu-item (click)="onSwitchEditorMode('INGESTION')">
+    <mat-icon *ngIf="this.createNewTransferData.editorMode === 'INGESTION' ?? false">check</mat-icon>Ingestion-Mode</button>
+  <button *ngIf="this.createNewTransferData !== undefined" mat-menu-item (click)="onSwitchEditorMode('EDITOR')">
+    <mat-icon *ngIf="this.createNewTransferData.editorMode === 'EDITOR' ?? false">check</mat-icon>Create JSON-Mode</button>
+</mat-menu>
+
 <div class="stepper">
   <mat-stepper [linear]="true" [selectedIndex]="activeStep" class="ingestor-stepper">
     <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
diff --git a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 8242dd5b50..49c58df6ab 100644
--- a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -4,6 +4,7 @@ import {
   Output,
   EventEmitter,
   Injector,
+  OnInit,
 } from "@angular/core";
 import { MatDialog } from "@angular/material/dialog";
 import {
@@ -153,4 +154,24 @@ export class IngestorDialogStepperComponent {
     };
     input.click();
   }
+
+  onSwitchEditorMode(mode: string) {
+    if (this.createNewTransferData) {
+      switch (mode) {
+        case "INGESTION":
+          this.createNewTransferData.editorMode = "INGESTION";
+          break;
+        case "EDITOR":
+          this.createNewTransferData.editorMode = "EDITOR";
+          break;
+        default:
+          console.error("Unknown mode");
+      }
+
+      // Clean selected file and selected method
+      this.createNewTransferData.selectedPath = "";
+      this.createNewTransferData.selectedMethod = null;
+      this.createNewTransferDataChange.emit(this.createNewTransferData);
+    }
+  }
 }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
index 9d5b92d303..ab3b93854a 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -19,6 +19,7 @@ export class IngestorConfirmTransferDialogComponent implements OnInit {
   provideMergeMetaData = "";
   backendURL = "";
   errorMessage = "";
+  copiedToClipboard = false;
 
   constructor(
     public dialog: MatDialog,
@@ -92,4 +93,15 @@ export class IngestorConfirmTransferDialogComponent implements OnInit {
       });
     }
   }
+
+  onCopyMetadata(): void {
+    navigator.clipboard.writeText(this.provideMergeMetaData).then(
+      () => {
+        this.copiedToClipboard = true;
+      },
+      (err) => {
+        console.error("Failed to copy metadata to clipboard: ", err);
+      },
+    );
+  }
 }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
index 0226b835a5..77f2d8c36a 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
@@ -42,6 +42,10 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial
+  <button *ngIf="createNewTransferData.editorMode === 'INGESTION'" mat-button color="primary" cdkFocusInitial
     (click)="onClickConfirm()">Ingest</button>
+    <button *ngIf="createNewTransferData.editorMode === 'EDITOR'" mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">
+      {{!copiedToClipboard ? "Copy JSON" : "Copied!"}}
+    </button>
+    <button *ngIf="copiedToClipboard" mat-dialog-close mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">Close</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index fdeb8f1afb..2b0d75e30c 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -128,9 +128,13 @@ export class IngestorNewTransferDialogComponent implements OnInit {
   }
 
   validateNextButton(): void {
-    this.uiNextButtonReady =
-      !!this.createNewTransferData.selectedPath &&
-      !!this.createNewTransferData.selectedMethod?.name;
+    const selectedPathReady =
+      (this.createNewTransferData.editorMode === "INGESTION" &&
+        this.createNewTransferData.selectedPath) ||
+      this.createNewTransferData.editorMode === "EDITOR";
+    const selectedMethodReady = this.createNewTransferData.selectedMethod?.name;
+
+    this.uiNextButtonReady = !!selectedPathReady && !!selectedMethodReady;
   }
 
   onExtractorMethodsPageChange(event: PageChangeEvent) {
@@ -146,4 +150,8 @@ export class IngestorNewTransferDialogComponent implements OnInit {
       },
     });
   }
+
+  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
+    Object.assign(this.createNewTransferData, updatedData);
+  }
 }
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
index 4672769e9e..98017d7c10 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
@@ -8,12 +8,14 @@ <h2 mat-dialog-title>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
-  <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
+  <ingestor-dialog-stepper [activeStep]="0"
+  [createNewTransferData]="createNewTransferData"
+  (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
 
   <p>Please select the dataset to be uploaded and the appropriate metadata
     extractor method.</p>
 
-  <div>
+  <div *ngIf="createNewTransferData.editorMode === 'INGESTION'">
     <mat-form-field class="form-full-width">
       <mat-label>File Path</mat-label>
       <input matInput [(ngModel)]="selectedPath" (click)="onClickOpenFileBrowser()" readonly>
@@ -26,7 +28,8 @@ <h2 mat-dialog-title>
 
   <div *ngIf="extractionMethods !== null">
     <mat-form-field class="form-full-width">
-      <mat-label>Extraction Method</mat-label>
+      <mat-label *ngIf="createNewTransferData.editorMode === 'INGESTION'">Extraction Method</mat-label>
+      <mat-label *ngIf="createNewTransferData.editorMode === 'EDITOR'">Editor schema</mat-label>
       <mat-select [(ngModel)]="selectedMethod">
         <mat-option *ngFor="let method of extractionMethods.methods" [value]="method">
           {{ method.name }}
diff --git a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
index 9a93848c95..780caf2928 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
@@ -11,6 +11,7 @@ export interface IngestionRequestInformation {
   selectedMethod: ExtractionMethod;
   selectedResolvedDecodedSchema: JsonSchema;
   scicatHeader: object;
+
   userMetaData: {
     organizational: object;
     sample: object;
@@ -19,8 +20,10 @@ export interface IngestionRequestInformation {
     instrument: object;
     acquisition: object;
   };
+
   mergedMetaDataString: string;
 
+  editorMode: string;
   apiInformation: {
     extractMetaDataRequested: boolean;
     extractorMetaDataReady: boolean;
@@ -92,6 +95,7 @@ export class IngestorHelper {
         acquisition: {},
       },
       mergedMetaDataString: "",
+      editorMode: "INGESTION",
       apiInformation: {
         metaDataExtractionFailed: false,
         extractMetaDataRequested: false,
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor/ingestor.component.ts
index 871f7cf99a..a8513cba22 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor/ingestor.component.ts
@@ -88,7 +88,7 @@ export class IngestorComponent implements OnInit {
     private apiManager: IngestorAPIManager,
     private sseService: IngestorMetadataSSEService,
     private store: Store,
-  ) {}
+  ) { }
 
   ngOnInit() {
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
@@ -317,6 +317,13 @@ export class IngestorComponent implements OnInit {
     this.onClickNext(0); // Open first dialog to start the ingestion process
   }
 
+  resetExtractedMetadata(): void {
+    this.createNewTransferData.extractorMetaData = {
+      instrument: {},
+      acquisition: {},
+    };
+  }
+
   onClickNext(step: number): void {
     this.dialog.closeAll();
 
@@ -340,9 +347,15 @@ export class IngestorComponent implements OnInit {
 
         break;
       case 1:
-        this.startMetadataExtraction().catch((error) => {
-          console.error("Metadata extraction error", error);
-        });
+        this.resetExtractedMetadata();
+        if (this.createNewTransferData.editorMode === "INGESTION") {
+          this.startMetadataExtraction().catch((error) => {
+            console.error("Metadata extraction error", error);
+          });
+        } else if (this.createNewTransferData.editorMode === "EDITOR") {
+          this.createNewTransferData.apiInformation.extractorMetaDataReady =
+            true;
+        }
 
         dialogRef = this.dialog.open(IngestorUserMetadataDialogComponent, {
           data: {

From c113a7cfd43ea1ea99f3e2e4648f4a339004295a Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 10 Apr 2025 07:51:06 +0000
Subject: [PATCH 146/245] bug fix - validate not working when selecting path

---
 .../ingestor.new-transfer-dialog.component.ts | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
index 2b0d75e30c..4c431226ad 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
@@ -130,9 +130,12 @@ export class IngestorNewTransferDialogComponent implements OnInit {
   validateNextButton(): void {
     const selectedPathReady =
       (this.createNewTransferData.editorMode === "INGESTION" &&
-        this.createNewTransferData.selectedPath) ||
+        this.createNewTransferData.selectedPath !== "") ||
       this.createNewTransferData.editorMode === "EDITOR";
-    const selectedMethodReady = this.createNewTransferData.selectedMethod?.name;
+    const selectedMethodReady =
+      this.selectedMethod !== null &&
+      this.selectedMethod !== undefined &&
+      this.selectedMethod.name !== "";
 
     this.uiNextButtonReady = !!selectedPathReady && !!selectedMethodReady;
   }
@@ -143,15 +146,21 @@ export class IngestorNewTransferDialogComponent implements OnInit {
   }
 
   onClickOpenFileBrowser(): void {
-    this.dialog.open(IngestorFileBrowserComponent, {
-      data: {
-        backendURL: this.backendURL,
-        createNewTransferData: this.createNewTransferData,
-      },
-    });
+    this.dialog
+      .open(IngestorFileBrowserComponent, {
+        data: {
+          backendURL: this.backendURL,
+          createNewTransferData: this.createNewTransferData,
+        },
+      })
+      .afterClosed()
+      .subscribe(() => {
+        this.validateNextButton();
+      });
   }
 
   onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
     Object.assign(this.createNewTransferData, updatedData);
+    this.validateNextButton();
   }
 }

From 24dcc3cdc9db5b9c822ef3277593562a4871ae92 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 10 Apr 2025 09:40:34 +0000
Subject: [PATCH 147/245] redirect to deposition

---
 src/app/state-management/effects/depositor.effects.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/state-management/effects/depositor.effects.ts b/src/app/state-management/effects/depositor.effects.ts
index 95837baef7..3870fc986a 100644
--- a/src/app/state-management/effects/depositor.effects.ts
+++ b/src/app/state-management/effects/depositor.effects.ts
@@ -107,6 +107,12 @@ export class OneDepEffects {
             "Deposition Created Successfully. Deposition ID: " + deposition.id,
           duration: 5000,
         };
+        setTimeout(function () {
+          window.open(
+            `https://onedep-depui-test.wwpdb.org/deposition/api/v1/depositions/${deposition.id}/view`,
+            "_blank",
+          );
+        }, 1800);
         return of(showMessageAction({ message }));
       }),
     );

From 0dd64a668db43ec2d522bd752ebca8956b15347d Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 17 Apr 2025 13:45:55 +0000
Subject: [PATCH 148/245] Save latest store version

---
 src/app/app-config.service.ts                 |   1 +
 .../ingestor.routing.module.ts                |   2 +-
 .../{ingestor => }/_ingestor-theme.scss       |   0
 .../ingestor.confirmation-dialog.component.ts |   2 +-
 .../ingestor.confirmation-dialog.html         |   0
 ...estor.confirm-transfer-dialog.component.ts |   6 +-
 .../ingestor.confirm-transfer-dialog.html     |   0
 ...tor.extractor-metadata-dialog.component.ts |   4 +-
 .../ingestor.extractor-metadata-dialog.html   |   0
 .../ingestor.new-transfer-dialog.component.ts |  10 +-
 .../ingestor.new-transfer-dialog.html         |   0
 ...ingestor.user-metadata-dialog.component.ts |   4 +-
 .../ingestor.user-metadata-dialog.html        |   0
 .../ingestor.dialog-stepper.component.css     |   0
 .../ingestor.dialog-stepper.component.html    |   0
 .../ingestor.dialog-stepper.component.ts      |   2 +-
 .../ingestor.export-helper.component.ts       |   0
 .../ingestor.file-browser.component.html      |   0
 .../ingestor.file-browser.component.ts        |  10 +-
 .../helper/ingestor-api-endpoints.ts          |   0
 .../helper/ingestor-api-manager.ts            |   2 +-
 .../helper/ingestor.component-helper.ts       |   2 +-
 .../helper/ingestor.metadata-sse-service.ts   |   0
 .../ingestor.component.html                   |   0
 .../ingestor.component.scss                   |   0
 .../ingestor.component.spec.ts                |   0
 .../ingestor.component.ts                     |  70 ++++++------
 src/app/ingestor/ingestor.module.ts           |  24 ++--
 src/app/shared/sdk/apis/ingestor.service.ts   |  57 ++++++++++
 .../sdk/models/ingestor}/_generateModel.md    |   0
 .../models/ingestor}/deleteTransferRequest.ts |   0
 .../ingestor}/deleteTransferResponse.ts       |   0
 .../sdk/models/ingestor}/folderNode.ts        |   0
 .../ingestor}/getBrowseDatasetResponse.ts     |   0
 .../models/ingestor}/getDatasetResponse.ts    |   0
 .../models/ingestor}/getExtractorResponse.ts  |   0
 .../models/ingestor}/getTransferResponse.ts   |   0
 .../sdk/models/ingestor}/methodItem.ts        |   0
 .../sdk/models/ingestor}/modelError.ts        |   0
 .../sdk/models/ingestor}/models.ts            |   0
 .../sdk/models/ingestor}/oidcCallbackOk.ts    |   0
 .../ingestor}/oidcCallbackOkOAuth2Token.ts    |   0
 .../ingestor}/oidcCallbackOkUserInfo.ts       |   0
 .../models/ingestor}/otherHealthResponse.ts   |   0
 .../models/ingestor}/otherVersionResponse.ts  |   0
 .../models/ingestor}/postDatasetRequest.ts    |   0
 .../models/ingestor}/postDatasetResponse.ts   |   0
 .../sdk/models/ingestor}/transferItem.ts      |   0
 .../sdk/models/ingestor}/userInfo.ts          |   0
 .../actions/ingestor.actions.ts               |  23 ++++
 .../effects/ingestor.effect.ts                | 106 ++++++++++++++++++
 .../reducers/ingestor.reducer.ts              |  51 +++++++++
 .../selectors/ingestor.selector.ts            |  20 ++++
 .../state-management/state/ingestor.store.ts  |  31 +++++
 src/styles.scss                               |   2 +-
 55 files changed, 364 insertions(+), 65 deletions(-)
 rename src/app/ingestor/{ingestor => }/_ingestor-theme.scss (100%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs}/confirmation-dialog/ingestor.confirmation-dialog.component.ts (93%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs}/confirmation-dialog/ingestor.confirmation-dialog.html (100%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs/creation-dialog}/ingestor.confirm-transfer-dialog.component.ts (92%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs/creation-dialog}/ingestor.confirm-transfer-dialog.html (100%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs/creation-dialog}/ingestor.extractor-metadata-dialog.component.ts (96%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs/creation-dialog}/ingestor.extractor-metadata-dialog.html (100%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs/creation-dialog}/ingestor.new-transfer-dialog.component.ts (93%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs/creation-dialog}/ingestor.new-transfer-dialog.html (100%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs/creation-dialog}/ingestor.user-metadata-dialog.component.ts (96%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs/creation-dialog}/ingestor.user-metadata-dialog.html (100%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs}/dialog-mounting-components/ingestor.dialog-stepper.component.css (100%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs}/dialog-mounting-components/ingestor.dialog-stepper.component.html (100%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs}/dialog-mounting-components/ingestor.dialog-stepper.component.ts (98%)
 rename src/app/ingestor/{ingestor/dialog => ingestor-dialogs}/dialog-mounting-components/ingestor.export-helper.component.ts (100%)
 rename src/app/ingestor/{ => ingestor-dialogs}/ingestor-file-browser/ingestor.file-browser.component.html (100%)
 rename src/app/ingestor/{ => ingestor-dialogs}/ingestor-file-browser/ingestor.file-browser.component.ts (92%)
 rename src/app/ingestor/{ingestor => ingestor-page}/helper/ingestor-api-endpoints.ts (100%)
 rename src/app/ingestor/{ingestor => ingestor-page}/helper/ingestor-api-manager.ts (99%)
 rename src/app/ingestor/{ingestor => ingestor-page}/helper/ingestor.component-helper.ts (98%)
 rename src/app/ingestor/{ingestor => ingestor-page}/helper/ingestor.metadata-sse-service.ts (100%)
 rename src/app/ingestor/{ingestor => ingestor-page}/ingestor.component.html (100%)
 rename src/app/ingestor/{ingestor => ingestor-page}/ingestor.component.scss (100%)
 rename src/app/ingestor/{ingestor => ingestor-page}/ingestor.component.spec.ts (100%)
 rename src/app/ingestor/{ingestor => ingestor-page}/ingestor.component.ts (89%)
 create mode 100644 src/app/shared/sdk/apis/ingestor.service.ts
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/_generateModel.md (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/deleteTransferRequest.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/deleteTransferResponse.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/folderNode.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/getBrowseDatasetResponse.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/getDatasetResponse.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/getExtractorResponse.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/getTransferResponse.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/methodItem.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/modelError.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/models.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/oidcCallbackOk.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/oidcCallbackOkOAuth2Token.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/oidcCallbackOkUserInfo.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/otherHealthResponse.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/otherVersionResponse.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/postDatasetRequest.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/postDatasetResponse.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/transferItem.ts (100%)
 rename src/app/{ingestor/model => shared/sdk/models/ingestor}/userInfo.ts (100%)
 create mode 100644 src/app/state-management/actions/ingestor.actions.ts
 create mode 100644 src/app/state-management/effects/ingestor.effect.ts
 create mode 100644 src/app/state-management/reducers/ingestor.reducer.ts
 create mode 100644 src/app/state-management/selectors/ingestor.selector.ts
 create mode 100644 src/app/state-management/state/ingestor.store.ts

diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index 7dec6effdf..0e5570ae6e 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -64,6 +64,7 @@ export interface AppConfig {
   jupyterHubUrl: string | null;
   landingPage: string | null;
   lbBaseURL: string;
+  ingestorURL: string;
   localColumns?: TableColumn[]; // localColumns is deprecated and should be removed in the future
   logbookEnabled: boolean;
   loginFormEnabled: boolean;
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
index c1a5b047d5..03d079021a 100644
--- a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
+++ b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
-import { IngestorComponent } from "ingestor/ingestor/ingestor.component";
+import { IngestorComponent } from "ingestor/ingestor-page/ingestor.component";
 
 const routes: Routes = [
   {
diff --git a/src/app/ingestor/ingestor/_ingestor-theme.scss b/src/app/ingestor/_ingestor-theme.scss
similarity index 100%
rename from src/app/ingestor/ingestor/_ingestor-theme.scss
rename to src/app/ingestor/_ingestor-theme.scss
diff --git a/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.ts
similarity index 93%
rename from src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts
rename to src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.ts
index c6d174fded..918c9dc46c 100644
--- a/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.ts
@@ -4,7 +4,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
 @Component({
   selector: "app-ingestor-confirmation-dialog",
   templateUrl: "./ingestor.confirmation-dialog.html",
-  styleUrls: ["../../ingestor.component.scss"],
+  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorConfirmationDialogComponent {
   constructor(
diff --git a/src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.html b/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.html
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.html
rename to src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.html
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.component.ts
similarity index 92%
rename from src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.component.ts
index ab3b93854a..9185c2c296 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.component.ts
@@ -5,13 +5,13 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
   SciCatHeader,
-} from "../helper/ingestor.component-helper";
-import { IngestorConfirmationDialogComponent } from "./confirmation-dialog/ingestor.confirmation-dialog.component";
+} from "../../ingestor-page/helper/ingestor.component-helper";
+import { IngestorConfirmationDialogComponent } from "../confirmation-dialog/ingestor.confirmation-dialog.component";
 
 @Component({
   selector: "ingestor.confirm-transfer-dialog",
   templateUrl: "ingestor.confirm-transfer-dialog.html",
-  styleUrls: ["../ingestor.component.scss"],
+  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorConfirmTransferDialogComponent implements OnInit {
   createNewTransferData: IngestionRequestInformation =
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.html
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/ingestor.confirm-transfer-dialog.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.html
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.component.ts
similarity index 96%
rename from src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.component.ts
index 33c7673ffc..5017088875 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.component.ts
@@ -5,13 +5,13 @@ import {
   DialogDataObject,
   IngestionRequestInformation,
   IngestorHelper,
-} from "../helper/ingestor.component-helper";
+} from "../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 @Component({
   selector: "ingestor.extractor-metadata-dialog",
   templateUrl: "ingestor.extractor-metadata-dialog.html",
-  styleUrls: ["../ingestor.component.scss"],
+  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorExtractorMetadataDialogComponent {
   metadataSchemaInstrument: JsonSchema;
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.html
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/ingestor.extractor-metadata-dialog.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.html
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.component.ts
similarity index 93%
rename from src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.component.ts
index 4c431226ad..707950b4f7 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.component.ts
@@ -6,17 +6,17 @@ import {
   ExtractionMethod,
   IngestionRequestInformation,
   IngestorHelper,
-} from "../helper/ingestor.component-helper";
+} from "../../ingestor-page/helper/ingestor.component-helper";
 import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
-import { IngestorAPIManager } from "../helper/ingestor-api-manager";
-import { GetExtractorResponse } from "ingestor/model/models";
+import { IngestorAPIManager } from "../../ingestor-page/helper/ingestor-api-manager";
+import { GetExtractorResponse } from "shared/sdk/models/ingestor/models";
 import { PageChangeEvent } from "shared/modules/table/table.component";
-import { IngestorFileBrowserComponent } from "ingestor/ingestor-file-browser/ingestor.file-browser.component";
+import { IngestorFileBrowserComponent } from "ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component";
 
 @Component({
   selector: "ingestor.new-transfer-dialog",
   templateUrl: "ingestor.new-transfer-dialog.html",
-  styleUrls: ["../ingestor.component.scss"],
+  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorNewTransferDialogComponent implements OnInit {
   extractionMethods: GetExtractorResponse = null;
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.html
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/ingestor.new-transfer-dialog.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.html
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.component.ts
similarity index 96%
rename from src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.component.ts
index 2271fd6ede..3ba9f156fd 100644
--- a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.component.ts
@@ -6,13 +6,13 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
   SciCatHeader_Schema,
-} from "../helper/ingestor.component-helper";
+} from "../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 @Component({
   selector: "ingestor.user-metadata-dialog",
   templateUrl: "ingestor.user-metadata-dialog.html",
-  styleUrls: ["../ingestor.component.scss"],
+  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorUserMetadataDialogComponent {
   metadataSchemaOrganizational: JsonSchema;
diff --git a/src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.html
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/ingestor.user-metadata-dialog.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.html
diff --git a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.css b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.css
rename to src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css
diff --git a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.html
rename to src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
diff --git a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
similarity index 98%
rename from src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
rename to src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 49c58df6ab..090ec80fd6 100644
--- a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -10,7 +10,7 @@ import { MatDialog } from "@angular/material/dialog";
 import {
   IngestionRequestInformation,
   SciCatHeader,
-} from "../../helper/ingestor.component-helper";
+} from "../../ingestor-page/helper/ingestor.component-helper";
 import { IngestorConfirmationDialogComponent } from "../confirmation-dialog/ingestor.confirmation-dialog.component";
 import {
   ExportOptions,
diff --git a/src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.ts
similarity index 100%
rename from src/app/ingestor/ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component.ts
rename to src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.ts
diff --git a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
similarity index 100%
rename from src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.html
rename to src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
diff --git a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
similarity index 92%
rename from src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
rename to src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
index e0b0c7b31f..53316f0afb 100644
--- a/src/app/ingestor/ingestor-file-browser/ingestor.file-browser.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -1,13 +1,13 @@
 import { ChangeDetectorRef, Component, Inject, OnInit } from "@angular/core";
 import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
-import { IngestorAPIManager } from "ingestor/ingestor/helper/ingestor-api-manager";
+import { IngestorAPIManager } from "ingestor/ingestor-page/helper/ingestor-api-manager";
 import {
   IngestionRequestInformation,
   IngestorHelper,
   DialogDataObject,
-} from "ingestor/ingestor/helper/ingestor.component-helper";
-import { FolderNode } from "ingestor/model/folderNode";
-import { GetBrowseDatasetResponse } from "ingestor/model/models";
+} from "ingestor/ingestor-page/helper/ingestor.component-helper";
+import { FolderNode } from "shared/sdk/models/ingestor/folderNode";
+import { GetBrowseDatasetResponse } from "shared/sdk/models/ingestor/models";
 import { PageChangeEvent } from "shared/modules/table/table.component";
 
 export interface BrowsableNode extends FolderNode {
@@ -24,7 +24,7 @@ export interface GoBackNode extends FolderNode {
 @Component({
   selector: "ingestor.file-browser.component",
   templateUrl: "ingestor.file-browser.component.html",
-  styleUrls: ["../ingestor/ingestor.component.scss"],
+  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorFileBrowserComponent implements OnInit {
   private _activeNode: BrowsableNode | null = null;
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor-page/helper/ingestor-api-endpoints.ts
similarity index 100%
rename from src/app/ingestor/ingestor/helper/ingestor-api-endpoints.ts
rename to src/app/ingestor/ingestor-page/helper/ingestor-api-endpoints.ts
diff --git a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts
similarity index 99%
rename from src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
rename to src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts
index b3e116149b..068c461e67 100644
--- a/src/app/ingestor/ingestor/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts
@@ -12,7 +12,7 @@ import {
   OtherVersionResponse,
   PostDatasetRequest,
   UserInfo,
-} from "ingestor/model/models";
+} from "shared/sdk/models/ingestor/models";
 
 @Injectable({
   providedIn: "root",
diff --git a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
similarity index 98%
rename from src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
rename to src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 780caf2928..12ff330500 100644
--- a/src/app/ingestor/ingestor/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -1,5 +1,5 @@
 import { JsonSchema } from "@jsonforms/core";
-import { UserInfo } from "ingestor/model/userInfo";
+import { UserInfo } from "shared/sdk/models/ingestor/userInfo";
 
 export interface ExtractionMethod {
   name: string;
diff --git a/src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts b/src/app/ingestor/ingestor-page/helper/ingestor.metadata-sse-service.ts
similarity index 100%
rename from src/app/ingestor/ingestor/helper/ingestor.metadata-sse-service.ts
rename to src/app/ingestor/ingestor-page/helper/ingestor.metadata-sse-service.ts
diff --git a/src/app/ingestor/ingestor/ingestor.component.html b/src/app/ingestor/ingestor-page/ingestor.component.html
similarity index 100%
rename from src/app/ingestor/ingestor/ingestor.component.html
rename to src/app/ingestor/ingestor-page/ingestor.component.html
diff --git a/src/app/ingestor/ingestor/ingestor.component.scss b/src/app/ingestor/ingestor-page/ingestor.component.scss
similarity index 100%
rename from src/app/ingestor/ingestor/ingestor.component.scss
rename to src/app/ingestor/ingestor-page/ingestor.component.scss
diff --git a/src/app/ingestor/ingestor/ingestor.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor.component.spec.ts
similarity index 100%
rename from src/app/ingestor/ingestor/ingestor.component.spec.ts
rename to src/app/ingestor/ingestor-page/ingestor.component.spec.ts
diff --git a/src/app/ingestor/ingestor/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
similarity index 89%
rename from src/app/ingestor/ingestor/ingestor.component.ts
rename to src/app/ingestor/ingestor-page/ingestor.component.ts
index a8513cba22..8bb358f4a7 100644
--- a/src/app/ingestor/ingestor/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -2,11 +2,11 @@ import { Component, inject, OnInit } from "@angular/core";
 import { HttpParams } from "@angular/common/http";
 import { ActivatedRoute, Router } from "@angular/router";
 import { INGESTOR_API_ENDPOINTS_V1 } from "./helper/ingestor-api-endpoints";
-import { IngestorNewTransferDialogComponent } from "./dialog/ingestor.new-transfer-dialog.component";
+import { IngestorNewTransferDialogComponent } from "../ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.component";
 import { MatDialog } from "@angular/material/dialog";
-import { IngestorUserMetadataDialogComponent } from "./dialog/ingestor.user-metadata-dialog.component";
-import { IngestorExtractorMetadataDialogComponent } from "./dialog/ingestor.extractor-metadata-dialog.component";
-import { IngestorConfirmTransferDialogComponent } from "./dialog/ingestor.confirm-transfer-dialog.component";
+import { IngestorUserMetadataDialogComponent } from "../ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.component";
+import { IngestorExtractorMetadataDialogComponent } from "../ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialogComponent } from "../ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.component";
 import {
   IngestionRequestInformation,
   IngestorHelper,
@@ -21,7 +21,7 @@ import {
   PostDatasetRequest,
   GetTransferResponse,
   TransferItem,
-} from "ingestor/model/models";
+} from "shared/sdk/models/ingestor/models";
 import { PageChangeEvent } from "shared/modules/table/table.component";
 import { Store } from "@ngrx/store";
 import {
@@ -32,6 +32,11 @@ import {
   fetchCurrentUserAction,
   fetchScicatTokenAction,
 } from "state-management/actions/user.actions";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import {
+  selectIngestorStatus,
+  selectIngestorAuth,
+} from "state-management/selectors/ingestor.selector";
 
 @Component({
   selector: "ingestor",
@@ -43,6 +48,10 @@ export class IngestorComponent implements OnInit {
 
   vm$ = this.store.select(selectUserSettingsPageViewModel);
   sciCatLoggedIn$ = this.store.select(selectIsLoggedIn);
+
+  ingestorStatus$ = this.store.select(selectIngestorStatus);
+  ingestorAuthInfo$ = this.store.select(selectIngestorAuth);
+
   ingestorInitialized = false;
   tokenValue: string;
 
@@ -70,7 +79,7 @@ export class IngestorComponent implements OnInit {
   ];
 
   versionInfo: OtherVersionResponse = null;
-  userInfo: UserInfo = null;
+  userInfo: UserInfo | null = null;
   scicatUserProfile: any = null;
   authIsDisabled = false;
   healthInfo: OtherHealthResponse = null;
@@ -138,6 +147,7 @@ export class IngestorComponent implements OnInit {
   async initializeIngestorConnection(
     facilityBackendUrl: string,
   ): Promise<boolean> {
+    let returnValue = true;
     this.connectingToFacilityBackend = true;
     let facilityBackendUrlCleaned = facilityBackendUrl.slice();
     // Check if last symbol is a slash and add version endpoint
@@ -149,42 +159,36 @@ export class IngestorComponent implements OnInit {
 
     this.connectedFacilityBackend = facilityBackendUrlCleaned;
 
-    // Try to connect - get ingestor version
-    try {
-      this.versionInfo = await this.apiManager.getVersion();
-    } catch (error) {
-      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-      this.connectedFacilityBackend = "";
-      this.connectingToFacilityBackend = false;
-      this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-      return false;
-    }
+    this.store.dispatch(fromActions.connectIngestor());
+    this.ingestorStatus$.subscribe((ingestorStatus) => {
+      if (!ingestorStatus.validEndpoint) {
+        this.connectedFacilityBackend = "";
+        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+        returnValue = false;
+      } else if (
+        ingestorStatus.versionResponse &&
+        ingestorStatus.healthResponse
+      ) {
+        this.versionInfo = ingestorStatus.versionResponse;
+        this.healthInfo = ingestorStatus.healthResponse;
+      }
+    });
 
-    // If connected, get User Info
-    try {
-      this.userInfo = await this.apiManager.getUserInfo();
-    } catch (error) {
-      if (String(error.error).includes("disabled")) {
-        this.authIsDisabled = true;
-      } else {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+    this.ingestorAuthInfo$.subscribe((authInfo) => {
+      if (authInfo) {
+        this.userInfo = authInfo.userInfoResponse;
+        this.authIsDisabled = authInfo.authIsDisabled;
+        console.log(this.userInfo);
       }
-    }
+    });
 
     // Only refresh if the user is logged in or the auth is disabled
     if (this.authIsDisabled || this.userInfo.logged_in) {
       this.doRefreshTransferList();
     }
 
-    // Get health state
-    try {
-      this.healthInfo = await this.apiManager.getHealth();
-    } catch (error) {
-      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-    }
-
     this.connectingToFacilityBackend = false;
-    return true;
+    return returnValue;
   }
 
   async ingestDataset(): Promise<boolean> {
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 6c3891ff68..9995873eac 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
-import { IngestorComponent } from "./ingestor/ingestor.component";
+import { IngestorComponent } from "./ingestor-page/ingestor.component";
 import { MatCardModule } from "@angular/material/card";
 import { RouterModule } from "@angular/router";
 import { IngestorMetadataEditorComponent } from "./ingestor-metadata-editor/ingestor-metadata-editor.component";
@@ -17,24 +17,24 @@ import { MatDialogModule } from "@angular/material/dialog";
 import { MatSelectModule } from "@angular/material/select";
 import { MatOptionModule } from "@angular/material/core";
 import { MatAutocompleteModule } from "@angular/material/autocomplete";
-import { IngestorNewTransferDialogComponent } from "./ingestor/dialog/ingestor.new-transfer-dialog.component";
-import { IngestorUserMetadataDialogComponent } from "./ingestor/dialog/ingestor.user-metadata-dialog.component";
+import { IngestorNewTransferDialogComponent } from "./ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.component";
+import { IngestorUserMetadataDialogComponent } from "./ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.component";
 import { JsonFormsModule } from "@jsonforms/angular";
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
-import { IngestorExtractorMetadataDialogComponent } from "./ingestor/dialog/ingestor.extractor-metadata-dialog.component";
-import { IngestorConfirmTransferDialogComponent } from "./ingestor/dialog/ingestor.confirm-transfer-dialog.component";
+import { IngestorExtractorMetadataDialogComponent } from "./ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialogComponent } from "./ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.component";
 import { MatStepperModule } from "@angular/material/stepper";
-import { IngestorDialogStepperComponent } from "./ingestor/dialog/dialog-mounting-components/ingestor.dialog-stepper.component";
+import { IngestorDialogStepperComponent } from "./ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component";
 import { AnyOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
 import { MatRadioModule } from "@angular/material/radio";
 import { ArrayLayoutRendererCustom } from "./ingestor-metadata-editor/customRenderer/array-renderer";
 import { MatBadgeModule } from "@angular/material/badge";
 import { MatTooltipModule } from "@angular/material/tooltip";
-import { IngestorConfirmationDialogComponent } from "./ingestor/dialog/confirmation-dialog/ingestor.confirmation-dialog.component";
-import { ExportTemplateHelperComponent } from "./ingestor/dialog/dialog-mounting-components/ingestor.export-helper.component";
+import { IngestorConfirmationDialogComponent } from "./ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
+import { ExportTemplateHelperComponent } from "./ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component";
 import { MatPaginatorModule } from "@angular/material/paginator";
 import { CustomObjectControlRendererComponent } from "./ingestor-metadata-editor/customRenderer/object-group-renderer";
-import { IngestorFileBrowserComponent } from "./ingestor-file-browser/ingestor.file-browser.component";
+import { IngestorFileBrowserComponent } from "./ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component";
 import { MatTreeModule } from "@angular/material/tree";
 import { OwnerGroupFieldComponent } from "./ingestor-metadata-editor/customRenderer/owner-group-field-renderer";
 import { QuantityValueObjectComponent } from "./ingestor-metadata-editor/customRenderer/quantity-value-renderer";
@@ -43,6 +43,10 @@ import {
   QuantityValueLayoutRendererComponent,
 } from "./ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer";
 import { MatMenuModule } from "@angular/material/menu";
+import { EffectsModule } from "@ngrx/effects";
+import { IngestorEffects } from "state-management/effects/ingestor.effect";
+import { StoreModule } from "@ngrx/store";
+import { ingestorReducer } from "state-management/reducers/ingestor.reducer";
 
 @NgModule({
   declarations: [
@@ -91,6 +95,8 @@ import { MatMenuModule } from "@angular/material/menu";
     CommonModule,
     MatPaginatorModule,
     MatMenuModule,
+    EffectsModule.forFeature([IngestorEffects]),
+    StoreModule.forFeature("ingestor", ingestorReducer),
   ],
 })
 export class IngestorModule {}
diff --git a/src/app/shared/sdk/apis/ingestor.service.ts b/src/app/shared/sdk/apis/ingestor.service.ts
new file mode 100644
index 0000000000..aea25d65ba
--- /dev/null
+++ b/src/app/shared/sdk/apis/ingestor.service.ts
@@ -0,0 +1,57 @@
+import { Injectable } from "@angular/core";
+import { HttpClient } from "@angular/common/http";
+import { Observable } from "rxjs";
+import { AppConfigService, AppConfig } from "app-config.service";
+import {
+  OtherHealthResponse,
+  OtherVersionResponse,
+  UserInfo,
+} from "../models/ingestor/models";
+
+const INGESTOR_API_ENDPOINTS_V1 = {
+  AUTH: {
+    LOGIN: "login",
+    LOGOUT: "logout",
+    USERINFO: "userinfo",
+  },
+  DATASET: "dataset",
+  DATASET_BROWSE: "dataset/browse",
+  TRANSFER: "transfer",
+  OTHER: {
+    VERSION: "version",
+    HEALTH: "health",
+  },
+  EXTRACTOR: "extractor",
+  METADATA: "metadata",
+};
+
+@Injectable({
+  providedIn: "root",
+})
+export class Ingestor {
+  config: AppConfig;
+  constructor(
+    private http: HttpClient,
+    public appConfigService: AppConfigService,
+  ) {
+    this.config = this.appConfigService.getConfig();
+  }
+
+  getVersion(): Observable<OtherVersionResponse> {
+    return this.http.get<OtherVersionResponse>(
+      `${this.config.ingestorURL}/${INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION}`,
+    );
+  }
+
+  getUserInfo(): Observable<UserInfo> {
+    return this.http.get<UserInfo>(
+      `${this.config.ingestorURL}/${INGESTOR_API_ENDPOINTS_V1.AUTH.USERINFO}`,
+    );
+  }
+
+  getHealth(): Observable<OtherHealthResponse> {
+    return this.http.get<OtherHealthResponse>(
+      `${this.config.ingestorURL}/${INGESTOR_API_ENDPOINTS_V1.OTHER.HEALTH}`,
+    );
+  }
+}
diff --git a/src/app/ingestor/model/_generateModel.md b/src/app/shared/sdk/models/ingestor/_generateModel.md
similarity index 100%
rename from src/app/ingestor/model/_generateModel.md
rename to src/app/shared/sdk/models/ingestor/_generateModel.md
diff --git a/src/app/ingestor/model/deleteTransferRequest.ts b/src/app/shared/sdk/models/ingestor/deleteTransferRequest.ts
similarity index 100%
rename from src/app/ingestor/model/deleteTransferRequest.ts
rename to src/app/shared/sdk/models/ingestor/deleteTransferRequest.ts
diff --git a/src/app/ingestor/model/deleteTransferResponse.ts b/src/app/shared/sdk/models/ingestor/deleteTransferResponse.ts
similarity index 100%
rename from src/app/ingestor/model/deleteTransferResponse.ts
rename to src/app/shared/sdk/models/ingestor/deleteTransferResponse.ts
diff --git a/src/app/ingestor/model/folderNode.ts b/src/app/shared/sdk/models/ingestor/folderNode.ts
similarity index 100%
rename from src/app/ingestor/model/folderNode.ts
rename to src/app/shared/sdk/models/ingestor/folderNode.ts
diff --git a/src/app/ingestor/model/getBrowseDatasetResponse.ts b/src/app/shared/sdk/models/ingestor/getBrowseDatasetResponse.ts
similarity index 100%
rename from src/app/ingestor/model/getBrowseDatasetResponse.ts
rename to src/app/shared/sdk/models/ingestor/getBrowseDatasetResponse.ts
diff --git a/src/app/ingestor/model/getDatasetResponse.ts b/src/app/shared/sdk/models/ingestor/getDatasetResponse.ts
similarity index 100%
rename from src/app/ingestor/model/getDatasetResponse.ts
rename to src/app/shared/sdk/models/ingestor/getDatasetResponse.ts
diff --git a/src/app/ingestor/model/getExtractorResponse.ts b/src/app/shared/sdk/models/ingestor/getExtractorResponse.ts
similarity index 100%
rename from src/app/ingestor/model/getExtractorResponse.ts
rename to src/app/shared/sdk/models/ingestor/getExtractorResponse.ts
diff --git a/src/app/ingestor/model/getTransferResponse.ts b/src/app/shared/sdk/models/ingestor/getTransferResponse.ts
similarity index 100%
rename from src/app/ingestor/model/getTransferResponse.ts
rename to src/app/shared/sdk/models/ingestor/getTransferResponse.ts
diff --git a/src/app/ingestor/model/methodItem.ts b/src/app/shared/sdk/models/ingestor/methodItem.ts
similarity index 100%
rename from src/app/ingestor/model/methodItem.ts
rename to src/app/shared/sdk/models/ingestor/methodItem.ts
diff --git a/src/app/ingestor/model/modelError.ts b/src/app/shared/sdk/models/ingestor/modelError.ts
similarity index 100%
rename from src/app/ingestor/model/modelError.ts
rename to src/app/shared/sdk/models/ingestor/modelError.ts
diff --git a/src/app/ingestor/model/models.ts b/src/app/shared/sdk/models/ingestor/models.ts
similarity index 100%
rename from src/app/ingestor/model/models.ts
rename to src/app/shared/sdk/models/ingestor/models.ts
diff --git a/src/app/ingestor/model/oidcCallbackOk.ts b/src/app/shared/sdk/models/ingestor/oidcCallbackOk.ts
similarity index 100%
rename from src/app/ingestor/model/oidcCallbackOk.ts
rename to src/app/shared/sdk/models/ingestor/oidcCallbackOk.ts
diff --git a/src/app/ingestor/model/oidcCallbackOkOAuth2Token.ts b/src/app/shared/sdk/models/ingestor/oidcCallbackOkOAuth2Token.ts
similarity index 100%
rename from src/app/ingestor/model/oidcCallbackOkOAuth2Token.ts
rename to src/app/shared/sdk/models/ingestor/oidcCallbackOkOAuth2Token.ts
diff --git a/src/app/ingestor/model/oidcCallbackOkUserInfo.ts b/src/app/shared/sdk/models/ingestor/oidcCallbackOkUserInfo.ts
similarity index 100%
rename from src/app/ingestor/model/oidcCallbackOkUserInfo.ts
rename to src/app/shared/sdk/models/ingestor/oidcCallbackOkUserInfo.ts
diff --git a/src/app/ingestor/model/otherHealthResponse.ts b/src/app/shared/sdk/models/ingestor/otherHealthResponse.ts
similarity index 100%
rename from src/app/ingestor/model/otherHealthResponse.ts
rename to src/app/shared/sdk/models/ingestor/otherHealthResponse.ts
diff --git a/src/app/ingestor/model/otherVersionResponse.ts b/src/app/shared/sdk/models/ingestor/otherVersionResponse.ts
similarity index 100%
rename from src/app/ingestor/model/otherVersionResponse.ts
rename to src/app/shared/sdk/models/ingestor/otherVersionResponse.ts
diff --git a/src/app/ingestor/model/postDatasetRequest.ts b/src/app/shared/sdk/models/ingestor/postDatasetRequest.ts
similarity index 100%
rename from src/app/ingestor/model/postDatasetRequest.ts
rename to src/app/shared/sdk/models/ingestor/postDatasetRequest.ts
diff --git a/src/app/ingestor/model/postDatasetResponse.ts b/src/app/shared/sdk/models/ingestor/postDatasetResponse.ts
similarity index 100%
rename from src/app/ingestor/model/postDatasetResponse.ts
rename to src/app/shared/sdk/models/ingestor/postDatasetResponse.ts
diff --git a/src/app/ingestor/model/transferItem.ts b/src/app/shared/sdk/models/ingestor/transferItem.ts
similarity index 100%
rename from src/app/ingestor/model/transferItem.ts
rename to src/app/shared/sdk/models/ingestor/transferItem.ts
diff --git a/src/app/ingestor/model/userInfo.ts b/src/app/shared/sdk/models/ingestor/userInfo.ts
similarity index 100%
rename from src/app/ingestor/model/userInfo.ts
rename to src/app/shared/sdk/models/ingestor/userInfo.ts
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
new file mode 100644
index 0000000000..215dd9e9d8
--- /dev/null
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -0,0 +1,23 @@
+import { createAction, props } from "@ngrx/store";
+import {
+  OtherHealthResponse,
+  OtherVersionResponse,
+  UserInfo,
+} from "shared/sdk/models/ingestor/models";
+
+export const connectIngestor = createAction("[Ingestor] Connect Ingestor");
+
+export const connectIngestorSuccess = createAction(
+  "[Ingestor] Completed Ingestor Connection",
+  props<{
+    versionResponse: OtherVersionResponse;
+    userInfoResponse: UserInfo;
+    authIsDisabled: boolean;
+    healthResponse: OtherHealthResponse;
+  }>(),
+);
+
+export const connectIngestorFailure = createAction(
+  "[Ingestor] Failed to connect to Ingestor ",
+  props<{ err: Error }>(),
+);
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
new file mode 100644
index 0000000000..140a77d9fd
--- /dev/null
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -0,0 +1,106 @@
+import { Injectable } from "@angular/core";
+import { Actions, createEffect, ofType } from "@ngrx/effects";
+import { of } from "rxjs";
+import { catchError, map, switchMap } from "rxjs/operators";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import { Ingestor } from "shared/sdk/apis/ingestor.service";
+import {
+  OtherHealthResponse,
+  OtherVersionResponse,
+  UserInfo,
+} from "shared/sdk/models/ingestor/models";
+import { MessageType } from "state-management/models";
+import { HttpErrorResponse } from "@angular/common/http";
+import { showMessageAction } from "state-management/actions/user.actions";
+
+@Injectable()
+export class IngestorEffects {
+  connectToIngestor$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.connectIngestor),
+      switchMap(() => {
+        return this.ingestor.getVersion().pipe(
+          switchMap((versionResponse) =>
+            this.ingestor.getHealth().pipe(
+              switchMap((healthResponse) =>
+                this.ingestor.getUserInfo().pipe(
+                  map((userInfoResponse) =>
+                    fromActions.connectIngestorSuccess({
+                      versionResponse: versionResponse as OtherVersionResponse,
+                      healthResponse: healthResponse as OtherHealthResponse,
+                      userInfoResponse: userInfoResponse as UserInfo,
+                      authIsDisabled: false,
+                    }),
+                  ),
+                  catchError((err) => {
+                    const errorMessage =
+                      err instanceof HttpErrorResponse
+                        ? (err.error?.message ?? err.error ?? err.message)
+                        : err.message;
+
+                    if (errorMessage.includes("disabled")) {
+                      return of(
+                        fromActions.connectIngestorSuccess({
+                          versionResponse:
+                            versionResponse as OtherVersionResponse,
+                          healthResponse: healthResponse as OtherHealthResponse,
+                          userInfoResponse: null, // Kein UserInfo verfügbar
+                          authIsDisabled: true,
+                        }),
+                      );
+                    }
+
+                    return of(fromActions.connectIngestorFailure({ err }));
+                  }),
+                ),
+              ),
+            ),
+          ),
+          catchError((err) => of(fromActions.connectIngestorFailure({ err }))),
+        );
+      }),
+    );
+  });
+
+  connectToIngestorSuccess$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.connectIngestorSuccess),
+      switchMap(({ versionResponse }) => {
+        const message = {
+          type: MessageType.Success,
+          content:
+            "Successfully connected to ingestor version " +
+            versionResponse.version,
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+
+  connectToIngestorFailure$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.connectIngestorFailure),
+      switchMap(({ err }) => {
+        const errorMessage =
+          err instanceof HttpErrorResponse
+            ? (err.error?.message ?? err.message ?? "Unknown error")
+            : err.message || "Unknown error";
+        const message = {
+          type: MessageType.Error,
+          content:
+            "Failed to connect to the ingestor service: " +
+            errorMessage +
+            " Are you sure service is running?",
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+
+  constructor(
+    private actions$: Actions,
+    private ingestor: Ingestor,
+  ) {}
+}
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
new file mode 100644
index 0000000000..d2446098bb
--- /dev/null
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -0,0 +1,51 @@
+import { createReducer, Action, on } from "@ngrx/store";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import {
+  IngestorState,
+  initialIngestorState,
+} from "state-management/state/ingestor.store";
+
+export const ingestorReducer = (state: undefined, action: Action) => {
+  if (action.type.indexOf("[Ingestor]") !== -1) {
+    console.log("Action came in! " + action.type);
+  }
+  return reducer(state, action);
+};
+const reducer = createReducer(
+  initialIngestorState,
+  on(
+    fromActions.connectIngestor,
+    (state): IngestorState => ({
+      ...state,
+    }),
+  ),
+  on(
+    fromActions.connectIngestorSuccess,
+    (
+      state,
+      { versionResponse, userInfoResponse, authIsDisabled, healthResponse },
+    ): IngestorState => ({
+      ...state,
+      ingestorStatus: {
+        versionResponse,
+        healthResponse,
+        validEndpoint: true,
+      },
+      ingestorAuth: {
+        userInfoResponse,
+        authIsDisabled,
+      },
+    }),
+  ),
+  on(
+    fromActions.connectIngestorFailure,
+    (state, { err }): IngestorState => ({
+      ...state,
+      ingestorStatus: {
+        ...state.ingestorStatus,
+        validEndpoint: false,
+      },
+      error: err,
+    }),
+  ),
+);
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
new file mode 100644
index 0000000000..ec0f465d6d
--- /dev/null
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -0,0 +1,20 @@
+import { createFeatureSelector, createSelector } from "@ngrx/store";
+import { IngestorState } from "state-management/state/ingestor.store";
+
+export const selectIngestorState =
+  createFeatureSelector<IngestorState>("ingestor");
+
+export const selectIngestorStatus = createSelector(
+  selectIngestorState,
+  (state) => state.ingestorStatus,
+);
+
+export const selectIngestorAuth = createSelector(
+  selectIngestorState,
+  (state) => state.ingestorAuth,
+);
+
+export const selectIngestorError = createSelector(
+  selectIngestorState,
+  (state) => state.error,
+);
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
new file mode 100644
index 0000000000..3bf34d3308
--- /dev/null
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -0,0 +1,31 @@
+import {
+  OtherHealthResponse,
+  OtherVersionResponse,
+  UserInfo,
+} from "shared/sdk/models/ingestor/models";
+
+interface IngestorAuthentication {
+  userInfoResponse: UserInfo | null;
+  authIsDisabled: boolean;
+}
+
+interface IngestorStatus {
+  versionResponse: OtherVersionResponse | null;
+  healthResponse: OtherHealthResponse | null;
+  validEndpoint: boolean;
+}
+
+export interface IngestorState {
+  ingestorStatus: IngestorStatus;
+  ingestorAuth: IngestorAuthentication | null;
+  error: any | null;
+}
+export const initialIngestorState: IngestorState = {
+  ingestorStatus: {
+    versionResponse: null,
+    healthResponse: null,
+    validEndpoint: true,
+  },
+  ingestorAuth: null,
+  error: null,
+};
diff --git a/src/styles.scss b/src/styles.scss
index 150dc3ab4c..2ee089e787 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -29,7 +29,7 @@
 @use "./app/shared/modules/shared-table/shared-table-theme" as shared-table;
 @use "./app/shared/modules/table/table-theme" as table;
 @use "./app/users/user-settings/user-settings-theme" as user-settings;
-@use "./app/ingestor/ingestor/ingestor-theme" as ingestor;
+@use "./app/ingestor/ingestor-theme" as ingestor;
 
 $my-custom-button-level: mat.define-typography-level(
   $font-weight: 400,

From 12b34f7142b3f4e4ce65e201fca710fe37afae14 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 23 Apr 2025 16:46:12 +0000
Subject: [PATCH 149/245] update to rxjs-store

---
 .../helper/ingestor-api-manager.ts            | 103 ----------
 .../ingestor-page/ingestor.component.html     |  21 +-
 .../ingestor-page/ingestor.component.ts       | 137 ++++++-------
 src/app/shared/sdk/apis/ingestor.service.ts   | 182 ++++++++++++++++--
 .../actions/ingestor.actions.ts               |  29 +++
 .../effects/ingestor.effect.ts                |  93 +++++----
 .../reducers/ingestor.reducer.ts              |  28 +++
 .../selectors/ingestor.selector.ts            |  15 ++
 .../state-management/state/ingestor.store.ts  |   7 +
 9 files changed, 366 insertions(+), 249 deletions(-)

diff --git a/src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts
index 068c461e67..6299997a03 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts
@@ -7,11 +7,7 @@ import {
   GetBrowseDatasetResponse,
   GetDatasetResponse,
   GetExtractorResponse,
-  GetTransferResponse,
-  OtherHealthResponse,
-  OtherVersionResponse,
   PostDatasetRequest,
-  UserInfo,
 } from "shared/sdk/models/ingestor/models";
 
 @Injectable({
@@ -33,63 +29,6 @@ export class IngestorAPIManager {
     };
   }
 
-  public getVersion(): Promise<OtherVersionResponse> {
-    const params = new HttpParams();
-    return new Promise((resolve, reject) => {
-      this.http
-        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION, {
-          params,
-          ...this.connectOptions,
-        })
-        .subscribe({
-          next: (response) => {
-            resolve(response as OtherVersionResponse);
-          },
-          error: (error) => {
-            reject(error);
-          },
-        });
-    });
-  }
-
-  public getUserInfo(): Promise<UserInfo> {
-    const params = new HttpParams();
-    return new Promise((resolve, reject) => {
-      this.http
-        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.AUTH.USERINFO, {
-          params,
-          ...this.connectOptions,
-        })
-        .subscribe({
-          next: (response) => {
-            resolve(response as UserInfo);
-          },
-          error: (error) => {
-            reject(error);
-          },
-        });
-    });
-  }
-
-  public getHealth(): Promise<OtherHealthResponse> {
-    const params = new HttpParams();
-    return new Promise((resolve, reject) => {
-      this.http
-        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.OTHER.HEALTH, {
-          params,
-          ...this.connectOptions,
-        })
-        .subscribe({
-          next: (response) => {
-            resolve(response as OtherHealthResponse);
-          },
-          error: (error) => {
-            reject(error);
-          },
-        });
-    });
-  }
-
   public cancelTransfer(transferId: string): Promise<DeleteTransferResponse> {
     const body: DeleteTransferRequest = { transferId: transferId };
 
@@ -111,35 +50,6 @@ export class IngestorAPIManager {
     });
   }
 
-  public getTransferList(
-    page: number,
-    pageSize: number,
-    transferId?: string,
-  ): Promise<GetTransferResponse> {
-    const params: any = {
-      page: page.toString(),
-      pageSize: pageSize.toString(),
-    };
-    if (transferId) {
-      params.transferId = transferId;
-    }
-    return new Promise((resolve, reject) => {
-      this.http
-        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {
-          params,
-          ...this.connectOptions,
-        })
-        .subscribe({
-          next: (response) => {
-            resolve(response as GetTransferResponse);
-          },
-          error: (error) => {
-            reject(error);
-          },
-        });
-    });
-  }
-
   public startIngestion(payload: PostDatasetRequest): Promise<string> {
     return new Promise((resolve, reject) => {
       this.http
@@ -238,17 +148,4 @@ export class IngestorAPIManager {
         });
     });
   }
-
-  /*public getAutodiscoveryList(): Promise<string> {
-    return new Promise((resolve, reject) => {
-      this.http.get(AUTODISCOVERY_ENDPOINT, {}).subscribe({
-        next: (data) => {
-          resolve(data as string);
-        },
-        error: (error) => {
-          console.error("Fetch error:", error);
-          reject(error);
-        },
-      });
-    }); }*/
 }
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.html b/src/app/ingestor/ingestor-page/ingestor.component.html
index 6843d6929b..de3c3aef71 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor.component.html
@@ -163,12 +163,12 @@
                   </mat-list-item>
                   <mat-list-item>
                     <span matListItemTitle>Version</span>
-                    <span matListItemLine>{{ versionInfo.version ?? ""
+                    <span matListItemLine>{{ versionInfo ? versionInfo.version ?? "" : ""
                       }}</span>
                   </mat-list-item>
                   <mat-list-item>
                     <span matListItemTitle>Health Status</span>
-                    <span matListItemLine>{{ healthInfo.status }}</span>
+                    <span matListItemLine>{{ healthInfo ? healthInfo.status ?? "" : "" }}</span>
                   </mat-list-item>
                 </mat-list>
               </mat-tab>
@@ -194,21 +194,4 @@
       </mat-card-content>
     </mat-card>
   </p>
-
-  <p *ngIf="errorMessage !== ''">
-    <mat-card class="ingestor-card">
-      <mat-card-header class="ingestor-mixed-header">
-        <mat-card-title>Error message</mat-card-title>
-        <button mat-icon-button class="ingestor-close-button"
-          (click)="clearErrorMessage()">
-          <mat-icon>close</mat-icon>
-        </button>
-      </mat-card-header>
-      <mat-card-content class="ingestor-vertical-layout">
-        <div>
-          <p style="color: red" [innerHTML]="errorMessage"></p>
-        </div>
-      </mat-card-content>
-    </mat-card>
-  </p>
 </div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 8bb358f4a7..c18479de9f 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -20,7 +20,6 @@ import {
   OtherVersionResponse,
   PostDatasetRequest,
   GetTransferResponse,
-  TransferItem,
 } from "shared/sdk/models/ingestor/models";
 import { PageChangeEvent } from "shared/modules/table/table.component";
 import { Store } from "@ngrx/store";
@@ -36,6 +35,9 @@ import * as fromActions from "state-management/actions/ingestor.actions";
 import {
   selectIngestorStatus,
   selectIngestorAuth,
+  selectIngestorConnecting,
+  selectIngestorEndpoint,
+  selectIngestorTransferList,
 } from "state-management/selectors/ingestor.selector";
 
 @Component({
@@ -48,15 +50,15 @@ export class IngestorComponent implements OnInit {
 
   vm$ = this.store.select(selectUserSettingsPageViewModel);
   sciCatLoggedIn$ = this.store.select(selectIsLoggedIn);
-
   ingestorStatus$ = this.store.select(selectIngestorStatus);
   ingestorAuthInfo$ = this.store.select(selectIngestorAuth);
+  ingestorConnecting$ = this.store.select(selectIngestorConnecting);
+  ingestorBackend$ = this.store.select(selectIngestorEndpoint);
+  transferList$ = this.store.select(selectIngestorTransferList);
 
-  ingestorInitialized = false;
   tokenValue: string;
 
   sourceFolder = "";
-  loading = false;
   forwardFacilityBackend = "";
 
   connectedFacilityBackend = "";
@@ -65,7 +67,6 @@ export class IngestorComponent implements OnInit {
   lastUsedFacilityBackends: string[] = [];
 
   transferDataInformation: GetTransferResponse = null;
-  transferDetailInformation: TransferItem[] = [];
   transferAutoRefreshIntervalDetail = 3000;
   transferDataPageSize = 100;
   transferDataPageIndex = 0;
@@ -97,7 +98,7 @@ export class IngestorComponent implements OnInit {
     private apiManager: IngestorAPIManager,
     private sseService: IngestorMetadataSSEService,
     private store: Store,
-  ) { }
+  ) {}
 
   ngOnInit() {
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
@@ -107,19 +108,28 @@ export class IngestorComponent implements OnInit {
       this.scicatUserProfile = settings.profile;
       this.tokenValue = settings.scicatToken;
 
-      if (!this.ingestorInitialized) {
-        this.ingestorInitialized = true;
-        this.loadIngestorConfiguration();
-      }
-
       if (this.tokenValue === "") {
         this.store.dispatch(fetchScicatTokenAction());
       }
     });
+
+    this.ingestorBackend$.subscribe((ingestorBackend) => {
+      if (ingestorBackend) {
+        this.connectedFacilityBackend = ingestorBackend;
+      }
+    });
+
+    this.transferList$.subscribe((transferList) => {
+      if (transferList) {
+        this.transferDataInformation = transferList;
+      }
+    });
+
+    this.loadIngestorConfiguration();
     this.store.dispatch(fetchCurrentUserAction());
   }
 
-  loadIngestorConfiguration(): void {
+  async loadIngestorConfiguration(): Promise<void> {
     // Get the GET parameter 'backendUrl' from the URL
     this.route.queryParams.subscribe(async (params) => {
       const backendUrl = params["backendUrl"];
@@ -137,34 +147,33 @@ export class IngestorComponent implements OnInit {
       }
 
       if (backendUrl) {
-        this.initializeIngestorConnection(backendUrl);
+        // backendUrl should not end with a slash
+        const facilityBackendUrlCleaned = backendUrl.replace(/\/$/, "");
+
+        await this.store.dispatch(
+          fromActions.setIngestorEndpoint({
+            ingestorEndpoint: facilityBackendUrlCleaned,
+          }),
+        );
+
+        this.initializeIngestorConnection();
       } else {
         this.connectingToFacilityBackend = false;
       }
     });
   }
 
-  async initializeIngestorConnection(
-    facilityBackendUrl: string,
-  ): Promise<boolean> {
-    let returnValue = true;
-    this.connectingToFacilityBackend = true;
-    let facilityBackendUrlCleaned = facilityBackendUrl.slice();
-    // Check if last symbol is a slash and add version endpoint
-    if (!facilityBackendUrlCleaned.endsWith("/")) {
-      facilityBackendUrlCleaned += "/";
-    }
-
-    this.apiManager.connect(facilityBackendUrlCleaned, !this.authIsDisabled);
+  async initializeIngestorConnection(): Promise<void> {
+    this.store.dispatch(fromActions.connectIngestor());
 
-    this.connectedFacilityBackend = facilityBackendUrlCleaned;
+    this.ingestorConnecting$.subscribe((connecting) => {
+      this.connectingToFacilityBackend = connecting;
+    });
 
-    this.store.dispatch(fromActions.connectIngestor());
     this.ingestorStatus$.subscribe((ingestorStatus) => {
       if (!ingestorStatus.validEndpoint) {
         this.connectedFacilityBackend = "";
         this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-        returnValue = false;
       } else if (
         ingestorStatus.versionResponse &&
         ingestorStatus.healthResponse
@@ -178,22 +187,16 @@ export class IngestorComponent implements OnInit {
       if (authInfo) {
         this.userInfo = authInfo.userInfoResponse;
         this.authIsDisabled = authInfo.authIsDisabled;
-        console.log(this.userInfo);
+
+        // Only refresh if the user is logged in or the auth is disabled
+        if (this.authIsDisabled || this.userInfo.logged_in) {
+          this.doRefreshTransferList();
+        }
       }
     });
-
-    // Only refresh if the user is logged in or the auth is disabled
-    if (this.authIsDisabled || this.userInfo.logged_in) {
-      this.doRefreshTransferList();
-    }
-
-    this.connectingToFacilityBackend = false;
-    return returnValue;
   }
 
   async ingestDataset(): Promise<boolean> {
-    this.loading = true;
-
     const payload: PostDatasetRequest = {
       metaData: this.createNewTransferData.mergedMetaDataString,
       userToken: this.tokenValue,
@@ -202,17 +205,14 @@ export class IngestorComponent implements OnInit {
     try {
       const result = await this.apiManager.startIngestion(payload);
       if (result) {
-        this.loading = false;
         this.doRefreshTransferList();
         return true;
       }
     } catch (error) {
       this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-      this.loading = false;
       throw error;
     }
 
-    this.loading = false;
     return false;
   }
 
@@ -277,14 +277,6 @@ export class IngestorComponent implements OnInit {
 
   onClickForwardToIngestorPage() {
     if (this.forwardFacilityBackend) {
-      this.connectingToFacilityBackend = true;
-
-      // If current route is equal to the forward route, the router will not navigate to the new route
-      if (this.connectedFacilityBackend === this.forwardFacilityBackend) {
-        this.initializeIngestorConnection(this.forwardFacilityBackend);
-        return;
-      }
-
       this.router.navigate(["/ingestor"], {
         queryParams: { backendUrl: this.forwardFacilityBackend },
       });
@@ -292,7 +284,6 @@ export class IngestorComponent implements OnInit {
   }
 
   onClickDisconnectIngestor() {
-    this.connectedFacilityBackend = "";
     // Remove the GET parameter 'backendUrl' from the URL
     this.router.navigate(["/ingestor"]);
   }
@@ -312,10 +303,6 @@ export class IngestorComponent implements OnInit {
     return [];
   }
 
-  clearErrorMessage(): void {
-    this.errorMessage = "";
-  }
-
   onClickAddIngestion(): void {
     this.createNewTransferData = IngestorHelper.createEmptyRequestInformation();
     this.onClickNext(0); // Open first dialog to start the ingestion process
@@ -404,22 +391,14 @@ export class IngestorComponent implements OnInit {
     if (dialogRef === null) return;
   }
 
-  async doRefreshTransferList(transferId?: string): Promise<void> {
-    try {
-      const response = await this.apiManager.getTransferList(
-        this.transferDataPageIndex + 1,
-        this.transferDataPageSize,
+  doRefreshTransferList(transferId?: string): void {
+    this.store.dispatch(
+      fromActions.updateTransferList({
         transferId,
-      );
-
-      if (transferId && response.transfers.length > 0) {
-        this.transferDetailInformation.push(response.transfers[0]);
-      } else {
-        this.transferDataInformation = response;
-      }
-    } catch (error) {
-      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-    }
+        page: this.transferDataPageIndex + 1,
+        pageNumber: this.transferDataPageSize,
+      }),
+    );
   }
 
   async onCancelTransfer(transferId: string) {
@@ -439,16 +418,20 @@ export class IngestorComponent implements OnInit {
 
   openIngestorLogin(): void {
     window.location.href =
-      this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.AUTH.LOGIN;
+      this.connectedFacilityBackend +
+      "/" +
+      INGESTOR_API_ENDPOINTS_V1.AUTH.LOGIN;
   }
 
   openIngestorLogout(): void {
     window.location.href =
-      this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.AUTH.LOGOUT;
+      this.connectedFacilityBackend +
+      "/" +
+      INGESTOR_API_ENDPOINTS_V1.AUTH.LOGOUT;
   }
 
   getTransferDetailInformation(transferId: string): string {
-    const detailItem = this.transferDetailInformation.find(
+    const detailItem = this.transferDataInformation.transfers?.find(
       (item) => item.transferId === transferId,
     );
     if (detailItem) {
@@ -484,15 +467,11 @@ export class IngestorComponent implements OnInit {
     return "No further information available.";
   }
 
-  reloadTransferDetailInformation(transferId: string): void {
-    this.doRefreshTransferList(transferId);
-  }
-
   startAutoRefresh(transferId: string): void {
-    this.reloadTransferDetailInformation(transferId);
+    this.doRefreshTransferList(transferId);
     this.stopAutoRefresh();
     this.autoRefreshInterval = setInterval(() => {
-      this.reloadTransferDetailInformation(transferId);
+      this.doRefreshTransferList(transferId);
     }, this.transferAutoRefreshIntervalDetail);
   }
 
diff --git a/src/app/shared/sdk/apis/ingestor.service.ts b/src/app/shared/sdk/apis/ingestor.service.ts
index aea25d65ba..b742a37606 100644
--- a/src/app/shared/sdk/apis/ingestor.service.ts
+++ b/src/app/shared/sdk/apis/ingestor.service.ts
@@ -1,12 +1,22 @@
 import { Injectable } from "@angular/core";
-import { HttpClient } from "@angular/common/http";
+import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
 import { Observable } from "rxjs";
-import { AppConfigService, AppConfig } from "app-config.service";
+import { switchMap } from "rxjs/operators";
+import { AppConfigService } from "app-config.service";
 import {
+  DeleteTransferRequest,
+  DeleteTransferResponse,
+  GetBrowseDatasetResponse,
+  GetDatasetResponse,
+  GetExtractorResponse,
+  GetTransferResponse,
   OtherHealthResponse,
   OtherVersionResponse,
+  PostDatasetRequest,
   UserInfo,
 } from "../models/ingestor/models";
+import { Store } from "@ngrx/store";
+import { selectIngestorEndpoint } from "state-management/selectors/ingestor.selector";
 
 const INGESTOR_API_ENDPOINTS_V1 = {
   AUTH: {
@@ -29,29 +39,173 @@ const INGESTOR_API_ENDPOINTS_V1 = {
   providedIn: "root",
 })
 export class Ingestor {
-  config: AppConfig;
   constructor(
     private http: HttpClient,
     public appConfigService: AppConfigService,
-  ) {
-    this.config = this.appConfigService.getConfig();
+    private store: Store,
+  ) {}
+
+  private getRequestOptions() {
+    return {
+      withCredentials: true,
+      headers: new HttpHeaders({
+        "Content-Type": "application/json; charset=utf-8",
+      }),
+    };
   }
 
   getVersion(): Observable<OtherVersionResponse> {
-    return this.http.get<OtherVersionResponse>(
-      `${this.config.ingestorURL}/${INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION}`,
-    );
+    return this.store
+      .select(selectIngestorEndpoint)
+      .pipe(
+        switchMap((ingestorEndpoint) =>
+          this.http.get<OtherVersionResponse>(
+            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION}`,
+            this.getRequestOptions(),
+          ),
+        ),
+      );
   }
 
   getUserInfo(): Observable<UserInfo> {
-    return this.http.get<UserInfo>(
-      `${this.config.ingestorURL}/${INGESTOR_API_ENDPOINTS_V1.AUTH.USERINFO}`,
-    );
+    return this.store
+      .select(selectIngestorEndpoint)
+      .pipe(
+        switchMap((ingestorEndpoint) =>
+          this.http.get<UserInfo>(
+            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.AUTH.USERINFO}`,
+            this.getRequestOptions(),
+          ),
+        ),
+      );
   }
 
   getHealth(): Observable<OtherHealthResponse> {
-    return this.http.get<OtherHealthResponse>(
-      `${this.config.ingestorURL}/${INGESTOR_API_ENDPOINTS_V1.OTHER.HEALTH}`,
-    );
+    return this.store
+      .select(selectIngestorEndpoint)
+      .pipe(
+        switchMap((ingestorEndpoint) =>
+          this.http.get<OtherHealthResponse>(
+            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.OTHER.HEALTH}`,
+            this.getRequestOptions(),
+          ),
+        ),
+      );
+  }
+
+  cancelTransfer(transferId: string): Observable<DeleteTransferResponse> {
+    const body: DeleteTransferRequest = { transferId: transferId };
+
+    return this.store
+      .select(selectIngestorEndpoint)
+      .pipe(
+        switchMap((ingestorEndpoint) =>
+          this.http.delete<DeleteTransferResponse>(
+            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
+            { ...this.getRequestOptions(), body },
+          ),
+        ),
+      );
+  }
+
+  getTransferList(
+    page: number,
+    pageSize: number,
+    transferId?: string,
+  ): Observable<GetTransferResponse> {
+    const params: any = {
+      page: page.toString(),
+      pageSize: pageSize.toString(),
+    };
+    if (transferId) {
+      params.transferId = transferId;
+    }
+
+    return this.store
+      .select(selectIngestorEndpoint)
+      .pipe(
+        switchMap((ingestorEndpoint) =>
+          this.http.get<GetTransferResponse>(
+            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
+            { ...this.getRequestOptions(), params },
+          ),
+        ),
+      );
+  }
+
+  startIngestion(payload: PostDatasetRequest): Observable<string> {
+    return this.store
+      .select(selectIngestorEndpoint)
+      .pipe(
+        switchMap((ingestorEndpoint) =>
+          this.http.post<string>(
+            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET}`,
+            payload,
+            this.getRequestOptions(),
+          ),
+        ),
+      );
+  }
+
+  getExtractionMethods(
+    page: number,
+    pageSize: number,
+  ): Observable<GetExtractorResponse> {
+    const params = new HttpParams()
+      .set("page", page.toString())
+      .set("pageSize", pageSize.toString());
+
+    return this.store
+      .select(selectIngestorEndpoint)
+      .pipe(
+        switchMap((ingestorEndpoint) =>
+          this.http.get<GetExtractorResponse>(
+            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.EXTRACTOR}`,
+            { ...this.getRequestOptions(), params },
+          ),
+        ),
+      );
+  }
+
+  getAvailableFilePaths(
+    page: number,
+    pageSize: number,
+  ): Observable<GetDatasetResponse> {
+    const params = new HttpParams()
+      .set("page", page.toString())
+      .set("pageSize", pageSize.toString());
+
+    return this.store
+      .select(selectIngestorEndpoint)
+      .pipe(
+        switchMap((ingestorEndpoint) =>
+          this.http.get<GetDatasetResponse>(
+            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET}`,
+            { ...this.getRequestOptions(), params },
+          ),
+        ),
+      );
+  }
+
+  getBrowseFilePath(
+    page: number,
+    pageSize: number,
+    path: string,
+  ): Observable<GetBrowseDatasetResponse> {
+    const params = new HttpParams()
+      .set("page", page.toString())
+      .set("pageSize", pageSize.toString())
+      .set("path", path.toString());
+
+    return this.store
+      .select(selectIngestorEndpoint)
+      .pipe(
+        switchMap((ingestorEndpoint) =>
+          this.http.get<GetBrowseDatasetResponse>(
+            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET_BROWSE}`,
+            { ...this.getRequestOptions(), params },
+          ),
+        ),
+      );
   }
 }
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 215dd9e9d8..708062e3a7 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -1,10 +1,16 @@
 import { createAction, props } from "@ngrx/store";
 import {
+  GetTransferResponse,
   OtherHealthResponse,
   OtherVersionResponse,
   UserInfo,
 } from "shared/sdk/models/ingestor/models";
 
+export const setIngestorEndpoint = createAction(
+  "[Ingestor] Set ingestor endpoint",
+  props<{ ingestorEndpoint: string }>(),
+);
+
 export const connectIngestor = createAction("[Ingestor] Connect Ingestor");
 
 export const connectIngestorSuccess = createAction(
@@ -21,3 +27,26 @@ export const connectIngestorFailure = createAction(
   "[Ingestor] Failed to connect to Ingestor ",
   props<{ err: Error }>(),
 );
+
+export const startConnectingIngestor = createAction(
+  "[Ingestor] Start connecting Ingestor",
+);
+
+export const stopConnectingIngestor = createAction(
+  "[Ingestor] Stop connecting Ingestor",
+);
+
+export const updateTransferList = createAction(
+  "[Ingestor] Update transfer list",
+  props<{ transferId: string; page: number; pageNumber: number }>(),
+);
+
+export const updateTransferListSuccess = createAction(
+  "[Ingestor] Update Transfer List Success",
+  props<{ transferList: GetTransferResponse }>(),
+);
+
+export const updateTransferListFailure = createAction(
+  "[Ingestor] Update Transfer List Failure",
+  props<{ err: Error }>(),
+);
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index 140a77d9fd..c6af17d195 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Actions, createEffect, ofType } from "@ngrx/effects";
 import { of } from "rxjs";
-import { catchError, map, switchMap } from "rxjs/operators";
+import { catchError, map, switchMap, finalize } from "rxjs/operators"; // Import finalize
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Ingestor } from "shared/sdk/apis/ingestor.service";
 import {
@@ -18,47 +18,58 @@ export class IngestorEffects {
   connectToIngestor$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(fromActions.connectIngestor),
-      switchMap(() => {
-        return this.ingestor.getVersion().pipe(
-          switchMap((versionResponse) =>
-            this.ingestor.getHealth().pipe(
-              switchMap((healthResponse) =>
-                this.ingestor.getUserInfo().pipe(
-                  map((userInfoResponse) =>
-                    fromActions.connectIngestorSuccess({
-                      versionResponse: versionResponse as OtherVersionResponse,
-                      healthResponse: healthResponse as OtherHealthResponse,
-                      userInfoResponse: userInfoResponse as UserInfo,
-                      authIsDisabled: false,
-                    }),
-                  ),
-                  catchError((err) => {
-                    const errorMessage =
-                      err instanceof HttpErrorResponse
-                        ? (err.error?.message ?? err.error ?? err.message)
-                        : err.message;
-
-                    if (errorMessage.includes("disabled")) {
-                      return of(
+      switchMap(() =>
+        of(fromActions.startConnectingIngestor()).pipe(
+          switchMap(() => {
+            return this.ingestor.getVersion().pipe(
+              switchMap((versionResponse) =>
+                this.ingestor.getHealth().pipe(
+                  switchMap((healthResponse) =>
+                    this.ingestor.getUserInfo().pipe(
+                      map((userInfoResponse) =>
                         fromActions.connectIngestorSuccess({
                           versionResponse:
                             versionResponse as OtherVersionResponse,
                           healthResponse: healthResponse as OtherHealthResponse,
-                          userInfoResponse: null, // Kein UserInfo verfügbar
-                          authIsDisabled: true,
+                          userInfoResponse: userInfoResponse as UserInfo,
+                          authIsDisabled: false,
                         }),
-                      );
-                    }
+                      ),
+                      catchError((err) => {
+                        const errorMessage =
+                          err instanceof HttpErrorResponse
+                            ? (err.error?.message ?? err.error ?? err.message)
+                            : err.message;
 
-                    return of(fromActions.connectIngestorFailure({ err }));
-                  }),
+                        if (errorMessage.includes("disabled")) {
+                          return of(
+                            fromActions.connectIngestorSuccess({
+                              versionResponse:
+                                versionResponse as OtherVersionResponse,
+                              healthResponse:
+                                healthResponse as OtherHealthResponse,
+                              userInfoResponse: null, // Kein UserInfo verfügbar
+                              authIsDisabled: true,
+                            }),
+                          );
+                        }
+                        return of(fromActions.connectIngestorFailure({ err }));
+                      }),
+                    ),
+                  ),
                 ),
               ),
-            ),
-          ),
-          catchError((err) => of(fromActions.connectIngestorFailure({ err }))),
-        );
-      }),
+              catchError((err) =>
+                of(fromActions.connectIngestorFailure({ err })),
+              ),
+              finalize(() => {
+                // Dispatch stopConnectingIngestor after the process is complete
+                of(fromActions.stopConnectingIngestor());
+              }),
+            );
+          }),
+        ),
+      ),
     );
   });
 
@@ -99,6 +110,20 @@ export class IngestorEffects {
     );
   });
 
+  updateTransferList$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.updateTransferList),
+      switchMap(({ transferId, page, pageNumber }) =>
+        this.ingestor.getTransferList(page, pageNumber, transferId).pipe(
+          map((transferList) =>
+            fromActions.updateTransferListSuccess({ transferList }),
+          ),
+          catchError((err) => of(fromActions.updateTransferListFailure({ err }))),
+        ),
+      ),
+    );
+  });
+
   constructor(
     private actions$: Actions,
     private ingestor: Ingestor,
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index d2446098bb..714f485223 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -13,6 +13,27 @@ export const ingestorReducer = (state: undefined, action: Action) => {
 };
 const reducer = createReducer(
   initialIngestorState,
+  on(
+    fromActions.setIngestorEndpoint,
+    (state, { ingestorEndpoint }): IngestorState => ({
+      ...state,
+      ingestorEndpoint,
+    }),
+  ),
+  on(
+    fromActions.startConnectingIngestor,
+    (state): IngestorState => ({
+      ...state,
+      connectingBackend: true,
+    }),
+  ),
+  on(
+    fromActions.stopConnectingIngestor,
+    (state): IngestorState => ({
+      ...state,
+      connectingBackend: false,
+    }),
+  ),
   on(
     fromActions.connectIngestor,
     (state): IngestorState => ({
@@ -48,4 +69,11 @@ const reducer = createReducer(
       error: err,
     }),
   ),
+  on(
+    fromActions.updateTransferListSuccess,
+    (state, { transferList }): IngestorState => ({
+      ...state,
+      ingestorTransferList: transferList,
+    }),
+  ),
 );
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
index ec0f465d6d..47684b1b90 100644
--- a/src/app/state-management/selectors/ingestor.selector.ts
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -4,6 +4,11 @@ import { IngestorState } from "state-management/state/ingestor.store";
 export const selectIngestorState =
   createFeatureSelector<IngestorState>("ingestor");
 
+export const selectIngestorEndpoint = createSelector(
+  selectIngestorState,
+  (state) => state.ingestorEndpoint,
+);
+
 export const selectIngestorStatus = createSelector(
   selectIngestorState,
   (state) => state.ingestorStatus,
@@ -18,3 +23,13 @@ export const selectIngestorError = createSelector(
   selectIngestorState,
   (state) => state.error,
 );
+
+export const selectIngestorConnecting = createSelector(
+  selectIngestorState,
+  (state) => state.connectingBackend,
+);
+
+export const selectIngestorTransferList = createSelector(
+  selectIngestorState,
+  (state) => state.ingestorTransferList,
+);
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 3bf34d3308..191ebe31ed 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -1,4 +1,5 @@
 import {
+  GetTransferResponse,
   OtherHealthResponse,
   OtherVersionResponse,
   UserInfo,
@@ -18,6 +19,9 @@ interface IngestorStatus {
 export interface IngestorState {
   ingestorStatus: IngestorStatus;
   ingestorAuth: IngestorAuthentication | null;
+  ingestorEndpoint: string | null;
+  ingestorTransferList: GetTransferResponse | null;
+  connectingBackend: boolean;
   error: any | null;
 }
 export const initialIngestorState: IngestorState = {
@@ -27,5 +31,8 @@ export const initialIngestorState: IngestorState = {
     validEndpoint: true,
   },
   ingestorAuth: null,
+  ingestorEndpoint: null,
+  ingestorTransferList: null,
+  connectingBackend: false,
   error: null,
 };

From e732a35cef11264684ce82d00baf85a33133235d Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 24 Apr 2025 16:22:42 +0000
Subject: [PATCH 150/245] further updates to ngrx-store

---
 ....confirm-transfer-dialog-page.component.ts | 120 +++++++++++
 ...ngestor.confirm-transfer-dialog-page.html} |   0
 ...stor.new-transfer-dialog-page.component.ts | 196 ++++++++++++++++++
 .../ingestor.new-transfer-dialog-page.html}   |   0
 ...tor.user-metadata-dialog-page.component.ts | 144 +++++++++++++
 .../ingestor.user-metadata-dialog-page.html}  |   0
 ...estor.confirm-transfer-dialog.component.ts |   6 +-
 .../ingestor.confirm-transfer-dialog.html     |  51 +++++
 ...tor.extractor-metadata-dialog.component.ts |   4 +-
 .../ingestor.extractor-metadata-dialog.html   |   0
 .../ingestor.new-transfer-dialog.component.ts |   6 +-
 .../ingestor.new-transfer-dialog.html         |  54 +++++
 ...ingestor.user-metadata-dialog.component.ts |   4 +-
 .../ingestor.user-metadata-dialog.html        |  88 ++++++++
 ...ingestor.creation-dialog-base.component.ts | 190 +++++++++++++++++
 .../ingestor.creation-dialog-base.html        |   1 +
 .../ingestor.file-browser.component.html      |   2 +-
 .../ingestor.file-browser.component.ts        | 105 +++++-----
 .../ingestor-page/ingestor.component.html     |  12 +-
 .../ingestor-page/ingestor.component.ts       | 185 ++---------------
 src/app/ingestor/ingestor.module.ts           |  16 +-
 .../actions/ingestor.actions.ts               |  38 ++++
 .../effects/ingestor.effect.ts                |  36 +++-
 .../reducers/ingestor.reducer.ts              |  43 +++-
 .../selectors/ingestor.selector.ts            |  15 ++
 .../state-management/state/ingestor.store.ts  |  12 ++
 26 files changed, 1079 insertions(+), 249 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.component.ts
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{ingestor.confirm-transfer-dialog.html => creation-pages-new/ingestor.confirm-transfer-dialog-page.html} (100%)
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.component.ts
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{ingestor.new-transfer-dialog.html => creation-pages-new/ingestor.new-transfer-dialog-page.html} (100%)
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.component.ts
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{ingestor.user-metadata-dialog.html => creation-pages-new/ingestor.user-metadata-dialog-page.html} (100%)
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{ => creation-pages}/ingestor.confirm-transfer-dialog.component.ts (92%)
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.html
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{ => creation-pages}/ingestor.extractor-metadata-dialog.component.ts (96%)
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{ => creation-pages}/ingestor.extractor-metadata-dialog.html (100%)
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{ => creation-pages}/ingestor.new-transfer-dialog.component.ts (96%)
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.html
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{ => creation-pages}/ingestor.user-metadata-dialog.component.ts (96%)
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.html
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.component.ts
new file mode 100644
index 0000000000..6e0ad676c6
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.component.ts
@@ -0,0 +1,120 @@
+import { Component, inject, OnInit } from "@angular/core";
+import {
+  IngestionRequestInformation,
+  IngestorHelper,
+  SciCatHeader,
+} from "../../../ingestor-page/helper/ingestor.component-helper";
+import { Store } from "@ngrx/store";
+import {
+  selectIngestionObject,
+  selectIngestorEndpoint,
+} from "state-management/selectors/ingestor.selector";
+import { MatDialog } from "@angular/material/dialog";
+
+@Component({
+  selector: "ingestor-confirm-transfer-dialog-page",
+  templateUrl: "ingestor.confirm-transfer-dialog-page.html",
+  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
+})
+export class IngestorConfirmTransferDialogPageComponent implements OnInit {
+  readonly dialog = inject(MatDialog);
+
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+
+  ingestionObject$ = this.store.select(selectIngestionObject);
+  ingestorBackend$ = this.store.select(selectIngestorEndpoint);
+
+  provideMergeMetaData = "";
+  connectedFacilityBackend = "";
+
+  errorMessage = "";
+  copiedToClipboard = false;
+
+  constructor(private store: Store) {}
+
+  ngOnInit() {
+    this.ingestionObject$.subscribe((ingestionObject) => {
+      if (ingestionObject) {
+        this.createNewTransferData = ingestionObject;
+      }
+    });
+
+    this.ingestorBackend$.subscribe((ingestorBackend) => {
+      if (ingestorBackend) {
+        this.connectedFacilityBackend = ingestorBackend;
+      }
+    });
+    this.provideMergeMetaData = this.createMetaDataString();
+  }
+
+  createMetaDataString(): string {
+    const space = 2;
+    const scicatMetadata: SciCatHeader = {
+      ...(this.createNewTransferData.scicatHeader as SciCatHeader),
+      scientificMetadata: {
+        organizational:
+          this.createNewTransferData.userMetaData["organizational"],
+        sample: this.createNewTransferData.userMetaData["sample"],
+        acquisition:
+          this.createNewTransferData.extractorMetaData["acquisition"],
+        instrument: this.createNewTransferData.extractorMetaData["instrument"],
+      },
+    };
+
+    return JSON.stringify(scicatMetadata, null, space);
+  }
+
+  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
+    Object.assign(this.createNewTransferData, updatedData);
+  }
+
+  clearErrorMessage(): void {
+    this.errorMessage = "";
+  }
+
+  onClickBack(): void {
+    // TODO on click back
+  }
+
+  onClickConfirm(): void {
+    this.errorMessage = "";
+    /*if (this.data && this.data.onClickNext) {
+      const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
+        data: {
+          header: "Confirm ingestion",
+          message: "Create a new dataset and start data transfer?",
+        },
+      });
+      dialogRef.afterClosed().subscribe(async (result) => {
+        if (result) {
+          this.createNewTransferData.mergedMetaDataString =
+            this.provideMergeMetaData;
+          try {
+            const success = await this.data.onStartUpload();
+            if (success) {
+              this.data.onClickNext(4);
+            }
+          } catch (error) {
+            this.errorMessage = error.message;
+
+            if (error.error) {
+              this.errorMessage += ": " + error.error;
+            }
+          }
+        }
+      });
+    }*/
+  }
+
+  onCopyMetadata(): void {
+    navigator.clipboard.writeText(this.provideMergeMetaData).then(
+      () => {
+        this.copiedToClipboard = true;
+      },
+      (err) => {
+        console.error("Failed to copy metadata to clipboard: ", err);
+      },
+    );
+  }
+}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.html
similarity index 100%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.html
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.component.ts
new file mode 100644
index 0000000000..cdb532fd43
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.component.ts
@@ -0,0 +1,196 @@
+import { Component, EventEmitter, inject, OnInit, Output } from "@angular/core";
+import { MatDialog } from "@angular/material/dialog";
+import {
+  decodeBase64ToUTF8,
+  ExtractionMethod,
+  IngestionRequestInformation,
+  IngestorHelper,
+} from "../../../ingestor-page/helper/ingestor.component-helper";
+import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import { GetExtractorResponse } from "shared/sdk/models/ingestor/models";
+import { PageChangeEvent } from "shared/modules/table/table.component";
+import { IngestorFileBrowserComponent } from "ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component";
+import { Store } from "@ngrx/store";
+import {
+  selectIngestionObject,
+  selectIngestorEndpoint,
+  selectIngestorExtractionMethods,
+} from "state-management/selectors/ingestor.selector";
+import * as fromActions from "state-management/actions/ingestor.actions";
+
+@Component({
+  selector: "ingestor-new-transfer-dialog-page",
+  templateUrl: "ingestor.new-transfer-dialog-page.html",
+  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
+})
+export class IngestorNewTransferDialogPageComponent implements OnInit {
+  readonly dialog = inject(MatDialog);
+
+  ingestionObject$ = this.store.select(selectIngestionObject);
+  ingestorBackend$ = this.store.select(selectIngestorEndpoint);
+  ingestorExtractionMethods$ = this.store.select(
+    selectIngestorExtractionMethods,
+  );
+
+  @Output() nextStep = new EventEmitter<void>();
+  @Output() backStep = new EventEmitter<void>();
+
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+
+  extractionMethods: GetExtractorResponse = null;
+  dropdownPageSize = 50;
+  extractionMethodsPage = 0;
+
+  connectedFacilityBackend = "";
+  extractionMethodsError = "";
+
+  uiNextButtonReady = false;
+
+  constructor(private store: Store) {}
+
+  ngOnInit() {
+    this.loadExtractionMethods();
+
+    this.ingestionObject$.subscribe((ingestionObject) => {
+      if (ingestionObject) {
+        this.createNewTransferData = ingestionObject;
+      }
+    });
+
+    this.ingestorBackend$.subscribe((ingestorBackend) => {
+      if (ingestorBackend) {
+        this.connectedFacilityBackend = ingestorBackend;
+      }
+    });
+
+    this.ingestorExtractionMethods$.subscribe((extractionMethods) => {
+      if (extractionMethods) {
+        this.extractionMethods = extractionMethods;
+        this.extractionMethodsError = "";
+      } else {
+        this.extractionMethodsError =
+          "No extraction methods available. Please check your connection.";
+      }
+    });
+  }
+
+  set selectedPath(value: string) {
+    this.createNewTransferData.selectedPath = value;
+    this.validateNextButton();
+  }
+
+  get selectedPath(): string {
+    return this.createNewTransferData.selectedPath;
+  }
+
+  set selectedMethod(value: ExtractionMethod) {
+    this.createNewTransferData.selectedMethod = value;
+    this.validateNextButton();
+  }
+
+  get selectedMethod(): ExtractionMethod {
+    return this.createNewTransferData.selectedMethod;
+  }
+
+  async loadExtractionMethods(): Promise<void> {
+    this.store.dispatch(
+      fromActions.getExtractionMethods({
+        page: this.extractionMethodsPage + 1, // 1-based
+        pageNumber: this.dropdownPageSize,
+      }),
+    );
+  }
+
+  generateExampleDataForSciCatHeader(): void {
+    this.createNewTransferData.scicatHeader["sourceFolder"] =
+      this.createNewTransferData.selectedPath;
+    this.createNewTransferData.scicatHeader["keywords"] = ["OpenEM"];
+
+    const nameWithoutPath =
+      this.createNewTransferData.selectedPath.split("/|\\")[-1] ??
+      this.createNewTransferData.selectedPath;
+    this.createNewTransferData.scicatHeader["datasetName"] = nameWithoutPath;
+    this.createNewTransferData.scicatHeader["license"] = "MIT License";
+    this.createNewTransferData.scicatHeader["type"] = "raw";
+    this.createNewTransferData.scicatHeader["dataFormat"] = "root";
+    this.createNewTransferData.scicatHeader["owner"] = "User";
+
+    /*this.createNewTransferData.scicatHeader["principalInvestigator"] =
+      this.data.userInfo?.name ?? "";
+    this.createNewTransferData.scicatHeader["investigator"] =
+      this.data.userInfo?.name ?? "";
+    this.createNewTransferData.scicatHeader["ownerEmail"] =
+      this.data.userInfo?.email ?? "";
+    this.createNewTransferData.scicatHeader["contactEmail"] =
+      this.data.userInfo?.email ?? "";*/
+    const creationTime = new Date();
+    const formattedCreationTime = creationTime.toISOString().split("T")[0];
+    this.createNewTransferData.scicatHeader["creationTime"] =
+      formattedCreationTime;
+  }
+
+  prepareSchemaForProcessing(): void {
+    const encodedSchema = this.createNewTransferData.selectedMethod.schema;
+    const decodedSchema = decodeBase64ToUTF8(encodedSchema);
+    const schema = JSON.parse(decodedSchema);
+    const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
+      schema,
+      schema,
+    );
+    this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
+  }
+
+  onClickRetryRequests(): void {
+    this.loadExtractionMethods();
+  }
+
+  onClickNext(): void {
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+
+    this.generateExampleDataForSciCatHeader();
+    this.prepareSchemaForProcessing();
+    this.nextStep.emit(); // Open next dialog
+  }
+
+  validateNextButton(): void {
+    const selectedPathReady =
+      (this.createNewTransferData.editorMode === "INGESTION" &&
+        this.createNewTransferData.selectedPath !== "") ||
+      this.createNewTransferData.editorMode === "EDITOR";
+    const selectedMethodReady =
+      this.selectedMethod !== null &&
+      this.selectedMethod !== undefined &&
+      this.selectedMethod.name !== "";
+
+    this.uiNextButtonReady = !!selectedPathReady && !!selectedMethodReady;
+  }
+
+  onExtractorMethodsPageChange(event: PageChangeEvent) {
+    this.extractionMethodsPage = event.pageIndex; // 0-based
+    this.loadExtractionMethods();
+  }
+
+  onClickOpenFileBrowser(): void {
+    this.dialog
+      .open(IngestorFileBrowserComponent, {
+        data: {
+          backendURL: this.connectedFacilityBackend,
+          createNewTransferData: this.createNewTransferData,
+        },
+      })
+      .afterClosed()
+      .subscribe(() => {
+        this.validateNextButton();
+      });
+  }
+
+  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
+    Object.assign(this.createNewTransferData, updatedData);
+    this.validateNextButton();
+  }
+}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.html
similarity index 100%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.html
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.component.ts
new file mode 100644
index 0000000000..dc3635b2bc
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.component.ts
@@ -0,0 +1,144 @@
+import { ChangeDetectorRef, Component, OnInit } from "@angular/core";
+import { JsonSchema } from "@jsonforms/core";
+import {
+  IngestionRequestInformation,
+  IngestorHelper,
+  SciCatHeader_Schema,
+} from "../../../ingestor-page/helper/ingestor.component-helper";
+import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import {
+  selectIngestionObject,
+  selectIngestorEndpoint,
+} from "state-management/selectors/ingestor.selector";
+import { Store } from "@ngrx/store";
+
+@Component({
+  selector: "ingestor-user-metadata-dialog",
+  templateUrl: "ingestor.user-metadata-dialog-page.html",
+  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
+})
+export class IngestorUserMetadataDialogPageComponent implements OnInit {
+  ingestionObject$ = this.store.select(selectIngestionObject);
+  ingestorBackend$ = this.store.select(selectIngestorEndpoint);
+
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+
+  metadataSchemaOrganizational: JsonSchema;
+  metadataSchemaSample: JsonSchema;
+  scicatHeaderSchema: JsonSchema;
+  connectedFacilityBackend = "";
+
+  uiNextButtonReady = false;
+  isSciCatHeaderOk = false;
+  scicatHeaderErrors = "";
+  isOrganizationalMetadataOk = false;
+  organizationalErrors = "";
+  isSampleInformationOk = false;
+  sampleErrors = "";
+
+  isCardContentVisible = {
+    scicat: true,
+    organizational: true,
+    sample: true,
+  };
+
+  constructor(
+    private store: Store,
+    private cdr: ChangeDetectorRef,
+  ) {
+    const organizationalSchema =
+      this.createNewTransferData.selectedResolvedDecodedSchema.properties
+        .organizational;
+    const sampleSchema =
+      this.createNewTransferData.selectedResolvedDecodedSchema.properties
+        .sample;
+
+    this.metadataSchemaOrganizational = organizationalSchema;
+    this.metadataSchemaSample = sampleSchema;
+    this.scicatHeaderSchema = SciCatHeader_Schema;
+  }
+
+  ngOnInit() {
+    this.ingestionObject$.subscribe((ingestionObject) => {
+      if (ingestionObject) {
+        this.createNewTransferData = ingestionObject;
+      }
+    });
+
+    this.ingestorBackend$.subscribe((ingestorBackend) => {
+      if (ingestorBackend) {
+        this.connectedFacilityBackend = ingestorBackend;
+      }
+    });
+  }
+
+  onClickBack(): void {
+    /*if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(0); // Beispielwert für den Schritt
+    }*/
+  }
+
+  onClickNext(): void {
+    /*if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(2); // Beispielwert für den Schritt
+    }*/
+  }
+
+  onDataChangeUserMetadataOrganization(event: any) {
+    this.createNewTransferData.userMetaData["organizational"] = event;
+  }
+
+  onDataChangeUserMetadataSample(event: any) {
+    this.createNewTransferData.userMetaData["sample"] = event;
+  }
+
+  onDataChangeUserScicatHeader(event: any) {
+    this.createNewTransferData.scicatHeader = event;
+  }
+
+  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
+    Object.assign(this.createNewTransferData, updatedData);
+  }
+
+  toggleCardContent(card: string): void {
+    this.isCardContentVisible[card] = !this.isCardContentVisible[card];
+  }
+
+  scicatHeaderErrorsHandler(errors: any[]) {
+    this.isSciCatHeaderOk = errors.length === 0;
+    this.scicatHeaderErrors = convertJSONFormsErrorToString(errors);
+    this.validateNextButton();
+    this.cdr.detectChanges();
+  }
+
+  organizationalErrorsHandler(errors: any[]) {
+    this.isOrganizationalMetadataOk = errors.length === 0;
+    this.organizationalErrors = convertJSONFormsErrorToString(errors);
+    this.validateNextButton();
+    this.cdr.detectChanges();
+  }
+
+  sampleErrorsHandler(errors: any[]) {
+    this.isSampleInformationOk = errors.length === 0;
+    this.sampleErrors = "";
+    errors.forEach((error, number) => {
+      if (error.message) {
+        const ctrNum = number + 1;
+        this.sampleErrors += ctrNum + ": " + error.message + "\n";
+      }
+    });
+    this.validateNextButton();
+    this.cdr.detectChanges();
+  }
+
+  validateNextButton(): void {
+    this.uiNextButtonReady = true;
+
+    // Uncomment if prod
+    /*this.uiNextButtonReady =
+      this.isSciCatHeaderOk &&
+      this.isOrganizationalMetadataOk &&
+      this.isSampleInformationOk;*/
+  }
+}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.html
similarity index 100%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.html
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.component.ts
similarity index 92%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.component.ts
index 9185c2c296..b59aa55c31 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.component.ts
@@ -5,13 +5,13 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
   SciCatHeader,
-} from "../../ingestor-page/helper/ingestor.component-helper";
-import { IngestorConfirmationDialogComponent } from "../confirmation-dialog/ingestor.confirmation-dialog.component";
+} from "../../../ingestor-page/helper/ingestor.component-helper";
+import { IngestorConfirmationDialogComponent } from "../../confirmation-dialog/ingestor.confirmation-dialog.component";
 
 @Component({
   selector: "ingestor.confirm-transfer-dialog",
   templateUrl: "ingestor.confirm-transfer-dialog.html",
-  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
+  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorConfirmTransferDialogComponent implements OnInit {
   createNewTransferData: IngestionRequestInformation =
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.html
new file mode 100644
index 0000000000..77f2d8c36a
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.html
@@ -0,0 +1,51 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Confirm transfer
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography">
+  <ingestor-dialog-stepper [activeStep]="3"
+    [createNewTransferData]="createNewTransferData"
+    (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
+
+  <p *ngIf="errorMessage !== ''">
+    <mat-card class="ingestor-card">
+      <mat-card-header class="ingestor-mixed-header">
+        <mat-card-title>Error message</mat-card-title>
+        <button mat-icon-button class="ingestor-close-button"
+          (click)="clearErrorMessage()">
+          <mat-icon>close</mat-icon>
+        </button>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <div>
+          <p style="color: red" [innerHTML]="errorMessage"></p>
+        </div>
+      </mat-card-content>
+    </mat-card>
+  </p>
+
+  <p>Confirm Metadata</p>
+
+  <div class="code-editor">
+    <pre class="code">
+    <div *ngFor="let line of provideMergeMetaData.split('\n')">
+      <code>{{ line }}</code>
+    </div>
+    </pre>
+  </div>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
+  <button *ngIf="createNewTransferData.editorMode === 'INGESTION'" mat-button color="primary" cdkFocusInitial
+    (click)="onClickConfirm()">Ingest</button>
+    <button *ngIf="createNewTransferData.editorMode === 'EDITOR'" mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">
+      {{!copiedToClipboard ? "Copy JSON" : "Copied!"}}
+    </button>
+    <button *ngIf="copiedToClipboard" mat-dialog-close mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">Close</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.component.ts
similarity index 96%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.component.ts
index 5017088875..eb672b32ea 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.component.ts
@@ -5,13 +5,13 @@ import {
   DialogDataObject,
   IngestionRequestInformation,
   IngestorHelper,
-} from "../../ingestor-page/helper/ingestor.component-helper";
+} from "../../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 @Component({
   selector: "ingestor.extractor-metadata-dialog",
   templateUrl: "ingestor.extractor-metadata-dialog.html",
-  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
+  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorExtractorMetadataDialogComponent {
   metadataSchemaInstrument: JsonSchema;
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.html
similarity index 100%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.html
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.component.ts
similarity index 96%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.component.ts
index 707950b4f7..12958bd256 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.component.ts
@@ -6,9 +6,9 @@ import {
   ExtractionMethod,
   IngestionRequestInformation,
   IngestorHelper,
-} from "../../ingestor-page/helper/ingestor.component-helper";
+} from "../../../ingestor-page/helper/ingestor.component-helper";
 import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
-import { IngestorAPIManager } from "../../ingestor-page/helper/ingestor-api-manager";
+import { IngestorAPIManager } from "../../../ingestor-page/helper/ingestor-api-manager";
 import { GetExtractorResponse } from "shared/sdk/models/ingestor/models";
 import { PageChangeEvent } from "shared/modules/table/table.component";
 import { IngestorFileBrowserComponent } from "ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component";
@@ -16,7 +16,7 @@ import { IngestorFileBrowserComponent } from "ingestor/ingestor-dialogs/ingestor
 @Component({
   selector: "ingestor.new-transfer-dialog",
   templateUrl: "ingestor.new-transfer-dialog.html",
-  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
+  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorNewTransferDialogComponent implements OnInit {
   extractionMethods: GetExtractorResponse = null;
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.html
new file mode 100644
index 0000000000..98017d7c10
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.html
@@ -0,0 +1,54 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Select your ingestion method
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+  <ingestor-dialog-stepper [activeStep]="0"
+  [createNewTransferData]="createNewTransferData"
+  (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
+
+  <p>Please select the dataset to be uploaded and the appropriate metadata
+    extractor method.</p>
+
+  <div *ngIf="createNewTransferData.editorMode === 'INGESTION'">
+    <mat-form-field class="form-full-width">
+      <mat-label>File Path</mat-label>
+      <input matInput [(ngModel)]="selectedPath" (click)="onClickOpenFileBrowser()" readonly>
+      <!-- [matAutocomplete]="auto" -->
+      <button mat-icon-button matSuffix (click)="onClickOpenFileBrowser()">
+        <mat-icon>folder</mat-icon>
+      </button>
+    </mat-form-field>
+  </div>
+
+  <div *ngIf="extractionMethods !== null">
+    <mat-form-field class="form-full-width">
+      <mat-label *ngIf="createNewTransferData.editorMode === 'INGESTION'">Extraction Method</mat-label>
+      <mat-label *ngIf="createNewTransferData.editorMode === 'EDITOR'">Editor schema</mat-label>
+      <mat-select [(ngModel)]="selectedMethod">
+        <mat-option *ngFor="let method of extractionMethods.methods" [value]="method">
+          {{ method.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError
+      }}</mat-error>
+
+    <mat-paginator *ngIf="extractionMethods.total > dropdownPageSize" [length]="extractionMethods.total" [pageSize]="dropdownPageSize" aria-label="Select page"
+      [hidePageSize]="true" [showFirstLastButtons]="false" [pageIndex]="extractionMethodsPage" (page)="onExtractorMethodsPageChange($event)">
+    </mat-paginator>
+  </div>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button *ngIf="extractionMethodsError" mat-button
+    color="warn" (click)="onClickRetryRequests()">Retry</button>
+  <button mat-button mat-dialog-close>Cancel</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.component.ts
similarity index 96%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.component.ts
index 3ba9f156fd..cba2a90443 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.component.ts
@@ -6,13 +6,13 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
   SciCatHeader_Schema,
-} from "../../ingestor-page/helper/ingestor.component-helper";
+} from "../../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
 @Component({
   selector: "ingestor.user-metadata-dialog",
   templateUrl: "ingestor.user-metadata-dialog.html",
-  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
+  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorUserMetadataDialogComponent {
   metadataSchemaOrganizational: JsonSchema;
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.html
new file mode 100644
index 0000000000..8316d0c900
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.html
@@ -0,0 +1,88 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    Fill out user-specific metadata
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+  <ingestor-dialog-stepper [activeStep]="1" [createNewTransferData]="createNewTransferData" (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
+
+  <div fxLayout="row" fxLayout.xs="column">
+    <div fxFlex="80%">
+      <mat-card>
+        <mat-card-header class="scicat-header"
+          (click)="toggleCardContent('scicat')">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> info </mat-icon>
+          </div>
+          SciCat Information
+          <span class="spacer"></span>
+            <mat-icon
+            [matTooltip]="isSciCatHeaderOk ? 'Your input is correct.' : scicatHeaderErrors"
+            [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'">{{
+            isSciCatHeaderOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ?
+            'expand_less' : 'expand_more' }}</mat-icon>
+        </mat-card-header>
+        <mat-card-content *ngIf="isCardContentVisible.scicat">
+          <app-metadata-editor [schema]="scicatHeaderSchema"
+            [data]="createNewTransferData.scicatHeader"
+            (dataChange)="onDataChangeUserScicatHeader($event)" (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
+        </mat-card-content>
+      </mat-card>
+
+      <mat-card>
+        <mat-card-header class="organizational-header"
+          (click)="toggleCardContent('organizational')">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> person </mat-icon>
+          </div>
+          Organizational Information
+          <span class="spacer"></span>
+          <mat-icon
+            [matTooltip]="isOrganizationalMetadataOk ? 'Your input is correct.' : organizationalErrors"
+            [ngClass]="isOrganizationalMetadataOk ? 'success-icon' : 'error-icon'">{{
+            isOrganizationalMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ?
+            'expand_less' : 'expand_more' }}</mat-icon>
+        </mat-card-header>
+        <mat-card-content *ngIf="isCardContentVisible.organizational">
+          <app-metadata-editor [schema]="metadataSchemaOrganizational"
+            [data]="createNewTransferData.userMetaData['organizational']"
+            (dataChange)="onDataChangeUserMetadataOrganization($event)" (errors)="organizationalErrorsHandler($event)"></app-metadata-editor>
+        </mat-card-content>
+      </mat-card>
+
+      <mat-card>
+        <mat-card-header class="sample-header"
+          (click)="toggleCardContent('sample')">
+          <div mat-card-avatar class="section-icon">
+            <mat-icon> description </mat-icon>
+          </div>
+          Sample Information
+          <span class="spacer"></span>
+          <mat-icon
+            [matTooltip]="isSampleInformationOk ? 'Your input is correct.' : sampleErrors"
+            [ngClass]="isSampleInformationOk ? 'success-icon' : 'error-icon'">{{
+            isSampleInformationOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
+          <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ?
+            'expand_less' : 'expand_more' }}</mat-icon>
+        </mat-card-header>
+        <mat-card-content *ngIf="isCardContentVisible.sample">
+          <app-metadata-editor [schema]="metadataSchemaSample"
+            [data]="createNewTransferData.userMetaData['sample']"
+            (dataChange)="onDataChangeUserMetadataSample($event)" (errors)="sampleErrorsHandler($event)"></app-metadata-editor>
+        </mat-card-content>
+      </mat-card>
+    </div>
+  </div>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
new file mode 100644
index 0000000000..4b3f04903f
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -0,0 +1,190 @@
+import { Component, Inject, OnInit } from "@angular/core";
+import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
+import {
+  DialogDataObject,
+  IngestionRequestInformation,
+  IngestorHelper,
+  ScientificMetadata,
+} from "../../ingestor-page/helper/ingestor.component-helper";
+import {
+  selectIngestionObject,
+  selectIngestorEndpoint,
+} from "state-management/selectors/ingestor.selector";
+import { Store } from "@ngrx/store";
+import { IngestorMetadataSSEService } from "ingestor/ingestor-page/helper/ingestor.metadata-sse-service";
+import { HttpParams } from "@angular/common/http";
+import { INGESTOR_API_ENDPOINTS_V1 } from "ingestor/ingestor-page/helper/ingestor-api-endpoints";
+import { PostDatasetRequest } from "shared/sdk/models/ingestor/models";
+
+type dialogStep =
+  | "NEW_TRANSFER"
+  | "USER_METADATA"
+  | "EXTRACTOR_METADATA"
+  | "CONFIRM_TRANSFER";
+
+@Component({
+  selector: "ingestor.creation-dialog-base",
+  templateUrl: "ingestor.creation-dialog-base.html",
+  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
+})
+export class IngestorCreationDialogBaseComponent implements OnInit {
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+
+  ingestionObject$ = this.store.select(selectIngestionObject);
+  ingestorBackend$ = this.store.select(selectIngestorEndpoint);
+
+  currentDialogStep: dialogStep = "NEW_TRANSFER";
+  connectedFacilityBackend = "";
+
+  constructor(
+    public dialog: MatDialog,
+    private store: Store,
+    private sseService: IngestorMetadataSSEService,
+    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+  ) {}
+
+  ngOnInit() {
+    this.ingestionObject$.subscribe((ingestionObject) => {
+      if (ingestionObject) {
+        this.createNewTransferData = ingestionObject;
+      }
+    });
+
+    this.ingestorBackend$.subscribe((ingestorBackend) => {
+      if (ingestorBackend) {
+        this.connectedFacilityBackend = ingestorBackend;
+      }
+    });
+  }
+
+  resetExtractedMetadata(): void {
+    this.createNewTransferData.extractorMetaData = {
+      instrument: {},
+      acquisition: {},
+    };
+  }
+
+  async startMetadataExtraction(): Promise<boolean> {
+    this.createNewTransferData.apiInformation.metaDataExtractionFailed = false;
+
+    if (this.createNewTransferData.apiInformation.extractMetaDataRequested) {
+      return false;
+    }
+
+    this.createNewTransferData.apiInformation.extractorMetaDataReady = false;
+    this.createNewTransferData.apiInformation.extractMetaDataRequested = true;
+
+    const params = new HttpParams()
+      .set("filePath", this.createNewTransferData.selectedPath)
+      .set("methodName", this.createNewTransferData.selectedMethod.name);
+
+    const sseUrl = `${this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.METADATA}?${params.toString()}`;
+    this.sseService.connect(sseUrl);
+    this.sseService.getMessages().subscribe({
+      next: (data) => {
+        //console.log("Received SSE data:", data);
+        this.createNewTransferData.apiInformation.extractorMetaDataStatus =
+          data.message;
+        this.createNewTransferData.apiInformation.extractorMetadataProgress =
+          data.progress;
+
+        if (data.result) {
+          this.createNewTransferData.apiInformation.extractorMetaDataReady =
+            true;
+          const extractedScientificMetadata = JSON.parse(
+            data.resultMessage,
+          ) as ScientificMetadata;
+
+          this.createNewTransferData.extractorMetaData.instrument =
+            extractedScientificMetadata.instrument ?? {};
+          this.createNewTransferData.extractorMetaData.acquisition =
+            extractedScientificMetadata.acquisition ?? {};
+        } else if (data.error) {
+          this.createNewTransferData.apiInformation.metaDataExtractionFailed =
+            true;
+          this.createNewTransferData.apiInformation.extractMetaDataRequested =
+            false;
+          this.createNewTransferData.apiInformation.extractorMetaDataStatus =
+            data.message;
+          this.createNewTransferData.apiInformation.extractorMetadataProgress =
+            data.progress;
+        }
+      },
+      error: (error) => {
+        console.error("Error receiving SSE data:", error);
+        this.createNewTransferData.apiInformation.metaDataExtractionFailed =
+          true;
+        this.createNewTransferData.apiInformation.extractMetaDataRequested =
+          false;
+      },
+    });
+
+    return true;
+  }
+
+  onClickNext(step: dialogStep): void {
+    console.log("Next step clicked", step);
+
+    switch (step) {
+      case "NEW_TRANSFER":
+        this.createNewTransferData.apiInformation.extractMetaDataRequested =
+          false;
+        this.createNewTransferData.apiInformation.extractorMetaDataReady =
+          false;
+        this.currentDialogStep = "USER_METADATA";
+        break;
+      case "USER_METADATA":
+        this.resetExtractedMetadata();
+        if (this.createNewTransferData.editorMode === "INGESTION") {
+          this.startMetadataExtraction().catch((error) => {
+            console.error("Metadata extraction error", error);
+          });
+        } else if (this.createNewTransferData.editorMode === "EDITOR") {
+          this.createNewTransferData.apiInformation.extractorMetaDataReady =
+            true;
+        }
+
+        this.currentDialogStep = "EXTRACTOR_METADATA";
+        break;
+      case "EXTRACTOR_METADATA":
+        this.currentDialogStep = "CONFIRM_TRANSFER";
+        break;
+      case "CONFIRM_TRANSFER":
+        console.log("Confirm transfer step");
+        break;
+      default:
+        console.error("Unknown step", step);
+    }
+  }
+
+  onClickBack(): void {
+    if (this.data && this.data.onClickNext) {
+      this.data.onClickNext(2);
+    }
+  }
+
+  onClickConfirm(): void {
+    console.log("Confirm button clicked");
+  }
+
+  async ingestDataset(): Promise<boolean> {
+    const payload: PostDatasetRequest = {
+      metaData: this.createNewTransferData.mergedMetaDataString,
+      userToken: "", //this.tokenValue,
+    };
+
+    try {
+      const result = null; //await this.apiManager.startIngestion(payload);
+      if (result) {
+        // Somehow udpate transfer list
+        return true;
+      }
+    } catch (error) {
+      console.error("Error during ingestion", error);
+      throw error;
+    }
+
+    return false;
+  }
+}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
new file mode 100644
index 0000000000..98765f376d
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
@@ -0,0 +1 @@
+<ingestor-new-transfer-dialog-page *ngIf="currentDialogStep === 'NEW_TRANSFER'" (nextStep)="onClickNext('NEW_TRANSFER')"></ingestor-new-transfer-dialog-page>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
index f266ee009e..6c38c4a999 100644
--- a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
+++ b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
@@ -8,7 +8,7 @@ <h2 mat-dialog-title>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
-  <div class="file-browser-view-toggle">
+  <div *ngIf="false" class="file-browser-view-toggle">
     <button mat-button disabled="true" (click)="toggleView()" [matTooltip]="isListView ? 'Switch to Tree View' : 'Switch to List View'">
       <mat-icon *ngIf="isListView">account_tree</mat-icon>
       <mat-icon *ngIf="!isListView">list</mat-icon>
diff --git a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
index 53316f0afb..ec9a6be146 100644
--- a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -1,6 +1,5 @@
-import { ChangeDetectorRef, Component, Inject, OnInit } from "@angular/core";
+import { Component, Inject, OnInit } from "@angular/core";
 import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
-import { IngestorAPIManager } from "ingestor/ingestor-page/helper/ingestor-api-manager";
 import {
   IngestionRequestInformation,
   IngestorHelper,
@@ -9,6 +8,12 @@ import {
 import { FolderNode } from "shared/sdk/models/ingestor/folderNode";
 import { GetBrowseDatasetResponse } from "shared/sdk/models/ingestor/models";
 import { PageChangeEvent } from "shared/modules/table/table.component";
+import {
+  selectIngestionObject,
+  selectIngestorBrowserActiveNode,
+} from "state-management/selectors/ingestor.selector";
+import { Store } from "@ngrx/store";
+import * as fromActions from "state-management/actions/ingestor.actions";
 
 export interface BrowsableNode extends FolderNode {
   childrenNodes?: BrowsableNode[];
@@ -28,10 +33,16 @@ export interface GoBackNode extends FolderNode {
 })
 export class IngestorFileBrowserComponent implements OnInit {
   private _activeNode: BrowsableNode | null = null;
+
+  ingestionObject$ = this.store.select(selectIngestionObject);
+  selectIngestorBrowserActiveNode$ = this.store.select(
+    selectIngestorBrowserActiveNode,
+  );
+
   activeNodeChildrenTotal = 0;
+  nextNode: BrowsableNode | null = null;
 
   isListView = true;
-  backendURL = "";
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
@@ -45,13 +56,8 @@ export class IngestorFileBrowserComponent implements OnInit {
   constructor(
     public dialog: MatDialog,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
-    private apiManager: IngestorAPIManager,
-    private cdr: ChangeDetectorRef,
-  ) {
-    this.createNewTransferData = data.createNewTransferData;
-    this.backendURL = data.backendURL;
-    this.apiManager.connect(this.backendURL);
-  }
+    private store: Store,
+  ) {}
 
   get activeNode(): BrowsableNode | null {
     return this._activeNode;
@@ -80,18 +86,34 @@ export class IngestorFileBrowserComponent implements OnInit {
     };
   }
 
-  async ngOnInit(): Promise<void> {
-    const rootNode: FolderNode = {
-      name: "",
-      path:
-        this.createNewTransferData.selectedPath !== ""
-          ? this.createNewTransferData.selectedPath
-          : "/",
-      children: false,
-    };
-
-    const rootNodeChildren = await this.onLoadFilePath(rootNode.path);
-    this.setExtendedNodeActive(rootNode, rootNodeChildren);
+  ngOnInit(): void {
+    this.ingestionObject$.subscribe((ingestionObject) => {
+      if (ingestionObject) {
+        this.createNewTransferData = ingestionObject;
+
+        const rootNode: FolderNode = {
+          name: "",
+          path:
+            this.createNewTransferData.selectedPath !== ""
+              ? this.createNewTransferData.selectedPath
+              : "/",
+          children: false,
+        };
+
+        this.selectIngestorBrowserActiveNode$.subscribe((newNode) => {
+          if (newNode) {
+            const newActiveNode: BrowsableNode = {
+              ...(this.nextNode ?? rootNode),
+              childrenNodes: [],
+              children: false,
+            };
+            this.setExtendedNodeActive(newActiveNode, newNode);
+          }
+        });
+
+        this.onLoadFolderNode(rootNode, true);
+      }
+    });
   }
 
   setExtendedNodeActive(
@@ -129,46 +151,25 @@ export class IngestorFileBrowserComponent implements OnInit {
     return item.id; // or any unique identifier for the items
   }
 
-  async onLoadFolderNode(item: BrowsableNode, resetPage = true): Promise<void> {
+  onLoadFolderNode(item: BrowsableNode, resetPage = true): void {
     if (resetPage) {
       // Reset Page, when clicking on an item
       this.browseFolderPage = 0;
     }
 
-    const newActiveNode: BrowsableNode = {
-      ...item,
-      childrenNodes: [],
-      children: false,
-    };
-    const newActiveNodeChildren = await this.onLoadFilePath(item.path);
-    this.setExtendedNodeActive(newActiveNode, newActiveNodeChildren);
-    //this.cdr.detectChanges();
-  }
+    this.nextNode = item;
 
-  async onLoadFilePath(path: string): Promise<GetBrowseDatasetResponse | null> {
-    try {
-      const folderNodeResponse = await this.apiManager.getBrowseFilePath(
-        this.browseFolderPage + 1, // 1-based
-        this.browseFolderPageSize,
-        path,
-      );
-
-      return folderNodeResponse;
-    } catch (error) {
-      console.error("Error loading path:", path, error);
-      return null;
-    }
+    this.store.dispatch(
+      fromActions.getBrowseFilePath({
+        page: this.browseFolderPage + 1, // 1-based
+        pageNumber: this.browseFolderPageSize,
+        path: item.path,
+      }),
+    );
   }
 
   onFileBrowserChildrenPageChange(event: PageChangeEvent) {
     this.browseFolderPage = event.pageIndex;
-
-    // Reload Active Node children
     this.onLoadFolderNode(this.activeNode, false);
   }
 }
-
-export interface Section {
-  name: string;
-  updated?: Date;
-}
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.html b/src/app/ingestor/ingestor-page/ingestor.component.html
index de3c3aef71..1c14fcc6f6 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor.component.html
@@ -73,8 +73,8 @@
               <mat-divider class="divider-down"></mat-divider>
             </div>
 
-            <mat-tab-group animationDuration="0ms">
-              <mat-tab *ngIf="authIsDisabled || userInfo?.logged_in"
+            <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTab">
+                <mat-tab [disabled]="!(authIsDisabled || userInfo?.logged_in)"
                 label="Transfers">
                 <button matTooltip="Refresh transfer list" mat-button
                   aria-label="Refresh transfer list"
@@ -82,7 +82,7 @@
                   <mat-icon>refresh</mat-icon>
                 </button>
                 <table
-                  *ngIf="transferDataInformation !== null && transferDataInformation.transfers.length > 0"
+                  *ngIf="transferDataInformation && transferDataInformation.transfers.length > 0"
                   mat-table [dataSource]="transferDataInformation.transfers">
 
                   <ng-container matColumnDef="transferId">
@@ -163,12 +163,14 @@
                   </mat-list-item>
                   <mat-list-item>
                     <span matListItemTitle>Version</span>
-                    <span matListItemLine>{{ versionInfo ? versionInfo.version ?? "" : ""
+                    <span matListItemLine>{{ versionInfo ? versionInfo.version
+                      ?? "" : ""
                       }}</span>
                   </mat-list-item>
                   <mat-list-item>
                     <span matListItemTitle>Health Status</span>
-                    <span matListItemLine>{{ healthInfo ? healthInfo.status ?? "" : "" }}</span>
+                    <span matListItemLine>{{ healthInfo ? healthInfo.status ??
+                      "" : "" }}</span>
                   </mat-list-item>
                 </mat-list>
               </mat-tab>
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index c18479de9f..5ee8a69447 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -1,24 +1,16 @@
 import { Component, inject, OnInit } from "@angular/core";
-import { HttpParams } from "@angular/common/http";
 import { ActivatedRoute, Router } from "@angular/router";
 import { INGESTOR_API_ENDPOINTS_V1 } from "./helper/ingestor-api-endpoints";
-import { IngestorNewTransferDialogComponent } from "../ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.component";
 import { MatDialog } from "@angular/material/dialog";
-import { IngestorUserMetadataDialogComponent } from "../ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.component";
-import { IngestorExtractorMetadataDialogComponent } from "../ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.component";
-import { IngestorConfirmTransferDialogComponent } from "../ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.component";
 import {
   IngestionRequestInformation,
   IngestorHelper,
-  ScientificMetadata,
 } from "./helper/ingestor.component-helper";
-import { IngestorMetadataSSEService } from "./helper/ingestor.metadata-sse-service";
 import { IngestorAPIManager } from "./helper/ingestor-api-manager";
 import {
   UserInfo,
   OtherHealthResponse,
   OtherVersionResponse,
-  PostDatasetRequest,
   GetTransferResponse,
 } from "shared/sdk/models/ingestor/models";
 import { PageChangeEvent } from "shared/modules/table/table.component";
@@ -39,6 +31,7 @@ import {
   selectIngestorEndpoint,
   selectIngestorTransferList,
 } from "state-management/selectors/ingestor.selector";
+import { IngestorCreationDialogBaseComponent } from "ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component";
 
 @Component({
   selector: "ingestor",
@@ -60,6 +53,7 @@ export class IngestorComponent implements OnInit {
 
   sourceFolder = "";
   forwardFacilityBackend = "";
+  selectedTab = 1;
 
   connectedFacilityBackend = "";
   connectingToFacilityBackend = true;
@@ -85,8 +79,6 @@ export class IngestorComponent implements OnInit {
   authIsDisabled = false;
   healthInfo: OtherHealthResponse = null;
 
-  errorMessage = "";
-
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
@@ -96,7 +88,6 @@ export class IngestorComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private apiManager: IngestorAPIManager,
-    private sseService: IngestorMetadataSSEService,
     private store: Store,
   ) {}
 
@@ -190,91 +181,14 @@ export class IngestorComponent implements OnInit {
 
         // Only refresh if the user is logged in or the auth is disabled
         if (this.authIsDisabled || this.userInfo.logged_in) {
+          // Activate Transfer Tab when ingestor is ready for actions
+          this.selectedTab = 0;
           this.doRefreshTransferList();
         }
       }
     });
   }
 
-  async ingestDataset(): Promise<boolean> {
-    const payload: PostDatasetRequest = {
-      metaData: this.createNewTransferData.mergedMetaDataString,
-      userToken: this.tokenValue,
-    };
-
-    try {
-      const result = await this.apiManager.startIngestion(payload);
-      if (result) {
-        this.doRefreshTransferList();
-        return true;
-      }
-    } catch (error) {
-      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
-      throw error;
-    }
-
-    return false;
-  }
-
-  async startMetadataExtraction(): Promise<boolean> {
-    this.createNewTransferData.apiInformation.metaDataExtractionFailed = false;
-
-    if (this.createNewTransferData.apiInformation.extractMetaDataRequested) {
-      return false;
-    }
-
-    this.createNewTransferData.apiInformation.extractorMetaDataReady = false;
-    this.createNewTransferData.apiInformation.extractMetaDataRequested = true;
-
-    const params = new HttpParams()
-      .set("filePath", this.createNewTransferData.selectedPath)
-      .set("methodName", this.createNewTransferData.selectedMethod.name);
-
-    const sseUrl = `${this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.METADATA}?${params.toString()}`;
-    this.sseService.connect(sseUrl);
-    this.sseService.getMessages().subscribe({
-      next: (data) => {
-        //console.log("Received SSE data:", data);
-        this.createNewTransferData.apiInformation.extractorMetaDataStatus =
-          data.message;
-        this.createNewTransferData.apiInformation.extractorMetadataProgress =
-          data.progress;
-
-        if (data.result) {
-          this.createNewTransferData.apiInformation.extractorMetaDataReady =
-            true;
-          const extractedScientificMetadata = JSON.parse(
-            data.resultMessage,
-          ) as ScientificMetadata;
-
-          this.createNewTransferData.extractorMetaData.instrument =
-            extractedScientificMetadata.instrument ?? {};
-          this.createNewTransferData.extractorMetaData.acquisition =
-            extractedScientificMetadata.acquisition ?? {};
-        } else if (data.error) {
-          this.createNewTransferData.apiInformation.metaDataExtractionFailed =
-            true;
-          this.createNewTransferData.apiInformation.extractMetaDataRequested =
-            false;
-          this.createNewTransferData.apiInformation.extractorMetaDataStatus =
-            data.message;
-          this.createNewTransferData.apiInformation.extractorMetadataProgress =
-            data.progress;
-        }
-      },
-      error: (error) => {
-        console.error("Error receiving SSE data:", error);
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}]<br>`;
-        this.createNewTransferData.apiInformation.metaDataExtractionFailed =
-          true;
-        this.createNewTransferData.apiInformation.extractMetaDataRequested =
-          false;
-      },
-    });
-
-    return true;
-  }
-
   onClickForwardToIngestorPage() {
     if (this.forwardFacilityBackend) {
       this.router.navigate(["/ingestor"], {
@@ -304,88 +218,19 @@ export class IngestorComponent implements OnInit {
   }
 
   onClickAddIngestion(): void {
-    this.createNewTransferData = IngestorHelper.createEmptyRequestInformation();
-    this.onClickNext(0); // Open first dialog to start the ingestion process
-  }
-
-  resetExtractedMetadata(): void {
-    this.createNewTransferData.extractorMetaData = {
-      instrument: {},
-      acquisition: {},
-    };
-  }
+    // Clean the current ingestion object
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: IngestorHelper.createEmptyRequestInformation(),
+      }),
+    );
 
-  onClickNext(step: number): void {
     this.dialog.closeAll();
 
     let dialogRef = null;
-
-    switch (step) {
-      case 0:
-        this.createNewTransferData.apiInformation.extractMetaDataRequested =
-          false;
-        this.createNewTransferData.apiInformation.extractorMetaDataReady =
-          false;
-        dialogRef = this.dialog.open(IngestorNewTransferDialogComponent, {
-          data: {
-            onClickNext: this.onClickNext.bind(this),
-            createNewTransferData: this.createNewTransferData,
-            backendURL: this.connectedFacilityBackend,
-            userInfo: this.userInfo,
-          },
-          disableClose: true,
-        });
-
-        break;
-      case 1:
-        this.resetExtractedMetadata();
-        if (this.createNewTransferData.editorMode === "INGESTION") {
-          this.startMetadataExtraction().catch((error) => {
-            console.error("Metadata extraction error", error);
-          });
-        } else if (this.createNewTransferData.editorMode === "EDITOR") {
-          this.createNewTransferData.apiInformation.extractorMetaDataReady =
-            true;
-        }
-
-        dialogRef = this.dialog.open(IngestorUserMetadataDialogComponent, {
-          data: {
-            onClickNext: this.onClickNext.bind(this),
-            createNewTransferData: this.createNewTransferData,
-            backendURL: this.connectedFacilityBackend,
-            userInfo: this.userInfo,
-          },
-          disableClose: true,
-        });
-        break;
-      case 2:
-        dialogRef = this.dialog.open(IngestorExtractorMetadataDialogComponent, {
-          data: {
-            onClickNext: this.onClickNext.bind(this),
-            createNewTransferData: this.createNewTransferData,
-            backendURL: this.connectedFacilityBackend,
-            userInfo: this.userInfo,
-          },
-          disableClose: true,
-        });
-        break;
-      case 3:
-        dialogRef = this.dialog.open(IngestorConfirmTransferDialogComponent, {
-          data: {
-            onClickNext: this.onClickNext.bind(this),
-            onStartUpload: this.ingestDataset.bind(this),
-            createNewTransferData: this.createNewTransferData,
-            backendURL: this.connectedFacilityBackend,
-            userInfo: this.userInfo,
-          },
-          disableClose: true,
-        });
-        break;
-      case 4:
-        break;
-      default:
-        console.error("Unknown step", step);
-    }
+    dialogRef = this.dialog.open(IngestorCreationDialogBaseComponent, {
+      disableClose: true,
+    });
 
     // Error if the dialog reference is not set
     if (dialogRef === null) return;
@@ -406,7 +251,7 @@ export class IngestorComponent implements OnInit {
       await this.apiManager.cancelTransfer(transferId);
       this.doRefreshTransferList();
     } catch (error) {
-      this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+      console.error("Error cancelling transfer", error);
     }
   }
 
@@ -497,7 +342,7 @@ export class IngestorComponent implements OnInit {
           return "http://localhost:8888";
         }
       } catch (error) {
-        this.errorMessage += `${new Date().toLocaleString()}: ${error.message}<br>`;
+        console.error("Error fetching autodiscovery list", error);
       }
     }
     return null;
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 9995873eac..633fb6a27e 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -17,12 +17,12 @@ import { MatDialogModule } from "@angular/material/dialog";
 import { MatSelectModule } from "@angular/material/select";
 import { MatOptionModule } from "@angular/material/core";
 import { MatAutocompleteModule } from "@angular/material/autocomplete";
-import { IngestorNewTransferDialogComponent } from "./ingestor-dialogs/creation-dialog/ingestor.new-transfer-dialog.component";
-import { IngestorUserMetadataDialogComponent } from "./ingestor-dialogs/creation-dialog/ingestor.user-metadata-dialog.component";
+import { IngestorNewTransferDialogComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.component";
+import { IngestorUserMetadataDialogComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.component";
 import { JsonFormsModule } from "@jsonforms/angular";
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
-import { IngestorExtractorMetadataDialogComponent } from "./ingestor-dialogs/creation-dialog/ingestor.extractor-metadata-dialog.component";
-import { IngestorConfirmTransferDialogComponent } from "./ingestor-dialogs/creation-dialog/ingestor.confirm-transfer-dialog.component";
+import { IngestorExtractorMetadataDialogComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.component";
+import { IngestorConfirmTransferDialogComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.component";
 import { MatStepperModule } from "@angular/material/stepper";
 import { IngestorDialogStepperComponent } from "./ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component";
 import { AnyOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
@@ -47,15 +47,23 @@ import { EffectsModule } from "@ngrx/effects";
 import { IngestorEffects } from "state-management/effects/ingestor.effect";
 import { StoreModule } from "@ngrx/store";
 import { ingestorReducer } from "state-management/reducers/ingestor.reducer";
+import { IngestorCreationDialogBaseComponent } from "./ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component";
+import { IngestorConfirmTransferDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.component";
+import { IngestorNewTransferDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.component";
+import { IngestorUserMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.component";
 
 @NgModule({
   declarations: [
     IngestorComponent,
     IngestorMetadataEditorComponent,
     IngestorNewTransferDialogComponent,
+    IngestorConfirmTransferDialogPageComponent,
+    IngestorNewTransferDialogPageComponent,
+    IngestorUserMetadataDialogPageComponent,
     IngestorUserMetadataDialogComponent,
     IngestorExtractorMetadataDialogComponent,
     IngestorConfirmTransferDialogComponent,
+    IngestorCreationDialogBaseComponent,
     IngestorDialogStepperComponent,
     AnyOfRendererComponent,
     ArrayLayoutRendererCustom,
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 708062e3a7..7d49b6a436 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -1,5 +1,8 @@
 import { createAction, props } from "@ngrx/store";
+import { IngestionRequestInformation } from "ingestor/ingestor-page/helper/ingestor.component-helper";
 import {
+  GetBrowseDatasetResponse,
+  GetExtractorResponse,
   GetTransferResponse,
   OtherHealthResponse,
   OtherVersionResponse,
@@ -50,3 +53,38 @@ export const updateTransferListFailure = createAction(
   "[Ingestor] Update Transfer List Failure",
   props<{ err: Error }>(),
 );
+
+export const updateIngestionObject = createAction(
+  "[Ingestor] Update Ingestion Object",
+  props<{ ingestionObject: IngestionRequestInformation }>(),
+);
+
+export const getExtractionMethods = createAction(
+  "[Ingestor] Get Extraction Methods",
+  props<{ page: number; pageNumber: number }>(),
+);
+
+export const getExtractionMethodsSuccess = createAction(
+  "[Ingestor] Get Extraction Methods Success",
+  props<{ extractionMethods: GetExtractorResponse }>(),
+);
+
+export const getExtractionMethodsFailure = createAction(
+  "[Ingestor] Get Extraction Methods Failure",
+  props<{ err: Error }>(),
+);
+
+export const getBrowseFilePath = createAction(
+  "[Ingestor] Get Browse File Path",
+  props<{ path: string; page: number; pageNumber: number }>(),
+);
+
+export const getBrowseFilePathSuccess = createAction(
+  "[Ingestor] Get Browse File Path Success",
+  props<{ ingestorBrowserActiveNode: GetBrowseDatasetResponse }>(),
+);
+
+export const getBrowseFilePathFailure = createAction(
+  "[Ingestor] Get Browse File Path Failure",
+  props<{ err: Error }>(),
+);
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index c6af17d195..8ded33a5f6 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -118,7 +118,41 @@ export class IngestorEffects {
           map((transferList) =>
             fromActions.updateTransferListSuccess({ transferList }),
           ),
-          catchError((err) => of(fromActions.updateTransferListFailure({ err }))),
+          catchError((err) =>
+            of(fromActions.updateTransferListFailure({ err })),
+          ),
+        ),
+      ),
+    );
+  });
+
+  getExtractionMethods$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.getExtractionMethods),
+      switchMap(({ page, pageNumber }) =>
+        this.ingestor.getExtractionMethods(page, pageNumber).pipe(
+          map((extractionMethods) =>
+            fromActions.getExtractionMethodsSuccess({ extractionMethods }),
+          ),
+          catchError((err) =>
+            of(fromActions.getExtractionMethodsFailure({ err })),
+          ),
+        ),
+      ),
+    );
+  });
+
+  getBrowseFilePath$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.getBrowseFilePath),
+      switchMap(({ path, page, pageNumber }) =>
+        this.ingestor.getBrowseFilePath(page, pageNumber, path).pipe(
+          map((ingestorBrowserActiveNode) =>
+            fromActions.getBrowseFilePathSuccess({ ingestorBrowserActiveNode }),
+          ),
+          catchError((err) =>
+            of(fromActions.getBrowseFilePathFailure({ err })),
+          ),
         ),
       ),
     );
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index 714f485223..bab75905f2 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -13,6 +13,36 @@ export const ingestorReducer = (state: undefined, action: Action) => {
 };
 const reducer = createReducer(
   initialIngestorState,
+  on(
+    fromActions.getBrowseFilePathSuccess,
+    (state, { ingestorBrowserActiveNode }): IngestorState => ({
+      ...state,
+      ingestorBrowserActiveNode: ingestorBrowserActiveNode,
+    }),
+  ),
+  on(
+    fromActions.getBrowseFilePathFailure,
+    (state, { err }): IngestorState => ({
+      ...state,
+      ingestorBrowserActiveNode: null,
+      error: err,
+    }),
+  ),
+  on(
+    fromActions.getExtractionMethodsSuccess,
+    (state, { extractionMethods }): IngestorState => ({
+      ...state,
+      ingestorExtractionMethods: extractionMethods,
+    }),
+  ),
+  on(
+    fromActions.getExtractionMethodsFailure,
+    (state, { err }): IngestorState => ({
+      ...state,
+      ingestorExtractionMethods: null,
+      error: err,
+    }),
+  ),
   on(
     fromActions.setIngestorEndpoint,
     (state, { ingestorEndpoint }): IngestorState => ({
@@ -34,12 +64,6 @@ const reducer = createReducer(
       connectingBackend: false,
     }),
   ),
-  on(
-    fromActions.connectIngestor,
-    (state): IngestorState => ({
-      ...state,
-    }),
-  ),
   on(
     fromActions.connectIngestorSuccess,
     (
@@ -76,4 +100,11 @@ const reducer = createReducer(
       ingestorTransferList: transferList,
     }),
   ),
+  on(
+    fromActions.updateIngestionObject,
+    (state, { ingestionObject }): IngestorState => ({
+      ...state,
+      ingestionObject,
+    }),
+  ),
 );
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
index 47684b1b90..ba87b9171a 100644
--- a/src/app/state-management/selectors/ingestor.selector.ts
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -33,3 +33,18 @@ export const selectIngestorTransferList = createSelector(
   selectIngestorState,
   (state) => state.ingestorTransferList,
 );
+
+export const selectIngestionObject = createSelector(
+  selectIngestorState,
+  (state) => state.ingestionObject,
+);
+
+export const selectIngestorExtractionMethods = createSelector(
+  selectIngestorState,
+  (state) => state.ingestorExtractionMethods,
+);
+
+export const selectIngestorBrowserActiveNode = createSelector(
+  selectIngestorState,
+  (state) => state.ingestorBrowserActiveNode,
+);
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 191ebe31ed..3dc444faf6 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -1,4 +1,10 @@
 import {
+  IngestionRequestInformation,
+  IngestorHelper,
+} from "ingestor/ingestor-page/helper/ingestor.component-helper";
+import {
+  GetBrowseDatasetResponse,
+  GetExtractorResponse,
   GetTransferResponse,
   OtherHealthResponse,
   OtherVersionResponse,
@@ -21,6 +27,9 @@ export interface IngestorState {
   ingestorAuth: IngestorAuthentication | null;
   ingestorEndpoint: string | null;
   ingestorTransferList: GetTransferResponse | null;
+  ingestorExtractionMethods: GetExtractorResponse | null;
+  ingestionObject: IngestionRequestInformation;
+  ingestorBrowserActiveNode: GetBrowseDatasetResponse | null;
   connectingBackend: boolean;
   error: any | null;
 }
@@ -33,6 +42,9 @@ export const initialIngestorState: IngestorState = {
   ingestorAuth: null,
   ingestorEndpoint: null,
   ingestorTransferList: null,
+  ingestorExtractionMethods: null,
+  ingestionObject: IngestorHelper.createEmptyRequestInformation(),
+  ingestorBrowserActiveNode: null,
   connectingBackend: false,
   error: null,
 };

From c5c143b7b70a741d09e1f0457c279d1db9379020 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 25 Apr 2025 09:39:18 +0000
Subject: [PATCH 151/245] further updates to ngrx-store

---
 ....confirm-transfer-dialog-page.component.ts |  22 +--
 ...ingestor.confirm-transfer-dialog-page.html |   4 +-
 ...estor.confirm-transfer-dialog.component.ts | 107 -----------
 .../ingestor.confirm-transfer-dialog.html     |  51 ------
 ...tractor-metadata-dialog-page.component.ts} |  94 ++++++----
 ...estor.extractor-metadata-dialog-page.html} |   4 +-
 ...stor.new-transfer-dialog-page.component.ts |  10 --
 .../ingestor.new-transfer-dialog-page.html    |   3 +-
 .../ingestor.new-transfer-dialog.component.ts | 166 ------------------
 .../ingestor.new-transfer-dialog.html         |  54 ------
 ...tor.user-metadata-dialog-page.component.ts |  62 +++----
 .../ingestor.user-metadata-dialog-page.html   |   4 +-
 ...ingestor.user-metadata-dialog.component.ts | 126 -------------
 .../ingestor.user-metadata-dialog.html        |  88 ----------
 ...ingestor.creation-dialog-base.component.ts |  35 ++--
 .../ingestor.creation-dialog-base.html        |  17 +-
 src/app/ingestor/ingestor.module.ts           |  16 +-
 17 files changed, 140 insertions(+), 723 deletions(-)
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{creation-pages-new => creation-pages}/ingestor.confirm-transfer-dialog-page.component.ts (85%)
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{creation-pages-new => creation-pages}/ingestor.confirm-transfer-dialog-page.html (88%)
 delete mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.component.ts
 delete mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.html
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/{ingestor.extractor-metadata-dialog.component.ts => ingestor.extractor-metadata-dialog-page.component.ts} (52%)
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/{ingestor.extractor-metadata-dialog.html => ingestor.extractor-metadata-dialog-page.html} (96%)
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{creation-pages-new => creation-pages}/ingestor.new-transfer-dialog-page.component.ts (94%)
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{creation-pages-new => creation-pages}/ingestor.new-transfer-dialog-page.html (93%)
 delete mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.component.ts
 delete mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.html
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{creation-pages-new => creation-pages}/ingestor.user-metadata-dialog-page.component.ts (74%)
 rename src/app/ingestor/ingestor-dialogs/creation-dialog/{creation-pages-new => creation-pages}/ingestor.user-metadata-dialog-page.html (96%)
 delete mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.component.ts
 delete mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.html

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
similarity index 85%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index 6e0ad676c6..882d42ce23 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -1,14 +1,11 @@
-import { Component, inject, OnInit } from "@angular/core";
+import { Component, EventEmitter, inject, OnInit, Output } from "@angular/core";
 import {
   IngestionRequestInformation,
   IngestorHelper,
   SciCatHeader,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { Store } from "@ngrx/store";
-import {
-  selectIngestionObject,
-  selectIngestorEndpoint,
-} from "state-management/selectors/ingestor.selector";
+import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
 import { MatDialog } from "@angular/material/dialog";
 
 @Component({
@@ -23,15 +20,16 @@ export class IngestorConfirmTransferDialogPageComponent implements OnInit {
     IngestorHelper.createEmptyRequestInformation();
 
   ingestionObject$ = this.store.select(selectIngestionObject);
-  ingestorBackend$ = this.store.select(selectIngestorEndpoint);
+
+  @Output() nextStep = new EventEmitter<void>();
+  @Output() backStep = new EventEmitter<void>();
 
   provideMergeMetaData = "";
-  connectedFacilityBackend = "";
 
   errorMessage = "";
   copiedToClipboard = false;
 
-  constructor(private store: Store) {}
+  constructor(private store: Store) { }
 
   ngOnInit() {
     this.ingestionObject$.subscribe((ingestionObject) => {
@@ -40,11 +38,6 @@ export class IngestorConfirmTransferDialogPageComponent implements OnInit {
       }
     });
 
-    this.ingestorBackend$.subscribe((ingestorBackend) => {
-      if (ingestorBackend) {
-        this.connectedFacilityBackend = ingestorBackend;
-      }
-    });
     this.provideMergeMetaData = this.createMetaDataString();
   }
 
@@ -74,10 +67,11 @@ export class IngestorConfirmTransferDialogPageComponent implements OnInit {
   }
 
   onClickBack(): void {
-    // TODO on click back
+    this.backStep.emit(); // Open previous dialog
   }
 
   onClickConfirm(): void {
+    this.nextStep.emit(); // Open previous dialog
     this.errorMessage = "";
     /*if (this.data && this.data.onClickNext) {
       const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
similarity index 88%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
index 77f2d8c36a..24444f9775 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
@@ -41,11 +41,11 @@ <h2 mat-dialog-title>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
+  <button mat-button (click)="onClickBack()">Back</button>
   <button *ngIf="createNewTransferData.editorMode === 'INGESTION'" mat-button color="primary" cdkFocusInitial
     (click)="onClickConfirm()">Ingest</button>
     <button *ngIf="createNewTransferData.editorMode === 'EDITOR'" mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">
       {{!copiedToClipboard ? "Copy JSON" : "Copied!"}}
     </button>
-    <button *ngIf="copiedToClipboard" mat-dialog-close mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">Close</button>
+    <button *ngIf="copiedToClipboard" mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">Close</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.component.ts
deleted file mode 100644
index b59aa55c31..0000000000
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.component.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { Component, Inject, OnInit } from "@angular/core";
-import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
-import {
-  DialogDataObject,
-  IngestionRequestInformation,
-  IngestorHelper,
-  SciCatHeader,
-} from "../../../ingestor-page/helper/ingestor.component-helper";
-import { IngestorConfirmationDialogComponent } from "../../confirmation-dialog/ingestor.confirmation-dialog.component";
-
-@Component({
-  selector: "ingestor.confirm-transfer-dialog",
-  templateUrl: "ingestor.confirm-transfer-dialog.html",
-  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
-})
-export class IngestorConfirmTransferDialogComponent implements OnInit {
-  createNewTransferData: IngestionRequestInformation =
-    IngestorHelper.createEmptyRequestInformation();
-  provideMergeMetaData = "";
-  backendURL = "";
-  errorMessage = "";
-  copiedToClipboard = false;
-
-  constructor(
-    public dialog: MatDialog,
-    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
-  ) {
-    this.createNewTransferData = data.createNewTransferData;
-    this.backendURL = data.backendURL;
-  }
-
-  ngOnInit() {
-    this.provideMergeMetaData = this.createMetaDataString();
-  }
-
-  createMetaDataString(): string {
-    const space = 2;
-    const scicatMetadata: SciCatHeader = {
-      ...(this.createNewTransferData.scicatHeader as SciCatHeader),
-      scientificMetadata: {
-        organizational:
-          this.createNewTransferData.userMetaData["organizational"],
-        sample: this.createNewTransferData.userMetaData["sample"],
-        acquisition:
-          this.createNewTransferData.extractorMetaData["acquisition"],
-        instrument: this.createNewTransferData.extractorMetaData["instrument"],
-      },
-    };
-
-    return JSON.stringify(scicatMetadata, null, space);
-  }
-
-  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
-    Object.assign(this.createNewTransferData, updatedData);
-  }
-
-  clearErrorMessage(): void {
-    this.errorMessage = "";
-  }
-
-  onClickBack(): void {
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(2);
-    }
-  }
-
-  onClickConfirm(): void {
-    this.errorMessage = "";
-    if (this.data && this.data.onClickNext) {
-      const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
-        data: {
-          header: "Confirm ingestion",
-          message: "Create a new dataset and start data transfer?",
-        },
-      });
-      dialogRef.afterClosed().subscribe(async (result) => {
-        if (result) {
-          this.createNewTransferData.mergedMetaDataString =
-            this.provideMergeMetaData;
-          try {
-            const success = await this.data.onStartUpload();
-            if (success) {
-              this.data.onClickNext(4);
-            }
-          } catch (error) {
-            this.errorMessage = error.message;
-
-            if (error.error) {
-              this.errorMessage += ": " + error.error;
-            }
-          }
-        }
-      });
-    }
-  }
-
-  onCopyMetadata(): void {
-    navigator.clipboard.writeText(this.provideMergeMetaData).then(
-      () => {
-        this.copiedToClipboard = true;
-      },
-      (err) => {
-        console.error("Failed to copy metadata to clipboard: ", err);
-      },
-    );
-  }
-}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.html
deleted file mode 100644
index 77f2d8c36a..0000000000
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="ingestor-mixed-header">
-  <h2 mat-dialog-title>
-    Confirm transfer
-  </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close"
-    class="ingestor-close-button">
-    <mat-icon>close</mat-icon>
-  </button>
-</div>
-<mat-dialog-content class="mat-typography">
-  <ingestor-dialog-stepper [activeStep]="3"
-    [createNewTransferData]="createNewTransferData"
-    (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
-
-  <p *ngIf="errorMessage !== ''">
-    <mat-card class="ingestor-card">
-      <mat-card-header class="ingestor-mixed-header">
-        <mat-card-title>Error message</mat-card-title>
-        <button mat-icon-button class="ingestor-close-button"
-          (click)="clearErrorMessage()">
-          <mat-icon>close</mat-icon>
-        </button>
-      </mat-card-header>
-      <mat-card-content class="ingestor-vertical-layout">
-        <div>
-          <p style="color: red" [innerHTML]="errorMessage"></p>
-        </div>
-      </mat-card-content>
-    </mat-card>
-  </p>
-
-  <p>Confirm Metadata</p>
-
-  <div class="code-editor">
-    <pre class="code">
-    <div *ngFor="let line of provideMergeMetaData.split('\n')">
-      <code>{{ line }}</code>
-    </div>
-    </pre>
-  </div>
-
-</mat-dialog-content>
-<mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button *ngIf="createNewTransferData.editorMode === 'INGESTION'" mat-button color="primary" cdkFocusInitial
-    (click)="onClickConfirm()">Ingest</button>
-    <button *ngIf="createNewTransferData.editorMode === 'EDITOR'" mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">
-      {{!copiedToClipboard ? "Copy JSON" : "Copied!"}}
-    </button>
-    <button *ngIf="copiedToClipboard" mat-dialog-close mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">Close</button>
-</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
similarity index 52%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index eb672b32ea..65ba43da84 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -1,25 +1,36 @@
-import { ChangeDetectorRef, Component, Inject } from "@angular/core";
-import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  OnInit,
+  Output,
+} from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import {
-  DialogDataObject,
   IngestionRequestInformation,
   IngestorHelper,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import { Store } from "@ngrx/store";
+import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
+import * as fromActions from "state-management/actions/ingestor.actions";
 
 @Component({
-  selector: "ingestor.extractor-metadata-dialog",
-  templateUrl: "ingestor.extractor-metadata-dialog.html",
+  selector: "ingestor-extractor-metadata-dialog-page",
+  templateUrl: "ingestor.extractor-metadata-dialog-page.html",
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
-export class IngestorExtractorMetadataDialogComponent {
+export class IngestorExtractorMetadataDialogPageComponent implements OnInit {
   metadataSchemaInstrument: JsonSchema;
   metadataSchemaAcquisition: JsonSchema;
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
-  backendURL = "";
+  ingestionObject$ = this.store.select(selectIngestionObject);
+
+  @Output() nextStep = new EventEmitter<void>();
+  @Output() backStep = new EventEmitter<void>();
+
   extractorMetaDataReady = false;
   extractorMetaDataStatus = "";
   extractorMetaDataError = false;
@@ -37,41 +48,54 @@ export class IngestorExtractorMetadataDialogComponent {
   };
 
   constructor(
-    public dialog: MatDialog,
-    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
+    private store: Store,
     private cdr: ChangeDetectorRef,
-  ) {
-    this.createNewTransferData = data.createNewTransferData;
-    this.backendURL = data.backendURL;
-    const instrumentSchema =
-      this.createNewTransferData.selectedResolvedDecodedSchema.properties
-        .instrument;
-    const acqusitionSchema =
-      this.createNewTransferData.selectedResolvedDecodedSchema.properties
-        .acquisition;
-
-    this.metadataSchemaInstrument = instrumentSchema;
-    this.metadataSchemaAcquisition = acqusitionSchema;
-    this.extractorMetaDataReady =
-      this.createNewTransferData.apiInformation.extractorMetaDataReady;
-    this.extractorMetaDataError =
-      this.createNewTransferData.apiInformation.metaDataExtractionFailed;
-    this.extractorMetaDataStatus =
-      this.createNewTransferData.apiInformation.extractorMetaDataStatus;
-    this.process =
-      this.createNewTransferData.apiInformation.extractorMetadataProgress;
+  ) {}
+
+  ngOnInit() {
+    this.ingestionObject$.subscribe((ingestionObject) => {
+      if (ingestionObject) {
+        this.createNewTransferData = ingestionObject;
+
+        const instrumentSchema =
+          this.createNewTransferData.selectedResolvedDecodedSchema.properties
+            .instrument;
+        const acqusitionSchema =
+          this.createNewTransferData.selectedResolvedDecodedSchema.properties
+            .acquisition;
+
+        this.metadataSchemaInstrument = instrumentSchema;
+        this.metadataSchemaAcquisition = acqusitionSchema;
+        this.extractorMetaDataReady =
+          this.createNewTransferData.apiInformation.extractorMetaDataReady;
+        this.extractorMetaDataError =
+          this.createNewTransferData.apiInformation.metaDataExtractionFailed;
+        this.extractorMetaDataStatus =
+          this.createNewTransferData.apiInformation.extractorMetaDataStatus;
+        this.process =
+          this.createNewTransferData.apiInformation.extractorMetadataProgress;
+      }
+    });
   }
 
   onClickBack(): void {
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(1); // Beispielwert für den Schritt
-    }
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+
+    this.backStep.emit(); // Open previous dialog
   }
 
   onClickNext(): void {
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(3); // Beispielwert für den Schritt
-    }
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+
+    this.nextStep.emit(); // Open next dialog
   }
 
   onDataChangeExtractorMetadataInstrument(event: any) {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
similarity index 96%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
index 9218779c2c..0d7a09800c 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
@@ -92,7 +92,7 @@ <h2 mat-dialog-title>
   </div>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+  <button mat-button (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial
     (click)="onClickNext()" [disabled]="!uiNextButtonReady">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
similarity index 94%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index cdb532fd43..1e0fc3cc53 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -13,7 +13,6 @@ import { IngestorFileBrowserComponent } from "ingestor/ingestor-dialogs/ingestor
 import { Store } from "@ngrx/store";
 import {
   selectIngestionObject,
-  selectIngestorEndpoint,
   selectIngestorExtractionMethods,
 } from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
@@ -27,13 +26,11 @@ export class IngestorNewTransferDialogPageComponent implements OnInit {
   readonly dialog = inject(MatDialog);
 
   ingestionObject$ = this.store.select(selectIngestionObject);
-  ingestorBackend$ = this.store.select(selectIngestorEndpoint);
   ingestorExtractionMethods$ = this.store.select(
     selectIngestorExtractionMethods,
   );
 
   @Output() nextStep = new EventEmitter<void>();
-  @Output() backStep = new EventEmitter<void>();
 
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
@@ -58,12 +55,6 @@ export class IngestorNewTransferDialogPageComponent implements OnInit {
       }
     });
 
-    this.ingestorBackend$.subscribe((ingestorBackend) => {
-      if (ingestorBackend) {
-        this.connectedFacilityBackend = ingestorBackend;
-      }
-    });
-
     this.ingestorExtractionMethods$.subscribe((extractionMethods) => {
       if (extractionMethods) {
         this.extractionMethods = extractionMethods;
@@ -179,7 +170,6 @@ export class IngestorNewTransferDialogPageComponent implements OnInit {
     this.dialog
       .open(IngestorFileBrowserComponent, {
         data: {
-          backendURL: this.connectedFacilityBackend,
           createNewTransferData: this.createNewTransferData,
         },
       })
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
similarity index 93%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index 98017d7c10..1d423fc891 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -49,6 +49,5 @@ <h2 mat-dialog-title>
   <button *ngIf="extractionMethodsError" mat-button
     color="warn" (click)="onClickRetryRequests()">Retry</button>
   <button mat-button mat-dialog-close>Cancel</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
-    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
+  <button mat-button color="primary" cdkFocusInitial [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.component.ts
deleted file mode 100644
index 12958bd256..0000000000
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.component.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import { Component, Inject, OnInit } from "@angular/core";
-import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
-import {
-  decodeBase64ToUTF8,
-  DialogDataObject,
-  ExtractionMethod,
-  IngestionRequestInformation,
-  IngestorHelper,
-} from "../../../ingestor-page/helper/ingestor.component-helper";
-import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
-import { IngestorAPIManager } from "../../../ingestor-page/helper/ingestor-api-manager";
-import { GetExtractorResponse } from "shared/sdk/models/ingestor/models";
-import { PageChangeEvent } from "shared/modules/table/table.component";
-import { IngestorFileBrowserComponent } from "ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component";
-
-@Component({
-  selector: "ingestor.new-transfer-dialog",
-  templateUrl: "ingestor.new-transfer-dialog.html",
-  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
-})
-export class IngestorNewTransferDialogComponent implements OnInit {
-  extractionMethods: GetExtractorResponse = null;
-  dropdownPageSize = 50;
-  extractionMethodsPage = 0;
-
-  backendURL = "";
-  extractionMethodsError = "";
-
-  uiNextButtonReady = false;
-
-  createNewTransferData: IngestionRequestInformation =
-    IngestorHelper.createEmptyRequestInformation();
-
-  constructor(
-    public dialog: MatDialog,
-    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
-    private apiManager: IngestorAPIManager,
-  ) {
-    this.createNewTransferData = data.createNewTransferData;
-    this.backendURL = data.backendURL;
-    this.apiManager.connect(this.backendURL);
-  }
-
-  ngOnInit(): void {
-    this.loadExtractionMethods();
-  }
-
-  set selectedPath(value: string) {
-    this.createNewTransferData.selectedPath = value;
-    this.validateNextButton();
-  }
-
-  get selectedPath(): string {
-    return this.createNewTransferData.selectedPath;
-  }
-
-  set selectedMethod(value: ExtractionMethod) {
-    this.createNewTransferData.selectedMethod = value;
-    this.validateNextButton();
-  }
-
-  get selectedMethod(): ExtractionMethod {
-    return this.createNewTransferData.selectedMethod;
-  }
-
-  async loadExtractionMethods(): Promise<void> {
-    try {
-      this.extractionMethods = await this.apiManager.getExtractionMethods(
-        this.extractionMethodsPage + 1, // 1-based
-        this.dropdownPageSize,
-      );
-    } catch (error) {
-      this.extractionMethodsError = error.message;
-      console.error(this.extractionMethodsError);
-    }
-  }
-
-  generateExampleDataForSciCatHeader(): void {
-    this.data.createNewTransferData.scicatHeader["sourceFolder"] =
-      this.createNewTransferData.selectedPath;
-    this.data.createNewTransferData.scicatHeader["keywords"] = ["OpenEM"];
-
-    const nameWithoutPath =
-      this.createNewTransferData.selectedPath.split("/|\\")[-1] ??
-      this.createNewTransferData.selectedPath;
-    this.data.createNewTransferData.scicatHeader["datasetName"] =
-      nameWithoutPath;
-    this.data.createNewTransferData.scicatHeader["license"] = "MIT License";
-    this.data.createNewTransferData.scicatHeader["type"] = "raw";
-    this.data.createNewTransferData.scicatHeader["dataFormat"] = "root";
-    this.data.createNewTransferData.scicatHeader["owner"] = "User";
-
-    this.data.createNewTransferData.scicatHeader["principalInvestigator"] =
-      this.data.userInfo?.name ?? "";
-    this.data.createNewTransferData.scicatHeader["investigator"] =
-      this.data.userInfo?.name ?? "";
-    this.data.createNewTransferData.scicatHeader["ownerEmail"] =
-      this.data.userInfo?.email ?? "";
-    this.data.createNewTransferData.scicatHeader["contactEmail"] =
-      this.data.userInfo?.email ?? "";
-    const creationTime = new Date();
-    const formattedCreationTime = creationTime.toISOString().split("T")[0];
-    this.data.createNewTransferData.scicatHeader["creationTime"] =
-      formattedCreationTime;
-  }
-
-  prepareSchemaForProcessing(): void {
-    const encodedSchema = this.createNewTransferData.selectedMethod.schema;
-    const decodedSchema = decodeBase64ToUTF8(encodedSchema);
-    const schema = JSON.parse(decodedSchema);
-    const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
-      schema,
-      schema,
-    );
-    this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
-  }
-
-  onClickRetryRequests(): void {
-    this.loadExtractionMethods();
-  }
-
-  onClickNext(): void {
-    if (this.data && this.data.onClickNext) {
-      this.generateExampleDataForSciCatHeader();
-      this.prepareSchemaForProcessing();
-      this.data.onClickNext(1); // Open next dialog
-    }
-  }
-
-  validateNextButton(): void {
-    const selectedPathReady =
-      (this.createNewTransferData.editorMode === "INGESTION" &&
-        this.createNewTransferData.selectedPath !== "") ||
-      this.createNewTransferData.editorMode === "EDITOR";
-    const selectedMethodReady =
-      this.selectedMethod !== null &&
-      this.selectedMethod !== undefined &&
-      this.selectedMethod.name !== "";
-
-    this.uiNextButtonReady = !!selectedPathReady && !!selectedMethodReady;
-  }
-
-  onExtractorMethodsPageChange(event: PageChangeEvent) {
-    this.extractionMethodsPage = event.pageIndex; // 0-based
-    this.loadExtractionMethods();
-  }
-
-  onClickOpenFileBrowser(): void {
-    this.dialog
-      .open(IngestorFileBrowserComponent, {
-        data: {
-          backendURL: this.backendURL,
-          createNewTransferData: this.createNewTransferData,
-        },
-      })
-      .afterClosed()
-      .subscribe(() => {
-        this.validateNextButton();
-      });
-  }
-
-  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
-    Object.assign(this.createNewTransferData, updatedData);
-    this.validateNextButton();
-  }
-}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.html
deleted file mode 100644
index 98017d7c10..0000000000
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="ingestor-mixed-header">
-  <h2 mat-dialog-title>
-    Select your ingestion method
-  </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close"
-    class="ingestor-close-button">
-    <mat-icon>close</mat-icon>
-  </button>
-</div>
-<mat-dialog-content class="mat-typography" disableClose="true">
-  <ingestor-dialog-stepper [activeStep]="0"
-  [createNewTransferData]="createNewTransferData"
-  (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
-
-  <p>Please select the dataset to be uploaded and the appropriate metadata
-    extractor method.</p>
-
-  <div *ngIf="createNewTransferData.editorMode === 'INGESTION'">
-    <mat-form-field class="form-full-width">
-      <mat-label>File Path</mat-label>
-      <input matInput [(ngModel)]="selectedPath" (click)="onClickOpenFileBrowser()" readonly>
-      <!-- [matAutocomplete]="auto" -->
-      <button mat-icon-button matSuffix (click)="onClickOpenFileBrowser()">
-        <mat-icon>folder</mat-icon>
-      </button>
-    </mat-form-field>
-  </div>
-
-  <div *ngIf="extractionMethods !== null">
-    <mat-form-field class="form-full-width">
-      <mat-label *ngIf="createNewTransferData.editorMode === 'INGESTION'">Extraction Method</mat-label>
-      <mat-label *ngIf="createNewTransferData.editorMode === 'EDITOR'">Editor schema</mat-label>
-      <mat-select [(ngModel)]="selectedMethod">
-        <mat-option *ngFor="let method of extractionMethods.methods" [value]="method">
-          {{ method.name }}
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-    <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError
-      }}</mat-error>
-
-    <mat-paginator *ngIf="extractionMethods.total > dropdownPageSize" [length]="extractionMethods.total" [pageSize]="dropdownPageSize" aria-label="Select page"
-      [hidePageSize]="true" [showFirstLastButtons]="false" [pageIndex]="extractionMethodsPage" (page)="onExtractorMethodsPageChange($event)">
-    </mat-paginator>
-  </div>
-
-</mat-dialog-content>
-<mat-dialog-actions align="end">
-  <button *ngIf="extractionMethodsError" mat-button
-    color="warn" (click)="onClickRetryRequests()">Retry</button>
-  <button mat-button mat-dialog-close>Cancel</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
-    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
-</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
similarity index 74%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.component.ts
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index dc3635b2bc..2209778b79 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -1,4 +1,10 @@
-import { ChangeDetectorRef, Component, OnInit } from "@angular/core";
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  OnInit,
+  Output,
+} from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import {
   IngestionRequestInformation,
@@ -6,10 +12,8 @@ import {
   SciCatHeader_Schema,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
-import {
-  selectIngestionObject,
-  selectIngestorEndpoint,
-} from "state-management/selectors/ingestor.selector";
+import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
+import * as fromActions from "state-management/actions/ingestor.actions";
 import { Store } from "@ngrx/store";
 
 @Component({
@@ -19,15 +23,16 @@ import { Store } from "@ngrx/store";
 })
 export class IngestorUserMetadataDialogPageComponent implements OnInit {
   ingestionObject$ = this.store.select(selectIngestionObject);
-  ingestorBackend$ = this.store.select(selectIngestorEndpoint);
 
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
+  @Output() nextStep = new EventEmitter<void>();
+  @Output() backStep = new EventEmitter<void>();
+
   metadataSchemaOrganizational: JsonSchema;
   metadataSchemaSample: JsonSchema;
   scicatHeaderSchema: JsonSchema;
-  connectedFacilityBackend = "";
 
   uiNextButtonReady = false;
   isSciCatHeaderOk = false;
@@ -46,43 +51,40 @@ export class IngestorUserMetadataDialogPageComponent implements OnInit {
   constructor(
     private store: Store,
     private cdr: ChangeDetectorRef,
-  ) {
-    const organizationalSchema =
-      this.createNewTransferData.selectedResolvedDecodedSchema.properties
-        .organizational;
-    const sampleSchema =
-      this.createNewTransferData.selectedResolvedDecodedSchema.properties
-        .sample;
-
-    this.metadataSchemaOrganizational = organizationalSchema;
-    this.metadataSchemaSample = sampleSchema;
-    this.scicatHeaderSchema = SciCatHeader_Schema;
-  }
+  ) {}
 
   ngOnInit() {
     this.ingestionObject$.subscribe((ingestionObject) => {
       if (ingestionObject) {
         this.createNewTransferData = ingestionObject;
-      }
-    });
 
-    this.ingestorBackend$.subscribe((ingestorBackend) => {
-      if (ingestorBackend) {
-        this.connectedFacilityBackend = ingestorBackend;
+        this.metadataSchemaOrganizational =
+          this.createNewTransferData.selectedResolvedDecodedSchema.properties.organizational;
+        this.metadataSchemaSample =
+          this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
+        this.scicatHeaderSchema = SciCatHeader_Schema;
       }
     });
   }
 
   onClickBack(): void {
-    /*if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(0); // Beispielwert für den Schritt
-    }*/
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+
+    this.backStep.emit(); // Open previous dialog
   }
 
   onClickNext(): void {
-    /*if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(2); // Beispielwert für den Schritt
-    }*/
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+
+    this.nextStep.emit(); // Open next dialog
   }
 
   onDataChangeUserMetadataOrganization(event: any) {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
similarity index 96%
rename from src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.html
rename to src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
index 8316d0c900..92e5c8c926 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
@@ -82,7 +82,7 @@ <h2 mat-dialog-title>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
+  <button mat-button (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial
     [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.component.ts
deleted file mode 100644
index cba2a90443..0000000000
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.component.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import { ChangeDetectorRef, Component, Inject } from "@angular/core";
-import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
-import { JsonSchema } from "@jsonforms/core";
-import {
-  DialogDataObject,
-  IngestionRequestInformation,
-  IngestorHelper,
-  SciCatHeader_Schema,
-} from "../../../ingestor-page/helper/ingestor.component-helper";
-import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
-
-@Component({
-  selector: "ingestor.user-metadata-dialog",
-  templateUrl: "ingestor.user-metadata-dialog.html",
-  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
-})
-export class IngestorUserMetadataDialogComponent {
-  metadataSchemaOrganizational: JsonSchema;
-  metadataSchemaSample: JsonSchema;
-  scicatHeaderSchema: JsonSchema;
-  createNewTransferData: IngestionRequestInformation =
-    IngestorHelper.createEmptyRequestInformation();
-  backendURL = "";
-
-  uiNextButtonReady = false;
-  isSciCatHeaderOk = false;
-  scicatHeaderErrors = "";
-  isOrganizationalMetadataOk = false;
-  organizationalErrors = "";
-  isSampleInformationOk = false;
-  sampleErrors = "";
-
-  isCardContentVisible = {
-    scicat: true,
-    organizational: true,
-    sample: true,
-  };
-
-  constructor(
-    public dialog: MatDialog,
-    @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
-    private cdr: ChangeDetectorRef,
-  ) {
-    this.createNewTransferData = data.createNewTransferData;
-    this.backendURL = data.backendURL;
-    const organizationalSchema =
-      this.createNewTransferData.selectedResolvedDecodedSchema.properties
-        .organizational;
-    const sampleSchema =
-      this.createNewTransferData.selectedResolvedDecodedSchema.properties
-        .sample;
-
-    this.metadataSchemaOrganizational = organizationalSchema;
-    this.metadataSchemaSample = sampleSchema;
-    this.scicatHeaderSchema = SciCatHeader_Schema;
-  }
-
-  onClickBack(): void {
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(0); // Beispielwert für den Schritt
-    }
-  }
-
-  onClickNext(): void {
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(2); // Beispielwert für den Schritt
-    }
-  }
-
-  onDataChangeUserMetadataOrganization(event: any) {
-    this.createNewTransferData.userMetaData["organizational"] = event;
-  }
-
-  onDataChangeUserMetadataSample(event: any) {
-    this.createNewTransferData.userMetaData["sample"] = event;
-  }
-
-  onDataChangeUserScicatHeader(event: any) {
-    this.createNewTransferData.scicatHeader = event;
-  }
-
-  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
-    Object.assign(this.createNewTransferData, updatedData);
-  }
-
-  toggleCardContent(card: string): void {
-    this.isCardContentVisible[card] = !this.isCardContentVisible[card];
-  }
-
-  scicatHeaderErrorsHandler(errors: any[]) {
-    this.isSciCatHeaderOk = errors.length === 0;
-    this.scicatHeaderErrors = convertJSONFormsErrorToString(errors);
-    this.validateNextButton();
-    this.cdr.detectChanges();
-  }
-
-  organizationalErrorsHandler(errors: any[]) {
-    this.isOrganizationalMetadataOk = errors.length === 0;
-    this.organizationalErrors = convertJSONFormsErrorToString(errors);
-    this.validateNextButton();
-    this.cdr.detectChanges();
-  }
-
-  sampleErrorsHandler(errors: any[]) {
-    this.isSampleInformationOk = errors.length === 0;
-    this.sampleErrors = "";
-    errors.forEach((error, number) => {
-      if (error.message) {
-        const ctrNum = number + 1;
-        this.sampleErrors += ctrNum + ": " + error.message + "\n";
-      }
-    });
-    this.validateNextButton();
-    this.cdr.detectChanges();
-  }
-
-  validateNextButton(): void {
-    this.uiNextButtonReady = true;
-
-    // Uncomment if prod
-    /*this.uiNextButtonReady =
-      this.isSciCatHeaderOk &&
-      this.isOrganizationalMetadataOk &&
-      this.isSampleInformationOk;*/
-  }
-}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.html
deleted file mode 100644
index 8316d0c900..0000000000
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<div class="ingestor-mixed-header">
-  <h2 mat-dialog-title>
-    Fill out user-specific metadata
-  </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close"
-    class="ingestor-close-button">
-    <mat-icon>close</mat-icon>
-  </button>
-</div>
-<mat-dialog-content class="mat-typography" disableClose="true">
-  <ingestor-dialog-stepper [activeStep]="1" [createNewTransferData]="createNewTransferData" (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
-
-  <div fxLayout="row" fxLayout.xs="column">
-    <div fxFlex="80%">
-      <mat-card>
-        <mat-card-header class="scicat-header"
-          (click)="toggleCardContent('scicat')">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> info </mat-icon>
-          </div>
-          SciCat Information
-          <span class="spacer"></span>
-            <mat-icon
-            [matTooltip]="isSciCatHeaderOk ? 'Your input is correct.' : scicatHeaderErrors"
-            [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'">{{
-            isSciCatHeaderOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
-          <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ?
-            'expand_less' : 'expand_more' }}</mat-icon>
-        </mat-card-header>
-        <mat-card-content *ngIf="isCardContentVisible.scicat">
-          <app-metadata-editor [schema]="scicatHeaderSchema"
-            [data]="createNewTransferData.scicatHeader"
-            (dataChange)="onDataChangeUserScicatHeader($event)" (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
-        </mat-card-content>
-      </mat-card>
-
-      <mat-card>
-        <mat-card-header class="organizational-header"
-          (click)="toggleCardContent('organizational')">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> person </mat-icon>
-          </div>
-          Organizational Information
-          <span class="spacer"></span>
-          <mat-icon
-            [matTooltip]="isOrganizationalMetadataOk ? 'Your input is correct.' : organizationalErrors"
-            [ngClass]="isOrganizationalMetadataOk ? 'success-icon' : 'error-icon'">{{
-            isOrganizationalMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
-          <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ?
-            'expand_less' : 'expand_more' }}</mat-icon>
-        </mat-card-header>
-        <mat-card-content *ngIf="isCardContentVisible.organizational">
-          <app-metadata-editor [schema]="metadataSchemaOrganizational"
-            [data]="createNewTransferData.userMetaData['organizational']"
-            (dataChange)="onDataChangeUserMetadataOrganization($event)" (errors)="organizationalErrorsHandler($event)"></app-metadata-editor>
-        </mat-card-content>
-      </mat-card>
-
-      <mat-card>
-        <mat-card-header class="sample-header"
-          (click)="toggleCardContent('sample')">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> description </mat-icon>
-          </div>
-          Sample Information
-          <span class="spacer"></span>
-          <mat-icon
-            [matTooltip]="isSampleInformationOk ? 'Your input is correct.' : sampleErrors"
-            [ngClass]="isSampleInformationOk ? 'success-icon' : 'error-icon'">{{
-            isSampleInformationOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
-          <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ?
-            'expand_less' : 'expand_more' }}</mat-icon>
-        </mat-card-header>
-        <mat-card-content *ngIf="isCardContentVisible.sample">
-          <app-metadata-editor [schema]="metadataSchemaSample"
-            [data]="createNewTransferData.userMetaData['sample']"
-            (dataChange)="onDataChangeUserMetadataSample($event)" (errors)="sampleErrorsHandler($event)"></app-metadata-editor>
-        </mat-card-content>
-      </mat-card>
-    </div>
-  </div>
-
-</mat-dialog-content>
-<mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
-    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
-</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index 4b3f04903f..e85e5eae4b 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -16,7 +16,7 @@ import { HttpParams } from "@angular/common/http";
 import { INGESTOR_API_ENDPOINTS_V1 } from "ingestor/ingestor-page/helper/ingestor-api-endpoints";
 import { PostDatasetRequest } from "shared/sdk/models/ingestor/models";
 
-type dialogStep =
+export type dialogStep =
   | "NEW_TRANSFER"
   | "USER_METADATA"
   | "EXTRACTOR_METADATA"
@@ -42,7 +42,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit {
     private store: Store,
     private sseService: IngestorMetadataSSEService,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
-  ) {}
+  ) { }
 
   ngOnInit() {
     this.ingestionObject$.subscribe((ingestionObject) => {
@@ -79,7 +79,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit {
       .set("filePath", this.createNewTransferData.selectedPath)
       .set("methodName", this.createNewTransferData.selectedMethod.name);
 
-    const sseUrl = `${this.connectedFacilityBackend + INGESTOR_API_ENDPOINTS_V1.METADATA}?${params.toString()}`;
+    const sseUrl = `${this.connectedFacilityBackend + "/" + INGESTOR_API_ENDPOINTS_V1.METADATA}?${params.toString()}`;
     this.sseService.connect(sseUrl);
     this.sseService.getMessages().subscribe({
       next: (data) => {
@@ -123,19 +123,17 @@ export class IngestorCreationDialogBaseComponent implements OnInit {
     return true;
   }
 
-  onClickNext(step: dialogStep): void {
-    console.log("Next step clicked", step);
-
-    switch (step) {
+  onClickNext(nextStep: dialogStep): void {
+    switch (nextStep) {
       case "NEW_TRANSFER":
+        this.resetExtractedMetadata();
+        break;
+      case "USER_METADATA":
         this.createNewTransferData.apiInformation.extractMetaDataRequested =
           false;
         this.createNewTransferData.apiInformation.extractorMetaDataReady =
           false;
-        this.currentDialogStep = "USER_METADATA";
-        break;
-      case "USER_METADATA":
-        this.resetExtractedMetadata();
+
         if (this.createNewTransferData.editorMode === "INGESTION") {
           this.startMetadataExtraction().catch((error) => {
             console.error("Metadata extraction error", error);
@@ -145,26 +143,19 @@ export class IngestorCreationDialogBaseComponent implements OnInit {
             true;
         }
 
-        this.currentDialogStep = "EXTRACTOR_METADATA";
         break;
       case "EXTRACTOR_METADATA":
-        this.currentDialogStep = "CONFIRM_TRANSFER";
         break;
       case "CONFIRM_TRANSFER":
-        console.log("Confirm transfer step");
         break;
       default:
-        console.error("Unknown step", step);
-    }
-  }
-
-  onClickBack(): void {
-    if (this.data && this.data.onClickNext) {
-      this.data.onClickNext(2);
+        console.error("Unknown step", nextStep);
+        return;
     }
+    this.currentDialogStep = nextStep;
   }
 
-  onClickConfirm(): void {
+  onClickStartIngestion(): void {
     console.log("Confirm button clicked");
   }
 
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
index 98765f376d..53276710fb 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
@@ -1 +1,16 @@
-<ingestor-new-transfer-dialog-page *ngIf="currentDialogStep === 'NEW_TRANSFER'" (nextStep)="onClickNext('NEW_TRANSFER')"></ingestor-new-transfer-dialog-page>
\ No newline at end of file
+<ingestor-new-transfer-dialog-page *ngIf="currentDialogStep === 'NEW_TRANSFER'"
+  (nextStep)="onClickNext('USER_METADATA')"></ingestor-new-transfer-dialog-page>
+
+<ingestor-user-metadata-dialog *ngIf="currentDialogStep === 'USER_METADATA'"
+  (nextStep)="onClickNext('EXTRACTOR_METADATA')"
+  (backStep)="onClickNext('NEW_TRANSFER')"></ingestor-user-metadata-dialog>
+
+<ingestor-extractor-metadata-dialog-page
+  *ngIf="currentDialogStep === 'EXTRACTOR_METADATA'"
+  (nextStep)="onClickNext('CONFIRM_TRANSFER')"
+  (backStep)="onClickNext('USER_METADATA')"></ingestor-extractor-metadata-dialog-page>
+
+<ingestor-confirm-transfer-dialog-page
+  *ngIf="currentDialogStep === 'CONFIRM_TRANSFER'"
+  (nextStep)="onClickStartIngestion()"
+  (backStep)="onClickNext('EXTRACTOR_METADATA')"></ingestor-confirm-transfer-dialog-page>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 633fb6a27e..0444c41557 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -17,12 +17,8 @@ import { MatDialogModule } from "@angular/material/dialog";
 import { MatSelectModule } from "@angular/material/select";
 import { MatOptionModule } from "@angular/material/core";
 import { MatAutocompleteModule } from "@angular/material/autocomplete";
-import { IngestorNewTransferDialogComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog.component";
-import { IngestorUserMetadataDialogComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog.component";
 import { JsonFormsModule } from "@jsonforms/angular";
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
-import { IngestorExtractorMetadataDialogComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog.component";
-import { IngestorConfirmTransferDialogComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog.component";
 import { MatStepperModule } from "@angular/material/stepper";
 import { IngestorDialogStepperComponent } from "./ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component";
 import { AnyOfRendererComponent } from "./ingestor-metadata-editor/customRenderer/any-of-renderer";
@@ -48,21 +44,19 @@ import { IngestorEffects } from "state-management/effects/ingestor.effect";
 import { StoreModule } from "@ngrx/store";
 import { ingestorReducer } from "state-management/reducers/ingestor.reducer";
 import { IngestorCreationDialogBaseComponent } from "./ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component";
-import { IngestorConfirmTransferDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.confirm-transfer-dialog-page.component";
-import { IngestorNewTransferDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.new-transfer-dialog-page.component";
-import { IngestorUserMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages-new/ingestor.user-metadata-dialog-page.component";
+import { IngestorConfirmTransferDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component";
+import { IngestorNewTransferDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component";
+import { IngestorUserMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component";
+import { IngestorExtractorMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component";
 
 @NgModule({
   declarations: [
     IngestorComponent,
     IngestorMetadataEditorComponent,
-    IngestorNewTransferDialogComponent,
     IngestorConfirmTransferDialogPageComponent,
     IngestorNewTransferDialogPageComponent,
     IngestorUserMetadataDialogPageComponent,
-    IngestorUserMetadataDialogComponent,
-    IngestorExtractorMetadataDialogComponent,
-    IngestorConfirmTransferDialogComponent,
+    IngestorExtractorMetadataDialogPageComponent,
     IngestorCreationDialogBaseComponent,
     IngestorDialogStepperComponent,
     AnyOfRendererComponent,

From ec035ecdf4011ef9c8fe8c0e21b65b62dc73b6d6 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 30 Apr 2025 14:17:23 +0000
Subject: [PATCH 152/245] start ingestion process using store

---
 ....confirm-transfer-dialog-page.component.ts | 60 ++++++--------
 ...ingestor.confirm-transfer-dialog-page.html | 80 ++++++++++++++-----
 ...stor.new-transfer-dialog-page.component.ts | 34 ++++----
 .../ingestor.new-transfer-dialog-page.html    |  2 +-
 ...ingestor.creation-dialog-base.component.ts | 40 +++++-----
 .../ingestor.dialog-stepper.component.html    | 45 ++++++++---
 .../ingestor.dialog-stepper.component.ts      | 20 ++++-
 .../ingestor.file-browser.component.html      |  4 +-
 .../ingestor.file-browser.component.ts        |  9 ++-
 .../helper/ingestor.component-helper.ts       |  6 ++
 .../ingestor-page/ingestor.component.scss     | 27 ++++++-
 .../ingestor-page/ingestor.component.ts       | 14 +---
 src/app/shared/sdk/apis/ingestor.service.ts   |  5 +-
 .../actions/ingestor.actions.ts               | 21 +++++
 .../effects/ingestor.effect.ts                | 50 +++++++++++-
 .../reducers/ingestor.reducer.ts              | 42 ++++++++++
 .../selectors/ingestor.selector.ts            |  5 ++
 .../state-management/state/ingestor.store.ts  |  4 +
 18 files changed, 340 insertions(+), 128 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index 882d42ce23..a1aa8c46e8 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -7,6 +7,8 @@ import {
 import { Store } from "@ngrx/store";
 import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
 import { MatDialog } from "@angular/material/dialog";
+import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
+import * as fromActions from "state-management/actions/ingestor.actions";
 
 @Component({
   selector: "ingestor-confirm-transfer-dialog-page",
@@ -26,10 +28,9 @@ export class IngestorConfirmTransferDialogPageComponent implements OnInit {
 
   provideMergeMetaData = "";
 
-  errorMessage = "";
   copiedToClipboard = false;
 
-  constructor(private store: Store) { }
+  constructor(private store: Store) {}
 
   ngOnInit() {
     this.ingestionObject$.subscribe((ingestionObject) => {
@@ -38,6 +39,9 @@ export class IngestorConfirmTransferDialogPageComponent implements OnInit {
       }
     });
 
+    //createNewTransferData.apiInformation.ingestionRequestFailed
+    //createNewTransferData.ingestionRequest
+
     this.provideMergeMetaData = this.createMetaDataString();
   }
 
@@ -62,43 +66,31 @@ export class IngestorConfirmTransferDialogPageComponent implements OnInit {
     Object.assign(this.createNewTransferData, updatedData);
   }
 
-  clearErrorMessage(): void {
-    this.errorMessage = "";
-  }
-
   onClickBack(): void {
+    // Reset the ingestion request
+    this.store.dispatch(fromActions.resetIngestDataset());
     this.backStep.emit(); // Open previous dialog
   }
 
   onClickConfirm(): void {
-    this.nextStep.emit(); // Open previous dialog
-    this.errorMessage = "";
-    /*if (this.data && this.data.onClickNext) {
-      const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
-        data: {
-          header: "Confirm ingestion",
-          message: "Create a new dataset and start data transfer?",
-        },
-      });
-      dialogRef.afterClosed().subscribe(async (result) => {
-        if (result) {
-          this.createNewTransferData.mergedMetaDataString =
-            this.provideMergeMetaData;
-          try {
-            const success = await this.data.onStartUpload();
-            if (success) {
-              this.data.onClickNext(4);
-            }
-          } catch (error) {
-            this.errorMessage = error.message;
-
-            if (error.error) {
-              this.errorMessage += ": " + error.error;
-            }
-          }
-        }
-      });
-    }*/
+    const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
+      data: {
+        header: "Confirm ingestion",
+        message: "Create a new dataset and start data transfer?",
+      },
+    });
+    dialogRef.afterClosed().subscribe(async (result) => {
+      if (result) {
+        this.createNewTransferData.mergedMetaDataString =
+          this.provideMergeMetaData;
+
+        this.nextStep.emit();
+      }
+    });
+  }
+
+  onClickRetryRequests(): void {
+    this.onClickConfirm();
   }
 
   onCopyMetadata(): void {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
index 24444f9775..a6e74eabe8 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
@@ -12,40 +12,80 @@ <h2 mat-dialog-title>
     [createNewTransferData]="createNewTransferData"
     (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
 
-  <p *ngIf="errorMessage !== ''">
+  <p
+    *ngIf="createNewTransferData.apiInformation.ingestionRequestErrorMessage !== ''">
     <mat-card class="ingestor-card">
       <mat-card-header class="ingestor-mixed-header">
-        <mat-card-title>Error message</mat-card-title>
-        <button mat-icon-button class="ingestor-close-button"
-          (click)="clearErrorMessage()">
-          <mat-icon>close</mat-icon>
-        </button>
+        <mat-card-title>Transfer request failed</mat-card-title>
       </mat-card-header>
       <mat-card-content class="ingestor-vertical-layout">
-        <div>
-          <p style="color: red" [innerHTML]="errorMessage"></p>
+        <div class="confirm-message-ingestor">
+            <mat-icon class="confirm-message-ingestor-icon">error</mat-icon>
+            <p>The transfer request has failed.</p>
+            <p class="confirm-message-error">
+            {{createNewTransferData.apiInformation.ingestionRequestErrorMessage}}
+            </p>
         </div>
+
+
       </mat-card-content>
     </mat-card>
   </p>
 
-  <p>Confirm Metadata</p>
+  <div
+    *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
+    <mat-card class="ingestor-card">
+      <mat-card-header class="ingestor-mixed-header">
+        <mat-card-title>Transfer requested</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <div class="confirm-message-ingestor">
+          <mat-icon
+            class="confirm-message-ingestor-icon">check_circle</mat-icon>
+            <p>The transfer request was successfully sent to the server.
+            You will receive an email as soon as the data transfer is complete.
+            </p>
+            <p>Transfer ID: {{createNewTransferData.ingestionRequest.transferId}}
+            </p>
+            <p>Transfer status: {{createNewTransferData.ingestionRequest.status}}
+            </p>
+        </div>
+      </mat-card-content>
+    </mat-card>
+  </div>
+
+  <div
+    *ngIf="createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
+    <p>Confirm Metadata</p>
 
-  <div class="code-editor">
-    <pre class="code">
-    <div *ngFor="let line of provideMergeMetaData.split('\n')">
-      <code>{{ line }}</code>
+    <div class="code-editor">
+      <pre class="code">
+      <div *ngFor="let line of provideMergeMetaData.split('\n')">
+        <code>{{ line }}</code>
+      </div>
+      </pre>
     </div>
-    </pre>
   </div>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button mat-button (click)="onClickBack()">Back</button>
-  <button *ngIf="createNewTransferData.editorMode === 'INGESTION'" mat-button color="primary" cdkFocusInitial
+  <button *ngIf="createNewTransferData.editorMode === 'EDITOR' ||
+  createNewTransferData.editorMode === 'INGESTION' &&
+  (createNewTransferData.ingestionRequest === null ||
+  createNewTransferData.apiInformation.ingestionRequestErrorMessage !== '')"
+    mat-button (click)="onClickBack()">Back</button>
+  <button
+    *ngIf="createNewTransferData.editorMode === 'INGESTION' && (createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '')"
+    mat-button color="primary" cdkFocusInitial
     (click)="onClickConfirm()">Ingest</button>
-    <button *ngIf="createNewTransferData.editorMode === 'EDITOR'" mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">
-      {{!copiedToClipboard ? "Copy JSON" : "Copied!"}}
-    </button>
-    <button *ngIf="copiedToClipboard" mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">Close</button>
+  <button *ngIf="createNewTransferData.editorMode === 'EDITOR'" mat-button
+    color="primary" cdkFocusInitial (click)="onCopyMetadata()">
+    {{!copiedToClipboard ? "Copy JSON" : "Copied!"}}
+  </button>
+  <button
+    *ngIf="copiedToClipboard || (createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '')"
+    mat-button color="primary" cdkFocusInitial mat-dialog-close>Close</button>
+  <button
+    *ngIf="createNewTransferData.apiInformation.ingestionRequestErrorMessage !== ''"
+    mat-button color="warn" (click)="onClickRetryRequests()">Retry</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 1e0fc3cc53..a059344ccd 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -16,6 +16,8 @@ import {
   selectIngestorExtractionMethods,
 } from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
+import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
+import { ReturnedUserDto } from "@scicatproject/scicat-sdk-ts";
 
 @Component({
   selector: "ingestor-new-transfer-dialog-page",
@@ -26,6 +28,7 @@ export class IngestorNewTransferDialogPageComponent implements OnInit {
   readonly dialog = inject(MatDialog);
 
   ingestionObject$ = this.store.select(selectIngestionObject);
+  vm$ = this.store.select(selectUserSettingsPageViewModel);
   ingestorExtractionMethods$ = this.store.select(
     selectIngestorExtractionMethods,
   );
@@ -42,13 +45,19 @@ export class IngestorNewTransferDialogPageComponent implements OnInit {
   connectedFacilityBackend = "";
   extractionMethodsError = "";
 
+  userProfile: ReturnedUserDto | null = null;
   uiNextButtonReady = false;
 
-  constructor(private store: Store) {}
+  constructor(private store: Store) { }
 
   ngOnInit() {
     this.loadExtractionMethods();
 
+    // Fetch the API token that the ingestor can authenticate to scicat as the user
+    this.vm$.subscribe((settings) => {
+      this.userProfile = settings.user;
+    });
+
     this.ingestionObject$.subscribe((ingestionObject) => {
       if (ingestionObject) {
         this.createNewTransferData = ingestionObject;
@@ -66,15 +75,6 @@ export class IngestorNewTransferDialogPageComponent implements OnInit {
     });
   }
 
-  set selectedPath(value: string) {
-    this.createNewTransferData.selectedPath = value;
-    this.validateNextButton();
-  }
-
-  get selectedPath(): string {
-    return this.createNewTransferData.selectedPath;
-  }
-
   set selectedMethod(value: ExtractionMethod) {
     this.createNewTransferData.selectedMethod = value;
     this.validateNextButton();
@@ -107,14 +107,14 @@ export class IngestorNewTransferDialogPageComponent implements OnInit {
     this.createNewTransferData.scicatHeader["dataFormat"] = "root";
     this.createNewTransferData.scicatHeader["owner"] = "User";
 
-    /*this.createNewTransferData.scicatHeader["principalInvestigator"] =
-      this.data.userInfo?.name ?? "";
+    this.createNewTransferData.scicatHeader["principalInvestigator"] =
+      this.userProfile.username;
     this.createNewTransferData.scicatHeader["investigator"] =
-      this.data.userInfo?.name ?? "";
+      this.userProfile.username;
     this.createNewTransferData.scicatHeader["ownerEmail"] =
-      this.data.userInfo?.email ?? "";
+      this.userProfile.email;
     this.createNewTransferData.scicatHeader["contactEmail"] =
-      this.data.userInfo?.email ?? "";*/
+      this.userProfile.email;
     const creationTime = new Date();
     const formattedCreationTime = creationTime.toISOString().split("T")[0];
     this.createNewTransferData.scicatHeader["creationTime"] =
@@ -169,9 +169,7 @@ export class IngestorNewTransferDialogPageComponent implements OnInit {
   onClickOpenFileBrowser(): void {
     this.dialog
       .open(IngestorFileBrowserComponent, {
-        data: {
-          createNewTransferData: this.createNewTransferData,
-        },
+        data: {},
       })
       .afterClosed()
       .subscribe(() => {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index 1d423fc891..de7865c50e 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -18,7 +18,7 @@ <h2 mat-dialog-title>
   <div *ngIf="createNewTransferData.editorMode === 'INGESTION'">
     <mat-form-field class="form-full-width">
       <mat-label>File Path</mat-label>
-      <input matInput [(ngModel)]="selectedPath" (click)="onClickOpenFileBrowser()" readonly>
+      <input matInput [(ngModel)]="createNewTransferData.selectedPath" (click)="onClickOpenFileBrowser()" readonly>
       <!-- [matAutocomplete]="auto" -->
       <button mat-icon-button matSuffix (click)="onClickOpenFileBrowser()">
         <mat-icon>folder</mat-icon>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index e85e5eae4b..d4dda8009e 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -15,6 +15,9 @@ import { IngestorMetadataSSEService } from "ingestor/ingestor-page/helper/ingest
 import { HttpParams } from "@angular/common/http";
 import { INGESTOR_API_ENDPOINTS_V1 } from "ingestor/ingestor-page/helper/ingestor-api-endpoints";
 import { PostDatasetRequest } from "shared/sdk/models/ingestor/models";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
+import { fetchScicatTokenAction } from "state-management/actions/user.actions";
 
 export type dialogStep =
   | "NEW_TRANSFER"
@@ -28,6 +31,8 @@ export type dialogStep =
   styleUrls: ["../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorCreationDialogBaseComponent implements OnInit {
+  vm$ = this.store.select(selectUserSettingsPageViewModel);
+
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
@@ -36,13 +41,14 @@ export class IngestorCreationDialogBaseComponent implements OnInit {
 
   currentDialogStep: dialogStep = "NEW_TRANSFER";
   connectedFacilityBackend = "";
+  tokenValue = "";
 
   constructor(
     public dialog: MatDialog,
     private store: Store,
     private sseService: IngestorMetadataSSEService,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
-  ) { }
+  ) {}
 
   ngOnInit() {
     this.ingestionObject$.subscribe((ingestionObject) => {
@@ -56,6 +62,15 @@ export class IngestorCreationDialogBaseComponent implements OnInit {
         this.connectedFacilityBackend = ingestorBackend;
       }
     });
+
+    // Fetch the API token that the ingestor can authenticate to scicat as the user
+    this.vm$.subscribe((settings) => {
+      this.tokenValue = settings.scicatToken;
+
+      if (this.tokenValue === "") {
+        this.store.dispatch(fetchScicatTokenAction());
+      }
+    });
   }
 
   resetExtractedMetadata(): void {
@@ -156,26 +171,15 @@ export class IngestorCreationDialogBaseComponent implements OnInit {
   }
 
   onClickStartIngestion(): void {
-    console.log("Confirm button clicked");
-  }
-
-  async ingestDataset(): Promise<boolean> {
     const payload: PostDatasetRequest = {
       metaData: this.createNewTransferData.mergedMetaDataString,
-      userToken: "", //this.tokenValue,
+      userToken: this.tokenValue,
     };
 
-    try {
-      const result = null; //await this.apiManager.startIngestion(payload);
-      if (result) {
-        // Somehow udpate transfer list
-        return true;
-      }
-    } catch (error) {
-      console.error("Error during ingestion", error);
-      throw error;
-    }
-
-    return false;
+    this.store.dispatch(
+      fromActions.ingestDataset({
+        ingestionDataset: payload,
+      }),
+    );
   }
 }
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index 84139aef31..e22ecaac84 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -1,28 +1,49 @@
 <div class="dialog-control-buttons">
-  <button mat-button matTooltip="Save the current values." [disabled]="activeStep < 1" (click)="onSave()"><mat-icon class="control-button-icon">save</mat-icon></button>
-  <button mat-button matTooltip="Upload a template." [disabled]="activeStep < 1" (click)="onUpload()"><mat-icon class="control-button-icon">upload</mat-icon></button>
-  <button *ngIf="this.createNewTransferData !== undefined" mat-button [matMenuTriggerFor]="settingsMenu" matTooltip="Customize the metadata editor" [disabled]="activeStep > 0"><mat-icon class="control-button-icon">settings</mat-icon></button>
+  <button mat-button matTooltip="Save the current values."
+    [disabled]="activeStep < 1" (click)="onSave()"><mat-icon
+      class="control-button-icon">save</mat-icon></button>
+  <button mat-button matTooltip="Upload a template." [disabled]="activeStep < 1"
+    (click)="onUpload()"><mat-icon
+      class="control-button-icon">upload</mat-icon></button>
+  <button *ngIf="this.createNewTransferData !== undefined" mat-button
+    matTooltip="Show all fields"><mat-icon
+      class="control-button-icon">visibility_off</mat-icon></button>
+  <button *ngIf="this.createNewTransferData !== undefined" mat-button
+    [matMenuTriggerFor]="settingsMenu"
+    matTooltip="Customize the metadata editor"
+    [disabled]="activeStep > 0"><mat-icon
+      class="control-button-icon">settings</mat-icon></button>
 </div>
 
 <mat-menu #settingsMenu="matMenu">
-  <button *ngIf="this.createNewTransferData !== undefined" mat-menu-item (click)="onSwitchEditorMode('INGESTION')">
-    <mat-icon *ngIf="this.createNewTransferData.editorMode === 'INGESTION' ?? false">check</mat-icon>Ingestion-Mode</button>
-  <button *ngIf="this.createNewTransferData !== undefined" mat-menu-item (click)="onSwitchEditorMode('EDITOR')">
-    <mat-icon *ngIf="this.createNewTransferData.editorMode === 'EDITOR' ?? false">check</mat-icon>Create JSON-Mode</button>
+  <button *ngIf="this.createNewTransferData !== undefined" mat-menu-item
+    (click)="onSwitchEditorMode('INGESTION')">
+    <mat-icon
+      *ngIf="this.createNewTransferData.editorMode === 'INGESTION' ?? false">check</mat-icon>Ingestion-Mode</button>
+  <button *ngIf="this.createNewTransferData !== undefined" mat-menu-item
+    (click)="onSwitchEditorMode('EDITOR')">
+    <mat-icon
+      *ngIf="this.createNewTransferData.editorMode === 'EDITOR' ?? false">check</mat-icon>Create
+    JSON-Mode</button>
 </mat-menu>
 
 <div class="stepper">
-  <mat-stepper [linear]="true" [selectedIndex]="activeStep" class="ingestor-stepper">
-    <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
+  <mat-stepper [linear]="true" [selectedIndex]="activeStep"
+    class="ingestor-stepper">
+    <mat-step [completed]="activeStep > 0" [editable]="false"
+      [stepControl]="null">
       <ng-template matStepLabel>Select your ingestion method</ng-template>
     </mat-step>
-    <mat-step [completed]="activeStep > 1" [editable]="false" [stepControl]="null">
+    <mat-step [completed]="activeStep > 1" [editable]="false"
+      [stepControl]="null">
       <ng-template matStepLabel>Fill out user-specific metadata</ng-template>
     </mat-step>
-    <mat-step [completed]="activeStep > 2" [editable]="false" [stepControl]="null">
+    <mat-step [completed]="activeStep > 2" [editable]="false"
+      [stepControl]="null">
       <ng-template matStepLabel>Correct dataset-specific metadata</ng-template>
     </mat-step>
-    <mat-step [completed]="activeStep > 3" [editable]="false" [stepControl]="null">
+    <mat-step [completed]="activeStep > 3" [editable]="false"
+      [stepControl]="null">
       <ng-template matStepLabel>Confirm inputs</ng-template>
     </mat-step>
   </mat-stepper>
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 090ec80fd6..46406227d9 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -16,13 +16,15 @@ import {
   ExportOptions,
   ExportTemplateHelperComponent,
 } from "./ingestor.export-helper.component";
+import { Store } from "@ngrx/store";
+import { selectIngestorRenderView } from "state-management/selectors/ingestor.selector";
 
 @Component({
   selector: "ingestor-dialog-stepper",
   templateUrl: "./ingestor.dialog-stepper.component.html",
   styleUrls: ["./ingestor.dialog-stepper.component.css"],
 })
-export class IngestorDialogStepperComponent {
+export class IngestorDialogStepperComponent implements OnInit {
   @Input() activeStep = 0;
   @Input() createNewTransferData: IngestionRequestInformation;
   @Output() createNewTransferDataChange =
@@ -30,6 +32,8 @@ export class IngestorDialogStepperComponent {
 
   testMessageComponent = ExportTemplateHelperComponent;
 
+  renderView$ = this.store.select(selectIngestorRenderView);
+
   exportValueOptions: ExportOptions = {
     exportSciCat: true,
     exportOrganizational: false,
@@ -45,7 +49,19 @@ export class IngestorDialogStepperComponent {
     ],
   });
 
-  constructor(private dialog: MatDialog) {}
+  constructor(
+    private dialog: MatDialog,
+    private store: Store,
+  ) {}
+
+  ngOnInit() {
+    this.renderView$.subscribe((renderView) => {
+      if (renderView) {
+        // TODO: Handle the render view change
+        console.log("Render view changed:", renderView);
+      }
+    });
+  }
 
   // Save a template of metadata
   onSave() {
diff --git a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
index 6c38c4a999..b8c3e2e312 100644
--- a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
+++ b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
@@ -21,7 +21,7 @@ <h2 mat-dialog-title>
         <mat-icon matListItemIcon>{{activeNode.probablyDataset ? 'folder_special' : 'folder'}}</mat-icon>
         <div matListItemTitle>{{activeNode.path}}</div>
       </mat-list-item>
-      <i *ngIf="activeNode.probablyDataset">This node is probably a valid data set.</i>
+      <i *ngIf="activeNode.probablyDataset" class="green-text">This node is probably a valid data set.</i>
       <div mat-subheader>Children</div>
 
       <mat-paginator *ngIf="true" [length]="activeNodeChildrenTotal" [pageSize]="browseFolderPageSize" aria-label="Select page"
@@ -51,7 +51,7 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 
 <mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close (click)="onCancel()">Cancel</button>
+  <button mat-button mat-dialog-close>Cancel</button>
   <button mat-button color="primary" cdkFocusInitial (click)="onSelect()"
     [mat-dialog-close]="true">Select</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
index ec9a6be146..96c358f0f2 100644
--- a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -57,7 +57,7 @@ export class IngestorFileBrowserComponent implements OnInit {
     public dialog: MatDialog,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
     private store: Store,
-  ) {}
+  ) { }
 
   get activeNode(): BrowsableNode | null {
     return this._activeNode;
@@ -135,11 +135,14 @@ export class IngestorFileBrowserComponent implements OnInit {
     }
   }
 
-  onCancel = (): void => {};
-
   onSelect = (): void => {
     if (this.activeNode) {
       this.createNewTransferData.selectedPath = this.activeNode.path;
+      this.store.dispatch(
+        fromActions.updateIngestionObject({
+          ingestionObject: this.createNewTransferData,
+        }),
+      );
     }
   };
 
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 12ff330500..8ea2f768be 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -1,4 +1,5 @@
 import { JsonSchema } from "@jsonforms/core";
+import { PostDatasetResponse } from "shared/sdk/models/ingestor/postDatasetResponse";
 import { UserInfo } from "shared/sdk/models/ingestor/userInfo";
 
 export interface ExtractionMethod {
@@ -30,7 +31,10 @@ export interface IngestionRequestInformation {
     metaDataExtractionFailed: boolean;
     extractorMetadataProgress: number;
     extractorMetaDataStatus: string;
+    ingestionRequestErrorMessage: string;
   };
+
+  ingestionRequest: PostDatasetResponse | null;
 }
 
 export interface TransferDataListEntry {
@@ -102,7 +106,9 @@ export class IngestorHelper {
         extractorMetaDataReady: false,
         extractorMetadataProgress: 0,
         extractorMetaDataStatus: "",
+        ingestionRequestErrorMessage: "",
       },
+      ingestionRequest: null,
     };
   };
 
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.scss b/src/app/ingestor/ingestor-page/ingestor.component.scss
index a091e5c47a..d5fe027c4b 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.scss
+++ b/src/app/ingestor/ingestor-page/ingestor.component.scss
@@ -77,11 +77,11 @@ mat-card {
 
 .code-editor pre.code {
   white-space: pre-wrap;
-  counter-reset: listing; 
+  counter-reset: listing;
   line-height: 0.1;
 }
 .code-editor pre.code code {
-  counter-increment: listing; 
+  counter-increment: listing;
   display: flex;
   line-height: 1;
 }
@@ -109,4 +109,25 @@ mat-card {
 .file-browser-view-toggle {
   display: flex;
   justify-content: flex-end;
-}
\ No newline at end of file
+}
+
+.green-text {
+  color: #4caf50;
+}
+
+.confirm-message-ingestor {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.confirm-message-ingestor-icon {
+  font-size: 4em;
+  width: auto;
+  height: auto;
+}
+
+.confirm-message-error {
+  color: red;
+}
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 5ee8a69447..7a2e1815b0 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -19,10 +19,7 @@ import {
   selectIsLoggedIn,
   selectUserSettingsPageViewModel,
 } from "state-management/selectors/user.selectors";
-import {
-  fetchCurrentUserAction,
-  fetchScicatTokenAction,
-} from "state-management/actions/user.actions";
+import { fetchCurrentUserAction } from "state-management/actions/user.actions";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import {
   selectIngestorStatus,
@@ -49,8 +46,6 @@ export class IngestorComponent implements OnInit {
   ingestorBackend$ = this.store.select(selectIngestorEndpoint);
   transferList$ = this.store.select(selectIngestorTransferList);
 
-  tokenValue: string;
-
   sourceFolder = "";
   forwardFacilityBackend = "";
   selectedTab = 1;
@@ -89,7 +84,7 @@ export class IngestorComponent implements OnInit {
     private router: Router,
     private apiManager: IngestorAPIManager,
     private store: Store,
-  ) {}
+  ) { }
 
   ngOnInit() {
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
@@ -97,11 +92,6 @@ export class IngestorComponent implements OnInit {
     // Fetch the API token that the ingestor can authenticate to scicat as the user
     this.vm$.subscribe((settings) => {
       this.scicatUserProfile = settings.profile;
-      this.tokenValue = settings.scicatToken;
-
-      if (this.tokenValue === "") {
-        this.store.dispatch(fetchScicatTokenAction());
-      }
     });
 
     this.ingestorBackend$.subscribe((ingestorBackend) => {
diff --git a/src/app/shared/sdk/apis/ingestor.service.ts b/src/app/shared/sdk/apis/ingestor.service.ts
index b742a37606..9d068a5ef2 100644
--- a/src/app/shared/sdk/apis/ingestor.service.ts
+++ b/src/app/shared/sdk/apis/ingestor.service.ts
@@ -13,6 +13,7 @@ import {
   OtherHealthResponse,
   OtherVersionResponse,
   PostDatasetRequest,
+  PostDatasetResponse,
   UserInfo,
 } from "../models/ingestor/models";
 import { Store } from "@ngrx/store";
@@ -133,12 +134,12 @@ export class Ingestor {
       );
   }
 
-  startIngestion(payload: PostDatasetRequest): Observable<string> {
+  startIngestion(payload: PostDatasetRequest): Observable<PostDatasetResponse> {
     return this.store
       .select(selectIngestorEndpoint)
       .pipe(
         switchMap((ingestorEndpoint) =>
-          this.http.post<string>(
+          this.http.post<PostDatasetResponse>(
             `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET}`,
             payload,
             this.getRequestOptions(),
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 7d49b6a436..4fe57ce43a 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -6,6 +6,8 @@ import {
   GetTransferResponse,
   OtherHealthResponse,
   OtherVersionResponse,
+  PostDatasetRequest,
+  PostDatasetResponse,
   UserInfo,
 } from "shared/sdk/models/ingestor/models";
 
@@ -88,3 +90,22 @@ export const getBrowseFilePathFailure = createAction(
   "[Ingestor] Get Browse File Path Failure",
   props<{ err: Error }>(),
 );
+
+export const ingestDataset = createAction(
+  "[Ingestor] Ingest Dataset",
+  props<{ ingestionDataset: PostDatasetRequest }>(),
+);
+
+export const ingestDatasetSuccess = createAction(
+  "[Ingestor] Ingest Dataset Success",
+  props<{ response: PostDatasetResponse }>(),
+);
+
+export const ingestDatasetFailure = createAction(
+  "[Ingestor] Ingest Dataset Failure",
+  props<{ err: Error }>(),
+);
+
+export const resetIngestDataset = createAction(
+  "[Ingestor] Reset Ingest Dataset",
+);
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index 8ded33a5f6..b5ba7de8e0 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -158,8 +158,56 @@ export class IngestorEffects {
     );
   });
 
+  ingestDataset$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.ingestDataset),
+      switchMap(({ ingestionDataset }) =>
+        this.ingestor.startIngestion(ingestionDataset).pipe(
+          map((response) => fromActions.ingestDatasetSuccess({ response })),
+          catchError((err) => of(fromActions.ingestDatasetFailure({ err }))),
+        ),
+      ),
+    );
+  });
+
+  ingestDatasetSuccess$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.ingestDatasetSuccess),
+      switchMap(({ response }) => {
+        const message = {
+          type: MessageType.Success,
+          content:
+            "Request ingestion dataset successfully: " + response.transferId,
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+
+  ingestDatasetFailure$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.ingestDatasetFailure),
+      switchMap(({ err }) => {
+        const errorMessage =
+          err instanceof HttpErrorResponse
+            ? (err.error?.message ??
+              err.error ??
+              err.message ??
+              "Unknown error")
+            : err.message || "Unknown error";
+        const message = {
+          type: MessageType.Error,
+          content: "Failed to ingest dataset: " + errorMessage,
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+
   constructor(
     private actions$: Actions,
     private ingestor: Ingestor,
-  ) {}
+  ) { }
 }
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index bab75905f2..74763218dd 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -107,4 +107,46 @@ const reducer = createReducer(
       ingestionObject,
     }),
   ),
+  on(
+    fromActions.ingestDatasetSuccess,
+    (state, { response }): IngestorState => ({
+      ...state,
+      ingestionObject: {
+        ...state.ingestionObject,
+        ingestionRequest: response,
+        apiInformation: {
+          ...state.ingestionObject.apiInformation,
+          ingestionRequestErrorMessage: "",
+        },
+      },
+    }),
+  ),
+  on(
+    fromActions.ingestDatasetFailure,
+    (state, { err }): IngestorState => ({
+      ...state,
+      ingestionObject: {
+        ...state.ingestionObject,
+        apiInformation: {
+          ...state.ingestionObject.apiInformation,
+          ingestionRequestErrorMessage: (err as any).error ?? err.message,
+        },
+      },
+      error: err,
+    }),
+  ),
+  on(
+    fromActions.resetIngestDataset,
+    (state): IngestorState => ({
+      ...state,
+      ingestionObject: {
+        ...state.ingestionObject,
+        ingestionRequest: null,
+        apiInformation: {
+          ...state.ingestionObject.apiInformation,
+          ingestionRequestErrorMessage: "",
+        },
+      },
+    }),
+  ),
 );
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
index ba87b9171a..3d9557a71e 100644
--- a/src/app/state-management/selectors/ingestor.selector.ts
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -48,3 +48,8 @@ export const selectIngestorBrowserActiveNode = createSelector(
   selectIngestorState,
   (state) => state.ingestorBrowserActiveNode,
 );
+
+export const selectIngestorRenderView = createSelector(
+  selectIngestorState,
+  (state) => state.renderView,
+);
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 3dc444faf6..527f3023d6 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -22,6 +22,8 @@ interface IngestorStatus {
   validEndpoint: boolean;
 }
 
+type renderView = "requiredOnly" | "all";
+
 export interface IngestorState {
   ingestorStatus: IngestorStatus;
   ingestorAuth: IngestorAuthentication | null;
@@ -30,6 +32,7 @@ export interface IngestorState {
   ingestorExtractionMethods: GetExtractorResponse | null;
   ingestionObject: IngestionRequestInformation;
   ingestorBrowserActiveNode: GetBrowseDatasetResponse | null;
+  renderView: renderView;
   connectingBackend: boolean;
   error: any | null;
 }
@@ -47,4 +50,5 @@ export const initialIngestorState: IngestorState = {
   ingestorBrowserActiveNode: null,
   connectingBackend: false,
   error: null,
+  renderView: "all",
 };

From 8b7512cc62d68cd283de277fafb91b0108f8bc33 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 30 Apr 2025 14:33:01 +0000
Subject: [PATCH 153/245] Move cancel transfer to store

---
 ...ingestor.creation-dialog-base.component.ts |   2 +-
 .../helper/ingestor-api-endpoints.ts          |  22 ---
 .../helper/ingestor-api-manager.ts            | 151 ------------------
 .../ingestor-page/ingestor.component.ts       |  21 ++-
 src/app/shared/sdk/apis/ingestor.service.ts   |   2 +-
 .../actions/ingestor.actions.ts               |   5 +
 .../effects/ingestor.effect.ts                |  29 +++-
 7 files changed, 44 insertions(+), 188 deletions(-)
 delete mode 100644 src/app/ingestor/ingestor-page/helper/ingestor-api-endpoints.ts
 delete mode 100644 src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index d4dda8009e..63bda86142 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -13,11 +13,11 @@ import {
 import { Store } from "@ngrx/store";
 import { IngestorMetadataSSEService } from "ingestor/ingestor-page/helper/ingestor.metadata-sse-service";
 import { HttpParams } from "@angular/common/http";
-import { INGESTOR_API_ENDPOINTS_V1 } from "ingestor/ingestor-page/helper/ingestor-api-endpoints";
 import { PostDatasetRequest } from "shared/sdk/models/ingestor/models";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
 import { fetchScicatTokenAction } from "state-management/actions/user.actions";
+import { INGESTOR_API_ENDPOINTS_V1 } from "shared/sdk/apis/ingestor.service";
 
 export type dialogStep =
   | "NEW_TRANSFER"
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor-api-endpoints.ts b/src/app/ingestor/ingestor-page/helper/ingestor-api-endpoints.ts
deleted file mode 100644
index a3c8458dc6..0000000000
--- a/src/app/ingestor/ingestor-page/helper/ingestor-api-endpoints.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export const INGESTOR_API_ENDPOINTS_V1 = {
-  AUTH: {
-    LOGIN: "login",
-    LOGOUT: "logout",
-    USERINFO: "userinfo",
-  },
-  DATASET: "dataset",
-  DATASET_BROWSE: "dataset/browse",
-  TRANSFER: "transfer",
-  OTHER: {
-    VERSION: "version",
-    HEALTH: "health",
-  },
-  EXTRACTOR: "extractor",
-  METADATA: "metadata",
-};
-
-/*export const AUTODISCOVERY_ENDPOINT =
-  "http://localhost:4000/assets/discovery/discovery.txt";*/
-
-export const LAST_USED_FALLBACK =
-  '["http://localhost:8000", "http://localhost:8888"]';
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts b/src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts
deleted file mode 100644
index 6299997a03..0000000000
--- a/src/app/ingestor/ingestor-page/helper/ingestor-api-manager.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { HttpClient, HttpHeaders, HttpParams } from "@angular/common/http";
-import { Injectable } from "@angular/core";
-import { INGESTOR_API_ENDPOINTS_V1 } from "./ingestor-api-endpoints";
-import {
-  DeleteTransferRequest,
-  DeleteTransferResponse,
-  GetBrowseDatasetResponse,
-  GetDatasetResponse,
-  GetExtractorResponse,
-  PostDatasetRequest,
-} from "shared/sdk/models/ingestor/models";
-
-@Injectable({
-  providedIn: "root",
-})
-export class IngestorAPIManager {
-  private connectUrl: string;
-  private connectOptions: object;
-
-  constructor(private http: HttpClient) {}
-
-  public connect(url: string, withCredentials = true): void {
-    this.connectUrl = url;
-    this.connectOptions = {
-      withCredentials: withCredentials,
-      headers: new HttpHeaders({
-        "Content-Type": "application/json;charset=UTF-8",
-      }),
-    };
-  }
-
-  public cancelTransfer(transferId: string): Promise<DeleteTransferResponse> {
-    const body: DeleteTransferRequest = { transferId: transferId };
-
-    //console.log("Cancel transfer", transferId);
-    return new Promise((resolve, reject) => {
-      this.http
-        .delete(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.TRANSFER, {
-          body,
-          ...this.connectOptions,
-        })
-        .subscribe({
-          next: (response) => {
-            resolve(response as DeleteTransferResponse);
-          },
-          error: (error) => {
-            reject(error);
-          },
-        });
-    });
-  }
-
-  public startIngestion(payload: PostDatasetRequest): Promise<string> {
-    return new Promise((resolve, reject) => {
-      this.http
-        .post(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET, payload, {
-          ...this.connectOptions,
-        })
-        .subscribe({
-          next: (response) => {
-            const returnValue = JSON.stringify(response);
-            resolve(returnValue);
-          },
-          error: (error) => {
-            console.error("Upload failed", error);
-            reject(error);
-          },
-        });
-    });
-  }
-
-  public getExtractionMethods(
-    page: number,
-    pageSize: number,
-  ): Promise<GetExtractorResponse> {
-    const params = new HttpParams()
-      .set("page", page.toString())
-      .set("pageSize", pageSize.toString());
-
-    return new Promise((resolve, reject) => {
-      this.http
-        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.EXTRACTOR, {
-          params,
-          ...this.connectOptions,
-        })
-        .subscribe({
-          next: (response: GetExtractorResponse) => {
-            resolve(response as GetExtractorResponse);
-          },
-          error: (error) => {
-            console.error(error);
-            reject(error);
-          },
-        });
-    });
-  }
-
-  public getAvailableFilePaths(
-    page: number,
-    pageSize: number,
-  ): Promise<GetDatasetResponse> {
-    const params = new HttpParams()
-      .set("page", page.toString())
-      .set("pageSize", pageSize.toString());
-
-    return new Promise((resolve, reject) => {
-      this.http
-        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET, {
-          params,
-          ...this.connectOptions,
-        })
-        .subscribe({
-          next: (response: GetDatasetResponse) => {
-            resolve(response as GetDatasetResponse);
-          },
-          error: (error) => {
-            console.error(error);
-            reject(error);
-          },
-        });
-    });
-  }
-
-  public getBrowseFilePath(
-    page: number,
-    pageSize: number,
-    path: string,
-  ): Promise<GetBrowseDatasetResponse> {
-    const params = new HttpParams()
-      .set("page", page.toString())
-      .set("pageSize", pageSize.toString())
-      .set("path", path.toString());
-
-    return new Promise((resolve, reject) => {
-      this.http
-        .get(this.connectUrl + INGESTOR_API_ENDPOINTS_V1.DATASET_BROWSE, {
-          params,
-          ...this.connectOptions,
-        })
-        .subscribe({
-          next: (response: GetBrowseDatasetResponse) => {
-            resolve(response as GetBrowseDatasetResponse);
-          },
-          error: (error) => {
-            console.error(error);
-            reject(error);
-          },
-        });
-    });
-  }
-}
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 7a2e1815b0..9760d1c53c 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -1,12 +1,10 @@
 import { Component, inject, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-import { INGESTOR_API_ENDPOINTS_V1 } from "./helper/ingestor-api-endpoints";
 import { MatDialog } from "@angular/material/dialog";
 import {
   IngestionRequestInformation,
   IngestorHelper,
 } from "./helper/ingestor.component-helper";
-import { IngestorAPIManager } from "./helper/ingestor-api-manager";
 import {
   UserInfo,
   OtherHealthResponse,
@@ -29,6 +27,7 @@ import {
   selectIngestorTransferList,
 } from "state-management/selectors/ingestor.selector";
 import { IngestorCreationDialogBaseComponent } from "ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component";
+import { INGESTOR_API_ENDPOINTS_V1 } from "shared/sdk/apis/ingestor.service";
 
 @Component({
   selector: "ingestor",
@@ -82,7 +81,6 @@ export class IngestorComponent implements OnInit {
   constructor(
     private route: ActivatedRoute,
     private router: Router,
-    private apiManager: IngestorAPIManager,
     private store: Store,
   ) { }
 
@@ -237,12 +235,11 @@ export class IngestorComponent implements OnInit {
   }
 
   async onCancelTransfer(transferId: string) {
-    try {
-      await this.apiManager.cancelTransfer(transferId);
-      this.doRefreshTransferList();
-    } catch (error) {
-      console.error("Error cancelling transfer", error);
-    }
+    this.store.dispatch(
+      fromActions.cancelTransfer({
+        transferId: transferId,
+      }),
+    );
   }
 
   onTransferPageChange(event: PageChangeEvent): void {
@@ -303,11 +300,11 @@ export class IngestorComponent implements OnInit {
   }
 
   startAutoRefresh(transferId: string): void {
-    this.doRefreshTransferList(transferId);
-    this.stopAutoRefresh();
+    //this.doRefreshTransferList(transferId);
+    /*this.stopAutoRefresh();
     this.autoRefreshInterval = setInterval(() => {
       this.doRefreshTransferList(transferId);
-    }, this.transferAutoRefreshIntervalDetail);
+    }, this.transferAutoRefreshIntervalDetail);*/
   }
 
   stopAutoRefresh(): void {
diff --git a/src/app/shared/sdk/apis/ingestor.service.ts b/src/app/shared/sdk/apis/ingestor.service.ts
index 9d068a5ef2..d601ff3b97 100644
--- a/src/app/shared/sdk/apis/ingestor.service.ts
+++ b/src/app/shared/sdk/apis/ingestor.service.ts
@@ -19,7 +19,7 @@ import {
 import { Store } from "@ngrx/store";
 import { selectIngestorEndpoint } from "state-management/selectors/ingestor.selector";
 
-const INGESTOR_API_ENDPOINTS_V1 = {
+export const INGESTOR_API_ENDPOINTS_V1 = {
   AUTH: {
     LOGIN: "login",
     LOGOUT: "logout",
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 4fe57ce43a..c73da22650 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -109,3 +109,8 @@ export const ingestDatasetFailure = createAction(
 export const resetIngestDataset = createAction(
   "[Ingestor] Reset Ingest Dataset",
 );
+
+export const cancelTransfer = createAction(
+  "[Ingestor] Cancel Transfer",
+  props<{ transferId: string }>(),
+);
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index b5ba7de8e0..d111e1dc75 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -206,8 +206,35 @@ export class IngestorEffects {
     );
   });
 
+  cancelTransfer$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.cancelTransfer),
+      switchMap(({ transferId }) =>
+        this.ingestor.cancelTransfer(transferId).pipe(
+          map((response) => {
+            const message = {
+              type: MessageType.Success,
+              content: "Successfully cancelled transfer: " + transferId,
+              duration: 5000,
+            };
+            return showMessageAction({ message }); // Direkt die Aktion zurückgeben
+          }),
+          catchError((err) => {
+            const message = {
+              type: MessageType.Error,
+              content:
+                "Failed to cancel transfer: " + (err.error ?? err.message),
+              duration: 5000,
+            };
+            return of(showMessageAction({ message })); // Wrap the action in of()
+          }),
+        ),
+      ),
+    );
+  });
+
   constructor(
     private actions$: Actions,
     private ingestor: Ingestor,
-  ) { }
+  ) {}
 }

From a878eaddfefe7552d1eadffb66adaa7380d3d9ed Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Mon, 5 May 2025 11:58:59 +0000
Subject: [PATCH 154/245] fix subscription handling

---
 ....confirm-transfer-dialog-page.component.ts |  39 ++--
 ...xtractor-metadata-dialog-page.component.ts |  61 +++---
 ...stor.new-transfer-dialog-page.component.ts |  74 ++++---
 ...tor.user-metadata-dialog-page.component.ts |  42 ++--
 ...ingestor.creation-dialog-base.component.ts | 120 ++++++-----
 .../ingestor.file-browser.component.ts        |  70 ++++---
 .../owner-group-field-renderer.ts             |  67 ++++---
 .../ingestor-page/ingestor.component.ts       | 189 +++++++++++-------
 .../actions/ingestor.actions.ts               |   8 +-
 .../effects/ingestor.effect.ts                |  66 ++++--
 .../reducers/ingestor.reducer.ts              |   6 +-
 .../selectors/ingestor.selector.ts            |   5 +
 .../state-management/state/ingestor.store.ts  |   8 +
 13 files changed, 465 insertions(+), 290 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index a1aa8c46e8..96c4294b0a 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -1,4 +1,11 @@
-import { Component, EventEmitter, inject, OnInit, Output } from "@angular/core";
+import {
+  Component,
+  EventEmitter,
+  inject,
+  OnDestroy,
+  OnInit,
+  Output,
+} from "@angular/core";
 import {
   IngestionRequestInformation,
   IngestorHelper,
@@ -9,13 +16,16 @@ import { selectIngestionObject } from "state-management/selectors/ingestor.selec
 import { MatDialog } from "@angular/material/dialog";
 import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
 import * as fromActions from "state-management/actions/ingestor.actions";
+import { Subscription } from "rxjs";
 
 @Component({
   selector: "ingestor-confirm-transfer-dialog-page",
   templateUrl: "ingestor.confirm-transfer-dialog-page.html",
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
-export class IngestorConfirmTransferDialogPageComponent implements OnInit {
+export class IngestorConfirmTransferDialogPageComponent
+  implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
   readonly dialog = inject(MatDialog);
 
   createNewTransferData: IngestionRequestInformation =
@@ -30,21 +40,24 @@ export class IngestorConfirmTransferDialogPageComponent implements OnInit {
 
   copiedToClipboard = false;
 
-  constructor(private store: Store) {}
+  constructor(private store: Store) { }
 
   ngOnInit() {
-    this.ingestionObject$.subscribe((ingestionObject) => {
-      if (ingestionObject) {
-        this.createNewTransferData = ingestionObject;
-      }
-    });
-
-    //createNewTransferData.apiInformation.ingestionRequestFailed
-    //createNewTransferData.ingestionRequest
+    this.subscriptions.push(
+      this.ingestionObject$.subscribe((ingestionObject) => {
+        if (ingestionObject) {
+          this.createNewTransferData = ingestionObject;
+        }
+      }),
+    );
 
     this.provideMergeMetaData = this.createMetaDataString();
   }
 
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
+  }
+
   createMetaDataString(): string {
     const space = 2;
     const scicatMetadata: SciCatHeader = {
@@ -79,13 +92,15 @@ export class IngestorConfirmTransferDialogPageComponent implements OnInit {
         message: "Create a new dataset and start data transfer?",
       },
     });
-    dialogRef.afterClosed().subscribe(async (result) => {
+
+    const dialogSub = dialogRef.afterClosed().subscribe(async (result) => {
       if (result) {
         this.createNewTransferData.mergedMetaDataString =
           this.provideMergeMetaData;
 
         this.nextStep.emit();
       }
+      dialogSub.unsubscribe();
     });
   }
 
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index 65ba43da84..4a57d9e02c 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -2,6 +2,7 @@ import {
   ChangeDetectorRef,
   Component,
   EventEmitter,
+  OnDestroy,
   OnInit,
   Output,
 } from "@angular/core";
@@ -14,13 +15,16 @@ import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor
 import { Store } from "@ngrx/store";
 import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
+import { Subscription } from "rxjs";
 
 @Component({
   selector: "ingestor-extractor-metadata-dialog-page",
   templateUrl: "ingestor.extractor-metadata-dialog-page.html",
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
-export class IngestorExtractorMetadataDialogPageComponent implements OnInit {
+export class IngestorExtractorMetadataDialogPageComponent
+  implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
   metadataSchemaInstrument: JsonSchema;
   metadataSchemaAcquisition: JsonSchema;
   createNewTransferData: IngestionRequestInformation =
@@ -50,32 +54,38 @@ export class IngestorExtractorMetadataDialogPageComponent implements OnInit {
   constructor(
     private store: Store,
     private cdr: ChangeDetectorRef,
-  ) {}
+  ) { }
 
   ngOnInit() {
-    this.ingestionObject$.subscribe((ingestionObject) => {
-      if (ingestionObject) {
-        this.createNewTransferData = ingestionObject;
-
-        const instrumentSchema =
-          this.createNewTransferData.selectedResolvedDecodedSchema.properties
-            .instrument;
-        const acqusitionSchema =
-          this.createNewTransferData.selectedResolvedDecodedSchema.properties
-            .acquisition;
-
-        this.metadataSchemaInstrument = instrumentSchema;
-        this.metadataSchemaAcquisition = acqusitionSchema;
-        this.extractorMetaDataReady =
-          this.createNewTransferData.apiInformation.extractorMetaDataReady;
-        this.extractorMetaDataError =
-          this.createNewTransferData.apiInformation.metaDataExtractionFailed;
-        this.extractorMetaDataStatus =
-          this.createNewTransferData.apiInformation.extractorMetaDataStatus;
-        this.process =
-          this.createNewTransferData.apiInformation.extractorMetadataProgress;
-      }
-    });
+    this.subscriptions.push(
+      this.ingestionObject$.subscribe((ingestionObject) => {
+        if (ingestionObject) {
+          this.createNewTransferData = ingestionObject;
+
+          const instrumentSchema =
+            this.createNewTransferData.selectedResolvedDecodedSchema.properties
+              .instrument;
+          const acqusitionSchema =
+            this.createNewTransferData.selectedResolvedDecodedSchema.properties
+              .acquisition;
+
+          this.metadataSchemaInstrument = instrumentSchema;
+          this.metadataSchemaAcquisition = acqusitionSchema;
+          this.extractorMetaDataReady =
+            this.createNewTransferData.apiInformation.extractorMetaDataReady;
+          this.extractorMetaDataError =
+            this.createNewTransferData.apiInformation.metaDataExtractionFailed;
+          this.extractorMetaDataStatus =
+            this.createNewTransferData.apiInformation.extractorMetaDataStatus;
+          this.process =
+            this.createNewTransferData.apiInformation.extractorMetadataProgress;
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
   }
 
   onClickBack(): void {
@@ -134,7 +144,6 @@ export class IngestorExtractorMetadataDialogPageComponent implements OnInit {
       this.isAcquisitionMetadataOk &&
       this.extractorMetaDataReady;*/
 
-    // TODO: Use upper line if schema values are fine
     this.uiNextButtonReady = this.extractorMetaDataReady;
   }
 }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index a059344ccd..904f2c3dd1 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -1,4 +1,11 @@
-import { Component, EventEmitter, inject, OnInit, Output } from "@angular/core";
+import {
+  Component,
+  EventEmitter,
+  inject,
+  OnDestroy,
+  OnInit,
+  Output,
+} from "@angular/core";
 import { MatDialog } from "@angular/material/dialog";
 import {
   decodeBase64ToUTF8,
@@ -18,13 +25,16 @@ import {
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
 import { ReturnedUserDto } from "@scicatproject/scicat-sdk-ts";
+import { Subscription } from "rxjs";
 
 @Component({
   selector: "ingestor-new-transfer-dialog-page",
   templateUrl: "ingestor.new-transfer-dialog-page.html",
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
-export class IngestorNewTransferDialogPageComponent implements OnInit {
+export class IngestorNewTransferDialogPageComponent
+  implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
   readonly dialog = inject(MatDialog);
 
   ingestionObject$ = this.store.select(selectIngestionObject);
@@ -54,24 +64,36 @@ export class IngestorNewTransferDialogPageComponent implements OnInit {
     this.loadExtractionMethods();
 
     // Fetch the API token that the ingestor can authenticate to scicat as the user
-    this.vm$.subscribe((settings) => {
-      this.userProfile = settings.user;
-    });
+    this.subscriptions.push(
+      this.vm$.subscribe((settings) => {
+        this.userProfile = settings.user;
+      }),
+    );
 
-    this.ingestionObject$.subscribe((ingestionObject) => {
-      if (ingestionObject) {
-        this.createNewTransferData = ingestionObject;
-      }
-    });
+    this.subscriptions.push(
+      this.ingestionObject$.subscribe((ingestionObject) => {
+        if (ingestionObject) {
+          this.createNewTransferData = ingestionObject;
+        }
+      }),
+    );
 
-    this.ingestorExtractionMethods$.subscribe((extractionMethods) => {
-      if (extractionMethods) {
-        this.extractionMethods = extractionMethods;
-        this.extractionMethodsError = "";
-      } else {
-        this.extractionMethodsError =
-          "No extraction methods available. Please check your connection.";
-      }
+    this.subscriptions.push(
+      this.ingestorExtractionMethods$.subscribe((extractionMethods) => {
+        if (extractionMethods) {
+          this.extractionMethods = extractionMethods;
+          this.extractionMethodsError = "";
+        } else {
+          this.extractionMethodsError =
+            "No extraction methods available. Please check your connection.";
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((subscription) => {
+      subscription.unsubscribe();
     });
   }
 
@@ -167,14 +189,14 @@ export class IngestorNewTransferDialogPageComponent implements OnInit {
   }
 
   onClickOpenFileBrowser(): void {
-    this.dialog
-      .open(IngestorFileBrowserComponent, {
-        data: {},
-      })
-      .afterClosed()
-      .subscribe(() => {
-        this.validateNextButton();
-      });
+    const dialogRef = this.dialog.open(IngestorFileBrowserComponent, {
+      data: {},
+    });
+
+    const dialogSub = dialogRef.afterClosed().subscribe(() => {
+      this.validateNextButton();
+      dialogSub.unsubscribe();
+    });
   }
 
   onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 2209778b79..57765497f3 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -2,6 +2,7 @@ import {
   ChangeDetectorRef,
   Component,
   EventEmitter,
+  OnDestroy,
   OnInit,
   Output,
 } from "@angular/core";
@@ -15,13 +16,16 @@ import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor
 import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Store } from "@ngrx/store";
+import { Subscription } from "rxjs";
 
 @Component({
   selector: "ingestor-user-metadata-dialog",
   templateUrl: "ingestor.user-metadata-dialog-page.html",
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
-export class IngestorUserMetadataDialogPageComponent implements OnInit {
+export class IngestorUserMetadataDialogPageComponent
+  implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
   ingestionObject$ = this.store.select(selectIngestionObject);
 
   createNewTransferData: IngestionRequestInformation =
@@ -51,20 +55,26 @@ export class IngestorUserMetadataDialogPageComponent implements OnInit {
   constructor(
     private store: Store,
     private cdr: ChangeDetectorRef,
-  ) {}
+  ) { }
 
   ngOnInit() {
-    this.ingestionObject$.subscribe((ingestionObject) => {
-      if (ingestionObject) {
-        this.createNewTransferData = ingestionObject;
-
-        this.metadataSchemaOrganizational =
-          this.createNewTransferData.selectedResolvedDecodedSchema.properties.organizational;
-        this.metadataSchemaSample =
-          this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
-        this.scicatHeaderSchema = SciCatHeader_Schema;
-      }
-    });
+    this.subscriptions.push(
+      this.ingestionObject$.subscribe((ingestionObject) => {
+        if (ingestionObject) {
+          this.createNewTransferData = ingestionObject;
+
+          this.metadataSchemaOrganizational =
+            this.createNewTransferData.selectedResolvedDecodedSchema.properties.organizational;
+          this.metadataSchemaSample =
+            this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
+          this.scicatHeaderSchema = SciCatHeader_Schema;
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
   }
 
   onClickBack(): void {
@@ -135,11 +145,7 @@ export class IngestorUserMetadataDialogPageComponent implements OnInit {
   }
 
   validateNextButton(): void {
-    this.uiNextButtonReady = true;
-
-    // Uncomment if prod
-    /*this.uiNextButtonReady =
-      this.isSciCatHeaderOk &&
+    this.uiNextButtonReady = this.isSciCatHeaderOk; /* &&
       this.isOrganizationalMetadataOk &&
       this.isSampleInformationOk;*/
   }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index 63bda86142..5ae4fd9e63 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, OnInit } from "@angular/core";
+import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
 import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
 import {
   DialogDataObject,
@@ -18,6 +18,7 @@ import * as fromActions from "state-management/actions/ingestor.actions";
 import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
 import { fetchScicatTokenAction } from "state-management/actions/user.actions";
 import { INGESTOR_API_ENDPOINTS_V1 } from "shared/sdk/apis/ingestor.service";
+import { Subscription } from "rxjs";
 
 export type dialogStep =
   | "NEW_TRANSFER"
@@ -30,7 +31,8 @@ export type dialogStep =
   templateUrl: "ingestor.creation-dialog-base.html",
   styleUrls: ["../../ingestor-page/ingestor.component.scss"],
 })
-export class IngestorCreationDialogBaseComponent implements OnInit {
+export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
   vm$ = this.store.select(selectUserSettingsPageViewModel);
 
   createNewTransferData: IngestionRequestInformation =
@@ -48,28 +50,40 @@ export class IngestorCreationDialogBaseComponent implements OnInit {
     private store: Store,
     private sseService: IngestorMetadataSSEService,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
-  ) {}
+  ) { }
 
   ngOnInit() {
-    this.ingestionObject$.subscribe((ingestionObject) => {
-      if (ingestionObject) {
-        this.createNewTransferData = ingestionObject;
-      }
-    });
+    this.subscriptions.push(
+      this.ingestionObject$.subscribe((ingestionObject) => {
+        if (ingestionObject) {
+          this.createNewTransferData = ingestionObject;
+        }
+      }),
+    );
 
-    this.ingestorBackend$.subscribe((ingestorBackend) => {
-      if (ingestorBackend) {
-        this.connectedFacilityBackend = ingestorBackend;
-      }
-    });
+    this.subscriptions.push(
+      this.ingestorBackend$.subscribe((ingestorBackend) => {
+        if (ingestorBackend) {
+          this.connectedFacilityBackend = ingestorBackend;
+        }
+      }),
+    );
 
     // Fetch the API token that the ingestor can authenticate to scicat as the user
-    this.vm$.subscribe((settings) => {
-      this.tokenValue = settings.scicatToken;
+    this.subscriptions.push(
+      this.vm$.subscribe((settings) => {
+        this.tokenValue = settings.scicatToken;
 
-      if (this.tokenValue === "") {
-        this.store.dispatch(fetchScicatTokenAction());
-      }
+        if (this.tokenValue === "") {
+          this.store.dispatch(fetchScicatTokenAction());
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((subscription) => {
+      subscription.unsubscribe();
     });
   }
 
@@ -96,44 +110,46 @@ export class IngestorCreationDialogBaseComponent implements OnInit {
 
     const sseUrl = `${this.connectedFacilityBackend + "/" + INGESTOR_API_ENDPOINTS_V1.METADATA}?${params.toString()}`;
     this.sseService.connect(sseUrl);
-    this.sseService.getMessages().subscribe({
-      next: (data) => {
-        //console.log("Received SSE data:", data);
-        this.createNewTransferData.apiInformation.extractorMetaDataStatus =
-          data.message;
-        this.createNewTransferData.apiInformation.extractorMetadataProgress =
-          data.progress;
-
-        if (data.result) {
-          this.createNewTransferData.apiInformation.extractorMetaDataReady =
-            true;
-          const extractedScientificMetadata = JSON.parse(
-            data.resultMessage,
-          ) as ScientificMetadata;
-
-          this.createNewTransferData.extractorMetaData.instrument =
-            extractedScientificMetadata.instrument ?? {};
-          this.createNewTransferData.extractorMetaData.acquisition =
-            extractedScientificMetadata.acquisition ?? {};
-        } else if (data.error) {
-          this.createNewTransferData.apiInformation.metaDataExtractionFailed =
-            true;
-          this.createNewTransferData.apiInformation.extractMetaDataRequested =
-            false;
+    this.subscriptions.push(
+      this.sseService.getMessages().subscribe({
+        next: (data) => {
+          //console.log("Received SSE data:", data);
           this.createNewTransferData.apiInformation.extractorMetaDataStatus =
             data.message;
           this.createNewTransferData.apiInformation.extractorMetadataProgress =
             data.progress;
-        }
-      },
-      error: (error) => {
-        console.error("Error receiving SSE data:", error);
-        this.createNewTransferData.apiInformation.metaDataExtractionFailed =
-          true;
-        this.createNewTransferData.apiInformation.extractMetaDataRequested =
-          false;
-      },
-    });
+
+          if (data.result) {
+            this.createNewTransferData.apiInformation.extractorMetaDataReady =
+              true;
+            const extractedScientificMetadata = JSON.parse(
+              data.resultMessage,
+            ) as ScientificMetadata;
+
+            this.createNewTransferData.extractorMetaData.instrument =
+              extractedScientificMetadata.instrument ?? {};
+            this.createNewTransferData.extractorMetaData.acquisition =
+              extractedScientificMetadata.acquisition ?? {};
+          } else if (data.error) {
+            this.createNewTransferData.apiInformation.metaDataExtractionFailed =
+              true;
+            this.createNewTransferData.apiInformation.extractMetaDataRequested =
+              false;
+            this.createNewTransferData.apiInformation.extractorMetaDataStatus =
+              data.message;
+            this.createNewTransferData.apiInformation.extractorMetadataProgress =
+              data.progress;
+          }
+        },
+        error: (error) => {
+          console.error("Error receiving SSE data:", error);
+          this.createNewTransferData.apiInformation.metaDataExtractionFailed =
+            true;
+          this.createNewTransferData.apiInformation.extractMetaDataRequested =
+            false;
+        },
+      }),
+    );
 
     return true;
   }
diff --git a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
index 96c358f0f2..11c7f63d97 100644
--- a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, OnInit } from "@angular/core";
+import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
 import { MAT_DIALOG_DATA, MatDialog } from "@angular/material/dialog";
 import {
   IngestionRequestInformation,
@@ -14,6 +14,7 @@ import {
 } from "state-management/selectors/ingestor.selector";
 import { Store } from "@ngrx/store";
 import * as fromActions from "state-management/actions/ingestor.actions";
+import { Subscription } from "rxjs";
 
 export interface BrowsableNode extends FolderNode {
   childrenNodes?: BrowsableNode[];
@@ -31,8 +32,9 @@ export interface GoBackNode extends FolderNode {
   templateUrl: "ingestor.file-browser.component.html",
   styleUrls: ["../../ingestor-page/ingestor.component.scss"],
 })
-export class IngestorFileBrowserComponent implements OnInit {
+export class IngestorFileBrowserComponent implements OnInit, OnDestroy {
   private _activeNode: BrowsableNode | null = null;
+  private subscriptions: Subscription[] = [];
 
   ingestionObject$ = this.store.select(selectIngestionObject);
   selectIngestorBrowserActiveNode$ = this.store.select(
@@ -57,7 +59,7 @@ export class IngestorFileBrowserComponent implements OnInit {
     public dialog: MatDialog,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
     private store: Store,
-  ) { }
+  ) {}
 
   get activeNode(): BrowsableNode | null {
     return this._activeNode;
@@ -87,33 +89,41 @@ export class IngestorFileBrowserComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.ingestionObject$.subscribe((ingestionObject) => {
-      if (ingestionObject) {
-        this.createNewTransferData = ingestionObject;
-
-        const rootNode: FolderNode = {
-          name: "",
-          path:
-            this.createNewTransferData.selectedPath !== ""
-              ? this.createNewTransferData.selectedPath
-              : "/",
-          children: false,
-        };
-
-        this.selectIngestorBrowserActiveNode$.subscribe((newNode) => {
-          if (newNode) {
-            const newActiveNode: BrowsableNode = {
-              ...(this.nextNode ?? rootNode),
-              childrenNodes: [],
-              children: false,
-            };
-            this.setExtendedNodeActive(newActiveNode, newNode);
-          }
-        });
-
-        this.onLoadFolderNode(rootNode, true);
-      }
-    });
+    this.subscriptions.push(
+      this.ingestionObject$.subscribe((ingestionObject) => {
+        if (ingestionObject) {
+          this.createNewTransferData = ingestionObject;
+
+          const rootNode: FolderNode = {
+            name: "",
+            path:
+              this.createNewTransferData.selectedPath !== ""
+                ? this.createNewTransferData.selectedPath
+                : "/",
+            children: false,
+          };
+
+          this.subscriptions.push(
+            this.selectIngestorBrowserActiveNode$.subscribe((newNode) => {
+              if (newNode) {
+                const newActiveNode: BrowsableNode = {
+                  ...(this.nextNode ?? rootNode),
+                  childrenNodes: [],
+                  children: false,
+                };
+                this.setExtendedNodeActive(newActiveNode, newNode);
+              }
+            }),
+          );
+
+          this.onLoadFolderNode(rootNode, true);
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
   }
 
   setExtendedNodeActive(
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
index 0782dc0808..af9f3f5e46 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
@@ -1,10 +1,16 @@
-import { Component, OnInit, ChangeDetectionStrategy } from "@angular/core";
+import {
+  Component,
+  OnInit,
+  ChangeDetectionStrategy,
+  OnDestroy,
+} from "@angular/core";
 import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
 import { RankedTester, rankWith, scopeEndsWith } from "@jsonforms/core";
 import { Store } from "@ngrx/store";
 import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
 import { fetchCurrentUserAction } from "state-management/actions/user.actions";
 import { MatAutocompleteSelectedEvent } from "@angular/material/autocomplete";
+import { Subscription } from "rxjs";
 
 @Component({
   selector: "owner-group-renderer",
@@ -68,8 +74,8 @@ import { MatAutocompleteSelectedEvent } from "@angular/material/autocomplete";
 })
 export class OwnerGroupFieldComponent
   extends JsonFormsControl
-  implements OnInit
-{
+  implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
   focused = false;
   vm$ = this.store.select(selectUserSettingsPageViewModel);
   userOwnerGroups = [];
@@ -89,37 +95,44 @@ export class OwnerGroupFieldComponent
     super.ngOnInit();
 
     // Fetch the owner groups from the scicat user
-    this.vm$.subscribe((settings) => {
-      const getclaims = (profile: any): string[] => {
-        if (!profile) {
+    this.subscriptions.push(
+      this.vm$.subscribe((settings) => {
+        const getclaims = (profile: any): string[] => {
+          if (!profile) {
+            return [];
+          }
+
+          if (profile.oidcClaims !== undefined) {
+            return settings.profile.oidcClaims.accessGroups ?? [];
+          }
+
+          if (profile.accessGroups !== undefined) {
+            return settings.profile.accessGroups ?? [];
+          }
+
           return [];
-        }
+        };
 
-        if (profile.oidcClaims !== undefined) {
-          return settings.profile.oidcClaims.accessGroups ?? [];
+        const claims = getclaims(settings.profile);
+        if (claims.length > 0) {
+          this.userOwnerGroups = claims;
         }
 
-        if (profile.accessGroups !== undefined) {
-          return settings.profile.accessGroups ?? [];
+        if (!this.groupFieldInitialized) {
+          this.groupFieldInitialized = true;
+          this.store.dispatch(fetchCurrentUserAction());
         }
 
-        return [];
-      };
-
-      const claims = getclaims(settings.profile);
-      if (claims.length > 0) {
-        this.userOwnerGroups = claims;
-      }
-
-      if (!this.groupFieldInitialized) {
-        this.groupFieldInitialized = true;
-        this.store.dispatch(fetchCurrentUserAction());
-      }
+        if (this.form.disabled) {
+          this.form.enable();
+        }
+      }),
+    );
+  }
 
-      if (this.form.disabled) {
-        this.form.enable();
-      }
-    });
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
   }
 
   onSelectAutocompleteValue($event: MatAutocompleteSelectedEvent) {
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 9760d1c53c..8d622d7311 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -1,4 +1,4 @@
-import { Component, inject, OnInit } from "@angular/core";
+import { Component, inject, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { MatDialog } from "@angular/material/dialog";
 import {
@@ -25,16 +25,19 @@ import {
   selectIngestorConnecting,
   selectIngestorEndpoint,
   selectIngestorTransferList,
+  selectIngestorTransferListRequestOptions,
 } from "state-management/selectors/ingestor.selector";
 import { IngestorCreationDialogBaseComponent } from "ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component";
 import { INGESTOR_API_ENDPOINTS_V1 } from "shared/sdk/apis/ingestor.service";
+import { Subscription } from "rxjs";
 
 @Component({
   selector: "ingestor",
   templateUrl: "./ingestor.component.html",
   styleUrls: ["./ingestor.component.scss"],
 })
-export class IngestorComponent implements OnInit {
+export class IngestorComponent implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
   readonly dialog = inject(MatDialog);
 
   vm$ = this.store.select(selectUserSettingsPageViewModel);
@@ -44,6 +47,9 @@ export class IngestorComponent implements OnInit {
   ingestorConnecting$ = this.store.select(selectIngestorConnecting);
   ingestorBackend$ = this.store.select(selectIngestorEndpoint);
   transferList$ = this.store.select(selectIngestorTransferList);
+  selectIngestorTransferListRequestOptions$ = this.store.select(
+    selectIngestorTransferListRequestOptions,
+  );
 
   sourceFolder = "";
   forwardFacilityBackend = "";
@@ -88,93 +94,123 @@ export class IngestorComponent implements OnInit {
     this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
 
     // Fetch the API token that the ingestor can authenticate to scicat as the user
-    this.vm$.subscribe((settings) => {
-      this.scicatUserProfile = settings.profile;
-    });
+    this.subscriptions.push(
+      this.vm$.subscribe((settings) => {
+        this.scicatUserProfile = settings.profile;
+      }),
+    );
 
-    this.ingestorBackend$.subscribe((ingestorBackend) => {
-      if (ingestorBackend) {
-        this.connectedFacilityBackend = ingestorBackend;
-      }
-    });
+    this.subscriptions.push(
+      this.ingestorBackend$.subscribe((ingestorBackend) => {
+        if (ingestorBackend) {
+          this.connectedFacilityBackend = ingestorBackend;
+        }
+      }),
+    );
 
-    this.transferList$.subscribe((transferList) => {
-      if (transferList) {
-        this.transferDataInformation = transferList;
-      }
-    });
+    this.subscriptions.push(
+      this.transferList$.subscribe((transferList) => {
+        if (transferList) {
+          this.transferDataInformation = transferList;
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.selectIngestorTransferListRequestOptions$.subscribe(
+        (requestOptions) => {
+          if (requestOptions) {
+            this.transferDataPageIndex = requestOptions.page;
+            this.transferDataPageSize = requestOptions.pageNumber;
+          }
+        },
+      ),
+    );
 
     this.loadIngestorConfiguration();
     this.store.dispatch(fetchCurrentUserAction());
   }
 
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
+  }
+
   async loadIngestorConfiguration(): Promise<void> {
     // Get the GET parameter 'backendUrl' from the URL
-    this.route.queryParams.subscribe(async (params) => {
-      const backendUrl = params["backendUrl"];
-      const discovery = params["discovery"];
-
-      if (discovery === "true" && !backendUrl) {
-        const facilityUrl = await this.getFacilityURLByUserInfo();
-        if (facilityUrl != null) {
-          this.router.navigate([], {
-            relativeTo: this.route,
-            queryParams: { backendUrl: facilityUrl },
-            queryParamsHandling: "",
-          });
+    this.subscriptions.push(
+      this.route.queryParams.subscribe(async (params) => {
+        const backendUrl = params["backendUrl"];
+        const discovery = params["discovery"];
+
+        if (discovery === "true" && !backendUrl) {
+          const facilityUrl = await this.getFacilityURLByUserInfo();
+          if (facilityUrl != null) {
+            this.router.navigate([], {
+              relativeTo: this.route,
+              queryParams: { backendUrl: facilityUrl },
+              queryParamsHandling: "",
+            });
+          }
         }
-      }
 
-      if (backendUrl) {
-        // backendUrl should not end with a slash
-        const facilityBackendUrlCleaned = backendUrl.replace(/\/$/, "");
+        if (backendUrl) {
+          // backendUrl should not end with a slash
+          const facilityBackendUrlCleaned = backendUrl.replace(/\/$/, "");
 
-        await this.store.dispatch(
-          fromActions.setIngestorEndpoint({
-            ingestorEndpoint: facilityBackendUrlCleaned,
-          }),
-        );
+          await this.store.dispatch(
+            fromActions.setIngestorEndpoint({
+              ingestorEndpoint: facilityBackendUrlCleaned,
+            }),
+          );
 
-        this.initializeIngestorConnection();
-      } else {
-        this.connectingToFacilityBackend = false;
-      }
-    });
+          this.initializeIngestorConnection();
+        } else {
+          this.connectingToFacilityBackend = false;
+        }
+      }),
+    );
   }
 
   async initializeIngestorConnection(): Promise<void> {
     this.store.dispatch(fromActions.connectIngestor());
 
-    this.ingestorConnecting$.subscribe((connecting) => {
-      this.connectingToFacilityBackend = connecting;
-    });
-
-    this.ingestorStatus$.subscribe((ingestorStatus) => {
-      if (!ingestorStatus.validEndpoint) {
-        this.connectedFacilityBackend = "";
-        this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-      } else if (
-        ingestorStatus.versionResponse &&
-        ingestorStatus.healthResponse
-      ) {
-        this.versionInfo = ingestorStatus.versionResponse;
-        this.healthInfo = ingestorStatus.healthResponse;
-      }
-    });
+    this.subscriptions.push(
+      this.ingestorConnecting$.subscribe((connecting) => {
+        this.connectingToFacilityBackend = connecting;
+      }),
+    );
 
-    this.ingestorAuthInfo$.subscribe((authInfo) => {
-      if (authInfo) {
-        this.userInfo = authInfo.userInfoResponse;
-        this.authIsDisabled = authInfo.authIsDisabled;
+    this.subscriptions.push(
+      this.ingestorStatus$.subscribe((ingestorStatus) => {
+        if (!ingestorStatus.validEndpoint) {
+          this.connectedFacilityBackend = "";
+          this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+        } else if (
+          ingestorStatus.versionResponse &&
+          ingestorStatus.healthResponse
+        ) {
+          this.versionInfo = ingestorStatus.versionResponse;
+          this.healthInfo = ingestorStatus.healthResponse;
+        }
+      }),
+    );
 
-        // Only refresh if the user is logged in or the auth is disabled
-        if (this.authIsDisabled || this.userInfo.logged_in) {
-          // Activate Transfer Tab when ingestor is ready for actions
-          this.selectedTab = 0;
-          this.doRefreshTransferList();
+    this.subscriptions.push(
+      this.ingestorAuthInfo$.subscribe((authInfo) => {
+        if (authInfo) {
+          this.userInfo = authInfo.userInfoResponse;
+          this.authIsDisabled = authInfo.authIsDisabled;
+
+          // Only refresh if the user is logged in or the auth is disabled
+          if (this.authIsDisabled || this.userInfo.logged_in) {
+            // Activate Transfer Tab when ingestor is ready for actions
+            this.selectedTab = 0;
+            this.doRefreshTransferList();
+          }
         }
-      }
-    });
+      }),
+    );
   }
 
   onClickForwardToIngestorPage() {
@@ -224,28 +260,31 @@ export class IngestorComponent implements OnInit {
     if (dialogRef === null) return;
   }
 
-  doRefreshTransferList(transferId?: string): void {
+  doRefreshTransferList(
+    transferId?: string,
+    page?: number,
+    pageNumber?: number,
+  ): void {
     this.store.dispatch(
       fromActions.updateTransferList({
         transferId,
-        page: this.transferDataPageIndex + 1,
-        pageNumber: this.transferDataPageSize,
+        page: page ? page + 1 : undefined,
+        pageNumber: pageNumber,
       }),
     );
   }
 
-  async onCancelTransfer(transferId: string) {
+  onCancelTransfer(transferId: string) {
     this.store.dispatch(
       fromActions.cancelTransfer({
         transferId: transferId,
       }),
     );
+    this.doRefreshTransferList();
   }
 
   onTransferPageChange(event: PageChangeEvent): void {
-    this.transferDataPageIndex = event.pageIndex;
-    this.transferDataPageSize = event.pageSize;
-    this.doRefreshTransferList();
+    this.doRefreshTransferList(undefined, event.pageIndex, event.pageSize);
   }
 
   openIngestorLogin(): void {
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index c73da22650..2f304e1d92 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -43,12 +43,16 @@ export const stopConnectingIngestor = createAction(
 
 export const updateTransferList = createAction(
   "[Ingestor] Update transfer list",
-  props<{ transferId: string; page: number; pageNumber: number }>(),
+  props<{ transferId?: string; page?: number; pageNumber?: number }>(),
 );
 
 export const updateTransferListSuccess = createAction(
   "[Ingestor] Update Transfer List Success",
-  props<{ transferList: GetTransferResponse }>(),
+  props<{
+    transferList: GetTransferResponse;
+    page: number;
+    pageNumber: number;
+  }>(),
 );
 
 export const updateTransferListFailure = createAction(
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index d111e1dc75..208852eba9 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { Actions, createEffect, ofType } from "@ngrx/effects";
+import { Actions, createEffect, ofType, concatLatestFrom } from "@ngrx/effects";
 import { of } from "rxjs";
 import { catchError, map, switchMap, finalize } from "rxjs/operators"; // Import finalize
 import * as fromActions from "state-management/actions/ingestor.actions";
@@ -12,6 +12,8 @@ import {
 import { MessageType } from "state-management/models";
 import { HttpErrorResponse } from "@angular/common/http";
 import { showMessageAction } from "state-management/actions/user.actions";
+import { Store } from "@ngrx/store";
+import { selectIngestorTransferListRequestOptions } from "state-management/selectors/ingestor.selector";
 
 @Injectable()
 export class IngestorEffects {
@@ -113,16 +115,32 @@ export class IngestorEffects {
   updateTransferList$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(fromActions.updateTransferList),
-      switchMap(({ transferId, page, pageNumber }) =>
-        this.ingestor.getTransferList(page, pageNumber, transferId).pipe(
-          map((transferList) =>
-            fromActions.updateTransferListSuccess({ transferList }),
-          ),
-          catchError((err) =>
-            of(fromActions.updateTransferListFailure({ err })),
-          ),
-        ),
+      concatLatestFrom(() =>
+        this.store.select(selectIngestorTransferListRequestOptions),
       ),
+      switchMap(([action, requestOptions]) => {
+        const { transferId, page, pageNumber } = action;
+        const { page: pageRO, pageNumber: pageNumberRO } = requestOptions;
+
+        return this.ingestor
+          .getTransferList(
+            page ?? pageRO,
+            pageNumber ?? pageNumberRO,
+            transferId,
+          )
+          .pipe(
+            map((transferList) =>
+              fromActions.updateTransferListSuccess({
+                transferList,
+                page: page ?? pageRO,
+                pageNumber: pageNumber ?? pageNumberRO,
+              }),
+            ),
+            catchError((err) =>
+              of(fromActions.updateTransferListFailure({ err })),
+            ),
+          );
+      }),
     );
   });
 
@@ -163,7 +181,10 @@ export class IngestorEffects {
       ofType(fromActions.ingestDataset),
       switchMap(({ ingestionDataset }) =>
         this.ingestor.startIngestion(ingestionDataset).pipe(
-          map((response) => fromActions.ingestDatasetSuccess({ response })),
+          switchMap((response) => [
+            fromActions.ingestDatasetSuccess({ response }),
+            fromActions.updateTransferList({}),
+          ]),
           catchError((err) => of(fromActions.ingestDatasetFailure({ err }))),
         ),
       ),
@@ -211,14 +232,16 @@ export class IngestorEffects {
       ofType(fromActions.cancelTransfer),
       switchMap(({ transferId }) =>
         this.ingestor.cancelTransfer(transferId).pipe(
-          map((response) => {
-            const message = {
-              type: MessageType.Success,
-              content: "Successfully cancelled transfer: " + transferId,
-              duration: 5000,
-            };
-            return showMessageAction({ message }); // Direkt die Aktion zurückgeben
-          }),
+          switchMap(() => [
+            showMessageAction({
+              message: {
+                type: MessageType.Success,
+                content: "Successfully cancelled transfer: " + transferId,
+                duration: 5000,
+              },
+            }),
+            fromActions.updateTransferList({}),
+          ]),
           catchError((err) => {
             const message = {
               type: MessageType.Error,
@@ -226,7 +249,7 @@ export class IngestorEffects {
                 "Failed to cancel transfer: " + (err.error ?? err.message),
               duration: 5000,
             };
-            return of(showMessageAction({ message })); // Wrap the action in of()
+            return of(showMessageAction({ message }));
           }),
         ),
       ),
@@ -236,5 +259,6 @@ export class IngestorEffects {
   constructor(
     private actions$: Actions,
     private ingestor: Ingestor,
-  ) {}
+    private store: Store,
+  ) { }
 }
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index 74763218dd..b4b65b076f 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -95,9 +95,13 @@ const reducer = createReducer(
   ),
   on(
     fromActions.updateTransferListSuccess,
-    (state, { transferList }): IngestorState => ({
+    (state, { transferList, page, pageNumber }): IngestorState => ({
       ...state,
       ingestorTransferList: transferList,
+      transferListRequestOptions: {
+        page,
+        pageNumber,
+      },
     }),
   ),
   on(
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
index 3d9557a71e..119445e81f 100644
--- a/src/app/state-management/selectors/ingestor.selector.ts
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -53,3 +53,8 @@ export const selectIngestorRenderView = createSelector(
   selectIngestorState,
   (state) => state.renderView,
 );
+
+export const selectIngestorTransferListRequestOptions = createSelector(
+  selectIngestorState,
+  (state) => state.transferListRequestOptions,
+);
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 527f3023d6..499128ef8f 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -29,6 +29,10 @@ export interface IngestorState {
   ingestorAuth: IngestorAuthentication | null;
   ingestorEndpoint: string | null;
   ingestorTransferList: GetTransferResponse | null;
+  transferListRequestOptions: {
+    page: number;
+    pageNumber: number;
+  };
   ingestorExtractionMethods: GetExtractorResponse | null;
   ingestionObject: IngestionRequestInformation;
   ingestorBrowserActiveNode: GetBrowseDatasetResponse | null;
@@ -45,6 +49,10 @@ export const initialIngestorState: IngestorState = {
   ingestorAuth: null,
   ingestorEndpoint: null,
   ingestorTransferList: null,
+  transferListRequestOptions: {
+    page: 0,
+    pageNumber: 100,
+  },
   ingestorExtractionMethods: null,
   ingestionObject: IngestorHelper.createEmptyRequestInformation(),
   ingestorBrowserActiveNode: null,

From 8b571f7d8566283d415ac1b2738863a6e6a9240e Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 6 May 2025 07:27:32 +0000
Subject: [PATCH 155/245] improve transfer information

---
 ...r.transfer-detail-view-dialog.component.ts | 118 ++++++++++++++++++
 .../ingestor.transfer-detail-view-dialog.html |  49 ++++++++
 .../ingestor-page/ingestor.component.html     |  22 ++--
 .../ingestor-page/ingestor.component.ts       |  86 +++++--------
 src/app/ingestor/ingestor.module.ts           |   2 +
 5 files changed, 206 insertions(+), 71 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
 create mode 100644 src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html

diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
new file mode 100644
index 0000000000..aae66ebfa7
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
@@ -0,0 +1,118 @@
+import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
+import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
+import { Store } from "@ngrx/store";
+import { Subscription } from "rxjs";
+import { TransferItem } from "shared/sdk/models/ingestor/transferItem";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import { selectIngestorTransferList } from "state-management/selectors/ingestor.selector";
+
+@Component({
+  selector: "app-ingestor-transfer-view-dialog",
+  templateUrl: "./ingestor.transfer-detail-view-dialog.html",
+  styleUrls: ["../../ingestor-page/ingestor.component.scss"],
+})
+export class IngestorTransferViewDialogComponent implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
+  transferAutoRefreshIntervalDetail = 3000;
+  autoRefreshInterval: NodeJS.Timeout = null;
+  transferList$ = this.store.select(selectIngestorTransferList);
+  detailItem: TransferItem | null = null;
+
+  constructor(
+    private store: Store,
+    public dialogRef: MatDialogRef<IngestorTransferViewDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: any,
+  ) { }
+
+  ngOnInit() {
+    this.subscriptions.push(
+      this.transferList$.subscribe((transferList) => {
+        if (transferList) {
+          this.detailItem = transferList.transfers?.find(
+            (item) => item.transferId === this.transferId,
+          );
+        }
+      }),
+    );
+
+    this.startAutoRefresh();
+  }
+
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
+
+    this.stopAutoRefresh();
+  }
+
+  getByteTransferRelative(): string {
+    if (this.detailItem) {
+      const bytesToGB = (bytes: number) => bytes / 1024 ** 3;
+      return `${(
+        bytesToGB(this.detailItem.bytesTransferred) /
+        bytesToGB(this.detailItem.bytesTotal)
+      ).toFixed(2)} %`;
+    }
+    return "No further information available.";
+  }
+
+  getByteTransferTotal(): string {
+    if (this.detailItem) {
+      const bytesToGB = (bytes: number) => bytes / 1024 ** 3;
+      return `${bytesToGB(this.detailItem.bytesTotal).toFixed(3)} GB`;
+    }
+    return "No further information available.";
+  }
+
+  getFileTransferTotal(): string {
+    if (this.detailItem) {
+      return `${this.detailItem.filesTransferred} / ${this.detailItem.filesTotal} Files`;
+    }
+    return "No further information available.";
+  }
+
+  get transferId(): string {
+    return this.data.transferId || null;
+  }
+
+  get header(): string {
+    return "Transfer Details";
+  }
+
+  startAutoRefresh(): void {
+    this.doRefreshTransferList(this.transferId);
+    this.stopAutoRefresh();
+    this.autoRefreshInterval = setInterval(() => {
+      this.doRefreshTransferList(this.transferId);
+    }, this.transferAutoRefreshIntervalDetail);
+  }
+
+  stopAutoRefresh(): void {
+    if (this.autoRefreshInterval) {
+      clearInterval(this.autoRefreshInterval);
+      this.autoRefreshInterval = null;
+    }
+  }
+
+  doRefreshTransferList(
+    transferId?: string,
+    page?: number,
+    pageNumber?: number,
+  ): void {
+    this.store.dispatch(
+      fromActions.updateTransferList({
+        transferId,
+        page: page ? page + 1 : undefined,
+        pageNumber: pageNumber,
+      }),
+    );
+  }
+
+  onConfirm(): void {
+    this.dialogRef.close(true);
+  }
+
+  onCancel(): void {
+    this.dialogRef.close(false);
+  }
+}
diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
new file mode 100644
index 0000000000..a05c33686f
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
@@ -0,0 +1,49 @@
+<div class="ingestor-mixed-header">
+  <h2 mat-dialog-title>
+    {{ header }}
+  </h2>
+  <button mat-icon-button mat-dialog-close aria-label="Close"
+    class="ingestor-close-button">
+    <mat-icon>close</mat-icon>
+  </button>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+  <table>
+    <thead>
+      <tr>
+        <th>Property</th>
+        <th>Value</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Transfer ID</td>
+        <td>{{transferId}}</td>
+      </tr>
+      <tr *ngIf="detailItem && detailItem.status !== undefined">
+        <td>Status</td>
+        <td>{{detailItem.status}}</td>
+      </tr>
+      <tr
+        *ngIf="detailItem && detailItem.bytesTransferred !== undefined && detailItem.bytesTotal !== undefined">
+        <td>GB transferred</td>
+        <td>{{getByteTransferRelative()}}</td>
+      </tr>
+      <tr
+        *ngIf="detailItem && detailItem.bytesTransferred !== undefined && detailItem.bytesTotal !== undefined">
+        <td>GB transferred (total)</td>
+        <td>{{getByteTransferTotal()}}</td>
+      </tr>
+      <tr
+        *ngIf="detailItem && detailItem.filesTransferred !== undefined && detailItem.filesTotal !== undefined">
+        <td>Files transferred (total)</td>
+        <td>{{getFileTransferTotal()}}</td>
+      </tr>
+    </tbody>
+  </table>
+</mat-dialog-content>
+
+<mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close cdkFocusInitial
+    (click)="onCancel()">Cancel</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.html b/src/app/ingestor/ingestor-page/ingestor.component.html
index 1c14fcc6f6..8fdfd11b04 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor.component.html
@@ -73,8 +73,9 @@
               <mat-divider class="divider-down"></mat-divider>
             </div>
 
-            <mat-tab-group animationDuration="0ms" [selectedIndex]="selectedTab">
-                <mat-tab [disabled]="!(authIsDisabled || userInfo?.logged_in)"
+            <mat-tab-group animationDuration="0ms"
+              [selectedIndex]="selectedTab">
+              <mat-tab [disabled]="!(authIsDisabled || userInfo?.logged_in)"
                 label="Transfers">
                 <button matTooltip="Refresh transfer list" mat-button
                   aria-label="Refresh transfer list"
@@ -107,14 +108,12 @@
                   </ng-container>
 
                   <ng-container matColumnDef="progress">
-                    <th mat-header-cell *matHeaderCellDef><b>Progress</b> </th>
-                    <td mat-cell *matCellDef="let element">
-                      <mat-icon
-                        [matTooltip]="getTransferDetailInformation(element.transferId)"
-                        (mouseover)="startAutoRefresh(element.transferId)"
-                        (mouseout)="stopAutoRefresh()">
-                        info
-                      </mat-icon>
+                    <th mat-header-cell *matHeaderCellDef class="text-right"><b>Progress</b> </th>
+                    <td mat-cell *matCellDef="let element" class="text-right">
+                      <button mat-button aria-label="Delete transfer"
+                        (click)="onOpenDetailView(element.transferId)">
+                        <mat-icon>info</mat-icon>
+                      </button>
                     </td>
                   </ng-container>
 
@@ -127,9 +126,6 @@
                         (click)="onCancelTransfer(element.transferId)">
                         <mat-icon>delete</mat-icon>
                       </button>
-                      <button mat-button aria-label="Pause transfer">
-                        <mat-icon>pause_circle</mat-icon>
-                      </button>
                     </td>
                   </ng-container>
 
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 8d622d7311..1d5997fd84 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -30,6 +30,8 @@ import {
 import { IngestorCreationDialogBaseComponent } from "ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component";
 import { INGESTOR_API_ENDPOINTS_V1 } from "shared/sdk/apis/ingestor.service";
 import { Subscription } from "rxjs";
+import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
+import { IngestorTransferViewDialogComponent } from "ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component";
 
 @Component({
   selector: "ingestor",
@@ -61,7 +63,6 @@ export class IngestorComponent implements OnInit, OnDestroy {
   lastUsedFacilityBackends: string[] = [];
 
   transferDataInformation: GetTransferResponse = null;
-  transferAutoRefreshIntervalDetail = 3000;
   transferDataPageSize = 100;
   transferDataPageIndex = 0;
   transferDataPageSizeOptions = [5, 10, 25, 100];
@@ -82,8 +83,6 @@ export class IngestorComponent implements OnInit, OnDestroy {
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
-  autoRefreshInterval: NodeJS.Timeout = null;
-
   constructor(
     private route: ActivatedRoute,
     private router: Router,
@@ -275,12 +274,23 @@ export class IngestorComponent implements OnInit, OnDestroy {
   }
 
   onCancelTransfer(transferId: string) {
-    this.store.dispatch(
-      fromActions.cancelTransfer({
-        transferId: transferId,
-      }),
-    );
-    this.doRefreshTransferList();
+    const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
+      data: {
+        header: "Confirm deletion",
+        message: "Cancel the transfer and remove it from the list?",
+      },
+    });
+
+    const dialogSub = dialogRef.afterClosed().subscribe(async (result) => {
+      if (result) {
+        this.store.dispatch(
+          fromActions.cancelTransfer({
+            transferId: transferId,
+          }),
+        );
+      }
+      dialogSub.unsubscribe();
+    });
   }
 
   onTransferPageChange(event: PageChangeEvent): void {
@@ -301,56 +311,16 @@ export class IngestorComponent implements OnInit, OnDestroy {
       INGESTOR_API_ENDPOINTS_V1.AUTH.LOGOUT;
   }
 
-  getTransferDetailInformation(transferId: string): string {
-    const detailItem = this.transferDataInformation.transfers?.find(
-      (item) => item.transferId === transferId,
-    );
-    if (detailItem) {
-      let progressState = "";
-      let progressPercent = 0;
-      let fileState = "";
-
-      if (detailItem.bytesTransferred && detailItem.bytesTotal) {
-        const bytesToGB = (bytes: number) => (bytes / 1024 ** 3).toFixed();
-        progressState = `${bytesToGB(detailItem.bytesTransferred)} / ${bytesToGB(detailItem.bytesTotal)} GB`;
-        progressPercent =
-          (detailItem.bytesTransferred / detailItem.bytesTotal) * 100;
-      }
-
-      if (
-        detailItem.filesTransferred &&
-        detailItem.filesTotal &&
-        detailItem.filesTotal > 0
-      ) {
-        fileState = `${detailItem.filesTransferred} / ${detailItem.filesTotal} Files`;
-      }
-
-      return (
-        "Progress: " +
-        progressPercent +
-        "%" +
-        " - Data: " +
-        progressState +
-        " - Files: " +
-        fileState
-      );
-    }
-    return "No further information available.";
-  }
-
-  startAutoRefresh(transferId: string): void {
-    //this.doRefreshTransferList(transferId);
-    /*this.stopAutoRefresh();
-    this.autoRefreshInterval = setInterval(() => {
-      this.doRefreshTransferList(transferId);
-    }, this.transferAutoRefreshIntervalDetail);*/
-  }
+  onOpenDetailView(transferId: string): void {
+    const dialogRef = this.dialog.open(IngestorTransferViewDialogComponent, {
+      data: {
+        transferId: transferId,
+      },
+    });
 
-  stopAutoRefresh(): void {
-    if (this.autoRefreshInterval) {
-      clearInterval(this.autoRefreshInterval);
-      this.autoRefreshInterval = null;
-    }
+    const dialogSub = dialogRef.afterClosed().subscribe(() => {
+      dialogSub.unsubscribe();
+    });
   }
 
   async getFacilityURLByUserInfo(): Promise<string | null> {
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 0444c41557..6bdd4bac01 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -48,6 +48,7 @@ import { IngestorConfirmTransferDialogPageComponent } from "./ingestor-dialogs/c
 import { IngestorNewTransferDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component";
 import { IngestorUserMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component";
 import { IngestorExtractorMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component";
+import { IngestorTransferViewDialogComponent } from "./ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component";
 
 @NgModule({
   declarations: [
@@ -69,6 +70,7 @@ import { IngestorExtractorMetadataDialogPageComponent } from "./ingestor-dialogs
     QuantityValueObjectComponent,
     QuantityValueLayoutRendererComponent,
     CustomLayoutChildrenRenderPropsPipe,
+    IngestorTransferViewDialogComponent,
   ],
   imports: [
     CommonModule,

From c8aed17251c3cec68838f937fd6a3d44b91e9940 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 6 May 2025 12:42:38 +0000
Subject: [PATCH 156/245] bugfixes

---
 .../ingestor.transfer-detail-view-dialog.html         |  2 +-
 .../customRenderer/any-of-renderer.ts                 |  2 +-
 .../ingestor-metadata-editor.component.scss           |  4 ++++
 src/app/ingestor/ingestor-page/ingestor.component.ts  | 11 ++++-------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
index a05c33686f..e4a5b2f8c4 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
@@ -45,5 +45,5 @@ <h2 mat-dialog-title>
 
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close cdkFocusInitial
-    (click)="onCancel()">Cancel</button>
+    (click)="onCancel()">Close</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 1869eac47f..d3456370b4 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -33,7 +33,7 @@ import { cloneDeep, isEmpty, startCase } from "lodash-es";
         <mat-tab-group *ngIf="tabAmount > 1">
           animationDuration="0ms" [selectedIndex]="selectedTabIndex" >
           <mat-tab *ngFor="let option of filteredOptions" label="{{ option }}">
-            <div *ngIf="option !== 'null'">
+            <div class="mat-tab-content-renderer" *ngIf="option !== 'null'">
               <jsonforms-outlet
                 [uischema]="getUISchema(option)"
                 [schema]="getTabSchema(option)"
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
index 44a95db72c..210851e365 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -50,4 +50,8 @@ mat-card {
 
 .quantity-value-element {
   flex: 1;
+}
+
+.mat-tab-content-renderer {
+  margin-top: 0.5em;
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 1d5997fd84..04df078652 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -259,14 +259,10 @@ export class IngestorComponent implements OnInit, OnDestroy {
     if (dialogRef === null) return;
   }
 
-  doRefreshTransferList(
-    transferId?: string,
-    page?: number,
-    pageNumber?: number,
-  ): void {
+  doRefreshTransferList(page?: number, pageNumber?: number): void {
     this.store.dispatch(
       fromActions.updateTransferList({
-        transferId,
+        transferId: undefined,
         page: page ? page + 1 : undefined,
         pageNumber: pageNumber,
       }),
@@ -294,7 +290,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
   }
 
   onTransferPageChange(event: PageChangeEvent): void {
-    this.doRefreshTransferList(undefined, event.pageIndex, event.pageSize);
+    this.doRefreshTransferList(event.pageIndex, event.pageSize);
   }
 
   openIngestorLogin(): void {
@@ -319,6 +315,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
     });
 
     const dialogSub = dialogRef.afterClosed().subscribe(() => {
+      this.doRefreshTransferList();
       dialogSub.unsubscribe();
     });
   }

From d67bd6733c756cf0a895e708ebed81ea4580ebfa Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 6 May 2025 12:43:49 +0000
Subject: [PATCH 157/245] remove ingestor url

---
 src/app/app-config.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index 0e5570ae6e..7dec6effdf 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -64,7 +64,6 @@ export interface AppConfig {
   jupyterHubUrl: string | null;
   landingPage: string | null;
   lbBaseURL: string;
-  ingestorURL: string;
   localColumns?: TableColumn[]; // localColumns is deprecated and should be removed in the future
   logbookEnabled: boolean;
   loginFormEnabled: boolean;

From ab1ba5101020847da676ee5e1214a37baf6779b6 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 6 May 2025 15:04:07 +0000
Subject: [PATCH 158/245] implemented reduced view (require only)

---
 ...xtractor-metadata-dialog-page.component.ts | 19 ++++++-
 ...gestor.extractor-metadata-dialog-page.html |  4 +-
 ...tor.user-metadata-dialog-page.component.ts | 16 +++++-
 .../ingestor.user-metadata-dialog-page.html   |  6 +--
 .../ingestor.dialog-stepper.component.html    |  9 ++--
 .../ingestor.dialog-stepper.component.ts      | 42 +++++++++++++---
 .../ingestor-metadata-editor-helper.ts        | 30 ++++++++++++
 .../ingestor-metadata-editor.component.ts     | 49 +++++++++++++++----
 .../actions/ingestor.actions.ts               |  6 +++
 .../effects/ingestor.effect.ts                | 14 ++++++
 .../reducers/ingestor.reducer.ts              |  7 +++
 .../state-management/state/ingestor.store.ts  |  3 +-
 12 files changed, 176 insertions(+), 29 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index 4a57d9e02c..cf05a8848f 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -13,9 +13,13 @@ import {
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 import { Store } from "@ngrx/store";
-import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
+import {
+  selectIngestionObject,
+  selectIngestorRenderView,
+} from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Subscription } from "rxjs";
+import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 
 @Component({
   selector: "ingestor-extractor-metadata-dialog-page",
@@ -23,7 +27,8 @@ import { Subscription } from "rxjs";
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorExtractorMetadataDialogPageComponent
-  implements OnInit, OnDestroy {
+  implements OnInit, OnDestroy
+{
   private subscriptions: Subscription[] = [];
   metadataSchemaInstrument: JsonSchema;
   metadataSchemaAcquisition: JsonSchema;
@@ -31,10 +36,12 @@ export class IngestorExtractorMetadataDialogPageComponent
     IngestorHelper.createEmptyRequestInformation();
 
   ingestionObject$ = this.store.select(selectIngestionObject);
+  renderView$ = this.store.select(selectIngestorRenderView);
 
   @Output() nextStep = new EventEmitter<void>();
   @Output() backStep = new EventEmitter<void>();
 
+  activeRenderView: renderView | null = null;
   extractorMetaDataReady = false;
   extractorMetaDataStatus = "";
   extractorMetaDataError = false;
@@ -82,6 +89,14 @@ export class IngestorExtractorMetadataDialogPageComponent
         }
       }),
     );
+
+    this.subscriptions.push(
+      this.renderView$.subscribe((renderView) => {
+        if (renderView) {
+          this.activeRenderView = renderView;
+        }
+      }),
+    );
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
index 0d7a09800c..87dd14a5f2 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
@@ -58,7 +58,7 @@ <h2 mat-dialog-title>
               'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.instrument">
-            <app-metadata-editor [schema]="metadataSchemaInstrument"
+            <app-metadata-editor [schema]="metadataSchemaInstrument" [renderView]="activeRenderView"
               [data]="createNewTransferData.extractorMetaData['instrument']"
               (dataChange)="onDataChangeExtractorMetadataInstrument($event)"
               (errors)="instrumentErrorsHandler($event)"></app-metadata-editor>
@@ -81,7 +81,7 @@ <h2 mat-dialog-title>
               'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.acquisition">
-            <app-metadata-editor [schema]="metadataSchemaAcquisition"
+            <app-metadata-editor [schema]="metadataSchemaAcquisition" [renderView]="activeRenderView"
               [data]="createNewTransferData.extractorMetaData['acquisition']"
               (dataChange)="onDataChangeExtractorMetadataAcquisition($event)"
               (errors)="acquisitionErrorsHandler($event)"></app-metadata-editor>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 57765497f3..6ef5d91390 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -13,10 +13,14 @@ import {
   SciCatHeader_Schema,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
-import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
+import {
+  selectIngestionObject,
+  selectIngestorRenderView,
+} from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Store } from "@ngrx/store";
 import { Subscription } from "rxjs";
+import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 
 @Component({
   selector: "ingestor-user-metadata-dialog",
@@ -27,6 +31,7 @@ export class IngestorUserMetadataDialogPageComponent
   implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   ingestionObject$ = this.store.select(selectIngestionObject);
+  renderView$ = this.store.select(selectIngestorRenderView);
 
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
@@ -37,6 +42,7 @@ export class IngestorUserMetadataDialogPageComponent
   metadataSchemaOrganizational: JsonSchema;
   metadataSchemaSample: JsonSchema;
   scicatHeaderSchema: JsonSchema;
+  activeRenderView: renderView | null = null;
 
   uiNextButtonReady = false;
   isSciCatHeaderOk = false;
@@ -71,6 +77,14 @@ export class IngestorUserMetadataDialogPageComponent
         }
       }),
     );
+
+    this.subscriptions.push(
+      this.renderView$.subscribe((renderView) => {
+        if (renderView) {
+          this.activeRenderView = renderView;
+        }
+      }),
+    );
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
index 92e5c8c926..e3763ff99f 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
@@ -28,7 +28,7 @@ <h2 mat-dialog-title>
             'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.scicat">
-          <app-metadata-editor [schema]="scicatHeaderSchema"
+          <app-metadata-editor [schema]="scicatHeaderSchema" [renderView]="activeRenderView"
             [data]="createNewTransferData.scicatHeader"
             (dataChange)="onDataChangeUserScicatHeader($event)" (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
         </mat-card-content>
@@ -50,7 +50,7 @@ <h2 mat-dialog-title>
             'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.organizational">
-          <app-metadata-editor [schema]="metadataSchemaOrganizational"
+          <app-metadata-editor [schema]="metadataSchemaOrganizational" [renderView]="activeRenderView"
             [data]="createNewTransferData.userMetaData['organizational']"
             (dataChange)="onDataChangeUserMetadataOrganization($event)" (errors)="organizationalErrorsHandler($event)"></app-metadata-editor>
         </mat-card-content>
@@ -72,7 +72,7 @@ <h2 mat-dialog-title>
             'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.sample">
-          <app-metadata-editor [schema]="metadataSchemaSample"
+          <app-metadata-editor [schema]="metadataSchemaSample" [renderView]="activeRenderView"
             [data]="createNewTransferData.userMetaData['sample']"
             (dataChange)="onDataChangeUserMetadataSample($event)" (errors)="sampleErrorsHandler($event)"></app-metadata-editor>
         </mat-card-content>
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index e22ecaac84..046fb4fca6 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -5,9 +5,12 @@
   <button mat-button matTooltip="Upload a template." [disabled]="activeStep < 1"
     (click)="onUpload()"><mat-icon
       class="control-button-icon">upload</mat-icon></button>
-  <button *ngIf="this.createNewTransferData !== undefined" mat-button
-    matTooltip="Show all fields"><mat-icon
-      class="control-button-icon">visibility_off</mat-icon></button>
+  <button
+    *ngIf="this.createNewTransferData !== undefined && activeRenderView !== null"
+    mat-button (click)="onChangeViewMode()" [matTooltip]="activeRenderView === 'requiredOnly'
+    ? 'Show all fields' : 'Show required fields only'"><mat-icon
+      class="control-button-icon">{{activeRenderView === "requiredOnly" ?
+      "visibility" : "visibility_off"}}</mat-icon></button>
   <button *ngIf="this.createNewTransferData !== undefined" mat-button
     [matMenuTriggerFor]="settingsMenu"
     matTooltip="Customize the metadata editor"
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 46406227d9..6d86f0ea48 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -5,6 +5,7 @@ import {
   EventEmitter,
   Injector,
   OnInit,
+  OnDestroy,
 } from "@angular/core";
 import { MatDialog } from "@angular/material/dialog";
 import {
@@ -18,13 +19,17 @@ import {
 } from "./ingestor.export-helper.component";
 import { Store } from "@ngrx/store";
 import { selectIngestorRenderView } from "state-management/selectors/ingestor.selector";
+import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import { Subscription } from "rxjs";
 
 @Component({
   selector: "ingestor-dialog-stepper",
   templateUrl: "./ingestor.dialog-stepper.component.html",
   styleUrls: ["./ingestor.dialog-stepper.component.css"],
 })
-export class IngestorDialogStepperComponent implements OnInit {
+export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
   @Input() activeStep = 0;
   @Input() createNewTransferData: IngestionRequestInformation;
   @Output() createNewTransferDataChange =
@@ -33,6 +38,7 @@ export class IngestorDialogStepperComponent implements OnInit {
   testMessageComponent = ExportTemplateHelperComponent;
 
   renderView$ = this.store.select(selectIngestorRenderView);
+  activeRenderView: renderView | null = null;
 
   exportValueOptions: ExportOptions = {
     exportSciCat: true,
@@ -52,15 +58,37 @@ export class IngestorDialogStepperComponent implements OnInit {
   constructor(
     private dialog: MatDialog,
     private store: Store,
-  ) {}
+  ) { }
 
   ngOnInit() {
-    this.renderView$.subscribe((renderView) => {
-      if (renderView) {
-        // TODO: Handle the render view change
-        console.log("Render view changed:", renderView);
+    this.subscriptions.push(
+      this.renderView$.subscribe((renderView) => {
+        if (renderView) {
+          this.activeRenderView = renderView;
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
+  }
+
+  onChangeViewMode() {
+    if (this.activeRenderView) {
+      switch (this.activeRenderView) {
+        case "requiredOnly":
+          this.store.dispatch(fromActions.setRenderView({ renderView: "all" }));
+          break;
+        case "all":
+          this.store.dispatch(
+            fromActions.setRenderView({ renderView: "requiredOnly" }),
+          );
+          break;
+        default:
+          console.error("Unknown mode");
       }
-    });
+    }
   }
 
   // Save a template of metadata
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index 30fcbde251..50f464ec9b 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -32,6 +32,36 @@ export class IngestorMetadataEditorHelper {
     }
     return schema;
   }
+
+  static reduceToRequiredProperties(schema: any): any {
+    if (!schema || typeof schema !== "object") {
+      return schema;
+    }
+
+    // Kopiere das Schema und initialisiere die reduzierte Struktur
+    const reducedSchema: any = { ...schema };
+
+    // Entferne nicht benötigte Eigenschaften
+    if (schema.properties && Array.isArray(schema.required)) {
+      reducedSchema.properties = {};
+      for (const key of schema.required) {
+        if (schema.properties[key]) {
+          const property = schema.properties[key];
+          // Rekursiver Aufruf für verschachtelte Objekte
+          reducedSchema.properties[key] =
+            IngestorMetadataEditorHelper.reduceToRequiredProperties(property);
+        }
+      }
+    }
+
+    // Falls es sich um ein Array handelt, reduziere das Items-Schema
+    if (schema.type === "array" && schema.items) {
+      reducedSchema.items =
+        IngestorMetadataEditorHelper.reduceToRequiredProperties(schema.items);
+    }
+
+    return reducedSchema;
+  }
 }
 
 export const convertJSONFormsErrorToString = (error: any): string => {
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index ab001574b9..2105c90b24 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -1,25 +1,54 @@
-import { Component, EventEmitter, Output, Input, OnInit } from "@angular/core";
+import {
+  Component,
+  EventEmitter,
+  Output,
+  Input,
+  OnInit,
+  OnChanges,
+  ChangeDetectorRef,
+} from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
-import { configuredRenderer } from "./ingestor-metadata-editor-helper";
+import {
+  configuredRenderer,
+  IngestorMetadataEditorHelper,
+} from "./ingestor-metadata-editor-helper";
 
+export type renderView = "requiredOnly" | "all";
+
+/* We need to jsonforms renderer here. If we change the view and we only use one instance, 
+it will produce errors when changing the schema. */
 @Component({
   selector: "app-metadata-editor",
-  template: `<jsonforms
-    [data]="visualData"
-    [schema]="schema"
-    [renderers]="combinedRenderers"
-    (dataChange)="onDataChange($event)"
-    (errors)="onErrors($event)"
-  ></jsonforms>`,
+  template: `<div>
+    <jsonforms
+      *ngIf="renderView === 'requiredOnly'"
+      [data]="visualData"
+      [schema]="reducedSchema"
+      [renderers]="combinedRenderers"
+      (dataChange)="onDataChange($event)"
+      (errors)="onErrors($event)"
+    ></jsonforms>
+
+    <jsonforms
+      *ngIf="renderView === 'all'"
+      [data]="visualData"
+      [schema]="schema"
+      [renderers]="combinedRenderers"
+      (dataChange)="onDataChange($event)"
+      (errors)="onErrors($event)"
+    ></jsonforms>
+  </div>`,
 })
 export class IngestorMetadataEditorComponent implements OnInit {
   @Input() data: object;
   @Input() schema: JsonSchema;
+  @Input() renderView: renderView;
 
   @Output() dataChange = new EventEmitter<string>();
   @Output() errors = new EventEmitter<any[]>();
 
   visualData: object = {};
+  reducedSchema: JsonSchema = {};
 
   ngOnInit() {
     // Do a deep clone
@@ -46,6 +75,8 @@ export class IngestorMetadataEditorComponent implements OnInit {
 
     initializeVisualData(this.schema, this.visualData);
 
+    this.reducedSchema =
+      IngestorMetadataEditorHelper.reduceToRequiredProperties(this.schema);
     //console.log(this.schema);
   }
 
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 2f304e1d92..2cf4513c85 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -10,6 +10,7 @@ import {
   PostDatasetResponse,
   UserInfo,
 } from "shared/sdk/models/ingestor/models";
+import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 
 export const setIngestorEndpoint = createAction(
   "[Ingestor] Set ingestor endpoint",
@@ -118,3 +119,8 @@ export const cancelTransfer = createAction(
   "[Ingestor] Cancel Transfer",
   props<{ transferId: string }>(),
 );
+
+export const setRenderView = createAction(
+  "[Ingestor] Set Render View",
+  props<{ renderView: renderView }>(),
+);
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index 208852eba9..4495fbc5d4 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -256,6 +256,20 @@ export class IngestorEffects {
     );
   });
 
+  setRenderView$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.setRenderView),
+      switchMap(({ renderView }) => {
+        const message = {
+          type: MessageType.Success,
+          content: "Render view set to: " + renderView,
+          duration: 5000,
+        };
+        return of(showMessageAction({ message }));
+      }),
+    );
+  });
+
   constructor(
     private actions$: Actions,
     private ingestor: Ingestor,
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index b4b65b076f..8750b6068b 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -13,6 +13,13 @@ export const ingestorReducer = (state: undefined, action: Action) => {
 };
 const reducer = createReducer(
   initialIngestorState,
+  on(
+    fromActions.setRenderView,
+    (state, { renderView }): IngestorState => ({
+      ...state,
+      renderView: renderView,
+    }),
+  ),
   on(
     fromActions.getBrowseFilePathSuccess,
     (state, { ingestorBrowserActiveNode }): IngestorState => ({
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 499128ef8f..58e3552640 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -1,3 +1,4 @@
+import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 import {
   IngestionRequestInformation,
   IngestorHelper,
@@ -22,8 +23,6 @@ interface IngestorStatus {
   validEndpoint: boolean;
 }
 
-type renderView = "requiredOnly" | "all";
-
 export interface IngestorState {
   ingestorStatus: IngestorStatus;
   ingestorAuth: IngestorAuthentication | null;

From c2c4c4b24f3bcad7132dbc6d06c405560ab76f22 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 6 May 2025 15:51:25 +0000
Subject: [PATCH 159/245] fix ingestor #115 - application of templates does not
 work

---
 ....confirm-transfer-dialog-page.component.ts |  4 --
 ...ingestor.confirm-transfer-dialog-page.html | 24 ++++-----
 ...xtractor-metadata-dialog-page.component.ts | 23 +++++++-
 ...gestor.extractor-metadata-dialog-page.html | 22 ++++----
 .../ingestor.new-transfer-dialog-page.html    | 31 ++++++-----
 ...tor.user-metadata-dialog-page.component.ts | 22 ++++++++
 .../ingestor.user-metadata-dialog-page.html   | 32 +++++++----
 ...ingestor.creation-dialog-base.component.ts | 15 +++++-
 .../ingestor.dialog-stepper.component.ts      | 53 ++++++++++++-------
 .../actions/ingestor.actions.ts               |  9 ++++
 .../reducers/ingestor.reducer.ts              | 15 ++++++
 .../selectors/ingestor.selector.ts            |  5 ++
 .../state-management/state/ingestor.store.ts  |  2 +
 13 files changed, 184 insertions(+), 73 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index 96c4294b0a..08a0ff1453 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -75,10 +75,6 @@ export class IngestorConfirmTransferDialogPageComponent
     return JSON.stringify(scicatMetadata, null, space);
   }
 
-  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
-    Object.assign(this.createNewTransferData, updatedData);
-  }
-
   onClickBack(): void {
     // Reset the ingestion request
     this.store.dispatch(fromActions.resetIngestDataset());
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
index a6e74eabe8..a1695e33d4 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
@@ -8,9 +8,7 @@ <h2 mat-dialog-title>
   </button>
 </div>
 <mat-dialog-content class="mat-typography">
-  <ingestor-dialog-stepper [activeStep]="3"
-    [createNewTransferData]="createNewTransferData"
-    (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
+  <ingestor-dialog-stepper [activeStep]="3"></ingestor-dialog-stepper>
 
   <p
     *ngIf="createNewTransferData.apiInformation.ingestionRequestErrorMessage !== ''">
@@ -20,11 +18,11 @@ <h2 mat-dialog-title>
       </mat-card-header>
       <mat-card-content class="ingestor-vertical-layout">
         <div class="confirm-message-ingestor">
-            <mat-icon class="confirm-message-ingestor-icon">error</mat-icon>
-            <p>The transfer request has failed.</p>
-            <p class="confirm-message-error">
+          <mat-icon class="confirm-message-ingestor-icon">error</mat-icon>
+          <p>The transfer request has failed.</p>
+          <p class="confirm-message-error">
             {{createNewTransferData.apiInformation.ingestionRequestErrorMessage}}
-            </p>
+          </p>
         </div>
 
 
@@ -42,13 +40,13 @@ <h2 mat-dialog-title>
         <div class="confirm-message-ingestor">
           <mat-icon
             class="confirm-message-ingestor-icon">check_circle</mat-icon>
-            <p>The transfer request was successfully sent to the server.
+          <p>The transfer request was successfully sent to the server.
             You will receive an email as soon as the data transfer is complete.
-            </p>
-            <p>Transfer ID: {{createNewTransferData.ingestionRequest.transferId}}
-            </p>
-            <p>Transfer status: {{createNewTransferData.ingestionRequest.status}}
-            </p>
+          </p>
+          <p>Transfer ID: {{createNewTransferData.ingestionRequest.transferId}}
+          </p>
+          <p>Transfer status: {{createNewTransferData.ingestionRequest.status}}
+          </p>
         </div>
       </mat-card-content>
     </mat-card>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index cf05a8848f..6acd68f7fb 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -16,6 +16,7 @@ import { Store } from "@ngrx/store";
 import {
   selectIngestionObject,
   selectIngestorRenderView,
+  selectUpdateEditorFromThirdParty,
 } from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Subscription } from "rxjs";
@@ -27,8 +28,7 @@ import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorExtractorMetadataDialogPageComponent
-  implements OnInit, OnDestroy
-{
+  implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   metadataSchemaInstrument: JsonSchema;
   metadataSchemaAcquisition: JsonSchema;
@@ -37,11 +37,15 @@ export class IngestorExtractorMetadataDialogPageComponent
 
   ingestionObject$ = this.store.select(selectIngestionObject);
   renderView$ = this.store.select(selectIngestorRenderView);
+  selectUpdateEditorFromThirdParty$ = this.store.select(
+    selectUpdateEditorFromThirdParty,
+  );
 
   @Output() nextStep = new EventEmitter<void>();
   @Output() backStep = new EventEmitter<void>();
 
   activeRenderView: renderView | null = null;
+  updateEditorFromThirdParty = false;
   extractorMetaDataReady = false;
   extractorMetaDataStatus = "";
   extractorMetaDataError = false;
@@ -97,6 +101,21 @@ export class IngestorExtractorMetadataDialogPageComponent
         }
       }),
     );
+
+    this.subscriptions.push(
+      this.selectUpdateEditorFromThirdParty$.subscribe((updateEditor) => {
+        // We need to rerender the editor if the user has changed the metadata in the third party
+        // So we get a flag, if it is true we unrender the editor
+        // and then we set it to false to render it again
+        this.updateEditorFromThirdParty = updateEditor;
+        if (updateEditor) {
+          this.cdr.detectChanges(); // Force the change detection to unrender the editor
+          this.store.dispatch(
+            fromActions.resetIngestionObjectFromThirdPartyFlag(),
+          );
+        }
+      }),
+    );
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
index 87dd14a5f2..10074cda6c 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
@@ -9,9 +9,11 @@ <h2 mat-dialog-title>
 </div>
 <mat-dialog-content class="mat-typography">
 
-  <div *ngIf="!extractorMetaDataReady || extractorMetaDataError" class="spinner-container">
+  <div *ngIf="!extractorMetaDataReady || extractorMetaDataError"
+    class="spinner-container">
     <ng-container *ngIf="!extractorMetaDataError; else errorIcon">
-      <mat-progress-spinner diameter="20" mode="indeterminate"></mat-progress-spinner>
+      <mat-progress-spinner diameter="20"
+        mode="indeterminate"></mat-progress-spinner>
       <div *ngIf="process > 0" class="progress-percentage">
         <span>{{process}}%</span>
       </div>
@@ -25,9 +27,7 @@ <h2 mat-dialog-title>
   </div>
 
   <div *ngIf="extractorMetaDataReady">
-    <ingestor-dialog-stepper [activeStep]="2"
-      [createNewTransferData]="createNewTransferData"
-      (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
+    <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
     <div *ngIf="extractorMetaDataError" class="error-message">
       <mat-card class="error-card">
         <mat-card-header>
@@ -58,7 +58,9 @@ <h2 mat-dialog-title>
               'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.instrument">
-            <app-metadata-editor [schema]="metadataSchemaInstrument" [renderView]="activeRenderView"
+            <app-metadata-editor *ngIf="!updateEditorFromThirdParty"
+              [schema]="metadataSchemaInstrument"
+              [renderView]="activeRenderView"
               [data]="createNewTransferData.extractorMetaData['instrument']"
               (dataChange)="onDataChangeExtractorMetadataInstrument($event)"
               (errors)="instrumentErrorsHandler($event)"></app-metadata-editor>
@@ -81,7 +83,9 @@ <h2 mat-dialog-title>
               'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.acquisition">
-            <app-metadata-editor [schema]="metadataSchemaAcquisition" [renderView]="activeRenderView"
+            <app-metadata-editor *ngIf="!updateEditorFromThirdParty"
+              [schema]="metadataSchemaAcquisition"
+              [renderView]="activeRenderView"
               [data]="createNewTransferData.extractorMetaData['acquisition']"
               (dataChange)="onDataChangeExtractorMetadataAcquisition($event)"
               (errors)="acquisitionErrorsHandler($event)"></app-metadata-editor>
@@ -93,6 +97,6 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial
-    (click)="onClickNext()" [disabled]="!uiNextButtonReady">Next</button>
+  <button mat-button color="primary" cdkFocusInitial (click)="onClickNext()"
+    [disabled]="!uiNextButtonReady">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index de7865c50e..78d3d2a28c 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -8,9 +8,7 @@ <h2 mat-dialog-title>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
-  <ingestor-dialog-stepper [activeStep]="0"
-  [createNewTransferData]="createNewTransferData"
-  (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
+  <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
 
   <p>Please select the dataset to be uploaded and the appropriate metadata
     extractor method.</p>
@@ -18,7 +16,8 @@ <h2 mat-dialog-title>
   <div *ngIf="createNewTransferData.editorMode === 'INGESTION'">
     <mat-form-field class="form-full-width">
       <mat-label>File Path</mat-label>
-      <input matInput [(ngModel)]="createNewTransferData.selectedPath" (click)="onClickOpenFileBrowser()" readonly>
+      <input matInput [(ngModel)]="createNewTransferData.selectedPath"
+        (click)="onClickOpenFileBrowser()" readonly>
       <!-- [matAutocomplete]="auto" -->
       <button mat-icon-button matSuffix (click)="onClickOpenFileBrowser()">
         <mat-icon>folder</mat-icon>
@@ -28,10 +27,14 @@ <h2 mat-dialog-title>
 
   <div *ngIf="extractionMethods !== null">
     <mat-form-field class="form-full-width">
-      <mat-label *ngIf="createNewTransferData.editorMode === 'INGESTION'">Extraction Method</mat-label>
-      <mat-label *ngIf="createNewTransferData.editorMode === 'EDITOR'">Editor schema</mat-label>
+      <mat-label
+        *ngIf="createNewTransferData.editorMode === 'INGESTION'">Extraction
+        Method</mat-label>
+      <mat-label *ngIf="createNewTransferData.editorMode === 'EDITOR'">Editor
+        schema</mat-label>
       <mat-select [(ngModel)]="selectedMethod">
-        <mat-option *ngFor="let method of extractionMethods.methods" [value]="method">
+        <mat-option *ngFor="let method of extractionMethods.methods"
+          [value]="method">
           {{ method.name }}
         </mat-option>
       </mat-select>
@@ -39,15 +42,19 @@ <h2 mat-dialog-title>
     <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError
       }}</mat-error>
 
-    <mat-paginator *ngIf="extractionMethods.total > dropdownPageSize" [length]="extractionMethods.total" [pageSize]="dropdownPageSize" aria-label="Select page"
-      [hidePageSize]="true" [showFirstLastButtons]="false" [pageIndex]="extractionMethodsPage" (page)="onExtractorMethodsPageChange($event)">
+    <mat-paginator *ngIf="extractionMethods.total > dropdownPageSize"
+      [length]="extractionMethods.total" [pageSize]="dropdownPageSize"
+      aria-label="Select page" [hidePageSize]="true"
+      [showFirstLastButtons]="false" [pageIndex]="extractionMethodsPage"
+      (page)="onExtractorMethodsPageChange($event)">
     </mat-paginator>
   </div>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button *ngIf="extractionMethodsError" mat-button
-    color="warn" (click)="onClickRetryRequests()">Retry</button>
+  <button *ngIf="extractionMethodsError" mat-button color="warn"
+    (click)="onClickRetryRequests()">Retry</button>
   <button mat-button mat-dialog-close>Cancel</button>
-  <button mat-button color="primary" cdkFocusInitial [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
+  <button mat-button color="primary" cdkFocusInitial
+    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 6ef5d91390..7fe7a13ef2 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -16,6 +16,7 @@ import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor
 import {
   selectIngestionObject,
   selectIngestorRenderView,
+  selectUpdateEditorFromThirdParty,
 } from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Store } from "@ngrx/store";
@@ -32,6 +33,9 @@ export class IngestorUserMetadataDialogPageComponent
   private subscriptions: Subscription[] = [];
   ingestionObject$ = this.store.select(selectIngestionObject);
   renderView$ = this.store.select(selectIngestorRenderView);
+  selectUpdateEditorFromThirdParty$ = this.store.select(
+    selectUpdateEditorFromThirdParty,
+  );
 
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
@@ -43,6 +47,7 @@ export class IngestorUserMetadataDialogPageComponent
   metadataSchemaSample: JsonSchema;
   scicatHeaderSchema: JsonSchema;
   activeRenderView: renderView | null = null;
+  updateEditorFromThirdParty = false;
 
   uiNextButtonReady = false;
   isSciCatHeaderOk = false;
@@ -74,6 +79,8 @@ export class IngestorUserMetadataDialogPageComponent
           this.metadataSchemaSample =
             this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
           this.scicatHeaderSchema = SciCatHeader_Schema;
+
+          this.cdr.markForCheck();
         }
       }),
     );
@@ -85,6 +92,21 @@ export class IngestorUserMetadataDialogPageComponent
         }
       }),
     );
+
+    this.subscriptions.push(
+      this.selectUpdateEditorFromThirdParty$.subscribe((updateEditor) => {
+        // We need to rerender the editor if the user has changed the metadata in the third party
+        // So we get a flag, if it is true we unrender the editor
+        // and then we set it to false to render it again
+        this.updateEditorFromThirdParty = updateEditor;
+        if (updateEditor) {
+          this.cdr.detectChanges(); // Force the change detection to unrender the editor
+          this.store.dispatch(
+            fromActions.resetIngestionObjectFromThirdPartyFlag(),
+          );
+        }
+      }),
+    );
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
index e3763ff99f..d9a989a1d8 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
@@ -8,7 +8,7 @@ <h2 mat-dialog-title>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
-  <ingestor-dialog-stepper [activeStep]="1" [createNewTransferData]="createNewTransferData" (createNewTransferDataChange)="onCreateNewTransferDataChange($event)"></ingestor-dialog-stepper>
+  <ingestor-dialog-stepper [activeStep]="1"></ingestor-dialog-stepper>
 
   <div fxLayout="row" fxLayout.xs="column">
     <div fxFlex="80%">
@@ -20,17 +20,20 @@ <h2 mat-dialog-title>
           </div>
           SciCat Information
           <span class="spacer"></span>
-            <mat-icon
+          <mat-icon
             [matTooltip]="isSciCatHeaderOk ? 'Your input is correct.' : scicatHeaderErrors"
             [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'">{{
-            isSciCatHeaderOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
+            isSciCatHeaderOk ? 'check_circle_outline' :
+            'error_outline'}}</mat-icon>
           <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ?
             'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.scicat">
-          <app-metadata-editor [schema]="scicatHeaderSchema" [renderView]="activeRenderView"
+          <app-metadata-editor *ngIf="!updateEditorFromThirdParty"
+            [schema]="scicatHeaderSchema" [renderView]="activeRenderView"
             [data]="createNewTransferData.scicatHeader"
-            (dataChange)="onDataChangeUserScicatHeader($event)" (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
+            (dataChange)="onDataChangeUserScicatHeader($event)"
+            (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
 
@@ -45,14 +48,18 @@ <h2 mat-dialog-title>
           <mat-icon
             [matTooltip]="isOrganizationalMetadataOk ? 'Your input is correct.' : organizationalErrors"
             [ngClass]="isOrganizationalMetadataOk ? 'success-icon' : 'error-icon'">{{
-            isOrganizationalMetadataOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
+            isOrganizationalMetadataOk ? 'check_circle_outline' :
+            'error_outline'}}</mat-icon>
           <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ?
             'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.organizational">
-          <app-metadata-editor [schema]="metadataSchemaOrganizational" [renderView]="activeRenderView"
+          <app-metadata-editor *ngIf="!updateEditorFromThirdParty"
+            [schema]="metadataSchemaOrganizational"
+            [renderView]="activeRenderView"
             [data]="createNewTransferData.userMetaData['organizational']"
-            (dataChange)="onDataChangeUserMetadataOrganization($event)" (errors)="organizationalErrorsHandler($event)"></app-metadata-editor>
+            (dataChange)="onDataChangeUserMetadataOrganization($event)"
+            (errors)="organizationalErrorsHandler($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
 
@@ -67,14 +74,17 @@ <h2 mat-dialog-title>
           <mat-icon
             [matTooltip]="isSampleInformationOk ? 'Your input is correct.' : sampleErrors"
             [ngClass]="isSampleInformationOk ? 'success-icon' : 'error-icon'">{{
-            isSampleInformationOk ? 'check_circle_outline' : 'error_outline'}}</mat-icon>
+            isSampleInformationOk ? 'check_circle_outline' :
+            'error_outline'}}</mat-icon>
           <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ?
             'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.sample">
-          <app-metadata-editor [schema]="metadataSchemaSample" [renderView]="activeRenderView"
+          <app-metadata-editor *ngIf="!updateEditorFromThirdParty"
+            [schema]="metadataSchemaSample" [renderView]="activeRenderView"
             [data]="createNewTransferData.userMetaData['sample']"
-            (dataChange)="onDataChangeUserMetadataSample($event)" (errors)="sampleErrorsHandler($event)"></app-metadata-editor>
+            (dataChange)="onDataChangeUserMetadataSample($event)"
+            (errors)="sampleErrorsHandler($event)"></app-metadata-editor>
         </mat-card-content>
       </mat-card>
     </div>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index 5ae4fd9e63..de95029e60 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -87,11 +87,22 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
     });
   }
 
-  resetExtractedMetadata(): void {
+  resetScientificMetadata(): void {
     this.createNewTransferData.extractorMetaData = {
       instrument: {},
       acquisition: {},
     };
+
+    this.createNewTransferData.userMetaData = {
+      organizational: {},
+      sample: {},
+    };
+
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
   }
 
   async startMetadataExtraction(): Promise<boolean> {
@@ -157,7 +168,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
   onClickNext(nextStep: dialogStep): void {
     switch (nextStep) {
       case "NEW_TRANSFER":
-        this.resetExtractedMetadata();
+        this.resetScientificMetadata();
         break;
       case "USER_METADATA":
         this.createNewTransferData.apiInformation.extractMetaDataRequested =
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 6d86f0ea48..b3c3a8c5ce 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -1,15 +1,8 @@
-import {
-  Component,
-  Input,
-  Output,
-  EventEmitter,
-  Injector,
-  OnInit,
-  OnDestroy,
-} from "@angular/core";
+import { Component, Input, Injector, OnInit, OnDestroy } from "@angular/core";
 import { MatDialog } from "@angular/material/dialog";
 import {
   IngestionRequestInformation,
+  IngestorHelper,
   SciCatHeader,
 } from "../../ingestor-page/helper/ingestor.component-helper";
 import { IngestorConfirmationDialogComponent } from "../confirmation-dialog/ingestor.confirmation-dialog.component";
@@ -18,7 +11,10 @@ import {
   ExportTemplateHelperComponent,
 } from "./ingestor.export-helper.component";
 import { Store } from "@ngrx/store";
-import { selectIngestorRenderView } from "state-management/selectors/ingestor.selector";
+import {
+  selectIngestionObject,
+  selectIngestorRenderView,
+} from "state-management/selectors/ingestor.selector";
 import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Subscription } from "rxjs";
@@ -31,13 +27,13 @@ import { Subscription } from "rxjs";
 export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   @Input() activeStep = 0;
-  @Input() createNewTransferData: IngestionRequestInformation;
-  @Output() createNewTransferDataChange =
-    new EventEmitter<IngestionRequestInformation>();
 
   testMessageComponent = ExportTemplateHelperComponent;
 
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
   renderView$ = this.store.select(selectIngestorRenderView);
+  ingestionObject$ = this.store.select(selectIngestionObject);
   activeRenderView: renderView | null = null;
 
   exportValueOptions: ExportOptions = {
@@ -61,6 +57,14 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
   ) { }
 
   ngOnInit() {
+    this.subscriptions.push(
+      this.ingestionObject$.subscribe((ingestionObject) => {
+        if (ingestionObject) {
+          this.createNewTransferData = ingestionObject;
+        }
+      }),
+    );
+
     this.subscriptions.push(
       this.renderView$.subscribe((renderView) => {
         if (renderView) {
@@ -91,6 +95,14 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
     }
   }
 
+  updateIngestionObject(updatedObject: IngestionRequestInformation) {
+    this.store.dispatch(
+      fromActions.updateIngestionObjectFromThirdParty({
+        ingestionObject: updatedObject,
+      }),
+    );
+  }
+
   // Save a template of metadata
   onSave() {
     const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
@@ -173,7 +185,7 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
             if (result) {
               try {
                 const parsedData = JSON.parse(content);
-                this.createNewTransferData = {
+                const newTransferData = {
                   ...this.createNewTransferData,
                   scicatHeader: {
                     ...this.createNewTransferData.scicatHeader,
@@ -184,9 +196,8 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
                     ...parsedData.userMetaData,
                   },
                 };
-                this.createNewTransferDataChange.emit(
-                  this.createNewTransferData,
-                );
+
+                this.updateIngestionObject(newTransferData);
               } catch (error) {
                 console.error("Error parsing JSON file:", error);
               }
@@ -212,10 +223,12 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
           console.error("Unknown mode");
       }
 
+      const newTransferData = { ...this.createNewTransferData };
       // Clean selected file and selected method
-      this.createNewTransferData.selectedPath = "";
-      this.createNewTransferData.selectedMethod = null;
-      this.createNewTransferDataChange.emit(this.createNewTransferData);
+      newTransferData.selectedPath = "";
+      newTransferData.selectedMethod = null;
+
+      this.updateIngestionObject(newTransferData);
     }
   }
 }
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 2cf4513c85..8898bb929c 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -66,6 +66,15 @@ export const updateIngestionObject = createAction(
   props<{ ingestionObject: IngestionRequestInformation }>(),
 );
 
+export const updateIngestionObjectFromThirdParty = createAction(
+  "[Ingestor] Update Ingestion Object from Third Party",
+  props<{ ingestionObject: IngestionRequestInformation }>(),
+);
+
+export const resetIngestionObjectFromThirdPartyFlag = createAction(
+  "[Ingestor] Reset Ingestion Object from Third Party Flag",
+);
+
 export const getExtractionMethods = createAction(
   "[Ingestor] Get Extraction Methods",
   props<{ page: number; pageNumber: number }>(),
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index 8750b6068b..8c55c8364f 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -118,6 +118,21 @@ const reducer = createReducer(
       ingestionObject,
     }),
   ),
+  on(
+    fromActions.updateIngestionObjectFromThirdParty,
+    (state, { ingestionObject }): IngestorState => ({
+      ...state,
+      ingestionObject,
+      updateEditorFromThirdParty: true,
+    }),
+  ),
+  on(
+    fromActions.resetIngestionObjectFromThirdPartyFlag,
+    (state): IngestorState => ({
+      ...state,
+      updateEditorFromThirdParty: false,
+    }),
+  ),
   on(
     fromActions.ingestDatasetSuccess,
     (state, { response }): IngestorState => ({
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
index 119445e81f..57b53efa78 100644
--- a/src/app/state-management/selectors/ingestor.selector.ts
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -58,3 +58,8 @@ export const selectIngestorTransferListRequestOptions = createSelector(
   selectIngestorState,
   (state) => state.transferListRequestOptions,
 );
+
+export const selectUpdateEditorFromThirdParty = createSelector(
+  selectIngestorState,
+  (state) => state.updateEditorFromThirdParty,
+);
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 58e3552640..d085aaea33 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -36,6 +36,7 @@ export interface IngestorState {
   ingestionObject: IngestionRequestInformation;
   ingestorBrowserActiveNode: GetBrowseDatasetResponse | null;
   renderView: renderView;
+  updateEditorFromThirdParty: boolean;
   connectingBackend: boolean;
   error: any | null;
 }
@@ -56,6 +57,7 @@ export const initialIngestorState: IngestorState = {
   ingestionObject: IngestorHelper.createEmptyRequestInformation(),
   ingestorBrowserActiveNode: null,
   connectingBackend: false,
+  updateEditorFromThirdParty: false,
   error: null,
   renderView: "all",
 };

From c501d87f23c8e9ec1551ed087e9e6089dab03595 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 6 May 2025 15:55:35 +0000
Subject: [PATCH 160/245] spelling

---
 .../ingestor.dialog-stepper.component.html                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index 046fb4fca6..3e685b259a 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -8,12 +8,12 @@
   <button
     *ngIf="this.createNewTransferData !== undefined && activeRenderView !== null"
     mat-button (click)="onChangeViewMode()" [matTooltip]="activeRenderView === 'requiredOnly'
-    ? 'Show all fields' : 'Show required fields only'"><mat-icon
+    ? 'Show all fields.' : 'Show required fields only.'"><mat-icon
       class="control-button-icon">{{activeRenderView === "requiredOnly" ?
       "visibility" : "visibility_off"}}</mat-icon></button>
   <button *ngIf="this.createNewTransferData !== undefined" mat-button
     [matMenuTriggerFor]="settingsMenu"
-    matTooltip="Customize the metadata editor"
+    matTooltip="Customize the metadata editor."
     [disabled]="activeStep > 0"><mat-icon
       class="control-button-icon">settings</mat-icon></button>
 </div>

From 9a56bb06e1fe0f42b879914ab7ecefac8cbbeb00 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 9 May 2025 14:12:36 +0000
Subject: [PATCH 161/245] add scicat header schema by dto

---
 ...stor.new-transfer-dialog-page.component.ts |   3 +-
 ...tor.user-metadata-dialog-page.component.ts |   4 +-
 .../helper/ingestor.component-helper.ts       | 309 +++++++++++++++---
 3 files changed, 273 insertions(+), 43 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 904f2c3dd1..08e76430ae 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -137,8 +137,9 @@ export class IngestorNewTransferDialogPageComponent
       this.userProfile.email;
     this.createNewTransferData.scicatHeader["contactEmail"] =
       this.userProfile.email;
+
     const creationTime = new Date();
-    const formattedCreationTime = creationTime.toISOString().split("T")[0];
+    const formattedCreationTime = creationTime.toISOString();
     this.createNewTransferData.scicatHeader["creationTime"] =
       formattedCreationTime;
   }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 7fe7a13ef2..4ac8d3d9ca 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -8,9 +8,9 @@ import {
 } from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import {
+  getJsonSchemaFromDto,
   IngestionRequestInformation,
   IngestorHelper,
-  SciCatHeader_Schema,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 import {
@@ -78,7 +78,7 @@ export class IngestorUserMetadataDialogPageComponent
             this.createNewTransferData.selectedResolvedDecodedSchema.properties.organizational;
           this.metadataSchemaSample =
             this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
-          this.scicatHeaderSchema = SciCatHeader_Schema;
+          this.scicatHeaderSchema = getJsonSchemaFromDto();
 
           this.cdr.markForCheck();
         }
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 8ea2f768be..823a8e927a 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -1,4 +1,6 @@
-import { JsonSchema } from "@jsonforms/core";
+import { JsonSchema, JsonSchema7 } from "@jsonforms/core";
+import { DatasetClass } from "@scicatproject/scicat-sdk-ts";
+import { isArray } from "mathjs";
 import { PostDatasetResponse } from "shared/sdk/models/ingestor/postDatasetResponse";
 import { UserInfo } from "shared/sdk/models/ingestor/userInfo";
 
@@ -125,45 +127,6 @@ export class IngestorHelper {
   }
 }
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const SciCatHeader_Schema: JsonSchema = {
-  type: "object",
-  properties: {
-    datasetName: { type: "string" },
-    description: { type: "string" },
-    creationLocation: { type: "string" },
-    dataFormat: { type: "string" },
-    ownerGroup: { type: "string" },
-    type: { type: "string" },
-    license: { type: "string" },
-    keywords: {
-      type: "array",
-      items: { type: "string" },
-    },
-    sourceFolder: { type: "string", readOnly: true }, // disabled, because its selected in the first step
-    principalInvestigator: { type: "string" },
-    ownerEmail: { type: "string" },
-    contactEmail: { type: "string" },
-    investigator: { type: "string" },
-    creationTime: { type: "string" },
-    owner: { type: "string" },
-  },
-  required: [
-    "datasetName",
-    "creationLocation",
-    "dataFormat",
-    "ownerGroup",
-    "type",
-    "sourceFolder",
-    "principalInvestigator",
-    "ownerEmail",
-    "contactEmail",
-    "investigator",
-    "creationTime",
-    "owner",
-  ],
-};
-
 export const isBase64 = (str: string) => {
   try {
     return btoa(atob(str)) === str;
@@ -182,3 +145,269 @@ export const decodeBase64ToUTF8 = (base64: string) => {
   const decoder = new TextDecoder(); // default is utf-8
   return decoder.decode(bytes);
 };
+
+export const getJsonSchemaFromDto = () => {
+  // Currently there is no valid schema which can be used. So we create one from the dataset class.
+  // --string => string
+  // --mail => string with regex
+  // --readonly => string with readonly
+  // --fqdn => string with regex
+  // --skip => skip
+  // --dateTime => string with dateTime format
+  // --number => number
+  // --boolean => boolean
+  // --optional => optional
+
+  // 0 => number
+  // -1 => skip number
+  // -2 => optional number
+  const emptyDatasetForSchema: DatasetClass = {
+    createdBy: "--skip",
+    updatedBy: "--skip",
+    createdAt: "--dateTime",
+    updatedAt: "--dateTime --skip", // skip
+    ownerGroup: "--string",
+    accessGroups: [],
+    isPublished: false,
+    pid: "--skip",
+    owner: "--string",
+    contactEmail: "--mail",
+    sourceFolder: "--readonly",
+    size: -1, // skip
+    numberOfFiles: -1, // skip
+    creationTime: "--dateTime",
+    type: "raw",
+    datasetName: "--string",
+    version: "--skip",
+    creationLocation: "--string",
+
+    // Optional fields
+    description: "--string --optional",
+    license: "--string --optional",
+    keywords: [],
+    principalInvestigator: "defaultInvestigator --optional",
+    scientificMetadata: {},
+    ownerEmail: "--mail --optional",
+
+    instrumentGroup: "--optional",
+    orcidOfOwner: "--optional",
+    sourceFolderHost: "--fqdn --optional",
+    packedSize: -1, // skip
+    numberOfFilesArchived: -1, // skip
+    validationStatus: "--string --optional",
+    classification: "--string --optional",
+    comment: "--string --optional",
+    dataQualityMetrics: -2, // optional
+    startTime: "--dateTime --optional",
+    endTime: "--dateTime --optional",
+    dataFormat: "--string --optional",
+    runNumber: "--optional",
+    datasetlifecycle: undefined,
+
+    proposalIds: [],
+    sampleIds: [],
+    instrumentIds: [],
+    inputDatasets: [],
+    usedSoftware: [],
+    jobLogData: "--string --optional",
+  };
+
+  const descriptionMatrix = {
+    createdBy:
+      "Indicate the user who created this record. This property is added and maintained by the system.",
+    updatedBy:
+      "Indicate the user who updated this record last. This property is added and maintained by the system.",
+    createdAt:
+      "Date and time when this record was created. This field is managed by mongoose with through the timestamp settings. The field should be a string containing a date in ISO 8601 format (2024-02-27T12:26:57.313Z).",
+    updatedAt:
+      "Date and time when this record was updated last. This field is managed by mongoose with through the timestamp settings. The field should be a string containing a date in ISO 8601 format (2024-02-27T12:26:57.313Z).",
+    ownerGroup:
+      "Defines the group which owns the data, and therefore has unrestricted access to this data. Usually a pgroup like p12151.",
+    accessGroups:
+      "Optional additional groups which have read access to the data. Users which are members in one of the groups listed here are allowed to access this data. The special group 'public' makes data available to all users.",
+    instrumentGroup:
+      "Optional additional groups which have read and write access to the data. Users which are members in one of the groups listed here are allowed to access this data.",
+    isPublished: "Flag is true when data are made publicly available.",
+    pid: "Persistent Identifier for datasets derived from UUIDv4 and prepended automatically by site specific PID prefix like 20.500.12345/.",
+    owner:
+      "Owner or custodian of the dataset, usually first name + last name. The string may contain a list of persons, which should then be separated by semicolons.",
+    ownerEmail:
+      "Email of the owner or custodian of the dataset. The string may contain a list of emails, which should then be separated by semicolons.",
+    orcidOfOwner:
+      "ORCID of the owner or custodian. The string may contain a list of ORCIDs, which should then be separated by semicolons.",
+    contactEmail:
+      "Email of the contact person for this dataset. The string may contain a list of emails, which should then be separated by semicolons.",
+    sourceFolder:
+      "Absolute file path on file server containing the files of this dataset, e.g. /some/path/to/sourcefolder. In case of a single file dataset, e.g. HDF5 data, it contains the path up to, but excluding the filename. Trailing slashes are removed.",
+    sourceFolderHost:
+      "DNS host name of file server hosting sourceFolder, optionally including a protocol e.g. [protocol://]fileserver1.example.com.",
+    size: "Total size of all source files contained in source folder on disk when unpacked.",
+    packedSize:
+      "Total size of all datablock package files created for this dataset.",
+    numberOfFiles:
+      "Total number of files in all OrigDatablocks for this dataset.",
+    numberOfFilesArchived:
+      "Total number of files in all Datablocks for this dataset.",
+    creationTime:
+      "Time when dataset became fully available on disk, i.e. all containing files have been written, or the dataset was created in SciCat. It is expected to be in ISO8601 format according to specifications for internet date/time format in RFC 3339, chapter 5.6.",
+    type: "Characterize type of dataset, either 'raw' or 'derived'. Autofilled when choosing the proper inherited models.",
+    validationStatus:
+      "Defines a level of trust, e.g. a measure of how much data was verified or used by other persons.",
+    keywords:
+      "Array of tags associated with the meaning or contents of this dataset. Values should ideally come from defined vocabularies, taxonomies, ontologies or knowledge graphs.",
+    description: "Free text explanation of contents of dataset.",
+    datasetName:
+      "A name for the dataset, given by the creator to carry some semantic meaning. Useful for display purposes e.g. instead of displaying the pid.",
+    classification:
+      "ACIA information about AUthenticity,COnfidentiality,INtegrity and AVailability requirements of dataset. E.g. AV(ailabilty)=medium could trigger the creation of a two tape copies.",
+    license: "Name of the license under which the data can be used.",
+    version:
+      "Version of the API used when the dataset was created or last updated. API version is defined in code for each release. Managed by the system.",
+    history: "List of objects containing old and new values.",
+    datasetlifecycle:
+      "Describes the current status of the dataset during its lifetime with respect to the storage handling systems.",
+    techniques: "Array of techniques information, with technique name and pid.",
+    relationships:
+      "Array of relationships with other datasets. It contains relationship type and destination dataset.",
+    sharedWith:
+      "List of additional users that the dataset has been shared with.",
+    scientificMetadata: "JSON object containing the scientific metadata.",
+    comment:
+      "Short comment provided by the user about a given dataset. This is additional to the description field.",
+    dataQualityMetrics:
+      "Data Quality Metrics given by the user to rate the dataset.",
+    principalInvestigator:
+      "First name and last name of principal investigator(s). If multiple PIs are present, use a semicolon separated list. This field is required if the dataset is a Raw dataset.",
+    startTime:
+      "Start time of data acquisition for the current dataset. It is expected to be in ISO8601 format according to specifications for internet date/time format in RFC 3339, chapter 5.6.",
+    endTime:
+      "End time of data acquisition for the current dataset. It is expected to be in ISO8601 format according to specifications for internet date/time format in RFC 3339, chapter 5.6.",
+    creationLocation:
+      "Unique location identifier where data was acquired. Usually in the form /Site-name/facility-name/instrumentOrBeamline-name.",
+    dataFormat:
+      "Defines the format of the data files in this dataset, e.g Nexus Version x.y.",
+    runNumber:
+      "Run number assigned by the system to the data acquisition for the current dataset.",
+    proposalIds:
+      "The ID of the proposal to which the dataset belongs to and it has been acquired under.",
+    sampleIds:
+      "Single ID or array of IDS of the samples used when collecting the data.",
+    instrumentIds:
+      "Id of the instrument or array of IDS of the instruments where the data contained in this dataset was created/acquired.",
+    inputDatasets:
+      "Array of input dataset identifiers used in producing the derived dataset. Ideally these are the global identifier to existing datasets inside this or federated data catalogs.",
+    usedSoftware:
+      "A list of links to software repositories which uniquely identifies the pieces of software, including versions, used for yielding the derived data.",
+    jobParameters:
+      "The creation process of the derived data will usually depend on input job parameters. The full structure of these input parameters are stored here.",
+    jobLogData:
+      "The output job logfile. Keep the size of this log data well below 15 MB.",
+  };
+
+  const schema = {
+    type: "object",
+    properties: {},
+    required: [],
+  } as JsonSchema7;
+
+  const regExMailFormat = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+  const regExISO8601 =
+    /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/;
+  const regExFQDN = /^(?!:\/\/)([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(:\d+)?(\/.*)?$/;
+  const regExDatasetType = /raw|derived/;
+
+  for (const key in emptyDatasetForSchema) {
+    if (Object.prototype.hasOwnProperty.call(emptyDatasetForSchema, key)) {
+      const value = (emptyDatasetForSchema as any)[key];
+
+      // Decide type and add to schema
+      if (typeof value === "string") {
+        if (value.includes("--skip")) {
+          continue; // Skip this field
+        }
+        schema.properties[key] = { type: "string" };
+
+        // Depending on the value, add regex or format
+        if (value.includes("--string")) {
+          schema.properties[key].type = "string";
+        }
+        if (value.includes("--mail")) {
+          schema.properties[key].type = "string";
+          schema.properties[key].pattern = regExMailFormat.source;
+        }
+        if (value.includes("--readonly")) {
+          schema.properties[key].type = "string";
+          schema.properties[key].readOnly = true;
+        }
+        if (value.includes("--dateTime")) {
+          schema.properties[key].type = "string";
+          schema.properties[key].format = "date-time";
+          schema.properties[key].pattern = regExISO8601.source;
+        }
+        if (value.includes("--fqdn")) {
+          schema.properties[key].type = "string";
+          schema.properties[key].pattern = regExFQDN.source;
+        }
+        if (value.includes("--optional")) {
+          schema.properties[key].type = "string";
+        }
+        if (value.includes("--type")) {
+          schema.properties[key].type = "string";
+          schema.properties[key].format = "date-time";
+          schema.properties[key].pattern = regExDatasetType.source;
+        }
+      } else if (typeof value === "number") {
+        // If -1 skip
+        if (value === -1) {
+          continue; // Skip this field
+        }
+        schema.properties[key] = { type: "number" };
+      } else if (typeof value === "boolean") {
+        schema.properties[key] = { type: "boolean" };
+      } else if (Array.isArray(value)) {
+        schema.properties[key] = { type: "array" };
+        schema.properties[key].items = { type: "string" };
+      } else {
+        continue; // Skip unsupported types
+      }
+
+      // Add the description from the description matrix to the schema
+      if (descriptionMatrix[key]) {
+        schema.properties[key].description = descriptionMatrix[key];
+      }
+
+      // Add to required fields if it is not optional
+      // Wenn string ohne --optional oder --skip, wenn number > 0, the rest always required
+      if (typeof value === "string") {
+        if (
+          value.includes("--string") &&
+          !value.includes("--optional") &&
+          !value.includes("--skip")
+        ) {
+          schema.required.push(key);
+        }
+      } else if (typeof value === "number") {
+        if (value > 0) {
+          schema.required.push(key);
+        }
+      } else if (isArray(value)) {
+        // For arrays, if the array is not empty, add to required fields
+        if (value.length > 0) {
+          schema.required.push(key);
+        }
+      } else {
+        // For all other types, add to required fields
+        schema.required.push(key);
+      }
+    }
+  }
+
+  // Sort the keys in the schema alphabetically
+  schema.properties = Object.fromEntries(
+    Object.entries(schema.properties).sort(([keyA], [keyB]) =>
+      keyA.localeCompare(keyB),
+    ),
+  );
+
+  return schema;
+};

From 9e8b20dde05dc797c6e5f2545bd8bbef9df44661 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 07:34:17 +0000
Subject: [PATCH 162/245] Update visual data when changing renderView

---
 ...xtractor-metadata-dialog-page.component.ts | 20 +++++++++++--
 ...gestor.extractor-metadata-dialog-page.html |  4 +--
 ...tor.user-metadata-dialog-page.component.ts | 30 ++++++++++++++-----
 .../ingestor.user-metadata-dialog-page.html   | 13 ++++----
 .../ingestor-metadata-editor.component.ts     | 26 ++++++++--------
 5 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index 6acd68f7fb..dfa127a288 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -5,6 +5,7 @@ import {
   OnDestroy,
   OnInit,
   Output,
+  ViewChild,
 } from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import {
@@ -20,7 +21,10 @@ import {
 } from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Subscription } from "rxjs";
-import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
+import {
+  IngestorMetadataEditorComponent,
+  renderView,
+} from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 
 @Component({
   selector: "ingestor-extractor-metadata-dialog-page",
@@ -44,6 +48,11 @@ export class IngestorExtractorMetadataDialogPageComponent
   @Output() nextStep = new EventEmitter<void>();
   @Output() backStep = new EventEmitter<void>();
 
+  @ViewChild("instrumentMetadataEditor")
+  instrumentMetadataEditor: IngestorMetadataEditorComponent;
+  @ViewChild("acquisitionMetadataEditor")
+  acquisitionMetadataEditor: IngestorMetadataEditorComponent;
+
   activeRenderView: renderView | null = null;
   updateEditorFromThirdParty = false;
   extractorMetaDataReady = false;
@@ -97,7 +106,14 @@ export class IngestorExtractorMetadataDialogPageComponent
     this.subscriptions.push(
       this.renderView$.subscribe((renderView) => {
         if (renderView) {
-          this.activeRenderView = renderView;
+          // Check if renderView changed
+          if (this.activeRenderView !== renderView) {
+            this.activeRenderView = renderView;
+
+            // Update visual data object with the new renderView (changes the schema)
+            this.instrumentMetadataEditor.updateVisualData();
+            this.acquisitionMetadataEditor.updateVisualData();
+          }
         }
       }),
     );
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
index 10074cda6c..2ae3f2be45 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
@@ -58,7 +58,7 @@ <h2 mat-dialog-title>
               'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.instrument">
-            <app-metadata-editor *ngIf="!updateEditorFromThirdParty"
+            <app-metadata-editor #instrumentMetadataEditor *ngIf="!updateEditorFromThirdParty"
               [schema]="metadataSchemaInstrument"
               [renderView]="activeRenderView"
               [data]="createNewTransferData.extractorMetaData['instrument']"
@@ -83,7 +83,7 @@ <h2 mat-dialog-title>
               'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.acquisition">
-            <app-metadata-editor *ngIf="!updateEditorFromThirdParty"
+            <app-metadata-editor #acquisitionMetadataEditor *ngIf="!updateEditorFromThirdParty"
               [schema]="metadataSchemaAcquisition"
               [renderView]="activeRenderView"
               [data]="createNewTransferData.extractorMetaData['acquisition']"
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 4ac8d3d9ca..580c64a8fd 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -5,6 +5,7 @@ import {
   OnDestroy,
   OnInit,
   Output,
+  ViewChild,
 } from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import {
@@ -21,7 +22,10 @@ import {
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Store } from "@ngrx/store";
 import { Subscription } from "rxjs";
-import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
+import {
+  IngestorMetadataEditorComponent,
+  renderView,
+} from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 
 @Component({
   selector: "ingestor-user-metadata-dialog",
@@ -43,6 +47,13 @@ export class IngestorUserMetadataDialogPageComponent
   @Output() nextStep = new EventEmitter<void>();
   @Output() backStep = new EventEmitter<void>();
 
+  @ViewChild("scicatHeaderEditor")
+  scicatHeaderEditor: IngestorMetadataEditorComponent;
+  @ViewChild("organizationalMetadataEditor")
+  organizationalMetadataEditor: IngestorMetadataEditorComponent;
+  @ViewChild("sampleMetadataEditor")
+  sampleMetadataEditor: IngestorMetadataEditorComponent;
+
   metadataSchemaOrganizational: JsonSchema;
   metadataSchemaSample: JsonSchema;
   scicatHeaderSchema: JsonSchema;
@@ -79,8 +90,6 @@ export class IngestorUserMetadataDialogPageComponent
           this.metadataSchemaSample =
             this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
           this.scicatHeaderSchema = getJsonSchemaFromDto();
-
-          this.cdr.markForCheck();
         }
       }),
     );
@@ -88,7 +97,16 @@ export class IngestorUserMetadataDialogPageComponent
     this.subscriptions.push(
       this.renderView$.subscribe((renderView) => {
         if (renderView) {
-          this.activeRenderView = renderView;
+          console.log(renderView);
+          // Check if renderView changed
+          if (this.activeRenderView !== renderView) {
+            this.activeRenderView = renderView;
+
+            // Update visual data object with the new renderView (changes the schema)
+            this.scicatHeaderEditor?.updateVisualData();
+            this.organizationalMetadataEditor?.updateVisualData();
+            this.sampleMetadataEditor?.updateVisualData();
+          }
         }
       }),
     );
@@ -181,8 +199,6 @@ export class IngestorUserMetadataDialogPageComponent
   }
 
   validateNextButton(): void {
-    this.uiNextButtonReady = this.isSciCatHeaderOk; /* &&
-      this.isOrganizationalMetadataOk &&
-      this.isSampleInformationOk;*/
+    this.uiNextButtonReady = this.isSciCatHeaderOk;
   }
 }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
index d9a989a1d8..a1e29cbd43 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
@@ -29,8 +29,9 @@ <h2 mat-dialog-title>
             'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.scicat">
-          <app-metadata-editor *ngIf="!updateEditorFromThirdParty"
-            [schema]="scicatHeaderSchema" [renderView]="activeRenderView"
+          <app-metadata-editor #scicatHeaderEditor
+            *ngIf="!updateEditorFromThirdParty" [schema]="scicatHeaderSchema"
+            [renderView]="activeRenderView"
             [data]="createNewTransferData.scicatHeader"
             (dataChange)="onDataChangeUserScicatHeader($event)"
             (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
@@ -54,7 +55,8 @@ <h2 mat-dialog-title>
             'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.organizational">
-          <app-metadata-editor *ngIf="!updateEditorFromThirdParty"
+          <app-metadata-editor #organizationalMetadataEditor
+            *ngIf="!updateEditorFromThirdParty"
             [schema]="metadataSchemaOrganizational"
             [renderView]="activeRenderView"
             [data]="createNewTransferData.userMetaData['organizational']"
@@ -80,8 +82,9 @@ <h2 mat-dialog-title>
             'expand_less' : 'expand_more' }}</mat-icon>
         </mat-card-header>
         <mat-card-content *ngIf="isCardContentVisible.sample">
-          <app-metadata-editor *ngIf="!updateEditorFromThirdParty"
-            [schema]="metadataSchemaSample" [renderView]="activeRenderView"
+          <app-metadata-editor #sampleMetadataEditor
+            *ngIf="!updateEditorFromThirdParty" [schema]="metadataSchemaSample"
+            [renderView]="activeRenderView"
             [data]="createNewTransferData.userMetaData['sample']"
             (dataChange)="onDataChangeUserMetadataSample($event)"
             (errors)="sampleErrorsHandler($event)"></app-metadata-editor>
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 2105c90b24..813da18d0d 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -1,12 +1,4 @@
-import {
-  Component,
-  EventEmitter,
-  Output,
-  Input,
-  OnInit,
-  OnChanges,
-  ChangeDetectorRef,
-} from "@angular/core";
+import { Component, EventEmitter, Output, Input, OnInit } from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import {
   configuredRenderer,
@@ -51,6 +43,14 @@ export class IngestorMetadataEditorComponent implements OnInit {
   reducedSchema: JsonSchema = {};
 
   ngOnInit() {
+    this.updateVisualData();
+
+    this.reducedSchema =
+      IngestorMetadataEditorHelper.reduceToRequiredProperties(this.schema);
+    //console.log(this.schema);
+  }
+
+  updateVisualData() {
     // Do a deep clone
     this.visualData = JSON.parse(JSON.stringify(this.data));
 
@@ -73,11 +73,9 @@ export class IngestorMetadataEditorComponent implements OnInit {
       });
     };
 
-    initializeVisualData(this.schema, this.visualData);
-
-    this.reducedSchema =
-      IngestorMetadataEditorHelper.reduceToRequiredProperties(this.schema);
-    //console.log(this.schema);
+    if (this.schema !== undefined && this.data !== undefined) {
+      initializeVisualData(this.schema, this.visualData);
+    }
   }
 
   get combinedRenderers() {

From 09b2999d94a1f97354dac1d78b1bcd6260d8e4b2 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 07:37:28 +0000
Subject: [PATCH 163/245] bugfix

---
 .../ingestor.extractor-metadata-dialog-page.component.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index dfa127a288..122a487dc7 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -111,8 +111,8 @@ export class IngestorExtractorMetadataDialogPageComponent
             this.activeRenderView = renderView;
 
             // Update visual data object with the new renderView (changes the schema)
-            this.instrumentMetadataEditor.updateVisualData();
-            this.acquisitionMetadataEditor.updateVisualData();
+            this.instrumentMetadataEditor?.updateVisualData();
+            this.acquisitionMetadataEditor?.updateVisualData();
           }
         }
       }),

From 827e16a976394223678d8c9dba44812453150c12 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 07:58:02 +0000
Subject: [PATCH 164/245] unify rerender strategy

---
 ...estor.extractor-metadata-dialog-page.component.ts |  9 ---------
 .../ingestor.user-metadata-dialog-page.component.ts  | 12 ------------
 .../ingestor.dialog-stepper.component.ts             |  4 ++--
 src/app/state-management/actions/ingestor.actions.ts |  2 +-
 src/app/state-management/effects/ingestor.effect.ts  |  2 +-
 .../state-management/reducers/ingestor.reducer.ts    |  3 ++-
 6 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index 122a487dc7..26049fbe5f 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -48,11 +48,6 @@ export class IngestorExtractorMetadataDialogPageComponent
   @Output() nextStep = new EventEmitter<void>();
   @Output() backStep = new EventEmitter<void>();
 
-  @ViewChild("instrumentMetadataEditor")
-  instrumentMetadataEditor: IngestorMetadataEditorComponent;
-  @ViewChild("acquisitionMetadataEditor")
-  acquisitionMetadataEditor: IngestorMetadataEditorComponent;
-
   activeRenderView: renderView | null = null;
   updateEditorFromThirdParty = false;
   extractorMetaDataReady = false;
@@ -109,10 +104,6 @@ export class IngestorExtractorMetadataDialogPageComponent
           // Check if renderView changed
           if (this.activeRenderView !== renderView) {
             this.activeRenderView = renderView;
-
-            // Update visual data object with the new renderView (changes the schema)
-            this.instrumentMetadataEditor?.updateVisualData();
-            this.acquisitionMetadataEditor?.updateVisualData();
           }
         }
       }),
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 580c64a8fd..aa9b433d78 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -47,13 +47,6 @@ export class IngestorUserMetadataDialogPageComponent
   @Output() nextStep = new EventEmitter<void>();
   @Output() backStep = new EventEmitter<void>();
 
-  @ViewChild("scicatHeaderEditor")
-  scicatHeaderEditor: IngestorMetadataEditorComponent;
-  @ViewChild("organizationalMetadataEditor")
-  organizationalMetadataEditor: IngestorMetadataEditorComponent;
-  @ViewChild("sampleMetadataEditor")
-  sampleMetadataEditor: IngestorMetadataEditorComponent;
-
   metadataSchemaOrganizational: JsonSchema;
   metadataSchemaSample: JsonSchema;
   scicatHeaderSchema: JsonSchema;
@@ -101,11 +94,6 @@ export class IngestorUserMetadataDialogPageComponent
           // Check if renderView changed
           if (this.activeRenderView !== renderView) {
             this.activeRenderView = renderView;
-
-            // Update visual data object with the new renderView (changes the schema)
-            this.scicatHeaderEditor?.updateVisualData();
-            this.organizationalMetadataEditor?.updateVisualData();
-            this.sampleMetadataEditor?.updateVisualData();
           }
         }
       }),
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index b3c3a8c5ce..16719298a6 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -82,11 +82,11 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
     if (this.activeRenderView) {
       switch (this.activeRenderView) {
         case "requiredOnly":
-          this.store.dispatch(fromActions.setRenderView({ renderView: "all" }));
+          this.store.dispatch(fromActions.setRenderViewFromThirdParty({ renderView: "all" }));
           break;
         case "all":
           this.store.dispatch(
-            fromActions.setRenderView({ renderView: "requiredOnly" }),
+            fromActions.setRenderViewFromThirdParty({ renderView: "requiredOnly" }),
           );
           break;
         default:
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 8898bb929c..eb85d90861 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -129,7 +129,7 @@ export const cancelTransfer = createAction(
   props<{ transferId: string }>(),
 );
 
-export const setRenderView = createAction(
+export const setRenderViewFromThirdParty = createAction(
   "[Ingestor] Set Render View",
   props<{ renderView: renderView }>(),
 );
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index 4495fbc5d4..d73ca5660f 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -258,7 +258,7 @@ export class IngestorEffects {
 
   setRenderView$ = createEffect(() => {
     return this.actions$.pipe(
-      ofType(fromActions.setRenderView),
+      ofType(fromActions.setRenderViewFromThirdParty),
       switchMap(({ renderView }) => {
         const message = {
           type: MessageType.Success,
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index 8c55c8364f..dda799745d 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -14,10 +14,11 @@ export const ingestorReducer = (state: undefined, action: Action) => {
 const reducer = createReducer(
   initialIngestorState,
   on(
-    fromActions.setRenderView,
+    fromActions.setRenderViewFromThirdParty,
     (state, { renderView }): IngestorState => ({
       ...state,
       renderView: renderView,
+      updateEditorFromThirdParty: true,
     }),
   ),
   on(

From 27593abd937eb4139cf9a4600e6a6eadb3d76c2c Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 11:23:36 +0000
Subject: [PATCH 165/245] bug fix #110 - keep values in object renderer

---
 .../ingestor.dialog-stepper.component.ts      | 10 ++-
 .../customRenderer/object-group-renderer.ts   | 88 ++++++++++++-------
 2 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 16719298a6..7df722e5d5 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -54,7 +54,7 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
   constructor(
     private dialog: MatDialog,
     private store: Store,
-  ) { }
+  ) {}
 
   ngOnInit() {
     this.subscriptions.push(
@@ -82,11 +82,15 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
     if (this.activeRenderView) {
       switch (this.activeRenderView) {
         case "requiredOnly":
-          this.store.dispatch(fromActions.setRenderViewFromThirdParty({ renderView: "all" }));
+          this.store.dispatch(
+            fromActions.setRenderViewFromThirdParty({ renderView: "all" }),
+          );
           break;
         case "all":
           this.store.dispatch(
-            fromActions.setRenderViewFromThirdParty({ renderView: "requiredOnly" }),
+            fromActions.setRenderViewFromThirdParty({
+              renderView: "requiredOnly",
+            }),
           );
           break;
         default:
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
index 68ab804f3a..373dee2f09 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -3,11 +3,20 @@ import {
   JsonFormsAngularService,
   JsonFormsControlWithDetail,
 } from "@jsonforms/angular";
-import { ControlProps } from "@jsonforms/core";
+import {
+  ControlProps,
+  findUISchema,
+  Generate,
+  GroupLayout,
+  setReadonly,
+  UISchemaElement,
+} from "@jsonforms/core";
 import {
   configuredRenderer,
   convertJSONFormsErrorToString,
 } from "../ingestor-metadata-editor-helper";
+import { cloneDeep, startCase } from "lodash-es";
+import isEmpty from "lodash/isEmpty";
 
 @Component({
   selector: "app-object-group-renderer",
@@ -18,10 +27,10 @@ import {
         >{{ objectTitle }}
         <span class="spacer"></span>
         <mat-icon
-          *ngIf="this.innerErrors?.length"
+          *ngIf="this.error !== null && this.error !== ''"
           color="warn"
           matBadgeColor="warn"
-          matTooltip="{{ this.innerErrors }}"
+          matTooltip="{{ this.error }}"
           matTooltipClass="error-message-tooltip"
         >
           error_outline
@@ -29,13 +38,12 @@ import {
       </mat-card-title>
       <mat-card-content>
         <div *ngIf="errorRecursiveStructure === false">
-          <jsonforms
+          <jsonforms-outlet
+            [uischema]="detailUiSchema"
             [schema]="scopedSchema"
-            [data]="data"
-            [renderers]="defaultRenderer"
-            (dataChange)="onInnerJsonFormsChange($event)"
-            (errors)="onInnerErrors($event)"
-          ></jsonforms>
+            [path]="propsPath"
+          >
+          </jsonforms-outlet>
         </div>
 
         <p *ngIf="errorRecursiveStructure">
@@ -48,16 +56,13 @@ import {
 })
 export class CustomObjectControlRendererComponent extends JsonFormsControlWithDetail {
   rendererService: JsonFormsAngularService;
+  detailUiSchema: UISchemaElement;
 
   defaultRenderer = configuredRenderer;
   objectTitle: string;
-  innerErrors: string;
   errorRecursiveStructure: boolean;
 
-  constructor(
-    service: JsonFormsAngularService,
-    private cdr: ChangeDetectorRef,
-  ) {
+  constructor(service: JsonFormsAngularService) {
     super(service);
     this.rendererService = service;
   }
@@ -72,28 +77,45 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
       .split(" ")
       .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
       .join(" ");
-  }
-
-  public onInnerJsonFormsChange(event: any) {
-    if (event !== this.data) {
-      const updatedData =
-        this.rendererService.getState().jsonforms.core.data ?? {};
-
-      // Update the data in the correct path
-      const pathSegments = this.path.split(".");
-      let current = updatedData ?? {};
-      for (let i = 0; i < pathSegments.length - 1; i++) {
-        current = current[pathSegments[i]];
-      }
-      current[pathSegments[pathSegments.length - 1]] = event;
 
-      this.rendererService.setData(updatedData);
+    this.detailUiSchema = findUISchema(
+      undefined,
+      props.schema,
+      props.uischema.scope,
+      props.path,
+      () => {
+        const newSchema = cloneDeep(props.schema);
+        return Generate.uiSchema(
+          newSchema,
+          "VerticalLayout",
+          undefined,
+          this.rootSchema,
+        );
+      },
+      props.uischema,
+      props.rootSchema,
+    );
+    if (isEmpty(props.path)) {
+      this.detailUiSchema.type = "VerticalLayout";
+    } else {
+      (this.detailUiSchema as GroupLayout).label = startCase(props.path);
     }
-  }
+    if (!this.isEnabled()) {
+      setReadonly(this.detailUiSchema);
+    }
+
+    // Get error from child elements
+    const path = props.path || "";
+    const allErrors =
+      this.rendererService.getState().jsonforms.core.errors ?? [];
+    const filteredErrors = allErrors.filter(
+      (e) =>
+        e.instancePath === "" ||
+        e.instancePath === "/" + path ||
+        e.instancePath.startsWith("/" + path + "/"),
+    );
 
-  onInnerErrors(errors: any[]) {
-    this.innerErrors = convertJSONFormsErrorToString(errors);
-    this.cdr.detectChanges();
+    this.error = convertJSONFormsErrorToString(filteredErrors);
   }
 
   isRecursive(): boolean {

From ba6e0b0ff3a4c3ebfbf244a9e410a602d35d2f36 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 11:54:07 +0000
Subject: [PATCH 166/245] show error location (instance path)

---
 .../ingestor.user-metadata-dialog-page.component.ts      | 8 +-------
 .../ingestor-metadata-editor-helper.ts                   | 9 ++++++++-
 .../ingestor-metadata-editor.component.ts                | 1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index aa9b433d78..2329dca350 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -175,13 +175,7 @@ export class IngestorUserMetadataDialogPageComponent
 
   sampleErrorsHandler(errors: any[]) {
     this.isSampleInformationOk = errors.length === 0;
-    this.sampleErrors = "";
-    errors.forEach((error, number) => {
-      if (error.message) {
-        const ctrNum = number + 1;
-        this.sampleErrors += ctrNum + ": " + error.message + "\n";
-      }
-    });
+    this.sampleErrors = convertJSONFormsErrorToString(errors);
     this.validateNextButton();
     this.cdr.detectChanges();
   }
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index 50f464ec9b..47f2e82140 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -70,7 +70,14 @@ export const convertJSONFormsErrorToString = (error: any): string => {
   error.forEach((error, number) => {
     if (error.message) {
       const ctrNum = number + 1;
-      errorString += ctrNum + ": " + error.message + "\n";
+      errorString +=
+        ctrNum +
+        ": " +
+        (error.instancePath && error.instancePath !== ""
+          ? "@" + error.instancePath + " "
+          : "") +
+        error.message +
+        "\n";
     }
   });
 
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 813da18d0d..fd12865826 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -87,6 +87,7 @@ export class IngestorMetadataEditorComponent implements OnInit {
   }
 
   onErrors(errors: any[]) {
+    console.log("Errors: ", errors);
     this.errors.emit(errors);
   }
 

From 7fbd8ad4cf67921e02b84d6168ad140ba9c11233 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 12:19:33 +0000
Subject: [PATCH 167/245] Improve error notification

---
 ...xtractor-metadata-dialog-page.component.ts | 11 +++---
 .../customRenderer/object-group-renderer.ts   |  7 ++--
 .../ingestor-metadata-editor-helper.ts        | 34 ++++++++++++-------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index 26049fbe5f..c425980b3f 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -5,7 +5,6 @@ import {
   OnDestroy,
   OnInit,
   Output,
-  ViewChild,
 } from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import {
@@ -21,10 +20,7 @@ import {
 } from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Subscription } from "rxjs";
-import {
-  IngestorMetadataEditorComponent,
-  renderView,
-} from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
+import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 
 @Component({
   selector: "ingestor-extractor-metadata-dialog-page",
@@ -32,7 +28,8 @@ import {
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
 })
 export class IngestorExtractorMetadataDialogPageComponent
-  implements OnInit, OnDestroy {
+  implements OnInit, OnDestroy
+{
   private subscriptions: Subscription[] = [];
   metadataSchemaInstrument: JsonSchema;
   metadataSchemaAcquisition: JsonSchema;
@@ -69,7 +66,7 @@ export class IngestorExtractorMetadataDialogPageComponent
   constructor(
     private store: Store,
     private cdr: ChangeDetectorRef,
-  ) { }
+  ) {}
 
   ngOnInit() {
     this.subscriptions.push(
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
index 373dee2f09..6cf9eeab3d 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -73,6 +73,7 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
     this.errorRecursiveStructure = this.isRecursive();
 
     this.objectTitle = pathTitle
+      .replaceAll(".", " ")
       .replaceAll("_", " ")
       .split(" ")
       .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
@@ -110,9 +111,9 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
       this.rendererService.getState().jsonforms.core.errors ?? [];
     const filteredErrors = allErrors.filter(
       (e) =>
-        e.instancePath === "" ||
-        e.instancePath === "/" + path ||
-        e.instancePath.startsWith("/" + path + "/"),
+        (e.instancePath === "" && path === "") ||
+        e.instancePath === "/" + path.replaceAll(".", "/") ||
+        e.instancePath.startsWith("/" + path.replaceAll(".", "/") + "/"),
     );
 
     this.error = convertJSONFormsErrorToString(filteredErrors);
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index 47f2e82140..bb53342bd1 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -66,20 +66,30 @@ export class IngestorMetadataEditorHelper {
 
 export const convertJSONFormsErrorToString = (error: any): string => {
   let errorString = "";
+  let displayIterNum = 1;
 
-  error.forEach((error, number) => {
-    if (error.message) {
-      const ctrNum = number + 1;
-      errorString +=
-        ctrNum +
-        ": " +
-        (error.instancePath && error.instancePath !== ""
-          ? "@" + error.instancePath + " "
-          : "") +
-        error.message +
-        "\n";
+  for (let counter = 0; counter < error.length; counter++) {
+    const currentError = error[counter];
+
+    if (currentError.message === undefined || currentError.message === null)
+      continue;
+
+    // Filter json forms internal errors
+    if (currentError.message === "must NOT have additional properties") {
+      continue;
     }
-  });
+
+    errorString +=
+      displayIterNum +
+      ". " +
+      (currentError.instancePath && currentError.instancePath !== ""
+        ? "@" + currentError.instancePath + " "
+        : "") +
+      currentError.message +
+      " ";
+
+    displayIterNum++;
+  }
 
   return errorString;
 };

From 528c98af9315327607184408ef573b5ff7cd4bb9 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 13:12:42 +0000
Subject: [PATCH 168/245] update models, cancel request and add autoarchive
 option

---
 ....confirm-transfer-dialog-page.component.ts | 10 +++
 ...ingestor.confirm-transfer-dialog-page.html | 35 ++++++--
 .../ingestor.new-transfer-dialog-page.html    | 81 +++++++++++--------
 ...ingestor.creation-dialog-base.component.ts |  1 +
 .../ingestor.file-browser.component.ts        |  2 +
 .../helper/ingestor.component-helper.ts       |  2 +
 .../ingestor-page/ingestor.component.ts       | 12 ++-
 src/app/shared/sdk/apis/ingestor.service.ts   | 31 ++-----
 .../models/ingestor/deleteTransferRequest.ts  |  8 ++
 .../shared/sdk/models/ingestor/folderNode.ts  |  2 +-
 .../ingestor/getBrowseDatasetResponse.ts      |  4 +-
 .../sdk/models/ingestor/getDatasetResponse.ts | 19 -----
 src/app/shared/sdk/models/ingestor/models.ts  |  1 -
 .../sdk/models/ingestor/postDatasetRequest.ts |  4 +
 .../actions/ingestor.actions.ts               |  3 +-
 .../effects/ingestor.effect.ts                |  9 ++-
 .../reducers/ingestor.reducer.ts              |  2 +-
 17 files changed, 130 insertions(+), 96 deletions(-)
 delete mode 100644 src/app/shared/sdk/models/ingestor/getDatasetResponse.ts

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index 08a0ff1453..35dbeb94ff 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -14,6 +14,7 @@ import {
 import { Store } from "@ngrx/store";
 import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
 import { MatDialog } from "@angular/material/dialog";
+import { MatCheckboxChange } from "@angular/material/checkbox";
 import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Subscription } from "rxjs";
@@ -57,6 +58,15 @@ export class IngestorConfirmTransferDialogPageComponent
   ngOnDestroy(): void {
     this.subscriptions.forEach((subscription) => subscription.unsubscribe());
   }
+  onAutoArchiveChange($event: MatCheckboxChange): void {
+    this.createNewTransferData.autoArchive = $event.checked;
+
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+  }
 
   createMetaDataString(): string {
     const space = 2;
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
index a1695e33d4..4ce39631b4 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
@@ -53,16 +53,41 @@ <h2 mat-dialog-title>
   </div>
 
   <div
-    *ngIf="createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
-    <p>Confirm Metadata</p>
+    *ngIf="createNewTransferData.editorMode === 'INGESTION' && createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
+    <mat-card class="ingestor-card">
+      <mat-card-header class="ingestor-mixed-header">
+        <mat-card-title>Transfer Options</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <mat-checkbox [(ngModel)]="createNewTransferData.autoArchive"
+          (change)="onAutoArchiveChange($event)"
+          aria-label="Auto Archive">
+          Auto Archive
+        </mat-checkbox>
+        <p class="checkbox-description">
+          Automatically trigger archiving jobs after the data transfer has
+          finished.
+        </p>
+      </mat-card-content>
+    </mat-card>
+  </div>
 
-    <div class="code-editor">
-      <pre class="code">
+  <div
+    *ngIf="createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
+    <mat-card class="ingestor-card">
+      <mat-card-header class="ingestor-mixed-header">
+        <mat-card-title>Confirm Metadata</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <div class="code-editor">
+          <pre class="code">
       <div *ngFor="let line of provideMergeMetaData.split('\n')">
         <code>{{ line }}</code>
       </div>
       </pre>
-    </div>
+        </div>
+      </mat-card-content>
+    </mat-card>
   </div>
 
 </mat-dialog-content>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index 78d3d2a28c..c3bbc2ccac 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -10,44 +10,55 @@ <h2 mat-dialog-title>
 <mat-dialog-content class="mat-typography" disableClose="true">
   <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
 
-  <p>Please select the dataset to be uploaded and the appropriate metadata
-    extractor method.</p>
+  <div>
+    <mat-card class="ingestor-card">
+      <mat-card-header class="ingestor-mixed-header">
+        <mat-card-title>Select Options</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <p>Please select the dataset to be uploaded and the appropriate metadata
+          extractor method.</p>
 
-  <div *ngIf="createNewTransferData.editorMode === 'INGESTION'">
-    <mat-form-field class="form-full-width">
-      <mat-label>File Path</mat-label>
-      <input matInput [(ngModel)]="createNewTransferData.selectedPath"
-        (click)="onClickOpenFileBrowser()" readonly>
-      <!-- [matAutocomplete]="auto" -->
-      <button mat-icon-button matSuffix (click)="onClickOpenFileBrowser()">
-        <mat-icon>folder</mat-icon>
-      </button>
-    </mat-form-field>
-  </div>
+        <div *ngIf="createNewTransferData.editorMode === 'INGESTION'">
+          <mat-form-field class="form-full-width">
+            <mat-label>File Path</mat-label>
+            <input matInput [(ngModel)]="createNewTransferData.selectedPath"
+              (click)="onClickOpenFileBrowser()" readonly>
+            <!-- [matAutocomplete]="auto" -->
+            <button mat-icon-button matSuffix
+              (click)="onClickOpenFileBrowser()">
+              <mat-icon>folder</mat-icon>
+            </button>
+          </mat-form-field>
+        </div>
 
-  <div *ngIf="extractionMethods !== null">
-    <mat-form-field class="form-full-width">
-      <mat-label
-        *ngIf="createNewTransferData.editorMode === 'INGESTION'">Extraction
-        Method</mat-label>
-      <mat-label *ngIf="createNewTransferData.editorMode === 'EDITOR'">Editor
-        schema</mat-label>
-      <mat-select [(ngModel)]="selectedMethod">
-        <mat-option *ngFor="let method of extractionMethods.methods"
-          [value]="method">
-          {{ method.name }}
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-    <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError
-      }}</mat-error>
+        <div *ngIf="extractionMethods !== null">
+          <mat-form-field class="form-full-width">
+            <mat-label
+              *ngIf="createNewTransferData.editorMode === 'INGESTION'">Extraction
+              Method</mat-label>
+            <mat-label
+              *ngIf="createNewTransferData.editorMode === 'EDITOR'">Editor
+              schema</mat-label>
+            <mat-select [(ngModel)]="selectedMethod">
+              <mat-option *ngFor="let method of extractionMethods.methods"
+                [value]="method">
+                {{ method.name }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError
+            }}</mat-error>
 
-    <mat-paginator *ngIf="extractionMethods.total > dropdownPageSize"
-      [length]="extractionMethods.total" [pageSize]="dropdownPageSize"
-      aria-label="Select page" [hidePageSize]="true"
-      [showFirstLastButtons]="false" [pageIndex]="extractionMethodsPage"
-      (page)="onExtractorMethodsPageChange($event)">
-    </mat-paginator>
+          <mat-paginator *ngIf="extractionMethods.total > dropdownPageSize"
+            [length]="extractionMethods.total" [pageSize]="dropdownPageSize"
+            aria-label="Select page" [hidePageSize]="true"
+            [showFirstLastButtons]="false" [pageIndex]="extractionMethodsPage"
+            (page)="onExtractorMethodsPageChange($event)">
+          </mat-paginator>
+        </div>
+      </mat-card-content>
+    </mat-card>
   </div>
 
 </mat-dialog-content>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index de95029e60..d6f88ff7de 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -201,6 +201,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
     const payload: PostDatasetRequest = {
       metaData: this.createNewTransferData.mergedMetaDataString,
       userToken: this.tokenValue,
+      autoArchive: this.createNewTransferData.autoArchive,
     };
 
     this.store.dispatch(
diff --git a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
index 11c7f63d97..5fc9d46477 100644
--- a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -85,6 +85,7 @@ export class IngestorFileBrowserComponent implements OnInit, OnDestroy {
       path: backNodePath,
       children: true,
       isRootNode: isRootNode,
+      probablyDataset: false,
     };
   }
 
@@ -101,6 +102,7 @@ export class IngestorFileBrowserComponent implements OnInit, OnDestroy {
                 ? this.createNewTransferData.selectedPath
                 : "/",
             children: false,
+            probablyDataset: false,
           };
 
           this.subscriptions.push(
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 823a8e927a..77dff594e4 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -37,6 +37,7 @@ export interface IngestionRequestInformation {
   };
 
   ingestionRequest: PostDatasetResponse | null;
+  autoArchive: boolean;
 }
 
 export interface TransferDataListEntry {
@@ -111,6 +112,7 @@ export class IngestorHelper {
         ingestionRequestErrorMessage: "",
       },
       ingestionRequest: null,
+      autoArchive: true,
     };
   };
 
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 04df078652..7f22de7ddc 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -32,6 +32,7 @@ import { INGESTOR_API_ENDPOINTS_V1 } from "shared/sdk/apis/ingestor.service";
 import { Subscription } from "rxjs";
 import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
 import { IngestorTransferViewDialogComponent } from "ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component";
+import { fetchScicatTokenAction } from "state-management/actions/user.actions";
 
 @Component({
   selector: "ingestor",
@@ -79,6 +80,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
   scicatUserProfile: any = null;
   authIsDisabled = false;
   healthInfo: OtherHealthResponse = null;
+  tokenValue = "";
 
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
@@ -96,6 +98,11 @@ export class IngestorComponent implements OnInit, OnDestroy {
     this.subscriptions.push(
       this.vm$.subscribe((settings) => {
         this.scicatUserProfile = settings.profile;
+        this.tokenValue = settings.scicatToken;
+
+        if (this.tokenValue === "") {
+          this.store.dispatch(fetchScicatTokenAction());
+        }
       }),
     );
 
@@ -281,7 +288,10 @@ export class IngestorComponent implements OnInit, OnDestroy {
       if (result) {
         this.store.dispatch(
           fromActions.cancelTransfer({
-            transferId: transferId,
+            requestBody: {
+              transferId: transferId,
+              scicatToken: this.tokenValue,
+            },
           }),
         );
       }
diff --git a/src/app/shared/sdk/apis/ingestor.service.ts b/src/app/shared/sdk/apis/ingestor.service.ts
index d601ff3b97..7c5d1d6b50 100644
--- a/src/app/shared/sdk/apis/ingestor.service.ts
+++ b/src/app/shared/sdk/apis/ingestor.service.ts
@@ -7,7 +7,6 @@ import {
   DeleteTransferRequest,
   DeleteTransferResponse,
   GetBrowseDatasetResponse,
-  GetDatasetResponse,
   GetExtractorResponse,
   GetTransferResponse,
   OtherHealthResponse,
@@ -44,7 +43,7 @@ export class Ingestor {
     private http: HttpClient,
     public appConfigService: AppConfigService,
     private store: Store,
-  ) {}
+  ) { }
 
   private getRequestOptions() {
     return {
@@ -94,16 +93,16 @@ export class Ingestor {
       );
   }
 
-  cancelTransfer(transferId: string): Observable<DeleteTransferResponse> {
-    const body: DeleteTransferRequest = { transferId: transferId };
-
+  cancelTransfer(
+    requestBody: DeleteTransferRequest,
+  ): Observable<DeleteTransferResponse> {
     return this.store
       .select(selectIngestorEndpoint)
       .pipe(
         switchMap((ingestorEndpoint) =>
           this.http.delete<DeleteTransferResponse>(
             `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
-            { ...this.getRequestOptions(), body },
+            { ...this.getRequestOptions(), body: requestBody },
           ),
         ),
       );
@@ -168,26 +167,6 @@ export class Ingestor {
       );
   }
 
-  getAvailableFilePaths(
-    page: number,
-    pageSize: number,
-  ): Observable<GetDatasetResponse> {
-    const params = new HttpParams()
-      .set("page", page.toString())
-      .set("pageSize", pageSize.toString());
-
-    return this.store
-      .select(selectIngestorEndpoint)
-      .pipe(
-        switchMap((ingestorEndpoint) =>
-          this.http.get<GetDatasetResponse>(
-            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET}`,
-            { ...this.getRequestOptions(), params },
-          ),
-        ),
-      );
-  }
-
   getBrowseFilePath(
     page: number,
     pageSize: number,
diff --git a/src/app/shared/sdk/models/ingestor/deleteTransferRequest.ts b/src/app/shared/sdk/models/ingestor/deleteTransferRequest.ts
index 2735d12dfa..6522519e02 100644
--- a/src/app/shared/sdk/models/ingestor/deleteTransferRequest.ts
+++ b/src/app/shared/sdk/models/ingestor/deleteTransferRequest.ts
@@ -14,5 +14,13 @@ export interface DeleteTransferRequest {
      * id of the transfer that should be cancelled
      */
     transferId: string;
+    /**
+     * if the ingestor is configured to use ExtGlobusService for transfer, this endpoint needs a SciCat token
+     */
+    scicatToken?: string;
+    /**
+     * if the entry needs to be deleted or not, in addition to cancelling it (by default false)
+     */
+    deleteTask?: boolean;
 }
 
diff --git a/src/app/shared/sdk/models/ingestor/folderNode.ts b/src/app/shared/sdk/models/ingestor/folderNode.ts
index 4d30662a9e..738a88c4c2 100644
--- a/src/app/shared/sdk/models/ingestor/folderNode.ts
+++ b/src/app/shared/sdk/models/ingestor/folderNode.ts
@@ -16,6 +16,6 @@ export interface FolderNode {
     name: string;
     path: string;
     children: boolean;
-    probablyDataset?: boolean;
+    probablyDataset: boolean;
 }
 
diff --git a/src/app/shared/sdk/models/ingestor/getBrowseDatasetResponse.ts b/src/app/shared/sdk/models/ingestor/getBrowseDatasetResponse.ts
index 6526a62b67..18afb243e2 100644
--- a/src/app/shared/sdk/models/ingestor/getBrowseDatasetResponse.ts
+++ b/src/app/shared/sdk/models/ingestor/getBrowseDatasetResponse.ts
@@ -11,10 +11,10 @@ import { FolderNode } from './folderNode';
 
 
 export interface GetBrowseDatasetResponse { 
-    folders?: Array<FolderNode>;
+    folders: Array<FolderNode>;
     /**
      * Total number of folders.
      */
-    total?: number;
+    total: number;
 }
 
diff --git a/src/app/shared/sdk/models/ingestor/getDatasetResponse.ts b/src/app/shared/sdk/models/ingestor/getDatasetResponse.ts
deleted file mode 100644
index 1f51aca662..0000000000
--- a/src/app/shared/sdk/models/ingestor/getDatasetResponse.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * SciCat Ingestor API
- *
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-export interface GetDatasetResponse { 
-    datasets: Array<string>;
-    /**
-     * Total number of datasets.
-     */
-    total: number;
-}
-
diff --git a/src/app/shared/sdk/models/ingestor/models.ts b/src/app/shared/sdk/models/ingestor/models.ts
index 698ebb07a6..9c2cc518a7 100644
--- a/src/app/shared/sdk/models/ingestor/models.ts
+++ b/src/app/shared/sdk/models/ingestor/models.ts
@@ -2,7 +2,6 @@ export * from './deleteTransferRequest';
 export * from './deleteTransferResponse';
 export * from './folderNode';
 export * from './getBrowseDatasetResponse';
-export * from './getDatasetResponse';
 export * from './getExtractorResponse';
 export * from './getTransferResponse';
 export * from './methodItem';
diff --git a/src/app/shared/sdk/models/ingestor/postDatasetRequest.ts b/src/app/shared/sdk/models/ingestor/postDatasetRequest.ts
index cd2311c2f8..2a710a26ec 100644
--- a/src/app/shared/sdk/models/ingestor/postDatasetRequest.ts
+++ b/src/app/shared/sdk/models/ingestor/postDatasetRequest.ts
@@ -18,5 +18,9 @@ export interface PostDatasetRequest {
      * the scicat token for acting on behalf of the user
      */
     userToken: string;
+    /**
+     * whether to autoarchive the dataset. Default is TRUE
+     */
+    autoArchive?: boolean;
 }
 
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index eb85d90861..30ba38e5eb 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -8,6 +8,7 @@ import {
   OtherVersionResponse,
   PostDatasetRequest,
   PostDatasetResponse,
+  DeleteTransferRequest,
   UserInfo,
 } from "shared/sdk/models/ingestor/models";
 import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
@@ -126,7 +127,7 @@ export const resetIngestDataset = createAction(
 
 export const cancelTransfer = createAction(
   "[Ingestor] Cancel Transfer",
-  props<{ transferId: string }>(),
+  props<{ requestBody: DeleteTransferRequest }>(),
 );
 
 export const setRenderViewFromThirdParty = createAction(
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index d73ca5660f..11dce148ed 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -230,13 +230,14 @@ export class IngestorEffects {
   cancelTransfer$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(fromActions.cancelTransfer),
-      switchMap(({ transferId }) =>
-        this.ingestor.cancelTransfer(transferId).pipe(
+      switchMap(({ requestBody }) =>
+        this.ingestor.cancelTransfer(requestBody).pipe(
           switchMap(() => [
             showMessageAction({
               message: {
                 type: MessageType.Success,
-                content: "Successfully cancelled transfer: " + transferId,
+                content:
+                  "Successfully cancelled transfer: " + requestBody.transferId,
                 duration: 5000,
               },
             }),
@@ -274,5 +275,5 @@ export class IngestorEffects {
     private actions$: Actions,
     private ingestor: Ingestor,
     private store: Store,
-  ) { }
+  ) {}
 }
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index dda799745d..ec563d8874 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -156,7 +156,7 @@ const reducer = createReducer(
         ...state.ingestionObject,
         apiInformation: {
           ...state.ingestionObject.apiInformation,
-          ingestionRequestErrorMessage: (err as any).error ?? err.message,
+          ingestionRequestErrorMessage: (err as any).error ?? (err as any).error?.error ?? err.message,
         },
       },
       error: err,

From 40625cda8adc4f20297196315846ed9501ef6b42 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 13:49:42 +0000
Subject: [PATCH 169/245] fix quantity value

---
 .../customRenderer/any-of-renderer.ts         |  4 +++-
 .../quantity-value-layout-renderer.ts         | 23 +++++++++++--------
 .../customRenderer/quantity-value-renderer.ts |  2 +-
 .../ingestor-metadata-editor.component.scss   |  6 +++--
 .../ingestor-metadata-editor.component.ts     |  4 ++--
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index d3456370b4..742c89e2cb 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -94,7 +94,9 @@ export class AnyOfRendererComponent extends JsonFormsControl {
   public getUISchema(tabOption: string): UISchemaElement {
     const selectedSchema = this.getTabSchema(tabOption);
 
-    const isQuantityValue = selectedSchema.title == "QuantityValue";
+    const isQuantityValue =
+      selectedSchema.title == "QuantityValue" ||
+      selectedSchema.title == "QuantitySI";
 
     const detailUiSchema = findUISchema(
       undefined,
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
index a4b1eede24..8e48656239 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
@@ -73,20 +73,23 @@ export class CustomLayoutChildrenRenderPropsPipe implements PipeTransform {
         const scopeA = a.uischema.scope || "";
         const scopeB = b.uischema.scope || "";
 
-        // Check if one of the scopes contains "value" and the other contains "unit"
-        const isValueA = scopeA.includes("value");
-        const isUnitA = scopeA.includes("unit");
-        const isValueB = scopeB.includes("value");
-        const isUnitB = scopeB.includes("unit");
+        const order = ["value", "unit", "valueSI", "unitSI"];
 
-        if (isValueA && isUnitB) {
-          return -1; // a comes before b
+        const indexA = order.findIndex((key) => scopeA.endsWith(key));
+        const indexB = order.findIndex((key) => scopeB.endsWith(key));
+
+        if (indexA !== -1 && indexB !== -1) {
+          return indexA - indexB; // Sort based on the defined order
+        }
+
+        if (indexA !== -1) {
+          return -1; // a comes before b if a matches and b doesn't
         }
-        if (isValueB && isUnitA) {
-          return 1; // b comes before a
+        if (indexB !== -1) {
+          return 1; // b comes before a if b matches and a doesn't
         }
 
-        // Fallback to localeCompare if neither condition is met
+        // Fallback to localeCompare if neither matches the order
         return scopeA.localeCompare(scopeB);
       });
 
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
index db73dda08e..6aac1db418 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
@@ -102,6 +102,6 @@ export class QuantityValueObjectComponent
 export const quantityValueTester: RankedTester = rankWith(
   5,
   schemaMatches((schema: JsonSchema) => {
-    return schema.title === "QuantityValue";
+    return schema.title === "QuantityValue" || schema.title === "QuantitySI";
   }),
 );
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
index 210851e365..24d6d7e942 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -45,11 +45,13 @@ mat-card {
 .quantity-value-box {
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 0.5em;
+  flex-wrap: wrap;
 }
 
 .quantity-value-element {
-  flex: 1;
+  flex: 1 1 calc(50% - 0.5em); /* Two elements per row with gap accounted for */
+  box-sizing: border-box;
 }
 
 .mat-tab-content-renderer {
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index fd12865826..56ffd4e0cc 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -47,7 +47,8 @@ export class IngestorMetadataEditorComponent implements OnInit {
 
     this.reducedSchema =
       IngestorMetadataEditorHelper.reduceToRequiredProperties(this.schema);
-    //console.log(this.schema);
+
+    console.log(this.schema);
   }
 
   updateVisualData() {
@@ -87,7 +88,6 @@ export class IngestorMetadataEditorComponent implements OnInit {
   }
 
   onErrors(errors: any[]) {
-    console.log("Errors: ", errors);
     this.errors.emit(errors);
   }
 

From 7c8d8d42890405e7e1c646f343db337e10da5a04 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 13:58:27 +0000
Subject: [PATCH 170/245] merge object group and quantity value renderer

---
 .../customRenderer/custom-renderers.ts        |  16 ---
 .../customRenderer/object-group-renderer.ts   |   6 +-
 .../customRenderer/quantity-value-renderer.ts | 107 ------------------
 src/app/ingestor/ingestor.module.ts           |   2 -
 4 files changed, 5 insertions(+), 126 deletions(-)
 delete mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index 6d8624eb67..5e24818d1b 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -15,10 +15,6 @@ import {
   OwnerGroupFieldComponent,
   ownerGroupFieldTester,
 } from "./owner-group-field-renderer";
-import {
-  QuantityValueObjectComponent,
-  quantityValueTester,
-} from "./quantity-value-renderer";
 import {
   QuantityValueLayoutRendererComponent,
   quantityValueLayoutTester,
@@ -29,22 +25,10 @@ export const customRenderers: JsonFormsRendererRegistryEntry[] = [
     tester: ownerGroupFieldTester,
     renderer: OwnerGroupFieldComponent,
   },
-  {
-    tester: quantityValueTester,
-    renderer: QuantityValueObjectComponent,
-  },
   {
     tester: quantityValueLayoutTester,
     renderer: QuantityValueLayoutRendererComponent,
   },
-  /*{
-    tester: rankWith(4, isOneOfControl),
-    renderer: OneOfRendererComponent,
-  },
-  {
-    tester: rankWith(4, isAllOfControl),
-    renderer: AllOfRendererComponent,
-  },*/
   {
     tester: rankWith(4, isAnyOfControl),
     renderer: AnyOfRendererComponent,
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
index 6cf9eeab3d..e2d4f236af 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -79,6 +79,10 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
       .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
       .join(" ");
 
+    const isQuantityValue =
+      props.schema.title == "QuantityValue" ||
+      props.schema.title == "QuantitySI";
+
     this.detailUiSchema = findUISchema(
       undefined,
       props.schema,
@@ -88,7 +92,7 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
         const newSchema = cloneDeep(props.schema);
         return Generate.uiSchema(
           newSchema,
-          "VerticalLayout",
+          isQuantityValue ? "QuantityValueLayout" : "VerticalLayout",
           undefined,
           this.rootSchema,
         );
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
deleted file mode 100644
index 6aac1db418..0000000000
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-renderer.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { Component, OnInit, ChangeDetectionStrategy } from "@angular/core";
-import {
-  JsonFormsAngularService,
-  JsonFormsControlWithDetail,
-} from "@jsonforms/angular";
-import {
-  ControlProps,
-  ControlWithDetailProps,
-  findUISchema,
-  Generate,
-  GroupLayout,
-  JsonSchema,
-  RankedTester,
-  rankWith,
-  schemaMatches,
-  setReadonly,
-  UISchemaElement,
-} from "@jsonforms/core";
-import { cloneDeep, startCase } from "lodash-es";
-import isEmpty from "lodash/isEmpty";
-
-@Component({
-  selector: "quantity-value-renderer",
-  styleUrls: ["../ingestor-metadata-editor.component.scss"],
-  template: `
-    <mat-card class="anyof-group">
-      <mat-card-title>{{ objectTitle }}</mat-card-title>
-      <mat-card-content>
-        <jsonforms-outlet
-          [uischema]="detailUiSchema"
-          [schema]="scopedSchema"
-          [path]="propsPath"
-        >
-        </jsonforms-outlet>
-      </mat-card-content>
-    </mat-card>
-  `,
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class QuantityValueObjectComponent
-  extends JsonFormsControlWithDetail
-  implements OnInit
-{
-  detailUiSchema: UISchemaElement;
-  focused = false;
-  objectTitle: string;
-
-  props: ControlProps;
-
-  constructor(jsonformsService: JsonFormsAngularService) {
-    super(jsonformsService);
-  }
-
-  public mapAdditionalProps(props: ControlWithDetailProps) {
-    super.mapAdditionalProps(props);
-    this.props = props;
-
-    const pathTitle = props.path || "Quantity Value";
-
-    this.objectTitle = pathTitle
-      .replaceAll("_", " ")
-      .split(" ")
-      .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-      .join(" ");
-
-    this.detailUiSchema = findUISchema(
-      props.uischemas,
-      props.schema,
-      props.uischema.scope,
-      props.path,
-      () => {
-        const newSchema = cloneDeep(props.schema);
-        return Generate.uiSchema(
-          newSchema,
-          "QuantityValueLayout",
-          undefined,
-          this.rootSchema,
-        );
-      },
-      props.uischema,
-      props.rootSchema,
-    );
-    if (isEmpty(props.path)) {
-      this.detailUiSchema.type = "VerticalLayout";
-    } else {
-      (this.detailUiSchema as GroupLayout).label = startCase(props.path);
-    }
-    if (!this.isEnabled()) {
-      setReadonly(this.detailUiSchema);
-    }
-  }
-
-  ngOnInit() {
-    // Call ngOnInit from super class
-    super.ngOnInit();
-    if (this.form.disabled) {
-      this.form.enable();
-    }
-  }
-}
-
-export const quantityValueTester: RankedTester = rankWith(
-  5,
-  schemaMatches((schema: JsonSchema) => {
-    return schema.title === "QuantityValue" || schema.title === "QuantitySI";
-  }),
-);
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 6bdd4bac01..c93fd2b79c 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -33,7 +33,6 @@ import { CustomObjectControlRendererComponent } from "./ingestor-metadata-editor
 import { IngestorFileBrowserComponent } from "./ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component";
 import { MatTreeModule } from "@angular/material/tree";
 import { OwnerGroupFieldComponent } from "./ingestor-metadata-editor/customRenderer/owner-group-field-renderer";
-import { QuantityValueObjectComponent } from "./ingestor-metadata-editor/customRenderer/quantity-value-renderer";
 import {
   CustomLayoutChildrenRenderPropsPipe,
   QuantityValueLayoutRendererComponent,
@@ -67,7 +66,6 @@ import { IngestorTransferViewDialogComponent } from "./ingestor-dialogs/transfer
     ExportTemplateHelperComponent,
     IngestorFileBrowserComponent,
     OwnerGroupFieldComponent,
-    QuantityValueObjectComponent,
     QuantityValueLayoutRendererComponent,
     CustomLayoutChildrenRenderPropsPipe,
     IngestorTransferViewDialogComponent,

From 0704b98604456a6e14549c6273d5bc1bc3d56b94 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 14:58:09 +0000
Subject: [PATCH 171/245] upgrade imports

---
 package-lock.json | 96 +++++++++++++++++++++++++++++++++++++++++------
 package.json      |  4 +-
 2 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1b75574810..e772983772 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,8 @@
         "@angular/platform-server": "^19.2.8",
         "@angular/router": "^19.2.8",
         "@angular/service-worker": "^19.2.8",
+        "@jsonforms/angular": "^3.5.1",
+        "@jsonforms/angular-material": "^3.5.1",
         "@ngbracket/ngx-layout": "^16.0.0",
         "@ngrx/effects": "^19.1.0",
         "@ngrx/operators": "^19.1.0",
@@ -4096,6 +4098,76 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@jsonforms/angular": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/@jsonforms/angular/-/angular-3.5.1.tgz",
+      "integrity": "sha512-qbMblz/G/kWOol1n6iMYUA81ndzQe80p788VyMsm6dJ5edTrqpvWVK8vjLkzWZtH5kbFrg/nkYaI/f6XsP1Chw==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "@angular/core": "^18.0.0 || ^19.0.0",
+        "@angular/forms": "^18.0.0 || ^19.0.0",
+        "@jsonforms/core": "3.5.1",
+        "rxjs": "^6.6.0 || ^7.4.0"
+      }
+    },
+    "node_modules/@jsonforms/angular-material": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/@jsonforms/angular-material/-/angular-material-3.5.1.tgz",
+      "integrity": "sha512-x2j3B3XG1uL3aU8gzo3iRSSRPuRBzceI4Do1itXn016h3S1JT5sDtI7NWvZ+K6TQN4YGuWypaXuBm2y686DKpw==",
+      "license": "MIT",
+      "dependencies": {
+        "hammerjs": "2.0.8",
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "@angular/animations": "^18.0.0 || ^19.0.0",
+        "@angular/cdk": "^18.0.0 || ^19.0.0",
+        "@angular/common": "^18.0.0 || ^19.0.0",
+        "@angular/core": "^18.0.0 || ^19.0.0",
+        "@angular/forms": "^18.0.0 || ^19.0.0",
+        "@angular/material": "^18.0.0 || ^19.0.0",
+        "@angular/platform-browser": "^18.0.0 || ^19.0.0",
+        "@angular/router": "^18.0.0 || ^19.0.0",
+        "@jsonforms/angular": "3.5.1",
+        "@jsonforms/core": "3.5.1",
+        "dayjs": "^1.11.10",
+        "rxjs": "^6.6.0 || ^7.4.0"
+      }
+    },
+    "node_modules/@jsonforms/core": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-3.5.1.tgz",
+      "integrity": "sha512-Jrq/UcfvKsAprLJ+9TMFa8pKsfdyv3dAw85XstSNRcjDT19LreBlhVqIvTvtgZidg8Iet3yqy5xlNnB+XyrvrQ==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "ajv": "^8.6.1",
+        "ajv-formats": "^2.1.0",
+        "lodash": "^4.17.21"
+      }
+    },
+    "node_modules/@jsonforms/core/node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@jsonjoy.com/base64": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
@@ -6409,8 +6481,7 @@
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
     },
     "node_modules/@types/lodash": {
       "version": "4.17.16",
@@ -7463,7 +7534,6 @@
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -10891,8 +10961,7 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-diff": {
       "version": "1.3.0",
@@ -10950,7 +11019,6 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
       "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -11603,6 +11671,15 @@
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
+    "node_modules/hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -12954,8 +13031,7 @@
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -13820,8 +13896,7 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
@@ -16423,7 +16498,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
diff --git a/package.json b/package.json
index cd06020208..5c698f7e9f 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
     "@angular/platform-server": "^19.2.8",
     "@angular/router": "^19.2.8",
     "@angular/service-worker": "^19.2.8",
-    "@jsonforms/angular": "3.2.*",
-    "@jsonforms/angular-material": "3.2.*",
+    "@jsonforms/angular": "^3.5.1",
+    "@jsonforms/angular-material": "^3.5.1",
     "@ngbracket/ngx-layout": "^16.0.0",
     "@ngrx/effects": "^19.1.0",
     "@ngrx/operators": "^19.1.0",

From d1b9f38dc4fd7d13bf345f72a2550c0316470a93 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 15:24:31 +0000
Subject: [PATCH 172/245] make frontend starting again

---
 src/app/ingestor/_ingestor-theme.scss         | 30 +++++++++----------
 .../ingestor.confirmation-dialog.component.ts |  1 +
 ....confirm-transfer-dialog-page.component.ts |  1 +
 ...xtractor-metadata-dialog-page.component.ts |  1 +
 ...stor.new-transfer-dialog-page.component.ts |  3 +-
 ...tor.user-metadata-dialog-page.component.ts |  1 +
 ...ingestor.creation-dialog-base.component.ts |  1 +
 .../ingestor.dialog-stepper.component.html    |  4 +--
 .../ingestor.dialog-stepper.component.ts      |  1 +
 .../ingestor.export-helper.component.ts       |  1 +
 .../ingestor.file-browser.component.ts        |  1 +
 ...r.transfer-detail-view-dialog.component.ts |  1 +
 .../customRenderer/any-of-renderer.ts         |  3 +-
 .../customRenderer/array-renderer.ts          |  5 ++--
 .../customRenderer/object-group-renderer.ts   |  1 +
 .../owner-group-field-renderer.ts             |  8 ++---
 .../quantity-value-layout-renderer.ts         |  4 +--
 .../ingestor-metadata-editor.component.ts     |  1 +
 .../helper/ingestor.component-helper.ts       |  4 +--
 .../ingestor-page/ingestor.component.ts       |  1 +
 .../effects/ingestor.effect.ts                |  3 +-
 21 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/src/app/ingestor/_ingestor-theme.scss b/src/app/ingestor/_ingestor-theme.scss
index 8e48d16b6e..794f62a937 100644
--- a/src/app/ingestor/_ingestor-theme.scss
+++ b/src/app/ingestor/_ingestor-theme.scss
@@ -2,41 +2,41 @@
 @use "@angular/material" as mat;
 
 @mixin color($theme) {
-  $color-config: map-get($theme, "color");
-  $primary: map-get($color-config, "primary");
-  $header-1: map-get($color-config, "header-1");
-  $header-2: map-get($color-config, "header-2");
-  $header-3: map-get($color-config, "header-3");
-  $accent: map-get($color-config, "accent");
-  $warn: map-get($color-config, "warn");
+  $color-config: map.get($theme, "color");
+  $primary: map.get($color-config, "primary");
+  $header-1: map.get($color-config, "header-1");
+  $header-2: map.get($color-config, "header-2");
+  $header-3: map.get($color-config, "header-3");
+  $accent: map.get($color-config, "accent");
+  $warn: map.get($color-config, "warn");
   mat-card {
     .scicat-header {
-      background-color: mat.get-color-from-palette($primary, "lighter");
+      background-color: mat.m2-get-color-from-palette($primary, "lighter");
     }
 
     .organizational-header {
-      background-color: mat.get-color-from-palette($header-1, "lighter");
+      background-color: mat.m2-get-color-from-palette($header-1, "lighter");
     }
 
     .sample-header {
-      background-color: mat.get-color-from-palette($header-2, "lighter");
+      background-color: mat.m2-get-color-from-palette($header-2, "lighter");
     }
 
     .instrument-header {
-      background-color: mat.get-color-from-palette($header-3, "lighter");
+      background-color: mat.m2-get-color-from-palette($header-3, "lighter");
     }
 
     .acquisition-header {
-      background-color: mat.get-color-from-palette($accent, "lighter");
+      background-color: mat.m2-get-color-from-palette($accent, "lighter");
     }
   }
 
   .error-message {
-    color: mat.get-color-from-palette($warn, "default");
+    color: mat.m2-get-color-from-palette($warn, "default");
   }
 
   .error-icon {
-    color: mat.get-color-from-palette($warn, "default");
+    color: mat.m2-get-color-from-palette($warn, "default");
   }
 
   .success-icon {
@@ -45,7 +45,7 @@
 }
 
 @mixin theme($theme) {
-  $color-config: mat.get-color-config($theme);
+  $color-config: mat.m2-get-color-config($theme);
   @if $color-config != null {
     @include color($theme);
   }
diff --git a/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.ts
index 918c9dc46c..eba0243a12 100644
--- a/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.ts
@@ -5,6 +5,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
   selector: "app-ingestor-confirmation-dialog",
   templateUrl: "./ingestor.confirmation-dialog.html",
   styleUrls: ["../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
 })
 export class IngestorConfirmationDialogComponent {
   constructor(
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index 35dbeb94ff..597fb92d5a 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -23,6 +23,7 @@ import { Subscription } from "rxjs";
   selector: "ingestor-confirm-transfer-dialog-page",
   templateUrl: "ingestor.confirm-transfer-dialog-page.html",
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
 })
 export class IngestorConfirmTransferDialogPageComponent
   implements OnInit, OnDestroy {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index c425980b3f..f2f93e0346 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -26,6 +26,7 @@ import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-
   selector: "ingestor-extractor-metadata-dialog-page",
   templateUrl: "ingestor.extractor-metadata-dialog-page.html",
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
 })
 export class IngestorExtractorMetadataDialogPageComponent
   implements OnInit, OnDestroy
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 08e76430ae..efce9a03a9 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -24,13 +24,14 @@ import {
 } from "state-management/selectors/ingestor.selector";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
-import { ReturnedUserDto } from "@scicatproject/scicat-sdk-ts";
 import { Subscription } from "rxjs";
+import { ReturnedUserDto } from "@scicatproject/scicat-sdk-ts-angular";
 
 @Component({
   selector: "ingestor-new-transfer-dialog-page",
   templateUrl: "ingestor.new-transfer-dialog-page.html",
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
 })
 export class IngestorNewTransferDialogPageComponent
   implements OnInit, OnDestroy {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 2329dca350..3a2975fc92 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -31,6 +31,7 @@ import {
   selector: "ingestor-user-metadata-dialog",
   templateUrl: "ingestor.user-metadata-dialog-page.html",
   styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
 })
 export class IngestorUserMetadataDialogPageComponent
   implements OnInit, OnDestroy {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index d6f88ff7de..e542e6f5f2 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -30,6 +30,7 @@ export type dialogStep =
   selector: "ingestor.creation-dialog-base",
   templateUrl: "ingestor.creation-dialog-base.html",
   styleUrls: ["../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
 })
 export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index 3e685b259a..484f332035 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -22,11 +22,11 @@
   <button *ngIf="this.createNewTransferData !== undefined" mat-menu-item
     (click)="onSwitchEditorMode('INGESTION')">
     <mat-icon
-      *ngIf="this.createNewTransferData.editorMode === 'INGESTION' ?? false">check</mat-icon>Ingestion-Mode</button>
+      *ngIf="this.createNewTransferData.editorMode === 'INGESTION'">check</mat-icon>Ingestion-Mode</button>
   <button *ngIf="this.createNewTransferData !== undefined" mat-menu-item
     (click)="onSwitchEditorMode('EDITOR')">
     <mat-icon
-      *ngIf="this.createNewTransferData.editorMode === 'EDITOR' ?? false">check</mat-icon>Create
+      *ngIf="this.createNewTransferData.editorMode === 'EDITOR'">check</mat-icon>Create
     JSON-Mode</button>
 </mat-menu>
 
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 7df722e5d5..0b652f3563 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -23,6 +23,7 @@ import { Subscription } from "rxjs";
   selector: "ingestor-dialog-stepper",
   templateUrl: "./ingestor.dialog-stepper.component.html",
   styleUrls: ["./ingestor.dialog-stepper.component.css"],
+  standalone: false,
 })
 export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.ts
index fcd215d5c2..ebcb872096 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.ts
@@ -25,6 +25,7 @@ export interface ExportOptions {
       }
     `,
   ],
+  standalone: false,
 })
 export class ExportTemplateHelperComponent {
   data: ExportOptions;
diff --git a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
index 5fc9d46477..0084b09687 100644
--- a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.ts
@@ -31,6 +31,7 @@ export interface GoBackNode extends FolderNode {
   selector: "ingestor.file-browser.component",
   templateUrl: "ingestor.file-browser.component.html",
   styleUrls: ["../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
 })
 export class IngestorFileBrowserComponent implements OnInit, OnDestroy {
   private _activeNode: BrowsableNode | null = null;
diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
index aae66ebfa7..a9c057d4e4 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
@@ -10,6 +10,7 @@ import { selectIngestorTransferList } from "state-management/selectors/ingestor.
   selector: "app-ingestor-transfer-view-dialog",
   templateUrl: "./ingestor.transfer-detail-view-dialog.html",
   styleUrls: ["../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
 })
 export class IngestorTransferViewDialogComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 742c89e2cb..f06c4e3c52 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -23,7 +23,7 @@ import { cloneDeep, isEmpty, startCase } from "lodash-es";
         <span class="spacer"></span>
         <mat-checkbox
           *ngIf="options.includes('null')"
-          [(ngModel)]="!nullOptionSelected"
+          [(ngModel)]="nullOptionSelected"
           (change)="onEnableCheckboxChange($event)"
         >
           Enabled
@@ -55,6 +55,7 @@ import { cloneDeep, isEmpty, startCase } from "lodash-es";
       </mat-card-content>
     </mat-card>
   `,
+  standalone: false,
 })
 export class AnyOfRendererComponent extends JsonFormsControl {
   dataAsString: string;
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
index 1b62441b69..f4bfc04b06 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
@@ -107,12 +107,12 @@ import {
       </mat-card-content>
     </mat-card>
   `,
+  standalone: false,
 })
 // eslint-disable-next-line @angular-eslint/component-class-suffix
 export class ArrayLayoutRendererCustom
   extends JsonFormsAbstractControl<StatePropsOfArrayLayout>
-  implements OnInit, OnDestroy
-{
+  implements OnInit, OnDestroy {
   noData: boolean;
   minOne: boolean;
   translations: ArrayTranslations;
@@ -158,7 +158,6 @@ export class ArrayLayoutRendererCustom
     this.removeItems = removeItems;
   }
   mapAdditionalProps(props: ArrayLayoutProps) {
-    this.translations = props.translations;
     this.noData = !props.data || props.data === 0;
     this.uischemas = props.uischemas;
     this.minOne = props.required;
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
index e2d4f236af..c58c1bfc1d 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -53,6 +53,7 @@ import isEmpty from "lodash/isEmpty";
       </mat-card-content>
     </mat-card>
   `,
+  standalone: false,
 })
 export class CustomObjectControlRendererComponent extends JsonFormsControlWithDetail {
   rendererService: JsonFormsAngularService;
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
index af9f3f5e46..4509ba738f 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
@@ -70,12 +70,12 @@ import { Subscription } from "rxjs";
       </mat-form-field>
     </div>
   `,
-  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: false,
 })
 export class OwnerGroupFieldComponent
   extends JsonFormsControl
   implements OnInit, OnDestroy {
-  private subscriptions: Subscription[] = [];
+  private componentSubscriptions: Subscription[] = [];
   focused = false;
   vm$ = this.store.select(selectUserSettingsPageViewModel);
   userOwnerGroups = [];
@@ -95,7 +95,7 @@ export class OwnerGroupFieldComponent
     super.ngOnInit();
 
     // Fetch the owner groups from the scicat user
-    this.subscriptions.push(
+    this.componentSubscriptions.push(
       this.vm$.subscribe((settings) => {
         const getclaims = (profile: any): string[] => {
           if (!profile) {
@@ -132,7 +132,7 @@ export class OwnerGroupFieldComponent
 
   ngOnDestroy(): void {
     // Unsubscribe from all subscriptions
-    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
+    this.componentSubscriptions.forEach((subscription) => subscription.unsubscribe());
   }
 
   onSelectAutocompleteValue($event: MatAutocompleteSelectedEvent) {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
index 8e48656239..9d1b6db17f 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
@@ -37,7 +37,7 @@ import { LayoutRenderer } from "@jsonforms/angular-material";
     </div>
   `,
   styleUrls: ["../ingestor-metadata-editor.component.scss"],
-  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: false,
 })
 export class QuantityValueLayoutRendererComponent extends LayoutRenderer<QuantityValueLayout> {
   constructor(
@@ -56,7 +56,7 @@ export interface QuantityValueLayout extends Layout {
   type: "QuantityValueLayout";
 }
 
-@Pipe({ name: "customLayoutChildrenRenderProps" })
+@Pipe({ name: "customLayoutChildrenRenderProps", standalone: false })
 export class CustomLayoutChildrenRenderPropsPipe implements PipeTransform {
   transform(
     uischema: Layout,
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 56ffd4e0cc..3e71fc87e9 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -30,6 +30,7 @@ it will produce errors when changing the schema. */
       (errors)="onErrors($event)"
     ></jsonforms>
   </div>`,
+  standalone: false,
 })
 export class IngestorMetadataEditorComponent implements OnInit {
   @Input() data: object;
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 77dff594e4..b6b0f47a7c 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -1,5 +1,5 @@
 import { JsonSchema, JsonSchema7 } from "@jsonforms/core";
-import { DatasetClass } from "@scicatproject/scicat-sdk-ts";
+import { DatasetClass } from "@scicatproject/scicat-sdk-ts-angular";
 import { isArray } from "mathjs";
 import { PostDatasetResponse } from "shared/sdk/models/ingestor/postDatasetResponse";
 import { UserInfo } from "shared/sdk/models/ingestor/userInfo";
@@ -187,7 +187,7 @@ export const getJsonSchemaFromDto = () => {
     description: "--string --optional",
     license: "--string --optional",
     keywords: [],
-    principalInvestigator: "defaultInvestigator --optional",
+    principalInvestigators: [],
     scientificMetadata: {},
     ownerEmail: "--mail --optional",
 
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 7f22de7ddc..18cf3d6fec 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -38,6 +38,7 @@ import { fetchScicatTokenAction } from "state-management/actions/user.actions";
   selector: "ingestor",
   templateUrl: "./ingestor.component.html",
   styleUrls: ["./ingestor.component.scss"],
+  standalone: false,
 })
 export class IngestorComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index 11dce148ed..bc6ede0730 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { Actions, createEffect, ofType, concatLatestFrom } from "@ngrx/effects";
+import { Actions, createEffect, ofType } from "@ngrx/effects";
 import { of } from "rxjs";
 import { catchError, map, switchMap, finalize } from "rxjs/operators"; // Import finalize
 import * as fromActions from "state-management/actions/ingestor.actions";
@@ -14,6 +14,7 @@ import { HttpErrorResponse } from "@angular/common/http";
 import { showMessageAction } from "state-management/actions/user.actions";
 import { Store } from "@ngrx/store";
 import { selectIngestorTransferListRequestOptions } from "state-management/selectors/ingestor.selector";
+import { concatLatestFrom } from "@ngrx/operators";
 
 @Injectable()
 export class IngestorEffects {

From 6e5419d4ee3e1d7c17db06e6939f0793e170be97 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 15:56:20 +0000
Subject: [PATCH 173/245] jsonforms-fixes

---
 ...stor.new-transfer-dialog-page.component.ts |  3 +--
 ...tor.user-metadata-dialog-page.component.ts |  2 --
 .../customRenderer/any-of-renderer.ts         | 12 +++++------
 .../customRenderer/array-renderer.ts          | 20 +++++++++++++++----
 .../ingestor-metadata-editor.component.html   |  4 ----
 .../ingestor-metadata-editor.component.ts     |  2 +-
 6 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index efce9a03a9..fa85f0ff9d 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -130,8 +130,7 @@ export class IngestorNewTransferDialogPageComponent
     this.createNewTransferData.scicatHeader["dataFormat"] = "root";
     this.createNewTransferData.scicatHeader["owner"] = "User";
 
-    this.createNewTransferData.scicatHeader["principalInvestigator"] =
-      this.userProfile.username;
+    this.createNewTransferData.scicatHeader["principalInvestigators"] = [this.userProfile.username];
     this.createNewTransferData.scicatHeader["investigator"] =
       this.userProfile.username;
     this.createNewTransferData.scicatHeader["ownerEmail"] =
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 3a2975fc92..062d4905b5 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -5,7 +5,6 @@ import {
   OnDestroy,
   OnInit,
   Output,
-  ViewChild,
 } from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import {
@@ -23,7 +22,6 @@ import * as fromActions from "state-management/actions/ingestor.actions";
 import { Store } from "@ngrx/store";
 import { Subscription } from "rxjs";
 import {
-  IngestorMetadataEditorComponent,
   renderView,
 } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index f06c4e3c52..6481f0bc5a 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -23,13 +23,13 @@ import { cloneDeep, isEmpty, startCase } from "lodash-es";
         <span class="spacer"></span>
         <mat-checkbox
           *ngIf="options.includes('null')"
-          [(ngModel)]="nullOptionSelected"
+          [(ngModel)]="notNullOptionSelected"
           (change)="onEnableCheckboxChange($event)"
         >
           Enabled
         </mat-checkbox></mat-card-title
       >
-      <mat-card-content *ngIf="!nullOptionSelected">
+      <mat-card-content *ngIf="notNullOptionSelected">
         <mat-tab-group *ngIf="tabAmount > 1">
           animationDuration="0ms" [selectedIndex]="selectedTabIndex" >
           <mat-tab *ngFor="let option of filteredOptions" label="{{ option }}">
@@ -62,7 +62,7 @@ export class AnyOfRendererComponent extends JsonFormsControl {
   options: string[] = [];
   filteredOptions: string[] = [];
   anyOfTitle: string;
-  nullOptionSelected = false;
+  notNullOptionSelected = false;
   selectedTabIndex = 0; // default value
   tabAmount = 0; // max tabs
 
@@ -85,7 +85,7 @@ export class AnyOfRendererComponent extends JsonFormsControl {
 
     if (this.options.includes("null") && !props.data) {
       this.selectedTabIndex = this.options.indexOf("null");
-      this.nullOptionSelected = true;
+      this.notNullOptionSelected = false;
     }
 
     this.filteredOptions = this.options.filter((option) => option !== "null");
@@ -140,7 +140,7 @@ export class AnyOfRendererComponent extends JsonFormsControl {
   }
 
   public onEnableCheckboxChange(event: MatCheckboxChange) {
-    this.nullOptionSelected = !event.checked;
+    this.notNullOptionSelected = event.checked;
 
     const updatedData =
       this.rendererService.getState().jsonforms.core.data ?? {};
@@ -151,7 +151,7 @@ export class AnyOfRendererComponent extends JsonFormsControl {
     for (let i = 0; i < pathSegments.length - 1; i++) {
       current = current[pathSegments[i]];
     }
-    current[pathSegments[pathSegments.length - 1]] = this.nullOptionSelected
+    current[pathSegments[pathSegments.length - 1]] = !this.notNullOptionSelected
       ? null
       : {};
 
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
index f4bfc04b06..e4d5534ce9 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
@@ -4,10 +4,13 @@ import {
   JsonFormsAbstractControl,
 } from "@jsonforms/angular";
 import {
+  arrayDefaultTranslations,
   ArrayLayoutProps,
   ArrayTranslations,
   createDefaultValue,
+  defaultJsonFormsI18nState,
   findUISchema,
+  getArrayTranslations,
   JsonFormsState,
   mapDispatchToArrayControlProps,
   mapStateToArrayLayoutProps,
@@ -115,7 +118,7 @@ export class ArrayLayoutRendererCustom
   implements OnInit, OnDestroy {
   noData: boolean;
   minOne: boolean;
-  translations: ArrayTranslations;
+  translations: ArrayTranslations = {};
   addItem: (path: string, value: any) => () => void;
   moveItemUp: (path: string, index: number) => () => void;
   moveItemDown: (path: string, index: number) => () => void;
@@ -127,9 +130,17 @@ export class ArrayLayoutRendererCustom
   constructor(jsonFormsService: JsonFormsAngularService) {
     super(jsonFormsService);
   }
-  mapToProps(state: JsonFormsState): StatePropsOfArrayLayout {
+  mapToProps(state: JsonFormsState): StatePropsOfArrayLayout & { translations: ArrayTranslations } {
     const props = mapStateToArrayLayoutProps(state, this.getOwnProps());
-    return { ...props };
+    const t =
+      state.jsonforms.i18n?.translate ?? defaultJsonFormsI18nState.translate;
+    const translations = getArrayTranslations(
+      t,
+      arrayDefaultTranslations,
+      props.i18nKeyPrefix,
+      props.label
+    );
+    return { ...props, translations };
   }
   remove(index: number): void {
     this.removeItems(this.propsPath, [index])();
@@ -157,7 +168,8 @@ export class ArrayLayoutRendererCustom
     this.moveItemDown = moveDown;
     this.removeItems = removeItems;
   }
-  mapAdditionalProps(props: ArrayLayoutProps) {
+  mapAdditionalProps(props: ArrayLayoutProps & { translations: ArrayTranslations }) {
+    this.translations = props.translations;
     this.noData = !props.data || props.data === 0;
     this.uischemas = props.uischemas;
     this.minOne = props.required;
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
deleted file mode 100644
index 2e2b11f4ef..0000000000
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="ingestor-metadata-editor">
-  <textarea class="ingestor-metadata-editor" matInput placeholder="Edit Metadata" rows="10"
-    [(ngModel)]="metadata"></textarea>
-</div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 3e71fc87e9..96fcf4edb8 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -49,7 +49,7 @@ export class IngestorMetadataEditorComponent implements OnInit {
     this.reducedSchema =
       IngestorMetadataEditorHelper.reduceToRequiredProperties(this.schema);
 
-    console.log(this.schema);
+    //console.log(this.schema);
   }
 
   updateVisualData() {

From 0ddb66799f3988ed9bf4404049d9abbe36968182 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 16:29:12 +0000
Subject: [PATCH 174/245] Remove principialInvestigators from Schema

---
 .../ingestor.new-transfer-dialog-page.component.ts              | 2 +-
 .../ingestor/ingestor-page/helper/ingestor.component-helper.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index fa85f0ff9d..867d3afad6 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -130,7 +130,7 @@ export class IngestorNewTransferDialogPageComponent
     this.createNewTransferData.scicatHeader["dataFormat"] = "root";
     this.createNewTransferData.scicatHeader["owner"] = "User";
 
-    this.createNewTransferData.scicatHeader["principalInvestigators"] = [this.userProfile.username];
+    //this.createNewTransferData.scicatHeader["principalInvestigators"] = [this.userProfile.username];
     this.createNewTransferData.scicatHeader["investigator"] =
       this.userProfile.username;
     this.createNewTransferData.scicatHeader["ownerEmail"] =
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index b6b0f47a7c..08400ebb90 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -187,7 +187,7 @@ export const getJsonSchemaFromDto = () => {
     description: "--string --optional",
     license: "--string --optional",
     keywords: [],
-    principalInvestigators: [],
+    principalInvestigators: null, // skip
     scientificMetadata: {},
     ownerEmail: "--mail --optional",
 

From fb0178ad0cb6e757d5bc2e05e79d47ab452ed4c5 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 13 May 2025 16:30:28 +0000
Subject: [PATCH 175/245] Remove principalInvestigators from schema

---
 .../ingestor.new-transfer-dialog-page.component.ts              | 2 +-
 .../ingestor/ingestor-page/helper/ingestor.component-helper.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index fa85f0ff9d..867d3afad6 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -130,7 +130,7 @@ export class IngestorNewTransferDialogPageComponent
     this.createNewTransferData.scicatHeader["dataFormat"] = "root";
     this.createNewTransferData.scicatHeader["owner"] = "User";
 
-    this.createNewTransferData.scicatHeader["principalInvestigators"] = [this.userProfile.username];
+    //this.createNewTransferData.scicatHeader["principalInvestigators"] = [this.userProfile.username];
     this.createNewTransferData.scicatHeader["investigator"] =
       this.userProfile.username;
     this.createNewTransferData.scicatHeader["ownerEmail"] =
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index b6b0f47a7c..c560310f44 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -187,7 +187,7 @@ export const getJsonSchemaFromDto = () => {
     description: "--string --optional",
     license: "--string --optional",
     keywords: [],
-    principalInvestigators: [],
+    principalInvestigators: null, // skip [],
     scientificMetadata: {},
     ownerEmail: "--mail --optional",
 

From 3e409b045142dd7b209b796c5f6dad80c9382631 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 15 May 2025 11:38:10 +0000
Subject: [PATCH 176/245] for testing in user menu bar

---
 .../app-header/app-header.component.html      | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index 120cf3b3bb..46c3cca494 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -1,5 +1,11 @@
 <div class="header">
   <mat-menu #userMenu="matMenu">
+    <button mat-menu-item [routerLink]="['/ingestor']"
+      [queryParams]="{ discovery: true }">
+      <mat-icon> cloud_upload</mat-icon>
+      <span>Ingestor</span>
+    </button>
+
     <button mat-menu-item routerLink="/datasets/">
       <mat-icon> folder</mat-icon>
       <span>Datasets</span>
@@ -67,29 +73,27 @@ <h3>{{ status }}</h3>
     </a>
 
     <span class="spacer"></span>
-    
+
     <span>
       <h6>
-        <a class="toplink" [routerLink]="['/ingestor']" [queryParams]="{ discovery: true }">
-          <mat-icon> cloud_upload  </mat-icon>
-          <span class="large-screen-text">Ingestor (OpenEM)</span></a
-        >
+        <a class="toplink" [routerLink]="['/ingestor']"
+          [queryParams]="{ discovery: true }">
+          <mat-icon> cloud_upload </mat-icon>
+          <span class="large-screen-text">Ingestor (OpenEM)</span></a>
       </h6>
     </span>
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/help']">
           <mat-icon> help </mat-icon>
-          <span class="large-screen-text">Help</span></a
-        >
+          <span class="large-screen-text">Help</span></a>
       </h6>
     </span>
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/about']">
           <mat-icon> info </mat-icon>
-          <span class="large-screen-text">About</span></a
-        >
+          <span class="large-screen-text">About</span></a>
       </h6>
     </span>
     <span *ngIf="(this.loggedIn$ | async) === false; else userButton">
@@ -103,12 +107,9 @@ <h6>
     <ng-template #userButton>
       <span *ngIf="config.shoppingCartOnHeader" [matMenuTriggerFor]="cartMenu">
         <button id="cartOnHeaderButton" mat-icon-button>
-          <mat-icon
-            matBadge="{{ inBatchIndicator$ | async }}"
+          <mat-icon matBadge="{{ inBatchIndicator$ | async }}"
             matBadgeColor="accent"
-            matBadgeSize="medium"
-            >shopping_cart</mat-icon
-          >
+            matBadgeSize="medium">shopping_cart</mat-icon>
         </button>
       </span>
 
@@ -124,4 +125,4 @@ <h6>
       </span>
     </ng-template>
   </mat-toolbar>
-</div>
+</div>
\ No newline at end of file

From 4bb03598069de63e2f8360f616ff5735bc3b5b65 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 15 May 2025 13:30:20 +0000
Subject: [PATCH 177/245] Finalize autodiscovery feature

---
 .../app-header/app-header.component.html      | 20 +++++++-----------
 .../app-header/app-header.component.ts        |  2 ++
 src/app/app-config.service.ts                 |  6 +++++-
 .../helper/ingestor.component-helper.ts       | 17 ++++++---------
 .../ingestor-page/ingestor.component.ts       | 21 ++++++++++---------
 5 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index 46c3cca494..9d648d7b63 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -1,10 +1,12 @@
 <div class="header">
   <mat-menu #userMenu="matMenu">
-    <button mat-menu-item [routerLink]="['/ingestor']"
-      [queryParams]="{ discovery: true }">
-      <mat-icon> cloud_upload</mat-icon>
-      <span>Ingestor</span>
-    </button>
+    <ng-container *ngIf="config.ingestorEnabled">
+      <button mat-menu-item [routerLink]="['/ingestor']"
+        [queryParams]="{ discovery: true }">
+        <mat-icon> cloud_upload</mat-icon>
+        <span>Ingestor</span>
+      </button>
+    </ng-container>
 
     <button mat-menu-item routerLink="/datasets/">
       <mat-icon> folder</mat-icon>
@@ -74,14 +76,6 @@ <h3>{{ status }}</h3>
 
     <span class="spacer"></span>
 
-    <span>
-      <h6>
-        <a class="toplink" [routerLink]="['/ingestor']"
-          [queryParams]="{ discovery: true }">
-          <mat-icon> cloud_upload </mat-icon>
-          <span class="large-screen-text">Ingestor (OpenEM)</span></a>
-      </h6>
-    </span>
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/help']">
diff --git a/src/app/_layout/app-header/app-header.component.ts b/src/app/_layout/app-header/app-header.component.ts
index dd1db860f0..eab3d407ff 100644
--- a/src/app/_layout/app-header/app-header.component.ts
+++ b/src/app/_layout/app-header/app-header.component.ts
@@ -59,5 +59,7 @@ export class AppHeaderComponent implements OnInit {
   ngOnInit() {
     this.store.dispatch(fetchCurrentUserAction());
     this.oAuth2Endpoints = this.config.oAuth2Endpoints;
+
+    console.log(this.config);
   }
 }
diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index c906f8a982..ada596a985 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -1,5 +1,6 @@
 import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
+import { IngestorAutodiscovery } from "ingestor/ingestor-page/helper/ingestor.component-helper";
 import { timeout } from "rxjs/operators";
 import {
   DatasetDetailComponentConfig,
@@ -106,13 +107,16 @@ export interface AppConfig {
   datasetDetailComponent?: DatasetDetailComponentConfig;
   labelsLocalization?: LabelsLocalization;
   dateFormat?: string;
+  ingestorEnabled?: boolean;
+  ingestorMode?: string;
+  ingestorAutodiscoveryOptions?: IngestorAutodiscovery[];
 }
 
 @Injectable()
 export class AppConfigService {
   private appConfig: object = {};
 
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient) { }
 
   async loadAppConfig(): Promise<void> {
     try {
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index c560310f44..32fcd8644a 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -4,6 +4,12 @@ import { isArray } from "mathjs";
 import { PostDatasetResponse } from "shared/sdk/models/ingestor/postDatasetResponse";
 import { UserInfo } from "shared/sdk/models/ingestor/userInfo";
 
+export interface IngestorAutodiscovery {
+  mailDomain: string;
+  description?: string;
+  facilityBackend: string;
+}
+
 export interface ExtractionMethod {
   name: string;
   schema: string; // Base64 encoded JSON schema
@@ -40,11 +46,6 @@ export interface IngestionRequestInformation {
   autoArchive: boolean;
 }
 
-export interface TransferDataListEntry {
-  transferId: string;
-  status: string;
-}
-
 // There are many more... see DerivedDataset.ts
 export interface SciCatHeader {
   datasetName: string;
@@ -72,12 +73,6 @@ export interface ScientificMetadata {
   instrument: object;
 }
 
-export interface MetadataExtractorResult {
-  cmdStdErr: string;
-  cmdStdOut: string;
-  result: string;
-}
-
 export interface DialogDataObject {
   createNewTransferData: IngestionRequestInformation;
   userInfo: UserInfo;
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 18cf3d6fec..20d1633415 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -33,6 +33,7 @@ import { Subscription } from "rxjs";
 import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
 import { IngestorTransferViewDialogComponent } from "ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component";
 import { fetchScicatTokenAction } from "state-management/actions/user.actions";
+import { AppConfigService } from "app-config.service";
 
 @Component({
   selector: "ingestor",
@@ -43,6 +44,7 @@ import { fetchScicatTokenAction } from "state-management/actions/user.actions";
 export class IngestorComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   readonly dialog = inject(MatDialog);
+  appConfig = this.appConfigService.getConfig();
 
   vm$ = this.store.select(selectUserSettingsPageViewModel);
   sciCatLoggedIn$ = this.store.select(selectIsLoggedIn);
@@ -90,6 +92,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     private router: Router,
     private store: Store,
+    public appConfigService: AppConfigService,
   ) { }
 
   ngOnInit() {
@@ -336,17 +339,15 @@ export class IngestorComponent implements OnInit, OnDestroy {
       const facilityEmail = this.scicatUserProfile.email;
       const facility = facilityEmail.split("@")[1] as string;
 
-      try {
-        const facilityName = facility.toLowerCase();
-        //const discoveryJson = await this.apiManager.getAutodiscoveryList();
-        //const discoveryList = JSON.parse(discoveryJson);
-        console.log(facilityName);
-        // TODO
-        if (facilityName === "unibe.ch") {
-          return "http://localhost:8888";
+      const facilityMailDomainName = facility.toLowerCase();
+      const discoveryList = this.appConfig.ingestorAutodiscoveryOptions;
+
+      if (discoveryList) {
+        for (const discovery of discoveryList) {
+          if (discovery.mailDomain.toLowerCase() === facilityMailDomainName) {
+            return discovery.facilityBackend;
+          }
         }
-      } catch (error) {
-        console.error("Error fetching autodiscovery list", error);
       }
     }
     return null;

From f9c6125518b23569b8c53bac009738e4f6a7ecbb Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 15 May 2025 15:59:03 +0000
Subject: [PATCH 178/245] add   depositor support

---
 .../state-management/effects/depositor.effects.ts  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/app/state-management/effects/depositor.effects.ts b/src/app/state-management/effects/depositor.effects.ts
index 3870fc986a..dcc0379552 100644
--- a/src/app/state-management/effects/depositor.effects.ts
+++ b/src/app/state-management/effects/depositor.effects.ts
@@ -1,8 +1,9 @@
 import { Injectable } from "@angular/core";
 import { Actions, createEffect, ofType } from "@ngrx/effects";
 import { of, from } from "rxjs";
-import { catchError, map, switchMap, concatMap, last } from "rxjs/operators";
+import { catchError, map, switchMap, concatMap, last, tap } from "rxjs/operators";
 import { HttpErrorResponse } from "@angular/common/http";
+import { Store } from "@ngrx/store";
 import { MessageType } from "state-management/models";
 import { showMessageAction } from "state-management/actions/user.actions";
 import * as fromActions from "state-management/actions/depositor.actions";
@@ -75,6 +76,14 @@ export class OneDepEffects {
       ofType(fromActions.submitDeposition),
       switchMap(({ deposition, files }) =>
         this.onedepDepositor.createDep(deposition).pipe(
+          tap((dep) => {
+          const message = {
+            type: MessageType.Success,
+            content: `Deposition entry created: ${dep.id}. Start uploading files.`,
+            duration: 10000,
+          };
+          this.store.dispatch(showMessageAction({ message }));
+          }),
           switchMap((dep) =>
             from(files).pipe(
               concatMap((file) =>
@@ -82,7 +91,7 @@ export class OneDepEffects {
                   ? this.onedepDepositor.sendCoordFile(dep.id, file.form)
                   : this.onedepDepositor.sendFile(dep.id, file.form),
               ),
-
+              
               last(),
               map(() =>
                 fromActions.submitDepositionSuccess({
@@ -350,5 +359,6 @@ export class OneDepEffects {
   constructor(
     private actions$: Actions,
     private onedepDepositor: Depositor,
+    private store: Store,
   ) {}
 }

From 897f250cb00557d48388bbc4914012e1f7cc175f Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 16 May 2025 07:25:41 +0000
Subject: [PATCH 179/245] update disconnect

---
 .../ingestor-page/ingestor.component.ts       | 83 +++++++++----------
 .../actions/ingestor.actions.ts               |  4 +
 .../effects/ingestor.effect.ts                |  1 +
 .../reducers/ingestor.reducer.ts              |  7 ++
 .../state-management/state/ingestor.store.ts  |  4 +-
 5 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 20d1633415..3968194421 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -137,6 +137,43 @@ export class IngestorComponent implements OnInit, OnDestroy {
       ),
     );
 
+    this.subscriptions.push(
+      this.ingestorConnecting$.subscribe((connecting) => {
+        this.connectingToFacilityBackend = connecting;
+      }),
+    );
+
+    this.subscriptions.push(
+      this.ingestorStatus$.subscribe((ingestorStatus) => {
+        if (!ingestorStatus.validEndpoint) {
+          this.connectedFacilityBackend = "";
+          this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+        } else if (
+          ingestorStatus.versionResponse &&
+          ingestorStatus.healthResponse
+        ) {
+          this.versionInfo = ingestorStatus.versionResponse;
+          this.healthInfo = ingestorStatus.healthResponse;
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.ingestorAuthInfo$.subscribe((authInfo) => {
+        if (authInfo) {
+          this.userInfo = authInfo.userInfoResponse;
+          this.authIsDisabled = authInfo.authIsDisabled;
+
+          // Only refresh if the user is logged in or the auth is disabled
+          if (this.authIsDisabled || this.userInfo.logged_in) {
+            // Activate Transfer Tab when ingestor is ready for actions
+            this.selectedTab = 0;
+            this.doRefreshTransferList();
+          }
+        }
+      }),
+    );
+
     this.loadIngestorConfiguration();
     this.store.dispatch(fetchCurrentUserAction());
   }
@@ -174,7 +211,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
             }),
           );
 
-          this.initializeIngestorConnection();
+          this.store.dispatch(fromActions.connectIngestor());
         } else {
           this.connectingToFacilityBackend = false;
         }
@@ -182,47 +219,6 @@ export class IngestorComponent implements OnInit, OnDestroy {
     );
   }
 
-  async initializeIngestorConnection(): Promise<void> {
-    this.store.dispatch(fromActions.connectIngestor());
-
-    this.subscriptions.push(
-      this.ingestorConnecting$.subscribe((connecting) => {
-        this.connectingToFacilityBackend = connecting;
-      }),
-    );
-
-    this.subscriptions.push(
-      this.ingestorStatus$.subscribe((ingestorStatus) => {
-        if (!ingestorStatus.validEndpoint) {
-          this.connectedFacilityBackend = "";
-          this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
-        } else if (
-          ingestorStatus.versionResponse &&
-          ingestorStatus.healthResponse
-        ) {
-          this.versionInfo = ingestorStatus.versionResponse;
-          this.healthInfo = ingestorStatus.healthResponse;
-        }
-      }),
-    );
-
-    this.subscriptions.push(
-      this.ingestorAuthInfo$.subscribe((authInfo) => {
-        if (authInfo) {
-          this.userInfo = authInfo.userInfoResponse;
-          this.authIsDisabled = authInfo.authIsDisabled;
-
-          // Only refresh if the user is logged in or the auth is disabled
-          if (this.authIsDisabled || this.userInfo.logged_in) {
-            // Activate Transfer Tab when ingestor is ready for actions
-            this.selectedTab = 0;
-            this.doRefreshTransferList();
-          }
-        }
-      }),
-    );
-  }
-
   onClickForwardToIngestorPage() {
     if (this.forwardFacilityBackend) {
       this.router.navigate(["/ingestor"], {
@@ -232,6 +228,9 @@ export class IngestorComponent implements OnInit, OnDestroy {
   }
 
   onClickDisconnectIngestor() {
+    // Reset state of the ingestor component
+    this.store.dispatch(
+      fromActions.resetIngestorComponent());
     // Remove the GET parameter 'backendUrl' from the URL
     this.router.navigate(["/ingestor"]);
   }
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 30ba38e5eb..515bd8e335 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -134,3 +134,7 @@ export const setRenderViewFromThirdParty = createAction(
   "[Ingestor] Set Render View",
   props<{ renderView: renderView }>(),
 );
+
+export const resetIngestorComponent = createAction(
+  "[Ingestor] Reset Ingestor Component",
+);
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index bc6ede0730..6f80b7fea2 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -24,6 +24,7 @@ export class IngestorEffects {
       switchMap(() =>
         of(fromActions.startConnectingIngestor()).pipe(
           switchMap(() => {
+            console.log("GET VERSION")
             return this.ingestor.getVersion().pipe(
               switchMap((versionResponse) =>
                 this.ingestor.getHealth().pipe(
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index ec563d8874..ffe0171f6a 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -176,4 +176,11 @@ const reducer = createReducer(
       },
     }),
   ),
+  on(
+    fromActions.resetIngestorComponent,
+    (state): IngestorState => ({
+      ...state,
+      ...initialIngestorState,
+    }),
+  )
 );
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index d085aaea33..44bc2f897b 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -26,7 +26,7 @@ interface IngestorStatus {
 export interface IngestorState {
   ingestorStatus: IngestorStatus;
   ingestorAuth: IngestorAuthentication | null;
-  ingestorEndpoint: string | null;
+  ingestorEndpoint: string;
   ingestorTransferList: GetTransferResponse | null;
   transferListRequestOptions: {
     page: number;
@@ -47,7 +47,7 @@ export const initialIngestorState: IngestorState = {
     validEndpoint: true,
   },
   ingestorAuth: null,
-  ingestorEndpoint: null,
+  ingestorEndpoint: "",
   ingestorTransferList: null,
   transferListRequestOptions: {
     page: 0,

From 3d5347addfeafb736aad0c38270b822b921e6d93 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 16 May 2025 12:01:52 +0000
Subject: [PATCH 180/245] show onedep and empiar cards as part of the depositor
 view

---
 .../datasets.routing.module.ts                |   9 +-
 src/app/datasets/datasets.module.ts           |   6 +-
 .../depositor/depositor.component.html        |   9 ++
 .../datasets/depositor/depositor.component.ts |  33 +++--
 .../depositor/methodWrapper.component.ts      |  69 +++++++++++
 src/app/datasets/empiar/empiar.component.html |  91 +++++++-------
 src/app/datasets/empiar/empiar.component.ts   | 115 +++++++++++-------
 src/app/datasets/onedep/onedep.component.html |  90 +++++++-------
 src/app/datasets/onedep/onedep.component.ts   |  84 ++++++++-----
 9 files changed, 330 insertions(+), 176 deletions(-)
 create mode 100644 src/app/datasets/depositor/methodWrapper.component.ts

diff --git a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
index da164d027e..5af1ab6c9b 100644
--- a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
+++ b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
@@ -7,6 +7,7 @@ import { DatablocksComponent } from "datasets/datablocks-table/datablocks-table.
 import { DatasetDetailsDashboardComponent } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
 import { OneDepComponent } from "datasets/onedep/onedep.component";
 import { EmpiarComponent } from "datasets/empiar/empiar.component";
+import { DepositorWrapperComponent } from "datasets/depositor/methodWrapper.component"
 import { PublishComponent } from "datasets/publish/publish.component";
 
 const routes: Routes = [
@@ -39,12 +40,16 @@ const routes: Routes = [
   },
   {
     path: ":id/onedep",
-    component: OneDepComponent,
+    // component: OneDepComponent,
+    component: DepositorWrapperComponent,
+    data: { method: 'onedep' },
     canActivate: [AuthGuard],
   },
   {
     path: ":id/empiar",
-    component: EmpiarComponent,
+    // component: EmpiarComponent,
+    component: DepositorWrapperComponent,
+    data: { method: 'empiar' },
     canActivate: [AuthGuard],
   },
 ];
diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 4522360b56..91ce03a31c 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -88,6 +88,7 @@ import { OrcidFormatterDirective } from "./onedep/onedep.directive";
 import { EmpiarComponent } from "./empiar/empiar.component";
 import { OneDepEffects } from "state-management/effects/depositor.effects";
 import { DepositorComponent } from "./depositor/depositor.component";
+import { DepositorWrapperComponent } from "./depositor/methodWrapper.component"
 import { QuestionnaireComponent } from "./depositor/empiar/questionnaire/questionnaire.component";
 import { onedepReducer } from "state-management/reducers/onedep.reducer";
 import { empiarReducer } from "state-management/reducers/empiar.reducer";
@@ -194,10 +195,11 @@ import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-w
     DatafilesActionsComponent,
     DatafilesActionComponent,
     DatasetsFilterSettingsComponent,
+    DepositorComponent,
+    DepositorWrapperComponent, 
+    EmpiarComponent,
     OneDepComponent,
     OrcidFormatterDirective,
-    EmpiarComponent,
-    DepositorComponent,
     QuestionnaireComponent,
     CustomEnumRendererComponent,
     CustomAuthorNameControlComponent,
diff --git a/src/app/datasets/depositor/depositor.component.html b/src/app/datasets/depositor/depositor.component.html
index be7bb76cc5..c74aaa9cbf 100644
--- a/src/app/datasets/depositor/depositor.component.html
+++ b/src/app/datasets/depositor/depositor.component.html
@@ -64,6 +64,15 @@
          
         </mat-form-field>
       </mat-card>
+      <div class="deposition-cards">
+        <mat-card *ngIf="selectedMethod === 'onedep'">
+          <app-onedep [dataset]="dataset" [user]="user" [showFirstCard]=false></app-onedep>
+        </mat-card>
+        <mat-card *ngIf="selectedMethod === 'empiar'">
+          <app-empiar [dataset]="dataset" [user]="user" [empiarSchemaEncoded]="empiarSchemaEncoded" [showFirstCard]=false></app-empiar>
+        </mat-card>
+      </div>
+      
     </div>
   </div>
 </ng-template>
diff --git a/src/app/datasets/depositor/depositor.component.ts b/src/app/datasets/depositor/depositor.component.ts
index bea24c9f5d..84e65c966c 100644
--- a/src/app/datasets/depositor/depositor.component.ts
+++ b/src/app/datasets/depositor/depositor.component.ts
@@ -22,6 +22,8 @@ import { selectCurrentDataset } from "state-management/selectors/datasets.select
 // } from "state-management/selectors/user.selectors";
 import { selectCurrentUser } from "state-management/selectors/user.selectors";
 import * as fromActions from "state-management/actions/depositor.actions";
+import { accessEmpiarSchema } from "state-management/actions/depositor.actions";
+import { selectEmpiarSchema } from "state-management/selectors/depositor.selectors";
 
 import { Subscription } from "rxjs";
 import { Router } from "@angular/router";
@@ -49,12 +51,15 @@ export class DepositorComponent implements OnInit, OnDestroy {
   depositionRepository: FormControl;
   dataset: OutputDatasetObsoleteDto | undefined;
   user: ReturnedUserDto | undefined;
+
+  
   selectedMethod: string | null = null;
   onedepLink: {
     location: string;
     enabled: boolean;
   } | null = null;
 
+  empiarSchemaEncoded:string | undefined;
   constructor(
     public appConfigService: AppConfigService,
     private store: Store,
@@ -82,6 +87,13 @@ export class DepositorComponent implements OnInit, OnDestroy {
         }
       }),
     );
+
+    this.store.dispatch(accessEmpiarSchema());
+    this.subscriptions.push(
+      this.store.select(selectEmpiarSchema).subscribe((schema) => {
+        this.empiarSchemaEncoded = schema;
+      })
+    );
   }
 
   ngOnDestroy() {
@@ -91,15 +103,16 @@ export class DepositorComponent implements OnInit, OnDestroy {
   }
 
   onChooseRepo() {
-    const id = encodeURIComponent(this.dataset.pid);
-    if (this.depositionRepository.value === "onedep") {
-      this.router.navigate(["/datasets", id, "onedep"], {
-        state: { pid: this.dataset.pid },
-      });
-    } else if (this.depositionRepository.value === "empiar") {
-      this.router.navigate(["/datasets", id, "empiar"], {
-        state: { pid: this.dataset.pid },
-      });
-    }
+    // const id = encodeURIComponent(this.dataset.pid);
+    // if (this.depositionRepository.value === "onedep") {
+    //   this.router.navigate(["/datasets", id, "onedep"], {
+    //     state: { pid: this.dataset.pid },
+    //   });
+    // } else if (this.depositionRepository.value === "empiar") {
+    //   this.router.navigate(["/datasets", id, "empiar"], {
+    //     state: { pid: this.dataset.pid },
+    //   });
+    // }
+    this.selectedMethod = this.depositionRepository.value;
   }
 }
diff --git a/src/app/datasets/depositor/methodWrapper.component.ts b/src/app/datasets/depositor/methodWrapper.component.ts
new file mode 100644
index 0000000000..f24b10fbfc
--- /dev/null
+++ b/src/app/datasets/depositor/methodWrapper.component.ts
@@ -0,0 +1,69 @@
+
+import { Component, Input,  OnInit, OnDestroy } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+
+import { Store } from "@ngrx/store";
+import { Subscription } from 'rxjs';
+
+import {
+  OutputDatasetObsoleteDto,
+  ReturnedUserDto,
+} from "@scicatproject/scicat-sdk-ts-angular";
+
+import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
+import { selectCurrentUser } from "state-management/selectors/user.selectors";
+import { fetchDatasetAction } from "state-management/actions/datasets.actions";
+import { accessEmpiarSchema } from "state-management/actions/depositor.actions";
+import { selectEmpiarSchema } from "state-management/selectors/depositor.selectors";
+
+@Component({
+  selector: 'app-depositor-wrapper',
+  template: `
+    <ng-container *ngIf="dataset && user">
+      <app-onedep *ngIf="method === 'onedep'" [dataset]="dataset" [user]="user" [showFirstCard]="showFirstCard"></app-onedep>
+      <app-empiar *ngIf="method === 'empiar'" [dataset]="dataset" [user]="user" [empiarSchemaEncoded]="empiarSchemaEncoded" [showFirstCard]="showFirstCard"></app-empiar>
+    </ng-container>
+  `,
+  standalone:false,
+})
+export class DepositorWrapperComponent implements OnInit {
+  @Input() method!: 'onedep' | 'empiar'; // Allows usage in depositor page too
+  dataset!: OutputDatasetObsoleteDto;
+  user!: ReturnedUserDto;
+  empiarSchemaEncoded!:string | undefined;
+
+  showFirstCard = false;
+
+
+  private subscriptions: Subscription[] = [];
+
+  constructor(
+    private route: ActivatedRoute, 
+    private store: Store, 
+    private router: Router) {}
+
+  ngOnInit() {
+    const pid = this.route.snapshot.paramMap.get('id');
+    this.method = this.route.snapshot.data['method'] ?? this.method; 
+    this.store.dispatch(fetchDatasetAction({ pid }));
+    this.store.select(selectCurrentDataset).subscribe((dataset) => {
+      this.dataset = dataset;
+    });
+    this.store.select(selectCurrentUser).subscribe((user) => {
+      this.user = user;
+    });
+    
+    const currentUrl = this.router.url;
+    if (currentUrl.includes('/empiar') || currentUrl.includes('/onedep')) {
+      this.showFirstCard = true;
+    } else {
+      this.showFirstCard = false;
+    }
+    this.store.dispatch(accessEmpiarSchema());
+    this.subscriptions.push(
+      this.store.select(selectEmpiarSchema).subscribe((schema) => {
+        this.empiarSchemaEncoded = schema;
+      })
+    );
+  }
+}
\ No newline at end of file
diff --git a/src/app/datasets/empiar/empiar.component.html b/src/app/datasets/empiar/empiar.component.html
index 9b13145e51..01964738e9 100644
--- a/src/app/datasets/empiar/empiar.component.html
+++ b/src/app/datasets/empiar/empiar.component.html
@@ -2,50 +2,53 @@
   <div style="clear: both;"></div>
   <div>
     <div>
-      <mat-card [formGroup]="form" data-cy="general-info">
-        <mat-card-header class="general-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> assignment </mat-icon>
-          </div>
-          General information
-        </mat-card-header>
-        <mat-card-content>
-          <table>
-            <tr>
-              <th>Name</th>
-              <td>{{ dataset.datasetName || "-" }}</td>
-            </tr>
-            <tr>
-              <th>Description</th>
-              <td>
-                <span [innerHTML]="dataset.description || '-' | linky"></span>
-              </td>
-            </tr>
-            <tr>
-              <th>PID</th>
-              <td>
-                {{ dataset.pid }}
-              </td>
-            </tr>
-            <tr>
-              <th>Type</th>
-              <td>{{dataset.type }}</td>
-            </tr>
-            <tr>
-              <th>Creation Time</th>
-              <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
-            </tr>
-            <tr class="keywords-row">
-              <th>Keywords</th>
-              <mat-chip-set role="list" #keywordChips>
-                <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
-                  {{ keyword }}
-                </mat-chip>
-              </mat-chip-set>
-            </tr>
-          </table>
-        </mat-card-content>
-      </mat-card>
+      
+      <div *ngIf="showFirstCard">
+        <mat-card [formGroup]="form" data-cy="general-info">
+          <mat-card-header class="general-header">
+            <div mat-card-avatar class="section-icon">
+              <mat-icon> assignment </mat-icon>
+            </div>
+            General information
+          </mat-card-header>
+          <mat-card-content>
+            <table>
+              <tr>
+                <th>Name</th>
+                <td>{{ dataset.datasetName || "-" }}</td>
+              </tr>
+              <tr>
+                <th>Description</th>
+                <td>
+                  <span [innerHTML]="dataset.description || '-' | linky"></span>
+                </td>
+              </tr>
+              <tr>
+                <th>PID</th>
+                <td>
+                  {{ dataset.pid }}
+                </td>
+              </tr>
+              <tr>
+                <th>Type</th>
+                <td>{{dataset.type }}</td>
+              </tr>
+              <tr>
+                <th>Creation Time</th>
+                <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
+              </tr>
+              <tr class="keywords-row">
+                <th>Keywords</th>
+                <mat-chip-set role="list" #keywordChips>
+                  <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
+                    {{ keyword }}
+                  </mat-chip>
+                </mat-chip-set>
+              </tr>
+            </table>
+          </mat-card-content>
+        </mat-card>
+      </div>
       <mat-card>
         <mat-card-header class="creator-header">
           <div mat-card-avatar class="section-icon">
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/empiar/empiar.component.ts
index d6f673718e..aed677f5a5 100644
--- a/src/app/datasets/empiar/empiar.component.ts
+++ b/src/app/datasets/empiar/empiar.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit } from "@angular/core";
+import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import { angularMaterialRenderers } from "@jsonforms/angular-material";
 import { AppConfigService, AppConfig } from "app-config.service";
@@ -31,17 +31,23 @@ import { customSemiEnumControlRenderer } from "./customRenderers/imagesSetRender
   styleUrls: ["./empiar.component.scss"],
   standalone: false,
 })
-export class EmpiarComponent implements OnInit, OnDestroy {
-  private subscriptions: Subscription[] = [];
+export class EmpiarComponent implements OnChanges, OnDestroy {
+  @Input() dataset!: OutputDatasetObsoleteDto | undefined;
+  @Input() user!: ReturnedUserDto | undefined;
+  @Input() empiarSchemaEncoded!: string; 
+  @Input() showFirstCard = true;
+
+  // private subscriptions: Subscription[] = [];
+  // dataset: OutputDatasetObsoleteDto | undefined;
+  // user: ReturnedUserDto | undefined;
   form: FormGroup;
+  data: JsonSchema = createEmptyInstance();
+  schema: JsonSchema;
+
   config: AppConfig;
-  dataset: OutputDatasetObsoleteDto | undefined;
-  user: ReturnedUserDto | undefined;
 
   empiarSchema$: Observable<string>;
   empiarSchema: string;
-  data: JsonSchema = createEmptyInstance();
-  schema: JsonSchema;
 
   generalSchema = generalSchemaAsset;
   imageSets = imageSetsAssets;
@@ -58,52 +64,77 @@ export class EmpiarComponent implements OnInit, OnDestroy {
   ];
 
   constructor(
-    public appConfigService: AppConfigService,
-    private store: Store,
+    // public appConfigService: AppConfigService,
+    // private store: Store,
     private fb: FormBuilder,
   ) {
-    this.config = this.appConfigService.getConfig();
+    // this.config = this.appConfigService.getConfig();
     this.form = this.fb.group({
       email: [""],
     });
   }
 
-  ngOnInit() {
-    // initialize an array for the files to be uploaded
-    const pid = history.state.pid;
-    this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
-    this.store.select(selectCurrentDataset).subscribe((dataset) => {
-      this.dataset = dataset;
-    });
-    this.subscriptions.push(
-      this.store.select(selectCurrentUser).subscribe((user) => {
-        if (user) {
-          this.user = user;
-        }
-      }),
-    );
-    this.store.dispatch(fromActions.accessEmpiarSchema());
-    this.empiarSchema$ = this.store.select(selectEmpiarSchema);
+  // ngOnInit() {
+  //   // initialize an array for the files to be uploaded
+  //   const pid = history.state.pid;
+  //   this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
+  //   this.store.select(selectCurrentDataset).subscribe((dataset) => {
+  //     this.dataset = dataset;
+  //   });
+  //   this.subscriptions.push(
+  //     this.store.select(selectCurrentUser).subscribe((user) => {
+  //       if (user) {
+  //         this.user = user;
+  //       }
+  //     }),
+  //   );
+  //   this.store.dispatch(fromActions.accessEmpiarSchema());
+  //   this.empiarSchema$ = this.store.select(selectEmpiarSchema);
 
-    this.empiarSchema$.subscribe((schema) => {
-      if (schema) {
-        this.empiarSchema = schema;
-        try {
-          const decodedSchema = atob(this.empiarSchema);
-          this.schema = JSON.parse(decodedSchema);
-        } catch (error) {
-          console.error("Failed to decode schema:", error);
-        }
+  //   this.empiarSchema$.subscribe((schema) => {
+  //     if (schema) {
+  //       this.empiarSchema = schema;
+  //       try {
+  //         const decodedSchema = atob(this.empiarSchema);
+  //         this.schema = JSON.parse(decodedSchema);
+  //       } catch (error) {
+  //         console.error("Failed to decode schema:", error);
+  //       }
+  //     }
+  //   });
+  //   this.data = { ...this.data };
+  //   this.data = camelToSnake(createEmptyInstance());
+  // }
+
+
+  ngOnChanges(changes: SimpleChanges) {
+      console.log( "show first card:", this.showFirstCard)
+    if (changes['dataset'] && this.dataset) {
+      this.form.patchValue({
+        metadata: this.dataset.scientificMetadata,
+      });
+    }
+
+    if (changes['user'] && this.user) {
+      this.form.patchValue({
+        email: this.user.email,
+      });
+    }
+
+    if (changes['empiarSchemaEncoded'] && this.empiarSchemaEncoded) {
+      try {
+        const decodedSchema = atob(this.empiarSchemaEncoded);
+        this.schema = JSON.parse(decodedSchema);
+      } catch (error) {
+        console.error("Failed to decode schema:", error);
       }
-    });
-    this.data = { ...this.data };
-    this.data = camelToSnake(createEmptyInstance());
+    }
   }
-
+  
   ngOnDestroy() {
-    this.subscriptions.forEach((subscription) => {
-      subscription.unsubscribe();
-    });
+    // this.subscriptions.forEach((subscription) => {
+    //   subscription.unsubscribe();
+    // });
   }
   onDataChange(event: EmpiarJson) {
     this.data = event;
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/onedep/onedep.component.html
index b920f4ec98..e6bc3073b6 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/onedep/onedep.component.html
@@ -2,50 +2,52 @@
   <div style="clear: both;"></div>
   <div>
     <div>
-      <mat-card [formGroup]="form" data-cy="general-info">
-        <mat-card-header class="general-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> assignment </mat-icon>
-          </div>
-          General information
-        </mat-card-header>
-        <mat-card-content>
-          <table>
-            <tr>
-              <th>Name</th>
-              <td>{{ dataset.datasetName || "-" }}</td>
-            </tr>
-            <tr>
-              <th>Description</th>
-              <td>
-                <span [innerHTML]="dataset.description || '-' | linky"></span>
-              </td>
-            </tr>
-            <tr>
-              <th>PID</th>
-              <td>
-                {{ dataset.pid }}
-              </td>
-            </tr>
-            <tr>
-              <th>Type</th>
-              <td>{{dataset.type }}</td>
-            </tr>
-            <tr>
-              <th>Creation Time</th>
-              <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
-            </tr>
-            <tr class="keywords-row">
-              <th>Keywords</th>
-              <mat-chip-set role="list" #keywordChips>
-                <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
-                  {{ keyword }}
-                </mat-chip>
-              </mat-chip-set>
-            </tr>
-          </table>
-        </mat-card-content>
-      </mat-card>
+      <div *ngIf="showFirstCard">
+        <mat-card [formGroup]="form" data-cy="general-info">
+          <mat-card-header class="general-header">
+            <div mat-card-avatar class="section-icon">
+              <mat-icon> assignment </mat-icon>
+            </div>
+            General information
+          </mat-card-header>
+          <mat-card-content>
+            <table>
+              <tr>
+                <th>Name</th>
+                <td>{{ dataset.datasetName || "-" }}</td>
+              </tr>
+              <tr>
+                <th>Description</th>
+                <td>
+                  <span [innerHTML]="dataset.description || '-' | linky"></span>
+                </td>
+              </tr>
+              <tr>
+                <th>PID</th>
+                <td>
+                  {{ dataset.pid }}
+                </td>
+              </tr>
+              <tr>
+                <th>Type</th>
+                <td>{{dataset.type }}</td>
+              </tr>
+              <tr>
+                <th>Creation Time</th>
+                <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
+              </tr>
+              <tr class="keywords-row">
+                <th>Keywords</th>
+                <mat-chip-set role="list" #keywordChips>
+                  <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
+                    {{ keyword }}
+                  </mat-chip>
+                </mat-chip-set>
+              </tr>
+            </table>
+          </mat-card-content>
+        </mat-card>
+      </div>
       <mat-card [formGroup]="form">
         <mat-card-header class="creator-header">
           <div mat-card-avatar class="section-icon">
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/onedep/onedep.component.ts
index c19f45862b..e199989290 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/onedep/onedep.component.ts
@@ -1,9 +1,11 @@
 import {
   Component,
-  OnInit,
+  Input,
+  OnChanges,
   ViewChild,
   ElementRef,
   OnDestroy,
+  SimpleChanges
 } from "@angular/core";
 import { MatRadioChange } from "@angular/material/radio";
 import { AppConfigService, AppConfig } from "app-config.service";
@@ -38,18 +40,21 @@ import { Observable, Subscription } from "rxjs";
 import { isNumeric } from "mathjs";
 
 @Component({
-  selector: "onedep",
+  selector: "app-onedep",
   templateUrl: "./onedep.component.html",
   styleUrls: ["./onedep.component.scss"],
   standalone: false,
 })
-export class OneDepComponent implements OnInit, OnDestroy {
+export class OneDepComponent implements OnChanges, OnDestroy {
+  @Input() dataset: OutputDatasetObsoleteDto | undefined;
+  @Input() user: ReturnedUserDto | undefined;
+  @Input() showFirstCard = true;
   private subscriptions: Subscription[] = [];
 
   config: AppConfig;
 
-  dataset: OutputDatasetObsoleteDto | undefined;
-  user: ReturnedUserDto | undefined;
+  // dataset: OutputDatasetObsoleteDto | undefined;
+  // user: ReturnedUserDto | undefined;
   form: FormGroup;
   showAssociatedMapQuestion = false;
   methodsList = createMethodsList();
@@ -101,34 +106,49 @@ export class OneDepComponent implements OnInit, OnDestroy {
     });
   }
 
-  ngOnInit() {
-    // initialize an array for the files to be uploaded
-    const pid = history.state.pid;
-    this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
-    this.fileTypes = [];
-    this.mainContour = 0.0;
-    //  connected in the depositor component
-    // this.store.dispatch(fromActions.connectToDepositor());
-
-    this.store.select(selectCurrentDataset).subscribe((dataset) => {
-      this.dataset = dataset;
-      if (dataset) {
-        this.form.patchValue({
-          metadata: this.dataset.scientificMetadata,
-        });
-      }
-    });
+  // ngOnInit() {
+  //   // initialize an array for the files to be uploaded
+  //   const pid = history.state.pid;
+  //   this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
+  //   this.fileTypes = [];
+  //   this.mainContour = 0.0;
+  //   //  connected in the depositor component
+  //   // this.store.dispatch(fromActions.connectToDepositor());
+
+  //   this.store.select(selectCurrentDataset).subscribe((dataset) => {
+  //     this.dataset = dataset;
+  //     if (dataset) {
+  //       this.form.patchValue({
+  //         metadata: this.dataset.scientificMetadata,
+  //       });
+  //     }
+  //   });
+
+  //   this.subscriptions.push(
+  //     this.store.select(selectCurrentUser).subscribe((user) => {
+  //       if (user) {
+  //         this.user = user;
+  //         this.form.patchValue({
+  //           email: this.user?.email || "",
+  //         });
+  //       }
+  //     }),
+  //   );
+  // }
+
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes['dataset'] && this.dataset) {
+      this.form.patchValue({
+        metadata: this.dataset.scientificMetadata,
+      });
+    }
 
-    this.subscriptions.push(
-      this.store.select(selectCurrentUser).subscribe((user) => {
-        if (user) {
-          this.user = user;
-          this.form.patchValue({
-            email: this.user?.email || "",
-          });
-        }
-      }),
-    );
+    if (changes['user'] && this.user) {
+      this.form.patchValue({
+        email: this.user.email || '',
+      });
+    }
   }
 
   ngOnDestroy() {

From 59952191dee9914fcfc6f34fc8772bf7a982224f Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 19 May 2025 07:23:41 +0000
Subject: [PATCH 181/245] fix initaial state before connecting to backend

---
 .../state-management/effects/ingestor.effect.ts  | 16 ++++------------
 .../reducers/ingestor.reducer.ts                 | 16 ++++------------
 src/app/state-management/state/ingestor.store.ts |  2 +-
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index 6f80b7fea2..b24bd933df 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Actions, createEffect, ofType } from "@ngrx/effects";
 import { of } from "rxjs";
-import { catchError, map, switchMap, finalize } from "rxjs/operators"; // Import finalize
+import { catchError, map, switchMap, takeUntil } from "rxjs/operators"; // Import finalize
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Ingestor } from "shared/sdk/apis/ingestor.service";
 import {
@@ -21,10 +21,7 @@ export class IngestorEffects {
   connectToIngestor$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(fromActions.connectIngestor),
-      switchMap(() =>
-        of(fromActions.startConnectingIngestor()).pipe(
-          switchMap(() => {
-            console.log("GET VERSION")
+      switchMap(() =>{
             return this.ingestor.getVersion().pipe(
               switchMap((versionResponse) =>
                 this.ingestor.getHealth().pipe(
@@ -66,14 +63,9 @@ export class IngestorEffects {
               catchError((err) =>
                 of(fromActions.connectIngestorFailure({ err })),
               ),
-              finalize(() => {
-                // Dispatch stopConnectingIngestor after the process is complete
-                of(fromActions.stopConnectingIngestor());
-              }),
+              takeUntil(this.actions$.pipe(ofType(fromActions.resetIngestorComponent)))
             );
-          }),
-        ),
-      ),
+      }),
     );
   });
 
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index ffe0171f6a..75ea51ac5c 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -59,19 +59,12 @@ const reducer = createReducer(
     }),
   ),
   on(
-    fromActions.startConnectingIngestor,
+    fromActions.connectIngestor,
     (state): IngestorState => ({
       ...state,
       connectingBackend: true,
     }),
   ),
-  on(
-    fromActions.stopConnectingIngestor,
-    (state): IngestorState => ({
-      ...state,
-      connectingBackend: false,
-    }),
-  ),
   on(
     fromActions.connectIngestorSuccess,
     (
@@ -79,6 +72,7 @@ const reducer = createReducer(
       { versionResponse, userInfoResponse, authIsDisabled, healthResponse },
     ): IngestorState => ({
       ...state,
+      connectingBackend: false,
       ingestorStatus: {
         versionResponse,
         healthResponse,
@@ -94,6 +88,7 @@ const reducer = createReducer(
     fromActions.connectIngestorFailure,
     (state, { err }): IngestorState => ({
       ...state,
+      connectingBackend: false,
       ingestorStatus: {
         ...state.ingestorStatus,
         validEndpoint: false,
@@ -178,9 +173,6 @@ const reducer = createReducer(
   ),
   on(
     fromActions.resetIngestorComponent,
-    (state): IngestorState => ({
-      ...state,
-      ...initialIngestorState,
-    }),
+    (): IngestorState => initialIngestorState
   )
 );
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 44bc2f897b..9e3902e31e 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -44,7 +44,7 @@ export const initialIngestorState: IngestorState = {
   ingestorStatus: {
     versionResponse: null,
     healthResponse: null,
-    validEndpoint: true,
+    validEndpoint: false,
   },
   ingestorAuth: null,
   ingestorEndpoint: "",

From 59a8cea8fbf7f2bc5acad379455a482f420500f5 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 19 May 2025 10:01:57 +0000
Subject: [PATCH 182/245] refactor

---
 .../datasets.routing.module.ts                |  4 +-
 src/app/datasets/datasets.module.ts           | 14 +++----
 .../depositor/depositor.component.html        | 40 ++++++++++++++-----
 .../depositor/depositor.component.scss        | 26 +++++++++++-
 .../datasets/depositor/depositor.component.ts | 15 +++----
 .../empiar/customRenderers/authorRenderer.ts  |  0
 .../empiar/customRenderers/enumRenderer.ts    |  0
 .../customRenderers/imagesSetRenderer.ts      |  0
 .../customRenderers/referenceRenderer.ts      |  0
 .../customRenderers/renderer.styles.scss      |  0
 .../empiar/depositionEMPIAR.ts                |  0
 .../empiar/empiar.component.html              |  0
 .../empiar/empiar.component.scss              |  0
 .../empiar/empiar.component.spec.ts           |  2 +-
 .../empiar/empiar.component.ts                |  0
 .../empiar/schemasUI/citationUI.json          |  0
 .../schemasUI/correspondingAuthorUI.json      |  0
 .../empiar/schemasUI/generalQuestionUI.json   |  0
 .../empiar/schemasUI/imageSetsUI.json         |  0
 .../empiar/schemasUI/piInfoUI.json            |  0
 .../onedep/onedep.component.html              |  1 +
 .../onedep/onedep.component.scss              |  0
 .../onedep/onedep.component.ts                |  2 +
 .../onedep/onedep.components.spec.ts          |  0
 .../onedep/onedep.directive.ts                |  0
 .../onedep/types/methods.enum.ts              |  0
 src/app/shared/sdk/models/OneDep.ts           |  2 +-
 .../effects/depositor.effects.ts              |  2 +-
 28 files changed, 75 insertions(+), 33 deletions(-)
 rename src/app/datasets/{ => depositor}/empiar/customRenderers/authorRenderer.ts (100%)
 rename src/app/datasets/{ => depositor}/empiar/customRenderers/enumRenderer.ts (100%)
 rename src/app/datasets/{ => depositor}/empiar/customRenderers/imagesSetRenderer.ts (100%)
 rename src/app/datasets/{ => depositor}/empiar/customRenderers/referenceRenderer.ts (100%)
 rename src/app/datasets/{ => depositor}/empiar/customRenderers/renderer.styles.scss (100%)
 rename src/app/datasets/{ => depositor}/empiar/depositionEMPIAR.ts (100%)
 rename src/app/datasets/{ => depositor}/empiar/empiar.component.html (100%)
 rename src/app/datasets/{ => depositor}/empiar/empiar.component.scss (100%)
 rename src/app/datasets/{ => depositor}/empiar/empiar.component.spec.ts (88%)
 rename src/app/datasets/{ => depositor}/empiar/empiar.component.ts (100%)
 rename src/app/datasets/{ => depositor}/empiar/schemasUI/citationUI.json (100%)
 rename src/app/datasets/{ => depositor}/empiar/schemasUI/correspondingAuthorUI.json (100%)
 rename src/app/datasets/{ => depositor}/empiar/schemasUI/generalQuestionUI.json (100%)
 rename src/app/datasets/{ => depositor}/empiar/schemasUI/imageSetsUI.json (100%)
 rename src/app/datasets/{ => depositor}/empiar/schemasUI/piInfoUI.json (100%)
 rename src/app/datasets/{ => depositor}/onedep/onedep.component.html (99%)
 rename src/app/datasets/{ => depositor}/onedep/onedep.component.scss (100%)
 rename src/app/datasets/{ => depositor}/onedep/onedep.component.ts (99%)
 rename src/app/datasets/{ => depositor}/onedep/onedep.components.spec.ts (100%)
 rename src/app/datasets/{ => depositor}/onedep/onedep.directive.ts (100%)
 rename src/app/datasets/{ => depositor}/onedep/types/methods.enum.ts (100%)

diff --git a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
index 5af1ab6c9b..9cbbcce7c9 100644
--- a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
+++ b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
@@ -5,8 +5,8 @@ import { BatchViewComponent } from "datasets/batch-view/batch-view.component";
 import { DashboardComponent } from "datasets/dashboard/dashboard.component";
 import { DatablocksComponent } from "datasets/datablocks-table/datablocks-table.component";
 import { DatasetDetailsDashboardComponent } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
-import { OneDepComponent } from "datasets/onedep/onedep.component";
-import { EmpiarComponent } from "datasets/empiar/empiar.component";
+import { OneDepComponent } from "datasets/depositor/onedep/onedep.component";
+import { EmpiarComponent } from "datasets/depositor/empiar/empiar.component";
 import { DepositorWrapperComponent } from "datasets/depositor/methodWrapper.component"
 import { PublishComponent } from "datasets/publish/publish.component";
 
diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 91ce03a31c..9200f468b8 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -83,9 +83,9 @@ import { CdkDrag, CdkDragHandle, CdkDropList } from "@angular/cdk/drag-drop";
 import { FiltersModule } from "shared/modules/filters/filters.module";
 import { userReducer } from "state-management/reducers/user.reducer";
 import { MatSnackBarModule } from "@angular/material/snack-bar";
-import { OneDepComponent } from "./onedep/onedep.component";
-import { OrcidFormatterDirective } from "./onedep/onedep.directive";
-import { EmpiarComponent } from "./empiar/empiar.component";
+import { OneDepComponent } from "./depositor/onedep/onedep.component";
+import { OrcidFormatterDirective } from "./depositor/onedep/onedep.directive";
+import { EmpiarComponent } from "./depositor/empiar/empiar.component";
 import { OneDepEffects } from "state-management/effects/depositor.effects";
 import { DepositorComponent } from "./depositor/depositor.component";
 import { DepositorWrapperComponent } from "./depositor/methodWrapper.component"
@@ -94,10 +94,10 @@ import { onedepReducer } from "state-management/reducers/onedep.reducer";
 import { empiarReducer } from "state-management/reducers/empiar.reducer";
 import { JsonFormsModule } from "@jsonforms/angular";
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
-import { CustomEnumRendererComponent } from "./empiar/customRenderers/enumRenderer";
-import { CustomAuthorNameControlComponent } from "./empiar/customRenderers/authorRenderer";
-import { CustomReferenceControlComponent } from "./empiar/customRenderers/referenceRenderer";
-import { CustomSemiEnumControlComponent } from "./empiar/customRenderers/imagesSetRenderer";
+import { CustomEnumRendererComponent } from "./depositor/empiar/customRenderers/enumRenderer";
+import { CustomAuthorNameControlComponent } from "./depositor/empiar/customRenderers/authorRenderer";
+import { CustomReferenceControlComponent } from "./depositor/empiar/customRenderers/referenceRenderer";
+import { CustomSemiEnumControlComponent } from "./depositor/empiar/customRenderers/imagesSetRenderer";
 import { DatasetDetailDynamicComponent } from "./dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component";
 import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-wrapper.component";
 
diff --git a/src/app/datasets/depositor/depositor.component.html b/src/app/datasets/depositor/depositor.component.html
index c74aaa9cbf..3f4943c7b1 100644
--- a/src/app/datasets/depositor/depositor.component.html
+++ b/src/app/datasets/depositor/depositor.component.html
@@ -53,16 +53,36 @@
           </div>
           Select Deposition Repository:
         </mat-card-header>
-      
-        <mat-form-field class="method-name">
-          <mat-label>Experimental Method</mat-label>
-          <mat-select required [formControl]="depositionRepository" (selectionChange)="onChooseRepo()">
-            <mat-option *ngFor="let repo of supportedDepositionList" [value]="repo.value">
-              {{ repo.viewValue }}
-            </mat-option>
-          </mat-select>
-         
-        </mat-form-field>
+
+        <mat-card-content>
+          <div class="deposition-info-container">
+            <p class="deposition-info">
+              Before proceeding with deposition, please ensure that the scientific metadata for this dataset is complete and accurate.
+              You can verify and adjust the metadata in the "Details" section or update it using the OpenEM schema.
+            </p>
+            <button
+              class="ingestor"
+              mat-raised-button
+              color="primary"
+              (click)="onChangeIngestorMetadata()"
+            >
+              Edit with OpenEM Schema
+            </button>
+          </div>
+
+          <mat-form-field class="method-name">
+            <mat-label>Experimental Method</mat-label>
+            <mat-select required [formControl]="depositionRepository" (selectionChange)="onChooseRepo()">
+              <mat-option *ngFor="let repo of supportedDepositionList" [value]="repo.value">
+                {{ repo.viewValue }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </mat-card-content>
+
+    
+
+      <!------  here put scientific Metadata ------>
       </mat-card>
       <div class="deposition-cards">
         <mat-card *ngIf="selectedMethod === 'onedep'">
diff --git a/src/app/datasets/depositor/depositor.component.scss b/src/app/datasets/depositor/depositor.component.scss
index 7beca09cfc..b24419345d 100644
--- a/src/app/datasets/depositor/depositor.component.scss
+++ b/src/app/datasets/depositor/depositor.component.scss
@@ -54,5 +54,29 @@ mat-card {
       }
     }
   }
-}
+  .deposition-info-container {
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+
+    margin: 1.5rem 3rem 1.5rem 3rem;
 
+    min-width: 12rem;
+    align-self: left;
+    width: 40%;
+  }
+
+  .deposition-info {
+    margin: 0;
+    font-size: 0.95rem;
+    line-height: 1.5;
+    color: #444;
+  }
+  .ingestor {
+    align-self: flex-start;
+    width: 300px;  
+    // margin-bottom: 1rem;
+    background-color: #B3D9AC;
+    color:black;
+  }
+}
diff --git a/src/app/datasets/depositor/depositor.component.ts b/src/app/datasets/depositor/depositor.component.ts
index 84e65c966c..71167401a0 100644
--- a/src/app/datasets/depositor/depositor.component.ts
+++ b/src/app/datasets/depositor/depositor.component.ts
@@ -103,16 +103,11 @@ export class DepositorComponent implements OnInit, OnDestroy {
   }
 
   onChooseRepo() {
-    // const id = encodeURIComponent(this.dataset.pid);
-    // if (this.depositionRepository.value === "onedep") {
-    //   this.router.navigate(["/datasets", id, "onedep"], {
-    //     state: { pid: this.dataset.pid },
-    //   });
-    // } else if (this.depositionRepository.value === "empiar") {
-    //   this.router.navigate(["/datasets", id, "empiar"], {
-    //     state: { pid: this.dataset.pid },
-    //   });
-    // }
     this.selectedMethod = this.depositionRepository.value;
   }
+
+  onChangeIngestorMetadata(){
+    console.log("Ingestor metadata changes");
+  }
+
 }
diff --git a/src/app/datasets/empiar/customRenderers/authorRenderer.ts b/src/app/datasets/depositor/empiar/customRenderers/authorRenderer.ts
similarity index 100%
rename from src/app/datasets/empiar/customRenderers/authorRenderer.ts
rename to src/app/datasets/depositor/empiar/customRenderers/authorRenderer.ts
diff --git a/src/app/datasets/empiar/customRenderers/enumRenderer.ts b/src/app/datasets/depositor/empiar/customRenderers/enumRenderer.ts
similarity index 100%
rename from src/app/datasets/empiar/customRenderers/enumRenderer.ts
rename to src/app/datasets/depositor/empiar/customRenderers/enumRenderer.ts
diff --git a/src/app/datasets/empiar/customRenderers/imagesSetRenderer.ts b/src/app/datasets/depositor/empiar/customRenderers/imagesSetRenderer.ts
similarity index 100%
rename from src/app/datasets/empiar/customRenderers/imagesSetRenderer.ts
rename to src/app/datasets/depositor/empiar/customRenderers/imagesSetRenderer.ts
diff --git a/src/app/datasets/empiar/customRenderers/referenceRenderer.ts b/src/app/datasets/depositor/empiar/customRenderers/referenceRenderer.ts
similarity index 100%
rename from src/app/datasets/empiar/customRenderers/referenceRenderer.ts
rename to src/app/datasets/depositor/empiar/customRenderers/referenceRenderer.ts
diff --git a/src/app/datasets/empiar/customRenderers/renderer.styles.scss b/src/app/datasets/depositor/empiar/customRenderers/renderer.styles.scss
similarity index 100%
rename from src/app/datasets/empiar/customRenderers/renderer.styles.scss
rename to src/app/datasets/depositor/empiar/customRenderers/renderer.styles.scss
diff --git a/src/app/datasets/empiar/depositionEMPIAR.ts b/src/app/datasets/depositor/empiar/depositionEMPIAR.ts
similarity index 100%
rename from src/app/datasets/empiar/depositionEMPIAR.ts
rename to src/app/datasets/depositor/empiar/depositionEMPIAR.ts
diff --git a/src/app/datasets/empiar/empiar.component.html b/src/app/datasets/depositor/empiar/empiar.component.html
similarity index 100%
rename from src/app/datasets/empiar/empiar.component.html
rename to src/app/datasets/depositor/empiar/empiar.component.html
diff --git a/src/app/datasets/empiar/empiar.component.scss b/src/app/datasets/depositor/empiar/empiar.component.scss
similarity index 100%
rename from src/app/datasets/empiar/empiar.component.scss
rename to src/app/datasets/depositor/empiar/empiar.component.scss
diff --git a/src/app/datasets/empiar/empiar.component.spec.ts b/src/app/datasets/depositor/empiar/empiar.component.spec.ts
similarity index 88%
rename from src/app/datasets/empiar/empiar.component.spec.ts
rename to src/app/datasets/depositor/empiar/empiar.component.spec.ts
index 24c4b1d590..0987d152bb 100644
--- a/src/app/datasets/empiar/empiar.component.spec.ts
+++ b/src/app/datasets/depositor/empiar/empiar.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { EmpiarComponent } from "./empiar.component";
+import { EmpiarComponent } from "../../empiar/empiar.component";
 
 describe("EmpiarComponent", () => {
   let component: EmpiarComponent;
diff --git a/src/app/datasets/empiar/empiar.component.ts b/src/app/datasets/depositor/empiar/empiar.component.ts
similarity index 100%
rename from src/app/datasets/empiar/empiar.component.ts
rename to src/app/datasets/depositor/empiar/empiar.component.ts
diff --git a/src/app/datasets/empiar/schemasUI/citationUI.json b/src/app/datasets/depositor/empiar/schemasUI/citationUI.json
similarity index 100%
rename from src/app/datasets/empiar/schemasUI/citationUI.json
rename to src/app/datasets/depositor/empiar/schemasUI/citationUI.json
diff --git a/src/app/datasets/empiar/schemasUI/correspondingAuthorUI.json b/src/app/datasets/depositor/empiar/schemasUI/correspondingAuthorUI.json
similarity index 100%
rename from src/app/datasets/empiar/schemasUI/correspondingAuthorUI.json
rename to src/app/datasets/depositor/empiar/schemasUI/correspondingAuthorUI.json
diff --git a/src/app/datasets/empiar/schemasUI/generalQuestionUI.json b/src/app/datasets/depositor/empiar/schemasUI/generalQuestionUI.json
similarity index 100%
rename from src/app/datasets/empiar/schemasUI/generalQuestionUI.json
rename to src/app/datasets/depositor/empiar/schemasUI/generalQuestionUI.json
diff --git a/src/app/datasets/empiar/schemasUI/imageSetsUI.json b/src/app/datasets/depositor/empiar/schemasUI/imageSetsUI.json
similarity index 100%
rename from src/app/datasets/empiar/schemasUI/imageSetsUI.json
rename to src/app/datasets/depositor/empiar/schemasUI/imageSetsUI.json
diff --git a/src/app/datasets/empiar/schemasUI/piInfoUI.json b/src/app/datasets/depositor/empiar/schemasUI/piInfoUI.json
similarity index 100%
rename from src/app/datasets/empiar/schemasUI/piInfoUI.json
rename to src/app/datasets/depositor/empiar/schemasUI/piInfoUI.json
diff --git a/src/app/datasets/onedep/onedep.component.html b/src/app/datasets/depositor/onedep/onedep.component.html
similarity index 99%
rename from src/app/datasets/onedep/onedep.component.html
rename to src/app/datasets/depositor/onedep/onedep.component.html
index e6bc3073b6..175f47005c 100644
--- a/src/app/datasets/onedep/onedep.component.html
+++ b/src/app/datasets/depositor/onedep/onedep.component.html
@@ -48,6 +48,7 @@
           </mat-card-content>
         </mat-card>
       </div>
+
       <mat-card [formGroup]="form">
         <mat-card-header class="creator-header">
           <div mat-card-avatar class="section-icon">
diff --git a/src/app/datasets/onedep/onedep.component.scss b/src/app/datasets/depositor/onedep/onedep.component.scss
similarity index 100%
rename from src/app/datasets/onedep/onedep.component.scss
rename to src/app/datasets/depositor/onedep/onedep.component.scss
diff --git a/src/app/datasets/onedep/onedep.component.ts b/src/app/datasets/depositor/onedep/onedep.component.ts
similarity index 99%
rename from src/app/datasets/onedep/onedep.component.ts
rename to src/app/datasets/depositor/onedep/onedep.component.ts
index e199989290..28e3950a10 100644
--- a/src/app/datasets/onedep/onedep.component.ts
+++ b/src/app/datasets/depositor/onedep/onedep.component.ts
@@ -160,6 +160,7 @@ export class OneDepComponent implements OnChanges, OnDestroy {
   togglePasswordVisibility() {
     this.showPassword = !this.showPassword;
   }
+
   // custom validator of the ORCID ids
   orcidValidatorNumeric(): (
     control: AbstractControl,
@@ -610,6 +611,7 @@ export class OneDepComponent implements OnChanges, OnDestroy {
     }
     this.submit();
   }
+
   submit() {
     let body: OneDepUserInfo;
     if (this.form.value.password) {
diff --git a/src/app/datasets/onedep/onedep.components.spec.ts b/src/app/datasets/depositor/onedep/onedep.components.spec.ts
similarity index 100%
rename from src/app/datasets/onedep/onedep.components.spec.ts
rename to src/app/datasets/depositor/onedep/onedep.components.spec.ts
diff --git a/src/app/datasets/onedep/onedep.directive.ts b/src/app/datasets/depositor/onedep/onedep.directive.ts
similarity index 100%
rename from src/app/datasets/onedep/onedep.directive.ts
rename to src/app/datasets/depositor/onedep/onedep.directive.ts
diff --git a/src/app/datasets/onedep/types/methods.enum.ts b/src/app/datasets/depositor/onedep/types/methods.enum.ts
similarity index 100%
rename from src/app/datasets/onedep/types/methods.enum.ts
rename to src/app/datasets/depositor/onedep/types/methods.enum.ts
diff --git a/src/app/shared/sdk/models/OneDep.ts b/src/app/shared/sdk/models/OneDep.ts
index 428c7d31ab..2e42c1af08 100644
--- a/src/app/shared/sdk/models/OneDep.ts
+++ b/src/app/shared/sdk/models/OneDep.ts
@@ -1,4 +1,4 @@
-import { EmFile } from "../../../datasets/onedep/types/methods.enum";
+import { EmFile } from "../../../datasets/depositor/onedep/types/methods.enum";
 
 export interface DepBackendVersion {
   version: string;
diff --git a/src/app/state-management/effects/depositor.effects.ts b/src/app/state-management/effects/depositor.effects.ts
index dcc0379552..d84d1cdfcd 100644
--- a/src/app/state-management/effects/depositor.effects.ts
+++ b/src/app/state-management/effects/depositor.effects.ts
@@ -14,7 +14,7 @@ import {
   UploadedFile,
   DepBackendVersion,
 } from "shared/sdk/models/OneDep";
-import { EmFile } from "../../datasets/onedep/types/methods.enum";
+import { EmFile } from "../../datasets/depositor/onedep/types/methods.enum";
 @Injectable()
 export class OneDepEffects {
   connectToDepositor$ = createEffect(() => {

From 0cb33f06de328e755de54c4794037c7a4a331bbc Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 20 May 2025 08:21:14 +0000
Subject: [PATCH 183/245] remote invetigator

---
 .../ingestor.new-transfer-dialog-page.component.ts              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 867d3afad6..9001490b57 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -131,8 +131,6 @@ export class IngestorNewTransferDialogPageComponent
     this.createNewTransferData.scicatHeader["owner"] = "User";
 
     //this.createNewTransferData.scicatHeader["principalInvestigators"] = [this.userProfile.username];
-    this.createNewTransferData.scicatHeader["investigator"] =
-      this.userProfile.username;
     this.createNewTransferData.scicatHeader["ownerEmail"] =
       this.userProfile.email;
     this.createNewTransferData.scicatHeader["contactEmail"] =

From 395ef3566418d620e6abd9655d6e74f71ef8c918 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 21 May 2025 11:03:48 +0000
Subject: [PATCH 184/245] bugfix establish connection

---
 .../ingestor-page/ingestor.component.html     |  5 ++--
 .../ingestor-page/ingestor.component.ts       |  5 ++++
 src/app/shared/sdk/apis/ingestor.service.ts   | 28 +++++++++++--------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/app/ingestor/ingestor-page/ingestor.component.html b/src/app/ingestor/ingestor-page/ingestor.component.html
index 8fdfd11b04..8010be29d0 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor.component.html
@@ -108,7 +108,8 @@
                   </ng-container>
 
                   <ng-container matColumnDef="progress">
-                    <th mat-header-cell *matHeaderCellDef class="text-right"><b>Progress</b> </th>
+                    <th mat-header-cell *matHeaderCellDef class="text-right">
+                      <b>Progress</b> </th>
                     <td mat-cell *matCellDef="let element" class="text-right">
                       <button mat-button aria-label="Delete transfer"
                         (click)="onOpenDetailView(element.transferId)">
@@ -178,7 +179,7 @@
     </mat-card>
   </p>
 
-  <p *ngIf="connectedFacilityBackend !== '' && (authIsDisabled ||
+  <p *ngIf="!connectingToFacilityBackend && connectedFacilityBackend !== '' && (authIsDisabled ||
     userInfo?.logged_in)">
     <mat-card class="ingestor-card">
       <mat-card-header>
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 3968194421..9f9fbc521a 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -147,7 +147,9 @@ export class IngestorComponent implements OnInit, OnDestroy {
       this.ingestorStatus$.subscribe((ingestorStatus) => {
         if (!ingestorStatus.validEndpoint) {
           this.connectedFacilityBackend = "";
+          this.forwardFacilityBackend = "";
           this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+          this.onClickForwardToIngestorPage();
         } else if (
           ingestorStatus.versionResponse &&
           ingestorStatus.healthResponse
@@ -225,6 +227,9 @@ export class IngestorComponent implements OnInit, OnDestroy {
         queryParams: { backendUrl: this.forwardFacilityBackend },
       });
     }
+    else {
+      this.router.navigate(["/ingestor"]);
+    }
   }
 
   onClickDisconnectIngestor() {
diff --git a/src/app/shared/sdk/apis/ingestor.service.ts b/src/app/shared/sdk/apis/ingestor.service.ts
index 7c5d1d6b50..c5b8007c96 100644
--- a/src/app/shared/sdk/apis/ingestor.service.ts
+++ b/src/app/shared/sdk/apis/ingestor.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
 import { Observable } from "rxjs";
-import { switchMap } from "rxjs/operators";
+import { switchMap, take } from "rxjs/operators";
 import { AppConfigService } from "app-config.service";
 import {
   DeleteTransferRequest,
@@ -55,22 +55,22 @@ export class Ingestor {
   }
 
   getVersion(): Observable<OtherVersionResponse> {
-    return this.store
-      .select(selectIngestorEndpoint)
-      .pipe(
-        switchMap((ingestorEndpoint) =>
-          this.http.get<OtherVersionResponse>(
-            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION}`,
-            this.getRequestOptions(),
-          ),
-        ),
-      );
+    return this.store.select(selectIngestorEndpoint).pipe(
+      take(1),
+      switchMap((endpoint) =>
+        this.http.get<OtherVersionResponse>(
+          `${endpoint}/${INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION}`,
+          this.getRequestOptions(),
+        )
+      )
+    );
   }
 
   getUserInfo(): Observable<UserInfo> {
     return this.store
       .select(selectIngestorEndpoint)
       .pipe(
+        take(1),
         switchMap((ingestorEndpoint) =>
           this.http.get<UserInfo>(
             `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.AUTH.USERINFO}`,
@@ -84,6 +84,7 @@ export class Ingestor {
     return this.store
       .select(selectIngestorEndpoint)
       .pipe(
+        take(1),
         switchMap((ingestorEndpoint) =>
           this.http.get<OtherHealthResponse>(
             `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.OTHER.HEALTH}`,
@@ -99,6 +100,7 @@ export class Ingestor {
     return this.store
       .select(selectIngestorEndpoint)
       .pipe(
+        take(1),
         switchMap((ingestorEndpoint) =>
           this.http.delete<DeleteTransferResponse>(
             `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
@@ -124,6 +126,7 @@ export class Ingestor {
     return this.store
       .select(selectIngestorEndpoint)
       .pipe(
+        take(1),
         switchMap((ingestorEndpoint) =>
           this.http.get<GetTransferResponse>(
             `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
@@ -137,6 +140,7 @@ export class Ingestor {
     return this.store
       .select(selectIngestorEndpoint)
       .pipe(
+        take(1),
         switchMap((ingestorEndpoint) =>
           this.http.post<PostDatasetResponse>(
             `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET}`,
@@ -158,6 +162,7 @@ export class Ingestor {
     return this.store
       .select(selectIngestorEndpoint)
       .pipe(
+        take(1),
         switchMap((ingestorEndpoint) =>
           this.http.get<GetExtractorResponse>(
             `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.EXTRACTOR}`,
@@ -180,6 +185,7 @@ export class Ingestor {
     return this.store
       .select(selectIngestorEndpoint)
       .pipe(
+        take(1),
         switchMap((ingestorEndpoint) =>
           this.http.get<GetBrowseDatasetResponse>(
             `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET_BROWSE}`,

From c9d09bdd010afa04ae0ee1aaa948f02b6c8fb55a Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 21 May 2025 11:12:16 +0000
Subject: [PATCH 185/245] improved timing when reset facility backend

---
 src/app/ingestor/ingestor-page/ingestor.component.html | 2 +-
 src/app/ingestor/ingestor-page/ingestor.component.ts   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/ingestor/ingestor-page/ingestor.component.html b/src/app/ingestor/ingestor-page/ingestor.component.html
index 8010be29d0..768947bbfd 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor.component.html
@@ -36,7 +36,7 @@
                 [(ngModel)]="forwardFacilityBackend">
             </mat-form-field>
             <button mat-raised-button color="primary"
-              (click)="onClickForwardToIngestorPage()">Connect</button>
+              (click)="onClickForwardToIngestorPage(forwardFacilityBackend)">Connect</button>
 
             <div>
               <ul>
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 9f9fbc521a..911b8dbb64 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -147,7 +147,6 @@ export class IngestorComponent implements OnInit, OnDestroy {
       this.ingestorStatus$.subscribe((ingestorStatus) => {
         if (!ingestorStatus.validEndpoint) {
           this.connectedFacilityBackend = "";
-          this.forwardFacilityBackend = "";
           this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
           this.onClickForwardToIngestorPage();
         } else if (
@@ -221,10 +220,10 @@ export class IngestorComponent implements OnInit, OnDestroy {
     );
   }
 
-  onClickForwardToIngestorPage() {
-    if (this.forwardFacilityBackend) {
+  onClickForwardToIngestorPage(nextFacilityBackend?: string) {
+    if (nextFacilityBackend) {
       this.router.navigate(["/ingestor"], {
-        queryParams: { backendUrl: this.forwardFacilityBackend },
+        queryParams: { backendUrl: nextFacilityBackend },
       });
     }
     else {

From ff9b929d14794b22704c410111fd83ea1eff3f7e Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 21 May 2025 11:51:05 +0000
Subject: [PATCH 186/245] store last used backends in local storage

---
 ....confirm-transfer-dialog-page.component.ts |  6 +--
 .../ingestor.dialog-stepper.component.ts      |  4 +-
 .../helper/ingestor.component-helper.ts       | 45 ++++++++-----------
 .../ingestor-page/ingestor.component.html     | 16 +++++--
 .../ingestor-page/ingestor.component.scss     | 11 +++++
 .../ingestor-page/ingestor.component.ts       | 21 ++++-----
 6 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index 597fb92d5a..bbe6ac89ca 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -9,7 +9,6 @@ import {
 import {
   IngestionRequestInformation,
   IngestorHelper,
-  SciCatHeader,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { Store } from "@ngrx/store";
 import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
@@ -18,6 +17,7 @@ import { MatCheckboxChange } from "@angular/material/checkbox";
 import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Subscription } from "rxjs";
+import { CreateDatasetDto } from "@scicatproject/scicat-sdk-ts-angular";
 
 @Component({
   selector: "ingestor-confirm-transfer-dialog-page",
@@ -71,8 +71,8 @@ export class IngestorConfirmTransferDialogPageComponent
 
   createMetaDataString(): string {
     const space = 2;
-    const scicatMetadata: SciCatHeader = {
-      ...(this.createNewTransferData.scicatHeader as SciCatHeader),
+    const scicatMetadata: CreateDatasetDto = {
+      ...(this.createNewTransferData.scicatHeader as CreateDatasetDto),
       scientificMetadata: {
         organizational:
           this.createNewTransferData.userMetaData["organizational"],
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 0b652f3563..541120bcdb 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -3,7 +3,6 @@ import { MatDialog } from "@angular/material/dialog";
 import {
   IngestionRequestInformation,
   IngestorHelper,
-  SciCatHeader,
 } from "../../ingestor-page/helper/ingestor.component-helper";
 import { IngestorConfirmationDialogComponent } from "../confirmation-dialog/ingestor.confirmation-dialog.component";
 import {
@@ -18,6 +17,7 @@ import {
 import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Subscription } from "rxjs";
+import { CreateDatasetDto } from "@scicatproject/scicat-sdk-ts-angular";
 
 @Component({
   selector: "ingestor-dialog-stepper",
@@ -123,7 +123,7 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
         if (this.createNewTransferData) {
           const sciCatHeaderWithoutSourcePath = {
             ...this.createNewTransferData.scicatHeader,
-          } as SciCatHeader;
+          } as CreateDatasetDto;
           delete sciCatHeaderWithoutSourcePath.sourceFolder;
 
           const exportData = {};
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 32fcd8644a..cc181d64dc 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -1,5 +1,5 @@
 import { JsonSchema, JsonSchema7 } from "@jsonforms/core";
-import { DatasetClass } from "@scicatproject/scicat-sdk-ts-angular";
+import { CreateDatasetDto, DatasetClass } from "@scicatproject/scicat-sdk-ts-angular";
 import { isArray } from "mathjs";
 import { PostDatasetResponse } from "shared/sdk/models/ingestor/postDatasetResponse";
 import { UserInfo } from "shared/sdk/models/ingestor/userInfo";
@@ -46,26 +46,6 @@ export interface IngestionRequestInformation {
   autoArchive: boolean;
 }
 
-// There are many more... see DerivedDataset.ts
-export interface SciCatHeader {
-  datasetName: string;
-  description: string;
-  creationLocation: string;
-  dataFormat: string;
-  ownerGroup: string;
-  type: string;
-  license: string;
-  keywords: string[];
-  sourceFolder: string;
-  scientificMetadata: ScientificMetadata;
-  principalInvestigator: string;
-  ownerEmail: string;
-  contactEmail: string;
-  investigator: string;
-  creationTime: string;
-  owner: string;
-}
-
 export interface ScientificMetadata {
   organizational: object;
   sample: object;
@@ -82,6 +62,22 @@ export interface DialogDataObject {
 }
 
 export class IngestorHelper {
+  static saveConnectionsToLocalStorage = (connections: string[]) => {
+    // Remove duplicates
+    const uniqueConnections = Array.from(new Set(connections));
+    const connectionsString = JSON.stringify(uniqueConnections);
+    localStorage.setItem("ingestorConnections", connectionsString);
+  };
+
+  static loadConnectionsFromLocalStorage = (): string[] => {
+    const connectionsString = localStorage.getItem("ingestorConnections");
+    if (connectionsString) {
+      const connections = JSON.parse(connectionsString);
+      return connections;
+    }
+    return [];
+  };
+
   static createEmptyRequestInformation = (): IngestionRequestInformation => {
     return {
       selectedPath: "",
@@ -158,11 +154,7 @@ export const getJsonSchemaFromDto = () => {
   // 0 => number
   // -1 => skip number
   // -2 => optional number
-  const emptyDatasetForSchema: DatasetClass = {
-    createdBy: "--skip",
-    updatedBy: "--skip",
-    createdAt: "--dateTime",
-    updatedAt: "--dateTime --skip", // skip
+  const emptyDatasetForSchema: CreateDatasetDto = {
     ownerGroup: "--string",
     accessGroups: [],
     isPublished: false,
@@ -175,7 +167,6 @@ export const getJsonSchemaFromDto = () => {
     creationTime: "--dateTime",
     type: "raw",
     datasetName: "--string",
-    version: "--skip",
     creationLocation: "--string",
 
     // Optional fields
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.html b/src/app/ingestor/ingestor-page/ingestor.component.html
index 768947bbfd..7687cc2360 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor.component.html
@@ -28,7 +28,7 @@
         </div>
         <div *ngIf="!connectingToFacilityBackend">
           <ng-container *ngIf="connectedFacilityBackend === ''">
-            <p style="color: red;">No Backend connected</p>
+            <p class="confirm-message-error">No Backend connected</p>
 
             <p>Please provide a valid Backend URL</p>
             <mat-form-field>
@@ -38,11 +38,18 @@
             <button mat-raised-button color="primary"
               (click)="onClickForwardToIngestorPage(forwardFacilityBackend)">Connect</button>
 
-            <div>
+            <div *ngIf="lastUsedFacilityBackends.length > 0"
+              class="last-used-facility-backends">
+              <p>Last used facility backends:</p>
               <ul>
-                <li *ngFor="let backend of lastUsedFacilityBackends">
+                <li *ngFor="let backend of lastUsedFacilityBackends"
+                  class="vertical-center-list-item">
                   <a (click)="onClickSelectFacilityBackend(backend)">{{ backend
                     }}</a>
+
+                  <a (click)="onClickDeleteStoredFacilityBackend(backend)">
+                    <mat-icon>remove_circle</mat-icon>
+                  </a>
                 </li>
               </ul>
             </div>
@@ -109,7 +116,8 @@
 
                   <ng-container matColumnDef="progress">
                     <th mat-header-cell *matHeaderCellDef class="text-right">
-                      <b>Progress</b> </th>
+                      <b>Progress</b>
+                    </th>
                     <td mat-cell *matCellDef="let element" class="text-right">
                       <button mat-button aria-label="Delete transfer"
                         (click)="onOpenDetailView(element.transferId)">
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.scss b/src/app/ingestor/ingestor-page/ingestor.component.scss
index d5fe027c4b..43cc89eb08 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.scss
+++ b/src/app/ingestor/ingestor-page/ingestor.component.scss
@@ -131,3 +131,14 @@ mat-card {
 .confirm-message-error {
   color: red;
 }
+
+.vertical-center-list-item {
+  display: flex;
+  align-items: center;
+  gap: 0.5em;
+}
+
+.last-used-facility-backends {
+  color: grey;
+  margin-top: 1em;
+}
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 911b8dbb64..5d879bb03f 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -96,7 +96,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
   ) { }
 
   ngOnInit() {
-    this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+    this.lastUsedFacilityBackends = IngestorHelper.loadConnectionsFromLocalStorage();
 
     // Fetch the API token that the ingestor can authenticate to scicat as the user
     this.subscriptions.push(
@@ -147,7 +147,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
       this.ingestorStatus$.subscribe((ingestorStatus) => {
         if (!ingestorStatus.validEndpoint) {
           this.connectedFacilityBackend = "";
-          this.lastUsedFacilityBackends = this.loadLastUsedFacilityBackends();
+          this.lastUsedFacilityBackends = IngestorHelper.loadConnectionsFromLocalStorage();
           this.onClickForwardToIngestorPage();
         } else if (
           ingestorStatus.versionResponse &&
@@ -222,6 +222,8 @@ export class IngestorComponent implements OnInit, OnDestroy {
 
   onClickForwardToIngestorPage(nextFacilityBackend?: string) {
     if (nextFacilityBackend) {
+      IngestorHelper.saveConnectionsToLocalStorage([...this.lastUsedFacilityBackends, nextFacilityBackend]);
+
       this.router.navigate(["/ingestor"], {
         queryParams: { backendUrl: nextFacilityBackend },
       });
@@ -244,14 +246,13 @@ export class IngestorComponent implements OnInit, OnDestroy {
     this.forwardFacilityBackend = facilityBackend;
   }
 
-  loadLastUsedFacilityBackends(): string[] {
-    // Load the list from the local Storage
-    const lastUsedFacilityBackends =
-      '["https://ingestor.development.psi.ch", "http://localhost:8800", "http://localhost:8000", "http://localhost:8888" ]';
-    if (lastUsedFacilityBackends) {
-      return JSON.parse(lastUsedFacilityBackends);
-    }
-    return [];
+  onClickDeleteStoredFacilityBackend(facilityBackend: string) {
+    const filteredFacilityBackends = this.lastUsedFacilityBackends.filter(
+      (backend) => backend !== facilityBackend,
+    );
+
+    IngestorHelper.saveConnectionsToLocalStorage(filteredFacilityBackends);
+    this.lastUsedFacilityBackends = filteredFacilityBackends;
   }
 
   onClickAddIngestion(): void {

From aea0d6be3f77640c17f7b76627b19ea52b3f142c Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 21 May 2025 12:41:08 +0000
Subject: [PATCH 187/245] improve styling

---
 ...ingestor.confirm-transfer-dialog-page.html |  27 +--
 ...gestor.extractor-metadata-dialog-page.html |  30 +--
 .../ingestor.new-transfer-dialog-page.html    |  25 ++-
 .../ingestor.user-metadata-dialog-page.html   | 178 +++++++++---------
 .../ingestor-metadata-editor.component.ts     |   5 +-
 .../ingestor-page/ingestor.component.scss     |  13 +-
 .../ingestor-page/ingestor.component.ts       |   1 +
 7 files changed, 155 insertions(+), 124 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
index 4ce39631b4..8ca2724b1c 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
@@ -1,14 +1,20 @@
-<div class="ingestor-mixed-header">
-  <h2 mat-dialog-title>
-    Confirm transfer
-  </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close"
-    class="ingestor-close-button">
-    <mat-icon>close</mat-icon>
-  </button>
+<div class="ingestor-dialog-header">
+  <div class="ingestor-mixed-header">
+    <h2 mat-dialog-title>
+      Confirm transfer
+    </h2>
+    <button mat-icon-button mat-dialog-close aria-label="Close"
+      class="ingestor-close-button">
+      <mat-icon>close</mat-icon>
+    </button>
+  </div>
+
+  <div class="ingestor-stepper-header">
+    <ingestor-dialog-stepper [activeStep]="3"></ingestor-dialog-stepper>
+  </div>
 </div>
+
 <mat-dialog-content class="mat-typography">
-  <ingestor-dialog-stepper [activeStep]="3"></ingestor-dialog-stepper>
 
   <p
     *ngIf="createNewTransferData.apiInformation.ingestionRequestErrorMessage !== ''">
@@ -60,8 +66,7 @@ <h2 mat-dialog-title>
       </mat-card-header>
       <mat-card-content class="ingestor-vertical-layout">
         <mat-checkbox [(ngModel)]="createNewTransferData.autoArchive"
-          (change)="onAutoArchiveChange($event)"
-          aria-label="Auto Archive">
+          (change)="onAutoArchiveChange($event)" aria-label="Auto Archive">
           Auto Archive
         </mat-checkbox>
         <p class="checkbox-description">
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
index 2ae3f2be45..042e246d7c 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
@@ -1,12 +1,19 @@
-<div class="ingestor-mixed-header">
-  <h2 mat-dialog-title>
-    Correct dataset-specific metadata
-  </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close"
-    class="ingestor-close-button">
-    <mat-icon>close</mat-icon>
-  </button>
+<div class="ingestor-dialog-header">
+  <div class="ingestor-mixed-header">
+    <h2 mat-dialog-title>
+      Correct dataset-specific metadata
+    </h2>
+    <button mat-icon-button mat-dialog-close aria-label="Close"
+      class="ingestor-close-button">
+      <mat-icon>close</mat-icon>
+    </button>
+  </div>
+
+  <div class="ingestor-stepper-header">
+    <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
+  </div>
 </div>
+
 <mat-dialog-content class="mat-typography">
 
   <div *ngIf="!extractorMetaDataReady || extractorMetaDataError"
@@ -27,7 +34,6 @@ <h2 mat-dialog-title>
   </div>
 
   <div *ngIf="extractorMetaDataReady">
-    <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
     <div *ngIf="extractorMetaDataError" class="error-message">
       <mat-card class="error-card">
         <mat-card-header>
@@ -58,7 +64,8 @@ <h2 mat-dialog-title>
               'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.instrument">
-            <app-metadata-editor #instrumentMetadataEditor *ngIf="!updateEditorFromThirdParty"
+            <app-metadata-editor #instrumentMetadataEditor
+              *ngIf="!updateEditorFromThirdParty"
               [schema]="metadataSchemaInstrument"
               [renderView]="activeRenderView"
               [data]="createNewTransferData.extractorMetaData['instrument']"
@@ -83,7 +90,8 @@ <h2 mat-dialog-title>
               'expand_less' : 'expand_more' }}</mat-icon>
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.acquisition">
-            <app-metadata-editor #acquisitionMetadataEditor *ngIf="!updateEditorFromThirdParty"
+            <app-metadata-editor #acquisitionMetadataEditor
+              *ngIf="!updateEditorFromThirdParty"
               [schema]="metadataSchemaAcquisition"
               [renderView]="activeRenderView"
               [data]="createNewTransferData.extractorMetaData['acquisition']"
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index c3bbc2ccac..d5f40e9e70 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -1,15 +1,20 @@
-<div class="ingestor-mixed-header">
-  <h2 mat-dialog-title>
-    Select your ingestion method
-  </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close"
-    class="ingestor-close-button">
-    <mat-icon>close</mat-icon>
-  </button>
+<div class="ingestor-dialog-header">
+  <div class="ingestor-mixed-header">
+    <h2 mat-dialog-title>
+      Select your ingestion method
+    </h2>
+    <button mat-icon-button mat-dialog-close aria-label="Close"
+      class="ingestor-close-button">
+      <mat-icon>close</mat-icon>
+    </button>
+  </div>
+
+  <div class="ingestor-stepper-header">
+    <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
+  </div>
 </div>
-<mat-dialog-content class="mat-typography" disableClose="true">
-  <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
 
+<mat-dialog-content class="mat-typography" disableClose="true">
   <div>
     <mat-card class="ingestor-card">
       <mat-card-header class="ingestor-mixed-header">
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
index a1e29cbd43..c68134fab3 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
@@ -1,97 +1,97 @@
-<div class="ingestor-mixed-header">
-  <h2 mat-dialog-title>
-    Fill out user-specific metadata
-  </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close"
-    class="ingestor-close-button">
-    <mat-icon>close</mat-icon>
-  </button>
+<div class="ingestor-dialog-header">
+  <div class="ingestor-mixed-header">
+    <h2 mat-dialog-title>
+      Fill out user-specific metadata
+    </h2>
+    <button mat-icon-button mat-dialog-close aria-label="Close"
+      class="ingestor-close-button">
+      <mat-icon>close</mat-icon>
+    </button>
+  </div>
+
+  <div class="ingestor-stepper-header">
+    <ingestor-dialog-stepper [activeStep]="1"></ingestor-dialog-stepper>
+  </div>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
-  <ingestor-dialog-stepper [activeStep]="1"></ingestor-dialog-stepper>
 
-  <div fxLayout="row" fxLayout.xs="column">
-    <div fxFlex="80%">
-      <mat-card>
-        <mat-card-header class="scicat-header"
-          (click)="toggleCardContent('scicat')">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> info </mat-icon>
-          </div>
-          SciCat Information
-          <span class="spacer"></span>
-          <mat-icon
-            [matTooltip]="isSciCatHeaderOk ? 'Your input is correct.' : scicatHeaderErrors"
-            [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'">{{
-            isSciCatHeaderOk ? 'check_circle_outline' :
-            'error_outline'}}</mat-icon>
-          <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ?
-            'expand_less' : 'expand_more' }}</mat-icon>
-        </mat-card-header>
-        <mat-card-content *ngIf="isCardContentVisible.scicat">
-          <app-metadata-editor #scicatHeaderEditor
-            *ngIf="!updateEditorFromThirdParty" [schema]="scicatHeaderSchema"
-            [renderView]="activeRenderView"
-            [data]="createNewTransferData.scicatHeader"
-            (dataChange)="onDataChangeUserScicatHeader($event)"
-            (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
-        </mat-card-content>
-      </mat-card>
+  <mat-card>
+    <mat-card-header class="scicat-header"
+      (click)="toggleCardContent('scicat')">
+      <div mat-card-avatar class="section-icon">
+        <mat-icon> info </mat-icon>
+      </div>
+      SciCat Information
+      <span class="spacer"></span>
+      <mat-icon
+        [matTooltip]="isSciCatHeaderOk ? 'Your input is correct.' : scicatHeaderErrors"
+        [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'">{{
+        isSciCatHeaderOk ? 'check_circle_outline' :
+        'error_outline'}}</mat-icon>
+      <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ?
+        'expand_less' : 'expand_more' }}</mat-icon>
+    </mat-card-header>
+    <mat-card-content *ngIf="isCardContentVisible.scicat">
+      <app-metadata-editor #scicatHeaderEditor
+        *ngIf="!updateEditorFromThirdParty" [schema]="scicatHeaderSchema"
+        [renderView]="activeRenderView"
+        [data]="createNewTransferData.scicatHeader"
+        (dataChange)="onDataChangeUserScicatHeader($event)"
+        (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
+    </mat-card-content>
+  </mat-card>
 
-      <mat-card>
-        <mat-card-header class="organizational-header"
-          (click)="toggleCardContent('organizational')">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> person </mat-icon>
-          </div>
-          Organizational Information
-          <span class="spacer"></span>
-          <mat-icon
-            [matTooltip]="isOrganizationalMetadataOk ? 'Your input is correct.' : organizationalErrors"
-            [ngClass]="isOrganizationalMetadataOk ? 'success-icon' : 'error-icon'">{{
-            isOrganizationalMetadataOk ? 'check_circle_outline' :
-            'error_outline'}}</mat-icon>
-          <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ?
-            'expand_less' : 'expand_more' }}</mat-icon>
-        </mat-card-header>
-        <mat-card-content *ngIf="isCardContentVisible.organizational">
-          <app-metadata-editor #organizationalMetadataEditor
-            *ngIf="!updateEditorFromThirdParty"
-            [schema]="metadataSchemaOrganizational"
-            [renderView]="activeRenderView"
-            [data]="createNewTransferData.userMetaData['organizational']"
-            (dataChange)="onDataChangeUserMetadataOrganization($event)"
-            (errors)="organizationalErrorsHandler($event)"></app-metadata-editor>
-        </mat-card-content>
-      </mat-card>
+  <mat-card>
+    <mat-card-header class="organizational-header"
+      (click)="toggleCardContent('organizational')">
+      <div mat-card-avatar class="section-icon">
+        <mat-icon> person </mat-icon>
+      </div>
+      Organizational Information
+      <span class="spacer"></span>
+      <mat-icon
+        [matTooltip]="isOrganizationalMetadataOk ? 'Your input is correct.' : organizationalErrors"
+        [ngClass]="isOrganizationalMetadataOk ? 'success-icon' : 'error-icon'">{{
+        isOrganizationalMetadataOk ? 'check_circle_outline' :
+        'error_outline'}}</mat-icon>
+      <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ?
+        'expand_less' : 'expand_more' }}</mat-icon>
+    </mat-card-header>
+    <mat-card-content *ngIf="isCardContentVisible.organizational">
+      <app-metadata-editor #organizationalMetadataEditor
+        *ngIf="!updateEditorFromThirdParty"
+        [schema]="metadataSchemaOrganizational" [renderView]="activeRenderView"
+        [data]="createNewTransferData.userMetaData['organizational']"
+        (dataChange)="onDataChangeUserMetadataOrganization($event)"
+        (errors)="organizationalErrorsHandler($event)"></app-metadata-editor>
+    </mat-card-content>
+  </mat-card>
 
-      <mat-card>
-        <mat-card-header class="sample-header"
-          (click)="toggleCardContent('sample')">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> description </mat-icon>
-          </div>
-          Sample Information
-          <span class="spacer"></span>
-          <mat-icon
-            [matTooltip]="isSampleInformationOk ? 'Your input is correct.' : sampleErrors"
-            [ngClass]="isSampleInformationOk ? 'success-icon' : 'error-icon'">{{
-            isSampleInformationOk ? 'check_circle_outline' :
-            'error_outline'}}</mat-icon>
-          <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ?
-            'expand_less' : 'expand_more' }}</mat-icon>
-        </mat-card-header>
-        <mat-card-content *ngIf="isCardContentVisible.sample">
-          <app-metadata-editor #sampleMetadataEditor
-            *ngIf="!updateEditorFromThirdParty" [schema]="metadataSchemaSample"
-            [renderView]="activeRenderView"
-            [data]="createNewTransferData.userMetaData['sample']"
-            (dataChange)="onDataChangeUserMetadataSample($event)"
-            (errors)="sampleErrorsHandler($event)"></app-metadata-editor>
-        </mat-card-content>
-      </mat-card>
-    </div>
-  </div>
+  <mat-card>
+    <mat-card-header class="sample-header"
+      (click)="toggleCardContent('sample')">
+      <div mat-card-avatar class="section-icon">
+        <mat-icon> description </mat-icon>
+      </div>
+      Sample Information
+      <span class="spacer"></span>
+      <mat-icon
+        [matTooltip]="isSampleInformationOk ? 'Your input is correct.' : sampleErrors"
+        [ngClass]="isSampleInformationOk ? 'success-icon' : 'error-icon'">{{
+        isSampleInformationOk ? 'check_circle_outline' :
+        'error_outline'}}</mat-icon>
+      <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ?
+        'expand_less' : 'expand_more' }}</mat-icon>
+    </mat-card-header>
+    <mat-card-content *ngIf="isCardContentVisible.sample">
+      <app-metadata-editor #sampleMetadataEditor
+        *ngIf="!updateEditorFromThirdParty" [schema]="metadataSchemaSample"
+        [renderView]="activeRenderView"
+        [data]="createNewTransferData.userMetaData['sample']"
+        (dataChange)="onDataChangeUserMetadataSample($event)"
+        (errors)="sampleErrorsHandler($event)"></app-metadata-editor>
+    </mat-card-content>
+  </mat-card>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end">
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 96fcf4edb8..ed55d0d5f5 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -11,7 +11,8 @@ export type renderView = "requiredOnly" | "all";
 it will produce errors when changing the schema. */
 @Component({
   selector: "app-metadata-editor",
-  template: `<div>
+  styleUrls: ["./ingestor-metadata-editor.component.scss"],
+  template: `<ng-container class="editor-container">
     <jsonforms
       *ngIf="renderView === 'requiredOnly'"
       [data]="visualData"
@@ -29,7 +30,7 @@ it will produce errors when changing the schema. */
       (dataChange)="onDataChange($event)"
       (errors)="onErrors($event)"
     ></jsonforms>
-  </div>`,
+  </ng-container>`,
   standalone: false,
 })
 export class IngestorMetadataEditorComponent implements OnInit {
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.scss b/src/app/ingestor/ingestor-page/ingestor.component.scss
index 43cc89eb08..be1f05bc49 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.scss
+++ b/src/app/ingestor/ingestor-page/ingestor.component.scss
@@ -4,10 +4,21 @@
   gap: 1em;
 }
 
+.ingestor-dialog-header {
+  display: flex;
+  flex-direction: column;
+}
+
 .ingestor-mixed-header {
   display: flex;
   justify-content: space-between;
-  align-items: center;
+  align-items: baseline;
+}
+
+.ingestor-stepper-header {
+  flex: 1;
+  width: 95%;
+  align-self: center;
 }
 
 .ingestor-close-button {
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 5d879bb03f..00d8437a99 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -268,6 +268,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
     let dialogRef = null;
     dialogRef = this.dialog.open(IngestorCreationDialogBaseComponent, {
       disableClose: true,
+      width: "75vw",
     });
 
     // Error if the dialog reference is not set

From 7168962c33af46d036bcca00e28cce5ed6f0d528 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 21 May 2025 13:00:02 +0000
Subject: [PATCH 188/245] commit config with ingestor settings

---
 src/assets/config.json | 207 ++++++++++++++---------------------------
 1 file changed, 71 insertions(+), 136 deletions(-)

diff --git a/src/assets/config.json b/src/assets/config.json
index 38eee0ed18..9a248a08e4 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -1,119 +1,84 @@
 {
-  "accessTokenPrefix": "Bearer ",
-  "addDatasetEnabled": true,
+  "addDatasetEnabled": false,
   "archiveWorkflowEnabled": false,
   "datasetReduceEnabled": true,
-  "datasetJsonScientificMetadata": true,
   "editDatasetSampleEnabled": true,
   "editMetadataEnabled": true,
-  "editPublishedData": false,
-  "addSampleEnabled": true,
-  "externalAuthEndpoint": "/auth/msad",
-  "facility": "Local",
-  "siteIcon": "site-header-logo.png",
-  "loginFacilityLabel": "ESS",
-  "loginLdapLabel": "Ldap",
-  "loginLocalLabel": "Local",
-  "loginFacilityEnabled": true,
-  "loginLdapEnabled": false,
-  "loginLocalEnabled": true,
+  "editPublishedData": true,
+  "editSampleEnabled": true,
+  "facility": "SAMPLE-SITE",
   "fileColorEnabled": true,
   "fileDownloadEnabled": true,
   "gettingStarted": null,
   "ingestManual": null,
-  "jobsEnabled": true,
+  "jobsEnabled": false,
   "jsonMetadataEnabled": true,
-  "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
-  "landingPage": "doi.ess.eu/detail/",
-  "lbBaseURL": "http://127.0.0.1:3000",
-  "logbookEnabled": true,
-  "loginFormEnabled": true,
-  "maxDirectDownloadSize": 5000000000,
-  "metadataPreviewEnabled": true,
-  "metadataStructure": "",
-  "multipleDownloadAction": "http://localhost:3012/zip",
-  "multipleDownloadEnabled": true,
-  "oAuth2Endpoints": [
+  "jupyterHubUrl": "",
+  "landingPage": "",
+  "lbBaseURL": "http://backend.localhost",
+  "localColumns": [
     {
-      "authURL": "api/v3/auth/oidc",
-      "displayText": "ESS One Identity"
-    }
-  ],
-  "policiesEnabled": true,
-  "retrieveDestinations": [],
-  "riotBaseUrl": "http://scichat.swap.ess.eu",
-  "scienceSearchEnabled": false,
-  "scienceSearchUnitsEnabled": true,
-  "searchPublicDataEnabled": true,
-  "searchSamples": true,
-  "sftpHost": "login.esss.dk",
-  "shareEnabled": true,
-  "shoppingCartEnabled": true,
-  "shoppingCartOnHeader": true,
-  "tableSciDataEnabled": true,
-  "datasetDetailsShowMissingProposalId": false,
-  "notificationInterceptorEnabled": true,
-  "datafilesActionsEnabled": true,
-  "datafilesActions": [
+      "name": "datasetName",
+      "order": 1,
+      "type": "standard",
+      "enabled": true
+    },
     {
-      "id": "eed8efec-4354-11ef-a3b5-d75573a5d37f",
-      "order": 4,
-      "label": "Download All",
-      "files": "all",
-      "mat_icon": "download",
-      "type": "form",
-      "url": "https://www.scicat.info/download/all",
-      "target": "_blank",
-      "enabled": "#SizeLimit",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
+      "name": "type",
+      "order": 2,
+      "type": "standard",
+      "enabled": true
     },
     {
-      "id": "3072fafc-4363-11ef-b9f9-ebf568222d26",
+      "name": "creationTime",
       "order": 3,
-      "label": "Download Selected",
-      "files": "selected",
-      "mat_icon": "download",
-      "type": "form",
-      "url": "https://www.scicat.info/download/selected",
-      "target": "_blank",
-      "enabled": "#Selected && #SizeLimit",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
+      "type": "standard",
+      "enabled": true
     },
     {
-      "id": "4f974f0e-4364-11ef-9c63-03d19f813f4e",
-      "order": 2,
-      "label": "Notebook All",
-      "files": "all",
-      "icon": "/assets/icons/jupyter_logo.png",
-      "type": "form",
-      "url": "https://www.scicat.info/notebook/all",
-      "target": "_blank",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
+      "name": "proposalId",
+      "order": 6,
+      "type": "standard",
+      "enabled": true
     },
     {
-      "id": "fa3ce6ee-482d-11ef-95e9-ff2c80dd50bd",
-      "order": 1,
-      "label": "Notebook Selected",
-      "files": "selected",
-      "icon": "/assets/icons/jupyter_logo.png",
-      "type": "form",
-      "url": "https://www.scicat.info/notebook/selected",
-      "target": "_blank",
-      "enabled": "#Selected",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
+      "name": "image",
+      "order": 7,
+      "type": "standard",
+      "enabled": true
+    },
+    {
+      "name": "sourceFolder",
+      "order": 8,
+      "type": "standard",
+      "enabled": true
     }
   ],
-  "labelMaps": {
-    "filters": {
-      "LocationFilter": "Location",
-      "PidFilter": "Pid",
-      "GroupFilter": "Group",
-      "TypeFilter": "Type",
-      "KeywordFilter": "Keyword",
-      "DateRangeFilter": "Start Date - End Date",
-      "TextFilter": "Text"
+  "logbookEnabled": false,
+  "loginFormEnabled": true,
+  "oAuth2Endpoints": [
+    {
+      "authURL": "api/v3/auth/oidc",
+      "displayText": "Login with OIDC"
     }
-  },
+  ],
+  "maxDirectDownloadSize": 5000000000,
+  "metadataPreviewEnabled": true,
+  "metadataStructure": "tree",
+  "multipleDownloadAction": "",
+  "multipleDownloadEnabled": false,
+  "policiesEnabled": true,
+  "retrieveDestinations": [],
+  "riotBaseUrl": "",
+  "scienceSearchEnabled": true,
+  "scienceSearchUnitsEnabled": true,
+  "searchPublicDataEnabled": true,
+  "searchSamples": true,
+  "sftpHost": "",
+  "shareEnabled": false,
+  "shoppingCartEnabled": false,
+  "shoppingCartOnHeader": false,
+  "tableSciDataEnabled": true,
   "defaultDatasetsListSettings": {
     "columns": [
       {
@@ -194,47 +159,17 @@
         "type": "standard",
         "enabled": false
       }
-    ],
-    "filters": [
-      { "LocationFilter": true },
-      { "PidFilter": true },
-      { "GroupFilter": true },
-      { "TypeFilter": true },
-      { "KeywordFilter": true },
-      { "DateRangeFilter": true },
-      { "TextFilter": true }
-    ],
-    "conditions": []
+    ]
   },
-  "labelsLocalization": {
-    "currentLabelSet": "ess",
-    "labelSets": {
-      "ess": {
-        "dataset-default": {},
-        "dataset-custom" : {
-          "pid": "PID",
-          "description": "Description",
-          "principalInvestigator": "Principal Investigator",
-          "keywords": "Keywords",
-          "creationTime": "Creation Time",
-          "scientificMetadata": "Scientific Metadata",
-          "metadataJsonView": "Metadata JsonView"
-        },
-        "proposal" : {
-          "General Information": "Proposal Information",
-          //"Title" : "Proposal Title",
-          "Abstract" : "Abstract",
-          "Proposal Id" : "Proposal Id",
-          "Proposal Type" : "Proposal Type",
-          "Parent Proposal" : "Parent Proposal",
-          "Start Time" : "Start Time",
-          "End Time" : "End Time",
-          "Creator Information" : "People",
-          "Main Proposer": "Proposal Submitted By",
-          "Principal Investigator" : "Principal Investigator",
-          "Metadata": "Additional Information"
-        }
-      }
+  "accessTokenPrefix": "Bearer ",
+  "externalAuthEndpoint": "/api/v3/auth/ldap",
+  "ingestorEnabled": true,
+  "ingestorMode": "standard",
+  "ingestorAutodiscoveryOptions": [
+    {
+      "mailDomain": "unibe.ch",
+      "description": "University of Bern",
+      "facilityBackend": "http://localhost:8888"
     }
-  }
-}
+  ]
+}
\ No newline at end of file

From bcf749fff3386548e74a1a177924f6415b9aeb63 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 21 May 2025 13:33:10 +0000
Subject: [PATCH 189/245] Improve detail view of transfers

---
 ...r.transfer-detail-view-dialog.component.ts | 24 ++++-
 .../ingestor.transfer-detail-view-dialog.html | 49 ++++------
 .../actions/ingestor.actions.ts               |  5 ++
 .../effects/ingestor.effect.ts                | 89 ++++++++++---------
 .../reducers/ingestor.reducer.ts              |  7 ++
 .../selectors/ingestor.selector.ts            |  5 ++
 .../state-management/state/ingestor.store.ts  |  2 +
 7 files changed, 104 insertions(+), 77 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
index a9c057d4e4..2705d4e67b 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
@@ -4,7 +4,7 @@ import { Store } from "@ngrx/store";
 import { Subscription } from "rxjs";
 import { TransferItem } from "shared/sdk/models/ingestor/transferItem";
 import * as fromActions from "state-management/actions/ingestor.actions";
-import { selectIngestorTransferList } from "state-management/selectors/ingestor.selector";
+import { selectIngestorTransferDetailList } from "state-management/selectors/ingestor.selector";
 
 @Component({
   selector: "app-ingestor-transfer-view-dialog",
@@ -16,7 +16,7 @@ export class IngestorTransferViewDialogComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   transferAutoRefreshIntervalDetail = 3000;
   autoRefreshInterval: NodeJS.Timeout = null;
-  transferList$ = this.store.select(selectIngestorTransferList);
+  transferDetailList$ = this.store.select(selectIngestorTransferDetailList);
   detailItem: TransferItem | null = null;
 
   constructor(
@@ -24,14 +24,32 @@ export class IngestorTransferViewDialogComponent implements OnInit, OnDestroy {
     public dialogRef: MatDialogRef<IngestorTransferViewDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any,
   ) { }
+  // Define tables
+  displayedColumns: string[] = ['property', 'value'];
+  tableData: { property: string; value: string }[] = [];
 
   ngOnInit() {
     this.subscriptions.push(
-      this.transferList$.subscribe((transferList) => {
+      this.transferDetailList$.subscribe((transferList) => {
         if (transferList) {
           this.detailItem = transferList.transfers?.find(
             (item) => item.transferId === this.transferId,
           );
+
+          this.tableData = [
+            { property: 'Transfer ID', value: this.transferId },
+            ...(this.detailItem?.status !== undefined ? [{ property: 'Status', value: this.detailItem.status }] : []),
+            ...(this.detailItem?.message !== undefined ? [{ property: 'Message', value: this.detailItem.message }] : []),
+            ...(this.detailItem?.bytesTransferred !== undefined && this.detailItem?.bytesTotal !== undefined
+              ? [
+                { property: 'GB transferred', value: this.getByteTransferRelative() },
+                { property: 'GB transferred (total)', value: this.getByteTransferTotal() }
+              ]
+              : []),
+            ...(this.detailItem?.filesTransferred !== undefined && this.detailItem?.filesTotal !== undefined
+              ? [{ property: 'Files transferred (total)', value: this.getFileTransferTotal() }]
+              : [])
+          ];
         }
       }),
     );
diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
index e4a5b2f8c4..b2b7449ae6 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
@@ -8,38 +8,23 @@ <h2 mat-dialog-title>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
-  <table>
-    <thead>
-      <tr>
-        <th>Property</th>
-        <th>Value</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>Transfer ID</td>
-        <td>{{transferId}}</td>
-      </tr>
-      <tr *ngIf="detailItem && detailItem.status !== undefined">
-        <td>Status</td>
-        <td>{{detailItem.status}}</td>
-      </tr>
-      <tr
-        *ngIf="detailItem && detailItem.bytesTransferred !== undefined && detailItem.bytesTotal !== undefined">
-        <td>GB transferred</td>
-        <td>{{getByteTransferRelative()}}</td>
-      </tr>
-      <tr
-        *ngIf="detailItem && detailItem.bytesTransferred !== undefined && detailItem.bytesTotal !== undefined">
-        <td>GB transferred (total)</td>
-        <td>{{getByteTransferTotal()}}</td>
-      </tr>
-      <tr
-        *ngIf="detailItem && detailItem.filesTransferred !== undefined && detailItem.filesTotal !== undefined">
-        <td>Files transferred (total)</td>
-        <td>{{getFileTransferTotal()}}</td>
-      </tr>
-    </tbody>
+  <table mat-table [dataSource]="tableData"
+    [displayedColumns]="displayedColumns">
+
+    <!-- Property Column -->
+    <ng-container matColumnDef="property">
+      <th mat-header-cell *matHeaderCellDef><b>Property</b></th>
+      <td mat-cell *matCellDef="let element">{{element.property}}</td>
+    </ng-container>
+
+    <!-- Value Column -->
+    <ng-container matColumnDef="value">
+      <th mat-header-cell *matHeaderCellDef><b>Value</b></th>
+      <td mat-cell *matCellDef="let element">{{element.value}}</td>
+    </ng-container>
+
+    <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+    <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
   </table>
 </mat-dialog-content>
 
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 515bd8e335..5c27e36d22 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -57,6 +57,11 @@ export const updateTransferListSuccess = createAction(
   }>(),
 );
 
+export const updateTransferListDetailSuccess = createAction(
+  "[Ingestor] Update Transfer List Detail Success",
+  props<{ transferListDetailView: GetTransferResponse }>(),
+);
+
 export const updateTransferListFailure = createAction(
   "[Ingestor] Update Transfer List Failure",
   props<{ err: Error }>(),
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index b24bd933df..ec967a721b 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -21,50 +21,50 @@ export class IngestorEffects {
   connectToIngestor$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(fromActions.connectIngestor),
-      switchMap(() =>{
-            return this.ingestor.getVersion().pipe(
-              switchMap((versionResponse) =>
-                this.ingestor.getHealth().pipe(
-                  switchMap((healthResponse) =>
-                    this.ingestor.getUserInfo().pipe(
-                      map((userInfoResponse) =>
+      switchMap(() => {
+        return this.ingestor.getVersion().pipe(
+          switchMap((versionResponse) =>
+            this.ingestor.getHealth().pipe(
+              switchMap((healthResponse) =>
+                this.ingestor.getUserInfo().pipe(
+                  map((userInfoResponse) =>
+                    fromActions.connectIngestorSuccess({
+                      versionResponse:
+                        versionResponse as OtherVersionResponse,
+                      healthResponse: healthResponse as OtherHealthResponse,
+                      userInfoResponse: userInfoResponse as UserInfo,
+                      authIsDisabled: false,
+                    }),
+                  ),
+                  catchError((err) => {
+                    const errorMessage =
+                      err instanceof HttpErrorResponse
+                        ? (err.error?.message ?? err.error ?? err.message)
+                        : err.message;
+
+                    if (errorMessage.includes("disabled")) {
+                      return of(
                         fromActions.connectIngestorSuccess({
                           versionResponse:
                             versionResponse as OtherVersionResponse,
-                          healthResponse: healthResponse as OtherHealthResponse,
-                          userInfoResponse: userInfoResponse as UserInfo,
-                          authIsDisabled: false,
+                          healthResponse:
+                            healthResponse as OtherHealthResponse,
+                          userInfoResponse: null, // Kein UserInfo verfügbar
+                          authIsDisabled: true,
                         }),
-                      ),
-                      catchError((err) => {
-                        const errorMessage =
-                          err instanceof HttpErrorResponse
-                            ? (err.error?.message ?? err.error ?? err.message)
-                            : err.message;
-
-                        if (errorMessage.includes("disabled")) {
-                          return of(
-                            fromActions.connectIngestorSuccess({
-                              versionResponse:
-                                versionResponse as OtherVersionResponse,
-                              healthResponse:
-                                healthResponse as OtherHealthResponse,
-                              userInfoResponse: null, // Kein UserInfo verfügbar
-                              authIsDisabled: true,
-                            }),
-                          );
-                        }
-                        return of(fromActions.connectIngestorFailure({ err }));
-                      }),
-                    ),
-                  ),
+                      );
+                    }
+                    return of(fromActions.connectIngestorFailure({ err }));
+                  }),
                 ),
               ),
-              catchError((err) =>
-                of(fromActions.connectIngestorFailure({ err })),
-              ),
-              takeUntil(this.actions$.pipe(ofType(fromActions.resetIngestorComponent)))
-            );
+            ),
+          ),
+          catchError((err) =>
+            of(fromActions.connectIngestorFailure({ err })),
+          ),
+          takeUntil(this.actions$.pipe(ofType(fromActions.resetIngestorComponent)))
+        );
       }),
     );
   });
@@ -123,12 +123,17 @@ export class IngestorEffects {
             transferId,
           )
           .pipe(
-            map((transferList) =>
-              fromActions.updateTransferListSuccess({
+            map((transferList) => {
+              if (transferId) {
+                return fromActions.updateTransferListDetailSuccess({ transferListDetailView: transferList })
+              };
+
+              return fromActions.updateTransferListSuccess({
                 transferList,
                 page: page ?? pageRO,
                 pageNumber: pageNumber ?? pageNumberRO,
-              }),
+              })
+            },
             ),
             catchError((err) =>
               of(fromActions.updateTransferListFailure({ err })),
@@ -269,5 +274,5 @@ export class IngestorEffects {
     private actions$: Actions,
     private ingestor: Ingestor,
     private store: Store,
-  ) {}
+  ) { }
 }
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index 75ea51ac5c..1acf1eec8d 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -107,6 +107,13 @@ const reducer = createReducer(
       },
     }),
   ),
+  on(
+    fromActions.updateTransferListDetailSuccess,
+    (state, { transferListDetailView }): IngestorState => ({
+      ...state,
+      ingestorTransferListDetailView: transferListDetailView,
+    }),
+  ),
   on(
     fromActions.updateIngestionObject,
     (state, { ingestionObject }): IngestorState => ({
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
index 57b53efa78..d73f45ee9a 100644
--- a/src/app/state-management/selectors/ingestor.selector.ts
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -34,6 +34,11 @@ export const selectIngestorTransferList = createSelector(
   (state) => state.ingestorTransferList,
 );
 
+export const selectIngestorTransferDetailList = createSelector(
+  selectIngestorState,
+  (state) => state.ingestorTransferListDetailView,
+);
+
 export const selectIngestionObject = createSelector(
   selectIngestorState,
   (state) => state.ingestionObject,
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 9e3902e31e..91bac0e542 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -28,6 +28,7 @@ export interface IngestorState {
   ingestorAuth: IngestorAuthentication | null;
   ingestorEndpoint: string;
   ingestorTransferList: GetTransferResponse | null;
+  ingestorTransferListDetailView: GetTransferResponse | null;
   transferListRequestOptions: {
     page: number;
     pageNumber: number;
@@ -49,6 +50,7 @@ export const initialIngestorState: IngestorState = {
   ingestorAuth: null,
   ingestorEndpoint: "",
   ingestorTransferList: null,
+  ingestorTransferListDetailView: null,
   transferListRequestOptions: {
     page: 0,
     pageNumber: 100,

From 4fc08bdb6bc1c6f4c7bb2ad6345bc347797c9056 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 21 May 2025 13:44:56 +0000
Subject: [PATCH 190/245] always show source folder

---
 .../ingestor/ingestor-page/helper/ingestor.component-helper.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index cc181d64dc..26b17361d4 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -161,7 +161,7 @@ export const getJsonSchemaFromDto = () => {
     pid: "--skip",
     owner: "--string",
     contactEmail: "--mail",
-    sourceFolder: "--readonly",
+    sourceFolder: "--string --readonly",
     size: -1, // skip
     numberOfFiles: -1, // skip
     creationTime: "--dateTime",

From b054aac7c87efd4ce1ce531c62152b02fcbc49ca Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Fri, 23 May 2025 08:08:07 +0000
Subject: [PATCH 191/245] Improve error handling when loosing auth

---
 .../app-header/app-header.component.ts        |  2 -
 ....confirm-transfer-dialog-page.component.ts | 27 ++------
 ...stor.new-transfer-dialog-page.component.ts |  5 +-
 ...ngestor.no-rights-dialog-page.component.ts | 56 ++++++++++++++++
 .../ingestor.no-rights-dialog-page.html       | 43 ++++++++++++
 ...tor.user-metadata-dialog-page.component.ts |  9 ++-
 ...ingestor.creation-dialog-base.component.ts | 11 ++-
 .../ingestor.creation-dialog-base.html        | 16 +++--
 .../ingestor.dialog-stepper.component.html    |  4 +-
 .../ingestor.dialog-stepper.component.ts      | 45 +++++++++++--
 .../ingestor.export-helper.component.ts       | 19 ++++++
 .../ingestor.transfer-detail-view-dialog.html |  3 +-
 .../helper/ingestor.component-helper.ts       | 22 +++++-
 .../ingestor-page/ingestor.component.html     |  2 +-
 .../ingestor-page/ingestor.component.ts       | 28 +++++---
 src/app/ingestor/ingestor.module.ts           |  2 +
 .../actions/ingestor.actions.ts               |  5 ++
 .../effects/ingestor.effect.ts                | 67 +++++++++++++------
 .../reducers/ingestor.reducer.ts              | 15 ++++-
 .../selectors/ingestor.selector.ts            |  5 ++
 .../state-management/state/ingestor.store.ts  |  6 +-
 21 files changed, 314 insertions(+), 78 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html

diff --git a/src/app/_layout/app-header/app-header.component.ts b/src/app/_layout/app-header/app-header.component.ts
index eab3d407ff..dd1db860f0 100644
--- a/src/app/_layout/app-header/app-header.component.ts
+++ b/src/app/_layout/app-header/app-header.component.ts
@@ -59,7 +59,5 @@ export class AppHeaderComponent implements OnInit {
   ngOnInit() {
     this.store.dispatch(fetchCurrentUserAction());
     this.oAuth2Endpoints = this.config.oAuth2Endpoints;
-
-    console.log(this.config);
   }
 }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index bbe6ac89ca..b2edf50ac5 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -17,7 +17,6 @@ import { MatCheckboxChange } from "@angular/material/checkbox";
 import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Subscription } from "rxjs";
-import { CreateDatasetDto } from "@scicatproject/scicat-sdk-ts-angular";
 
 @Component({
   selector: "ingestor-confirm-transfer-dialog-page",
@@ -26,7 +25,8 @@ import { CreateDatasetDto } from "@scicatproject/scicat-sdk-ts-angular";
   standalone: false,
 })
 export class IngestorConfirmTransferDialogPageComponent
-  implements OnInit, OnDestroy {
+  implements OnInit, OnDestroy
+{
   private subscriptions: Subscription[] = [];
   readonly dialog = inject(MatDialog);
 
@@ -42,7 +42,7 @@ export class IngestorConfirmTransferDialogPageComponent
 
   copiedToClipboard = false;
 
-  constructor(private store: Store) { }
+  constructor(private store: Store) {}
 
   ngOnInit() {
     this.subscriptions.push(
@@ -53,7 +53,9 @@ export class IngestorConfirmTransferDialogPageComponent
       }),
     );
 
-    this.provideMergeMetaData = this.createMetaDataString();
+    this.provideMergeMetaData = IngestorHelper.createMetaDataString(
+      this.createNewTransferData,
+    );
   }
 
   ngOnDestroy(): void {
@@ -69,23 +71,6 @@ export class IngestorConfirmTransferDialogPageComponent
     );
   }
 
-  createMetaDataString(): string {
-    const space = 2;
-    const scicatMetadata: CreateDatasetDto = {
-      ...(this.createNewTransferData.scicatHeader as CreateDatasetDto),
-      scientificMetadata: {
-        organizational:
-          this.createNewTransferData.userMetaData["organizational"],
-        sample: this.createNewTransferData.userMetaData["sample"],
-        acquisition:
-          this.createNewTransferData.extractorMetaData["acquisition"],
-        instrument: this.createNewTransferData.extractorMetaData["instrument"],
-      },
-    };
-
-    return JSON.stringify(scicatMetadata, null, space);
-  }
-
   onClickBack(): void {
     // Reset the ingestion request
     this.store.dispatch(fromActions.resetIngestDataset());
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 9001490b57..d5bd27e9c2 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -34,7 +34,8 @@ import { ReturnedUserDto } from "@scicatproject/scicat-sdk-ts-angular";
   standalone: false,
 })
 export class IngestorNewTransferDialogPageComponent
-  implements OnInit, OnDestroy {
+  implements OnInit, OnDestroy
+{
   private subscriptions: Subscription[] = [];
   readonly dialog = inject(MatDialog);
 
@@ -59,7 +60,7 @@ export class IngestorNewTransferDialogPageComponent
   userProfile: ReturnedUserDto | null = null;
   uiNextButtonReady = false;
 
-  constructor(private store: Store) { }
+  constructor(private store: Store) {}
 
   ngOnInit() {
     this.loadExtractionMethods();
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts
new file mode 100644
index 0000000000..f034ea185d
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts
@@ -0,0 +1,56 @@
+import {
+  Component,
+  EventEmitter,
+  inject,
+  OnDestroy,
+  OnInit,
+  Output,
+} from "@angular/core";
+import { MatDialog } from "@angular/material/dialog";
+import {
+  IngestionRequestInformation,
+  IngestorHelper,
+} from "../../../ingestor-page/helper/ingestor.component-helper";
+import { Store } from "@ngrx/store";
+import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
+import { Subscription } from "rxjs";
+
+@Component({
+  selector: "ingestor-no-rights-dialog-page",
+  templateUrl: "ingestor.no-rights-dialog-page.html",
+  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
+})
+export class IngestorNoRightsDialogPageComponent implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
+  readonly dialog = inject(MatDialog);
+
+  ingestionObject$ = this.store.select(selectIngestionObject);
+
+  @Output() nextStep = new EventEmitter<void>();
+
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+
+  constructor(private store: Store) {}
+
+  ngOnInit() {
+    this.subscriptions.push(
+      this.ingestionObject$.subscribe((ingestionObject) => {
+        if (ingestionObject) {
+          this.createNewTransferData = ingestionObject;
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((subscription) => {
+      subscription.unsubscribe();
+    });
+  }
+
+  onClickNext(): void {
+    this.nextStep.emit(); // Open next dialog
+  }
+}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html
new file mode 100644
index 0000000000..297367a35b
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html
@@ -0,0 +1,43 @@
+<div class="ingestor-dialog-header">
+  <div class="ingestor-mixed-header">
+    <h2 mat-dialog-title>
+      Lost Connection
+    </h2>
+    <button mat-icon-button mat-dialog-close aria-label="Close"
+      class="ingestor-close-button">
+      <mat-icon>close</mat-icon>
+    </button>
+  </div>
+
+  <div class="ingestor-stepper-header">
+    <ingestor-dialog-stepper [activeStep]="-1"></ingestor-dialog-stepper>
+  </div>
+</div>
+
+<mat-dialog-content class="mat-typography">
+  <p>
+    <mat-card class="ingestor-card">
+      <mat-card-header class="ingestor-mixed-header">
+        <mat-card-title>Action forbidden</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <div class="confirm-message-ingestor">
+          <mat-icon class="confirm-message-ingestor-icon">lock</mat-icon>
+          <p>You do not have permission to continue. </p>
+          <p>Please check your user or login status.
+          </p>
+          <i>If you have lost the connection, use the save button at the top
+            right to save the data you have entered.</i>
+          <p class="confirm-message-error">
+            {{createNewTransferData.apiInformation.ingestionRequestErrorMessage}}
+          </p>
+        </div>
+      </mat-card-content>
+    </mat-card>
+  </p>
+
+</mat-dialog-content>
+
+<mat-dialog-actions align="end">
+  <button mat-button cdkFocusInitial mat-dialog-close>Cancel</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 062d4905b5..52e510f8b8 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -21,9 +21,7 @@ import {
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Store } from "@ngrx/store";
 import { Subscription } from "rxjs";
-import {
-  renderView,
-} from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
+import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 
 @Component({
   selector: "ingestor-user-metadata-dialog",
@@ -32,7 +30,8 @@ import {
   standalone: false,
 })
 export class IngestorUserMetadataDialogPageComponent
-  implements OnInit, OnDestroy {
+  implements OnInit, OnDestroy
+{
   private subscriptions: Subscription[] = [];
   ingestionObject$ = this.store.select(selectIngestionObject);
   renderView$ = this.store.select(selectIngestorRenderView);
@@ -69,7 +68,7 @@ export class IngestorUserMetadataDialogPageComponent
   constructor(
     private store: Store,
     private cdr: ChangeDetectorRef,
-  ) { }
+  ) {}
 
   ngOnInit() {
     this.subscriptions.push(
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index e542e6f5f2..cc3ec50e4b 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -9,6 +9,7 @@ import {
 import {
   selectIngestionObject,
   selectIngestorEndpoint,
+  selectNoRightsError,
 } from "state-management/selectors/ingestor.selector";
 import { Store } from "@ngrx/store";
 import { IngestorMetadataSSEService } from "ingestor/ingestor-page/helper/ingestor.metadata-sse-service";
@@ -41,7 +42,9 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
 
   ingestionObject$ = this.store.select(selectIngestionObject);
   ingestorBackend$ = this.store.select(selectIngestorEndpoint);
+  selectNoRightsError$ = this.store.select(selectNoRightsError);
 
+  showNoRightsDialog = false;
   currentDialogStep: dialogStep = "NEW_TRANSFER";
   connectedFacilityBackend = "";
   tokenValue = "";
@@ -51,7 +54,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
     private store: Store,
     private sseService: IngestorMetadataSSEService,
     @Inject(MAT_DIALOG_DATA) public data: DialogDataObject,
-  ) { }
+  ) {}
 
   ngOnInit() {
     this.subscriptions.push(
@@ -80,6 +83,12 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
         }
       }),
     );
+
+    this.subscriptions.push(
+      this.selectNoRightsError$.subscribe((selectNoRightsError) => {
+        this.showNoRightsDialog = selectNoRightsError;
+      }),
+    );
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
index 53276710fb..efb35da039 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
@@ -1,16 +1,22 @@
-<ingestor-new-transfer-dialog-page *ngIf="currentDialogStep === 'NEW_TRANSFER'"
+<ingestor-new-transfer-dialog-page
+  *ngIf="currentDialogStep === 'NEW_TRANSFER' && !showNoRightsDialog"
   (nextStep)="onClickNext('USER_METADATA')"></ingestor-new-transfer-dialog-page>
 
-<ingestor-user-metadata-dialog *ngIf="currentDialogStep === 'USER_METADATA'"
+<ingestor-user-metadata-dialog
+  *ngIf="currentDialogStep === 'USER_METADATA' && !showNoRightsDialog"
   (nextStep)="onClickNext('EXTRACTOR_METADATA')"
   (backStep)="onClickNext('NEW_TRANSFER')"></ingestor-user-metadata-dialog>
 
 <ingestor-extractor-metadata-dialog-page
-  *ngIf="currentDialogStep === 'EXTRACTOR_METADATA'"
+  *ngIf="currentDialogStep === 'EXTRACTOR_METADATA' && !showNoRightsDialog"
   (nextStep)="onClickNext('CONFIRM_TRANSFER')"
   (backStep)="onClickNext('USER_METADATA')"></ingestor-extractor-metadata-dialog-page>
 
 <ingestor-confirm-transfer-dialog-page
-  *ngIf="currentDialogStep === 'CONFIRM_TRANSFER'"
+  *ngIf="currentDialogStep === 'CONFIRM_TRANSFER' && !showNoRightsDialog"
   (nextStep)="onClickStartIngestion()"
-  (backStep)="onClickNext('EXTRACTOR_METADATA')"></ingestor-confirm-transfer-dialog-page>
\ No newline at end of file
+  (backStep)="onClickNext('EXTRACTOR_METADATA')"></ingestor-confirm-transfer-dialog-page>
+
+<ingestor-no-rights-dialog-page *ngIf="showNoRightsDialog"
+  (nextStep)="onClickStartIngestion()"
+  (backStep)="onClickNext('EXTRACTOR_METADATA')"></ingestor-no-rights-dialog-page>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index 484f332035..c12be20dd5 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -1,6 +1,6 @@
 <div class="dialog-control-buttons">
   <button mat-button matTooltip="Save the current values."
-    [disabled]="activeStep < 1" (click)="onSave()"><mat-icon
+    [disabled]="activeStep === 0" (click)="onSave()"><mat-icon
       class="control-button-icon">save</mat-icon></button>
   <button mat-button matTooltip="Upload a template." [disabled]="activeStep < 1"
     (click)="onUpload()"><mat-icon
@@ -30,7 +30,7 @@
     JSON-Mode</button>
 </mat-menu>
 
-<div class="stepper">
+<div class="stepper" *ngIf="activeStep >= 0">
   <mat-stepper [linear]="true" [selectedIndex]="activeStep"
     class="ingestor-stepper">
     <mat-step [completed]="activeStep > 0" [editable]="false"
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 541120bcdb..80846e14dc 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -41,6 +41,8 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
     exportSciCat: true,
     exportOrganizational: false,
     exportSample: false,
+    exportAll: false,
+    exportAsJSON: false,
   };
 
   injector = Injector.create({
@@ -138,6 +140,10 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
             exportData["userMetaData"] = {};
           }
 
+          if (this.exportValueOptions.exportAll) {
+            exportData["extractorMetaData"] = {};
+          }
+
           if (this.exportValueOptions.exportOrganizational) {
             exportData["userMetaData"]["organizational"] = {
               ...this.createNewTransferData.userMetaData.organizational,
@@ -150,12 +156,43 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
             };
           }
 
+          if (this.exportValueOptions.exportAll) {
+            exportData["extractorMetaData"]["instrument"] = {
+              ...this.createNewTransferData.extractorMetaData.instrument,
+            };
+            exportData["extractorMetaData"]["acquisition"] = {
+              ...this.createNewTransferData.extractorMetaData.acquisition,
+            };
+          }
+
+          let exportString = "";
+          if (this.exportValueOptions.exportAsJSON) {
+            exportString = IngestorHelper.createMetaDataString(
+              exportData as IngestionRequestInformation,
+            );
+          } else {
+            exportString = JSON.stringify(exportData);
+          }
+
+          // Default file name is the current date and method name
+          const currentDate = new Date();
+          const formattedDate = currentDate
+            .toISOString()
+            .replace(/:/g, "-")
+            .replace(/\..+/, "");
+          const methodName =
+            this.createNewTransferData.selectedMethod.name ?? "no_method";
+          const ending = this.exportValueOptions.exportAsJSON
+            ? ".json"
+            : ".ingestor.template";
+
+          const fileName = formattedDate + "_" + methodName + ending;
+
           const dataStr =
-            "data:text/json;charset=utf-8," +
-            encodeURIComponent(JSON.stringify(exportData));
+            "data:text/json;charset=utf-8," + encodeURIComponent(exportString);
           const downloadAnchorNode = document.createElement("a");
           downloadAnchorNode.setAttribute("href", dataStr);
-          downloadAnchorNode.setAttribute("download", "ingestor-template.json");
+          downloadAnchorNode.setAttribute("download", fileName);
           document.body.appendChild(downloadAnchorNode);
           downloadAnchorNode.click();
           downloadAnchorNode.remove();
@@ -168,7 +205,7 @@ export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
   onUpload() {
     const input = document.createElement("input");
     input.type = "file";
-    input.accept = ".json";
+    input.accept = ".ingestor.template,.json";
     input.onchange = (event: Event) => {
       const target = event.target as HTMLInputElement;
       const file = target.files?.[0];
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.ts
index ebcb872096..c74ad18b34 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.ts
@@ -4,6 +4,8 @@ export interface ExportOptions {
   exportSciCat: boolean;
   exportOrganizational: boolean;
   exportSample: boolean;
+  exportAll: boolean;
+  exportAsJSON: boolean;
 }
 
 @Component({
@@ -15,6 +17,15 @@ export interface ExportOptions {
         >Export Organizational</mat-checkbox
       >
       <mat-checkbox [(ngModel)]="data.exportSample">Export Sample</mat-checkbox>
+      <mat-divider></mat-divider>
+      <i>Additional options</i>
+      <mat-checkbox [(ngModel)]="data.exportAll" (change)="onExportAllChange()"
+        >Export All (includes extracted metadata)</mat-checkbox
+      >
+      <mat-checkbox [(ngModel)]="data.exportAsJSON"
+        >Export As JSON (not a template format)</mat-checkbox
+      >
+      <mat-divider></mat-divider>
     </div>
   `,
   styles: [
@@ -33,4 +44,12 @@ export class ExportTemplateHelperComponent {
   constructor(public injector: Injector) {
     this.data = injector.get("data");
   }
+
+  onExportAllChange() {
+    if (this.data.exportAll) {
+      this.data.exportSciCat = true;
+      this.data.exportOrganizational = true;
+      this.data.exportSample = true;
+    }
+  }
 }
diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
index b2b7449ae6..82f031dba0 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
@@ -8,8 +8,7 @@ <h2 mat-dialog-title>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
-  <table mat-table [dataSource]="tableData"
-    [displayedColumns]="displayedColumns">
+  <table mat-table [dataSource]="tableData">
 
     <!-- Property Column -->
     <ng-container matColumnDef="property">
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 26b17361d4..01f074cd32 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -1,5 +1,8 @@
 import { JsonSchema, JsonSchema7 } from "@jsonforms/core";
-import { CreateDatasetDto, DatasetClass } from "@scicatproject/scicat-sdk-ts-angular";
+import {
+  CreateDatasetDto,
+  DatasetClass,
+} from "@scicatproject/scicat-sdk-ts-angular";
 import { isArray } from "mathjs";
 import { PostDatasetResponse } from "shared/sdk/models/ingestor/postDatasetResponse";
 import { UserInfo } from "shared/sdk/models/ingestor/userInfo";
@@ -62,6 +65,23 @@ export interface DialogDataObject {
 }
 
 export class IngestorHelper {
+  static createMetaDataString(
+    transferData: IngestionRequestInformation,
+  ): string {
+    const space = 2;
+    const scicatMetadata: CreateDatasetDto = {
+      ...(transferData.scicatHeader as CreateDatasetDto),
+      scientificMetadata: {
+        organizational: transferData.userMetaData["organizational"],
+        sample: transferData.userMetaData["sample"],
+        acquisition: transferData.extractorMetaData["acquisition"],
+        instrument: transferData.extractorMetaData["instrument"],
+      },
+    };
+
+    return JSON.stringify(scicatMetadata, null, space);
+  }
+
   static saveConnectionsToLocalStorage = (connections: string[]) => {
     // Remove duplicates
     const uniqueConnections = Array.from(new Set(connections));
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.html b/src/app/ingestor/ingestor-page/ingestor.component.html
index 7687cc2360..0a343e2283 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor.component.html
@@ -44,7 +44,7 @@
               <ul>
                 <li *ngFor="let backend of lastUsedFacilityBackends"
                   class="vertical-center-list-item">
-                  <a (click)="onClickSelectFacilityBackend(backend)">{{ backend
+                  <a (click)="onClickSelectFacilityBackend(backend)">{{"- " + backend
                     }}</a>
 
                   <a (click)="onClickDeleteStoredFacilityBackend(backend)">
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 00d8437a99..4e87799ca8 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -63,6 +63,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
 
   connectedFacilityBackend = "";
   connectingToFacilityBackend = true;
+  noRightsError = false;
 
   lastUsedFacilityBackends: string[] = [];
 
@@ -93,10 +94,11 @@ export class IngestorComponent implements OnInit, OnDestroy {
     private router: Router,
     private store: Store,
     public appConfigService: AppConfigService,
-  ) { }
+  ) {}
 
   ngOnInit() {
-    this.lastUsedFacilityBackends = IngestorHelper.loadConnectionsFromLocalStorage();
+    this.lastUsedFacilityBackends =
+      IngestorHelper.loadConnectionsFromLocalStorage();
 
     // Fetch the API token that the ingestor can authenticate to scicat as the user
     this.subscriptions.push(
@@ -145,9 +147,13 @@ export class IngestorComponent implements OnInit, OnDestroy {
 
     this.subscriptions.push(
       this.ingestorStatus$.subscribe((ingestorStatus) => {
-        if (!ingestorStatus.validEndpoint) {
+        if (
+          ingestorStatus.validEndpoint !== null &&
+          !ingestorStatus.validEndpoint
+        ) {
           this.connectedFacilityBackend = "";
-          this.lastUsedFacilityBackends = IngestorHelper.loadConnectionsFromLocalStorage();
+          this.lastUsedFacilityBackends =
+            IngestorHelper.loadConnectionsFromLocalStorage();
           this.onClickForwardToIngestorPage();
         } else if (
           ingestorStatus.versionResponse &&
@@ -170,6 +176,9 @@ export class IngestorComponent implements OnInit, OnDestroy {
             // Activate Transfer Tab when ingestor is ready for actions
             this.selectedTab = 0;
             this.doRefreshTransferList();
+          } // In case of loosing the connection to the ingestor, the user is logged out
+          else if (this.userInfo == null || this.userInfo.logged_in === false) {
+            this.selectedTab = 1;
           }
         }
       }),
@@ -222,21 +231,22 @@ export class IngestorComponent implements OnInit, OnDestroy {
 
   onClickForwardToIngestorPage(nextFacilityBackend?: string) {
     if (nextFacilityBackend) {
-      IngestorHelper.saveConnectionsToLocalStorage([...this.lastUsedFacilityBackends, nextFacilityBackend]);
+      IngestorHelper.saveConnectionsToLocalStorage([
+        ...this.lastUsedFacilityBackends,
+        nextFacilityBackend,
+      ]);
 
       this.router.navigate(["/ingestor"], {
         queryParams: { backendUrl: nextFacilityBackend },
       });
-    }
-    else {
+    } else {
       this.router.navigate(["/ingestor"]);
     }
   }
 
   onClickDisconnectIngestor() {
     // Reset state of the ingestor component
-    this.store.dispatch(
-      fromActions.resetIngestorComponent());
+    this.store.dispatch(fromActions.resetIngestorComponent());
     // Remove the GET parameter 'backendUrl' from the URL
     this.router.navigate(["/ingestor"]);
   }
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index c93fd2b79c..9e437a2ea1 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -48,6 +48,7 @@ import { IngestorNewTransferDialogPageComponent } from "./ingestor-dialogs/creat
 import { IngestorUserMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component";
 import { IngestorExtractorMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component";
 import { IngestorTransferViewDialogComponent } from "./ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component";
+import { IngestorNoRightsDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component";
 
 @NgModule({
   declarations: [
@@ -69,6 +70,7 @@ import { IngestorTransferViewDialogComponent } from "./ingestor-dialogs/transfer
     QuantityValueLayoutRendererComponent,
     CustomLayoutChildrenRenderPropsPipe,
     IngestorTransferViewDialogComponent,
+    IngestorNoRightsDialogPageComponent,
   ],
   imports: [
     CommonModule,
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 5c27e36d22..ed001f9eed 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -143,3 +143,8 @@ export const setRenderViewFromThirdParty = createAction(
 export const resetIngestorComponent = createAction(
   "[Ingestor] Reset Ingestor Component",
 );
+
+export const setNoRightsError = createAction(
+  "[Ingestor] Set No Rights Error",
+  props<{ noRightsError: boolean; err: Error }>(),
+);
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index ec967a721b..2751bf5f53 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -29,8 +29,7 @@ export class IngestorEffects {
                 this.ingestor.getUserInfo().pipe(
                   map((userInfoResponse) =>
                     fromActions.connectIngestorSuccess({
-                      versionResponse:
-                        versionResponse as OtherVersionResponse,
+                      versionResponse: versionResponse as OtherVersionResponse,
                       healthResponse: healthResponse as OtherHealthResponse,
                       userInfoResponse: userInfoResponse as UserInfo,
                       authIsDisabled: false,
@@ -47,8 +46,7 @@ export class IngestorEffects {
                         fromActions.connectIngestorSuccess({
                           versionResponse:
                             versionResponse as OtherVersionResponse,
-                          healthResponse:
-                            healthResponse as OtherHealthResponse,
+                          healthResponse: healthResponse as OtherHealthResponse,
                           userInfoResponse: null, // Kein UserInfo verfügbar
                           authIsDisabled: true,
                         }),
@@ -60,10 +58,18 @@ export class IngestorEffects {
               ),
             ),
           ),
-          catchError((err) =>
-            of(fromActions.connectIngestorFailure({ err })),
+          catchError((err) => {
+            if (err.error?.error?.includes("login session has expired")) {
+              return of(
+                fromActions.setNoRightsError({ noRightsError: true, err: err }),
+              );
+            }
+
+            return of(fromActions.getExtractionMethodsFailure({ err }));
+          }),
+          takeUntil(
+            this.actions$.pipe(ofType(fromActions.resetIngestorComponent)),
           ),
-          takeUntil(this.actions$.pipe(ofType(fromActions.resetIngestorComponent)))
         );
       }),
     );
@@ -125,16 +131,17 @@ export class IngestorEffects {
           .pipe(
             map((transferList) => {
               if (transferId) {
-                return fromActions.updateTransferListDetailSuccess({ transferListDetailView: transferList })
-              };
+                return fromActions.updateTransferListDetailSuccess({
+                  transferListDetailView: transferList,
+                });
+              }
 
               return fromActions.updateTransferListSuccess({
                 transferList,
                 page: page ?? pageRO,
                 pageNumber: pageNumber ?? pageNumberRO,
-              })
-            },
-            ),
+              });
+            }),
             catchError((err) =>
               of(fromActions.updateTransferListFailure({ err })),
             ),
@@ -151,9 +158,15 @@ export class IngestorEffects {
           map((extractionMethods) =>
             fromActions.getExtractionMethodsSuccess({ extractionMethods }),
           ),
-          catchError((err) =>
-            of(fromActions.getExtractionMethodsFailure({ err })),
-          ),
+          catchError((err) => {
+            if (err.error?.error?.includes("login session has expired")) {
+              return of(
+                fromActions.setNoRightsError({ noRightsError: true, err: err }),
+              );
+            }
+
+            return of(fromActions.getExtractionMethodsFailure({ err }));
+          }),
         ),
       ),
     );
@@ -167,9 +180,15 @@ export class IngestorEffects {
           map((ingestorBrowserActiveNode) =>
             fromActions.getBrowseFilePathSuccess({ ingestorBrowserActiveNode }),
           ),
-          catchError((err) =>
-            of(fromActions.getBrowseFilePathFailure({ err })),
-          ),
+          catchError((err) => {
+            if (err.error?.error?.includes("login session has expired")) {
+              return of(
+                fromActions.setNoRightsError({ noRightsError: true, err: err }),
+              );
+            }
+
+            return of(fromActions.getExtractionMethodsFailure({ err }));
+          }),
         ),
       ),
     );
@@ -184,7 +203,15 @@ export class IngestorEffects {
             fromActions.ingestDatasetSuccess({ response }),
             fromActions.updateTransferList({}),
           ]),
-          catchError((err) => of(fromActions.ingestDatasetFailure({ err }))),
+          catchError((err) => {
+            if (err.error?.error?.includes("login session has expired")) {
+              return of(
+                fromActions.setNoRightsError({ noRightsError: true, err: err }),
+              );
+            }
+
+            return of(fromActions.getExtractionMethodsFailure({ err }));
+          }),
         ),
       ),
     );
@@ -274,5 +301,5 @@ export class IngestorEffects {
     private actions$: Actions,
     private ingestor: Ingestor,
     private store: Store,
-  ) { }
+  ) {}
 }
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index 1acf1eec8d..f701cfbaab 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -181,5 +181,18 @@ const reducer = createReducer(
   on(
     fromActions.resetIngestorComponent,
     (): IngestorState => initialIngestorState
-  )
+  ),
+  on(
+    fromActions.setNoRightsError,
+    (state, { noRightsError }): IngestorState => ({
+      ...state,
+      noRightsError,
+      ingestorAuth: {
+        ...state.ingestorAuth,
+        userInfoResponse: {
+          logged_in: false,
+        },
+      },
+    }),
+  ),
 );
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
index d73f45ee9a..46437a962c 100644
--- a/src/app/state-management/selectors/ingestor.selector.ts
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -68,3 +68,8 @@ export const selectUpdateEditorFromThirdParty = createSelector(
   selectIngestorState,
   (state) => state.updateEditorFromThirdParty,
 );
+
+export const selectNoRightsError = createSelector(
+  selectIngestorState,
+  (state) => state.noRightsError,
+);
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 91bac0e542..bdef50e1df 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -20,7 +20,7 @@ interface IngestorAuthentication {
 interface IngestorStatus {
   versionResponse: OtherVersionResponse | null;
   healthResponse: OtherHealthResponse | null;
-  validEndpoint: boolean;
+  validEndpoint: boolean | null;
 }
 
 export interface IngestorState {
@@ -39,13 +39,14 @@ export interface IngestorState {
   renderView: renderView;
   updateEditorFromThirdParty: boolean;
   connectingBackend: boolean;
+  noRightsError: boolean;
   error: any | null;
 }
 export const initialIngestorState: IngestorState = {
   ingestorStatus: {
     versionResponse: null,
     healthResponse: null,
-    validEndpoint: false,
+    validEndpoint: null,
   },
   ingestorAuth: null,
   ingestorEndpoint: "",
@@ -60,6 +61,7 @@ export const initialIngestorState: IngestorState = {
   ingestorBrowserActiveNode: null,
   connectingBackend: false,
   updateEditorFromThirdParty: false,
+  noRightsError: false,
   error: null,
   renderView: "all",
 };

From 54081f812881a70c14529ccbf44d414188d37353 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Sun, 25 May 2025 15:14:32 +0000
Subject: [PATCH 192/245] wip: add ingestor interface to depositor

---
 src/app/datasets/datasets.module.ts           |  3 ++
 .../depositor/depositor.component.html        | 10 +++++
 .../datasets/depositor/depositor.component.ts | 43 ++++++++++++++++++-
 .../selectors/ingestor.selector.ts            |  6 +++
 4 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 9200f468b8..b7e15ee7b0 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -101,6 +101,8 @@ import { CustomSemiEnumControlComponent } from "./depositor/empiar/customRendere
 import { DatasetDetailDynamicComponent } from "./dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component";
 import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-wrapper.component";
 
+import { IngestorModule } from "../ingestor/ingestor.module"
+
 @NgModule({
   imports: [
     CommonModule,
@@ -167,6 +169,7 @@ import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-w
     CdkDrag,
     CdkDragHandle,
     FiltersModule,
+    IngestorModule,
   ],
   declarations: [
     BatchViewComponent,
diff --git a/src/app/datasets/depositor/depositor.component.html b/src/app/datasets/depositor/depositor.component.html
index 3f4943c7b1..5a36cbb701 100644
--- a/src/app/datasets/depositor/depositor.component.html
+++ b/src/app/datasets/depositor/depositor.component.html
@@ -70,6 +70,16 @@
             </button>
           </div>
 
+          <!-- Display the metadata editor if clicked-->
+          <app-metadata-editor
+            *ngIf="showMetadataEditor"
+            [data]="metadata"
+            [schema]="metadataSchema"
+            [renderView]="'all'"
+            (dataChange)="onMetadataChange($event)"
+            (errors)="onMetadataErrors($event)"
+          ></app-metadata-editor>
+
           <mat-form-field class="method-name">
             <mat-label>Experimental Method</mat-label>
             <mat-select required [formControl]="depositionRepository" (selectionChange)="onChooseRepo()">
diff --git a/src/app/datasets/depositor/depositor.component.ts b/src/app/datasets/depositor/depositor.component.ts
index 71167401a0..7d1b95df11 100644
--- a/src/app/datasets/depositor/depositor.component.ts
+++ b/src/app/datasets/depositor/depositor.component.ts
@@ -7,7 +7,7 @@ import {
 } from "@angular/forms";
 import { AppConfigService, AppConfig } from "app-config.service";
 import { ActivatedRoute } from "@angular/router";
-
+import { JsonSchema } from "@jsonforms/core";
 import { Store } from "@ngrx/store";
 import {
   OutputDatasetObsoleteDto,
@@ -25,7 +25,11 @@ import * as fromActions from "state-management/actions/depositor.actions";
 import { accessEmpiarSchema } from "state-management/actions/depositor.actions";
 import { selectEmpiarSchema } from "state-management/selectors/depositor.selectors";
 
-import { Subscription } from "rxjs";
+import * as ingestorActions from "state-management/actions/ingestor.actions";
+import { MethodItem } from "../../shared/sdk/models/ingestor/models"
+import { selectExtractionMethods} from "state-management/selectors/ingestor.selector";
+
+import { Observable, Subscription, take, find } from "rxjs";
 import { Router } from "@angular/router";
 
 interface DepositionRepository {
@@ -60,6 +64,13 @@ export class DepositorComponent implements OnInit, OnDestroy {
   } | null = null;
 
   empiarSchemaEncoded:string | undefined;
+  showMetadataEditor = false;
+
+  metadata: any = {}; 
+  metadataSchema: JsonSchema = null// ideally i get the schema by uid?
+
+  methods$: Observable<MethodItem[]> = this.store.select(selectExtractionMethods);
+
   constructor(
     public appConfigService: AppConfigService,
     private store: Store,
@@ -87,6 +98,12 @@ export class DepositorComponent implements OnInit, OnDestroy {
         }
       }),
     );
+    this.store.select(selectCurrentDataset).subscribe((dataset) => {
+      this.dataset = dataset;
+      if (dataset) {
+        this.metadata = this.dataset.scientificMetadata;
+      }
+    });
 
     this.store.dispatch(accessEmpiarSchema());
     this.subscriptions.push(
@@ -107,7 +124,29 @@ export class DepositorComponent implements OnInit, OnDestroy {
   }
 
   onChangeIngestorMetadata(){
+    this.store.dispatch(ingestorActions.getExtractionMethods({ page: 1, pageNumber: 10 }));
+
+    this.methods$.pipe(
+      take(1),
+    ).subscribe(methods => {
+      const selectedMethod = methods.find(m => m.name === 'spa');
+      if (selectedMethod) {
+        const parsedSchema: JsonSchema = JSON.parse(selectedMethod.schema);
+        this.metadataSchema = parsedSchema;
+        this.showMetadataEditor = false; //needs tuning
+      }
+    });
+
+    this.showMetadataEditor = true
     console.log("Ingestor metadata changes");
   }
 
+  onMetadataChange(newData: any) {
+    this.metadata= newData;
+  }
+
+  onMetadataErrors(errors: any[]) {
+    console.warn('Metadata validation errors:', errors);
+  }
+
 }
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
index 46437a962c..3f512a99c2 100644
--- a/src/app/state-management/selectors/ingestor.selector.ts
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -73,3 +73,9 @@ export const selectNoRightsError = createSelector(
   selectIngestorState,
   (state) => state.noRightsError,
 );
+
+
+export const selectExtractionMethods = createSelector(
+  selectIngestorState,
+  (state) => state.ingestorExtractionMethods.methods 
+);

From 9ee0d1eb97df7cd72ccb25613e09504f3da717c2 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 26 May 2025 11:44:07 +0000
Subject: [PATCH 193/245] user can change metadata prior to deposing

---
 .../depositor/depositor.component.html        | 34 +++++++++++++------
 .../depositor/depositor.component.scss        | 14 +++++++-
 .../datasets/depositor/depositor.component.ts | 22 ++++++++----
 .../depositor/empiar/empiar.component.ts      |  1 -
 src/app/ingestor/ingestor.module.ts           |  1 +
 .../actions/datasets.actions.ts               |  4 +++
 .../effects/datasets.effects.ts               | 17 ++++++++++
 src/assets/config.json                        | 12 -------
 8 files changed, 75 insertions(+), 30 deletions(-)

diff --git a/src/app/datasets/depositor/depositor.component.html b/src/app/datasets/depositor/depositor.component.html
index 5a36cbb701..9a490ccd5c 100644
--- a/src/app/datasets/depositor/depositor.component.html
+++ b/src/app/datasets/depositor/depositor.component.html
@@ -58,7 +58,10 @@
           <div class="deposition-info-container">
             <p class="deposition-info">
               Before proceeding with deposition, please ensure that the scientific metadata for this dataset is complete and accurate.
-              You can verify and adjust the metadata in the "Details" section or update it using the OpenEM schema.
+              You can verify look through the scientific metadata in the "Details" tab. 
+              If it requires changes you can update it using the OpenEM schema.
+              Please note, when SI values and units are present, you only need to make changes to the initially provided values and units, 
+              convertion to SI will be done automatically, after submitting. 
             </p>
             <button
               class="ingestor"
@@ -70,16 +73,27 @@
             </button>
           </div>
 
-          <!-- Display the metadata editor if clicked-->
-          <app-metadata-editor
-            *ngIf="showMetadataEditor"
-            [data]="metadata"
-            [schema]="metadataSchema"
-            [renderView]="'all'"
-            (dataChange)="onMetadataChange($event)"
-            (errors)="onMetadataErrors($event)"
-          ></app-metadata-editor>
 
+          <div class="includeIngestor">
+            <!-- Display the metadata editor if clicked-->
+            <app-metadata-editor
+              *ngIf="showMetadataEditor"
+              [data]="metadata"
+              [schema]="metadataSchema"
+              [renderView]="'all'"
+              (dataChange)="onMetadataChange($event)"
+              (errors)="onMetadataErrors($event)"
+            ></app-metadata-editor>
+            <button
+              *ngIf="showMetadataEditor"
+              class="ingestor"
+              mat-raised-button
+              color="primary"
+              (click)="onUpdateIngestorMetadata()"
+            >
+              Re-submit metadata
+            </button>
+          </div>
           <mat-form-field class="method-name">
             <mat-label>Experimental Method</mat-label>
             <mat-select required [formControl]="depositionRepository" (selectionChange)="onChooseRepo()">
diff --git a/src/app/datasets/depositor/depositor.component.scss b/src/app/datasets/depositor/depositor.component.scss
index b24419345d..6e2a95bb10 100644
--- a/src/app/datasets/depositor/depositor.component.scss
+++ b/src/app/datasets/depositor/depositor.component.scss
@@ -63,7 +63,19 @@ mat-card {
 
     min-width: 12rem;
     align-self: left;
-    width: 40%;
+    width: 70%;
+  }
+  .includeIngestor{
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+
+    margin: 1.5rem 3rem 1.5rem 3rem;
+
+    min-width: 12rem;
+    align-self: left;
+    width: 70%;
+
   }
 
   .deposition-info {
diff --git a/src/app/datasets/depositor/depositor.component.ts b/src/app/datasets/depositor/depositor.component.ts
index 7d1b95df11..8c6c9db511 100644
--- a/src/app/datasets/depositor/depositor.component.ts
+++ b/src/app/datasets/depositor/depositor.component.ts
@@ -25,10 +25,14 @@ import * as fromActions from "state-management/actions/depositor.actions";
 import { accessEmpiarSchema } from "state-management/actions/depositor.actions";
 import { selectEmpiarSchema } from "state-management/selectors/depositor.selectors";
 
+import { updatePropertyAction } from "state-management/actions/datasets.actions";
+
 import * as ingestorActions from "state-management/actions/ingestor.actions";
 import { MethodItem } from "../../shared/sdk/models/ingestor/models"
 import { selectExtractionMethods} from "state-management/selectors/ingestor.selector";
 
+// import { IngestorMetadataEditorComponent} from "../../ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component"
+
 import { Observable, Subscription, take, find } from "rxjs";
 import { Router } from "@angular/router";
 
@@ -124,21 +128,18 @@ export class DepositorComponent implements OnInit, OnDestroy {
   }
 
   onChangeIngestorMetadata(){
-    this.store.dispatch(ingestorActions.getExtractionMethods({ page: 1, pageNumber: 10 }));
-
+    this.store.dispatch(ingestorActions.getExtractionMethods({ page: 0, pageNumber: 50 }));
     this.methods$.pipe(
       take(1),
     ).subscribe(methods => {
-      const selectedMethod = methods.find(m => m.name === 'spa');
+      const selectedMethod = methods.find(m => m.name === 'Single Particle'); // that's bad, need to find an actual schema!
       if (selectedMethod) {
         const parsedSchema: JsonSchema = JSON.parse(selectedMethod.schema);
         this.metadataSchema = parsedSchema;
-        this.showMetadataEditor = false; //needs tuning
       }
     });
-
+    // now it uses metadata tructure in place of schema 
     this.showMetadataEditor = true
-    console.log("Ingestor metadata changes");
   }
 
   onMetadataChange(newData: any) {
@@ -149,4 +150,13 @@ export class DepositorComponent implements OnInit, OnDestroy {
     console.warn('Metadata validation errors:', errors);
   }
 
+
+  onUpdateIngestorMetadata() {
+    const pid = this.dataset.pid;
+    const property = { scientificMetadata: this.metadata };
+    this.store.dispatch(updatePropertyAction({ pid, property }));
+
+    this.showMetadataEditor = false // hide again after the form was submitted
+  }
+
 }
diff --git a/src/app/datasets/depositor/empiar/empiar.component.ts b/src/app/datasets/depositor/empiar/empiar.component.ts
index aed677f5a5..6a4ee4bb40 100644
--- a/src/app/datasets/depositor/empiar/empiar.component.ts
+++ b/src/app/datasets/depositor/empiar/empiar.component.ts
@@ -108,7 +108,6 @@ export class EmpiarComponent implements OnChanges, OnDestroy {
 
 
   ngOnChanges(changes: SimpleChanges) {
-      console.log( "show first card:", this.showFirstCard)
     if (changes['dataset'] && this.dataset) {
       this.form.patchValue({
         metadata: this.dataset.scientificMetadata,
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 9e437a2ea1..eb33f39ff8 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -102,5 +102,6 @@ import { IngestorNoRightsDialogPageComponent } from "./ingestor-dialogs/creation
     EffectsModule.forFeature([IngestorEffects]),
     StoreModule.forFeature("ingestor", ingestorReducer),
   ],
+  exports: [IngestorMetadataEditorComponent]
 })
 export class IngestorModule {}
diff --git a/src/app/state-management/actions/datasets.actions.ts b/src/app/state-management/actions/datasets.actions.ts
index f12a8881a2..67ebc9dc49 100644
--- a/src/app/state-management/actions/datasets.actions.ts
+++ b/src/app/state-management/actions/datasets.actions.ts
@@ -149,6 +149,10 @@ export const updatePropertyAction = createAction(
   "[Dataset] Update Property",
   props<{ pid: string; property: Record<string, unknown> }>(),
 );
+export const updateScientificMetadataCompleteAction = createAction(
+  "[Dataset] Update Property Complete",
+  props<{ pid: string }>()
+);
 export const updatePropertyCompleteAction = createAction(
   "[Dataset] Update Property Complete",
 );
diff --git a/src/app/state-management/effects/datasets.effects.ts b/src/app/state-management/effects/datasets.effects.ts
index 35a390bcbc..64ff2cc47b 100644
--- a/src/app/state-management/effects/datasets.effects.ts
+++ b/src/app/state-management/effects/datasets.effects.ts
@@ -35,6 +35,8 @@ import {
   loadingCompleteAction,
   updateUserSettingsAction,
 } from "state-management/actions/user.actions";
+import { MessageType } from "state-management/models";
+import { showMessageAction } from "state-management/actions/user.actions";
 
 @Injectable()
 export class DatasetEffects {
@@ -302,6 +304,7 @@ export class DatasetEffects {
           .pipe(
             switchMap(() => [
               fromActions.updatePropertyCompleteAction(),
+              fromActions.updateScientificMetadataCompleteAction({pid}),
               fromActions.fetchDatasetAction({ pid }),
             ]),
             catchError(() => of(fromActions.updatePropertyFailedAction())),
@@ -310,6 +313,20 @@ export class DatasetEffects {
     );
   });
 
+  updatePropertySuccessMessage$ = createEffect(() =>
+  this.actions$.pipe(
+    ofType(fromActions.updateScientificMetadataCompleteAction),
+    map(({ pid }) => {
+      const message = {
+        type: MessageType.Success,
+        content: `Updated scientific Metadata of dataset ${pid}`,
+        duration: 5000,
+      };
+      return showMessageAction({ message });
+    })
+  )
+);
+
   addAttachment$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(fromActions.addAttachmentAction),
diff --git a/src/assets/config.json b/src/assets/config.json
index 8fc5e19f4a..b24183aceb 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -8,9 +8,6 @@
   "editPublishedData": true,
   "editSampleEnabled": true,
   "facility": "SAMPLE-SITE",
-  "editPublishedData": true,
-  "editSampleEnabled": true,
-  "facility": "SAMPLE-SITE",
   "fileColorEnabled": true,
   "fileDownloadEnabled": true,
   "gettingStarted": null,
@@ -72,11 +69,6 @@
   "metadataStructure": "tree",
   "multipleDownloadAction": "",
   "multipleDownloadEnabled": false,
-  "maxDirectDownloadSize": 5000000000,
-  "metadataPreviewEnabled": true,
-  "metadataStructure": "tree",
-  "multipleDownloadAction": "",
-  "multipleDownloadEnabled": false,
   "policiesEnabled": true,
   "retrieveDestinations": [],
   "riotBaseUrl": "",
@@ -88,10 +80,6 @@
   "shareEnabled": false,
   "shoppingCartEnabled": false,
   "shoppingCartOnHeader": false,
-  "sftpHost": "",
-  "shareEnabled": false,
-  "shoppingCartEnabled": false,
-  "shoppingCartOnHeader": false,
   "tableSciDataEnabled": true,
   "defaultDatasetsListSettings": {
     "columns": [

From c8b5265f2790c98fc68865e6ce4a31e77a08f635 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 26 May 2025 11:59:14 +0000
Subject: [PATCH 194/245] change access to depositor to ownerUsedrs only

---
 src/app/app-config.service.ts                                 | 1 -
 .../dataset-details-dashboard.component.ts                    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index 10119f1d01..9af3a90c96 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -131,7 +131,6 @@ export class AppConfigService {
       console.log("No config available in backend, trying with local config.");
       try {
         const config = await this.http.get("/assets/config.json").toPromise();
-        console.log("Local config loaded.", config);
         this.appConfig = Object.assign({}, this.appConfig, config);
       } catch (err) {
         console.error("No config provided.");
diff --git a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
index a4dadc0b18..8e5b65c326 100644
--- a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
+++ b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
@@ -150,7 +150,7 @@ export class DatasetDetailsDashboardComponent
             const hasAccessToLogbook =
               isInOwnerGroup ||
               this.dataset.accessGroups.some((g) => groups.includes(g));
-            const hasOpenEMKeyword = this.dataset.keywords.some(
+            const hasAccessToDepositor = isInOwnerGroup && this.dataset.keywords.some(
               (k) => k.toLowerCase() === "openem",
             );
             this.navLinks = [
@@ -219,7 +219,7 @@ export class DatasetDetailsDashboardComponent
                 location: "./depositor",
                 label: TAB.depositor,
                 icon: "file_upload",
-                enabled: isLoggedIn && hasOpenEMKeyword,
+                enabled: isLoggedIn && hasAccessToDepositor,
               },
             ];
           })

From 8ac21ceb5f151600bc57c31ee2ceaa211e7c2137 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 9 Jun 2025 16:09:47 +0000
Subject: [PATCH 195/245] update comment

---
 src/app/datasets/depositor/depositor.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/datasets/depositor/depositor.component.ts b/src/app/datasets/depositor/depositor.component.ts
index 8c6c9db511..802977ecd4 100644
--- a/src/app/datasets/depositor/depositor.component.ts
+++ b/src/app/datasets/depositor/depositor.component.ts
@@ -132,7 +132,7 @@ export class DepositorComponent implements OnInit, OnDestroy {
     this.methods$.pipe(
       take(1),
     ).subscribe(methods => {
-      const selectedMethod = methods.find(m => m.name === 'Single Particle'); // that's bad, need to find an actual schema!
+      const selectedMethod = methods.find(m => m.name === 'Single Particle'); // that's bad, need to use an actual schema from elsewhere!
       if (selectedMethod) {
         const parsedSchema: JsonSchema = JSON.parse(selectedMethod.schema);
         this.metadataSchema = parsedSchema;

From d4a6b5271fe6f16539bd53edd552ce924991c9d4 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Tue, 10 Jun 2025 07:54:14 +0000
Subject: [PATCH 196/245] use v3 dataset dto

---
 .../ingestor.new-transfer-dialog-page.component.ts |  3 ++-
 .../helper/ingestor.component-helper.ts            | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index d5bd27e9c2..a47c42ab42 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -131,7 +131,8 @@ export class IngestorNewTransferDialogPageComponent
     this.createNewTransferData.scicatHeader["dataFormat"] = "root";
     this.createNewTransferData.scicatHeader["owner"] = "User";
 
-    //this.createNewTransferData.scicatHeader["principalInvestigators"] = [this.userProfile.username];
+    this.createNewTransferData.scicatHeader["principalInvestigator"] =
+      this.userProfile.username;
     this.createNewTransferData.scicatHeader["ownerEmail"] =
       this.userProfile.email;
     this.createNewTransferData.scicatHeader["contactEmail"] =
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 01f074cd32..3bfc55adb6 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -1,6 +1,7 @@
 import { JsonSchema, JsonSchema7 } from "@jsonforms/core";
 import {
   CreateDatasetDto,
+  CreateRawDatasetObsoleteDto,
   DatasetClass,
 } from "@scicatproject/scicat-sdk-ts-angular";
 import { isArray } from "mathjs";
@@ -174,7 +175,7 @@ export const getJsonSchemaFromDto = () => {
   // 0 => number
   // -1 => skip number
   // -2 => optional number
-  const emptyDatasetForSchema: CreateDatasetDto = {
+  const emptyDatasetForSchema: CreateRawDatasetObsoleteDto = {
     ownerGroup: "--string",
     accessGroups: [],
     isPublished: false,
@@ -193,7 +194,7 @@ export const getJsonSchemaFromDto = () => {
     description: "--string --optional",
     license: "--string --optional",
     keywords: [],
-    principalInvestigators: null, // skip [],
+    principalInvestigator: "--string", // skip [],
     scientificMetadata: {},
     ownerEmail: "--mail --optional",
 
@@ -212,9 +213,9 @@ export const getJsonSchemaFromDto = () => {
     runNumber: "--optional",
     datasetlifecycle: undefined,
 
-    proposalIds: [],
-    sampleIds: [],
-    instrumentIds: [],
+    proposalId: "--string --optional",
+    sampleId: "--string --optional",
+    instrumentId: "--string --optional",
     inputDatasets: [],
     usedSoftware: [],
     jobLogData: "--string --optional",
@@ -310,6 +311,9 @@ export const getJsonSchemaFromDto = () => {
       "The creation process of the derived data will usually depend on input job parameters. The full structure of these input parameters are stored here.",
     jobLogData:
       "The output job logfile. Keep the size of this log data well below 15 MB.",
+    proposalId: "The ID of the proposal to which the dataset belongs.",
+    sampleId: "ID of the sample used when collecting the data.",
+    instrumentId: "ID of the instrument where the data was created.",
   };
 
   const schema = {

From f3fa03d21e3372ab542d647d794323a2ff671d4f Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 11 Jun 2025 15:43:20 +0000
Subject: [PATCH 197/245] Bugfix: Extractor loading page was not updated

---
 ....confirm-transfer-dialog-page.component.ts |  14 +-
 ...ingestor.confirm-transfer-dialog-page.html | 152 ++++++++++--------
 ...gestor.extractor-metadata-dialog-page.html |   3 +-
 ...ingestor.creation-dialog-base.component.ts |  12 ++
 .../helper/ingestor.component-helper.ts       |   2 +
 .../helper/ingestor.metadata-sse-service.ts   |  17 +-
 .../actions/ingestor.actions.ts               |   5 +
 .../effects/ingestor.effect.ts                |  89 ++++++----
 .../reducers/ingestor.reducer.ts              |  22 ++-
 .../selectors/ingestor.selector.ts            |   5 +
 10 files changed, 212 insertions(+), 109 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index b2edf50ac5..9888fc1b32 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -11,7 +11,10 @@ import {
   IngestorHelper,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { Store } from "@ngrx/store";
-import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
+import {
+  selectIngestionObject,
+  selectIsIngestDatasetLoading,
+} from "state-management/selectors/ingestor.selector";
 import { MatDialog } from "@angular/material/dialog";
 import { MatCheckboxChange } from "@angular/material/checkbox";
 import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
@@ -34,6 +37,7 @@ export class IngestorConfirmTransferDialogPageComponent
     IngestorHelper.createEmptyRequestInformation();
 
   ingestionObject$ = this.store.select(selectIngestionObject);
+  ingestDatasetLoading$ = this.store.select(selectIsIngestDatasetLoading);
 
   @Output() nextStep = new EventEmitter<void>();
   @Output() backStep = new EventEmitter<void>();
@@ -41,6 +45,7 @@ export class IngestorConfirmTransferDialogPageComponent
   provideMergeMetaData = "";
 
   copiedToClipboard = false;
+  ingestionDatasetIsLoading = false;
 
   constructor(private store: Store) {}
 
@@ -53,6 +58,13 @@ export class IngestorConfirmTransferDialogPageComponent
       }),
     );
 
+    this.subscriptions.push(
+      this.ingestDatasetLoading$.subscribe((loading) => {
+        console.log(loading);
+        this.ingestionDatasetIsLoading = loading;
+      }),
+    );
+
     this.provideMergeMetaData = IngestorHelper.createMetaDataString(
       this.createNewTransferData,
     );
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
index 8ca2724b1c..4f90f52dc8 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
@@ -16,87 +16,101 @@ <h2 mat-dialog-title>
 
 <mat-dialog-content class="mat-typography">
 
-  <p
-    *ngIf="createNewTransferData.apiInformation.ingestionRequestErrorMessage !== ''">
-    <mat-card class="ingestor-card">
-      <mat-card-header class="ingestor-mixed-header">
-        <mat-card-title>Transfer request failed</mat-card-title>
-      </mat-card-header>
-      <mat-card-content class="ingestor-vertical-layout">
-        <div class="confirm-message-ingestor">
-          <mat-icon class="confirm-message-ingestor-icon">error</mat-icon>
-          <p>The transfer request has failed.</p>
-          <p class="confirm-message-error">
-            {{createNewTransferData.apiInformation.ingestionRequestErrorMessage}}
-          </p>
-        </div>
+  <div *ngIf="ingestionDatasetIsLoading" class="spinner-container">
+    <mat-progress-spinner diameter="20"
+      mode="indeterminate"></mat-progress-spinner>
+    <div class="progress-percentage">
+      <span>Wait for the response from the server...</span>
+    </div>
+  </div>
 
+  <div *ngIf="!ingestionDatasetIsLoading">
+    <p
+      *ngIf="createNewTransferData.apiInformation.ingestionRequestErrorMessage !== ''">
+      <mat-card class="ingestor-card">
+        <mat-card-header class="ingestor-mixed-header">
+          <mat-card-title>Transfer request failed</mat-card-title>
+        </mat-card-header>
+        <mat-card-content class="ingestor-vertical-layout">
+          <div class="confirm-message-ingestor">
+            <mat-icon class="confirm-message-ingestor-icon">error</mat-icon>
+            <p>The transfer request has failed.</p>
+            <p class="confirm-message-error">
+              {{createNewTransferData.apiInformation.ingestionRequestErrorMessage}}
+            </p>
+          </div>
 
-      </mat-card-content>
-    </mat-card>
-  </p>
 
-  <div
-    *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
-    <mat-card class="ingestor-card">
-      <mat-card-header class="ingestor-mixed-header">
-        <mat-card-title>Transfer requested</mat-card-title>
-      </mat-card-header>
-      <mat-card-content class="ingestor-vertical-layout">
-        <div class="confirm-message-ingestor">
-          <mat-icon
-            class="confirm-message-ingestor-icon">check_circle</mat-icon>
-          <p>The transfer request was successfully sent to the server.
-            You will receive an email as soon as the data transfer is complete.
-          </p>
-          <p>Transfer ID: {{createNewTransferData.ingestionRequest.transferId}}
-          </p>
-          <p>Transfer status: {{createNewTransferData.ingestionRequest.status}}
-          </p>
-        </div>
-      </mat-card-content>
-    </mat-card>
-  </div>
+        </mat-card-content>
+      </mat-card>
+    </p>
 
-  <div
-    *ngIf="createNewTransferData.editorMode === 'INGESTION' && createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
-    <mat-card class="ingestor-card">
-      <mat-card-header class="ingestor-mixed-header">
-        <mat-card-title>Transfer Options</mat-card-title>
-      </mat-card-header>
-      <mat-card-content class="ingestor-vertical-layout">
-        <mat-checkbox [(ngModel)]="createNewTransferData.autoArchive"
-          (change)="onAutoArchiveChange($event)" aria-label="Auto Archive">
-          Auto Archive
-        </mat-checkbox>
-        <p class="checkbox-description">
-          Automatically trigger archiving jobs after the data transfer has
-          finished.
-        </p>
-      </mat-card-content>
-    </mat-card>
-  </div>
+    <div
+      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
+      <mat-card class="ingestor-card">
+        <mat-card-header class="ingestor-mixed-header">
+          <mat-card-title>Transfer requested</mat-card-title>
+        </mat-card-header>
+        <mat-card-content class="ingestor-vertical-layout">
+          <div class="confirm-message-ingestor">
+            <mat-icon
+              class="confirm-message-ingestor-icon">check_circle</mat-icon>
+            <p>The transfer request was successfully sent to the server.
+              You will receive an email as soon as the data transfer is
+              complete.
+            </p>
+            <p>Transfer ID:
+              {{createNewTransferData.ingestionRequest.transferId}}
+            </p>
+            <p>Transfer status:
+              {{createNewTransferData.ingestionRequest.status}}
+            </p>
+          </div>
+        </mat-card-content>
+      </mat-card>
+    </div>
 
-  <div
-    *ngIf="createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
-    <mat-card class="ingestor-card">
-      <mat-card-header class="ingestor-mixed-header">
-        <mat-card-title>Confirm Metadata</mat-card-title>
-      </mat-card-header>
-      <mat-card-content class="ingestor-vertical-layout">
-        <div class="code-editor">
-          <pre class="code">
+    <div
+      *ngIf="createNewTransferData.editorMode === 'INGESTION' && createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
+      <mat-card class="ingestor-card">
+        <mat-card-header class="ingestor-mixed-header">
+          <mat-card-title>Transfer Options</mat-card-title>
+        </mat-card-header>
+        <mat-card-content class="ingestor-vertical-layout">
+          <mat-checkbox [(ngModel)]="createNewTransferData.autoArchive"
+            (change)="onAutoArchiveChange($event)" aria-label="Auto Archive">
+            Auto Archive
+          </mat-checkbox>
+          <p class="checkbox-description">
+            Automatically trigger archiving jobs after the data transfer has
+            finished.
+          </p>
+        </mat-card-content>
+      </mat-card>
+    </div>
+
+    <div
+      *ngIf="createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
+      <mat-card class="ingestor-card">
+        <mat-card-header class="ingestor-mixed-header">
+          <mat-card-title>Confirm Metadata</mat-card-title>
+        </mat-card-header>
+        <mat-card-content class="ingestor-vertical-layout">
+          <div class="code-editor">
+            <pre class="code">
       <div *ngFor="let line of provideMergeMetaData.split('\n')">
         <code>{{ line }}</code>
       </div>
       </pre>
-        </div>
-      </mat-card-content>
-    </mat-card>
+          </div>
+        </mat-card-content>
+      </mat-card>
+    </div>
   </div>
 
+
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions align="end" *ngIf="!ingestionDatasetIsLoading">
   <button *ngIf="createNewTransferData.editorMode === 'EDITOR' ||
   createNewTransferData.editorMode === 'INGESTION' &&
   (createNewTransferData.ingestionRequest === null ||
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
index 042e246d7c..0ef17a7d50 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
@@ -19,9 +19,10 @@ <h2 mat-dialog-title>
   <div *ngIf="!extractorMetaDataReady || extractorMetaDataError"
     class="spinner-container">
     <ng-container *ngIf="!extractorMetaDataError; else errorIcon">
+      <p>Wait for data extraction to finish...</p>
       <mat-progress-spinner diameter="20"
         mode="indeterminate"></mat-progress-spinner>
-      <div *ngIf="process > 0" class="progress-percentage">
+      <div *ngIf="process > -1" class="progress-percentage">
         <span>{{process}}%</span>
       </div>
     </ng-container>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index cc3ec50e4b..fcba621cd4 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -161,6 +161,12 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
             this.createNewTransferData.apiInformation.extractorMetadataProgress =
               data.progress;
           }
+
+          this.store.dispatch(
+            fromActions.updateIngestionObject({
+              ingestionObject: this.createNewTransferData,
+            }),
+          );
         },
         error: (error) => {
           console.error("Error receiving SSE data:", error);
@@ -168,6 +174,12 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
             true;
           this.createNewTransferData.apiInformation.extractMetaDataRequested =
             false;
+
+          this.store.dispatch(
+            fromActions.updateIngestionObject({
+              ingestionObject: this.createNewTransferData,
+            }),
+          );
         },
       }),
     );
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 3bfc55adb6..1dae4f68cd 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -44,6 +44,7 @@ export interface IngestionRequestInformation {
     extractorMetadataProgress: number;
     extractorMetaDataStatus: string;
     ingestionRequestErrorMessage: string;
+    ingestionDatasetLoading: boolean;
   };
 
   ingestionRequest: PostDatasetResponse | null;
@@ -122,6 +123,7 @@ export class IngestorHelper {
         extractorMetadataProgress: 0,
         extractorMetaDataStatus: "",
         ingestionRequestErrorMessage: "",
+        ingestionDatasetLoading: false,
       },
       ingestionRequest: null,
       autoArchive: true,
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.metadata-sse-service.ts b/src/app/ingestor/ingestor-page/helper/ingestor.metadata-sse-service.ts
index d2c09af9ba..b1cab387dc 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.metadata-sse-service.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.metadata-sse-service.ts
@@ -54,12 +54,19 @@ export class IngestorMetadataSSEService {
 
       const progressMessage = data.std_out.toLowerCase();
       let progress = 0;
-      // Check if data contains the string progress
+      // Check if the string "progress" is present in the message
       if (progressMessage.includes("progress")) {
-        // extract numbers, point and komma from string using regex
-        const extractedNumbers =
-          progressMessage.match(/[\d.,]+/g)?.join("") || "0";
-        progress = parseFloat(extractedNumbers);
+        // Find all occurrences of "progress" followed by a number, use the last one
+        const progressRegex = /progress[^\d]*(?<number>[\d.,]+)/gi;
+        let match: RegExpExecArray | null;
+        let lastNumber = "0";
+        while ((match = progressRegex.exec(progressMessage)) !== null) {
+          if (match.groups?.number) {
+            lastNumber = match.groups.number;
+          }
+        }
+
+        progress = parseFloat(lastNumber.replace(",", "."));
         progress = isNaN(progress) ? 0 : progress;
       }
 
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index ed001f9eed..26a530160c 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -116,6 +116,11 @@ export const ingestDataset = createAction(
   props<{ ingestionDataset: PostDatasetRequest }>(),
 );
 
+export const setIngestDatasetLoading = createAction(
+  "[Ingestor] Set Ingest Dataset Loading",
+  props<{ ingestionDatasetLoading: boolean }>(),
+);
+
 export const ingestDatasetSuccess = createAction(
   "[Ingestor] Ingest Dataset Success",
   props<{ response: PostDatasetResponse }>(),
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index 2751bf5f53..a021e5a0c2 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -1,7 +1,13 @@
 import { Injectable } from "@angular/core";
 import { Actions, createEffect, ofType } from "@ngrx/effects";
-import { of } from "rxjs";
-import { catchError, map, switchMap, takeUntil } from "rxjs/operators"; // Import finalize
+import { from, of } from "rxjs";
+import {
+  catchError,
+  map,
+  mergeMap,
+  switchMap,
+  takeUntil,
+} from "rxjs/operators"; // Import finalize
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { Ingestor } from "shared/sdk/apis/ingestor.service";
 import {
@@ -194,28 +200,48 @@ export class IngestorEffects {
     );
   });
 
-  ingestDataset$ = createEffect(() => {
-    return this.actions$.pipe(
+  setLoadingBeforeIngestion$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(fromActions.ingestDataset),
+      map(() =>
+        fromActions.setIngestDatasetLoading({ ingestionDatasetLoading: true }),
+      ),
+    ),
+  );
+
+  ingestDataset$ = createEffect(() =>
+    this.actions$.pipe(
       ofType(fromActions.ingestDataset),
       switchMap(({ ingestionDataset }) =>
         this.ingestor.startIngestion(ingestionDataset).pipe(
-          switchMap((response) => [
-            fromActions.ingestDatasetSuccess({ response }),
-            fromActions.updateTransferList({}),
-          ]),
-          catchError((err) => {
-            if (err.error?.error?.includes("login session has expired")) {
-              return of(
-                fromActions.setNoRightsError({ noRightsError: true, err: err }),
-              );
-            }
-
-            return of(fromActions.getExtractionMethodsFailure({ err }));
-          }),
+          mergeMap((response) =>
+            from([
+              fromActions.ingestDatasetSuccess({ response }),
+              fromActions.updateTransferList({}),
+              fromActions.setIngestDatasetLoading({
+                ingestionDatasetLoading: false,
+              }),
+            ]),
+          ),
+          catchError((err) =>
+            from([
+              ...(err.error?.error?.includes("login session has expired")
+                ? [
+                    fromActions.setNoRightsError({
+                      noRightsError: true,
+                      err,
+                    }),
+                  ]
+                : [fromActions.getExtractionMethodsFailure({ err })]),
+              fromActions.setIngestDatasetLoading({
+                ingestionDatasetLoading: false,
+              }),
+            ]),
+          ),
         ),
       ),
-    );
-  });
+    ),
+  );
 
   ingestDatasetSuccess$ = createEffect(() => {
     return this.actions$.pipe(
@@ -258,17 +284,20 @@ export class IngestorEffects {
       ofType(fromActions.cancelTransfer),
       switchMap(({ requestBody }) =>
         this.ingestor.cancelTransfer(requestBody).pipe(
-          switchMap(() => [
-            showMessageAction({
-              message: {
-                type: MessageType.Success,
-                content:
-                  "Successfully cancelled transfer: " + requestBody.transferId,
-                duration: 5000,
-              },
-            }),
-            fromActions.updateTransferList({}),
-          ]),
+          mergeMap(() =>
+            from([
+              showMessageAction({
+                message: {
+                  type: MessageType.Success,
+                  content:
+                    "Successfully cancelled transfer: " +
+                    requestBody.transferId,
+                  duration: 5000,
+                },
+              }),
+              fromActions.updateTransferList({}),
+            ]),
+          ),
           catchError((err) => {
             const message = {
               type: MessageType.Error,
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index f701cfbaab..2c586e6acd 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -118,7 +118,9 @@ const reducer = createReducer(
     fromActions.updateIngestionObject,
     (state, { ingestionObject }): IngestorState => ({
       ...state,
-      ingestionObject,
+      ingestionObject: {
+        ...ingestionObject,
+      },
     }),
   ),
   on(
@@ -158,7 +160,8 @@ const reducer = createReducer(
         ...state.ingestionObject,
         apiInformation: {
           ...state.ingestionObject.apiInformation,
-          ingestionRequestErrorMessage: (err as any).error ?? (err as any).error?.error ?? err.message,
+          ingestionRequestErrorMessage:
+            (err as any).error ?? (err as any).error?.error ?? err.message,
         },
       },
       error: err,
@@ -180,7 +183,7 @@ const reducer = createReducer(
   ),
   on(
     fromActions.resetIngestorComponent,
-    (): IngestorState => initialIngestorState
+    (): IngestorState => initialIngestorState,
   ),
   on(
     fromActions.setNoRightsError,
@@ -195,4 +198,17 @@ const reducer = createReducer(
       },
     }),
   ),
+  on(
+    fromActions.setIngestDatasetLoading,
+    (state, { ingestionDatasetLoading }): IngestorState => ({
+      ...state,
+      ingestionObject: {
+        ...state.ingestionObject,
+        apiInformation: {
+          ...state.ingestionObject.apiInformation,
+          ingestionDatasetLoading,
+        },
+      },
+    }),
+  ),
 );
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
index 46437a962c..53d70a27c8 100644
--- a/src/app/state-management/selectors/ingestor.selector.ts
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -73,3 +73,8 @@ export const selectNoRightsError = createSelector(
   selectIngestorState,
   (state) => state.noRightsError,
 );
+
+export const selectIsIngestDatasetLoading = createSelector(
+  selectIngestorState,
+  (state) => state.ingestionObject.apiInformation.ingestionDatasetLoading,
+);

From 75c1418728de93f8710efca5fa138aca2fd15184 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 11 Jun 2025 15:43:59 +0000
Subject: [PATCH 198/245] remove console log

---
 .../ingestor.confirm-transfer-dialog-page.component.ts           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index 9888fc1b32..2eac0de74c 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -60,7 +60,6 @@ export class IngestorConfirmTransferDialogPageComponent
 
     this.subscriptions.push(
       this.ingestDatasetLoading$.subscribe((loading) => {
-        console.log(loading);
         this.ingestionDatasetIsLoading = loading;
       }),
     );

From 31bfc35d9ab50017fe6e4b3550c2c2d3296622b4 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 12 Jun 2025 14:24:26 +0000
Subject: [PATCH 199/245] Fix error action when connecting

---
 src/app/state-management/effects/ingestor.effect.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index a021e5a0c2..f0bebb7181 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -71,7 +71,7 @@ export class IngestorEffects {
               );
             }
 
-            return of(fromActions.getExtractionMethodsFailure({ err }));
+            return of(fromActions.connectIngestorFailure({ err }));
           }),
           takeUntil(
             this.actions$.pipe(ofType(fromActions.resetIngestorComponent)),
@@ -193,7 +193,7 @@ export class IngestorEffects {
               );
             }
 
-            return of(fromActions.getExtractionMethodsFailure({ err }));
+            return of(fromActions.getBrowseFilePathFailure({ err }));
           }),
         ),
       ),
@@ -232,7 +232,7 @@ export class IngestorEffects {
                       err,
                     }),
                   ]
-                : [fromActions.getExtractionMethodsFailure({ err })]),
+                : [fromActions.ingestDatasetFailure({ err })]),
               fromActions.setIngestDatasetLoading({
                 ingestionDatasetLoading: false,
               }),

From 087476d2a686fdce8fca55296a38e58702718d10 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Sat, 14 Jun 2025 12:59:37 +0000
Subject: [PATCH 200/245] bugfix when changing backend

---
 src/app/ingestor/ingestor-page/ingestor.component.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 4e87799ca8..1bfeb5f736 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -114,7 +114,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
 
     this.subscriptions.push(
       this.ingestorBackend$.subscribe((ingestorBackend) => {
-        if (ingestorBackend) {
+        if (ingestorBackend !== null && ingestorBackend !== undefined) {
           this.connectedFacilityBackend = ingestorBackend;
         }
       }),
@@ -122,7 +122,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
 
     this.subscriptions.push(
       this.transferList$.subscribe((transferList) => {
-        if (transferList) {
+        if (transferList !== null && transferList !== undefined) {
           this.transferDataInformation = transferList;
         }
       }),
@@ -131,7 +131,7 @@ export class IngestorComponent implements OnInit, OnDestroy {
     this.subscriptions.push(
       this.selectIngestorTransferListRequestOptions$.subscribe(
         (requestOptions) => {
-          if (requestOptions) {
+          if (requestOptions !== null && requestOptions !== undefined) {
             this.transferDataPageIndex = requestOptions.page;
             this.transferDataPageSize = requestOptions.pageNumber;
           }

From 515df19d81d715882d8840dddad916b4396cf8ba Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 18 Jun 2025 08:59:00 +0000
Subject: [PATCH 201/245] added components for creation mode (without external
 ingestor)

---
 ....confirm-transfer-dialog-page.component.ts |  11 +-
 ...ingestor.confirm-transfer-dialog-page.html |  39 +-
 ...r.custom-metadata-dialog-page.component.ts | 165 ++++++++
 .../ingestor.custom-metadata-dialog-page.html |  49 +++
 ...stor.new-transfer-dialog-page.component.ts | 175 ++++++--
 .../ingestor.new-transfer-dialog-page.html    |  29 +-
 ...r.scicat-metadata-dialog-page.component.ts | 144 +++++++
 .../ingestor.scicat-metadata-dialog-page.html |  49 +++
 ...tor.user-metadata-dialog-page.component.ts |   1 -
 ...ingestor.creation-dialog-base.component.ts |  43 +-
 .../ingestor.creation-dialog-base.html        |  16 +-
 .../ingestor.dialog-stepper.component.html    |  23 +-
 .../helper/ingestor.component-helper.ts       |  43 +-
 .../ingestor-creation.component.html          |  47 +++
 .../ingestor-creation.component.ts            |  43 ++
 ....html => ingestor-transfer.component.html} |   0
 .../ingestor-transfer.component.ts            | 370 +++++++++++++++++
 .../ingestor-page/ingestor.component.ts       | 379 ++----------------
 src/app/ingestor/ingestor.module.ts           |   8 +
 .../actions/ingestor.actions.ts               |  14 +
 .../effects/ingestor.effect.ts                |  35 ++
 .../reducers/ingestor.reducer.ts              |  17 +
 src/assets/config.json                        |   2 +-
 23 files changed, 1263 insertions(+), 439 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.scicat-metadata-dialog-page.component.ts
 create mode 100644 src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.scicat-metadata-dialog-page.html
 create mode 100644 src/app/ingestor/ingestor-page/ingestor-creation.component.html
 create mode 100644 src/app/ingestor/ingestor-page/ingestor-creation.component.ts
 rename src/app/ingestor/ingestor-page/{ingestor.component.html => ingestor-transfer.component.html} (100%)
 create mode 100644 src/app/ingestor/ingestor-page/ingestor-transfer.component.ts

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index 2eac0de74c..1ebffc96db 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -66,6 +66,7 @@ export class IngestorConfirmTransferDialogPageComponent
 
     this.provideMergeMetaData = IngestorHelper.createMetaDataString(
       this.createNewTransferData,
+      this.createNewTransferData.editorMode === "CREATION",
     );
   }
 
@@ -91,8 +92,14 @@ export class IngestorConfirmTransferDialogPageComponent
   onClickConfirm(): void {
     const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
       data: {
-        header: "Confirm ingestion",
-        message: "Create a new dataset and start data transfer?",
+        header:
+          this.createNewTransferData.editorMode === "CREATION"
+            ? "Confirm creation"
+            : "Confirm ingestion",
+        message:
+          this.createNewTransferData.editorMode === "CREATION"
+            ? "Create a new dataset?"
+            : "Create a new dataset and start data transfer?",
       },
     });
 
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
index 4f90f52dc8..13bc381481 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
@@ -46,7 +46,31 @@ <h2 mat-dialog-title>
     </p>
 
     <div
-      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
+      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '' && createNewTransferData.editorMode === 'CREATION'">
+      <mat-card class="ingestor-card">
+        <mat-card-header class="ingestor-mixed-header">
+          <mat-card-title>Dataset created</mat-card-title>
+        </mat-card-header>
+        <mat-card-content class="ingestor-vertical-layout">
+          <div class="confirm-message-ingestor">
+            <mat-icon
+              class="confirm-message-ingestor-icon">check_circle</mat-icon>
+            <p>The data set was successfully created. You can find the data set
+              with the recorded metadata under the following details:
+            </p>
+            <p>Dataset ID:
+              {{createNewTransferData.ingestionRequest.transferId}}
+            </p>
+            <p>Dataset Name:
+              {{createNewTransferData.ingestionRequest.status}}
+            </p>
+          </div>
+        </mat-card-content>
+      </mat-card>
+    </div>
+
+    <div
+      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '' && createNewTransferData.editorMode === 'INGESTION'">
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Transfer requested</mat-card-title>
@@ -111,7 +135,7 @@ <h2 mat-dialog-title>
 
 </mat-dialog-content>
 <mat-dialog-actions align="end" *ngIf="!ingestionDatasetIsLoading">
-  <button *ngIf="createNewTransferData.editorMode === 'EDITOR' ||
+  <button *ngIf="createNewTransferData.editorMode === 'EDITOR' || createNewTransferData.editorMode === 'CREATION' ||
   createNewTransferData.editorMode === 'INGESTION' &&
   (createNewTransferData.ingestionRequest === null ||
   createNewTransferData.apiInformation.ingestionRequestErrorMessage !== '')"
@@ -120,12 +144,17 @@ <h2 mat-dialog-title>
     *ngIf="createNewTransferData.editorMode === 'INGESTION' && (createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '')"
     mat-button color="primary" cdkFocusInitial
     (click)="onClickConfirm()">Ingest</button>
-  <button *ngIf="createNewTransferData.editorMode === 'EDITOR'" mat-button
-    color="primary" cdkFocusInitial (click)="onCopyMetadata()">
+  <button
+    *ngIf="createNewTransferData.editorMode === 'EDITOR' || createNewTransferData.editorMode === 'CREATION'"
+    mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">
     {{!copiedToClipboard ? "Copy JSON" : "Copied!"}}
   </button>
   <button
-    *ngIf="copiedToClipboard || (createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '')"
+    *ngIf="createNewTransferData.editorMode === 'CREATION' && (createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '')"
+    mat-button color="primary" cdkFocusInitial (click)="onClickConfirm()">Create
+    Dataset</button>
+  <button
+    *ngIf="copiedToClipboard && createNewTransferData.editorMode === 'EDITOR' || (createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '')"
     mat-button color="primary" cdkFocusInitial mat-dialog-close>Close</button>
   <button
     *ngIf="createNewTransferData.apiInformation.ingestionRequestErrorMessage !== ''"
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
new file mode 100644
index 0000000000..a87259555f
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
@@ -0,0 +1,165 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  OnDestroy,
+  OnInit,
+  Output,
+} from "@angular/core";
+import { JsonSchema } from "@jsonforms/core";
+import {
+  IngestionRequestInformation,
+  IngestorHelper,
+} from "../../../ingestor-page/helper/ingestor.component-helper";
+import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import {
+  selectIngestionObject,
+  selectIngestorRenderView,
+  selectUpdateEditorFromThirdParty,
+} from "state-management/selectors/ingestor.selector";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import { Store } from "@ngrx/store";
+import { Subscription } from "rxjs";
+import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
+
+@Component({
+  selector: "ingestor-custom-metadata-dialog",
+  templateUrl: "ingestor.custom-metadata-dialog-page.html",
+  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
+})
+export class IngestorCustomMetadataDialogPageComponent
+  implements OnInit, OnDestroy
+{
+  private subscriptions: Subscription[] = [];
+  ingestionObject$ = this.store.select(selectIngestionObject);
+  renderView$ = this.store.select(selectIngestorRenderView);
+  selectUpdateEditorFromThirdParty$ = this.store.select(
+    selectUpdateEditorFromThirdParty,
+  );
+
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+
+  @Output() nextStep = new EventEmitter<void>();
+  @Output() backStep = new EventEmitter<void>();
+
+  customMetadataSchema: JsonSchema;
+  activeRenderView: renderView | null = null;
+  updateEditorFromThirdParty = false;
+
+  uiNextButtonReady = false;
+  isCustomMetadataOk = false;
+  customMetadataErrors = "";
+
+  isCardContentVisible = {
+    scientific: true,
+  };
+
+  constructor(
+    private store: Store,
+    private cdr: ChangeDetectorRef,
+  ) {}
+
+  ngOnInit() {
+    this.subscriptions.push(
+      this.ingestionObject$.subscribe((ingestionObject) => {
+        if (ingestionObject) {
+          this.createNewTransferData = ingestionObject;
+
+          const customSchema =
+            this.createNewTransferData.selectedResolvedDecodedSchema;
+
+          if (
+            // Remove all keys which start with $. Json Forms can't handle this. When preparing $refs are already resolved.
+            customSchema &&
+            typeof customSchema === "object" &&
+            !Array.isArray(customSchema)
+          ) {
+            Object.keys(customSchema)
+              .filter((key) => key.startsWith("$"))
+              .forEach((key) => {
+                delete customSchema[key];
+              });
+          }
+
+          this.customMetadataSchema = customSchema;
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.renderView$.subscribe((renderView) => {
+        if (renderView) {
+          // Check if renderView changed
+          if (this.activeRenderView !== renderView) {
+            this.activeRenderView = renderView;
+          }
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.selectUpdateEditorFromThirdParty$.subscribe((updateEditor) => {
+        // We need to rerender the editor if the user has changed the metadata in the third party
+        // So we get a flag, if it is true we unrender the editor
+        // and then we set it to false to render it again
+        this.updateEditorFromThirdParty = updateEditor;
+        if (updateEditor) {
+          this.cdr.detectChanges(); // Force the change detection to unrender the editor
+          this.store.dispatch(
+            fromActions.resetIngestionObjectFromThirdPartyFlag(),
+          );
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
+  }
+
+  onClickBack(): void {
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+
+    this.backStep.emit(); // Open previous dialog
+  }
+
+  onClickNext(): void {
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+
+    this.nextStep.emit(); // Open next dialog
+  }
+
+  onDataChangeCustomMetadata(event: any) {
+    this.createNewTransferData.customMetaData = event;
+  }
+
+  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
+    Object.assign(this.createNewTransferData, updatedData);
+  }
+
+  toggleCardContent(card: string): void {
+    this.isCardContentVisible[card] = !this.isCardContentVisible[card];
+  }
+
+  customMetadataErrorsHandler(errors: any[]) {
+    this.isCustomMetadataOk = errors.length === 0;
+    this.customMetadataErrors = convertJSONFormsErrorToString(errors);
+    this.validateNextButton();
+    this.cdr.detectChanges();
+  }
+
+  validateNextButton(): void {
+    // Don't force the user to fix all required entries
+    this.uiNextButtonReady = true; //this.isCustomMetadataOk;
+  }
+}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
new file mode 100644
index 0000000000..9bde13d601
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
@@ -0,0 +1,49 @@
+<div class="ingestor-dialog-header">
+  <div class="ingestor-mixed-header">
+    <h2 mat-dialog-title>
+      Fill out user-specific metadata
+    </h2>
+    <button mat-icon-button mat-dialog-close aria-label="Close"
+      class="ingestor-close-button">
+      <mat-icon>close</mat-icon>
+    </button>
+  </div>
+
+  <div class="ingestor-stepper-header">
+    <ingestor-dialog-stepper [activeStep]="2"></ingestor-dialog-stepper>
+  </div>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+
+  <mat-card>
+    <mat-card-header class="organizational-header"
+      (click)="toggleCardContent('scientific')">
+      <div mat-card-avatar class="section-icon">
+        <mat-icon> info </mat-icon>
+      </div>
+      Scientific Metadata
+      <span class="spacer"></span>
+      <mat-icon
+        [matTooltip]="isCustomMetadataOk ? 'Your input is correct.' : customMetadataErrors"
+        [ngClass]="isCustomMetadataOk ? 'success-icon' : 'error-icon'">{{
+        isCustomMetadataOk ? 'check_circle_outline' :
+        'error_outline'}}</mat-icon>
+      <mat-icon class="toggle-icon">{{ isCardContentVisible.scientific ?
+        'expand_less' : 'expand_more' }}</mat-icon>
+    </mat-card-header>
+    <mat-card-content *ngIf="isCardContentVisible.scientific">
+      <app-metadata-editor #customMetadataEditor
+        *ngIf="!updateEditorFromThirdParty" [schema]="customMetadataSchema"
+        [renderView]="activeRenderView"
+        [data]="createNewTransferData.customMetaData"
+        (dataChange)="onDataChangeCustomMetadata($event)"
+        (errors)="customMetadataErrorsHandler($event)"></app-metadata-editor>
+    </mat-card-content>
+  </mat-card>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial
+    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index a47c42ab42..328c47a928 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -26,6 +26,7 @@ import * as fromActions from "state-management/actions/ingestor.actions";
 import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
 import { Subscription } from "rxjs";
 import { ReturnedUserDto } from "@scicatproject/scicat-sdk-ts-angular";
+import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
 
 @Component({
   selector: "ingestor-new-transfer-dialog-page",
@@ -56,15 +57,19 @@ export class IngestorNewTransferDialogPageComponent
 
   connectedFacilityBackend = "";
   extractionMethodsError = "";
+  extractionMethodsInitialized = false;
 
   userProfile: ReturnedUserDto | null = null;
   uiNextButtonReady = false;
 
+  // Creation Mode Options
+  _selectedSchemaOption: "free" | "upload" = "free";
+  selectedSchemaFileName = "";
+  selectedSchemaFileContent = "";
+
   constructor(private store: Store) {}
 
   ngOnInit() {
-    this.loadExtractionMethods();
-
     // Fetch the API token that the ingestor can authenticate to scicat as the user
     this.subscriptions.push(
       this.vm$.subscribe((settings) => {
@@ -76,18 +81,33 @@ export class IngestorNewTransferDialogPageComponent
       this.ingestionObject$.subscribe((ingestionObject) => {
         if (ingestionObject) {
           this.createNewTransferData = ingestionObject;
-        }
-      }),
-    );
+          this.validateNextButton();
 
-    this.subscriptions.push(
-      this.ingestorExtractionMethods$.subscribe((extractionMethods) => {
-        if (extractionMethods) {
-          this.extractionMethods = extractionMethods;
-          this.extractionMethodsError = "";
-        } else {
-          this.extractionMethodsError =
-            "No extraction methods available. Please check your connection.";
+          if (!this.extractionMethodsInitialized) {
+            this.extractionMethodsInitialized = true;
+
+            if (
+              // Only load extraction methods if the editor mode is set to INGESTION or EDITOR
+              this.createNewTransferData.editorMode === "INGESTION" ||
+              this.createNewTransferData.editorMode === "EDITOR"
+            ) {
+              this.loadExtractionMethods();
+
+              this.subscriptions.push(
+                this.ingestorExtractionMethods$.subscribe(
+                  (extractionMethods) => {
+                    if (extractionMethods) {
+                      this.extractionMethods = extractionMethods;
+                      this.extractionMethodsError = "";
+                    } else {
+                      this.extractionMethodsError =
+                        "No extraction methods available. Please check your connection.";
+                    }
+                  },
+                ),
+              );
+            }
+          }
         }
       }),
     );
@@ -99,6 +119,15 @@ export class IngestorNewTransferDialogPageComponent
     });
   }
 
+  set selectedSchemaOption(value: "free" | "upload") {
+    this._selectedSchemaOption = value;
+    this.validateNextButton();
+  }
+
+  get selectedSchemaOption(): "free" | "upload" {
+    return this._selectedSchemaOption;
+  }
+
   set selectedMethod(value: ExtractionMethod) {
     this.createNewTransferData.selectedMethod = value;
     this.validateNextButton();
@@ -118,14 +147,25 @@ export class IngestorNewTransferDialogPageComponent
   }
 
   generateExampleDataForSciCatHeader(): void {
-    this.createNewTransferData.scicatHeader["sourceFolder"] =
-      this.createNewTransferData.selectedPath;
-    this.createNewTransferData.scicatHeader["keywords"] = ["OpenEM"];
-
-    const nameWithoutPath =
-      this.createNewTransferData.selectedPath.split("/|\\")[-1] ??
-      this.createNewTransferData.selectedPath;
-    this.createNewTransferData.scicatHeader["datasetName"] = nameWithoutPath;
+    if (this.createNewTransferData.editorMode === "INGESTION") {
+      this.createNewTransferData.scicatHeader["sourceFolder"] =
+        this.createNewTransferData.selectedPath;
+
+      const pathParts = this.createNewTransferData.selectedPath.split(/[/\\]/);
+      const nameWithoutPath =
+        pathParts[pathParts.length - 1] ||
+        this.createNewTransferData.selectedPath;
+
+      this.createNewTransferData.scicatHeader["datasetName"] = nameWithoutPath;
+    }
+
+    if (
+      this.createNewTransferData.editorMode === "INGESTION" ||
+      this.createNewTransferData.editorMode === "EDITOR"
+    ) {
+      this.createNewTransferData.scicatHeader["keywords"] = ["OpenEM"];
+    }
+
     this.createNewTransferData.scicatHeader["license"] = "MIT License";
     this.createNewTransferData.scicatHeader["type"] = "raw";
     this.createNewTransferData.scicatHeader["dataFormat"] = "root";
@@ -145,14 +185,31 @@ export class IngestorNewTransferDialogPageComponent
   }
 
   prepareSchemaForProcessing(): void {
-    const encodedSchema = this.createNewTransferData.selectedMethod.schema;
-    const decodedSchema = decodeBase64ToUTF8(encodedSchema);
-    const schema = JSON.parse(decodedSchema);
-    const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
-      schema,
-      schema,
-    );
-    this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
+    if (
+      this.createNewTransferData.editorMode === "INGESTION" ||
+      this.createNewTransferData.editorMode === "EDITOR"
+    ) {
+      const encodedSchema = this.createNewTransferData.selectedMethod.schema;
+      const decodedSchema = decodeBase64ToUTF8(encodedSchema);
+      const schema = JSON.parse(decodedSchema);
+      const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
+        schema,
+        schema,
+      );
+      this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
+    } else if (this.createNewTransferData.editorMode === "CREATION") {
+      if (this.selectedSchemaOption === "upload") {
+        const schema = JSON.parse(this.selectedSchemaFileContent);
+        const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
+          schema,
+          schema,
+        );
+        this.createNewTransferData.selectedResolvedDecodedSchema =
+          resolvedSchema;
+      }
+    } else {
+      console.error("Unknown editor mode");
+    }
   }
 
   onClickRetryRequests(): void {
@@ -168,20 +225,35 @@ export class IngestorNewTransferDialogPageComponent
 
     this.generateExampleDataForSciCatHeader();
     this.prepareSchemaForProcessing();
+
     this.nextStep.emit(); // Open next dialog
   }
 
   validateNextButton(): void {
     const selectedPathReady =
-      (this.createNewTransferData.editorMode === "INGESTION" &&
-        this.createNewTransferData.selectedPath !== "") ||
-      this.createNewTransferData.editorMode === "EDITOR";
+      this.createNewTransferData.editorMode === "INGESTION" &&
+      this.createNewTransferData.selectedPath !== "";
+
     const selectedMethodReady =
       this.selectedMethod !== null &&
       this.selectedMethod !== undefined &&
       this.selectedMethod.name !== "";
 
-    this.uiNextButtonReady = !!selectedPathReady && !!selectedMethodReady;
+    const creationModeParameterReady =
+      this.selectedSchemaOption === "free" ||
+      (this.selectedSchemaOption === "upload" &&
+        this.selectedSchemaFileName !== "");
+
+    if (
+      this.createNewTransferData.editorMode === "INGESTION" ||
+      this.createNewTransferData.editorMode === "EDITOR"
+    ) {
+      this.uiNextButtonReady = !!selectedPathReady && !!selectedMethodReady;
+    } else if (this.createNewTransferData.editorMode === "CREATION") {
+      this.uiNextButtonReady = !!creationModeParameterReady;
+    } else {
+      this.uiNextButtonReady = false;
+    }
   }
 
   onExtractorMethodsPageChange(event: PageChangeEvent) {
@@ -200,8 +272,39 @@ export class IngestorNewTransferDialogPageComponent
     });
   }
 
-  onCreateNewTransferDataChange(updatedData: IngestionRequestInformation) {
-    Object.assign(this.createNewTransferData, updatedData);
-    this.validateNextButton();
+  onUploadSchema(): void {
+    // Upload a template of metadata
+    const input = document.createElement("input");
+    input.type = "file";
+    input.accept = ".ingestor.schema,.json";
+    input.onchange = (event: Event) => {
+      const target = event.target as HTMLInputElement;
+      const file = target.files?.[0];
+      if (file) {
+        const reader = new FileReader();
+        reader.onload = (e) => {
+          const content = e.target?.result as string;
+
+          const dialogRef = this.dialog.open(
+            IngestorConfirmationDialogComponent,
+            {
+              data: {
+                header: "Confirm template",
+                message: "Do you really want to apply the following values?",
+              },
+            },
+          );
+          dialogRef.afterClosed().subscribe((result) => {
+            if (result) {
+              this.selectedSchemaFileName = file.name;
+              this.selectedSchemaFileContent = content;
+              this.validateNextButton();
+            }
+          });
+        };
+        reader.readAsText(file);
+      }
+    };
+    input.click();
   }
 }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index d5f40e9e70..f170bccb59 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -15,7 +15,34 @@ <h2 mat-dialog-title>
 </div>
 
 <mat-dialog-content class="mat-typography" disableClose="true">
-  <div>
+  <div *ngIf="createNewTransferData.editorMode === 'CREATION'">
+    <mat-card class="ingestor-card">
+      <mat-card-header>
+        <mat-card-title>Scientific Metadata Schema</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <mat-radio-group class="ingestor-radio-group"
+          [(ngModel)]="selectedSchemaOption">
+          <mat-radio-button value="free">Free Input</mat-radio-button>
+          <mat-radio-button value="upload">Upload Schema</mat-radio-button>
+        </mat-radio-group>
+
+        <div *ngIf="selectedSchemaOption === 'upload'"
+          class="ingestor-upload-section">
+          <label for="schema-upload">Upload your schema file: </label>
+          <button mat-raised-button color="primary"
+            (click)="onUploadSchema()">Choose File</button>
+
+          <p *ngIf="selectedSchemaFileName !== ''">
+            Selected file: {{ selectedSchemaFileName }}
+          </p>
+        </div>
+      </mat-card-content>
+    </mat-card>
+  </div>
+
+  <div
+    *ngIf="createNewTransferData.editorMode === 'INGESTION' || createNewTransferData.editorMode === 'EDITOR'">
     <mat-card class="ingestor-card">
       <mat-card-header class="ingestor-mixed-header">
         <mat-card-title>Select Options</mat-card-title>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.scicat-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.scicat-metadata-dialog-page.component.ts
new file mode 100644
index 0000000000..ffe7af7a59
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.scicat-metadata-dialog-page.component.ts
@@ -0,0 +1,144 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  OnDestroy,
+  OnInit,
+  Output,
+} from "@angular/core";
+import { JsonSchema } from "@jsonforms/core";
+import {
+  getJsonSchemaFromDto,
+  IngestionRequestInformation,
+  IngestorHelper,
+} from "../../../ingestor-page/helper/ingestor.component-helper";
+import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import {
+  selectIngestionObject,
+  selectIngestorRenderView,
+  selectUpdateEditorFromThirdParty,
+} from "state-management/selectors/ingestor.selector";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import { Store } from "@ngrx/store";
+import { Subscription } from "rxjs";
+import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
+
+@Component({
+  selector: "ingestor-scicat-metadata-dialog",
+  templateUrl: "ingestor.scicat-metadata-dialog-page.html",
+  styleUrls: ["../../../ingestor-page/ingestor.component.scss"],
+  standalone: false,
+})
+export class IngestorScicatMetadataDialogPageComponent
+  implements OnInit, OnDestroy
+{
+  private subscriptions: Subscription[] = [];
+  ingestionObject$ = this.store.select(selectIngestionObject);
+  renderView$ = this.store.select(selectIngestorRenderView);
+  selectUpdateEditorFromThirdParty$ = this.store.select(
+    selectUpdateEditorFromThirdParty,
+  );
+
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+
+  @Output() nextStep = new EventEmitter<void>();
+  @Output() backStep = new EventEmitter<void>();
+
+  scicatHeaderSchema: JsonSchema;
+  activeRenderView: renderView | null = null;
+  updateEditorFromThirdParty = false;
+
+  uiNextButtonReady = false;
+  isSciCatHeaderOk = false;
+  scicatHeaderErrors = "";
+
+  isCardContentVisible = {
+    scicat: true,
+  };
+
+  constructor(
+    private store: Store,
+    private cdr: ChangeDetectorRef,
+  ) {}
+
+  ngOnInit() {
+    this.subscriptions.push(
+      this.ingestionObject$.subscribe((ingestionObject) => {
+        if (ingestionObject) {
+          this.createNewTransferData = ingestionObject;
+          this.scicatHeaderSchema = getJsonSchemaFromDto(true);
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.renderView$.subscribe((renderView) => {
+        if (renderView) {
+          // Check if renderView changed
+          if (this.activeRenderView !== renderView) {
+            this.activeRenderView = renderView;
+          }
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.selectUpdateEditorFromThirdParty$.subscribe((updateEditor) => {
+        // We need to rerender the editor if the user has changed the metadata in the third party
+        // So we get a flag, if it is true we unrender the editor
+        // and then we set it to false to render it again
+        this.updateEditorFromThirdParty = updateEditor;
+        if (updateEditor) {
+          this.cdr.detectChanges(); // Force the change detection to unrender the editor
+          this.store.dispatch(
+            fromActions.resetIngestionObjectFromThirdPartyFlag(),
+          );
+        }
+      }),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
+  }
+
+  onClickBack(): void {
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+
+    this.backStep.emit(); // Open previous dialog
+  }
+
+  onClickNext(): void {
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+
+    this.nextStep.emit(); // Open next dialog
+  }
+
+  onDataChangeUserScicatHeader(event: any) {
+    this.createNewTransferData.scicatHeader = event;
+  }
+
+  toggleCardContent(card: string): void {
+    this.isCardContentVisible[card] = !this.isCardContentVisible[card];
+  }
+
+  scicatHeaderErrorsHandler(errors: any[]) {
+    this.isSciCatHeaderOk = errors.length === 0;
+    this.scicatHeaderErrors = convertJSONFormsErrorToString(errors);
+    this.validateNextButton();
+    this.cdr.detectChanges();
+  }
+
+  validateNextButton(): void {
+    this.uiNextButtonReady = this.isSciCatHeaderOk;
+  }
+}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.scicat-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.scicat-metadata-dialog-page.html
new file mode 100644
index 0000000000..0345229f27
--- /dev/null
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.scicat-metadata-dialog-page.html
@@ -0,0 +1,49 @@
+<div class="ingestor-dialog-header">
+  <div class="ingestor-mixed-header">
+    <h2 mat-dialog-title>
+      Fill out user-specific metadata
+    </h2>
+    <button mat-icon-button mat-dialog-close aria-label="Close"
+      class="ingestor-close-button">
+      <mat-icon>close</mat-icon>
+    </button>
+  </div>
+
+  <div class="ingestor-stepper-header">
+    <ingestor-dialog-stepper [activeStep]="1"></ingestor-dialog-stepper>
+  </div>
+</div>
+<mat-dialog-content class="mat-typography" disableClose="true">
+
+  <mat-card>
+    <mat-card-header class="scicat-header"
+      (click)="toggleCardContent('scicat')">
+      <div mat-card-avatar class="section-icon">
+        <mat-icon> info </mat-icon>
+      </div>
+      SciCat Information
+      <span class="spacer"></span>
+      <mat-icon
+        [matTooltip]="isSciCatHeaderOk ? 'Your input is correct.' : scicatHeaderErrors"
+        [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'">{{
+        isSciCatHeaderOk ? 'check_circle_outline' :
+        'error_outline'}}</mat-icon>
+      <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ?
+        'expand_less' : 'expand_more' }}</mat-icon>
+    </mat-card-header>
+    <mat-card-content *ngIf="isCardContentVisible.scicat">
+      <app-metadata-editor #scicatHeaderEditor
+        *ngIf="!updateEditorFromThirdParty" [schema]="scicatHeaderSchema"
+        [renderView]="activeRenderView"
+        [data]="createNewTransferData.scicatHeader"
+        (dataChange)="onDataChangeUserScicatHeader($event)"
+        (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
+    </mat-card-content>
+  </mat-card>
+
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button (click)="onClickBack()">Back</button>
+  <button mat-button color="primary" cdkFocusInitial
+    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 52e510f8b8..f5364a9fdc 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -88,7 +88,6 @@ export class IngestorUserMetadataDialogPageComponent
     this.subscriptions.push(
       this.renderView$.subscribe((renderView) => {
         if (renderView) {
-          console.log(renderView);
           // Check if renderView changed
           if (this.activeRenderView !== renderView) {
             this.activeRenderView = renderView;
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index fcba621cd4..2883d15c4f 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -25,7 +25,9 @@ export type dialogStep =
   | "NEW_TRANSFER"
   | "USER_METADATA"
   | "EXTRACTOR_METADATA"
-  | "CONFIRM_TRANSFER";
+  | "CONFIRM_TRANSFER"
+  | "CUSTOM_METADATA" // Only in Creation Editor Mode
+  | "SCICAT_METADATA"; // Only in Creation Editor Mode
 
 @Component({
   selector: "ingestor.creation-dialog-base",
@@ -202,7 +204,10 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
           this.startMetadataExtraction().catch((error) => {
             console.error("Metadata extraction error", error);
           });
-        } else if (this.createNewTransferData.editorMode === "EDITOR") {
+        } else if (
+          this.createNewTransferData.editorMode === "EDITOR" ||
+          this.createNewTransferData.editorMode === "CREATION"
+        ) {
           this.createNewTransferData.apiInformation.extractorMetaDataReady =
             true;
         }
@@ -212,6 +217,10 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
         break;
       case "CONFIRM_TRANSFER":
         break;
+      case "SCICAT_METADATA":
+        break;
+      case "CUSTOM_METADATA":
+        break;
       default:
         console.error("Unknown step", nextStep);
         return;
@@ -220,16 +229,24 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
   }
 
   onClickStartIngestion(): void {
-    const payload: PostDatasetRequest = {
-      metaData: this.createNewTransferData.mergedMetaDataString,
-      userToken: this.tokenValue,
-      autoArchive: this.createNewTransferData.autoArchive,
-    };
-
-    this.store.dispatch(
-      fromActions.ingestDataset({
-        ingestionDataset: payload,
-      }),
-    );
+    if (this.createNewTransferData.editorMode === "CREATION") {
+      this.store.dispatch(
+        fromActions.createDatasetAction({
+          dataset: JSON.parse(this.createNewTransferData.mergedMetaDataString),
+        }),
+      );
+    } else if (this.createNewTransferData.editorMode === "INGESTION") {
+      const payload: PostDatasetRequest = {
+        metaData: this.createNewTransferData.mergedMetaDataString,
+        userToken: this.tokenValue,
+        autoArchive: this.createNewTransferData.autoArchive,
+      };
+
+      this.store.dispatch(
+        fromActions.ingestDataset({
+          ingestionDataset: payload,
+        }),
+      );
+    }
   }
 }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
index efb35da039..f1556568ed 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
@@ -1,6 +1,6 @@
 <ingestor-new-transfer-dialog-page
   *ngIf="currentDialogStep === 'NEW_TRANSFER' && !showNoRightsDialog"
-  (nextStep)="onClickNext('USER_METADATA')"></ingestor-new-transfer-dialog-page>
+  (nextStep)="onClickNext(createNewTransferData.editorMode === 'CREATION' ? 'SCICAT_METADATA' : 'USER_METADATA')"></ingestor-new-transfer-dialog-page>
 
 <ingestor-user-metadata-dialog
   *ngIf="currentDialogStep === 'USER_METADATA' && !showNoRightsDialog"
@@ -15,8 +15,18 @@
 <ingestor-confirm-transfer-dialog-page
   *ngIf="currentDialogStep === 'CONFIRM_TRANSFER' && !showNoRightsDialog"
   (nextStep)="onClickStartIngestion()"
-  (backStep)="onClickNext('EXTRACTOR_METADATA')"></ingestor-confirm-transfer-dialog-page>
+  (backStep)="onClickNext(createNewTransferData.editorMode === 'CREATION' ? 'CUSTOM_METADATA' : 'EXTRACTOR_METADATA')"></ingestor-confirm-transfer-dialog-page>
 
 <ingestor-no-rights-dialog-page *ngIf="showNoRightsDialog"
   (nextStep)="onClickStartIngestion()"
-  (backStep)="onClickNext('EXTRACTOR_METADATA')"></ingestor-no-rights-dialog-page>
\ No newline at end of file
+  (backStep)="onClickNext('EXTRACTOR_METADATA')"></ingestor-no-rights-dialog-page>
+
+<ingestor-scicat-metadata-dialog
+  *ngIf="currentDialogStep === 'SCICAT_METADATA' && !showNoRightsDialog"
+  (nextStep)="onClickNext('CUSTOM_METADATA')"
+  (backStep)="onClickNext('NEW_TRANSFER')"></ingestor-scicat-metadata-dialog>
+
+<ingestor-custom-metadata-dialog
+  *ngIf="currentDialogStep === 'CUSTOM_METADATA' && !showNoRightsDialog"
+  (nextStep)="onClickNext('CONFIRM_TRANSFER')"
+  (backStep)="onClickNext('SCICAT_METADATA')"></ingestor-custom-metadata-dialog>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index c12be20dd5..77d7db71ab 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -1,8 +1,10 @@
 <div class="dialog-control-buttons">
-  <button mat-button matTooltip="Save the current values."
+  <button *ngIf="this.createNewTransferData.editorMode !== 'CREATION'"
+    mat-button matTooltip="Save the current values."
     [disabled]="activeStep === 0" (click)="onSave()"><mat-icon
       class="control-button-icon">save</mat-icon></button>
-  <button mat-button matTooltip="Upload a template." [disabled]="activeStep < 1"
+  <button *ngIf="this.createNewTransferData.editorMode !== 'CREATION'"
+    mat-button matTooltip="Upload a template." [disabled]="activeStep < 1"
     (click)="onUpload()"><mat-icon
       class="control-button-icon">upload</mat-icon></button>
   <button
@@ -11,8 +13,9 @@
     ? 'Show all fields.' : 'Show required fields only.'"><mat-icon
       class="control-button-icon">{{activeRenderView === "requiredOnly" ?
       "visibility" : "visibility_off"}}</mat-icon></button>
-  <button *ngIf="this.createNewTransferData !== undefined" mat-button
-    [matMenuTriggerFor]="settingsMenu"
+  <button
+    *ngIf="this.createNewTransferData !== undefined && this.createNewTransferData.editorMode !== 'CREATION'"
+    mat-button [matMenuTriggerFor]="settingsMenu"
     matTooltip="Customize the metadata editor."
     [disabled]="activeStep > 0"><mat-icon
       class="control-button-icon">settings</mat-icon></button>
@@ -39,11 +42,19 @@
     </mat-step>
     <mat-step [completed]="activeStep > 1" [editable]="false"
       [stepControl]="null">
-      <ng-template matStepLabel>Fill out user-specific metadata</ng-template>
+      <ng-template
+        *ngIf="this.createNewTransferData.editorMode === 'INGESTION' || this.createNewTransferData.editorMode === 'EDITOR'"
+        matStepLabel>Fill out user-specific metadata</ng-template>
+      <ng-template *ngIf="this.createNewTransferData.editorMode === 'CREATION'"
+        matStepLabel>Fill out scicat specific metadata</ng-template>
     </mat-step>
     <mat-step [completed]="activeStep > 2" [editable]="false"
       [stepControl]="null">
-      <ng-template matStepLabel>Correct dataset-specific metadata</ng-template>
+      <ng-template
+        *ngIf="this.createNewTransferData.editorMode === 'INGESTION' || this.createNewTransferData.editorMode === 'EDITOR'"
+        matStepLabel>Correct dataset-specific metadata</ng-template>
+      <ng-template *ngIf="this.createNewTransferData.editorMode === 'CREATION'"
+        matStepLabel>Fill out custom scientific metadata</ng-template>
     </mat-step>
     <mat-step [completed]="activeStep > 3" [editable]="false"
       [stepControl]="null">
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 1dae4f68cd..c7c56d6468 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -1,13 +1,13 @@
 import { JsonSchema, JsonSchema7 } from "@jsonforms/core";
-import {
-  CreateDatasetDto,
-  CreateRawDatasetObsoleteDto,
-  DatasetClass,
-} from "@scicatproject/scicat-sdk-ts-angular";
+import { CreateRawDatasetObsoleteDto } from "@scicatproject/scicat-sdk-ts-angular";
 import { isArray } from "mathjs";
 import { PostDatasetResponse } from "shared/sdk/models/ingestor/postDatasetResponse";
 import { UserInfo } from "shared/sdk/models/ingestor/userInfo";
 
+export type IngestorMode = "default" | "transfer" | "creation";
+
+export type IngestorEditorMode = "INGESTION" | "EDITOR" | "CREATION";
+
 export interface IngestorAutodiscovery {
   mailDomain: string;
   description?: string;
@@ -33,10 +33,11 @@ export interface IngestionRequestInformation {
     instrument: object;
     acquisition: object;
   };
+  customMetaData: object; // Custom metadata in creation mode
 
   mergedMetaDataString: string;
 
-  editorMode: string;
+  editorMode: IngestorEditorMode;
   apiInformation: {
     extractMetaDataRequested: boolean;
     extractorMetaDataReady: boolean;
@@ -69,18 +70,27 @@ export interface DialogDataObject {
 export class IngestorHelper {
   static createMetaDataString(
     transferData: IngestionRequestInformation,
+    useCustomMetadata?: boolean,
   ): string {
     const space = 2;
-    const scicatMetadata: CreateDatasetDto = {
-      ...(transferData.scicatHeader as CreateDatasetDto),
-      scientificMetadata: {
-        organizational: transferData.userMetaData["organizational"],
-        sample: transferData.userMetaData["sample"],
-        acquisition: transferData.extractorMetaData["acquisition"],
-        instrument: transferData.extractorMetaData["instrument"],
-      },
+    const scicatMetadata: CreateRawDatasetObsoleteDto = {
+      ...(transferData.scicatHeader as CreateRawDatasetObsoleteDto),
     };
 
+    if (useCustomMetadata) {
+      scicatMetadata.scientificMetadata = { ...transferData.customMetaData };
+    } else {
+      // EM DATA INGESTOR MODE
+      scicatMetadata.scientificMetadata = {
+        ...{
+          organizational: transferData.userMetaData["organizational"],
+          sample: transferData.userMetaData["sample"],
+          acquisition: transferData.extractorMetaData["acquisition"],
+          instrument: transferData.extractorMetaData["instrument"],
+        },
+      };
+    }
+
     return JSON.stringify(scicatMetadata, null, space);
   }
 
@@ -114,6 +124,7 @@ export class IngestorHelper {
         instrument: {},
         acquisition: {},
       },
+      customMetaData: {},
       mergedMetaDataString: "",
       editorMode: "INGESTION",
       apiInformation: {
@@ -162,7 +173,7 @@ export const decodeBase64ToUTF8 = (base64: string) => {
   return decoder.decode(bytes);
 };
 
-export const getJsonSchemaFromDto = () => {
+export const getJsonSchemaFromDto = (sourceFolderEditable?: boolean) => {
   // Currently there is no valid schema which can be used. So we create one from the dataset class.
   // --string => string
   // --mail => string with regex
@@ -184,7 +195,7 @@ export const getJsonSchemaFromDto = () => {
     pid: "--skip",
     owner: "--string",
     contactEmail: "--mail",
-    sourceFolder: "--string --readonly",
+    sourceFolder: sourceFolderEditable ? "--string" : "--string --readonly",
     size: -1, // skip
     numberOfFiles: -1, // skip
     creationTime: "--dateTime",
diff --git a/src/app/ingestor/ingestor-page/ingestor-creation.component.html b/src/app/ingestor/ingestor-page/ingestor-creation.component.html
new file mode 100644
index 0000000000..43d66a8776
--- /dev/null
+++ b/src/app/ingestor/ingestor-page/ingestor-creation.component.html
@@ -0,0 +1,47 @@
+<p *ngIf="(this.sciCatLoggedIn$ | async) === false">
+  <mat-card class="ingestor-card">
+    <mat-card-header>
+      <mat-card-title>
+        Log in
+      </mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
+      <p>
+        Before a dataset creation can be started, please <a href="/login">log in
+          to
+          SciCat</a>.
+      </p>
+      <a href="/login"><mat-icon>login</mat-icon></a>
+    </mat-card-content>
+  </mat-card>
+</p>
+
+<div *ngIf="(this.sciCatLoggedIn$ | async) === true">
+  <p>
+    <mat-card class="ingestor-card">
+      <mat-card-header>
+        <mat-card-title>Ingestor - Dataset creation mode</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        You can use the Ingestor to prepare SciCat datasets. The Ingestor
+        provides a simple editor to fill in metadata and scientific metadata and
+        then create a dataset envelope. The data upload must be performed
+        manually in this mode.
+      </mat-card-content>
+    </mat-card>
+  </p>
+
+  <p>
+    <mat-card class="ingestor-card">
+      <mat-card-header>
+        <mat-card-title>New dataset</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <button mat-fab aria-label="Add a new dataset" color="primary"
+          (click)="onClickAddIngestion()">
+          <mat-icon>add</mat-icon>
+        </button>
+      </mat-card-content>
+    </mat-card>
+  </p>
+</div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-page/ingestor-creation.component.ts b/src/app/ingestor/ingestor-page/ingestor-creation.component.ts
new file mode 100644
index 0000000000..918884e50d
--- /dev/null
+++ b/src/app/ingestor/ingestor-page/ingestor-creation.component.ts
@@ -0,0 +1,43 @@
+import { Component, inject, OnInit } from "@angular/core";
+import { Store } from "@ngrx/store";
+import { selectIsLoggedIn } from "state-management/selectors/user.selectors";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import { IngestorHelper } from "./helper/ingestor.component-helper";
+import { MatDialog } from "@angular/material/dialog";
+import { IngestorCreationDialogBaseComponent } from "ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component";
+
+@Component({
+  selector: "ingestor-creation",
+  styleUrls: ["./ingestor.component.scss"],
+  templateUrl: "./ingestor-creation.component.html",
+  standalone: false,
+})
+export class IngestorCreationComponent {
+  sciCatLoggedIn$ = this.store.select(selectIsLoggedIn);
+  readonly dialog = inject(MatDialog);
+
+  constructor(private store: Store) {}
+
+  onClickAddIngestion(): void {
+    // Clean the current ingestion object
+    const newTransferObject = IngestorHelper.createEmptyRequestInformation();
+    newTransferObject.editorMode = "CREATION";
+
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: newTransferObject,
+      }),
+    );
+
+    this.dialog.closeAll();
+
+    let dialogRef = null;
+    dialogRef = this.dialog.open(IngestorCreationDialogBaseComponent, {
+      disableClose: true,
+      width: "75vw",
+    });
+
+    // Error if the dialog reference is not set
+    if (dialogRef === null) return;
+  }
+}
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.html b/src/app/ingestor/ingestor-page/ingestor-transfer.component.html
similarity index 100%
rename from src/app/ingestor/ingestor-page/ingestor.component.html
rename to src/app/ingestor/ingestor-page/ingestor-transfer.component.html
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
new file mode 100644
index 0000000000..f89ae33961
--- /dev/null
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
@@ -0,0 +1,370 @@
+import { Component, inject, OnDestroy, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { MatDialog } from "@angular/material/dialog";
+import {
+  IngestionRequestInformation,
+  IngestorHelper,
+} from "./helper/ingestor.component-helper";
+import {
+  UserInfo,
+  OtherHealthResponse,
+  OtherVersionResponse,
+  GetTransferResponse,
+} from "shared/sdk/models/ingestor/models";
+import { PageChangeEvent } from "shared/modules/table/table.component";
+import { Store } from "@ngrx/store";
+import {
+  selectIsLoggedIn,
+  selectUserSettingsPageViewModel,
+} from "state-management/selectors/user.selectors";
+import { fetchCurrentUserAction } from "state-management/actions/user.actions";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import {
+  selectIngestorStatus,
+  selectIngestorAuth,
+  selectIngestorConnecting,
+  selectIngestorEndpoint,
+  selectIngestorTransferList,
+  selectIngestorTransferListRequestOptions,
+} from "state-management/selectors/ingestor.selector";
+import { IngestorCreationDialogBaseComponent } from "ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component";
+import { INGESTOR_API_ENDPOINTS_V1 } from "shared/sdk/apis/ingestor.service";
+import { Subscription } from "rxjs";
+import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
+import { IngestorTransferViewDialogComponent } from "ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component";
+import { fetchScicatTokenAction } from "state-management/actions/user.actions";
+import { AppConfigService } from "app-config.service";
+
+@Component({
+  selector: "ingestor-transfer",
+  templateUrl: "./ingestor-transfer.component.html",
+  styleUrls: ["./ingestor.component.scss"],
+  standalone: false,
+})
+export class IngestorTransferComponent implements OnInit, OnDestroy {
+  private subscriptions: Subscription[] = [];
+  readonly dialog = inject(MatDialog);
+  appConfig = this.appConfigService.getConfig();
+
+  vm$ = this.store.select(selectUserSettingsPageViewModel);
+  sciCatLoggedIn$ = this.store.select(selectIsLoggedIn);
+  ingestorStatus$ = this.store.select(selectIngestorStatus);
+  ingestorAuthInfo$ = this.store.select(selectIngestorAuth);
+  ingestorConnecting$ = this.store.select(selectIngestorConnecting);
+  ingestorBackend$ = this.store.select(selectIngestorEndpoint);
+  transferList$ = this.store.select(selectIngestorTransferList);
+  selectIngestorTransferListRequestOptions$ = this.store.select(
+    selectIngestorTransferListRequestOptions,
+  );
+
+  sourceFolder = "";
+  forwardFacilityBackend = "";
+  selectedTab = 1;
+
+  connectedFacilityBackend = "";
+  connectingToFacilityBackend = true;
+  noRightsError = false;
+
+  lastUsedFacilityBackends: string[] = [];
+
+  transferDataInformation: GetTransferResponse = null;
+  transferDataPageSize = 100;
+  transferDataPageIndex = 0;
+  transferDataPageSizeOptions = [5, 10, 25, 100];
+  displayedColumns: string[] = [
+    "transferId",
+    "status",
+    "message",
+    "progress",
+    "actions",
+  ];
+
+  versionInfo: OtherVersionResponse = null;
+  userInfo: UserInfo | null = null;
+  scicatUserProfile: any = null;
+  authIsDisabled = false;
+  healthInfo: OtherHealthResponse = null;
+  tokenValue = "";
+
+  createNewTransferData: IngestionRequestInformation =
+    IngestorHelper.createEmptyRequestInformation();
+
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private store: Store,
+    public appConfigService: AppConfigService,
+  ) {}
+
+  ngOnInit() {
+    this.lastUsedFacilityBackends =
+      IngestorHelper.loadConnectionsFromLocalStorage();
+
+    // Fetch the API token that the ingestor can authenticate to scicat as the user
+    this.subscriptions.push(
+      this.vm$.subscribe((settings) => {
+        this.scicatUserProfile = settings.profile;
+        this.tokenValue = settings.scicatToken;
+
+        if (this.tokenValue === "") {
+          this.store.dispatch(fetchScicatTokenAction());
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.ingestorBackend$.subscribe((ingestorBackend) => {
+        if (ingestorBackend !== null && ingestorBackend !== undefined) {
+          this.connectedFacilityBackend = ingestorBackend;
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.transferList$.subscribe((transferList) => {
+        if (transferList !== null && transferList !== undefined) {
+          this.transferDataInformation = transferList;
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.selectIngestorTransferListRequestOptions$.subscribe(
+        (requestOptions) => {
+          if (requestOptions !== null && requestOptions !== undefined) {
+            this.transferDataPageIndex = requestOptions.page;
+            this.transferDataPageSize = requestOptions.pageNumber;
+          }
+        },
+      ),
+    );
+
+    this.subscriptions.push(
+      this.ingestorConnecting$.subscribe((connecting) => {
+        this.connectingToFacilityBackend = connecting;
+      }),
+    );
+
+    this.subscriptions.push(
+      this.ingestorStatus$.subscribe((ingestorStatus) => {
+        if (
+          ingestorStatus.validEndpoint !== null &&
+          !ingestorStatus.validEndpoint
+        ) {
+          this.connectedFacilityBackend = "";
+          this.lastUsedFacilityBackends =
+            IngestorHelper.loadConnectionsFromLocalStorage();
+          this.onClickForwardToIngestorPage();
+        } else if (
+          ingestorStatus.versionResponse &&
+          ingestorStatus.healthResponse
+        ) {
+          this.versionInfo = ingestorStatus.versionResponse;
+          this.healthInfo = ingestorStatus.healthResponse;
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.ingestorAuthInfo$.subscribe((authInfo) => {
+        if (authInfo) {
+          this.userInfo = authInfo.userInfoResponse;
+          this.authIsDisabled = authInfo.authIsDisabled;
+
+          // Only refresh if the user is logged in or the auth is disabled
+          if (this.authIsDisabled || this.userInfo.logged_in) {
+            // Activate Transfer Tab when ingestor is ready for actions
+            this.selectedTab = 0;
+            this.doRefreshTransferList();
+          } // In case of loosing the connection to the ingestor, the user is logged out
+          else if (this.userInfo == null || this.userInfo.logged_in === false) {
+            this.selectedTab = 1;
+          }
+        }
+      }),
+    );
+
+    this.loadIngestorConfiguration();
+    this.store.dispatch(fetchCurrentUserAction());
+  }
+
+  ngOnDestroy(): void {
+    // Unsubscribe from all subscriptions
+    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
+  }
+
+  async loadIngestorConfiguration(): Promise<void> {
+    // Get the GET parameter 'backendUrl' from the URL
+    this.subscriptions.push(
+      this.route.queryParams.subscribe(async (params) => {
+        const backendUrl = params["backendUrl"];
+        const discovery = params["discovery"];
+
+        if (discovery === "true" && !backendUrl) {
+          const facilityUrl = await this.getFacilityURLByUserInfo();
+          if (facilityUrl != null) {
+            this.router.navigate([], {
+              relativeTo: this.route,
+              queryParams: { backendUrl: facilityUrl },
+              queryParamsHandling: "",
+            });
+          }
+        }
+
+        if (backendUrl) {
+          // backendUrl should not end with a slash
+          const facilityBackendUrlCleaned = backendUrl.replace(/\/$/, "");
+
+          await this.store.dispatch(
+            fromActions.setIngestorEndpoint({
+              ingestorEndpoint: facilityBackendUrlCleaned,
+            }),
+          );
+
+          this.store.dispatch(fromActions.connectIngestor());
+        } else {
+          this.connectingToFacilityBackend = false;
+        }
+      }),
+    );
+  }
+
+  onClickForwardToIngestorPage(nextFacilityBackend?: string) {
+    if (nextFacilityBackend) {
+      IngestorHelper.saveConnectionsToLocalStorage([
+        ...this.lastUsedFacilityBackends,
+        nextFacilityBackend,
+      ]);
+
+      this.router.navigate(["/ingestor"], {
+        queryParams: { backendUrl: nextFacilityBackend },
+      });
+    } else {
+      this.router.navigate(["/ingestor"]);
+    }
+  }
+
+  onClickDisconnectIngestor() {
+    // Reset state of the ingestor component
+    this.store.dispatch(fromActions.resetIngestorComponent());
+    // Remove the GET parameter 'backendUrl' from the URL
+    this.router.navigate(["/ingestor"]);
+  }
+
+  // Helper functions
+  onClickSelectFacilityBackend(facilityBackend: string) {
+    this.forwardFacilityBackend = facilityBackend;
+  }
+
+  onClickDeleteStoredFacilityBackend(facilityBackend: string) {
+    const filteredFacilityBackends = this.lastUsedFacilityBackends.filter(
+      (backend) => backend !== facilityBackend,
+    );
+
+    IngestorHelper.saveConnectionsToLocalStorage(filteredFacilityBackends);
+    this.lastUsedFacilityBackends = filteredFacilityBackends;
+  }
+
+  onClickAddIngestion(): void {
+    // Clean the current ingestion object
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: IngestorHelper.createEmptyRequestInformation(),
+      }),
+    );
+
+    this.dialog.closeAll();
+
+    let dialogRef = null;
+    dialogRef = this.dialog.open(IngestorCreationDialogBaseComponent, {
+      disableClose: true,
+      width: "75vw",
+    });
+
+    // Error if the dialog reference is not set
+    if (dialogRef === null) return;
+  }
+
+  doRefreshTransferList(page?: number, pageNumber?: number): void {
+    this.store.dispatch(
+      fromActions.updateTransferList({
+        transferId: undefined,
+        page: page ? page + 1 : undefined,
+        pageNumber: pageNumber,
+      }),
+    );
+  }
+
+  onCancelTransfer(transferId: string) {
+    const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
+      data: {
+        header: "Confirm deletion",
+        message: "Cancel the transfer and remove it from the list?",
+      },
+    });
+
+    const dialogSub = dialogRef.afterClosed().subscribe(async (result) => {
+      if (result) {
+        this.store.dispatch(
+          fromActions.cancelTransfer({
+            requestBody: {
+              transferId: transferId,
+              scicatToken: this.tokenValue,
+            },
+          }),
+        );
+      }
+      dialogSub.unsubscribe();
+    });
+  }
+
+  onTransferPageChange(event: PageChangeEvent): void {
+    this.doRefreshTransferList(event.pageIndex, event.pageSize);
+  }
+
+  openIngestorLogin(): void {
+    window.location.href =
+      this.connectedFacilityBackend +
+      "/" +
+      INGESTOR_API_ENDPOINTS_V1.AUTH.LOGIN;
+  }
+
+  openIngestorLogout(): void {
+    window.location.href =
+      this.connectedFacilityBackend +
+      "/" +
+      INGESTOR_API_ENDPOINTS_V1.AUTH.LOGOUT;
+  }
+
+  onOpenDetailView(transferId: string): void {
+    const dialogRef = this.dialog.open(IngestorTransferViewDialogComponent, {
+      data: {
+        transferId: transferId,
+      },
+    });
+
+    const dialogSub = dialogRef.afterClosed().subscribe(() => {
+      this.doRefreshTransferList();
+      dialogSub.unsubscribe();
+    });
+  }
+
+  async getFacilityURLByUserInfo(): Promise<string | null> {
+    if (this.scicatUserProfile && this.scicatUserProfile.email) {
+      const facilityEmail = this.scicatUserProfile.email;
+      const facility = facilityEmail.split("@")[1] as string;
+
+      const facilityMailDomainName = facility.toLowerCase();
+      const discoveryList = this.appConfig.ingestorAutodiscoveryOptions;
+
+      if (discoveryList) {
+        for (const discovery of discoveryList) {
+          if (discovery.mailDomain.toLowerCase() === facilityMailDomainName) {
+            return discovery.facilityBackend;
+          }
+        }
+      }
+    }
+    return null;
+  }
+}
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 1bfeb5f736..7d584799dc 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -1,370 +1,39 @@
-import { Component, inject, OnDestroy, OnInit } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
-import { MatDialog } from "@angular/material/dialog";
-import {
-  IngestionRequestInformation,
-  IngestorHelper,
-} from "./helper/ingestor.component-helper";
-import {
-  UserInfo,
-  OtherHealthResponse,
-  OtherVersionResponse,
-  GetTransferResponse,
-} from "shared/sdk/models/ingestor/models";
-import { PageChangeEvent } from "shared/modules/table/table.component";
-import { Store } from "@ngrx/store";
-import {
-  selectIsLoggedIn,
-  selectUserSettingsPageViewModel,
-} from "state-management/selectors/user.selectors";
-import { fetchCurrentUserAction } from "state-management/actions/user.actions";
-import * as fromActions from "state-management/actions/ingestor.actions";
-import {
-  selectIngestorStatus,
-  selectIngestorAuth,
-  selectIngestorConnecting,
-  selectIngestorEndpoint,
-  selectIngestorTransferList,
-  selectIngestorTransferListRequestOptions,
-} from "state-management/selectors/ingestor.selector";
-import { IngestorCreationDialogBaseComponent } from "ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component";
-import { INGESTOR_API_ENDPOINTS_V1 } from "shared/sdk/apis/ingestor.service";
-import { Subscription } from "rxjs";
-import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
-import { IngestorTransferViewDialogComponent } from "ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component";
-import { fetchScicatTokenAction } from "state-management/actions/user.actions";
+import { Component, OnInit } from "@angular/core";
 import { AppConfigService } from "app-config.service";
+import { IngestorMode } from "./helper/ingestor.component-helper";
 
 @Component({
   selector: "ingestor",
-  templateUrl: "./ingestor.component.html",
   styleUrls: ["./ingestor.component.scss"],
+  template: `
+    <div>
+      <ingestor-transfer *ngIf="ingestorMode === 'transfer'" />
+      <ingestor-creation *ngIf="ingestorMode === 'creation'" />
+    </div>
+  `,
   standalone: false,
 })
-export class IngestorComponent implements OnInit, OnDestroy {
-  private subscriptions: Subscription[] = [];
-  readonly dialog = inject(MatDialog);
+export class IngestorComponent implements OnInit {
   appConfig = this.appConfigService.getConfig();
+  ingestorMode: IngestorMode = "default";
 
-  vm$ = this.store.select(selectUserSettingsPageViewModel);
-  sciCatLoggedIn$ = this.store.select(selectIsLoggedIn);
-  ingestorStatus$ = this.store.select(selectIngestorStatus);
-  ingestorAuthInfo$ = this.store.select(selectIngestorAuth);
-  ingestorConnecting$ = this.store.select(selectIngestorConnecting);
-  ingestorBackend$ = this.store.select(selectIngestorEndpoint);
-  transferList$ = this.store.select(selectIngestorTransferList);
-  selectIngestorTransferListRequestOptions$ = this.store.select(
-    selectIngestorTransferListRequestOptions,
-  );
-
-  sourceFolder = "";
-  forwardFacilityBackend = "";
-  selectedTab = 1;
-
-  connectedFacilityBackend = "";
-  connectingToFacilityBackend = true;
-  noRightsError = false;
-
-  lastUsedFacilityBackends: string[] = [];
-
-  transferDataInformation: GetTransferResponse = null;
-  transferDataPageSize = 100;
-  transferDataPageIndex = 0;
-  transferDataPageSizeOptions = [5, 10, 25, 100];
-  displayedColumns: string[] = [
-    "transferId",
-    "status",
-    "message",
-    "progress",
-    "actions",
-  ];
-
-  versionInfo: OtherVersionResponse = null;
-  userInfo: UserInfo | null = null;
-  scicatUserProfile: any = null;
-  authIsDisabled = false;
-  healthInfo: OtherHealthResponse = null;
-  tokenValue = "";
-
-  createNewTransferData: IngestionRequestInformation =
-    IngestorHelper.createEmptyRequestInformation();
-
-  constructor(
-    private route: ActivatedRoute,
-    private router: Router,
-    private store: Store,
-    public appConfigService: AppConfigService,
-  ) {}
+  constructor(public appConfigService: AppConfigService) {}
 
   ngOnInit() {
-    this.lastUsedFacilityBackends =
-      IngestorHelper.loadConnectionsFromLocalStorage();
-
-    // Fetch the API token that the ingestor can authenticate to scicat as the user
-    this.subscriptions.push(
-      this.vm$.subscribe((settings) => {
-        this.scicatUserProfile = settings.profile;
-        this.tokenValue = settings.scicatToken;
-
-        if (this.tokenValue === "") {
-          this.store.dispatch(fetchScicatTokenAction());
-        }
-      }),
-    );
-
-    this.subscriptions.push(
-      this.ingestorBackend$.subscribe((ingestorBackend) => {
-        if (ingestorBackend !== null && ingestorBackend !== undefined) {
-          this.connectedFacilityBackend = ingestorBackend;
-        }
-      }),
-    );
-
-    this.subscriptions.push(
-      this.transferList$.subscribe((transferList) => {
-        if (transferList !== null && transferList !== undefined) {
-          this.transferDataInformation = transferList;
-        }
-      }),
-    );
-
-    this.subscriptions.push(
-      this.selectIngestorTransferListRequestOptions$.subscribe(
-        (requestOptions) => {
-          if (requestOptions !== null && requestOptions !== undefined) {
-            this.transferDataPageIndex = requestOptions.page;
-            this.transferDataPageSize = requestOptions.pageNumber;
-          }
-        },
-      ),
-    );
-
-    this.subscriptions.push(
-      this.ingestorConnecting$.subscribe((connecting) => {
-        this.connectingToFacilityBackend = connecting;
-      }),
-    );
-
-    this.subscriptions.push(
-      this.ingestorStatus$.subscribe((ingestorStatus) => {
-        if (
-          ingestorStatus.validEndpoint !== null &&
-          !ingestorStatus.validEndpoint
-        ) {
-          this.connectedFacilityBackend = "";
-          this.lastUsedFacilityBackends =
-            IngestorHelper.loadConnectionsFromLocalStorage();
-          this.onClickForwardToIngestorPage();
-        } else if (
-          ingestorStatus.versionResponse &&
-          ingestorStatus.healthResponse
-        ) {
-          this.versionInfo = ingestorStatus.versionResponse;
-          this.healthInfo = ingestorStatus.healthResponse;
-        }
-      }),
-    );
-
-    this.subscriptions.push(
-      this.ingestorAuthInfo$.subscribe((authInfo) => {
-        if (authInfo) {
-          this.userInfo = authInfo.userInfoResponse;
-          this.authIsDisabled = authInfo.authIsDisabled;
-
-          // Only refresh if the user is logged in or the auth is disabled
-          if (this.authIsDisabled || this.userInfo.logged_in) {
-            // Activate Transfer Tab when ingestor is ready for actions
-            this.selectedTab = 0;
-            this.doRefreshTransferList();
-          } // In case of loosing the connection to the ingestor, the user is logged out
-          else if (this.userInfo == null || this.userInfo.logged_in === false) {
-            this.selectedTab = 1;
-          }
-        }
-      }),
-    );
-
-    this.loadIngestorConfiguration();
-    this.store.dispatch(fetchCurrentUserAction());
-  }
-
-  ngOnDestroy(): void {
-    // Unsubscribe from all subscriptions
-    this.subscriptions.forEach((subscription) => subscription.unsubscribe());
-  }
-
-  async loadIngestorConfiguration(): Promise<void> {
-    // Get the GET parameter 'backendUrl' from the URL
-    this.subscriptions.push(
-      this.route.queryParams.subscribe(async (params) => {
-        const backendUrl = params["backendUrl"];
-        const discovery = params["discovery"];
-
-        if (discovery === "true" && !backendUrl) {
-          const facilityUrl = await this.getFacilityURLByUserInfo();
-          if (facilityUrl != null) {
-            this.router.navigate([], {
-              relativeTo: this.route,
-              queryParams: { backendUrl: facilityUrl },
-              queryParamsHandling: "",
-            });
-          }
-        }
-
-        if (backendUrl) {
-          // backendUrl should not end with a slash
-          const facilityBackendUrlCleaned = backendUrl.replace(/\/$/, "");
-
-          await this.store.dispatch(
-            fromActions.setIngestorEndpoint({
-              ingestorEndpoint: facilityBackendUrlCleaned,
-            }),
-          );
-
-          this.store.dispatch(fromActions.connectIngestor());
-        } else {
-          this.connectingToFacilityBackend = false;
-        }
-      }),
-    );
-  }
-
-  onClickForwardToIngestorPage(nextFacilityBackend?: string) {
-    if (nextFacilityBackend) {
-      IngestorHelper.saveConnectionsToLocalStorage([
-        ...this.lastUsedFacilityBackends,
-        nextFacilityBackend,
-      ]);
-
-      this.router.navigate(["/ingestor"], {
-        queryParams: { backendUrl: nextFacilityBackend },
-      });
+    // Render the ingestor component based on the mode
+    const mode = this.appConfig.ingestorMode;
+
+    if (mode === undefined || mode === null || mode === "default") {
+      this.ingestorMode = "transfer";
+    } else if (mode === "creation") {
+      this.ingestorMode = "creation";
+    } else if (mode === "transfer") {
+      this.ingestorMode = "transfer";
     } else {
-      this.router.navigate(["/ingestor"]);
-    }
-  }
-
-  onClickDisconnectIngestor() {
-    // Reset state of the ingestor component
-    this.store.dispatch(fromActions.resetIngestorComponent());
-    // Remove the GET parameter 'backendUrl' from the URL
-    this.router.navigate(["/ingestor"]);
-  }
-
-  // Helper functions
-  onClickSelectFacilityBackend(facilityBackend: string) {
-    this.forwardFacilityBackend = facilityBackend;
-  }
-
-  onClickDeleteStoredFacilityBackend(facilityBackend: string) {
-    const filteredFacilityBackends = this.lastUsedFacilityBackends.filter(
-      (backend) => backend !== facilityBackend,
-    );
-
-    IngestorHelper.saveConnectionsToLocalStorage(filteredFacilityBackends);
-    this.lastUsedFacilityBackends = filteredFacilityBackends;
-  }
-
-  onClickAddIngestion(): void {
-    // Clean the current ingestion object
-    this.store.dispatch(
-      fromActions.updateIngestionObject({
-        ingestionObject: IngestorHelper.createEmptyRequestInformation(),
-      }),
-    );
-
-    this.dialog.closeAll();
-
-    let dialogRef = null;
-    dialogRef = this.dialog.open(IngestorCreationDialogBaseComponent, {
-      disableClose: true,
-      width: "75vw",
-    });
-
-    // Error if the dialog reference is not set
-    if (dialogRef === null) return;
-  }
-
-  doRefreshTransferList(page?: number, pageNumber?: number): void {
-    this.store.dispatch(
-      fromActions.updateTransferList({
-        transferId: undefined,
-        page: page ? page + 1 : undefined,
-        pageNumber: pageNumber,
-      }),
-    );
-  }
-
-  onCancelTransfer(transferId: string) {
-    const dialogRef = this.dialog.open(IngestorConfirmationDialogComponent, {
-      data: {
-        header: "Confirm deletion",
-        message: "Cancel the transfer and remove it from the list?",
-      },
-    });
-
-    const dialogSub = dialogRef.afterClosed().subscribe(async (result) => {
-      if (result) {
-        this.store.dispatch(
-          fromActions.cancelTransfer({
-            requestBody: {
-              transferId: transferId,
-              scicatToken: this.tokenValue,
-            },
-          }),
-        );
-      }
-      dialogSub.unsubscribe();
-    });
-  }
-
-  onTransferPageChange(event: PageChangeEvent): void {
-    this.doRefreshTransferList(event.pageIndex, event.pageSize);
-  }
-
-  openIngestorLogin(): void {
-    window.location.href =
-      this.connectedFacilityBackend +
-      "/" +
-      INGESTOR_API_ENDPOINTS_V1.AUTH.LOGIN;
-  }
-
-  openIngestorLogout(): void {
-    window.location.href =
-      this.connectedFacilityBackend +
-      "/" +
-      INGESTOR_API_ENDPOINTS_V1.AUTH.LOGOUT;
-  }
-
-  onOpenDetailView(transferId: string): void {
-    const dialogRef = this.dialog.open(IngestorTransferViewDialogComponent, {
-      data: {
-        transferId: transferId,
-      },
-    });
-
-    const dialogSub = dialogRef.afterClosed().subscribe(() => {
-      this.doRefreshTransferList();
-      dialogSub.unsubscribe();
-    });
-  }
-
-  async getFacilityURLByUserInfo(): Promise<string | null> {
-    if (this.scicatUserProfile && this.scicatUserProfile.email) {
-      const facilityEmail = this.scicatUserProfile.email;
-      const facility = facilityEmail.split("@")[1] as string;
-
-      const facilityMailDomainName = facility.toLowerCase();
-      const discoveryList = this.appConfig.ingestorAutodiscoveryOptions;
-
-      if (discoveryList) {
-        for (const discovery of discoveryList) {
-          if (discovery.mailDomain.toLowerCase() === facilityMailDomainName) {
-            return discovery.facilityBackend;
-          }
-        }
-      }
+      console.error(
+        `Unknown ingestor mode: ${mode} - Falling back to transfer mode.`,
+      );
+      this.ingestorMode = "transfer"; // Fallback to transfer mode
     }
-    return null;
   }
 }
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 9e437a2ea1..f142ec67bb 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -49,10 +49,16 @@ import { IngestorUserMetadataDialogPageComponent } from "./ingestor-dialogs/crea
 import { IngestorExtractorMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component";
 import { IngestorTransferViewDialogComponent } from "./ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component";
 import { IngestorNoRightsDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component";
+import { IngestorTransferComponent } from "./ingestor-page/ingestor-transfer.component";
+import { IngestorCreationComponent } from "./ingestor-page/ingestor-creation.component";
+import { IngestorScicatMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.scicat-metadata-dialog-page.component";
+import { IngestorCustomMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component";
 
 @NgModule({
   declarations: [
     IngestorComponent,
+    IngestorTransferComponent,
+    IngestorCreationComponent,
     IngestorMetadataEditorComponent,
     IngestorConfirmTransferDialogPageComponent,
     IngestorNewTransferDialogPageComponent,
@@ -71,6 +77,8 @@ import { IngestorNoRightsDialogPageComponent } from "./ingestor-dialogs/creation
     CustomLayoutChildrenRenderPropsPipe,
     IngestorTransferViewDialogComponent,
     IngestorNoRightsDialogPageComponent,
+    IngestorScicatMetadataDialogPageComponent,
+    IngestorCustomMetadataDialogPageComponent,
   ],
   imports: [
     CommonModule,
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 26a530160c..ac891617ce 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -12,6 +12,10 @@ import {
   UserInfo,
 } from "shared/sdk/models/ingestor/models";
 import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
+import {
+  DatasetsControllerCreateV3Request,
+  OutputDatasetObsoleteDto,
+} from "@scicatproject/scicat-sdk-ts-angular";
 
 export const setIngestorEndpoint = createAction(
   "[Ingestor] Set ingestor endpoint",
@@ -153,3 +157,13 @@ export const setNoRightsError = createAction(
   "[Ingestor] Set No Rights Error",
   props<{ noRightsError: boolean; err: Error }>(),
 );
+
+export const createDatasetAction = createAction(
+  "[Ingestor] Create Dataset",
+  props<{ dataset: DatasetsControllerCreateV3Request }>(),
+);
+
+export const createDatasetSuccess = createAction(
+  "[Ingestor] Create Dataset Success",
+  props<{ dataset: OutputDatasetObsoleteDto }>(),
+);
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index f0bebb7181..230bb7397c 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -21,6 +21,7 @@ import { showMessageAction } from "state-management/actions/user.actions";
 import { Store } from "@ngrx/store";
 import { selectIngestorTransferListRequestOptions } from "state-management/selectors/ingestor.selector";
 import { concatLatestFrom } from "@ngrx/operators";
+import { DatasetsService } from "@scicatproject/scicat-sdk-ts-angular";
 
 @Injectable()
 export class IngestorEffects {
@@ -326,9 +327,43 @@ export class IngestorEffects {
     );
   });
 
+  createDataset$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(fromActions.createDatasetAction),
+      mergeMap(({ dataset }) =>
+        this.datasetsService.datasetsControllerCreateV3(dataset).pipe(
+          mergeMap((response) =>
+            from([
+              fromActions.createDatasetSuccess({ dataset: response }),
+              fromActions.setIngestDatasetLoading({
+                ingestionDatasetLoading: false,
+              }),
+            ]),
+          ),
+          catchError((err) =>
+            from([
+              ...(err.error?.error?.includes("login session has expired")
+                ? [
+                    fromActions.setNoRightsError({
+                      noRightsError: true,
+                      err,
+                    }),
+                  ]
+                : [fromActions.ingestDatasetFailure({ err })]),
+              fromActions.setIngestDatasetLoading({
+                ingestionDatasetLoading: false,
+              }),
+            ]),
+          ),
+        ),
+      ),
+    );
+  });
+
   constructor(
     private actions$: Actions,
     private ingestor: Ingestor,
+    private datasetsService: DatasetsService,
     private store: Store,
   ) {}
 }
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index 2c586e6acd..b4a912ac93 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -152,6 +152,23 @@ const reducer = createReducer(
       },
     }),
   ),
+  on(
+    fromActions.createDatasetSuccess,
+    (state, { dataset }): IngestorState => ({
+      ...state,
+      ingestionObject: {
+        ...state.ingestionObject,
+        ingestionRequest: {
+          transferId: dataset.pid,
+          status: dataset.datasetName,
+        },
+        apiInformation: {
+          ...state.ingestionObject.apiInformation,
+          ingestionRequestErrorMessage: "",
+        },
+      },
+    }),
+  ),
   on(
     fromActions.ingestDatasetFailure,
     (state, { err }): IngestorState => ({
diff --git a/src/assets/config.json b/src/assets/config.json
index 9a248a08e4..41eea15a60 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -164,7 +164,7 @@
   "accessTokenPrefix": "Bearer ",
   "externalAuthEndpoint": "/api/v3/auth/ldap",
   "ingestorEnabled": true,
-  "ingestorMode": "standard",
+  "ingestorMode": "transfer",
   "ingestorAutodiscoveryOptions": [
     {
       "mailDomain": "unibe.ch",

From 05426a5f9edddf10bd92a74436b04e377ec2093d Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 2 Jul 2025 09:30:19 +0000
Subject: [PATCH 202/245] many network requests (self) - fix

---
 ...ingestor.creation-dialog-base.component.ts |   7 +-
 .../customRenderer/any-of-renderer.ts         |   3 +-
 .../customRenderer/array-renderer.ts          |   3 +-
 .../customRenderer/object-group-renderer.ts   |   3 +-
 .../owner-group-field-renderer.ts             |  27 ++--
 .../quantity-value-layout-renderer.ts         |   1 +
 .../ingestor-metadata-editor.component.ts     |   5 +-
 .../helper/ingestor.component-helper.ts       |  20 +--
 src/app/shared/sdk/apis/ingestor.service.ts   | 134 ++++++++----------
 9 files changed, 100 insertions(+), 103 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index 2883d15c4f..da1dda40da 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -193,13 +193,14 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
     switch (nextStep) {
       case "NEW_TRANSFER":
         this.resetScientificMetadata();
-        break;
-      case "USER_METADATA":
+
+        // Reset metadata extractor
         this.createNewTransferData.apiInformation.extractMetaDataRequested =
           false;
         this.createNewTransferData.apiInformation.extractorMetaDataReady =
           false;
-
+        break;
+      case "USER_METADATA":
         if (this.createNewTransferData.editorMode === "INGESTION") {
           this.startMetadataExtraction().catch((error) => {
             console.error("Metadata extraction error", error);
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 6481f0bc5a..7b3b72ac9d 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -1,4 +1,4 @@
-import { Component } from "@angular/core";
+import { ChangeDetectionStrategy, Component } from "@angular/core";
 import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
 import {
   ControlProps,
@@ -56,6 +56,7 @@ import { cloneDeep, isEmpty, startCase } from "lodash-es";
     </mat-card>
   `,
   standalone: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AnyOfRendererComponent extends JsonFormsControl {
   dataAsString: string;
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
index e4d5534ce9..77408f0c85 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit } from "@angular/core";
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from "@angular/core";
 import {
   JsonFormsAngularService,
   JsonFormsAbstractControl,
@@ -111,6 +111,7 @@ import {
     </mat-card>
   `,
   standalone: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 // eslint-disable-next-line @angular-eslint/component-class-suffix
 export class ArrayLayoutRendererCustom
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
index c58c1bfc1d..24d92e4dad 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component } from "@angular/core";
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component } from "@angular/core";
 import {
   JsonFormsAngularService,
   JsonFormsControlWithDetail,
@@ -54,6 +54,7 @@ import isEmpty from "lodash/isEmpty";
     </mat-card>
   `,
   standalone: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CustomObjectControlRendererComponent extends JsonFormsControlWithDetail {
   rendererService: JsonFormsAngularService;
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
index 4509ba738f..97a3cace33 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
@@ -71,15 +71,16 @@ import { Subscription } from "rxjs";
     </div>
   `,
   standalone: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class OwnerGroupFieldComponent
   extends JsonFormsControl
-  implements OnInit, OnDestroy {
+  implements OnInit, OnDestroy
+{
   private componentSubscriptions: Subscription[] = [];
   focused = false;
   vm$ = this.store.select(selectUserSettingsPageViewModel);
   userOwnerGroups = [];
-  groupFieldInitialized = false;
 
   constructor(
     jsonformsService: JsonFormsAngularService,
@@ -97,29 +98,29 @@ export class OwnerGroupFieldComponent
     // Fetch the owner groups from the scicat user
     this.componentSubscriptions.push(
       this.vm$.subscribe((settings) => {
-        const getclaims = (profile: any): string[] => {
+        const getclaims = (profile: any): string[] | null => {
           if (!profile) {
-            return [];
+            return null;
           }
 
           if (profile.oidcClaims !== undefined) {
-            return settings.profile.oidcClaims.accessGroups ?? [];
+            return settings.profile.oidcClaims.accessGroups ?? null;
           }
 
           if (profile.accessGroups !== undefined) {
-            return settings.profile.accessGroups ?? [];
+            return settings.profile.accessGroups ?? null;
           }
 
-          return [];
+          return null;
         };
 
         const claims = getclaims(settings.profile);
-        if (claims.length > 0) {
+        if (claims !== null && claims.length > 0) {
           this.userOwnerGroups = claims;
-        }
+        } else {
+          this.userOwnerGroups = [];
 
-        if (!this.groupFieldInitialized) {
-          this.groupFieldInitialized = true;
+          // Fetch the current user to get the owner groups if not available
           this.store.dispatch(fetchCurrentUserAction());
         }
 
@@ -132,7 +133,9 @@ export class OwnerGroupFieldComponent
 
   ngOnDestroy(): void {
     // Unsubscribe from all subscriptions
-    this.componentSubscriptions.forEach((subscription) => subscription.unsubscribe());
+    this.componentSubscriptions.forEach((subscription) =>
+      subscription.unsubscribe(),
+    );
   }
 
   onSelectAutocompleteValue($event: MatAutocompleteSelectedEvent) {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
index 9d1b6db17f..cf16b5b618 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
@@ -38,6 +38,7 @@ import { LayoutRenderer } from "@jsonforms/angular-material";
   `,
   styleUrls: ["../ingestor-metadata-editor.component.scss"],
   standalone: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class QuantityValueLayoutRendererComponent extends LayoutRenderer<QuantityValueLayout> {
   constructor(
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index ed55d0d5f5..526931f276 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -12,7 +12,7 @@ it will produce errors when changing the schema. */
 @Component({
   selector: "app-metadata-editor",
   styleUrls: ["./ingestor-metadata-editor.component.scss"],
-  template: `<ng-container class="editor-container">
+  template: `<ng-container class="editor-container" *ngIf="editorInitialized">
     <jsonforms
       *ngIf="renderView === 'requiredOnly'"
       [data]="visualData"
@@ -43,6 +43,7 @@ export class IngestorMetadataEditorComponent implements OnInit {
 
   visualData: object = {};
   reducedSchema: JsonSchema = {};
+  editorInitialized = false;
 
   ngOnInit() {
     this.updateVisualData();
@@ -50,7 +51,7 @@ export class IngestorMetadataEditorComponent implements OnInit {
     this.reducedSchema =
       IngestorMetadataEditorHelper.reduceToRequiredProperties(this.schema);
 
-    //console.log(this.schema);
+    this.editorInitialized = true;
   }
 
   updateVisualData() {
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index c7c56d6468..670f6426ef 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -19,6 +19,16 @@ export interface ExtractionMethod {
   schema: string; // Base64 encoded JSON schema
 }
 
+export interface APIInformation {
+  extractMetaDataRequested: boolean;
+  extractorMetaDataReady: boolean;
+  metaDataExtractionFailed: boolean;
+  extractorMetadataProgress: number;
+  extractorMetaDataStatus: string;
+  ingestionRequestErrorMessage: string;
+  ingestionDatasetLoading: boolean;
+}
+
 export interface IngestionRequestInformation {
   selectedPath: string;
   selectedMethod: ExtractionMethod;
@@ -38,15 +48,7 @@ export interface IngestionRequestInformation {
   mergedMetaDataString: string;
 
   editorMode: IngestorEditorMode;
-  apiInformation: {
-    extractMetaDataRequested: boolean;
-    extractorMetaDataReady: boolean;
-    metaDataExtractionFailed: boolean;
-    extractorMetadataProgress: number;
-    extractorMetaDataStatus: string;
-    ingestionRequestErrorMessage: string;
-    ingestionDatasetLoading: boolean;
-  };
+  apiInformation: APIInformation;
 
   ingestionRequest: PostDatasetResponse | null;
   autoArchive: boolean;
diff --git a/src/app/shared/sdk/apis/ingestor.service.ts b/src/app/shared/sdk/apis/ingestor.service.ts
index c5b8007c96..1e447ae6f6 100644
--- a/src/app/shared/sdk/apis/ingestor.service.ts
+++ b/src/app/shared/sdk/apis/ingestor.service.ts
@@ -43,7 +43,7 @@ export class Ingestor {
     private http: HttpClient,
     public appConfigService: AppConfigService,
     private store: Store,
-  ) { }
+  ) {}
 
   private getRequestOptions() {
     return {
@@ -61,53 +61,47 @@ export class Ingestor {
         this.http.get<OtherVersionResponse>(
           `${endpoint}/${INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION}`,
           this.getRequestOptions(),
-        )
-      )
+        ),
+      ),
     );
   }
 
   getUserInfo(): Observable<UserInfo> {
-    return this.store
-      .select(selectIngestorEndpoint)
-      .pipe(
-        take(1),
-        switchMap((ingestorEndpoint) =>
-          this.http.get<UserInfo>(
-            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.AUTH.USERINFO}`,
-            this.getRequestOptions(),
-          ),
+    return this.store.select(selectIngestorEndpoint).pipe(
+      take(1),
+      switchMap((ingestorEndpoint) =>
+        this.http.get<UserInfo>(
+          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.AUTH.USERINFO}`,
+          this.getRequestOptions(),
         ),
-      );
+      ),
+    );
   }
 
   getHealth(): Observable<OtherHealthResponse> {
-    return this.store
-      .select(selectIngestorEndpoint)
-      .pipe(
-        take(1),
-        switchMap((ingestorEndpoint) =>
-          this.http.get<OtherHealthResponse>(
-            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.OTHER.HEALTH}`,
-            this.getRequestOptions(),
-          ),
+    return this.store.select(selectIngestorEndpoint).pipe(
+      take(1),
+      switchMap((ingestorEndpoint) =>
+        this.http.get<OtherHealthResponse>(
+          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.OTHER.HEALTH}`,
+          this.getRequestOptions(),
         ),
-      );
+      ),
+    );
   }
 
   cancelTransfer(
     requestBody: DeleteTransferRequest,
   ): Observable<DeleteTransferResponse> {
-    return this.store
-      .select(selectIngestorEndpoint)
-      .pipe(
-        take(1),
-        switchMap((ingestorEndpoint) =>
-          this.http.delete<DeleteTransferResponse>(
-            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
-            { ...this.getRequestOptions(), body: requestBody },
-          ),
+    return this.store.select(selectIngestorEndpoint).pipe(
+      take(1),
+      switchMap((ingestorEndpoint) =>
+        this.http.delete<DeleteTransferResponse>(
+          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
+          { ...this.getRequestOptions(), body: requestBody },
         ),
-      );
+      ),
+    );
   }
 
   getTransferList(
@@ -123,32 +117,28 @@ export class Ingestor {
       params.transferId = transferId;
     }
 
-    return this.store
-      .select(selectIngestorEndpoint)
-      .pipe(
-        take(1),
-        switchMap((ingestorEndpoint) =>
-          this.http.get<GetTransferResponse>(
-            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
-            { ...this.getRequestOptions(), params },
-          ),
+    return this.store.select(selectIngestorEndpoint).pipe(
+      take(1),
+      switchMap((ingestorEndpoint) =>
+        this.http.get<GetTransferResponse>(
+          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
+          { ...this.getRequestOptions(), params },
         ),
-      );
+      ),
+    );
   }
 
   startIngestion(payload: PostDatasetRequest): Observable<PostDatasetResponse> {
-    return this.store
-      .select(selectIngestorEndpoint)
-      .pipe(
-        take(1),
-        switchMap((ingestorEndpoint) =>
-          this.http.post<PostDatasetResponse>(
-            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET}`,
-            payload,
-            this.getRequestOptions(),
-          ),
+    return this.store.select(selectIngestorEndpoint).pipe(
+      take(1),
+      switchMap((ingestorEndpoint) =>
+        this.http.post<PostDatasetResponse>(
+          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET}`,
+          payload,
+          this.getRequestOptions(),
         ),
-      );
+      ),
+    );
   }
 
   getExtractionMethods(
@@ -159,17 +149,15 @@ export class Ingestor {
       .set("page", page.toString())
       .set("pageSize", pageSize.toString());
 
-    return this.store
-      .select(selectIngestorEndpoint)
-      .pipe(
-        take(1),
-        switchMap((ingestorEndpoint) =>
-          this.http.get<GetExtractorResponse>(
-            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.EXTRACTOR}`,
-            { ...this.getRequestOptions(), params },
-          ),
+    return this.store.select(selectIngestorEndpoint).pipe(
+      take(1),
+      switchMap((ingestorEndpoint) =>
+        this.http.get<GetExtractorResponse>(
+          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.EXTRACTOR}`,
+          { ...this.getRequestOptions(), params },
         ),
-      );
+      ),
+    );
   }
 
   getBrowseFilePath(
@@ -182,16 +170,14 @@ export class Ingestor {
       .set("pageSize", pageSize.toString())
       .set("path", path.toString());
 
-    return this.store
-      .select(selectIngestorEndpoint)
-      .pipe(
-        take(1),
-        switchMap((ingestorEndpoint) =>
-          this.http.get<GetBrowseDatasetResponse>(
-            `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET_BROWSE}`,
-            { ...this.getRequestOptions(), params },
-          ),
+    return this.store.select(selectIngestorEndpoint).pipe(
+      take(1),
+      switchMap((ingestorEndpoint) =>
+        this.http.get<GetBrowseDatasetResponse>(
+          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET_BROWSE}`,
+          { ...this.getRequestOptions(), params },
         ),
-      );
+      ),
+    );
   }
 }

From 02cbcd7a6e0318d440029d0a90b6693c4f45c69d Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 2 Jul 2025 11:25:15 +0000
Subject: [PATCH 203/245] avoid object object as error

---
 .../state-management/reducers/ingestor.reducer.ts   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index b4a912ac93..ca59f561db 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -33,7 +33,7 @@ const reducer = createReducer(
     (state, { err }): IngestorState => ({
       ...state,
       ingestorBrowserActiveNode: null,
-      error: err,
+      error: JSON.stringify(err),
     }),
   ),
   on(
@@ -48,7 +48,7 @@ const reducer = createReducer(
     (state, { err }): IngestorState => ({
       ...state,
       ingestorExtractionMethods: null,
-      error: err,
+      error: JSON.stringify(err),
     }),
   ),
   on(
@@ -93,7 +93,7 @@ const reducer = createReducer(
         ...state.ingestorStatus,
         validEndpoint: false,
       },
-      error: err,
+      error: JSON.stringify(err),
     }),
   ),
   on(
@@ -178,10 +178,13 @@ const reducer = createReducer(
         apiInformation: {
           ...state.ingestionObject.apiInformation,
           ingestionRequestErrorMessage:
-            (err as any).error ?? (err as any).error?.error ?? err.message,
+            (err as any).error ??
+            (err as any).error?.error ??
+            err.message ??
+            JSON.stringify(err),
         },
       },
-      error: err,
+      error: JSON.stringify(err),
     }),
   ),
   on(

From dfabdcdce2d80943acfc6fc16c5d6b6b96d1ea5c Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 2 Jul 2025 13:21:30 +0000
Subject: [PATCH 204/245] Separated api information

---
 ....confirm-transfer-dialog-page.component.ts | 16 ++++
 ...ingestor.confirm-transfer-dialog-page.html | 22 ++---
 ...xtractor-metadata-dialog-page.component.ts | 24 +++++-
 ...ngestor.no-rights-dialog-page.component.ts | 20 ++++-
 .../ingestor.no-rights-dialog-page.html       |  2 +-
 ...ingestor.creation-dialog-base.component.ts | 85 ++++++++++++++-----
 .../helper/ingestor.component-helper.ts       | 22 ++---
 .../actions/ingestor.actions.ts               | 10 ++-
 .../reducers/ingestor.reducer.ts              | 60 +++++++------
 .../selectors/ingestor.selector.ts            |  7 +-
 .../state-management/state/ingestor.store.ts  |  6 ++
 11 files changed, 196 insertions(+), 78 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index 1ebffc96db..d394eaa1c9 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -7,11 +7,13 @@ import {
   Output,
 } from "@angular/core";
 import {
+  APIInformation,
   IngestionRequestInformation,
   IngestorHelper,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { Store } from "@ngrx/store";
 import {
+  ingestionObjectAPIInformation,
   selectIngestionObject,
   selectIsIngestDatasetLoading,
 } from "state-management/selectors/ingestor.selector";
@@ -35,6 +37,12 @@ export class IngestorConfirmTransferDialogPageComponent
 
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
+  createNewTransferDataApiInformation: APIInformation =
+    IngestorHelper.createEmptyAPIInformation();
+
+  ingestionObjectApiInformation$ = this.store.select(
+    ingestionObjectAPIInformation,
+  );
 
   ingestionObject$ = this.store.select(selectIngestionObject);
   ingestDatasetLoading$ = this.store.select(selectIsIngestDatasetLoading);
@@ -58,6 +66,14 @@ export class IngestorConfirmTransferDialogPageComponent
       }),
     );
 
+    this.subscriptions.push(
+      this.ingestionObjectApiInformation$.subscribe((apiInformation) => {
+        if (apiInformation) {
+          this.createNewTransferDataApiInformation = apiInformation;
+        }
+      }),
+    );
+
     this.subscriptions.push(
       this.ingestDatasetLoading$.subscribe((loading) => {
         this.ingestionDatasetIsLoading = loading;
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
index 13bc381481..5f2b941556 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
@@ -26,7 +26,7 @@ <h2 mat-dialog-title>
 
   <div *ngIf="!ingestionDatasetIsLoading">
     <p
-      *ngIf="createNewTransferData.apiInformation.ingestionRequestErrorMessage !== ''">
+      *ngIf="createNewTransferDataApiInformation.ingestionRequestErrorMessage !== ''">
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Transfer request failed</mat-card-title>
@@ -36,7 +36,7 @@ <h2 mat-dialog-title>
             <mat-icon class="confirm-message-ingestor-icon">error</mat-icon>
             <p>The transfer request has failed.</p>
             <p class="confirm-message-error">
-              {{createNewTransferData.apiInformation.ingestionRequestErrorMessage}}
+              {{createNewTransferDataApiInformation.ingestionRequestErrorMessage}}
             </p>
           </div>
 
@@ -46,7 +46,7 @@ <h2 mat-dialog-title>
     </p>
 
     <div
-      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '' && createNewTransferData.editorMode === 'CREATION'">
+      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '' && createNewTransferData.editorMode === 'CREATION'">
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Dataset created</mat-card-title>
@@ -70,7 +70,7 @@ <h2 mat-dialog-title>
     </div>
 
     <div
-      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '' && createNewTransferData.editorMode === 'INGESTION'">
+      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '' && createNewTransferData.editorMode === 'INGESTION'">
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Transfer requested</mat-card-title>
@@ -95,7 +95,7 @@ <h2 mat-dialog-title>
     </div>
 
     <div
-      *ngIf="createNewTransferData.editorMode === 'INGESTION' && createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
+      *ngIf="createNewTransferData.editorMode === 'INGESTION' && createNewTransferData.ingestionRequest === null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === ''">
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Transfer Options</mat-card-title>
@@ -114,7 +114,7 @@ <h2 mat-dialog-title>
     </div>
 
     <div
-      *ngIf="createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === ''">
+      *ngIf="createNewTransferData.ingestionRequest === null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === ''">
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Confirm Metadata</mat-card-title>
@@ -138,10 +138,10 @@ <h2 mat-dialog-title>
   <button *ngIf="createNewTransferData.editorMode === 'EDITOR' || createNewTransferData.editorMode === 'CREATION' ||
   createNewTransferData.editorMode === 'INGESTION' &&
   (createNewTransferData.ingestionRequest === null ||
-  createNewTransferData.apiInformation.ingestionRequestErrorMessage !== '')"
+  createNewTransferDataApiInformation.ingestionRequestErrorMessage !== '')"
     mat-button (click)="onClickBack()">Back</button>
   <button
-    *ngIf="createNewTransferData.editorMode === 'INGESTION' && (createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '')"
+    *ngIf="createNewTransferData.editorMode === 'INGESTION' && (createNewTransferData.ingestionRequest === null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '')"
     mat-button color="primary" cdkFocusInitial
     (click)="onClickConfirm()">Ingest</button>
   <button
@@ -150,13 +150,13 @@ <h2 mat-dialog-title>
     {{!copiedToClipboard ? "Copy JSON" : "Copied!"}}
   </button>
   <button
-    *ngIf="createNewTransferData.editorMode === 'CREATION' && (createNewTransferData.ingestionRequest === null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '')"
+    *ngIf="createNewTransferData.editorMode === 'CREATION' && (createNewTransferData.ingestionRequest === null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '')"
     mat-button color="primary" cdkFocusInitial (click)="onClickConfirm()">Create
     Dataset</button>
   <button
-    *ngIf="copiedToClipboard && createNewTransferData.editorMode === 'EDITOR' || (createNewTransferData.ingestionRequest !== null && createNewTransferData.apiInformation.ingestionRequestErrorMessage === '')"
+    *ngIf="copiedToClipboard && createNewTransferData.editorMode === 'EDITOR' || (createNewTransferData.ingestionRequest !== null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '')"
     mat-button color="primary" cdkFocusInitial mat-dialog-close>Close</button>
   <button
-    *ngIf="createNewTransferData.apiInformation.ingestionRequestErrorMessage !== ''"
+    *ngIf="createNewTransferDataApiInformation.ingestionRequestErrorMessage !== ''"
     mat-button color="warn" (click)="onClickRetryRequests()">Retry</button>
 </mat-dialog-actions>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index f2f93e0346..c73d016766 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -8,12 +8,14 @@ import {
 } from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import {
+  APIInformation,
   IngestionRequestInformation,
   IngestorHelper,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 import { Store } from "@ngrx/store";
 import {
+  ingestionObjectAPIInformation,
   selectIngestionObject,
   selectIngestorRenderView,
   selectUpdateEditorFromThirdParty,
@@ -36,7 +38,12 @@ export class IngestorExtractorMetadataDialogPageComponent
   metadataSchemaAcquisition: JsonSchema;
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
+  createNewTransferDataApiInformation: APIInformation =
+    IngestorHelper.createEmptyAPIInformation();
 
+  ingestionObjectApiInformation$ = this.store.select(
+    ingestionObjectAPIInformation,
+  );
   ingestionObject$ = this.store.select(selectIngestionObject);
   renderView$ = this.store.select(selectIngestorRenderView);
   selectUpdateEditorFromThirdParty$ = this.store.select(
@@ -84,14 +91,23 @@ export class IngestorExtractorMetadataDialogPageComponent
 
           this.metadataSchemaInstrument = instrumentSchema;
           this.metadataSchemaAcquisition = acqusitionSchema;
+        }
+      }),
+    );
+
+    this.subscriptions.push(
+      this.ingestionObjectApiInformation$.subscribe((apiInformation) => {
+        if (apiInformation) {
+          this.createNewTransferDataApiInformation = apiInformation;
+
           this.extractorMetaDataReady =
-            this.createNewTransferData.apiInformation.extractorMetaDataReady;
+            this.createNewTransferDataApiInformation.extractorMetaDataReady;
           this.extractorMetaDataError =
-            this.createNewTransferData.apiInformation.metaDataExtractionFailed;
+            this.createNewTransferDataApiInformation.metaDataExtractionFailed;
           this.extractorMetaDataStatus =
-            this.createNewTransferData.apiInformation.extractorMetaDataStatus;
+            this.createNewTransferDataApiInformation.extractorMetaDataStatus;
           this.process =
-            this.createNewTransferData.apiInformation.extractorMetadataProgress;
+            this.createNewTransferDataApiInformation.extractorMetadataProgress;
         }
       }),
     );
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts
index f034ea185d..41c2f4e9d7 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts
@@ -8,11 +8,15 @@ import {
 } from "@angular/core";
 import { MatDialog } from "@angular/material/dialog";
 import {
+  APIInformation,
   IngestionRequestInformation,
   IngestorHelper,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { Store } from "@ngrx/store";
-import { selectIngestionObject } from "state-management/selectors/ingestor.selector";
+import {
+  ingestionObjectAPIInformation,
+  selectIngestionObject,
+} from "state-management/selectors/ingestor.selector";
 import { Subscription } from "rxjs";
 
 @Component({
@@ -31,6 +35,12 @@ export class IngestorNoRightsDialogPageComponent implements OnInit, OnDestroy {
 
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
+  createNewTransferDataApiInformation: APIInformation =
+    IngestorHelper.createEmptyAPIInformation();
+
+  ingestionObjectApiInformation$ = this.store.select(
+    ingestionObjectAPIInformation,
+  );
 
   constructor(private store: Store) {}
 
@@ -42,6 +52,14 @@ export class IngestorNoRightsDialogPageComponent implements OnInit, OnDestroy {
         }
       }),
     );
+
+    this.subscriptions.push(
+      this.ingestionObjectApiInformation$.subscribe((apiInformation) => {
+        if (apiInformation) {
+          this.createNewTransferDataApiInformation = apiInformation;
+        }
+      }),
+    );
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html
index 297367a35b..5a8a34492c 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html
@@ -29,7 +29,7 @@ <h2 mat-dialog-title>
           <i>If you have lost the connection, use the save button at the top
             right to save the data you have entered.</i>
           <p class="confirm-message-error">
-            {{createNewTransferData.apiInformation.ingestionRequestErrorMessage}}
+            {{createNewTransferDataApiInformation.ingestionRequestErrorMessage}}
           </p>
         </div>
       </mat-card-content>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index da1dda40da..93e3dd1a16 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -1,12 +1,14 @@
 import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
 import { MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
 import {
+  APIInformation,
   DialogDataObject,
   IngestionRequestInformation,
   IngestorHelper,
   ScientificMetadata,
 } from "../../ingestor-page/helper/ingestor.component-helper";
 import {
+  ingestionObjectAPIInformation,
   selectIngestionObject,
   selectIngestorEndpoint,
   selectNoRightsError,
@@ -41,8 +43,13 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
 
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
+  createNewTransferDataApiInformation: APIInformation =
+    IngestorHelper.createEmptyAPIInformation();
 
   ingestionObject$ = this.store.select(selectIngestionObject);
+  ingestionObjectApiInformation$ = this.store.select(
+    ingestionObjectAPIInformation,
+  );
   ingestorBackend$ = this.store.select(selectIngestorEndpoint);
   selectNoRightsError$ = this.store.select(selectNoRightsError);
 
@@ -67,6 +74,14 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
       }),
     );
 
+    this.subscriptions.push(
+      this.ingestionObjectApiInformation$.subscribe((apiInformation) => {
+        if (apiInformation) {
+          this.createNewTransferDataApiInformation = apiInformation;
+        }
+      }),
+    );
+
     this.subscriptions.push(
       this.ingestorBackend$.subscribe((ingestorBackend) => {
         if (ingestorBackend) {
@@ -110,6 +125,8 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
       sample: {},
     };
 
+    this.createNewTransferData.selectedMethod = { name: "", schema: "" };
+
     this.store.dispatch(
       fromActions.updateIngestionObject({
         ingestionObject: this.createNewTransferData,
@@ -118,14 +135,20 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
   }
 
   async startMetadataExtraction(): Promise<boolean> {
-    this.createNewTransferData.apiInformation.metaDataExtractionFailed = false;
+    this.createNewTransferDataApiInformation.metaDataExtractionFailed = false;
 
-    if (this.createNewTransferData.apiInformation.extractMetaDataRequested) {
+    if (this.createNewTransferDataApiInformation.extractMetaDataRequested) {
       return false;
     }
 
-    this.createNewTransferData.apiInformation.extractorMetaDataReady = false;
-    this.createNewTransferData.apiInformation.extractMetaDataRequested = true;
+    this.createNewTransferDataApiInformation.extractorMetaDataReady = false;
+    this.createNewTransferDataApiInformation.extractMetaDataRequested = true;
+
+    this.store.dispatch(
+      fromActions.updateIngestionObjectAPIInformation({
+        ingestionObjectApiInformation: this.createNewTransferDataApiInformation,
+      }),
+    );
 
     const params = new HttpParams()
       .set("filePath", this.createNewTransferData.selectedPath)
@@ -137,13 +160,13 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
       this.sseService.getMessages().subscribe({
         next: (data) => {
           //console.log("Received SSE data:", data);
-          this.createNewTransferData.apiInformation.extractorMetaDataStatus =
+          this.createNewTransferDataApiInformation.extractorMetaDataStatus =
             data.message;
-          this.createNewTransferData.apiInformation.extractorMetadataProgress =
+          this.createNewTransferDataApiInformation.extractorMetadataProgress =
             data.progress;
 
           if (data.result) {
-            this.createNewTransferData.apiInformation.extractorMetaDataReady =
+            this.createNewTransferDataApiInformation.extractorMetaDataReady =
               true;
             const extractedScientificMetadata = JSON.parse(
               data.resultMessage,
@@ -153,33 +176,41 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
               extractedScientificMetadata.instrument ?? {};
             this.createNewTransferData.extractorMetaData.acquisition =
               extractedScientificMetadata.acquisition ?? {};
+
+            this.store.dispatch(
+              fromActions.updateIngestionObject({
+                ingestionObject: this.createNewTransferData,
+              }),
+            );
           } else if (data.error) {
-            this.createNewTransferData.apiInformation.metaDataExtractionFailed =
+            this.createNewTransferDataApiInformation.metaDataExtractionFailed =
               true;
-            this.createNewTransferData.apiInformation.extractMetaDataRequested =
+            this.createNewTransferDataApiInformation.extractMetaDataRequested =
               false;
-            this.createNewTransferData.apiInformation.extractorMetaDataStatus =
+            this.createNewTransferDataApiInformation.extractorMetaDataStatus =
               data.message;
-            this.createNewTransferData.apiInformation.extractorMetadataProgress =
+            this.createNewTransferDataApiInformation.extractorMetadataProgress =
               data.progress;
           }
 
           this.store.dispatch(
-            fromActions.updateIngestionObject({
-              ingestionObject: this.createNewTransferData,
+            fromActions.updateIngestionObjectAPIInformation({
+              ingestionObjectApiInformation:
+                this.createNewTransferDataApiInformation,
             }),
           );
         },
         error: (error) => {
           console.error("Error receiving SSE data:", error);
-          this.createNewTransferData.apiInformation.metaDataExtractionFailed =
+          this.createNewTransferDataApiInformation.metaDataExtractionFailed =
             true;
-          this.createNewTransferData.apiInformation.extractMetaDataRequested =
+          this.createNewTransferDataApiInformation.extractMetaDataRequested =
             false;
 
           this.store.dispatch(
-            fromActions.updateIngestionObject({
-              ingestionObject: this.createNewTransferData,
+            fromActions.updateIngestionObjectAPIInformation({
+              ingestionObjectApiInformation:
+                this.createNewTransferDataApiInformation,
             }),
           );
         },
@@ -195,10 +226,16 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
         this.resetScientificMetadata();
 
         // Reset metadata extractor
-        this.createNewTransferData.apiInformation.extractMetaDataRequested =
-          false;
-        this.createNewTransferData.apiInformation.extractorMetaDataReady =
+        this.sseService.disconnect();
+        this.createNewTransferDataApiInformation.extractMetaDataRequested =
           false;
+        this.createNewTransferDataApiInformation.extractorMetaDataReady = false;
+        this.store.dispatch(
+          fromActions.updateIngestionObjectAPIInformation({
+            ingestionObjectApiInformation:
+              this.createNewTransferDataApiInformation,
+          }),
+        );
         break;
       case "USER_METADATA":
         if (this.createNewTransferData.editorMode === "INGESTION") {
@@ -209,8 +246,14 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
           this.createNewTransferData.editorMode === "EDITOR" ||
           this.createNewTransferData.editorMode === "CREATION"
         ) {
-          this.createNewTransferData.apiInformation.extractorMetaDataReady =
+          this.createNewTransferDataApiInformation.extractorMetaDataReady =
             true;
+          this.store.dispatch(
+            fromActions.updateIngestionObjectAPIInformation({
+              ingestionObjectApiInformation:
+                this.createNewTransferDataApiInformation,
+            }),
+          );
         }
 
         break;
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 670f6426ef..552578d9bf 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -48,7 +48,6 @@ export interface IngestionRequestInformation {
   mergedMetaDataString: string;
 
   editorMode: IngestorEditorMode;
-  apiInformation: APIInformation;
 
   ingestionRequest: PostDatasetResponse | null;
   autoArchive: boolean;
@@ -129,20 +128,23 @@ export class IngestorHelper {
       customMetaData: {},
       mergedMetaDataString: "",
       editorMode: "INGESTION",
-      apiInformation: {
-        metaDataExtractionFailed: false,
-        extractMetaDataRequested: false,
-        extractorMetaDataReady: false,
-        extractorMetadataProgress: 0,
-        extractorMetaDataStatus: "",
-        ingestionRequestErrorMessage: "",
-        ingestionDatasetLoading: false,
-      },
       ingestionRequest: null,
       autoArchive: true,
     };
   };
 
+  static createEmptyAPIInformation = (): APIInformation => {
+    return {
+      metaDataExtractionFailed: false,
+      extractMetaDataRequested: false,
+      extractorMetaDataReady: false,
+      extractorMetadataProgress: 0,
+      extractorMetaDataStatus: "",
+      ingestionRequestErrorMessage: "",
+      ingestionDatasetLoading: false,
+    };
+  };
+
   static mergeUserAndExtractorMetadata(
     userMetadata: object,
     extractorMetadata: object,
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index ac891617ce..01915ee147 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -1,5 +1,8 @@
 import { createAction, props } from "@ngrx/store";
-import { IngestionRequestInformation } from "ingestor/ingestor-page/helper/ingestor.component-helper";
+import {
+  APIInformation,
+  IngestionRequestInformation,
+} from "ingestor/ingestor-page/helper/ingestor.component-helper";
 import {
   GetBrowseDatasetResponse,
   GetExtractorResponse,
@@ -81,6 +84,11 @@ export const updateIngestionObjectFromThirdParty = createAction(
   props<{ ingestionObject: IngestionRequestInformation }>(),
 );
 
+export const updateIngestionObjectAPIInformation = createAction(
+  "[Ingestor] Update Ingestion Object API Information",
+  props<{ ingestionObjectApiInformation: APIInformation }>(),
+);
+
 export const resetIngestionObjectFromThirdPartyFlag = createAction(
   "[Ingestor] Reset Ingestion Object from Third Party Flag",
 );
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index ca59f561db..67180515bb 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -123,6 +123,16 @@ const reducer = createReducer(
       },
     }),
   ),
+  on(
+    fromActions.updateIngestionObjectAPIInformation,
+    (state, { ingestionObjectApiInformation }): IngestorState => ({
+      ...state,
+      ingestionObjectApiInformation: {
+        ...state.ingestionObjectApiInformation,
+        ...ingestionObjectApiInformation,
+      },
+    }),
+  ),
   on(
     fromActions.updateIngestionObjectFromThirdParty,
     (state, { ingestionObject }): IngestorState => ({
@@ -142,13 +152,13 @@ const reducer = createReducer(
     fromActions.ingestDatasetSuccess,
     (state, { response }): IngestorState => ({
       ...state,
+      ingestionObjectApiInformation: {
+        ...state.ingestionObjectApiInformation,
+        ingestionRequestErrorMessage: "",
+      },
       ingestionObject: {
         ...state.ingestionObject,
         ingestionRequest: response,
-        apiInformation: {
-          ...state.ingestionObject.apiInformation,
-          ingestionRequestErrorMessage: "",
-        },
       },
     }),
   ),
@@ -156,16 +166,16 @@ const reducer = createReducer(
     fromActions.createDatasetSuccess,
     (state, { dataset }): IngestorState => ({
       ...state,
+      ingestionObjectApiInformation: {
+        ...state.ingestionObjectApiInformation,
+        ingestionRequestErrorMessage: "",
+      },
       ingestionObject: {
         ...state.ingestionObject,
         ingestionRequest: {
           transferId: dataset.pid,
           status: dataset.datasetName,
         },
-        apiInformation: {
-          ...state.ingestionObject.apiInformation,
-          ingestionRequestErrorMessage: "",
-        },
       },
     }),
   ),
@@ -173,16 +183,13 @@ const reducer = createReducer(
     fromActions.ingestDatasetFailure,
     (state, { err }): IngestorState => ({
       ...state,
-      ingestionObject: {
-        ...state.ingestionObject,
-        apiInformation: {
-          ...state.ingestionObject.apiInformation,
-          ingestionRequestErrorMessage:
-            (err as any).error ??
-            (err as any).error?.error ??
-            err.message ??
-            JSON.stringify(err),
-        },
+      ingestionObjectApiInformation: {
+        ...state.ingestionObjectApiInformation,
+        ingestionRequestErrorMessage:
+          (err as any).error ??
+          (err as any).error?.error ??
+          err.message ??
+          JSON.stringify(err),
       },
       error: JSON.stringify(err),
     }),
@@ -194,10 +201,10 @@ const reducer = createReducer(
       ingestionObject: {
         ...state.ingestionObject,
         ingestionRequest: null,
-        apiInformation: {
-          ...state.ingestionObject.apiInformation,
-          ingestionRequestErrorMessage: "",
-        },
+      },
+      ingestionObjectApiInformation: {
+        ...state.ingestionObjectApiInformation,
+        ingestionRequestErrorMessage: "",
       },
     }),
   ),
@@ -222,12 +229,9 @@ const reducer = createReducer(
     fromActions.setIngestDatasetLoading,
     (state, { ingestionDatasetLoading }): IngestorState => ({
       ...state,
-      ingestionObject: {
-        ...state.ingestionObject,
-        apiInformation: {
-          ...state.ingestionObject.apiInformation,
-          ingestionDatasetLoading,
-        },
+      ingestionObjectApiInformation: {
+        ...state.ingestionObjectApiInformation,
+        ingestionDatasetLoading,
       },
     }),
   ),
diff --git a/src/app/state-management/selectors/ingestor.selector.ts b/src/app/state-management/selectors/ingestor.selector.ts
index 53d70a27c8..4e9af1121a 100644
--- a/src/app/state-management/selectors/ingestor.selector.ts
+++ b/src/app/state-management/selectors/ingestor.selector.ts
@@ -76,5 +76,10 @@ export const selectNoRightsError = createSelector(
 
 export const selectIsIngestDatasetLoading = createSelector(
   selectIngestorState,
-  (state) => state.ingestionObject.apiInformation.ingestionDatasetLoading,
+  (state) => state.ingestionObjectApiInformation.ingestionDatasetLoading,
+);
+
+export const ingestionObjectAPIInformation = createSelector(
+  selectIngestorState,
+  (state) => state.ingestionObjectApiInformation,
 );
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index bdef50e1df..86c297fa91 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -1,5 +1,6 @@
 import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 import {
+  APIInformation,
   IngestionRequestInformation,
   IngestorHelper,
 } from "ingestor/ingestor-page/helper/ingestor.component-helper";
@@ -34,7 +35,10 @@ export interface IngestorState {
     pageNumber: number;
   };
   ingestorExtractionMethods: GetExtractorResponse | null;
+
   ingestionObject: IngestionRequestInformation;
+  ingestionObjectApiInformation: APIInformation;
+
   ingestorBrowserActiveNode: GetBrowseDatasetResponse | null;
   renderView: renderView;
   updateEditorFromThirdParty: boolean;
@@ -58,6 +62,8 @@ export const initialIngestorState: IngestorState = {
   },
   ingestorExtractionMethods: null,
   ingestionObject: IngestorHelper.createEmptyRequestInformation(),
+  ingestionObjectApiInformation: IngestorHelper.createEmptyAPIInformation(),
+
   ingestorBrowserActiveNode: null,
   connectingBackend: false,
   updateEditorFromThirdParty: false,

From dd90f3df28621e08d557a239f3bbfbcd938d538e Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Wed, 2 Jul 2025 13:33:43 +0000
Subject: [PATCH 205/245] Remove free mode, since its not ready

---
 .../ingestor.new-transfer-dialog-page.component.ts            | 2 +-
 .../creation-pages/ingestor.new-transfer-dialog-page.html     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 328c47a928..2cffacb1e0 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -63,7 +63,7 @@ export class IngestorNewTransferDialogPageComponent
   uiNextButtonReady = false;
 
   // Creation Mode Options
-  _selectedSchemaOption: "free" | "upload" = "free";
+  _selectedSchemaOption: "free" | "upload" = "upload";
   selectedSchemaFileName = "";
   selectedSchemaFileContent = "";
 
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index f170bccb59..01b6ce1671 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -21,11 +21,11 @@ <h2 mat-dialog-title>
         <mat-card-title>Scientific Metadata Schema</mat-card-title>
       </mat-card-header>
       <mat-card-content class="ingestor-vertical-layout">
-        <mat-radio-group class="ingestor-radio-group"
+        <!-- <mat-radio-group class="ingestor-radio-group"
           [(ngModel)]="selectedSchemaOption">
           <mat-radio-button value="free">Free Input</mat-radio-button>
           <mat-radio-button value="upload">Upload Schema</mat-radio-button>
-        </mat-radio-group>
+        </mat-radio-group> -->
 
         <div *ngIf="selectedSchemaOption === 'upload'"
           class="ingestor-upload-section">

From ec398180a3f884b25d9d7d66f018b580c3d492c1 Mon Sep 17 00:00:00 2001
From: dwiessner-unibe <david.wiessner@unibe.ch>
Date: Thu, 3 Jul 2025 13:55:52 +0000
Subject: [PATCH 206/245] properly reset ingestion object when creating new
 transfer

---
 .../helper/ingestor.metadata-sse-service.ts          | 12 +++++++++++-
 .../ingestor-page/ingestor-creation.component.ts     |  4 +---
 .../ingestor-page/ingestor-transfer.component.ts     |  7 +------
 src/app/state-management/actions/ingestor.actions.ts |  6 ++++++
 .../state-management/reducers/ingestor.reducer.ts    | 10 ++++++++++
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.metadata-sse-service.ts b/src/app/ingestor/ingestor-page/helper/ingestor.metadata-sse-service.ts
index b1cab387dc..befedd69a7 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.metadata-sse-service.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.metadata-sse-service.ts
@@ -25,9 +25,19 @@ export class IngestorMetadataSSEService {
   private messageSubject: Subject<IngestorMetadataEvent> =
     new Subject<IngestorMetadataEvent>();
 
-  constructor() {}
+  constructor() {
+    // Close previous connection if it exists
+    this.disconnect();
+  }
+
+  destroy(): void {
+    this.disconnect();
+  }
 
   public connect(url: string, withCredentials = true): void {
+    // Close previous connection if it exists
+    this.disconnect();
+
     this.eventSource = new EventSource(url, { withCredentials });
 
     this.eventSource.onmessage = (event) => {
diff --git a/src/app/ingestor/ingestor-page/ingestor-creation.component.ts b/src/app/ingestor/ingestor-page/ingestor-creation.component.ts
index 918884e50d..3ca9dea365 100644
--- a/src/app/ingestor/ingestor-page/ingestor-creation.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-creation.component.ts
@@ -24,9 +24,7 @@ export class IngestorCreationComponent {
     newTransferObject.editorMode = "CREATION";
 
     this.store.dispatch(
-      fromActions.updateIngestionObject({
-        ingestionObject: newTransferObject,
-      }),
+      fromActions.resetIngestionObject({ ingestionObject: newTransferObject }),
     );
 
     this.dialog.closeAll();
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
index f89ae33961..dacb9a4b3a 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
@@ -267,12 +267,7 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
 
   onClickAddIngestion(): void {
     // Clean the current ingestion object
-    this.store.dispatch(
-      fromActions.updateIngestionObject({
-        ingestionObject: IngestorHelper.createEmptyRequestInformation(),
-      }),
-    );
-
+    this.store.dispatch(fromActions.resetIngestionObject({}));
     this.dialog.closeAll();
 
     let dialogRef = null;
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 01915ee147..1f9ed61618 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -74,6 +74,12 @@ export const updateTransferListFailure = createAction(
   props<{ err: Error }>(),
 );
 
+/* Optional pass an ingestionObject to set custom properties */
+export const resetIngestionObject = createAction(
+  "[Ingestor] Reset Ingestion Object",
+  props<{ ingestionObject?: IngestionRequestInformation }>(),
+);
+
 export const updateIngestionObject = createAction(
   "[Ingestor] Update Ingestion Object",
   props<{ ingestionObject: IngestionRequestInformation }>(),
diff --git a/src/app/state-management/reducers/ingestor.reducer.ts b/src/app/state-management/reducers/ingestor.reducer.ts
index 67180515bb..920558209c 100644
--- a/src/app/state-management/reducers/ingestor.reducer.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.ts
@@ -1,4 +1,5 @@
 import { createReducer, Action, on } from "@ngrx/store";
+import { IngestorHelper } from "ingestor/ingestor-page/helper/ingestor.component-helper";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import {
   IngestorState,
@@ -133,6 +134,15 @@ const reducer = createReducer(
       },
     }),
   ),
+  on(
+    fromActions.resetIngestionObject,
+    (state, { ingestionObject }): IngestorState => ({
+      ...state,
+      ingestionObject:
+        ingestionObject ?? IngestorHelper.createEmptyRequestInformation(),
+      ingestionObjectApiInformation: IngestorHelper.createEmptyAPIInformation(),
+    }),
+  ),
   on(
     fromActions.updateIngestionObjectFromThirdParty,
     (state, { ingestionObject }): IngestorState => ({

From c30be79f74162f46db4bfe5634f86c691eb9d8c9 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 22 Jul 2025 13:01:11 +0000
Subject: [PATCH 207/245] fix config after merge

---
 src/app/app-config.service.ts                         |  6 +++---
 src/app/datasets/depositor/depositor.component.ts     | 10 +++++-----
 src/app/datasets/depositor/empiar/empiar.component.ts |  4 ++--
 src/app/datasets/depositor/onedep/onedep.component.ts |  4 ++--
 src/app/shared/sdk/apis/depositor.service.ts          |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index 5915c5d927..0fdd634571 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -123,6 +123,9 @@ export interface AppConfigInterface {
   labelsLocalization?: LabelsLocalization;
   dateFormat?: string;
   defaultMainPage?: MainPageConfiguration;
+  ingestorEnabled?: boolean;
+  ingestorMode?: string;
+  ingestorAutodiscoveryOptions?: IngestorAutodiscovery[];
 }
 
 function isMainPageConfiguration(obj: any): obj is MainPageConfiguration {
@@ -133,9 +136,6 @@ function isMainPageConfiguration(obj: any): obj is MainPageConfiguration {
     validKeys.includes(obj.nonAuthenticatedUser) &&
     validKeys.includes(obj.authenticatedUser)
   );
-  ingestorEnabled?: boolean;
-  ingestorMode?: string;
-  ingestorAutodiscoveryOptions?: IngestorAutodiscovery[];
 }
 
 @Injectable({
diff --git a/src/app/datasets/depositor/depositor.component.ts b/src/app/datasets/depositor/depositor.component.ts
index 802977ecd4..9b0e67cff4 100644
--- a/src/app/datasets/depositor/depositor.component.ts
+++ b/src/app/datasets/depositor/depositor.component.ts
@@ -5,7 +5,7 @@ import {
   FormBuilder,
   Validators,
 } from "@angular/forms";
-import { AppConfigService, AppConfig } from "app-config.service";
+import { AppConfigService, AppConfigInterface } from "app-config.service";
 import { ActivatedRoute } from "@angular/router";
 import { JsonSchema } from "@jsonforms/core";
 import { Store } from "@ngrx/store";
@@ -28,8 +28,8 @@ import { selectEmpiarSchema } from "state-management/selectors/depositor.selecto
 import { updatePropertyAction } from "state-management/actions/datasets.actions";
 
 import * as ingestorActions from "state-management/actions/ingestor.actions";
-import { MethodItem } from "../../shared/sdk/models/ingestor/models"
-import { selectExtractionMethods} from "state-management/selectors/ingestor.selector";
+import { GetExtractorResponse, MethodItem } from "../../shared/sdk/models/ingestor/models"
+import { selectIngestorExtractionMethods} from "state-management/selectors/ingestor.selector";
 
 // import { IngestorMetadataEditorComponent} from "../../ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component"
 
@@ -51,7 +51,7 @@ export class DepositorComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   form: FormGroup;
 
-  config: AppConfig;
+  config: AppConfigInterface;
   supportedDepositionList: DepositionRepository[] = [
     { value: "onedep", viewValue: "OneDep" },
     { value: "empiar", viewValue: "EMPIAR" },
@@ -73,7 +73,7 @@ export class DepositorComponent implements OnInit, OnDestroy {
   metadata: any = {}; 
   metadataSchema: JsonSchema = null// ideally i get the schema by uid?
 
-  methods$: Observable<MethodItem[]> = this.store.select(selectExtractionMethods);
+  methods$: Observable<MethodItem[]> = this.store.select(selectIngestorExtractionMethods)["methods"];
 
   constructor(
     public appConfigService: AppConfigService,
diff --git a/src/app/datasets/depositor/empiar/empiar.component.ts b/src/app/datasets/depositor/empiar/empiar.component.ts
index 6a4ee4bb40..c09dff055d 100644
--- a/src/app/datasets/depositor/empiar/empiar.component.ts
+++ b/src/app/datasets/depositor/empiar/empiar.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from "@angular/core";
 import { JsonSchema } from "@jsonforms/core";
 import { angularMaterialRenderers } from "@jsonforms/angular-material";
-import { AppConfigService, AppConfig } from "app-config.service";
+import { AppConfigService, AppConfigInterface } from "app-config.service";
 import { Store, select } from "@ngrx/store";
 import {
   OutputDatasetObsoleteDto,
@@ -44,7 +44,7 @@ export class EmpiarComponent implements OnChanges, OnDestroy {
   data: JsonSchema = createEmptyInstance();
   schema: JsonSchema;
 
-  config: AppConfig;
+  config: AppConfigInterface;
 
   empiarSchema$: Observable<string>;
   empiarSchema: string;
diff --git a/src/app/datasets/depositor/onedep/onedep.component.ts b/src/app/datasets/depositor/onedep/onedep.component.ts
index 28e3950a10..62cb106164 100644
--- a/src/app/datasets/depositor/onedep/onedep.component.ts
+++ b/src/app/datasets/depositor/onedep/onedep.component.ts
@@ -8,7 +8,7 @@ import {
   SimpleChanges
 } from "@angular/core";
 import { MatRadioChange } from "@angular/material/radio";
-import { AppConfigService, AppConfig } from "app-config.service";
+import { AppConfigService, AppConfigInterface } from "app-config.service";
 import {
   FormBuilder,
   FormControl,
@@ -51,7 +51,7 @@ export class OneDepComponent implements OnChanges, OnDestroy {
   @Input() showFirstCard = true;
   private subscriptions: Subscription[] = [];
 
-  config: AppConfig;
+  config: AppConfigInterface;
 
   // dataset: OutputDatasetObsoleteDto | undefined;
   // user: ReturnedUserDto | undefined;
diff --git a/src/app/shared/sdk/apis/depositor.service.ts b/src/app/shared/sdk/apis/depositor.service.ts
index 5e4eb239e0..a0f2e3e1ce 100644
--- a/src/app/shared/sdk/apis/depositor.service.ts
+++ b/src/app/shared/sdk/apis/depositor.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { HttpClient, HttpHeaders } from "@angular/common/http";
 import { Observable } from "rxjs";
-import { AppConfigService, AppConfig } from "app-config.service";
+import { AppConfigService, AppConfigInterface } from "app-config.service";
 import {
   DepBackendVersion,
   OneDepUserInfo,
@@ -13,7 +13,7 @@ import {
   providedIn: "root",
 })
 export class Depositor {
-  config: AppConfig;
+  config: AppConfigInterface;
   constructor(
     private http: HttpClient,
     public appConfigService: AppConfigService,

From 99f988550f3f4e4b1c35f62290a8d37fbb8725e0 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 22 Aug 2025 07:59:22 +0000
Subject: [PATCH 208/245] minor changes, continue at step 2 for creation mode

---
 ...stor.new-transfer-dialog-page.component.ts | 30 ++++---------------
 .../ingestor.new-transfer-dialog-page.html    |  7 ++---
 .../ingestor.dialog-stepper.component.html    |  6 ++--
 .../ingestor-metadata-editor.component.ts     |  3 +-
 .../ingestor-page/ingestor.component.scss     |  5 ++++
 5 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index bc250fcdea..bbd931ce27 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -68,8 +68,6 @@ export class IngestorNewTransferDialogPageComponent
   userProfile: ReturnedUserDto | null = null;
   uiNextButtonReady = false;
 
-  // Creation Mode Options
-  _selectedSchemaOption: "free" | "upload" = "upload";
   selectedSchemaFileName = "";
   selectedSchemaFileContent = "";
   renderView$ = this.store.select(selectIngestorRenderView);
@@ -169,15 +167,6 @@ export class IngestorNewTransferDialogPageComponent
     });
   }
 
-  set selectedSchemaOption(value: "free" | "upload") {
-    this._selectedSchemaOption = value;
-    this.validateNextButton();
-  }
-
-  get selectedSchemaOption(): "free" | "upload" {
-    return this._selectedSchemaOption;
-  }
-
   set selectedMethod(value: ExtractionMethod) {
     this.createNewTransferData.selectedMethod = value;
     this.validateNextButton();
@@ -247,8 +236,8 @@ export class IngestorNewTransferDialogPageComponent
         schema,
       );
       this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
-    } else if (this.createNewTransferData.editorMode === "CREATION") {
-      if (this.selectedSchemaOption === "upload") {
+    } else {
+      if (this.selectedSchemaFileContent) {
         const schema = JSON.parse(this.selectedSchemaFileContent);
         const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
           schema,
@@ -257,8 +246,6 @@ export class IngestorNewTransferDialogPageComponent
         this.createNewTransferData.selectedResolvedDecodedSchema =
           resolvedSchema;
       }
-    } else {
-      console.error("Unknown editor mode");
     }
   }
 
@@ -272,11 +259,9 @@ export class IngestorNewTransferDialogPageComponent
         ingestionObject: this.createNewTransferData,
       }),
     );
-
     this.generateExampleDataForSciCatHeader();
     this.prepareSchemaForProcessing();
-
-    this.nextStep.emit(); // Open next dialog
+    this.nextStep.emit(); 
   }
 
   onDataChangeUserScicatHeader(event: any) {
@@ -304,18 +289,13 @@ export class IngestorNewTransferDialogPageComponent
       this.selectedMethod !== undefined &&
       this.selectedMethod.name !== "";
 
-    const creationModeParameterReady =
-      this.selectedSchemaOption === "free" ||
-      (this.selectedSchemaOption === "upload" &&
-        this.selectedSchemaFileName !== "");
-
     if (
       this.createNewTransferData.editorMode === "INGESTION" ||
       this.createNewTransferData.editorMode === "EDITOR"
     ) {
       this.uiNextButtonReady = !!selectedPathReady && !!selectedMethodReady;
-    } else if (this.createNewTransferData.editorMode === "CREATION") {
-      this.uiNextButtonReady = !!creationModeParameterReady && this.isSciCatHeaderOk;
+    } else if (this.createNewTransferData.editorMode === "CREATION") { // user can proceed without the schema
+      this.uiNextButtonReady = this.isSciCatHeaderOk;
     } else {
       this.uiNextButtonReady = false;
     }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index 609c1f08c1..69447284dd 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -55,10 +55,9 @@ <h2 *ngIf="createNewTransferData.editorMode !== 'CREATION'" mat-dialog-title>
         <mat-card-title>Scientific Metadata Schema</mat-card-title>
       </mat-card-header>
       <mat-card-content class="ingestor-vertical-layout">
-        <div *ngIf="selectedSchemaOption === 'upload'"
-          class="ingestor-upload-section">
-          <label for="schema-upload">Upload your schema file: </label>
-          <button mat-raised-button color="primary"
+        <div class="ingestor-upload-section">
+          <label for="schema-upload">You can provide a schema for your scientific metadata. We only accept schemas in json format. </label>
+          <button mat-raised-button class="block-button" color="primary"
             (click)="onUploadSchema()">Choose File</button>
 
           <p *ngIf="selectedSchemaFileName !== ''">
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index 5faa4abfa9..f8e584756e 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -10,9 +10,9 @@
   <button
     *ngIf="this.createNewTransferData !== undefined && activeRenderView !== null"
     mat-button (click)="onChangeViewMode()" [matTooltip]="activeRenderView === 'requiredOnly'
-    ? 'Show all fields.' : 'Show required fields only.'"><mat-icon
-      class="control-button-icon">{{activeRenderView === "requiredOnly" ?
-      "visibility" : "visibility_off"}}</mat-icon></button>
+    ? 'Show all fields.' : 'Show required fields only.'">
+    <mat-icon class="control-button-icon">filter_list</mat-icon>
+    {{ activeRenderView === 'requiredOnly' ? 'All Fields' : 'Required Only' }}</button>
   <button
     *ngIf="this.createNewTransferData !== undefined && this.createNewTransferData.editorMode !== 'CREATION'"
     mat-button [matMenuTriggerFor]="settingsMenu"
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 526931f276..6f6a6284a2 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -56,8 +56,7 @@ export class IngestorMetadataEditorComponent implements OnInit {
 
   updateVisualData() {
     // Do a deep clone
-    this.visualData = JSON.parse(JSON.stringify(this.data));
-
+    this.visualData = structuredClone(this.data);
     // Update the data with the same keys as the schema, including nested properties
     // This is necessary, otherwise the error checks will not work correctly
     // Fill empty boolean with false to avoid undefined errors
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.scss b/src/app/ingestor/ingestor-page/ingestor.component.scss
index be1f05bc49..de61ee3fa1 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.scss
+++ b/src/app/ingestor/ingestor-page/ingestor.component.scss
@@ -153,3 +153,8 @@ mat-card {
   color: grey;
   margin-top: 1em;
 }
+
+.block-button {
+  display: block;
+  margin-top: 8px;
+}
\ No newline at end of file

From 06dd5d9d69d5e849740bbe645dd76839336fa08b Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 28 Aug 2025 11:21:37 +0000
Subject: [PATCH 209/245] minor ux changes

---
 ...stor.new-transfer-dialog-page.component.ts | 80 ++++++++++---------
 .../ingestor.new-transfer-dialog-page.html    | 33 ++++----
 .../ingestor.dialog-stepper.component.html    | 18 +++--
 3 files changed, 74 insertions(+), 57 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index bbd931ce27..faf323c4df 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -67,8 +67,8 @@ export class IngestorNewTransferDialogPageComponent
 
   userProfile: ReturnedUserDto | null = null;
   uiNextButtonReady = false;
-
-  selectedSchemaFileName = "";
+  schemaUrl = "";
+  // selectedSchemaFileName = "";
   selectedSchemaFileContent = "";
   renderView$ = this.store.select(selectIngestorRenderView);
   selectUpdateEditorFromThirdParty$ = this.store.select(
@@ -317,39 +317,47 @@ export class IngestorNewTransferDialogPageComponent
     });
   }
 
-  onUploadSchema(): void {
-    // Upload a template of metadata
-    const input = document.createElement("input");
-    input.type = "file";
-    input.accept = ".ingestor.schema,.json";
-    input.onchange = (event: Event) => {
-      const target = event.target as HTMLInputElement;
-      const file = target.files?.[0];
-      if (file) {
-        const reader = new FileReader();
-        reader.onload = (e) => {
-          const content = e.target?.result as string;
-
-          const dialogRef = this.dialog.open(
-            IngestorConfirmationDialogComponent,
-            {
-              data: {
-                header: "Confirm template",
-                message: "Do you really want to apply the following values?",
-              },
-            },
-          );
-          dialogRef.afterClosed().subscribe((result) => {
-            if (result) {
-              this.selectedSchemaFileName = file.name;
-              this.selectedSchemaFileContent = content;
-              this.validateNextButton();
-            }
-          });
-        };
-        reader.readAsText(file);
-      }
-    };
-    input.click();
+  async onUploadSchema(): Promise<void> {
+  if (!this.schemaUrl) {
+    alert("Please enter a schema URL.");
+    return;
+  }
+  console.log("Fetching schema from URL:", this.schemaUrl);
+  let content: string;
+  let parsedJson: any;
+
+  try {
+    const response = await fetch(this.schemaUrl);
+    if (!response.ok) {
+      throw new Error(`Failed to fetch schema: ${response.statusText}`);
+    }
+    content = await response.text();
+    try {
+      parsedJson = JSON.parse(content);
+    } catch (e) {
+      alert("The provided URL does not contain valid JSON.");
+      return;
+    }
+  } catch (error: any) {
+    alert(`Error fetching schema: ${error.message}`);
+    return;
   }
+
+  // If we reach here, we have valid JSON
+  const dialogRef = this.dialog.open(
+    IngestorConfirmationDialogComponent,
+    {
+      data: {
+        header: "Confirm template",
+        message: "Do you really want to apply the following values?",
+      },
+    },
+  );
+  dialogRef.afterClosed().subscribe((result) => {
+    if (result) {
+      this.selectedSchemaFileContent = content;
+      this.validateNextButton();
+    }
+  });
 }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index 69447284dd..75f5bc1c0f 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -51,21 +51,26 @@ <h2 *ngIf="createNewTransferData.editorMode !== 'CREATION'" mat-dialog-title>
 
     
     <mat-card class="ingestor-card">
-      <mat-card-header>
-        <mat-card-title>Scientific Metadata Schema</mat-card-title>
-      </mat-card-header>
-      <mat-card-content class="ingestor-vertical-layout">
-        <div class="ingestor-upload-section">
-          <label for="schema-upload">You can provide a schema for your scientific metadata. We only accept schemas in json format. </label>
-          <button mat-raised-button class="block-button" color="primary"
-            (click)="onUploadSchema()">Choose File</button>
+  <mat-card-header>
+    <mat-card-title>Scientific Metadata Schema</mat-card-title>
+  </mat-card-header>
+  <mat-card-content class="ingestor-vertical-layout">
+    <div class="ingestor-upload-section">
+      <label for="schemaUrl">
+        You can provide a schema for your scientific metadata. We only accept schemas in json format.
+      </label>
+      <mat-form-field class="form-full-width">
+        <input matInput id="schemaUrl" placeholder="Paste schema URL here" [(ngModel)]="schemaUrl" />
+       <button mat-raised-button class="block-button" color="primary"
+            (click)="onUploadSchema()">Validate</button>
 
-          <p *ngIf="selectedSchemaFileName !== ''">
-            Selected file: {{ selectedSchemaFileName }}
-          </p>
-        </div>
-      </mat-card-content>
-    </mat-card>
+      </mat-form-field>
+      <p *ngIf="selectedSchemaFileContent">
+        Loaded schema from: {{ schemaUrl }}
+      </p>
+    </div>
+  </mat-card-content>
+</mat-card>
   </div>
 
   <div
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index f8e584756e..a5a4252cc4 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -7,12 +7,7 @@
     mat-button matTooltip="Upload a template." [disabled]="activeStep < 1"
     (click)="onUpload()"><mat-icon
       class="control-button-icon">upload</mat-icon></button>
-  <button
-    *ngIf="this.createNewTransferData !== undefined && activeRenderView !== null"
-    mat-button (click)="onChangeViewMode()" [matTooltip]="activeRenderView === 'requiredOnly'
-    ? 'Show all fields.' : 'Show required fields only.'">
-    <mat-icon class="control-button-icon">filter_list</mat-icon>
-    {{ activeRenderView === 'requiredOnly' ? 'All Fields' : 'Required Only' }}</button>
+
   <button
     *ngIf="this.createNewTransferData !== undefined && this.createNewTransferData.editorMode !== 'CREATION'"
     mat-button [matMenuTriggerFor]="settingsMenu"
@@ -66,4 +61,13 @@
       <ng-template matStepLabel>Confirm inputs</ng-template>
     </mat-step>
   </mat-stepper>
-</div>
\ No newline at end of file
+</div>
+
+  <mat-slide-toggle
+    *ngIf="this.createNewTransferData !== undefined && activeRenderView !== null"
+    [checked]="activeRenderView === 'requiredOnly'"
+    (change)="onChangeViewMode()"
+    color="primary"
+  >
+    {{ activeRenderView === 'requiredOnly' ? 'Required Only' : 'All Fields' }}
+  </mat-slide-toggle>
\ No newline at end of file

From c7d03b01342c2c492ca0f40b19c775e5c3b2f338 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 28 Aug 2025 14:44:22 +0000
Subject: [PATCH 210/245] add some style changes

---
 src/app/app-config.service.ts                 |   2 +-
 ...stor.new-transfer-dialog-page.component.ts |  80 ++---
 .../ingestor.new-transfer-dialog-page.html    |   2 +-
 ...ingestor.creation-dialog-base.component.ts |  21 +-
 .../ingestor.dialog-stepper.component.css     |   8 +
 .../ingestor.dialog-stepper.component.html    |   7 +-
 ...r.transfer-detail-view-dialog.component.ts |  41 ++-
 .../customRenderer/array-renderer.ts          |  21 +-
 .../quantity-value-layout-renderer.ts         |   3 +-
 .../ingestor-metadata-editor.component.scss   | 334 +++++++++++++++++-
 .../ingestor-page/ingestor.component.ts       |   2 +-
 src/app/ingestor/ingestor.module.ts           |   2 +-
 .../effects/ingestor.effect.ts                |  16 +-
 13 files changed, 440 insertions(+), 99 deletions(-)

diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index 2e2226c71f..77acc84dff 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -163,7 +163,7 @@ function isMainPageConfiguration(obj: any): obj is MainPageConfiguration {
 export class AppConfigService {
   private appConfig: object = {};
 
-  constructor(private http: HttpClient) { }
+  constructor(private http: HttpClient) {}
 
   async loadAppConfig(): Promise<void> {
     try {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index faf323c4df..a643836a67 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -8,6 +8,7 @@ import {
   Output,
 } from "@angular/core";
 import { MatDialog } from "@angular/material/dialog";
+import Ajv, {JSONSchemaType} from "ajv"
 import { JsonSchema } from "@jsonforms/core";
 import {
   decodeBase64ToUTF8,
@@ -85,8 +86,10 @@ export class IngestorNewTransferDialogPageComponent
     scicat: true,
   };
 
-  constructor(private store: Store,
-    private cdr: ChangeDetectorRef,) {}
+  constructor(
+    private store: Store,
+    private cdr: ChangeDetectorRef,
+  ) {}
 
   ngOnInit() {
     // Fetch the API token that the ingestor can authenticate to scicat as the user
@@ -125,14 +128,14 @@ export class IngestorNewTransferDialogPageComponent
                   },
                 ),
               );
-            }else{
+            } else {
               this.scicatHeaderSchema = getJsonSchemaFromDto(true);
             }
           }
         }
       }),
     );
-    if (this.createNewTransferData.editorMode === "CREATION"){
+    if (this.createNewTransferData.editorMode === "CREATION") {
       this.subscriptions.push(
         this.renderView$.subscribe((renderView) => {
           if (renderView) {
@@ -261,7 +264,7 @@ export class IngestorNewTransferDialogPageComponent
     );
     this.generateExampleDataForSciCatHeader();
     this.prepareSchemaForProcessing();
-    this.nextStep.emit(); 
+    this.nextStep.emit();
   }
 
   onDataChangeUserScicatHeader(event: any) {
@@ -294,7 +297,8 @@ export class IngestorNewTransferDialogPageComponent
       this.createNewTransferData.editorMode === "EDITOR"
     ) {
       this.uiNextButtonReady = !!selectedPathReady && !!selectedMethodReady;
-    } else if (this.createNewTransferData.editorMode === "CREATION") { // user can proceed without the schema
+    } else if (this.createNewTransferData.editorMode === "CREATION") {
+      // user can proceed without the schema
       this.uiNextButtonReady = this.isSciCatHeaderOk;
     } else {
       this.uiNextButtonReady = false;
@@ -318,46 +322,38 @@ export class IngestorNewTransferDialogPageComponent
   }
 
   async onUploadSchema(): Promise<void> {
-  if (!this.schemaUrl) {
-    alert("Please enter a schema URL.");
-    return;
-  }
-  console.log("Fetching schema from URL:", this.schemaUrl);
-  let content: string;
-  let parsedJson: any;
-
-  try {
-    const response = await fetch(this.schemaUrl);
-    if (!response.ok) {
-      throw new Error(`Failed to fetch schema: ${response.statusText}`);
+    if (!this.schemaUrl) {
+      alert("Please enter a schema URL.");
+      return;
     }
-    content = await response.text();
+    console.log("Fetching schema from URL:", this.schemaUrl);
+    let content: string;
+    let parsedJson: any;
+    const ajv = new Ajv()
+
     try {
-      parsedJson = JSON.parse(content);
-    } catch (e) {
-      alert("The provided URL does not contain valid JSON.");
+      const response = await fetch(this.schemaUrl);
+      if (!response.ok) {
+        throw new Error(`Failed to fetch schema: ${response.statusText}`);
+      }
+      content = await response.text();
+      try {
+        parsedJson = JSON.parse(content);
+      } catch (e) {
+        alert("The provided URL does not contain valid JSON.");
+        return;
+      }
+    } catch (error: any) {
+      alert(`Error fetching schema: ${error.message}`);
       return;
     }
-  } catch (error: any) {
-    alert(`Error fetching schema: ${error.message}`);
-    return;
-  }
-
-  // If we reach here, we have valid JSON
-  const dialogRef = this.dialog.open(
-    IngestorConfirmationDialogComponent,
-    {
-      data: {
-        header: "Confirm template",
-        message: "Do you really want to apply the following values?",
-      },
-    },
-  );
-  dialogRef.afterClosed().subscribe((result) => {
-    if (result) {
-      this.selectedSchemaFileContent = content;
+    this.selectedSchemaFileContent = content;
+    const valid = ajv.compile(this.selectedSchemaFileContent as JSONSchemaType<any>);
+    if (!valid) {
+      this.schemaUrl = "";
+      this.selectedSchemaFileContent = "";
+    }else{
       this.validateNextButton();
     }
-  });
+  }
 }
-}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index 75f5bc1c0f..a1fa798664 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -66,7 +66,7 @@ <h2 *ngIf="createNewTransferData.editorMode !== 'CREATION'" mat-dialog-title>
 
       </mat-form-field>
       <p *ngIf="selectedSchemaFileContent">
-        Loaded schema from: {{ schemaUrl }}
+        Loaded schema is valid!
       </p>
     </div>
   </mat-card-content>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index 93e3dd1a16..ce00fcbc73 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -166,8 +166,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
             data.progress;
 
           if (data.result) {
-            this.createNewTransferDataApiInformation.extractorMetaDataReady =
-              true;
+            this.createNewTransferDataApiInformation.extractorMetaDataReady = true;
             const extractedScientificMetadata = JSON.parse(
               data.resultMessage,
             ) as ScientificMetadata;
@@ -183,10 +182,8 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
               }),
             );
           } else if (data.error) {
-            this.createNewTransferDataApiInformation.metaDataExtractionFailed =
-              true;
-            this.createNewTransferDataApiInformation.extractMetaDataRequested =
-              false;
+            this.createNewTransferDataApiInformation.metaDataExtractionFailed = true;
+            this.createNewTransferDataApiInformation.extractMetaDataRequested = false;
             this.createNewTransferDataApiInformation.extractorMetaDataStatus =
               data.message;
             this.createNewTransferDataApiInformation.extractorMetadataProgress =
@@ -202,10 +199,8 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
         },
         error: (error) => {
           console.error("Error receiving SSE data:", error);
-          this.createNewTransferDataApiInformation.metaDataExtractionFailed =
-            true;
-          this.createNewTransferDataApiInformation.extractMetaDataRequested =
-            false;
+          this.createNewTransferDataApiInformation.metaDataExtractionFailed = true;
+          this.createNewTransferDataApiInformation.extractMetaDataRequested = false;
 
           this.store.dispatch(
             fromActions.updateIngestionObjectAPIInformation({
@@ -227,8 +222,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
 
         // Reset metadata extractor
         this.sseService.disconnect();
-        this.createNewTransferDataApiInformation.extractMetaDataRequested =
-          false;
+        this.createNewTransferDataApiInformation.extractMetaDataRequested = false;
         this.createNewTransferDataApiInformation.extractorMetaDataReady = false;
         this.store.dispatch(
           fromActions.updateIngestionObjectAPIInformation({
@@ -246,8 +240,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
           this.createNewTransferData.editorMode === "EDITOR" ||
           this.createNewTransferData.editorMode === "CREATION"
         ) {
-          this.createNewTransferDataApiInformation.extractorMetaDataReady =
-            true;
+          this.createNewTransferDataApiInformation.extractorMetaDataReady = true;
           this.store.dispatch(
             fromActions.updateIngestionObjectAPIInformation({
               ingestionObjectApiInformation:
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css
index 215e47f1c4..901a576d10 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css
@@ -28,4 +28,12 @@
     width: 100%;
     text-align: center;
   }
+}
+.field-toggle {
+  margin-bottom: 24px;
+  display: block;
+  
+  mat-slide-toggle {
+    margin-bottom: 0;
+  }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index a5a4252cc4..34a0f3394a 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -63,11 +63,12 @@
   </mat-stepper>
 </div>
 
+<div class="field-toggle">
   <mat-slide-toggle
     *ngIf="this.createNewTransferData !== undefined && activeRenderView !== null"
     [checked]="activeRenderView === 'requiredOnly'"
     (change)="onChangeViewMode()"
-    color="primary"
-  >
+    color="primary">
     {{ activeRenderView === 'requiredOnly' ? 'Required Only' : 'All Fields' }}
-  </mat-slide-toggle>
\ No newline at end of file
+  </mat-slide-toggle>
+</div>
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
index 2705d4e67b..409ac71e8a 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
@@ -23,9 +23,9 @@ export class IngestorTransferViewDialogComponent implements OnInit, OnDestroy {
     private store: Store,
     public dialogRef: MatDialogRef<IngestorTransferViewDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any,
-  ) { }
+  ) {}
   // Define tables
-  displayedColumns: string[] = ['property', 'value'];
+  displayedColumns: string[] = ["property", "value"];
   tableData: { property: string; value: string }[] = [];
 
   ngOnInit() {
@@ -37,18 +37,35 @@ export class IngestorTransferViewDialogComponent implements OnInit, OnDestroy {
           );
 
           this.tableData = [
-            { property: 'Transfer ID', value: this.transferId },
-            ...(this.detailItem?.status !== undefined ? [{ property: 'Status', value: this.detailItem.status }] : []),
-            ...(this.detailItem?.message !== undefined ? [{ property: 'Message', value: this.detailItem.message }] : []),
-            ...(this.detailItem?.bytesTransferred !== undefined && this.detailItem?.bytesTotal !== undefined
+            { property: "Transfer ID", value: this.transferId },
+            ...(this.detailItem?.status !== undefined
+              ? [{ property: "Status", value: this.detailItem.status }]
+              : []),
+            ...(this.detailItem?.message !== undefined
+              ? [{ property: "Message", value: this.detailItem.message }]
+              : []),
+            ...(this.detailItem?.bytesTransferred !== undefined &&
+            this.detailItem?.bytesTotal !== undefined
+              ? [
+                  {
+                    property: "GB transferred",
+                    value: this.getByteTransferRelative(),
+                  },
+                  {
+                    property: "GB transferred (total)",
+                    value: this.getByteTransferTotal(),
+                  },
+                ]
+              : []),
+            ...(this.detailItem?.filesTransferred !== undefined &&
+            this.detailItem?.filesTotal !== undefined
               ? [
-                { property: 'GB transferred', value: this.getByteTransferRelative() },
-                { property: 'GB transferred (total)', value: this.getByteTransferTotal() }
-              ]
+                  {
+                    property: "Files transferred (total)",
+                    value: this.getFileTransferTotal(),
+                  },
+                ]
               : []),
-            ...(this.detailItem?.filesTransferred !== undefined && this.detailItem?.filesTotal !== undefined
-              ? [{ property: 'Files transferred (total)', value: this.getFileTransferTotal() }]
-              : [])
           ];
         }
       }),
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
index 77408f0c85..148273fbd6 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
@@ -1,4 +1,9 @@
-import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from "@angular/core";
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnDestroy,
+  OnInit,
+} from "@angular/core";
 import {
   JsonFormsAngularService,
   JsonFormsAbstractControl,
@@ -111,12 +116,14 @@ import {
     </mat-card>
   `,
   standalone: false,
+
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 // eslint-disable-next-line @angular-eslint/component-class-suffix
 export class ArrayLayoutRendererCustom
   extends JsonFormsAbstractControl<StatePropsOfArrayLayout>
-  implements OnInit, OnDestroy {
+  implements OnInit, OnDestroy
+{
   noData: boolean;
   minOne: boolean;
   translations: ArrayTranslations = {};
@@ -131,7 +138,9 @@ export class ArrayLayoutRendererCustom
   constructor(jsonFormsService: JsonFormsAngularService) {
     super(jsonFormsService);
   }
-  mapToProps(state: JsonFormsState): StatePropsOfArrayLayout & { translations: ArrayTranslations } {
+  mapToProps(
+    state: JsonFormsState,
+  ): StatePropsOfArrayLayout & { translations: ArrayTranslations } {
     const props = mapStateToArrayLayoutProps(state, this.getOwnProps());
     const t =
       state.jsonforms.i18n?.translate ?? defaultJsonFormsI18nState.translate;
@@ -139,7 +148,7 @@ export class ArrayLayoutRendererCustom
       t,
       arrayDefaultTranslations,
       props.i18nKeyPrefix,
-      props.label
+      props.label,
     );
     return { ...props, translations };
   }
@@ -169,7 +178,9 @@ export class ArrayLayoutRendererCustom
     this.moveItemDown = moveDown;
     this.removeItems = removeItems;
   }
-  mapAdditionalProps(props: ArrayLayoutProps & { translations: ArrayTranslations }) {
+  mapAdditionalProps(
+    props: ArrayLayoutProps & { translations: ArrayTranslations },
+  ) {
     this.translations = props.translations;
     this.noData = !props.data || props.data === 0;
     this.uischemas = props.uischemas;
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
index cf16b5b618..52b2049d12 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
@@ -38,6 +38,7 @@ import { LayoutRenderer } from "@jsonforms/angular-material";
   `,
   styleUrls: ["../ingestor-metadata-editor.component.scss"],
   standalone: false,
+
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class QuantityValueLayoutRendererComponent extends LayoutRenderer<QuantityValueLayout> {
@@ -57,7 +58,7 @@ export interface QuantityValueLayout extends Layout {
   type: "QuantityValueLayout";
 }
 
-@Pipe({ name: "customLayoutChildrenRenderProps", standalone: false })
+@Pipe({ name: "customLayoutChildrenRenderProps", standalone: false  })
 export class CustomLayoutChildrenRenderPropsPipe implements PipeTransform {
   transform(
     uischema: Layout,
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
index 24d6d7e942..bba36ff4ff 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -1,59 +1,373 @@
 .ingestor-metadata-editor {
   width: 100%;
+  font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
 }
 
 .spacer {
   flex: 1 1 auto;
 }
 
+// Modern glassmorphism card styling
 mat-card {
   .mat-mdc-card-title {
     display: flex;
-    padding: 16px;
+    padding: 24px;
+    font-weight: 700;
+    font-size: 1.2em;
+    background: linear-gradient(135deg, rgba(255,255,255,0.1), rgba(255,255,255,0.05));
+    backdrop-filter: blur(10px);
+    border: 1px solid rgba(255,255,255,0.18);
+    border-radius: 16px 16px 0 0;
+    color: #1a1a1a;
+    letter-spacing: -0.02em;
   }
 }
 
+// Modern form sections with subtle shadows and gradients
+.form-section {
+  margin-bottom: 32px;
+  padding: 32px;
+  background: linear-gradient(145deg, #ffffff, #f8fafc);
+  border-radius: 20px;
+  border: 1px solid rgba(226, 232, 240, 0.8);
+  box-shadow: 
+    0 1px 3px rgba(0, 0, 0, 0.05),
+    0 10px 30px rgba(0, 0, 0, 0.02);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  
+  &:hover {
+    transform: translateY(-2px);
+    box-shadow: 
+      0 4px 12px rgba(0, 0, 0, 0.08),
+      0 20px 40px rgba(0, 0, 0, 0.04);
+  }
+  
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+// Bold, modern section headers
+.section-header {
+  font-size: 1.25em;
+  font-weight: 800;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  background-clip: text;
+  margin-bottom: 24px;
+  padding-bottom: 12px;
+  border-bottom: 2px solid transparent;
+  border-image: linear-gradient(90deg, #667eea, #764ba2) 1;
+  letter-spacing: -0.03em;
+  
+  &.major-section {
+    font-size: 1.5em;
+    background: linear-gradient(135deg, #6366f1 0%, #8b5cf6 50%, #d946ef 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+    margin-bottom: 32px;
+  }
+}
+
+// Elevated field groups with modern aesthetics
+.field-group {
+  background: rgba(255, 255, 255, 0.7);
+  backdrop-filter: blur(20px);
+  border-radius: 16px;
+  padding: 24px;
+  margin-bottom: 20px;
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.04);
+  position: relative;
+  
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 3px;
+    background: linear-gradient(90deg, #6366f1, #8b5cf6, #d946ef);
+    border-radius: 16px 16px 0 0;
+  }
+  
+  &.related-fields {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+    gap: 20px;
+    align-items: start;
+  }
+}
+
+// Ultra-modern form controls
+.jsonforms-control {
+  margin-bottom: 24px;
+  
+  .mat-mdc-form-field {
+    width: 100%;
+    
+    .mat-mdc-text-field-wrapper {
+      border-radius: 12px;
+      background: rgba(255, 255, 255, 0.9);
+      backdrop-filter: blur(10px);
+      transition: all 0.3s ease;
+      
+      &:hover {
+        background: rgba(255, 255, 255, 0.95);
+        transform: translateY(-1px);
+      }
+    }
+    
+    &.mat-focused .mat-mdc-text-field-wrapper {
+      box-shadow: 
+        0 0 0 2px rgba(99, 102, 241, 0.2),
+        0 8px 25px rgba(99, 102, 241, 0.15);
+    }
+  }
+  
+  label {
+    font-weight: 600;
+    color: #374151;
+    margin-bottom: 8px;
+    display: block;
+    font-size: 0.95em;
+    letter-spacing: -0.01em;
+  }
+}
+
+// Modern grid layouts
+.two-column-fields {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+  gap: 24px;
+  margin-bottom: 24px;
+}
+
+// Subtle dividers and spacers
+.form-spacer {
+  height: 32px;
+}
+
+.form-divider {
+  height: 1px;
+  background: linear-gradient(90deg, transparent, #e5e7eb, transparent);
+  margin: 40px 0;
+  position: relative;
+  
+  &::after {
+    content: '';
+    position: absolute;
+    left: 50%;
+    top: -4px;
+    transform: translateX(-50%);
+    width: 8px;
+    height: 8px;
+    background: linear-gradient(135deg, #6366f1, #8b5cf6);
+    border-radius: 50%;
+  }
+}
+
+// Futuristic array layouts
 .array-layout {
   display: flex;
   flex-direction: column;
-  gap: 16px;
+  gap: 24px;
+  background: linear-gradient(145deg, #f8fafc, #f1f5f9);
+  border-radius: 20px;
+  padding: 24px;
+  border: 1px solid rgba(226, 232, 240, 0.6);
+  position: relative;
+  overflow: hidden;
+  
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 2px;
+    background: linear-gradient(90deg, transparent, #6366f1, transparent);
+    animation: shimmer 3s infinite;
+  }
 }
+
+@keyframes shimmer {
+  0% { left: -100%; }
+  100% { left: 100%; }
+}
+
 .array-layout > * {
   flex: 1 1 auto;
 }
+
 .array-layout-toolbar {
   display: flex;
   align-items: center;
+  padding-bottom: 16px;
+  border-bottom: 1px solid rgba(226, 232, 240, 0.6);
+  margin-bottom: 20px;
 }
+
 .array-layout-title {
   margin: 0;
+  font-weight: 700;
+  color: #1f2937;
+  font-size: 1.1em;
+  letter-spacing: -0.02em;
 }
+
 .array-layout-toolbar > span {
   flex: 1 1 auto;
 }
+
 .array-item {
-  padding: 16px;
+  padding: 24px;
+  background: rgba(255, 255, 255, 0.9);
+  backdrop-filter: blur(20px);
+  border-radius: 16px;
+  border: 1px solid rgba(255, 255, 255, 0.3);
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.06);
+  transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+  
+  &:hover {
+    transform: translateY(-4px) scale(1.02);
+    box-shadow: 0 20px 50px rgba(0, 0, 0, 0.1);
+  }
+}
+
+// Modern toggle styling
+.field-view-toggle {
+  margin-bottom: 32px;
+  display: block;
+  
+  .mat-slide-toggle-bar {
+    background: linear-gradient(135deg, #e5e7eb, #d1d5db);
+  }
+  
+  &.mat-checked .mat-slide-toggle-bar {
+    background: linear-gradient(135deg, #6366f1, #8b5cf6);
+  }
 }
+
+// Enhanced error styling
 ::ng-deep .error-message-tooltip {
   white-space: pre-line;
+  background: linear-gradient(135deg, #ef4444, #dc2626);
+  border-radius: 8px;
 }
 
+// Modern input styling
 .custom-input-box {
   width: 100%;
+  
+  .mat-mdc-form-field {
+    .mat-mdc-text-field-wrapper {
+      background: rgba(255, 255, 255, 0.8);
+      backdrop-filter: blur(10px);
+      border-radius: 12px;
+    }
+  }
 }
 
+// Futuristic quantity value boxes
 .quantity-value-box {
-  display: flex;
-  align-items: center;
-  gap: 0.5em;
-  flex-wrap: wrap;
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+  gap: 20px;
+  padding: 20px;
+  background: linear-gradient(145deg, rgba(255,255,255,0.9), rgba(248,250,252,0.9));
+  backdrop-filter: blur(20px);
+  border-radius: 16px;
+  border: 1px solid rgba(255, 255, 255, 0.3);
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.04);
 }
 
 .quantity-value-element {
-  flex: 1 1 calc(50% - 0.5em); /* Two elements per row with gap accounted for */
-  box-sizing: border-box;
+  transition: transform 0.3s ease;
+  
+  &:hover {
+    transform: scale(1.02);
+  }
 }
 
+// Modern tab styling
 .mat-tab-content-renderer {
-  margin-top: 0.5em;
+  margin-top: 20px;
+}
+
+// Cutting-edge step indicator
+.step-indicator {
+  margin-bottom: 32px;
+  text-align: center;
+  
+  .step-title {
+    font-size: 2em;
+    font-weight: 900;
+    background: linear-gradient(135deg, #1f2937 0%, #4f46e5 50%, #7c3aed 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+    margin-bottom: 12px;
+    letter-spacing: -0.04em;
+  }
+  
+  .step-description {
+    color: #6b7280;
+    font-size: 1em;
+    margin-bottom: 24px;
+    font-weight: 500;
+  }
+}
+
+// Dark mode support
+@media (prefers-color-scheme: dark) {
+  .form-section {
+    background: linear-gradient(145deg, #1f2937, #111827);
+    border-color: rgba(75, 85, 99, 0.3);
+    color: #f9fafb;
+  }
+  
+  .field-group {
+    background: rgba(17, 24, 39, 0.7);
+    border-color: rgba(75, 85, 99, 0.2);
+  }
+  
+  .jsonforms-control label {
+    color: #d1d5db;
+  }
+}
+
+// Responsive modern design
+@media (max-width: 768px) {
+  .form-section {
+    padding: 20px;
+    margin-bottom: 20px;
+    border-radius: 16px;
+  }
+  
+  .field-group.related-fields {
+    grid-template-columns: 1fr;
+  }
+  
+  .step-indicator .step-title {
+    font-size: 1.5em;
+  }
+}
+
+// Micro-animations for enhanced UX
+.jsonforms-control {
+  animation: fadeInUp 0.6s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+@keyframes fadeInUp {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index b24fea2c1f..00752517f2 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -25,7 +25,7 @@ export class IngestorComponent implements OnInit {
 
     if (mode === "transfer") {
       this.ingestorMode = "transfer";
-    } else{
+    } else {
       this.ingestorMode = "creation";
     }
   }
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index a6c6788205..6f35fb32d5 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -108,6 +108,6 @@ import { IngestorCustomMetadataDialogPageComponent } from "./ingestor-dialogs/cr
     EffectsModule.forFeature([IngestorEffects]),
     StoreModule.forFeature("ingestor", ingestorReducer),
   ],
-  exports: [IngestorMetadataEditorComponent, IngestorCreationComponent]
+  exports: [IngestorMetadataEditorComponent, IngestorCreationComponent],
 })
 export class IngestorModule {}
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effect.ts
index 230bb7397c..5c1db85788 100644
--- a/src/app/state-management/effects/ingestor.effect.ts
+++ b/src/app/state-management/effects/ingestor.effect.ts
@@ -201,17 +201,17 @@ export class IngestorEffects {
     );
   });
 
-  setLoadingBeforeIngestion$ = createEffect(() =>
-    this.actions$.pipe(
+  setLoadingBeforeIngestion$ = createEffect(() => {
+    return this.actions$.pipe(
       ofType(fromActions.ingestDataset),
       map(() =>
         fromActions.setIngestDatasetLoading({ ingestionDatasetLoading: true }),
       ),
-    ),
-  );
+    );
+  });
 
-  ingestDataset$ = createEffect(() =>
-    this.actions$.pipe(
+  ingestDataset$ = createEffect(() => {
+    return this.actions$.pipe(
       ofType(fromActions.ingestDataset),
       switchMap(({ ingestionDataset }) =>
         this.ingestor.startIngestion(ingestionDataset).pipe(
@@ -241,8 +241,8 @@ export class IngestorEffects {
           ),
         ),
       ),
-    ),
-  );
+    );
+  });
 
   ingestDatasetSuccess$ = createEffect(() => {
     return this.actions$.pipe(

From 422a258cc4d23991804f5c038071aba334f29920 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Wed, 3 Sep 2025 15:48:59 +0000
Subject: [PATCH 211/245] add updates to match onedep api field for coordinates

---
 src/app/datasets/depositor/onedep/onedep.component.ts   | 2 ++
 src/app/datasets/depositor/onedep/types/methods.enum.ts | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/app/datasets/depositor/onedep/onedep.component.ts b/src/app/datasets/depositor/onedep/onedep.component.ts
index 62cb106164..cd5b28819f 100644
--- a/src/app/datasets/depositor/onedep/onedep.component.ts
+++ b/src/app/datasets/depositor/onedep/onedep.component.ts
@@ -622,6 +622,7 @@ export class OneDepComponent implements OnChanges, OnDestroy {
         method: this.form.value.emMethod,
         jwtToken: this.form.value.jwtToken,
         password: this.form.value.password,
+        coordinates: this.form.value.deposingCoordinates === "true",
       };
     } else {
       body = {
@@ -630,6 +631,7 @@ export class OneDepComponent implements OnChanges, OnDestroy {
         country: "United States",
         method: this.form.value.emMethod,
         jwtToken: this.form.value.jwtToken,
+        coordinates: this.form.value.deposingCoordinates === "true",
       };
     }
     let metadataAdded = false;
diff --git a/src/app/datasets/depositor/onedep/types/methods.enum.ts b/src/app/datasets/depositor/onedep/types/methods.enum.ts
index 0ff45a1915..bc95ae9fe4 100644
--- a/src/app/datasets/depositor/onedep/types/methods.enum.ts
+++ b/src/app/datasets/depositor/onedep/types/methods.enum.ts
@@ -37,6 +37,7 @@ export interface OneDepUserInfo {
   method: string;
   jwtToken: string;
   password?: string;
+  coordinates:boolean;
 }
 
 export interface OneDepCreate {

From 50d34b84246a8660c4b895d2c47987603fec215b Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 4 Sep 2025 09:23:11 +0000
Subject: [PATCH 212/245] Merge remote-tracking branch 'origin/master' into
 rewireCreationMode

---
 .github/workflows/test.yml                    |   1 -
 .../e2e/datasets/datasets-attachment.cy.js    |   2 +-
 cypress/e2e/datasets/datasets-datafiles.cy.js |  14 +-
 .../datasets/datasets-detail-default.cy.js    |   2 +-
 .../datasets/datasets-detail-dynamic.cy.js    |   2 +-
 cypress/e2e/datasets/datasets-general.cy.js   | 141 +++++++---
 cypress/e2e/datasets/datasets-keyword.cy.js   |   4 +-
 cypress/e2e/datasets/datasets-metadata.cy.js  |  34 ++-
 cypress/e2e/datasets/datasets-public.cy.js    |   2 +-
 cypress/e2e/datasets/datasets-publish.cy.js   |   2 +-
 cypress/e2e/datasets/datasets-reduce.cy.js    |   2 +-
 cypress/e2e/datasets/datasets-share.cy.js     |   2 +-
 cypress/e2e/mainPage/main-page.cy.js          |  97 ++++---
 cypress/e2e/proposals/proposals-general.cy.js |   8 +-
 cypress/support/commands.js                   | 119 ++++----
 package-lock.json                             | 260 +++++++++---------
 .../dataset-detail.component.html             |   2 +
 .../dataset-detail.component.scss             |   4 +
 .../dataset-detail.component.ts               |   2 +-
 .../dataset-table.component.html              |   1 -
 .../dataset-table/dataset-table.component.ts  |   1 -
 .../datasets-filter.component.html            |  17 +-
 .../datasets-filter.component.scss            |   1 +
 .../datasets-filter.component.spec.ts         |   2 +-
 .../datasets-filter.component.ts              | 147 +++++++---
 .../files-dashboard.component.html            |   1 -
 .../instruments-dashboard.component.html      |   1 -
 .../proposal-dashboard.component.scss         |   3 +
 .../proposal-table.component.html             |   1 -
 .../proposal-table.component.ts               |   1 +
 .../related-proposals.component.html          |   1 -
 .../cores/table-data-source.ts                |  48 ++--
 .../cores/table.core.directive.ts             |  26 +-
 .../table/dynamic-mat-table.component.html    |  26 +-
 .../table/dynamic-mat-table.component.scss    |  14 +-
 .../table/dynamic-mat-table.component.ts      |  61 ++--
 .../table/dynamic-mat-table.style.scss        |   2 -
 .../filters/group-filter.component.html       |   2 +
 .../modules/filters/group-filter.component.ts |  15 +
 .../filters/keyword-filter.component.html     |   2 +
 .../filters/keyword-filter.component.ts       |  15 +
 .../filters/location-filter.component.html    |   2 +
 .../filters/location-filter.component.ts      |  16 ++
 .../filters/type-filter.component.html        |   2 +
 .../modules/filters/type-filter.component.ts  |  15 +
 .../search-parameters-dialog.component.html   |   3 +-
 .../search-parameters-dialog.component.scss   |   5 +
 .../search-parameters-dialog.component.ts     |   8 +-
 .../shared/services/units-options.service.ts  |  25 ++
 .../state-management/effects/user.effects.ts  |  29 +-
 src/app/state-management/models/index.ts      |   3 +-
 51 files changed, 725 insertions(+), 471 deletions(-)
 create mode 100644 src/app/shared/services/units-options.service.ts

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f77814b409..449c11b040 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -127,7 +127,6 @@ jobs:
         with:
           config-file: cypress.config.ts
           install-command: npm install --omit peer
-          
       - name: docker logs
         if: ${{ failure() }}
         run: |
diff --git a/cypress/e2e/datasets/datasets-attachment.cy.js b/cypress/e2e/datasets/datasets-attachment.cy.js
index be8d539ace..1e5a92d9ad 100644
--- a/cypress/e2e/datasets/datasets-attachment.cy.js
+++ b/cypress/e2e/datasets/datasets-attachment.cy.js
@@ -13,7 +13,7 @@ describe("Dataset attachments", () => {
 
   describe("Attachment tests", () => {
     it("should go to dataset details and add an attachment using the dropzone", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
       cy.visit("/datasets");
 
       cy.get(".dataset-table mat-table mat-header-row").should("exist");
diff --git a/cypress/e2e/datasets/datasets-datafiles.cy.js b/cypress/e2e/datasets/datasets-datafiles.cy.js
index c7da8aa8fc..c81cbaaaff 100644
--- a/cypress/e2e/datasets/datasets-datafiles.cy.js
+++ b/cypress/e2e/datasets/datasets-datafiles.cy.js
@@ -25,12 +25,7 @@ describe("Dataset datafiles", () => {
       notebookAll: "http://localhost:4200/notebook/all",
     };
     it("Should be able to download/notebook with selected/all", () => {
-      cy.createDataset(
-        "raw",
-        testData.rawDataset.datasetName,
-        undefined,
-        "small",
-      );
+      cy.createDataset({ type: "raw", dataFileSize: "small" });
 
       cy.visit("/datasets");
 
@@ -81,12 +76,7 @@ describe("Dataset datafiles", () => {
     });
 
     it("Should not be able to download selected/all file that is exceeding size limit", () => {
-      cy.createDataset(
-        "raw",
-        testData.rawDataset.datasetName,
-        undefined,
-        "large",
-      );
+      cy.createDataset({ type: "raw", dataFileSize: "large" });
 
       cy.visit("/datasets");
 
diff --git a/cypress/e2e/datasets/datasets-detail-default.cy.js b/cypress/e2e/datasets/datasets-detail-default.cy.js
index 563a68cd90..f7bbef51c6 100644
--- a/cypress/e2e/datasets/datasets-detail-default.cy.js
+++ b/cypress/e2e/datasets/datasets-detail-default.cy.js
@@ -13,7 +13,7 @@ describe("Datasets Detail View Default", () => {
     });
 
     cy.login(Cypress.env("username"), Cypress.env("password"));
-    cy.createDataset("raw");
+    cy.createDataset({ type: "raw" });
     cy.visit("/datasets");
     cy.wait("@getFrontendConfig");
   });
diff --git a/cypress/e2e/datasets/datasets-detail-dynamic.cy.js b/cypress/e2e/datasets/datasets-detail-dynamic.cy.js
index 093e731c34..d016b848b3 100644
--- a/cypress/e2e/datasets/datasets-detail-dynamic.cy.js
+++ b/cypress/e2e/datasets/datasets-detail-dynamic.cy.js
@@ -17,7 +17,7 @@ describe("Datasets Detail View Dynamic", () => {
     });
 
     cy.login(Cypress.env("username"), Cypress.env("password"));
-    cy.createDataset("raw");
+    cy.createDataset({ type: "raw" });
     cy.visit("/datasets");
     cy.wait("@getFrontendConfig");
   });
diff --git a/cypress/e2e/datasets/datasets-general.cy.js b/cypress/e2e/datasets/datasets-general.cy.js
index 8ddddc10dd..47c0cd1d34 100644
--- a/cypress/e2e/datasets/datasets-general.cy.js
+++ b/cypress/e2e/datasets/datasets-general.cy.js
@@ -5,7 +5,7 @@ describe("Datasets general", () => {
     cy.login(Cypress.env("username"), Cypress.env("password"));
   });
 
-  after(() => {
+  afterEach(() => {
     cy.removeDatasets();
   });
 
@@ -14,7 +14,7 @@ describe("Datasets general", () => {
       const username = Cypress.env("username");
       const password = Cypress.env("password");
 
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -60,17 +60,17 @@ describe("Datasets general", () => {
 
       cy.get("mat-row").contains("Cypress Dataset").click();
     });
-    afterEach(() => {
-      cy.removeDatasets();
-    });
   });
 
   describe("Proposal connection and link from dataset details", () => {
     it("should be able to see and click proposal connection link from dataset details page", () => {
       const proposalId = Math.floor(100000 + Math.random() * 900000).toString();
       cy.createProposal({ ...testData.proposal, proposalId });
-      cy.createDataset("raw", undefined, proposalId);
-
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        proposalId,
+      });
       cy.visit("/datasets");
 
       cy.get(".dataset-table mat-table mat-header-row").should("exist");
@@ -99,25 +99,18 @@ describe("Datasets general", () => {
 
       cy.deleteProposal(proposalId);
     });
-    afterEach(() => {
-      cy.removeDatasets();
-    });
   });
 
   describe("Dataset page filter and scientific condition UI test", () => {
     beforeEach(() => {
-      cy.createDataset(
-        "raw",
-        testData.rawDataset.datasetName,
-        undefined,
-        "small",
-        {
-          scientificMetadata: {
-            extra_entry_end_time: { type: "number", value: 2, unit: "" },
-          },
-          isPublished: true,
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        scientificMetadata: {
+          extra_entry_end_time: { type: "number", value: 2, unit: "" },
         },
-      );
+        isPublished: true,
+      });
     });
 
     it("should not be able to add duplicated conditions ", () => {
@@ -146,8 +139,8 @@ describe("Datasets general", () => {
         .within(() => {
           cy.get("mat-select").click();
         });
-      
-      cy.get('mat-option').contains('>').click();
+
+      cy.get("mat-option").contains(">").click();
 
       cy.get(".condition-panel")
         .first()
@@ -197,7 +190,7 @@ describe("Datasets general", () => {
           cy.get("mat-select").click();
         });
 
-      cy.get("mat-option").contains('<').click();
+      cy.get("mat-option").contains("<").click();
 
       // change value
       cy.get(".condition-panel")
@@ -214,14 +207,85 @@ describe("Datasets general", () => {
       cy.get("mat-slide-toggle").click();
 
       // remove the condition
-      cy.get("button").contains("Remove").click();
+      cy.get('[data-cy="remove-condition-button"]').click();
 
       cy.get('[data-cy="scientific-condition-filter-list"]')
         .find(".condition-panel")
         .should("have.length", 0);
     });
-    afterEach(() => {
-      cy.removeDatasets();
+  });
+
+  describe("Units options in condition panel units dropdown", () => {
+    beforeEach(() => {
+      cy.login(Cypress.env("username"), Cypress.env("password"));
+      cy.createDataset({
+        type: "raw",
+        datasetName: testData.rawDataset.datasetName,
+        dataFileSize: "small",
+
+        scientificMetadata: {
+          outgassing_values_after_1h: {
+            type: "quantity",
+            value: 2,
+            unit: "mbar l/s/cm^2",
+          },
+        },
+        isPublished: true,
+      }).then(() => {
+        cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
+          const testConfig = {
+            ...baseConfig,
+            defaultDatasetsListSettings: {
+              ...baseConfig.defaultDatasetsListSettings,
+              conditions: [
+                {
+                  condition: {
+                    lhs: "outgassing_values_after_1h",
+                    relation: "GREATER_THAN",
+                    rhs: 1,
+                    unit: "",
+                    unitsOptions: [
+                      "mbar l/s/cm^2",
+                      "Pa m^3/s/m^2",
+                      "bar m^3/s/m^2",
+                    ],
+                  },
+                  enabled: false,
+                },
+              ],
+            },
+          };
+
+          cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
+          cy.visit("/datasets");
+          cy.wait("@getConfig", { timeout: 20000 });
+          cy.finishedLoading();
+        });
+      });
+    });
+
+    it("should display limited options in units dropdown", () => {
+      cy.get(".condition-panel").first().click();
+
+      cy.get(".condition-panel")
+        .first()
+        .within(() => {
+          cy.get("input[matInput]").last().click();
+        });
+
+      cy.get("mat-option").eq(0).should("contain.text", "mbar l/s/cm^2");
+      cy.get("mat-option").eq(1).should("contain.text", "Pa m^3/s/m^2");
+      cy.get("mat-option").eq(2).should("contain.text", "bar m^3/s/m^2");
+
+      cy.get("mat-option").eq(0).click();
+
+      cy.get("mat-slide-toggle").click();
+
+      cy.get('[data-cy="search-button"]').click();
+
+      cy.get(".condition-panel").first().click();
+
+      cy.get('[data-cy="remove-condition-button"]').click();
     });
   });
 
@@ -258,18 +322,14 @@ describe("Datasets general", () => {
   describe("Pre-configured conditions test", () => {
     beforeEach(() => {
       cy.login(Cypress.env("username"), Cypress.env("password"));
-      cy.createDataset(
-        "raw",
-        testData.rawDataset.datasetName,
-        undefined,
-        "small",
-        {
-          scientificMetadata: {
-            extra_entry_end_time: { type: "number", value: 2, unit: "" },
-          },
-          isPublished: true,
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        scientificMetadata: {
+          extra_entry_end_time: { type: "number", value: 2, unit: "" },
         },
-      ).then(() => {
+        isPublished: true,
+      }).then(() => {
         cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
           const relationsToTest = [
             { relation: "GREATER_THAN", rhs: 1 },
@@ -304,7 +364,7 @@ describe("Datasets general", () => {
     });
 
     it("should check if pre-configured conditions are applied", () => {
-      cy.scrollTo('bottom');
+      cy.scrollTo("bottom");
       cy.get('[data-cy="scientific-condition-filter-list"] .condition-panel')
         .should("contain.text", "extra_entry_end_time")
         .and("contain.text", ">")
@@ -330,7 +390,4 @@ describe("Datasets general", () => {
       });
     });
   });
-  afterEach(() => {
-      cy.removeDatasets();
-    });
 });
diff --git a/cypress/e2e/datasets/datasets-keyword.cy.js b/cypress/e2e/datasets/datasets-keyword.cy.js
index 9e3e360f66..ff89541da9 100644
--- a/cypress/e2e/datasets/datasets-keyword.cy.js
+++ b/cypress/e2e/datasets/datasets-keyword.cy.js
@@ -14,7 +14,7 @@ describe("Datasets", () => {
     it("should be able to edit dataset details", () => {
       const newName = "Test changing dataset name";
       const newDescription = "Test changing dataset description";
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -53,7 +53,7 @@ describe("Datasets", () => {
         .should("contain.text", newDescription);
     });
     it("should go to dataset details and add a keyword", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
diff --git a/cypress/e2e/datasets/datasets-metadata.cy.js b/cypress/e2e/datasets/datasets-metadata.cy.js
index 64cb62233c..57d5c8a5fc 100644
--- a/cypress/e2e/datasets/datasets-metadata.cy.js
+++ b/cypress/e2e/datasets/datasets-metadata.cy.js
@@ -22,7 +22,7 @@ describe("Datasets", () => {
 
   describe("Add metadata item", () => {
     it("should go to dataset details and add a metadata entry", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -89,7 +89,7 @@ describe("Datasets", () => {
     });
 
     it("should not be able to create a metadata with duplicate name", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -159,7 +159,7 @@ describe("Datasets", () => {
     });
 
     it("should not be able to edit the existing metadata with a duplicate name", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -238,7 +238,7 @@ describe("Datasets", () => {
     });
 
     it("should show warning icon in the edit and view table if the metadata unit is invalid or cannot be converted", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -333,7 +333,7 @@ describe("Datasets", () => {
     });
 
     it("added metadata entry should be visible from the Scientific Metadata(JSON) table", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
@@ -410,7 +410,11 @@ describe("Datasets", () => {
         human_name: "Date test",
         type: "date",
       };
-      cy.createDataset("raw", newMetadataName);
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        datasetName: newMetadataName,
+      });
 
       cy.visit("/datasets");
 
@@ -488,7 +492,11 @@ describe("Datasets", () => {
         human_name: "Link test",
         type: "link",
       };
-      cy.createDataset("raw", newMetadataName);
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        datasetName: newMetadataName,
+      });
 
       cy.visit("/datasets");
 
@@ -566,7 +574,11 @@ describe("Datasets", () => {
         human_name: "Number range test",
         type: "number_range",
       };
-      cy.createDataset("raw", newMetadataName);
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        datasetName: newMetadataName,
+      });
 
       cy.visit("/datasets");
 
@@ -647,7 +659,11 @@ describe("Datasets", () => {
         valueSI: "0.01,0.02",
         unitSI: "m",
       };
-      cy.createDataset("raw", newMetadataName);
+      cy.createDataset({
+        type: "raw",
+        dataFileSize: "small",
+        datasetName: newMetadataName,
+      });
 
       cy.visit("/datasets");
 
diff --git a/cypress/e2e/datasets/datasets-public.cy.js b/cypress/e2e/datasets/datasets-public.cy.js
index 98bb2608b8..a8a73d0ea9 100644
--- a/cypress/e2e/datasets/datasets-public.cy.js
+++ b/cypress/e2e/datasets/datasets-public.cy.js
@@ -2,7 +2,7 @@ describe("Datasets", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));
 
-    cy.createDataset("raw");
+    cy.createDataset({ type: "raw" });
 
     cy.intercept("PATCH", "/api/v3/datasets/**/*").as("change");
     cy.intercept("GET", "*").as("fetch");
diff --git a/cypress/e2e/datasets/datasets-publish.cy.js b/cypress/e2e/datasets/datasets-publish.cy.js
index 59432e5a88..4e7857b950 100644
--- a/cypress/e2e/datasets/datasets-publish.cy.js
+++ b/cypress/e2e/datasets/datasets-publish.cy.js
@@ -9,7 +9,7 @@ describe("Datasets", () => {
 
   describe("Add item to cart and publish", () => {
     it("should add dataset to cart", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
diff --git a/cypress/e2e/datasets/datasets-reduce.cy.js b/cypress/e2e/datasets/datasets-reduce.cy.js
index 06725d804f..3b86f7e83d 100644
--- a/cypress/e2e/datasets/datasets-reduce.cy.js
+++ b/cypress/e2e/datasets/datasets-reduce.cy.js
@@ -12,7 +12,7 @@ describe("Datasets", () => {
 
   describe("Reduce dataset", () => {
     it("should go to dataset details reduce tab and step through the workflow", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
diff --git a/cypress/e2e/datasets/datasets-share.cy.js b/cypress/e2e/datasets/datasets-share.cy.js
index 925061fb2e..443f3435b9 100644
--- a/cypress/e2e/datasets/datasets-share.cy.js
+++ b/cypress/e2e/datasets/datasets-share.cy.js
@@ -9,7 +9,7 @@ describe("Datasets", () => {
 
   describe("Add item to cart and publish", () => {
     it("should add dataset to cart, share it with another user and remove the share", () => {
-      cy.createDataset("raw");
+      cy.createDataset({ type: "raw" });
 
       cy.visit("/datasets");
 
diff --git a/cypress/e2e/mainPage/main-page.cy.js b/cypress/e2e/mainPage/main-page.cy.js
index 2099551d8c..a043583679 100644
--- a/cypress/e2e/mainPage/main-page.cy.js
+++ b/cypress/e2e/mainPage/main-page.cy.js
@@ -3,24 +3,20 @@ import { testData } from "../../fixtures/testData";
 describe("Main Page", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));
-    cy.createDataset(
-      "raw",
-      "Main Page Dataset Public",
-      "20150729",
-      "small",
-      {
-        isPublished: true,
-      },
-    );
-    cy.createDataset(
-      "raw",
-      "Main Page Dataset Non Public",
-      "20150729",
-      "small",
-      {
-        isPublished: true,
-      },
-    );
+    cy.createDataset({
+      type: "raw",
+      dataFileSize: "small",
+      datasetName: "Main Page Dataset Public",
+      proposalId: "20150729",
+      isPublished: true,
+    });
+    cy.createDataset({
+      type: "raw",
+      dataFileSize: "small",
+      datasetName: "Main Page Dataset Non Public",
+      proposalId: "20150729",
+      isPublished: true,
+    });
   });
 
   after(() => {
@@ -30,7 +26,7 @@ describe("Main Page", () => {
   describe("Main page configuration as non authenticated user", () => {
     it("should visit main page correctly configured", () => {
       const username = Cypress.env("username");
-      
+
       cy.visit("/");
       cy.finishedLoading();
 
@@ -43,18 +39,29 @@ describe("Main Page", () => {
 
       cy.finishedLoading();
 
-      cy.get("breadcrumb > div > span > a").should('contain', "Datasets");
-
-      cy.get("div.header mat-toolbar.mat-toolbar.mat-elevation-z1.mat-primary.mat-toolbar-single-row a").eq(0).should('have.attr','href','/datasets');
-      cy.get("div.header mat-toolbar.mat-toolbar.mat-elevation-z1.mat-primary.mat-toolbar-single-row a").eq(1).should('have.attr','href','https://my.facility.site');
-
-      cy.get("div.main-menu").click()
-
-      cy.get('button.mat-mdc-menu-item:nth-child(1) > span:nth-child(2) > span:nth-child(1)').should('contain','Datasets')
-      cy.get('button.mat-mdc-menu-item:nth-child(4) > span:nth-child(2) > span:nth-child(1)').should('contain','Published Data')
-
-      cy.get('[data-cy="login-button"]').should('exist');
-
+      cy.get("breadcrumb > div > span > a").should("contain", "Datasets");
+
+      cy.get(
+        "div.header mat-toolbar.mat-toolbar.mat-elevation-z1.mat-primary.mat-toolbar-single-row a",
+      )
+        .eq(0)
+        .should("have.attr", "href", "/datasets");
+      cy.get(
+        "div.header mat-toolbar.mat-toolbar.mat-elevation-z1.mat-primary.mat-toolbar-single-row a",
+      )
+        .eq(1)
+        .should("have.attr", "href", "https://my.facility.site");
+
+      cy.get("div.main-menu").click();
+
+      cy.get(
+        "button.mat-mdc-menu-item:nth-child(1) > span:nth-child(2) > span:nth-child(1)",
+      ).should("contain", "Datasets");
+      cy.get(
+        "button.mat-mdc-menu-item:nth-child(4) > span:nth-child(2) > span:nth-child(1)",
+      ).should("contain", "Published Data");
+
+      cy.get('[data-cy="login-button"]').should("exist");
     });
   });
 
@@ -68,21 +75,29 @@ describe("Main Page", () => {
 
       cy.url().should("include", "/proposals");
 
-      cy.get("breadcrumb > div > span > a").should('contain', "Proposals");
+      cy.get("breadcrumb > div > span > a").should("contain", "Proposals");
 
-      cy.get("div.header mat-toolbar.mat-toolbar.mat-elevation-z1.mat-primary.mat-toolbar-single-row a").eq(0).should('have.attr','href','/proposals');
-      cy.get("div.header mat-toolbar.mat-toolbar.mat-elevation-z1.mat-primary.mat-toolbar-single-row a").eq(1).should('have.attr','href','https://my.facility.site');
+      cy.get(
+        "div.header mat-toolbar.mat-toolbar.mat-elevation-z1.mat-primary.mat-toolbar-single-row a",
+      )
+        .eq(0)
+        .should("have.attr", "href", "/proposals");
+      cy.get(
+        "div.header mat-toolbar.mat-toolbar.mat-elevation-z1.mat-primary.mat-toolbar-single-row a",
+      )
+        .eq(1)
+        .should("have.attr", "href", "https://my.facility.site");
 
-      cy.get("div.main-menu").click()
+      cy.get("div.main-menu").click();
 
-      cy.get('button.mat-mdc-menu-item:nth-child(2) > span:nth-child(2) > span:nth-child(1)').should('contain','Files')
+      cy.get(
+        "button.mat-mdc-menu-item:nth-child(2) > span:nth-child(2) > span:nth-child(1)",
+      ).should("contain", "Files");
 
-      cy.get("div.main-menu").click()
-
-      cy.get('[data-cy="login-button"]').should('not.exist');
-      cy.get('.user-button').should('exist');
+      cy.get("div.main-menu").click();
 
+      cy.get('[data-cy="login-button"]').should("not.exist");
+      cy.get(".user-button").should("exist");
     });
   });
-
 });
diff --git a/cypress/e2e/proposals/proposals-general.cy.js b/cypress/e2e/proposals/proposals-general.cy.js
index 1e34a23ce6..9ad075e9b6 100644
--- a/cypress/e2e/proposals/proposals-general.cy.js
+++ b/cypress/e2e/proposals/proposals-general.cy.js
@@ -412,7 +412,7 @@ describe("Proposals general", () => {
         defaultPageSize,
       );
 
-      cy.get("mat-paginator mat-select").click({ force: true });
+      cy.get("mat-paginator").first().find("mat-select").click({ force: true });
       cy.get("mat-option").contains(newPageSize).click({ force: true });
 
       cy.reload();
@@ -425,7 +425,7 @@ describe("Proposals general", () => {
         `1 – ${newPageSize}`,
       );
 
-      cy.get("mat-paginator [aria-label='Next page']").click();
+      cy.get("mat-paginator").first().find("[aria-label='Next page']").click();
 
       cy.get("mat-paginator .mat-mdc-paginator-range-actions").should(
         "not.contain",
@@ -548,7 +548,7 @@ describe("Proposals general", () => {
 
       cy.visit("/proposals");
 
-      cy.get("mat-paginator mat-select").click({ force: true });
+      cy.get("mat-paginator").first().find("mat-select").click({ force: true });
       cy.get("mat-option").contains("25").click({ force: true });
 
       cy.get("dynamic-mat-table table-menu button").click();
@@ -584,7 +584,7 @@ describe("Proposals general", () => {
 
       cy.visit("/proposals");
 
-      cy.get("mat-paginator mat-select").click({ force: true });
+      cy.get("mat-paginator").first().find("mat-select").click({ force: true });
       cy.get("mat-option").contains("25").click({ force: true });
 
       cy.get("dynamic-mat-table table-menu button").click();
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index fbfa210f41..fe83913f91 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -106,80 +106,71 @@ Cypress.Commands.add("isLoading", (type) => {
   cy.get('[data-cy="spinner"]').should("not.exist");
 });
 
-Cypress.Commands.add(
-  "createDataset",
-  (
-    type,
-    datasetName = testData.rawDataset.datasetName,
-    proposalId = "20170266",
-    dataFileSize = "small",
-    overrides = {}
-  ) => {
-    cy.getCookie("user").then((userCookie) => {
-      const user = JSON.parse(decodeURIComponent(userCookie.value));
+Cypress.Commands.add("createDataset", (overwrites = {}) => {
+  const { type = "raw", dataFileSize = "small", ...rest } = overwrites;
 
-      cy.getToken().then((token) => {
-        if (type === "raw") {
-          const dataset = { 
-            ...testData.rawDataset, 
-            datasetName, 
-            proposalId,
-            ...overrides,
-          };
-          cy.log("Raw Dataset 1: " + JSON.stringify(dataset, null, 2));
-          cy.log("User: " + JSON.stringify(user, null, 2));
+  cy.getCookie("user").then((userCookie) => {
+    const user = JSON.parse(decodeURIComponent(userCookie.value));
 
-          cy.request({
-            method: "POST",
-            url: lbBaseUrl + "/datasets",
-            headers: {
-              Authorization: token,
-              Accept: "application/json",
-              "Content-Type": "application/json",
-            },
-            body: dataset,
-          }).then((response) => {
-            const origDataBlock =
-              dataFileSize === "small"
-                ? testData.origDataBlockSmall
-                : testData.origDataBlockLarge;
-            origDataBlock.datasetId = response.body.pid;
-
-            cy.request({
-              method: "POST",
-              url: lbBaseUrl + `/OrigDatablocks`,
-              headers: {
-                Authorization: token,
-                Accept: "application/json",
-                "Content-Type": "application/json",
-              },
-              body: origDataBlock,
-            });
-          });
-        } else if (type === "derived") {
-          const dataset = testData.derivedDataset;
-          dataset.investigator = user.email;
-          dataset.owner = user.username;
-          dataset.ownerEmail = user.email;
-          dataset.contactEmail = user.email;
-          dataset.createdBy = user.username;
-          dataset.updatedBy = user.username;
+    cy.getToken().then((token) => {
+      if (type === "raw") {
+        const dataset = {
+          ...testData.rawDataset,
+          ...rest,
+        };
+        cy.log("Raw Dataset 1: " + JSON.stringify(dataset, null, 2));
+        cy.log("User: " + JSON.stringify(user, null, 2));
+
+        cy.request({
+          method: "POST",
+          url: lbBaseUrl + "/datasets",
+          headers: {
+            Authorization: token,
+            Accept: "application/json",
+            "Content-Type": "application/json",
+          },
+          body: dataset,
+        }).then((response) => {
+          const origDataBlock =
+            dataFileSize === "small"
+              ? testData.origDataBlockSmall
+              : testData.origDataBlockLarge;
+          origDataBlock.datasetId = response.body.pid;
 
           cy.request({
             method: "POST",
-            url: lbBaseUrl + "/datasets",
+            url: lbBaseUrl + `/OrigDatablocks`,
             headers: {
               Authorization: token,
               Accept: "application/json",
               "Content-Type": "application/json",
             },
-            body: dataset,
+            body: origDataBlock,
           });
-        }
-      });
+        });
+      } else if (type === "derived") {
+        const dataset = { ...testData.derivedDataset, ...rest };
+        dataset.investigator = user.email;
+        dataset.owner = user.username;
+        dataset.ownerEmail = user.email;
+        dataset.contactEmail = user.email;
+        dataset.createdBy = user.username;
+        dataset.updatedBy = user.username;
+
+        cy.request({
+          method: "POST",
+          url: lbBaseUrl + "/datasets",
+          headers: {
+            Authorization: token,
+            Accept: "application/json",
+            "Content-Type": "application/json",
+          },
+          body: dataset,
+        });
+      }
     });
-  },
-);
+  });
+});
 Cypress.Commands.add("createProposal", (proposal) => {
   return cy.getCookie("user").then((userCookie) => {
     const user = JSON.parse(decodeURIComponent(userCookie.value));
@@ -368,9 +359,7 @@ Cypress.Commands.add("removeInstruments", () => {
           cy.request({
             method: "DELETE",
             url:
-              lbBaseUrl +
-              "/instruments/" +
-              encodeURIComponent(instrument.pid),
+              lbBaseUrl + "/instruments/" + encodeURIComponent(instrument.pid),
             headers: {
               Authorization: token,
               Accept: "application/json",
diff --git a/package-lock.json b/package-lock.json
index 3002ff0d75..9cd12049e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3488,10 +3488,11 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.33.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz",
-      "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
+      "version": "9.34.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz",
+      "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -6336,17 +6337,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.40.0.tgz",
-      "integrity": "sha512-w/EboPlBwnmOBtRbiOvzjD+wdiZdgFeo17lkltrtn7X37vagKKWJABvyfsJXTlHe6XBzugmYgd4A4nW+k8Mixw==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.41.0.tgz",
+      "integrity": "sha512-8fz6oa6wEKZrhXWro/S3n2eRJqlRcIa6SlDh59FXJ5Wp5XRZ8B9ixpJDcjadHq47hMx0u+HW6SNa6LjJQ6NLtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.40.0",
-        "@typescript-eslint/type-utils": "8.40.0",
-        "@typescript-eslint/utils": "8.40.0",
-        "@typescript-eslint/visitor-keys": "8.40.0",
+        "@typescript-eslint/scope-manager": "8.41.0",
+        "@typescript-eslint/type-utils": "8.41.0",
+        "@typescript-eslint/utils": "8.41.0",
+        "@typescript-eslint/visitor-keys": "8.41.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -6360,20 +6361,20 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0",
+        "@typescript-eslint/parser": "^8.41.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/project-service": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.40.0.tgz",
-      "integrity": "sha512-/A89vz7Wf5DEXsGVvcGdYKbVM9F7DyFXj52lNYUDS1L9yJfqjW/fIp5PgMuEJL/KeqVTe2QSbXAGUZljDUpArw==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
+      "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.40.0",
-        "@typescript-eslint/types": "^8.40.0",
+        "@typescript-eslint/tsconfig-utils": "^8.41.0",
+        "@typescript-eslint/types": "^8.41.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6388,14 +6389,14 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.40.0.tgz",
-      "integrity": "sha512-y9ObStCcdCiZKzwqsE8CcpyuVMwRouJbbSrNuThDpv16dFAj429IkM6LNb1dZ2m7hK5fHyzNcErZf7CEeKXR4w==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
+      "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.40.0",
-        "@typescript-eslint/visitor-keys": "8.40.0"
+        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/visitor-keys": "8.41.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6406,9 +6407,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.40.0.tgz",
-      "integrity": "sha512-jtMytmUaG9d/9kqSl/W3E3xaWESo4hFDxAIHGVW/WKKtQhesnRIJSAJO6XckluuJ6KDB5woD1EiqknriCtAmcw==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
+      "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6423,9 +6424,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.40.0.tgz",
-      "integrity": "sha512-ETdbFlgbAmXHyFPwqUIYrfc12ArvpBhEVgGAxVYSwli26dn8Ko+lIo4Su9vI9ykTZdJn+vJprs/0eZU0YMAEQg==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
+      "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6437,16 +6438,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.40.0.tgz",
-      "integrity": "sha512-k1z9+GJReVVOkc1WfVKs1vBrR5MIKKbdAjDTPvIK3L8De6KbFfPFt6BKpdkdk7rZS2GtC/m6yI5MYX+UsuvVYQ==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
+      "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.40.0",
-        "@typescript-eslint/tsconfig-utils": "8.40.0",
-        "@typescript-eslint/types": "8.40.0",
-        "@typescript-eslint/visitor-keys": "8.40.0",
+        "@typescript-eslint/project-service": "8.41.0",
+        "@typescript-eslint/tsconfig-utils": "8.41.0",
+        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/visitor-keys": "8.41.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -6466,16 +6467,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.40.0.tgz",
-      "integrity": "sha512-Cgzi2MXSZyAUOY+BFwGs17s7ad/7L+gKt6Y8rAVVWS+7o6wrjeFN4nVfTpbE25MNcxyJ+iYUXflbs2xR9h4UBg==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz",
+      "integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.40.0",
-        "@typescript-eslint/types": "8.40.0",
-        "@typescript-eslint/typescript-estree": "8.40.0"
+        "@typescript-eslint/scope-manager": "8.41.0",
+        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/typescript-estree": "8.41.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6490,13 +6491,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.40.0.tgz",
-      "integrity": "sha512-8CZ47QwalyRjsypfwnbI3hKy5gJDPmrkLjkgMxhi0+DZZ2QNx2naS6/hWoVYUHU7LU2zleF68V9miaVZvhFfTA==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
+      "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.40.0",
+        "@typescript-eslint/types": "8.41.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -6537,16 +6538,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.40.0.tgz",
-      "integrity": "sha512-jCNyAuXx8dr5KJMkecGmZ8KI61KBUhkCob+SD+C+I5+Y1FWI2Y3QmY4/cxMCC5WAsZqoEtEETVhUiUMIGCf6Bw==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.41.0.tgz",
+      "integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.40.0",
-        "@typescript-eslint/types": "8.40.0",
-        "@typescript-eslint/typescript-estree": "8.40.0",
-        "@typescript-eslint/visitor-keys": "8.40.0",
+        "@typescript-eslint/scope-manager": "8.41.0",
+        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/typescript-estree": "8.41.0",
+        "@typescript-eslint/visitor-keys": "8.41.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6562,14 +6563,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.40.0.tgz",
-      "integrity": "sha512-/A89vz7Wf5DEXsGVvcGdYKbVM9F7DyFXj52lNYUDS1L9yJfqjW/fIp5PgMuEJL/KeqVTe2QSbXAGUZljDUpArw==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
+      "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.40.0",
-        "@typescript-eslint/types": "^8.40.0",
+        "@typescript-eslint/tsconfig-utils": "^8.41.0",
+        "@typescript-eslint/types": "^8.41.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6584,14 +6585,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.40.0.tgz",
-      "integrity": "sha512-y9ObStCcdCiZKzwqsE8CcpyuVMwRouJbbSrNuThDpv16dFAj429IkM6LNb1dZ2m7hK5fHyzNcErZf7CEeKXR4w==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
+      "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.40.0",
-        "@typescript-eslint/visitor-keys": "8.40.0"
+        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/visitor-keys": "8.41.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6602,9 +6603,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.40.0.tgz",
-      "integrity": "sha512-jtMytmUaG9d/9kqSl/W3E3xaWESo4hFDxAIHGVW/WKKtQhesnRIJSAJO6XckluuJ6KDB5woD1EiqknriCtAmcw==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
+      "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6619,9 +6620,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.40.0.tgz",
-      "integrity": "sha512-ETdbFlgbAmXHyFPwqUIYrfc12ArvpBhEVgGAxVYSwli26dn8Ko+lIo4Su9vI9ykTZdJn+vJprs/0eZU0YMAEQg==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
+      "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6633,16 +6634,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.40.0.tgz",
-      "integrity": "sha512-k1z9+GJReVVOkc1WfVKs1vBrR5MIKKbdAjDTPvIK3L8De6KbFfPFt6BKpdkdk7rZS2GtC/m6yI5MYX+UsuvVYQ==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
+      "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.40.0",
-        "@typescript-eslint/tsconfig-utils": "8.40.0",
-        "@typescript-eslint/types": "8.40.0",
-        "@typescript-eslint/visitor-keys": "8.40.0",
+        "@typescript-eslint/project-service": "8.41.0",
+        "@typescript-eslint/tsconfig-utils": "8.41.0",
+        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/visitor-keys": "8.41.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -6662,13 +6663,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.40.0.tgz",
-      "integrity": "sha512-8CZ47QwalyRjsypfwnbI3hKy5gJDPmrkLjkgMxhi0+DZZ2QNx2naS6/hWoVYUHU7LU2zleF68V9miaVZvhFfTA==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
+      "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.40.0",
+        "@typescript-eslint/types": "8.41.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -6766,15 +6767,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.40.0.tgz",
-      "integrity": "sha512-eE60cK4KzAc6ZrzlJnflXdrMqOBaugeukWICO2rB0KNvwdIMaEaYiywwHMzA1qFpTxrLhN9Lp4E/00EgWcD3Ow==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.41.0.tgz",
+      "integrity": "sha512-63qt1h91vg3KsjVVonFJWjgSK7pZHSQFKH6uwqxAH9bBrsyRhO6ONoKyXxyVBzG1lJnFAJcKAcxLS54N1ee1OQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.40.0",
-        "@typescript-eslint/typescript-estree": "8.40.0",
-        "@typescript-eslint/utils": "8.40.0",
+        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/typescript-estree": "8.41.0",
+        "@typescript-eslint/utils": "8.41.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -6791,14 +6792,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/project-service": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.40.0.tgz",
-      "integrity": "sha512-/A89vz7Wf5DEXsGVvcGdYKbVM9F7DyFXj52lNYUDS1L9yJfqjW/fIp5PgMuEJL/KeqVTe2QSbXAGUZljDUpArw==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
+      "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.40.0",
-        "@typescript-eslint/types": "^8.40.0",
+        "@typescript-eslint/tsconfig-utils": "^8.41.0",
+        "@typescript-eslint/types": "^8.41.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6813,14 +6814,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.40.0.tgz",
-      "integrity": "sha512-y9ObStCcdCiZKzwqsE8CcpyuVMwRouJbbSrNuThDpv16dFAj429IkM6LNb1dZ2m7hK5fHyzNcErZf7CEeKXR4w==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
+      "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.40.0",
-        "@typescript-eslint/visitor-keys": "8.40.0"
+        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/visitor-keys": "8.41.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6831,9 +6832,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.40.0.tgz",
-      "integrity": "sha512-jtMytmUaG9d/9kqSl/W3E3xaWESo4hFDxAIHGVW/WKKtQhesnRIJSAJO6XckluuJ6KDB5woD1EiqknriCtAmcw==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
+      "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6848,9 +6849,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.40.0.tgz",
-      "integrity": "sha512-ETdbFlgbAmXHyFPwqUIYrfc12ArvpBhEVgGAxVYSwli26dn8Ko+lIo4Su9vI9ykTZdJn+vJprs/0eZU0YMAEQg==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
+      "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6862,16 +6863,16 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.40.0.tgz",
-      "integrity": "sha512-k1z9+GJReVVOkc1WfVKs1vBrR5MIKKbdAjDTPvIK3L8De6KbFfPFt6BKpdkdk7rZS2GtC/m6yI5MYX+UsuvVYQ==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
+      "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.40.0",
-        "@typescript-eslint/tsconfig-utils": "8.40.0",
-        "@typescript-eslint/types": "8.40.0",
-        "@typescript-eslint/visitor-keys": "8.40.0",
+        "@typescript-eslint/project-service": "8.41.0",
+        "@typescript-eslint/tsconfig-utils": "8.41.0",
+        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/visitor-keys": "8.41.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -6891,16 +6892,16 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.40.0.tgz",
-      "integrity": "sha512-Cgzi2MXSZyAUOY+BFwGs17s7ad/7L+gKt6Y8rAVVWS+7o6wrjeFN4nVfTpbE25MNcxyJ+iYUXflbs2xR9h4UBg==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz",
+      "integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.40.0",
-        "@typescript-eslint/types": "8.40.0",
-        "@typescript-eslint/typescript-estree": "8.40.0"
+        "@typescript-eslint/scope-manager": "8.41.0",
+        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/typescript-estree": "8.41.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6915,13 +6916,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.40.0.tgz",
-      "integrity": "sha512-8CZ47QwalyRjsypfwnbI3hKy5gJDPmrkLjkgMxhi0+DZZ2QNx2naS6/hWoVYUHU7LU2zleF68V9miaVZvhFfTA==",
+      "version": "8.41.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
+      "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.40.0",
+        "@typescript-eslint/types": "8.41.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -10142,10 +10143,11 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.33.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz",
-      "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
+      "version": "9.34.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz",
+      "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -10153,7 +10155,7 @@
         "@eslint/config-helpers": "^0.3.1",
         "@eslint/core": "^0.15.2",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.33.0",
+        "@eslint/js": "9.34.0",
         "@eslint/plugin-kit": "^0.3.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -12561,10 +12563,11 @@
       }
     },
     "node_modules/jasmine-core": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.9.0.tgz",
-      "integrity": "sha512-OMUvF1iI6+gSRYOhMrH4QYothVLN9C3EJ6wm4g7zLJlnaTl8zbaPOr0bTw70l7QxkoM7sVFOWo83u9B2Fe2Zng==",
-      "dev": true
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.10.0.tgz",
+      "integrity": "sha512-MrChbWV5LBo+EaeKwTM1eZ6oYSz1brvFExnRafraEkJkbJ9evbUxABhnIgGQimhpMxhg+BD6QmOvb/e3NXsNdg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jasmine-marbles": {
       "version": "0.9.2",
@@ -12607,6 +12610,13 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/jasmine/node_modules/jasmine-core": {
+      "version": "5.9.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.9.0.tgz",
+      "integrity": "sha512-OMUvF1iI6+gSRYOhMrH4QYothVLN9C3EJ6wm4g7zLJlnaTl8zbaPOr0bTw70l7QxkoM7sVFOWo83u9B2Fe2Zng==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/jasmine/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
diff --git a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html
index ac605dd2fc..7fe0851b5a 100644
--- a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html
@@ -86,6 +86,7 @@
                   <mat-chip
                     role="listitem"
                     *ngFor="let keyword of dataset.keywords"
+                    (click)="onClickKeyword(keyword)"
                   >
                     {{ keyword }}
                   </mat-chip>
@@ -110,6 +111,7 @@
                       [matChipInputSeparatorKeyCodes]="separatorKeyCodes"
                       [matChipInputAddOnBlur]="true"
                       (matChipInputTokenEnd)="onAddKeyword($event)"
+                      class="keyword-input"
                     />
                   </mat-chip-grid>
                 </mat-form-field>
diff --git a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.scss b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.scss
index 43b641d839..50dd208df2 100644
--- a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.scss
+++ b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.scss
@@ -86,3 +86,7 @@ mat-card {
   max-width: 80vw;
   overflow: auto;
 }
+
+.keyword-input {
+  padding-left: 10px;
+}
diff --git a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.ts b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.ts
index 14900885db..88a3a90513 100644
--- a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.ts
+++ b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.ts
@@ -174,7 +174,7 @@ export class DatasetDetailComponent implements OnInit, OnDestroy {
     const value = event.value;
 
     if ((value || "").trim() && this.dataset) {
-      const keyword = value.trim().toLowerCase();
+      const keyword = value.trim();
       if (this.keywords.value.indexOf(keyword) === -1) {
         this.keywords.push(this.fb.control(keyword));
 
diff --git a/src/app/datasets/dataset-table/dataset-table.component.html b/src/app/datasets/dataset-table/dataset-table.component.html
index f60918887b..ff32934544 100644
--- a/src/app/datasets/dataset-table/dataset-table.component.html
+++ b/src/app/datasets/dataset-table/dataset-table.component.html
@@ -13,7 +13,6 @@
   (onRowEvent)="onRowEvent($event)"
   (settingChange)="onSettingChange($event)"
   (onTableEvent)="onTableEvent($event)"
-  style="height: 70vh"
   class="mat-elevation-z2 dataset-table"
 >
 </dynamic-mat-table>
diff --git a/src/app/datasets/dataset-table/dataset-table.component.ts b/src/app/datasets/dataset-table/dataset-table.component.ts
index 273377e152..59e7f16551 100644
--- a/src/app/datasets/dataset-table/dataset-table.component.ts
+++ b/src/app/datasets/dataset-table/dataset-table.component.ts
@@ -64,7 +64,6 @@ import { TitleCasePipe } from "shared/pipes/title-case.pipe";
 import { actionMenu } from "shared/modules/dynamic-material-table/utilizes/default-table-settings";
 import { TableConfigService } from "shared/services/table-config.service";
 import { selectInstruments } from "state-management/selectors/instruments.selectors";
-
 export interface SortChangeEvent {
   active: string;
   direction: "asc" | "desc" | "";
diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.html b/src/app/datasets/datasets-filter/datasets-filter.component.html
index 697b418381..943c685abd 100644
--- a/src/app/datasets/datasets-filter/datasets-filter.component.html
+++ b/src/app/datasets/datasets-filter/datasets-filter.component.html
@@ -3,7 +3,7 @@
     <mat-card-title>Filters</mat-card-title>
     <div class="section-container" data-cy="more-filters-button">
       <button
-        mat-button
+        mat-icon-button
         class="settings-button"
         (click)="showDatasetsFilterSettingsDialog()"
         matTooltip="Filter settings"
@@ -34,7 +34,7 @@
       <div class="section-container conditions-header">
         <mat-card-title>Conditions</mat-card-title>
         <button
-          mat-button
+          mat-icon-button
           class="condition-button"
           (click)="addCondition()"
           matTooltip="Add condition"
@@ -126,7 +126,9 @@
                 </mat-select-trigger>
                 <mat-option
                   *ngFor="
-                    let operator of getAllowedOperators(conditionConfig.condition.lhs)
+                    let operator of getAllowedOperators(
+                      conditionConfig.condition.lhs
+                    )
                   "
                   [value]="operator"
                 >
@@ -221,11 +223,8 @@
                   [value]="conditionConfig.condition.unit || ''"
                   (input)="updateConditionUnit(i, $event)"
                   [matAutocomplete]="rhsUnits"
-                  [disabled]="
-                    conditionConfig.condition.relation === 'EQUAL_TO_STRING'
-                  "
                 />
-                <mat-autocomplete #rhsUnits="matAutocomplete">
+                <mat-autocomplete #rhsUnits="matAutocomplete" (optionSelected)="updateConditionUnit(i, $event)">
                   <mat-option
                     *ngFor="let unit of getUnits(conditionConfig.condition.lhs)"
                     [value]="unit"
@@ -248,13 +247,13 @@
 
               <button
                 class="condition-remove"
-                mat-button
+                mat-icon-button
                 color="warn"
                 (click)="removeCondition(conditionConfig, i)"
                 matTooltip="Remove condition"
+                data-cy="remove-condition-button"
               >
                 <mat-icon>delete</mat-icon>
-                Remove
               </button>
             </div>
           </div>
diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.scss b/src/app/datasets/datasets-filter/datasets-filter.component.scss
index e8dc3dc928..c45e52fb77 100644
--- a/src/app/datasets/datasets-filter/datasets-filter.component.scss
+++ b/src/app/datasets/datasets-filter/datasets-filter.component.scss
@@ -93,6 +93,7 @@ mat-card {
   .condition-field-name {
     font-weight: 500;
     margin-bottom: 0.25rem;
+    word-break: break-word;
   }
 
   .condition-description {
diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.spec.ts b/src/app/datasets/datasets-filter/datasets-filter.component.spec.ts
index 5a74224091..fd7eb8a5ad 100644
--- a/src/app/datasets/datasets-filter/datasets-filter.component.spec.ts
+++ b/src/app/datasets/datasets-filter/datasets-filter.component.spec.ts
@@ -201,7 +201,7 @@ describe("DatasetsFilterComponent", () => {
 
       component.reset();
 
-      expect(dispatchSpy).toHaveBeenCalledTimes(5);
+      expect(dispatchSpy).toHaveBeenCalledTimes(6);
       expect(dispatchSpy).toHaveBeenCalledWith(clearFacetsAction());
       expect(dispatchSpy).toHaveBeenCalledWith(
         deselectAllCustomColumnsAction(),
diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.ts b/src/app/datasets/datasets-filter/datasets-filter.component.ts
index af9a5ab3cb..c61b2c039b 100644
--- a/src/app/datasets/datasets-filter/datasets-filter.component.ts
+++ b/src/app/datasets/datasets-filter/datasets-filter.component.ts
@@ -61,6 +61,7 @@ import {
 } from "state-management/actions/user.actions";
 import { UnitsService } from "shared/services/units.service";
 import { ScientificCondition } from "state-management/models";
+import { UnitsOptionsService } from "shared/services/units-options.service";
 
 const COMPONENT_MAP: { [K in Filters]: Type<any> } = {
   PidFilter: PidFilterComponent,
@@ -115,6 +116,7 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
     private viewContainerRef: ViewContainerRef,
     private snackBar: MatSnackBar,
     private unitsService: UnitsService,
+    private unitsOptionsService: UnitsOptionsService,
   ) {}
 
   ngOnInit() {
@@ -139,6 +141,7 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
   applyEnabledConditions() {
     this.conditionConfigs$.pipe(take(1)).subscribe((conditionConfigs) => {
       (conditionConfigs || []).forEach((config) => {
+        this.applyUnitsOptions(config.condition);
         if (config.enabled && config.condition.lhs && config.condition.rhs) {
           this.store.dispatch(
             addScientificConditionAction({
@@ -224,8 +227,31 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
   }
 
   applyFilters() {
-    this.store.dispatch(fetchDatasetsAction());
-    this.store.dispatch(fetchFacetCountsAction());
+    this.conditionConfigs$.pipe(take(1)).subscribe((conditionConfigs) => {
+      (conditionConfigs || []).forEach((oldCondition) => {
+        this.store.dispatch(
+          removeScientificConditionAction({
+            condition: oldCondition.condition,
+          }),
+        );
+      });
+
+      (conditionConfigs || []).forEach((config) => {
+        if (config.enabled && config.condition.lhs && config.condition.rhs) {
+          this.store.dispatch(
+            addScientificConditionAction({ condition: config.condition }),
+          );
+        }
+      });
+
+      this.store.dispatch(
+        updateUserSettingsAction({
+          property: { conditions: conditionConfigs },
+        }),
+      );
+      this.store.dispatch(fetchDatasetsAction());
+      this.store.dispatch(fetchFacetCountsAction());
+    });
   }
 
   trackByCondition(index: number, conditionConfig: ConditionConfig): string {
@@ -298,17 +324,21 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
 
   addCondition() {
     this.datasets$.pipe(take(1)).subscribe((datasets) => {
-      if (datasets && datasets.length > 0 && datasets[0].scientificMetadata) {
-        const metadata = datasets[0].scientificMetadata;
+      if (datasets && datasets.length > 0) {
         this.humanNameMap = {};
         this.fieldTypeMap = {};
-        Object.keys(metadata).forEach((key) => {
-          if (metadata[key]?.human_name) {
-            this.humanNameMap[key] = metadata[key].human_name;
-          }
-          if (metadata[key]?.type) {
-            this.fieldTypeMap[key] = metadata[key].type;
-          }
+
+        datasets.forEach((dataset) => {
+          const metadata = dataset.scientificMetadata;
+
+          Object.keys(metadata).forEach((key) => {
+            if (metadata[key]?.human_name) {
+              this.humanNameMap[key] = metadata[key].human_name;
+            }
+            if (metadata[key]?.type) {
+              this.fieldTypeMap[key] = metadata[key].type;
+            }
+          });
         });
       }
     });
@@ -370,10 +400,6 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
                       property: { conditions: updatedConditions },
                     }),
                   );
-
-                  this.store.dispatch(
-                    addScientificConditionAction({ condition: data }),
-                  );
                   this.store.dispatch(
                     selectColumnAction({
                       name: data.lhs,
@@ -393,42 +419,54 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
   }
 
   getUnits(parameterKey: string): string[] {
+    const stored = this.unitsOptionsService.getUnitsOptions(parameterKey);
+    if (stored?.length) {
+      return stored;
+    }
     return this.unitsService.getUnits(parameterKey);
   }
 
-  updateCondition(index: number, updates: Partial<any>) {
+  applyUnitsOptions(condition: ScientificCondition): void {
+    const lhs = condition?.lhs;
+    const unitsOptions = condition?.unitsOptions;
+
+    // if pre-configured condition has unitsOptions, store and use them.
+    if (lhs && unitsOptions?.length) {
+      this.unitsOptionsService.setUnitsOptions(lhs, unitsOptions);
+    }
+  }
+
+  updateCondition(newCondition: ConditionConfig, index: number) {
     const currentConditions =
       this.asyncPipe.transform(this.conditionConfigs$) || [];
     const updatedConditions = [...currentConditions];
-    const condition = updatedConditions[index];
-    const oldCondition = condition.condition;
+
+    const oldCondition = updatedConditions[index];
+    updatedConditions.splice(index, 1);
 
     // Removes the old condition if enabled
-    if (condition.enabled) {
+    if (oldCondition.enabled) {
       this.store.dispatch(
-        removeScientificConditionAction({ condition: oldCondition }),
+        removeScientificConditionAction({ condition: oldCondition.condition }),
       );
       this.store.dispatch(
-        deselectColumnAction({ name: oldCondition.lhs, columnType: "custom" }),
+        deselectColumnAction({
+          name: oldCondition.condition.lhs,
+          columnType: "custom",
+        }),
       );
     }
 
-    // Updates the condition
-    updatedConditions[index] = {
-      ...condition,
-      condition: { ...oldCondition, ...updates },
-    };
+    // Adds the new condition if enabled
+    if (newCondition.enabled) {
+      updatedConditions.splice(index, 0, newCondition);
 
-    // Adds the updated condition if enabled
-    if (condition.enabled) {
       this.store.dispatch(
-        addScientificConditionAction({
-          condition: updatedConditions[index].condition,
-        }),
+        addScientificConditionAction({ condition: newCondition.condition }),
       );
       this.store.dispatch(
         selectColumnAction({
-          name: updatedConditions[index].condition.lhs,
+          name: newCondition.condition.lhs,
           columnType: "custom",
         }),
       );
@@ -441,12 +479,33 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
     );
   }
 
-  updateConditionOperator(index: number, newOperator: string) {
-    this.updateCondition(index, {
+  updateConditionField(index: number, updates: Partial<ScientificCondition>) {
+    const currentConditions =
+      this.asyncPipe.transform(this.conditionConfigs$) || [];
+    const updatedConditions = [...currentConditions];
+    const conditionConfig = updatedConditions[index];
+
+    updatedConditions[index] = {
+      ...conditionConfig,
+      condition: {
+        ...conditionConfig.condition,
+        ...updates,
+      },
+    };
+
+    this.updateConditionInStore(updatedConditions);
+  }
+
+  updateConditionOperator(
+    index: number,
+    newOperator: ScientificCondition["relation"],
+  ) {
+    const updates: Partial<ScientificCondition> = {
       relation: newOperator,
       rhs: newOperator === "RANGE" ? [undefined, undefined] : "",
       unit: newOperator === "EQUAL_TO_STRING" ? "" : undefined,
-    });
+    };
+    this.updateConditionField(index, updates);
   }
 
   updateConditionValue(index: number, event: Event) {
@@ -460,12 +519,12 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
       currentRelation === "EQUAL_TO_STRING"
     ) {
       const isNumeric = newValue !== "" && !isNaN(Number(newValue));
-      this.updateCondition(index, {
+      this.updateConditionField(index, {
         rhs: isNumeric ? Number(newValue) : newValue,
         relation: isNumeric ? "EQUAL_TO_NUMERIC" : "EQUAL_TO_STRING",
       });
     } else {
-      this.updateCondition(index, { rhs: Number(newValue) });
+      this.updateConditionField(index, { rhs: Number(newValue) });
     }
   }
 
@@ -477,7 +536,7 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
       ? [...currentRhs]
       : [undefined, undefined];
     rhs[rangeIndex] = Number(newValue);
-    this.updateCondition(index, { rhs });
+    this.updateConditionField(index, { rhs });
   }
 
   getOperatorUIValue(relation: string): string {
@@ -486,9 +545,11 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
       : relation;
   }
 
-  updateConditionUnit(index: number, event: Event) {
-    const newUnit = (event.target as HTMLInputElement).value;
-    this.updateCondition(index, { unit: newUnit || undefined });
+  updateConditionUnit(index: number, event: any) {
+    const newUnit = event.target
+      ? (event.target as HTMLInputElement).value
+      : event.option.value;
+    this.updateConditionField(index, { unit: newUnit || undefined });
   }
 
   updateConditionInStore(updatedConditions: ConditionConfig[]) {
@@ -519,6 +580,10 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
       );
     }
 
+    if (condition.condition.lhs) {
+      this.unitsOptionsService.clearUnitsOptions(condition.condition.lhs);
+    }
+
     this.updateConditionInStore(updatedConditions);
     this.store.dispatch(
       updateUserSettingsAction({ property: { conditions: updatedConditions } }),
diff --git a/src/app/files/files-dashboard/files-dashboard.component.html b/src/app/files/files-dashboard/files-dashboard.component.html
index aec8231812..96ef35c3f3 100644
--- a/src/app/files/files-dashboard/files-dashboard.component.html
+++ b/src/app/files/files-dashboard/files-dashboard.component.html
@@ -14,7 +14,6 @@
   (onRowEvent)="onRowClick($event)"
   (settingChange)="onSettingChange($event)"
   (onTableEvent)="onTableEvent($event)"
-  style="height: 70vh"
   class="mat-elevation-z2"
 >
 </dynamic-mat-table>
diff --git a/src/app/instruments/instruments-dashboard/instruments-dashboard.component.html b/src/app/instruments/instruments-dashboard/instruments-dashboard.component.html
index b23412ca62..0b9e8d2d7a 100644
--- a/src/app/instruments/instruments-dashboard/instruments-dashboard.component.html
+++ b/src/app/instruments/instruments-dashboard/instruments-dashboard.component.html
@@ -12,7 +12,6 @@
   (onRowEvent)="onRowClick($event)"
   (settingChange)="onSettingChange($event)"
   (onTableEvent)="onTableEvent($event)"
-  style="height: 70vh"
   class="mat-elevation-z2"
 >
 </dynamic-mat-table>
diff --git a/src/app/proposals/proposal-dashboard/proposal-dashboard.component.scss b/src/app/proposals/proposal-dashboard/proposal-dashboard.component.scss
index 7e55840a83..88dc60dcba 100644
--- a/src/app/proposals/proposal-dashboard/proposal-dashboard.component.scss
+++ b/src/app/proposals/proposal-dashboard/proposal-dashboard.component.scss
@@ -2,6 +2,7 @@ mat-sidenav-container {
   mat-sidenav-content {
     padding: 0.5rem;
     background-color: #ffffff;
+    overflow-x: hidden;
 
     :host-context(.anonymous-site) .action-column {
       margin-top: 3.5rem;
@@ -27,6 +28,8 @@ mat-sidenav-container {
     .table-column {
       margin-top: 0.5rem;
       padding-bottom: 1rem;
+      overflow-x: auto;
+      width: 100%;
     }
   }
 
diff --git a/src/app/proposals/proposal-table/proposal-table.component.html b/src/app/proposals/proposal-table/proposal-table.component.html
index 2e3d757af5..c2247424a7 100644
--- a/src/app/proposals/proposal-table/proposal-table.component.html
+++ b/src/app/proposals/proposal-table/proposal-table.component.html
@@ -12,7 +12,6 @@
   (onRowEvent)="onRowClick($event)"
   (settingChange)="onSettingChange($event)"
   (onTableEvent)="onTableEvent($event)"
-  style="height: 70vh"
   class="mat-elevation-z2"
 >
 </dynamic-mat-table>
diff --git a/src/app/proposals/proposal-table/proposal-table.component.ts b/src/app/proposals/proposal-table/proposal-table.component.ts
index 10ea15e0c7..ffbc71cc37 100644
--- a/src/app/proposals/proposal-table/proposal-table.component.ts
+++ b/src/app/proposals/proposal-table/proposal-table.component.ts
@@ -42,6 +42,7 @@ const tableDefaultSettingsConfig: ITableSetting = {
           header: "Proposal ID",
           icon: "perm_device_information",
           type: "text",
+          style: { "min-width": "250px" },
         },
         {
           name: "startTime",
diff --git a/src/app/proposals/related-proposals/related-proposals.component.html b/src/app/proposals/related-proposals/related-proposals.component.html
index 66dcae8f1d..520d7ba293 100644
--- a/src/app/proposals/related-proposals/related-proposals.component.html
+++ b/src/app/proposals/related-proposals/related-proposals.component.html
@@ -18,7 +18,6 @@
   (paginationChange)="onPaginationChange($event)"
   (onRowEvent)="onRowClick($event)"
   (onTableEvent)="onTableEvent($event)"
-  style="height: 60vh"
   class="mat-elevation-z2"
 >
 </dynamic-mat-table>
diff --git a/src/app/shared/modules/dynamic-material-table/cores/table-data-source.ts b/src/app/shared/modules/dynamic-material-table/cores/table-data-source.ts
index 3d7326196c..1c7c52e12b 100644
--- a/src/app/shared/modules/dynamic-material-table/cores/table-data-source.ts
+++ b/src/app/shared/modules/dynamic-material-table/cores/table-data-source.ts
@@ -18,25 +18,8 @@ import { TableField } from "../models/table-field.model";
 import { TableRow } from "../models/table-row.model";
 import { AbstractFilter } from "../table/extensions/filter/compare/abstract-filter";
 
-export class TableVirtualScrollDataSource<
-  T extends TableRow,
-> extends MatTableDataSource<T> {
-  private streamsReady: boolean;
+export class TableDataSource<T extends TableRow> extends MatTableDataSource<T> {
   private filterMap: HashMap<AbstractFilter[]> = {};
-  public dataToRender$: Subject<T[]>;
-  public dataOfRange$: Subject<T[]>;
-  public columns: TableField<T>[] = [];
-  get allData(): T[] {
-    return this.data;
-  }
-
-  private initStreams() {
-    if (!this.streamsReady) {
-      this.dataToRender$ = new ReplaySubject<T[]>(1);
-      this.dataOfRange$ = new ReplaySubject<T[]>(1);
-      this.streamsReady = true;
-    }
-  }
 
   toTranslate(): any[] {
     const tranList = [];
@@ -75,10 +58,6 @@ export class TableVirtualScrollDataSource<
     this.refreshFilterPredicate();
   }
 
-  clearData() {
-    this.data = [];
-  }
-
   public refreshFilterPredicate() {
     let conditionsString = "";
     Object.keys(this.filterMap).forEach((key) => {
@@ -105,6 +84,31 @@ export class TableVirtualScrollDataSource<
     }
     this.filter = conditionsString;
   }
+}
+
+export class TableVirtualScrollDataSource<
+  T extends TableRow,
+> extends TableDataSource<T> {
+  private streamsReady: boolean;
+  public dataToRender$: Subject<T[]>;
+  public dataOfRange$: Subject<T[]>;
+  public columns: TableField<T>[] = [];
+
+  get allData(): T[] {
+    return this.data;
+  }
+
+  private initStreams() {
+    if (!this.streamsReady) {
+      this.dataToRender$ = new ReplaySubject<T[]>(1);
+      this.dataOfRange$ = new ReplaySubject<T[]>(1);
+      this.streamsReady = true;
+    }
+  }
+
+  clearData() {
+    this.data = [];
+  }
 
   // When client paging active use for retrieve paging data
   pagingData(data) {
diff --git a/src/app/shared/modules/dynamic-material-table/cores/table.core.directive.ts b/src/app/shared/modules/dynamic-material-table/cores/table.core.directive.ts
index a20367f869..0c45b0ca83 100644
--- a/src/app/shared/modules/dynamic-material-table/cores/table.core.directive.ts
+++ b/src/app/shared/modules/dynamic-material-table/cores/table.core.directive.ts
@@ -13,10 +13,10 @@ import {
   EventEmitter,
   HostBinding,
   ChangeDetectorRef,
+  ElementRef,
 } from "@angular/core";
 import { TableField } from "../models/table-field.model";
 import { titleCase } from "../utilizes/utilizes";
-import { CdkVirtualScrollViewport } from "@angular/cdk/scrolling";
 import { moveItemInArray } from "@angular/cdk/drag-drop";
 import { SelectionModel } from "@angular/cdk/collections";
 import { TableService } from "../table/dynamic-mat-table.service";
@@ -106,8 +106,8 @@ export class TableCoreDirective<T extends TableRow> {
 
   /**************************************** Reference Variables ***************************************/
   @ViewChild(MatTable, { static: true }) table!: MatTable<any>;
-  @ViewChild(CdkVirtualScrollViewport, { static: true })
-  viewport!: CdkVirtualScrollViewport;
+  @ViewChild("tbl", { static: true })
+  tableContainer!: ElementRef<any>;
   /**************************************** Methods **********************************************/
 
   constructor(
@@ -140,7 +140,6 @@ export class TableCoreDirective<T extends TableRow> {
     return this.tableSetting.scrollStrategy;
   }
   set ScrollStrategyType(value: TableScrollStrategy) {
-    this.viewport["_scrollStrategy"].scrollStrategyMode = value;
     this.tableSetting.scrollStrategy = value;
   }
 
@@ -353,8 +352,8 @@ export class TableCoreDirective<T extends TableRow> {
 
   public clear() {
     if (!isNullorUndefined(this.tvsDataSource)) {
-      if (this.viewport) {
-        this.viewport.scrollTo({ top: 0, behavior: "auto" });
+      if (this.tableContainer) {
+        this.tableContainer.nativeElement.scrollTop = 0;
       }
       this.tvsDataSource.clearData();
       this.expandedElement = null;
@@ -397,7 +396,6 @@ export class TableCoreDirective<T extends TableRow> {
     this.cdr.detectChanges();
     this.refreshColumn(this.tableColumns);
     this.table.renderRows();
-    this.viewport.checkViewportSize();
   }
 
   public moveRow(from: number, to: number) {
@@ -420,14 +418,12 @@ export class TableCoreDirective<T extends TableRow> {
   }
 
   refreshColumn(columns: TableField<T>[]) {
-    if (this.viewport) {
-      const currentOffset = this.viewport.measureScrollOffset();
-      this.columns = columns;
-      setTimeout(
-        () => this.viewport.scrollTo({ top: currentOffset, behavior: "auto" }),
-        0,
-      );
-    }
+    const currentOffset = this.tableContainer.nativeElement.scrollTop;
+    this.columns = columns;
+
+    setTimeout(() => {
+      this.tableContainer.nativeElement.scrollTop = currentOffset;
+    }, 0);
   }
 
   /************************************ Selection Table Row *******************************************/
diff --git a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.html b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.html
index 78faffda22..00af722e44 100644
--- a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.html
+++ b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.html
@@ -1,11 +1,15 @@
-<cdk-virtual-scroll-viewport
+<mat-paginator
+  [pageSizeOptions]="pagination.pageSizeOptions"
+  [pageIndex]="pagination.pageIndex"
+  [length]="pagination.length"
+  [pageSize]="pagination.pageSize"
+  (page)="pagination_onChange($event)"
+  *ngIf="pagination"
+>
+</mat-paginator>
+<div
   #tbl
   [ngClass]="viewportClass"
-  [tvsItemSize]="rowHeight || 48"
-  [headerHeight]="headerHeight || 56"
-  [footerHeight]="headerHeight || 56"
-  [headerEnabled]="headerEnable || true"
-  [footerEnabled]="footerEnable || false"
   [ngStyle]="{ 'background-color': backgroundColor || 'white' }"
   [class.print-preview]="printing"
 >
@@ -19,7 +23,7 @@
     (cdkDragStarted)="dragStarted($event)"
     (cdkDropListDropped)="dropListDropped($event)"
     [trackBy]="indexTrackFn"
-    [dataSource]="tvsDataSource"
+    [dataSource]="standardDataSource"
   >
     <!-- Select Checkbox Column -->
     <ng-container matColumnDef="row-checkbox">
@@ -317,14 +321,12 @@
         class="global-search"
         [@tableAnimation]
         *matHeaderRowDef="searchRowColumns; sticky: sticky"
-        [style.top.px]="inverseOfTranslation"
       ></mat-header-row>
     </ng-container>
     <mat-header-row
       class="header"
       [@tableAnimation]
       *matHeaderRowDef="displayedColumns; sticky: sticky"
-      [style.top.px]="inverseOfTranslation"
     ></mat-header-row>
     <ng-container *ngIf="displayedFooter.length > 0">
       <mat-footer-row
@@ -336,10 +338,10 @@
     <mat-header-row
       class="progress"
       *matHeaderRowDef="progressColumn; sticky: sticky"
-      [style.top.px]="inverseOfTranslation + headerHeight - 5"
+      [style.top.px]="headerHeight - 5"
     ></mat-header-row>
   </mat-table>
-</cdk-virtual-scroll-viewport>
+</div>
 <mat-paginator
   [pageSizeOptions]="pagination.pageSizeOptions"
   [pageIndex]="pagination.pageIndex"
@@ -350,7 +352,7 @@
 >
 </mat-paginator>
 <ng-container *ngIf="showNoData && init === true">
-  <div class="no-records" *ngIf="tvsDataSource.data.length === 0">
+  <div class="no-records" *ngIf="standardDataSource.data.length === 0">
     No data
     <br />
     <button
diff --git a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.scss b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.scss
index aa26b3bf00..f39c59265f 100644
--- a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.scss
+++ b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.scss
@@ -6,7 +6,7 @@
   table-layout: fixed;
   min-height: 200px;
   position: relative;
-  overflow: auto;
+  overflow: hidden;
   transition: 0.3s cubic-bezier(0.46, -0.72, 0.46, 1.54);
   border: 2px rgb(0, 150, 136);
 
@@ -19,6 +19,10 @@
     }
   }
 }
+  .dynamic-table {
+    min-width: 100%;
+    width: max-content;
+  }
 
 /* Fixed Scroll */
 ::ng-deep .cdk-virtual-scroll-content-wrapper {
@@ -54,12 +58,10 @@ mat-footer-cell:first-of-type {
   padding-left: 20px;
 }
 
-.viewport {
+.viewport, .viewport-with-pagination  {
   height: calc(100% - 0px);
-}
-
-.viewport-with-pagination {
-  height: calc(100% - 48px);
+  overflow-x: auto;
+  width: 100%
 }
 
 .table-paginator {
diff --git a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts
index e9c30d6892..87547f5692 100644
--- a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts
+++ b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts
@@ -51,7 +51,6 @@ import {
   distinctUntilChanged,
   filter,
 } from "rxjs/operators";
-import { FixedSizeTableVirtualScrollStrategy } from "../cores/fixed-size-table-virtual-scroll-strategy";
 import { Subject, Subscription } from "rxjs";
 import { MatMenuTrigger } from "@angular/material/menu";
 import { ContextMenuItem } from "../models/context-menu.model";
@@ -76,6 +75,7 @@ import {
   TableMenuAction,
   TableMenuActionChange,
 } from "../models/table-menu.model";
+import { TableDataSource } from "../cores/table-data-source";
 
 export interface IDynamicCell {
   row: TableRow;
@@ -196,7 +196,7 @@ export class DynamicMatTableComponent<T extends TableRow>
   currentContextMenuSender: any = {};
   globalSearchUpdate = new Subject<string>();
 
-  @ViewChild("tbl", { static: true }) tbl;
+  @ViewChild("tbl", { static: true }) tbl: ElementRef;
   @Input()
   get setting() {
     return this.tableSetting;
@@ -257,6 +257,8 @@ export class DynamicMatTableComponent<T extends TableRow>
   /* Tooltip */
   overlayRef: OverlayRef = null;
 
+  standardDataSource: TableDataSource<T>;
+
   constructor(
     public dialog: MatDialog,
     private renderer: Renderer2,
@@ -268,6 +270,7 @@ export class DynamicMatTableComponent<T extends TableRow>
     public readonly config: TableSetting,
   ) {
     super(tableService, cdr, config);
+    this.standardDataSource = new TableDataSource<T>([]);
     this.overlayContainer
       .getContainerElement()
       .addEventListener("contextmenu", (e) => {
@@ -320,7 +323,7 @@ export class DynamicMatTableComponent<T extends TableRow>
   }
 
   ngAfterViewInit(): void {
-    this.tvsDataSource.paginator = this.paginator;
+    this.standardDataSource.paginator = this.paginator;
     if (this.tableSetting.tableSort) {
       this.sort.sort({
         id: this.tableSetting.tableSort.sortColumn,
@@ -328,17 +331,17 @@ export class DynamicMatTableComponent<T extends TableRow>
         disableClear: false,
       });
     }
-    this.tvsDataSource.sort = this.sort;
+    this.standardDataSource.sort = this.sort;
     this.dataSource.subscribe((x) => {
       x = x || [];
       this.rowSelectionModel.clear();
-      this.tvsDataSource.data = [];
+      this.standardDataSource.data = [];
       this.initSystemField(x);
-      this.tvsDataSource.data = x;
+      this.standardDataSource.data = x;
       this.refreshUI();
     });
 
-    this.tvsDataSource.sort.sortChange.subscribe((sort) => {
+    this.standardDataSource.sort.sortChange.subscribe((sort) => {
       if (this.pagination) {
         this.pagination.pageIndex = 0;
       }
@@ -446,10 +449,7 @@ export class DynamicMatTableComponent<T extends TableRow>
     }
     this.refreshColumn(this.tableColumns);
     this.tvsDataSource.columns = this.columns;
-    const scrollStrategy: FixedSizeTableVirtualScrollStrategy =
-      this.viewport["_scrollStrategy"];
-    scrollStrategy?.viewport?.checkViewportSize();
-    scrollStrategy?.viewport?.scrollToOffset(0);
+
     this.cdr.detectChanges();
   }
 
@@ -457,29 +457,18 @@ export class DynamicMatTableComponent<T extends TableRow>
     setTimeout(() => {
       this.init = true;
     }, 1000);
-    const scrollStrategy: FixedSizeTableVirtualScrollStrategy =
-      this.viewport["_scrollStrategy"];
 
-    scrollStrategy.offsetChange.subscribe((offset) => {});
-    this.viewport.renderedRangeStream.subscribe((t) => {
-      // in expanding row scrolling make not good appearance therefor close it.
-      if (
-        this.expandedElement &&
-        this.expandedElement.option &&
-        this.expandedElement.option.expand
-      ) {
-        // this.expandedElement.option.expand = false;
-        // this.expandedElement = null;
-      }
-    });
+    if (this.dataSource) {
+      this.dataSource.subscribe((data) => {
+        if (this.standardDataSource) {
+          this.standardDataSource.data = data;
+        }
+      });
+    }
   }
 
   public get inverseOfTranslation(): number {
-    if (!this.viewport || !this.viewport["_renderedContentOffset"]) {
-      return -0;
-    }
-    const offset = this.viewport["_renderedContentOffset"];
-    return -offset;
+    return 0;
   }
 
   headerClass(column: TableField<T>) {
@@ -549,7 +538,7 @@ export class DynamicMatTableComponent<T extends TableRow>
   }
 
   filter_onChanged(column: TableField<T>, filter: AbstractFilter[]) {
-    this.tvsDataSource.setFilter(column.name, filter).subscribe(() => {
+    this.standardDataSource.setFilter(column.name, filter).subscribe(() => {
       this.clearSelection();
     });
   }
@@ -730,31 +719,31 @@ export class DynamicMatTableComponent<T extends TableRow>
         this.refreshUI();
       }
     } else if (e.type === TableMenuAction.FullScreenMode) {
-      requestFullscreen(this.tbl.elementRef);
+      requestFullscreen(this.tbl);
     } else if (e.type === TableMenuAction.Download) {
       this.onTableEvent.emit({
         event: TableEventType.ExportData,
         sender: {
           type: e.data,
           columns: this.columns,
-          data: this.tvsDataSource.filteredData,
+          data: this.standardDataSource.filteredData,
           dataSelection: this.rowSelectionModel,
         },
       });
       if (e.data === "CSV") {
         this.tableService.exportToCsv<T>(
           this.columns,
-          this.tvsDataSource.filteredData,
+          this.standardDataSource.filteredData,
           this.rowSelectionModel,
         );
       } else if (e.data === "JSON") {
         this.tableService.exportToJson(
-          this.tvsDataSource.filteredData,
+          this.standardDataSource.filteredData,
           this.rowSelectionModel,
         );
       }
     } else if (e.type === TableMenuAction.FilterClear) {
-      this.tvsDataSource.clearFilter();
+      this.standardDataSource.clearFilter();
       this.headerFilterList.forEach((hf) => hf.clearColumn_OnClick());
     } else if (e.type === TableMenuAction.Print) {
       this.onTableEvent.emit({
diff --git a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.style.scss b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.style.scss
index 11acd29db7..7227af7b64 100644
--- a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.style.scss
+++ b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.style.scss
@@ -81,8 +81,6 @@
 
   ::ng-deep
     dynamic-mat-table
-    cdk-virtual-scroll-viewport
-    .cdk-virtual-scroll-content-wrapper
     .mat-mdc-table
     mat-row
     .mat-mdc-cell
diff --git a/src/app/shared/modules/filters/group-filter.component.html b/src/app/shared/modules/filters/group-filter.component.html
index ced5d9621c..b1a22f513e 100644
--- a/src/app/shared/modules/filters/group-filter.component.html
+++ b/src/app/shared/modules/filters/group-filter.component.html
@@ -12,6 +12,8 @@
     #input
     (input)="onGroupInput($event)"
     [value]="groupInput$ | async"
+    (blur)="onGroupBlur()"
+    (keydown.enter)="onGroupKeyEnter()"
     matInput
     class="group-input"
     [matChipInputFor]="groupChipList"
diff --git a/src/app/shared/modules/filters/group-filter.component.ts b/src/app/shared/modules/filters/group-filter.component.ts
index 9e51d0b7ae..9d6efd459a 100644
--- a/src/app/shared/modules/filters/group-filter.component.ts
+++ b/src/app/shared/modules/filters/group-filter.component.ts
@@ -41,6 +41,7 @@ export class GroupFilterComponent
 
   groupFacetCounts$ = this.store.select(selectGroupFacetCounts);
   groupInput$ = new BehaviorSubject<string>("");
+  typedGroup = "";
 
   groupSuggestions$ = createSuggestionObserver(
     this.groupFacetCounts$,
@@ -61,13 +62,27 @@ export class GroupFilterComponent
   onGroupInput(event: any) {
     const value = (<HTMLInputElement>event.target).value;
     this.groupInput$.next(value);
+    this.typedGroup = value.trim();
   }
   groupSelected(group: string) {
     this.store.dispatch(addGroupFilterAction({ group }));
     this.groupInput$.next("");
+    this.typedGroup = "";
   }
 
   groupRemoved(group: string) {
     this.store.dispatch(removeGroupFilterAction({ group }));
   }
+
+  onGroupKeyEnter() {
+    if (this.typedGroup) {
+      this.groupSelected(this.typedGroup);
+    }
+  }
+
+  onGroupBlur() {
+    if (this.typedGroup) {
+      this.groupSelected(this.typedGroup);
+    }
+  }
 }
diff --git a/src/app/shared/modules/filters/keyword-filter.component.html b/src/app/shared/modules/filters/keyword-filter.component.html
index 04798ae2be..7d013cd5f6 100644
--- a/src/app/shared/modules/filters/keyword-filter.component.html
+++ b/src/app/shared/modules/filters/keyword-filter.component.html
@@ -12,6 +12,8 @@
     #input
     (input)="onKeywordInput($event)"
     [value]="keywordsInput$ | async"
+    (blur)="onKeywordBlur()"
+    (keydown.enter)="onKeywordKeyEnter()"
     matInput
     class="keyword-input"
     [matChipInputFor]="keywordChipList"
diff --git a/src/app/shared/modules/filters/keyword-filter.component.ts b/src/app/shared/modules/filters/keyword-filter.component.ts
index 811ba8b73a..ada1f764e2 100644
--- a/src/app/shared/modules/filters/keyword-filter.component.ts
+++ b/src/app/shared/modules/filters/keyword-filter.component.ts
@@ -46,6 +46,7 @@ export class KeywordFilterComponent
   keywordFacetCounts$ = this.store.select(selectKeywordFacetCounts);
 
   subscription = undefined;
+  typedKeyword = "";
 
   keywordsSuggestions$ = createSuggestionObserver(
     this.keywordFacetCounts$,
@@ -75,17 +76,31 @@ export class KeywordFilterComponent
   onKeywordInput(event: any) {
     const value = (<HTMLInputElement>event.target).value;
     this.keywordsInput$.next(value);
+    this.typedKeyword = value.trim();
   }
 
   keywordSelected(keyword: string) {
     this.store.dispatch(addKeywordFilterAction({ keyword }));
     this.keywordsInput$.next("");
+    this.typedKeyword = "";
   }
 
   keywordRemoved(keyword: string) {
     this.store.dispatch(removeKeywordFilterAction({ keyword }));
   }
 
+  onKeywordKeyEnter() {
+    if (this.typedKeyword) {
+      this.keywordSelected(this.typedKeyword);
+    }
+  }
+
+  onKeywordBlur() {
+    if (this.typedKeyword) {
+      this.keywordSelected(this.typedKeyword);
+    }
+  }
+
   ngOnDestroy() {
     this.subscription.unsubscribe();
   }
diff --git a/src/app/shared/modules/filters/location-filter.component.html b/src/app/shared/modules/filters/location-filter.component.html
index c3f2a5016e..651d640808 100644
--- a/src/app/shared/modules/filters/location-filter.component.html
+++ b/src/app/shared/modules/filters/location-filter.component.html
@@ -13,6 +13,8 @@
     #input
     (input)="onLocationInput($event)"
     [value]="locationInput$ | async"
+    (blur)="onLocationBlur()"
+    (keydown.enter)="onLocationKeyEnter()"
     matInput
     class="location-input"
     [matChipInputFor]="locationChipList"
diff --git a/src/app/shared/modules/filters/location-filter.component.ts b/src/app/shared/modules/filters/location-filter.component.ts
index 6d99d41de6..097c515c74 100644
--- a/src/app/shared/modules/filters/location-filter.component.ts
+++ b/src/app/shared/modules/filters/location-filter.component.ts
@@ -42,6 +42,8 @@ export class LocationFilterComponent
 
   locationInput$ = new BehaviorSubject<string>("");
 
+  typedLocation = "";
+
   locationSuggestions$ = createSuggestionObserver(
     this.locationFacetCounts$,
     this.locationInput$,
@@ -62,6 +64,7 @@ export class LocationFilterComponent
     const loc = location || "";
     this.store.dispatch(addLocationFilterAction({ location: loc }));
     this.locationInput$.next("");
+    this.typedLocation = "";
   }
 
   locationRemoved(location: string) {
@@ -71,5 +74,18 @@ export class LocationFilterComponent
   onLocationInput(event: any) {
     const value = (<HTMLInputElement>event.target).value;
     this.locationInput$.next(value);
+    this.typedLocation = value.trim();
+  }
+
+  onLocationKeyEnter() {
+    if (this.typedLocation) {
+      this.locationSelected(this.typedLocation);
+    }
+  }
+
+  onLocationBlur() {
+    if (this.typedLocation) {
+      this.locationSelected(this.typedLocation);
+    }
   }
 }
diff --git a/src/app/shared/modules/filters/type-filter.component.html b/src/app/shared/modules/filters/type-filter.component.html
index 7747d52812..59542f99c8 100644
--- a/src/app/shared/modules/filters/type-filter.component.html
+++ b/src/app/shared/modules/filters/type-filter.component.html
@@ -12,6 +12,8 @@
     #input
     (input)="onTypeInput($event)"
     [value]="typeInput$ | async"
+    (blur)="onTypeBlur()"
+    (keydown.enter)="onTypeKeyEnter()"
     matInput
     class="type-input"
     [matChipInputFor]="typeChipList"
diff --git a/src/app/shared/modules/filters/type-filter.component.ts b/src/app/shared/modules/filters/type-filter.component.ts
index ce5e948f10..a8a123f417 100644
--- a/src/app/shared/modules/filters/type-filter.component.ts
+++ b/src/app/shared/modules/filters/type-filter.component.ts
@@ -41,6 +41,7 @@ export class TypeFilterComponent
 
   typeFilter$ = this.store.select(selectTypeFilter);
   typeInput$ = new BehaviorSubject<string>("");
+  typedType = "";
 
   typeSuggestions$ = createSuggestionObserver(
     this.typeFacetCounts$,
@@ -60,14 +61,28 @@ export class TypeFilterComponent
   onTypeInput(event: any) {
     const value = (<HTMLInputElement>event.target).value;
     this.typeInput$.next(value);
+    this.typedType = value.trim();
   }
 
   typeSelected(type: string) {
     this.store.dispatch(addTypeFilterAction({ datasetType: type }));
     this.typeInput$.next("");
+    this.typedType = "";
   }
 
   typeRemoved(type: string) {
     this.store.dispatch(removeTypeFilterAction({ datasetType: type }));
   }
+
+  onTypeKeyEnter() {
+    if (this.typedType) {
+      this.typeSelected(this.typedType);
+    }
+  }
+
+  onTypeBlur() {
+    if (this.typedType) {
+      this.typeSelected(this.typedType);
+    }
+  }
 }
diff --git a/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.html b/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.html
index 1b95ac7604..7facb5586b 100644
--- a/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.html
+++ b/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.html
@@ -32,7 +32,8 @@ <h2 mat-dialog-title>Add Characteristic</h2>
             {{ key }}
           </td>
         </ng-container>
-        <tr mat-row *matRowDef="let row; columns: ['field']"></tr>
+        <tr mat-row *matRowDef="let row; columns: ['field']"
+        [class.selected_row]="row === parametersForm.get('lhs').value"></tr>
       </table>
     </div>
   </mat-dialog-content>
diff --git a/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.scss b/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.scss
index 4cb96fde37..bc2fd0fe20 100644
--- a/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.scss
+++ b/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.scss
@@ -17,4 +17,9 @@ mat-dialog-content {
   .mat-table {
     width: 100%;
   }
+
+  .selected_row {
+    font-weight: bold;
+    background-color: rgba(0, 255, 64, 0.1);
+  }
 }
diff --git a/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.ts b/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.ts
index 207bd2f795..70e0d06a2f 100644
--- a/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.ts
+++ b/src/app/shared/modules/search-parameters-dialog/search-parameters-dialog.component.ts
@@ -28,10 +28,10 @@ export class SearchParametersDialogComponent {
       Validators.required,
       Validators.minLength(9),
     ]),
-    rhs: new FormControl<string | number>(this.data.condition?.rhs || "", [
-      Validators.required,
-      Validators.minLength(1),
-    ]),
+    rhs: new FormControl<string | number | number[]>(
+      this.data.condition?.rhs || "",
+      [Validators.required, Validators.minLength(1)],
+    ),
     unit: new FormControl(""),
   });
 
diff --git a/src/app/shared/services/units-options.service.ts b/src/app/shared/services/units-options.service.ts
new file mode 100644
index 0000000000..4e19f07243
--- /dev/null
+++ b/src/app/shared/services/units-options.service.ts
@@ -0,0 +1,25 @@
+import { Injectable } from "@angular/core";
+
+@Injectable({
+  providedIn: "root",
+})
+export class UnitsOptionsService {
+  // private unitsOptionsMap: Record<string, string[]> = {};
+
+  setUnitsOptions(lhs: string, unitsOptions: string[]) {
+    localStorage.setItem(`unitsOptions_${lhs}`, JSON.stringify(unitsOptions));
+  }
+
+  getUnitsOptions(lhs: string): string[] | undefined {
+    const stored = localStorage.getItem(`unitsOptions_${lhs}`);
+    if (stored) {
+      const unitsOptions = JSON.parse(stored);
+      return unitsOptions;
+    }
+    return undefined;
+  }
+
+  clearUnitsOptions(lhs: string) {
+    localStorage.removeItem(`unitsOptions_${lhs}`);
+  }
+}
diff --git a/src/app/state-management/effects/user.effects.ts b/src/app/state-management/effects/user.effects.ts
index efa3a2af00..14d313f4a5 100644
--- a/src/app/state-management/effects/user.effects.ts
+++ b/src/app/state-management/effects/user.effects.ts
@@ -30,6 +30,7 @@ import { Store } from "@ngrx/store";
 import {
   selectColumns,
   selectCurrentUser,
+  selectConditions,
 } from "state-management/selectors/user.selectors";
 import {
   addScientificConditionAction,
@@ -511,7 +512,8 @@ export class UserEffects {
   loadDefaultSettings$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(fromActions.loadDefaultSettings),
-      map(({ config }) => {
+      concatLatestFrom(() => this.store.select(selectConditions)),
+      map(([{ config }, existingConditions]) => {
         const defaultFilters =
           config.defaultDatasetsListSettings.filters ||
           initialUserState.filters;
@@ -527,18 +529,33 @@ export class UserEffects {
           initialUserState.columns;
         const isAuthenticated = this.authService.isAuthenticated();
 
-        return [
-          fromActions.updateConditionsConfigs({
-            conditionConfigs: defaultConditions,
-          }),
+        const actions = [];
+
+        if (!existingConditions || existingConditions.length === 0) {
+          actions.push(
+            fromActions.updateConditionsConfigs({
+              conditionConfigs: defaultConditions,
+            }),
+          );
+        }
+
+        actions.push(
           fromActions.updateHasFetchedSettings({
             hasFetchedSettings: !isAuthenticated,
           }),
+        );
+
+        actions.push(
           fromActions.updateFilterConfigs({ filterConfigs: defaultFilters }),
+        );
+
+        actions.push(
           fromActions.setDatasetTableColumnsAction({
             columns,
           }),
-        ];
+        );
+
+        return actions;
       }),
       concatMap((actions) => actions),
     );
diff --git a/src/app/state-management/models/index.ts b/src/app/state-management/models/index.ts
index 2c493a6230..900c1d4f88 100644
--- a/src/app/state-management/models/index.ts
+++ b/src/app/state-management/models/index.ts
@@ -137,8 +137,9 @@ type ScientificConditionRelation =
 export interface ScientificCondition {
   lhs: string;
   relation: ScientificConditionRelation;
-  rhs: string | number;
+  rhs: string | number | number[];
   unit: string;
+  unitsOptions?: string[];
 }
 
 export interface GenericFilters {

From 5c7e3fc30d11e2fee951e944523073e2ce259e9b Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Tue, 12 Aug 2025 22:58:45 +0200
Subject: [PATCH 213/245] Fix minor error during job-details initialization

---
 src/app/jobs/jobs-detail/jobs-detail.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.ts b/src/app/jobs/jobs-detail/jobs-detail.component.ts
index 7f2c393549..b96b26a865 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.ts
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.ts
@@ -34,7 +34,7 @@ export class JobsDetailComponent implements OnInit, OnDestroy {
       this.store.dispatch(fetchJobAction({ jobId: params.id }));
     });
     this.job$.subscribe((job) => {
-      this.hasJobResultObject =
+      this.hasJobResultObject = job &&
         Object.keys(job.jobResultObject || {}).length > 0;
     });
   }

From ecb5fef5129da7d78841ecf88021e84b7db70e17 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Mon, 8 Sep 2025 15:29:51 +0000
Subject: [PATCH 214/245] Fix job DTO in the frontend

This aligns all new jobs with the current CreateJobDtoV3.

Note, following https://github.com/SciCatProject/scicat-backend-next/issues/2174
the DTO will change and jobStatusMessage should be left as default.
For now, set jobStatusMessage to the default "jobSubmitted".
---
 .../datasets/admin-tab/admin-tab.component.ts |  2 +-
 src/app/datasets/archiving.service.ts         | 19 ++++++++++++-------
 .../datasets/datafiles/datafiles.component.ts |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/app/datasets/admin-tab/admin-tab.component.ts b/src/app/datasets/admin-tab/admin-tab.component.ts
index 1cd8cc483b..6556b2c072 100644
--- a/src/app/datasets/admin-tab/admin-tab.component.ts
+++ b/src/app/datasets/admin-tab/admin-tab.component.ts
@@ -65,7 +65,7 @@ export class AdminTabComponent implements OnInit, OnDestroy {
               type: "reset",
               datasetList: [fileObj],
               jobParams: {},
-              jobStatusMessage: "jobCreated",
+              jobStatusMessage: "jobSubmitted",
             };
             job.jobParams["username"] = user.username;
             this.store.dispatch(submitJobAction({ job }));
diff --git a/src/app/datasets/archiving.service.ts b/src/app/datasets/archiving.service.ts
index 1d2662860d..99b14a795a 100644
--- a/src/app/datasets/archiving.service.ts
+++ b/src/app/datasets/archiving.service.ts
@@ -12,6 +12,7 @@ import { RetrieveDestinations } from "app-config.service";
 import {
   OutputDatasetObsoleteDto,
   ReturnedUserDto,
+  CreateJobDtoV3,
 } from "@scicatproject/scicat-sdk-ts-angular";
 
 @Injectable()
@@ -27,13 +28,10 @@ export class ArchivingService {
     archive: boolean,
     destinationPath?: Record<string, string>,
     // Do not specify tape copies here
-  ) {
+  ): CreateJobDtoV3 {
     const extra = archive ? {} : destinationPath;
     const jobParams = {
-      datasetList: datasets.map((dataset) => ({
-        pid: dataset.pid,
-        files: [],
-      })),
+      username: user.username,
       ...extra,
     };
 
@@ -41,11 +39,18 @@ export class ArchivingService {
       user.email = profile.email;
     });
 
-    const data = {
+    // TODO remove jobStatusMessage when issue #2174 is resolved
+    // https://github.com/SciCatProject/scicat-backend-next/issues/2174
+    const data: CreateJobDtoV3 = {
       jobParams,
-      createdBy: user.username,
+      emailJobInitiator: user.email,
       // Revise this, files == []...? See earlier version of this method in dataset-table component for context
+      datasetList: datasets.map((dataset) => ({
+        pid: dataset.pid,
+        files: [],
+      })),
       type: archive ? "archive" : "retrieve",
+      jobStatusMessage: "jobSubmitted",
     };
 
     return data;
diff --git a/src/app/datasets/datafiles/datafiles.component.ts b/src/app/datasets/datafiles/datafiles.component.ts
index e57a10bf6a..44b5fdee36 100644
--- a/src/app/datasets/datafiles/datafiles.component.ts
+++ b/src/app/datasets/datafiles/datafiles.component.ts
@@ -317,7 +317,7 @@ export class DatafilesComponent
               files: this.getSelectedFiles(),
             },
           ],
-          jobStatusMessage: "jobCreated",
+          jobStatusMessage: "jobSubmitted",
         };
         this.store.dispatch(submitJobAction({ job: data }));
       }

From d3393534be8f540ec381f7818a044a60c0bcef4e Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Mon, 8 Sep 2025 19:28:53 +0000
Subject: [PATCH 215/245] Fix some error in tests

Tests still fail due to deeper issues.
---
 src/app/app-config.service.spec.ts                           | 4 ++++
 src/app/datasets/archiving.service.spec.ts                   | 2 +-
 src/app/datasets/depositor/empiar/empiar.component.spec.ts   | 2 +-
 src/app/datasets/share-dialog/share-dialog.component.spec.ts | 3 ++-
 src/app/shared/MockStubs.ts                                  | 1 -
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/app-config.service.spec.ts b/src/app/app-config.service.spec.ts
index 3ab11c6005..b6ee361c9e 100644
--- a/src/app/app-config.service.spec.ts
+++ b/src/app/app-config.service.spec.ts
@@ -226,6 +226,10 @@ const appConfig: AppConfigInterface = {
     ],
     conditions: [],
   },
+  datasetOneDepIntegration: true,
+  depositorURL: "http://localhost:4201",
+  ingestorEnabled: true,
+  ingestorMode: "creation",
 };
 
 describe("AppConfigService", () => {
diff --git a/src/app/datasets/archiving.service.spec.ts b/src/app/datasets/archiving.service.spec.ts
index 0768619635..538112c15c 100644
--- a/src/app/datasets/archiving.service.spec.ts
+++ b/src/app/datasets/archiving.service.spec.ts
@@ -113,7 +113,7 @@ describe("ArchivingService", () => {
         datasetList,
         type: "archive",
         jobResultObject: {},
-        statusMessage: "",
+        jobStatusMessage: "jobSubmitted",
       });
       const createJobSpy = spyOn<any, string>(
         service,
diff --git a/src/app/datasets/depositor/empiar/empiar.component.spec.ts b/src/app/datasets/depositor/empiar/empiar.component.spec.ts
index 0987d152bb..24c4b1d590 100644
--- a/src/app/datasets/depositor/empiar/empiar.component.spec.ts
+++ b/src/app/datasets/depositor/empiar/empiar.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { EmpiarComponent } from "../../empiar/empiar.component";
+import { EmpiarComponent } from "./empiar.component";
 
 describe("EmpiarComponent", () => {
   let component: EmpiarComponent;
diff --git a/src/app/datasets/share-dialog/share-dialog.component.spec.ts b/src/app/datasets/share-dialog/share-dialog.component.spec.ts
index 2c73e9d860..667e5471b1 100644
--- a/src/app/datasets/share-dialog/share-dialog.component.spec.ts
+++ b/src/app/datasets/share-dialog/share-dialog.component.spec.ts
@@ -32,6 +32,7 @@ import {
   DatasetsService,
   InstrumentsService,
   JobsService,
+  JobsV4Service,
   LogbooksService,
   ProposalsService,
   PublishedDataService,
@@ -77,7 +78,7 @@ describe("ShareDialogComponent", () => {
         { provide: UsersService, useClass: MockUserApi },
         { provide: InstrumentsService, useValue: {} },
         { provide: JobsService, useValue: {} },
-        { provide: JobsServiceV4, useValue: {} },
+        { provide: JobsV4Service, useValue: {} },
         { provide: ProposalsService, useValue: {} },
         { provide: SamplesService, useValue: {} },
         { provide: PublishedDataService, useClass: MockPublishedDataApi },
diff --git a/src/app/shared/MockStubs.ts b/src/app/shared/MockStubs.ts
index 290a3abfe6..2c82ad5190 100644
--- a/src/app/shared/MockStubs.ts
+++ b/src/app/shared/MockStubs.ts
@@ -24,7 +24,6 @@ import {
   OutputAttachmentV3Dto,
 } from "@scicatproject/scicat-sdk-ts-angular";
 import { SDKToken } from "./services/auth/auth.service";
-import { JobInterface } from "./sdk/models/Job";
 
 export class MockUserApi {
   getCurrentId() {

From 8bb3b6f421beaa5bb7c79180dc2498b2a13034b6 Mon Sep 17 00:00:00 2001
From: Philipp Wissmann <phwissmann@posteo.ch>
Date: Wed, 17 Sep 2025 09:04:41 +0200
Subject: [PATCH 216/245] Ingestor: fix logout button

Typo in selected callback method
---
 src/app/ingestor/ingestor-page/ingestor-transfer.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.html b/src/app/ingestor/ingestor-page/ingestor-transfer.component.html
index 0a343e2283..b304f0f114 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.html
@@ -74,7 +74,7 @@
                 </div>
                 <div *ngIf="userInfo.logged_in">
                   <button mat-stroked-button
-                    (click)="openIngestorLogin()">Logout</button>
+                    (click)="openIngestorLogout()">Logout</button>
                 </div>
               </div>
               <mat-divider class="divider-down"></mat-divider>

From ee18ca81dbc25f76e0502337aa60709cefc1196f Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 19 Sep 2025 12:50:14 +0000
Subject: [PATCH 217/245] another try

---
 .finished                                     |   0
 package-lock.json                             |   6 +-
 .../app-header/app-header.component.html      |   8 -
 src/app/app-config.service.spec.ts            |   2 -
 src/app/app-config.service.ts                 |   7 +-
 ...ataset-details-dashboard.routing.module.ts |  15 +-
 .../datasets.routing.module.ts                |  17 -
 .../ingestor.routing.module.ts                |   4 +-
 src/app/app-routing/service.guard.ts          |   3 -
 src/app/datasets/archiving.service.spec.ts    |   4 +-
 .../dataset-details-dashboard.component.ts    |   8 -
 src/app/datasets/datasets.module.ts           |  15 -
 .../depositor/depositor.component.html        | 122 ---
 .../depositor/depositor.component.scss        |  94 ---
 .../depositor/depositor.component.spec.ts     |  21 -
 .../datasets/depositor/depositor.component.ts | 162 ----
 .../empiar/customRenderers/authorRenderer.ts  |  97 ---
 .../empiar/customRenderers/enumRenderer.ts    |  75 --
 .../customRenderers/imagesSetRenderer.ts      | 179 -----
 .../customRenderers/referenceRenderer.ts      |  80 --
 .../customRenderers/renderer.styles.scss      |  33 -
 .../depositor/empiar/depositionEMPIAR.ts      | 412 ----------
 .../depositor/empiar/empiar.component.html    | 148 ----
 .../depositor/empiar/empiar.component.scss    |  37 -
 .../depositor/empiar/empiar.component.spec.ts |  21 -
 .../depositor/empiar/empiar.component.ts      | 256 -------
 .../questionnaire.component.html              |   1 -
 .../questionnaire.component.scss              |   0
 .../questionnaire.component.spec.ts           |  21 -
 .../questionnaire/questionnaire.component.ts  |  38 -
 .../empiar/schemasUI/citationUI.json          | 158 ----
 .../schemasUI/correspondingAuthorUI.json      |  85 --
 .../empiar/schemasUI/generalQuestionUI.json   | 133 ----
 .../empiar/schemasUI/imageSetsUI.json         |  94 ---
 .../depositor/empiar/schemasUI/piInfoUI.json  |  85 --
 .../depositor/methodWrapper.component.ts      |  69 --
 .../depositor/onedep/onedep.component.html    | 330 --------
 .../depositor/onedep/onedep.component.scss    | 280 -------
 .../depositor/onedep/onedep.component.ts      | 723 ------------------
 .../onedep/onedep.components.spec.ts          |  21 -
 .../depositor/onedep/onedep.directive.ts      |  67 --
 .../depositor/onedep/types/methods.enum.ts    | 287 -------
 .../ingestor-creation.component.spec.ts       |  90 +++
 .../ingestor-transfer.component.spec.ts       |  75 ++
 .../ingestor-transfer.component.ts            |   4 +-
 .../ingestor-page/ingestor.component.spec.ts  |  80 +-
 .../ingestor-page/ingestor.component.ts       |  22 +-
 src/app/ingestor/ingestor.module.ts           |   4 +-
 .../shared/sdk/apis/depositor.service.spec.ts |  16 -
 src/app/shared/sdk/apis/depositor.service.ts  |  86 ---
 src/app/shared/sdk/models/OneDep.ts           |  43 --
 .../actions/depositor.actions.ts              | 110 ---
 .../effects/depositor.effects.spec.ts         |  29 -
 .../effects/depositor.effects.ts              | 364 ---------
 src/app/state-management/models/index.ts      |   8 +
 .../reducers/depositor.reducer.ts             |  41 -
 .../reducers/empiar.reducer.ts                |  34 -
 .../reducers/onedep.reducer.spec.ts           |   0
 .../reducers/onedep.reducer.ts                |  35 -
 .../selectors/datasets.selectors.ts           |   2 +-
 .../selectors/depositor.selectors.ts          |  27 -
 .../state-management/state/depositor.store.ts |  34 -
 src/assets/config.json                        |  23 +-
 63 files changed, 276 insertions(+), 5069 deletions(-)
 delete mode 100644 .finished
 delete mode 100644 src/app/datasets/depositor/depositor.component.html
 delete mode 100644 src/app/datasets/depositor/depositor.component.scss
 delete mode 100644 src/app/datasets/depositor/depositor.component.spec.ts
 delete mode 100644 src/app/datasets/depositor/depositor.component.ts
 delete mode 100644 src/app/datasets/depositor/empiar/customRenderers/authorRenderer.ts
 delete mode 100644 src/app/datasets/depositor/empiar/customRenderers/enumRenderer.ts
 delete mode 100644 src/app/datasets/depositor/empiar/customRenderers/imagesSetRenderer.ts
 delete mode 100644 src/app/datasets/depositor/empiar/customRenderers/referenceRenderer.ts
 delete mode 100644 src/app/datasets/depositor/empiar/customRenderers/renderer.styles.scss
 delete mode 100644 src/app/datasets/depositor/empiar/depositionEMPIAR.ts
 delete mode 100644 src/app/datasets/depositor/empiar/empiar.component.html
 delete mode 100644 src/app/datasets/depositor/empiar/empiar.component.scss
 delete mode 100644 src/app/datasets/depositor/empiar/empiar.component.spec.ts
 delete mode 100644 src/app/datasets/depositor/empiar/empiar.component.ts
 delete mode 100644 src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.html
 delete mode 100644 src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.scss
 delete mode 100644 src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.spec.ts
 delete mode 100644 src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.ts
 delete mode 100644 src/app/datasets/depositor/empiar/schemasUI/citationUI.json
 delete mode 100644 src/app/datasets/depositor/empiar/schemasUI/correspondingAuthorUI.json
 delete mode 100644 src/app/datasets/depositor/empiar/schemasUI/generalQuestionUI.json
 delete mode 100644 src/app/datasets/depositor/empiar/schemasUI/imageSetsUI.json
 delete mode 100644 src/app/datasets/depositor/empiar/schemasUI/piInfoUI.json
 delete mode 100644 src/app/datasets/depositor/methodWrapper.component.ts
 delete mode 100644 src/app/datasets/depositor/onedep/onedep.component.html
 delete mode 100644 src/app/datasets/depositor/onedep/onedep.component.scss
 delete mode 100644 src/app/datasets/depositor/onedep/onedep.component.ts
 delete mode 100644 src/app/datasets/depositor/onedep/onedep.components.spec.ts
 delete mode 100644 src/app/datasets/depositor/onedep/onedep.directive.ts
 delete mode 100644 src/app/datasets/depositor/onedep/types/methods.enum.ts
 create mode 100644 src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts
 create mode 100644 src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts
 delete mode 100644 src/app/shared/sdk/apis/depositor.service.spec.ts
 delete mode 100644 src/app/shared/sdk/apis/depositor.service.ts
 delete mode 100644 src/app/shared/sdk/models/OneDep.ts
 delete mode 100644 src/app/state-management/actions/depositor.actions.ts
 delete mode 100644 src/app/state-management/effects/depositor.effects.spec.ts
 delete mode 100644 src/app/state-management/effects/depositor.effects.ts
 delete mode 100644 src/app/state-management/reducers/depositor.reducer.ts
 delete mode 100644 src/app/state-management/reducers/empiar.reducer.ts
 delete mode 100644 src/app/state-management/reducers/onedep.reducer.spec.ts
 delete mode 100644 src/app/state-management/reducers/onedep.reducer.ts
 delete mode 100644 src/app/state-management/selectors/depositor.selectors.ts
 delete mode 100644 src/app/state-management/state/depositor.store.ts

diff --git a/.finished b/.finished
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/package-lock.json b/package-lock.json
index b2c41ffefb..212d2bc944 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11101,9 +11101,9 @@
       "license": "MIT"
     },
     "node_modules/filesize": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.2.tgz",
-      "integrity": "sha512-s/iAeeWLk5BschUIpmdrF8RA8lhFZ/xDZgKw1Tan72oGws1/dFGB06nYEiyyssWUfjKNQTNRlrwMVjO9/hvXDw==",
+      "version": "11.0.7",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.7.tgz",
+      "integrity": "sha512-HozRSaD6ZrUdUVdSI9kJPsI9TzDZb+OZNL0xOWlxkQGfOsjh5Fp1AAI7GObJutOpclSBycHBDEREzwYcXPo8Ew==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 10.4.0"
diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index 2147d0466e..e035f995f1 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -2,14 +2,6 @@
   <mat-menu #mainMenu="matMenu">
     <ng-container *ngIf="mainMenuConfig$ | async as mainMenuConfig; else noMenuItems">
 
-      <ng-container *ngIf="config.ingestorEnabled">
-        <button mat-menu-item [routerLink]="['/ingestor']"
-          [queryParams]="{ discovery: true }">
-          <mat-icon> cloud_upload</mat-icon>
-          <span>Ingestor</span>
-        </button>
-      </ng-container>
-
       <ng-container *ngIf="mainMenuConfig?.datasets ?? false">
         <button mat-menu-item routerLink="/datasets/">
           <mat-icon> folder</mat-icon>
diff --git a/src/app/app-config.service.spec.ts b/src/app/app-config.service.spec.ts
index 3f1c7015e5..0c6f19affb 100644
--- a/src/app/app-config.service.spec.ts
+++ b/src/app/app-config.service.spec.ts
@@ -250,8 +250,6 @@ const appConfig: AppConfigInterface = {
     ],
     conditions: [],
   },
-  datasetOneDepIntegration: true,
-  depositorURL: "http://localhost:4201",
   ingestorEnabled: true,
   ingestorMode: "creation",
 };
diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index a2179a4173..ca78f710f1 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -1,10 +1,10 @@
 import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
-import { IngestorAutodiscovery } from "ingestor/ingestor-page/helper/ingestor.component-helper";
 import { timeout } from "rxjs/operators";
 import {
   DatasetDetailComponentConfig,
   DatasetsListSettings,
+  IngestorComponentConfig,
   LabelsLocalization,
   TableColumn,
 } from "state-management/models";
@@ -96,7 +96,6 @@ export interface AppConfigInterface {
   jupyterHubUrl: string | null;
   landingPage: string | null;
   lbBaseURL: string;
-  depositorURL: string;
   localColumns?: TableColumn[]; // localColumns is deprecated and should be removed in the future
   logbookEnabled: boolean;
   loginFormEnabled: boolean;
@@ -142,9 +141,7 @@ export interface AppConfigInterface {
   siteHeaderLogoUrl?: string;
   mainMenu?: MainMenuConfiguration;
   supportEmail?: string;
-  ingestorEnabled?: boolean;
-  ingestorMode?: string;
-  ingestorAutodiscoveryOptions?: IngestorAutodiscovery[];
+  ingestorComponent?: IngestorComponentConfig;
 }
 
 function isMainPageConfiguration(obj: any): obj is MainPageConfiguration {
diff --git a/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts b/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
index ac3a72d32a..4e5e7a0a4f 100644
--- a/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
+++ b/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
@@ -9,7 +9,6 @@ import { JsonScientificMetadataComponent } from "datasets/jsonScientificMetadata
 import { DatasetFileUploaderComponent } from "datasets/dataset-file-uploader/dataset-file-uploader.component";
 import { DatasetLifecycleComponent } from "datasets/dataset-lifecycle/dataset-lifecycle.component";
 import { ReduceComponent } from "datasets/reduce/reduce.component";
-import { DepositorComponent } from "datasets/depositor/depositor.component";
 import { RelatedDatasetsComponent } from "datasets/related-datasets/related-datasets.component";
 import { LogbooksDashboardComponent } from "logbooks/logbooks-dashboard/logbooks-dashboard.component";
 import { DatasetDetailWrapperComponent } from "datasets/dataset-detail/dataset-detail-wrapper.component";
@@ -69,19 +68,7 @@ const routes: Routes = [
     path: "admin",
     component: AdminTabComponent,
     canActivate: [AuthGuard, AdminGuard],
-  },
-  {
-    path: "depositor",
-    canActivate: [ServiceGuard],
-    children: [
-      {
-        path: "",
-        component: DepositorComponent,
-        canActivate: [AuthGuard],
-      },
-    ],
-    data: { service: "depositor" },
-  },
+  }
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
index a5ffef02c4..708be25017 100644
--- a/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
+++ b/src/app/app-routing/lazy/datasets-routing/datasets.routing.module.ts
@@ -6,9 +6,6 @@ import { BatchViewComponent } from "datasets/batch-view/batch-view.component";
 import { DashboardComponent } from "datasets/dashboard/dashboard.component";
 import { DatablocksComponent } from "datasets/datablocks-table/datablocks-table.component";
 import { DatasetDetailsDashboardComponent } from "datasets/dataset-details-dashboard/dataset-details-dashboard.component";
-import { OneDepComponent } from "datasets/depositor/onedep/onedep.component";
-import { EmpiarComponent } from "datasets/depositor/empiar/empiar.component";
-import { DepositorWrapperComponent } from "datasets/depositor/methodWrapper.component"
 import { PublishComponent } from "datasets/publish/publish.component";
 
 const routes: Routes = [
@@ -40,20 +37,6 @@ const routes: Routes = [
     component: DatablocksComponent,
     canActivate: [AuthGuard],
   },
-  {
-    path: ":id/onedep",
-    // component: OneDepComponent,
-    component: DepositorWrapperComponent,
-    data: { method: 'onedep' },
-    canActivate: [AuthGuard],
-  },
-  {
-    path: ":id/empiar",
-    // component: EmpiarComponent,
-    component: DepositorWrapperComponent,
-    data: { method: 'empiar' },
-    canActivate: [AuthGuard],
-  },
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
index 03d079021a..1a150cb173 100644
--- a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
+++ b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
@@ -1,11 +1,11 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
-import { IngestorComponent } from "ingestor/ingestor-page/ingestor.component";
+import { IngestorWrapperComponent } from "ingestor/ingestor-page/ingestor.component";
 
 const routes: Routes = [
   {
     path: "",
-    component: IngestorComponent,
+    component: IngestorWrapperComponent,
   },
 ];
 @NgModule({
diff --git a/src/app/app-routing/service.guard.ts b/src/app/app-routing/service.guard.ts
index 225f35b292..fddb5db54b 100644
--- a/src/app/app-routing/service.guard.ts
+++ b/src/app/app-routing/service.guard.ts
@@ -31,9 +31,6 @@ export class ServiceGuard implements CanActivate {
       case "reduce":
         shouldActivate = this.appConfig.datasetReduceEnabled;
         break;
-      case "depositor":
-        shouldActivate = this.appConfig.datasetOneDepIntegration;
-        break;
     }
     if (!shouldActivate) {
       this.router.navigate(["/404"], {
diff --git a/src/app/datasets/archiving.service.spec.ts b/src/app/datasets/archiving.service.spec.ts
index 538112c15c..d8e14e650e 100644
--- a/src/app/datasets/archiving.service.spec.ts
+++ b/src/app/datasets/archiving.service.spec.ts
@@ -112,8 +112,10 @@ describe("ArchivingService", () => {
         emailJobInitiator: user.email,
         datasetList,
         type: "archive",
+        executionTime: "",
         jobResultObject: {},
-        jobStatusMessage: "jobSubmitted",
+        statusMessage: "",
+        jobStatusMessage: "",
       });
       const createJobSpy = spyOn<any, string>(
         service,
diff --git a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
index 8506a5411c..ee969be6ff 100644
--- a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
+++ b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
@@ -62,7 +62,6 @@ enum TAB {
   attachments = "Attachments",
   admin = "Admin",
   lifecycle = "Lifecycle",
-  depositor = "Depositor",
 }
 @Component({
   selector: "dataset-details-dashboard",
@@ -106,7 +105,6 @@ export class DatasetDetailsDashboardComponent
     [TAB.logbook]: { action: fetchDatasetLogbookAction, loaded: false },
     [TAB.attachments]: { action: fetchAttachmentsAction, loaded: false },
     [TAB.admin]: { action: fetchDatablocksAction, loaded: false },
-    [TAB.depositor]: { action: fetchDatasetAction, loaded: false },
   };
   userProfile$ = this.store.select(selectProfile);
   isAdmin$ = this.store.select(selectIsAdmin);
@@ -215,12 +213,6 @@ export class DatasetDetailsDashboardComponent
                 icon: "settings",
                 enabled: isLoggedIn && isAdmin,
               },
-              {
-                location: "./depositor",
-                label: TAB.depositor,
-                icon: "file_upload",
-                enabled: isLoggedIn && hasAccessToDepositor,
-              },
             ];
           })
           .unsubscribe();
diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index 1853f42028..eea38f5ca5 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -80,21 +80,8 @@ import { DatasetsFilterSettingsComponent } from "./datasets-filter/settings/data
 import { CdkDrag, CdkDragHandle, CdkDropList } from "@angular/cdk/drag-drop";
 import { userReducer } from "state-management/reducers/user.reducer";
 import { MatSnackBarModule } from "@angular/material/snack-bar";
-import { OneDepComponent } from "./depositor/onedep/onedep.component";
-import { OrcidFormatterDirective } from "./depositor/onedep/onedep.directive";
-import { EmpiarComponent } from "./depositor/empiar/empiar.component";
-import { OneDepEffects } from "state-management/effects/depositor.effects";
-import { DepositorComponent } from "./depositor/depositor.component";
-import { DepositorWrapperComponent } from "./depositor/methodWrapper.component"
-import { QuestionnaireComponent } from "./depositor/empiar/questionnaire/questionnaire.component";
-import { onedepReducer } from "state-management/reducers/onedep.reducer";
-import { empiarReducer } from "state-management/reducers/empiar.reducer";
 import { JsonFormsModule } from "@jsonforms/angular";
 import { JsonFormsAngularMaterialModule } from "@jsonforms/angular-material";
-import { CustomEnumRendererComponent } from "./depositor/empiar/customRenderers/enumRenderer";
-import { CustomAuthorNameControlComponent } from "./depositor/empiar/customRenderers/authorRenderer";
-import { CustomReferenceControlComponent } from "./depositor/empiar/customRenderers/referenceRenderer";
-import { CustomSemiEnumControlComponent } from "./depositor/empiar/customRenderers/imagesSetRenderer";
 import { DatasetDetailDynamicComponent } from "./dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component";
 import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-wrapper.component";
 import { JsonHeadPipe } from "shared/pipes/json-head.pipe";
@@ -161,8 +148,6 @@ import { TitleCasePipe } from "shared/pipes/title-case.pipe";
     StoreModule.forFeature("publishedData", publishedDataReducer),
     StoreModule.forFeature("logbooks", logbooksReducer),
     StoreModule.forFeature("users", userReducer),
-    StoreModule.forFeature("onedep", onedepReducer),
-    StoreModule.forFeature("empiar", empiarReducer),
     LogbooksModule,
     MatMenuModule,
     CdkDropList,
diff --git a/src/app/datasets/depositor/depositor.component.html b/src/app/datasets/depositor/depositor.component.html
deleted file mode 100644
index 9a490ccd5c..0000000000
--- a/src/app/datasets/depositor/depositor.component.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<ng-template [ngIf]="dataset">
-  <div style="clear: both;"></div>
-  <div>
-    <div>
-      <mat-card [formGroup]="form" data-cy="general-info">
-        <mat-card-header class="general-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> assignment </mat-icon>
-          </div>
-          General information
-        </mat-card-header>
-        <mat-card-content>
-          <table>
-            <tr>
-              <th>Name</th>
-              <td>{{ dataset.datasetName || "-" }}</td>
-            </tr>
-            <tr>
-              <th>Description</th>
-              <td>
-                <span [innerHTML]="dataset.description || '-' | linky"></span>
-              </td>
-            </tr>
-            <tr>
-              <th>PID</th>
-              <td>
-                {{ dataset.pid }}
-              </td>
-            </tr>
-            <tr>
-              <th>Type</th>
-              <td>{{dataset.type }}</td>
-            </tr>
-            <tr>
-              <th>Creation Time</th>
-              <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
-            </tr>
-            <tr class="keywords-row">
-              <th>Keywords</th>
-              <mat-chip-set role="list" #keywordChips>
-                <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
-                  {{ keyword }}
-                </mat-chip>
-              </mat-chip-set>
-            </tr>
-          </table>
-        </mat-card-content>
-      </mat-card>
-      <mat-card>
-        <mat-card-header class="creator-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon>blur_linear</mat-icon>
-          </div>
-          Select Deposition Repository:
-        </mat-card-header>
-
-        <mat-card-content>
-          <div class="deposition-info-container">
-            <p class="deposition-info">
-              Before proceeding with deposition, please ensure that the scientific metadata for this dataset is complete and accurate.
-              You can verify look through the scientific metadata in the "Details" tab. 
-              If it requires changes you can update it using the OpenEM schema.
-              Please note, when SI values and units are present, you only need to make changes to the initially provided values and units, 
-              convertion to SI will be done automatically, after submitting. 
-            </p>
-            <button
-              class="ingestor"
-              mat-raised-button
-              color="primary"
-              (click)="onChangeIngestorMetadata()"
-            >
-              Edit with OpenEM Schema
-            </button>
-          </div>
-
-
-          <div class="includeIngestor">
-            <!-- Display the metadata editor if clicked-->
-            <app-metadata-editor
-              *ngIf="showMetadataEditor"
-              [data]="metadata"
-              [schema]="metadataSchema"
-              [renderView]="'all'"
-              (dataChange)="onMetadataChange($event)"
-              (errors)="onMetadataErrors($event)"
-            ></app-metadata-editor>
-            <button
-              *ngIf="showMetadataEditor"
-              class="ingestor"
-              mat-raised-button
-              color="primary"
-              (click)="onUpdateIngestorMetadata()"
-            >
-              Re-submit metadata
-            </button>
-          </div>
-          <mat-form-field class="method-name">
-            <mat-label>Experimental Method</mat-label>
-            <mat-select required [formControl]="depositionRepository" (selectionChange)="onChooseRepo()">
-              <mat-option *ngFor="let repo of supportedDepositionList" [value]="repo.value">
-                {{ repo.viewValue }}
-              </mat-option>
-            </mat-select>
-          </mat-form-field>
-        </mat-card-content>
-
-    
-
-      <!------  here put scientific Metadata ------>
-      </mat-card>
-      <div class="deposition-cards">
-        <mat-card *ngIf="selectedMethod === 'onedep'">
-          <app-onedep [dataset]="dataset" [user]="user" [showFirstCard]=false></app-onedep>
-        </mat-card>
-        <mat-card *ngIf="selectedMethod === 'empiar'">
-          <app-empiar [dataset]="dataset" [user]="user" [empiarSchemaEncoded]="empiarSchemaEncoded" [showFirstCard]=false></app-empiar>
-        </mat-card>
-      </div>
-      
-    </div>
-  </div>
-</ng-template>
diff --git a/src/app/datasets/depositor/depositor.component.scss b/src/app/datasets/depositor/depositor.component.scss
deleted file mode 100644
index 6e2a95bb10..0000000000
--- a/src/app/datasets/depositor/depositor.component.scss
+++ /dev/null
@@ -1,94 +0,0 @@
-mat-card {
-  margin: 1em;
-
-  .section-icon {
-    height: auto !important;
-    width: auto !important;
-
-    mat-icon {
-      vertical-align: middle;
-    }
-  }
-  .caption-text {
-    word-break: break-all;
-  }
-
-  .method-name {
-    min-width: 12rem;
-    align-self: left;
-    margin: 3rem;
-    width: 20%;
-  }
-
-  table {
-    th {
-      min-width: 10rem;
-      padding-right: 0.5rem;
-      text-align: left;
-    }
-
-    td {
-      width: 100%;
-      padding: 0.5rem 0;
-
-      .sample-edit {
-        padding-left: 0.5rem;
-
-        mat-icon {
-          font-size: medium;
-        }
-      }
-
-      .sample-edit:hover {
-        cursor: pointer;
-      }
-    }
-
-    .full-width {
-      width: 100%;
-    }
-
-    .keywords-row {
-      .add-keyword-chip:hover {
-        cursor: pointer;
-      }
-    }
-  }
-  .deposition-info-container {
-    display: flex;
-    flex-direction: column;
-    gap: 0.75rem;
-
-    margin: 1.5rem 3rem 1.5rem 3rem;
-
-    min-width: 12rem;
-    align-self: left;
-    width: 70%;
-  }
-  .includeIngestor{
-    display: flex;
-    flex-direction: column;
-    gap: 0.75rem;
-
-    margin: 1.5rem 3rem 1.5rem 3rem;
-
-    min-width: 12rem;
-    align-self: left;
-    width: 70%;
-
-  }
-
-  .deposition-info {
-    margin: 0;
-    font-size: 0.95rem;
-    line-height: 1.5;
-    color: #444;
-  }
-  .ingestor {
-    align-self: flex-start;
-    width: 300px;  
-    // margin-bottom: 1rem;
-    background-color: #B3D9AC;
-    color:black;
-  }
-}
diff --git a/src/app/datasets/depositor/depositor.component.spec.ts b/src/app/datasets/depositor/depositor.component.spec.ts
deleted file mode 100644
index f1bd7b3ba2..0000000000
--- a/src/app/datasets/depositor/depositor.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DepositorComponent } from './depositor.component';
-
-describe('DepositorComponent', () => {
-  let component: DepositorComponent;
-  let fixture: ComponentFixture<DepositorComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [DepositorComponent]
-    });
-    fixture = TestBed.createComponent(DepositorComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/datasets/depositor/depositor.component.ts b/src/app/datasets/depositor/depositor.component.ts
deleted file mode 100644
index 9b0e67cff4..0000000000
--- a/src/app/datasets/depositor/depositor.component.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import { Component, OnInit, OnDestroy } from "@angular/core";
-import {
-  FormControl,
-  FormGroup,
-  FormBuilder,
-  Validators,
-} from "@angular/forms";
-import { AppConfigService, AppConfigInterface } from "app-config.service";
-import { ActivatedRoute } from "@angular/router";
-import { JsonSchema } from "@jsonforms/core";
-import { Store } from "@ngrx/store";
-import {
-  OutputDatasetObsoleteDto,
-  ReturnedUserDto,
-} from "@scicatproject/scicat-sdk-ts-angular";
-import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
-// import {
-//   selectIsAdmin,
-//   selectIsLoading,
-//   selectIsLoggedIn,
-//   selectProfile,
-// } from "state-management/selectors/user.selectors";
-import { selectCurrentUser } from "state-management/selectors/user.selectors";
-import * as fromActions from "state-management/actions/depositor.actions";
-import { accessEmpiarSchema } from "state-management/actions/depositor.actions";
-import { selectEmpiarSchema } from "state-management/selectors/depositor.selectors";
-
-import { updatePropertyAction } from "state-management/actions/datasets.actions";
-
-import * as ingestorActions from "state-management/actions/ingestor.actions";
-import { GetExtractorResponse, MethodItem } from "../../shared/sdk/models/ingestor/models"
-import { selectIngestorExtractionMethods} from "state-management/selectors/ingestor.selector";
-
-// import { IngestorMetadataEditorComponent} from "../../ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component"
-
-import { Observable, Subscription, take, find } from "rxjs";
-import { Router } from "@angular/router";
-
-interface DepositionRepository {
-  value: string;
-  viewValue: string;
-}
-
-@Component({
-  selector: "depositor",
-  templateUrl: "./depositor.component.html",
-  styleUrls: ["./depositor.component.scss"],
-  standalone: false,
-})
-export class DepositorComponent implements OnInit, OnDestroy {
-  private subscriptions: Subscription[] = [];
-  form: FormGroup;
-
-  config: AppConfigInterface;
-  supportedDepositionList: DepositionRepository[] = [
-    { value: "onedep", viewValue: "OneDep" },
-    { value: "empiar", viewValue: "EMPIAR" },
-  ];
-  depositionRepository: FormControl;
-  dataset: OutputDatasetObsoleteDto | undefined;
-  user: ReturnedUserDto | undefined;
-
-  
-  selectedMethod: string | null = null;
-  onedepLink: {
-    location: string;
-    enabled: boolean;
-  } | null = null;
-
-  empiarSchemaEncoded:string | undefined;
-  showMetadataEditor = false;
-
-  metadata: any = {}; 
-  metadataSchema: JsonSchema = null// ideally i get the schema by uid?
-
-  methods$: Observable<MethodItem[]> = this.store.select(selectIngestorExtractionMethods)["methods"];
-
-  constructor(
-    public appConfigService: AppConfigService,
-    private store: Store,
-    private fb: FormBuilder,
-    private router: Router,
-  ) {
-    this.config = this.appConfigService.getConfig();
-    this.depositionRepository = new FormControl("");
-    this.form = this.fb.group({
-      datasetName: new FormControl("", [Validators.required]),
-      description: new FormControl("", [Validators.required]),
-      keywords: this.fb.array([]),
-    });
-  }
-  ngOnInit() {
-    this.store.dispatch(fromActions.connectToDepositor());
-
-    this.store.select(selectCurrentDataset).subscribe((dataset) => {
-      this.dataset = dataset;
-    });
-    this.subscriptions.push(
-      this.store.select(selectCurrentUser).subscribe((user) => {
-        if (user) {
-          this.user = user;
-        }
-      }),
-    );
-    this.store.select(selectCurrentDataset).subscribe((dataset) => {
-      this.dataset = dataset;
-      if (dataset) {
-        this.metadata = this.dataset.scientificMetadata;
-      }
-    });
-
-    this.store.dispatch(accessEmpiarSchema());
-    this.subscriptions.push(
-      this.store.select(selectEmpiarSchema).subscribe((schema) => {
-        this.empiarSchemaEncoded = schema;
-      })
-    );
-  }
-
-  ngOnDestroy() {
-    this.subscriptions.forEach((subscription) => {
-      subscription.unsubscribe();
-    });
-  }
-
-  onChooseRepo() {
-    this.selectedMethod = this.depositionRepository.value;
-  }
-
-  onChangeIngestorMetadata(){
-    this.store.dispatch(ingestorActions.getExtractionMethods({ page: 0, pageNumber: 50 }));
-    this.methods$.pipe(
-      take(1),
-    ).subscribe(methods => {
-      const selectedMethod = methods.find(m => m.name === 'Single Particle'); // that's bad, need to use an actual schema from elsewhere!
-      if (selectedMethod) {
-        const parsedSchema: JsonSchema = JSON.parse(selectedMethod.schema);
-        this.metadataSchema = parsedSchema;
-      }
-    });
-    // now it uses metadata tructure in place of schema 
-    this.showMetadataEditor = true
-  }
-
-  onMetadataChange(newData: any) {
-    this.metadata= newData;
-  }
-
-  onMetadataErrors(errors: any[]) {
-    console.warn('Metadata validation errors:', errors);
-  }
-
-
-  onUpdateIngestorMetadata() {
-    const pid = this.dataset.pid;
-    const property = { scientificMetadata: this.metadata };
-    this.store.dispatch(updatePropertyAction({ pid, property }));
-
-    this.showMetadataEditor = false // hide again after the form was submitted
-  }
-
-}
diff --git a/src/app/datasets/depositor/empiar/customRenderers/authorRenderer.ts b/src/app/datasets/depositor/empiar/customRenderers/authorRenderer.ts
deleted file mode 100644
index 29b597ab75..0000000000
--- a/src/app/datasets/depositor/empiar/customRenderers/authorRenderer.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { Component } from "@angular/core";
-import { JsonFormsControl } from "@jsonforms/angular";
-import {
-  and,
-  schemaTypeIs,
-  rankWith,
-  schemaMatches,
-  ControlElement,
-} from "@jsonforms/core";
-import { ExtendedJsonSchema } from "../depositionEMPIAR";
-
-@Component({
-  selector: "custom-author-name-control",
-  template: `
-    <div>
-      <mat-form-field appearance="outline">
-        <mat-label>Last Name<span *ngIf="isRequired">*</span></mat-label>
-        <input
-          matInput
-          [(ngModel)]="lastName"
-          (ngModelChange)="onNameChange()"
-        />
-        <mat-error *ngIf="error">{{ error }}</mat-error>
-      </mat-form-field>
-
-      <mat-form-field appearance="outline">
-        <mat-label>First Name(s)<span *ngIf="isRequired">*</span></mat-label>
-        <input
-          matInput
-          [(ngModel)]="firstNames"
-          (ngModelChange)="onNameChange()"
-        />
-        <mat-error *ngIf="error">{{ error }}</mat-error>
-      </mat-form-field>
-    </div>
-  `,
-  standalone: false,
-})
-export class CustomAuthorNameControlComponent extends JsonFormsControl {
-  lastName = "";
-  firstNames = "";
-  isRequired = false;
-
-  override ngOnInit() {
-    super.ngOnInit();
-    this.initializeValues();
-    this.checkIfRequired();
-  }
-  initializeValues() {
-    if (this.data) {
-      const nameMatch = this.data?.match(/\('(.+)', '(.+)'\)/);
-      if (nameMatch) {
-        this.lastName = nameMatch[1];
-        this.firstNames = nameMatch[2];
-      }
-    }
-  }
-
-  checkIfRequired() {
-    const controlElement = this.uischema as ControlElement;
-    const schemaProperties = this.schema?.properties;
-    if (controlElement?.scope && schemaProperties) {
-      const propertyKey = controlElement.scope.replace("#/properties/", "");
-      this.isRequired = this.schema?.required?.includes(propertyKey);
-    }
-  }
-
-  onNameChange() {
-    const initials = this.firstNames
-      .split(" ")
-      .map((word) => word.charAt(0).toUpperCase())
-      .join("");
-
-    const formattedName = `('${this.lastName}', '${initials}')`;
-
-    if (this.onChange) {
-      this.onChange({
-        path: this.path,
-        value: formattedName,
-      });
-    }
-  }
-}
-export const customNameControlRenderer = {
-  tester: rankWith(
-    4,
-    and(
-      schemaTypeIs("string"),
-      schemaMatches((schema) => {
-        const schemaId = (schema as ExtendedJsonSchema).$id;
-        return schemaId.includes("authors") || schemaId.includes("editors");
-      }),
-      schemaMatches((schema) => schema.title === "The Name Schema "), // careful with space at the end..
-    ),
-  ),
-  renderer: CustomAuthorNameControlComponent,
-};
diff --git a/src/app/datasets/depositor/empiar/customRenderers/enumRenderer.ts b/src/app/datasets/depositor/empiar/customRenderers/enumRenderer.ts
deleted file mode 100644
index 31dcfa1c49..0000000000
--- a/src/app/datasets/depositor/empiar/customRenderers/enumRenderer.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { Component } from "@angular/core";
-import { JsonFormsControl } from "@jsonforms/angular";
-import { rankWith, isEnumControl } from "@jsonforms/core";
-import {
-  ReleaseDate,
-  Scale,
-  ExperimentType,
-  CountryEnum,
-  ExtendedJsonSchema,
-} from "../depositionEMPIAR";
-
-@Component({
-  selector: "custom-enum-renderer",
-  styleUrls: ["./renderer.styles.scss"],
-  template: `
-    <mat-form-field appearance="outline" class="custom-dropdown">
-      <mat-label>{{ label }}</mat-label>
-      <mat-select [value]="data" (selectionChange)="onEnumChange($event.value)">
-        <mat-option
-          *ngFor="let option of transformedOptions"
-          [value]="option.value"
-        >
-          <span class="option-text">{{ option.label }}</span>
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-  `,
-  standalone: false,
-})
-export class CustomEnumRendererComponent extends JsonFormsControl {
-  transformedOptions = [];
-  $id?: string;
-
-  override ngOnInit() {
-    super.ngOnInit();
-    const propertyId = (this.scopedSchema as ExtendedJsonSchema).$id;
-    if (propertyId == "/properties/release_date") {
-      this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
-        value: val,
-        label: ReleaseDate[val] || val,
-      }));
-    } else if (propertyId == "/properties/scale") {
-      this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
-        value: val,
-        label: Scale["S" + val] || val,
-      }));
-    } else if (propertyId.split("/").at(-1) == "country") {
-      this.transformedOptions = this.scopedSchema.enum
-        .map((val: string) => ({
-          value: val,
-          label: CountryEnum[val] || val,
-        }))
-        .sort((a, b) => a.label.localeCompare(b.label));
-    } else if (propertyId == "/properties/experiment_type") {
-      this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
-        value: val,
-        label: ExperimentType["E" + val] || val,
-      }));
-    } else {
-      this.transformedOptions = this.scopedSchema.enum.map((val: string) => ({
-        value: val,
-        label: val,
-      }));
-    }
-  }
-
-  onEnumChange(value: string) {
-    this.onChange({ value });
-  }
-}
-
-export const customEnumRenderer = {
-  renderer: CustomEnumRendererComponent,
-  tester: rankWith(3, isEnumControl),
-};
diff --git a/src/app/datasets/depositor/empiar/customRenderers/imagesSetRenderer.ts b/src/app/datasets/depositor/empiar/customRenderers/imagesSetRenderer.ts
deleted file mode 100644
index b59f29564b..0000000000
--- a/src/app/datasets/depositor/empiar/customRenderers/imagesSetRenderer.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import { Component } from "@angular/core";
-import { JsonFormsControl } from "@jsonforms/angular";
-import {
-  and,
-  or,
-  rankWith,
-  schemaTypeIs,
-  schemaMatches,
-  scopeEndsWith,
-} from "@jsonforms/core";
-import { ExtendedJsonSchema } from "../depositionEMPIAR";
-@Component({
-  selector: "custom-semi-enum-control",
-  styleUrls: ["./renderer.styles.scss"],
-  template: `
-    <div class="voxel-type-container">
-      <label class="voxel-type-label">{{ title }}</label>
-      <mat-radio-group
-        [(ngModel)]="selectedType"
-        (change)="onVoxelTypeChange()"
-        class="voxel-type-radio-group"
-      >
-        <mat-radio-button
-          *ngFor="let option of options"
-          [value]="option.code"
-          class="voxel-type-radio-button"
-        >
-          {{ option.label }}
-        </mat-radio-button>
-        <mat-radio-button value="OT" class="voxel-type-radio-button"
-          >Other</mat-radio-button
-        >
-      </mat-radio-group>
-      <mat-form-field
-        *ngIf="selectedType === 'OT'"
-        appearance="outline"
-        class="voxel-type-input"
-      >
-        <mat-label>Specify Voxel Type</mat-label>
-        <input
-          matInput
-          [(ngModel)]="otherType"
-          (ngModelChange)="onVoxelTypeChange()"
-        />
-      </mat-form-field>
-    </div>
-  `,
-  standalone: false,
-})
-export class CustomSemiEnumControlComponent extends JsonFormsControl {
-  voxelOptions = [
-    { code: "T1", label: "Unsigned Byte" },
-    { code: "T2", label: "Signed Byte" },
-    { code: "T3", label: "Unsigned 16-bit Integer" },
-    { code: "T4", label: "Signed 16-bit Integer" },
-    { code: "T5", label: "Unsigned 32-bit Integer" },
-    { code: "T6", label: "Signed 32-bit Integer" },
-    { code: "T7", label: "32-bit Float" },
-    { code: "T8", label: "Bit" },
-    { code: "T9", label: "4-bit Integer" },
-  ];
-  dataFormatOptions = [
-    { code: "T1", label: "MRC" },
-    { code: "T2", label: "MRCS" },
-    { code: "T3", label: "TIFF" },
-    { code: "T4", label: "IMAGIC" },
-    { code: "T5", label: "DM3" },
-    { code: "T6", label: "DM4" },
-    { code: "T7", label: "SPIDER" },
-    { code: "T8", label: "BIG DATA VIEWER HDF5" },
-    { code: "T9", label: "EER" },
-    { code: "T10", label: "PNG" },
-    { code: "T11", label: "JPEG" },
-    { code: "T12", label: "SMV" },
-    { code: "T13", label: "EM" },
-    { code: "T14", label: "TPX3" },
-  ];
-  headerFormatOptions = [
-    { code: "T1", label: "MRC" },
-    { code: "T2", label: "MRCS" },
-    { code: "T3", label: "TIFF" },
-    { code: "T4", label: "IMAGIC" },
-    { code: "T5", label: "DM3" },
-    { code: "T6", label: "DM4" },
-    { code: "T7", label: "SPIDER" },
-    { code: "T8", label: "XML" },
-    { code: "T9", label: "EER" },
-    { code: "T10", label: "PNG" },
-    { code: "T11", label: "JPEG" },
-    { code: "T12", label: "SMV" },
-    { code: "T13", label: "EM" },
-    { code: "T14", label: "TPX3" },
-  ];
-  categoryOptions = [
-    { code: "T1", label: "Micrographs - Single Frame" },
-    { code: "T2", label: "Micrographs - Multiframe" },
-    { code: "T3", label: "Micrographs - Focal Pairs - Unprocessed" },
-    { code: "T4", label: "Micrographs - Focal Pairs - Contrast Inverted" },
-    { code: "T5", label: "Picked Particles - Single Frame - Unprocessed" },
-    { code: "T6", label: "Picked Particles - Multiframe - Unprocessed" },
-    { code: "T7", label: "Picked Particles - Single Frame - Processed" },
-    { code: "T8", label: "Picked Particles - Multiframe - Processed" },
-    { code: "T9", label: "Tilt Series" },
-    { code: "T10", label: "Class Averages" },
-    { code: "T11", label: "Stitched Maps" },
-    { code: "T12", label: "Diffraction Images" },
-    { code: "T13", label: "Reconstructed Volumes" },
-    { code: "T14", label: "Subtomograms" },
-  ];
-
-  selectedType = "";
-  otherType = "";
-  $id = "";
-  options = [];
-  title = "";
-
-  override ngOnInit() {
-    super.ngOnInit();
-    const propertyId = (this.scopedSchema as ExtendedJsonSchema).$id;
-    this.title = (this.scopedSchema as ExtendedJsonSchema).title;
-    if (propertyId == "/properties/imagesets/items/properties/category") {
-      this.options = this.categoryOptions;
-    } else if (
-      propertyId == "/properties/imagesets/items/properties/header_format"
-    ) {
-      this.options = this.headerFormatOptions;
-    } else if (
-      propertyId == "/properties/imagesets/items/properties/data_format"
-    ) {
-      this.options = this.dataFormatOptions;
-    } else if (
-      propertyId == "/properties/imagesets/items/properties/voxel_type"
-    ) {
-      this.options = this.voxelOptions;
-    }
-    this.initializeValue();
-  }
-
-  initializeValue() {
-    if (this.data) {
-      const match = this.data.match(/\('(.+)', '([^']*)'\)/);
-      if (match) {
-        this.selectedType = match[1];
-        this.otherType = match[2] || "";
-      }
-    }
-  }
-
-  onVoxelTypeChange() {
-    const formattedValue =
-      this.selectedType === "OT"
-        ? `('OT', '${this.otherType}')`
-        : `('${this.selectedType}', '')`;
-
-    if (this.onChange) {
-      this.onChange({ path: this.path, value: formattedValue });
-    }
-  }
-}
-
-export const customSemiEnumControlRenderer = {
-  tester: rankWith(
-    5,
-    and(
-      schemaTypeIs("string"),
-      schemaMatches((schema) => {
-        const schemaId = (schema as ExtendedJsonSchema).$id;
-        return schemaId.includes("imagesets");
-      }),
-      or(
-        scopeEndsWith("category"),
-        scopeEndsWith("header_format"),
-        scopeEndsWith("data_format"),
-        scopeEndsWith("voxel_type"),
-      ),
-    ),
-  ),
-  renderer: CustomSemiEnumControlComponent,
-};
diff --git a/src/app/datasets/depositor/empiar/customRenderers/referenceRenderer.ts b/src/app/datasets/depositor/empiar/customRenderers/referenceRenderer.ts
deleted file mode 100644
index e71d6a00e7..0000000000
--- a/src/app/datasets/depositor/empiar/customRenderers/referenceRenderer.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { Component } from "@angular/core";
-import { JsonFormsControl } from "@jsonforms/angular";
-import { and, rankWith, schemaTypeIs, schemaMatches } from "@jsonforms/core";
-import { ExtendedJsonSchema } from "../depositionEMPIAR";
-
-@Component({
-  selector: "custom-reference-control",
-  template: `
-    <div style="width: 20%;">
-      <mat-form-field appearance="outline" style="width: 100%;">
-        <input
-          matInput
-          [(ngModel)]="referenceValue"
-          (ngModelChange)="onReferenceChange()"
-          [pattern]="pattern"
-        />
-
-        <mat-error *ngIf="referenceValue && !referenceValue.match(pattern)">
-          Please enter a valid reference.
-        </mat-error>
-      </mat-form-field>
-    </div>
-  `,
-  standalone: false,
-})
-export class CustomReferenceControlComponent extends JsonFormsControl {
-  referenceValue = "";
-  pattern: string | undefined;
-
-  override ngOnInit() {
-    super.ngOnInit();
-    this.initializeValue();
-    if (this.schema?.properties?.name?.pattern) {
-      this.pattern = this.schema.properties.name.pattern;
-    }
-  }
-
-  initializeValue() {
-    if (this.data) {
-      this.referenceValue = this.data;
-    }
-  }
-
-  addReference() {
-    const newReference = { name: "EMD-" };
-    const updatedData = this.data
-      ? [...this.data, newReference]
-      : [newReference];
-
-    this.onChange({
-      path: this.path,
-      value: updatedData,
-    });
-  }
-  onReferenceChange() {
-    if (this.onChange) {
-      this.onChange({
-        path: this.path,
-        value: this.referenceValue,
-      });
-    }
-  }
-}
-
-export const customReferenceControlRenderer = {
-  tester: rankWith(
-    5,
-    and(
-      schemaTypeIs("string"),
-      schemaMatches((schema) => {
-        const schemaId = (schema as ExtendedJsonSchema).$id;
-        return schemaId.includes("reference");
-      }),
-      schemaMatches((schema) => {
-        return schema.title === "The Name Schema "; // careful with space at the end..
-      }),
-    ),
-  ),
-  renderer: CustomReferenceControlComponent,
-};
diff --git a/src/app/datasets/depositor/empiar/customRenderers/renderer.styles.scss b/src/app/datasets/depositor/empiar/customRenderers/renderer.styles.scss
deleted file mode 100644
index a7a08b0b93..0000000000
--- a/src/app/datasets/depositor/empiar/customRenderers/renderer.styles.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-.custom-dropdown {
-  width: 100%; 
-}
-
-.option-text {
-  white-space: normal;
-  display: block;
-  max-width:100%;
-  overflow-wrap: break-word;
-}
-
-::ng-deep .mat-option {
-  white-space: normal !important;
-}
-
-.voxel-type-container {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-}
-.voxel-type-label {
-  font-size: 1.2em;
-  font-weight: bold;
-}
-.voxel-type-radio-group {
-  gap: 5px;
-}
-.voxel-type-radio-button {
-  margin-bottom: 5px;
-}
-.voxel-type-input {
-  width: 100%;
-}
\ No newline at end of file
diff --git a/src/app/datasets/depositor/empiar/depositionEMPIAR.ts b/src/app/datasets/depositor/empiar/depositionEMPIAR.ts
deleted file mode 100644
index ec9ae61485..0000000000
--- a/src/app/datasets/depositor/empiar/depositionEMPIAR.ts
+++ /dev/null
@@ -1,412 +0,0 @@
-import { JsonSchema4 } from "@jsonforms/core";
-
-export interface EmpiarJson {
-  title: string;
-  releaseDate: ReleaseDate;
-  experimentType: ExperimentType;
-  scale?: Scale;
-  crossReferences?: References[];
-  biostudiesReferences?: References[];
-  idrReferences?: References[];
-  empiarReferences?: References[];
-  workflows?: Workflow[];
-  authors: Author[];
-  correspondingAuthor: AuthorExtended;
-  principalInvestigator: AuthorExtended[];
-  imagesets: ImageSet[];
-  citation: Citation[];
-}
-
-interface References {
-  name: string;
-}
-
-interface Workflow {
-  url: string;
-  type: number;
-}
-
-export interface Author {
-  name: string;
-  orderId: number;
-  authorOrcid?: string | null;
-}
-
-interface AuthorExtended {
-  authorOrcid?: string | null;
-  firstName: string;
-  middleName?: string | null;
-  lastName: string;
-  organization: string;
-  street?: string | null;
-  townOrCity: string;
-  stateOrProvince?: string | null;
-  postOrZip: string;
-  telephone?: string | null;
-  fax?: string | null;
-  email: string;
-  country: CountryEnum;
-}
-
-interface ImageSet {
-  name: string;
-  directory: string;
-  category: string;
-  headerFormat: string;
-  dataFormat: string;
-  numImagesOrTiltSeries: number;
-  framesPerImage: number;
-  frameRangeMin?: number | null;
-  frameRangeMax?: number | null;
-  voxelType: string;
-  pixelWidth?: number | null;
-  pixelHeight?: number | null;
-  details?: string | null;
-  micrographsFilePattern?: string | null;
-  pickedParticlesFilePattern?: string | null;
-  pickedParticlesDirectory?: string | null;
-  imageWidth?: number | null;
-  imageHeight?: number | null;
-}
-
-interface Citation {
-  authors: Author[];
-  editors?: Author[];
-  published: boolean;
-  preprint: boolean;
-  jOrNjCitation: boolean;
-  title: string;
-  volume?: string | null;
-  country?: CountryEnum | null;
-  firstPage?: string | null;
-  lastPage?: string | null;
-  year?: number | null;
-  language?: string | null;
-  doi?: string | null;
-  pubmedid?: string | null;
-  details?: string | null;
-  bookChapterTitle?: string | null;
-  publisher?: string | null;
-  publicationLocation?: string | null;
-  journal?: string | null;
-  journalAbbreviation?: string | null;
-  issue?: string | null;
-}
-// export function GetEnumTitles(enumObj: any): string[] {
-//   return Object.keys(enumObj).map(key => enumObj[key]);
-// }
-
-export function camelToSnake(obj: any): any {
-  if (Array.isArray(obj)) {
-    return obj.map(camelToSnake);
-  } else if (obj !== null && typeof obj === "object") {
-    return Object.keys(obj).reduce((acc, key) => {
-      const snakeKey = key.replace(
-        /[A-Z]/g,
-        (letter) => `_${letter.toLowerCase()}`,
-      );
-      acc[snakeKey] = camelToSnake(obj[key]);
-      return acc;
-    }, {} as any);
-  }
-  return obj;
-}
-export function snakeToCamel(obj: any): any {
-  if (Array.isArray(obj)) {
-    return obj.map(snakeToCamel);
-  } else if (obj !== null && typeof obj === "object") {
-    return Object.keys(obj).reduce((acc, key) => {
-      const camelKey = key.replace(/_([a-z])/g, (_, letter) =>
-        letter.toUpperCase(),
-      );
-      acc[camelKey] = snakeToCamel(obj[key]);
-      return acc;
-    }, {} as any);
-  }
-  return obj;
-}
-
-export interface ExtendedJsonSchema extends JsonSchema4 {
-  $id?: string;
-}
-
-export enum ReleaseDate {
-  RE = "directly after the submission has been processed",
-  EP = "after the related EMDB entry has been released",
-  HP = "after the related primary citation has been published",
-  HO = "delay release of entry by one year from the date of deposition",
-}
-
-export enum ExperimentType {
-  E1 = "image data collected using soft x-ray tomography",
-  E2 = "simulated data, for instance, created using InSilicoTEM (note: we only accept simulated data in special circumstances such as test/training sets for validation challenges: you need to ask for and be granted permission PRIOR to deposition otherwise the dataset will be rejected)",
-  E3 = "raw image data relating to structures deposited to the Electron Microscopy Data Bank",
-  E4 = "image data collected using serial block-face scanning electron microscopy (like the Gatan 3View system)",
-  E5 = "image data collected using focused ion beam scanning electron microscopy",
-  E6 = "integrative hybrid modelling data",
-  E7 = "correlative light-electron microscopy",
-  E8 = "correlative light X-ray microscopy",
-  E9 = "microcrystal electron diffraction",
-  E11 = "ATUM-SEM",
-  E12 = "Hard X-ray/X-ray microCT",
-  E13 = "ssET",
-}
-export enum Scale {
-  S1 = "molecule",
-  S2 = "virus",
-  S3 = "cell",
-  S4 = "tissue",
-  S5 = "organism",
-}
-
-export enum CountryEnum {
-  AF = "Afghanistan",
-  AL = "Albania",
-  DZ = "Algeria",
-  AS = "American Samoa",
-  AD = "Andorra",
-  AO = "Angola",
-  AI = "Anguilla",
-  AQ = "Antarctica",
-  AG = "Antigua and Barbuda",
-  AR = "Argentina",
-  AM = "Armenia",
-  AW = "Aruba",
-  AU = "Australia",
-  AT = "Austria",
-  AZ = "Azerbaijan",
-  BS = "Bahamas (the)",
-  BH = "Bahrain",
-  BD = "Bangladesh",
-  BB = "Barbados",
-  BY = "Belarus",
-  BE = "Belgium",
-  BZ = "Belize",
-  BJ = "Benin",
-  BM = "Bermuda",
-  BT = "Bhutan",
-  BO = "Bolivia (Plurinational State of)",
-  BQ = "Bonaire, Sint Eustatius and Saba",
-  BA = "Bosnia and Herzegovina",
-  BW = "Botswana",
-  BV = "Bouvet Island",
-  BR = "Brazil",
-  IO = "British Indian Ocean Territory (the)",
-  BN = "Brunei Darussalam",
-  BG = "Bulgaria",
-  BF = "Burkina Faso",
-  BI = "Burundi",
-  CV = "Cabo Verde",
-  KH = "Cambodia",
-  CM = "Cameroon",
-  CA = "Canada",
-  KY = "Cayman Islands (the)",
-  CF = "Central African Republic (the)",
-  TD = "Chad",
-  CL = "Chile",
-  CN = "China",
-  CX = "Christmas Island",
-  CC = "Cocos (Keeling) Islands (the)",
-  CO = "Colombia",
-  KM = "Comoros (the)",
-  CD = "Congo (the Democratic Republic of the)",
-  CG = "Congo (the)",
-  CK = "Cook Islands (the)",
-  CR = "Costa Rica",
-  HR = "Croatia",
-  CU = "Cuba",
-  CW = "Curaçao",
-  CY = "Cyprus",
-  CZ = "Czechia",
-  CI = "Côte d'Ivoire",
-  DK = "Denmark",
-  DJ = "Djibouti",
-  DM = "Dominica",
-  DO = "Dominican Republic (the)",
-  EC = "Ecuador",
-  EG = "Egypt",
-  SV = "El Salvador",
-  GQ = "Equatorial Guinea",
-  ER = "Eritrea",
-  EE = "Estonia",
-  SZ = "Eswatini",
-  ET = "Ethiopia",
-  FK = "Falkland Islands (the) [Malvinas]",
-  FO = "Faroe Islands (the)",
-  FJ = "Fiji",
-  FI = "Finland",
-  FR = "France",
-  GF = "French Guiana",
-  PF = "French Polynesia",
-  TF = "French Southern Territories (the)",
-  GA = "Gabon",
-  GM = "Gambia (the)",
-  GE = "Georgia",
-  DE = "Germany",
-  GH = "Ghana",
-  GI = "Gibraltar",
-  GR = "Greece",
-  GL = "Greenland",
-  GD = "Grenada",
-  GP = "Guadeloupe",
-  GU = "Guam",
-  GT = "Guatemala",
-  GG = "Guernsey",
-  GN = "Guinea",
-  GW = "Guinea-Bissau",
-  GY = "Guyana",
-  HT = "Haiti",
-  HM = "Heard Island and McDonald Islands",
-  VA = "Holy See (the)",
-  HN = "Honduras",
-  HK = "Hong Kong",
-  HU = "Hungary",
-  IS = "Iceland",
-  IN = "India",
-  ID = "Indonesia",
-  IR = "Iran (Islamic Republic of)",
-  IQ = "Iraq",
-  IE = "Ireland",
-  IM = "Isle of Man",
-  IL = "Israel",
-  IT = "Italy",
-  JM = "Jamaica",
-  JP = "Japan",
-  JE = "Jersey",
-  JO = "Jordan",
-  KZ = "Kazakhstan",
-  KE = "Kenya",
-  KI = "Kiribati",
-  KP = "Korea (the Democratic People's Republic of)",
-  KR = "Korea (the Republic of)",
-  KW = "Kuwait",
-  KG = "Kyrgyzstan",
-  LA = "Lao People's Democratic Republic (the)",
-  LV = "Latvia",
-  LB = "Lebanon",
-  LS = "Lesotho",
-  LR = "Liberia",
-  LY = "Libya",
-  LI = "Liechtenstein",
-  LT = "Lithuania",
-  LU = "Luxembourg",
-  MO = "Macao",
-  MG = "Madagascar",
-  MW = "Malawi",
-  MY = "Malaysia",
-  MV = "Maldives",
-  ML = "Mali",
-  MT = "Malta",
-  MH = "Marshall Islands (the)",
-  MQ = "Martinique",
-  MR = "Mauritania",
-  MU = "Mauritius",
-  YT = "Mayotte",
-  MX = "Mexico",
-  FM = "Micronesia (Federated States of)",
-  MD = "Moldova (the Republic of)",
-  MC = "Monaco",
-  MN = "Mongolia",
-  ME = "Montenegro",
-  MS = "Montserrat",
-  MA = "Morocco",
-  MZ = "Mozambique",
-  MM = "Myanmar",
-  NA = "Namibia",
-  NR = "Nauru",
-  NP = "Nepal",
-  NL = "Netherlands (the)",
-  NC = "New Caledonia",
-  NZ = "New Zealand",
-  NI = "Nicaragua",
-  NE = "Niger (the)",
-  NG = "Nigeria",
-  NU = "Niue",
-  NF = "Norfolk Island",
-  MP = "Northern Mariana Islands (the)",
-  NO = "Norway",
-  OM = "Oman",
-  PK = "Pakistan",
-  PW = "Palau",
-  PS = "Palestine, State of",
-  PA = "Panama",
-  PG = "Papua New Guinea",
-  PY = "Paraguay",
-  PE = "Peru",
-  PH = "Philippines (the)",
-  PN = "Pitcairn",
-  PL = "Poland",
-  PT = "Portugal",
-  PR = "Puerto Rico",
-  QA = "Qatar",
-  MK = "Republic of North Macedonia",
-  RO = "Romania",
-  RU = "Russian Federation (the)",
-  RW = "Rwanda",
-  RE = "Réunion",
-  BL = "Saint Barthélemy",
-  SH = "Saint Helena, Ascension and Tristan da Cunha",
-  KN = "Saint Kitts and Nevis",
-  LC = "Saint Lucia",
-  MF = "Saint Martin (French part)",
-  PM = "Saint Pierre and Miquelon",
-  VC = "Saint Vincent and the Grenadines",
-  WS = "Samoa",
-  SM = "San Marino",
-  ST = "Sao Tome and Principe",
-  SA = "Saudi Arabia",
-  SN = "Senegal",
-  RS = "Serbia",
-  SC = "Seychelles",
-  SL = "Sierra Leone",
-  SG = "Singapore",
-  SX = "Sint Maarten (Dutch part)",
-  SK = "Slovakia",
-  SI = "Slovenia",
-  SB = "Solomon Islands",
-  SO = "Somalia",
-  ZA = "South Africa",
-  GS = "South Georgia and the South Sandwich Islands",
-  SS = "South Sudan",
-  ES = "Spain",
-  LK = "Sri Lanka",
-  SD = "Sudan (the)",
-  SR = "Suriname",
-  SJ = "Svalbard and Jan Mayen",
-  SE = "Sweden",
-  CH = "Switzerland",
-  SY = "Syrian Arab Republic",
-  TW = "Taiwan (Province of China)",
-  TJ = "Tajikistan",
-  TZ = "Tanzania, United Republic of",
-  TH = "Thailand",
-  TL = "Timor-Leste",
-  TG = "Togo",
-  TK = "Tokelau",
-  TO = "Tonga",
-  TT = "Trinidad and Tobago",
-  TN = "Tunisia",
-  TR = "Turkey",
-  TM = "Turkmenistan",
-  TC = "Turks and Caicos Islands (the)",
-  TV = "Tuvalu",
-  UG = "Uganda",
-  UA = "Ukraine",
-  AE = "United Arab Emirates (the)",
-  GB = "United Kingdom of Great Britain and Northern Ireland (the)",
-  UM = "United States Minor Outlying Islands (the)",
-  US = "United States of America (the)",
-  UY = "Uruguay",
-  UZ = "Uzbekistan",
-  VU = "Vanuatu",
-  VE = "Venezuela (Bolivarian Republic of)",
-  VN = "Viet Nam",
-  VG = "Virgin Islands (British)",
-  VI = "Virgin Islands (U.S.)",
-  WF = "Wallis and Futuna",
-  EH = "Western Sahara",
-  YE = "Yemen",
-  ZM = "Zambia",
-  ZW = "Zimbabwe",
-  AX = "Åland Islands",
-}
diff --git a/src/app/datasets/depositor/empiar/empiar.component.html b/src/app/datasets/depositor/empiar/empiar.component.html
deleted file mode 100644
index 01964738e9..0000000000
--- a/src/app/datasets/depositor/empiar/empiar.component.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<ng-template [ngIf]="dataset">
-  <div style="clear: both;"></div>
-  <div>
-    <div>
-      
-      <div *ngIf="showFirstCard">
-        <mat-card [formGroup]="form" data-cy="general-info">
-          <mat-card-header class="general-header">
-            <div mat-card-avatar class="section-icon">
-              <mat-icon> assignment </mat-icon>
-            </div>
-            General information
-          </mat-card-header>
-          <mat-card-content>
-            <table>
-              <tr>
-                <th>Name</th>
-                <td>{{ dataset.datasetName || "-" }}</td>
-              </tr>
-              <tr>
-                <th>Description</th>
-                <td>
-                  <span [innerHTML]="dataset.description || '-' | linky"></span>
-                </td>
-              </tr>
-              <tr>
-                <th>PID</th>
-                <td>
-                  {{ dataset.pid }}
-                </td>
-              </tr>
-              <tr>
-                <th>Type</th>
-                <td>{{dataset.type }}</td>
-              </tr>
-              <tr>
-                <th>Creation Time</th>
-                <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
-              </tr>
-              <tr class="keywords-row">
-                <th>Keywords</th>
-                <mat-chip-set role="list" #keywordChips>
-                  <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
-                    {{ keyword }}
-                  </mat-chip>
-                </mat-chip-set>
-              </tr>
-            </table>
-          </mat-card-content>
-        </mat-card>
-      </div>
-      <mat-card>
-        <mat-card-header class="creator-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> assignment </mat-icon>
-          </div>
-          <!-- General Info and references card -->
-          EMPIAR deposition Information
-        </mat-card-header>
-        <jsonforms
-          [data]="data"
-          [schema]="schema"
-          [uischema]="generalSchema"
-          [renderers]="configuredRenderer"
-          (dataChange)="onDataChange($event)"
-         ></jsonforms>
-      </mat-card>
-
-      <!-- Authors card -->
-      <mat-card>
-        <mat-card-header class="file-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> contact_mail </mat-icon>
-          </div>
-          Corresponding Author Information
-        </mat-card-header>
-          <jsonforms
-          [data]="data"
-          [schema]="schema"
-          [uischema]="schemaCorrespondingAuthor"
-          [renderers]="configuredRenderer"
-          (dataChange)="onDataChange($event)"
-        ></jsonforms>
-      </mat-card>
-
-      <mat-card>
-        <mat-card-header class="file-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> contacts </mat-icon>
-          </div>
-          Principal Investigators Information
-        </mat-card-header>
-        <jsonforms
-          [data]="data"
-          [schema]="schema"
-          [uischema]="schemaPI"
-          [renderers]="configuredRenderer"
-          (dataChange)="onDataChange($event)"
-        ></jsonforms>
-      </mat-card>
-
-
-      <!-- Imagesets card -->
-
-      <mat-card>
-        <mat-card-header class="file-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> biotech </mat-icon>
-          </div>
-          Image sets
-        </mat-card-header>
-        <jsonforms
-          [data]="data"
-          [schema]="schema"
-          [uischema]="imageSets"
-          [renderers]="configuredRenderer"
-          (dataChange)="onDataChange($event)"
-         ></jsonforms>
-      </mat-card>
-
-    
-      <!-- Citation card -->
-
-      <mat-card>
-        <mat-card-header class="file-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> article </mat-icon>
-          </div>
-          Citation Information
-        </mat-card-header>
-        <jsonforms
-          [data]="data"
-          [schema]="schema"
-          [uischema]="citationSchema"
-          [renderers]="configuredRenderer"
-          (dataChange)="onDataChange($event)"
-         ></jsonforms>
-      </mat-card>
-
-
-      <div class="button-container">
-        <button class="submitDep" mat-raised-button color="primary" (click)="onSubmitClick()">
-          Next
-        </button>
-      </div>
-    </div>
-  </div>
-</ng-template>
\ No newline at end of file
diff --git a/src/app/datasets/depositor/empiar/empiar.component.scss b/src/app/datasets/depositor/empiar/empiar.component.scss
deleted file mode 100644
index 0fb6fd130e..0000000000
--- a/src/app/datasets/depositor/empiar/empiar.component.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-mat-card {
-  margin: 1em;
-  .section-icon {
-    height: auto !important;
-    width: auto !important;
-
-    mat-icon {
-      vertical-align: middle;
-    }
-  }
-
-  .card-container {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-    gap: 16px;
-    padding: 8px 16px 8px;
-  }
-}
-
-.button-container {
-  display: flex;       
-  align-items: flex-start; 
-  gap: 20px; 
-  margin-top: 16px;
-
-  .button-wrapper {
-    display: flex;
-    flex-direction: column;
-  }
-}
-.submitDep {
-  width: 300px;  
-  flex-direction: column;
-  background-color: #B3D9AC;
-  color:black;
-}
\ No newline at end of file
diff --git a/src/app/datasets/depositor/empiar/empiar.component.spec.ts b/src/app/datasets/depositor/empiar/empiar.component.spec.ts
deleted file mode 100644
index 24c4b1d590..0000000000
--- a/src/app/datasets/depositor/empiar/empiar.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-
-import { EmpiarComponent } from "./empiar.component";
-
-describe("EmpiarComponent", () => {
-  let component: EmpiarComponent;
-  let fixture: ComponentFixture<EmpiarComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [EmpiarComponent],
-    });
-    fixture = TestBed.createComponent(EmpiarComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it("should create", () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/datasets/depositor/empiar/empiar.component.ts b/src/app/datasets/depositor/empiar/empiar.component.ts
deleted file mode 100644
index c09dff055d..0000000000
--- a/src/app/datasets/depositor/empiar/empiar.component.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from "@angular/core";
-import { JsonSchema } from "@jsonforms/core";
-import { angularMaterialRenderers } from "@jsonforms/angular-material";
-import { AppConfigService, AppConfigInterface } from "app-config.service";
-import { Store, select } from "@ngrx/store";
-import {
-  OutputDatasetObsoleteDto,
-  ReturnedUserDto,
-} from "@scicatproject/scicat-sdk-ts-angular";
-import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
-import { selectCurrentUser } from "state-management/selectors/user.selectors";
-import { selectEmpiarSchema } from "state-management/selectors/depositor.selectors";
-import * as fromActions from "state-management/actions/depositor.actions";
-import { Subscription, Observable } from "rxjs";
-import * as datasetActions from "state-management/actions/datasets.actions";
-import { FormGroup, FormBuilder } from "@angular/forms";
-import generalSchemaAsset from "./schemasUI/generalQuestionUI.json";
-import imageSetsAssets from "./schemasUI/imageSetsUI.json";
-import piAsset from "./schemasUI/piInfoUI.json";
-import correspondingAuthorAsset from "./schemasUI/correspondingAuthorUI.json";
-import citationAsset from "./schemasUI/citationUI.json";
-import { EmpiarJson, camelToSnake, snakeToCamel } from "./depositionEMPIAR";
-import { customEnumRenderer } from "./customRenderers/enumRenderer";
-import { customNameControlRenderer } from "./customRenderers/authorRenderer";
-import { customReferenceControlRenderer } from "./customRenderers/referenceRenderer";
-import { customSemiEnumControlRenderer } from "./customRenderers/imagesSetRenderer";
-
-@Component({
-  selector: "app-empiar",
-  templateUrl: "./empiar.component.html",
-  styleUrls: ["./empiar.component.scss"],
-  standalone: false,
-})
-export class EmpiarComponent implements OnChanges, OnDestroy {
-  @Input() dataset!: OutputDatasetObsoleteDto | undefined;
-  @Input() user!: ReturnedUserDto | undefined;
-  @Input() empiarSchemaEncoded!: string; 
-  @Input() showFirstCard = true;
-
-  // private subscriptions: Subscription[] = [];
-  // dataset: OutputDatasetObsoleteDto | undefined;
-  // user: ReturnedUserDto | undefined;
-  form: FormGroup;
-  data: JsonSchema = createEmptyInstance();
-  schema: JsonSchema;
-
-  config: AppConfigInterface;
-
-  empiarSchema$: Observable<string>;
-  empiarSchema: string;
-
-  generalSchema = generalSchemaAsset;
-  imageSets = imageSetsAssets;
-  schemaPI = piAsset;
-  schemaCorrespondingAuthor = correspondingAuthorAsset;
-  citationSchema = citationAsset;
-
-  configuredRenderer = [
-    ...angularMaterialRenderers,
-    customEnumRenderer,
-    customNameControlRenderer,
-    customReferenceControlRenderer,
-    customSemiEnumControlRenderer,
-  ];
-
-  constructor(
-    // public appConfigService: AppConfigService,
-    // private store: Store,
-    private fb: FormBuilder,
-  ) {
-    // this.config = this.appConfigService.getConfig();
-    this.form = this.fb.group({
-      email: [""],
-    });
-  }
-
-  // ngOnInit() {
-  //   // initialize an array for the files to be uploaded
-  //   const pid = history.state.pid;
-  //   this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
-  //   this.store.select(selectCurrentDataset).subscribe((dataset) => {
-  //     this.dataset = dataset;
-  //   });
-  //   this.subscriptions.push(
-  //     this.store.select(selectCurrentUser).subscribe((user) => {
-  //       if (user) {
-  //         this.user = user;
-  //       }
-  //     }),
-  //   );
-  //   this.store.dispatch(fromActions.accessEmpiarSchema());
-  //   this.empiarSchema$ = this.store.select(selectEmpiarSchema);
-
-  //   this.empiarSchema$.subscribe((schema) => {
-  //     if (schema) {
-  //       this.empiarSchema = schema;
-  //       try {
-  //         const decodedSchema = atob(this.empiarSchema);
-  //         this.schema = JSON.parse(decodedSchema);
-  //       } catch (error) {
-  //         console.error("Failed to decode schema:", error);
-  //       }
-  //     }
-  //   });
-  //   this.data = { ...this.data };
-  //   this.data = camelToSnake(createEmptyInstance());
-  // }
-
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes['dataset'] && this.dataset) {
-      this.form.patchValue({
-        metadata: this.dataset.scientificMetadata,
-      });
-    }
-
-    if (changes['user'] && this.user) {
-      this.form.patchValue({
-        email: this.user.email,
-      });
-    }
-
-    if (changes['empiarSchemaEncoded'] && this.empiarSchemaEncoded) {
-      try {
-        const decodedSchema = atob(this.empiarSchemaEncoded);
-        this.schema = JSON.parse(decodedSchema);
-      } catch (error) {
-        console.error("Failed to decode schema:", error);
-      }
-    }
-  }
-  
-  ngOnDestroy() {
-    // this.subscriptions.forEach((subscription) => {
-    //   subscription.unsubscribe();
-    // });
-  }
-  onDataChange(event: EmpiarJson) {
-    this.data = event;
-  }
-
-  onSubmitClick() {
-    this.data = snakeToCamel(this.data);
-    this.data["authors"].map((author) => {
-      author["orderId"] = this.data["authors"].indexOf(author);
-    });
-    // to do create a json file based on entered data
-    console.log(this.data);
-  }
-}
-
-function createEmptyInstance(): EmpiarJson {
-  return {
-    title: "",
-    releaseDate: null,
-    experimentType: null,
-    scale: undefined,
-    crossReferences: [{ name: "EMD-" }],
-    biostudiesReferences: [],
-    idrReferences: [],
-    empiarReferences: [],
-    workflows: [],
-    authors: [
-      {
-        name: "",
-        orderId: 0,
-        authorOrcid: null,
-      },
-    ],
-    correspondingAuthor: {
-      authorOrcid: null,
-      firstName: "",
-      middleName: null,
-      lastName: "",
-      organization: "",
-      street: null,
-      townOrCity: "",
-      stateOrProvince: null,
-      postOrZip: "",
-      telephone: null,
-      fax: null,
-      email: "",
-      country: null,
-    },
-    principalInvestigator: [
-      {
-        authorOrcid: null,
-        firstName: "",
-        middleName: null,
-        lastName: "",
-        organization: "",
-        street: null,
-        townOrCity: "",
-        stateOrProvince: null,
-        postOrZip: "",
-        telephone: null,
-        fax: null,
-        email: "",
-        country: null,
-      },
-    ],
-    imagesets: [
-      {
-        name: "",
-        directory: "",
-        category: "",
-        headerFormat: "",
-        dataFormat: "",
-        numImagesOrTiltSeries: 0,
-        framesPerImage: 0,
-        // frameRangeMin?: 0,
-        // frameRangeMax?: 0,
-        voxelType: "",
-        // pixelWidth?: 0,
-        // pixelHeight?: 0,
-        // details?: "",
-        // micrographsFilePattern?: "",
-        // pickedParticlesFilePattern?: "",
-        // pickedParticlesDirectory?: "",
-        // imageWidth?: 0,
-        // imageHeight?: 0,
-      },
-    ],
-    citation: [
-      {
-        authors: [
-          {
-            name: "",
-            orderId: 0,
-            authorOrcid: "",
-          },
-        ],
-        editors: [],
-        published: false,
-        preprint: false,
-        jOrNjCitation: false,
-        title: "",
-        volume: null,
-        country: null,
-        firstPage: null,
-        lastPage: null,
-        year: null,
-        language: null,
-        doi: null,
-        pubmedid: null,
-        details: null,
-        bookChapterTitle: null,
-        publisher: null,
-        publicationLocation: null,
-        journal: null,
-        journalAbbreviation: null,
-        issue: null,
-      },
-    ],
-  };
-}
diff --git a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.html b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.html
deleted file mode 100644
index 0103a1386d..0000000000
--- a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>questionnaire works!</p>
diff --git a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.scss b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.spec.ts b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.spec.ts
deleted file mode 100644
index a82fa956ee..0000000000
--- a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { QuestionnaireComponent } from './questionnaire.component';
-
-describe('QuestionnaireComponent', () => {
-  let component: QuestionnaireComponent;
-  let fixture: ComponentFixture<QuestionnaireComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [QuestionnaireComponent]
-    });
-    fixture = TestBed.createComponent(QuestionnaireComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.ts b/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.ts
deleted file mode 100644
index bcdc002f3c..0000000000
--- a/src/app/datasets/depositor/empiar/questionnaire/questionnaire.component.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector: "app-questionnaire",
-  templateUrl: "./questionnaire.component.html",
-  styleUrls: ["./questionnaire.component.scss"],
-  standalone: false,
-})
-export class QuestionnaireComponent {
-
-}
-// import { Component, EventEmitter, Output, Input } from "@angular/core";
-// import { JsonSchema } from "@jsonforms/core";
-// import { configuredRenderer } from "./ingestor-metadata-editor-helper";
-
-// @Component({
-//   selector: "app-metadata-editor",
-//   template: `<jsonforms
-//     [data]="data"
-//     [schema]="schema"
-//     [renderers]="combinedRenderers"
-//     (dataChange)="onDataChange($event)"
-//   ></jsonforms>`,
-// })
-// export class IngestorMetadataEditorComponent {
-//   @Input() data: object;
-//   @Input() schema: JsonSchema;
-
-//   @Output() dataChange = new EventEmitter<string>();
-
-//   get combinedRenderers() {
-//     return configuredRenderer;
-//   }
-
-//   onDataChange(event: any) {
-//     this.dataChange.emit(event);
-//   }
-// }
diff --git a/src/app/datasets/depositor/empiar/schemasUI/citationUI.json b/src/app/datasets/depositor/empiar/schemasUI/citationUI.json
deleted file mode 100644
index f4cfb89b1c..0000000000
--- a/src/app/datasets/depositor/empiar/schemasUI/citationUI.json
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-  "type": "Group",
-  "label": "Citations",
-  "elements": [
-    {
-      "type": "Control",
-      "scope": "#/properties/citation",
-      "options": {
-        "elementLabelProp": "title",
-        "showSortButtons": false,
-        "detail": {
-          "type": "VerticalLayout",
-          "elements": [
-            {
-              "type": "Control",
-              "label": "Title",
-              "scope": "#/properties/title"
-            },
-            {
-              "type": "Control",
-              "label": "Published",
-              "scope": "#/properties/published",
-              "options": { "toggle": true }
-            },
-            {
-              "type": "Control",
-              "label": "Preprint",
-              "scope": "#/properties/preprint",
-              "options": { "toggle": true }
-            },
-            {
-              "type": "Control",
-              "label": "Journal Citation",
-              "scope": "#/properties/j_or_nj_citation",
-              "options": { "toggle": true }
-            },
-            {
-              "type": "Control",
-              "label": "Authors",
-              "scope": "#/properties/authors",
-              "options": {
-                "elementLabelProp": "name",
-                "detail": {
-                  "type": "VerticalLayout",
-                  "elements": [
-                    {
-                      "type": "Control",
-                      "label": "Name",
-                      "scope": "#/properties/name"
-                    },
-                    {
-                      "type": "Control",
-                      "label": "ORCID",
-                      "scope": "#/properties/author_orcid"
-                    }
-                  ]
-                }
-              }
-            },
-            {
-              "type": "Control",
-              "label": "Editors",
-              "scope": "#/properties/editors",
-              "options": {
-                "elementLabelProp": "name",
-                "detail": {
-                  "type": "VerticalLayout",
-                  "elements": [
-                    {
-                      "type": "Control",
-                      "label": "Name",
-                      "scope": "#/properties/name"
-                    },
-                    {
-                      "type": "Control",
-                      "label": "ORCID",
-                      "scope": "#/properties/author_orcid"
-                    }
-                  ]
-                }
-              }
-            },
-            {
-              "type": "Control",
-              "label": "Year",
-              "scope": "#/properties/year"
-            },
-            {
-              "type": "Control",
-              "label": "Volume",
-              "scope": "#/properties/volume"
-            },
-            {
-              "type": "Control",
-              "label": "Country",
-              "scope": "#/properties/country"
-            },
-            {
-              "type": "Control",
-              "label": "First Page",
-              "scope": "#/properties/first_page"
-            },
-            {
-              "type": "Control",
-              "label": "Last Page",
-              "scope": "#/properties/last_page"
-            },
-            {
-              "type": "Control",
-              "label": "DOI",
-              "scope": "#/properties/doi"
-            },
-            {
-              "type": "Control",
-              "label": "PubMed ID",
-              "scope": "#/properties/pubmedid"
-            },
-            {
-              "type": "Control",
-              "label": "Details",
-              "scope": "#/properties/details"
-            },
-            {
-              "type": "Control",
-              "label": "Book Chapter Title",
-              "scope": "#/properties/book_chapter_title"
-            },
-            {
-              "type": "Control",
-              "label": "Publisher",
-              "scope": "#/properties/publisher"
-            },
-            {
-              "type": "Control",
-              "label": "Publication Location",
-              "scope": "#/properties/publication_location"
-            },
-            {
-              "type": "Control",
-              "label": "Journal",
-              "scope": "#/properties/journal"
-            },
-            {
-              "type": "Control",
-              "label": "Journal Abbreviation",
-              "scope": "#/properties/journal_abbreviation"
-            },
-            {
-              "type": "Control",
-              "label": "Issue",
-              "scope": "#/properties/issue"
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
diff --git a/src/app/datasets/depositor/empiar/schemasUI/correspondingAuthorUI.json b/src/app/datasets/depositor/empiar/schemasUI/correspondingAuthorUI.json
deleted file mode 100644
index 7b1ed394bb..0000000000
--- a/src/app/datasets/depositor/empiar/schemasUI/correspondingAuthorUI.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "type": "Group",
-  "elements": [
-    {
-      "type": "Control",
-      "label": "Corresponding Author",
-      "scope": "#/properties/corresponding_author",
-      "options": {
-        "elementLabelProp": "last_name",
-        
-        "detail": {
-          "type": "VerticalLayout",
-          "elements": [
-            {
-              "type": "Control",
-              "label": "ORCID",
-              "scope": "#/properties/author_orcid",
-              "description": "ORCID identifier of the author (format: 0000-0000-0000-000X)"
-            },
-            {
-              "type": "Control",
-              "label": "First Name",
-              "scope": "#/properties/first_name"
-            },
-            {
-              "type": "Control",
-              "label": "Middle Name",
-              "scope": "#/properties/middle_name"
-            },
-            {
-              "type": "Control",
-              "label": "Last Name",
-              "scope": "#/properties/last_name"
-            },
-            {
-              "type": "Control",
-              "label": "Organization",
-              "scope": "#/properties/organization"
-            },
-            {
-              "type": "Control",
-              "label": "Street",
-              "scope": "#/properties/street"
-            },
-            {
-              "type": "Control",
-              "label": "Town/City",
-              "scope": "#/properties/town_or_city"
-            },
-            {
-              "type": "Control",
-              "label": "State/Province",
-              "scope": "#/properties/state_or_province"
-            },
-            {
-              "type": "Control",
-              "label": "Postal/ZIP Code",
-              "scope": "#/properties/post_or_zip"
-            },
-            {
-              "type": "Control",
-              "label": "Telephone",
-              "scope": "#/properties/telephone"
-            },
-            {
-              "type": "Control",
-              "label": "Fax",
-              "scope": "#/properties/fax"
-            },
-            {
-              "type": "Control",
-              "label": "Email",
-              "scope": "#/properties/email"
-            },
-            {
-              "type": "Control",
-              "label": "Country",
-              "scope": "#/properties/country"
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
diff --git a/src/app/datasets/depositor/empiar/schemasUI/generalQuestionUI.json b/src/app/datasets/depositor/empiar/schemasUI/generalQuestionUI.json
deleted file mode 100644
index 00dc819a80..0000000000
--- a/src/app/datasets/depositor/empiar/schemasUI/generalQuestionUI.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-  "type": "VerticalLayout",
-  "elements": [
-    {
-      "type":"Group", 
-      "elements":[
-        {
-          "type": "Control",
-          "label": "Title",
-          "scope": "#/properties/title",
-          "options":{
-            "multi":true
-          }
-        },
-        {
-          "type": "Control",
-          "label": "Release Date",
-          "scope": "#/properties/release_date",
-          "options": {
-            "format": "radio"
-          }
-        },
-        {
-          "type": "Control",
-          "label": "Experiment Type",
-          "scope": "#/properties/experiment_type",
-          "options": {
-            "format": "radio"
-          }
-        },
-        {
-          "type": "Control",
-          "label":"Scale",
-          "scope": "#/properties/scale",
-          "options": {
-            "format": "select"
-          }
-        }, 
-        {
-          "type": "Group",
-          "elements": [
-            {
-              "type": "Label",
-              "text": "EMDB References"
-            },
-            {
-              "type": "Control",
-              "scope": "#/properties/cross_references",
-              "options": {
-                "elementLabelProp": "name"
-              }
-            },
-            {
-              "type": "Label",
-              "text": "BioStudies References"
-            },
-            {
-              "type": "Control",
-              "scope": "#/properties/biostudies_references",
-              "options": {
-                "elementLabelProp": "name"
-              }
-            },
-            {
-              "type": "Label",
-              "text": "IDR References"
-            },
-            {
-              "type": "Control",
-              "scope": "#/properties/idr_references",
-              "options": {
-                "elementLabelProp": "name"
-              }
-            },
-            {
-              "type": "Label",
-              "text": "EMPIAR References"
-            },
-            {
-              "type": "Control",
-              "scope": "#/properties/empiar_references",
-              "options": {
-                "elementLabelProp": "name"
-              }
-            },
-            {
-              "type": "Label",
-              "text": "Workflows"
-            },
-            {
-              "type": "Control",
-              "label": "Workflows",
-              "scope": "#/properties/workflows",
-              "options": {
-                "elementLabelProp": "url"
-              }
-            }
-          ]
-        },
-        {
-          "type": "Group",
-          "elements": [
-            {
-              "type": "Control",
-              "label": "Authors",
-              "description": "Please add authors in the order they should appear in the publication.",
-              "scope": "#/properties/authors",
-              "options": {
-                "showSortButtons": true,
-                "detail": {
-                  "type": "VerticalLayout",
-                  "elements": [
-                    {
-                      "type": "Control",
-                      "label": "Author's Name",
-                      "scope": "#/properties/name",
-                      "description": "Format: ('Surname', 'Initials')"
-                    },
-                    {
-                      "type": "Control",
-                      "label": "Author ORCID",
-                      "scope": "#/properties/author_orcid"
-                    }
-                  ]
-                }
-              }
-            }            
-          ]
-        }        
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/app/datasets/depositor/empiar/schemasUI/imageSetsUI.json b/src/app/datasets/depositor/empiar/schemasUI/imageSetsUI.json
deleted file mode 100644
index 4f4362c05a..0000000000
--- a/src/app/datasets/depositor/empiar/schemasUI/imageSetsUI.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "type": "Group",
-  "elements": [
-    {
-      "type": "Control",
-      "label": "Image Sets",
-      "scope": "#/properties/imagesets",
-      "options": {
-        "elementLabelProp": "name",
-        "showSortButtons": false,
-        "detail": {
-          "type": "VerticalLayout",
-          "elements": [
-            {
-              "type": "Control",
-              "label": "Name",
-              "scope": "#/properties/name"
-            },
-            {
-              "type": "Control",
-              "label": "Directory",
-              "scope": "#/properties/directory"
-            },
-            {
-              "type": "Control",
-              "label": "Category",
-              "scope": "#/properties/category"
-            },
-            {
-              "type": "Control",
-              "label": "Header Format",
-              "scope": "#/properties/header_format"
-            },
-            {
-              "type": "Control",
-              "label": "Data Format",
-              "scope": "#/properties/data_format"
-            },
-            {
-              "type": "Control",
-              "label": "Number of Images/Tilt Series",
-              "scope": "#/properties/num_images_or_tilt_series"
-            },
-            {
-              "type": "Control",
-              "label": "Frames per Image",
-              "scope": "#/properties/frames_per_image"
-            },
-            {
-              "type": "Control",
-              "label": "Voxel Type",
-              "scope": "#/properties/voxel_type"
-            },
-            {
-              "type": "Control",
-              "label": "Pixel Width",
-              "scope": "#/properties/pixel_width"
-            },
-            {
-              "type": "Control",
-              "label": "Pixel Height",
-              "scope": "#/properties/pixel_height"
-            },
-            {
-              "type": "Control",
-              "label": "micrographs file pattern",
-              "scope": "#/properties/micrographs_file_pattern"
-            },
-            {
-              "type": "Control",
-              "label": "picked particles file pattern",
-              "scope": "#/properties/picked_particles_file_pattern"
-            },
-            {
-              "type": "Control",
-              "label": "picked particles directory",
-              "scope": "#/properties/picked_particles_directory"
-            },
-            {
-              "type": "Control",
-              "label": "Image width",
-              "scope": "#/properties/image_width"
-            },
-            {
-              "type": "Control",
-              "label": "Image hight",
-              "scope": "#/properties/image_height"
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
diff --git a/src/app/datasets/depositor/empiar/schemasUI/piInfoUI.json b/src/app/datasets/depositor/empiar/schemasUI/piInfoUI.json
deleted file mode 100644
index 1ccdc38c7e..0000000000
--- a/src/app/datasets/depositor/empiar/schemasUI/piInfoUI.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "type": "Group",
-  "elements": [
-    {
-      "type": "Control",
-      "label": "Principal Investigators",
-      "scope": "#/properties/principal_investigator",
-      "options": {
-        "elementLabelProp": "last_name",
-        "showSortButtons": false,
-        "detail": {
-          "type": "VerticalLayout",
-          "elements": [
-            {
-              "type": "Control",
-              "label": "ORCID",
-              "scope": "#/properties/author_orcid",
-              "description": "ORCID identifier of the author (format: 0000-0000-0000-000X)"
-            },
-            {
-              "type": "Control",
-              "label": "First Name",
-              "scope": "#/properties/first_name"
-            },
-            {
-              "type": "Control",
-              "label": "Middle Name",
-              "scope": "#/properties/middle_name"
-            },
-            {
-              "type": "Control",
-              "label": "Last Name",
-              "scope": "#/properties/last_name"
-            },
-            {
-              "type": "Control",
-              "label": "Organization",
-              "scope": "#/properties/organization"
-            },
-            {
-              "type": "Control",
-              "label": "Street",
-              "scope": "#/properties/street"
-            },
-            {
-              "type": "Control",
-              "label": "Town/City",
-              "scope": "#/properties/town_or_city"
-            },
-            {
-              "type": "Control",
-              "label": "State/Province",
-              "scope": "#/properties/state_or_province"
-            },
-            {
-              "type": "Control",
-              "label": "Postal/ZIP Code",
-              "scope": "#/properties/post_or_zip"
-            },
-            {
-              "type": "Control",
-              "label": "Telephone",
-              "scope": "#/properties/telephone"
-            },
-            {
-              "type": "Control",
-              "label": "Fax",
-              "scope": "#/properties/fax"
-            },
-            {
-              "type": "Control",
-              "label": "Email",
-              "scope": "#/properties/email"
-            },
-            {
-              "type": "Control",
-              "label": "Country",
-              "scope": "#/properties/country"
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
diff --git a/src/app/datasets/depositor/methodWrapper.component.ts b/src/app/datasets/depositor/methodWrapper.component.ts
deleted file mode 100644
index f24b10fbfc..0000000000
--- a/src/app/datasets/depositor/methodWrapper.component.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-
-import { Component, Input,  OnInit, OnDestroy } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
-
-import { Store } from "@ngrx/store";
-import { Subscription } from 'rxjs';
-
-import {
-  OutputDatasetObsoleteDto,
-  ReturnedUserDto,
-} from "@scicatproject/scicat-sdk-ts-angular";
-
-import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
-import { selectCurrentUser } from "state-management/selectors/user.selectors";
-import { fetchDatasetAction } from "state-management/actions/datasets.actions";
-import { accessEmpiarSchema } from "state-management/actions/depositor.actions";
-import { selectEmpiarSchema } from "state-management/selectors/depositor.selectors";
-
-@Component({
-  selector: 'app-depositor-wrapper',
-  template: `
-    <ng-container *ngIf="dataset && user">
-      <app-onedep *ngIf="method === 'onedep'" [dataset]="dataset" [user]="user" [showFirstCard]="showFirstCard"></app-onedep>
-      <app-empiar *ngIf="method === 'empiar'" [dataset]="dataset" [user]="user" [empiarSchemaEncoded]="empiarSchemaEncoded" [showFirstCard]="showFirstCard"></app-empiar>
-    </ng-container>
-  `,
-  standalone:false,
-})
-export class DepositorWrapperComponent implements OnInit {
-  @Input() method!: 'onedep' | 'empiar'; // Allows usage in depositor page too
-  dataset!: OutputDatasetObsoleteDto;
-  user!: ReturnedUserDto;
-  empiarSchemaEncoded!:string | undefined;
-
-  showFirstCard = false;
-
-
-  private subscriptions: Subscription[] = [];
-
-  constructor(
-    private route: ActivatedRoute, 
-    private store: Store, 
-    private router: Router) {}
-
-  ngOnInit() {
-    const pid = this.route.snapshot.paramMap.get('id');
-    this.method = this.route.snapshot.data['method'] ?? this.method; 
-    this.store.dispatch(fetchDatasetAction({ pid }));
-    this.store.select(selectCurrentDataset).subscribe((dataset) => {
-      this.dataset = dataset;
-    });
-    this.store.select(selectCurrentUser).subscribe((user) => {
-      this.user = user;
-    });
-    
-    const currentUrl = this.router.url;
-    if (currentUrl.includes('/empiar') || currentUrl.includes('/onedep')) {
-      this.showFirstCard = true;
-    } else {
-      this.showFirstCard = false;
-    }
-    this.store.dispatch(accessEmpiarSchema());
-    this.subscriptions.push(
-      this.store.select(selectEmpiarSchema).subscribe((schema) => {
-        this.empiarSchemaEncoded = schema;
-      })
-    );
-  }
-}
\ No newline at end of file
diff --git a/src/app/datasets/depositor/onedep/onedep.component.html b/src/app/datasets/depositor/onedep/onedep.component.html
deleted file mode 100644
index 175f47005c..0000000000
--- a/src/app/datasets/depositor/onedep/onedep.component.html
+++ /dev/null
@@ -1,330 +0,0 @@
-<ng-template [ngIf]="dataset">
-  <div style="clear: both;"></div>
-  <div>
-    <div>
-      <div *ngIf="showFirstCard">
-        <mat-card [formGroup]="form" data-cy="general-info">
-          <mat-card-header class="general-header">
-            <div mat-card-avatar class="section-icon">
-              <mat-icon> assignment </mat-icon>
-            </div>
-            General information
-          </mat-card-header>
-          <mat-card-content>
-            <table>
-              <tr>
-                <th>Name</th>
-                <td>{{ dataset.datasetName || "-" }}</td>
-              </tr>
-              <tr>
-                <th>Description</th>
-                <td>
-                  <span [innerHTML]="dataset.description || '-' | linky"></span>
-                </td>
-              </tr>
-              <tr>
-                <th>PID</th>
-                <td>
-                  {{ dataset.pid }}
-                </td>
-              </tr>
-              <tr>
-                <th>Type</th>
-                <td>{{dataset.type }}</td>
-              </tr>
-              <tr>
-                <th>Creation Time</th>
-                <td>{{ dataset.creationTime | date: "yyyy-MM-dd HH:mm" }}</td>
-              </tr>
-              <tr class="keywords-row">
-                <th>Keywords</th>
-                <mat-chip-set role="list" #keywordChips>
-                  <mat-chip role="listitem" *ngFor="let keyword of dataset.keywords">
-                    {{ keyword }}
-                  </mat-chip>
-                </mat-chip-set>
-              </tr>
-            </table>
-          </mat-card-content>
-        </mat-card>
-      </div>
-
-      <mat-card [formGroup]="form">
-        <mat-card-header class="creator-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> blur_linear </mat-icon>
-          </div>
-          Administrative and Method Information:
-        </mat-card-header>
-        <div class="card-container">
-          <div class="card-left">
-            <h2>Obtain OneDep Token</h2>
-            <p class="instruction">
-              Go to <a href="https://onedep-depui-test.wwpdb.org" target="_blank">OneDep API</a> and choose option to sign in with ORCID. After the authorization you will be redirected back to OneDep. In the left bar below the map, tick the
-              Deposition API option and click "Generate Key". Copy the token in the field below.
-            </p>
-            <mat-form-field class="token-field" appearance="outline">
-              <mat-label>Token</mat-label>
-              <textarea matInput required placeholder="copy the token here" rows="1" formControlName="jwtToken" (input)="autoGrow($event)" [style.overflow]="detailsOverflow"></textarea>
-            </mat-form-field>
-            <!-- Password Field -->
-            <h2 class="password">Password</h2>
-            <p class="instruction">You can provide a password, which will be confirmed in the email and sent to all provided ORCID users.</p>
-            <mat-form-field class="password-field" appearance="outline">
-              <mat-label>Password</mat-label>
-              <input matInput [type]="showPassword ? 'text' : 'password'" placeholder="enter your password" formControlName="password" />
-              <button mat-icon-button matSuffix (click)="togglePasswordVisibility()">
-                <mat-icon>{{ showPassword ? 'visibility_off' : 'visibility' }}</mat-icon>
-              </button>
-            </mat-form-field>
-          </div>
-          <div class="card-middle">
-            <h2>Enter 16-digit ORCID iD</h2>
-            <p class="instruction">Owners of these ORCIDs iDs are allowed to access this deposition.</p>
-            <!-- Link the orcid FormArray -->
-            <div formArrayName="orcid">
-              <ng-container *ngFor="let field of orcidArray().controls; let i = index">
-                <div [formGroupName]="i">
-                  <mat-form-field class="data-field" appearance="outline">
-                    <mat-label>Enter 16-digits ORCID iD</mat-label>
-                    <div class="input-container">
-                      <input matInput type="text" maxlength="19" placeholder="xxxx-xxxx-xxxx-xxxx" formControlName="orcidId" orcidFormatter />
-                      <button mat-icon-button class="remove-orcid-btn" (click)="removeOrcidField(i)">
-                        <mat-icon>clear</mat-icon>
-                      </button>
-                    </div>
-                  </mat-form-field>
-                  <mat-error *ngIf="field.get('orcidId')?.hasError('notNumeric')">
-                    ORCID ID must contain only numbers.
-                  </mat-error>
-                  <mat-error *ngIf="field.get('orcidId')?.touched  && field.get('orcidId')?.hasError('not16digits')">
-                    ORCID ID must contain 16 digits.
-                  </mat-error>
-                </div>
-              </ng-container>
-            </div>
-            <button mat-icon-button class="add-field-btn" (click)="addOrcidField()">
-              <mat-icon>add</mat-icon>
-            </button>
-          </div>
-          <div class="card-right">
-            <!-- Question 1: Electron Microscopy Method -->
-            <h2>Choose Electron Microscopy Method</h2>
-            <mat-form-field class="method-name">
-              <mat-label>experimental method</mat-label>
-              <mat-select required formControlName="emMethod" name="method" (selectionChange)="onMethodChange()">
-                <mat-option *ngFor="let method of methodsList" [value]="method.value">
-                {{ method.viewValue }}
-                </mat-option>
-              </mat-select>
-              <!-- Error Message -->
-              <mat-error *ngIf="form.get('emMethod')?.invalid && form.get('emMethod')?.touched">
-                You must specify the experimental method
-              </mat-error>
-            </mat-form-field>
-            <!-- Question 2: PDB Deposition -->
-            <tr *ngIf="form.value['emMethod'] && form.value['emMethod'] !== 'tomogram'">
-              <th class="questionnaire">Are you deposing coordinates with this submission? (for PDB)</th>
-              <td>
-                <mat-radio-group reuired formControlName="deposingCoordinates" (change)="onPDB($event)">
-                  <mat-radio-button name="deposingCoordinates" value="true">
-                    Yes
-                  </mat-radio-button>
-                  <mat-radio-button name="deposingCoordinates" value="false" checked>
-                    No
-                  </mat-radio-button>
-                </mat-radio-group>
-              </td>
-            </tr>
-            <!-- Question 3: Associated map -->
-            <tr *ngIf="form.value['emMethod'] && form.get('deposingCoordinates')?.value === 'true'">
-              <th>Has an associated map been deposited to EMDB?</th>
-              <td>
-                <mat-radio-group reuired formControlName="associatedMap">
-                  <mat-radio-button name="associatedMap" value="true">
-                    Yes
-                  </mat-radio-button>
-                  <mat-radio-button name="associatedMap" value="false">
-                    No
-                  </mat-radio-button>
-                </mat-radio-group>
-              </td>
-            </tr>
-            <!-- Question 4: EMDB Identifier Field -->
-            <tr *ngIf="form.value['emMethod'] && form.get('associatedMap').value === 'true' && form.get('deposingCoordinates').value === 'true'">
-              <th>EMDB Identifier</th>
-              <td>
-                <mat-form-field class="EMDB-ID">
-                  <mat-label>EMDB ID</mat-label>
-                  <input required matInput formControlName="emdbId" />
-                </mat-form-field>
-              </td>
-            </tr>
-            <!-- Final Question: Composite Map -->
-            <tr *ngIf=" form.value['emMethod']">
-              <th class="questionnaire">Is this a composite map?</th>
-              <td>
-                <mat-radio-group required formControlName="compositeMap">
-                  <mat-radio-button name="compositeMap" value="true">
-                    Yes
-                  </mat-radio-button>
-                  <mat-radio-button name="compositeMap" value="false" checked>
-                    No
-                  </mat-radio-button>
-                </mat-radio-group>
-              </td>
-            </tr>
-          </div>
-        </div>
-      </mat-card>
-      <!-- Attachments -->
-      <mat-card [formGroup]="form">
-        <mat-card-header class="file-header">
-          <div mat-card-avatar class="section-icon">
-            <mat-icon> attachment </mat-icon>
-          </div>
-          Choose files for deposition
-        </mat-card-header>
-        <mat-card-content>
-          <mat-card *ngFor="let fileType of files; let i = index" class="fileCard">
-            <mat-card-header matTooltip="{{ fileType.get('explanation').value }}" matTooltipPosition="above">
-              <mat-card-title>
-                {{ fileType.get('nameFE').value }}
-                <span class="required-asterisk" *ngIf="fileType.get('required').value"> *</span>
-              </mat-card-title>
-            </mat-card-header>
-            <mat-card-content>
-              <div class="file-selection-container">
-                <button class="fileChooser" mat-raised-button color="primary" (click)="onChooseFile(fileInput)">
-                Choose File
-                </button>
-                <div *ngIf="selectedFile[fileType.get('emName').value]">
-                  <mat-icon>attach_file</mat-icon>
-                </div>
-                <div *ngIf="(fileType.get('emName').value === 'add-map' && selectedFile['add-map-' + fileType.get('id').value]) || (fileType.get('emName').value === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.get('id').value])">
-                  <mat-icon>attach_file</mat-icon>
-                </div>
-                <input type="file" #fileInput (change)="fileType.get('emName').value === 'add-map' ? onFileAddMore($event, fileType.get('id').value, 'add-map') : fileType.get('emName').value === 'fsc-xml' ? onFileAddMore($event, fileType.get('id').value, 'fsc-xml') : onFileSelected($event, fileType.get('emName').value)" style="display: none;" />
-                <div *ngIf="(fileType.get('emName').value !== 'add-map' && selectedFile[fileType.get('emName').value]) || (fileType.get('emName').value === 'fsc-xml' && selectedFile['fsc-xml' + fileType.get('id').value])" class="fileName">
-                  <p>Selected File: {{ selectedFile[fileType.get('emName').value]?.name }}</p>
-                </div>
-                <div *ngIf="fileType.get('emName').value === 'add-map' && selectedFile['add-map-' + fileType.get('id').value]" class="fileName">
-                  <p>Selected File: {{ selectedFile['add-map-' + fileType.get('id').value]?.name }}</p>
-                </div>
-                <div *ngIf="fileType.get('emName').value === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.get('id').value]" class="fileName">
-                  <p>Selected File: {{ selectedFile['fsc-xml-' + fileType.get('id').value]?.name }}</p>
-                </div>
-                <div *ngIf=
-                  "(fileType.get('emName').value !== 'add-map' && fileType.get('emName').value !== 'fsc-xml' && selectedFile[fileType.get('emName').value]) ||
-                  (fileType.get('emName').value === 'add-map' && selectedFile['add-map-' + fileType.get('id').value]) ||
-                  (fileType.get('emName').value === 'fsc-xml' && selectedFile['fsc-xml-' + fileType.get('id').value])">
-                  <button
-                    mat-icon-button
-                    class="remove-field-btn"
-                    (click)="clearFile(fileType.get('emName').value, fileType.get('id').value)"
-                    >
-                    <mat-icon>clear</mat-icon>
-                  </button>
-                </div>
-                <mat-error *ngIf="fileType.get('file').hasError('correctExtension')">
-                  Invalid file format. Allowed formats: {{ fileType.get('fileFormat').value }}
-                </mat-error>
-               
-              </div>
-              <ng-container *ngIf="isMap(fileType.get('emName').value)">
-                <div class="input-container">
-                  <div class="contour-field-wrapper">  <!-- wrap into column the contour level and it's error message -->
-                    <ng-container>  <!--  *ngIf="fileType.get('contour').value !== null"  details and contour come together-->
-                      <mat-form-field appearance="outline" class="contour-level">
-                        <mat-label>Contour Level</mat-label>
-                        <input
-                        matInput
-                        type="number"
-                        placeholder="e.g. 0.0"
-                        [formControl]="getContourControl(fileType)"
-                        (input)="fileType.get('emName').value === 'vo-map' ? updateContourLevelMain($event) : 
-                        fileType.get('emName').value === 'add-map' ? updateContourLevelAddMap($event, fileType.get('id').value) : 
-                        updateContourLevel($event, fileType.get('emName').value)"
-                        />
-                      </mat-form-field>
-                      
-                      <mat-error *ngIf="fileType.get('contour').invalid && fileType.get('contour').touched" class="contour-error">
-                        Invalid contour level, must be numeric.
-                      </mat-error>
-                    </ng-container>
-                  </div>
-                  <ng-container> <!--  *ngIf="fileType.get('details') !== null" -->  
-                    <mat-form-field class="details">
-                      <mat-label>Short description</mat-label>
-                      <textarea
-                      matInput
-                      placeholder="Enter details..."
-                      rows="1"
-                      (input)="fileType.get('emName').value === 'add-map' ? updateDetailsAddMap($event, fileType.get('id').value) : updateDetails($event, fileType.get('emName').value)"
-                      (input)="autoGrow($event)"
-                      [style.overflow]="detailsOverflow"
-                      ></textarea>
-                    </mat-form-field>
-                  </ng-container>
-                </div>
-              </ng-container>
-            </mat-card-content>
-            <div *ngIf="fileType.get('emName').value === 'add-map' && fileType.get('id').value === 0">
-              <button mat-icon-button matTooltip="Add more maps" aria-label="Add another map" (click)="addMap()">
-                <mat-icon>add</mat-icon>
-              </button>
-            </div>
-            <div *ngIf="fileType.get('emName').value === 'fsc-xml' && fileType.get('id').value === 0">
-              <button mat-icon-button matTooltip="Add more FSC" aria-label="Add another FSC xml" (click)="addFSC()">
-                <mat-icon>add</mat-icon>
-              </button>
-            </div>
-          </mat-card>
-          <!-- UPLOAD FILES DONE -->
-          <div>
-            <mat-checkbox
-            formControlName="privacyTermsTicked"
-            >
-            Tick to indicate that you have read and accepted the wwPDB policy on personal data privacy, including what data wwPDB collects, how the data is stored and shared.
-            <a href="https://www.wwpdb.org/about/privacy" target="_blank">www.wwpdb.org/about/privacy</a>
-            </mat-checkbox>            
-          </div>
-          <div class="button-container">
-            <div class="button-wrapper">
-              <div *ngIf="depositClicked && !form.valid">
-                <button 
-                  class="submitDep" 
-                  mat-raised-button 
-                  color="primary" 
-                  (click)="onDepositClick()"
-                  [disabled]="!form.valid"
-                  >
-                  Start Deposition
-                </button>
-                <mat-error *ngIf="!form.valid && form.touched" class="form-error">
-                  Please complete the form before starting deposition!
-                </mat-error>
-              </div>
-              <div *ngIf="!depositClicked || (depositClicked && form.valid)">
-                <button 
-                  class="submitDep" 
-                  mat-raised-button 
-                  color="primary" 
-                  (click)="onDepositClick()"
-                  >
-                  Start Deposition
-                </button>
-                <mat-error *ngIf="!form.valid && form.touched" class="form-error">
-                  Please complete the form before starting deposition!
-                </mat-error>
-              </div>
-            </div>
-            <button class="submitDep" mat-raised-button color="primary" (click)="onDownloadClick()">
-            Download mmCIF
-            </button>
-          </div>
-        </mat-card-content>
-      </mat-card>
-    </div>
-  </div>
-</ng-template>
diff --git a/src/app/datasets/depositor/onedep/onedep.component.scss b/src/app/datasets/depositor/onedep/onedep.component.scss
deleted file mode 100644
index 939b46578c..0000000000
--- a/src/app/datasets/depositor/onedep/onedep.component.scss
+++ /dev/null
@@ -1,280 +0,0 @@
-mat-card {
-  margin: 1em;
-  .section-icon {
-    height: auto !important;
-    width: auto !important;
-
-    mat-icon {
-      vertical-align: middle;
-    }
-  }
-
-  .card-container {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-    gap: 16px;
-    padding: 8px 16px 8px;
-  }
-
-  .card-left, 
-  .card-middle,
-  .card-right {
-    flex: 0 0 33%;
-    display: flex;
-    flex-direction: column;
-    gap: 1rem;
-    box-sizing: border-box;
-    padding: 1rem; 
-
-  }
-
-  .card-left {
-    overflow-y: auto; /* Allows content to scroll if it overflows */
-  }
-  h2 {
-    font-size: 1.2rem;
-    margin-top: 0;
-  }
-  h2.password{
-    margin-top:3rem;
-  }
-  .file-header {/* space after the main Attachments card */
-    display: flex;
-    margin-bottom: 16px;
-  }
-
-  .instruction {
-    color: #555;
-    width: 80%;
-  }
-
-  .token-field {
-    width: 80%;
-    height: 20px;
-    min-width: 12rem;
-    margin-bottom: 8px;
-    margin-top: 0;
-    box-sizing: border-box
-  }
-  .token-field 
-    textarea {
-      width: 100%;              
-      max-height: calc(3 * 1.5em); // Allow up to 5 lines of text
-      overflow-y: auto;          // Show scrollbar only when needed
-      resize: none;              // Prevent manual resizing
-      box-sizing: border-box;    // Padding doesn't affect the size
-      line-height: 1.5;          // Match text line height
-      border: none;              // Remove textarea border
-      padding: 0;                // Remove padding
-    
-  }
-  .password-field{
-    width:40%;
-  }
-
-  .remove-orcid-btn {
-    position: absolute;
-    top: 50%;
-    right: -40%;
-    transform: translateY(-50%);
-    margin-left: 8px;
-    color: rgba(0, 0, 0, 0.6);
-  }
-
-  .remove-file-btn {
-    position: absolute;
-    margin-left: 16px;
-    color: rgba(0, 0, 0, 0.6);
-  }
-
-  .add-field-btn {
-    margin-top: 5px;
-    color: rgba(0, 0, 0, 0.6);
-    transition: color 0.3s ease;
-  }
-
-  button[mat-icon-button]:hover {
-      background-color: rgba(56, 178, 73, 0.1); /* Subtle background highlight on hover */
-  }
-  .add-field-btn:hover {
-    color: rgba(0, 0, 0, 0.9);
-  }
-
-  .add-field-btn mat-icon {
-    font-size: 24px;
-  }
-
-
-  th {
-    .questionnaire {
-      min-width: 20rem;
-    }
-
-    min-width: 10rem;
-    padding-right: 0.5rem;
-    text-align: left;
-  }
-
-  td {
-    width: 100%;
-    padding: 0.5rem 0;
-
-    mat-icon {
-      font-size: medium;
-    }
-  }
-
-  mat-radio-group {
-    display: flex;
-    flex-direction: column;
-    gap: 0;
-  }
-
-  mat-radio-button {
-    display: block;
-    margin-bottom: -0.7rem;
-  }
-
-
-  .EMDB-ID {
-    width: 50%;
-  }
-
-  .method-name {
-    min-width: 12rem;
-    width: 50%;
-  }
-
-  .file-types {
-    width: 10%;
-  }
-
-  .full-width {
-    width: 100%;
-  }
-
-
-  .fileCard {
-    width: 80%;
-    margin: 16px 0 0 0; /* Space between attachment cards */
-    border: 1px solid #ddd;
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
-
-    mat-card-header {
-      background-color: #B3D9AC;
-      height: 26px;
-      display: flex; 
-      align-items: center; 
-      padding: 0 16px; 
-    }
-
-    mat-card-title {
-      font-size: 16px;
-    }
-
-    .file-selection-container {
-      display: flex; 
-      align-items: center; 
-      gap: 16px;
-      
-
-      .fileChooser {
-        background-color: #CFE7CB;
-        color: #333;
-        margin: 16px 0 2px 0;
-      }
-
-      .fileName {
-        font-size: 16px; 
-        transform: translateY(15%);
-        color: #333; 
-      }
-    }
-
-    mat-card-content {
-      display: flex;
-      flex-direction: column;
-      margin-bottom: 0px;
-      
-      .data-field {
-        width: 350px; 
-        min-width: 320px; 
-        position: relative; 
-    }
-      
-      .input-container {
-        display: flex; 
-        align-items: flex-end;
-        gap: 16px;
-        margin-top: 0px;
-
-        .contour-level {
-          flex: 0 0 12%; // Set to take 12% of the width
-          min-width: 150px;
-
-          /* Chrome, Safari, Edge, Opera */
-          input[matinput]::-webkit-outer-spin-button,
-          input[matinput]::-webkit-inner-spin-button {
-            -webkit-appearance: none;
-            margin: 0;          }
-
-          /* Firefox */
-          input[matinput][type=number] {
-            -moz-appearance: textfield;
-          }
-        }
-        .contour-field-wrapper {
-          display: flex;
-          flex-direction: column;
-        }
-        
-        .mat-error {
-          flex: 1;
-          font-size: 0.75rem; /* Angular Material error size */
-          color: #f44336; /* Default error color */
-        }
-        .details {
-
-          margin-top:  16px;
-          flex: 1;
-          min-width: 200px;
-
-          mat-form-field {
-            textarea {
-              max-height: calc(3 * 1.5em); // 5 lines max height
-              overflow-y: hidden; // Hide overflow
-              resize: none; // Disable resizing
-              line-height: 1.5; // Set line height
-
-              &:focus {
-                height: auto; // Allow height to grow as needed
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  .button-container {
-    display: flex;       
-    align-items: flex-start; 
-    gap: 20px; 
-    margin-top: 16px;
-
-    .button-wrapper {
-      display: flex;
-      flex-direction: column;
-    }
-  }
-  .submitDep {
-    width: 300px;  
-    flex-direction: column;
-    background-color: #B3D9AC;
-    color:black;
-  }
-  .form-error{
-    margin-top: 16px;
-  }
-
-}
\ No newline at end of file
diff --git a/src/app/datasets/depositor/onedep/onedep.component.ts b/src/app/datasets/depositor/onedep/onedep.component.ts
deleted file mode 100644
index cd5b28819f..0000000000
--- a/src/app/datasets/depositor/onedep/onedep.component.ts
+++ /dev/null
@@ -1,723 +0,0 @@
-import {
-  Component,
-  Input,
-  OnChanges,
-  ViewChild,
-  ElementRef,
-  OnDestroy,
-  SimpleChanges
-} from "@angular/core";
-import { MatRadioChange } from "@angular/material/radio";
-import { AppConfigService, AppConfigInterface } from "app-config.service";
-import {
-  FormBuilder,
-  FormControl,
-  FormGroup,
-  FormArray,
-  Validators,
-  AbstractControl,
-  ValidationErrors,
-} from "@angular/forms";
-
-import { Store } from "@ngrx/store";
-import {
-  OutputDatasetObsoleteDto,
-  ReturnedUserDto,
-} from "@scicatproject/scicat-sdk-ts-angular";
-import { selectCurrentDataset } from "state-management/selectors/datasets.selectors";
-import { selectCurrentUser } from "state-management/selectors/user.selectors";
-import * as fromActions from "state-management/actions/depositor.actions";
-import * as datasetActions from "state-management/actions/datasets.actions";
-import {
-  createMethodsList,
-  EmFile,
-  DepositionFile,
-  OneDepUserInfo,
-  isMap,
-} from "./types/methods.enum";
-import { Depositor } from "shared/sdk/apis/depositor.service";
-import { Observable, Subscription } from "rxjs";
-import { isNumeric } from "mathjs";
-
-@Component({
-  selector: "app-onedep",
-  templateUrl: "./onedep.component.html",
-  styleUrls: ["./onedep.component.scss"],
-  standalone: false,
-})
-export class OneDepComponent implements OnChanges, OnDestroy {
-  @Input() dataset: OutputDatasetObsoleteDto | undefined;
-  @Input() user: ReturnedUserDto | undefined;
-  @Input() showFirstCard = true;
-  private subscriptions: Subscription[] = [];
-
-  config: AppConfigInterface;
-
-  // dataset: OutputDatasetObsoleteDto | undefined;
-  // user: ReturnedUserDto | undefined;
-  form: FormGroup;
-  showAssociatedMapQuestion = false;
-  methodsList = createMethodsList();
-  selectedFile: { [key: string]: File | null } = {};
-  emFile = EmFile;
-  detailsOverflow = "hidden";
-  additionalMaps = 0;
-  showPassword = false;
-  fileTypes: DepositionFile[]; // required to keep the initial set of files based on EM method
-  mainContour = 0.0;
-  isMap = isMap;
-  depositClicked = false;
-  privacyTermsTicked = false;
-  depID$: Observable<string>;
-  pid$: Observable<object>;
-  @ViewChild("fileInput") fileInput: ElementRef<HTMLInputElement> | undefined;
-
-  constructor(
-    public appConfigService: AppConfigService,
-    private store: Store,
-    private fb: FormBuilder,
-    private depositor: Depositor,
-  ) {
-    this.config = this.appConfigService.getConfig();
-    this.form = this.fb.group({
-      privacyTermsTicked: new FormControl(false, Validators.requiredTrue),
-      email: ["", [Validators.required, Validators.email]],
-      jwtToken: ["", Validators.required],
-      password: new FormControl(""),
-      metadata: ["", Validators.required],
-      orcid: this.fb.array([
-        this.fb.group({
-          orcidId: [
-            "",
-            [
-              Validators.required,
-              this.orcidValidatorNumeric(),
-              this.orcidValidator16digits(),
-            ],
-          ],
-        }),
-      ]),
-      emMethod: ["", Validators.required],
-      deposingCoordinates: new FormControl("false", Validators.required),
-      associatedMap: new FormControl("false", Validators.required),
-      compositeMap: new FormControl("false", Validators.required),
-      emdbId: new FormControl(""),
-      files: this.fb.array([]),
-    });
-  }
-
-  // ngOnInit() {
-  //   // initialize an array for the files to be uploaded
-  //   const pid = history.state.pid;
-  //   this.store.dispatch(datasetActions.fetchDatasetAction({ pid }));
-  //   this.fileTypes = [];
-  //   this.mainContour = 0.0;
-  //   //  connected in the depositor component
-  //   // this.store.dispatch(fromActions.connectToDepositor());
-
-  //   this.store.select(selectCurrentDataset).subscribe((dataset) => {
-  //     this.dataset = dataset;
-  //     if (dataset) {
-  //       this.form.patchValue({
-  //         metadata: this.dataset.scientificMetadata,
-  //       });
-  //     }
-  //   });
-
-  //   this.subscriptions.push(
-  //     this.store.select(selectCurrentUser).subscribe((user) => {
-  //       if (user) {
-  //         this.user = user;
-  //         this.form.patchValue({
-  //           email: this.user?.email || "",
-  //         });
-  //       }
-  //     }),
-  //   );
-  // }
-
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes['dataset'] && this.dataset) {
-      this.form.patchValue({
-        metadata: this.dataset.scientificMetadata,
-      });
-    }
-
-    if (changes['user'] && this.user) {
-      this.form.patchValue({
-        email: this.user.email || '',
-      });
-    }
-  }
-
-  ngOnDestroy() {
-    this.subscriptions.forEach((subscription) => {
-      subscription.unsubscribe();
-    });
-  }
-
-  togglePasswordVisibility() {
-    this.showPassword = !this.showPassword;
-  }
-
-  // custom validator of the ORCID ids
-  orcidValidatorNumeric(): (
-    control: AbstractControl,
-  ) => ValidationErrors | null {
-    return (control: AbstractControl): ValidationErrors | null => {
-      const value = control.value.replace(/-/g, "");
-      if (!value) {
-        return null;
-      }
-      const isValid = /^\d+$/.test(value);
-      return isValid ? null : { notNumeric: true };
-    };
-  }
-  orcidValidator16digits(): (
-    control: AbstractControl,
-  ) => ValidationErrors | null {
-    return (control: AbstractControl): ValidationErrors | null => {
-      const value = control.value.replace(/-/g, "");
-      if (!value) {
-        return null;
-      }
-      return value.length === 16 ? null : { not16digits: true };
-    };
-  }
-  orcidArray(): FormArray {
-    return this.form.get("orcid") as FormArray;
-  }
-  addOrcidField() {
-    // adds an empty ORCID field to the form
-    const orcidField = this.fb.group({
-      orcidId: [
-        "",
-        [
-          Validators.required,
-          this.orcidValidatorNumeric(),
-          this.orcidValidator16digits(),
-        ],
-      ],
-    });
-    this.orcidArray().push(orcidField);
-  }
-  removeOrcidField(index: number) {
-    // removes an ORCID field from the form; if it's first entry, just wipes the field
-    if (index === 0) {
-      this.orcidArray().at(0).reset({ orcidId: "" });
-    } else if (this.orcidArray().length > 1) {
-      this.orcidArray().removeAt(index);
-    }
-  }
-  addFileToForm(file: DepositionFile, index?: number) {
-    // adds a depositionFile to the form
-    const fileValidators = [this.correctExtension];
-    const contourValidators = [this.numericContourValidator];
-    if (file.required) {
-      // add-map is not required and hence excluded
-      if (this.isMap(file.emName)) {
-        contourValidators.push(Validators.required);
-      }
-      fileValidators.push(Validators.required);
-    }
-
-    const filesArray = this.form.get("files") as FormArray;
-    const fileGroup = this.fb.group({
-      emName: [file.emName],
-      id: [file.id],
-      nameFE: [file.nameFE],
-      type: [file.type],
-      fileName: [file.fileName],
-      file: [file.file, fileValidators],
-      required: [file.required],
-      contour: [file.contour, contourValidators],
-      details: [file.details],
-      fileFormat: [file.fileFormat],
-      explanation: [file.explanation],
-    });
-    if (index !== undefined) {
-      filesArray.insert(index, fileGroup);
-    } else {
-      filesArray.push(fileGroup);
-    }
-  }
-
-  //remove a file from the form; only used for co-cif (yes/no toggle). On method change a new files array will be generated
-  removeFileFromForm(controlName: EmFile) {
-    const filesArray = this.form.get("files") as FormArray;
-    const index = filesArray.value.findIndex(
-      (file: DepositionFile) => file.emName === controlName,
-    );
-    if (index > -1) {
-      filesArray.removeAt(index);
-    }
-  }
-  onMethodChange() {
-    // generates a form array with predefined types of depositionFiles with empty peoperties and specified required tag
-    const filesArray = this.form.get("files") as FormArray;
-    filesArray.clear(); // clear files form
-
-    this.methodsList = createMethodsList(); // Reset the methods list to be empty
-    this.fileTypes = this.methodsList.find(
-      (mL) => mL.value === this.form.value["emMethod"],
-    ).files;
-    this.fileTypes.forEach((fT) => {
-      fT.required =
-        fT.emName === this.emFile.MainMap || fT.emName === this.emFile.Image;
-    });
-    switch (this.form.value["emMethod"]) {
-      case "helical":
-        this.fileTypes.forEach((fT) => {
-          if (
-            fT.emName === this.emFile.HalfMap1 ||
-            fT.emName === this.emFile.HalfMap2
-          ) {
-            fT.required = true;
-          }
-        });
-        break;
-      case "single-particle":
-        this.fileTypes.forEach((fT) => {
-          if (
-            fT.emName === this.emFile.HalfMap1 ||
-            fT.emName === this.emFile.HalfMap2 ||
-            fT.emName === this.emFile.MaskMap
-          ) {
-            fT.required = true;
-          }
-        });
-        break;
-      case "tomogram":
-        // these questions in questionnaire are not relevant for tomogram but required for other methods
-        this.form.get("deposingCoordinates")?.setValue("false");
-        this.form.get("associatedMap")?.setValue("false");
-        break;
-    }
-    // let sortedfileType = new Array<DepositionFile>(this.fileTypes.length);
-    this.fileTypes.forEach((file) => {
-      if (file.emName !== this.emFile.Coordinates) {
-        this.addFileToForm(file);
-      }
-    });
-  }
-  get files() {
-    return (this.form.get("files") as FormArray).controls;
-  }
-
-  getContourControl(fileType: AbstractControl): FormControl {
-    return fileType.get("contour") as FormControl;
-  }
-  onPDB(event: MatRadioChange) {
-    const input = event.value;
-    if (input === "true") {
-      this.fileTypes.forEach((fT) => {
-        if (fT.emName === this.emFile.Coordinates) {
-          fT.required = true; // update the co-cif required status
-          this.addFileToForm(fT, 1);
-        }
-      });
-    } else {
-      this.removeFileFromForm(this.emFile.Coordinates);
-    }
-  }
-
-  autoGrow(event: Event) {
-    // function to auto-grow the textarea
-    const textarea = event.target as HTMLTextAreaElement;
-    const lineHeight = parseInt(getComputedStyle(textarea).lineHeight, 10);
-    const maxLines = 3;
-
-    textarea.style.height = "auto";
-
-    const newHeight = Math.min(textarea.scrollHeight, lineHeight * maxLines);
-    textarea.style.height = `${newHeight}px`;
-
-    this.detailsOverflow =
-      textarea.scrollHeight > newHeight ? "auto" : "hidden";
-  }
-  onChooseFile(fileInput: HTMLInputElement) {
-    fileInput.click();
-  }
-  onFileSelected(event: Event, controlName: EmFile) {
-    // once the file is selected, adds it to the form
-    const input = event.target as HTMLInputElement;
-    if (input.files && input.files.length > 0) {
-      this.selectedFile[controlName] = input.files[0];
-
-      const filesArray = this.form.get("files") as FormArray;
-      const fileControl = filesArray.controls.find(
-        (control) => control.get("emName")?.value === controlName,
-      );
-      if (fileControl) {
-        fileControl.get("file")?.setValue(this.selectedFile[controlName]);
-        fileControl
-          .get("fileName")
-          ?.setValue(this.selectedFile[controlName].name);
-        if (
-          this.mainContour !== 0.0 &&
-          [EmFile.MainMap, EmFile.HalfMap1, EmFile.HalfMap2].includes(
-            controlName,
-          )
-        ) {
-          fileControl.get("contour").setValue(this.mainContour);
-        }
-      }
-    }
-  }
-  onFileAddMore(event: Event, id: number, fileType: string) {
-    // once the file is selected, adds it to the form. Only for additional maps and FSC inputs, as they can include multiple files
-    const input = event.target as HTMLInputElement;
-    let fileControl;
-    if (input.files && input.files.length > 0) {
-      this.selectedFile[`${fileType}-${id}`] = input.files[0];
-
-      const filesArray = this.form.get("files") as FormArray;
-      if (fileType === "add-map") {
-        fileControl = filesArray.controls.find(
-          (control) =>
-            control.get("emName")?.value === this.emFile.AddMap &&
-            control.get("id")?.value === id,
-        );
-        if (fileControl) {
-          const contourControl = fileControl.get("contour");
-          contourControl.setValidators([
-            Validators.required,
-            ...(contourControl?.validator ? [contourControl.validator] : []),
-          ]);
-          contourControl?.updateValueAndValidity();
-        }
-      } else {
-        fileControl = filesArray.controls.find(
-          (control) =>
-            control.get("emName")?.value === this.emFile.FSC &&
-            control.get("id")?.value === id,
-        );
-      }
-      if (fileControl) {
-        fileControl
-          .get("file")
-          ?.setValue(this.selectedFile[`${fileType}-${id}`]);
-        fileControl
-          .get("fileName")
-          ?.setValue(this.selectedFile[`${fileType}-${id}`].name);
-      }
-    }
-  }
-
-  clearFile(controlName: EmFile, id?: number) {
-    // clear the selected file from form
-    const key =
-      controlName === "add-map" || controlName === "fsc-xml"
-        ? `${controlName}-${id}`
-        : controlName;
-    this.selectedFile[key] = null;
-
-    let index = -1;
-    const filesArray = this.form.get("files") as FormArray;
-    if (controlName !== "add-map" && controlName !== "fsc-xml") {
-      index = filesArray.value.findIndex(
-        (file: DepositionFile) => file.emName === controlName,
-      );
-    } else {
-      for (let i = 0; i < filesArray.length; i++) {
-        if (
-          filesArray.at(i).value.emName === controlName &&
-          filesArray.at(i).value.id === id
-        ) {
-          index = i;
-          break;
-        }
-      }
-    }
-    if (index > -1) {
-      filesArray.at(index).patchValue({ file: null });
-    }
-  }
-
-  updateContourLevelMain(event: Event) {
-    const input = (event.target as HTMLInputElement).value.trim();
-    const normalizedInput = input.replace(",", ".");
-    const parsedValue = parseFloat(normalizedInput);
-    if (!isNaN(parsedValue)) {
-      this.mainContour = parsedValue;
-      this.files.forEach((fT) => {
-        if (
-          fT.value.file &&
-          (fT.value.emName === EmFile.MainMap ||
-            fT.value.emName === EmFile.HalfMap1 ||
-            fT.value.emName === EmFile.HalfMap2)
-        ) {
-          fT.value.contour = this.mainContour;
-        }
-      });
-    }
-  }
-  updateContourLevelAddMap(event: Event, id: number) {
-    const input = (event.target as HTMLInputElement).value.trim();
-    const normalizedInput = input.replace(",", ".");
-    const parsedValue = parseFloat(normalizedInput);
-    if (!isNaN(parsedValue)) {
-      const filesArray = this.form.get("files") as FormArray;
-      const fileControl = filesArray.controls.find(
-        (control) =>
-          control.get("emName")?.value === this.emFile.AddMap &&
-          control.get("id")?.value === id,
-      );
-      if (fileControl) {
-        fileControl.get("contour")?.patchValue(parsedValue);
-      }
-    }
-  }
-  updateContourLevel(event: Event, controlName: EmFile) {
-    const input = (event.target as HTMLInputElement).value.trim();
-    const normalizedInput = input.replace(",", ".");
-    const parsedValue = parseFloat(normalizedInput);
-    if (!isNaN(parsedValue)) {
-      const filesArray = this.form.get("files") as FormArray;
-      const fileControl = filesArray.controls.find(
-        (control) => control.get("emName")?.value === controlName,
-      );
-      if (fileControl) {
-        fileControl.get("contour")?.patchValue(parsedValue);
-      }
-    }
-  }
-  updateDetails(event: Event, controlName: EmFile) {
-    // function to update details for a map
-    const textarea = event.target as HTMLTextAreaElement;
-    const value = textarea.value;
-
-    const filesArray = this.form.get("files") as FormArray;
-    const fileControl = filesArray.controls.find(
-      (control) => control.get("emName")?.value === controlName,
-    );
-    if (fileControl) {
-      fileControl.get("details")?.patchValue(value);
-    }
-  }
-  updateDetailsAddMap(event: Event, id: number) {
-    // function to update details for additional maps
-    const textarea = event.target as HTMLTextAreaElement;
-    const value = textarea.value;
-    const filesArray = this.form.get("files") as FormArray;
-    const fileControl = filesArray.controls.find(
-      (control) =>
-        control.get("emName")?.value === this.emFile.AddMap &&
-        control.get("id")?.value === id,
-    );
-    if (fileControl) {
-      fileControl.get("details")?.patchValue(value);
-    }
-  }
-  addMap() {
-    // adds an empty DepositionFile of type Add-Map to the form
-    const nextId =
-      this.files
-        .filter((file) => file.value.emName === EmFile.AddMap)
-        .reduce(
-          (maxId, file) => (file.value.id > maxId ? file.value.id : maxId),
-          0,
-        ) + 1;
-
-    const newMap: DepositionFile = {
-      emName: EmFile.AddMap,
-      id: nextId,
-      nameFE: "Additional Map ( " + (nextId + 1).toString() + " )",
-      type: "add-map",
-      fileName: "",
-      file: null,
-      contour: null,
-      details: "",
-      required: false,
-      fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
-      explanation:
-        "Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)",
-    };
-    // get the index of last map in the files array and insert as next
-    const filesArray = this.form.get("files") as FormArray;
-    const index = filesArray.value.findIndex(
-      (file: DepositionFile) =>
-        file.emName === EmFile.AddMap && file.id === nextId - 1,
-    );
-    this.addFileToForm(newMap, index + 1);
-  }
-  addFSC() {
-    // adds an empty DepositionFile of type FSC to the form
-    const nextId =
-      this.files
-        .filter((file) => file.value.emName === EmFile.FSC)
-        .reduce(
-          (maxId, file) => (file.value.id > maxId ? file.value.id : maxId),
-          0,
-        ) + 1;
-
-    const newFSC: DepositionFile = {
-      emName: EmFile.FSC,
-      id: nextId,
-      nameFE: "FSC-XML ( " + (nextId + 1).toString() + " )",
-      type: "fsc-xml",
-      fileName: "",
-      file: null,
-      required: false,
-      fileFormat: [".xml"],
-      explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs",
-    };
-    // get the index of last fsc in the files array and insert as next
-    const filesArray = this.form.get("files") as FormArray;
-    const index = filesArray.value.findIndex(
-      (file: DepositionFile) =>
-        file.emName === EmFile.FSC && file.id === nextId - 1,
-    );
-    this.addFileToForm(newFSC, index + 1);
-  }
-
-  correctExtension(controlFile: AbstractControl): ValidationErrors | null {
-    // checks if the provided files has a correct extension
-    const fileValue = controlFile.value;
-    if (!fileValue) {
-      return null;
-    }
-    const allowedExtensions = controlFile.parent?.get("fileFormat")?.value;
-    const fileName = fileValue.name || fileValue;
-    const fileExtension = fileName.endsWith(".gz")
-      ? "." + fileName.split(".").slice(-2).join(".")
-      : "." + fileName.split(".").pop();
-
-    if (allowedExtensions && allowedExtensions.includes(fileExtension)) {
-      return null;
-    }
-    return { correctExtension: true };
-  }
-
-  numericContourValidator(
-    controlFile: AbstractControl,
-  ): ValidationErrors | null {
-    const value = controlFile.value;
-
-    if (value === null || value === undefined) {
-      return null;
-    }
-
-    return isNumeric(value) ? null : { notNumeric: true };
-  }
-
-  onDepositClick() {
-    // Mark the form as submitted (trigger validation)
-    this.depositClicked = true;
-    this.form.markAllAsTouched();
-    if (this.form.invalid) {
-      return;
-    }
-    this.submit();
-  }
-
-  submit() {
-    let body: OneDepUserInfo;
-    if (this.form.value.password) {
-      body = {
-        email: this.form.value.email,
-        orcidIds: this.orcidArray().value.map((item) => item.orcidId),
-        country: "United States",
-        method: this.form.value.emMethod,
-        jwtToken: this.form.value.jwtToken,
-        password: this.form.value.password,
-        coordinates: this.form.value.deposingCoordinates === "true",
-      };
-    } else {
-      body = {
-        email: this.form.value.email,
-        orcidIds: this.orcidArray().value.map((item) => item.orcidId),
-        country: "United States",
-        method: this.form.value.emMethod,
-        jwtToken: this.form.value.jwtToken,
-        coordinates: this.form.value.deposingCoordinates === "true",
-      };
-    }
-    let metadataAdded = false;
-
-    const filesToUpload = this.files
-      .filter((fT) => fT.value.file)
-      .map((fT) => {
-        const formDataFile = new FormData();
-        formDataFile.append("jwtToken", this.form.value.jwtToken);
-        formDataFile.append("file", fT.value.file);
-        if (fT.value.emName === this.emFile.Coordinates) {
-          formDataFile.append(
-            "scientificMetadata",
-            JSON.stringify(this.form.value.metadata),
-          );
-          metadataAdded = true;
-        } else {
-          formDataFile.append(
-            "fileMetadata",
-            JSON.stringify({
-              name: fT.value.fileName,
-              type: fT.value.type,
-              contour: fT.value.contour,
-              details: fT.value.details,
-            }),
-          );
-        }
-        return { form: formDataFile, fileType: fT.value.emName };
-      });
-    // if (!metadataAdded) {
-    //   const formDataFile = new FormData();
-
-    //   formDataFile.append("jwtToken", this.form.value.jwtToken);
-    //   formDataFile.append(
-    //     "scientificMetadata",
-    //     JSON.stringify(this.form.value.metadata),
-    //   );
-    //   // FIXME: This is a temporary fix, the metadata fileType should be specified as such, once supported by OneDep API
-    //   filesToUpload.push({ form: formDataFile, fileType: EmFile.Coordinates });
-    // }
-
-    this.store.dispatch(
-      fromActions.submitDeposition({
-        deposition: body as OneDepUserInfo,
-        files: filesToUpload,
-      }),
-    );
-  }
-  onDownloadClick() {
-    if (this.form.value.deposingCoordinates === "true") {
-      const fileEntry = this.files.find(
-        (fileType) => fileType.value.emName === this.emFile.Coordinates,
-      );
-
-      if (fileEntry) {
-        const file = fileEntry.value.file;
-        this.depositor
-          .downloadCoordinatesWithMetadata(file, this.form.value.metadata)
-          .subscribe({
-            next: (response: Blob) => {
-              this.triggerDownload(response, "coordinatesWithMetadata.cif");
-            },
-            // error: (error) => {
-            //   console.error("Error downloading file from /onedep/pdb", error);
-            // },
-          });
-      }
-    } else {
-      this.depositor.downloadMetadata(this.form.value.metadata).subscribe({
-        next: (response: Blob) => {
-          this.triggerDownload(response, "metadata.cif");
-        },
-        // error: (error) => {
-        //   console.error("Error downloading file from /onedep/metadata", error);
-        // },
-      });
-    }
-  }
-
-  triggerDownload(response: Blob, filename: string) {
-    const downloadUrl = window.URL.createObjectURL(response);
-    const a = document.createElement("a");
-    a.href = downloadUrl;
-    a.download = filename;
-    document.body.appendChild(a);
-    a.click();
-    document.body.removeChild(a);
-  }
-}
diff --git a/src/app/datasets/depositor/onedep/onedep.components.spec.ts b/src/app/datasets/depositor/onedep/onedep.components.spec.ts
deleted file mode 100644
index 39c765d51b..0000000000
--- a/src/app/datasets/depositor/onedep/onedep.components.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-
-import { OneDepComponent } from "./onedep.component";
-
-describe("OneDepComponent", () => {
-  let component: OneDepComponent;
-  let fixture: ComponentFixture<OneDepComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [OneDepComponent],
-    });
-    fixture = TestBed.createComponent(OneDepComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it("should create", () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/datasets/depositor/onedep/onedep.directive.ts b/src/app/datasets/depositor/onedep/onedep.directive.ts
deleted file mode 100644
index e0b5ecc6a8..0000000000
--- a/src/app/datasets/depositor/onedep/onedep.directive.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { Directive, HostListener, ElementRef } from "@angular/core";
-
-@Directive({ 
-  selector: "[orcidFormatter]", 
-  standalone: false,
-})
-export class OrcidFormatterDirective {
-  private readonly maxRawLength = 16;
-
-  constructor(private el: ElementRef) {}
-
-  private formatWithDashes(value: string): string {
-    return value.match(/.{1,4}/g)?.join("-") || value;
-  }
-
-  private getAdjustedCursorPosition(
-    rawValue: string,
-    originalPosition: number,
-  ): number {
-    const rawCursorPosition = rawValue.slice(0, originalPosition).length;
-    const dashCountBeforeCursor = Math.floor(rawCursorPosition / 4);
-    return rawCursorPosition + dashCountBeforeCursor;
-  }
-
-  private calculateCursorAdjustment(
-    previousValue: string,
-    newValue: string,
-    cursorPosition: number,
-  ): number {
-    const removedChar = previousValue.length > newValue.length;
-    const addedDash = newValue.charAt(cursorPosition - 1) === "-";
-    if (removedChar && addedDash) {
-      return -1;
-    }
-    if (addedDash) {
-      return +1;
-    }
-
-    return 0;
-  }
-  @HostListener("input", ["$event"])
-  onInput(event: InputEvent): void {
-    const inputElement = this.el.nativeElement as HTMLInputElement;
-
-    const rawValue = inputElement.value
-      .replace(/-/g, "")
-      .slice(0, this.maxRawLength);
-
-    const formattedValue = this.formatWithDashes(rawValue);
-
-    // Calculate the new cursor position
-    const previousValue = inputElement.value;
-    const previousCursorPosition = inputElement.selectionStart || 0;
-    const adjustment = this.calculateCursorAdjustment(
-      previousValue,
-      formattedValue,
-      previousCursorPosition,
-    );
-
-    // Update the input's visible value
-    inputElement.value = formattedValue;
-
-    // Set the cursor to the adjusted position
-    const cursorPosition = previousCursorPosition + adjustment;
-    inputElement.setSelectionRange(cursorPosition, cursorPosition);
-  }
-}
diff --git a/src/app/datasets/depositor/onedep/types/methods.enum.ts b/src/app/datasets/depositor/onedep/types/methods.enum.ts
deleted file mode 100644
index bc95ae9fe4..0000000000
--- a/src/app/datasets/depositor/onedep/types/methods.enum.ts
+++ /dev/null
@@ -1,287 +0,0 @@
-export enum EmType {
-  Helical = "helical",
-  SingleParticle = "single-particle",
-  SubtomogramAveraging = "subtomogram-averaging",
-  Tomogram = "tomogram",
-  ElectronCristallography = "electron-cristallography",
-}
-
-export enum EmFile {
-  MainMap = "vo-map",
-  HalfMap1 = "half-map1",
-  HalfMap2 = "half-map2",
-  MaskMap = "mask-map",
-  AddMap = "add-map",
-  Coordinates = "co-cif",
-  Image = "img-emdb",
-  FSC = "fsc-xml",
-  LayerLines = "layer-lines",
-  StructureFactors = "xs-cif",
-  MTZ = "xs-mtz",
-}
-
-export function isMap(emFile: EmFile): boolean {
-  return (
-    emFile === EmFile.MainMap ||
-    emFile === EmFile.HalfMap1 ||
-    emFile === EmFile.HalfMap2 ||
-    emFile === EmFile.MaskMap ||
-    emFile === EmFile.AddMap
-  );
-}
-
-export interface OneDepUserInfo {
-  email: string;
-  orcidIds: string[];
-  country: string;
-  method: string;
-  jwtToken: string;
-  password?: string;
-  coordinates:boolean;
-}
-
-export interface OneDepCreate {
-  depID: string;
-}
-export interface DepositionFile {
-  emName: EmFile;
-  id?: number;
-  nameFE: string;
-  type: string;
-  fileName: string;
-  file: File;
-  contour?: number;
-  details?: string;
-  required: boolean;
-  fileFormat?: string[];
-  prioritySort?: number; // additional fsc and xml may have no value, sort will be exequted based on id
-  explanation?: string;
-}
-
-interface EmMethod {
-  value: EmType;
-  viewValue: string;
-  files: DepositionFile[];
-}
-
-export const createMethodsList = (): EmMethod[] => {
-  const depositionImage: DepositionFile = {
-    emName: EmFile.Image,
-    nameFE: "Public Image",
-    type: "img-emdb",
-    fileName: "",
-    file: null,
-    required: false,
-    fileFormat: [".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tiff"],
-    prioritySort: 0,
-    explanation:
-      "Image of the map (500 x 500 pixels in .jpg, .png, etc. format)",
-  };
-  const depositionMainMap: DepositionFile = {
-    emName: EmFile.MainMap,
-    nameFE: "Main Map",
-    type: "vo-map",
-    fileName: "",
-    file: null,
-    contour: null,
-    details: "",
-    required: false,
-    fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
-    prioritySort: 2,
-    explanation:
-      "Primary map (.mrc or .ccp4 format, may use gzip or bzip2 compression) along with recommended contour level",
-  };
-  const depositionHalfMap1: DepositionFile = {
-    emName: EmFile.HalfMap1,
-    nameFE: "Half Map (1)",
-    type: "half-map",
-    fileName: "",
-    file: null,
-    contour: null,
-    details: "",
-    required: false,
-    fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
-    prioritySort: 4,
-    explanation:
-      "Half maps (as used for FSC calculation; two maps must be uploaded)",
-  };
-  const depositionHalfMap2: DepositionFile = {
-    emName: EmFile.HalfMap2,
-    nameFE: "Half Map (2)",
-    type: "half-map",
-    fileName: "",
-    file: null,
-    contour: null,
-    details: "",
-    required: false,
-    fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
-    prioritySort: 5,
-    explanation:
-      "Half maps (as used for FSC calculation; two maps must be uploaded)",
-  };
-  const depositionMaskMap: DepositionFile = {
-    emName: EmFile.MaskMap,
-    nameFE: "Mask Map",
-    type: "mask-map",
-    fileName: "",
-    file: null,
-    contour: null,
-    details: "",
-    required: false,
-    fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
-    prioritySort: 3,
-    explanation:
-      "Primary/raw map mask, segmentation/focused refinement mask and half-map mask",
-  };
-  const depositionAddMap: DepositionFile = {
-    emName: EmFile.AddMap,
-    id: 0,
-    nameFE: "Additional Map",
-    type: "add-map",
-    fileName: "",
-    file: null,
-    contour: null,
-    details: "",
-    required: false,
-    fileFormat: [".mrc", ".ccp4", ".mrc.gz", ".ccp4.gz"],
-    prioritySort: 10,
-    explanation:
-      "Difference maps, maps showing alternative conformations and/or compositions, maps with differential processing (e.g. filtering, sharpening and masking)",
-  };
-  const depositionFSC: DepositionFile = {
-    emName: EmFile.FSC,
-    id: 0,
-    nameFE: "FSC-XML",
-    type: "fsc-xml",
-    fileName: "",
-    file: null,
-    fileFormat: [".xml"],
-    required: false,
-    prioritySort: 7,
-    explanation: "Half-map FSC, Map-model FSC, Cross-validation FSCs",
-  };
-  const depositionLayerLines: DepositionFile = {
-    emName: EmFile.LayerLines,
-    nameFE: "Other: Layer Lines Data ",
-    type: "layer-lines",
-    fileName: "",
-    file: null,
-    required: false,
-    prioritySort: 9,
-  };
-  const depositionCoordinates: DepositionFile = {
-    emName: EmFile.Coordinates,
-    nameFE: "Coordinates",
-    type: "co-cif",
-    fileName: "",
-    file: null,
-    required: false,
-    fileFormat: [
-      ".cif",
-      ".pdb",
-      ".ent",
-      ".brk",
-      ".cif.gz",
-      ".pdb.gz",
-      ".ent.gz",
-      ".brk.gz",
-    ],
-    prioritySort: 1,
-    explanation: "mmCIF or PDB format",
-  };
-  const depositionStructureFactors: DepositionFile = {
-    emName: EmFile.StructureFactors,
-    nameFE: "Structure Factors",
-    type: "xs-cif",
-    fileName: "",
-    file: null,
-    required: false,
-    prioritySort: 8,
-    fileFormat: [".cif", ".mtz", ".cif.gz", ".mtz.gz"],
-  };
-  const depositionMTZ: DepositionFile = {
-    emName: EmFile.MTZ,
-    nameFE: "MTZ",
-    type: "xs-mtz",
-    fileName: "",
-    file: null,
-    required: false,
-    prioritySort: 6,
-  };
-  return [
-    {
-      value: EmType.Helical,
-      viewValue: "Helical",
-      files: [
-        depositionImage,
-        depositionCoordinates,
-        depositionMainMap,
-        depositionHalfMap1,
-        depositionHalfMap2,
-        depositionMaskMap,
-        depositionFSC,
-        depositionLayerLines,
-        depositionAddMap,
-      ],
-    },
-    {
-      value: EmType.SingleParticle,
-      viewValue: "Single Particle",
-      files: [
-        depositionImage,
-        depositionCoordinates,
-        depositionMainMap,
-        depositionHalfMap1,
-        depositionHalfMap2,
-        depositionMaskMap,
-        depositionFSC,
-        depositionLayerLines,
-        depositionAddMap,
-      ],
-    },
-    {
-      value: EmType.SubtomogramAveraging,
-      viewValue: "Subtomogram Averaging",
-      files: [
-        depositionImage,
-        depositionCoordinates,
-        depositionMainMap,
-        depositionHalfMap1,
-        depositionHalfMap2,
-        depositionMaskMap,
-        depositionFSC,
-        depositionLayerLines,
-        depositionAddMap,
-      ],
-    },
-    {
-      value: EmType.Tomogram,
-      viewValue: "Tomogram",
-      files: [
-        depositionImage,
-        depositionMainMap,
-        depositionMaskMap,
-        depositionFSC,
-        depositionLayerLines,
-        depositionAddMap,
-      ],
-    },
-    {
-      value: EmType.ElectronCristallography,
-      viewValue: "Electron Crystallography",
-      files: [
-        depositionImage,
-        depositionCoordinates,
-        depositionMainMap,
-        depositionHalfMap1,
-        depositionHalfMap2,
-        depositionMaskMap,
-        depositionStructureFactors,
-        depositionMTZ,
-        depositionFSC,
-        depositionLayerLines,
-        depositionAddMap,
-      ],
-    },
-  ];
-};
diff --git a/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts
new file mode 100644
index 0000000000..def4a42a77
--- /dev/null
+++ b/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts
@@ -0,0 +1,90 @@
+import { IngestorCreationComponent } from "./ingestor-creation.component";
+import { IngestorHelper } from "./helper/ingestor.component-helper";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import { MatCardModule} from "@angular/material/card";
+import { MatListModule } from "@angular/material/list";
+import { MatIconModule } from "@angular/material/icon";
+import { MockActivatedRoute, MockUserApi } from "shared/MockStubs";
+import { Store, StoreModule } from "@ngrx/store";
+import { MockStore } from "@ngrx/store/testing";
+import { Router, ActivatedRoute } from "@angular/router";
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from "@angular/core/testing";
+import { AppConfigService } from "app-config.service";
+import { UsersService } from "@scicatproject/scicat-sdk-ts-angular";
+
+describe("IngestorCreationComponent", () => {
+  let component: IngestorCreationComponent;
+  let fixture: ComponentFixture<IngestorCreationComponent>;
+  let store: MockStore;
+
+  const router = {
+    navigateByUrl: jasmine.createSpy("navigateByUrl"),
+  };
+  const getConfig = () => ({
+    ingestorInTransferMode: false,
+  });
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [IngestorCreationComponent],
+      imports:[
+        MatCardModule,
+        MatListModule,
+        MatIconModule,
+        StoreModule.forRoot({})],
+      })
+      TestBed.overrideComponent(IngestorCreationComponent, {
+        set: {
+          providers: [
+            { provide: Router, useValue: router },
+            {
+              provide: AppConfigService,
+              useValue: {
+                getConfig,
+              },
+            },
+            { provide: ActivatedRoute, useClass: MockActivatedRoute },
+            { provide: UsersService, useClass: MockUserApi },
+          ],
+        },
+      });      
+    TestBed.compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(IngestorCreationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  beforeEach(inject([Store], (mockStore: MockStore) => {
+    store = mockStore;
+  }));
+
+  afterEach(() => {
+    fixture.destroy();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+  it("should create empty transfer object with CREATION mode", () => {
+    spyOn(store, "dispatch");
+
+    component.onClickAddIngestion();
+
+    // Verify the actual object structure
+    const expectedObject = IngestorHelper.createEmptyRequestInformation();
+    expectedObject.editorMode = "CREATION";
+
+    expect(store.dispatch).toHaveBeenCalledWith(
+      fromActions.resetIngestionObject({ ingestionObject: expectedObject })
+    );
+  });
+});
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts
new file mode 100644
index 0000000000..866a63c824
--- /dev/null
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts
@@ -0,0 +1,75 @@
+import { IngestorTransferComponent } from "./ingestor-transfer.component";
+import { MatCardModule} from "@angular/material/card";
+import { MatListModule } from "@angular/material/list";
+import { MockActivatedRoute, MockUserApi } from "shared/MockStubs";
+import { Store, StoreModule } from "@ngrx/store";
+import { NO_ERRORS_SCHEMA } from "@angular/core";
+import { MockStore } from "@ngrx/store/testing";
+import { Router, ActivatedRoute } from "@angular/router";
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from "@angular/core/testing";
+import { AppConfigService } from "app-config.service";
+import { UsersService } from "@scicatproject/scicat-sdk-ts-angular";
+
+describe("IngestorTransferComponent", () => {
+  let component: IngestorTransferComponent;
+  let fixture: ComponentFixture<IngestorTransferComponent>;
+  let store: MockStore;
+
+  const router = {
+    navigateByUrl: jasmine.createSpy("navigateByUrl"),
+  };
+
+  const getConfig = () => ({
+    ingestorInTransferMode: true,
+  });
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      schemas: [NO_ERRORS_SCHEMA],
+      declarations: [IngestorTransferComponent],
+      imports:[
+        MatCardModule,
+        MatListModule,
+        StoreModule.forRoot({})],
+      })
+      TestBed.overrideComponent(IngestorTransferComponent, {
+        set: {
+          providers: [
+            { provide: Router, useValue: router },
+            {
+              provide: AppConfigService,
+              useValue: {
+                getConfig,
+              },
+            },
+            { provide: ActivatedRoute, useClass: MockActivatedRoute },
+            { provide: UsersService, useClass: MockUserApi },
+          ],
+        },
+      });      
+    TestBed.compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(IngestorTransferComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+  beforeEach(inject([Store], (mockStore: MockStore) => {
+    store = mockStore;
+  }));
+
+  afterEach(() => {
+    fixture.destroy();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+
+});
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
index dacb9a4b3a..6c9f5555a4 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
@@ -215,7 +215,7 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
           // backendUrl should not end with a slash
           const facilityBackendUrlCleaned = backendUrl.replace(/\/$/, "");
 
-          await this.store.dispatch(
+          this.store.dispatch(
             fromActions.setIngestorEndpoint({
               ingestorEndpoint: facilityBackendUrlCleaned,
             }),
@@ -350,7 +350,7 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
       const facility = facilityEmail.split("@")[1] as string;
 
       const facilityMailDomainName = facility.toLowerCase();
-      const discoveryList = this.appConfig.ingestorAutodiscoveryOptions;
+      const discoveryList = this.appConfig.ingestorComponent.ingestorAutodiscoveryOptions;
 
       if (discoveryList) {
         for (const discovery of discoveryList) {
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor.component.spec.ts
index dd70900334..07a117078b 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.spec.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.spec.ts
@@ -1,23 +1,77 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { IngestorComponent } from "./ingestor.component";
+mport { IngestorWrapperComponent } from "./ingestor.component";
+import { NO_ERRORS_SCHEMA } from "@angular/core";
+import { AppConfigInterface, AppConfigService } from "app-config.service";
+import { IngestorTransferComponent } from "./ingestor-transfer.component";
+import { IngestorCreationComponent } from "./ingestor-creation.component";
+import {
+  ComponentFixture,
+  TestBed,
+} from "@angular/core/testing";
 
 describe("IngestorComponent", () => {
-  let component: IngestorComponent;
-  let fixture: ComponentFixture<IngestorComponent>;
+  let component: IngestorWrapperComponent;
+  let fixture: ComponentFixture<IngestorWrapperComponent>;
+  let appConfigService: jasmine.SpyObj<AppConfigService>;
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [IngestorComponent],
-    }).compileComponents();
-  });
+  // const getConfig = () => ({
+  //   ingestorInTransferMode: false,
+  // });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(IngestorComponent);
+    const appConfigServiceSpy = jasmine.createSpyObj("AppConfigService", [
+      "getConfig",
+    ]);
+
+
+    TestBed.configureTestingModule({
+      declarations: [IngestorWrapperComponent, 
+      ],
+      providers: [{ provide: AppConfigService, useValue: appConfigServiceSpy }],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+
+
+    fixture = TestBed.createComponent(IngestorWrapperComponent);
     component = fixture.componentInstance;
-    fixture.detectChanges();
+    appConfigService = TestBed.inject(
+      AppConfigService,
+    ) as jasmine.SpyObj<AppConfigService>;
+  });
+
+  afterEach(() => {
+    fixture.destroy();
   });
 
-  it("should create", () => {
+  it("should create", () => {   
+    appConfigService.getConfig.and.returnValue({
+      ingestorComponent: {
+        ingestorEnabled: true,
+      },
+    } as AppConfigInterface);
+
     expect(component).toBeTruthy();
   });
-});
+
+  it("should load IngestorTransferComponent when config specifies ingestorInTransferMode as true", () => {
+    appConfigService.getConfig.and.returnValue({
+          ingestorComponent: {
+            ingestorEnabled: true,
+            ingestorInTransferMode: true,
+          },
+        } as AppConfigInterface);
+
+        const componentInstance = component.getIngestorComponent();
+        expect(componentInstance).toBe(IngestorTransferComponent);
+  });
+
+  it("should load IngestorCreationComponent when config specifies ingestorInTransferMode as false", () => {
+    appConfigService.getConfig.and.returnValue({
+          ingestorComponent: {
+            ingestorInTransferMode: false,
+          },
+        } as AppConfigInterface);
+
+        const componentInstance = component.getIngestorComponent();
+        expect(componentInstance).toBe(IngestorCreationComponent);
+  });
+  });
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor.component.ts
index 00752517f2..53990ff2a7 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor.component.ts
@@ -1,32 +1,28 @@
 import { Component, OnInit } from "@angular/core";
 import { AppConfigService } from "app-config.service";
 import { IngestorMode } from "./helper/ingestor.component-helper";
+import { IngestorTransferComponent } from "./ingestor-transfer.component";
+import { IngestorCreationComponent } from "./ingestor-creation.component";
 
 @Component({
   selector: "ingestor",
   styleUrls: ["./ingestor.component.scss"],
   template: `
     <div>
-      <ingestor-transfer *ngIf="ingestorMode === 'transfer'" />
-      <ingestor-creation *ngIf="ingestorMode === 'creation'" />
+      <ng-container *ngComponentOutlet="getIngestorComponent()" />
     </div>
   `,
   standalone: false,
 })
-export class IngestorComponent implements OnInit {
+export class IngestorWrapperComponent{
   appConfig = this.appConfigService.getConfig();
   ingestorMode: IngestorMode = "creation";
 
   constructor(public appConfigService: AppConfigService) {}
-
-  ngOnInit() {
-    // Render the ingestor component based on the mode
-    const mode = this.appConfig.ingestorMode;
-
-    if (mode === "transfer") {
-      this.ingestorMode = "transfer";
-    } else {
-      this.ingestorMode = "creation";
-    }
+  getIngestorComponent() {
+      return this.appConfigService.getConfig().ingestorComponent
+        ?.ingestorInTransferMode
+        ? IngestorTransferComponent
+        : IngestorCreationComponent;
   }
 }
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 6f35fb32d5..d7558bcc8a 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
-import { IngestorComponent } from "./ingestor-page/ingestor.component";
+import { IngestorWrapperComponent } from "./ingestor-page/ingestor.component";
 import { MatCardModule } from "@angular/material/card";
 import { RouterModule } from "@angular/router";
 import { IngestorMetadataEditorComponent } from "./ingestor-metadata-editor/ingestor-metadata-editor.component";
@@ -55,7 +55,7 @@ import { IngestorCustomMetadataDialogPageComponent } from "./ingestor-dialogs/cr
 
 @NgModule({
   declarations: [
-    IngestorComponent,
+    IngestorWrapperComponent,
     IngestorTransferComponent,
     IngestorCreationComponent,
     IngestorMetadataEditorComponent,
diff --git a/src/app/shared/sdk/apis/depositor.service.spec.ts b/src/app/shared/sdk/apis/depositor.service.spec.ts
deleted file mode 100644
index abb027b801..0000000000
--- a/src/app/shared/sdk/apis/depositor.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from "@angular/core/testing";
-
-import { Depositor } from "./depositor.service";
-
-describe("OnedepDepositorService", () => {
-  let service: Depositor;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(Depositor);
-  });
-
-  it("should be created", () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/sdk/apis/depositor.service.ts b/src/app/shared/sdk/apis/depositor.service.ts
deleted file mode 100644
index a0f2e3e1ce..0000000000
--- a/src/app/shared/sdk/apis/depositor.service.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { Injectable } from "@angular/core";
-import { HttpClient, HttpHeaders } from "@angular/common/http";
-import { Observable } from "rxjs";
-import { AppConfigService, AppConfigInterface } from "app-config.service";
-import {
-  DepBackendVersion,
-  OneDepUserInfo,
-  OneDepCreated,
-  UploadedFile,
-} from "../models/OneDep";
-
-@Injectable({
-  providedIn: "root",
-})
-export class Depositor {
-  config: AppConfigInterface;
-  constructor(
-    private http: HttpClient,
-    public appConfigService: AppConfigService,
-  ) {
-    this.config = this.appConfigService.getConfig();
-  }
-
-  getVersion(): Observable<DepBackendVersion> {
-    return this.http.get<DepBackendVersion>(
-      `${this.config.depositorURL}/version`,
-    );
-  }
-  createDep(body: OneDepUserInfo): Observable<OneDepCreated> {
-    return this.http.post<OneDepCreated>(
-      `${this.config.depositorURL}/onedep`,
-      body,
-      {
-        headers: { "Content-Type": "application/json" },
-      },
-    );
-  }
-  sendFile(depID: string, form: FormData): Observable<UploadedFile> {
-    return this.http.post<UploadedFile>(
-      `${this.config.depositorURL}/onedep/${depID}/file`,
-      form,
-    );
-  }
-  sendCoordFile(depID: string, form: FormData): Observable<UploadedFile> {
-    return this.http.post<UploadedFile>(
-      `${this.config.depositorURL}/onedep/${depID}/pdb`,
-      form,
-    );
-  }
-  sendMetadata(depID: string, form: FormData): Observable<UploadedFile> {
-    return this.http.post<UploadedFile>(
-      `${this.config.depositorURL}/onedep/${depID}/metadata`,
-      form,
-    );
-  }
-
-  downloadCoordinatesWithMetadata(file: File, metadata: any) {
-    const formDataFile = new FormData();
-    formDataFile.append("file", file);
-    formDataFile.append("scientificMetadata", JSON.stringify(metadata));
-
-    return this.http.post(
-      `${this.config.depositorURL}/onedep/pdb`,
-      formDataFile,
-      {
-        responseType: "blob",
-      },
-    );
-  }
-
-  downloadMetadata(metadata: any) {
-    const headers = new HttpHeaders({ "Content-Type": "application/json" });
-    const body = JSON.stringify(metadata);
-
-    return this.http.post(`${this.config.depositorURL}/onedep/metadata`, body, {
-      headers,
-      responseType: "blob",
-    });
-  }
-
-  getEmpiarSchema() {
-    return this.http.get<{ schema: string }>(
-      `${this.config.depositorURL}/empiar/schema`,
-    );
-  }
-}
diff --git a/src/app/shared/sdk/models/OneDep.ts b/src/app/shared/sdk/models/OneDep.ts
deleted file mode 100644
index 2e42c1af08..0000000000
--- a/src/app/shared/sdk/models/OneDep.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { EmFile } from "../../../datasets/depositor/onedep/types/methods.enum";
-
-export interface DepBackendVersion {
-  version: string;
-}
-
-export interface OneDepCreated {
-  email: string;
-  id: string;
-  pdb_id: string;
-  emdb_id: string;
-  bmrb_id: string;
-  title: string;
-  hold_exp_date: string;
-  created: string;
-  last_login: string;
-  site: string;
-  site_url: string;
-  // Status: Status;
-  experiments: any;
-  // Errors      :OneDepError
-  code: string;
-  message: string;
-}
-
-export interface OneDepUserInfo {
-  email: string;
-  orcidIds: string[];
-  country: string;
-  method: string;
-  jwtToken: string;
-  password?: string;
-}
-
-export interface UploadedFile {
-  depID: string;
-  fileID: string;
-}
-
-export interface FileUpload {
-  form: FormData;
-  fileType: EmFile;
-}
diff --git a/src/app/state-management/actions/depositor.actions.ts b/src/app/state-management/actions/depositor.actions.ts
deleted file mode 100644
index 47209316f6..0000000000
--- a/src/app/state-management/actions/depositor.actions.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { createAction, props } from "@ngrx/store";
-import {
-  OneDepUserInfo,
-  OneDepCreated,
-  UploadedFile,
-  FileUpload,
-  DepBackendVersion,
-} from "shared/sdk/models/OneDep";
-
-export const connectToDepositor = createAction(
-  "[Depositor] Connect to Depositor",
-);
-export const connectToDepositorSuccess = createAction(
-  "[Depositor] Successfully connected to Depositor",
-  props<{ depositor: DepBackendVersion }>(),
-);
-
-export const connectToDepositorFailure = createAction(
-  "[Depositor] Failed to connect to Depositor",
-  props<{ err: Error }>(),
-);
-export const submitDeposition = createAction(
-  "[OneDep] Submit Deposition",
-  props<{ deposition: OneDepUserInfo; files: FileUpload[] }>(),
-);
-export const submitDepositionSuccess = createAction(
-  "[OneDep] Completed Deposition Creation",
-  props<{ deposition: OneDepCreated }>(),
-);
-
-export const submitDepositionFailure = createAction(
-  "[OneDep] Failed to complete Deposition ",
-  props<{ err: Error }>(),
-);
-
-export const accessEmpiarSchema = createAction("[EMPIAR] get EMPIAR schema");
-export const accessEmpiarSchemaSuccess = createAction(
-  "[EMPIAR] Successfully retrieved JSON schema for EMPIAR deposition",
-  props<{ schema: any }>(),
-);
-
-export const accessEmpiarSchemaFailure = createAction(
-  "[EMPIAR] Failed to retrieve JSON schema for EMPIAR deposition",
-  props<{ err: Error }>(),
-);
-
-// export const createDepositionAction = createAction(
-//   "[OneDep] Create Deposition",
-//   props<{ deposition: OneDepUserInfo }>(),
-// );
-
-// export const createDepositionSuccess = createAction(
-//   "[OneDep] Create Deposition Complete",
-//   props<{ deposition: OneDepCreated }>(),
-// );
-
-// export const createDepositionFailure = createAction(
-//   "[OneDep] Create Deposition Failure",
-//   props<{ err: Error }>(),
-// );
-
-// export const sendFile = createAction(
-//   "[OneDep] Send File",
-//   props<{ depID: string; form: FormData }>(),
-// );
-
-// export const sendFileSuccess = createAction(
-//   "[OneDep] Send File Success",
-//   props<{ uploadedFile: UploadedFile }>(),
-// );
-
-// export const sendFileFailure = createAction(
-//   "[OneDep] Send File Failure",
-//   props<{ err: Error }>(),
-// );
-
-// export const sendCoordFile = createAction(
-//   "[OneDep] Send Coord File",
-//   props<{ depID: string; form: FormData }>(),
-// );
-
-// export const uploadFilesAction = createAction(
-//   "[OneDep] Upload Files",
-//   props<{ depID: string; files: FileUpload[] }>(),
-// );
-
-// export const sendCoordFileSuccess = createAction(
-//   "[OneDep] Send Coord File Success",
-//   props<{ uploadedFile: UploadedFile }>(),
-// );
-
-// export const sendCoordFileFailure = createAction(
-//   "[OneDep] Send Coord File Failure",
-//   props<{ error: Error }>(),
-// );
-
-// export const sendMetadata = createAction(
-//   "[OneDep] Send Metadata",
-//   props<{ depID: string; form: FormData }>(),
-// );
-
-// export const sendMetadataSuccess = createAction(
-//   "[OneDep] Send Metadata Success",
-//   props<{ uploadedFile: UploadedFile }>(),
-// );
-
-// export const sendMetadataFailure = createAction(
-//   "[OneDep] Send Metadata Failure",
-//   props<{ error: Error }>(),
-// );
diff --git a/src/app/state-management/effects/depositor.effects.spec.ts b/src/app/state-management/effects/depositor.effects.spec.ts
deleted file mode 100644
index 7a2fe21699..0000000000
--- a/src/app/state-management/effects/depositor.effects.spec.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { TestBed } from "@angular/core/testing";
-import { provideMockActions } from "@ngrx/effects/testing";
-import { provideMockStore } from "@ngrx/store/testing";
-import { HttpClientTestingModule } from "@angular/common/http/testing";
-import { Observable } from "rxjs";
-import { OneDepEffects } from "./depositor.effects";
-import { Actions } from "@ngrx/effects";
-
-describe("OneDepEffects", () => {
-  let actions$: Observable<any>;
-  let effects: OneDepEffects;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [
-        OneDepEffects,
-        provideMockActions(() => actions$),
-        provideMockStore(),
-      ],
-    });
-
-    effects = TestBed.inject(OneDepEffects);
-  });
-
-  it("should be created", () => {
-    expect(effects).toBeTruthy();
-  });
-});
\ No newline at end of file
diff --git a/src/app/state-management/effects/depositor.effects.ts b/src/app/state-management/effects/depositor.effects.ts
deleted file mode 100644
index d84d1cdfcd..0000000000
--- a/src/app/state-management/effects/depositor.effects.ts
+++ /dev/null
@@ -1,364 +0,0 @@
-import { Injectable } from "@angular/core";
-import { Actions, createEffect, ofType } from "@ngrx/effects";
-import { of, from } from "rxjs";
-import { catchError, map, switchMap, concatMap, last, tap } from "rxjs/operators";
-import { HttpErrorResponse } from "@angular/common/http";
-import { Store } from "@ngrx/store";
-import { MessageType } from "state-management/models";
-import { showMessageAction } from "state-management/actions/user.actions";
-import * as fromActions from "state-management/actions/depositor.actions";
-import { Depositor } from "shared/sdk/apis/depositor.service";
-import {
-  OneDepUserInfo,
-  OneDepCreated,
-  UploadedFile,
-  DepBackendVersion,
-} from "shared/sdk/models/OneDep";
-import { EmFile } from "../../datasets/depositor/onedep/types/methods.enum";
-@Injectable()
-export class OneDepEffects {
-  connectToDepositor$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.connectToDepositor),
-      switchMap(() =>
-        this.onedepDepositor.getVersion().pipe(
-          map((res) =>
-            fromActions.connectToDepositorSuccess({
-              depositor: res as DepBackendVersion,
-            }),
-          ),
-          catchError((err) =>
-            of(fromActions.connectToDepositorFailure({ err })),
-          ),
-        ),
-      ),
-    );
-  });
-
-  connectToDepositorSuccess$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.connectToDepositorSuccess),
-      switchMap(({ depositor }) => {
-        const message = {
-          type: MessageType.Success,
-          content:
-            "Successfully connected to depositor version " + depositor.version,
-          duration: 5000,
-        };
-        return of(showMessageAction({ message }));
-      }),
-    );
-  });
-
-  connectToDepositorFailure$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.connectToDepositorFailure),
-      switchMap(({ err }) => {
-        const errorMessage =
-          err instanceof HttpErrorResponse
-            ? (err.error?.message ?? err.message ?? "Unknown error")
-            : err.message || "Unknown error";
-        const message = {
-          type: MessageType.Error,
-          content:
-            "Failed to connect to the depositor service: " +
-            errorMessage +
-            " Are you sure service is running?",
-          duration: 5000,
-        };
-        return of(showMessageAction({ message }));
-      }),
-    );
-  });
-
-  submitDeposition$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.submitDeposition),
-      switchMap(({ deposition, files }) =>
-        this.onedepDepositor.createDep(deposition).pipe(
-          tap((dep) => {
-          const message = {
-            type: MessageType.Success,
-            content: `Deposition entry created: ${dep.id}. Start uploading files.`,
-            duration: 10000,
-          };
-          this.store.dispatch(showMessageAction({ message }));
-          }),
-          switchMap((dep) =>
-            from(files).pipe(
-              concatMap((file) =>
-                file.fileType === EmFile.Coordinates
-                  ? this.onedepDepositor.sendCoordFile(dep.id, file.form)
-                  : this.onedepDepositor.sendFile(dep.id, file.form),
-              ),
-              
-              last(),
-              map(() =>
-                fromActions.submitDepositionSuccess({
-                  deposition: dep as OneDepCreated,
-                }),
-              ),
-            ),
-          ),
-          catchError((err) => of(fromActions.submitDepositionFailure({ err }))),
-        ),
-      ),
-    );
-  });
-
-  submitDepositionSuccess$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.submitDepositionSuccess),
-      switchMap(({ deposition }) => {
-        const message = {
-          type: MessageType.Success,
-          content:
-            "Deposition Created Successfully. Deposition ID: " + deposition.id,
-          duration: 5000,
-        };
-        setTimeout(function () {
-          window.open(
-            `https://onedep-depui-test.wwpdb.org/deposition/api/v1/depositions/${deposition.id}/view`,
-            "_blank",
-          );
-        }, 1800);
-        return of(showMessageAction({ message }));
-      }),
-    );
-  });
-
-  submitDepositionFailure$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.submitDepositionFailure),
-      switchMap(({ err }) => {
-        const errorMessage =
-          err instanceof HttpErrorResponse
-            ? (err.error?.message ?? err.message ?? "Unknown error")
-            : err.message || "Unknown error";
-        const message = {
-          type: MessageType.Error,
-          content: "Deposition to OneDep failed: " + errorMessage,
-          duration: 10000,
-        };
-        return of(showMessageAction({ message }));
-      }),
-    );
-  });
-
-  accessEmpiarSchema$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.accessEmpiarSchema),
-      switchMap(() =>
-        this.onedepDepositor.getEmpiarSchema().pipe(
-          map((res) =>
-            fromActions.accessEmpiarSchemaSuccess({
-              schema: res.schema,
-            }),
-          ),
-          catchError((err) =>
-            of(fromActions.accessEmpiarSchemaFailure({ err })),
-          ),
-        ),
-      ),
-    );
-  });
-
-  accessEmpiarSchemaSuccess$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.accessEmpiarSchemaSuccess),
-      switchMap(() => {
-        const message = {
-          type: MessageType.Success,
-          content: "Successfully retrieved EMPIAR schema ",
-          duration: 5000,
-        };
-        return of(showMessageAction({ message }));
-      }),
-    );
-  });
-
-  accessEmpiarSchemaFailure$ = createEffect(() => {
-    return this.actions$.pipe(
-      ofType(fromActions.accessEmpiarSchemaFailure),
-      switchMap(({ err }) => {
-        const errorMessage =
-          err instanceof HttpErrorResponse
-            ? (err.error?.message ?? err.message ?? "Unknown error")
-            : err.message || "Unknown error";
-        const message = {
-          type: MessageType.Error,
-          content: "Failed to retrieve EMPIAR schema: " + errorMessage,
-          duration: 10000,
-        };
-        return of(showMessageAction({ message }));
-      }),
-    );
-  });
-
-  // createDeposition$ = createEffect(() => {
-  //   return this.actions$.pipe(
-  //     ofType(fromActions.createDepositionAction),
-  //     switchMap(({ deposition }) =>
-  //       this.onedepDepositor.createDep(deposition as OneDepUserInfo).pipe(
-  //         map((res) =>
-  //           fromActions.createDepositionSuccess({
-  //             deposition: res as OneDepCreated,
-  //           }),
-  //         ),
-  //         catchError((err) => of(fromActions.createDepositionFailure({ err }))),
-  //       ),
-  //     ),
-  //   );
-  // });
-
-  // createDepositionSuccessMessage$ = createEffect(() => {
-  //   return this.actions$.pipe(
-  //     ofType(fromActions.createDepositionSuccess),
-  //     switchMap(({ deposition }) => {
-  //       const message = {
-  //         type: MessageType.Success,
-  //         content:
-  //           "Deposition Created Successfully. Deposition ID: " +
-  //           deposition.depID,
-  //         duration: 5000,
-  //       };
-  //       return of(showMessageAction({ message }));
-  //     }),
-  //   );
-  // });
-
-  // createDepositionFailureMessage$ = createEffect(() => {
-  //   return this.actions$.pipe(
-  //     ofType(fromActions.createDepositionFailure),
-  //     switchMap(({ err }) => {
-  //       const errorMessage =
-  //         err instanceof HttpErrorResponse
-  //           ? (err.error?.message ?? err.message ?? "Unknown error")
-  //           : err.message || "Unknown error";
-  //       const message = {
-  //         type: MessageType.Error,
-  //         content: "Deposition to OneDep failed: " + errorMessage,
-  //         duration: 10000,
-  //       };
-  //       return of(showMessageAction({ message }));
-  //     }),
-  //   );
-  // });
-  // uploadFiles$ = createEffect(() => {
-  //   return this.actions$.pipe(
-  //     ofType(fromActions.uploadFilesAction),
-  //     mergeMap(({ depID, files }) =>
-  //       from(files).pipe(
-  //         mergeMap((file) =>
-  //           this.onedepDepositor.sendFile(depID, file.form).pipe(
-  //             map((res) =>
-  //               fromActions.sendFileSuccess({
-  //                 uploadedFile: res as UploadedFile,
-  //               }),
-  //             ),
-  //             catchError((err) => of(fromActions.sendFileFailure({ err }))),
-  //           ),
-  //         ),
-  //       ),
-  //     ),
-  //   );
-  // });
-  // sendFile$ = createEffect(() => {
-  //   return this.actions$.pipe(
-  //     ofType(fromActions.sendFile),
-  //     switchMap(({ depID, form }) =>
-  //       this.onedepDepositor.sendFile(depID, form).pipe(
-  //         map((res) =>
-  //           fromActions.sendFileSuccess({
-  //             uploadedFile: res as UploadedFile,
-  //           }),
-  //         ),
-  //         catchError((err) => of(fromActions.sendFileFailure({ err }))),
-  //       ),
-  //     ),
-  //   );
-  // });
-
-  // sendFileSuccessMessage$ = createEffect(() => {
-  //   return this.actions$.pipe(
-  //     ofType(fromActions.sendFileSuccess),
-  //     switchMap(({ uploadedFile }) => {
-  //       const message = {
-  //         type: MessageType.Success,
-  //         content:
-  //           "File Upladed to Deposition ID: " +
-  //           uploadedFile.depID +
-  //           " with File ID: " +
-  //           uploadedFile.fileID,
-  //         duration: 5000,
-  //       };
-  //       return of(showMessageAction({ message }));
-  //     }),
-  //   );
-  // });
-
-  // sendFileFailureMessage$ = createEffect(() => {
-  //   return this.actions$.pipe(
-  //     ofType(fromActions.sendFileFailure),
-  //     switchMap(({ err }) => {
-  //       const errorMessage =
-  //         err instanceof HttpErrorResponse
-  //           ? (err.error?.message ?? err.message ?? "Unknown error")
-  //           : err.message || "Unknown error";
-  //       const message = {
-  //         type: MessageType.Error,
-  //         content: "Deposition to OneDep failed: " + errorMessage,
-  //         duration: 10000,
-  //       };
-  //       return of(showMessageAction({ message }));
-  //     }),
-  //   );
-  // });
-
-  // sendCoordFile$ = createEffect(() =>
-  //   this.actions$.pipe(
-  //     ofType(OneDepActions.sendCoordFile),
-  //     mergeMap((action) =>
-  //       this.http
-  //         .post(
-  //           `${this.connectedDepositionBackend}onedep/${action.depID}/pdb`,
-  //           action.form
-  //         )
-  //         .pipe(
-  //           map((res) =>
-  //             OneDepActions.sendCoordFileSuccess({ res })
-  //           ),
-  //           catchError((error) =>
-  //             of(OneDepActions.sendCoordFileFailure({ error }))
-  //           )
-  //         )
-  //     )
-  //   )
-  // );
-
-  // sendMetadata$ = createEffect(() =>
-  //   this.actions$.pipe(
-  //     ofType(OneDepActions.sendMetadata),
-  //     mergeMap((action) =>
-  //       this.http
-  //         .post(
-  //           `${this.connectedDepositionBackend}onedep/${action.depID}/metadata`,
-  //           action.form
-  //         )
-  //         .pipe(
-  //           map((res) =>
-  //             OneDepActions.sendMetadataSuccess({ res })
-  //           ),
-  //           catchError((error) =>
-  //             of(OneDepActions.sendMetadataFailure({ error }))
-  //           )
-  //         )
-  //     )
-  //   )
-  // );
-  constructor(
-    private actions$: Actions,
-    private onedepDepositor: Depositor,
-    private store: Store,
-  ) {}
-}
diff --git a/src/app/state-management/models/index.ts b/src/app/state-management/models/index.ts
index f3ef3114e7..49d18ea1bb 100644
--- a/src/app/state-management/models/index.ts
+++ b/src/app/state-management/models/index.ts
@@ -2,6 +2,7 @@ import {
   FilterConfig,
   ConditionConfig,
 } from "state-management/state/user.store";
+import { IngestorAutodiscovery } from "ingestor/ingestor-page/helper/ingestor.component-helper";
 
 export interface Settings {
   tapeCopies: string;
@@ -30,6 +31,13 @@ export interface DatasetDetailComponentConfig {
   enableCustomizedComponent: boolean;
   customization: CustomizationItem[];
 }
+
+export interface IngestorComponentConfig {
+  ingestorEnabled: boolean;
+  ingestorInTransferMode: boolean; // otherwise in creation mode
+  ingestorAutodiscoveryOptions?: IngestorAutodiscovery[];
+}
+
 export enum DatasetViewFieldType {
   TEXT = "text",
   DATE = "date",
diff --git a/src/app/state-management/reducers/depositor.reducer.ts b/src/app/state-management/reducers/depositor.reducer.ts
deleted file mode 100644
index f6f1cab24e..0000000000
--- a/src/app/state-management/reducers/depositor.reducer.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { createReducer, Action, on } from "@ngrx/store";
-import * as fromActions from "state-management/actions/depositor.actions";
-import {
-  DepositorState,
-  initialDepositorState,
-} from "state-management/state/depositor.store";
-
-export const depositorReducer = (
-  state: DepositorState | undefined,
-  action: Action,
-) => {
-  if (action.type.indexOf("[Depositor]") !== -1) {
-    console.log("Action came in! " + action.type);
-  }
-  return reducer(state, action);
-};
-
-const reducer = createReducer(
-  initialDepositorState,
-  on(
-    fromActions.connectToDepositor,
-    (state): DepositorState => ({
-      ...state,
-      interactionError: undefined,
-    }),
-  ),
-  on(
-    fromActions.connectToDepositorSuccess,
-    (state): DepositorState => ({
-      ...state,
-      interactionError: undefined,
-    }),
-  ),
-  on(
-    fromActions.connectToDepositorFailure,
-    (state, { err }): DepositorState => ({
-      ...state,
-      interactionError: err,
-    }),
-  ),
-);
diff --git a/src/app/state-management/reducers/empiar.reducer.ts b/src/app/state-management/reducers/empiar.reducer.ts
deleted file mode 100644
index 0162b013c3..0000000000
--- a/src/app/state-management/reducers/empiar.reducer.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { createReducer, Action, on } from "@ngrx/store";
-import * as fromActions from "state-management/actions/depositor.actions";
-import {
-  EmpiarSchemaState,
-  initialEMPIARState,
-} from "state-management/state/depositor.store";
-
-export const empiarReducer = (
-  state: EmpiarSchemaState | undefined,
-  action: Action,
-) => {
-  if (action.type.indexOf("[Depositor]") !== -1) {
-    console.log("Action came in! " + action.type);
-  }
-  return schemaReducer(state, action);
-};
-
-const schemaReducer = createReducer(
-  initialEMPIARState,
-  on(
-    fromActions.accessEmpiarSchemaSuccess,
-    (state, { schema }): EmpiarSchemaState => ({
-      ...state,
-      schema,
-    }),
-  ),
-  on(
-    fromActions.accessEmpiarSchemaFailure,
-    (state, { err }): EmpiarSchemaState => ({
-      ...state,
-      empiarInteractionError: err,
-    }),
-  ),
-);
diff --git a/src/app/state-management/reducers/onedep.reducer.spec.ts b/src/app/state-management/reducers/onedep.reducer.spec.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/state-management/reducers/onedep.reducer.ts b/src/app/state-management/reducers/onedep.reducer.ts
deleted file mode 100644
index 5d4ac064e8..0000000000
--- a/src/app/state-management/reducers/onedep.reducer.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { createReducer, Action, on } from "@ngrx/store";
-import * as fromActions from "state-management/actions/depositor.actions";
-import {
-  OneDepState,
-  initialOneDepState,
-} from "state-management/state/depositor.store";
-
-const reducer = createReducer(
-  initialOneDepState,
-  on(
-    fromActions.submitDepositionSuccess,
-    (state, { deposition }): OneDepState => ({
-      ...state,
-      depositionCreated: deposition,
-      oneDepInteractionError: undefined,
-    }),
-  ),
-  on(
-    fromActions.submitDepositionFailure,
-    (state, { err }): OneDepState => ({
-      ...state,
-      oneDepInteractionError: err,
-    }),
-  ),
-);
-
-export const onedepReducer = (
-  state: OneDepState | undefined,
-  action: Action,
-) => {
-  if (action.type.indexOf("[OneDep]") !== -1) {
-    console.log("Action came in! " + action.type);
-  }
-  return reducer(state, action);
-};
diff --git a/src/app/state-management/selectors/datasets.selectors.ts b/src/app/state-management/selectors/datasets.selectors.ts
index fd1608f774..8ae6bf7451 100644
--- a/src/app/state-management/selectors/datasets.selectors.ts
+++ b/src/app/state-management/selectors/datasets.selectors.ts
@@ -302,4 +302,4 @@ export const selectRelatedDatasetsCurrentPage = createSelector(
 export const selectRelatedDatasetsPerPage = createSelector(
   selectRelatedDatasetsFilters,
   (filters) => filters.limit,
-);
+);
\ No newline at end of file
diff --git a/src/app/state-management/selectors/depositor.selectors.ts b/src/app/state-management/selectors/depositor.selectors.ts
deleted file mode 100644
index 0a8f5bc85a..0000000000
--- a/src/app/state-management/selectors/depositor.selectors.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { createFeatureSelector, createSelector } from "@ngrx/store";
-import {
-  DepositorState,
-  OneDepState,
-  EmpiarSchemaState,
-} from "state-management/state/depositor.store";
-
-export const selectDepositorState =
-  createFeatureSelector<DepositorState>("depositor");
-export const selectOneDepState = createFeatureSelector<OneDepState>("onedep");
-export const selectEMPIARState =
-  createFeatureSelector<EmpiarSchemaState>("empiar");
-
-export const selectDeposition = createSelector(
-  selectOneDepState,
-  (state) => state.depositionCreated,
-);
-
-export const selectCurrentFileID = createSelector(
-  selectOneDepState,
-  (state) => state.currentFileID,
-);
-
-export const selectEmpiarSchema = createSelector(
-  selectEMPIARState,
-  (state) => state?.schema,
-);
diff --git a/src/app/state-management/state/depositor.store.ts b/src/app/state-management/state/depositor.store.ts
deleted file mode 100644
index 03905cdf9a..0000000000
--- a/src/app/state-management/state/depositor.store.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { OneDepCreated, OneDepUserInfo } from "shared/sdk/models/OneDep";
-
-export interface DepositorState {
-  depositor: string | undefined;
-  interactionError: Error | undefined;
-}
-export const initialDepositorState: DepositorState = {
-  depositor: undefined,
-  interactionError: undefined,
-};
-
-export interface OneDepState {
-  depositionCreated: OneDepCreated | undefined;
-  oneDepInteractionError: Error | undefined;
-  fileIDs: string[] | undefined;
-  currentFileID: string | undefined;
-}
-
-export const initialOneDepState: OneDepState = {
-  // depositionInfo: undefined,
-  depositionCreated: undefined,
-  oneDepInteractionError: undefined,
-  fileIDs: [],
-  currentFileID: undefined,
-};
-
-export interface EmpiarSchemaState {
-  schema: string | undefined;
-  empiarInteractionError: Error | undefined;
-}
-export const initialEMPIARState: EmpiarSchemaState = {
-  schema: undefined,
-  empiarInteractionError: undefined,
-};
diff --git a/src/assets/config.json b/src/assets/config.json
index 3102a4d9f6..924f35c9a3 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -31,18 +31,17 @@
   
   "accessTokenPrefix": "Bearer ",
   "externalAuthEndpoint": "/api/v3/auth/ldap",
-  "datasetOneDepIntegration": true,
-  "depositorURL": "http://127.0.0.1:8080",
-  "ingestorEnabled": true,
-  "ingestorMode": "transfer",
-  "ingestorAutodiscoveryOptions": [
-    {
-      "mailDomain": "unibe.ch",
-      "description": "University of Bern",
-      "facilityBackend": "http://localhost:8888"
-    }
-  ],
-
+  "ingestorComponent":{
+    "ingestorEnabled": true,
+    "ingestorInTransferMode": true,
+    "ingestorAutodiscoveryOptions": [
+      {
+        "mailDomain": "unibe.ch",
+        "description": "University of Bern",
+        "facilityBackend": "http://localhost:8888"
+      }
+    ]
+  },
   "localColumns": [
     {
       "name": "datasetName",

From 61371f6a488a67b28449ebc4c6c9d21a5150e669 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 19 Sep 2025 13:09:09 +0000
Subject: [PATCH 218/245] try fix the branch

---
 src/app/app-config.service.ts                        |  1 -
 src/app/datasets/admin-tab/admin-tab.component.ts    |  2 +-
 src/app/datasets/archiving.service.spec.ts           |  1 -
 src/app/datasets/archiving.service.ts                |  8 ++------
 .../datafiles-action.component.spec.ts               |  4 ++--
 src/app/datasets/datafiles/datafiles.component.ts    |  2 +-
 .../dataset-details-dashboard.component.ts           |  3 ---
 .../share-dialog/share-dialog.component.spec.ts      |  2 --
 .../datasets/share-dialog/share-dialog.component.ts  |  2 +-
 .../jobs-dashboard-new.component.ts                  | 11 ++++++-----
 .../jobs-dashboard/jobs-dashboard.component.spec.ts  |  4 ++--
 .../jobs/jobs-dashboard/jobs-dashboard.component.ts  | 12 ++++++------
 src/app/jobs/jobs-detail/jobs-detail.component.scss  |  2 +-
 src/app/jobs/jobs-detail/jobs-detail.component.ts    |  2 +-
 .../policies/edit-dialog/edit-dialog.component.ts    |  2 +-
 src/app/state-management/effects/jobs.effects.ts     |  2 +-
 16 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index ca78f710f1..2a0e22c750 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -71,7 +71,6 @@ export interface AppConfigInterface {
   datasetJsonScientificMetadata: boolean;
   datasetReduceEnabled: boolean;
   datasetDetailsShowMissingProposalId: boolean;
-  datasetOneDepIntegration: boolean;
   datafilesActionsEnabled: boolean;
   datafilesActions: any[];
   editDatasetEnabled: boolean;
diff --git a/src/app/datasets/admin-tab/admin-tab.component.ts b/src/app/datasets/admin-tab/admin-tab.component.ts
index 6556b2c072..1cd8cc483b 100644
--- a/src/app/datasets/admin-tab/admin-tab.component.ts
+++ b/src/app/datasets/admin-tab/admin-tab.component.ts
@@ -65,7 +65,7 @@ export class AdminTabComponent implements OnInit, OnDestroy {
               type: "reset",
               datasetList: [fileObj],
               jobParams: {},
-              jobStatusMessage: "jobSubmitted",
+              jobStatusMessage: "jobCreated",
             };
             job.jobParams["username"] = user.username;
             this.store.dispatch(submitJobAction({ job }));
diff --git a/src/app/datasets/archiving.service.spec.ts b/src/app/datasets/archiving.service.spec.ts
index d8e14e650e..183d5a09d2 100644
--- a/src/app/datasets/archiving.service.spec.ts
+++ b/src/app/datasets/archiving.service.spec.ts
@@ -114,7 +114,6 @@ describe("ArchivingService", () => {
         type: "archive",
         executionTime: "",
         jobResultObject: {},
-        statusMessage: "",
         jobStatusMessage: "",
       });
       const createJobSpy = spyOn<any, string>(
diff --git a/src/app/datasets/archiving.service.ts b/src/app/datasets/archiving.service.ts
index 99b14a795a..99a5489ce8 100644
--- a/src/app/datasets/archiving.service.ts
+++ b/src/app/datasets/archiving.service.ts
@@ -12,7 +12,6 @@ import { RetrieveDestinations } from "app-config.service";
 import {
   OutputDatasetObsoleteDto,
   ReturnedUserDto,
-  CreateJobDtoV3,
 } from "@scicatproject/scicat-sdk-ts-angular";
 
 @Injectable()
@@ -28,7 +27,7 @@ export class ArchivingService {
     archive: boolean,
     destinationPath?: Record<string, string>,
     // Do not specify tape copies here
-  ): CreateJobDtoV3 {
+  ) {
     const extra = archive ? {} : destinationPath;
     const jobParams = {
       username: user.username,
@@ -39,9 +38,7 @@ export class ArchivingService {
       user.email = profile.email;
     });
 
-    // TODO remove jobStatusMessage when issue #2174 is resolved
-    // https://github.com/SciCatProject/scicat-backend-next/issues/2174
-    const data: CreateJobDtoV3 = {
+    const data = {
       jobParams,
       emailJobInitiator: user.email,
       // Revise this, files == []...? See earlier version of this method in dataset-table component for context
@@ -50,7 +47,6 @@ export class ArchivingService {
         files: [],
       })),
       type: archive ? "archive" : "retrieve",
-      jobStatusMessage: "jobSubmitted",
     };
 
     return data;
diff --git a/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts b/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
index b427618520..917a1eff52 100644
--- a/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
+++ b/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
@@ -229,7 +229,7 @@ describe("1000: DatafilesActionComponent", () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(DatafilesActionComponent);
     component = fixture.componentInstance;
-    component.files = JSON.parse(JSON.stringify(actionFiles));
+    component.files =structuredClone(actionFiles);
     component.actionConfig = actionsConfig[0];
     component.actionDataset = actionDataset;
     component.maxFileSize = lowerMaxFileSizeLimit;
@@ -528,7 +528,7 @@ describe("1000: DatafilesActionComponent", () => {
         component.maxFileSize = lowerMaxFileSizeLimit;
         break;
     }
-    component.files = JSON.parse(JSON.stringify(actionFiles));
+    component.files = structuredClone(actionFiles);
     switch (selectedFiles) {
       case selectedFilesType.file1:
         component.files[0].selected = true;
diff --git a/src/app/datasets/datafiles/datafiles.component.ts b/src/app/datasets/datafiles/datafiles.component.ts
index 44b5fdee36..e57a10bf6a 100644
--- a/src/app/datasets/datafiles/datafiles.component.ts
+++ b/src/app/datasets/datafiles/datafiles.component.ts
@@ -317,7 +317,7 @@ export class DatafilesComponent
               files: this.getSelectedFiles(),
             },
           ],
-          jobStatusMessage: "jobSubmitted",
+          jobStatusMessage: "jobCreated",
         };
         this.store.dispatch(submitJobAction({ job: data }));
       }
diff --git a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
index ee969be6ff..f26f62f12b 100644
--- a/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
+++ b/src/app/datasets/dataset-details-dashboard/dataset-details-dashboard.component.ts
@@ -148,9 +148,6 @@ export class DatasetDetailsDashboardComponent
             const hasAccessToLogbook =
               isInOwnerGroup ||
               this.dataset.accessGroups.some((g) => groups.includes(g));
-            const hasAccessToDepositor = isInOwnerGroup && this.dataset.keywords.some(
-              (k) => k.toLowerCase() === "openem",
-            );
             this.navLinks = [
               {
                 location: "./",
diff --git a/src/app/datasets/share-dialog/share-dialog.component.spec.ts b/src/app/datasets/share-dialog/share-dialog.component.spec.ts
index 667e5471b1..412f118845 100644
--- a/src/app/datasets/share-dialog/share-dialog.component.spec.ts
+++ b/src/app/datasets/share-dialog/share-dialog.component.spec.ts
@@ -32,7 +32,6 @@ import {
   DatasetsService,
   InstrumentsService,
   JobsService,
-  JobsV4Service,
   LogbooksService,
   ProposalsService,
   PublishedDataService,
@@ -78,7 +77,6 @@ describe("ShareDialogComponent", () => {
         { provide: UsersService, useClass: MockUserApi },
         { provide: InstrumentsService, useValue: {} },
         { provide: JobsService, useValue: {} },
-        { provide: JobsV4Service, useValue: {} },
         { provide: ProposalsService, useValue: {} },
         { provide: SamplesService, useValue: {} },
         { provide: PublishedDataService, useClass: MockPublishedDataApi },
diff --git a/src/app/datasets/share-dialog/share-dialog.component.ts b/src/app/datasets/share-dialog/share-dialog.component.ts
index 46ea1dafaf..34082b946a 100644
--- a/src/app/datasets/share-dialog/share-dialog.component.ts
+++ b/src/app/datasets/share-dialog/share-dialog.component.ts
@@ -32,7 +32,7 @@ export class ShareDialogComponent {
       sharedUsersList: string[];
     },
   ) {
-    this.data = JSON.parse(JSON.stringify(data));
+    this.data = structuredClone(data);
     this.users = this.data.sharedUsersList;
   }
 
diff --git a/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts b/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
index 34ffff1d1f..8a325b1046 100644
--- a/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
+++ b/src/app/jobs/jobs-dashboard-new/jobs-dashboard-new.component.ts
@@ -32,11 +32,11 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 0,
     },
     {
-      id: "createdBy",
-      label: "Creator",
+      id: "emailJobInitiator",
+      label: "Initiator",
       icon: "person",
       canSort: true,
-      matchMode: "is",
+      matchMode: "contains",
       hideOrder: 1,
     },
     {
@@ -48,7 +48,7 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 2,
     },
     {
-      id: "createdAt",
+      id: "creationTime",
       icon: "schedule",
       label: "Created at local time",
       format: "date medium ",
@@ -67,9 +67,10 @@ export class JobsDashboardNewComponent implements OnDestroy, AfterViewChecked {
       hideOrder: 4,
     },
     {
-      id: "statusCode",
+      id: "jobStatusMessage",
       icon: "traffic",
       label: "Status",
+      format: "json",
       canSort: true,
       matchMode: "contains",
       hideOrder: 5,
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
index 365628f81c..ea693ad5be 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts
@@ -100,8 +100,8 @@ describe("JobsDashboardComponent", () => {
       dispatchSpy = spyOn(store, "dispatch");
 
       const mode = JobViewMode.myJobs;
-      component.username = "testName";
-      const viewMode = { createdBy: component.username };
+      component.email = "test@email.com";
+      const viewMode = { emailJobInitiator: component.email };
       component.onModeChange(mode);
 
       expect(dispatchSpy).toHaveBeenCalledTimes(1);
diff --git a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
index 7557613766..ec043e22de 100644
--- a/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
+++ b/src/app/jobs/jobs-dashboard/jobs-dashboard.component.ts
@@ -49,7 +49,7 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
 
   jobs: JobsTableData[] = [];
   profile: any;
-  username = "";
+  email = "";
 
   subscriptions: Subscription[] = [];
 
@@ -127,7 +127,7 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
         break;
       }
       case JobViewMode.myJobs: {
-        viewMode = { createdBy: this.username };
+        viewMode = { emailJobInitiator: this.email };
         break;
       }
       default: {
@@ -152,11 +152,11 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
     // map column names back to original names
     switch (event.active) {
       case "statusMessage": {
-        event.active = "statusMessage";
+        event.active = "jobStatusMessage";
         break;
       }
       case "initiator": {
-        event.active = "createdBy";
+        event.active = "emailJobInitiator";
         break;
       }
       default: {
@@ -179,13 +179,13 @@ export class JobsDashboardComponent implements OnInit, OnDestroy {
     this.subscriptions.push(
       this.store.select(selectCurrentUser).subscribe((current) => {
         if (current) {
-          this.username = current.username;
+          this.email = current.email;
 
           if (!current.realm) {
             this.store.select(selectProfile).subscribe((profile) => {
               if (profile) {
                 this.profile = profile;
-                this.username = profile.username;
+                this.email = profile.email;
               }
               this.onModeChange(JobViewMode.myJobs);
             });
diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.scss b/src/app/jobs/jobs-detail/jobs-detail.component.scss
index b0cc683ba6..07d1eb8400 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.scss
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.scss
@@ -25,4 +25,4 @@ mat-card {
       padding: 0.5rem 0;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/jobs/jobs-detail/jobs-detail.component.ts b/src/app/jobs/jobs-detail/jobs-detail.component.ts
index b96b26a865..7f2c393549 100644
--- a/src/app/jobs/jobs-detail/jobs-detail.component.ts
+++ b/src/app/jobs/jobs-detail/jobs-detail.component.ts
@@ -34,7 +34,7 @@ export class JobsDetailComponent implements OnInit, OnDestroy {
       this.store.dispatch(fetchJobAction({ jobId: params.id }));
     });
     this.job$.subscribe((job) => {
-      this.hasJobResultObject = job &&
+      this.hasJobResultObject =
         Object.keys(job.jobResultObject || {}).length > 0;
     });
   }
diff --git a/src/app/policies/edit-dialog/edit-dialog.component.ts b/src/app/policies/edit-dialog/edit-dialog.component.ts
index d0f9902819..739372e721 100644
--- a/src/app/policies/edit-dialog/edit-dialog.component.ts
+++ b/src/app/policies/edit-dialog/edit-dialog.component.ts
@@ -28,7 +28,7 @@ export class EditDialogComponent implements /*OnChanges,*/ OnInit {
   ) {
     this.multiEdit = data.multiSelect;
     // clone input, do not mutate
-    this.data = JSON.parse(JSON.stringify(data));
+    this.data = structuredClone(data);
 
     // should make selected policy null is multi select, need to preserve group?
     if (this.multiEdit) {
diff --git a/src/app/state-management/effects/jobs.effects.ts b/src/app/state-management/effects/jobs.effects.ts
index 834510013e..f69093ff4f 100644
--- a/src/app/state-management/effects/jobs.effects.ts
+++ b/src/app/state-management/effects/jobs.effects.ts
@@ -134,4 +134,4 @@ export class JobEffects {
     private jobsService: JobsService,
     private store: Store,
   ) {}
-}
\ No newline at end of file
+}

From c5e71d8e849a326c24ed68eab2b10066ff3bdb3b Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 19 Sep 2025 14:18:07 +0000
Subject: [PATCH 219/245] starts up, but menu is missing

---
 .../app-header/app-header.component.html      |   2 +-
 .../datafiles-action.component.spec.ts        |   2 +-
 src/app/datasets/datasets.module.ts           |  11 -
 .../share-dialog/share-dialog.component.ts    |   2 +-
 .../selectors/datasets.selectors.ts           |   2 +-
 src/app/users/adauth.service.ts               |   2 +-
 src/assets/config.json                        | 403 +-----------------
 7 files changed, 21 insertions(+), 403 deletions(-)

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index e035f995f1..a44c15959b 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -9,7 +9,7 @@
         </button>
       </ng-container>
 
-      <ng-container *ngIf="config.ingestorEnabled">
+      <ng-container *ngIf="config.ingestorComponent.ingestorEnabled">
         <button mat-menu-item [routerLink]="['/ingestor']"
           [queryParams]="{ discovery: true }">
           <mat-icon> cloud_upload</mat-icon>
diff --git a/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts b/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
index 917a1eff52..8de1a48c1c 100644
--- a/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
+++ b/src/app/datasets/datafiles-actions/datafiles-action.component.spec.ts
@@ -229,7 +229,7 @@ describe("1000: DatafilesActionComponent", () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(DatafilesActionComponent);
     component = fixture.componentInstance;
-    component.files =structuredClone(actionFiles);
+    component.files = structuredClone(actionFiles);
     component.actionConfig = actionsConfig[0];
     component.actionDataset = actionDataset;
     component.maxFileSize = lowerMaxFileSizeLimit;
diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index eea38f5ca5..a384757fb8 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -138,7 +138,6 @@ import { TitleCasePipe } from "shared/pipes/title-case.pipe";
       SampleEffects,
       PublishedDataEffects,
       LogbookEffects,
-      OneDepEffects,
     ]),
     StoreModule.forFeature("datasets", datasetsReducer),
     StoreModule.forFeature("instruments", instrumentsReducer),
@@ -185,16 +184,6 @@ import { TitleCasePipe } from "shared/pipes/title-case.pipe";
     DatafilesActionsComponent,
     DatafilesActionComponent,
     DatasetsFilterSettingsComponent,
-    DepositorComponent,
-    DepositorWrapperComponent,
-    EmpiarComponent,
-    OneDepComponent,
-    OrcidFormatterDirective,
-    QuestionnaireComponent,
-    CustomEnumRendererComponent,
-    CustomAuthorNameControlComponent,
-    CustomReferenceControlComponent,
-    CustomSemiEnumControlComponent,
   ],
   providers: [
     ArchivingService,
diff --git a/src/app/datasets/share-dialog/share-dialog.component.ts b/src/app/datasets/share-dialog/share-dialog.component.ts
index 34082b946a..46ea1dafaf 100644
--- a/src/app/datasets/share-dialog/share-dialog.component.ts
+++ b/src/app/datasets/share-dialog/share-dialog.component.ts
@@ -32,7 +32,7 @@ export class ShareDialogComponent {
       sharedUsersList: string[];
     },
   ) {
-    this.data = structuredClone(data);
+    this.data = JSON.parse(JSON.stringify(data));
     this.users = this.data.sharedUsersList;
   }
 
diff --git a/src/app/state-management/selectors/datasets.selectors.ts b/src/app/state-management/selectors/datasets.selectors.ts
index 8ae6bf7451..fd1608f774 100644
--- a/src/app/state-management/selectors/datasets.selectors.ts
+++ b/src/app/state-management/selectors/datasets.selectors.ts
@@ -302,4 +302,4 @@ export const selectRelatedDatasetsCurrentPage = createSelector(
 export const selectRelatedDatasetsPerPage = createSelector(
   selectRelatedDatasetsFilters,
   (filters) => filters.limit,
-);
\ No newline at end of file
+);
diff --git a/src/app/users/adauth.service.ts b/src/app/users/adauth.service.ts
index 39f29c6031..6b2d1ec557 100644
--- a/src/app/users/adauth.service.ts
+++ b/src/app/users/adauth.service.ts
@@ -53,4 +53,4 @@ export class ADAuthService {
       .post<AccessToken>(url, creds, { observe: "response" })
       .pipe(timeout(3000));
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/config.json b/src/assets/config.json
index 924f35c9a3..d08d892eef 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -1,24 +1,12 @@
-
 {
   "addDatasetEnabled": true,
-  "archiveWorkflowEnabled": false,
+  "archiveWorkflowEnabled": true,
   "datasetReduceEnabled": true,
-  "datasetJsonScientificMetadata": true,
-  "editDatasetEnabled": true,
   "editDatasetSampleEnabled": true,
   "editMetadataEnabled": true,
   "editPublishedData": true,
-  "addSampleEnabled": true,
-  "facility": "Local",
-  "siteIcon": "site-header-logo.png",
-  "sitetitle": "",
-  "siteSciCatLogo": "",
-  "loginFacilityLabel": "ESS",
-  "loginLdapLabel": "Ldap",
-  "loginLocalLabel": "Local",
-  "loginFacilityEnabled": true,
-  "loginLdapEnabled": false,
-  "loginLocalEnabled": true,
+  "editSampleEnabled": true,
+  "facility": "SAMPLE-SITE",
   "fileColorEnabled": true,
   "fileDownloadEnabled": true,
   "gettingStarted": null,
@@ -27,10 +15,7 @@
   "jsonMetadataEnabled": true,
   "jupyterHubUrl": "",
   "landingPage": "",
-  "lbBaseURL": "http://backend.localhost",
-  
-  "accessTokenPrefix": "Bearer ",
-  "externalAuthEndpoint": "/api/v3/auth/ldap",
+  "lbBaseURL": "http://localhost:3001",
   "ingestorComponent":{
     "ingestorEnabled": true,
     "ingestorInTransferMode": true,
@@ -82,16 +67,17 @@
   ],
   "logbookEnabled": false,
   "loginFormEnabled": true,
-  "metadataPreviewEnabled": true,
-  "metadataStructure": "",
-  "multipleDownloadAction": "http://localhost:3012/zip",
-  "multipleDownloadEnabled": true,
   "oAuth2Endpoints": [
     {
       "authURL": "api/v3/auth/oidc",
       "displayText": "Login with OIDC"
     }
   ],
+  "maxDirectDownloadSize": 5000000000,
+  "metadataPreviewEnabled": true,
+  "metadataStructure": "tree",
+  "multipleDownloadAction": "",
+  "multipleDownloadEnabled": false,
   "policiesEnabled": true,
   "retrieveDestinations": [],
   "riotBaseUrl": "",
@@ -99,84 +85,11 @@
   "scienceSearchUnitsEnabled": true,
   "searchPublicDataEnabled": true,
   "searchSamples": true,
-  "sftpHost": "login.esss.dk",
-  "shareEnabled": true,
-  "sourceFolder": "/data/ess",
-  "maxDirectDownloadSize": 5000000000,
-  "maxFileSizeWarning": "Some files are above <maxDirectDownloadSize> and cannot be downloaded directly. These file can be downloaded via sftp host: <sftpHost> in directory: <sourceFolder>",
-  "shoppingCartEnabled": true,
-  "shoppingCartOnHeader": true,
+  "sftpHost": "",
+  "shareEnabled": false,
+  "shoppingCartEnabled": false,
+  "shoppingCartOnHeader": false,
   "tableSciDataEnabled": true,
-  "datasetDetailsShowMissingProposalId": false,
-  "notificationInterceptorEnabled": true,
-  "metadataEditingUnitListDisabled": true,
-  "datafilesActionsEnabled": true,
-  "datafilesActions": [
-    {
-      "id": "eed8efec-4354-11ef-a3b5-d75573a5d37f",
-      "description": "This action let users download all files using the zip service",
-      "order": 5,
-      "label": "Download All",
-      "files": "all",
-      "mat_icon": "download",
-      "type": "form",
-      "url": "https://zip.scicatproject.org/download/all",
-      "target": "_blank",
-      "enabled": "#SizeLimit",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
-    },
-    {
-      "id": "3072fafc-4363-11ef-b9f9-ebf568222d26",
-      "description": "This action let users download selected files using the zip service",
-      "order": 4,
-      "label": "Download Selected",
-      "files": "selected",
-      "mat_icon": "download",
-      "type": "form",
-      "url": "https://zip.scicatproject.org/download/selected",
-      "target": "_blank",
-      "enabled": "#Selected && #SizeLimit",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
-    },
-    {
-      "id": "4f974f0e-4364-11ef-9c63-03d19f813f4e",
-      "description": "This action let users download jupyter notebook properly populated with dataset pid and all files using an instance of sciwyrm",
-      "order": 2,
-      "label": "Notebook All (Form)",
-      "files": "all",
-      "icon": "/assets/icons/jupyter_logo.png",
-      "type": "form",
-      "url": "https://www.scicat.info/notebook/all",
-      "target": "_blank",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
-    },
-    {
-      "id": "0cd5b592-0b1a-11f0-a42c-23e177127ee7",
-      "description": "This action let users download jupyter notebook properly populated with dataset pid and selected files using an instance of sciwyrm",
-      "order": 3,
-      "label": "Notebook All (Download JSON)",
-      "files": "all",
-      "type": "json-download",
-      "icon": "/assets/icons/jupyter_logo.png",
-      "url": "https://www.sciwyrm.info/notebook",
-      "target": "_blank",
-      "authorization": ["#datasetAccess", "#datasetPublic"],
-      "payload": "{\"template_id\":\"c975455e-ede3-11ef-94fb-138c9cd51fc0\",\"parameters\":{\"dataset\":\"{{ datasetPid }}\",\"directory\":\"{{ sourceFolder }}\",\"files\": {{ filesPath }},\"jwt\":\"{{ jwt }}\",\"scicat_url\":\"https://staging.scicat.ess.url\",\"file_server_url\":\"sftserver2.esss.dk\",\"file_server_port\":\"22\"}}",
-      "filename": "{{ uuid }}.ipynb"
-    },
-    {
-      "id": "fa3ce6ee-482d-11ef-95e9-ff2c80dd50bd",
-      "order": 1,
-      "label": "Notebook Selected",
-      "files": "selected",
-      "icon": "/assets/icons/jupyter_logo.png",
-      "type": "form",
-      "url": "https://www.scicat.info/notebook/selected",
-      "target": "_blank",
-      "enabled": "#Selected",
-      "authorization": ["#datasetAccess", "#datasetPublic"]
-    }
-  ],
   "defaultDatasetsListSettings": {
     "columns": [
       {
@@ -257,292 +170,8 @@
         "type": "standard",
         "enabled": false
       }
-    ],
-    "filters": [
-      {
-        "key": "creationLocation",
-        "label": "Location",
-        "type": "multiSelect",
-        "description": "Filter by creation location on the dataset",
-        "enabled": true
-      },
-      {
-        "key": "pid",
-        "label": "Pid",
-        "type": "text",
-        "description": "Filter by dataset pid",
-        "enabled": true
-      },
-      {
-        "key": "ownerGroup",
-        "label": "Group",
-        "type": "multiSelect",
-        "description": "Filter by owner group of the dataset",
-        "enabled": true
-      },
-      {
-        "key": "type",
-        "label": "Type",
-        "type": "multiSelect",
-        "description": "Filter by dataset type",
-        "enabled": true
-      },
-      {
-        "key": "keywords",
-        "label": "Keyword",
-        "type": "multiSelect",
-        "description": "Filter by keywords in the dataset",
-        "enabled": true
-      },
-      {
-        "key": "creationTime",
-        "label": "Creation Time",
-        "type": "dateRange",
-        "description": "Filter by creation time of the dataset",
-        "enabled": true
-      }
-    ],
-    "conditions": []
-  },
-  "labelsLocalization": {
-    "datasetDefault": {},
-    "datasetCustom": {
-      "pid": "PID",
-      "description": "Description",
-      "principalInvestigator": "Principal Investigator",
-      "keywords": "Keywords",
-      "creationTime": "Creation Time",
-      "scientificMetadata": "Scientific Metadata",
-      "metadataJsonView": "Metadata Json View",
-      "datasetName": "Dataset Name",
-      "scientificMetadata.run_number.value": "Run Number",
-      "scientificMetadata.start_time": "Start Time"
-    },
-    "proposalDefault": {
-      "General Information": "Proposal Information",
-      "Title": "Proposal Title",
-      "Abstract": "Abstract",
-      "Proposal Id": "Proposal Id",
-      "Proposal Type": "Proposal Type",
-      "Parent Proposal": "Parent Proposal",
-      "Start Time": "Start Time",
-      "End Time": "End Time",
-      "Creator Information": "People",
-      "Main Proposer": "Proposal Submitted By",
-      "Principal Investigator": "Principal Investigator",
-      "Metadata": "Additional Information"
-    }
-  },
-  "dateFormat": "yyyy-MM-dd HH:mm",
-  "datasetDetailComponent": {
-    "enableCustomizedComponent": false,
-    "customization": [
-      {
-        "type": "regular",
-        "label": "General Information",
-        "order": 0,
-        "row": 1,
-        "col": 8,
-        "fields": [
-          {
-            "element": "text",
-            "source": "scientificMetadata.start_time",
-            "order": 0
-          },
-          {
-            "element": "copy",
-            "source": "scientificMetadata.run_number.value",
-            "order": 1
-          },
-          {
-            "element": "text",
-            "source": "creationTime",
-            "order": 2
-          },
-          {
-            "element": "text",
-            "source": "type",
-            "order": 3
-          },
-          {
-            "element": "text",
-            "source": "datasetName",
-            "order": 4
-          },
-          {
-            "element": "tag",
-            "source": "keywords",
-            "order": 5
-          }
-        ]
-      },
-      {
-        "type": "attachments",
-        "label": "Gallery",
-        "order": 1,
-        "col": 2,
-        "row": 2,
-        "options": {
-          "limit": 5,
-          "size": "medium"
-        }
-      },
-      {
-        "type": "regular",
-        "label": "Contact Information",
-        "order": 2,
-        "col": 2,
-        "row": 1,
-        "fields": [
-          {
-            "element": "text",
-            "source": "principalInvestigator",
-            "order": 0
-          },
-          {
-            "element": "linky",
-            "source": "contactEmail",
-            "order": 1
-          }
-        ]
-      },
-      {
-        "type": "regular",
-        "label": "Files Information",
-        "order": 3,
-        "col": 2,
-        "row": 1,
-        "fields": [
-          {
-            "element": "text",
-            "source": "scientificMetadata.runnumber",
-            "order": 0
-          },
-          {
-            "element": "text",
-            "source": "sourceFolderHost",
-            "order": 1
-          },
-          {
-            "element": "text",
-            "source": "numberOfFiles",
-            "order": 2
-          },
-          {
-            "element": "text",
-            "source": "size",
-            "order": 3
-          },
-          {
-            "element": "text",
-            "source": "numberOfFilesArchived",
-            "order": 4
-          },
-          {
-            "element": "text",
-            "source": "packedSize",
-            "order": 5
-          }
-        ]
-      },
-      {
-        "type": "regular",
-        "label": "Related Documents",
-        "order": 4,
-        "col": 4,
-        "row": 1,
-        "fields": [
-          {
-            "element": "internalLink",
-            "source": "proposalIds",
-            "order": 0
-          },
-          {
-            "element": "internalLink",
-            "source": "instrumentIds",
-            "order": 1
-          },
-          {
-            "element": "tag",
-            "source": "sampleIds",
-            "order": 2
-          },
-          {
-            "element": "tag",
-            "source": "inputDatasets",
-            "order": 3
-          },
-          {
-            "element": "internalLink",
-            "source": "creationLocation",
-            "order": 4
-          }
-        ]
-      },
-      {
-        "type": "attachments",
-        "label": "Gallery",
-        "order": 5,
-        "col": 1,
-        "row": 1,
-        "options": {
-          "limit": 2,
-          "size": "small"
-        }
-      },
-      {
-        "type": "scientificMetadata",
-        "label": "Scientific Metadata Table",
-        "viewMode": "table",
-        "order": 6,
-        "col": 9,
-        "row": 1
-      },
-      {
-        "type": "scientificMetadata",
-        "label": "Scientific Metadata JSON",
-        "viewMode": "json",
-        "order": 6
-      },
-      {
-        "type": "scientificMetadata",
-        "label": "Scientific Metadata Tree",
-        "viewMode": "tree",
-        "order": 6
-      },
-      {
-        "type": "datasetJsonView",
-        "label": "Dataset Json View",
-        "order": 7,
-        "col": 10,
-        "row": 2
-      }
     ]
   },
-  "defaultMainPage": {
-    "nonAuthenticatedUser": "DATASETS",
-    "authenticatedUser": "DATASETS"
-  },
-  "mainMenu": {
-    "nonAuthenticatedUser": {
-      "datasets": true,
-      "files": false,
-      "instruments": true,
-      "jobs": false,
-      "policies": false,
-      "proposals": true,
-      "publishedData": true,
-      "samples": false
-    },
-    "authenticatedUser": {
-      "datasets": true,
-      "files": true,
-      "instruments": true,
-      "jobs": true,
-      "policies": false,
-      "proposals": true,
-      "publishedData": true,
-      "samples": true
-    }
-  }
-}
\ No newline at end of file
+  "accessTokenPrefix": "Bearer ",
+  "externalAuthEndpoint": "/api/v3/auth/ldap"
+}

From c09188c5d0f9852500021634386dd475bcffb795 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 19 Sep 2025 14:37:45 +0000
Subject: [PATCH 220/245] fix config to return hamburger menu

---
 .../app-header/app-header.component.html      |  11 +-
 ...ataset-details-dashboard.routing.module.ts |   2 +-
 .../datasets/admin-tab/admin-tab.component.ts |   1 -
 .../dataset-detail.component.html             |   1 -
 .../edit-dialog/edit-dialog.component.ts      |   2 +-
 src/assets/config.json                        | 453 +++++++++++++++---
 6 files changed, 399 insertions(+), 71 deletions(-)

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index a44c15959b..117a3c96a7 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -1,7 +1,6 @@
 <div class="header">
   <mat-menu #mainMenu="matMenu">
     <ng-container *ngIf="mainMenuConfig$ | async as mainMenuConfig; else noMenuItems">
-
       <ng-container *ngIf="mainMenuConfig?.datasets ?? false">
         <button mat-menu-item routerLink="/datasets/">
           <mat-icon> folder</mat-icon>
@@ -16,7 +15,6 @@
           <span>Ingestor</span>
         </button>
       </ng-container>
-
       <ng-container *ngIf="mainMenuConfig?.files ?? false">
         <button mat-menu-item routerLink="/files/">
           <mat-icon> text_snippet</mat-icon>
@@ -108,19 +106,20 @@
     <span class="title">
       <h3>{{ siteTitle }}</h3>
     </span>
-
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/help']">
           <mat-icon> help </mat-icon>
-          <span class="large-screen-text">Help</span></a>
+          <span class="large-screen-text">Help</span></a
+        >
       </h6>
     </span>
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/about']">
           <mat-icon> info </mat-icon>
-          <span class="large-screen-text">About</span></a>
+          <span class="large-screen-text">About</span></a
+        >
       </h6>
     </span>
     <!--<span *ngIf="(this.isLoggedIn | async) === false; else userButton">-->
@@ -157,4 +156,4 @@ <h6>
       </h6>
     </ng-template>
   </mat-toolbar>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts b/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
index 4e5e7a0a4f..d48eeab3a4 100644
--- a/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
+++ b/src/app/app-routing/lazy/dataset-details-dashboard-routing/dataset-details-dashboard.routing.module.ts
@@ -68,7 +68,7 @@ const routes: Routes = [
     path: "admin",
     component: AdminTabComponent,
     canActivate: [AuthGuard, AdminGuard],
-  }
+  },
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/datasets/admin-tab/admin-tab.component.ts b/src/app/datasets/admin-tab/admin-tab.component.ts
index 1cd8cc483b..8e7662dd2f 100644
--- a/src/app/datasets/admin-tab/admin-tab.component.ts
+++ b/src/app/datasets/admin-tab/admin-tab.component.ts
@@ -73,7 +73,6 @@ export class AdminTabComponent implements OnInit, OnDestroy {
         });
     }
   }
-
   ngOnDestroy(): void {
     this.subscriptions.forEach((sub) => {
       sub.unsubscribe();
diff --git a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html
index 0675078bf4..7fe0851b5a 100644
--- a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html
+++ b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html
@@ -22,7 +22,6 @@
       </mat-slide-toggle>
     </div>
   </div>
-
   <div style="clear: both"></div>
   <div fxLayout="row" fxLayout.xs="column" *ngIf="dataset">
     <div [fxFlex]="(attachments$ | async)?.length > 0 ? '90%' : '100%'">
diff --git a/src/app/policies/edit-dialog/edit-dialog.component.ts b/src/app/policies/edit-dialog/edit-dialog.component.ts
index 739372e721..d0f9902819 100644
--- a/src/app/policies/edit-dialog/edit-dialog.component.ts
+++ b/src/app/policies/edit-dialog/edit-dialog.component.ts
@@ -28,7 +28,7 @@ export class EditDialogComponent implements /*OnChanges,*/ OnInit {
   ) {
     this.multiEdit = data.multiSelect;
     // clone input, do not mutate
-    this.data = structuredClone(data);
+    this.data = JSON.parse(JSON.stringify(data));
 
     // should make selected policy null is multi select, need to preserve group?
     if (this.multiEdit) {
diff --git a/src/assets/config.json b/src/assets/config.json
index d08d892eef..ba80370ffa 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -1,21 +1,34 @@
 {
+  "accessTokenPrefix": "Bearer ",
   "addDatasetEnabled": true,
-  "archiveWorkflowEnabled": true,
+  "archiveWorkflowEnabled": false,
   "datasetReduceEnabled": true,
+  "datasetJsonScientificMetadata": true,
+  "editDatasetEnabled": true,
   "editDatasetSampleEnabled": true,
   "editMetadataEnabled": true,
   "editPublishedData": true,
-  "editSampleEnabled": true,
-  "facility": "SAMPLE-SITE",
+  "addSampleEnabled": true,
+  "externalAuthEndpoint": "/auth/msad",
+  "facility": "Local",
+  "siteIcon": "site-header-logo.png",
+  "sitetitle": "",
+  "siteSciCatLogo": "",
+  "loginFacilityLabel": "ESS",
+  "loginLdapLabel": "Ldap",
+  "loginLocalLabel": "Local",
+  "loginFacilityEnabled": true,
+  "loginLdapEnabled": false,
+  "loginLocalEnabled": true,
   "fileColorEnabled": true,
   "fileDownloadEnabled": true,
   "gettingStarted": null,
   "ingestManual": null,
-  "jobsEnabled": false,
+  "jobsEnabled": true,
   "jsonMetadataEnabled": true,
-  "jupyterHubUrl": "",
-  "landingPage": "",
-  "lbBaseURL": "http://localhost:3001",
+  "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
+  "landingPage": "doi.ess.eu/detail/",
+  "lbBaseURL": "http://127.0.0.1:3000",
   "ingestorComponent":{
     "ingestorEnabled": true,
     "ingestorInTransferMode": true,
@@ -27,69 +40,103 @@
       }
     ]
   },
-  "localColumns": [
-    {
-      "name": "datasetName",
-      "order": 1,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "type",
-      "order": 2,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "creationTime",
-      "order": 3,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "proposalId",
-      "order": 6,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "image",
-      "order": 7,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "sourceFolder",
-      "order": 8,
-      "type": "standard",
-      "enabled": true
-    }
-  ],
-  "logbookEnabled": false,
+  "logbookEnabled": true,
   "loginFormEnabled": true,
+  "metadataPreviewEnabled": true,
+  "metadataStructure": "",
+  "multipleDownloadAction": "http://localhost:3012/zip",
+  "multipleDownloadEnabled": true,
   "oAuth2Endpoints": [
     {
       "authURL": "api/v3/auth/oidc",
-      "displayText": "Login with OIDC"
+      "displayText": "ESS One Identity"
     }
   ],
-  "maxDirectDownloadSize": 5000000000,
-  "metadataPreviewEnabled": true,
-  "metadataStructure": "tree",
-  "multipleDownloadAction": "",
-  "multipleDownloadEnabled": false,
   "policiesEnabled": true,
   "retrieveDestinations": [],
-  "riotBaseUrl": "",
-  "scienceSearchEnabled": true,
+  "riotBaseUrl": "http://scichat.swap.ess.eu",
+  "scienceSearchEnabled": false,
   "scienceSearchUnitsEnabled": true,
   "searchPublicDataEnabled": true,
   "searchSamples": true,
-  "sftpHost": "",
-  "shareEnabled": false,
-  "shoppingCartEnabled": false,
-  "shoppingCartOnHeader": false,
+  "sftpHost": "login.esss.dk",
+  "shareEnabled": true,
+  "sourceFolder": "/data/ess",
+  "maxDirectDownloadSize": 5000000000,
+  "maxFileSizeWarning": "Some files are above <maxDirectDownloadSize> and cannot be downloaded directly. These file can be downloaded via sftp host: <sftpHost> in directory: <sourceFolder>",
+  "shoppingCartEnabled": true,
+  "shoppingCartOnHeader": true,
   "tableSciDataEnabled": true,
+  "datasetDetailsShowMissingProposalId": false,
+  "notificationInterceptorEnabled": true,
+  "metadataEditingUnitListDisabled": true,
+  "datafilesActionsEnabled": true,
+  "datafilesActions": [
+    {
+      "id": "eed8efec-4354-11ef-a3b5-d75573a5d37f",
+      "description": "This action let users download all files using the zip service",
+      "order": 5,
+      "label": "Download All",
+      "files": "all",
+      "mat_icon": "download",
+      "type": "form",
+      "url": "https://zip.scicatproject.org/download/all",
+      "target": "_blank",
+      "enabled": "#SizeLimit",
+      "authorization": ["#datasetAccess", "#datasetPublic"]
+    },
+    {
+      "id": "3072fafc-4363-11ef-b9f9-ebf568222d26",
+      "description": "This action let users download selected files using the zip service",
+      "order": 4,
+      "label": "Download Selected",
+      "files": "selected",
+      "mat_icon": "download",
+      "type": "form",
+      "url": "https://zip.scicatproject.org/download/selected",
+      "target": "_blank",
+      "enabled": "#Selected && #SizeLimit",
+      "authorization": ["#datasetAccess", "#datasetPublic"]
+    },
+    {
+      "id": "4f974f0e-4364-11ef-9c63-03d19f813f4e",
+      "description": "This action let users download jupyter notebook properly populated with dataset pid and all files using an instance of sciwyrm",
+      "order": 2,
+      "label": "Notebook All (Form)",
+      "files": "all",
+      "icon": "/assets/icons/jupyter_logo.png",
+      "type": "form",
+      "url": "https://www.scicat.info/notebook/all",
+      "target": "_blank",
+      "authorization": ["#datasetAccess", "#datasetPublic"]
+    },
+    {
+      "id": "0cd5b592-0b1a-11f0-a42c-23e177127ee7",
+      "description": "This action let users download jupyter notebook properly populated with dataset pid and selected files using an instance of sciwyrm",
+      "order": 3,
+      "label": "Notebook All (Download JSON)",
+      "files": "all",
+      "type": "json-download",
+      "icon": "/assets/icons/jupyter_logo.png",
+      "url": "https://www.sciwyrm.info/notebook",
+      "target": "_blank",
+      "authorization": ["#datasetAccess", "#datasetPublic"],
+      "payload": "{\"template_id\":\"c975455e-ede3-11ef-94fb-138c9cd51fc0\",\"parameters\":{\"dataset\":\"{{ datasetPid }}\",\"directory\":\"{{ sourceFolder }}\",\"files\": {{ filesPath }},\"jwt\":\"{{ jwt }}\",\"scicat_url\":\"https://staging.scicat.ess.url\",\"file_server_url\":\"sftserver2.esss.dk\",\"file_server_port\":\"22\"}}",
+      "filename": "{{ uuid }}.ipynb"
+    },
+    {
+      "id": "fa3ce6ee-482d-11ef-95e9-ff2c80dd50bd",
+      "order": 1,
+      "label": "Notebook Selected",
+      "files": "selected",
+      "icon": "/assets/icons/jupyter_logo.png",
+      "type": "form",
+      "url": "https://www.scicat.info/notebook/selected",
+      "target": "_blank",
+      "enabled": "#Selected",
+      "authorization": ["#datasetAccess", "#datasetPublic"]
+    }
+  ],
   "defaultDatasetsListSettings": {
     "columns": [
       {
@@ -170,8 +217,292 @@
         "type": "standard",
         "enabled": false
       }
+    ],
+    "filters": [
+      {
+        "key": "creationLocation",
+        "label": "Location",
+        "type": "multiSelect",
+        "description": "Filter by creation location on the dataset",
+        "enabled": true
+      },
+      {
+        "key": "pid",
+        "label": "Pid",
+        "type": "text",
+        "description": "Filter by dataset pid",
+        "enabled": true
+      },
+      {
+        "key": "ownerGroup",
+        "label": "Group",
+        "type": "multiSelect",
+        "description": "Filter by owner group of the dataset",
+        "enabled": true
+      },
+      {
+        "key": "type",
+        "label": "Type",
+        "type": "multiSelect",
+        "description": "Filter by dataset type",
+        "enabled": true
+      },
+      {
+        "key": "keywords",
+        "label": "Keyword",
+        "type": "multiSelect",
+        "description": "Filter by keywords in the dataset",
+        "enabled": true
+      },
+      {
+        "key": "creationTime",
+        "label": "Creation Time",
+        "type": "dateRange",
+        "description": "Filter by creation time of the dataset",
+        "enabled": true
+      }
+    ],
+    "conditions": []
+  },
+  "labelsLocalization": {
+    "datasetDefault": {},
+    "datasetCustom": {
+      "pid": "PID",
+      "description": "Description",
+      "principalInvestigator": "Principal Investigator",
+      "keywords": "Keywords",
+      "creationTime": "Creation Time",
+      "scientificMetadata": "Scientific Metadata",
+      "metadataJsonView": "Metadata Json View",
+      "datasetName": "Dataset Name",
+      "scientificMetadata.run_number.value": "Run Number",
+      "scientificMetadata.start_time": "Start Time"
+    },
+    "proposalDefault": {
+      "General Information": "Proposal Information",
+      "Title": "Proposal Title",
+      "Abstract": "Abstract",
+      "Proposal Id": "Proposal Id",
+      "Proposal Type": "Proposal Type",
+      "Parent Proposal": "Parent Proposal",
+      "Start Time": "Start Time",
+      "End Time": "End Time",
+      "Creator Information": "People",
+      "Main Proposer": "Proposal Submitted By",
+      "Principal Investigator": "Principal Investigator",
+      "Metadata": "Additional Information"
+    }
+  },
+  "dateFormat": "yyyy-MM-dd HH:mm",
+  "datasetDetailComponent": {
+    "enableCustomizedComponent": false,
+    "customization": [
+      {
+        "type": "regular",
+        "label": "General Information",
+        "order": 0,
+        "row": 1,
+        "col": 8,
+        "fields": [
+          {
+            "element": "text",
+            "source": "scientificMetadata.start_time",
+            "order": 0
+          },
+          {
+            "element": "copy",
+            "source": "scientificMetadata.run_number.value",
+            "order": 1
+          },
+          {
+            "element": "text",
+            "source": "creationTime",
+            "order": 2
+          },
+          {
+            "element": "text",
+            "source": "type",
+            "order": 3
+          },
+          {
+            "element": "text",
+            "source": "datasetName",
+            "order": 4
+          },
+          {
+            "element": "tag",
+            "source": "keywords",
+            "order": 5
+          }
+        ]
+      },
+      {
+        "type": "attachments",
+        "label": "Gallery",
+        "order": 1,
+        "col": 2,
+        "row": 2,
+        "options": {
+          "limit": 5,
+          "size": "medium"
+        }
+      },
+      {
+        "type": "regular",
+        "label": "Contact Information",
+        "order": 2,
+        "col": 2,
+        "row": 1,
+        "fields": [
+          {
+            "element": "text",
+            "source": "principalInvestigator",
+            "order": 0
+          },
+          {
+            "element": "linky",
+            "source": "contactEmail",
+            "order": 1
+          }
+        ]
+      },
+      {
+        "type": "regular",
+        "label": "Files Information",
+        "order": 3,
+        "col": 2,
+        "row": 1,
+        "fields": [
+          {
+            "element": "text",
+            "source": "scientificMetadata.runnumber",
+            "order": 0
+          },
+          {
+            "element": "text",
+            "source": "sourceFolderHost",
+            "order": 1
+          },
+          {
+            "element": "text",
+            "source": "numberOfFiles",
+            "order": 2
+          },
+          {
+            "element": "text",
+            "source": "size",
+            "order": 3
+          },
+          {
+            "element": "text",
+            "source": "numberOfFilesArchived",
+            "order": 4
+          },
+          {
+            "element": "text",
+            "source": "packedSize",
+            "order": 5
+          }
+        ]
+      },
+      {
+        "type": "regular",
+        "label": "Related Documents",
+        "order": 4,
+        "col": 4,
+        "row": 1,
+        "fields": [
+          {
+            "element": "internalLink",
+            "source": "proposalIds",
+            "order": 0
+          },
+          {
+            "element": "internalLink",
+            "source": "instrumentIds",
+            "order": 1
+          },
+          {
+            "element": "tag",
+            "source": "sampleIds",
+            "order": 2
+          },
+          {
+            "element": "tag",
+            "source": "inputDatasets",
+            "order": 3
+          },
+          {
+            "element": "internalLink",
+            "source": "creationLocation",
+            "order": 4
+          }
+        ]
+      },
+      {
+        "type": "attachments",
+        "label": "Gallery",
+        "order": 5,
+        "col": 1,
+        "row": 1,
+        "options": {
+          "limit": 2,
+          "size": "small"
+        }
+      },
+      {
+        "type": "scientificMetadata",
+        "label": "Scientific Metadata Table",
+        "viewMode": "table",
+        "order": 6,
+        "col": 9,
+        "row": 1
+      },
+      {
+        "type": "scientificMetadata",
+        "label": "Scientific Metadata JSON",
+        "viewMode": "json",
+        "order": 6
+      },
+      {
+        "type": "scientificMetadata",
+        "label": "Scientific Metadata Tree",
+        "viewMode": "tree",
+        "order": 6
+      },
+      {
+        "type": "datasetJsonView",
+        "label": "Dataset Json View",
+        "order": 7,
+        "col": 10,
+        "row": 2
+      }
     ]
   },
-  "accessTokenPrefix": "Bearer ",
-  "externalAuthEndpoint": "/api/v3/auth/ldap"
-}
+  "defaultMainPage": {
+    "nonAuthenticatedUser": "DATASETS",
+    "authenticatedUser": "DATASETS"
+  },
+  "mainMenu": {
+    "nonAuthenticatedUser": {
+      "datasets": true,
+      "files": false,
+      "instruments": true,
+      "jobs": false,
+      "policies": false,
+      "proposals": true,
+      "publishedData": true,
+      "samples": false
+    },
+    "authenticatedUser": {
+      "datasets": true,
+      "files": true,
+      "instruments": true,
+      "jobs": true,
+      "policies": false,
+      "proposals": true,
+      "publishedData": true,
+      "samples": true
+    }
+  }
+}
\ No newline at end of file

From b24f6558d048f9955e75bb31e6d35f336d4a1a95 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 23 Sep 2025 05:50:32 +0000
Subject: [PATCH 221/245] renamed components

---
 src/app/app-config.service.spec.ts                           | 5 ++++-
 .../lazy/ingestor-routing/ingestor.routing.module.ts         | 2 +-
 ....component.spec.ts => ingestor-wrapper.component.spec.ts} | 2 +-
 .../{ingestor.component.ts => ingestor-wrapper.component.ts} | 0
 src/app/ingestor/ingestor.module.ts                          | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)
 rename src/app/ingestor/ingestor-page/{ingestor.component.spec.ts => ingestor-wrapper.component.spec.ts} (97%)
 rename src/app/ingestor/ingestor-page/{ingestor.component.ts => ingestor-wrapper.component.ts} (100%)

diff --git a/src/app/app-config.service.spec.ts b/src/app/app-config.service.spec.ts
index 0c6f19affb..d662c974a7 100644
--- a/src/app/app-config.service.spec.ts
+++ b/src/app/app-config.service.spec.ts
@@ -250,8 +250,11 @@ const appConfig: AppConfigInterface = {
     ],
     conditions: [],
   },
+  ingestorComponent:{
   ingestorEnabled: true,
-  ingestorMode: "creation",
+  ingestorInTransferMode: true,
+
+  }
 };
 
 describe("AppConfigService", () => {
diff --git a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
index 1a150cb173..24df36f663 100644
--- a/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
+++ b/src/app/app-routing/lazy/ingestor-routing/ingestor.routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
-import { IngestorWrapperComponent } from "ingestor/ingestor-page/ingestor.component";
+import { IngestorWrapperComponent } from "ingestor/ingestor-page/ingestor-wrapper.component";
 
 const routes: Routes = [
   {
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts
similarity index 97%
rename from src/app/ingestor/ingestor-page/ingestor.component.spec.ts
rename to src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts
index 07a117078b..c93cd9cf81 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.spec.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts
@@ -1,4 +1,4 @@
-mport { IngestorWrapperComponent } from "./ingestor.component";
+import { IngestorWrapperComponent } from "./ingestor-wrapper.component";
 import { NO_ERRORS_SCHEMA } from "@angular/core";
 import { AppConfigInterface, AppConfigService } from "app-config.service";
 import { IngestorTransferComponent } from "./ingestor-transfer.component";
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.ts b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
similarity index 100%
rename from src/app/ingestor/ingestor-page/ingestor.component.ts
rename to src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index d7558bcc8a..cecd42a0f9 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
-import { IngestorWrapperComponent } from "./ingestor-page/ingestor.component";
+import { IngestorWrapperComponent } from "./ingestor-page/ingestor-wrapper.component";
 import { MatCardModule } from "@angular/material/card";
 import { RouterModule } from "@angular/router";
 import { IngestorMetadataEditorComponent } from "./ingestor-metadata-editor/ingestor-metadata-editor.component";

From 3b5c45c47337b8096db5f4ead14b5bc78d5d3c07 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 23 Sep 2025 07:17:14 +0000
Subject: [PATCH 222/245] fix failing tests

---
 .../dashboard/dashboard.component.spec.ts     | 59 +++----------------
 ...ingestor.creation-dialog-base.component.ts |  3 +-
 .../effects/datasets.effects.ts               | 17 ------
 3 files changed, 11 insertions(+), 68 deletions(-)

diff --git a/src/app/datasets/dashboard/dashboard.component.spec.ts b/src/app/datasets/dashboard/dashboard.component.spec.ts
index d5f9f87843..aa2e9df0e7 100644
--- a/src/app/datasets/dashboard/dashboard.component.spec.ts
+++ b/src/app/datasets/dashboard/dashboard.component.spec.ts
@@ -22,6 +22,7 @@ import {
 } from "state-management/actions/datasets.actions";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { provideMockStore } from "@ngrx/store/testing";
+import {resetIngestionObject} from "state-management/actions/ingestor.actions";
 import { selectSelectedDatasets } from "state-management/selectors/datasets.selectors";
 import {
   selectColumns,
@@ -33,6 +34,7 @@ import { MatCardModule } from "@angular/material/card";
 import { MatIconModule } from "@angular/material/icon";
 import { AppConfigService } from "app-config.service";
 import { PageChangeEvent } from "shared/modules/table/table.component";
+import { IngestionRequestInformation } from "ingestor/ingestor-page/helper/ingestor.component-helper";
 import {
   DatasetsControllerCreateV3Request,
   ReturnedUserDto,
@@ -135,61 +137,18 @@ describe("DashboardComponent", () => {
   });
 
   describe("#openDialog()", () => {
-    it("should dispatch an addDatasetAction when dialog returns a value", () => {
-      jasmine.clock().install();
-      jasmine.clock().mockDate(new Date(2019, 12, 17, 12, 0, 0));
-
-      dispatchSpy = spyOn(store, "dispatch");
-
-      const currentUser = createMock<ReturnedUserDto>({
-        id: "testId",
-        username: "ldap.Test User",
-        email: "test@email.com",
-        realm: "test",
-        emailVerified: true,
-        authStrategy: "local",
-      });
-
-      const dataset: DatasetsControllerCreateV3Request = {
-        accessGroups: [],
-        contactEmail: currentUser.email,
-        creationTime: new Date().toISOString(),
-        datasetName: "Test Name",
-        description: "Test description",
-        isPublished: false,
-        keywords: [],
-        owner: currentUser.username.replace("ldap.", ""),
-        ownerEmail: currentUser.email,
-        ownerGroup: "test",
-        packedSize: 0,
-        size: 0,
-        sourceFolder: "/nfs/test",
-        type: "derived",
-        inputDatasets: [],
-        investigator: currentUser.email,
-        scientificMetadata: {},
-        usedSoftware: ["test software"],
-        numberOfFilesArchived: 0,
-        creationLocation: undefined,
-        principalInvestigator: undefined,
-      };
-
-      component.currentUser = currentUser;
-      component.userGroups = ["test"];
+    it("should call Ingestor method", () => {
+      const mockIngestor = jasmine.createSpyObj('IngestorCreationComponent', ['onClickAddIngestion']);
 
+      component.ingestor = mockIngestor;
       component.openDialog();
-
-      expect(dispatchSpy).toHaveBeenCalledTimes(1);
-      expect(dispatchSpy).toHaveBeenCalledWith(
-        addDatasetAction({
-          dataset: dataset,
-        }),
-      );
+      
+      expect(mockIngestor.onClickAddIngestion).toHaveBeenCalledTimes(1);
     });
   });
-
+  
   describe("#onPageChange()", () => {
-    it("should dispatch a changePangeAction", () => {
+    it("should dispatch a changePageAction", () => {
       dispatchSpy = spyOn(store, "dispatch");
 
       const event: PageChangeEvent = {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index ce00fcbc73..0098600851 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -18,6 +18,7 @@ import { IngestorMetadataSSEService } from "ingestor/ingestor-page/helper/ingest
 import { HttpParams } from "@angular/common/http";
 import { PostDatasetRequest } from "shared/sdk/models/ingestor/models";
 import * as fromActions from "state-management/actions/ingestor.actions";
+import * as datasetActions from "state-management/actions/datasets.actions";
 import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
 import { fetchScicatTokenAction } from "state-management/actions/user.actions";
 import { INGESTOR_API_ENDPOINTS_V1 } from "shared/sdk/apis/ingestor.service";
@@ -268,7 +269,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
   onClickStartIngestion(): void {
     if (this.createNewTransferData.editorMode === "CREATION") {
       this.store.dispatch(
-        fromActions.createDatasetAction({
+        datasetActions.addDatasetAction({
           dataset: JSON.parse(this.createNewTransferData.mergedMetaDataString),
         }),
       );
diff --git a/src/app/state-management/effects/datasets.effects.ts b/src/app/state-management/effects/datasets.effects.ts
index be17d074ca..bb5c44402a 100644
--- a/src/app/state-management/effects/datasets.effects.ts
+++ b/src/app/state-management/effects/datasets.effects.ts
@@ -35,8 +35,6 @@ import {
   loadingCompleteAction,
   updateUserSettingsAction,
 } from "state-management/actions/user.actions";
-import { MessageType } from "state-management/models";
-import { showMessageAction } from "state-management/actions/user.actions";
 
 @Injectable()
 export class DatasetEffects {
@@ -305,7 +303,6 @@ export class DatasetEffects {
           .pipe(
             switchMap(() => [
               fromActions.updatePropertyCompleteAction(),
-              fromActions.updateScientificMetadataCompleteAction({pid}),
               fromActions.fetchDatasetAction({ pid }),
             ]),
             catchError(() => of(fromActions.updatePropertyFailedAction())),
@@ -314,20 +311,6 @@ export class DatasetEffects {
     );
   });
 
-  updatePropertySuccessMessage$ = createEffect(() =>
-  this.actions$.pipe(
-    ofType(fromActions.updateScientificMetadataCompleteAction),
-    map(({ pid }) => {
-      const message = {
-        type: MessageType.Success,
-        content: `Updated scientific Metadata of dataset ${pid}`,
-        duration: 5000,
-      };
-      return showMessageAction({ message });
-    })
-  )
-);
-
   addAttachment$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(fromActions.addAttachmentAction),

From be174f0da57f66141f452b71caab41278542eeed Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 25 Sep 2025 09:44:21 +0000
Subject: [PATCH 223/245] fix: #ingestor-142 validation error in reqOnly mode

---
 ...r.custom-metadata-dialog-page.component.ts | 12 ++-
 ...xtractor-metadata-dialog-page.component.ts | 22 ++++-
 ...tor.user-metadata-dialog-page.component.ts | 32 +++++--
 .../ingestor-metadata-editor-helper.ts        | 91 +++++++++++++++++++
 .../helper/ingestor.component-helper.ts       |  1 +
 5 files changed, 143 insertions(+), 15 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
index a87259555f..7dcc62b40e 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
@@ -11,7 +11,7 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
-import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 import {
   selectIngestionObject,
   selectIngestorRenderView,
@@ -152,8 +152,14 @@ export class IngestorCustomMetadataDialogPageComponent
   }
 
   customMetadataErrorsHandler(errors: any[]) {
-    this.isCustomMetadataOk = errors.length === 0;
-    this.customMetadataErrors = convertJSONFormsErrorToString(errors);
+    const result = IngestorMetadataEditorHelper.processMetadataErrors(
+      errors,
+      this.customMetadataSchema,
+      this.activeRenderView
+    );
+    
+    this.isCustomMetadataOk = result.isValid;
+    this.customMetadataErrors = result.errorString;
     this.validateNextButton();
     this.cdr.detectChanges();
   }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index c73d016766..ea0cb098cf 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -12,7 +12,7 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
-import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 import { Store } from "@ngrx/store";
 import {
   ingestionObjectAPIInformation,
@@ -180,15 +180,27 @@ export class IngestorExtractorMetadataDialogPageComponent
   }
 
   instrumentErrorsHandler(errors: any[]) {
-    this.isInstrumentMetadataOk = errors.length === 0;
-    this.instrumentErrors = convertJSONFormsErrorToString(errors);
+    const result = IngestorMetadataEditorHelper.processMetadataErrors(
+      errors,
+      this.metadataSchemaInstrument,
+      this.activeRenderView
+    );
+    
+    this.isInstrumentMetadataOk = result.isValid;
+    this.instrumentErrors = result.errorString;
     this.validateNextButton();
     this.cdr.detectChanges();
   }
 
   acquisitionErrorsHandler(errors: any[]) {
-    this.isAcquisitionMetadataOk = errors.length === 0;
-    this.acquisitionErrors = convertJSONFormsErrorToString(errors);
+    const result = IngestorMetadataEditorHelper.processMetadataErrors(
+      errors,
+      this.metadataSchemaAcquisition,
+      this.activeRenderView
+    );
+    
+    this.isAcquisitionMetadataOk = result.isValid;
+    this.acquisitionErrors = result.errorString;
     this.validateNextButton();
     this.cdr.detectChanges();
   }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index f5364a9fdc..b3d9f06471 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -12,7 +12,7 @@ import {
   IngestionRequestInformation,
   IngestorHelper,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
-import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 import {
   selectIngestionObject,
   selectIngestorRenderView,
@@ -157,22 +157,40 @@ export class IngestorUserMetadataDialogPageComponent
   }
 
   scicatHeaderErrorsHandler(errors: any[]) {
-    this.isSciCatHeaderOk = errors.length === 0;
-    this.scicatHeaderErrors = convertJSONFormsErrorToString(errors);
+    const result = IngestorMetadataEditorHelper.processMetadataErrors(
+      errors,
+      this.scicatHeaderSchema,
+      this.activeRenderView
+    );
+    
+    this.isSciCatHeaderOk = result.isValid;
+    this.scicatHeaderErrors = result.errorString;
     this.validateNextButton();
     this.cdr.detectChanges();
   }
 
   organizationalErrorsHandler(errors: any[]) {
-    this.isOrganizationalMetadataOk = errors.length === 0;
-    this.organizationalErrors = convertJSONFormsErrorToString(errors);
+    const result = IngestorMetadataEditorHelper.processMetadataErrors(
+      errors,
+      this.metadataSchemaOrganizational,
+      this.activeRenderView
+    );
+    
+    this.isOrganizationalMetadataOk = result.isValid;
+    this.organizationalErrors = result.errorString;
     this.validateNextButton();
     this.cdr.detectChanges();
   }
 
   sampleErrorsHandler(errors: any[]) {
-    this.isSampleInformationOk = errors.length === 0;
-    this.sampleErrors = convertJSONFormsErrorToString(errors);
+    const result = IngestorMetadataEditorHelper.processMetadataErrors(
+      errors,
+      this.metadataSchemaSample,
+      this.activeRenderView
+    );
+    
+    this.isSampleInformationOk = result.isValid;
+    this.sampleErrors = result.errorString;
     this.validateNextButton();
     this.cdr.detectChanges();
   }
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index bb53342bd1..f4192b7173 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -1,5 +1,6 @@
 import { angularMaterialRenderers } from "@jsonforms/angular-material";
 import { customRenderers } from "./customRenderer/custom-renderers";
+import { JsonSchema } from "@jsonforms/core";
 
 export const configuredRenderer = [
   ...customRenderers,
@@ -62,6 +63,96 @@ export class IngestorMetadataEditorHelper {
 
     return reducedSchema;
   }
+
+    /**
+     * Checks if a field at the given error path is marked as required in the JSON schema
+     * @param errorPath - The path to the field (e.g., "/instrument/name" or "/acquisition/voltage")
+     * @param schema - The JSON schema to check against
+     * @returns true if the field is required, false otherwise
+     */
+    static isRequiredField(errorPath: string, schema: JsonSchema): boolean {
+      if (!schema || !errorPath) {
+        return false;
+      }
+  
+      // Remove leading slash and split the path
+      const pathSegments = errorPath.replace(/^\//, '').split('/');
+      
+      // If empty path, return false
+      if (pathSegments.length === 0 || pathSegments[0] === '') {
+        return false;
+      }
+  
+      // Start from the root schema
+      let currentSchema = schema;
+  
+      // Navigate through nested objects if the path is nested
+      for (let i = 0; i < pathSegments.length - 1; i++) {
+        const segment = pathSegments[i];
+        
+        if (currentSchema.properties && currentSchema.properties[segment]) {
+          currentSchema = currentSchema.properties[segment];
+        } else {
+          // Path doesn't exist in schema
+          return false;
+        }
+      }
+  
+      // Get the final field name
+      const fieldName = pathSegments[pathSegments.length - 1];
+  
+      // Check if the field is in the required array of the current schema level
+      if (currentSchema.required && Array.isArray(currentSchema.required)) {
+        return currentSchema.required.includes(fieldName);
+      }
+  
+      // If no required array found, field is not required
+      return false;
+    }
+  
+  
+    /**
+     * Filters validation errors to only include those for required fields when in 'requiredOnly' render mode
+     * @param errors - Array of validation errors from JSONForms
+     * @param schema - The JSON schema to validate against
+     * @param renderView - The current render view mode
+     * @returns Filtered array of errors (only required field errors if renderView is 'requiredOnly')
+     */
+    static filterErrorsForRenderView(
+      errors: any[], 
+      schema: JsonSchema, 
+      renderView: string
+    ): any[] {
+      if (renderView !== 'requiredOnly' || !errors || errors.length === 0) {
+        return errors;
+      }
+  
+      return errors.filter(error => {
+        // Try different possible error path properties
+        const errorPath = error.instancePath || error.dataPath || error.schemaPath || '';
+        return this.isRequiredField(errorPath, schema);
+      });
+    }
+  
+    /**
+     * Processes validation errors for metadata forms
+     * @param errors - Array of validation errors from JSONForms
+     * @param schema - The JSON schema to validate against
+     * @param renderView - The current render view mode
+     * @returns Object containing processed validation results
+     */
+    static processMetadataErrors(
+      errors: any[], 
+      schema: JsonSchema, 
+      renderView: string
+    ): { isValid: boolean; errorString: string } {
+      const filteredErrors = this.filterErrorsForRenderView(errors, schema, renderView || 'all');
+      
+      return {
+        isValid: filteredErrors.length === 0,
+        errorString: convertJSONFormsErrorToString(filteredErrors)
+      };
+    }
 }
 
 export const convertJSONFormsErrorToString = (error: any): string => {
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 98fcb9afa6..be3d57e06e 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -158,6 +158,7 @@ export class IngestorHelper {
   }
 }
 
+
 export const isBase64 = (str: string) => {
   try {
     return btoa(atob(str)) === str;

From d31fef6afaad3ed2cacdf10cd1d3557a12676a23 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 25 Sep 2025 11:31:46 +0000
Subject: [PATCH 224/245] fix: ingestor #193, hide SI fields from the user

---
 ...r.custom-metadata-dialog-page.component.ts |  3 +-
 .../ingestor.custom-metadata-dialog-page.html |  3 +-
 ...xtractor-metadata-dialog-page.component.ts |  4 +-
 .../ingestor.new-transfer-dialog-page.html    |  3 +-
 ...tor.user-metadata-dialog-page.component.ts |  2 +-
 .../ingestor-metadata-editor-helper.ts        | 61 +++++++++++++++++++
 6 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
index 7dcc62b40e..bba177c38a 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
@@ -82,8 +82,7 @@ export class IngestorCustomMetadataDialogPageComponent
                 delete customSchema[key];
               });
           }
-
-          this.customMetadataSchema = customSchema;
+          this.customMetadataSchema = IngestorMetadataEditorHelper.removeSIFieldsFromSchema(customSchema);
         }
       }),
     );
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
index 9bde13d601..2a19022370 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
@@ -33,7 +33,8 @@ <h2 mat-dialog-title>
     </mat-card-header>
     <mat-card-content *ngIf="isCardContentVisible.scientific">
       <app-metadata-editor #customMetadataEditor
-        *ngIf="!updateEditorFromThirdParty" [schema]="customMetadataSchema"
+        *ngIf="!updateEditorFromThirdParty" 
+        [schema]="customMetadataSchema"
         [renderView]="activeRenderView"
         [data]="createNewTransferData.customMetaData"
         (dataChange)="onDataChangeCustomMetadata($event)"
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index ea0cb098cf..de22e23d0e 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -89,8 +89,8 @@ export class IngestorExtractorMetadataDialogPageComponent
             this.createNewTransferData.selectedResolvedDecodedSchema.properties
               .acquisition;
 
-          this.metadataSchemaInstrument = instrumentSchema;
-          this.metadataSchemaAcquisition = acqusitionSchema;
+          this.metadataSchemaInstrument = IngestorMetadataEditorHelper.removeSIFieldsFromSchema(instrumentSchema);
+          this.metadataSchemaAcquisition = IngestorMetadataEditorHelper.removeSIFieldsFromSchema(acqusitionSchema);
         }
       }),
     );
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index a1fa798664..64c492c951 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -40,7 +40,8 @@ <h2 *ngIf="createNewTransferData.editorMode !== 'CREATION'" mat-dialog-title>
     </mat-card-header>
     <mat-card-content *ngIf="isCardContentVisible.scicat">
       <app-metadata-editor #scicatHeaderEditor
-        *ngIf="!updateEditorFromThirdParty" [schema]="scicatHeaderSchema"
+        *ngIf="!updateEditorFromThirdParty" 
+        [schema]="scicatHeaderSchema"
         [renderView]="activeRenderView"
         [data]="createNewTransferData.scicatHeader"
         (dataChange)="onDataChangeUserScicatHeader($event)"
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index b3d9f06471..ceb5dd3997 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -79,7 +79,7 @@ export class IngestorUserMetadataDialogPageComponent
           this.metadataSchemaOrganizational =
             this.createNewTransferData.selectedResolvedDecodedSchema.properties.organizational;
           this.metadataSchemaSample =
-            this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
+            IngestorMetadataEditorHelper.removeSIFieldsFromSchema(this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample);
           this.scicatHeaderSchema = getJsonSchemaFromDto();
         }
       }),
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index f4192b7173..cff588b484 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -153,6 +153,67 @@ export class IngestorMetadataEditorHelper {
         errorString: convertJSONFormsErrorToString(filteredErrors)
       };
     }
+
+/**
+ * Removes SI-related fields from a JSON schema
+ * @param schema - The original JSON schema
+ * @returns A new schema with SI fields removed
+ */
+static removeSIFieldsFromSchema(schema: JsonSchema): JsonSchema {
+  if (!schema || typeof schema !== 'object') {
+    return schema;
+  }
+
+  // Deep clone the schema to avoid mutating the original
+  const cleanedSchema = JSON.parse(JSON.stringify(schema));
+
+  // Recursively clean properties
+  if (cleanedSchema.properties) {
+    cleanedSchema.properties = this.cleanProperties(cleanedSchema.properties);
+  }
+
+  // Clean required array if it exists
+  if (cleanedSchema.required && Array.isArray(cleanedSchema.required)) {
+    cleanedSchema.required = cleanedSchema.required.filter(
+      (field: string) => !this.isSIField(field)
+    );
+  }
+
+  return cleanedSchema;
+}
+
+private static cleanProperties(properties: any): any {
+  const cleaned = {};
+  
+  for (const [key, value] of Object.entries(properties)) {
+    // Skip SI fields entirely
+    if (this.isSIField(key)) {
+      continue;
+    }
+
+    // If it's an object with nested properties, recursively clean it
+    if (value && typeof value === 'object' && (value as any).properties) {
+      cleaned[key] = {
+        ...value,
+        properties: this.cleanProperties((value as any).properties),
+        // Also clean nested required arrays
+        ...(((value as any).required && Array.isArray((value as any).required)) && {
+          required: (value as any).required.filter((field: string) => !this.isSIField(field))
+        })
+      };
+    } else {
+      cleaned[key] = value;
+    }
+  }
+
+  return cleaned;
+}
+
+private static isSIField(fieldName: string): boolean {
+  // Define patterns for SI fields
+  const siPatterns = ['unitSI', 'valueSI'];
+  return siPatterns.some(pattern => fieldName.includes(pattern));
+}
 }
 
 export const convertJSONFormsErrorToString = (error: any): string => {

From e139e8dd81098a17ed601cf2c24cdce3e7f3d519 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 25 Sep 2025 13:18:43 +0000
Subject: [PATCH 225/245] Revert "fix: ingestor #193, hide SI fields from the
 user"

This reverts commit d31fef6afaad3ed2cacdf10cd1d3557a12676a23.
---
 ...r.custom-metadata-dialog-page.component.ts |  3 +-
 .../ingestor.custom-metadata-dialog-page.html |  3 +-
 ...xtractor-metadata-dialog-page.component.ts |  4 +-
 .../ingestor.new-transfer-dialog-page.html    |  3 +-
 ...tor.user-metadata-dialog-page.component.ts |  2 +-
 .../ingestor-metadata-editor-helper.ts        | 61 -------------------
 6 files changed, 7 insertions(+), 69 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
index bba177c38a..7dcc62b40e 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
@@ -82,7 +82,8 @@ export class IngestorCustomMetadataDialogPageComponent
                 delete customSchema[key];
               });
           }
-          this.customMetadataSchema = IngestorMetadataEditorHelper.removeSIFieldsFromSchema(customSchema);
+
+          this.customMetadataSchema = customSchema;
         }
       }),
     );
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
index 2a19022370..9bde13d601 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
@@ -33,8 +33,7 @@ <h2 mat-dialog-title>
     </mat-card-header>
     <mat-card-content *ngIf="isCardContentVisible.scientific">
       <app-metadata-editor #customMetadataEditor
-        *ngIf="!updateEditorFromThirdParty" 
-        [schema]="customMetadataSchema"
+        *ngIf="!updateEditorFromThirdParty" [schema]="customMetadataSchema"
         [renderView]="activeRenderView"
         [data]="createNewTransferData.customMetaData"
         (dataChange)="onDataChangeCustomMetadata($event)"
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index de22e23d0e..ea0cb098cf 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -89,8 +89,8 @@ export class IngestorExtractorMetadataDialogPageComponent
             this.createNewTransferData.selectedResolvedDecodedSchema.properties
               .acquisition;
 
-          this.metadataSchemaInstrument = IngestorMetadataEditorHelper.removeSIFieldsFromSchema(instrumentSchema);
-          this.metadataSchemaAcquisition = IngestorMetadataEditorHelper.removeSIFieldsFromSchema(acqusitionSchema);
+          this.metadataSchemaInstrument = instrumentSchema;
+          this.metadataSchemaAcquisition = acqusitionSchema;
         }
       }),
     );
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index 64c492c951..a1fa798664 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -40,8 +40,7 @@ <h2 *ngIf="createNewTransferData.editorMode !== 'CREATION'" mat-dialog-title>
     </mat-card-header>
     <mat-card-content *ngIf="isCardContentVisible.scicat">
       <app-metadata-editor #scicatHeaderEditor
-        *ngIf="!updateEditorFromThirdParty" 
-        [schema]="scicatHeaderSchema"
+        *ngIf="!updateEditorFromThirdParty" [schema]="scicatHeaderSchema"
         [renderView]="activeRenderView"
         [data]="createNewTransferData.scicatHeader"
         (dataChange)="onDataChangeUserScicatHeader($event)"
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index ceb5dd3997..b3d9f06471 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -79,7 +79,7 @@ export class IngestorUserMetadataDialogPageComponent
           this.metadataSchemaOrganizational =
             this.createNewTransferData.selectedResolvedDecodedSchema.properties.organizational;
           this.metadataSchemaSample =
-            IngestorMetadataEditorHelper.removeSIFieldsFromSchema(this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample);
+            this.createNewTransferData.selectedResolvedDecodedSchema.properties.sample;
           this.scicatHeaderSchema = getJsonSchemaFromDto();
         }
       }),
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index cff588b484..f4192b7173 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -153,67 +153,6 @@ export class IngestorMetadataEditorHelper {
         errorString: convertJSONFormsErrorToString(filteredErrors)
       };
     }
-
-/**
- * Removes SI-related fields from a JSON schema
- * @param schema - The original JSON schema
- * @returns A new schema with SI fields removed
- */
-static removeSIFieldsFromSchema(schema: JsonSchema): JsonSchema {
-  if (!schema || typeof schema !== 'object') {
-    return schema;
-  }
-
-  // Deep clone the schema to avoid mutating the original
-  const cleanedSchema = JSON.parse(JSON.stringify(schema));
-
-  // Recursively clean properties
-  if (cleanedSchema.properties) {
-    cleanedSchema.properties = this.cleanProperties(cleanedSchema.properties);
-  }
-
-  // Clean required array if it exists
-  if (cleanedSchema.required && Array.isArray(cleanedSchema.required)) {
-    cleanedSchema.required = cleanedSchema.required.filter(
-      (field: string) => !this.isSIField(field)
-    );
-  }
-
-  return cleanedSchema;
-}
-
-private static cleanProperties(properties: any): any {
-  const cleaned = {};
-  
-  for (const [key, value] of Object.entries(properties)) {
-    // Skip SI fields entirely
-    if (this.isSIField(key)) {
-      continue;
-    }
-
-    // If it's an object with nested properties, recursively clean it
-    if (value && typeof value === 'object' && (value as any).properties) {
-      cleaned[key] = {
-        ...value,
-        properties: this.cleanProperties((value as any).properties),
-        // Also clean nested required arrays
-        ...(((value as any).required && Array.isArray((value as any).required)) && {
-          required: (value as any).required.filter((field: string) => !this.isSIField(field))
-        })
-      };
-    } else {
-      cleaned[key] = value;
-    }
-  }
-
-  return cleaned;
-}
-
-private static isSIField(fieldName: string): boolean {
-  // Define patterns for SI fields
-  const siPatterns = ['unitSI', 'valueSI'];
-  return siPatterns.some(pattern => fieldName.includes(pattern));
-}
 }
 
 export const convertJSONFormsErrorToString = (error: any): string => {

From 27fcbdde20521fd36bf27ad07d9607de003524e3 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 25 Sep 2025 13:39:40 +0000
Subject: [PATCH 226/245] fix: ingestor 193

---
 .../customRenderer/custom-renderers.ts        |  5 +++++
 .../customRenderer/quantity-field-renderer.ts | 21 +++++++++++++++++++
 src/assets/config.json                        |  4 ++--
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts

diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index 5e24818d1b..e9024cddf6 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -19,6 +19,7 @@ import {
   QuantityValueLayoutRendererComponent,
   quantityValueLayoutTester,
 } from "./quantity-value-layout-renderer";
+import { SIFieldHiderRenderer, isSIFieldTester } from "./quantity-field-renderer";
 
 export const customRenderers: JsonFormsRendererRegistryEntry[] = [
   {
@@ -42,4 +43,8 @@ export const customRenderers: JsonFormsRendererRegistryEntry[] = [
     tester: ObjectControlRendererTester,
     renderer: CustomObjectControlRendererComponent,
   },
+  {
+    tester: isSIFieldTester, 
+    renderer: SIFieldHiderRenderer,
+  },
 ];
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
new file mode 100644
index 0000000000..1de0b65956
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
+import { rankWith, scopeEndsWith, or } from '@jsonforms/core';
+
+export const isSIFieldTester = rankWith(
+  100,
+  or(
+    scopeEndsWith('unitSI'),
+    scopeEndsWith('valueSI')
+  )
+);
+
+@Component({
+  selector: 'si-field-hider',
+  template: '' // Empty template - renders nothing
+})
+export class SIFieldHiderRenderer extends JsonFormsControl {
+  constructor(jsonformsService: JsonFormsAngularService) {
+    super(jsonformsService);
+  }
+}
\ No newline at end of file
diff --git a/src/assets/config.json b/src/assets/config.json
index ba80370ffa..ebfc2fb46e 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -28,7 +28,7 @@
   "jsonMetadataEnabled": true,
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
-  "lbBaseURL": "http://127.0.0.1:3000",
+  "lbBaseURL": "http://127.0.0.1:3001",
   "ingestorComponent":{
     "ingestorEnabled": true,
     "ingestorInTransferMode": true,
@@ -36,7 +36,7 @@
       {
         "mailDomain": "unibe.ch",
         "description": "University of Bern",
-        "facilityBackend": "http://localhost:8888"
+        "facilityBackend": "https://dci-ingestor.unil.ch"
       }
     ]
   },

From 75026c294c2f6fac436164408bead4a32a333274 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 29 Sep 2025 09:55:42 +0000
Subject: [PATCH 227/245] improve autodiscovery to match university domain

---
 .../ingestor-page/ingestor-transfer.component.ts      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
index 6c9f5555a4..699cc3e9ed 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
@@ -346,15 +346,18 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
 
   async getFacilityURLByUserInfo(): Promise<string | null> {
     if (this.scicatUserProfile && this.scicatUserProfile.email) {
-      const facilityEmail = this.scicatUserProfile.email;
-      const facility = facilityEmail.split("@")[1] as string;
+      const userEmail = this.scicatUserProfile.email;
+      const facility = userEmail.split("@")[1]?.toLowerCase();
 
-      const facilityMailDomainName = facility.toLowerCase();
       const discoveryList = this.appConfig.ingestorComponent.ingestorAutodiscoveryOptions;
 
       if (discoveryList) {
         for (const discovery of discoveryList) {
-          if (discovery.mailDomain.toLowerCase() === facilityMailDomainName) {
+          const escapedDomain = discovery.mailDomain
+            .toLowerCase()
+            .replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+          const domainPattern = new RegExp(`^([\\w-]+\\.)*${escapedDomain}$`); // <any.sub.domain.uni.ch>
+          if (domainPattern.test(facility)) {
             return discovery.facilityBackend;
           }
         }

From 30c63c62dd5c565f367acff2b87666fefe146849 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 30 Sep 2025 16:29:09 +0000
Subject: [PATCH 228/245] tests for effects and trying to fix an issue with no
 schema passed in "creation" mode

---
 .../ingestor.custom-metadata-dialog-page.html |   5 +-
 ...gestor.extractor-metadata-dialog-page.html |  11 +-
 ...stor.new-transfer-dialog-page.component.ts |  11 +-
 .../ingestor.new-transfer-dialog-page.html    |   5 +-
 .../ingestor.user-metadata-dialog-page.html   |  10 +-
 .../ingestor.dialog-stepper.component.html    |  66 ++-
 .../ingestor.dialog-stepper.component.ts      |   3 +-
 .../ingestor-metadata-editor.component.ts     |   3 +
 .../helper/ingestor.component-helper.ts       |   2 +-
 src/app/ingestor/ingestor.module.ts           |   2 +-
 ...ction.spec.ts => ingestor.actions.spec.ts} |   0
 .../effects/ingestor.effects.spec.ts          | 466 ++++++++++++++++++
 ...ingestor.effect.ts => ingestor.effects.ts} |   0
 13 files changed, 540 insertions(+), 44 deletions(-)
 rename src/app/state-management/actions/{ingestor.action.spec.ts => ingestor.actions.spec.ts} (100%)
 rename src/app/state-management/effects/{ingestor.effect.ts => ingestor.effects.ts} (100%)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
index 9bde13d601..ab1e33a636 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
@@ -21,7 +21,10 @@ <h2 mat-dialog-title>
       <div mat-card-avatar class="section-icon">
         <mat-icon> info </mat-icon>
       </div>
-      Scientific Metadata
+      <mat-card-title>Scientific Metadata</mat-card-title>
+      <mat-card-subtitle>
+        Fields in Red Are Required By The Schema. You can proceed with ingestion without filling them out.
+      </mat-card-subtitle>
       <span class="spacer"></span>
       <mat-icon
         [matTooltip]="isCustomMetadataOk ? 'Your input is correct.' : customMetadataErrors"
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
index 0ef17a7d50..b2cbba9252 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
@@ -54,7 +54,11 @@ <h2 mat-dialog-title>
             <div mat-card-avatar class="section-icon">
               <mat-icon> biotech </mat-icon>
             </div>
-            Instrument Information
+            
+            <mat-card-title>Instrument Information</mat-card-title>
+            <mat-card-subtitle>
+              Fields in Red Are Required By The Schema. You can proceed with ingestion without filling them out.
+            </mat-card-subtitle>
             <span class="spacer"></span>
             <mat-icon
               [matTooltip]="isInstrumentMetadataOk ? 'Your input is correct.' : instrumentErrors"
@@ -80,7 +84,10 @@ <h2 mat-dialog-title>
             <div mat-card-avatar class="section-icon">
               <mat-icon> category-search </mat-icon>
             </div>
-            Acquisition Information
+            <mat-card-title>Acquisition Information</mat-card-title>
+            <mat-card-subtitle>
+              Fields in Red Are Required By The Schema. You can proceed with ingestion without filling them out.
+            </mat-card-subtitle>
             <span class="spacer"></span>
             <mat-icon
               [matTooltip]="isAcquisitionMetadataOk ? 'Your input is correct.' : acquisitionErrors"
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 421e3f278c..b05fae96d8 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -8,7 +8,6 @@ import {
   Output,
 } from "@angular/core";
 import { MatDialog } from "@angular/material/dialog";
-import Ajv, {JSONSchemaType} from "ajv"
 import { JsonSchema } from "@jsonforms/core";
 import {
   decodeBase64ToUTF8,
@@ -34,7 +33,6 @@ import * as fromActions from "state-management/actions/ingestor.actions";
 import { selectUserSettingsPageViewModel } from "state-management/selectors/user.selectors";
 import { Subscription } from "rxjs";
 import { ReturnedUserDto } from "@scicatproject/scicat-sdk-ts-angular";
-import { IngestorConfirmationDialogComponent } from "ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component";
 
 @Component({
   selector: "ingestor-new-transfer-dialog-page",
@@ -329,7 +327,6 @@ export class IngestorNewTransferDialogPageComponent
     console.log("Fetching schema from URL:", this.schemaUrl);
     let content: string;
     let parsedJson: any;
-    const ajv = new Ajv()
 
     try {
       const response = await fetch(this.schemaUrl);
@@ -348,12 +345,6 @@ export class IngestorNewTransferDialogPageComponent
       return;
     }
     this.selectedSchemaFileContent = content;
-    const valid = ajv.compile(this.selectedSchemaFileContent as JSONSchemaType<any>);
-    if (!valid) {
-      this.schemaUrl = "";
-      this.selectedSchemaFileContent = "";
-    }else{
-      this.validateNextButton();
-    }
+    this.validateNextButton();
   }
 }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index a1fa798664..240f9292e8 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -14,7 +14,10 @@ <h2 *ngIf="createNewTransferData.editorMode !== 'CREATION'" mat-dialog-title>
   </div>
 
   <div class="ingestor-stepper-header">
-    <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
+    <ingestor-dialog-stepper 
+      [activeStep]="0"
+      [selectedSchemaFileContent]="selectedSchemaFileContent"
+    ></ingestor-dialog-stepper>
   </div>
 </div>
 
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
index c68134fab3..240492457d 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
@@ -47,7 +47,10 @@ <h2 mat-dialog-title>
       <div mat-card-avatar class="section-icon">
         <mat-icon> person </mat-icon>
       </div>
-      Organizational Information
+      <mat-card-title>Organizational Information</mat-card-title>
+      <mat-card-subtitle>
+        Fields in Red Are Required By The Schema. You can proceed with ingestion without filling them out.
+      </mat-card-subtitle>
       <span class="spacer"></span>
       <mat-icon
         [matTooltip]="isOrganizationalMetadataOk ? 'Your input is correct.' : organizationalErrors"
@@ -73,7 +76,10 @@ <h2 mat-dialog-title>
       <div mat-card-avatar class="section-icon">
         <mat-icon> description </mat-icon>
       </div>
-      Sample Information
+      <mat-card-title>Sample Information</mat-card-title>
+      <mat-card-subtitle>
+        Fields in Red Are Required By The Schema. You can proceed with ingestion without filling them out.
+      </mat-card-subtitle>
       <span class="spacer"></span>
       <mat-icon
         [matTooltip]="isSampleInformationOk ? 'Your input is correct.' : sampleErrors"
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index 34a0f3394a..6b86941293 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -28,36 +28,52 @@
     JSON-Mode</button>
 </mat-menu>
 
-<div class="stepper" *ngIf="activeStep >= 0">
-  <mat-stepper [linear]="true" [selectedIndex]="activeStep"
-    class="ingestor-stepper">
-    <!-- STEP 1 -->
-    <mat-step [completed]="activeStep > 0" [editable]="false"
-      [stepControl]="null">
-      <ng-template *ngIf="this.createNewTransferData.editorMode === 'CREATION'"matStepLabel> Fill out Dataset information </ng-template>
-      <ng-template *ngIf="this.createNewTransferData.editorMode !== 'CREATION'"matStepLabel>Select your ingestion method</ng-template>
+<!-- EDITOR/INGESTION MODE (4 steps) -->
+<div class="stepper" *ngIf="activeStep >= 0 && this.createNewTransferData.editorMode !== 'CREATION'">
+  <mat-stepper [linear]="true" [selectedIndex]="activeStep" class="ingestor-stepper">
+    <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Select your ingestion method</ng-template>
     </mat-step>
-    <!-- STEP 2 -->
-    <mat-step *ngIf="this.createNewTransferData.editorMode !== 'CREATION'" 
-      [completed]="activeStep > 1" [editable]="false"
-      [stepControl]="null">
+    
+    <mat-step [completed]="activeStep > 1" [editable]="false" [stepControl]="null">
       <ng-template matStepLabel>Fill out user-specific metadata</ng-template>
     </mat-step>
-    <!-- Step 2 for CREATION, Step 3 for others -->
-    <mat-step [completed]="activeStep> (this.createNewTransferData.editorMode === 'CREATION' ? 1 : 2)" 
-      [editable]="false"
-      [stepControl]="null">
-      <ng-template
-        *ngIf="this.createNewTransferData.editorMode === 'INGESTION' || this.createNewTransferData.editorMode === 'EDITOR'"
-        matStepLabel>Correct dataset-specific metadata</ng-template>
-      <ng-template *ngIf="this.createNewTransferData.editorMode === 'CREATION'"
-        matStepLabel>Fill out custom scientific metadata</ng-template>
+    
+    <mat-step [completed]="activeStep > 2" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Correct dataset-specific metadata</ng-template>
     </mat-step>
+    
+    <mat-step [completed]="activeStep > 3" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Confirm inputs</ng-template>
+    </mat-step>
+  </mat-stepper>
+</div>
+
+<!-- CREATION MODE WITH SCHEMA (3 steps) -->
+<div class="stepper" *ngIf="activeStep >= 0 && this.createNewTransferData.editorMode === 'CREATION' && this.selectedSchemaFileContent !== ''">
+  <mat-stepper [linear]="true" [selectedIndex]="activeStep" class="ingestor-stepper">
+    <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Fill out Dataset information</ng-template>
+    </mat-step>
+    
+    <mat-step [completed]="activeStep > 1" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Fill out custom scientific metadata</ng-template>
+    </mat-step>
+    
+    <mat-step [completed]="activeStep > 2" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Confirm inputs</ng-template>
+    </mat-step>
+  </mat-stepper>
+</div>
 
-    <!-- Step 3 for CREATION, Step 4 for others -->
-    <mat-step [completed]="activeStep >  (this.createNewTransferData.editorMode === 'CREATION' ? 2 : 3)"
-      [editable]="false"
-      [stepControl]="null">
+<!-- CREATION MODE WITHOUT SCHEMA (2 steps) -->
+<div class="stepper" *ngIf="activeStep >= 0 && this.createNewTransferData.editorMode === 'CREATION' && this.selectedSchemaFileContent === ''">
+  <mat-stepper [linear]="true" [selectedIndex]="activeStep" class="ingestor-stepper">
+    <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
+      <ng-template matStepLabel>Fill out Dataset information</ng-template>
+    </mat-step>
+    
+    <mat-step [completed]="activeStep > 3" [editable]="false" [stepControl]="null">
       <ng-template matStepLabel>Confirm inputs</ng-template>
     </mat-step>
   </mat-stepper>
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index f5cbc134fe..2971b9a5e7 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -28,7 +28,8 @@ import { CreateDatasetDto } from "@scicatproject/scicat-sdk-ts-angular";
 export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   @Input() activeStep = 0;
-
+  @Input() selectedSchemaFileContent: string = '';
+  
   testMessageComponent = ExportTemplateHelperComponent;
 
   createNewTransferData: IngestionRequestInformation =
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 6f6a6284a2..5192031d05 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -61,6 +61,9 @@ export class IngestorMetadataEditorComponent implements OnInit {
     // This is necessary, otherwise the error checks will not work correctly
     // Fill empty boolean with false to avoid undefined errors
     const initializeVisualData = (schema: JsonSchema, target: any) => {
+      if (!schema.properties || Object.keys(schema.properties).length === 0) {
+        return;
+      }
       Object.keys(schema.properties).forEach((key) => {
         const property = schema.properties[key];
         if (property.type === "object") {
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index be3d57e06e..50a629d2b4 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -407,7 +407,7 @@ export const getJsonSchemaFromDto = (sourceFolderEditable?: boolean) => {
       }
 
       // Add to required fields if it is not optional
-      // Wenn string ohne --optional oder --skip, wenn number > 0, the rest always required
+      // When string without --optional or --skip, when number > 0, the rest always required
       if (typeof value === "string") {
         if (
           value.includes("--string") &&
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index cecd42a0f9..7483f0f805 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -39,7 +39,7 @@ import {
 } from "./ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer";
 import { MatMenuModule } from "@angular/material/menu";
 import { EffectsModule } from "@ngrx/effects";
-import { IngestorEffects } from "state-management/effects/ingestor.effect";
+import { IngestorEffects } from "state-management/effects/ingestor.effects";
 import { StoreModule } from "@ngrx/store";
 import { ingestorReducer } from "state-management/reducers/ingestor.reducer";
 import { IngestorCreationDialogBaseComponent } from "./ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component";
diff --git a/src/app/state-management/actions/ingestor.action.spec.ts b/src/app/state-management/actions/ingestor.actions.spec.ts
similarity index 100%
rename from src/app/state-management/actions/ingestor.action.spec.ts
rename to src/app/state-management/actions/ingestor.actions.spec.ts
diff --git a/src/app/state-management/effects/ingestor.effects.spec.ts b/src/app/state-management/effects/ingestor.effects.spec.ts
index e69de29bb2..9a3a490467 100644
--- a/src/app/state-management/effects/ingestor.effects.spec.ts
+++ b/src/app/state-management/effects/ingestor.effects.spec.ts
@@ -0,0 +1,466 @@
+import { TestBed } from "@angular/core/testing";
+import { provideMockActions } from "@ngrx/effects/testing";
+import { Observable, of, throwError } from "rxjs";
+import { IngestorEffects } from "state-management/effects/ingestor.effects";
+import { Ingestor } from "shared/sdk/apis/ingestor.service";
+import { DatasetsService } from "@scicatproject/scicat-sdk-ts-angular";
+import { provideMockStore, MockStore } from "@ngrx/store/testing";
+import * as fromActions from "state-management/actions/ingestor.actions";
+import { showMessageAction } from "state-management/actions/user.actions";
+import { MessageType } from "state-management/models";
+import { HttpErrorResponse } from "@angular/common/http";
+import { hot, cold } from "jasmine-marbles";
+
+describe("IngestorEffects", () => {
+  let actions$: Observable<any>;
+  let effects: IngestorEffects;
+  let ingestorService: jasmine.SpyObj<Ingestor>;
+  let datasetsService: jasmine.SpyObj<DatasetsService>;
+  let store: MockStore;
+
+  const mockVersionResponse = { version: "1.0.0" };
+  const mockHealthResponse = { status: "ok" };
+  const mockUserInfoResponse = { logged_in: true };
+
+  beforeEach(() => {
+    const ingestorSpy = jasmine.createSpyObj("Ingestor", [
+      "getVersion",
+      "getHealth",
+      "getUserInfo",
+      "getTransferList",
+      "getExtractionMethods",
+      "getBrowseFilePath",
+      "startIngestion",
+      "cancelTransfer",
+    ]);
+
+    const datasetsSpy = jasmine.createSpyObj("DatasetsService", [
+      "datasetsControllerCreateV3",
+    ]);
+
+    TestBed.configureTestingModule({
+      providers: [
+        IngestorEffects,
+        provideMockActions(() => actions$),
+        provideMockStore({
+          initialState: {
+            ingestor: {
+              transferListRequestOptions: { page: 1, pageNumber: 50 },
+            },
+          },
+        }),
+        { provide: Ingestor, useValue: ingestorSpy },
+        { provide: DatasetsService, useValue: datasetsSpy },
+      ],
+    });
+
+    effects = TestBed.inject(IngestorEffects);
+    ingestorService = TestBed.inject(Ingestor) as jasmine.SpyObj<Ingestor>;
+    datasetsService = TestBed.inject(DatasetsService) as jasmine.SpyObj<DatasetsService>;
+    store = TestBed.inject(MockStore);
+  });
+
+  describe("connectToIngestor$", () => {
+    it("should dispatch connectIngestorSuccess on successful connection", (done) => {
+      ingestorService.getVersion.and.returnValue(of(mockVersionResponse));
+      ingestorService.getHealth.and.returnValue(of(mockHealthResponse));
+      ingestorService.getUserInfo.and.returnValue(of(mockUserInfoResponse));
+
+      actions$ = of(fromActions.connectIngestor());
+
+      effects.connectToIngestor$.subscribe((action) => {
+        expect(action).toEqual(
+          fromActions.connectIngestorSuccess({
+            versionResponse: mockVersionResponse,
+            healthResponse: mockHealthResponse,
+            userInfoResponse: mockUserInfoResponse,
+            authIsDisabled: false,
+          })
+        );
+        done();
+      });
+    });
+
+    it("should dispatch connectIngestorSuccess with authIsDisabled when getUserInfo fails with disabled message", (done) => {
+      const error = new Error("Auth is disabled");
+      ingestorService.getVersion.and.returnValue(of(mockVersionResponse));
+      ingestorService.getHealth.and.returnValue(of(mockHealthResponse));
+      ingestorService.getUserInfo.and.returnValue(throwError(() => error));
+
+      actions$ = of(fromActions.connectIngestor());
+
+      effects.connectToIngestor$.subscribe((action) => {
+        expect(action).toEqual(
+          fromActions.connectIngestorSuccess({
+            versionResponse: mockVersionResponse,
+            healthResponse: mockHealthResponse,
+            userInfoResponse: null,
+            authIsDisabled: true,
+          })
+        );
+        done();
+      });
+    });
+
+    it("should dispatch connectIngestorFailure on connection failure", (done) => {
+      const error = new Error("Connection failed");
+      ingestorService.getVersion.and.returnValue(throwError(() => error));
+
+      actions$ = of(fromActions.connectIngestor());
+
+      effects.connectToIngestor$.subscribe((action) => {
+        expect(action.type).toBe(fromActions.connectIngestorFailure.type);
+        done();
+      });
+    });
+
+    it("should dispatch setNoRightsError when session expired", (done) => {
+      const error = { error: { error: "login session has expired" } };
+      ingestorService.getVersion.and.returnValue(throwError(() => error));
+
+      actions$ = of(fromActions.connectIngestor());
+
+      effects.connectToIngestor$.subscribe((action) => {
+        expect(action.type).toBe(fromActions.setNoRightsError.type);
+        done();
+      });
+    });
+  });
+
+  describe("connectToIngestorSuccess$", () => {
+    it("should dispatch showMessageAction with success message", (done) => {
+      actions$ = of(
+        fromActions.connectIngestorSuccess({
+          versionResponse: mockVersionResponse,
+          healthResponse: mockHealthResponse,
+          userInfoResponse: mockUserInfoResponse,
+          authIsDisabled: false,
+        })
+      );
+
+      effects.connectToIngestorSuccess$.subscribe((action) => {
+        expect(action.type).toBe(showMessageAction.type);
+        expect(action.message.type).toBe(MessageType.Success);
+        expect(action.message.content).toContain("1.0.0");
+        done();
+      });
+    });
+  });
+
+  describe("connectToIngestorFailure$", () => {
+    it("should dispatch showMessageAction with error message", (done) => {
+      const error = new Error("Connection failed");
+      actions$ = of(fromActions.connectIngestorFailure({ err: error }));
+
+      effects.connectToIngestorFailure$.subscribe((action) => {
+        expect(action.type).toBe(showMessageAction.type);
+        expect(action.message.type).toBe(MessageType.Error);
+        expect(action.message.content).toContain("Failed to connect");
+        done();
+      });
+    });
+  });
+
+  describe("updateTransferList$", () => {
+    it("should dispatch updateTransferListSuccess on success", (done) => {
+      const transferList = { transfers: [], total: 0 };
+      ingestorService.getTransferList.and.returnValue(of(transferList));
+
+      actions$ = of(fromActions.updateTransferList({}));
+
+      effects.updateTransferList$.subscribe((action) => {
+        expect(action).toEqual(
+          fromActions.updateTransferListSuccess({
+            transferList,
+            page: 1,
+            pageNumber: 50,
+          })
+        );
+        done();
+      });
+    });
+
+    it("should dispatch updateTransferListDetailSuccess when transferId provided", (done) => {
+      const transferList = { transfers: [], total: 0 };
+      ingestorService.getTransferList.and.returnValue(of(transferList));
+
+      actions$ = of(fromActions.updateTransferList({ transferId: "123" }));
+
+      effects.updateTransferList$.subscribe((action) => {
+        expect(action).toEqual(
+          fromActions.updateTransferListDetailSuccess({
+            transferListDetailView: transferList,
+          })
+        );
+        done();
+      });
+    });
+
+    it("should dispatch updateTransferListFailure on error", (done) => {
+      const error = new Error("Failed to fetch");
+      ingestorService.getTransferList.and.returnValue(throwError(() => error));
+
+      actions$ = of(fromActions.updateTransferList({}));
+
+      effects.updateTransferList$.subscribe((action) => {
+        expect(action.type).toBe(fromActions.updateTransferListFailure.type);
+        done();
+      });
+    });
+  });
+
+  describe("getExtractionMethods$", () => {
+    it("should dispatch getExtractionMethodsSuccess on success", (done) => {
+      const methods = { methods: [], total: 0 };
+      ingestorService.getExtractionMethods.and.returnValue(of(methods));
+
+      actions$ = of(fromActions.getExtractionMethods({ page: 1, pageNumber: 50 }));
+
+      effects.getExtractionMethods$.subscribe((action) => {
+        expect(action).toEqual(
+          fromActions.getExtractionMethodsSuccess({ extractionMethods: methods })
+        );
+        done();
+      });
+    });
+
+    it("should dispatch setNoRightsError when session expired", (done) => {
+      const error = { error: { error: "login session has expired" } };
+      ingestorService.getExtractionMethods.and.returnValue(throwError(() => error));
+
+      actions$ = of(fromActions.getExtractionMethods({ page: 1, pageNumber: 50 }));
+
+      effects.getExtractionMethods$.subscribe((action) => {
+        expect(action.type).toBe(fromActions.setNoRightsError.type);
+        done();
+      });
+    });
+
+    it("should dispatch getExtractionMethodsFailure on error", (done) => {
+      const error = new Error("Failed");
+      ingestorService.getExtractionMethods.and.returnValue(throwError(() => error));
+
+      actions$ = of(fromActions.getExtractionMethods({ page: 1, pageNumber: 50 }));
+
+      effects.getExtractionMethods$.subscribe((action) => {
+        expect(action.type).toBe(fromActions.getExtractionMethodsFailure.type);
+        done();
+      });
+    });
+  });
+
+  describe("getBrowseFilePath$", () => {
+    it("should dispatch getBrowseFilePathSuccess on success", (done) => {
+      const browseResult = { folders: [], total: 0 };
+      ingestorService.getBrowseFilePath.and.returnValue(of(browseResult));
+
+      actions$ = of(
+        fromActions.getBrowseFilePath({ path: "/test", page: 1, pageNumber: 50 })
+      );
+
+      effects.getBrowseFilePath$.subscribe((action) => {
+        expect(action).toEqual(
+          fromActions.getBrowseFilePathSuccess({
+            ingestorBrowserActiveNode: browseResult,
+          })
+        );
+        done();
+      });
+    });
+
+    it("should dispatch getBrowseFilePathFailure on error", (done) => {
+      const error = new Error("Browse failed");
+      ingestorService.getBrowseFilePath.and.returnValue(throwError(() => error));
+
+      actions$ = of(
+        fromActions.getBrowseFilePath({ path: "/test", page: 1, pageNumber: 50 })
+      );
+
+      effects.getBrowseFilePath$.subscribe((action) => {
+        expect(action.type).toBe(fromActions.getBrowseFilePathFailure.type);
+        done();
+      });
+    });
+  });
+
+  describe("setLoadingBeforeIngestion$", () => {
+    it("should dispatch setIngestDatasetLoading", (done) => {
+      const ingestionDataset = {
+        metaData: "{}",
+        userToken: "token",
+        autoArchive: false,
+      };
+      actions$ = of(fromActions.ingestDataset({ ingestionDataset }));
+
+      effects.setLoadingBeforeIngestion$.subscribe((action) => {
+        expect(action).toEqual(
+          fromActions.setIngestDatasetLoading({ ingestionDatasetLoading: true })
+        );
+        done();
+      });
+    });
+  });
+
+  describe("ingestDataset$", () => {
+    it("should dispatch success actions on successful ingestion", (done) => {
+      const response = { transferId: "123", status: "success" };
+      ingestorService.startIngestion.and.returnValue(of(response));
+
+      const ingestionDataset = {
+        metaData: "{}",
+        userToken: "token",
+        autoArchive: false,
+      };
+      actions$ = of(fromActions.ingestDataset({ ingestionDataset }));
+
+      const actions: any[] = [];
+      effects.ingestDataset$.subscribe((action) => {
+        actions.push(action);
+        if (actions.length === 3) {
+          expect(actions[0].type).toBe(fromActions.ingestDatasetSuccess.type);
+          expect(actions[1].type).toBe(fromActions.updateTransferList.type);
+          expect(actions[2].type).toBe(fromActions.setIngestDatasetLoading.type);
+          done();
+        }
+      });
+    });
+
+    it("should dispatch failure actions on error", (done) => {
+      const error = new Error("Ingestion failed");
+      ingestorService.startIngestion.and.returnValue(throwError(() => error));
+
+      const ingestionDataset = {
+        metaData: "{}",
+        userToken: "token",
+        autoArchive: false,
+      };
+      actions$ = of(fromActions.ingestDataset({ ingestionDataset }));
+
+      const actions: any[] = [];
+      effects.ingestDataset$.subscribe((action) => {
+        actions.push(action);
+        if (actions.length === 2) {
+          expect(actions[0].type).toBe(fromActions.ingestDatasetFailure.type);
+          expect(actions[1].type).toBe(fromActions.setIngestDatasetLoading.type);
+          done();
+        }
+      });
+    });
+  });
+
+  describe("ingestDatasetSuccess$", () => {
+    it("should dispatch showMessageAction with success message", (done) => {
+      const response = { transferId: "123", status: "success" };
+      actions$ = of(fromActions.ingestDatasetSuccess({ response }));
+
+      effects.ingestDatasetSuccess$.subscribe((action) => {
+        expect(action.type).toBe(showMessageAction.type);
+        expect(action.message.type).toBe(MessageType.Success);
+        expect(action.message.content).toContain("123");
+        done();
+      });
+    });
+  });
+
+  describe("ingestDatasetFailure$", () => {
+    it("should dispatch showMessageAction with error message", (done) => {
+      const error = new Error("Failed");
+      actions$ = of(fromActions.ingestDatasetFailure({ err: error }));
+
+      effects.ingestDatasetFailure$.subscribe((action) => {
+        expect(action.type).toBe(showMessageAction.type);
+        expect(action.message.type).toBe(MessageType.Error);
+        expect(action.message.content).toContain("Failed to ingest");
+        done();
+      });
+    });
+  });
+  
+  describe("cancelTransfer$", () => {
+    it("should dispatch success actions on successful cancel", (done) => {
+      const deleteResponse = { transferId: "123" };
+      ingestorService.cancelTransfer.and.returnValue(of(deleteResponse));
+
+      const requestBody = { transferId: "123" };
+      actions$ = of(fromActions.cancelTransfer({ requestBody }));
+
+      const actions: any[] = [];
+      effects.cancelTransfer$.subscribe((action) => {
+        actions.push(action);
+        if (actions.length === 2) {
+          expect(actions[0].type).toBe(showMessageAction.type);
+          expect((actions[0] as any).message.type).toBe(MessageType.Success);
+          expect(actions[1].type).toBe(fromActions.updateTransferList.type);
+          done();
+        }
+      });
+    });
+
+    it("should dispatch showMessageAction with error on failure", (done) => {
+      const error = new Error("Cancel failed");
+      ingestorService.cancelTransfer.and.returnValue(throwError(() => error));
+
+      const requestBody = { transferId: "123" };
+      actions$ = of(fromActions.cancelTransfer({ requestBody }));
+
+      effects.cancelTransfer$.subscribe((action) => {
+        expect(action.type).toBe(showMessageAction.type);
+        expect((action as any).message.type).toBe(MessageType.Error);
+        done();
+      });
+    });
+  });
+
+  describe("setRenderView$", () => {
+    it("should dispatch showMessageAction", (done) => {
+      actions$ = of(
+        fromActions.setRenderViewFromThirdParty({ renderView: "requiredOnly" })
+      );
+
+      effects.setRenderView$.subscribe((action) => {
+        expect(action.type).toBe(showMessageAction.type);
+        expect(action.message.content).toContain("requiredOnly");
+        done();
+      });
+    });
+  });
+
+  describe("createDataset$", () => {
+    it("should dispatch success actions on successful creation", (done) => {
+      const dataset = { pid: "123", datasetName: "Test" } as any;
+      datasetsService.datasetsControllerCreateV3.and.returnValue(of(dataset));
+
+      actions$ = of(fromActions.createDatasetAction({ dataset }));
+
+      const actions: any[] = [];
+      effects.createDataset$.subscribe((action) => {
+        actions.push(action);
+        if (actions.length === 2) {
+          expect(actions[0].type).toBe(fromActions.createDatasetSuccess.type);
+          expect(actions[1].type).toBe(fromActions.setIngestDatasetLoading.type);
+          done();
+        }
+      });
+    });
+
+    it("should dispatch failure actions on error", (done) => {
+      const error = new Error("Create failed");
+      datasetsService.datasetsControllerCreateV3.and.returnValue(
+        throwError(() => error)
+      );
+
+      const dataset = { datasetName: "Test" } as any;
+      actions$ = of(fromActions.createDatasetAction({ dataset }));
+
+      const actions: any[] = [];
+      effects.createDataset$.subscribe((action) => {
+        actions.push(action);
+        if (actions.length === 2) {
+          expect(actions[0].type).toBe(fromActions.ingestDatasetFailure.type);
+          expect(actions[1].type).toBe(fromActions.setIngestDatasetLoading.type);
+          done();
+        }
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/app/state-management/effects/ingestor.effect.ts b/src/app/state-management/effects/ingestor.effects.ts
similarity index 100%
rename from src/app/state-management/effects/ingestor.effect.ts
rename to src/app/state-management/effects/ingestor.effects.ts

From 6cb7f3ebb64681523b9e9727f220f7dae1d72312 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 2 Oct 2025 10:23:20 +0000
Subject: [PATCH 229/245] fix the stepper with no schema in create mode

---
 ...stor.new-transfer-dialog-page.component.ts | 48 +++++++++++++++----
 .../ingestor.new-transfer-dialog-page.html    | 24 ++++++----
 .../ingestor.creation-dialog-base.html        |  9 +++-
 .../ingestor.dialog-stepper.component.html    | 13 +++--
 .../ingestor.dialog-stepper.component.ts      |  1 -
 .../helper/ingestor.component-helper.ts       |  9 +++-
 6 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index b05fae96d8..714e225b3f 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -66,9 +66,7 @@ export class IngestorNewTransferDialogPageComponent
 
   userProfile: ReturnedUserDto | null = null;
   uiNextButtonReady = false;
-  schemaUrl = "";
-  // selectedSchemaFileName = "";
-  selectedSchemaFileContent = "";
+
   renderView$ = this.store.select(selectIngestorRenderView);
   selectUpdateEditorFromThirdParty$ = this.store.select(
     selectUpdateEditorFromThirdParty,
@@ -238,8 +236,8 @@ export class IngestorNewTransferDialogPageComponent
       );
       this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
     } else {
-      if (this.selectedSchemaFileContent) {
-        const schema = JSON.parse(this.selectedSchemaFileContent);
+      if (this.createNewTransferData.selectedSchemaFileContent) {
+        const schema = JSON.parse(this.createNewTransferData.selectedSchemaFileContent);
         const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
           schema,
           schema,
@@ -262,9 +260,22 @@ export class IngestorNewTransferDialogPageComponent
     );
     this.generateExampleDataForSciCatHeader();
     this.prepareSchemaForProcessing();
+    
+    // Emit once to go to next step
     this.nextStep.emit();
+    
+    // In CREATION mode with no schema, skip the scientific metadata page
+    if (
+      this.createNewTransferData.editorMode === 'CREATION' && 
+      (!this.createNewTransferData.selectedSchemaFileContent || this.createNewTransferData.selectedSchemaFileContent === '')
+    ) {
+      // Emit again to skip scientific metadata and go straight to confirm
+      this.nextStep.emit();
+      this.nextStep.emit();
+    }
   }
 
+
   onDataChangeUserScicatHeader(event: any) {
     this.createNewTransferData.scicatHeader = event;
   }
@@ -319,17 +330,26 @@ export class IngestorNewTransferDialogPageComponent
     });
   }
 
+  onSchemaUrlChange(url: string): void {
+    this.createNewTransferData.schemaUrl = url;
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+  }
+
   async onUploadSchema(): Promise<void> {
-    if (!this.schemaUrl) {
+    if (!this.createNewTransferData.schemaUrl) {
       alert("Please enter a schema URL.");
       return;
     }
-    console.log("Fetching schema from URL:", this.schemaUrl);
+    console.log("Fetching schema from URL:", this.createNewTransferData.schemaUrl);
     let content: string;
     let parsedJson: any;
 
     try {
-      const response = await fetch(this.schemaUrl);
+      const response = await fetch(this.createNewTransferData.schemaUrl);
       if (!response.ok) {
         throw new Error(`Failed to fetch schema: ${response.statusText}`);
       }
@@ -344,7 +364,17 @@ export class IngestorNewTransferDialogPageComponent
       alert(`Error fetching schema: ${error.message}`);
       return;
     }
-    this.selectedSchemaFileContent = content;
+    
+    this.createNewTransferData.selectedSchemaFileContent = content;
+    
+    // Update the store with both the URL and content
+    this.createNewTransferData.selectedSchemaFileContent = content;
+    this.store.dispatch(
+      fromActions.updateIngestionObject({
+        ingestionObject: this.createNewTransferData,
+      }),
+    );
+    
     this.validateNextButton();
   }
 }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index 240f9292e8..1b932885e5 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -16,7 +16,6 @@ <h2 *ngIf="createNewTransferData.editorMode !== 'CREATION'" mat-dialog-title>
   <div class="ingestor-stepper-header">
     <ingestor-dialog-stepper 
       [activeStep]="0"
-      [selectedSchemaFileContent]="selectedSchemaFileContent"
     ></ingestor-dialog-stepper>
   </div>
 </div>
@@ -54,21 +53,26 @@ <h2 *ngIf="createNewTransferData.editorMode !== 'CREATION'" mat-dialog-title>
 
     
     <mat-card class="ingestor-card">
-  <mat-card-header>
-    <mat-card-title>Scientific Metadata Schema</mat-card-title>
-  </mat-card-header>
-  <mat-card-content class="ingestor-vertical-layout">
+    <mat-card-header>
+      <mat-card-title>Scientific Metadata Schema</mat-card-title>
+    </mat-card-header>
+    <mat-card-content class="ingestor-vertical-layout">
     <div class="ingestor-upload-section">
       <label for="schemaUrl">
         You can provide a schema for your scientific metadata. We only accept schemas in json format.
       </label>
       <mat-form-field class="form-full-width">
-        <input matInput id="schemaUrl" placeholder="Paste schema URL here" [(ngModel)]="schemaUrl" />
-       <button mat-raised-button class="block-button" color="primary"
-            (click)="onUploadSchema()">Validate</button>
-
+        <input matInput 
+              id="schemaUrl" 
+              placeholder="Paste schema URL here" 
+              [ngModel]="createNewTransferData.schemaUrl"
+              (ngModelChange)="onSchemaUrlChange($event)" />
+        <button mat-raised-button 
+                class="block-button" 
+                color="primary"
+                (click)="onUploadSchema()">Validate</button>
       </mat-form-field>
-      <p *ngIf="selectedSchemaFileContent">
+      <p *ngIf="this.createNewTransferData.selectedSchemaFileContent">
         Loaded schema is valid!
       </p>
     </div>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
index eb74ecac51..67489d6a41 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
@@ -1,7 +1,12 @@
 <ingestor-new-transfer-dialog-page
   *ngIf="currentDialogStep === 'NEW_TRANSFER' && !showNoRightsDialog"
-  (nextStep)="onClickNext(createNewTransferData.editorMode === 'CREATION' ? 'CUSTOM_METADATA' : 'USER_METADATA')"></ingestor-new-transfer-dialog-page>
-
+  (nextStep)="onClickNext(
+    createNewTransferData.editorMode === 'CREATION' 
+      ? (createNewTransferData.selectedSchemaFileContent && createNewTransferData.selectedSchemaFileContent !== '' 
+         ? 'CUSTOM_METADATA' 
+         : 'CONFIRM_TRANSFER')
+      : 'USER_METADATA'
+  )"></ingestor-new-transfer-dialog-page>
 <ingestor-user-metadata-dialog
   *ngIf="currentDialogStep === 'USER_METADATA' && !showNoRightsDialog"
   (nextStep)="onClickNext('EXTRACTOR_METADATA')"
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index 6b86941293..9aafa3fab0 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -48,27 +48,26 @@
     </mat-step>
   </mat-stepper>
 </div>
-
 <!-- CREATION MODE WITH SCHEMA (3 steps) -->
-<div class="stepper" *ngIf="activeStep >= 0 && this.createNewTransferData.editorMode === 'CREATION' && this.selectedSchemaFileContent !== ''">
-  <mat-stepper [linear]="true" [selectedIndex]="activeStep" class="ingestor-stepper">
+<div class="stepper" *ngIf="activeStep >= 0 && this.createNewTransferData.editorMode === 'CREATION' && this.createNewTransferData.selectedSchemaFileContent !== ''">
+  <mat-stepper [linear]="true" [selectedIndex]="activeStep === 0 ? 0 : activeStep - 1" class="ingestor-stepper">
     <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
       <ng-template matStepLabel>Fill out Dataset information</ng-template>
     </mat-step>
     
-    <mat-step [completed]="activeStep > 1" [editable]="false" [stepControl]="null">
+    <mat-step [completed]="activeStep > 2" [editable]="false" [stepControl]="null">
       <ng-template matStepLabel>Fill out custom scientific metadata</ng-template>
     </mat-step>
     
-    <mat-step [completed]="activeStep > 2" [editable]="false" [stepControl]="null">
+    <mat-step [completed]="activeStep > 3" [editable]="false" [stepControl]="null">
       <ng-template matStepLabel>Confirm inputs</ng-template>
     </mat-step>
   </mat-stepper>
 </div>
 
 <!-- CREATION MODE WITHOUT SCHEMA (2 steps) -->
-<div class="stepper" *ngIf="activeStep >= 0 && this.createNewTransferData.editorMode === 'CREATION' && this.selectedSchemaFileContent === ''">
-  <mat-stepper [linear]="true" [selectedIndex]="activeStep" class="ingestor-stepper">
+<div class="stepper" *ngIf="activeStep >= 0 && this.createNewTransferData.editorMode === 'CREATION' && this.createNewTransferData.selectedSchemaFileContent === ''">
+  <mat-stepper [linear]="true" [selectedIndex]="activeStep === 0 ? 0 : 1" class="ingestor-stepper">
     <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
       <ng-template matStepLabel>Fill out Dataset information</ng-template>
     </mat-step>
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 2971b9a5e7..455ca040f1 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -28,7 +28,6 @@ import { CreateDatasetDto } from "@scicatproject/scicat-sdk-ts-angular";
 export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   @Input() activeStep = 0;
-  @Input() selectedSchemaFileContent: string = '';
   
   testMessageComponent = ExportTemplateHelperComponent;
 
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index 50a629d2b4..e344320535 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -34,7 +34,6 @@ export interface IngestionRequestInformation {
   selectedMethod: ExtractionMethod;
   selectedResolvedDecodedSchema: JsonSchema;
   scicatHeader: object;
-
   userMetaData: {
     organizational: object;
     sample: object;
@@ -43,7 +42,6 @@ export interface IngestionRequestInformation {
     instrument: object;
     acquisition: object;
   };
-  customMetaData: object; // Custom metadata in creation mode
 
   mergedMetaDataString: string;
 
@@ -51,6 +49,10 @@ export interface IngestionRequestInformation {
 
   ingestionRequest: PostDatasetResponse | null;
   autoArchive: boolean;
+  // Custom metadata in creation mode
+  schemaUrl?: string;  
+  selectedSchemaFileContent?: string; 
+  customMetaData: object; 
 }
 
 export interface ScientificMetadata {
@@ -130,6 +132,9 @@ export class IngestorHelper {
       editorMode: "INGESTION",
       ingestionRequest: null,
       autoArchive: true,
+
+      schemaUrl: "",
+      selectedSchemaFileContent: "", 
     };
   };
 

From 7abafaf726bd7f20e91743843583467e8fc923b2 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 2 Oct 2025 11:44:26 +0000
Subject: [PATCH 230/245] run prettier

---
 .../_layout/app-header/_app-header-theme.scss |  12 +-
 .../app-header/app-header.component.html      |  24 +-
 .../app-header/app-header.component.scss      |   6 +-
 src/app/app-config.service.spec.ts            |   9 +-
 .../dashboard/dashboard.component.html        |   5 +-
 .../dashboard/dashboard.component.scss        |   2 -
 .../dashboard/dashboard.component.spec.ts     |  10 +-
 .../datasets/dashboard/dashboard.component.ts |   4 +-
 .../datafiles-action.component.scss           |   2 +-
 .../datafiles-actions.component.scss          |   2 +-
 .../datafiles/datafiles.component.scss        |   1 -
 .../dataset-detail-dynamic.component.scss     |   2 +-
 .../dataset-detail.component.scss             |   6 +-
 .../datasets-filter.component.html            |   5 +-
 src/app/datasets/datasets.module.ts           |   2 +-
 src/app/help/help/help.component.html         |   3 +-
 ...stor.confirmation-dialog.component.spec.ts |   8 +-
 .../ingestor.confirmation-dialog.html         |  29 +-
 ...irm-transfer-dialog-page.component.spec.ts |  11 +-
 ...ingestor.confirm-transfer-dialog-page.html | 130 +++--
 ...tom-metadata-dialog-page.component.spec.ts |  14 +-
 ...r.custom-metadata-dialog-page.component.ts |   4 +-
 .../ingestor.custom-metadata-dialog-page.html |  58 +-
 ...tor-metadata-dialog-page.component.spec.ts |  14 +-
 ...xtractor-metadata-dialog-page.component.ts |   8 +-
 ...gestor.extractor-metadata-dialog-page.html | 100 ++--
 ...new-transfer-dialog-page.component.spec.ts |   7 +-
 ...stor.new-transfer-dialog-page.component.ts |  25 +-
 .../ingestor.new-transfer-dialog-page.html    | 225 +++++---
 ...or.no-rights-dialog-page.component.spec.ts |   7 +-
 .../ingestor.no-rights-dialog-page.html       |  26 +-
 ...ser-metadata-dialog-page.component.spec.ts |  10 +-
 ...tor.user-metadata-dialog-page.component.ts |  12 +-
 .../ingestor.user-metadata-dialog-page.html   | 117 ++--
 ...tor.creation-dialog-base.component.spec.ts |  13 +-
 .../ingestor.creation-dialog-base.html        |  21 +-
 .../ingestor.dialog-stepper.component.css     |   4 +-
 .../ingestor.dialog-stepper.component.html    | 191 +++++--
 .../ingestor.dialog-stepper.component.spec.ts |   8 +-
 .../ingestor.dialog-stepper.component.ts      |   2 +-
 .../ingestor.export-helper.component.spec.ts  |  17 +-
 .../ingestor.file-browser.component.html      |  82 ++-
 .../ingestor.file-browser.component.spec.ts   |  13 +-
 ...nsfer-detail-view-dialog.component.spec.ts |  22 +-
 .../ingestor.transfer-detail-view-dialog.html |  20 +-
 .../customRenderer/custom-renderers.ts        |   7 +-
 .../customRenderer/object-group-renderer.ts   |   6 +-
 .../customRenderer/quantity-field-renderer.ts |  17 +-
 .../quantity-value-layout-renderer.ts         |   2 +-
 .../ingestor-metadata-editor-helper.spec.ts   | 109 ++--
 .../ingestor-metadata-editor-helper.ts        | 150 ++---
 .../ingestor-metadata-editor-schema_demo.ts   | 520 ++++++++++--------
 .../ingestor-metadata-editor.component.html   |  11 +-
 .../ingestor-metadata-editor.component.scss   |  89 +--
 ...ingestor-metadata-editor.component.spec.ts |  12 +-
 .../helper/ingestor.component-helper.ts       |   9 +-
 .../ingestor-creation.component.html          |  19 +-
 .../ingestor-creation.component.spec.ts       |  41 +-
 .../ingestor-transfer.component.html          | 173 +++---
 .../ingestor-transfer.component.spec.ts       |  40 +-
 .../ingestor-transfer.component.ts            |   5 +-
 .../ingestor-wrapper.component.spec.ts        |  40 +-
 .../ingestor-wrapper.component.ts             |  10 +-
 .../ingestor-page/ingestor.component.scss     |   2 +-
 src/app/shared/MockStubs.ts                   |  85 ++-
 .../actions/datasets.actions.ts               |   2 +-
 .../actions/ingestor.actions.spec.ts          |  18 +-
 .../effects/ingestor.effects.spec.ts          |  84 ++-
 .../reducers/ingestor.reducer.spec.ts         | 129 +++--
 .../selectors/ingestor.selectors.spec.ts      |  28 +-
 src/assets/config.json                        |   4 +-
 71 files changed, 1768 insertions(+), 1137 deletions(-)

diff --git a/src/app/_layout/app-header/_app-header-theme.scss b/src/app/_layout/app-header/_app-header-theme.scss
index 604d21c036..1fbe57dc0f 100644
--- a/src/app/_layout/app-header/_app-header-theme.scss
+++ b/src/app/_layout/app-header/_app-header-theme.scss
@@ -7,10 +7,16 @@
 
   .header {
     mat-toolbar {
-      background-color: mat.m2-get-color-from-palette($primary, "default-contrast");
-      border-bottom: 2px solid mat.m2-get-color-from-palette($primary, "default");
+      background-color: mat.m2-get-color-from-palette(
+        $primary,
+        "default-contrast"
+      );
+      border-bottom: 2px solid
+        mat.m2-get-color-from-palette($primary, "default");
     }
-    a, h3, div {
+    a,
+    h3,
+    div {
       color: mat.m2-get-color-from-palette($primary, "default");
     }
   }
diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index 117a3c96a7..5623422baa 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -1,6 +1,8 @@
 <div class="header">
   <mat-menu #mainMenu="matMenu">
-    <ng-container *ngIf="mainMenuConfig$ | async as mainMenuConfig; else noMenuItems">
+    <ng-container
+      *ngIf="mainMenuConfig$ | async as mainMenuConfig; else noMenuItems"
+    >
       <ng-container *ngIf="mainMenuConfig?.datasets ?? false">
         <button mat-menu-item routerLink="/datasets/">
           <mat-icon> folder</mat-icon>
@@ -9,8 +11,11 @@
       </ng-container>
 
       <ng-container *ngIf="config.ingestorComponent.ingestorEnabled">
-        <button mat-menu-item [routerLink]="['/ingestor']"
-          [queryParams]="{ discovery: true }">
+        <button
+          mat-menu-item
+          [routerLink]="['/ingestor']"
+          [queryParams]="{ discovery: true }"
+        >
           <mat-icon> cloud_upload</mat-icon>
           <span>Ingestor</span>
         </button>
@@ -93,7 +98,12 @@
     <a [routerLink]="[defaultMainPage$ | async]">
       <img class="logo" src="../../../assets/images/{{ siteSciCatLogo }}" />
     </a>
-    <ng-container *ngIf="isSiteHeaderLogoUrlExternal$ | async; else siteHeaderLogoUrlInternal">
+    <ng-container
+      *ngIf="
+        isSiteHeaderLogoUrlExternal$ | async;
+        else siteHeaderLogoUrlInternal
+      "
+    >
       <a [href]="siteHeaderLogoUrl$ | async">
         <img class="logo" src="../../../assets/images/{{ siteHeaderLogo }}" />
       </a>
@@ -127,7 +137,7 @@ <h6>
       <span *ngIf="config.shoppingCartOnHeader" [matMenuTriggerFor]="cartMenu">
         <button id="cartOnHeaderButton" mat-icon-button>
           <mat-icon
-            color = "primary"
+            color="primary"
             matBadge="{{ inBatchIndicator$ | async }}"
             matBadgeColor="accent"
             matBadgeSize="medium"
@@ -143,7 +153,9 @@ <h6>
       <span>
         <button mat-button class="user-button" [matMenuTriggerFor]="userMenu">
           <img class="user-image" src="{{ profileImage$ | async }}" />
-          <div color="primary" class="large-screen-text">{{ username$ | async }}</div>
+          <div color="primary" class="large-screen-text">
+            {{ username$ | async }}
+          </div>
         </button>
       </span>
     </span>
diff --git a/src/app/_layout/app-header/app-header.component.scss b/src/app/_layout/app-header/app-header.component.scss
index a064ecd304..6579c1f34e 100644
--- a/src/app/_layout/app-header/app-header.component.scss
+++ b/src/app/_layout/app-header/app-header.component.scss
@@ -7,7 +7,8 @@
   mat-toolbar {
     height: 3.5rem;
 
-    a, .main-menu {
+    a,
+    .main-menu {
       height: 2.5rem;
       padding: 0.5rem;
 
@@ -22,7 +23,8 @@
       cursor: pointer;
     }
 
-    .spacer, .title {
+    .spacer,
+    .title {
       flex: 1 1 auto;
     }
 
diff --git a/src/app/app-config.service.spec.ts b/src/app/app-config.service.spec.ts
index c3efd6045c..f817f52bfe 100644
--- a/src/app/app-config.service.spec.ts
+++ b/src/app/app-config.service.spec.ts
@@ -250,11 +250,10 @@ const appConfig: AppConfigInterface = {
     ],
     conditions: [],
   },
-  ingestorComponent:{
-  ingestorEnabled: true,
-  ingestorInTransferMode: true,
-
-  }
+  ingestorComponent: {
+    ingestorEnabled: true,
+    ingestorInTransferMode: true,
+  },
 };
 
 describe("AppConfigService", () => {
diff --git a/src/app/datasets/dashboard/dashboard.component.html b/src/app/datasets/dashboard/dashboard.component.html
index 0053b97265..11bbf53510 100644
--- a/src/app/datasets/dashboard/dashboard.component.html
+++ b/src/app/datasets/dashboard/dashboard.component.html
@@ -13,7 +13,10 @@
       <div class="action-column" fxFlex="14" fxFlex.lt-xl="20">
         <datasets-filter></datasets-filter>
         <ng-template [ngIf]="this.loggedIn$ | async">
-          <ingestor-creation #ingestor style="display:none"></ingestor-creation>
+          <ingestor-creation
+            #ingestor
+            style="display: none"
+          ></ingestor-creation>
           <mat-card
             *ngIf="appConfig.addDatasetEnabled"
             class="add-card"
diff --git a/src/app/datasets/dashboard/dashboard.component.scss b/src/app/datasets/dashboard/dashboard.component.scss
index 934353d5d1..7e55840a83 100644
--- a/src/app/datasets/dashboard/dashboard.component.scss
+++ b/src/app/datasets/dashboard/dashboard.component.scss
@@ -1,5 +1,3 @@
-
-
 mat-sidenav-container {
   mat-sidenav-content {
     padding: 0.5rem;
diff --git a/src/app/datasets/dashboard/dashboard.component.spec.ts b/src/app/datasets/dashboard/dashboard.component.spec.ts
index aa2e9df0e7..862e05ad35 100644
--- a/src/app/datasets/dashboard/dashboard.component.spec.ts
+++ b/src/app/datasets/dashboard/dashboard.component.spec.ts
@@ -22,7 +22,7 @@ import {
 } from "state-management/actions/datasets.actions";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { provideMockStore } from "@ngrx/store/testing";
-import {resetIngestionObject} from "state-management/actions/ingestor.actions";
+import { resetIngestionObject } from "state-management/actions/ingestor.actions";
 import { selectSelectedDatasets } from "state-management/selectors/datasets.selectors";
 import {
   selectColumns,
@@ -138,15 +138,17 @@ describe("DashboardComponent", () => {
 
   describe("#openDialog()", () => {
     it("should call Ingestor method", () => {
-      const mockIngestor = jasmine.createSpyObj('IngestorCreationComponent', ['onClickAddIngestion']);
+      const mockIngestor = jasmine.createSpyObj("IngestorCreationComponent", [
+        "onClickAddIngestion",
+      ]);
 
       component.ingestor = mockIngestor;
       component.openDialog();
-      
+
       expect(mockIngestor.onClickAddIngestion).toHaveBeenCalledTimes(1);
     });
   });
-  
+
   describe("#onPageChange()", () => {
     it("should dispatch a changePageAction", () => {
       dispatchSpy = spyOn(store, "dispatch");
diff --git a/src/app/datasets/dashboard/dashboard.component.ts b/src/app/datasets/dashboard/dashboard.component.ts
index 3ff945e6f5..ed3b175cab 100644
--- a/src/app/datasets/dashboard/dashboard.component.ts
+++ b/src/app/datasets/dashboard/dashboard.component.ts
@@ -45,7 +45,7 @@ import {
 } from "@scicatproject/scicat-sdk-ts-angular";
 import { loadDefaultSettings } from "state-management/actions/user.actions";
 import { AppConfigService } from "app-config.service";
-import {IngestorCreationComponent} from "ingestor/ingestor-page/ingestor-creation.component";
+import { IngestorCreationComponent } from "ingestor/ingestor-page/ingestor-creation.component";
 
 @Component({
   selector: "dashboard",
@@ -74,7 +74,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
   clearColumnSearch = false;
 
   @ViewChild(MatSidenav, { static: false }) sideNav!: MatSidenav;
-  @ViewChild('ingestor') ingestor: IngestorCreationComponent;
+  @ViewChild("ingestor") ingestor: IngestorCreationComponent;
 
   constructor(
     public appConfigService: AppConfigService,
diff --git a/src/app/datasets/datafiles-actions/datafiles-action.component.scss b/src/app/datasets/datafiles-actions/datafiles-action.component.scss
index 43d6d664c1..79b9d1c7a4 100644
--- a/src/app/datasets/datafiles-actions/datafiles-action.component.scss
+++ b/src/app/datasets/datafiles-actions/datafiles-action.component.scss
@@ -7,4 +7,4 @@ button {
     width: auto;
     vertical-align: middle;
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/datasets/datafiles-actions/datafiles-actions.component.scss b/src/app/datasets/datafiles-actions/datafiles-actions.component.scss
index cdc435d73b..2a13354b9b 100644
--- a/src/app/datasets/datafiles-actions/datafiles-actions.component.scss
+++ b/src/app/datasets/datafiles-actions/datafiles-actions.component.scss
@@ -1,3 +1,3 @@
 .dataset-datafiles-actions {
   float: right;
-}
\ No newline at end of file
+}
diff --git a/src/app/datasets/datafiles/datafiles.component.scss b/src/app/datasets/datafiles/datafiles.component.scss
index 89e181f679..f0663d1d2d 100644
--- a/src/app/datasets/datafiles/datafiles.component.scss
+++ b/src/app/datasets/datafiles/datafiles.component.scss
@@ -13,5 +13,4 @@ mat-icon {
   .nbr-of-files {
     font-size: larger;
   }
-
 }
diff --git a/src/app/datasets/dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component.scss b/src/app/datasets/dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component.scss
index 465594005f..75c36a30c4 100644
--- a/src/app/datasets/dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component.scss
+++ b/src/app/datasets/dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component.scss
@@ -130,7 +130,7 @@ mat-card {
 
 .scientific-metadata-content {
   height: 100%;
-  
+
   > div {
     height: 100%;
   }
diff --git a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.scss b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.scss
index 50dd208df2..013be16c0a 100644
--- a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.scss
+++ b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.scss
@@ -1,7 +1,11 @@
 mat-card {
   margin: 1em;
 
-  .scientific-header, .related-header, .creator-header, .file-header, .general-header {
+  .scientific-header,
+  .related-header,
+  .creator-header,
+  .file-header,
+  .general-header {
     display: flex;
     align-items: center;
     padding: 1em;
diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.html b/src/app/datasets/datasets-filter/datasets-filter.component.html
index a4a281bc32..ff6a7cd9ec 100644
--- a/src/app/datasets/datasets-filter/datasets-filter.component.html
+++ b/src/app/datasets/datasets-filter/datasets-filter.component.html
@@ -229,7 +229,10 @@
                   (input)="updateConditionUnit(i, $event)"
                   [matAutocomplete]="rhsUnits"
                 />
-                <mat-autocomplete #rhsUnits="matAutocomplete" (optionSelected)="updateConditionUnit(i, $event)">
+                <mat-autocomplete
+                  #rhsUnits="matAutocomplete"
+                  (optionSelected)="updateConditionUnit(i, $event)"
+                >
                   <mat-option
                     *ngFor="let unit of getUnits(conditionConfig.condition.lhs)"
                     [value]="unit"
diff --git a/src/app/datasets/datasets.module.ts b/src/app/datasets/datasets.module.ts
index a384757fb8..6d86cb9b28 100644
--- a/src/app/datasets/datasets.module.ts
+++ b/src/app/datasets/datasets.module.ts
@@ -86,7 +86,7 @@ import { DatasetDetailDynamicComponent } from "./dataset-detail/dataset-detail-d
 import { DatasetDetailWrapperComponent } from "./dataset-detail/dataset-detail-wrapper.component";
 import { JsonHeadPipe } from "shared/pipes/json-head.pipe";
 import { ThumbnailPipe } from "shared/pipes/thumbnail.pipe";
-import { IngestorModule } from "../ingestor/ingestor.module"
+import { IngestorModule } from "../ingestor/ingestor.module";
 import { MatExpansionModule } from "@angular/material/expansion";
 import { MatBadgeModule } from "@angular/material/badge";
 import { TitleCasePipe } from "shared/pipes/title-case.pipe";
diff --git a/src/app/help/help/help.component.html b/src/app/help/help/help.component.html
index fda9d3f9c9..236e47da20 100644
--- a/src/app/help/help/help.component.html
+++ b/src/app/help/help/help.component.html
@@ -116,7 +116,8 @@
     </mat-card-header>
     <mat-card-content>
       If you have any questions or need help, please contact
-      <a href="mailto:{{ supportEmail }}">{{ supportEmail }}</a>.
+      <a href="mailto:{{ supportEmail }}">{{ supportEmail }}</a
+      >.
     </mat-card-content>
   </mat-card>
 </p>
diff --git a/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.spec.ts b/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.spec.ts
index c2c4ee4adf..6ccc6616bd 100644
--- a/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.component.spec.ts
@@ -1,6 +1,10 @@
 import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
 import { IngestorConfirmationDialogComponent } from "./ingestor.confirmation-dialog.component";
-import { MatDialogRef, MAT_DIALOG_DATA, MatDialogModule } from "@angular/material/dialog";
+import {
+  MatDialogRef,
+  MAT_DIALOG_DATA,
+  MatDialogModule,
+} from "@angular/material/dialog";
 import { NO_ERRORS_SCHEMA } from "@angular/core";
 
 describe("IngestorConfirmationDialogComponent", () => {
@@ -45,4 +49,4 @@ describe("IngestorConfirmationDialogComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.html b/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.html
index cdcac49b21..054bb484f5 100644
--- a/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.html
+++ b/src/app/ingestor/ingestor-dialogs/confirmation-dialog/ingestor.confirmation-dialog.html
@@ -1,21 +1,32 @@
 <div class="ingestor-mixed-header">
-  <h2 mat-dialog-title>
-    {{ header }}
-  </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close"
-    class="ingestor-close-button">
+  <h2 mat-dialog-title>{{ header }}</h2>
+  <button
+    mat-icon-button
+    mat-dialog-close
+    aria-label="Close"
+    class="ingestor-close-button"
+  >
     <mat-icon>close</mat-icon>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
   <div class="confirmation-dialog">
     <p>{{ message }}</p>
-    <ng-container *ngComponentOutlet="messageComponent; injector: injector"></ng-container>
+    <ng-container
+      *ngComponentOutlet="messageComponent; injector: injector"
+    ></ng-container>
   </div>
 </mat-dialog-content>
 
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close (click)="onCancel()">Cancel</button>
-  <button mat-button color="primary" cdkFocusInitial [mat-dialog-close]="true"
-    (click)="onConfirm()">Confirm</button>
-</mat-dialog-actions>
\ No newline at end of file
+  <button
+    mat-button
+    color="primary"
+    cdkFocusInitial
+    [mat-dialog-close]="true"
+    (click)="onConfirm()"
+  >
+    Confirm
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.spec.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.spec.ts
index ef5bb23581..a4a87845b9 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.spec.ts
@@ -17,10 +17,7 @@ describe("IngestorConfirmTransferDialogPageComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorConfirmTransferDialogPageComponent],
-      imports: [
-        MatDialogModule,
-        StoreModule.forRoot({}),
-      ],
+      imports: [MatDialogModule, StoreModule.forRoot({})],
       providers: [
         provideMockStore(),
         { provide: MatDialog, useValue: mockDialog },
@@ -31,7 +28,9 @@ describe("IngestorConfirmTransferDialogPageComponent", () => {
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(IngestorConfirmTransferDialogPageComponent);
+    fixture = TestBed.createComponent(
+      IngestorConfirmTransferDialogPageComponent,
+    );
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
@@ -45,4 +44,4 @@ describe("IngestorConfirmTransferDialogPageComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
index 5f2b941556..4303189909 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.html
@@ -1,10 +1,12 @@
 <div class="ingestor-dialog-header">
   <div class="ingestor-mixed-header">
-    <h2 mat-dialog-title>
-      Confirm transfer
-    </h2>
-    <button mat-icon-button mat-dialog-close aria-label="Close"
-      class="ingestor-close-button">
+    <h2 mat-dialog-title>Confirm transfer</h2>
+    <button
+      mat-icon-button
+      mat-dialog-close
+      aria-label="Close"
+      class="ingestor-close-button"
+    >
       <mat-icon>close</mat-icon>
     </button>
   </div>
@@ -15,10 +17,11 @@ <h2 mat-dialog-title>
 </div>
 
 <mat-dialog-content class="mat-typography">
-
   <div *ngIf="ingestionDatasetIsLoading" class="spinner-container">
-    <mat-progress-spinner diameter="20"
-      mode="indeterminate"></mat-progress-spinner>
+    <mat-progress-spinner
+      diameter="20"
+      mode="indeterminate"
+    ></mat-progress-spinner>
     <div class="progress-percentage">
       <span>Wait for the response from the server...</span>
     </div>
@@ -26,7 +29,8 @@ <h2 mat-dialog-title>
 
   <div *ngIf="!ingestionDatasetIsLoading">
     <p
-      *ngIf="createNewTransferDataApiInformation.ingestionRequestErrorMessage !== ''">
+      *ngIf="createNewTransferDataApiInformation.ingestionRequestErrorMessage !== ''"
+    >
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Transfer request failed</mat-card-title>
@@ -39,30 +43,31 @@ <h2 mat-dialog-title>
               {{createNewTransferDataApiInformation.ingestionRequestErrorMessage}}
             </p>
           </div>
-
-
         </mat-card-content>
       </mat-card>
     </p>
 
     <div
-      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '' && createNewTransferData.editorMode === 'CREATION'">
+      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '' && createNewTransferData.editorMode === 'CREATION'"
+    >
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Dataset created</mat-card-title>
         </mat-card-header>
         <mat-card-content class="ingestor-vertical-layout">
           <div class="confirm-message-ingestor">
-            <mat-icon
-              class="confirm-message-ingestor-icon">check_circle</mat-icon>
-            <p>The data set was successfully created. You can find the data set
+            <mat-icon class="confirm-message-ingestor-icon"
+              >check_circle</mat-icon
+            >
+            <p>
+              The data set was successfully created. You can find the data set
               with the recorded metadata under the following details:
             </p>
-            <p>Dataset ID:
-              {{createNewTransferData.ingestionRequest.transferId}}
+            <p>
+              Dataset ID: {{createNewTransferData.ingestionRequest.transferId}}
             </p>
-            <p>Dataset Name:
-              {{createNewTransferData.ingestionRequest.status}}
+            <p>
+              Dataset Name: {{createNewTransferData.ingestionRequest.status}}
             </p>
           </div>
         </mat-card-content>
@@ -70,24 +75,26 @@ <h2 mat-dialog-title>
     </div>
 
     <div
-      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '' && createNewTransferData.editorMode === 'INGESTION'">
+      *ngIf="createNewTransferData.ingestionRequest !== null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '' && createNewTransferData.editorMode === 'INGESTION'"
+    >
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Transfer requested</mat-card-title>
         </mat-card-header>
         <mat-card-content class="ingestor-vertical-layout">
           <div class="confirm-message-ingestor">
-            <mat-icon
-              class="confirm-message-ingestor-icon">check_circle</mat-icon>
-            <p>The transfer request was successfully sent to the server.
-              You will receive an email as soon as the data transfer is
-              complete.
+            <mat-icon class="confirm-message-ingestor-icon"
+              >check_circle</mat-icon
+            >
+            <p>
+              The transfer request was successfully sent to the server. You will
+              receive an email as soon as the data transfer is complete.
             </p>
-            <p>Transfer ID:
-              {{createNewTransferData.ingestionRequest.transferId}}
+            <p>
+              Transfer ID: {{createNewTransferData.ingestionRequest.transferId}}
             </p>
-            <p>Transfer status:
-              {{createNewTransferData.ingestionRequest.status}}
+            <p>
+              Transfer status: {{createNewTransferData.ingestionRequest.status}}
             </p>
           </div>
         </mat-card-content>
@@ -95,14 +102,18 @@ <h2 mat-dialog-title>
     </div>
 
     <div
-      *ngIf="createNewTransferData.editorMode === 'INGESTION' && createNewTransferData.ingestionRequest === null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === ''">
+      *ngIf="createNewTransferData.editorMode === 'INGESTION' && createNewTransferData.ingestionRequest === null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === ''"
+    >
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Transfer Options</mat-card-title>
         </mat-card-header>
         <mat-card-content class="ingestor-vertical-layout">
-          <mat-checkbox [(ngModel)]="createNewTransferData.autoArchive"
-            (change)="onAutoArchiveChange($event)" aria-label="Auto Archive">
+          <mat-checkbox
+            [(ngModel)]="createNewTransferData.autoArchive"
+            (change)="onAutoArchiveChange($event)"
+            aria-label="Auto Archive"
+          >
             Auto Archive
           </mat-checkbox>
           <p class="checkbox-description">
@@ -114,7 +125,8 @@ <h2 mat-dialog-title>
     </div>
 
     <div
-      *ngIf="createNewTransferData.ingestionRequest === null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === ''">
+      *ngIf="createNewTransferData.ingestionRequest === null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === ''"
+    >
       <mat-card class="ingestor-card">
         <mat-card-header class="ingestor-mixed-header">
           <mat-card-title>Confirm Metadata</mat-card-title>
@@ -131,32 +143,60 @@ <h2 mat-dialog-title>
       </mat-card>
     </div>
   </div>
-
-
 </mat-dialog-content>
 <mat-dialog-actions align="end" *ngIf="!ingestionDatasetIsLoading">
-  <button *ngIf="createNewTransferData.editorMode === 'EDITOR' || createNewTransferData.editorMode === 'CREATION' ||
+  <button
+    *ngIf="createNewTransferData.editorMode === 'EDITOR' || createNewTransferData.editorMode === 'CREATION' ||
   createNewTransferData.editorMode === 'INGESTION' &&
   (createNewTransferData.ingestionRequest === null ||
   createNewTransferDataApiInformation.ingestionRequestErrorMessage !== '')"
-    mat-button (click)="onClickBack()">Back</button>
+    mat-button
+    (click)="onClickBack()"
+  >
+    Back
+  </button>
   <button
     *ngIf="createNewTransferData.editorMode === 'INGESTION' && (createNewTransferData.ingestionRequest === null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '')"
-    mat-button color="primary" cdkFocusInitial
-    (click)="onClickConfirm()">Ingest</button>
+    mat-button
+    color="primary"
+    cdkFocusInitial
+    (click)="onClickConfirm()"
+  >
+    Ingest
+  </button>
   <button
     *ngIf="createNewTransferData.editorMode === 'EDITOR' || createNewTransferData.editorMode === 'CREATION'"
-    mat-button color="primary" cdkFocusInitial (click)="onCopyMetadata()">
+    mat-button
+    color="primary"
+    cdkFocusInitial
+    (click)="onCopyMetadata()"
+  >
     {{!copiedToClipboard ? "Copy JSON" : "Copied!"}}
   </button>
   <button
     *ngIf="createNewTransferData.editorMode === 'CREATION' && (createNewTransferData.ingestionRequest === null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '')"
-    mat-button color="primary" cdkFocusInitial (click)="onClickConfirm()">Create
-    Dataset</button>
+    mat-button
+    color="primary"
+    cdkFocusInitial
+    (click)="onClickConfirm()"
+  >
+    Create Dataset
+  </button>
   <button
     *ngIf="copiedToClipboard && createNewTransferData.editorMode === 'EDITOR' || (createNewTransferData.ingestionRequest !== null && createNewTransferDataApiInformation.ingestionRequestErrorMessage === '')"
-    mat-button color="primary" cdkFocusInitial mat-dialog-close>Close</button>
+    mat-button
+    color="primary"
+    cdkFocusInitial
+    mat-dialog-close
+  >
+    Close
+  </button>
   <button
     *ngIf="createNewTransferDataApiInformation.ingestionRequestErrorMessage !== ''"
-    mat-button color="warn" (click)="onClickRetryRequests()">Retry</button>
-</mat-dialog-actions>
\ No newline at end of file
+    mat-button
+    color="warn"
+    (click)="onClickRetryRequests()"
+  >
+    Retry
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.spec.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.spec.ts
index 76a5ef3225..a83e2be541 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.spec.ts
@@ -12,19 +12,17 @@ describe("IngestorCustomMetadataDialogPageComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorCustomMetadataDialogPageComponent],
-      imports: [
-        StoreModule.forRoot({}),
-      ],
-      providers: [
-        provideMockStore(),
-      ],
+      imports: [StoreModule.forRoot({})],
+      providers: [provideMockStore()],
     });
 
     TestBed.compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(IngestorCustomMetadataDialogPageComponent);
+    fixture = TestBed.createComponent(
+      IngestorCustomMetadataDialogPageComponent,
+    );
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
@@ -38,4 +36,4 @@ describe("IngestorCustomMetadataDialogPageComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
index 72a98eabd0..10d4de6e55 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component.ts
@@ -155,9 +155,9 @@ export class IngestorCustomMetadataDialogPageComponent
     const result = IngestorMetadataEditorHelper.processMetadataErrors(
       errors,
       this.customMetadataSchema,
-      this.activeRenderView
+      this.activeRenderView,
     );
-    
+
     this.isCustomMetadataOk = result.isValid;
     this.customMetadataErrors = result.errorString;
     this.validateNextButton();
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
index ab1e33a636..343d59f698 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.html
@@ -1,10 +1,12 @@
 <div class="ingestor-dialog-header">
   <div class="ingestor-mixed-header">
-    <h2 mat-dialog-title>
-      Fill out user-specific metadata
-    </h2>
-    <button mat-icon-button mat-dialog-close aria-label="Close"
-      class="ingestor-close-button">
+    <h2 mat-dialog-title>Fill out user-specific metadata</h2>
+    <button
+      mat-icon-button
+      mat-dialog-close
+      aria-label="Close"
+      class="ingestor-close-button"
+    >
       <mat-icon>close</mat-icon>
     </button>
   </div>
@@ -14,39 +16,53 @@ <h2 mat-dialog-title>
   </div>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
-
   <mat-card>
-    <mat-card-header class="organizational-header"
-      (click)="toggleCardContent('scientific')">
+    <mat-card-header
+      class="organizational-header"
+      (click)="toggleCardContent('scientific')"
+    >
       <div mat-card-avatar class="section-icon">
         <mat-icon> info </mat-icon>
       </div>
       <mat-card-title>Scientific Metadata</mat-card-title>
       <mat-card-subtitle>
-        Fields in Red Are Required By The Schema. You can proceed with ingestion without filling them out.
+        Fields in Red Are Required By The Schema. You can proceed with ingestion
+        without filling them out.
       </mat-card-subtitle>
       <span class="spacer"></span>
       <mat-icon
         [matTooltip]="isCustomMetadataOk ? 'Your input is correct.' : customMetadataErrors"
-        [ngClass]="isCustomMetadataOk ? 'success-icon' : 'error-icon'">{{
-        isCustomMetadataOk ? 'check_circle_outline' :
-        'error_outline'}}</mat-icon>
-      <mat-icon class="toggle-icon">{{ isCardContentVisible.scientific ?
-        'expand_less' : 'expand_more' }}</mat-icon>
+        [ngClass]="isCustomMetadataOk ? 'success-icon' : 'error-icon'"
+        >{{ isCustomMetadataOk ? 'check_circle_outline' :
+        'error_outline'}}</mat-icon
+      >
+      <mat-icon class="toggle-icon"
+        >{{ isCardContentVisible.scientific ? 'expand_less' : 'expand_more'
+        }}</mat-icon
+      >
     </mat-card-header>
     <mat-card-content *ngIf="isCardContentVisible.scientific">
-      <app-metadata-editor #customMetadataEditor
-        *ngIf="!updateEditorFromThirdParty" [schema]="customMetadataSchema"
+      <app-metadata-editor
+        #customMetadataEditor
+        *ngIf="!updateEditorFromThirdParty"
+        [schema]="customMetadataSchema"
         [renderView]="activeRenderView"
         [data]="createNewTransferData.customMetaData"
         (dataChange)="onDataChangeCustomMetadata($event)"
-        (errors)="customMetadataErrorsHandler($event)"></app-metadata-editor>
+        (errors)="customMetadataErrorsHandler($event)"
+      ></app-metadata-editor>
     </mat-card-content>
   </mat-card>
-
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial
-    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
-</mat-dialog-actions>
\ No newline at end of file
+  <button
+    mat-button
+    color="primary"
+    cdkFocusInitial
+    [disabled]="!uiNextButtonReady"
+    (click)="onClickNext()"
+  >
+    Next
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.spec.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.spec.ts
index 385241aee7..3101f9b73e 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.spec.ts
@@ -12,19 +12,17 @@ describe("IngestorExtractorMetadataDialogPageComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorExtractorMetadataDialogPageComponent],
-      imports: [
-        StoreModule.forRoot({}),
-      ],
-      providers: [
-        provideMockStore(),
-      ],
+      imports: [StoreModule.forRoot({})],
+      providers: [provideMockStore()],
     });
 
     TestBed.compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(IngestorExtractorMetadataDialogPageComponent);
+    fixture = TestBed.createComponent(
+      IngestorExtractorMetadataDialogPageComponent,
+    );
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
@@ -38,4 +36,4 @@ describe("IngestorExtractorMetadataDialogPageComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index 969a1cfb91..dad6a77eb6 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -183,9 +183,9 @@ export class IngestorExtractorMetadataDialogPageComponent
     const result = IngestorMetadataEditorHelper.processMetadataErrors(
       errors,
       this.metadataSchemaInstrument,
-      this.activeRenderView
+      this.activeRenderView,
     );
-    
+
     this.isInstrumentMetadataOk = result.isValid;
     this.instrumentErrors = result.errorString;
     this.validateNextButton();
@@ -196,9 +196,9 @@ export class IngestorExtractorMetadataDialogPageComponent
     const result = IngestorMetadataEditorHelper.processMetadataErrors(
       errors,
       this.metadataSchemaAcquisition,
-      this.activeRenderView
+      this.activeRenderView,
     );
-    
+
     this.isAcquisitionMetadataOk = result.isValid;
     this.acquisitionErrors = result.errorString;
     this.validateNextButton();
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
index b2cbba9252..7c698098e3 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.html
@@ -1,10 +1,12 @@
 <div class="ingestor-dialog-header">
   <div class="ingestor-mixed-header">
-    <h2 mat-dialog-title>
-      Correct dataset-specific metadata
-    </h2>
-    <button mat-icon-button mat-dialog-close aria-label="Close"
-      class="ingestor-close-button">
+    <h2 mat-dialog-title>Correct dataset-specific metadata</h2>
+    <button
+      mat-icon-button
+      mat-dialog-close
+      aria-label="Close"
+      class="ingestor-close-button"
+    >
       <mat-icon>close</mat-icon>
     </button>
   </div>
@@ -15,13 +17,16 @@ <h2 mat-dialog-title>
 </div>
 
 <mat-dialog-content class="mat-typography">
-
-  <div *ngIf="!extractorMetaDataReady || extractorMetaDataError"
-    class="spinner-container">
+  <div
+    *ngIf="!extractorMetaDataReady || extractorMetaDataError"
+    class="spinner-container"
+  >
     <ng-container *ngIf="!extractorMetaDataError; else errorIcon">
       <p>Wait for data extraction to finish...</p>
-      <mat-progress-spinner diameter="20"
-        mode="indeterminate"></mat-progress-spinner>
+      <mat-progress-spinner
+        diameter="20"
+        mode="indeterminate"
+      ></mat-progress-spinner>
       <div *ngIf="process > -1" class="progress-percentage">
         <span>{{process}}%</span>
       </div>
@@ -41,70 +46,86 @@ <h2 mat-dialog-title>
           <div mat-card-avatar class="section-icon">
             <mat-icon> error </mat-icon>
           </div>
-          The automatic metadata extraction was not successful. Please enter
-          the data manually.
+          The automatic metadata extraction was not successful. Please enter the
+          data manually.
         </mat-card-header>
       </mat-card>
     </div>
     <div fxLayout="row" fxLayout.xs="column">
       <div fxFlex="80%">
         <mat-card>
-          <mat-card-header class="instrument-header"
-            (click)="toggleCardContent('instrument')">
+          <mat-card-header
+            class="instrument-header"
+            (click)="toggleCardContent('instrument')"
+          >
             <div mat-card-avatar class="section-icon">
               <mat-icon> biotech </mat-icon>
             </div>
-            
+
             <mat-card-title>Instrument Information</mat-card-title>
             <mat-card-subtitle>
-              Fields in Red Are Required By The Schema. You can proceed with ingestion without filling them out.
+              Fields in Red Are Required By The Schema. You can proceed with
+              ingestion without filling them out.
             </mat-card-subtitle>
             <span class="spacer"></span>
             <mat-icon
               [matTooltip]="isInstrumentMetadataOk ? 'Your input is correct.' : instrumentErrors"
-              [ngClass]="isInstrumentMetadataOk ? 'success-icon' : 'error-icon'">{{
-              isInstrumentMetadataOk ? 'check_circle_outline' :
-              'error_outline'}}</mat-icon>
-            <mat-icon class="toggle-icon">{{ isCardContentVisible.instrument ?
-              'expand_less' : 'expand_more' }}</mat-icon>
+              [ngClass]="isInstrumentMetadataOk ? 'success-icon' : 'error-icon'"
+              >{{ isInstrumentMetadataOk ? 'check_circle_outline' :
+              'error_outline'}}</mat-icon
+            >
+            <mat-icon class="toggle-icon"
+              >{{ isCardContentVisible.instrument ? 'expand_less' :
+              'expand_more' }}</mat-icon
+            >
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.instrument">
-            <app-metadata-editor #instrumentMetadataEditor
+            <app-metadata-editor
+              #instrumentMetadataEditor
               *ngIf="!updateEditorFromThirdParty"
               [schema]="metadataSchemaInstrument"
               [renderView]="activeRenderView"
               [data]="createNewTransferData.extractorMetaData['instrument']"
               (dataChange)="onDataChangeExtractorMetadataInstrument($event)"
-              (errors)="instrumentErrorsHandler($event)"></app-metadata-editor>
+              (errors)="instrumentErrorsHandler($event)"
+            ></app-metadata-editor>
           </mat-card-content>
         </mat-card>
         <mat-card>
-          <mat-card-header class="acquisition-header"
-            (click)="toggleCardContent('acquisition')">
+          <mat-card-header
+            class="acquisition-header"
+            (click)="toggleCardContent('acquisition')"
+          >
             <div mat-card-avatar class="section-icon">
               <mat-icon> category-search </mat-icon>
             </div>
             <mat-card-title>Acquisition Information</mat-card-title>
             <mat-card-subtitle>
-              Fields in Red Are Required By The Schema. You can proceed with ingestion without filling them out.
+              Fields in Red Are Required By The Schema. You can proceed with
+              ingestion without filling them out.
             </mat-card-subtitle>
             <span class="spacer"></span>
             <mat-icon
               [matTooltip]="isAcquisitionMetadataOk ? 'Your input is correct.' : acquisitionErrors"
-              [ngClass]="isAcquisitionMetadataOk ? 'success-icon' : 'error-icon'">{{
-              isAcquisitionMetadataOk ? 'check_circle_outline' :
-              'error_outline'}}</mat-icon>
-            <mat-icon class="toggle-icon">{{ isCardContentVisible.acquisition ?
-              'expand_less' : 'expand_more' }}</mat-icon>
+              [ngClass]="isAcquisitionMetadataOk ? 'success-icon' : 'error-icon'"
+              >{{ isAcquisitionMetadataOk ? 'check_circle_outline' :
+              'error_outline'}}</mat-icon
+            >
+            <mat-icon class="toggle-icon"
+              >{{ isCardContentVisible.acquisition ? 'expand_less' :
+              'expand_more' }}</mat-icon
+            >
           </mat-card-header>
           <mat-card-content *ngIf="isCardContentVisible.acquisition">
-            <app-metadata-editor #acquisitionMetadataEditor
+            <app-metadata-editor
+              #acquisitionMetadataEditor
               *ngIf="!updateEditorFromThirdParty"
               [schema]="metadataSchemaAcquisition"
               [renderView]="activeRenderView"
               [data]="createNewTransferData.extractorMetaData['acquisition']"
               (dataChange)="onDataChangeExtractorMetadataAcquisition($event)"
-              (errors)="acquisitionErrorsHandler($event)"></app-metadata-editor>
+              (errors)="acquisitionErrorsHandler($event)"
+            ></app-metadata-editor>
           </mat-card-content>
         </mat-card>
       </div>
@@ -113,6 +134,13 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial (click)="onClickNext()"
-    [disabled]="!uiNextButtonReady">Next</button>
-</mat-dialog-actions>
\ No newline at end of file
+  <button
+    mat-button
+    color="primary"
+    cdkFocusInitial
+    (click)="onClickNext()"
+    [disabled]="!uiNextButtonReady"
+  >
+    Next
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.spec.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.spec.ts
index 6bfd291f18..18c15a7de8 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.spec.ts
@@ -17,10 +17,7 @@ describe("IngestorNewTransferDialogPageComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorNewTransferDialogPageComponent],
-      imports: [
-        MatDialogModule,
-        StoreModule.forRoot({}),
-      ],
+      imports: [MatDialogModule, StoreModule.forRoot({})],
       providers: [
         provideMockStore(),
         { provide: MatDialog, useValue: mockDialog },
@@ -45,4 +42,4 @@ describe("IngestorNewTransferDialogPageComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 714e225b3f..d8c5ea2056 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -237,7 +237,9 @@ export class IngestorNewTransferDialogPageComponent
       this.createNewTransferData.selectedResolvedDecodedSchema = resolvedSchema;
     } else {
       if (this.createNewTransferData.selectedSchemaFileContent) {
-        const schema = JSON.parse(this.createNewTransferData.selectedSchemaFileContent);
+        const schema = JSON.parse(
+          this.createNewTransferData.selectedSchemaFileContent,
+        );
         const resolvedSchema = IngestorMetadataEditorHelper.resolveRefs(
           schema,
           schema,
@@ -260,14 +262,15 @@ export class IngestorNewTransferDialogPageComponent
     );
     this.generateExampleDataForSciCatHeader();
     this.prepareSchemaForProcessing();
-    
+
     // Emit once to go to next step
     this.nextStep.emit();
-    
+
     // In CREATION mode with no schema, skip the scientific metadata page
     if (
-      this.createNewTransferData.editorMode === 'CREATION' && 
-      (!this.createNewTransferData.selectedSchemaFileContent || this.createNewTransferData.selectedSchemaFileContent === '')
+      this.createNewTransferData.editorMode === "CREATION" &&
+      (!this.createNewTransferData.selectedSchemaFileContent ||
+        this.createNewTransferData.selectedSchemaFileContent === "")
     ) {
       // Emit again to skip scientific metadata and go straight to confirm
       this.nextStep.emit();
@@ -275,7 +278,6 @@ export class IngestorNewTransferDialogPageComponent
     }
   }
 
-
   onDataChangeUserScicatHeader(event: any) {
     this.createNewTransferData.scicatHeader = event;
   }
@@ -344,7 +346,10 @@ export class IngestorNewTransferDialogPageComponent
       alert("Please enter a schema URL.");
       return;
     }
-    console.log("Fetching schema from URL:", this.createNewTransferData.schemaUrl);
+    console.log(
+      "Fetching schema from URL:",
+      this.createNewTransferData.schemaUrl,
+    );
     let content: string;
     let parsedJson: any;
 
@@ -364,9 +369,9 @@ export class IngestorNewTransferDialogPageComponent
       alert(`Error fetching schema: ${error.message}`);
       return;
     }
-    
+
     this.createNewTransferData.selectedSchemaFileContent = content;
-    
+
     // Update the store with both the URL and content
     this.createNewTransferData.selectedSchemaFileContent = content;
     this.store.dispatch(
@@ -374,7 +379,7 @@ export class IngestorNewTransferDialogPageComponent
         ingestionObject: this.createNewTransferData,
       }),
     );
-    
+
     this.validateNextButton();
   }
 }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
index 1b932885e5..e66ca2cdb4 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.html
@@ -1,103 +1,132 @@
 <div class="ingestor-dialog-header">
   <div class="ingestor-mixed-header">
-    <h2 *ngIf="createNewTransferData.editorMode === 'CREATION'" mat-dialog-title>
+    <h2
+      *ngIf="createNewTransferData.editorMode === 'CREATION'"
+      mat-dialog-title
+    >
       Fill out Dataset information
     </h2>
 
-    <h2 *ngIf="createNewTransferData.editorMode !== 'CREATION'" mat-dialog-title>
+    <h2
+      *ngIf="createNewTransferData.editorMode !== 'CREATION'"
+      mat-dialog-title
+    >
       Select your ingestion method
     </h2>
-    <button mat-icon-button mat-dialog-close aria-label="Close"
-      class="ingestor-close-button">
+    <button
+      mat-icon-button
+      mat-dialog-close
+      aria-label="Close"
+      class="ingestor-close-button"
+    >
       <mat-icon>close</mat-icon>
     </button>
   </div>
 
   <div class="ingestor-stepper-header">
-    <ingestor-dialog-stepper 
-      [activeStep]="0"
-    ></ingestor-dialog-stepper>
+    <ingestor-dialog-stepper [activeStep]="0"></ingestor-dialog-stepper>
   </div>
 </div>
 
 <mat-dialog-content class="mat-typography" disableClose="true">
   <div *ngIf="createNewTransferData.editorMode === 'CREATION'">
+    <mat-card>
+      <mat-card-header
+        class="scicat-header"
+        (click)="toggleCardContent('scicat')"
+      >
+        <div mat-card-avatar class="section-icon">
+          <mat-icon> info </mat-icon>
+        </div>
+        SciCat Information
+        <span class="spacer"></span>
+        <mat-icon
+          [matTooltip]="isSciCatHeaderOk ? 'Your input is correct.' : scicatHeaderErrors"
+          [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'"
+          >{{ isSciCatHeaderOk ? 'check_circle_outline' :
+          'error_outline'}}</mat-icon
+        >
+        <mat-icon class="toggle-icon"
+          >{{ isCardContentVisible.scicat ? 'expand_less' : 'expand_more'
+          }}</mat-icon
+        >
+      </mat-card-header>
+      <mat-card-content *ngIf="isCardContentVisible.scicat">
+        <app-metadata-editor
+          #scicatHeaderEditor
+          *ngIf="!updateEditorFromThirdParty"
+          [schema]="scicatHeaderSchema"
+          [renderView]="activeRenderView"
+          [data]="createNewTransferData.scicatHeader"
+          (dataChange)="onDataChangeUserScicatHeader($event)"
+          (errors)="scicatHeaderErrorsHandler($event)"
+        ></app-metadata-editor>
+      </mat-card-content>
+    </mat-card>
 
-
-  <mat-card>
-    <mat-card-header class="scicat-header"
-      (click)="toggleCardContent('scicat')">
-      <div mat-card-avatar class="section-icon">
-        <mat-icon> info </mat-icon>
-      </div>
-      SciCat Information
-      <span class="spacer"></span>
-      <mat-icon
-        [matTooltip]="isSciCatHeaderOk ? 'Your input is correct.' : scicatHeaderErrors"
-        [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'">{{
-        isSciCatHeaderOk ? 'check_circle_outline' :
-        'error_outline'}}</mat-icon>
-      <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ?
-        'expand_less' : 'expand_more' }}</mat-icon>
-    </mat-card-header>
-    <mat-card-content *ngIf="isCardContentVisible.scicat">
-      <app-metadata-editor #scicatHeaderEditor
-        *ngIf="!updateEditorFromThirdParty" [schema]="scicatHeaderSchema"
-        [renderView]="activeRenderView"
-        [data]="createNewTransferData.scicatHeader"
-        (dataChange)="onDataChangeUserScicatHeader($event)"
-        (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
-    </mat-card-content>
-  </mat-card>
-
-
-    
     <mat-card class="ingestor-card">
-    <mat-card-header>
-      <mat-card-title>Scientific Metadata Schema</mat-card-title>
-    </mat-card-header>
-    <mat-card-content class="ingestor-vertical-layout">
-    <div class="ingestor-upload-section">
-      <label for="schemaUrl">
-        You can provide a schema for your scientific metadata. We only accept schemas in json format.
-      </label>
-      <mat-form-field class="form-full-width">
-        <input matInput 
-              id="schemaUrl" 
-              placeholder="Paste schema URL here" 
+      <mat-card-header>
+        <mat-card-title>Scientific Metadata Schema</mat-card-title>
+      </mat-card-header>
+      <mat-card-content class="ingestor-vertical-layout">
+        <div class="ingestor-upload-section">
+          <label for="schemaUrl">
+            You can provide a schema for your scientific metadata. We only
+            accept schemas in json format.
+          </label>
+          <mat-form-field class="form-full-width">
+            <input
+              matInput
+              id="schemaUrl"
+              placeholder="Paste schema URL here"
               [ngModel]="createNewTransferData.schemaUrl"
-              (ngModelChange)="onSchemaUrlChange($event)" />
-        <button mat-raised-button 
-                class="block-button" 
-                color="primary"
-                (click)="onUploadSchema()">Validate</button>
-      </mat-form-field>
-      <p *ngIf="this.createNewTransferData.selectedSchemaFileContent">
-        Loaded schema is valid!
-      </p>
-    </div>
-  </mat-card-content>
-</mat-card>
+              (ngModelChange)="onSchemaUrlChange($event)"
+            />
+            <button
+              mat-raised-button
+              class="block-button"
+              color="primary"
+              (click)="onUploadSchema()"
+            >
+              Validate
+            </button>
+          </mat-form-field>
+          <p *ngIf="this.createNewTransferData.selectedSchemaFileContent">
+            Loaded schema is valid!
+          </p>
+        </div>
+      </mat-card-content>
+    </mat-card>
   </div>
 
   <div
-    *ngIf="createNewTransferData.editorMode === 'INGESTION' || createNewTransferData.editorMode === 'EDITOR'">
+    *ngIf="createNewTransferData.editorMode === 'INGESTION' || createNewTransferData.editorMode === 'EDITOR'"
+  >
     <mat-card class="ingestor-card">
       <mat-card-header class="ingestor-mixed-header">
         <mat-card-title>Select Options</mat-card-title>
       </mat-card-header>
       <mat-card-content class="ingestor-vertical-layout">
-        <p>Please select the dataset to be uploaded and the appropriate metadata
-          extractor method.</p>
+        <p>
+          Please select the dataset to be uploaded and the appropriate metadata
+          extractor method.
+        </p>
 
         <div *ngIf="createNewTransferData.editorMode === 'INGESTION'">
           <mat-form-field class="form-full-width">
             <mat-label>File Path</mat-label>
-            <input matInput [(ngModel)]="createNewTransferData.selectedPath"
-              (click)="onClickOpenFileBrowser()" readonly>
+            <input
+              matInput
+              [(ngModel)]="createNewTransferData.selectedPath"
+              (click)="onClickOpenFileBrowser()"
+              readonly
+            />
             <!-- [matAutocomplete]="auto" -->
-            <button mat-icon-button matSuffix
-              (click)="onClickOpenFileBrowser()">
+            <button
+              mat-icon-button
+              matSuffix
+              (click)="onClickOpenFileBrowser()"
+            >
               <mat-icon>folder</mat-icon>
             </button>
           </mat-form-field>
@@ -105,38 +134,58 @@ <h2 *ngIf="createNewTransferData.editorMode !== 'CREATION'" mat-dialog-title>
 
         <div *ngIf="extractionMethods !== null">
           <mat-form-field class="form-full-width">
-            <mat-label
-              *ngIf="createNewTransferData.editorMode === 'INGESTION'">Extraction
-              Method</mat-label>
-            <mat-label
-              *ngIf="createNewTransferData.editorMode === 'EDITOR'">Editor
-              schema</mat-label>
+            <mat-label *ngIf="createNewTransferData.editorMode === 'INGESTION'"
+              >Extraction Method</mat-label
+            >
+            <mat-label *ngIf="createNewTransferData.editorMode === 'EDITOR'"
+              >Editor schema</mat-label
+            >
             <mat-select [(ngModel)]="selectedMethod">
-              <mat-option *ngFor="let method of extractionMethods.methods"
-                [value]="method">
+              <mat-option
+                *ngFor="let method of extractionMethods.methods"
+                [value]="method"
+              >
                 {{ method.name }}
               </mat-option>
             </mat-select>
           </mat-form-field>
-          <mat-error *ngIf="extractionMethodsError">{{ extractionMethodsError
-            }}</mat-error>
+          <mat-error *ngIf="extractionMethodsError"
+            >{{ extractionMethodsError }}</mat-error
+          >
 
-          <mat-paginator *ngIf="extractionMethods.total > dropdownPageSize"
-            [length]="extractionMethods.total" [pageSize]="dropdownPageSize"
-            aria-label="Select page" [hidePageSize]="true"
-            [showFirstLastButtons]="false" [pageIndex]="extractionMethodsPage"
-            (page)="onExtractorMethodsPageChange($event)">
+          <mat-paginator
+            *ngIf="extractionMethods.total > dropdownPageSize"
+            [length]="extractionMethods.total"
+            [pageSize]="dropdownPageSize"
+            aria-label="Select page"
+            [hidePageSize]="true"
+            [showFirstLastButtons]="false"
+            [pageIndex]="extractionMethodsPage"
+            (page)="onExtractorMethodsPageChange($event)"
+          >
           </mat-paginator>
         </div>
       </mat-card-content>
     </mat-card>
   </div>
-
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button *ngIf="extractionMethodsError" mat-button color="warn"
-    (click)="onClickRetryRequests()">Retry</button>
+  <button
+    *ngIf="extractionMethodsError"
+    mat-button
+    color="warn"
+    (click)="onClickRetryRequests()"
+  >
+    Retry
+  </button>
   <button mat-button mat-dialog-close>Cancel</button>
-  <button mat-button color="primary" cdkFocusInitial
-    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
-</mat-dialog-actions>
\ No newline at end of file
+  <button
+    mat-button
+    color="primary"
+    cdkFocusInitial
+    [disabled]="!uiNextButtonReady"
+    (click)="onClickNext()"
+  >
+    Next
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.spec.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.spec.ts
index b791960865..efd4617e8a 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.spec.ts
@@ -17,10 +17,7 @@ describe("IngestorNoRightsDialogPageComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorNoRightsDialogPageComponent],
-      imports: [
-        MatDialogModule,
-        StoreModule.forRoot({}),
-      ],
+      imports: [MatDialogModule, StoreModule.forRoot({})],
       providers: [
         provideMockStore(),
         { provide: MatDialog, useValue: mockDialog },
@@ -45,4 +42,4 @@ describe("IngestorNoRightsDialogPageComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html
index 5a8a34492c..4ab96e8915 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.html
@@ -1,10 +1,12 @@
 <div class="ingestor-dialog-header">
   <div class="ingestor-mixed-header">
-    <h2 mat-dialog-title>
-      Lost Connection
-    </h2>
-    <button mat-icon-button mat-dialog-close aria-label="Close"
-      class="ingestor-close-button">
+    <h2 mat-dialog-title>Lost Connection</h2>
+    <button
+      mat-icon-button
+      mat-dialog-close
+      aria-label="Close"
+      class="ingestor-close-button"
+    >
       <mat-icon>close</mat-icon>
     </button>
   </div>
@@ -23,11 +25,12 @@ <h2 mat-dialog-title>
       <mat-card-content class="ingestor-vertical-layout">
         <div class="confirm-message-ingestor">
           <mat-icon class="confirm-message-ingestor-icon">lock</mat-icon>
-          <p>You do not have permission to continue. </p>
-          <p>Please check your user or login status.
-          </p>
-          <i>If you have lost the connection, use the save button at the top
-            right to save the data you have entered.</i>
+          <p>You do not have permission to continue.</p>
+          <p>Please check your user or login status.</p>
+          <i
+            >If you have lost the connection, use the save button at the top
+            right to save the data you have entered.</i
+          >
           <p class="confirm-message-error">
             {{createNewTransferDataApiInformation.ingestionRequestErrorMessage}}
           </p>
@@ -35,9 +38,8 @@ <h2 mat-dialog-title>
       </mat-card-content>
     </mat-card>
   </p>
-
 </mat-dialog-content>
 
 <mat-dialog-actions align="end">
   <button mat-button cdkFocusInitial mat-dialog-close>Cancel</button>
-</mat-dialog-actions>
\ No newline at end of file
+</mat-dialog-actions>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.spec.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.spec.ts
index 9ad0f9d0de..1908e4c198 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.spec.ts
@@ -12,12 +12,8 @@ describe("IngestorUserMetadataDialogPageComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorUserMetadataDialogPageComponent],
-      imports: [
-        StoreModule.forRoot({}),
-      ],
-      providers: [
-        provideMockStore(),
-      ],
+      imports: [StoreModule.forRoot({})],
+      providers: [provideMockStore()],
     });
 
     TestBed.compileComponents();
@@ -38,4 +34,4 @@ describe("IngestorUserMetadataDialogPageComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index 8c95577cec..b7a6940e58 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -160,9 +160,9 @@ export class IngestorUserMetadataDialogPageComponent
     const result = IngestorMetadataEditorHelper.processMetadataErrors(
       errors,
       this.scicatHeaderSchema,
-      this.activeRenderView
+      this.activeRenderView,
     );
-    
+
     this.isSciCatHeaderOk = result.isValid;
     this.scicatHeaderErrors = result.errorString;
     this.validateNextButton();
@@ -173,9 +173,9 @@ export class IngestorUserMetadataDialogPageComponent
     const result = IngestorMetadataEditorHelper.processMetadataErrors(
       errors,
       this.metadataSchemaOrganizational,
-      this.activeRenderView
+      this.activeRenderView,
     );
-    
+
     this.isOrganizationalMetadataOk = result.isValid;
     this.organizationalErrors = result.errorString;
     this.validateNextButton();
@@ -186,9 +186,9 @@ export class IngestorUserMetadataDialogPageComponent
     const result = IngestorMetadataEditorHelper.processMetadataErrors(
       errors,
       this.metadataSchemaSample,
-      this.activeRenderView
+      this.activeRenderView,
     );
-    
+
     this.isSampleInformationOk = result.isValid;
     this.sampleErrors = result.errorString;
     this.validateNextButton();
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
index 240492457d..2795ba4901 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.html
@@ -1,10 +1,12 @@
 <div class="ingestor-dialog-header">
   <div class="ingestor-mixed-header">
-    <h2 mat-dialog-title>
-      Fill out user-specific metadata
-    </h2>
-    <button mat-icon-button mat-dialog-close aria-label="Close"
-      class="ingestor-close-button">
+    <h2 mat-dialog-title>Fill out user-specific metadata</h2>
+    <button
+      mat-icon-button
+      mat-dialog-close
+      aria-label="Close"
+      class="ingestor-close-button"
+    >
       <mat-icon>close</mat-icon>
     </button>
   </div>
@@ -14,10 +16,11 @@ <h2 mat-dialog-title>
   </div>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
-
   <mat-card>
-    <mat-card-header class="scicat-header"
-      (click)="toggleCardContent('scicat')">
+    <mat-card-header
+      class="scicat-header"
+      (click)="toggleCardContent('scicat')"
+    >
       <div mat-card-avatar class="section-icon">
         <mat-icon> info </mat-icon>
       </div>
@@ -25,83 +28,113 @@ <h2 mat-dialog-title>
       <span class="spacer"></span>
       <mat-icon
         [matTooltip]="isSciCatHeaderOk ? 'Your input is correct.' : scicatHeaderErrors"
-        [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'">{{
-        isSciCatHeaderOk ? 'check_circle_outline' :
-        'error_outline'}}</mat-icon>
-      <mat-icon class="toggle-icon">{{ isCardContentVisible.scicat ?
-        'expand_less' : 'expand_more' }}</mat-icon>
+        [ngClass]="isSciCatHeaderOk ? 'success-icon' : 'error-icon'"
+        >{{ isSciCatHeaderOk ? 'check_circle_outline' :
+        'error_outline'}}</mat-icon
+      >
+      <mat-icon class="toggle-icon"
+        >{{ isCardContentVisible.scicat ? 'expand_less' : 'expand_more'
+        }}</mat-icon
+      >
     </mat-card-header>
     <mat-card-content *ngIf="isCardContentVisible.scicat">
-      <app-metadata-editor #scicatHeaderEditor
-        *ngIf="!updateEditorFromThirdParty" [schema]="scicatHeaderSchema"
+      <app-metadata-editor
+        #scicatHeaderEditor
+        *ngIf="!updateEditorFromThirdParty"
+        [schema]="scicatHeaderSchema"
         [renderView]="activeRenderView"
         [data]="createNewTransferData.scicatHeader"
         (dataChange)="onDataChangeUserScicatHeader($event)"
-        (errors)="scicatHeaderErrorsHandler($event)"></app-metadata-editor>
+        (errors)="scicatHeaderErrorsHandler($event)"
+      ></app-metadata-editor>
     </mat-card-content>
   </mat-card>
 
   <mat-card>
-    <mat-card-header class="organizational-header"
-      (click)="toggleCardContent('organizational')">
+    <mat-card-header
+      class="organizational-header"
+      (click)="toggleCardContent('organizational')"
+    >
       <div mat-card-avatar class="section-icon">
         <mat-icon> person </mat-icon>
       </div>
       <mat-card-title>Organizational Information</mat-card-title>
       <mat-card-subtitle>
-        Fields in Red Are Required By The Schema. You can proceed with ingestion without filling them out.
+        Fields in Red Are Required By The Schema. You can proceed with ingestion
+        without filling them out.
       </mat-card-subtitle>
       <span class="spacer"></span>
       <mat-icon
         [matTooltip]="isOrganizationalMetadataOk ? 'Your input is correct.' : organizationalErrors"
-        [ngClass]="isOrganizationalMetadataOk ? 'success-icon' : 'error-icon'">{{
-        isOrganizationalMetadataOk ? 'check_circle_outline' :
-        'error_outline'}}</mat-icon>
-      <mat-icon class="toggle-icon">{{ isCardContentVisible.organizational ?
-        'expand_less' : 'expand_more' }}</mat-icon>
+        [ngClass]="isOrganizationalMetadataOk ? 'success-icon' : 'error-icon'"
+        >{{ isOrganizationalMetadataOk ? 'check_circle_outline' :
+        'error_outline'}}</mat-icon
+      >
+      <mat-icon class="toggle-icon"
+        >{{ isCardContentVisible.organizational ? 'expand_less' : 'expand_more'
+        }}</mat-icon
+      >
     </mat-card-header>
     <mat-card-content *ngIf="isCardContentVisible.organizational">
-      <app-metadata-editor #organizationalMetadataEditor
+      <app-metadata-editor
+        #organizationalMetadataEditor
         *ngIf="!updateEditorFromThirdParty"
-        [schema]="metadataSchemaOrganizational" [renderView]="activeRenderView"
+        [schema]="metadataSchemaOrganizational"
+        [renderView]="activeRenderView"
         [data]="createNewTransferData.userMetaData['organizational']"
         (dataChange)="onDataChangeUserMetadataOrganization($event)"
-        (errors)="organizationalErrorsHandler($event)"></app-metadata-editor>
+        (errors)="organizationalErrorsHandler($event)"
+      ></app-metadata-editor>
     </mat-card-content>
   </mat-card>
 
   <mat-card>
-    <mat-card-header class="sample-header"
-      (click)="toggleCardContent('sample')">
+    <mat-card-header
+      class="sample-header"
+      (click)="toggleCardContent('sample')"
+    >
       <div mat-card-avatar class="section-icon">
         <mat-icon> description </mat-icon>
       </div>
       <mat-card-title>Sample Information</mat-card-title>
       <mat-card-subtitle>
-        Fields in Red Are Required By The Schema. You can proceed with ingestion without filling them out.
+        Fields in Red Are Required By The Schema. You can proceed with ingestion
+        without filling them out.
       </mat-card-subtitle>
       <span class="spacer"></span>
       <mat-icon
         [matTooltip]="isSampleInformationOk ? 'Your input is correct.' : sampleErrors"
-        [ngClass]="isSampleInformationOk ? 'success-icon' : 'error-icon'">{{
-        isSampleInformationOk ? 'check_circle_outline' :
-        'error_outline'}}</mat-icon>
-      <mat-icon class="toggle-icon">{{ isCardContentVisible.sample ?
-        'expand_less' : 'expand_more' }}</mat-icon>
+        [ngClass]="isSampleInformationOk ? 'success-icon' : 'error-icon'"
+        >{{ isSampleInformationOk ? 'check_circle_outline' :
+        'error_outline'}}</mat-icon
+      >
+      <mat-icon class="toggle-icon"
+        >{{ isCardContentVisible.sample ? 'expand_less' : 'expand_more'
+        }}</mat-icon
+      >
     </mat-card-header>
     <mat-card-content *ngIf="isCardContentVisible.sample">
-      <app-metadata-editor #sampleMetadataEditor
-        *ngIf="!updateEditorFromThirdParty" [schema]="metadataSchemaSample"
+      <app-metadata-editor
+        #sampleMetadataEditor
+        *ngIf="!updateEditorFromThirdParty"
+        [schema]="metadataSchemaSample"
         [renderView]="activeRenderView"
         [data]="createNewTransferData.userMetaData['sample']"
         (dataChange)="onDataChangeUserMetadataSample($event)"
-        (errors)="sampleErrorsHandler($event)"></app-metadata-editor>
+        (errors)="sampleErrorsHandler($event)"
+      ></app-metadata-editor>
     </mat-card-content>
   </mat-card>
-
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button (click)="onClickBack()">Back</button>
-  <button mat-button color="primary" cdkFocusInitial
-    [disabled]="!uiNextButtonReady" (click)="onClickNext()">Next</button>
-</mat-dialog-actions>
\ No newline at end of file
+  <button
+    mat-button
+    color="primary"
+    cdkFocusInitial
+    [disabled]="!uiNextButtonReady"
+    (click)="onClickNext()"
+  >
+    Next
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.spec.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.spec.ts
index 310696d294..f2367493c6 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.spec.ts
@@ -1,6 +1,10 @@
 import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
 import { IngestorCreationDialogBaseComponent } from "./ingestor.creation-dialog-base.component";
-import { MatDialog, MAT_DIALOG_DATA, MatDialogModule } from "@angular/material/dialog";
+import {
+  MatDialog,
+  MAT_DIALOG_DATA,
+  MatDialogModule,
+} from "@angular/material/dialog";
 import { StoreModule } from "@ngrx/store";
 import { provideMockStore } from "@ngrx/store/testing";
 import { IngestorMetadataSSEService } from "ingestor/ingestor-page/helper/ingestor.metadata-sse-service";
@@ -29,10 +33,7 @@ describe("IngestorCreationDialogBaseComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorCreationDialogBaseComponent],
-      imports: [
-        MatDialogModule,
-        StoreModule.forRoot({}),
-      ],
+      imports: [MatDialogModule, StoreModule.forRoot({})],
       providers: [
         provideMockStore(),
         { provide: MatDialog, useValue: mockDialog },
@@ -59,4 +60,4 @@ describe("IngestorCreationDialogBaseComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
index 67489d6a41..41a075f35c 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
@@ -6,27 +6,34 @@
          ? 'CUSTOM_METADATA' 
          : 'CONFIRM_TRANSFER')
       : 'USER_METADATA'
-  )"></ingestor-new-transfer-dialog-page>
+  )"
+></ingestor-new-transfer-dialog-page>
 <ingestor-user-metadata-dialog
   *ngIf="currentDialogStep === 'USER_METADATA' && !showNoRightsDialog"
   (nextStep)="onClickNext('EXTRACTOR_METADATA')"
-  (backStep)="onClickNext('NEW_TRANSFER')"></ingestor-user-metadata-dialog>
+  (backStep)="onClickNext('NEW_TRANSFER')"
+></ingestor-user-metadata-dialog>
 
 <ingestor-extractor-metadata-dialog-page
   *ngIf="currentDialogStep === 'EXTRACTOR_METADATA' && !showNoRightsDialog"
   (nextStep)="onClickNext('CONFIRM_TRANSFER')"
-  (backStep)="onClickNext('USER_METADATA')"></ingestor-extractor-metadata-dialog-page>
+  (backStep)="onClickNext('USER_METADATA')"
+></ingestor-extractor-metadata-dialog-page>
 
 <ingestor-confirm-transfer-dialog-page
   *ngIf="currentDialogStep === 'CONFIRM_TRANSFER' && !showNoRightsDialog"
   (nextStep)="onClickStartIngestion()"
-  (backStep)="onClickNext(createNewTransferData.editorMode === 'CREATION' ? 'CUSTOM_METADATA' : 'EXTRACTOR_METADATA')"></ingestor-confirm-transfer-dialog-page>
+  (backStep)="onClickNext(createNewTransferData.editorMode === 'CREATION' ? 'CUSTOM_METADATA' : 'EXTRACTOR_METADATA')"
+></ingestor-confirm-transfer-dialog-page>
 
-<ingestor-no-rights-dialog-page *ngIf="showNoRightsDialog"
+<ingestor-no-rights-dialog-page
+  *ngIf="showNoRightsDialog"
   (nextStep)="onClickStartIngestion()"
-  (backStep)="onClickNext('EXTRACTOR_METADATA')"></ingestor-no-rights-dialog-page>
+  (backStep)="onClickNext('EXTRACTOR_METADATA')"
+></ingestor-no-rights-dialog-page>
 
 <ingestor-custom-metadata-dialog
   *ngIf="currentDialogStep === 'CUSTOM_METADATA' && !showNoRightsDialog"
   (nextStep)="onClickNext('CONFIRM_TRANSFER')"
-  (backStep)="onClickNext('NEW_TRANSFER')"></ingestor-custom-metadata-dialog>
+  (backStep)="onClickNext('NEW_TRANSFER')"
+></ingestor-custom-metadata-dialog>
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css
index 901a576d10..b0400a5743 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css
@@ -32,8 +32,8 @@
 .field-toggle {
   margin-bottom: 24px;
   display: block;
-  
+
   mat-slide-toggle {
     margin-bottom: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index 9aafa3fab0..de3336b4f8 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -1,78 +1,172 @@
 <div class="dialog-control-buttons">
-  <button *ngIf="this.createNewTransferData.editorMode !== 'CREATION'"
-    mat-button matTooltip="Save the current values."
-    [disabled]="activeStep === 0" (click)="onSave()"><mat-icon
-      class="control-button-icon">save</mat-icon></button>
-  <button *ngIf="this.createNewTransferData.editorMode !== 'CREATION'"
-    mat-button matTooltip="Upload a template." [disabled]="activeStep < 1"
-    (click)="onUpload()"><mat-icon
-      class="control-button-icon">upload</mat-icon></button>
+  <button
+    *ngIf="this.createNewTransferData.editorMode !== 'CREATION'"
+    mat-button
+    matTooltip="Save the current values."
+    [disabled]="activeStep === 0"
+    (click)="onSave()"
+  >
+    <mat-icon class="control-button-icon">save</mat-icon>
+  </button>
+  <button
+    *ngIf="this.createNewTransferData.editorMode !== 'CREATION'"
+    mat-button
+    matTooltip="Upload a template."
+    [disabled]="activeStep < 1"
+    (click)="onUpload()"
+  >
+    <mat-icon class="control-button-icon">upload</mat-icon>
+  </button>
 
   <button
-    *ngIf="this.createNewTransferData !== undefined && this.createNewTransferData.editorMode !== 'CREATION'"
-    mat-button [matMenuTriggerFor]="settingsMenu"
+    *ngIf="
+      this.createNewTransferData !== undefined &&
+      this.createNewTransferData.editorMode !== 'CREATION'
+    "
+    mat-button
+    [matMenuTriggerFor]="settingsMenu"
     matTooltip="Customize the metadata editor."
-    [disabled]="activeStep > 0"><mat-icon
-      class="control-button-icon">settings</mat-icon></button>
+    [disabled]="activeStep > 0"
+  >
+    <mat-icon class="control-button-icon">settings</mat-icon>
+  </button>
 </div>
 
 <mat-menu #settingsMenu="matMenu">
-  <button *ngIf="this.createNewTransferData !== undefined" mat-menu-item
-    (click)="onSwitchEditorMode('INGESTION')">
-    <mat-icon
-      *ngIf="this.createNewTransferData.editorMode === 'INGESTION'">check</mat-icon>Ingestion-Mode</button>
-  <button *ngIf="this.createNewTransferData !== undefined" mat-menu-item
-    (click)="onSwitchEditorMode('EDITOR')">
-    <mat-icon
-      *ngIf="this.createNewTransferData.editorMode === 'EDITOR'">check</mat-icon>Create
-    JSON-Mode</button>
+  <button
+    *ngIf="this.createNewTransferData !== undefined"
+    mat-menu-item
+    (click)="onSwitchEditorMode('INGESTION')"
+  >
+    <mat-icon *ngIf="this.createNewTransferData.editorMode === 'INGESTION'"
+      >check</mat-icon
+    >Ingestion-Mode
+  </button>
+  <button
+    *ngIf="this.createNewTransferData !== undefined"
+    mat-menu-item
+    (click)="onSwitchEditorMode('EDITOR')"
+  >
+    <mat-icon *ngIf="this.createNewTransferData.editorMode === 'EDITOR'"
+      >check</mat-icon
+    >Create JSON-Mode
+  </button>
 </mat-menu>
 
 <!-- EDITOR/INGESTION MODE (4 steps) -->
-<div class="stepper" *ngIf="activeStep >= 0 && this.createNewTransferData.editorMode !== 'CREATION'">
-  <mat-stepper [linear]="true" [selectedIndex]="activeStep" class="ingestor-stepper">
-    <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
+<div
+  class="stepper"
+  *ngIf="
+    activeStep >= 0 && this.createNewTransferData.editorMode !== 'CREATION'
+  "
+>
+  <mat-stepper
+    [linear]="true"
+    [selectedIndex]="activeStep"
+    class="ingestor-stepper"
+  >
+    <mat-step
+      [completed]="activeStep > 0"
+      [editable]="false"
+      [stepControl]="null"
+    >
       <ng-template matStepLabel>Select your ingestion method</ng-template>
     </mat-step>
-    
-    <mat-step [completed]="activeStep > 1" [editable]="false" [stepControl]="null">
+
+    <mat-step
+      [completed]="activeStep > 1"
+      [editable]="false"
+      [stepControl]="null"
+    >
       <ng-template matStepLabel>Fill out user-specific metadata</ng-template>
     </mat-step>
-    
-    <mat-step [completed]="activeStep > 2" [editable]="false" [stepControl]="null">
+
+    <mat-step
+      [completed]="activeStep > 2"
+      [editable]="false"
+      [stepControl]="null"
+    >
       <ng-template matStepLabel>Correct dataset-specific metadata</ng-template>
     </mat-step>
-    
-    <mat-step [completed]="activeStep > 3" [editable]="false" [stepControl]="null">
+
+    <mat-step
+      [completed]="activeStep > 3"
+      [editable]="false"
+      [stepControl]="null"
+    >
       <ng-template matStepLabel>Confirm inputs</ng-template>
     </mat-step>
   </mat-stepper>
 </div>
 <!-- CREATION MODE WITH SCHEMA (3 steps) -->
-<div class="stepper" *ngIf="activeStep >= 0 && this.createNewTransferData.editorMode === 'CREATION' && this.createNewTransferData.selectedSchemaFileContent !== ''">
-  <mat-stepper [linear]="true" [selectedIndex]="activeStep === 0 ? 0 : activeStep - 1" class="ingestor-stepper">
-    <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
+<div
+  class="stepper"
+  *ngIf="
+    activeStep >= 0 &&
+    this.createNewTransferData.editorMode === 'CREATION' &&
+    this.createNewTransferData.selectedSchemaFileContent !== ''
+  "
+>
+  <mat-stepper
+    [linear]="true"
+    [selectedIndex]="activeStep === 0 ? 0 : activeStep - 1"
+    class="ingestor-stepper"
+  >
+    <mat-step
+      [completed]="activeStep > 0"
+      [editable]="false"
+      [stepControl]="null"
+    >
       <ng-template matStepLabel>Fill out Dataset information</ng-template>
     </mat-step>
-    
-    <mat-step [completed]="activeStep > 2" [editable]="false" [stepControl]="null">
-      <ng-template matStepLabel>Fill out custom scientific metadata</ng-template>
+
+    <mat-step
+      [completed]="activeStep > 2"
+      [editable]="false"
+      [stepControl]="null"
+    >
+      <ng-template matStepLabel
+        >Fill out custom scientific metadata</ng-template
+      >
     </mat-step>
-    
-    <mat-step [completed]="activeStep > 3" [editable]="false" [stepControl]="null">
+
+    <mat-step
+      [completed]="activeStep > 3"
+      [editable]="false"
+      [stepControl]="null"
+    >
       <ng-template matStepLabel>Confirm inputs</ng-template>
     </mat-step>
   </mat-stepper>
 </div>
 
 <!-- CREATION MODE WITHOUT SCHEMA (2 steps) -->
-<div class="stepper" *ngIf="activeStep >= 0 && this.createNewTransferData.editorMode === 'CREATION' && this.createNewTransferData.selectedSchemaFileContent === ''">
-  <mat-stepper [linear]="true" [selectedIndex]="activeStep === 0 ? 0 : 1" class="ingestor-stepper">
-    <mat-step [completed]="activeStep > 0" [editable]="false" [stepControl]="null">
+<div
+  class="stepper"
+  *ngIf="
+    activeStep >= 0 &&
+    this.createNewTransferData.editorMode === 'CREATION' &&
+    this.createNewTransferData.selectedSchemaFileContent === ''
+  "
+>
+  <mat-stepper
+    [linear]="true"
+    [selectedIndex]="activeStep === 0 ? 0 : 1"
+    class="ingestor-stepper"
+  >
+    <mat-step
+      [completed]="activeStep > 0"
+      [editable]="false"
+      [stepControl]="null"
+    >
       <ng-template matStepLabel>Fill out Dataset information</ng-template>
     </mat-step>
-    
-    <mat-step [completed]="activeStep > 3" [editable]="false" [stepControl]="null">
+
+    <mat-step
+      [completed]="activeStep > 3"
+      [editable]="false"
+      [stepControl]="null"
+    >
       <ng-template matStepLabel>Confirm inputs</ng-template>
     </mat-step>
   </mat-stepper>
@@ -80,10 +174,13 @@
 
 <div class="field-toggle">
   <mat-slide-toggle
-    *ngIf="this.createNewTransferData !== undefined && activeRenderView !== null"
+    *ngIf="
+      this.createNewTransferData !== undefined && activeRenderView !== null
+    "
     [checked]="activeRenderView === 'requiredOnly'"
     (change)="onChangeViewMode()"
-    color="primary">
-    {{ activeRenderView === 'requiredOnly' ? 'Required Only' : 'All Fields' }}
+    color="primary"
+  >
+    {{ activeRenderView === "requiredOnly" ? "Required Only" : "All Fields" }}
   </mat-slide-toggle>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.spec.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.spec.ts
index 4bda060411..e26c385f3f 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.spec.ts
@@ -18,11 +18,7 @@ describe("IngestorDialogStepperComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorDialogStepperComponent],
-      imports: [
-        MatDialogModule,
-        MatMenuModule,
-        StoreModule.forRoot({}),
-      ],
+      imports: [MatDialogModule, MatMenuModule, StoreModule.forRoot({})],
       providers: [
         provideMockStore(),
         { provide: MatDialog, useValue: mockDialog },
@@ -47,4 +43,4 @@ describe("IngestorDialogStepperComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index 455ca040f1..f5cbc134fe 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -28,7 +28,7 @@ import { CreateDatasetDto } from "@scicatproject/scicat-sdk-ts-angular";
 export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription[] = [];
   @Input() activeStep = 0;
-  
+
   testMessageComponent = ExportTemplateHelperComponent;
 
   createNewTransferData: IngestionRequestInformation =
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.spec.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.spec.ts
index e540ab6a10..b22e7b3453 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.export-helper.component.spec.ts
@@ -1,5 +1,8 @@
 import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
-import { ExportTemplateHelperComponent, ExportOptions } from "./ingestor.export-helper.component";
+import {
+  ExportTemplateHelperComponent,
+  ExportOptions,
+} from "./ingestor.export-helper.component";
 import { MatCheckboxModule } from "@angular/material/checkbox";
 import { MatDividerModule } from "@angular/material/divider";
 import { FormsModule } from "@angular/forms";
@@ -21,14 +24,8 @@ describe("ExportTemplateHelperComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [ExportTemplateHelperComponent],
-      imports: [
-        MatCheckboxModule,
-        MatDividerModule,
-        FormsModule,
-      ],
-      providers: [
-        { provide: "data", useValue: mockData },
-      ],
+      imports: [MatCheckboxModule, MatDividerModule, FormsModule],
+      providers: [{ provide: "data", useValue: mockData }],
     });
 
     TestBed.compileComponents();
@@ -49,4 +46,4 @@ describe("ExportTemplateHelperComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
index b8c3e2e312..c72f04b7cc 100644
--- a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
+++ b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.html
@@ -1,15 +1,22 @@
 <div class="ingestor-mixed-header">
-  <h2 mat-dialog-title>
-    Ingestor Dataset Browser
-  </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close"
-    class="ingestor-close-button">
+  <h2 mat-dialog-title>Ingestor Dataset Browser</h2>
+  <button
+    mat-icon-button
+    mat-dialog-close
+    aria-label="Close"
+    class="ingestor-close-button"
+  >
     <mat-icon>close</mat-icon>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
   <div *ngIf="false" class="file-browser-view-toggle">
-    <button mat-button disabled="true" (click)="toggleView()" [matTooltip]="isListView ? 'Switch to Tree View' : 'Switch to List View'">
+    <button
+      mat-button
+      disabled="true"
+      (click)="toggleView()"
+      [matTooltip]="isListView ? 'Switch to Tree View' : 'Switch to List View'"
+    >
       <mat-icon *ngIf="isListView">account_tree</mat-icon>
       <mat-icon *ngIf="!isListView">list</mat-icon>
     </button>
@@ -18,29 +25,49 @@ <h2 mat-dialog-title>
     <mat-list class="ingestor-file-list">
       <div mat-subheader>Selected Path</div>
       <mat-list-item class="mat-elevation-z2">
-        <mat-icon matListItemIcon>{{activeNode.probablyDataset ? 'folder_special' : 'folder'}}</mat-icon>
-        <div matListItemTitle>{{activeNode.path}}</div>
+        <mat-icon matListItemIcon>{{
+          activeNode.probablyDataset ? "folder_special" : "folder"
+        }}</mat-icon>
+        <div matListItemTitle>{{ activeNode.path }}</div>
       </mat-list-item>
-      <i *ngIf="activeNode.probablyDataset" class="green-text">This node is probably a valid data set.</i>
+      <i *ngIf="activeNode.probablyDataset" class="green-text"
+        >This node is probably a valid data set.</i
+      >
       <div mat-subheader>Children</div>
 
-      <mat-paginator *ngIf="true" [length]="activeNodeChildrenTotal" [pageSize]="browseFolderPageSize" aria-label="Select page"
-        [hidePageSize]="true" [showFirstLastButtons]="false" [pageIndex]="browseFolderPage" (page)="onFileBrowserChildrenPageChange($event)">
+      <mat-paginator
+        *ngIf="true"
+        [length]="activeNodeChildrenTotal"
+        [pageSize]="browseFolderPageSize"
+        aria-label="Select page"
+        [hidePageSize]="true"
+        [showFirstLastButtons]="false"
+        [pageIndex]="browseFolderPage"
+        (page)="onFileBrowserChildrenPageChange($event)"
+      >
       </mat-paginator>
 
-      <mat-list-item *ngIf="!goBackNode.isRootNode" (click)='onLoadFolderNode(goBackNode)' 
-        class="mat-elevation-z2 mat-list-item-hover">
+      <mat-list-item
+        *ngIf="!goBackNode.isRootNode"
+        (click)="onLoadFolderNode(goBackNode)"
+        class="mat-elevation-z2 mat-list-item-hover"
+      >
         <mat-icon matListItemIcon>folder</mat-icon>
-        <div matListItemTitle>{{goBackNode.name}}</div>
-        <div matListItemLine>{{goBackNode.path}}</div>
+        <div matListItemTitle>{{ goBackNode.name }}</div>
+        <div matListItemLine>{{ goBackNode.path }}</div>
       </mat-list-item>
       <ng-container
-        *ngFor="let folder of activeNode.childrenNodes; trackBy: trackByFn">
-        <mat-list-item (click)="onLoadFolderNode(folder)"
-          class="mat-elevation-z2 mat-list-item-hover">
-          <mat-icon matListItemIcon>{{folder.probablyDataset ? 'folder_special' : 'folder'}}</mat-icon>
-          <div matListItemTitle>{{folder.name}}</div>
-          <div matListItemLine>{{folder.path}}</div>
+        *ngFor="let folder of activeNode.childrenNodes; trackBy: trackByFn"
+      >
+        <mat-list-item
+          (click)="onLoadFolderNode(folder)"
+          class="mat-elevation-z2 mat-list-item-hover"
+        >
+          <mat-icon matListItemIcon>{{
+            folder.probablyDataset ? "folder_special" : "folder"
+          }}</mat-icon>
+          <div matListItemTitle>{{ folder.name }}</div>
+          <div matListItemLine>{{ folder.path }}</div>
         </mat-list-item>
       </ng-container>
     </mat-list>
@@ -52,6 +79,13 @@ <h2 mat-dialog-title>
 
 <mat-dialog-actions align="end">
   <button mat-button mat-dialog-close>Cancel</button>
-  <button mat-button color="primary" cdkFocusInitial (click)="onSelect()"
-    [mat-dialog-close]="true">Select</button>
-</mat-dialog-actions>
\ No newline at end of file
+  <button
+    mat-button
+    color="primary"
+    cdkFocusInitial
+    (click)="onSelect()"
+    [mat-dialog-close]="true"
+  >
+    Select
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.spec.ts b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.spec.ts
index 1f1d94c7c2..07bc13ee57 100644
--- a/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component.spec.ts
@@ -1,6 +1,10 @@
 import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
 import { IngestorFileBrowserComponent } from "./ingestor.file-browser.component";
-import { MatDialog, MAT_DIALOG_DATA, MatDialogModule } from "@angular/material/dialog";
+import {
+  MatDialog,
+  MAT_DIALOG_DATA,
+  MatDialogModule,
+} from "@angular/material/dialog";
 import { StoreModule } from "@ngrx/store";
 import { provideMockStore } from "@ngrx/store/testing";
 import { NO_ERRORS_SCHEMA } from "@angular/core";
@@ -21,10 +25,7 @@ describe("IngestorFileBrowserComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorFileBrowserComponent],
-      imports: [
-        MatDialogModule,
-        StoreModule.forRoot({}),
-      ],
+      imports: [MatDialogModule, StoreModule.forRoot({})],
       providers: [
         provideMockStore(),
         { provide: MatDialog, useValue: mockDialog },
@@ -50,4 +51,4 @@ describe("IngestorFileBrowserComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts
index 1aa64c88c5..36f527f0a3 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts
@@ -1,17 +1,17 @@
 import { IngestorTransferViewDialogComponent } from "./ingestor.transfer-detail-view-dialog.component";
-import { MatCardModule} from "@angular/material/card";
+import { MatCardModule } from "@angular/material/card";
 import { MatListModule } from "@angular/material/list";
-import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
+import {
+  MatDialogModule,
+  MatDialogRef,
+  MAT_DIALOG_DATA,
+} from "@angular/material/dialog";
 import { MockActivatedRoute, MockUserApi } from "shared/MockStubs";
 import { StoreModule } from "@ngrx/store";
 import { NO_ERRORS_SCHEMA } from "@angular/core";
 import { provideMockStore } from "@ngrx/store/testing";
 import { Router, ActivatedRoute } from "@angular/router";
-import {
-  ComponentFixture,
-  TestBed,
-  waitForAsync,
-} from "@angular/core/testing";
+import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
 import { AppConfigService } from "app-config.service";
 import { UsersService } from "@scicatproject/scicat-sdk-ts-angular";
 
@@ -39,11 +39,11 @@ describe("IngestorTransferViewDialogComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorTransferViewDialogComponent],
-      imports:[
+      imports: [
         MatCardModule,
         MatListModule,
         MatDialogModule,
-        StoreModule.forRoot({})
+        StoreModule.forRoot({}),
       ],
       providers: [
         provideMockStore(),
@@ -58,7 +58,7 @@ describe("IngestorTransferViewDialogComponent", () => {
         { provide: UsersService, useClass: MockUserApi },
       ],
     });
-    
+
     TestBed.compileComponents();
   }));
 
@@ -77,4 +77,4 @@ describe("IngestorTransferViewDialogComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
index 82f031dba0..5142d5854e 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.html
@@ -1,15 +1,16 @@
 <div class="ingestor-mixed-header">
-  <h2 mat-dialog-title>
-    {{ header }}
-  </h2>
-  <button mat-icon-button mat-dialog-close aria-label="Close"
-    class="ingestor-close-button">
+  <h2 mat-dialog-title>{{ header }}</h2>
+  <button
+    mat-icon-button
+    mat-dialog-close
+    aria-label="Close"
+    class="ingestor-close-button"
+  >
     <mat-icon>close</mat-icon>
   </button>
 </div>
 <mat-dialog-content class="mat-typography" disableClose="true">
   <table mat-table [dataSource]="tableData">
-
     <!-- Property Column -->
     <ng-container matColumnDef="property">
       <th mat-header-cell *matHeaderCellDef><b>Property</b></th>
@@ -28,6 +29,7 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 
 <mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close cdkFocusInitial
-    (click)="onCancel()">Close</button>
-</mat-dialog-actions>
\ No newline at end of file
+  <button mat-button mat-dialog-close cdkFocusInitial (click)="onCancel()">
+    Close
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index e9024cddf6..65a4ea7592 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -19,7 +19,10 @@ import {
   QuantityValueLayoutRendererComponent,
   quantityValueLayoutTester,
 } from "./quantity-value-layout-renderer";
-import { SIFieldHiderRenderer, isSIFieldTester } from "./quantity-field-renderer";
+import {
+  SIFieldHiderRenderer,
+  isSIFieldTester,
+} from "./quantity-field-renderer";
 
 export const customRenderers: JsonFormsRendererRegistryEntry[] = [
   {
@@ -44,7 +47,7 @@ export const customRenderers: JsonFormsRendererRegistryEntry[] = [
     renderer: CustomObjectControlRendererComponent,
   },
   {
-    tester: isSIFieldTester, 
+    tester: isSIFieldTester,
     renderer: SIFieldHiderRenderer,
   },
 ];
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
index 24d92e4dad..34e05756bc 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component } from "@angular/core";
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+} from "@angular/core";
 import {
   JsonFormsAngularService,
   JsonFormsControlWithDetail,
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
index 1de0b65956..d52a3614a6 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
@@ -1,21 +1,18 @@
-import { Component } from '@angular/core';
-import { JsonFormsAngularService, JsonFormsControl } from '@jsonforms/angular';
-import { rankWith, scopeEndsWith, or } from '@jsonforms/core';
+import { Component } from "@angular/core";
+import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
+import { rankWith, scopeEndsWith, or } from "@jsonforms/core";
 
 export const isSIFieldTester = rankWith(
   100,
-  or(
-    scopeEndsWith('unitSI'),
-    scopeEndsWith('valueSI')
-  )
+  or(scopeEndsWith("unitSI"), scopeEndsWith("valueSI")),
 );
 
 @Component({
-  selector: 'si-field-hider',
-  template: '' // Empty template - renders nothing
+  selector: "si-field-hider",
+  template: "", // Empty template - renders nothing
 })
 export class SIFieldHiderRenderer extends JsonFormsControl {
   constructor(jsonformsService: JsonFormsAngularService) {
     super(jsonformsService);
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
index 52b2049d12..39d5f5b020 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
@@ -58,7 +58,7 @@ export interface QuantityValueLayout extends Layout {
   type: "QuantityValueLayout";
 }
 
-@Pipe({ name: "customLayoutChildrenRenderProps", standalone: false  })
+@Pipe({ name: "customLayoutChildrenRenderProps", standalone: false })
 export class CustomLayoutChildrenRenderPropsPipe implements PipeTransform {
   transform(
     uischema: Layout,
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.spec.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.spec.ts
index 79501cb58b..fcb0e9cd95 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.spec.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.spec.ts
@@ -1,20 +1,25 @@
-import { IngestorMetadataEditorHelper, convertJSONFormsErrorToString } from "./ingestor-metadata-editor-helper";
+import {
+  IngestorMetadataEditorHelper,
+  convertJSONFormsErrorToString,
+} from "./ingestor-metadata-editor-helper";
 import { JsonSchema } from "@jsonforms/core";
 
 describe("IngestorMetadataEditorHelper", () => {
-  
   describe("resolveRefs", () => {
     it("should resolve a simple $ref", () => {
       const schema = {
         definitions: {
-          name: { type: "string" }
+          name: { type: "string" },
         },
         properties: {
-          userName: { $ref: "#/definitions/name" }
-        }
+          userName: { $ref: "#/definitions/name" },
+        },
       };
 
-      const resolved = IngestorMetadataEditorHelper.resolveRefs(schema.properties.userName, schema);
+      const resolved = IngestorMetadataEditorHelper.resolveRefs(
+        schema.properties.userName,
+        schema,
+      );
       expect(resolved.type).toBe("string");
     });
 
@@ -26,7 +31,9 @@ describe("IngestorMetadataEditorHelper", () => {
 
     it("should handle null or undefined schemas", () => {
       expect(IngestorMetadataEditorHelper.resolveRefs(null, {})).toBeNull();
-      expect(IngestorMetadataEditorHelper.resolveRefs(undefined, {})).toBeUndefined();
+      expect(
+        IngestorMetadataEditorHelper.resolveRefs(undefined, {}),
+      ).toBeUndefined();
     });
   });
 
@@ -38,31 +45,51 @@ describe("IngestorMetadataEditorHelper", () => {
           type: "object",
           properties: {
             name: { type: "string" },
-            voltage: { type: "number" }
+            voltage: { type: "number" },
           },
-          required: ["name"]
-        }
+          required: ["name"],
+        },
       },
-      required: ["instrument"]
+      required: ["instrument"],
     };
 
     it("should return true for required fields", () => {
-      expect(IngestorMetadataEditorHelper.isRequiredField("/instrument", schema)).toBe(true);
-      expect(IngestorMetadataEditorHelper.isRequiredField("/instrument/name", schema)).toBe(true);
+      expect(
+        IngestorMetadataEditorHelper.isRequiredField("/instrument", schema),
+      ).toBe(true);
+      expect(
+        IngestorMetadataEditorHelper.isRequiredField(
+          "/instrument/name",
+          schema,
+        ),
+      ).toBe(true);
     });
 
     it("should return false for non-required fields", () => {
-      expect(IngestorMetadataEditorHelper.isRequiredField("/instrument/voltage", schema)).toBe(false);
+      expect(
+        IngestorMetadataEditorHelper.isRequiredField(
+          "/instrument/voltage",
+          schema,
+        ),
+      ).toBe(false);
     });
 
     it("should return false for invalid paths", () => {
-      expect(IngestorMetadataEditorHelper.isRequiredField("/nonexistent", schema)).toBe(false);
-      expect(IngestorMetadataEditorHelper.isRequiredField("", schema)).toBe(false);
+      expect(
+        IngestorMetadataEditorHelper.isRequiredField("/nonexistent", schema),
+      ).toBe(false);
+      expect(IngestorMetadataEditorHelper.isRequiredField("", schema)).toBe(
+        false,
+      );
     });
 
     it("should handle null or undefined inputs", () => {
-      expect(IngestorMetadataEditorHelper.isRequiredField(null, schema)).toBe(false);
-      expect(IngestorMetadataEditorHelper.isRequiredField("/test", null)).toBe(false);
+      expect(IngestorMetadataEditorHelper.isRequiredField(null, schema)).toBe(
+        false,
+      );
+      expect(IngestorMetadataEditorHelper.isRequiredField("/test", null)).toBe(
+        false,
+      );
     });
   });
 
@@ -71,29 +98,41 @@ describe("IngestorMetadataEditorHelper", () => {
       type: "object",
       properties: {
         name: { type: "string" },
-        age: { type: "number" }
+        age: { type: "number" },
       },
-      required: ["name"]
+      required: ["name"],
     };
 
     const errors = [
       { instancePath: "/name", message: "is required" },
-      { instancePath: "/age", message: "must be a number" }
+      { instancePath: "/age", message: "must be a number" },
     ];
 
     it("should return all errors when renderView is 'all'", () => {
-      const filtered = IngestorMetadataEditorHelper.filterErrorsForRenderView(errors, schema, "all");
+      const filtered = IngestorMetadataEditorHelper.filterErrorsForRenderView(
+        errors,
+        schema,
+        "all",
+      );
       expect(filtered.length).toBe(2);
     });
 
     it("should filter to only required field errors when renderView is 'requiredOnly'", () => {
-      const filtered = IngestorMetadataEditorHelper.filterErrorsForRenderView(errors, schema, "requiredOnly");
+      const filtered = IngestorMetadataEditorHelper.filterErrorsForRenderView(
+        errors,
+        schema,
+        "requiredOnly",
+      );
       expect(filtered.length).toBe(1);
       expect(filtered[0].instancePath).toBe("/name");
     });
 
     it("should return empty array when errors is empty", () => {
-      const filtered = IngestorMetadataEditorHelper.filterErrorsForRenderView([], schema, "requiredOnly");
+      const filtered = IngestorMetadataEditorHelper.filterErrorsForRenderView(
+        [],
+        schema,
+        "requiredOnly",
+      );
       expect(filtered.length).toBe(0);
     });
   });
@@ -102,20 +141,28 @@ describe("IngestorMetadataEditorHelper", () => {
     const schema: JsonSchema = {
       type: "object",
       properties: {
-        name: { type: "string" }
+        name: { type: "string" },
       },
-      required: ["name"]
+      required: ["name"],
     };
 
     it("should return valid when no errors", () => {
-      const result = IngestorMetadataEditorHelper.processMetadataErrors([], schema, "all");
+      const result = IngestorMetadataEditorHelper.processMetadataErrors(
+        [],
+        schema,
+        "all",
+      );
       expect(result.isValid).toBe(true);
       expect(result.errorString).toBe("");
     });
 
     it("should return invalid with error string when errors exist", () => {
       const errors = [{ instancePath: "/name", message: "is required" }];
-      const result = IngestorMetadataEditorHelper.processMetadataErrors(errors, schema, "all");
+      const result = IngestorMetadataEditorHelper.processMetadataErrors(
+        errors,
+        schema,
+        "all",
+      );
       expect(result.isValid).toBe(false);
       expect(result.errorString).toContain("is required");
     });
@@ -126,7 +173,7 @@ describe("convertJSONFormsErrorToString", () => {
   it("should convert errors to string format", () => {
     const errors = [
       { instancePath: "/name", message: "is required" },
-      { instancePath: "/age", message: "must be a number" }
+      { instancePath: "/age", message: "must be a number" },
     ];
     const result = convertJSONFormsErrorToString(errors);
     expect(result).toContain("1. @/name is required");
@@ -136,7 +183,7 @@ describe("convertJSONFormsErrorToString", () => {
   it("should skip errors with 'must NOT have additional properties' message", () => {
     const errors = [
       { message: "must NOT have additional properties" },
-      { instancePath: "/name", message: "is required" }
+      { instancePath: "/name", message: "is required" },
     ];
     const result = convertJSONFormsErrorToString(errors);
     expect(result).not.toContain("additional properties");
@@ -147,4 +194,4 @@ describe("convertJSONFormsErrorToString", () => {
     const result = convertJSONFormsErrorToString([]);
     expect(result).toBe("");
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
index fb1c4c64af..9fe41e2375 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper.ts
@@ -64,84 +64,88 @@ export class IngestorMetadataEditorHelper {
     return reducedSchema;
   }
 
-    /**
-     * Checks if a field at the given error path is marked as required in the JSON schema
-     * @param errorPath - The path to the field (e.g., "/instrument/name" or "/acquisition/voltage")
-     * @param schema - The JSON schema to check against
-     * @returns true if the field is required, false otherwise
-     */
-    static isRequiredField(errorPath: string, schema: JsonSchema): boolean {
-      if (!schema || !errorPath) {
-        return false;
-      }
-      const pathSegments = errorPath.replace(/^\//, '').split('/');
-      if (pathSegments.length === 0 || pathSegments[0] === '') {
-        return false;
-      }
-      let currentSchema = schema;
-  
-      for (let i = 0; i < pathSegments.length - 1; i++) {
-        const segment = pathSegments[i];
-        
-        if (currentSchema.properties && currentSchema.properties[segment]) {
-          currentSchema = currentSchema.properties[segment];
-        } else {
-          return false;
-        }
-      }
-  
-      const fieldName = pathSegments[pathSegments.length - 1];
-  
-      if (currentSchema.required && Array.isArray(currentSchema.required)) {
-        return currentSchema.required.includes(fieldName);
-      }
-  
-      // If no required array found, field is not required
+  /**
+   * Checks if a field at the given error path is marked as required in the JSON schema
+   * @param errorPath - The path to the field (e.g., "/instrument/name" or "/acquisition/voltage")
+   * @param schema - The JSON schema to check against
+   * @returns true if the field is required, false otherwise
+   */
+  static isRequiredField(errorPath: string, schema: JsonSchema): boolean {
+    if (!schema || !errorPath) {
+      return false;
+    }
+    const pathSegments = errorPath.replace(/^\//, "").split("/");
+    if (pathSegments.length === 0 || pathSegments[0] === "") {
       return false;
     }
-  
-  
-    /**
-     * Filters validation errors to only include those for required fields when in 'requiredOnly' render mode
-     * @param errors - Array of validation errors from JSONForms
-     * @param schema - The JSON schema to validate against
-     * @param renderView - The current render view mode
-     * @returns Filtered array of errors (only required field errors if renderView is 'requiredOnly')
-     */
-    static filterErrorsForRenderView(
-      errors: any[], 
-      schema: JsonSchema, 
-      renderView: string
-    ): any[] {
-      if (renderView !== 'requiredOnly' || !errors || errors.length === 0) {
-        return errors;
+    let currentSchema = schema;
+
+    for (let i = 0; i < pathSegments.length - 1; i++) {
+      const segment = pathSegments[i];
+
+      if (currentSchema.properties && currentSchema.properties[segment]) {
+        currentSchema = currentSchema.properties[segment];
+      } else {
+        return false;
       }
-  
-      return errors.filter(error => {
-        const errorPath = error.instancePath || error.dataPath || error.schemaPath || '';
-        return this.isRequiredField(errorPath, schema);
-      });
     }
-  
-    /**
-     * Processes validation errors for metadata forms
-     * @param errors - Array of validation errors from JSONForms
-     * @param schema - The JSON schema to validate against
-     * @param renderView - The current render view mode
-     * @returns Object containing processed validation results
-     */
-    static processMetadataErrors(
-      errors: any[], 
-      schema: JsonSchema, 
-      renderView: string
-    ): { isValid: boolean; errorString: string } {
-      const filteredErrors = this.filterErrorsForRenderView(errors, schema, renderView || 'all');
-      
-      return {
-        isValid: filteredErrors.length === 0,
-        errorString: convertJSONFormsErrorToString(filteredErrors)
-      };
+
+    const fieldName = pathSegments[pathSegments.length - 1];
+
+    if (currentSchema.required && Array.isArray(currentSchema.required)) {
+      return currentSchema.required.includes(fieldName);
     }
+
+    // If no required array found, field is not required
+    return false;
+  }
+
+  /**
+   * Filters validation errors to only include those for required fields when in 'requiredOnly' render mode
+   * @param errors - Array of validation errors from JSONForms
+   * @param schema - The JSON schema to validate against
+   * @param renderView - The current render view mode
+   * @returns Filtered array of errors (only required field errors if renderView is 'requiredOnly')
+   */
+  static filterErrorsForRenderView(
+    errors: any[],
+    schema: JsonSchema,
+    renderView: string,
+  ): any[] {
+    if (renderView !== "requiredOnly" || !errors || errors.length === 0) {
+      return errors;
+    }
+
+    return errors.filter((error) => {
+      const errorPath =
+        error.instancePath || error.dataPath || error.schemaPath || "";
+      return this.isRequiredField(errorPath, schema);
+    });
+  }
+
+  /**
+   * Processes validation errors for metadata forms
+   * @param errors - Array of validation errors from JSONForms
+   * @param schema - The JSON schema to validate against
+   * @param renderView - The current render view mode
+   * @returns Object containing processed validation results
+   */
+  static processMetadataErrors(
+    errors: any[],
+    schema: JsonSchema,
+    renderView: string,
+  ): { isValid: boolean; errorString: string } {
+    const filteredErrors = this.filterErrorsForRenderView(
+      errors,
+      schema,
+      renderView || "all",
+    );
+
+    return {
+      isValid: filteredErrors.length === 0,
+      errorString: convertJSONFormsErrorToString(filteredErrors),
+    };
+  }
 }
 
 export const convertJSONFormsErrorToString = (error: any): string => {
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
index 5874d74d42..d39912e268 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor-schema_demo.ts
@@ -1,466 +1,526 @@
 export const demo_organizational_schema = {
-  type: 'object',
+  type: "object",
   properties: {
     grants: {
-      type: 'array',
+      type: "array",
       items: {
-        type: 'object',
+        type: "object",
         properties: {
           grant_name: {
-            type: 'string',
-            description: 'name of the grant',
+            type: "string",
+            description: "name of the grant",
           },
           start_date: {
-            type: 'string',
-            format: 'date',
-            description: 'start date',
+            type: "string",
+            format: "date",
+            description: "start date",
           },
           end_date: {
-            type: 'string',
-            format: 'date',
-            description: 'end date',
+            type: "string",
+            format: "date",
+            description: "end date",
           },
           budget: {
-            type: 'number',
-            description: 'budget',
+            type: "number",
+            description: "budget",
           },
           project_id: {
-            type: 'string',
-            description: 'project id',
+            type: "string",
+            description: "project id",
           },
           country: {
-            type: 'string',
-            description: 'Country of the institution',
+            type: "string",
+            description: "Country of the institution",
           },
         },
       },
-      description: 'List of grants associated with the project',
+      description: "List of grants associated with the project",
     },
     authors: {
-      type: 'array',
+      type: "array",
       items: {
-        type: 'object',
+        type: "object",
         properties: {
           first_name: {
-            type: 'string',
-            description: 'first name',
+            type: "string",
+            description: "first name",
           },
           work_status: {
-            type: 'boolean',
-            description: 'work status',
+            type: "boolean",
+            description: "work status",
           },
           email: {
-            type: 'string',
-            description: 'email',
-            pattern: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$',
+            type: "string",
+            description: "email",
+            pattern: "^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$",
           },
           work_phone: {
-            type: 'string',
-            description: 'work phone',
+            type: "string",
+            description: "work phone",
           },
           name: {
-            type: 'string',
-            description: 'name',
+            type: "string",
+            description: "name",
           },
           name_org: {
-            type: 'string',
-            description: 'Name of the organization',
+            type: "string",
+            description: "Name of the organization",
           },
           type_org: {
-            type: 'string',
-            description: 'Type of organization, academic, commercial, governmental, etc.',
-            enum: ['Academic', 'Commercial', 'Government', 'Other'],
+            type: "string",
+            description:
+              "Type of organization, academic, commercial, governmental, etc.",
+            enum: ["Academic", "Commercial", "Government", "Other"],
           },
           country: {
-            type: 'string',
-            description: 'Country of the institution',
+            type: "string",
+            description: "Country of the institution",
           },
           role: {
-            type: 'string',
-            description: 'Role of the author, for example principal investigator',
+            type: "string",
+            description:
+              "Role of the author, for example principal investigator",
           },
           orcid: {
-            type: 'string',
-            description: 'ORCID of the author, a type of unique identifier',
+            type: "string",
+            description: "ORCID of the author, a type of unique identifier",
           },
         },
       },
-      description: 'List of authors associated with the project',
+      description: "List of authors associated with the project",
     },
     funder: {
-      type: 'array',
+      type: "array",
       items: {
-        type: 'object',
+        type: "object",
         properties: {
           funder_name: {
-            type: 'string',
-            description: 'funding organization/person.',
+            type: "string",
+            description: "funding organization/person.",
           },
           type_org: {
-            type: 'string',
-            description: 'Type of organization, academic, commercial, governmental, etc.',
-            enum: ['Academic', 'Commercial', 'Government', 'Other'],
+            type: "string",
+            description:
+              "Type of organization, academic, commercial, governmental, etc.",
+            enum: ["Academic", "Commercial", "Government", "Other"],
           },
           country: {
-            type: 'string',
-            description: 'Country of the institution',
+            type: "string",
+            description: "Country of the institution",
           },
         },
       },
-      description: 'Description of the project funding',
+      description: "Description of the project funding",
     },
   },
-  required: ['authors', 'funder'],
+  required: ["authors", "funder"],
 };
 
 export const demo_acquisition_schema = {
-  type: 'object',
+  type: "object",
   properties: {
     nominal_defocus: {
-      type: 'object',
-      description: 'Target defocus set, min and max values in µm.',
+      type: "object",
+      description: "Target defocus set, min and max values in µm.",
     },
     calibrated_defocus: {
-      type: 'object',
-      description: 'Machine estimated defocus, min and max values in µm. Has a tendency to be off.',
+      type: "object",
+      description:
+        "Machine estimated defocus, min and max values in µm. Has a tendency to be off.",
     },
     nominal_magnification: {
-      type: 'integer',
-      description: 'Magnification level as indicated by the instrument, no unit',
+      type: "integer",
+      description:
+        "Magnification level as indicated by the instrument, no unit",
     },
     calibrated_magnification: {
-      type: 'integer',
-      description: 'Calculated magnification, no unit',
+      type: "integer",
+      description: "Calculated magnification, no unit",
     },
     holder: {
-      type: 'string',
-      description: 'Speciman holder model',
+      type: "string",
+      description: "Speciman holder model",
     },
     holder_cryogen: {
-      type: 'string',
-      description: 'Type of cryogen used in the holder - if the holder is cooled seperately',
+      type: "string",
+      description:
+        "Type of cryogen used in the holder - if the holder is cooled seperately",
     },
     temperature_range: {
-      type: 'object',
-      description: 'Temperature during data collection, in K with min and max values.',
+      type: "object",
+      description:
+        "Temperature during data collection, in K with min and max values.",
     },
     microscope_software: {
-      type: 'string',
-      description: 'Software used for instrument control',
+      type: "string",
+      description: "Software used for instrument control",
     },
     detector: {
-      type: 'string',
-      description: 'Make and model of the detector used',
+      type: "string",
+      description: "Make and model of the detector used",
     },
     detector_mode: {
-      type: 'string',
-      description: 'Operating mode of the detector',
+      type: "string",
+      description: "Operating mode of the detector",
     },
     dose_per_movie: {
-      type: 'object',
-      description: 'Average dose per image/movie/tilt - given in electrons per square Angstrom',
+      type: "object",
+      description:
+        "Average dose per image/movie/tilt - given in electrons per square Angstrom",
     },
     energy_filter: {
-      type: 'object',
-      description: 'Whether an energy filter was used and its specifics.',
+      type: "object",
+      description: "Whether an energy filter was used and its specifics.",
     },
     image_size: {
-      type: 'object',
-      description: 'The size of the image in pixels, height and width given.',
+      type: "object",
+      description: "The size of the image in pixels, height and width given.",
     },
     date_time: {
-      type: 'string',
-      description: 'Time and date of the data acquisition',
+      type: "string",
+      description: "Time and date of the data acquisition",
     },
     exposure_time: {
-      type: 'object',
-      description: 'Time of data acquisition per movie/tilt - in s',
+      type: "object",
+      description: "Time of data acquisition per movie/tilt - in s",
     },
     cryogen: {
-      type: 'string',
-      description: 'Cryogen used in cooling the instrument and sample, usually nitrogen',
+      type: "string",
+      description:
+        "Cryogen used in cooling the instrument and sample, usually nitrogen",
     },
     frames_per_movie: {
-      type: 'integer',
-      description: 'Number of frames that on average constitute a full movie, can be a bit hard to define for some detectors',
+      type: "integer",
+      description:
+        "Number of frames that on average constitute a full movie, can be a bit hard to define for some detectors",
     },
     grids_imaged: {
-      type: 'integer',
-      description: 'Number of grids imaged for this project - here with qualifier during this data acquisition',
+      type: "integer",
+      description:
+        "Number of grids imaged for this project - here with qualifier during this data acquisition",
     },
     images_generated: {
-      type: 'integer',
-      description: 'Number of images generated total for this data collection - might need a qualifier for tilt series to determine whether full series or individual tilts are counted',
+      type: "integer",
+      description:
+        "Number of images generated total for this data collection - might need a qualifier for tilt series to determine whether full series or individual tilts are counted",
     },
     binning_camera: {
-      type: 'number',
-      description: 'Level of binning on the images applied during data collection',
+      type: "number",
+      description:
+        "Level of binning on the images applied during data collection",
     },
     pixel_size: {
-      type: 'object',
-      description: 'Pixel size, in Angstrom',
+      type: "object",
+      description: "Pixel size, in Angstrom",
     },
     specialist_optics: {
-      type: 'object',
-      description: 'Any type of special optics, such as a phaseplate',
+      type: "object",
+      description: "Any type of special optics, such as a phaseplate",
     },
     beamshift: {
-      type: 'object',
-      description: 'Movement of the beam above the sample for data collection purposes that does not require movement of the stage. Given in mrad.',
+      type: "object",
+      description:
+        "Movement of the beam above the sample for data collection purposes that does not require movement of the stage. Given in mrad.",
     },
     beamtilt: {
-      type: 'object',
-      description: 'Another way to move the beam above the sample for data collection purposes that does not require movement of the stage. Given in mrad.',
+      type: "object",
+      description:
+        "Another way to move the beam above the sample for data collection purposes that does not require movement of the stage. Given in mrad.",
     },
     imageshift: {
-      type: 'object',
-      description: 'Movement of the Beam below the image in order to shift the image on the detector. Given in µm.',
+      type: "object",
+      description:
+        "Movement of the Beam below the image in order to shift the image on the detector. Given in µm.",
     },
     beamtiltgroups: {
-      type: 'integer',
-      description: 'Number of Beamtilt groups present in this dataset - for optimized processing split dataset into groups of same tilt angle. Despite its name Beamshift is often used to achieve this result.',
+      type: "integer",
+      description:
+        "Number of Beamtilt groups present in this dataset - for optimized processing split dataset into groups of same tilt angle. Despite its name Beamshift is often used to achieve this result.",
     },
     gainref_flip_rotate: {
-      type: 'string',
-      description: 'Whether and how you have to flip or rotate the gainref in order to align with your acquired images',
+      type: "string",
+      description:
+        "Whether and how you have to flip or rotate the gainref in order to align with your acquired images",
     },
   },
-  required: ['detector', 'dose_per_movie', 'date_time', 'binning_camera', 'pixel_size'],
+  required: [
+    "detector",
+    "dose_per_movie",
+    "date_time",
+    "binning_camera",
+    "pixel_size",
+  ],
 };
 
 export const demo_sample_schema = {
-  type: 'object',
+  type: "object",
   properties: {
     overall_molecule: {
-      type: 'object',
-      description: 'Description of the overall molecule',
+      type: "object",
+      description: "Description of the overall molecule",
       properties: {
         molecular_type: {
-          type: 'string',
-          description: 'Description of the overall molecular type, i.e., a complex',
+          type: "string",
+          description:
+            "Description of the overall molecular type, i.e., a complex",
         },
         name_sample: {
-          type: 'string',
-          description: 'Name of the full sample',
+          type: "string",
+          description: "Name of the full sample",
         },
         source: {
-          type: 'string',
-          description: 'Where the sample was taken from, i.e., natural host, recombinantly expressed, etc.',
+          type: "string",
+          description:
+            "Where the sample was taken from, i.e., natural host, recombinantly expressed, etc.",
         },
         molecular_weight: {
-          type: 'object',
-          description: 'Molecular weight in Da',
+          type: "object",
+          description: "Molecular weight in Da",
         },
         assembly: {
-          type: 'string',
-          description: 'What type of higher order structure your sample forms - if any.',
-          enum: ['FILAMENT', 'HELICAL ARRAY', 'PARTICLE'],
+          type: "string",
+          description:
+            "What type of higher order structure your sample forms - if any.",
+          enum: ["FILAMENT", "HELICAL ARRAY", "PARTICLE"],
         },
       },
-      required: ['molecular_type', 'name_sample', 'source', 'assembly'],
+      required: ["molecular_type", "name_sample", "source", "assembly"],
     },
     molecule: {
-      type: 'array',
+      type: "array",
       items: {
-        type: 'object',
+        type: "object",
         properties: {
           name_mol: {
-            type: 'string',
-            description: 'Name of an individual molecule (often protein) in the sample',
+            type: "string",
+            description:
+              "Name of an individual molecule (often protein) in the sample",
           },
           molecular_type: {
-            type: 'string',
-            description: 'Description of the overall molecular type, i.e., a complex',
+            type: "string",
+            description:
+              "Description of the overall molecular type, i.e., a complex",
           },
           molecular_class: {
-            type: 'string',
-            description: 'Class of the molecule',
-            enum: ['Antibiotic', 'Carbohydrate', 'Chimera', 'None of these'],
+            type: "string",
+            description: "Class of the molecule",
+            enum: ["Antibiotic", "Carbohydrate", "Chimera", "None of these"],
           },
           sequence: {
-            type: 'string',
-            description: 'Full sequence of the sample as in the data, i.e., cleaved tags should also be removed from sequence here',
+            type: "string",
+            description:
+              "Full sequence of the sample as in the data, i.e., cleaved tags should also be removed from sequence here",
           },
           natural_source: {
-            type: 'string',
-            description: 'Scientific name of the natural host organism',
+            type: "string",
+            description: "Scientific name of the natural host organism",
           },
           taxonomy_id_source: {
-            type: 'string',
-            description: 'Taxonomy ID of the natural source organism',
+            type: "string",
+            description: "Taxonomy ID of the natural source organism",
           },
           expression_system: {
-            type: 'string',
-            description: 'Scientific name of the organism used to produce the molecule of interest',
+            type: "string",
+            description:
+              "Scientific name of the organism used to produce the molecule of interest",
           },
           taxonomy_id_expression: {
-            type: 'string',
-            description: 'Taxonomy ID of the expression system organism',
+            type: "string",
+            description: "Taxonomy ID of the expression system organism",
           },
           gene_name: {
-            type: 'string',
-            description: 'Name of the gene of interest',
+            type: "string",
+            description: "Name of the gene of interest",
           },
         },
       },
-      required: ['name_mol', 'molecular_type', 'molecular_class', 'sequence', 'natural_source', 'taxonomy_id_source', 'expression_system', 'taxonomy_id_expression'],
+      required: [
+        "name_mol",
+        "molecular_type",
+        "molecular_class",
+        "sequence",
+        "natural_source",
+        "taxonomy_id_source",
+        "expression_system",
+        "taxonomy_id_expression",
+      ],
     },
     ligands: {
-      type: 'array',
+      type: "array",
       items: {
-        type: 'object',
+        type: "object",
         properties: {
           present: {
-            type: 'boolean',
-            description: 'Whether the model contains any ligands',
+            type: "boolean",
+            description: "Whether the model contains any ligands",
           },
           smiles: {
-            type: 'string',
-            description: 'Provide a valid SMILES string of your ligand',
+            type: "string",
+            description: "Provide a valid SMILES string of your ligand",
           },
           reference: {
-            type: 'string',
-            description: 'Link to a reference of your ligand, i.e., CCD, PubChem, etc.',
+            type: "string",
+            description:
+              "Link to a reference of your ligand, i.e., CCD, PubChem, etc.",
           },
         },
       },
-      description: 'List of ligands associated with the sample',
+      description: "List of ligands associated with the sample",
     },
     specimen: {
-      type: 'object',
-      description: 'Description of the specimen',
+      type: "object",
+      description: "Description of the specimen",
       properties: {
         buffer: {
-          type: 'string',
-          description: 'Name/composition of the (chemical) sample buffer during grid preparation',
+          type: "string",
+          description:
+            "Name/composition of the (chemical) sample buffer during grid preparation",
         },
         concentration: {
-          type: 'object',
-          description: 'Concentration of the (supra)molecule in the sample, in mg/ml',
+          type: "object",
+          description:
+            "Concentration of the (supra)molecule in the sample, in mg/ml",
         },
         ph: {
-          type: 'number',
-          description: 'pH of the sample buffer',
+          type: "number",
+          description: "pH of the sample buffer",
         },
         vitrification: {
-          type: 'boolean',
-          description: 'Whether the sample was vitrified',
+          type: "boolean",
+          description: "Whether the sample was vitrified",
         },
         vitrification_cryogen: {
-          type: 'string',
-          description: 'Which cryogen was used for vitrification',
+          type: "string",
+          description: "Which cryogen was used for vitrification",
         },
         humidity: {
-          type: 'object',
-          description: 'Environmental humidity just before vitrification, in %',
+          type: "object",
+          description: "Environmental humidity just before vitrification, in %",
         },
         temperature: {
-          type: 'object',
-          description: 'Environmental temperature just before vitrification, in K',
+          type: "object",
+          description:
+            "Environmental temperature just before vitrification, in K",
           minimum: 0.0,
         },
         staining: {
-          type: 'boolean',
-          description: 'Whether the sample was stained',
+          type: "boolean",
+          description: "Whether the sample was stained",
         },
         embedding: {
-          type: 'boolean',
-          description: 'Whether the sample was embedded',
+          type: "boolean",
+          description: "Whether the sample was embedded",
         },
         shadowing: {
-          type: 'boolean',
-          description: 'Whether the sample was shadowed',
+          type: "boolean",
+          description: "Whether the sample was shadowed",
         },
       },
-      required: ['ph', 'vitrification', 'vitrification_cryogen', 'staining', 'embedding', 'shadowing'],
+      required: [
+        "ph",
+        "vitrification",
+        "vitrification_cryogen",
+        "staining",
+        "embedding",
+        "shadowing",
+      ],
     },
     grid: {
-      type: 'object',
-      description: 'Description of the grid used',
+      type: "object",
+      description: "Description of the grid used",
       properties: {
         manufacturer: {
-          type: 'string',
-          description: 'Grid manufacturer',
+          type: "string",
+          description: "Grid manufacturer",
         },
         material: {
-          type: 'string',
-          description: 'Material out of which the grid is made',
+          type: "string",
+          description: "Material out of which the grid is made",
         },
         mesh: {
-          type: 'number',
-          description: 'Grid mesh in lines per inch',
+          type: "number",
+          description: "Grid mesh in lines per inch",
         },
         film_support: {
-          type: 'boolean',
-          description: 'Whether a support film was used',
+          type: "boolean",
+          description: "Whether a support film was used",
         },
         film_material: {
-          type: 'string',
-          description: 'Type of material the support film is made of',
+          type: "string",
+          description: "Type of material the support film is made of",
         },
         film_topology: {
-          type: 'string',
-          description: 'Topology of the support film',
+          type: "string",
+          description: "Topology of the support film",
         },
         film_thickness: {
-          type: 'string',
-          description: 'Thickness of the support film',
+          type: "string",
+          description: "Thickness of the support film",
         },
         pretreatment_type: {
-          type: 'string',
-          description: 'Type of pretreatment of the grid, i.e., glow discharge',
+          type: "string",
+          description: "Type of pretreatment of the grid, i.e., glow discharge",
         },
         pretreatment_time: {
-          type: 'object',
-          description: 'Length of time of the pretreatment in s',
+          type: "object",
+          description: "Length of time of the pretreatment in s",
         },
         pretreatment_pressure: {
-          type: 'object',
-          description: 'Pressure of the chamber during pretreatment, in Pa',
+          type: "object",
+          description: "Pressure of the chamber during pretreatment, in Pa",
         },
         pretreatment_atmosphere: {
-          type: 'string',
-          description: 'Atmospheric conditions in the chamber during pretreatment, i.e., addition of specific gases, etc.',
+          type: "string",
+          description:
+            "Atmospheric conditions in the chamber during pretreatment, i.e., addition of specific gases, etc.",
         },
       },
     },
   },
-  required: ['overall_molecule', 'molecule', 'specimen', 'grid'],
+  required: ["overall_molecule", "molecule", "specimen", "grid"],
 };
 
-export const demo_instrument_schema = { 
-  type: 'object',
+export const demo_instrument_schema = {
+  type: "object",
   properties: {
     microscope: {
-      type: 'string',
-      description: 'Name/Type of the Microscope',
+      type: "string",
+      description: "Name/Type of the Microscope",
     },
     illumination: {
-      type: 'string',
-      description: 'Mode of illumination used during data collection',
+      type: "string",
+      description: "Mode of illumination used during data collection",
     },
     imaging: {
-      type: 'string',
-      description: 'Mode of imaging used during data collection',
+      type: "string",
+      description: "Mode of imaging used during data collection",
     },
     electron_source: {
-      type: 'string',
-      description: 'Type of electron source used in the microscope, such as FEG',
+      type: "string",
+      description:
+        "Type of electron source used in the microscope, such as FEG",
     },
     acceleration_voltage: {
-      type: 'object',
-      description: 'Voltage used for the electron acceleration, in kV',
+      type: "object",
+      description: "Voltage used for the electron acceleration, in kV",
     },
     c2_aperture: {
-      type: 'object',
-      description: 'C2 aperture size used in data acquisition, in µm',
+      type: "object",
+      description: "C2 aperture size used in data acquisition, in µm",
     },
     cs: {
-      type: 'object',
-      description: 'Spherical aberration of the instrument, in mm',
+      type: "object",
+      description: "Spherical aberration of the instrument, in mm",
     },
   },
-  required: ['microscope', 'illumination', 'imaging', 'electron_source', 'acceleration_voltage', 'cs'],
+  required: [
+    "microscope",
+    "illumination",
+    "imaging",
+    "electron_source",
+    "acceleration_voltage",
+    "cs",
+  ],
 };
 
 export const demo_scicatheader_schema = {
@@ -475,9 +535,19 @@ export const demo_scicatheader_schema = {
     license: { type: "string" },
     keywords: {
       type: "array",
-      items: { type: "string" }
+      items: { type: "string" },
     },
-    scientificMetadata: { type: "string" }
+    scientificMetadata: { type: "string" },
   },
-  required: ["datasetName", "description", "creationLocation", "dataFormat", "ownerGroup", "type", "license", "keywords", "scientificMetadata"]
-}
\ No newline at end of file
+  required: [
+    "datasetName",
+    "description",
+    "creationLocation",
+    "dataFormat",
+    "ownerGroup",
+    "type",
+    "license",
+    "keywords",
+    "scientificMetadata",
+  ],
+};
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
index 2e2b11f4ef..690d60cbf7 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.html
@@ -1,4 +1,9 @@
 <div class="ingestor-metadata-editor">
-  <textarea class="ingestor-metadata-editor" matInput placeholder="Edit Metadata" rows="10"
-    [(ngModel)]="metadata"></textarea>
-</div>
\ No newline at end of file
+  <textarea
+    class="ingestor-metadata-editor"
+    matInput
+    placeholder="Edit Metadata"
+    rows="10"
+    [(ngModel)]="metadata"
+  ></textarea>
+</div>
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
index bba36ff4ff..3d0b7f61da 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -1,6 +1,11 @@
 .ingestor-metadata-editor {
   width: 100%;
-  font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family:
+    "Inter",
+    -apple-system,
+    BlinkMacSystemFont,
+    "Segoe UI",
+    sans-serif;
 }
 
 .spacer {
@@ -14,9 +19,13 @@ mat-card {
     padding: 24px;
     font-weight: 700;
     font-size: 1.2em;
-    background: linear-gradient(135deg, rgba(255,255,255,0.1), rgba(255,255,255,0.05));
+    background: linear-gradient(
+      135deg,
+      rgba(255, 255, 255, 0.1),
+      rgba(255, 255, 255, 0.05)
+    );
     backdrop-filter: blur(10px);
-    border: 1px solid rgba(255,255,255,0.18);
+    border: 1px solid rgba(255, 255, 255, 0.18);
     border-radius: 16px 16px 0 0;
     color: #1a1a1a;
     letter-spacing: -0.02em;
@@ -30,18 +39,18 @@ mat-card {
   background: linear-gradient(145deg, #ffffff, #f8fafc);
   border-radius: 20px;
   border: 1px solid rgba(226, 232, 240, 0.8);
-  box-shadow: 
+  box-shadow:
     0 1px 3px rgba(0, 0, 0, 0.05),
     0 10px 30px rgba(0, 0, 0, 0.02);
   transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  
+
   &:hover {
     transform: translateY(-2px);
-    box-shadow: 
+    box-shadow:
       0 4px 12px rgba(0, 0, 0, 0.08),
       0 20px 40px rgba(0, 0, 0, 0.04);
   }
-  
+
   &:last-child {
     margin-bottom: 0;
   }
@@ -60,7 +69,7 @@ mat-card {
   border-bottom: 2px solid transparent;
   border-image: linear-gradient(90deg, #667eea, #764ba2) 1;
   letter-spacing: -0.03em;
-  
+
   &.major-section {
     font-size: 1.5em;
     background: linear-gradient(135deg, #6366f1 0%, #8b5cf6 50%, #d946ef 100%);
@@ -81,9 +90,9 @@ mat-card {
   border: 1px solid rgba(255, 255, 255, 0.2);
   box-shadow: 0 8px 32px rgba(0, 0, 0, 0.04);
   position: relative;
-  
+
   &::before {
-    content: '';
+    content: "";
     position: absolute;
     top: 0;
     left: 0;
@@ -92,7 +101,7 @@ mat-card {
     background: linear-gradient(90deg, #6366f1, #8b5cf6, #d946ef);
     border-radius: 16px 16px 0 0;
   }
-  
+
   &.related-fields {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
@@ -104,29 +113,29 @@ mat-card {
 // Ultra-modern form controls
 .jsonforms-control {
   margin-bottom: 24px;
-  
+
   .mat-mdc-form-field {
     width: 100%;
-    
+
     .mat-mdc-text-field-wrapper {
       border-radius: 12px;
       background: rgba(255, 255, 255, 0.9);
       backdrop-filter: blur(10px);
       transition: all 0.3s ease;
-      
+
       &:hover {
         background: rgba(255, 255, 255, 0.95);
         transform: translateY(-1px);
       }
     }
-    
+
     &.mat-focused .mat-mdc-text-field-wrapper {
-      box-shadow: 
+      box-shadow:
         0 0 0 2px rgba(99, 102, 241, 0.2),
         0 8px 25px rgba(99, 102, 241, 0.15);
     }
   }
-  
+
   label {
     font-weight: 600;
     color: #374151;
@@ -155,9 +164,9 @@ mat-card {
   background: linear-gradient(90deg, transparent, #e5e7eb, transparent);
   margin: 40px 0;
   position: relative;
-  
+
   &::after {
-    content: '';
+    content: "";
     position: absolute;
     left: 50%;
     top: -4px;
@@ -180,9 +189,9 @@ mat-card {
   border: 1px solid rgba(226, 232, 240, 0.6);
   position: relative;
   overflow: hidden;
-  
+
   &::before {
-    content: '';
+    content: "";
     position: absolute;
     top: 0;
     left: -100%;
@@ -194,8 +203,12 @@ mat-card {
 }
 
 @keyframes shimmer {
-  0% { left: -100%; }
-  100% { left: 100%; }
+  0% {
+    left: -100%;
+  }
+  100% {
+    left: 100%;
+  }
 }
 
 .array-layout > * {
@@ -230,7 +243,7 @@ mat-card {
   border: 1px solid rgba(255, 255, 255, 0.3);
   box-shadow: 0 8px 32px rgba(0, 0, 0, 0.06);
   transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
-  
+
   &:hover {
     transform: translateY(-4px) scale(1.02);
     box-shadow: 0 20px 50px rgba(0, 0, 0, 0.1);
@@ -241,11 +254,11 @@ mat-card {
 .field-view-toggle {
   margin-bottom: 32px;
   display: block;
-  
+
   .mat-slide-toggle-bar {
     background: linear-gradient(135deg, #e5e7eb, #d1d5db);
   }
-  
+
   &.mat-checked .mat-slide-toggle-bar {
     background: linear-gradient(135deg, #6366f1, #8b5cf6);
   }
@@ -261,7 +274,7 @@ mat-card {
 // Modern input styling
 .custom-input-box {
   width: 100%;
-  
+
   .mat-mdc-form-field {
     .mat-mdc-text-field-wrapper {
       background: rgba(255, 255, 255, 0.8);
@@ -277,7 +290,11 @@ mat-card {
   grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
   gap: 20px;
   padding: 20px;
-  background: linear-gradient(145deg, rgba(255,255,255,0.9), rgba(248,250,252,0.9));
+  background: linear-gradient(
+    145deg,
+    rgba(255, 255, 255, 0.9),
+    rgba(248, 250, 252, 0.9)
+  );
   backdrop-filter: blur(20px);
   border-radius: 16px;
   border: 1px solid rgba(255, 255, 255, 0.3);
@@ -286,7 +303,7 @@ mat-card {
 
 .quantity-value-element {
   transition: transform 0.3s ease;
-  
+
   &:hover {
     transform: scale(1.02);
   }
@@ -301,7 +318,7 @@ mat-card {
 .step-indicator {
   margin-bottom: 32px;
   text-align: center;
-  
+
   .step-title {
     font-size: 2em;
     font-weight: 900;
@@ -312,7 +329,7 @@ mat-card {
     margin-bottom: 12px;
     letter-spacing: -0.04em;
   }
-  
+
   .step-description {
     color: #6b7280;
     font-size: 1em;
@@ -328,12 +345,12 @@ mat-card {
     border-color: rgba(75, 85, 99, 0.3);
     color: #f9fafb;
   }
-  
+
   .field-group {
     background: rgba(17, 24, 39, 0.7);
     border-color: rgba(75, 85, 99, 0.2);
   }
-  
+
   .jsonforms-control label {
     color: #d1d5db;
   }
@@ -346,11 +363,11 @@ mat-card {
     margin-bottom: 20px;
     border-radius: 16px;
   }
-  
+
   .field-group.related-fields {
     grid-template-columns: 1fr;
   }
-  
+
   .step-indicator .step-title {
     font-size: 1.5em;
   }
@@ -370,4 +387,4 @@ mat-card {
     opacity: 1;
     transform: translateY(0);
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.spec.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.spec.ts
index e0d88a4230..035fc06c7c 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.spec.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.spec.ts
@@ -10,14 +10,14 @@ describe("IngestorMetadataEditorComponent", () => {
     type: "object",
     properties: {
       name: { type: "string" },
-      age: { type: "number" }
+      age: { type: "number" },
     },
-    required: ["name"]
+    required: ["name"],
   };
 
   const mockData = {
     name: "Test",
-    age: 25
+    age: 25,
   };
 
   beforeEach(waitForAsync(() => {
@@ -32,11 +32,11 @@ describe("IngestorMetadataEditorComponent", () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(IngestorMetadataEditorComponent);
     component = fixture.componentInstance;
-    
+
     component.data = mockData;
     component.schema = mockSchema;
     component.renderView = "all";
-    
+
     fixture.detectChanges();
   });
 
@@ -49,4 +49,4 @@ describe("IngestorMetadataEditorComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
index e344320535..34ef263201 100644
--- a/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
+++ b/src/app/ingestor/ingestor-page/helper/ingestor.component-helper.ts
@@ -50,9 +50,9 @@ export interface IngestionRequestInformation {
   ingestionRequest: PostDatasetResponse | null;
   autoArchive: boolean;
   // Custom metadata in creation mode
-  schemaUrl?: string;  
-  selectedSchemaFileContent?: string; 
-  customMetaData: object; 
+  schemaUrl?: string;
+  selectedSchemaFileContent?: string;
+  customMetaData: object;
 }
 
 export interface ScientificMetadata {
@@ -134,7 +134,7 @@ export class IngestorHelper {
       autoArchive: true,
 
       schemaUrl: "",
-      selectedSchemaFileContent: "", 
+      selectedSchemaFileContent: "",
     };
   };
 
@@ -163,7 +163,6 @@ export class IngestorHelper {
   }
 }
 
-
 export const isBase64 = (str: string) => {
   try {
     return btoa(atob(str)) === str;
diff --git a/src/app/ingestor/ingestor-page/ingestor-creation.component.html b/src/app/ingestor/ingestor-page/ingestor-creation.component.html
index 43d66a8776..fb4df12052 100644
--- a/src/app/ingestor/ingestor-page/ingestor-creation.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor-creation.component.html
@@ -1,15 +1,12 @@
 <p *ngIf="(this.sciCatLoggedIn$ | async) === false">
   <mat-card class="ingestor-card">
     <mat-card-header>
-      <mat-card-title>
-        Log in
-      </mat-card-title>
+      <mat-card-title> Log in </mat-card-title>
     </mat-card-header>
     <mat-card-content class="ingestor-vertical-layout">
       <p>
-        Before a dataset creation can be started, please <a href="/login">log in
-          to
-          SciCat</a>.
+        Before a dataset creation can be started, please
+        <a href="/login">log in to SciCat</a>.
       </p>
       <a href="/login"><mat-icon>login</mat-icon></a>
     </mat-card-content>
@@ -37,11 +34,15 @@
         <mat-card-title>New dataset</mat-card-title>
       </mat-card-header>
       <mat-card-content class="ingestor-vertical-layout">
-        <button mat-fab aria-label="Add a new dataset" color="primary"
-          (click)="onClickAddIngestion()">
+        <button
+          mat-fab
+          aria-label="Add a new dataset"
+          color="primary"
+          (click)="onClickAddIngestion()"
+        >
           <mat-icon>add</mat-icon>
         </button>
       </mat-card-content>
     </mat-card>
   </p>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts
index def4a42a77..b0c6ae04bf 100644
--- a/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts
@@ -1,7 +1,7 @@
 import { IngestorCreationComponent } from "./ingestor-creation.component";
 import { IngestorHelper } from "./helper/ingestor.component-helper";
 import * as fromActions from "state-management/actions/ingestor.actions";
-import { MatCardModule} from "@angular/material/card";
+import { MatCardModule } from "@angular/material/card";
 import { MatListModule } from "@angular/material/list";
 import { MatIconModule } from "@angular/material/icon";
 import { MockActivatedRoute, MockUserApi } from "shared/MockStubs";
@@ -32,27 +32,28 @@ describe("IngestorCreationComponent", () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [IngestorCreationComponent],
-      imports:[
+      imports: [
         MatCardModule,
         MatListModule,
         MatIconModule,
-        StoreModule.forRoot({})],
-      })
-      TestBed.overrideComponent(IngestorCreationComponent, {
-        set: {
-          providers: [
-            { provide: Router, useValue: router },
-            {
-              provide: AppConfigService,
-              useValue: {
-                getConfig,
-              },
+        StoreModule.forRoot({}),
+      ],
+    });
+    TestBed.overrideComponent(IngestorCreationComponent, {
+      set: {
+        providers: [
+          { provide: Router, useValue: router },
+          {
+            provide: AppConfigService,
+            useValue: {
+              getConfig,
             },
-            { provide: ActivatedRoute, useClass: MockActivatedRoute },
-            { provide: UsersService, useClass: MockUserApi },
-          ],
-        },
-      });      
+          },
+          { provide: ActivatedRoute, useClass: MockActivatedRoute },
+          { provide: UsersService, useClass: MockUserApi },
+        ],
+      },
+    });
     TestBed.compileComponents();
   }));
 
@@ -84,7 +85,7 @@ describe("IngestorCreationComponent", () => {
     expectedObject.editorMode = "CREATION";
 
     expect(store.dispatch).toHaveBeenCalledWith(
-      fromActions.resetIngestionObject({ ingestionObject: expectedObject })
+      fromActions.resetIngestionObject({ ingestionObject: expectedObject }),
     );
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.html b/src/app/ingestor/ingestor-page/ingestor-transfer.component.html
index b304f0f114..2dd13318ac 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.html
@@ -1,14 +1,12 @@
 <p *ngIf="(this.sciCatLoggedIn$ | async) === false">
   <mat-card class="ingestor-card">
     <mat-card-header>
-      <mat-card-title>
-        Log in
-      </mat-card-title>
+      <mat-card-title> Log in </mat-card-title>
     </mat-card-header>
     <mat-card-content class="ingestor-vertical-layout">
       <p>
-        Before a transfer can be started, please <a href="/login">log in to
-          SciCat</a>.
+        Before a transfer can be started, please
+        <a href="/login">log in to SciCat</a>.
       </p>
       <a href="/login"><mat-icon>login</mat-icon></a>
     </mat-card-content>
@@ -23,8 +21,10 @@
       </mat-card-header>
       <mat-card-content class="ingestor-vertical-layout">
         <div *ngIf="connectingToFacilityBackend">
-          <mat-progress-spinner diameter="20"
-            mode="indeterminate"></mat-progress-spinner>
+          <mat-progress-spinner
+            diameter="20"
+            mode="indeterminate"
+          ></mat-progress-spinner>
         </div>
         <div *ngIf="!connectingToFacilityBackend">
           <ng-container *ngIf="connectedFacilityBackend === ''">
@@ -32,20 +32,33 @@
 
             <p>Please provide a valid Backend URL</p>
             <mat-form-field>
-              <input matInput placeholder="Backend URL"
-                [(ngModel)]="forwardFacilityBackend">
+              <input
+                matInput
+                placeholder="Backend URL"
+                [(ngModel)]="forwardFacilityBackend"
+              />
             </mat-form-field>
-            <button mat-raised-button color="primary"
-              (click)="onClickForwardToIngestorPage(forwardFacilityBackend)">Connect</button>
+            <button
+              mat-raised-button
+              color="primary"
+              (click)="onClickForwardToIngestorPage(forwardFacilityBackend)"
+            >
+              Connect
+            </button>
 
-            <div *ngIf="lastUsedFacilityBackends.length > 0"
-              class="last-used-facility-backends">
+            <div
+              *ngIf="lastUsedFacilityBackends.length > 0"
+              class="last-used-facility-backends"
+            >
               <p>Last used facility backends:</p>
               <ul>
-                <li *ngFor="let backend of lastUsedFacilityBackends"
-                  class="vertical-center-list-item">
-                  <a (click)="onClickSelectFacilityBackend(backend)">{{"- " + backend
-                    }}</a>
+                <li
+                  *ngFor="let backend of lastUsedFacilityBackends"
+                  class="vertical-center-list-item"
+                >
+                  <a (click)="onClickSelectFacilityBackend(backend)">{{
+                    "- " + backend
+                  }}</a>
 
                   <a (click)="onClickDeleteStoredFacilityBackend(backend)">
                     <mat-icon>remove_circle</mat-icon>
@@ -53,7 +66,6 @@
                 </li>
               </ul>
             </div>
-
           </ng-container>
           <ng-container *ngIf="connectedFacilityBackend !== ''">
             <div *ngIf="!authIsDisabled">
@@ -64,53 +76,66 @@
                   <p>Hello, {{ userInfo.name }}</p>
                 </div>
                 <div *ngIf="!userInfo.logged_in">
-                  <button mat-stroked-button
-                    (click)="openIngestorLogin()">Login</button>
-                  <br><br>
+                  <button mat-stroked-button (click)="openIngestorLogin()">
+                    Login
+                  </button>
+                  <br /><br />
                   <div class="user-icon-container">
                     <mat-icon>error</mat-icon>
-                    <p>Please log in to the Ingestor to start a transfer. </p>
+                    <p>Please log in to the Ingestor to start a transfer.</p>
                   </div>
                 </div>
                 <div *ngIf="userInfo.logged_in">
-                  <button mat-stroked-button
-                    (click)="openIngestorLogout()">Logout</button>
+                  <button mat-stroked-button (click)="openIngestorLogout()">
+                    Logout
+                  </button>
                 </div>
               </div>
               <mat-divider class="divider-down"></mat-divider>
             </div>
 
-            <mat-tab-group animationDuration="0ms"
-              [selectedIndex]="selectedTab">
-              <mat-tab [disabled]="!(authIsDisabled || userInfo?.logged_in)"
-                label="Transfers">
-                <button matTooltip="Refresh transfer list" mat-button
+            <mat-tab-group
+              animationDuration="0ms"
+              [selectedIndex]="selectedTab"
+            >
+              <mat-tab
+                [disabled]="!(authIsDisabled || userInfo?.logged_in)"
+                label="Transfers"
+              >
+                <button
+                  matTooltip="Refresh transfer list"
+                  mat-button
                   aria-label="Refresh transfer list"
-                  (click)="doRefreshTransferList()">
+                  (click)="doRefreshTransferList()"
+                >
                   <mat-icon>refresh</mat-icon>
                 </button>
                 <table
-                  *ngIf="transferDataInformation && transferDataInformation.transfers.length > 0"
-                  mat-table [dataSource]="transferDataInformation.transfers">
-
+                  *ngIf="
+                    transferDataInformation &&
+                    transferDataInformation.transfers.length > 0
+                  "
+                  mat-table
+                  [dataSource]="transferDataInformation.transfers"
+                >
                   <ng-container matColumnDef="transferId">
-                    <th mat-header-cell *matHeaderCellDef><b>ID</b> </th>
+                    <th mat-header-cell *matHeaderCellDef><b>ID</b></th>
                     <td mat-cell *matCellDef="let element">
-                      {{element.transferId}}
+                      {{ element.transferId }}
                     </td>
                   </ng-container>
 
                   <ng-container matColumnDef="status">
-                    <th mat-header-cell *matHeaderCellDef><b>Status</b> </th>
-                    <td mat-cell *matCellDef="let element"> {{element.status ??
-                      ""}}
+                    <th mat-header-cell *matHeaderCellDef><b>Status</b></th>
+                    <td mat-cell *matCellDef="let element">
+                      {{ element.status ?? "" }}
                     </td>
                   </ng-container>
 
                   <ng-container matColumnDef="message">
-                    <th mat-header-cell *matHeaderCellDef><b>Message</b> </th>
-                    <td mat-cell *matCellDef="let element"> {{element.message ??
-                      ""}}
+                    <th mat-header-cell *matHeaderCellDef><b>Message</b></th>
+                    <td mat-cell *matCellDef="let element">
+                      {{ element.message ?? "" }}
                     </td>
                   </ng-container>
 
@@ -119,8 +144,11 @@
                       <b>Progress</b>
                     </th>
                     <td mat-cell *matCellDef="let element" class="text-right">
-                      <button mat-button aria-label="Delete transfer"
-                        (click)="onOpenDetailView(element.transferId)">
+                      <button
+                        mat-button
+                        aria-label="Delete transfer"
+                        (click)="onOpenDetailView(element.transferId)"
+                      >
                         <mat-icon>info</mat-icon>
                       </button>
                     </td>
@@ -131,26 +159,33 @@
                       <b>Action</b>
                     </th>
                     <td mat-cell *matCellDef="let element" class="text-right">
-                      <button mat-button aria-label="Delete transfer"
-                        (click)="onCancelTransfer(element.transferId)">
+                      <button
+                        mat-button
+                        aria-label="Delete transfer"
+                        (click)="onCancelTransfer(element.transferId)"
+                      >
                         <mat-icon>delete</mat-icon>
                       </button>
                     </td>
                   </ng-container>
 
                   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-                  <tr mat-row *matRowDef="let row; columns: displayedColumns;">
-                  </tr>
+                  <tr
+                    mat-row
+                    *matRowDef="let row; columns: displayedColumns"
+                  ></tr>
                 </table>
 
-                <mat-paginator *ngIf="transferDataInformation !== null"
+                <mat-paginator
+                  *ngIf="transferDataInformation !== null"
                   class="transferPaginator"
                   [length]="transferDataInformation.total"
                   [pageSize]="transferDataPageSize"
                   [pageSizeOptions]="transferDataPageSizeOptions"
                   [pageIndex]="transferDataPageIndex"
                   (page)="onTransferPageChange($event)"
-                  aria-label="Select page">
+                  aria-label="Select page"
+                >
                 </mat-paginator>
               </mat-tab>
 
@@ -159,46 +194,58 @@
                 <mat-list>
                   <mat-list-item>
                     <span matListItemTitle>Backend URL</span>
-                    <span matListItemLine>{{ connectedFacilityBackend }} <a
-                        (click)="onClickDisconnectIngestor()">change</a></span>
+                    <span matListItemLine
+                      >{{ connectedFacilityBackend }}
+                      <a (click)="onClickDisconnectIngestor()">change</a></span
+                    >
                   </mat-list-item>
                   <mat-list-item>
                     <span matListItemTitle>Connection Status</span>
-                    <span matListItemLine style="color: green;">Connected</span>
+                    <span matListItemLine style="color: green">Connected</span>
                   </mat-list-item>
                   <mat-list-item>
                     <span matListItemTitle>Version</span>
-                    <span matListItemLine>{{ versionInfo ? versionInfo.version
-                      ?? "" : ""
-                      }}</span>
+                    <span matListItemLine>{{
+                      versionInfo ? (versionInfo.version ?? "") : ""
+                    }}</span>
                   </mat-list-item>
                   <mat-list-item>
                     <span matListItemTitle>Health Status</span>
-                    <span matListItemLine>{{ healthInfo ? healthInfo.status ??
-                      "" : "" }}</span>
+                    <span matListItemLine>{{
+                      healthInfo ? (healthInfo.status ?? "") : ""
+                    }}</span>
                   </mat-list-item>
                 </mat-list>
               </mat-tab>
             </mat-tab-group>
-            <br><br>
+            <br /><br />
           </ng-container>
         </div>
       </mat-card-content>
     </mat-card>
   </p>
 
-  <p *ngIf="!connectingToFacilityBackend && connectedFacilityBackend !== '' && (authIsDisabled ||
-    userInfo?.logged_in)">
+  <p
+    *ngIf="
+      !connectingToFacilityBackend &&
+      connectedFacilityBackend !== '' &&
+      (authIsDisabled || userInfo?.logged_in)
+    "
+  >
     <mat-card class="ingestor-card">
       <mat-card-header>
         <mat-card-title>New transfer</mat-card-title>
       </mat-card-header>
       <mat-card-content class="ingestor-vertical-layout">
-        <button mat-fab aria-label="Add a new dataset transfer" color="primary"
-          (click)="onClickAddIngestion()">
+        <button
+          mat-fab
+          aria-label="Add a new dataset transfer"
+          color="primary"
+          (click)="onClickAddIngestion()"
+        >
           <mat-icon>add</mat-icon>
         </button>
       </mat-card-content>
     </mat-card>
   </p>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts
index 866a63c824..f47b7afd9a 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts
@@ -1,5 +1,5 @@
 import { IngestorTransferComponent } from "./ingestor-transfer.component";
-import { MatCardModule} from "@angular/material/card";
+import { MatCardModule } from "@angular/material/card";
 import { MatListModule } from "@angular/material/list";
 import { MockActivatedRoute, MockUserApi } from "shared/MockStubs";
 import { Store, StoreModule } from "@ngrx/store";
@@ -32,26 +32,23 @@ describe("IngestorTransferComponent", () => {
     TestBed.configureTestingModule({
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [IngestorTransferComponent],
-      imports:[
-        MatCardModule,
-        MatListModule,
-        StoreModule.forRoot({})],
-      })
-      TestBed.overrideComponent(IngestorTransferComponent, {
-        set: {
-          providers: [
-            { provide: Router, useValue: router },
-            {
-              provide: AppConfigService,
-              useValue: {
-                getConfig,
-              },
+      imports: [MatCardModule, MatListModule, StoreModule.forRoot({})],
+    });
+    TestBed.overrideComponent(IngestorTransferComponent, {
+      set: {
+        providers: [
+          { provide: Router, useValue: router },
+          {
+            provide: AppConfigService,
+            useValue: {
+              getConfig,
             },
-            { provide: ActivatedRoute, useClass: MockActivatedRoute },
-            { provide: UsersService, useClass: MockUserApi },
-          ],
-        },
-      });      
+          },
+          { provide: ActivatedRoute, useClass: MockActivatedRoute },
+          { provide: UsersService, useClass: MockUserApi },
+        ],
+      },
+    });
     TestBed.compileComponents();
   }));
 
@@ -71,5 +68,4 @@ describe("IngestorTransferComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
-
-});
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
index 0d3c79f1a0..9549368a37 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
@@ -349,13 +349,14 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
       const userEmail = this.scicatUserProfile.email;
       const facility = userEmail.split("@")[1]?.toLowerCase();
 
-      const discoveryList = this.appConfig.ingestorComponent.ingestorAutodiscoveryOptions;
+      const discoveryList =
+        this.appConfig.ingestorComponent.ingestorAutodiscoveryOptions;
 
       if (discoveryList) {
         for (const discovery of discoveryList) {
           const escapedDomain = discovery.mailDomain
             .toLowerCase()
-            .replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            .replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
           const domainPattern = new RegExp(`^([\\w-]+\\.)*${escapedDomain}$`); // <any.sub.domain.uni.ch>
           if (domainPattern.test(facility)) {
             return discovery.facilityBackend;
diff --git a/src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts
index c93cd9cf81..d5c208d3af 100644
--- a/src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts
@@ -3,10 +3,7 @@ import { NO_ERRORS_SCHEMA } from "@angular/core";
 import { AppConfigInterface, AppConfigService } from "app-config.service";
 import { IngestorTransferComponent } from "./ingestor-transfer.component";
 import { IngestorCreationComponent } from "./ingestor-creation.component";
-import {
-  ComponentFixture,
-  TestBed,
-} from "@angular/core/testing";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 describe("IngestorComponent", () => {
   let component: IngestorWrapperComponent;
@@ -22,15 +19,12 @@ describe("IngestorComponent", () => {
       "getConfig",
     ]);
 
-
     TestBed.configureTestingModule({
-      declarations: [IngestorWrapperComponent, 
-      ],
+      declarations: [IngestorWrapperComponent],
       providers: [{ provide: AppConfigService, useValue: appConfigServiceSpy }],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
-
     fixture = TestBed.createComponent(IngestorWrapperComponent);
     component = fixture.componentInstance;
     appConfigService = TestBed.inject(
@@ -42,7 +36,7 @@ describe("IngestorComponent", () => {
     fixture.destroy();
   });
 
-  it("should create", () => {   
+  it("should create", () => {
     appConfigService.getConfig.and.returnValue({
       ingestorComponent: {
         ingestorEnabled: true,
@@ -54,24 +48,24 @@ describe("IngestorComponent", () => {
 
   it("should load IngestorTransferComponent when config specifies ingestorInTransferMode as true", () => {
     appConfigService.getConfig.and.returnValue({
-          ingestorComponent: {
-            ingestorEnabled: true,
-            ingestorInTransferMode: true,
-          },
-        } as AppConfigInterface);
+      ingestorComponent: {
+        ingestorEnabled: true,
+        ingestorInTransferMode: true,
+      },
+    } as AppConfigInterface);
 
-        const componentInstance = component.getIngestorComponent();
-        expect(componentInstance).toBe(IngestorTransferComponent);
+    const componentInstance = component.getIngestorComponent();
+    expect(componentInstance).toBe(IngestorTransferComponent);
   });
 
   it("should load IngestorCreationComponent when config specifies ingestorInTransferMode as false", () => {
     appConfigService.getConfig.and.returnValue({
-          ingestorComponent: {
-            ingestorInTransferMode: false,
-          },
-        } as AppConfigInterface);
+      ingestorComponent: {
+        ingestorInTransferMode: false,
+      },
+    } as AppConfigInterface);
 
-        const componentInstance = component.getIngestorComponent();
-        expect(componentInstance).toBe(IngestorCreationComponent);
+    const componentInstance = component.getIngestorComponent();
+    expect(componentInstance).toBe(IngestorCreationComponent);
   });
-  });
\ No newline at end of file
+});
diff --git a/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
index 53990ff2a7..d835e540a9 100644
--- a/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
@@ -14,15 +14,15 @@ import { IngestorCreationComponent } from "./ingestor-creation.component";
   `,
   standalone: false,
 })
-export class IngestorWrapperComponent{
+export class IngestorWrapperComponent {
   appConfig = this.appConfigService.getConfig();
   ingestorMode: IngestorMode = "creation";
 
   constructor(public appConfigService: AppConfigService) {}
   getIngestorComponent() {
-      return this.appConfigService.getConfig().ingestorComponent
-        ?.ingestorInTransferMode
-        ? IngestorTransferComponent
-        : IngestorCreationComponent;
+    return this.appConfigService.getConfig().ingestorComponent
+      ?.ingestorInTransferMode
+      ? IngestorTransferComponent
+      : IngestorCreationComponent;
   }
 }
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.scss b/src/app/ingestor/ingestor-page/ingestor.component.scss
index de61ee3fa1..2cfb6329dd 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.scss
+++ b/src/app/ingestor/ingestor-page/ingestor.component.scss
@@ -157,4 +157,4 @@ mat-card {
 .block-button {
   display: block;
   margin-top: 8px;
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/MockStubs.ts b/src/app/shared/MockStubs.ts
index 40d927e011..22b5ac6fdf 100644
--- a/src/app/shared/MockStubs.ts
+++ b/src/app/shared/MockStubs.ts
@@ -338,50 +338,50 @@ export const mockPolicy = createMock<Policy>({});
 export const mockPublishedData = createMock<PublishedData>({});
 export const mockUser = createMock<ReturnedUserDto>({});
 
-
-export  const mockIngestionRequestInformation = createMock<IngestionRequestInformation>({
-  selectedPath: "/test/path",
-  selectedMethod: {
-    name: "test-method",
-    schema: "base64-encoded-schema",
-  },
-  selectedResolvedDecodedSchema: {
-    type: "object",
-    properties: {
-      organizational: { type: "object" },
-      sample: { type: "object" },
-      instrument: { type: "object" },
-      acquisition: { type: "object" },
+export const mockIngestionRequestInformation =
+  createMock<IngestionRequestInformation>({
+    selectedPath: "/test/path",
+    selectedMethod: {
+      name: "test-method",
+      schema: "base64-encoded-schema",
     },
-  },
-  scicatHeader: {
-    datasetName: "test-dataset",
-    sourceFolder: "/test/path",
-    type: "raw",
-    owner: "testuser",
-  },
-  userMetaData: {
-    organizational: {
-      experimentId: "EXP-001",
+    selectedResolvedDecodedSchema: {
+      type: "object",
+      properties: {
+        organizational: { type: "object" },
+        sample: { type: "object" },
+        instrument: { type: "object" },
+        acquisition: { type: "object" },
+      },
     },
-    sample: {
-      sampleId: "SAMPLE-001",
+    scicatHeader: {
+      datasetName: "test-dataset",
+      sourceFolder: "/test/path",
+      type: "raw",
+      owner: "testuser",
     },
-  },
-  extractorMetaData: {
-    instrument: {
-      name: "Test Instrument",
+    userMetaData: {
+      organizational: {
+        experimentId: "EXP-001",
+      },
+      sample: {
+        sampleId: "SAMPLE-001",
+      },
     },
-    acquisition: {
-      date: "2024-01-01",
+    extractorMetaData: {
+      instrument: {
+        name: "Test Instrument",
+      },
+      acquisition: {
+        date: "2024-01-01",
+      },
     },
-  },
-  customMetaData: {},
-  mergedMetaDataString: "{}",
-  editorMode: "INGESTION",
-  ingestionRequest: null,
-  autoArchive: false,
-});
+    customMetaData: {},
+    mergedMetaDataString: "{}",
+    editorMode: "INGESTION",
+    ingestionRequest: null,
+    autoArchive: false,
+  });
 
 export const mockMethodItem = createMock<MethodItem>({
   name: "test-extraction-method",
@@ -393,10 +393,7 @@ export const mockMethodItem2 = createMock<MethodItem>({
   schema: "eyJwcm9wZXJ0aWVzIjp7Imluc3RydW1lbnQiOnt9fX0=",
 });
 
-export const mockMethodItems: MethodItem[] = [
-  mockMethodItem,
-  mockMethodItem2,
-];
+export const mockMethodItems: MethodItem[] = [mockMethodItem, mockMethodItem2];
 
 export const mockFolderNode = createMock<FolderNode>({
   name: "test-folder",
@@ -433,4 +430,4 @@ export const mockAPIInformation = createMock<APIInformation>({
   extractorMetadataProgress: 0,
   extractorMetaDataStatus: "",
   ingestionRequestErrorMessage: "",
-});
\ No newline at end of file
+});
diff --git a/src/app/state-management/actions/datasets.actions.ts b/src/app/state-management/actions/datasets.actions.ts
index 17c94f88ac..550f250b14 100644
--- a/src/app/state-management/actions/datasets.actions.ts
+++ b/src/app/state-management/actions/datasets.actions.ts
@@ -153,7 +153,7 @@ export const updatePropertyAction = createAction(
 );
 export const updateScientificMetadataCompleteAction = createAction(
   "[Dataset] Update Property Complete",
-  props<{ pid: string }>()
+  props<{ pid: string }>(),
 );
 export const updatePropertyCompleteAction = createAction(
   "[Dataset] Update Property Complete",
diff --git a/src/app/state-management/actions/ingestor.actions.spec.ts b/src/app/state-management/actions/ingestor.actions.spec.ts
index 65cdd578c0..262cc26424 100644
--- a/src/app/state-management/actions/ingestor.actions.spec.ts
+++ b/src/app/state-management/actions/ingestor.actions.spec.ts
@@ -119,7 +119,9 @@ describe("Ingestor Actions", () => {
         transferListDetailView,
       });
 
-      expect(action.type).toBe("[Ingestor] Update Transfer List Detail Success");
+      expect(action.type).toBe(
+        "[Ingestor] Update Transfer List Detail Success",
+      );
       expect(action.transferListDetailView).toEqual(transferListDetailView);
     });
   });
@@ -169,7 +171,9 @@ describe("Ingestor Actions", () => {
         ingestionObject: mockIngestionRequestInformation,
       });
 
-      expect(action.type).toBe("[Ingestor] Update Ingestion Object from Third Party");
+      expect(action.type).toBe(
+        "[Ingestor] Update Ingestion Object from Third Party",
+      );
       expect(action.ingestionObject).toEqual(mockIngestionRequestInformation);
     });
   });
@@ -180,7 +184,9 @@ describe("Ingestor Actions", () => {
         ingestionObjectApiInformation: mockAPIInformation,
       });
 
-      expect(action.type).toBe("[Ingestor] Update Ingestion Object API Information");
+      expect(action.type).toBe(
+        "[Ingestor] Update Ingestion Object API Information",
+      );
       expect(action.ingestionObjectApiInformation).toEqual(mockAPIInformation);
     });
   });
@@ -189,7 +195,9 @@ describe("Ingestor Actions", () => {
     it("should create an action", () => {
       const action = fromActions.resetIngestionObjectFromThirdPartyFlag();
 
-      expect(action.type).toBe("[Ingestor] Reset Ingestion Object from Third Party Flag");
+      expect(action.type).toBe(
+        "[Ingestor] Reset Ingestion Object from Third Party Flag",
+      );
     });
   });
 
@@ -386,4 +394,4 @@ describe("Ingestor Actions", () => {
       expect(action.dataset).toEqual(dataset);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/state-management/effects/ingestor.effects.spec.ts b/src/app/state-management/effects/ingestor.effects.spec.ts
index 9a3a490467..1c0ba723cc 100644
--- a/src/app/state-management/effects/ingestor.effects.spec.ts
+++ b/src/app/state-management/effects/ingestor.effects.spec.ts
@@ -56,7 +56,9 @@ describe("IngestorEffects", () => {
 
     effects = TestBed.inject(IngestorEffects);
     ingestorService = TestBed.inject(Ingestor) as jasmine.SpyObj<Ingestor>;
-    datasetsService = TestBed.inject(DatasetsService) as jasmine.SpyObj<DatasetsService>;
+    datasetsService = TestBed.inject(
+      DatasetsService,
+    ) as jasmine.SpyObj<DatasetsService>;
     store = TestBed.inject(MockStore);
   });
 
@@ -75,7 +77,7 @@ describe("IngestorEffects", () => {
             healthResponse: mockHealthResponse,
             userInfoResponse: mockUserInfoResponse,
             authIsDisabled: false,
-          })
+          }),
         );
         done();
       });
@@ -96,7 +98,7 @@ describe("IngestorEffects", () => {
             healthResponse: mockHealthResponse,
             userInfoResponse: null,
             authIsDisabled: true,
-          })
+          }),
         );
         done();
       });
@@ -135,7 +137,7 @@ describe("IngestorEffects", () => {
           healthResponse: mockHealthResponse,
           userInfoResponse: mockUserInfoResponse,
           authIsDisabled: false,
-        })
+        }),
       );
 
       effects.connectToIngestorSuccess$.subscribe((action) => {
@@ -174,7 +176,7 @@ describe("IngestorEffects", () => {
             transferList,
             page: 1,
             pageNumber: 50,
-          })
+          }),
         );
         done();
       });
@@ -190,7 +192,7 @@ describe("IngestorEffects", () => {
         expect(action).toEqual(
           fromActions.updateTransferListDetailSuccess({
             transferListDetailView: transferList,
-          })
+          }),
         );
         done();
       });
@@ -214,11 +216,15 @@ describe("IngestorEffects", () => {
       const methods = { methods: [], total: 0 };
       ingestorService.getExtractionMethods.and.returnValue(of(methods));
 
-      actions$ = of(fromActions.getExtractionMethods({ page: 1, pageNumber: 50 }));
+      actions$ = of(
+        fromActions.getExtractionMethods({ page: 1, pageNumber: 50 }),
+      );
 
       effects.getExtractionMethods$.subscribe((action) => {
         expect(action).toEqual(
-          fromActions.getExtractionMethodsSuccess({ extractionMethods: methods })
+          fromActions.getExtractionMethodsSuccess({
+            extractionMethods: methods,
+          }),
         );
         done();
       });
@@ -226,9 +232,13 @@ describe("IngestorEffects", () => {
 
     it("should dispatch setNoRightsError when session expired", (done) => {
       const error = { error: { error: "login session has expired" } };
-      ingestorService.getExtractionMethods.and.returnValue(throwError(() => error));
+      ingestorService.getExtractionMethods.and.returnValue(
+        throwError(() => error),
+      );
 
-      actions$ = of(fromActions.getExtractionMethods({ page: 1, pageNumber: 50 }));
+      actions$ = of(
+        fromActions.getExtractionMethods({ page: 1, pageNumber: 50 }),
+      );
 
       effects.getExtractionMethods$.subscribe((action) => {
         expect(action.type).toBe(fromActions.setNoRightsError.type);
@@ -238,9 +248,13 @@ describe("IngestorEffects", () => {
 
     it("should dispatch getExtractionMethodsFailure on error", (done) => {
       const error = new Error("Failed");
-      ingestorService.getExtractionMethods.and.returnValue(throwError(() => error));
+      ingestorService.getExtractionMethods.and.returnValue(
+        throwError(() => error),
+      );
 
-      actions$ = of(fromActions.getExtractionMethods({ page: 1, pageNumber: 50 }));
+      actions$ = of(
+        fromActions.getExtractionMethods({ page: 1, pageNumber: 50 }),
+      );
 
       effects.getExtractionMethods$.subscribe((action) => {
         expect(action.type).toBe(fromActions.getExtractionMethodsFailure.type);
@@ -255,14 +269,18 @@ describe("IngestorEffects", () => {
       ingestorService.getBrowseFilePath.and.returnValue(of(browseResult));
 
       actions$ = of(
-        fromActions.getBrowseFilePath({ path: "/test", page: 1, pageNumber: 50 })
+        fromActions.getBrowseFilePath({
+          path: "/test",
+          page: 1,
+          pageNumber: 50,
+        }),
       );
 
       effects.getBrowseFilePath$.subscribe((action) => {
         expect(action).toEqual(
           fromActions.getBrowseFilePathSuccess({
             ingestorBrowserActiveNode: browseResult,
-          })
+          }),
         );
         done();
       });
@@ -270,10 +288,16 @@ describe("IngestorEffects", () => {
 
     it("should dispatch getBrowseFilePathFailure on error", (done) => {
       const error = new Error("Browse failed");
-      ingestorService.getBrowseFilePath.and.returnValue(throwError(() => error));
+      ingestorService.getBrowseFilePath.and.returnValue(
+        throwError(() => error),
+      );
 
       actions$ = of(
-        fromActions.getBrowseFilePath({ path: "/test", page: 1, pageNumber: 50 })
+        fromActions.getBrowseFilePath({
+          path: "/test",
+          page: 1,
+          pageNumber: 50,
+        }),
       );
 
       effects.getBrowseFilePath$.subscribe((action) => {
@@ -294,7 +318,9 @@ describe("IngestorEffects", () => {
 
       effects.setLoadingBeforeIngestion$.subscribe((action) => {
         expect(action).toEqual(
-          fromActions.setIngestDatasetLoading({ ingestionDatasetLoading: true })
+          fromActions.setIngestDatasetLoading({
+            ingestionDatasetLoading: true,
+          }),
         );
         done();
       });
@@ -319,7 +345,9 @@ describe("IngestorEffects", () => {
         if (actions.length === 3) {
           expect(actions[0].type).toBe(fromActions.ingestDatasetSuccess.type);
           expect(actions[1].type).toBe(fromActions.updateTransferList.type);
-          expect(actions[2].type).toBe(fromActions.setIngestDatasetLoading.type);
+          expect(actions[2].type).toBe(
+            fromActions.setIngestDatasetLoading.type,
+          );
           done();
         }
       });
@@ -341,7 +369,9 @@ describe("IngestorEffects", () => {
         actions.push(action);
         if (actions.length === 2) {
           expect(actions[0].type).toBe(fromActions.ingestDatasetFailure.type);
-          expect(actions[1].type).toBe(fromActions.setIngestDatasetLoading.type);
+          expect(actions[1].type).toBe(
+            fromActions.setIngestDatasetLoading.type,
+          );
           done();
         }
       });
@@ -375,7 +405,7 @@ describe("IngestorEffects", () => {
       });
     });
   });
-  
+
   describe("cancelTransfer$", () => {
     it("should dispatch success actions on successful cancel", (done) => {
       const deleteResponse = { transferId: "123" };
@@ -414,7 +444,7 @@ describe("IngestorEffects", () => {
   describe("setRenderView$", () => {
     it("should dispatch showMessageAction", (done) => {
       actions$ = of(
-        fromActions.setRenderViewFromThirdParty({ renderView: "requiredOnly" })
+        fromActions.setRenderViewFromThirdParty({ renderView: "requiredOnly" }),
       );
 
       effects.setRenderView$.subscribe((action) => {
@@ -437,7 +467,9 @@ describe("IngestorEffects", () => {
         actions.push(action);
         if (actions.length === 2) {
           expect(actions[0].type).toBe(fromActions.createDatasetSuccess.type);
-          expect(actions[1].type).toBe(fromActions.setIngestDatasetLoading.type);
+          expect(actions[1].type).toBe(
+            fromActions.setIngestDatasetLoading.type,
+          );
           done();
         }
       });
@@ -446,7 +478,7 @@ describe("IngestorEffects", () => {
     it("should dispatch failure actions on error", (done) => {
       const error = new Error("Create failed");
       datasetsService.datasetsControllerCreateV3.and.returnValue(
-        throwError(() => error)
+        throwError(() => error),
       );
 
       const dataset = { datasetName: "Test" } as any;
@@ -457,10 +489,12 @@ describe("IngestorEffects", () => {
         actions.push(action);
         if (actions.length === 2) {
           expect(actions[0].type).toBe(fromActions.ingestDatasetFailure.type);
-          expect(actions[1].type).toBe(fromActions.setIngestDatasetLoading.type);
+          expect(actions[1].type).toBe(
+            fromActions.setIngestDatasetLoading.type,
+          );
           done();
         }
       });
     });
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/state-management/reducers/ingestor.reducer.spec.ts b/src/app/state-management/reducers/ingestor.reducer.spec.ts
index eb46c6a7c3..d9c200c715 100644
--- a/src/app/state-management/reducers/ingestor.reducer.spec.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.spec.ts
@@ -1,7 +1,10 @@
 import { ingestorReducer } from "./ingestor.reducer";
 import * as fromActions from "state-management/actions/ingestor.actions";
 import { initialIngestorState } from "state-management/state/ingestor.store";
-import { mockIngestionRequestInformation, mockMethodItems } from "shared/MockStubs";
+import {
+  mockIngestionRequestInformation,
+  mockMethodItems,
+} from "shared/MockStubs";
 
 describe("IngestorReducer", () => {
   describe("undefined action", () => {
@@ -15,7 +18,9 @@ describe("IngestorReducer", () => {
 
   describe("setRenderViewFromThirdParty", () => {
     it("should set render view and update flag", () => {
-      const action = fromActions.setRenderViewFromThirdParty({ renderView: "requiredOnly" });
+      const action = fromActions.setRenderViewFromThirdParty({
+        renderView: "requiredOnly",
+      });
       const result = ingestorReducer(undefined, action);
 
       expect(result.renderView).toBe("requiredOnly");
@@ -26,10 +31,19 @@ describe("IngestorReducer", () => {
   describe("getBrowseFilePathSuccess", () => {
     it("should set active node on success", () => {
       const mockNode = {
-        folders: [{ name: "test", path: "/test", children: true, probablyDataset: false }],
+        folders: [
+          {
+            name: "test",
+            path: "/test",
+            children: true,
+            probablyDataset: false,
+          },
+        ],
         total: 1,
       };
-      const action = fromActions.getBrowseFilePathSuccess({ ingestorBrowserActiveNode: mockNode });
+      const action = fromActions.getBrowseFilePathSuccess({
+        ingestorBrowserActiveNode: mockNode,
+      });
       const result = ingestorReducer(undefined, action);
 
       expect(result.ingestorBrowserActiveNode).toEqual(mockNode);
@@ -50,7 +64,9 @@ describe("IngestorReducer", () => {
   describe("getExtractionMethodsSuccess", () => {
     it("should set extraction methods on success", () => {
       const mockMethods = { methods: mockMethodItems, total: 2 };
-      const action = fromActions.getExtractionMethodsSuccess({ extractionMethods: mockMethods });
+      const action = fromActions.getExtractionMethodsSuccess({
+        extractionMethods: mockMethods,
+      });
       const result = ingestorReducer(undefined, action);
 
       expect(result.ingestorExtractionMethods).toEqual(mockMethods);
@@ -71,7 +87,9 @@ describe("IngestorReducer", () => {
   describe("setIngestorEndpoint", () => {
     it("should set ingestor endpoint", () => {
       const endpoint = "http://localhost:3000";
-      const action = fromActions.setIngestorEndpoint({ ingestorEndpoint: endpoint });
+      const action = fromActions.setIngestorEndpoint({
+        ingestorEndpoint: endpoint,
+      });
       const result = ingestorReducer(undefined, action);
 
       expect(result.ingestorEndpoint).toBe(endpoint);
@@ -129,7 +147,11 @@ describe("IngestorReducer", () => {
       const page = 1;
       const pageNumber = 50;
 
-      const action = fromActions.updateTransferListSuccess({ transferList, page, pageNumber });
+      const action = fromActions.updateTransferListSuccess({
+        transferList,
+        page,
+        pageNumber,
+      });
       const result = ingestorReducer(undefined, action);
 
       expect(result.ingestorTransferList).toEqual(transferList);
@@ -141,16 +163,22 @@ describe("IngestorReducer", () => {
   describe("updateTransferListDetailSuccess", () => {
     it("should update transfer detail list", () => {
       const transferListDetailView = { transfers: [] };
-      const action = fromActions.updateTransferListDetailSuccess({ transferListDetailView });
+      const action = fromActions.updateTransferListDetailSuccess({
+        transferListDetailView,
+      });
       const result = ingestorReducer(undefined, action);
 
-      expect(result.ingestorTransferListDetailView).toEqual(transferListDetailView);
+      expect(result.ingestorTransferListDetailView).toEqual(
+        transferListDetailView,
+      );
     });
   });
 
   describe("updateIngestionObject", () => {
     it("should update ingestion object", () => {
-      const action = fromActions.updateIngestionObject({ ingestionObject: mockIngestionRequestInformation });
+      const action = fromActions.updateIngestionObject({
+        ingestionObject: mockIngestionRequestInformation,
+      });
       const result = ingestorReducer(undefined, action);
 
       expect(result.ingestionObject).toEqual(mockIngestionRequestInformation);
@@ -168,25 +196,38 @@ describe("IngestorReducer", () => {
         extractorMetaDataStatus: "",
         ingestionRequestErrorMessage: "",
       };
-      const action = fromActions.updateIngestionObjectAPIInformation({ ingestionObjectApiInformation: apiInfo });
+      const action = fromActions.updateIngestionObjectAPIInformation({
+        ingestionObjectApiInformation: apiInfo,
+      });
       const result = ingestorReducer(undefined, action);
 
-      expect(result.ingestionObjectApiInformation.ingestionDatasetLoading).toBe(true);
-      expect(result.ingestionObjectApiInformation.extractorMetaDataReady).toBe(true);
+      expect(result.ingestionObjectApiInformation.ingestionDatasetLoading).toBe(
+        true,
+      );
+      expect(result.ingestionObjectApiInformation.extractorMetaDataReady).toBe(
+        true,
+      );
     });
   });
 
   describe("resetIngestionObject", () => {
     it("should reset ingestion object to provided value", () => {
-      const customObject = { ...mockIngestionRequestInformation, selectedPath: "/custom" };
-      const action = fromActions.resetIngestionObject({ ingestionObject: customObject });
+      const customObject = {
+        ...mockIngestionRequestInformation,
+        selectedPath: "/custom",
+      };
+      const action = fromActions.resetIngestionObject({
+        ingestionObject: customObject,
+      });
       const result = ingestorReducer(undefined, action);
 
       expect(result.ingestionObject.selectedPath).toBe("/custom");
     });
 
     it("should reset to empty when no object provided", () => {
-      const action = fromActions.resetIngestionObject({ ingestionObject: null });
+      const action = fromActions.resetIngestionObject({
+        ingestionObject: null,
+      });
       const result = ingestorReducer(undefined, action);
 
       expect(result.ingestionObject).toBeDefined();
@@ -195,7 +236,9 @@ describe("IngestorReducer", () => {
 
   describe("updateIngestionObjectFromThirdParty", () => {
     it("should update object and set third party flag", () => {
-      const action = fromActions.updateIngestionObjectFromThirdParty({ ingestionObject: mockIngestionRequestInformation });
+      const action = fromActions.updateIngestionObjectFromThirdParty({
+        ingestionObject: mockIngestionRequestInformation,
+      });
       const result = ingestorReducer(undefined, action);
 
       expect(result.ingestionObject).toEqual(mockIngestionRequestInformation);
@@ -206,7 +249,9 @@ describe("IngestorReducer", () => {
   describe("resetIngestionObjectFromThirdPartyFlag", () => {
     it("should reset third party update flag", () => {
       // First set the flag to true
-      const setFlagAction = fromActions.setRenderViewFromThirdParty({ renderView: "all" });
+      const setFlagAction = fromActions.setRenderViewFromThirdParty({
+        renderView: "all",
+      });
       ingestorReducer(undefined, setFlagAction);
 
       // Then reset it
@@ -224,28 +269,39 @@ describe("IngestorReducer", () => {
       const result = ingestorReducer(undefined, action);
 
       expect(result.ingestionObject.ingestionRequest).toEqual(response);
-      expect(result.ingestionObjectApiInformation.ingestionRequestErrorMessage).toBe("");
+      expect(
+        result.ingestionObjectApiInformation.ingestionRequestErrorMessage,
+      ).toBe("");
     });
   });
 
   describe("createDatasetSuccess", () => {
     it("should set dataset creation response", () => {
-      const dataset = { pid: "dataset-123", datasetName: "Test Dataset" } as any;
+      const dataset = {
+        pid: "dataset-123",
+        datasetName: "Test Dataset",
+      } as any;
       const action = fromActions.createDatasetSuccess({ dataset });
       const result = ingestorReducer(undefined, action);
 
-      expect(result.ingestionObject.ingestionRequest.transferId).toBe("dataset-123");
-      expect(result.ingestionObject.ingestionRequest.status).toBe("Test Dataset");
+      expect(result.ingestionObject.ingestionRequest.transferId).toBe(
+        "dataset-123",
+      );
+      expect(result.ingestionObject.ingestionRequest.status).toBe(
+        "Test Dataset",
+      );
     });
   });
 
   describe("ingestDatasetFailure", () => {
     it("should set error message on failure", () => {
-      const error = new Error( "Bad request");
+      const error = new Error("Bad request");
       const action = fromActions.ingestDatasetFailure({ err: error });
       const result = ingestorReducer(undefined, action);
 
-      expect(result.ingestionObjectApiInformation.ingestionRequestErrorMessage).toBeDefined();
+      expect(
+        result.ingestionObjectApiInformation.ingestionRequestErrorMessage,
+      ).toBeDefined();
       expect(result.error).toBe(JSON.stringify(error));
     });
   });
@@ -253,8 +309,8 @@ describe("IngestorReducer", () => {
   describe("resetIngestDataset", () => {
     it("should clear ingestion request and errors", () => {
       // First set up state with a request and error
-      const successAction = fromActions.ingestDatasetSuccess({ 
-        response: { transferId: "123", status: "done" } 
+      const successAction = fromActions.ingestDatasetSuccess({
+        response: { transferId: "123", status: "done" },
       });
       ingestorReducer(undefined, successAction);
 
@@ -263,14 +319,18 @@ describe("IngestorReducer", () => {
       const result = ingestorReducer(undefined, resetAction);
 
       expect(result.ingestionObject.ingestionRequest).toBeNull();
-      expect(result.ingestionObjectApiInformation.ingestionRequestErrorMessage).toBe("");
+      expect(
+        result.ingestionObjectApiInformation.ingestionRequestErrorMessage,
+      ).toBe("");
     });
   });
 
   describe("resetIngestorComponent", () => {
     it("should reset entire state to initial", () => {
       // Build up some modified state
-      const setEndpointAction = fromActions.setIngestorEndpoint({ ingestorEndpoint: "http://test.com" });
+      const setEndpointAction = fromActions.setIngestorEndpoint({
+        ingestorEndpoint: "http://test.com",
+      });
       const connectAction = fromActions.connectIngestor();
       ingestorReducer(undefined, setEndpointAction);
       ingestorReducer(undefined, connectAction);
@@ -286,7 +346,10 @@ describe("IngestorReducer", () => {
   describe("setNoRightsError", () => {
     it("should set no rights error and update auth status", () => {
       const error = new Error("No rights");
-      const action = fromActions.setNoRightsError({ noRightsError: true, err: error });
+      const action = fromActions.setNoRightsError({
+        noRightsError: true,
+        err: error,
+      });
       const result = ingestorReducer(undefined, action);
 
       expect(result.noRightsError).toBe(true);
@@ -296,10 +359,14 @@ describe("IngestorReducer", () => {
 
   describe("setIngestDatasetLoading", () => {
     it("should set loading state", () => {
-      const action = fromActions.setIngestDatasetLoading({ ingestionDatasetLoading: true });
+      const action = fromActions.setIngestDatasetLoading({
+        ingestionDatasetLoading: true,
+      });
       const result = ingestorReducer(undefined, action);
 
-      expect(result.ingestionObjectApiInformation.ingestionDatasetLoading).toBe(true);
+      expect(result.ingestionObjectApiInformation.ingestionDatasetLoading).toBe(
+        true,
+      );
     });
   });
 });
diff --git a/src/app/state-management/selectors/ingestor.selectors.spec.ts b/src/app/state-management/selectors/ingestor.selectors.spec.ts
index c45e271405..ea6a457bb4 100644
--- a/src/app/state-management/selectors/ingestor.selectors.spec.ts
+++ b/src/app/state-management/selectors/ingestor.selectors.spec.ts
@@ -1,10 +1,12 @@
 import * as fromSelectors from "./ingestor.selectors";
 import { IngestorState } from "state-management/state/ingestor.store";
-import { mockIngestionRequestInformation, mockMethodItems, mockFolderNodes } from "shared/MockStubs";
+import {
+  mockIngestionRequestInformation,
+  mockMethodItems,
+  mockFolderNodes,
+} from "shared/MockStubs";
 
 describe("Ingestor Selectors", () => {
-
-
   const mockIngestorState: IngestorState = {
     ingestorEndpoint: "http://localhost:3000",
     ingestorStatus: {
@@ -12,7 +14,7 @@ describe("Ingestor Selectors", () => {
       healthResponse: { status: "ok" },
       validEndpoint: true,
     },
-    ingestorAuth:{
+    ingestorAuth: {
       userInfoResponse: null,
       authIsDisabled: false,
     },
@@ -21,10 +23,10 @@ describe("Ingestor Selectors", () => {
     ingestorTransferList: { transfers: [] },
     ingestorTransferListDetailView: { transfers: [] },
     ingestionObject: mockIngestionRequestInformation,
-    ingestorExtractionMethods: { methods: mockMethodItems, total:2 },
-    ingestorBrowserActiveNode: { folders: mockFolderNodes, total:3 },
+    ingestorExtractionMethods: { methods: mockMethodItems, total: 2 },
+    ingestorBrowserActiveNode: { folders: mockFolderNodes, total: 3 },
     renderView: "all",
-    transferListRequestOptions: { page: 1, pageNumber:5 },
+    transferListRequestOptions: { page: 1, pageNumber: 5 },
     updateEditorFromThirdParty: false,
     noRightsError: false,
     ingestionObjectApiInformation: {
@@ -37,7 +39,6 @@ describe("Ingestor Selectors", () => {
     },
   } as any;
 
-
   const mockState = {
     ingestor: mockIngestorState,
   };
@@ -63,7 +64,7 @@ describe("Ingestor Selectors", () => {
 
   it("should select ingestorAuth", () => {
     const result = fromSelectors.selectIngestorAuth(mockState);
-    expect(result).toEqual({ 
+    expect(result).toEqual({
       userInfoResponse: null,
       authIsDisabled: false,
     });
@@ -96,12 +97,12 @@ describe("Ingestor Selectors", () => {
 
   it("should select ingestorExtractionMethods", () => {
     const result = fromSelectors.selectIngestorExtractionMethods(mockState);
-    expect(result).toEqual({ methods: mockMethodItems, total:2 });
+    expect(result).toEqual({ methods: mockMethodItems, total: 2 });
   });
 
   it("should select ingestorBrowserActiveNode", () => {
     const result = fromSelectors.selectIngestorBrowserActiveNode(mockState);
-    expect(result).toEqual({ folders: mockFolderNodes, total:3 });
+    expect(result).toEqual({ folders: mockFolderNodes, total: 3 });
   });
 
   it("should select ingestorRenderView", () => {
@@ -110,7 +111,8 @@ describe("Ingestor Selectors", () => {
   });
 
   it("should select ingestorTransferListRequestOptions", () => {
-    const result = fromSelectors.selectIngestorTransferListRequestOptions(mockState);
+    const result =
+      fromSelectors.selectIngestorTransferListRequestOptions(mockState);
     expect(result).toEqual({ page: 1, pageNumber: 5 });
   });
 
@@ -133,4 +135,4 @@ describe("Ingestor Selectors", () => {
     const result = fromSelectors.ingestionObjectAPIInformation(mockState);
     expect(result).toEqual(mockIngestorState.ingestionObjectApiInformation);
   });
-});
\ No newline at end of file
+});
diff --git a/src/assets/config.json b/src/assets/config.json
index ebfc2fb46e..72ceacb4d8 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -29,7 +29,7 @@
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
   "lbBaseURL": "http://127.0.0.1:3001",
-  "ingestorComponent":{
+  "ingestorComponent": {
     "ingestorEnabled": true,
     "ingestorInTransferMode": true,
     "ingestorAutodiscoveryOptions": [
@@ -505,4 +505,4 @@
       "samples": true
     }
   }
-}
\ No newline at end of file
+}

From 7c79fcd3f2beb243471c1dfa9c7921370ac51795 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 2 Oct 2025 12:15:28 +0000
Subject: [PATCH 231/245] Merge remote-tracking branch 'origin/master' into
 another-attempt

---
 .github/workflows/test.yml                    |   1 +
 cypress/e2e/datasets/datasets-general.cy.js   | 120 ++-
 cypress/e2e/datasets/datasets-metadata.cy.js  |   2 +-
 cypress/e2e/mainPage/main-page.cy.js          |   5 +-
 .../e2e/published-data/published-data.cy.js   |   5 +-
 package-lock.json                             | 784 +++++++++++++++---
 src/app/app.module.ts                         |  19 -
 .../dataset-table/dataset-table.component.ts  |  18 +-
 .../proposal-dashboard.component.scss         |   2 -
 .../proposal-side-filter.component.html       |   2 +-
 .../proposal-side-filter.component.scss       |  20 +-
 .../proposal-table.component.ts               |   4 +-
 .../table/dynamic-mat-table.component.ts      |   1 -
 .../shared-filter.component.html              |  47 +-
 .../shared-filter.component.scss              |  16 +-
 .../shared-filter/shared-filter.module.ts     |  27 +-
 src/app/shared/shared.module.ts               |   4 +-
 17 files changed, 832 insertions(+), 245 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 439508c0af..a39f87c13b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -129,6 +129,7 @@ jobs:
         uses: cypress-io/github-action@v6
         with:
           config-file: cypress.config.ts
+          browser: chrome
           install-command: npm install --omit peer
       - name: docker logs
         if: ${{ failure() }}
diff --git a/cypress/e2e/datasets/datasets-general.cy.js b/cypress/e2e/datasets/datasets-general.cy.js
index 1de59ec529..93cc83a395 100644
--- a/cypress/e2e/datasets/datasets-general.cy.js
+++ b/cypress/e2e/datasets/datasets-general.cy.js
@@ -231,37 +231,36 @@ describe("Datasets general", () => {
           },
         },
         isPublished: true,
-      }).then(() => {
-        cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
-          const testConfig = {
-            ...baseConfig,
-            defaultDatasetsListSettings: {
-              ...baseConfig.defaultDatasetsListSettings,
-              conditions: [
-                {
-                  condition: {
-                    lhs: "outgassing_values_after_1h",
-                    relation: "GREATER_THAN",
-                    rhs: 1,
-                    unit: "",
-                    unitsOptions: [
-                      "mbar l/s/cm^2",
-                      "Pa m^3/s/m^2",
-                      "bar m^3/s/m^2",
-                    ],
-                  },
-                  enabled: false,
+      });
+      cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
+        const testConfig = {
+          ...baseConfig,
+          defaultDatasetsListSettings: {
+            ...baseConfig.defaultDatasetsListSettings,
+            conditions: [
+              {
+                condition: {
+                  lhs: "outgassing_values_after_1h",
+                  relation: "GREATER_THAN",
+                  rhs: 1,
+                  unit: "",
+                  unitsOptions: [
+                    "mbar l/s/cm^2",
+                    "Pa m^3/s/m^2",
+                    "bar m^3/s/m^2",
+                  ],
                 },
-              ],
-            },
-          };
-
-          cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
-          cy.visit("/datasets");
-          cy.wait("@getConfig", { timeout: 20000 });
-          cy.finishedLoading();
-        });
+                enabled: false,
+              },
+            ],
+          },
+        };
+
+        cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
       });
+      cy.visit("/datasets");
+      cy.wait("@getConfig", { timeout: 20000 });
+      cy.finishedLoading();
     });
 
     it("should display limited options in units dropdown", () => {
@@ -319,7 +318,7 @@ describe("Datasets general", () => {
 
         cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
         cy.visit("/datasets");
-        cy.wait("@getConfig", { timeout: 10000 });
+        cy.wait("@getConfig");
         cy.finishedLoading();
       });
     });
@@ -342,38 +341,37 @@ describe("Datasets general", () => {
           extra_entry_end_time: { type: "number", value: 2, unit: "" },
         },
         isPublished: true,
-      }).then(() => {
-        cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
-          const relationsToTest = [
-            { relation: "GREATER_THAN", rhs: 1 },
-            { relation: "LESS_THAN", rhs: 3 },
-            { relation: "EQUAL_TO_NUMERIC", rhs: 2 },
-            { relation: "GREATER_THAN_OR_EQUAL", rhs: 2 },
-            { relation: "LESS_THAN_OR_EQUAL", rhs: 2 },
-            { relation: "RANGE", rhs: [1, 3] },
-          ];
-          const testConfig = {
-            ...baseConfig,
-            defaultDatasetsListSettings: {
-              ...baseConfig.defaultDatasetsListSettings,
-              conditions: relationsToTest.map(({ relation, rhs }) => ({
-                condition: {
-                  lhs: "extra_entry_end_time",
-                  relation,
-                  rhs,
-                  unit: "",
-                },
-                enabled: true,
-              })),
-            },
-          };
-
-          cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
-          cy.visit("/datasets");
-          cy.wait("@getConfig", { timeout: 20000 });
-          cy.finishedLoading();
-        });
       });
+
+      cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
+        const relationsToTest = [
+          { relation: "GREATER_THAN", rhs: 1 },
+          { relation: "LESS_THAN", rhs: 3 },
+          { relation: "EQUAL_TO_NUMERIC", rhs: 2 },
+          { relation: "GREATER_THAN_OR_EQUAL", rhs: 2 },
+          { relation: "LESS_THAN_OR_EQUAL", rhs: 2 },
+          { relation: "RANGE", rhs: [1, 3] },
+        ];
+        const testConfig = {
+          ...baseConfig,
+          defaultDatasetsListSettings: {
+            ...baseConfig.defaultDatasetsListSettings,
+            conditions: relationsToTest.map(({ relation, rhs }) => ({
+              condition: {
+                lhs: "extra_entry_end_time",
+                relation,
+                rhs,
+                unit: "",
+              },
+              enabled: true,
+            })),
+          },
+        };
+
+        cy.intercept("GET", "**/admin/config", testConfig).as("getConfig");
+      });
+      cy.visit("/datasets");
+      cy.wait("@getConfig");
     });
 
     it("should check if pre-configured conditions are applied", () => {
diff --git a/cypress/e2e/datasets/datasets-metadata.cy.js b/cypress/e2e/datasets/datasets-metadata.cy.js
index c9a2d7c692..4407708280 100644
--- a/cypress/e2e/datasets/datasets-metadata.cy.js
+++ b/cypress/e2e/datasets/datasets-metadata.cy.js
@@ -403,7 +403,7 @@ describe("Datasets", () => {
   describe("Different metadata types", () => {
     it("should be able to add a metadata entry with type 'date'", () => {
       const newMetadataName = "Cypress dataset date metadata";
-      const metaDataInvalidValue = "20";
+      const metaDataInvalidValue = "20ab";
       const metadata = {
         value: "2025-03-05 10:48",
         name: "date_metadata",
diff --git a/cypress/e2e/mainPage/main-page.cy.js b/cypress/e2e/mainPage/main-page.cy.js
index a043583679..9af3da60ce 100644
--- a/cypress/e2e/mainPage/main-page.cy.js
+++ b/cypress/e2e/mainPage/main-page.cy.js
@@ -67,9 +67,6 @@ describe("Main Page", () => {
 
   describe("Main page configuration as authenticated user", () => {
     it("should visit main page correctly configured", () => {
-      const username = Cypress.env("username");
-      const password = Cypress.env("password");
-
       cy.visit("/");
       cy.finishedLoading();
 
@@ -94,7 +91,7 @@ describe("Main Page", () => {
         "button.mat-mdc-menu-item:nth-child(2) > span:nth-child(2) > span:nth-child(1)",
       ).should("contain", "Files");
 
-      cy.get("div.main-menu").click();
+      cy.get("body").type("{esc}");
 
       cy.get('[data-cy="login-button"]').should("not.exist");
       cy.get(".user-button").should("exist");
diff --git a/cypress/e2e/published-data/published-data.cy.js b/cypress/e2e/published-data/published-data.cy.js
index 0a3ad13bd4..337d98120c 100644
--- a/cypress/e2e/published-data/published-data.cy.js
+++ b/cypress/e2e/published-data/published-data.cy.js
@@ -140,7 +140,10 @@ describe("Datasets general", () => {
 
       cy.isLoading();
 
-      cy.get(".dataset-table mat-row input[type='checkbox']").last().click();
+      cy.get(".dataset-table mat-row input[type='checkbox']")
+        .last()
+        .and("not.be.disabled")
+        .click();
 
       cy.get("#addToBatchButton").click();
 
diff --git a/package-lock.json b/package-lock.json
index 66c43e777f..66128302c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3597,9 +3597,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.35.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.35.0.tgz",
-      "integrity": "sha512-30iXE9whjlILfWobBkNerJo+TXYsgVM5ERQwMcMKCHckHflCmf7wXDAHlARoWnh0s1U72WqlbeyE7iAcCzuCPw==",
+      "version": "9.36.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.36.0.tgz",
+      "integrity": "sha512-uhCbYtYynH30iZErszX78U+nR3pJU3RHGQ57NXy5QupD4SBVwDeU8TNBy+MjMngc1UyIW9noKqsRqfjQTBU2dw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6702,6 +6702,13 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@types/tmp": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
+      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/ws": {
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
@@ -6724,17 +6731,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.44.0.tgz",
-      "integrity": "sha512-EGDAOGX+uwwekcS0iyxVDmRV9HX6FLSM5kzrAToLTsr9OWCIKG/y3lQheCq18yZ5Xh78rRKJiEpP0ZaCs4ryOQ==",
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.45.0.tgz",
+      "integrity": "sha512-HC3y9CVuevvWCl/oyZuI47dOeDF9ztdMEfMH8/DW/Mhwa9cCLnK1oD7JoTVGW/u7kFzNZUKUoyJEqkaJh5y3Wg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.44.0",
-        "@typescript-eslint/type-utils": "8.44.0",
-        "@typescript-eslint/utils": "8.44.0",
-        "@typescript-eslint/visitor-keys": "8.44.0",
+        "@typescript-eslint/scope-manager": "8.45.0",
+        "@typescript-eslint/type-utils": "8.45.0",
+        "@typescript-eslint/utils": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -6748,23 +6755,450 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.44.0",
-        "eslint": "^8.57.0 || ^9.0.0",
+        "@typescript-eslint/parser": "^8.45.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.45.0.tgz",
+      "integrity": "sha512-clmm8XSNj/1dGvJeO6VGH7EUSeA0FMs+5au/u3lrA3KfG8iJ4u8ym9/j2tTEoacAffdW1TVUzXO30W1JTJS7dA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
+      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.45.0.tgz",
+      "integrity": "sha512-GfE1NfVbLam6XQ0LcERKwdTTPlLvHvXXhOeUGC1OXi4eQBoyy1iVsW+uzJ/J9jtCz6/7GCQ9MtrQ0fml/jWCnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.45.0",
+        "@typescript-eslint/tsconfig-utils": "8.45.0",
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.45.0.tgz",
+      "integrity": "sha512-bxi1ht+tLYg4+XV2knz/F7RVhU0k6VrSMc9sb8DQ6fyCTrGQLHfo7lDtN0QJjZjKkLA2ThrKuCdHEvLReqtIGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.45.0",
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/typescript-estree": "8.45.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.45.0.tgz",
+      "integrity": "sha512-qsaFBA3e09MIDAGFUrTk+dzqtfv1XPVz8t8d1f0ybTzrCY7BKiMC5cjrl1O/P7UmHsNyW90EYSkU/ZWpmXelag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.45.0",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.45.0.tgz",
+      "integrity": "sha512-TGf22kon8KW+DeKaUmOibKWktRY8b2NSAZNdtWh798COm1NWx8+xJ6iFBtk3IvLdv6+LGLJLRlyhrhEDZWargQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.45.0",
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/typescript-estree": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.45.0.tgz",
+      "integrity": "sha512-clmm8XSNj/1dGvJeO6VGH7EUSeA0FMs+5au/u3lrA3KfG8iJ4u8ym9/j2tTEoacAffdW1TVUzXO30W1JTJS7dA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
+      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.45.0.tgz",
+      "integrity": "sha512-GfE1NfVbLam6XQ0LcERKwdTTPlLvHvXXhOeUGC1OXi4eQBoyy1iVsW+uzJ/J9jtCz6/7GCQ9MtrQ0fml/jWCnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.45.0",
+        "@typescript-eslint/tsconfig-utils": "8.45.0",
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.45.0.tgz",
+      "integrity": "sha512-qsaFBA3e09MIDAGFUrTk+dzqtfv1XPVz8t8d1f0ybTzrCY7BKiMC5cjrl1O/P7UmHsNyW90EYSkU/ZWpmXelag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.45.0",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.45.0.tgz",
+      "integrity": "sha512-3pcVHwMG/iA8afdGLMuTibGR7pDsn9RjDev6CCB+naRsSYs2pns5QbinF4Xqw6YC/Sj3lMrm/Im0eMfaa61WUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.45.0",
+        "@typescript-eslint/types": "^8.45.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
+      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.44.0.tgz",
+      "integrity": "sha512-87Jv3E+al8wpD+rIdVJm/ItDBe/Im09zXIjFoipOjr5gHUhJmTzfFLuTJ/nPTMc2Srsroy4IBXwcTCHyRR7KzA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.44.0",
+        "@typescript-eslint/visitor-keys": "8.44.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
+      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.44.0.tgz",
+      "integrity": "sha512-x5Y0+AuEPqAInc6yd0n5DAcvtoQ/vyaGwuX5HE9n6qAefk1GaedqrLQF8kQGylLUb9pnZyLf+iEiL9fr8APDtQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.45.0.tgz",
+      "integrity": "sha512-bpjepLlHceKgyMEPglAeULX1vixJDgaKocp0RVJ5u4wLJIMNuKtUXIczpJCPcn2waII0yuvks/5m5/h3ZQKs0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/typescript-estree": "8.45.0",
+        "@typescript-eslint/utils": "8.45.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.45.0.tgz",
+      "integrity": "sha512-clmm8XSNj/1dGvJeO6VGH7EUSeA0FMs+5au/u3lrA3KfG8iJ4u8ym9/j2tTEoacAffdW1TVUzXO30W1JTJS7dA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
+      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.44.0.tgz",
-      "integrity": "sha512-VGMpFQGUQWYT9LfnPcX8ouFojyrZ/2w3K5BucvxL/spdNehccKhB4jUyB1yBCXpr2XFm0jkECxgrpXBW2ipoAw==",
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.45.0.tgz",
+      "integrity": "sha512-GfE1NfVbLam6XQ0LcERKwdTTPlLvHvXXhOeUGC1OXi4eQBoyy1iVsW+uzJ/J9jtCz6/7GCQ9MtrQ0fml/jWCnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.44.0",
-        "@typescript-eslint/types": "8.44.0",
-        "@typescript-eslint/typescript-estree": "8.44.0",
-        "@typescript-eslint/visitor-keys": "8.44.0",
-        "debug": "^4.3.4"
+        "@typescript-eslint/project-service": "8.45.0",
+        "@typescript-eslint/tsconfig-utils": "8.45.0",
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6774,20 +7208,20 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.44.0.tgz",
-      "integrity": "sha512-ZeaGNraRsq10GuEohKTo4295Z/SuGcSq2LzfGlqiuEvfArzo/VRrT0ZaJsVPuKZ55lVbNk8U6FcL+ZMH8CoyVA==",
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.45.0.tgz",
+      "integrity": "sha512-bxi1ht+tLYg4+XV2knz/F7RVhU0k6VrSMc9sb8DQ6fyCTrGQLHfo7lDtN0QJjZjKkLA2ThrKuCdHEvLReqtIGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.44.0",
-        "@typescript-eslint/types": "^8.44.0",
-        "debug": "^4.3.4"
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.45.0",
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/typescript-estree": "8.45.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6797,18 +7231,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.44.0.tgz",
-      "integrity": "sha512-87Jv3E+al8wpD+rIdVJm/ItDBe/Im09zXIjFoipOjr5gHUhJmTzfFLuTJ/nPTMc2Srsroy4IBXwcTCHyRR7KzA==",
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.45.0.tgz",
+      "integrity": "sha512-qsaFBA3e09MIDAGFUrTk+dzqtfv1XPVz8t8d1f0ybTzrCY7BKiMC5cjrl1O/P7UmHsNyW90EYSkU/ZWpmXelag==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.44.0",
-        "@typescript-eslint/visitor-keys": "8.44.0"
+        "@typescript-eslint/types": "8.45.0",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6818,52 +7253,39 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.44.0.tgz",
-      "integrity": "sha512-x5Y0+AuEPqAInc6yd0n5DAcvtoQ/vyaGwuX5HE9n6qAefk1GaedqrLQF8kQGylLUb9pnZyLf+iEiL9fr8APDtQ==",
+    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.44.0.tgz",
-      "integrity": "sha512-9cwsoSxJ8Sak67Be/hD2RNt/fsqmWnNE1iHohG8lxqLSNY8xNfyY7wloo5zpW3Nu9hxVgURevqfcH6vvKCt6yg==",
+    "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "@typescript-eslint/types": "8.44.0",
-        "@typescript-eslint/typescript-estree": "8.44.0",
-        "@typescript-eslint/utils": "8.44.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^2.1.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
-      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.45.0.tgz",
+      "integrity": "sha512-WugXLuOIq67BMgQInIxxnsSyRLFxdkJEJu8r4ngLR56q/4Q5LrbfkFRH27vMTjxEK8Pyz7QfzuZe/G15qQnVRA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6880,6 +7302,7 @@
       "integrity": "sha512-lqNj6SgnGcQZwL4/SBJ3xdPEfcBuhCG8zdcwCPgYcmiPLgokiNDKlbPzCwEwu7m279J/lBYWtDYL+87OEfn8Jw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/project-service": "8.44.0",
         "@typescript-eslint/tsconfig-utils": "8.44.0",
@@ -6903,12 +7326,51 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/project-service": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.44.0.tgz",
+      "integrity": "sha512-ZeaGNraRsq10GuEohKTo4295Z/SuGcSq2LzfGlqiuEvfArzo/VRrT0ZaJsVPuKZ55lVbNk8U6FcL+ZMH8CoyVA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.44.0",
+        "@typescript-eslint/types": "^8.44.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/types": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
+      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -6925,6 +7387,7 @@
       "integrity": "sha512-nktOlVcg3ALo0mYlV+L7sWUD58KG4CMj1rb2HUVOO4aL3K/6wcD+NERqd0rrA5Vg06b42YhF6cFxeixsp9Riqg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
         "@typescript-eslint/scope-manager": "8.44.0",
@@ -6943,12 +7406,28 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
+      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "8.44.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.44.0.tgz",
       "integrity": "sha512-zaz9u8EJ4GBmnehlrpoKvj/E3dNbuQ7q0ucyZImm3cLqJ8INTc970B1qEqDX/Rzq65r3TvVTN7kHWPBoyW7DWw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "8.44.0",
         "eslint-visitor-keys": "^4.2.1"
@@ -6961,12 +7440,28 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
+      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
       "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -8435,16 +8930,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/check-more-types": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
-      "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/chokidar": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
@@ -9241,9 +9726,9 @@
       "license": "MIT"
     },
     "node_modules/cypress": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.2.0.tgz",
-      "integrity": "sha512-J4ehSzOSb58SkXyldCe9y/oZ8ep8Bl6+q9kDUjnkqNqc2ZKzDq5KSbhIc2lHFAFR5Jtj10oNqr9JRAZbr8DA8A==",
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.3.0.tgz",
+      "integrity": "sha512-g9rDhoK9y8wW4Vx3Ppr8dtfvThXxPL3mJsV5e98fG+6EerrhXKmeRT2sL86cvNRtEZouXJfsuVL1lqiMuGNGcg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -9252,13 +9737,13 @@
         "@cypress/xvfb": "^1.2.4",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
+        "@types/tmp": "^0.2.3",
         "arch": "^2.2.0",
         "blob-util": "^2.0.2",
         "bluebird": "^3.7.2",
         "buffer": "^5.7.1",
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
-        "check-more-types": "^2.24.0",
         "ci-info": "^4.1.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "0.6.1",
@@ -9275,7 +9760,6 @@
         "fs-extra": "^9.1.0",
         "hasha": "5.2.2",
         "is-installed-globally": "~0.4.0",
-        "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
         "lodash": "^4.17.21",
         "log-symbols": "^4.0.0",
@@ -9297,7 +9781,7 @@
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": "^20.0.0 || ^22.0.0 || >=24.0.0"
+        "node": "^20.1.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/cypress/node_modules/ansi-escapes": {
@@ -10354,9 +10838,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.35.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.35.0.tgz",
-      "integrity": "sha512-QePbBFMJFjgmlE+cXAlbHZbHpdFVS2E/6vzCy7aKlebddvl1vadiC4JFV5u/wqTkNUwEV8WrQi257jf5f06hrg==",
+      "version": "9.36.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.36.0.tgz",
+      "integrity": "sha512-hB4FIzXovouYzwzECDcUkJ4OcfOEkXTv2zRY6B9bkwjx/cprAq0uvm1nl7zvQ0/TsUk0zQiN4uPfJpB9m+rPMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10366,7 +10850,7 @@
         "@eslint/config-helpers": "^0.3.1",
         "@eslint/core": "^0.15.2",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.35.0",
+        "@eslint/js": "9.36.0",
         "@eslint/plugin-kit": "^0.3.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -11115,12 +11599,12 @@
       "license": "MIT"
     },
     "node_modules/filesize": {
-      "version": "11.0.7",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.7.tgz",
-      "integrity": "sha512-HozRSaD6ZrUdUVdSI9kJPsI9TzDZb+OZNL0xOWlxkQGfOsjh5Fp1AAI7GObJutOpclSBycHBDEREzwYcXPo8Ew==",
+      "version": "11.0.13",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.13.tgz",
+      "integrity": "sha512-mYJ/qXKvREuO0uH8LTQJ6v7GsUvVOguqxg2VTwQUkyTPXXRRWPdjuUPVqdBrJQhvci48OHlNGRnux+Slr2Rnvw==",
       "license": "BSD-3-Clause",
       "engines": {
-        "node": ">= 10.4.0"
+        "node": ">= 10.8.0"
       }
     },
     "node_modules/fill-range": {
@@ -12966,23 +13450,23 @@
       }
     },
     "node_modules/jasmine": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-5.10.0.tgz",
-      "integrity": "sha512-v4FojO8cXQdx15mJXovGhjJOvyIcVf7AC+H0ZahnfLk52vUbwuLxjVgbikc95yLmgwKQsFT47/FGQ3dOrWVxtQ==",
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-5.11.0.tgz",
+      "integrity": "sha512-MhIYY2pLfRA5hhIvY72ZLilwKeZEBuTyIUv9JDB+b+pEYehsJDW2obKF2dmMtWaFG6pDiFiAUNphpZ7SW7fFMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "glob": "^10.2.2",
-        "jasmine-core": "~5.10.0"
+        "jasmine-core": "~5.11.0"
       },
       "bin": {
         "jasmine": "bin/jasmine.js"
       }
     },
     "node_modules/jasmine-core": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.10.0.tgz",
-      "integrity": "sha512-MrChbWV5LBo+EaeKwTM1eZ6oYSz1brvFExnRafraEkJkbJ9evbUxABhnIgGQimhpMxhg+BD6QmOvb/e3NXsNdg==",
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.11.0.tgz",
+      "integrity": "sha512-MPJ8L5yyNul0F2SuEsLASwESXQjJvBXnKu31JWFyRZSvuv2B79K4GDWN3pSqvLheUNh7Fyb6dXwd4rsz95O2Kg==",
       "dev": true,
       "license": "MIT"
     },
@@ -13705,16 +14189,6 @@
         "shell-quote": "^1.8.3"
       }
     },
-    "node_modules/lazy-ass": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
-      "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "> 0.8"
-      }
-    },
     "node_modules/lazystream": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
@@ -18992,6 +19466,104 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.44.0.tgz",
+      "integrity": "sha512-EGDAOGX+uwwekcS0iyxVDmRV9HX6FLSM5kzrAToLTsr9OWCIKG/y3lQheCq18yZ5Xh78rRKJiEpP0ZaCs4ryOQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.44.0",
+        "@typescript-eslint/type-utils": "8.44.0",
+        "@typescript-eslint/utils": "8.44.0",
+        "@typescript-eslint/visitor-keys": "8.44.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^7.0.0",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.44.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/parser": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.44.0.tgz",
+      "integrity": "sha512-VGMpFQGUQWYT9LfnPcX8ouFojyrZ/2w3K5BucvxL/spdNehccKhB4jUyB1yBCXpr2XFm0jkECxgrpXBW2ipoAw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.44.0",
+        "@typescript-eslint/types": "8.44.0",
+        "@typescript-eslint/typescript-estree": "8.44.0",
+        "@typescript-eslint/visitor-keys": "8.44.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/type-utils": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.44.0.tgz",
+      "integrity": "sha512-9cwsoSxJ8Sak67Be/hD2RNt/fsqmWnNE1iHohG8lxqLSNY8xNfyY7wloo5zpW3Nu9hxVgURevqfcH6vvKCt6yg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.44.0",
+        "@typescript-eslint/typescript-estree": "8.44.0",
+        "@typescript-eslint/utils": "8.44.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/types": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
+      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/ua-parser-js": {
       "version": "0.7.41",
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.41.tgz",
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 59f9fa88f1..19c51956a3 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -16,8 +16,6 @@ import { StoreModule } from "@ngrx/store";
 import { ApiModule, Configuration } from "@scicatproject/scicat-sdk-ts-angular";
 import { routerReducer } from "@ngrx/router-store";
 import { extModules } from "./build-specifics";
-import { MAT_DATE_FORMATS } from "@angular/material/core";
-
 import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
 import {
   MAT_FORM_FIELD_DEFAULT_OPTIONS,
@@ -130,23 +128,6 @@ const apiConfigurationFn = (
       },
       deps: [AppConfigService],
     },
-    {
-      provide: MAT_DATE_FORMATS,
-      useFactory: (appConfigService: AppConfigService) => {
-        const base =
-          appConfigService.getConfig().dateFormat || "yyyy-MM-dd HH:mm";
-        return {
-          parse: { dateInput: base },
-          display: {
-            dateInput: base,
-            monthYearLabel: "MMM yyyy",
-            dateA11yLabel: "LL",
-            monthYearA11yLabel: "MMMM yyyy",
-          },
-        };
-      },
-      deps: [AppConfigService],
-    },
     AuthService,
     AppThemeService,
     Title,
diff --git a/src/app/datasets/dataset-table/dataset-table.component.ts b/src/app/datasets/dataset-table/dataset-table.component.ts
index d16e189b2a..211db2d541 100644
--- a/src/app/datasets/dataset-table/dataset-table.component.ts
+++ b/src/app/datasets/dataset-table/dataset-table.component.ts
@@ -214,7 +214,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy {
   saveTableSettings(setting: ITableSetting) {
     this.pending = true;
     const columnsSetting = setting.columnSetting.map((column, index) => {
-      const { name, display, width, type } = column;
+      const { name, display, width, type, format } = column;
 
       return {
         name,
@@ -222,6 +222,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy {
         order: index,
         width,
         type,
+        format,
       };
     });
     this.store.dispatch(
@@ -271,10 +272,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy {
     if (event === TableEventType.SortChanged) {
       const { active, direction } = sender as Sort;
 
-      let column = active;
-      if (column === "runNumber") {
-        column = "scientificMetadata.runNumber.value";
-      }
+      const column = active;
 
       this.store.dispatch(sortByColumnAction({ column, direction }));
     }
@@ -367,8 +365,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy {
 
   onSortChange(event: SortChangeEvent): void {
     const { active, direction } = event;
-    let column = active.split("_")[1];
-    if (column === "runNumber") column = "scientificMetadata.runNumber.value";
+    const column = active.split("_")[1];
     this.store.dispatch(sortByColumnAction({ column, direction }));
   }
 
@@ -387,13 +384,6 @@ export class DatasetTableComponent implements OnInit, OnDestroy {
           tooltip: column.tooltip,
         };
 
-        if (column.name === "runNumber" && column.type !== "custom") {
-          // NOTE: This is for the saved columns in the database or the old config.
-          convertedColumn.customRender = (c, row) =>
-            lodashGet(row, "scientificMetadata.runNumber.value");
-          convertedColumn.toExport = (row) =>
-            lodashGet(row, "scientificMetadata.runNumber.value");
-        }
         // NOTE: This is how we render the custom columns if new config is used.
         if (column.type === "custom") {
           convertedColumn.customRender = (c, row) =>
diff --git a/src/app/proposals/proposal-dashboard/proposal-dashboard.component.scss b/src/app/proposals/proposal-dashboard/proposal-dashboard.component.scss
index ec634658b0..2acf2d23c6 100644
--- a/src/app/proposals/proposal-dashboard/proposal-dashboard.component.scss
+++ b/src/app/proposals/proposal-dashboard/proposal-dashboard.component.scss
@@ -8,8 +8,6 @@ mat-sidenav-container {
       margin-top: 3.5rem;
     }
     .action-column {
-      margin-right: 0.5rem;
-
       .add-card {
         margin: 1rem 0 1rem;
         text-align: center;
diff --git a/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.html b/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.html
index a762409343..198099af30 100644
--- a/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.html
+++ b/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.html
@@ -1,4 +1,4 @@
-<mat-card *ngIf="!collapsed">
+<mat-card *ngIf="!collapsed" [class.side-gap]="!collapsed">
   <mat-card-header class="section-container">
     <mat-card-title>{{ collapsed ? "" : "Filters" }} </mat-card-title>
     <button
diff --git a/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.scss b/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.scss
index 4c67761108..f5bfeb877d 100644
--- a/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.scss
+++ b/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.scss
@@ -1,6 +1,10 @@
 mat-card {
   margin-top: 0.5rem;
 
+  &.side-gap {
+    margin-right: 0.5rem;
+  }
+
   .section-container {
     display: flex;
     justify-content: space-between;
@@ -27,13 +31,11 @@ mat-card {
 }
 
 .small-btn {
-  padding: 2px;
-
-  width: 24px;
-  height: 24px;
-
-  margin-top: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+  position: absolute;
+  z-index: 10;
+  background: none;
+  top: 1.125rem;
+  left: 0.625rem;
+  scale: 0.9;
+  background: rgba($color: #000000, $alpha: 0.05);
 }
diff --git a/src/app/proposals/proposal-table/proposal-table.component.ts b/src/app/proposals/proposal-table/proposal-table.component.ts
index d2a3f34c2d..525c5c8c4f 100644
--- a/src/app/proposals/proposal-table/proposal-table.component.ts
+++ b/src/app/proposals/proposal-table/proposal-table.component.ts
@@ -243,13 +243,15 @@ export class ProposalTableComponent implements OnInit, OnDestroy {
   saveTableSettings(setting: ITableSetting) {
     this.pending = true;
     const columnsSetting = setting.columnSetting.map((column) => {
-      const { name, display, index, width } = column;
+      const { name, display, index, width, type, format } = column;
 
       return {
         name,
         enabled: !!(display === "visible"),
         order: index,
         width,
+        type,
+        format,
       };
     });
 
diff --git a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts
index 87569eee60..2ec50d6de9 100644
--- a/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts
+++ b/src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.ts
@@ -553,7 +553,6 @@ export class DynamicMatTableComponent<T extends TableRow>
     if (column.customRender) {
       return column.customRender(column, row);
     }
-
     return row[column.name];
   }
 
diff --git a/src/app/shared/modules/shared-filter/shared-filter.component.html b/src/app/shared/modules/shared-filter/shared-filter.component.html
index e2aa99181b..9d44efdf0f 100644
--- a/src/app/shared/modules/shared-filter/shared-filter.component.html
+++ b/src/app/shared/modules/shared-filter/shared-filter.component.html
@@ -44,24 +44,24 @@
     </ng-container>
 
     <ng-container *ngSwitchCase="'checkbox'">
-      <ng-container *ngIf="checkboxFacetCounts?.length > 0">
-        <div class="filter-group">
-          <mat-label class="filter-title">{{
-            label | translate: localization
-          }}</mat-label>
-          <mat-form-field
-            appearance="outline"
-            class="facet-search"
-            floatLabel="always"
-          >
-            <mat-label>Type to filter</mat-label>
-            <input
-              matInput
-              type="search"
-              formControlName="textField"
-              placeholder="{{ placeholder }}"
-            />
-          </mat-form-field>
+      <div class="filter-group">
+        <mat-label class="filter-title">{{
+          label | translate: localization
+        }}</mat-label>
+        <mat-form-field
+          appearance="outline"
+          class="facet-search"
+          floatLabel="always"
+        >
+          <mat-label>Type to filter</mat-label>
+          <input
+            matInput
+            type="search"
+            formControlName="textField"
+            placeholder="{{ placeholder }}"
+          />
+        </mat-form-field>
+        <ng-container *ngIf="visibleFacetCounts?.length > 0; else noItems">
           <div class="checkbox-list">
             <mat-checkbox
               *ngFor="let field of visibleFacetCounts; trackBy: trackById"
@@ -76,10 +76,15 @@
           <div class="show-more-btn" *ngIf="hasMore">
             <button mat-button (click)="onShowMore()">Show more...</button>
           </div>
-        </div>
-        <mat-divider />
-      </ng-container>
+        </ng-container>
+        <ng-template #noItems>
+          <div class="empty-text">No options found</div>
+        </ng-template>
+      </div>
+
+      <mat-divider />
     </ng-container>
+
     <ng-container *ngSwitchCase="'multiSelect'">
       <multiselect-filter
         [key]="key"
diff --git a/src/app/shared/modules/shared-filter/shared-filter.component.scss b/src/app/shared/modules/shared-filter/shared-filter.component.scss
index aaef55fa31..6519b940b6 100644
--- a/src/app/shared/modules/shared-filter/shared-filter.component.scss
+++ b/src/app/shared/modules/shared-filter/shared-filter.component.scss
@@ -6,6 +6,14 @@
   @include mat.form-field-density(-5);
 }
 
+::ng-deep .mat-date-range-input-wrapper {
+  min-width: 100px;
+}
+
+::ng-deep .mat-date-range-input-separator {
+  color: var(--theme-primary-default) !important;
+}
+
 .mat-mdc-form-field {
   width: 100%;
 }
@@ -45,7 +53,13 @@
   }
 }
 
+.empty-text {
+  font-size: 0.765em;
+  color: rgba($color: #000000, $alpha: 0.5);
+  text-align: center;
+}
+
 mat-divider {
-  margin: 0.8em 0;
+  margin: 0.4em 0;
   opacity: 0.4;
 }
diff --git a/src/app/shared/modules/shared-filter/shared-filter.module.ts b/src/app/shared/modules/shared-filter/shared-filter.module.ts
index 4cc4cdb363..f95cd61d9f 100644
--- a/src/app/shared/modules/shared-filter/shared-filter.module.ts
+++ b/src/app/shared/modules/shared-filter/shared-filter.module.ts
@@ -9,7 +9,7 @@ import { SharedFilterComponent } from "./shared-filter.component";
 import { ReactiveFormsModule } from "@angular/forms";
 import { MatFormFieldModule } from "@angular/material/form-field";
 import { MultiSelectFilterComponent } from "../filters/multiselect-filter.component";
-import { MatOptionModule } from "@angular/material/core";
+import { MAT_DATE_FORMATS, MatOptionModule } from "@angular/material/core";
 import { MatChipsModule } from "@angular/material/chips";
 import { NgxNumericRangeFormFieldModule } from "../numeric-range/ngx-numeric-range-form-field.module";
 import { MatAutocompleteModule } from "@angular/material/autocomplete";
@@ -17,6 +17,8 @@ import { MatDividerModule } from "@angular/material/divider";
 import { MatCheckboxModule } from "@angular/material/checkbox";
 import { MatButtonModule } from "@angular/material/button";
 import { PipesModule } from "shared/pipes/pipes.module";
+import { provideLuxonDateAdapter } from "@angular/material-luxon-adapter";
+import { AppConfigService } from "app-config.service";
 
 @NgModule({
   declarations: [SharedFilterComponent, MultiSelectFilterComponent],
@@ -38,6 +40,29 @@ import { PipesModule } from "shared/pipes/pipes.module";
     MatChipsModule,
     NgxNumericRangeFormFieldModule,
   ],
+  // Force shared-filter to use the Luxon adapter.
+  // Needed because JsonFormsAngularMaterialModule brings in MatNativeDateModule,
+  // which otherwise switches the DateAdapter to the native one.
+  providers: [
+    provideLuxonDateAdapter(),
+    {
+      provide: MAT_DATE_FORMATS,
+      useFactory: (appConfigService: AppConfigService) => {
+        const base =
+          appConfigService.getConfig().dateFormat || "yyyy-MM-dd HH:mm";
+        return {
+          parse: { dateInput: base },
+          display: {
+            dateInput: base,
+            monthYearLabel: "MMM yyyy",
+            dateA11yLabel: "LL",
+            monthYearA11yLabel: "MMMM yyyy",
+          },
+        };
+      },
+      deps: [AppConfigService],
+    },
+  ],
   exports: [SharedFilterComponent, MultiSelectFilterComponent],
 })
 export class SharedFilterModule {}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 7d2c4fbe4f..c034ed8636 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -42,7 +42,6 @@ import { JsonformsAccordionRendererService } from "./services/jsonforms-accordio
     SearchParametersDialogModule,
     CommonModule,
     FormsModule,
-    SharedFilterModule,
     SharedTableModule,
     ScientificMetadataTreeModule,
     DynamicMatTableModule.forRoot({}),
@@ -51,6 +50,7 @@ import { JsonformsAccordionRendererService } from "./services/jsonforms-accordio
     JsonFormsModule,
     JsonFormsAngularMaterialModule,
     JsonFormsCustomRenderersModule,
+    SharedFilterModule,
   ],
   providers: [
     ConfigService,
@@ -72,7 +72,6 @@ import { JsonformsAccordionRendererService } from "./services/jsonforms-accordio
     TableModule,
     CommonModule,
     FormsModule,
-    SharedFilterModule,
     SharedTableModule,
     ScientificMetadataTreeModule,
     DynamicMatTableModule,
@@ -81,6 +80,7 @@ import { JsonformsAccordionRendererService } from "./services/jsonforms-accordio
     JsonFormsModule,
     JsonFormsAngularMaterialModule,
     JsonFormsCustomRenderersModule,
+    SharedFilterModule,
   ],
 })
 export class SharedScicatFrontendModule {}

From f2dbd20f8a664f146638292ef9174a896af7426c Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 2 Oct 2025 14:45:45 +0000
Subject: [PATCH 232/245] disable ingestor

---
 .../ingestor.new-transfer-dialog-page.component.ts    | 10 ----------
 .../ingestor.user-metadata-dialog-page.component.ts   | 11 ++++-------
 .../ingestor.creation-dialog-base.html                |  9 +++++++--
 src/assets/config.json                                | 10 +++++-----
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index d8c5ea2056..9dd6c4ab3d 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -266,16 +266,6 @@ export class IngestorNewTransferDialogPageComponent
     // Emit once to go to next step
     this.nextStep.emit();
 
-    // In CREATION mode with no schema, skip the scientific metadata page
-    if (
-      this.createNewTransferData.editorMode === "CREATION" &&
-      (!this.createNewTransferData.selectedSchemaFileContent ||
-        this.createNewTransferData.selectedSchemaFileContent === "")
-    ) {
-      // Emit again to skip scientific metadata and go straight to confirm
-      this.nextStep.emit();
-      this.nextStep.emit();
-    }
   }
 
   onDataChangeUserScicatHeader(event: any) {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index b7a6940e58..f806c270d2 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -22,6 +22,8 @@ import * as fromActions from "state-management/actions/ingestor.actions";
 import { Store } from "@ngrx/store";
 import { Subscription } from "rxjs";
 import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
+import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
+
 
 @Component({
   selector: "ingestor-user-metadata-dialog",
@@ -157,14 +159,9 @@ export class IngestorUserMetadataDialogPageComponent
   }
 
   scicatHeaderErrorsHandler(errors: any[]) {
-    const result = IngestorMetadataEditorHelper.processMetadataErrors(
-      errors,
-      this.scicatHeaderSchema,
-      this.activeRenderView,
-    );
+    this.isSciCatHeaderOk = errors.length === 0;
+    this.scicatHeaderErrors = convertJSONFormsErrorToString(errors);
 
-    this.isSciCatHeaderOk = result.isValid;
-    this.scicatHeaderErrors = result.errorString;
     this.validateNextButton();
     this.cdr.detectChanges();
   }
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
index 41a075f35c..a3c6c3c987 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.html
@@ -23,8 +23,13 @@
 <ingestor-confirm-transfer-dialog-page
   *ngIf="currentDialogStep === 'CONFIRM_TRANSFER' && !showNoRightsDialog"
   (nextStep)="onClickStartIngestion()"
-  (backStep)="onClickNext(createNewTransferData.editorMode === 'CREATION' ? 'CUSTOM_METADATA' : 'EXTRACTOR_METADATA')"
-></ingestor-confirm-transfer-dialog-page>
+  (backStep)="onClickNext(
+    createNewTransferData.editorMode === 'CREATION' 
+      ? (createNewTransferData.selectedSchemaFileContent && createNewTransferData.selectedSchemaFileContent !== '' 
+         ? 'CUSTOM_METADATA' 
+         : 'NEW_TRANSFER')
+      : 'EXTRACTOR_METADATA'
+  )"></ingestor-confirm-transfer-dialog-page>
 
 <ingestor-no-rights-dialog-page
   *ngIf="showNoRightsDialog"
diff --git a/src/assets/config.json b/src/assets/config.json
index 72ceacb4d8..bc2ef55f77 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -28,15 +28,15 @@
   "jsonMetadataEnabled": true,
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
-  "lbBaseURL": "http://127.0.0.1:3001",
+  "lbBaseURL": "http://127.0.0.1:3000",
   "ingestorComponent": {
     "ingestorEnabled": true,
-    "ingestorInTransferMode": true,
+    "ingestorInTransferMode": false,
     "ingestorAutodiscoveryOptions": [
       {
-        "mailDomain": "unibe.ch",
-        "description": "University of Bern",
-        "facilityBackend": "https://dci-ingestor.unil.ch"
+        "mailDomain": "university.ch",
+        "description": "University/facility of Choice",
+        "facilityBackend": "http://localhost:8888"
       }
     ]
   },

From f79d8d6b626bb0dae1d634448238d2c05d547e0c Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 3 Oct 2025 07:32:56 +0000
Subject: [PATCH 233/245] remove redundant config variable

---
 src/app/app-config.service.spec.ts            |  1 -
 ...nsfer-detail-view-dialog.component.spec.ts |  2 +-
 .../ingestor-creation.component.spec.ts       |  2 +-
 .../ingestor-transfer.component.spec.ts       |  2 +-
 .../ingestor-wrapper.component.spec.ts        | 22 +++++--------------
 .../ingestor-wrapper.component.ts             |  2 +-
 src/app/state-management/models/index.ts      |  1 -
 src/assets/config.json                        |  3 +--
 8 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/app/app-config.service.spec.ts b/src/app/app-config.service.spec.ts
index f817f52bfe..21f32257a3 100644
--- a/src/app/app-config.service.spec.ts
+++ b/src/app/app-config.service.spec.ts
@@ -252,7 +252,6 @@ const appConfig: AppConfigInterface = {
   },
   ingestorComponent: {
     ingestorEnabled: true,
-    ingestorInTransferMode: true,
   },
 };
 
diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts
index 36f527f0a3..8d6080f723 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts
@@ -24,7 +24,7 @@ describe("IngestorTransferViewDialogComponent", () => {
   };
 
   const getConfig = () => ({
-    ingestorInTransferMode: true,
+    ingestorEnabled:true,
   });
 
   const mockDialogRef = {
diff --git a/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts
index b0c6ae04bf..843fa8c5d0 100644
--- a/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-creation.component.spec.ts
@@ -26,7 +26,7 @@ describe("IngestorCreationComponent", () => {
     navigateByUrl: jasmine.createSpy("navigateByUrl"),
   };
   const getConfig = () => ({
-    ingestorInTransferMode: false,
+    ingestorEnabled: false,
   });
 
   beforeEach(waitForAsync(() => {
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts
index f47b7afd9a..adb6bd3b67 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.spec.ts
@@ -25,7 +25,7 @@ describe("IngestorTransferComponent", () => {
   };
 
   const getConfig = () => ({
-    ingestorInTransferMode: true,
+    ingestorEnabled: true,
   });
 
   beforeEach(waitForAsync(() => {
diff --git a/src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts
index d5c208d3af..561f34a145 100644
--- a/src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.spec.ts
@@ -10,9 +10,9 @@ describe("IngestorComponent", () => {
   let fixture: ComponentFixture<IngestorWrapperComponent>;
   let appConfigService: jasmine.SpyObj<AppConfigService>;
 
-  // const getConfig = () => ({
-  //   ingestorInTransferMode: false,
-  // });
+  const getConfig = () => ({
+    ingestorEnabled: false,
+  });
 
   beforeEach(() => {
     const appConfigServiceSpy = jasmine.createSpyObj("AppConfigService", [
@@ -46,22 +46,10 @@ describe("IngestorComponent", () => {
     expect(component).toBeTruthy();
   });
 
-  it("should load IngestorTransferComponent when config specifies ingestorInTransferMode as true", () => {
-    appConfigService.getConfig.and.returnValue({
-      ingestorComponent: {
-        ingestorEnabled: true,
-        ingestorInTransferMode: true,
-      },
-    } as AppConfigInterface);
-
-    const componentInstance = component.getIngestorComponent();
-    expect(componentInstance).toBe(IngestorTransferComponent);
-  });
-
-  it("should load IngestorCreationComponent when config specifies ingestorInTransferMode as false", () => {
+  it("should load IngestorCreationComponent when config specifies ingestoEnabled as false", () => {
     appConfigService.getConfig.and.returnValue({
       ingestorComponent: {
-        ingestorInTransferMode: false,
+        ingestorEnabled: false,
       },
     } as AppConfigInterface);
 
diff --git a/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
index d835e540a9..0e33978bfb 100644
--- a/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
@@ -21,7 +21,7 @@ export class IngestorWrapperComponent {
   constructor(public appConfigService: AppConfigService) {}
   getIngestorComponent() {
     return this.appConfigService.getConfig().ingestorComponent
-      ?.ingestorInTransferMode
+      ?.ingestorEnabled
       ? IngestorTransferComponent
       : IngestorCreationComponent;
   }
diff --git a/src/app/state-management/models/index.ts b/src/app/state-management/models/index.ts
index 269e4b027a..7abfce5121 100644
--- a/src/app/state-management/models/index.ts
+++ b/src/app/state-management/models/index.ts
@@ -35,7 +35,6 @@ export interface DatasetDetailComponentConfig {
 
 export interface IngestorComponentConfig {
   ingestorEnabled: boolean;
-  ingestorInTransferMode: boolean; // otherwise in creation mode
   ingestorAutodiscoveryOptions?: IngestorAutodiscovery[];
 }
 
diff --git a/src/assets/config.json b/src/assets/config.json
index bc2ef55f77..af996da17f 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -30,8 +30,7 @@
   "landingPage": "doi.ess.eu/detail/",
   "lbBaseURL": "http://127.0.0.1:3000",
   "ingestorComponent": {
-    "ingestorEnabled": true,
-    "ingestorInTransferMode": false,
+    "ingestorEnabled": false,
     "ingestorAutodiscoveryOptions": [
       {
         "mailDomain": "university.ch",

From 36316e81322fdbfe549750add01e486edc5aafbc Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 3 Oct 2025 10:19:14 +0000
Subject: [PATCH 234/245] add creationLocaltion based on facility description
 from autodiscovery config

---
 ...stor.new-transfer-dialog-page.component.ts | 14 +++++
 ...ingestor.creation-dialog-base.component.ts |  2 +-
 .../ingestor-transfer.component.ts            | 62 +++++++++++--------
 src/app/shared/sdk/apis/ingestor.service.ts   | 18 +++---
 .../actions/ingestor.actions.spec.ts          | 12 +++-
 .../actions/ingestor.actions.ts               |  4 +-
 .../effects/ingestor.effects.ts               |  2 +-
 .../reducers/ingestor.reducer.spec.ts         | 14 ++++-
 .../selectors/ingestor.selectors.spec.ts      | 12 +++-
 .../state-management/state/ingestor.store.ts  | 10 ++-
 10 files changed, 102 insertions(+), 48 deletions(-)

diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 9dd6c4ab3d..5a56848c2e 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -15,6 +15,7 @@ import {
   ExtractionMethod,
   IngestionRequestInformation,
   IngestorHelper,
+  IngestorAutodiscovery,
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
@@ -24,6 +25,7 @@ import { PageChangeEvent } from "shared/modules/table/table.component";
 import { IngestorFileBrowserComponent } from "ingestor/ingestor-dialogs/ingestor-file-browser/ingestor.file-browser.component";
 import { Store } from "@ngrx/store";
 import {
+  selectIngestorEndpoint,
   selectIngestionObject,
   selectIngestorExtractionMethods,
   selectIngestorRenderView,
@@ -46,6 +48,7 @@ export class IngestorNewTransferDialogPageComponent
   private subscriptions: Subscription[] = [];
   readonly dialog = inject(MatDialog);
 
+  facilityBackend$ = this.store.select(selectIngestorEndpoint);
   ingestionObject$ = this.store.select(selectIngestionObject);
   vm$ = this.store.select(selectUserSettingsPageViewModel);
   ingestorExtractionMethods$ = this.store.select(
@@ -57,6 +60,7 @@ export class IngestorNewTransferDialogPageComponent
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
+  facilityInfo: IngestorAutodiscovery | null = null;  
   extractionMethods: GetExtractorResponse = null;
   dropdownPageSize = 50;
   extractionMethodsPage = 0;
@@ -124,6 +128,14 @@ export class IngestorNewTransferDialogPageComponent
                   },
                 ),
               );
+                this.subscriptions.push(
+                this.facilityBackend$.subscribe((ingestorEndpoint) => {
+                  if (ingestorEndpoint) {
+                    console.log("Ingestor endpoint changed:", ingestorEndpoint);
+                    this.facilityInfo = ingestorEndpoint;
+                  }
+                })
+              );
             } else {
               this.scicatHeaderSchema = getJsonSchemaFromDto(true);
             }
@@ -160,6 +172,7 @@ export class IngestorNewTransferDialogPageComponent
     }
   }
 
+
   ngOnDestroy(): void {
     this.subscriptions.forEach((subscription) => {
       subscription.unsubscribe();
@@ -208,6 +221,7 @@ export class IngestorNewTransferDialogPageComponent
     this.createNewTransferData.scicatHeader["type"] = "raw";
     this.createNewTransferData.scicatHeader["dataFormat"] = "root";
     this.createNewTransferData.scicatHeader["owner"] = "User";
+    this.createNewTransferData.scicatHeader["creationLocation"] = this.facilityInfo.description || "";
 
     this.createNewTransferData.scicatHeader["principalInvestigator"] =
       this.userProfile.username;
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index 8c3fb16f14..995e8ca2c6 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -86,7 +86,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
     this.subscriptions.push(
       this.ingestorBackend$.subscribe((ingestorBackend) => {
         if (ingestorBackend) {
-          this.connectedFacilityBackend = ingestorBackend;
+          this.connectedFacilityBackend = ingestorBackend.facilityBackend;
         }
       }),
     );
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
index 9549368a37..f358d54c22 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
@@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { MatDialog } from "@angular/material/dialog";
 import {
   IngestionRequestInformation,
+  IngestorAutodiscovery,
   IngestorHelper,
 } from "./helper/ingestor.component-helper";
 import {
@@ -115,7 +116,7 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
     this.subscriptions.push(
       this.ingestorBackend$.subscribe((ingestorBackend) => {
         if (ingestorBackend !== null && ingestorBackend !== undefined) {
-          this.connectedFacilityBackend = ingestorBackend;
+          this.connectedFacilityBackend = ingestorBackend.facilityBackend;
         }
       }),
     );
@@ -199,32 +200,39 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
       this.route.queryParams.subscribe(async (params) => {
         const backendUrl = params["backendUrl"];
         const discovery = params["discovery"];
-
-        if (discovery === "true" && !backendUrl) {
-          const facilityUrl = await this.getFacilityURLByUserInfo();
-          if (facilityUrl != null) {
-            this.router.navigate([], {
-              relativeTo: this.route,
-              queryParams: { backendUrl: facilityUrl },
-              queryParamsHandling: "",
-            });
+        let facility = null;
+        if (discovery === "true") {
+            facility = await this.getFacilityByUserInfo();
+            if (facility != null && !backendUrl) {
+              this.router.navigate([], {
+                relativeTo: this.route,
+                queryParams: { 
+                  backendUrl: facility.facilityBackend,
+                  discovery: "true",
+                },
+                queryParamsHandling: "merge",
+              });
+              return;
+            }
           }
-        }
-
-        if (backendUrl) {
-          // backendUrl should not end with a slash
-          const facilityBackendUrlCleaned = backendUrl.replace(/\/$/, "");
 
-          this.store.dispatch(
-            fromActions.setIngestorEndpoint({
-              ingestorEndpoint: facilityBackendUrlCleaned,
-            }),
-          );
-
-          this.store.dispatch(fromActions.connectIngestor());
-        } else {
-          this.connectingToFacilityBackend = false;
-        }
+          if (backendUrl) {
+            // backendUrl should not end with a slash
+            const facilityBackendUrlCleaned = backendUrl.replace(/\/$/, "");
+            this.store.dispatch(
+              fromActions.setIngestorEndpoint({
+                ingestorEndpoint: { 
+                  mailDomain:"",
+                  facilityBackend: facilityBackendUrlCleaned,
+                  description: facility?.description ?? "",
+                }
+              }),
+            );
+
+            this.store.dispatch(fromActions.connectIngestor());
+          } else {
+            this.connectingToFacilityBackend = false;
+          }
       }),
     );
   }
@@ -344,7 +352,7 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
     });
   }
 
-  async getFacilityURLByUserInfo(): Promise<string | null> {
+  async getFacilityByUserInfo(): Promise<IngestorAutodiscovery | null> {
     if (this.scicatUserProfile && this.scicatUserProfile.email) {
       const userEmail = this.scicatUserProfile.email;
       const facility = userEmail.split("@")[1]?.toLowerCase();
@@ -359,7 +367,7 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
             .replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
           const domainPattern = new RegExp(`^([\\w-]+\\.)*${escapedDomain}$`); // <any.sub.domain.uni.ch>
           if (domainPattern.test(facility)) {
-            return discovery.facilityBackend;
+            return discovery;
           }
         }
       }
diff --git a/src/app/shared/sdk/apis/ingestor.service.ts b/src/app/shared/sdk/apis/ingestor.service.ts
index 8dbc993eef..716c89a0ff 100644
--- a/src/app/shared/sdk/apis/ingestor.service.ts
+++ b/src/app/shared/sdk/apis/ingestor.service.ts
@@ -57,9 +57,9 @@ export class Ingestor {
   getVersion(): Observable<OtherVersionResponse> {
     return this.store.select(selectIngestorEndpoint).pipe(
       take(1),
-      switchMap((endpoint) =>
+      switchMap((ingestorEndpoint) =>
         this.http.get<OtherVersionResponse>(
-          `${endpoint}/${INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION}`,
+          `${ingestorEndpoint.facilityBackend}/${INGESTOR_API_ENDPOINTS_V1.OTHER.VERSION}`,
           this.getRequestOptions(),
         ),
       ),
@@ -71,7 +71,7 @@ export class Ingestor {
       take(1),
       switchMap((ingestorEndpoint) =>
         this.http.get<UserInfo>(
-          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.AUTH.USERINFO}`,
+          `${ingestorEndpoint.facilityBackend}/${INGESTOR_API_ENDPOINTS_V1.AUTH.USERINFO}`,
           this.getRequestOptions(),
         ),
       ),
@@ -83,7 +83,7 @@ export class Ingestor {
       take(1),
       switchMap((ingestorEndpoint) =>
         this.http.get<OtherHealthResponse>(
-          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.OTHER.HEALTH}`,
+          `${ingestorEndpoint.facilityBackend}/${INGESTOR_API_ENDPOINTS_V1.OTHER.HEALTH}`,
           this.getRequestOptions(),
         ),
       ),
@@ -97,7 +97,7 @@ export class Ingestor {
       take(1),
       switchMap((ingestorEndpoint) =>
         this.http.delete<DeleteTransferResponse>(
-          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
+          `${ingestorEndpoint.facilityBackend}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
           { ...this.getRequestOptions(), body: requestBody },
         ),
       ),
@@ -121,7 +121,7 @@ export class Ingestor {
       take(1),
       switchMap((ingestorEndpoint) =>
         this.http.get<GetTransferResponse>(
-          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
+          `${ingestorEndpoint.facilityBackend}/${INGESTOR_API_ENDPOINTS_V1.TRANSFER}`,
           { ...this.getRequestOptions(), params },
         ),
       ),
@@ -133,7 +133,7 @@ export class Ingestor {
       take(1),
       switchMap((ingestorEndpoint) =>
         this.http.post<PostDatasetResponse>(
-          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET}`,
+          `${ingestorEndpoint.facilityBackend}/${INGESTOR_API_ENDPOINTS_V1.DATASET}`,
           payload,
           this.getRequestOptions(),
         ),
@@ -153,7 +153,7 @@ export class Ingestor {
       take(1),
       switchMap((ingestorEndpoint) =>
         this.http.get<GetExtractorResponse>(
-          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.EXTRACTOR}`,
+          `${ingestorEndpoint.facilityBackend}/${INGESTOR_API_ENDPOINTS_V1.EXTRACTOR}`,
           { ...this.getRequestOptions(), params },
         ),
       ),
@@ -174,7 +174,7 @@ export class Ingestor {
       take(1),
       switchMap((ingestorEndpoint) =>
         this.http.get<GetBrowseDatasetResponse>(
-          `${ingestorEndpoint}/${INGESTOR_API_ENDPOINTS_V1.DATASET_BROWSE}`,
+          `${ingestorEndpoint.facilityBackend}/${INGESTOR_API_ENDPOINTS_V1.DATASET_BROWSE}`,
           { ...this.getRequestOptions(), params },
         ),
       ),
diff --git a/src/app/state-management/actions/ingestor.actions.spec.ts b/src/app/state-management/actions/ingestor.actions.spec.ts
index 262cc26424..099c83574e 100644
--- a/src/app/state-management/actions/ingestor.actions.spec.ts
+++ b/src/app/state-management/actions/ingestor.actions.spec.ts
@@ -10,11 +10,19 @@ describe("Ingestor Actions", () => {
   describe("setIngestorEndpoint", () => {
     it("should create an action with endpoint", () => {
       const action = fromActions.setIngestorEndpoint({
-        ingestorEndpoint: "http://localhost:3000",
+        ingestorEndpoint:  {
+          mailDomain:"",
+          description: "",
+          facilityBackend:"http://localhost:3000",
+        },
       });
 
       expect(action.type).toBe("[Ingestor] Set ingestor endpoint");
-      expect(action.ingestorEndpoint).toBe("http://localhost:3000");
+      expect(action.ingestorEndpoint).toEqual( {
+        mailDomain:"",
+        description: "",
+        facilityBackend:"http://localhost:3000",
+      },);
     });
   });
 
diff --git a/src/app/state-management/actions/ingestor.actions.ts b/src/app/state-management/actions/ingestor.actions.ts
index 1f9ed61618..9806a3d11d 100644
--- a/src/app/state-management/actions/ingestor.actions.ts
+++ b/src/app/state-management/actions/ingestor.actions.ts
@@ -2,6 +2,7 @@ import { createAction, props } from "@ngrx/store";
 import {
   APIInformation,
   IngestionRequestInformation,
+  IngestorAutodiscovery,
 } from "ingestor/ingestor-page/helper/ingestor.component-helper";
 import {
   GetBrowseDatasetResponse,
@@ -14,6 +15,7 @@ import {
   DeleteTransferRequest,
   UserInfo,
 } from "shared/sdk/models/ingestor/models";
+
 import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 import {
   DatasetsControllerCreateV3Request,
@@ -22,7 +24,7 @@ import {
 
 export const setIngestorEndpoint = createAction(
   "[Ingestor] Set ingestor endpoint",
-  props<{ ingestorEndpoint: string }>(),
+  props<{ ingestorEndpoint: IngestorAutodiscovery }>(),
 );
 
 export const connectIngestor = createAction("[Ingestor] Connect Ingestor");
diff --git a/src/app/state-management/effects/ingestor.effects.ts b/src/app/state-management/effects/ingestor.effects.ts
index 38405f175d..a017473271 100644
--- a/src/app/state-management/effects/ingestor.effects.ts
+++ b/src/app/state-management/effects/ingestor.effects.ts
@@ -54,7 +54,7 @@ export class IngestorEffects {
                           versionResponse:
                             versionResponse as OtherVersionResponse,
                           healthResponse: healthResponse as OtherHealthResponse,
-                          userInfoResponse: null, // Kein UserInfo verfügbar
+                          userInfoResponse: null, // no UserInfo available
                           authIsDisabled: true,
                         }),
                       );
diff --git a/src/app/state-management/reducers/ingestor.reducer.spec.ts b/src/app/state-management/reducers/ingestor.reducer.spec.ts
index d9c200c715..d13a0f35a5 100644
--- a/src/app/state-management/reducers/ingestor.reducer.spec.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.spec.ts
@@ -86,13 +86,17 @@ describe("IngestorReducer", () => {
 
   describe("setIngestorEndpoint", () => {
     it("should set ingestor endpoint", () => {
-      const endpoint = "http://localhost:3000";
+      const endpoint =  {
+        mailDomain:"",
+        description: "",
+        facilityBackend:"http://localhost:3000",
+      };
       const action = fromActions.setIngestorEndpoint({
         ingestorEndpoint: endpoint,
       });
       const result = ingestorReducer(undefined, action);
 
-      expect(result.ingestorEndpoint).toBe(endpoint);
+      expect(result.ingestorEndpoint).toEqual(endpoint);
     });
   });
 
@@ -329,7 +333,11 @@ describe("IngestorReducer", () => {
     it("should reset entire state to initial", () => {
       // Build up some modified state
       const setEndpointAction = fromActions.setIngestorEndpoint({
-        ingestorEndpoint: "http://test.com",
+        ingestorEndpoint: {
+          mailDomain:"",
+          description: "",
+          facilityBackend:"http://test.com",
+        }, 
       });
       const connectAction = fromActions.connectIngestor();
       ingestorReducer(undefined, setEndpointAction);
diff --git a/src/app/state-management/selectors/ingestor.selectors.spec.ts b/src/app/state-management/selectors/ingestor.selectors.spec.ts
index ea6a457bb4..376009f09b 100644
--- a/src/app/state-management/selectors/ingestor.selectors.spec.ts
+++ b/src/app/state-management/selectors/ingestor.selectors.spec.ts
@@ -8,7 +8,11 @@ import {
 
 describe("Ingestor Selectors", () => {
   const mockIngestorState: IngestorState = {
-    ingestorEndpoint: "http://localhost:3000",
+    ingestorEndpoint:  {
+      mailDomain:"",
+      description: "example facility",
+      facilityBackend:"http://localhost:3000",
+    },
     ingestorStatus: {
       versionResponse: { version: "1.0.0" },
       healthResponse: { status: "ok" },
@@ -50,7 +54,11 @@ describe("Ingestor Selectors", () => {
 
   it("should select ingestorEndpoint", () => {
     const result = fromSelectors.selectIngestorEndpoint(mockState);
-    expect(result).toBe("http://localhost:3000");
+    expect(result).toEqual( {
+    mailDomain:"",
+    description: "example facility",
+    facilityBackend:"http://localhost:3000",
+    },);
   });
 
   it("should select ingestorStatus", () => {
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 86c297fa91..7218fa28ae 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -1,6 +1,7 @@
 import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 import {
   APIInformation,
+  IngestorAutodiscovery,
   IngestionRequestInformation,
   IngestorHelper,
 } from "ingestor/ingestor-page/helper/ingestor.component-helper";
@@ -24,10 +25,11 @@ interface IngestorStatus {
   validEndpoint: boolean | null;
 }
 
+
 export interface IngestorState {
   ingestorStatus: IngestorStatus;
   ingestorAuth: IngestorAuthentication | null;
-  ingestorEndpoint: string;
+  ingestorEndpoint: IngestorAutodiscovery | null;
   ingestorTransferList: GetTransferResponse | null;
   ingestorTransferListDetailView: GetTransferResponse | null;
   transferListRequestOptions: {
@@ -53,7 +55,11 @@ export const initialIngestorState: IngestorState = {
     validEndpoint: null,
   },
   ingestorAuth: null,
-  ingestorEndpoint: "",
+  ingestorEndpoint: {
+    mailDomain:"",
+    description: "",
+    facilityBackend:"",
+  },
   ingestorTransferList: null,
   ingestorTransferListDetailView: null,
   transferListRequestOptions: {

From 0dadf633015fec06147095cf0c0b0cd2b1e5e78a Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 3 Oct 2025 12:37:28 +0000
Subject: [PATCH 235/245] dependencies

---
 package-lock.json | 129 +++++++++++++++++++---------------------------
 1 file changed, 53 insertions(+), 76 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8dfdbba7da..51fce6ffe9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6778,23 +6778,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
-      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
       "version": "8.45.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.45.0.tgz",
@@ -6952,23 +6935,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
-      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
       "version": "8.45.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.45.0.tgz",
@@ -7081,10 +7047,10 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/tsconfig-utils": {
+    "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/types": {
       "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
-      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.45.0.tgz",
+      "integrity": "sha512-WugXLuOIq67BMgQInIxxnsSyRLFxdkJEJu8r4ngLR56q/4Q5LrbfkFRH27vMTjxEK8Pyz7QfzuZe/G15qQnVRA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7093,17 +7059,19 @@
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/types": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.45.0.tgz",
-      "integrity": "sha512-WugXLuOIq67BMgQInIxxnsSyRLFxdkJEJu8r4ngLR56q/4Q5LrbfkFRH27vMTjxEK8Pyz7QfzuZe/G15qQnVRA==",
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.44.0.tgz",
+      "integrity": "sha512-87Jv3E+al8wpD+rIdVJm/ItDBe/Im09zXIjFoipOjr5gHUhJmTzfFLuTJ/nPTMc2Srsroy4IBXwcTCHyRR7KzA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.44.0",
+        "@typescript-eslint/visitor-keys": "8.44.0"
+      },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -7112,29 +7080,22 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.39.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.39.1.tgz",
-      "integrity": "sha512-RkBKGBrjgskFGWuyUGz/EtD8AF/GW49S21J8dvMzpJitOF1slLEbbHnNEtAHtnDAnx8qDEdRrULRnWVx27wGBw==",
+    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
+      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.45.0",
-        "@typescript-eslint/types": "^8.45.0",
-        "debug": "^4.3.4"
-      },
+      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/tsconfig-utils": {
+    "node_modules/@typescript-eslint/tsconfig-utils": {
       "version": "8.45.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
       "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
@@ -7157,7 +7118,6 @@
       "integrity": "sha512-bpjepLlHceKgyMEPglAeULX1vixJDgaKocp0RVJ5u4wLJIMNuKtUXIczpJCPcn2waII0yuvks/5m5/h3ZQKs0A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "8.45.0",
         "@typescript-eslint/typescript-estree": "8.45.0",
@@ -7195,24 +7155,6 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
-      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.45.0",
-        "@typescript-eslint/visitor-keys": "8.45.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
       "version": "8.45.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.45.0.tgz",
@@ -7336,6 +7278,7 @@
       "integrity": "sha512-WugXLuOIq67BMgQInIxxnsSyRLFxdkJEJu8r4ngLR56q/4Q5LrbfkFRH27vMTjxEK8Pyz7QfzuZe/G15qQnVRA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -7397,6 +7340,24 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.44.0.tgz",
+      "integrity": "sha512-x5Y0+AuEPqAInc6yd0n5DAcvtoQ/vyaGwuX5HE9n6qAefk1GaedqrLQF8kQGylLUb9pnZyLf+iEiL9fr8APDtQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/types": {
       "version": "8.44.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
@@ -9832,6 +9793,22 @@
         "node": "^20.1.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/cypress/node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/cypress/node_modules/cli-truncate": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",

From 4e7517c7d3be1a5fb08cb0f56063868c71a0c9ef Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 3 Oct 2025 13:24:36 +0000
Subject: [PATCH 236/245] fix tests

---
 .eslintrc.json                                |  4 +-
 ....confirm-transfer-dialog-page.component.ts |  4 +-
 ...xtractor-metadata-dialog-page.component.ts |  4 +-
 ...stor.new-transfer-dialog-page.component.ts | 11 ++--
 ...ngestor.no-rights-dialog-page.component.ts |  4 +-
 ...tor.user-metadata-dialog-page.component.ts |  1 -
 ...ingestor.creation-dialog-base.component.ts |  4 +-
 ...nsfer-detail-view-dialog.component.spec.ts |  2 +-
 ...r.transfer-detail-view-dialog.component.ts |  6 +-
 .../customRenderer/custom-renderers.ts        |  4 +-
 .../customRenderer/quantity-field-renderer.ts |  2 +-
 .../ingestor-transfer.component.ts            | 58 +++++++++----------
 .../ingestor-wrapper.component.ts             |  3 +-
 src/app/shared/MockStubs.ts                   |  2 +-
 .../actions/ingestor.actions.spec.ts          | 14 ++---
 .../reducers/ingestor.reducer.spec.ts         | 12 ++--
 .../selectors/ingestor.selectors.spec.ts      | 18 +++---
 .../selectors/ingestor.selectors.ts           |  2 +-
 .../state-management/state/ingestor.store.ts  |  5 +-
 19 files changed, 79 insertions(+), 81 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 0bc384a39a..eea6ff8a61 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,6 +1,8 @@
 {
   "root": true,
-  "ignorePatterns": ["projects/**/*"],
+  "ignorePatterns": [
+    "projects/**/*",
+    "src/app/shared/sdk/models/ingestor/**"], // Ignore autogenerated files
   "parserOptions": {
     "ecmaVersion": 2020,
     "sourceType": "module",
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
index 1f694e6bab..77c0320d3e 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.confirm-transfer-dialog-page.component.ts
@@ -13,7 +13,7 @@ import {
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { Store } from "@ngrx/store";
 import {
-  ingestionObjectAPIInformation,
+  selectIngestionObjectAPIInformation,
   selectIngestionObject,
   selectIsIngestDatasetLoading,
 } from "state-management/selectors/ingestor.selectors";
@@ -41,7 +41,7 @@ export class IngestorConfirmTransferDialogPageComponent
     IngestorHelper.createEmptyAPIInformation();
 
   ingestionObjectApiInformation$ = this.store.select(
-    ingestionObjectAPIInformation,
+    selectIngestionObjectAPIInformation,
   );
 
   ingestionObject$ = this.store.select(selectIngestionObject);
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
index dad6a77eb6..ba842c0dcb 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.extractor-metadata-dialog-page.component.ts
@@ -15,7 +15,7 @@ import {
 import { IngestorMetadataEditorHelper } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 import { Store } from "@ngrx/store";
 import {
-  ingestionObjectAPIInformation,
+  selectIngestionObjectAPIInformation,
   selectIngestionObject,
   selectIngestorRenderView,
   selectUpdateEditorFromThirdParty,
@@ -42,7 +42,7 @@ export class IngestorExtractorMetadataDialogPageComponent
     IngestorHelper.createEmptyAPIInformation();
 
   ingestionObjectApiInformation$ = this.store.select(
-    ingestionObjectAPIInformation,
+    selectIngestionObjectAPIInformation,
   );
   ingestionObject$ = this.store.select(selectIngestionObject);
   renderView$ = this.store.select(selectIngestorRenderView);
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 5a56848c2e..154e4d32be 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -60,7 +60,7 @@ export class IngestorNewTransferDialogPageComponent
   createNewTransferData: IngestionRequestInformation =
     IngestorHelper.createEmptyRequestInformation();
 
-  facilityInfo: IngestorAutodiscovery | null = null;  
+  facilityInfo: IngestorAutodiscovery | null = null;
   extractionMethods: GetExtractorResponse = null;
   dropdownPageSize = 50;
   extractionMethodsPage = 0;
@@ -128,13 +128,13 @@ export class IngestorNewTransferDialogPageComponent
                   },
                 ),
               );
-                this.subscriptions.push(
+              this.subscriptions.push(
                 this.facilityBackend$.subscribe((ingestorEndpoint) => {
                   if (ingestorEndpoint) {
                     console.log("Ingestor endpoint changed:", ingestorEndpoint);
                     this.facilityInfo = ingestorEndpoint;
                   }
-                })
+                }),
               );
             } else {
               this.scicatHeaderSchema = getJsonSchemaFromDto(true);
@@ -172,7 +172,6 @@ export class IngestorNewTransferDialogPageComponent
     }
   }
 
-
   ngOnDestroy(): void {
     this.subscriptions.forEach((subscription) => {
       subscription.unsubscribe();
@@ -221,7 +220,8 @@ export class IngestorNewTransferDialogPageComponent
     this.createNewTransferData.scicatHeader["type"] = "raw";
     this.createNewTransferData.scicatHeader["dataFormat"] = "root";
     this.createNewTransferData.scicatHeader["owner"] = "User";
-    this.createNewTransferData.scicatHeader["creationLocation"] = this.facilityInfo.description || "";
+    this.createNewTransferData.scicatHeader["creationLocation"] =
+      this.facilityInfo.description || "";
 
     this.createNewTransferData.scicatHeader["principalInvestigator"] =
       this.userProfile.username;
@@ -279,7 +279,6 @@ export class IngestorNewTransferDialogPageComponent
 
     // Emit once to go to next step
     this.nextStep.emit();
-
   }
 
   onDataChangeUserScicatHeader(event: any) {
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts
index 35b5a48d98..e6d4548588 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.no-rights-dialog-page.component.ts
@@ -14,7 +14,7 @@ import {
 } from "../../../ingestor-page/helper/ingestor.component-helper";
 import { Store } from "@ngrx/store";
 import {
-  ingestionObjectAPIInformation,
+  selectIngestionObjectAPIInformation,
   selectIngestionObject,
 } from "state-management/selectors/ingestor.selectors";
 import { Subscription } from "rxjs";
@@ -39,7 +39,7 @@ export class IngestorNoRightsDialogPageComponent implements OnInit, OnDestroy {
     IngestorHelper.createEmptyAPIInformation();
 
   ingestionObjectApiInformation$ = this.store.select(
-    ingestionObjectAPIInformation,
+    selectIngestionObjectAPIInformation,
   );
 
   constructor(private store: Store) {}
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
index f806c270d2..60e553bb4c 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.user-metadata-dialog-page.component.ts
@@ -24,7 +24,6 @@ import { Subscription } from "rxjs";
 import { renderView } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component";
 import { convertJSONFormsErrorToString } from "ingestor/ingestor-metadata-editor/ingestor-metadata-editor-helper";
 
-
 @Component({
   selector: "ingestor-user-metadata-dialog",
   templateUrl: "ingestor.user-metadata-dialog-page.html",
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
index 995e8ca2c6..911abd5350 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/ingestor.creation-dialog-base.component.ts
@@ -8,7 +8,7 @@ import {
   ScientificMetadata,
 } from "../../ingestor-page/helper/ingestor.component-helper";
 import {
-  ingestionObjectAPIInformation,
+  selectIngestionObjectAPIInformation,
   selectIngestionObject,
   selectIngestorEndpoint,
   selectNoRightsError,
@@ -49,7 +49,7 @@ export class IngestorCreationDialogBaseComponent implements OnInit, OnDestroy {
 
   ingestionObject$ = this.store.select(selectIngestionObject);
   ingestionObjectApiInformation$ = this.store.select(
-    ingestionObjectAPIInformation,
+    selectIngestionObjectAPIInformation,
   );
   ingestorBackend$ = this.store.select(selectIngestorEndpoint);
   selectNoRightsError$ = this.store.select(selectNoRightsError);
diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts
index 8d6080f723..801d97087e 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.spec.ts
@@ -24,7 +24,7 @@ describe("IngestorTransferViewDialogComponent", () => {
   };
 
   const getConfig = () => ({
-    ingestorEnabled:true,
+    ingestorEnabled: true,
   });
 
   const mockDialogRef = {
diff --git a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
index 3626237043..4a89335fdb 100644
--- a/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/transfer-detail-view/ingestor.transfer-detail-view-dialog.component.ts
@@ -18,15 +18,15 @@ export class IngestorTransferViewDialogComponent implements OnInit, OnDestroy {
   autoRefreshInterval: NodeJS.Timeout = null;
   transferDetailList$ = this.store.select(selectIngestorTransferDetailList);
   detailItem: TransferItem | null = null;
+  // Define tables
+  displayedColumns: string[] = ["property", "value"];
+  tableData: { property: string; value: string }[] = [];
 
   constructor(
     private store: Store,
     public dialogRef: MatDialogRef<IngestorTransferViewDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any,
   ) {}
-  // Define tables
-  displayedColumns: string[] = ["property", "value"];
-  tableData: { property: string; value: string }[] = [];
 
   ngOnInit() {
     this.subscriptions.push(
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index 65a4ea7592..23e0efdeb4 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -20,7 +20,7 @@ import {
   quantityValueLayoutTester,
 } from "./quantity-value-layout-renderer";
 import {
-  SIFieldHiderRenderer,
+  SIFieldHiderRendererComponent,
   isSIFieldTester,
 } from "./quantity-field-renderer";
 
@@ -48,6 +48,6 @@ export const customRenderers: JsonFormsRendererRegistryEntry[] = [
   },
   {
     tester: isSIFieldTester,
-    renderer: SIFieldHiderRenderer,
+    renderer: SIFieldHiderRendererComponent,
   },
 ];
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
index d52a3614a6..e2b6b29dc7 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
@@ -11,7 +11,7 @@ export const isSIFieldTester = rankWith(
   selector: "si-field-hider",
   template: "", // Empty template - renders nothing
 })
-export class SIFieldHiderRenderer extends JsonFormsControl {
+export class SIFieldHiderRendererComponent extends JsonFormsControl {
   constructor(jsonformsService: JsonFormsAngularService) {
     super(jsonformsService);
   }
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
index f358d54c22..27f48677cd 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
@@ -202,37 +202,37 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
         const discovery = params["discovery"];
         let facility = null;
         if (discovery === "true") {
-            facility = await this.getFacilityByUserInfo();
-            if (facility != null && !backendUrl) {
-              this.router.navigate([], {
-                relativeTo: this.route,
-                queryParams: { 
-                  backendUrl: facility.facilityBackend,
-                  discovery: "true",
-                },
-                queryParamsHandling: "merge",
-              });
-              return;
-            }
+          facility = await this.getFacilityByUserInfo();
+          if (facility != null && !backendUrl) {
+            this.router.navigate([], {
+              relativeTo: this.route,
+              queryParams: {
+                backendUrl: facility.facilityBackend,
+                discovery: "true",
+              },
+              queryParamsHandling: "merge",
+            });
+            return;
           }
+        }
 
-          if (backendUrl) {
-            // backendUrl should not end with a slash
-            const facilityBackendUrlCleaned = backendUrl.replace(/\/$/, "");
-            this.store.dispatch(
-              fromActions.setIngestorEndpoint({
-                ingestorEndpoint: { 
-                  mailDomain:"",
-                  facilityBackend: facilityBackendUrlCleaned,
-                  description: facility?.description ?? "",
-                }
-              }),
-            );
-
-            this.store.dispatch(fromActions.connectIngestor());
-          } else {
-            this.connectingToFacilityBackend = false;
-          }
+        if (backendUrl) {
+          // backendUrl should not end with a slash
+          const facilityBackendUrlCleaned = backendUrl.replace(/\/$/, "");
+          this.store.dispatch(
+            fromActions.setIngestorEndpoint({
+              ingestorEndpoint: {
+                mailDomain: "",
+                facilityBackend: facilityBackendUrlCleaned,
+                description: facility?.description ?? "",
+              },
+            }),
+          );
+
+          this.store.dispatch(fromActions.connectIngestor());
+        } else {
+          this.connectingToFacilityBackend = false;
+        }
       }),
     );
   }
diff --git a/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
index 0e33978bfb..457c642f89 100644
--- a/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-wrapper.component.ts
@@ -20,8 +20,7 @@ export class IngestorWrapperComponent {
 
   constructor(public appConfigService: AppConfigService) {}
   getIngestorComponent() {
-    return this.appConfigService.getConfig().ingestorComponent
-      ?.ingestorEnabled
+    return this.appConfigService.getConfig().ingestorComponent?.ingestorEnabled
       ? IngestorTransferComponent
       : IngestorCreationComponent;
   }
diff --git a/src/app/shared/MockStubs.ts b/src/app/shared/MockStubs.ts
index 22b5ac6fdf..4be9096106 100644
--- a/src/app/shared/MockStubs.ts
+++ b/src/app/shared/MockStubs.ts
@@ -25,7 +25,7 @@ import {
 } from "@scicatproject/scicat-sdk-ts-angular";
 import { SDKToken } from "./services/auth/auth.service";
 import { IngestionRequestInformation } from "ingestor/ingestor-page/helper/ingestor.component-helper";
-import { MethodItem } from "/frontend/src/app/shared/sdk/models/ingestor/methodItem";
+import { MethodItem } from "./sdk/models/ingestor/methodItem";
 import { FolderNode } from "./sdk/models/ingestor/folderNode";
 import { APIInformation } from "ingestor/ingestor-page/helper/ingestor.component-helper";
 
diff --git a/src/app/state-management/actions/ingestor.actions.spec.ts b/src/app/state-management/actions/ingestor.actions.spec.ts
index 099c83574e..c54808202e 100644
--- a/src/app/state-management/actions/ingestor.actions.spec.ts
+++ b/src/app/state-management/actions/ingestor.actions.spec.ts
@@ -10,19 +10,19 @@ describe("Ingestor Actions", () => {
   describe("setIngestorEndpoint", () => {
     it("should create an action with endpoint", () => {
       const action = fromActions.setIngestorEndpoint({
-        ingestorEndpoint:  {
-          mailDomain:"",
+        ingestorEndpoint: {
+          mailDomain: "",
           description: "",
-          facilityBackend:"http://localhost:3000",
+          facilityBackend: "http://localhost:3000",
         },
       });
 
       expect(action.type).toBe("[Ingestor] Set ingestor endpoint");
-      expect(action.ingestorEndpoint).toEqual( {
-        mailDomain:"",
+      expect(action.ingestorEndpoint).toEqual({
+        mailDomain: "",
         description: "",
-        facilityBackend:"http://localhost:3000",
-      },);
+        facilityBackend: "http://localhost:3000",
+      });
     });
   });
 
diff --git a/src/app/state-management/reducers/ingestor.reducer.spec.ts b/src/app/state-management/reducers/ingestor.reducer.spec.ts
index d13a0f35a5..36b0f6acda 100644
--- a/src/app/state-management/reducers/ingestor.reducer.spec.ts
+++ b/src/app/state-management/reducers/ingestor.reducer.spec.ts
@@ -86,10 +86,10 @@ describe("IngestorReducer", () => {
 
   describe("setIngestorEndpoint", () => {
     it("should set ingestor endpoint", () => {
-      const endpoint =  {
-        mailDomain:"",
+      const endpoint = {
+        mailDomain: "",
         description: "",
-        facilityBackend:"http://localhost:3000",
+        facilityBackend: "http://localhost:3000",
       };
       const action = fromActions.setIngestorEndpoint({
         ingestorEndpoint: endpoint,
@@ -334,10 +334,10 @@ describe("IngestorReducer", () => {
       // Build up some modified state
       const setEndpointAction = fromActions.setIngestorEndpoint({
         ingestorEndpoint: {
-          mailDomain:"",
+          mailDomain: "",
           description: "",
-          facilityBackend:"http://test.com",
-        }, 
+          facilityBackend: "http://test.com",
+        },
       });
       const connectAction = fromActions.connectIngestor();
       ingestorReducer(undefined, setEndpointAction);
diff --git a/src/app/state-management/selectors/ingestor.selectors.spec.ts b/src/app/state-management/selectors/ingestor.selectors.spec.ts
index 376009f09b..e20c6cdb48 100644
--- a/src/app/state-management/selectors/ingestor.selectors.spec.ts
+++ b/src/app/state-management/selectors/ingestor.selectors.spec.ts
@@ -8,10 +8,10 @@ import {
 
 describe("Ingestor Selectors", () => {
   const mockIngestorState: IngestorState = {
-    ingestorEndpoint:  {
-      mailDomain:"",
+    ingestorEndpoint: {
+      mailDomain: "",
       description: "example facility",
-      facilityBackend:"http://localhost:3000",
+      facilityBackend: "http://localhost:3000",
     },
     ingestorStatus: {
       versionResponse: { version: "1.0.0" },
@@ -54,11 +54,11 @@ describe("Ingestor Selectors", () => {
 
   it("should select ingestorEndpoint", () => {
     const result = fromSelectors.selectIngestorEndpoint(mockState);
-    expect(result).toEqual( {
-    mailDomain:"",
-    description: "example facility",
-    facilityBackend:"http://localhost:3000",
-    },);
+    expect(result).toEqual({
+      mailDomain: "",
+      description: "example facility",
+      facilityBackend: "http://localhost:3000",
+    });
   });
 
   it("should select ingestorStatus", () => {
@@ -140,7 +140,7 @@ describe("Ingestor Selectors", () => {
   });
 
   it("should select ingestionObjectAPIInformation", () => {
-    const result = fromSelectors.ingestionObjectAPIInformation(mockState);
+    const result = fromSelectors.selectIngestionObjectAPIInformation(mockState);
     expect(result).toEqual(mockIngestorState.ingestionObjectApiInformation);
   });
 });
diff --git a/src/app/state-management/selectors/ingestor.selectors.ts b/src/app/state-management/selectors/ingestor.selectors.ts
index 4e9af1121a..10c523799b 100644
--- a/src/app/state-management/selectors/ingestor.selectors.ts
+++ b/src/app/state-management/selectors/ingestor.selectors.ts
@@ -79,7 +79,7 @@ export const selectIsIngestDatasetLoading = createSelector(
   (state) => state.ingestionObjectApiInformation.ingestionDatasetLoading,
 );
 
-export const ingestionObjectAPIInformation = createSelector(
+export const selectIngestionObjectAPIInformation = createSelector(
   selectIngestorState,
   (state) => state.ingestionObjectApiInformation,
 );
diff --git a/src/app/state-management/state/ingestor.store.ts b/src/app/state-management/state/ingestor.store.ts
index 7218fa28ae..77b5edc724 100644
--- a/src/app/state-management/state/ingestor.store.ts
+++ b/src/app/state-management/state/ingestor.store.ts
@@ -25,7 +25,6 @@ interface IngestorStatus {
   validEndpoint: boolean | null;
 }
 
-
 export interface IngestorState {
   ingestorStatus: IngestorStatus;
   ingestorAuth: IngestorAuthentication | null;
@@ -56,9 +55,9 @@ export const initialIngestorState: IngestorState = {
   },
   ingestorAuth: null,
   ingestorEndpoint: {
-    mailDomain:"",
+    mailDomain: "",
     description: "",
-    facilityBackend:"",
+    facilityBackend: "",
   },
   ingestorTransferList: null,
   ingestorTransferListDetailView: null,

From 59ffd34bda31870d6df945bb9a12d9ab371b00a5 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 6 Oct 2025 13:08:10 +0000
Subject: [PATCH 237/245] minimal changes

---
 package.json  | 2 +-
 tsconfig.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e03752b9cb..b8c977fbe8 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "@angular/router": "^19.2.8",
     "@angular/service-worker": "^19.2.8",
     "@jsonforms/angular": "^3.5.1",
-    "@jsonforms/angular-material": "^3.5.1",        
+    "@jsonforms/angular-material": "^3.5.1",
     "@jsonforms/core": "^3.5.1",
     "@jsonforms/react": "^3.5.1",
     "@ngbracket/ngx-layout": "^16.0.0",
diff --git a/tsconfig.json b/tsconfig.json
index 3a2daf7ec3..23bdf3c94d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,7 +18,7 @@
     "useDefineForClassFields": false,
     "target": "es2022",
     "module": "es2022",
-    "lib": ["es2022", "dom"], 
+    "lib": ["es2022", "dom"]
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,

From 00959214a5d157a4e42098e393f3b4f5a011028d Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 7 Oct 2025 09:13:42 +0000
Subject: [PATCH 238/245] ingestor component is turned off per default

---
 .../app-header/app-header.component.html      |  2 +-
 .../app-header/app-header.component.ts        |  3 +-
 src/app/app-routing/app-routing.module.ts     |  2 +
 src/app/app-routing/ingestor.guard.ts         | 37 +++++++++++++++++++
 ...stor.new-transfer-dialog-page.component.ts |  2 +-
 5 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 src/app/app-routing/ingestor.guard.ts

diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html
index 5623422baa..1123522112 100644
--- a/src/app/_layout/app-header/app-header.component.html
+++ b/src/app/_layout/app-header/app-header.component.html
@@ -10,7 +10,7 @@
         </button>
       </ng-container>
 
-      <ng-container *ngIf="config.ingestorComponent.ingestorEnabled">
+      <ng-container *ngIf="ingestorEnabled">
         <button
           mat-menu-item
           [routerLink]="['/ingestor']"
diff --git a/src/app/_layout/app-header/app-header.component.ts b/src/app/_layout/app-header/app-header.component.ts
index 58c7acdc76..634e1db9ad 100644
--- a/src/app/_layout/app-header/app-header.component.ts
+++ b/src/app/_layout/app-header/app-header.component.ts
@@ -38,7 +38,8 @@ export class AppHeaderComponent implements OnInit {
       ? "scicat-header-logo-icon.png"
       : "scicat-header-logo-full.png";
   siteHeaderLogo = this.config.siteHeaderLogo ?? "site-header-logo.png";
-
+  ingestorEnabled = this.config.ingestorComponent?.ingestorEnabled ?? false;
+  
   oAuth2Endpoints: OAuth2Endpoint[] = [];
   username$ = this.store.select(selectCurrentUserName);
   profileImage$ = this.store.select(selectThumbnailPhoto);
diff --git a/src/app/app-routing/app-routing.module.ts b/src/app/app-routing/app-routing.module.ts
index aea69f1201..bebe91433f 100644
--- a/src/app/app-routing/app-routing.module.ts
+++ b/src/app/app-routing/app-routing.module.ts
@@ -5,6 +5,7 @@ import { ErrorPageComponent } from "shared/modules/error-page/error-page.compone
 import { AppLayoutComponent } from "_layout/app-layout/app-layout.component";
 import { AppMainLayoutComponent } from "_layout/app-main-layout/app-main-layout.component";
 import { ServiceGuard } from "./service.guard";
+import { IngestorGuard } from "./ingestor.guard";
 import { MainPageGuard } from "./main-page";
 import { RedirectingComponent } from "./redirecting.component";
 
@@ -114,6 +115,7 @@ export const routes: Routes = [
               import("./lazy/ingestor-routing/ingestor.feature.module").then(
                 (m) => m.IngestorFeatureModule,
               ),
+            canActivate: [IngestorGuard],
           },
           {
             path: "logbooks",
diff --git a/src/app/app-routing/ingestor.guard.ts b/src/app/app-routing/ingestor.guard.ts
new file mode 100644
index 0000000000..41ff71d8c6
--- /dev/null
+++ b/src/app/app-routing/ingestor.guard.ts
@@ -0,0 +1,37 @@
+import { Injectable } from "@angular/core";
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+} from "@angular/router";
+import { AppConfigService } from "app-config.service";
+
+@Injectable({
+  providedIn: "root",
+})
+export class IngestorGuard implements CanActivate {
+  appConfig = this.appConfigService.getConfig();
+
+  constructor(
+    private appConfigService: AppConfigService,
+    private router: Router,
+  ) {}
+
+  canActivate(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot,
+  ): boolean {
+    if (this.appConfig.ingestorComponent?.ingestorEnabled) {
+      return true;
+    } else {
+      this.router.navigate(["/404"], {
+        skipLocationChange: true,
+        queryParams: {
+          url: state.url,
+        },
+      });
+      return false;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index 154e4d32be..d48d945d44 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -221,7 +221,7 @@ export class IngestorNewTransferDialogPageComponent
     this.createNewTransferData.scicatHeader["dataFormat"] = "root";
     this.createNewTransferData.scicatHeader["owner"] = "User";
     this.createNewTransferData.scicatHeader["creationLocation"] =
-      this.facilityInfo.description || "";
+      this.facilityInfo.description || null;
 
     this.createNewTransferData.scicatHeader["principalInvestigator"] =
       this.userProfile.username;

From a8c6efa901b477e0a7b3f51f16b8c9d2dc56827e Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 7 Oct 2025 10:20:29 +0000
Subject: [PATCH 239/245] dependencies

---
 package-lock.json | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b133d1d73f..9b8151eab9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7104,7 +7104,6 @@
       "integrity": "sha512-bHGGJyVjSE4dJJIO5yyEWt/cHyNwga/zXGJbJJ8TiO01aVREK6gCTu3L+5wrkb1FbDkQ+TKjMNe9R/QQQP9+rA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "8.44.0",
         "@typescript-eslint/visitor-keys": "8.44.0"
@@ -7117,13 +7116,12 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
+    "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/types/node_modules/@typescript-eslint/types": {
       "version": "8.44.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
       "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -7132,21 +7130,38 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
-      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.44.0.tgz",
+      "integrity": "sha512-87Jv3E+al8wpD+rIdVJm/ItDBe/Im09zXIjFoipOjr5gHUhJmTzfFLuTJ/nPTMc2Srsroy4IBXwcTCHyRR7KzA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.44.0",
+        "@typescript-eslint/visitor-keys": "8.44.0"
+      },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
+      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
@@ -7487,7 +7502,6 @@
       "integrity": "sha512-zaz9u8EJ4GBmnehlrpoKvj/E3dNbuQ7q0ucyZImm3cLqJ8INTc970B1qEqDX/Rzq65r3TvVTN7kHWPBoyW7DWw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/types": "8.44.0",
         "eslint-visitor-keys": "^4.2.1"
@@ -7506,7 +7520,6 @@
       "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -7521,7 +7534,6 @@
       "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },

From 05f462d14dd5568c98984b71d849e6275cf19fc1 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Tue, 7 Oct 2025 10:23:04 +0000
Subject: [PATCH 240/245] fix lint

---
 src/app/_layout/app-header/app-header.component.ts | 2 +-
 src/app/app-routing/ingestor.guard.ts              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/_layout/app-header/app-header.component.ts b/src/app/_layout/app-header/app-header.component.ts
index 634e1db9ad..aead229273 100644
--- a/src/app/_layout/app-header/app-header.component.ts
+++ b/src/app/_layout/app-header/app-header.component.ts
@@ -39,7 +39,7 @@ export class AppHeaderComponent implements OnInit {
       : "scicat-header-logo-full.png";
   siteHeaderLogo = this.config.siteHeaderLogo ?? "site-header-logo.png";
   ingestorEnabled = this.config.ingestorComponent?.ingestorEnabled ?? false;
-  
+
   oAuth2Endpoints: OAuth2Endpoint[] = [];
   username$ = this.store.select(selectCurrentUserName);
   profileImage$ = this.store.select(selectThumbnailPhoto);
diff --git a/src/app/app-routing/ingestor.guard.ts b/src/app/app-routing/ingestor.guard.ts
index 41ff71d8c6..8f71e11174 100644
--- a/src/app/app-routing/ingestor.guard.ts
+++ b/src/app/app-routing/ingestor.guard.ts
@@ -34,4 +34,4 @@ export class IngestorGuard implements CanActivate {
       return false;
     }
   }
-}
\ No newline at end of file
+}

From e6942805086c68208facfd52c5a1997f85f15d6b Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Thu, 9 Oct 2025 14:31:50 +0000
Subject: [PATCH 241/245] remove old file; after merge is redundant

---
 src/assets/defaultDatasetsListSettings.json | 92 ---------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 src/assets/defaultDatasetsListSettings.json

diff --git a/src/assets/defaultDatasetsListSettings.json b/src/assets/defaultDatasetsListSettings.json
deleted file mode 100644
index 0e1d466700..0000000000
--- a/src/assets/defaultDatasetsListSettings.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "columns": [
-    {
-      "name": "select",
-      "order": 0,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "pid",
-      "order": 1,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "datasetName",
-      "order": 2,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "runNumber",
-      "order": 3,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "sourceFolder",
-      "order": 4,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "size",
-      "order": 5,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "creationTime",
-      "order": 6,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "type",
-      "order": 7,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "image",
-      "order": 8,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "metadata",
-      "order": 9,
-      "type": "standard",
-      "enabled": false
-    },
-    {
-      "name": "proposalId",
-      "order": 10,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "ownerGroup",
-      "order": 11,
-      "type": "standard",
-      "enabled": false
-    },
-    {
-      "name": "dataStatus",
-      "order": 12,
-      "type": "standard",
-      "enabled": false
-    }
-  ],
-  "filters": [
-    { "LocationFilter": true },
-    { "PidFilter": true },
-    { "GroupFilter": true },
-    { "TypeFilter": true },
-    { "KeywordFilter": true },
-    { "DateRangeFilter": true },
-    { "TextFilter": true }
-  ],
-  "conditions": []
-}

From 5444879a2cc84d1c9f92d5fc70f9fbbdac67d8fd Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 10 Oct 2025 08:38:40 +0000
Subject: [PATCH 242/245] fix packages

---
 package-lock.json | 5943 +++++++++++++++++++++++++--------------------
 1 file changed, 3352 insertions(+), 2591 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7097fef680..852e44bd6d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2978,1658 +2978,1550 @@
         "node": ">=14.17.0"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
+    "node_modules/@esbuild/aix-ppc64": {
       "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
-      "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
+      "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
       "cpu": [
-        "arm64"
+        "ppc64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "darwin"
+        "aix"
       ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
+      "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^3.4.3"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
+      "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/config-array": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
-      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
+      "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@eslint/object-schema": "^2.1.6",
-        "debug": "^4.3.1",
-        "minimatch": "^3.1.2"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
-    "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
+      "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": "*"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/config-helpers": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
-      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
+      "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/core": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.15"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
-      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
+      "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^10.0.1",
-        "globals": "^14.0.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
+      "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
+      "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">= 4"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
+      "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
+      "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
+      "cpu": [
+        "loong64"
+      ],
       "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "*"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/js": {
-      "version": "9.32.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.32.0.tgz",
-      "integrity": "sha512-BBpRFZK3eX6uMLKz8WxFOBIFFcGFJ/g8XuwjTHCqHROSIsopI+ddn/d5Cfh36+7+e5edVS8dbSHnBNhrLEX0zg==",
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
+      "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
+      "cpu": [
+        "mips64el"
+      ],
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://eslint.org/donate"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/object-schema": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
+      "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.4.tgz",
-      "integrity": "sha512-Ul5l+lHEcw3L5+k8POx6r74mxEYKG5kOb6Xpy2gCRW6zweT6TEhAf8vhxGgjhqrd/VO/Dirhsb+1hNpD1ue9hw==",
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
+      "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@eslint/core": "^0.15.1",
-        "levn": "^0.4.1"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
-    "node_modules/@fast-csv/format": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@fast-csv/format/-/format-4.3.5.tgz",
-      "integrity": "sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==",
-      "dependencies": {
-        "@types/node": "^14.0.1",
-        "lodash.escaperegexp": "^4.1.2",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isequal": "^4.5.0",
-        "lodash.isfunction": "^3.0.9",
-        "lodash.isnil": "^4.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@fast-csv/format/node_modules/@types/node": {
-      "version": "14.18.63",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
-      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ=="
-    },
-    "node_modules/@fast-csv/parse": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@fast-csv/parse/-/parse-4.3.6.tgz",
-      "integrity": "sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==",
-      "dependencies": {
-        "@types/node": "^14.0.1",
-        "lodash.escaperegexp": "^4.1.2",
-        "lodash.groupby": "^4.6.0",
-        "lodash.isfunction": "^3.0.9",
-        "lodash.isnil": "^4.0.0",
-        "lodash.isundefined": "^3.0.1",
-        "lodash.uniq": "^4.5.0"
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
+      "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@fast-csv/parse/node_modules/@types/node": {
-      "version": "14.18.63",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
-      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ=="
-    },
-    "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
+      "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=18.18.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@humanfs/node": {
-      "version": "0.16.6",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@humanfs/core": "^0.19.1",
-        "@humanwhocodes/retry": "^0.3.0"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
       "engines": {
-        "node": ">=18.18.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
+      "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
       "engines": {
-        "node": ">=18.18"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+        "node": ">=18"
       }
     },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
       "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+        "node": ">=18"
       }
     },
-    "node_modules/@humanwhocodes/retry": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
-      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
+      "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
       "engines": {
-        "node": ">=18.18"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+        "node": ">=18"
       }
     },
-    "node_modules/@inquirer/checkbox": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.2.0.tgz",
-      "integrity": "sha512-fdSw07FLJEU5vbpOPzXo5c6xmMGDzbZE2+niuDHX5N6mc6V0Ebso/q3xiHra4D73+PMsC8MJmcaZKuAAoaQsSA==",
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
+      "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@inquirer/core": "^10.1.15",
-        "@inquirer/figures": "^1.0.13",
-        "@inquirer/type": "^3.0.8",
-        "ansi-escapes": "^4.3.2",
-        "yoctocolors-cjs": "^2.1.2"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
       "engines": {
         "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
       }
     },
-    "node_modules/@inquirer/confirm": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.6.tgz",
-      "integrity": "sha512-6ZXYK3M1XmaVBZX6FCfChgtponnL0R6I7k8Nu+kaoNkT828FVZTcca1MqmWQipaW2oNREQl5AaPCUOOCVNdRMw==",
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
+      "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@inquirer/core": "^10.1.7",
-        "@inquirer/type": "^3.0.4"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
       }
     },
-    "node_modules/@inquirer/core": {
-      "version": "10.1.15",
-      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.15.tgz",
-      "integrity": "sha512-8xrp836RZvKkpNbVvgWUlxjT4CraKk2q+I3Ksy+seI2zkcE+y6wNs1BVhgcv8VyImFecUhdQrYLdW32pAjwBdA==",
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
+      "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "dependencies": {
-        "@inquirer/figures": "^1.0.13",
-        "@inquirer/type": "^3.0.8",
-        "ansi-escapes": "^4.3.2",
-        "cli-width": "^4.1.0",
-        "mute-stream": "^2.0.0",
-        "signal-exit": "^4.1.0",
-        "wrap-ansi": "^6.2.0",
-        "yoctocolors-cjs": "^2.1.2"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
       }
     },
-    "node_modules/@inquirer/editor": {
-      "version": "4.2.15",
-      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.15.tgz",
-      "integrity": "sha512-wst31XT8DnGOSS4nNJDIklGKnf+8shuauVrWzgKegWUe28zfCftcWZ2vktGdzJgcylWSS2SrDnYUb6alZcwnCQ==",
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
+      "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@inquirer/core": "^10.1.15",
-        "@inquirer/type": "^3.0.8",
-        "external-editor": "^3.1.0"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
       }
     },
-    "node_modules/@inquirer/expand": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.17.tgz",
-      "integrity": "sha512-PSqy9VmJx/VbE3CT453yOfNa+PykpKg/0SYP7odez1/NWBGuDXgPhp4AeGYYKjhLn5lUUavVS/JbeYMPdH50Mw==",
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.15",
-        "@inquirer/type": "^3.0.8",
-        "yoctocolors-cjs": "^2.1.2"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependencies": {
-        "@types/node": ">=18"
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@inquirer/figures": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.13.tgz",
-      "integrity": "sha512-lGPVU3yO9ZNqA7vTYz26jny41lE7yoQansmqdMLBEfqaGsmdg7V3W9mK9Pvb5IL4EVZ9GnSDGMO/cJXud5dMaw==",
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@inquirer/input": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.2.1.tgz",
-      "integrity": "sha512-tVC+O1rBl0lJpoUZv4xY+WGWY8V5b0zxU1XDsMsIHYregdh7bN5X5QnIONNBAl0K765FYlAfNHS2Bhn7SSOVow==",
+    "node_modules/@eslint/config-array": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@inquirer/core": "^10.1.15",
-        "@inquirer/type": "^3.0.8"
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@inquirer/number": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.17.tgz",
-      "integrity": "sha512-GcvGHkyIgfZgVnnimURdOueMk0CztycfC8NZTiIY9arIAkeOgt6zG57G+7vC59Jns3UX27LMkPKnKWAOF5xEYg==",
+    "node_modules/@eslint/config-array/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.15",
-        "@inquirer/type": "^3.0.8"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/@inquirer/password": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.17.tgz",
-      "integrity": "sha512-DJolTnNeZ00E1+1TW+8614F7rOJJCM4y4BAGQ3Gq6kQIG+OJ4zr3GLjIjVVJCbKsk2jmkmv6v2kQuN/vriHdZA==",
+    "node_modules/@eslint/config-array/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "@inquirer/core": "^10.1.15",
-        "@inquirer/type": "^3.0.8",
-        "ansi-escapes": "^4.3.2"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
+        "node": "*"
       }
     },
-    "node_modules/@inquirer/prompts": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.3.2.tgz",
-      "integrity": "sha512-G1ytyOoHh5BphmEBxSwALin3n1KGNYB6yImbICcRQdzXfOGbuJ9Jske/Of5Sebk339NSGGNfUshnzK8YWkTPsQ==",
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.0.tgz",
+      "integrity": "sha512-WUFvV4WoIwW8Bv0KeKCIIEgdSiFOsulyN0xrMu+7z43q/hkOLXjvb5u7UC9jDxvRzcrbEmuZBX5yJZz1741jog==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@inquirer/checkbox": "^4.1.2",
-        "@inquirer/confirm": "^5.1.6",
-        "@inquirer/editor": "^4.2.7",
-        "@inquirer/expand": "^4.0.9",
-        "@inquirer/input": "^4.1.6",
-        "@inquirer/number": "^3.0.9",
-        "@inquirer/password": "^4.0.9",
-        "@inquirer/rawlist": "^4.0.9",
-        "@inquirer/search": "^3.0.9",
-        "@inquirer/select": "^4.0.9"
+        "@eslint/core": "^0.16.0"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@inquirer/rawlist": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.5.tgz",
-      "integrity": "sha512-R5qMyGJqtDdi4Ht521iAkNqyB6p2UPuZUbMifakg1sWtu24gc2Z8CJuw8rP081OckNDMgtDCuLe42Q2Kr3BolA==",
+    "node_modules/@eslint/core": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz",
+      "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@inquirer/core": "^10.1.15",
-        "@inquirer/type": "^3.0.8",
-        "yoctocolors-cjs": "^2.1.2"
+        "@types/json-schema": "^7.0.15"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@inquirer/search": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.1.0.tgz",
-      "integrity": "sha512-PMk1+O/WBcYJDq2H7foV0aAZSmDdkzZB9Mw2v/DmONRJopwA/128cS9M/TXWLKKdEQKZnKwBzqu2G4x/2Nqx8Q==",
+    "node_modules/@eslint/eslintrc": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.15",
-        "@inquirer/figures": "^1.0.13",
-        "@inquirer/type": "^3.0.8",
-        "yoctocolors-cjs": "^2.1.2"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@inquirer/select": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.3.1.tgz",
-      "integrity": "sha512-Gfl/5sqOF5vS/LIrSndFgOh7jgoe0UXEizDqahFRkq5aJBLegZ6WjuMh/hVEJwlFQjyLq1z9fRtvUMkb7jM1LA==",
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.15",
-        "@inquirer/figures": "^1.0.13",
-        "@inquirer/type": "^3.0.8",
-        "ansi-escapes": "^4.3.2",
-        "yoctocolors-cjs": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@inquirer/type": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.8.tgz",
-      "integrity": "sha512-lg9Whz8onIHRthWaN1Q9EGLa/0LFJjyM8mEUbL1eTi6yMGvBf8gvyDLtxSXztQsxMvhxxNpJYrwa1YHdq+w4Jw==",
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true,
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
-      }
+      "license": "Python-2.0"
     },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+    "node_modules/@eslint/eslintrc/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+        "node": ">= 4"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=12"
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "*"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+    "node_modules/@eslint/js": {
+      "version": "9.37.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.37.0.tgz",
+      "integrity": "sha512-jaS+NJ+hximswBG6pjNX0uEJZkrT0zwpVi3BA3vX22aFGjJjmgSTSmPpZCRKmoBL5VY/M6p0xsSJx7rk7sy5gg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
       "engines": {
-        "node": ">=12"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+        "url": "https://eslint.org/donate"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@isaacs/fs-minipass": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
-      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz",
+      "integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "minipass": "^7.0.4"
+        "@eslint/core": "^0.16.0",
+        "levn": "^0.4.1"
       },
       "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
-      "dev": true,
+    "node_modules/@fast-csv/format": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@fast-csv/format/-/format-4.3.5.tgz",
+      "integrity": "sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0",
-        "@jridgewell/trace-mapping": "^0.3.24"
+        "@types/node": "^14.0.1",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isequal": "^4.5.0",
+        "lodash.isfunction": "^3.0.9",
+        "lodash.isnil": "^4.0.0"
       }
     },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
+    "node_modules/@fast-csv/format/node_modules/@types/node": {
+      "version": "14.18.63",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
+      "license": "MIT"
     },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
-      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
-      "dev": true,
+    "node_modules/@fast-csv/parse": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@fast-csv/parse/-/parse-4.3.6.tgz",
+      "integrity": "sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25"
+        "@types/node": "^14.0.1",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.groupby": "^4.6.0",
+        "lodash.isfunction": "^3.0.9",
+        "lodash.isnil": "^4.0.0",
+        "lodash.isundefined": "^3.0.1",
+        "lodash.uniq": "^4.5.0"
       }
     },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
-      "dev": true
+    "node_modules/@fast-csv/parse/node_modules/@types/node": {
+      "version": "14.18.63",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
+      "license": "MIT"
     },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.30",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz",
-      "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "node_modules/@jsonforms/angular": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/@jsonforms/angular/-/angular-3.5.1.tgz",
-      "integrity": "sha512-qbMblz/G/kWOol1n6iMYUA81ndzQe80p788VyMsm6dJ5edTrqpvWVK8vjLkzWZtH5kbFrg/nkYaI/f6XsP1Chw==",
-      "dependencies": {
-        "lodash": "^4.17.21"
-      },
-      "peerDependencies": {
-        "@angular/core": "^18.0.0 || ^19.0.0",
-        "@angular/forms": "^18.0.0 || ^19.0.0",
-        "@jsonforms/core": "3.5.1",
-        "rxjs": "^6.6.0 || ^7.4.0"
-      }
-    },
-    "node_modules/@jsonforms/angular-material": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/@jsonforms/angular-material/-/angular-material-3.5.1.tgz",
-      "integrity": "sha512-x2j3B3XG1uL3aU8gzo3iRSSRPuRBzceI4Do1itXn016h3S1JT5sDtI7NWvZ+K6TQN4YGuWypaXuBm2y686DKpw==",
-      "dependencies": {
-        "hammerjs": "2.0.8",
-        "lodash": "^4.17.21"
-      },
-      "peerDependencies": {
-        "@angular/animations": "^18.0.0 || ^19.0.0",
-        "@angular/cdk": "^18.0.0 || ^19.0.0",
-        "@angular/common": "^18.0.0 || ^19.0.0",
-        "@angular/core": "^18.0.0 || ^19.0.0",
-        "@angular/forms": "^18.0.0 || ^19.0.0",
-        "@angular/material": "^18.0.0 || ^19.0.0",
-        "@angular/platform-browser": "^18.0.0 || ^19.0.0",
-        "@angular/router": "^18.0.0 || ^19.0.0",
-        "@jsonforms/angular": "3.5.1",
-        "@jsonforms/core": "3.5.1",
-        "dayjs": "^1.11.10",
-        "rxjs": "^6.6.0 || ^7.4.0"
-      }
-    },
-    "node_modules/@jsonforms/core": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-3.5.1.tgz",
-      "integrity": "sha512-Jrq/UcfvKsAprLJ+9TMFa8pKsfdyv3dAw85XstSNRcjDT19LreBlhVqIvTvtgZidg8Iet3yqy5xlNnB+XyrvrQ==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.3",
-        "ajv": "^8.6.1",
-        "ajv-formats": "^2.1.0",
-        "lodash": "^4.17.21"
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
       }
     },
-    "node_modules/@jsonforms/core/node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+    "node_modules/@humanfs/node": {
+      "version": "0.16.7",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
+      "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.4.0"
       },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=18.18.0"
       }
     },
-    "node_modules/@jsonjoy.com/base64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": ">=10.0"
+        "node": ">=12.22"
       },
       "funding": {
         "type": "github",
-        "url": "https://github.com/sponsors/streamich"
-      },
-      "peerDependencies": {
-        "tslib": "2"
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@jsonjoy.com/buffers": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/buffers/-/buffers-1.0.0.tgz",
-      "integrity": "sha512-NDigYR3PHqCnQLXYyoLbnEdzMMvzeiCWo1KOut7Q0CoIqg9tUAPKJ1iq/2nFhc5kZtexzutNY0LFjdwWL3Dw3Q==",
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": ">=10.0"
+        "node": ">=18.18"
       },
       "funding": {
         "type": "github",
-        "url": "https://github.com/sponsors/streamich"
-      },
-      "peerDependencies": {
-        "tslib": "2"
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@jsonjoy.com/codegen": {
+    "node_modules/@inquirer/ansi": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/codegen/-/codegen-1.0.0.tgz",
-      "integrity": "sha512-E8Oy+08cmCf0EK/NMxpaJZmOxPqM+6iSe2S4nlSBrPZOORoDJILxtbSUEDKQyTamm/BVAhIGllOBNU79/dwf0g==",
+      "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-1.0.0.tgz",
+      "integrity": "sha512-JWaTfCxI1eTmJ1BIv86vUfjVatOdxwD0DAVKYevY8SazeUUZtW+tNbsdejVO1GYE0GXJW1N1ahmiC3TFd+7wZA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "engines": {
-        "node": ">=10.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
-      },
-      "peerDependencies": {
-        "tslib": "2"
+        "node": ">=18"
       }
     },
-    "node_modules/@jsonjoy.com/json-pack": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.14.0.tgz",
-      "integrity": "sha512-LpWbYgVnKzphN5S6uss4M25jJ/9+m6q6UJoeN6zTkK4xAGhKsiBRPVeF7OYMWonn5repMQbE5vieRXcMUrKDKw==",
+    "node_modules/@inquirer/checkbox": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.2.4.tgz",
+      "integrity": "sha512-2n9Vgf4HSciFq8ttKXk+qy+GsyTXPV1An6QAwe/8bkbbqvG4VW1I/ZY1pNu2rf+h9bdzMLPbRSfcNxkHBy/Ydw==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@jsonjoy.com/base64": "^1.1.2",
-        "@jsonjoy.com/buffers": "^1.0.0",
-        "@jsonjoy.com/codegen": "^1.0.0",
-        "@jsonjoy.com/json-pointer": "^1.0.1",
-        "@jsonjoy.com/util": "^1.9.0",
-        "hyperdyperid": "^1.2.0",
-        "thingies": "^2.5.0"
+        "@inquirer/ansi": "^1.0.0",
+        "@inquirer/core": "^10.2.2",
+        "@inquirer/figures": "^1.0.13",
+        "@inquirer/type": "^3.0.8",
+        "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
-        "node": ">=10.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "tslib": "2"
-      }
-    },
-    "node_modules/@jsonjoy.com/json-pointer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pointer/-/json-pointer-1.0.2.tgz",
-      "integrity": "sha512-Fsn6wM2zlDzY1U+v4Nc8bo3bVqgfNTGcn6dMgs6FjrEnt4ZCe60o6ByKRjOGlI2gow0aE/Q41QOigdTqkyK5fg==",
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/confirm": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.6.tgz",
+      "integrity": "sha512-6ZXYK3M1XmaVBZX6FCfChgtponnL0R6I7k8Nu+kaoNkT828FVZTcca1MqmWQipaW2oNREQl5AaPCUOOCVNdRMw==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@jsonjoy.com/codegen": "^1.0.0",
-        "@jsonjoy.com/util": "^1.9.0"
+        "@inquirer/core": "^10.1.7",
+        "@inquirer/type": "^3.0.4"
       },
       "engines": {
-        "node": ">=10.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "tslib": "2"
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@jsonjoy.com/util": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.9.0.tgz",
-      "integrity": "sha512-pLuQo+VPRnN8hfPqUTLTHk126wuYdXVxE6aDmjSeV4NCAgyxWbiOIeNJVtID3h1Vzpoi9m4jXezf73I6LgabgQ==",
+    "node_modules/@inquirer/core": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.2.2.tgz",
+      "integrity": "sha512-yXq/4QUnk4sHMtmbd7irwiepjB8jXU0kkFRL4nr/aDBA2mDz13cMakEWdDwX3eSCTkk03kwcndD1zfRAIlELxA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@jsonjoy.com/buffers": "^1.0.0",
-        "@jsonjoy.com/codegen": "^1.0.0"
+        "@inquirer/ansi": "^1.0.0",
+        "@inquirer/figures": "^1.0.13",
+        "@inquirer/type": "^3.0.8",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^2.0.0",
+        "signal-exit": "^4.1.0",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
-        "node": ">=10.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "tslib": "2"
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@kwsites/file-exists": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
-      "integrity": "sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==",
+    "node_modules/@inquirer/editor": {
+      "version": "4.2.20",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.20.tgz",
+      "integrity": "sha512-7omh5y5bK672Q+Brk4HBbnHNowOZwrb/78IFXdrEB9PfdxL3GudQyDk8O9vQ188wj3xrEebS2M9n18BjJoI83g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "debug": "^4.1.1"
+        "@inquirer/core": "^10.2.2",
+        "@inquirer/external-editor": "^1.0.2",
+        "@inquirer/type": "^3.0.8"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@kwsites/promise-deferred": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz",
-      "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",
-      "dev": true
-    },
-    "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
-      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@listr2/prompt-adapter-inquirer": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.18.tgz",
-      "integrity": "sha512-0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==",
+    "node_modules/@inquirer/expand": {
+      "version": "4.0.20",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.20.tgz",
+      "integrity": "sha512-Dt9S+6qUg94fEvgn54F2Syf0Z3U8xmnBI9ATq2f5h9xt09fs2IJXSCIXyyVHwvggKWFXEY/7jATRo2K6Dkn6Ow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@inquirer/type": "^1.5.5"
+        "@inquirer/core": "^10.2.2",
+        "@inquirer/type": "^3.0.8",
+        "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@inquirer/prompts": ">= 3 < 8"
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz",
-      "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==",
+    "node_modules/@inquirer/external-editor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.2.tgz",
+      "integrity": "sha512-yy9cOoBnx58TlsPrIxauKIFQTiyH+0MK4e97y4sV9ERbI+zDxw7i2hxHLCIEGIE/8PPvDxGhgzIOTSOWcs6/MQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "mute-stream": "^1.0.0"
+        "chardet": "^2.1.0",
+        "iconv-lite": "^0.7.0"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@listr2/prompt-adapter-inquirer/node_modules/mute-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+    "node_modules/@inquirer/figures": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.13.tgz",
+      "integrity": "sha512-lGPVU3yO9ZNqA7vTYz26jny41lE7yoQansmqdMLBEfqaGsmdg7V3W9mK9Pvb5IL4EVZ9GnSDGMO/cJXud5dMaw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@lmdb/lmdb-darwin-arm64": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.2.6.tgz",
-      "integrity": "sha512-yF/ih9EJJZc72psFQbwnn8mExIWfTnzWJg+N02hnpXtDPETYLmQswIMBn7+V88lfCaFrMozJsUvcEQIkEPU0Gg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
-      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@napi-rs/nice": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@napi-rs/nice/-/nice-1.1.1.tgz",
-      "integrity": "sha512-xJIPs+bYuc9ASBl+cvGsKbGrJmS6fAKaSZCnT0lhahT5rhA2VVy9/EcIgd2JhtEuFOJNx7UHNn/qiTPTY4nrQw==",
+    "node_modules/@inquirer/input": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.2.4.tgz",
+      "integrity": "sha512-cwSGpLBMwpwcZZsc6s1gThm0J+it/KIJ+1qFL2euLmSKUMGumJ5TcbMgxEjMjNHRGadouIYbiIgruKoDZk7klw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
+      "dependencies": {
+        "@inquirer/core": "^10.2.2",
+        "@inquirer/type": "^3.0.8"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": ">=18"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Brooooooklyn"
+      "peerDependencies": {
+        "@types/node": ">=18"
       },
-      "optionalDependencies": {
-        "@napi-rs/nice-android-arm-eabi": "1.1.1",
-        "@napi-rs/nice-android-arm64": "1.1.1",
-        "@napi-rs/nice-darwin-arm64": "1.1.1",
-        "@napi-rs/nice-darwin-x64": "1.1.1",
-        "@napi-rs/nice-freebsd-x64": "1.1.1",
-        "@napi-rs/nice-linux-arm-gnueabihf": "1.1.1",
-        "@napi-rs/nice-linux-arm64-gnu": "1.1.1",
-        "@napi-rs/nice-linux-arm64-musl": "1.1.1",
-        "@napi-rs/nice-linux-ppc64-gnu": "1.1.1",
-        "@napi-rs/nice-linux-riscv64-gnu": "1.1.1",
-        "@napi-rs/nice-linux-s390x-gnu": "1.1.1",
-        "@napi-rs/nice-linux-x64-gnu": "1.1.1",
-        "@napi-rs/nice-linux-x64-musl": "1.1.1",
-        "@napi-rs/nice-openharmony-arm64": "1.1.1",
-        "@napi-rs/nice-win32-arm64-msvc": "1.1.1",
-        "@napi-rs/nice-win32-ia32-msvc": "1.1.1",
-        "@napi-rs/nice-win32-x64-msvc": "1.1.1"
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@napi-rs/nice-darwin-arm64": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.1.1.tgz",
-      "integrity": "sha512-s/E7w45NaLqTGuOjC2p96pct4jRfo61xb9bU1unM/MJ/RFkKlJyJDx7OJI/O0ll/hrfpqKopuAFDV8yo0hfT7A==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@inquirer/number": {
+      "version": "3.0.20",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.20.tgz",
+      "integrity": "sha512-bbooay64VD1Z6uMfNehED2A2YOPHSJnQLs9/4WNiV/EK+vXczf/R988itL2XLDGTgmhMF2KkiWZo+iEZmc4jqg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ngbracket/ngx-layout": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@ngbracket/ngx-layout/-/ngx-layout-16.1.3.tgz",
-      "integrity": "sha512-N24KX2BIBYXbCfLyr8Q/wXHh5x9w8yGn2G5GLo99inOJ2BtBNu3AvBdvz1oYIsuLEdqgWZIqt0JqlBeIm4u/iQ==",
-      "license": "MIT",
       "dependencies": {
-        "tslib": "^2.5.0"
+        "@inquirer/core": "^10.2.2",
+        "@inquirer/type": "^3.0.8"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@angular/cdk": ">=16.0.0",
-        "@angular/common": ">=16.0.0",
-        "@angular/core": ">=16.0.0",
-        "@angular/platform-browser": ">=16.0.0",
-        "rxjs": "^6.5.3 || ^7.8.0"
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@ngrx/effects": {
-      "version": "19.2.1",
-      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-19.2.1.tgz",
-      "integrity": "sha512-RZmTPOIC/h4JtySxh4Oa0ReQomxv4/+2er9vJ2IiuPDgUo7oE83iKZvB8uZUW/8y9dcu+MB6u0VjWM6rcbpCcA==",
+    "node_modules/@inquirer/password": {
+      "version": "4.0.20",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.20.tgz",
+      "integrity": "sha512-nxSaPV2cPvvoOmRygQR+h0B+Av73B01cqYLcr7NXcGXhbmsYfUb8fDdw2Us1bI2YsX+VvY7I7upgFYsyf8+Nug==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tslib": "^2.0.0"
+        "@inquirer/ansi": "^1.0.0",
+        "@inquirer/core": "^10.2.2",
+        "@inquirer/type": "^3.0.8"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@angular/core": "^19.0.0",
-        "@ngrx/store": "19.2.1",
-        "rxjs": "^6.5.3 || ^7.5.0"
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@ngrx/eslint-plugin": {
-      "version": "19.2.1",
-      "resolved": "https://registry.npmjs.org/@ngrx/eslint-plugin/-/eslint-plugin-19.2.1.tgz",
-      "integrity": "sha512-6NquOZRc6y6uWdct7ygYh83KMenTCy4dz3+W3+g5wdohtvH2uHmdOnEuA4FW7PHSP0DJKwSN2GgmS6PYs4TEvg==",
+    "node_modules/@inquirer/prompts": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.3.2.tgz",
+      "integrity": "sha512-G1ytyOoHh5BphmEBxSwALin3n1KGNYB6yImbICcRQdzXfOGbuJ9Jske/Of5Sebk339NSGGNfUshnzK8YWkTPsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "semver": "^7.3.5",
-        "strip-json-comments": "3.1.1"
+        "@inquirer/checkbox": "^4.1.2",
+        "@inquirer/confirm": "^5.1.6",
+        "@inquirer/editor": "^4.2.7",
+        "@inquirer/expand": "^4.0.9",
+        "@inquirer/input": "^4.1.6",
+        "@inquirer/number": "^3.0.9",
+        "@inquirer/password": "^4.0.9",
+        "@inquirer/rawlist": "^4.0.9",
+        "@inquirer/search": "^3.0.9",
+        "@inquirer/select": "^4.0.9"
       },
-      "peerDependencies": {
-        "@typescript-eslint/utils": "^8.0.0",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": "*",
-        "typescript-eslint": "^8.0.0"
-      }
-    },
-    "node_modules/@ngrx/operators": {
-      "version": "19.2.1",
-      "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-19.2.1.tgz",
-      "integrity": "sha512-umjSny5nWe7+a3XPeyMfE8vjhXD4ec6nA/KSV7bQA43Yt3eW8cQQr5ng7UZOkC0rbqcBGpSsJPt5thTeXiMXQg==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.3.0"
+      "engines": {
+        "node": ">=18"
       },
       "peerDependencies": {
-        "rxjs": "^6.5.3 || ^7.4.0"
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@ngrx/router-store": {
-      "version": "19.2.1",
-      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-19.2.1.tgz",
-      "integrity": "sha512-4gI9A5Mnl52UEHskLKb2A6QXdHDdGr6eyBM940t16mI5RCXfkoSJNb5mQ/jXh2OZjhx9ponRVNmCaLwkxBMB5g==",
+    "node_modules/@inquirer/rawlist": {
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.8.tgz",
+      "integrity": "sha512-CQ2VkIASbgI2PxdzlkeeieLRmniaUU1Aoi5ggEdm6BIyqopE9GuDXdDOj9XiwOqK5qm72oI2i6J+Gnjaa26ejg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tslib": "^2.0.0"
+        "@inquirer/core": "^10.2.2",
+        "@inquirer/type": "^3.0.8",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@angular/common": "^19.0.0",
-        "@angular/core": "^19.0.0",
-        "@angular/router": "^19.0.0",
-        "@ngrx/store": "19.2.1",
-        "rxjs": "^6.5.3 || ^7.5.0"
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@ngrx/schematics": {
-      "version": "19.2.1",
-      "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-19.2.1.tgz",
-      "integrity": "sha512-6N7nyQ5QkHnFVAHPEHGiIKTgBqbwv/lS/vqbbuY4H4Gd4DYH/wAHcN97/EU+wVzlsrK7I1cCUEL2zwQ7WsbPdg==",
+    "node_modules/@inquirer/search": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.1.3.tgz",
+      "integrity": "sha512-D5T6ioybJJH0IiSUK/JXcoRrrm8sXwzrVMjibuPs+AgxmogKslaafy1oxFiorNI4s3ElSkeQZbhYQgLqiL8h6Q==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@ngrx/store": {
-      "version": "19.2.1",
-      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-19.2.1.tgz",
-      "integrity": "sha512-c5vQId7YoAhM0y4HASrz9mtLju+28vJspd6OBlhPbBlSae8GN8m9S/oav+8LaSY19yh95cZ5B/nMcLNNWgL/jA==",
       "license": "MIT",
       "dependencies": {
-        "tslib": "^2.0.0"
+        "@inquirer/core": "^10.2.2",
+        "@inquirer/figures": "^1.0.13",
+        "@inquirer/type": "^3.0.8",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@angular/core": "^19.0.0",
-        "rxjs": "^6.5.3 || ^7.5.0"
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@ngrx/store-devtools": {
-      "version": "19.2.1",
-      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-19.2.1.tgz",
-      "integrity": "sha512-gj1YO+4yl6D0l9vzLWdw07TQSu5UPKgsSLsNJfDLXraaLCUcB8voAp4J7zohN8qR5ixDuHeMoiSSVuklQ75u2w==",
+    "node_modules/@inquirer/select": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.3.4.tgz",
+      "integrity": "sha512-Qp20nySRmfbuJBBsgPU7E/cL62Hf250vMZRzYDcBHty2zdD1kKCnoDFWRr0WO2ZzaXp3R7a4esaVGJUx0E6zvA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tslib": "^2.0.0"
+        "@inquirer/ansi": "^1.0.0",
+        "@inquirer/core": "^10.2.2",
+        "@inquirer/figures": "^1.0.13",
+        "@inquirer/type": "^3.0.8",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@angular/core": "^19.0.0",
-        "@ngrx/store": "19.2.1",
-        "rxjs": "^6.5.3 || ^7.5.0"
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@ngtools/webpack": {
-      "version": "19.2.17",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.2.17.tgz",
-      "integrity": "sha512-HpbOLwS8tIW041UXcMqwfySqpZ9ztObH8U4NWKwjPBe0S5UDnF6doW2rS3GQm71hkiuB8sqbxOWz5I/NNvZFNQ==",
+    "node_modules/@inquirer/type": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.8.tgz",
+      "integrity": "sha512-lg9Whz8onIHRthWaN1Q9EGLa/0LFJjyM8mEUbL1eTi6yMGvBf8gvyDLtxSXztQsxMvhxxNpJYrwa1YHdq+w4Jw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^19.0.0 || ^19.2.0-next.0",
-        "typescript": ">=5.5 <5.9",
-        "webpack": "^5.54.0"
-      }
-    },
-    "node_modules/@ngx-translate/core": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-17.0.0.tgz",
-      "integrity": "sha512-Rft2D5ns2pq4orLZjEtx1uhNuEBerUdpFUG1IcqtGuipj6SavgB8SkxtNQALNDA+EVlvsNCCjC2ewZVtUeN6rg==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.3.0"
+        "@types/node": ">=18"
       },
-      "peerDependencies": {
-        "@angular/common": ">=16",
-        "@angular/core": ">=16"
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@ngxmc/datetime-picker": {
-      "version": "19.3.1",
-      "resolved": "https://registry.npmjs.org/@ngxmc/datetime-picker/-/datetime-picker-19.3.1.tgz",
-      "integrity": "sha512-1Ud8XeCD0JRJ4Esbv0Op9sCdLjPPXfH+NHXSXe+zeCu+MyvIocqytT4o0THWUj4Lcg/yqneLG7dTbK0X8bxSrg==",
-      "license": "MIT",
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "tslib": "^2.3.0"
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
       },
-      "peerDependencies": {
-        "@angular/cdk": "^19.0.0",
-        "@angular/common": "^19.0.0",
-        "@angular/core": "^19.0.0",
-        "@angular/forms": "^19.0.0",
-        "@angular/material": "^19.0.0",
-        "@angular/platform-browser": "^19.0.0"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
       "engines": {
-        "node": ">= 8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@npmcli/agent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz",
-      "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==",
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.1.0",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.1",
-        "lru-cache": "^10.0.1",
-        "socks-proxy-agent": "^8.0.3"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/@npmcli/agent/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/@npmcli/fs": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
-      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "semver": "^7.3.5"
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/@npmcli/git": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-6.0.3.tgz",
-      "integrity": "sha512-GUYESQlxZRAdhs3UhbB6pVRNUELQOHXwK9ruDkwmCv2aZ5y0SApQzUJCg02p3A7Ue2J5hxvlk1YI53c00NmRyQ==",
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/promise-spawn": "^8.0.0",
-        "ini": "^5.0.0",
-        "lru-cache": "^10.0.1",
-        "npm-pick-manifest": "^10.0.0",
-        "proc-log": "^5.0.0",
-        "promise-retry": "^2.0.1",
-        "semver": "^7.3.5",
-        "which": "^5.0.0"
+        "minipass": "^7.0.4"
       },
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">=18.0.0"
       }
     },
-    "node_modules/@npmcli/git/node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "engines": {
-        "node": ">=16"
+        "node": ">=8"
       }
     },
-    "node_modules/@npmcli/git/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "dev": true,
-      "license": "ISC"
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
     },
-    "node_modules/@npmcli/git/node_modules/which": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
-      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@npmcli/installed-package-contents": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz",
-      "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==",
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "npm-bundled": "^4.0.0",
-        "npm-normalize-package-bin": "^4.0.0"
-      },
-      "bin": {
-        "installed-package-contents": "bin/index.js"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
-    "node_modules/@npmcli/node-gyp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz",
-      "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==",
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/@npmcli/package-json": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.2.0.tgz",
-      "integrity": "sha512-rCNLSB/JzNvot0SEyXqWZ7tX2B5dD2a1br2Dp0vSYVo5jh8Z0EZ7lS9TsZ1UtziddB1UfNUaMCc538/HztnJGA==",
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "@npmcli/git": "^6.0.0",
-        "glob": "^10.2.2",
-        "hosted-git-info": "^8.0.0",
-        "json-parse-even-better-errors": "^4.0.0",
-        "proc-log": "^5.0.0",
-        "semver": "^7.5.3",
-        "validate-npm-package-license": "^3.0.4"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@npmcli/package-json/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/@jsonforms/angular": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@jsonforms/angular/-/angular-3.6.0.tgz",
+      "integrity": "sha512-QRL/MIkw7/C5JSpHO3rY0Bq0qyYyOQj9PwoMW33vSCTPsrBtSnn5CZnrBITQ7VLbA9WQ+sNf5tbsaoyWHuDFlg==",
+      "license": "MIT",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "lodash": "^4.17.21"
       },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+      "peerDependencies": {
+        "@angular/core": "^18.0.0 || ^19.0.0 || ^20.0.0",
+        "@angular/forms": "^18.0.0 || ^19.0.0 || ^20.0.0",
+        "@jsonforms/core": "3.6.0",
+        "rxjs": "^6.6.0 || ^7.4.0"
+      }
+    },
+    "node_modules/@jsonforms/angular-material": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@jsonforms/angular-material/-/angular-material-3.6.0.tgz",
+      "integrity": "sha512-tASA5DF9UMbPft94zYF9YRVGxUUpRXMpOho5uBwRuD+2jmpxyVgvlLnjh/+6VzQcPjLM/6KAZa2o4Cn5qNm5LQ==",
+      "license": "MIT",
+      "dependencies": {
+        "hammerjs": "2.0.8",
+        "lodash": "^4.17.21"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependencies": {
+        "@angular/animations": "^18.0.0 || ^19.0.0 || ^20.0.0",
+        "@angular/cdk": "^18.0.0 || ^19.0.0 || ^20.0.0",
+        "@angular/common": "^18.0.0 || ^19.0.0 || ^20.0.0",
+        "@angular/core": "^18.0.0 || ^19.0.0 || ^20.0.0",
+        "@angular/forms": "^18.0.0 || ^19.0.0 || ^20.0.0",
+        "@angular/material": "^18.0.0 || ^19.0.0 || ^20.0.0",
+        "@angular/platform-browser": "^18.0.0 || ^19.0.0 || ^20.0.0",
+        "@angular/router": "^18.0.0 || ^19.0.0 || ^20.0.0",
+        "@jsonforms/angular": "3.6.0",
+        "@jsonforms/core": "3.6.0",
+        "dayjs": "^1.11.10",
+        "rxjs": "^6.6.0 || ^7.4.0"
       }
     },
-    "node_modules/@npmcli/package-json/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/@jsonforms/core": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-3.6.0.tgz",
+      "integrity": "sha512-Qz7qJPf/yP4ybqknZ500zggIDZRJfcufu+3efp/xNWf05mpXvxN9TdfmA++BdXi5Nr4UAgjos2kFmQpZpQaCDw==",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@types/json-schema": "^7.0.3",
+        "ajv": "^8.6.1",
+        "ajv-formats": "^2.1.0",
+        "lodash": "^4.17.21"
+      }
+    },
+    "node_modules/@jsonforms/core/node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
       },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
+      "peerDependencies": {
+        "ajv": "^8.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@npmcli/promise-spawn": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.3.tgz",
-      "integrity": "sha512-Yb00SWaL4F8w+K8YGhQ55+xE4RUNdMHV43WZGsiTM92gS+lC0mGsn7I4hLug7pbao035S6bj3Y3w0cUNGLfmkg==",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/@jsonforms/react": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@jsonforms/react/-/react-3.6.0.tgz",
+      "integrity": "sha512-dor7FYltCkNkAM+SVZGtabjpUhGlj0/coAqx7GIZ8h+leET+d1sLEAc8kfxxh6gZBq9C4KAErb0Pj3uHedOs9Q==",
+      "license": "MIT",
       "dependencies": {
-        "which": "^5.0.0"
+        "lodash": "^4.17.21"
       },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+      "peerDependencies": {
+        "@jsonforms/core": "3.6.0",
+        "react": "^16.12.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/@npmcli/promise-spawn/node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+    "node_modules/@jsonjoy.com/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
       "dev": true,
-      "license": "ISC",
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/@npmcli/promise-spawn/node_modules/which": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
-      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^3.1.1"
+        "node": ">=10.0"
       },
-      "bin": {
-        "node-which": "bin/which.js"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
       },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+      "peerDependencies": {
+        "tslib": "2"
       }
     },
-    "node_modules/@npmcli/redact": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-3.2.2.tgz",
-      "integrity": "sha512-7VmYAmk4csGv08QzrDKScdzn11jHPFGyqJW39FyPgPuAp3zIaUmuCo1yxw9aGs+NEJuTGQ9Gwqpt93vtJubucg==",
+    "node_modules/@jsonjoy.com/buffers": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/buffers/-/buffers-1.2.0.tgz",
+      "integrity": "sha512-6RX+W5a+ZUY/c/7J5s5jK9UinLfJo5oWKh84fb4X0yK2q4WXEWUWZWuEMjvCb1YNUQhEAhUfr5scEGOH7jC4YQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
       }
     },
-    "node_modules/@npmcli/run-script": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-9.1.0.tgz",
-      "integrity": "sha512-aoNSbxtkePXUlbZB+anS1LqsJdctG5n3UVhfU47+CDdwMi6uNTBMF9gPcQRnqghQd2FGzcwwIFBruFMxjhBewg==",
+    "node_modules/@jsonjoy.com/codegen": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/codegen/-/codegen-1.0.0.tgz",
+      "integrity": "sha512-E8Oy+08cmCf0EK/NMxpaJZmOxPqM+6iSe2S4nlSBrPZOORoDJILxtbSUEDKQyTamm/BVAhIGllOBNU79/dwf0g==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@npmcli/node-gyp": "^4.0.0",
-        "@npmcli/package-json": "^6.0.0",
-        "@npmcli/promise-spawn": "^8.0.0",
-        "node-gyp": "^11.0.0",
-        "proc-log": "^5.0.0",
-        "which": "^5.0.0"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
       }
     },
-    "node_modules/@npmcli/run-script/node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+    "node_modules/@jsonjoy.com/json-pack": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.20.0.tgz",
+      "integrity": "sha512-adcXFVorSQULtT4XDL0giRLr2EVGIcyWm6eQKZWTrRA4EEydGOY8QVQtL0PaITQpUyu+lOd/QOicw6vdy1v8QQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jsonjoy.com/base64": "^1.1.2",
+        "@jsonjoy.com/buffers": "^1.2.0",
+        "@jsonjoy.com/codegen": "^1.0.0",
+        "@jsonjoy.com/json-pointer": "^1.0.2",
+        "@jsonjoy.com/util": "^1.9.0",
+        "hyperdyperid": "^1.2.0",
+        "thingies": "^2.5.0"
+      },
       "engines": {
-        "node": ">=16"
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
       }
     },
-    "node_modules/@npmcli/run-script/node_modules/which": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
-      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+    "node_modules/@jsonjoy.com/json-pointer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pointer/-/json-pointer-1.0.2.tgz",
+      "integrity": "sha512-Fsn6wM2zlDzY1U+v4Nc8bo3bVqgfNTGcn6dMgs6FjrEnt4ZCe60o6ByKRjOGlI2gow0aE/Q41QOigdTqkyK5fg==",
       "dev": true,
-      "license": "ISC",
+      "license": "Apache-2.0",
       "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
+        "@jsonjoy.com/codegen": "^1.0.0",
+        "@jsonjoy.com/util": "^1.9.0"
       },
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
       }
     },
-    "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+    "node_modules/@jsonjoy.com/util": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.9.0.tgz",
+      "integrity": "sha512-pLuQo+VPRnN8hfPqUTLTHk126wuYdXVxE6aDmjSeV4NCAgyxWbiOIeNJVtID3h1Vzpoi9m4jXezf73I6LgabgQ==",
       "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "detect-libc": "^1.0.3",
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.0"
+        "@jsonjoy.com/buffers": "^1.0.0",
+        "@jsonjoy.com/codegen": "^1.0.0"
       },
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=10.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
       },
-      "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
+      "peerDependencies": {
+        "tslib": "2"
       }
     },
-    "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@kwsites/file-exists": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
+      "integrity": "sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "dependencies": {
+        "debug": "^4.1.1"
+      }
+    },
+    "node_modules/@kwsites/promise-deferred": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz",
+      "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@listr2/prompt-adapter-inquirer": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.18.tgz",
+      "integrity": "sha512-0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/type": "^1.5.5"
+      },
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=18.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+      "peerDependencies": {
+        "@inquirer/prompts": ">= 3 < 8"
       }
     },
-    "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+    "node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz",
+      "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mute-stream": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@listr2/prompt-adapter-inquirer/node_modules/mute-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@lmdb/lmdb-darwin-arm64": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.2.6.tgz",
+      "integrity": "sha512-yF/ih9EJJZc72psFQbwnn8mExIWfTnzWJg+N02hnpXtDPETYLmQswIMBn7+V88lfCaFrMozJsUvcEQIkEPU0Gg==",
       "cpu": [
         "arm64"
       ],
@@ -4638,19 +4530,12 @@
       "optional": true,
       "os": [
         "darwin"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
+      ]
     },
-    "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+    "node_modules/@lmdb/lmdb-darwin-x64": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.2.6.tgz",
+      "integrity": "sha512-5BbCumsFLbCi586Bb1lTWQFkekdQUw8/t8cy++Uq251cl3hbDIGEwD9HAwh8H6IS2F6QA9KdKmO136LmipRNkg==",
       "cpu": [
         "x64"
       ],
@@ -4659,82 +4544,68 @@
       "optional": true,
       "os": [
         "darwin"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
+      ]
     },
-    "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+    "node_modules/@lmdb/lmdb-linux-arm": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.2.6.tgz",
+      "integrity": "sha512-+6XgLpMb7HBoWxXj+bLbiiB4s0mRRcDPElnRS3LpWRzdYSe+gFk5MT/4RrVNqd2MESUDmb53NUXw1+BP69bjiQ==",
       "cpu": [
-        "x64"
+        "arm"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
+        "linux"
+      ]
     },
-    "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+    "node_modules/@lmdb/lmdb-linux-arm64": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.2.6.tgz",
+      "integrity": "sha512-l5VmJamJ3nyMmeD1ANBQCQqy7do1ESaJQfKPSm2IG9/ADZryptTyCj8N6QaYgIWewqNUrcbdMkJajRQAt5Qjfg==",
       "cpu": [
-        "arm"
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
+      ]
     },
-    "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+    "node_modules/@lmdb/lmdb-linux-x64": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.2.6.tgz",
+      "integrity": "sha512-nDYT8qN9si5+onHYYaI4DiauDMx24OAiuZAUsEqrDy+ja/3EbpXPX/VAkMV8AEaQhy3xc4dRC+KcYIvOFefJ4Q==",
       "cpu": [
-        "arm"
+        "x64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-win32-x64": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.2.6.tgz",
+      "integrity": "sha512-XlqVtILonQnG+9fH2N3Aytria7P/1fwDgDhl29rde96uH2sLB8CHORIf2PfuLVzFQJ7Uqp8py9AYwr3ZUCFfWg==",
+      "cpu": [
+        "x64"
       ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
     },
-    "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
+      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
       "cpu": [
         "arm64"
       ],
@@ -4742,41 +4613,55 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
+      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
+      "cpu": [
+        "x64"
       ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
     },
-    "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
+      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
       "cpu": [
-        "arm64"
+        "arm"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
+      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
+      "cpu": [
+        "arm64"
       ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
+      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
       "cpu": [
         "x64"
       ],
@@ -4785,40 +4670,77 @@
       "optional": true,
       "os": [
         "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+      "cpu": [
+        "x64"
       ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@napi-rs/nice": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice/-/nice-1.1.1.tgz",
+      "integrity": "sha512-xJIPs+bYuc9ASBl+cvGsKbGrJmS6fAKaSZCnT0lhahT5rhA2VVy9/EcIgd2JhtEuFOJNx7UHNn/qiTPTY4nrQw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">= 10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "optionalDependencies": {
+        "@napi-rs/nice-android-arm-eabi": "1.1.1",
+        "@napi-rs/nice-android-arm64": "1.1.1",
+        "@napi-rs/nice-darwin-arm64": "1.1.1",
+        "@napi-rs/nice-darwin-x64": "1.1.1",
+        "@napi-rs/nice-freebsd-x64": "1.1.1",
+        "@napi-rs/nice-linux-arm-gnueabihf": "1.1.1",
+        "@napi-rs/nice-linux-arm64-gnu": "1.1.1",
+        "@napi-rs/nice-linux-arm64-musl": "1.1.1",
+        "@napi-rs/nice-linux-ppc64-gnu": "1.1.1",
+        "@napi-rs/nice-linux-riscv64-gnu": "1.1.1",
+        "@napi-rs/nice-linux-s390x-gnu": "1.1.1",
+        "@napi-rs/nice-linux-x64-gnu": "1.1.1",
+        "@napi-rs/nice-linux-x64-musl": "1.1.1",
+        "@napi-rs/nice-openharmony-arm64": "1.1.1",
+        "@napi-rs/nice-win32-arm64-msvc": "1.1.1",
+        "@napi-rs/nice-win32-ia32-msvc": "1.1.1",
+        "@napi-rs/nice-win32-x64-msvc": "1.1.1"
       }
     },
-    "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+    "node_modules/@napi-rs/nice-android-arm-eabi": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.1.1.tgz",
+      "integrity": "sha512-kjirL3N6TnRPv5iuHw36wnucNqXAO46dzK9oPb0wj076R5Xm8PfUVA9nAFB5ZNMmfJQJVKACAPd/Z2KYMppthw==",
       "cpu": [
-        "x64"
+        "arm"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "android"
       ],
       "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "node": ">= 10"
       }
     },
-    "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+    "node_modules/@napi-rs/nice-android-arm64": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.1.1.tgz",
+      "integrity": "sha512-blG0i7dXgbInN5urONoUCNf+DUEAavRffrO7fZSeoRMJc5qD+BJeNcpr54msPF6qfDD6kzs9AQJogZvT2KD5nw==",
       "cpu": [
         "arm64"
       ],
@@ -4826,41 +4748,33 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "win32"
+        "android"
       ],
       "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "node": ">= 10"
       }
     },
-    "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+    "node_modules/@napi-rs/nice-darwin-arm64": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.1.1.tgz",
+      "integrity": "sha512-s/E7w45NaLqTGuOjC2p96pct4jRfo61xb9bU1unM/MJ/RFkKlJyJDx7OJI/O0ll/hrfpqKopuAFDV8yo0hfT7A==",
       "cpu": [
-        "ia32"
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "win32"
+        "darwin"
       ],
       "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "node": ">= 10"
       }
     },
-    "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+    "node_modules/@napi-rs/nice-darwin-x64": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.1.1.tgz",
+      "integrity": "sha512-dGoEBnVpsdcC+oHHmW1LRK5eiyzLwdgNQq3BmZIav+9/5WTZwBYX7r5ZkQC07Nxd3KHOCkgbHSh4wPkH1N1LiQ==",
       "cpu": [
         "x64"
       ],
@@ -4868,1083 +4782,1983 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "win32"
+        "darwin"
       ],
       "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "node": ">= 10"
       }
     },
-    "node_modules/@parcel/watcher/node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+    "node_modules/@napi-rs/nice-freebsd-x64": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.1.1.tgz",
+      "integrity": "sha512-kHv4kEHAylMYmlNwcQcDtXjklYp4FCf0b05E+0h6nDHsZ+F0bDe04U/tXNOqrx5CmIAth4vwfkjjUmp4c4JktQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "optional": true,
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": ">=0.10"
+        "node": ">= 10"
       }
     },
-    "node_modules/@parcel/watcher/node_modules/node-addon-api": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+    "node_modules/@napi-rs/nice-linux-arm-gnueabihf": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.1.1.tgz",
+      "integrity": "sha512-E1t7K0efyKXZDoZg1LzCOLxgolxV58HCkaEkEvIYQx12ht2pa8hoBo+4OB3qh7e+QiBlp1SRf+voWUZFxyhyqg==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
       "license": "MIT",
-      "optional": true
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
     },
-    "node_modules/@phenomnomnominal/debug": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@phenomnomnominal/debug/-/debug-0.2.5.tgz",
-      "integrity": "sha512-5yAKsIqcvKUiTYfsEXTt6wiNW2jWVEpa6ej8RSPSRV681av1APBK+2BpEIdOo9DAmq2bwq45Ry3zi/wxBjndaQ==",
+    "node_modules/@napi-rs/nice-linux-arm64-gnu": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.1.1.tgz",
+      "integrity": "sha512-CIKLA12DTIZlmTaaKhQP88R3Xao+gyJxNWEn04wZwC2wmRapNnxCUZkVwggInMJvtVElA+D4ZzOU5sX4jV+SmQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "callsite": "^1.0.0",
-        "esprima": "^4.0.1",
-        "esquery": "^1.3.1",
-        "tslib": "^2.0.3"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/@phenomnomnominal/tstemplate": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@phenomnomnominal/tstemplate/-/tstemplate-0.1.0.tgz",
-      "integrity": "sha512-/v+GIVNFHAz4+nQtgy9e5ZAXK3xj6TbP5s9JTpnFuqkcLB+gB2lJ6x/nsDhkKhzR6o4REuzhsYoWYnXqKC/UnQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@phenomnomnominal/worker-require": {
-      "version": "0.0.34",
-      "resolved": "https://registry.npmjs.org/@phenomnomnominal/worker-require/-/worker-require-0.0.34.tgz",
-      "integrity": "sha512-2GoVa1PRjrCjOpbMdzsZMQzkx/yFKqWizZc+ZNYSWE+Ym8BG+qAGDcWehUmUmGqy22wS13qitdVt6sR/DAWkIw==",
+    "node_modules/@napi-rs/nice-linux-arm64-musl": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.1.1.tgz",
+      "integrity": "sha512-+2Rzdb3nTIYZ0YJF43qf2twhqOCkiSrHx2Pg6DJaCPYhhaxbLcdlV8hCRMHghQ+EtZQWGNcS2xF4KxBhSGeutg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "callsite": "^1.0.0",
-        "comlink": "^4.3.0",
-        "tslib": "^1.10.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/@phenomnomnominal/worker-require/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+    "node_modules/@napi-rs/nice-linux-ppc64-gnu": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.1.1.tgz",
+      "integrity": "sha512-4FS8oc0GeHpwvv4tKciKkw3Y4jKsL7FRhaOeiPei0X9T4Jd619wHNe4xCLmN2EMgZoeGg+Q7GY7BsvwKpL22Tg==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "license": "0BSD"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
     },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+    "node_modules/@napi-rs/nice-linux-riscv64-gnu": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.1.1.tgz",
+      "integrity": "sha512-HU0nw9uD4FO/oGCCk409tCi5IzIZpH2agE6nN4fqpwVlCn5BOq0MS1dXGjXaG17JaAvrlpV5ZeyZwSon10XOXw==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
       "license": "MIT",
       "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=14"
+        "node": ">= 10"
       }
     },
-    "node_modules/@pkgr/core": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
-      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+    "node_modules/@napi-rs/nice-linux-s390x-gnu": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.1.1.tgz",
+      "integrity": "sha512-2YqKJWWl24EwrX0DzCQgPLKQBxYDdBxOHot1KWEq7aY2uYeX+Uvtv4I8xFVVygJDgf6/92h9N3Y43WPx8+PAgQ==",
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/pkgr"
+        "node": ">= 10"
       }
     },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.8.tgz",
-      "integrity": "sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==",
+    "node_modules/@napi-rs/nice-linux-x64-gnu": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.1.1.tgz",
+      "integrity": "sha512-/gaNz3R92t+dcrfCw/96pDopcmec7oCcAQ3l/M+Zxr82KT4DljD37CpgrnXV+pJC263JkW572pdbP3hP+KjcIg==",
       "cpu": [
-        "arm64"
+        "x64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "darwin"
-      ]
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
     },
-    "node_modules/@schematics/angular": {
-      "version": "19.2.17",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.2.17.tgz",
-      "integrity": "sha512-FGNDJXjeCoYz3JMze3JReNOGkPsxLGs5LmLf5Zj3+BYYMsFoDUJD9BMRRf+tmc/epBkiZZtv80c8gmfhqGv4dA==",
+    "node_modules/@napi-rs/nice-linux-x64-musl": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.1.1.tgz",
+      "integrity": "sha512-xScCGnyj/oppsNPMnevsBe3pvNaoK7FGvMjT35riz9YdhB2WtTG47ZlbxtOLpjeO9SqqQ2J2igCmz6IJOD5JYw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@angular-devkit/core": "19.2.17",
-        "@angular-devkit/schematics": "19.2.17",
-        "jsonc-parser": "3.3.1"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/@scicatproject/scicat-sdk-ts-angular": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@scicatproject/scicat-sdk-ts-angular/-/scicat-sdk-ts-angular-4.24.0.tgz",
-      "integrity": "sha512-bERg4m/yhSZlDkLSn2yRl+rwN8P3UVzFL7zWPgV2O3RWx1VX+yMoFMY2qZcVmqEOELz3p8QqNJG0Ktj6dHvlrQ==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "^19.0.0",
-        "rxjs": "^7.4.0"
+    "node_modules/@napi-rs/nice-openharmony-arm64": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-openharmony-arm64/-/nice-openharmony-arm64-1.1.1.tgz",
+      "integrity": "sha512-6uJPRVwVCLDeoOaNyeiW0gp2kFIM4r7PL2MczdZQHkFi9gVlgm+Vn+V6nTWRcu856mJ2WjYJiumEajfSm7arPQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/@sigstore/bundle": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz",
-      "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag==",
+    "node_modules/@napi-rs/nice-win32-arm64-msvc": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.1.1.tgz",
+      "integrity": "sha512-uoTb4eAvM5B2aj/z8j+Nv8OttPf2m+HVx3UjA5jcFxASvNhQriyCQF1OB1lHL43ZhW+VwZlgvjmP5qF3+59atA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@sigstore/protobuf-specs": "^0.4.0"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/@sigstore/core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz",
-      "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==",
+    "node_modules/@napi-rs/nice-win32-ia32-msvc": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.1.1.tgz",
+      "integrity": "sha512-CNQqlQT9MwuCsg1Vd/oKXiuH+TcsSPJmlAFc5frFyX/KkOh0UpBLEj7aoY656d5UKZQMQFP7vJNa1DNUNORvug==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/@sigstore/protobuf-specs": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.3.tgz",
-      "integrity": "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA==",
+    "node_modules/@napi-rs/nice-win32-x64-msvc": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.1.1.tgz",
+      "integrity": "sha512-vB+4G/jBQCAh0jelMTY3+kgFy00Hlx2f2/1zjMoH821IbplbWZOkLiTYXQkygNTzQJTq5cvwBDgn2ppHD+bglQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/@sigstore/sign": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz",
-      "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw==",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/@ngbracket/ngx-layout": {
+      "version": "16.1.3",
+      "resolved": "https://registry.npmjs.org/@ngbracket/ngx-layout/-/ngx-layout-16.1.3.tgz",
+      "integrity": "sha512-N24KX2BIBYXbCfLyr8Q/wXHh5x9w8yGn2G5GLo99inOJ2BtBNu3AvBdvz1oYIsuLEdqgWZIqt0JqlBeIm4u/iQ==",
+      "license": "MIT",
       "dependencies": {
-        "@sigstore/bundle": "^3.1.0",
-        "@sigstore/core": "^2.0.0",
-        "@sigstore/protobuf-specs": "^0.4.0",
-        "make-fetch-happen": "^14.0.2",
-        "proc-log": "^5.0.0",
-        "promise-retry": "^2.0.1"
+        "tslib": "^2.5.0"
       },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+      "peerDependencies": {
+        "@angular/cdk": ">=16.0.0",
+        "@angular/common": ">=16.0.0",
+        "@angular/core": ">=16.0.0",
+        "@angular/platform-browser": ">=16.0.0",
+        "rxjs": "^6.5.3 || ^7.8.0"
       }
     },
-    "node_modules/@sigstore/tuf": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz",
-      "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg==",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/@ngrx/effects": {
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-19.2.1.tgz",
+      "integrity": "sha512-RZmTPOIC/h4JtySxh4Oa0ReQomxv4/+2er9vJ2IiuPDgUo7oE83iKZvB8uZUW/8y9dcu+MB6u0VjWM6rcbpCcA==",
+      "license": "MIT",
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.4.1",
-        "tuf-js": "^3.0.1"
+        "tslib": "^2.0.0"
       },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+      "peerDependencies": {
+        "@angular/core": "^19.0.0",
+        "@ngrx/store": "19.2.1",
+        "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
-    "node_modules/@sigstore/verify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz",
-      "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w==",
+    "node_modules/@ngrx/eslint-plugin": {
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/eslint-plugin/-/eslint-plugin-19.2.1.tgz",
+      "integrity": "sha512-6NquOZRc6y6uWdct7ygYh83KMenTCy4dz3+W3+g5wdohtvH2uHmdOnEuA4FW7PHSP0DJKwSN2GgmS6PYs4TEvg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@sigstore/bundle": "^3.1.0",
-        "@sigstore/core": "^2.0.0",
-        "@sigstore/protobuf-specs": "^0.4.1"
+        "semver": "^7.3.5",
+        "strip-json-comments": "3.1.1"
       },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+      "peerDependencies": {
+        "@typescript-eslint/utils": "^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": "*",
+        "typescript-eslint": "^8.0.0"
       }
     },
-    "node_modules/@sindresorhus/merge-streams": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
-      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
-      "dev": true,
+    "node_modules/@ngrx/operators": {
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-19.2.1.tgz",
+      "integrity": "sha512-umjSny5nWe7+a3XPeyMfE8vjhXD4ec6nA/KSV7bQA43Yt3eW8cQQr5ng7UZOkC0rbqcBGpSsJPt5thTeXiMXQg==",
       "license": "MIT",
-      "engines": {
-        "node": ">=18"
+      "dependencies": {
+        "tslib": "^2.3.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
-    "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
-      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
-      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
-      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tufjs/canonical-json": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz",
-      "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==",
-      "dev": true,
+    "node_modules/@ngrx/router-store": {
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-19.2.1.tgz",
+      "integrity": "sha512-4gI9A5Mnl52UEHskLKb2A6QXdHDdGr6eyBM940t16mI5RCXfkoSJNb5mQ/jXh2OZjhx9ponRVNmCaLwkxBMB5g==",
       "license": "MIT",
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^19.0.0",
+        "@angular/core": "^19.0.0",
+        "@angular/router": "^19.0.0",
+        "@ngrx/store": "19.2.1",
+        "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
-    "node_modules/@tufjs/models": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz",
-      "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==",
+    "node_modules/@ngrx/schematics": {
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-19.2.1.tgz",
+      "integrity": "sha512-6N7nyQ5QkHnFVAHPEHGiIKTgBqbwv/lS/vqbbuY4H4Gd4DYH/wAHcN97/EU+wVzlsrK7I1cCUEL2zwQ7WsbPdg==",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@ngrx/store": {
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-19.2.1.tgz",
+      "integrity": "sha512-c5vQId7YoAhM0y4HASrz9mtLju+28vJspd6OBlhPbBlSae8GN8m9S/oav+8LaSY19yh95cZ5B/nMcLNNWgL/jA==",
       "license": "MIT",
       "dependencies": {
-        "@tufjs/canonical-json": "2.0.0",
-        "minimatch": "^9.0.5"
+        "tslib": "^2.0.0"
       },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+      "peerDependencies": {
+        "@angular/core": "^19.0.0",
+        "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
-    "node_modules/@tufjs/models/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+    "node_modules/@ngrx/store-devtools": {
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-19.2.1.tgz",
+      "integrity": "sha512-gj1YO+4yl6D0l9vzLWdw07TQSu5UPKgsSLsNJfDLXraaLCUcB8voAp4J7zohN8qR5ixDuHeMoiSSVuklQ75u2w==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "tslib": "^2.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependencies": {
+        "@angular/core": "^19.0.0",
+        "@ngrx/store": "19.2.1",
+        "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.6",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
-      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
+    "node_modules/@ngtools/webpack": {
+      "version": "19.2.17",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.2.17.tgz",
+      "integrity": "sha512-HpbOLwS8tIW041UXcMqwfySqpZ9ztObH8U4NWKwjPBe0S5UDnF6doW2rS3GQm71hkiuB8sqbxOWz5I/NNvZFNQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^19.0.0 || ^19.2.0-next.0",
+        "typescript": ">=5.5 <5.9",
+        "webpack": "^5.54.0"
       }
     },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
-      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
-      "dev": true,
+    "node_modules/@ngx-translate/core": {
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-17.0.0.tgz",
+      "integrity": "sha512-Rft2D5ns2pq4orLZjEtx1uhNuEBerUdpFUG1IcqtGuipj6SavgB8SkxtNQALNDA+EVlvsNCCjC2ewZVtUeN6rg==",
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=16",
+        "@angular/core": ">=16"
       }
     },
-    "node_modules/@types/connect": {
-      "version": "3.4.38",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
-      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
-      "dev": true,
+    "node_modules/@ngxmc/datetime-picker": {
+      "version": "19.3.1",
+      "resolved": "https://registry.npmjs.org/@ngxmc/datetime-picker/-/datetime-picker-19.3.1.tgz",
+      "integrity": "sha512-1Ud8XeCD0JRJ4Esbv0Op9sCdLjPPXfH+NHXSXe+zeCu+MyvIocqytT4o0THWUj4Lcg/yqneLG7dTbK0X8bxSrg==",
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/cdk": "^19.0.0",
+        "@angular/common": "^19.0.0",
+        "@angular/core": "^19.0.0",
+        "@angular/forms": "^19.0.0",
+        "@angular/material": "^19.0.0",
+        "@angular/platform-browser": "^19.0.0"
       }
     },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
-      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/@types/cors": {
-      "version": "2.8.19",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
-      "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==",
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/@types/deep-equal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@types/deep-equal/-/deep-equal-1.0.4.tgz",
-      "integrity": "sha512-tqdiS4otQP4KmY0PR3u6KbZ5EWvhNdUoS/jc93UuK23C220lOZ/9TvjfxdPcKvqwwDVtmtSCrnr0p/2dirAxkA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/eslint": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+    "node_modules/@npmcli/agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz",
+      "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
+        "agent-base": "^7.1.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.1",
+        "lru-cache": "^10.0.1",
+        "socks-proxy-agent": "^8.0.3"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+    "node_modules/@npmcli/agent/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "ISC"
     },
-    "node_modules/@types/express": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
-      "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
+    "node_modules/@npmcli/fs": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
+      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.33",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "4.19.6",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
-      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
+    "node_modules/@npmcli/git": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-6.0.3.tgz",
+      "integrity": "sha512-GUYESQlxZRAdhs3UhbB6pVRNUELQOHXwK9ruDkwmCv2aZ5y0SApQzUJCg02p3A7Ue2J5hxvlk1YI53c00NmRyQ==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
-      }
-    },
-    "node_modules/@types/file-saver": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.7.tgz",
-      "integrity": "sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "ini": "^5.0.0",
+        "lru-cache": "^10.0.1",
+        "npm-pick-manifest": "^10.0.0",
+        "proc-log": "^5.0.0",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@npmcli/git/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/installed-package-contents": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz",
+      "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-bundled": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
+      },
+      "bin": {
+        "installed-package-contents": "bin/index.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/node-gyp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz",
+      "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/package-json": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.2.0.tgz",
+      "integrity": "sha512-rCNLSB/JzNvot0SEyXqWZ7tX2B5dD2a1br2Dp0vSYVo5jh8Z0EZ7lS9TsZ1UtziddB1UfNUaMCc538/HztnJGA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/git": "^6.0.0",
+        "glob": "^10.2.2",
+        "hosted-git-info": "^8.0.0",
+        "json-parse-even-better-errors": "^4.0.0",
+        "proc-log": "^5.0.0",
+        "semver": "^7.5.3",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.3.tgz",
+      "integrity": "sha512-Yb00SWaL4F8w+K8YGhQ55+xE4RUNdMHV43WZGsiTM92gS+lC0mGsn7I4hLug7pbao035S6bj3Y3w0cUNGLfmkg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/redact": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-3.2.2.tgz",
+      "integrity": "sha512-7VmYAmk4csGv08QzrDKScdzn11jHPFGyqJW39FyPgPuAp3zIaUmuCo1yxw9aGs+NEJuTGQ9Gwqpt93vtJubucg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/run-script": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-9.1.0.tgz",
+      "integrity": "sha512-aoNSbxtkePXUlbZB+anS1LqsJdctG5n3UVhfU47+CDdwMi6uNTBMF9gPcQRnqghQd2FGzcwwIFBruFMxjhBewg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/node-gyp": "^4.0.0",
+        "@npmcli/package-json": "^6.0.0",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "node-gyp": "^11.0.0",
+        "proc-log": "^5.0.0",
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/run-script/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@npmcli/run-script/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/@parcel/watcher/node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/@phenomnomnominal/debug": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@phenomnomnominal/debug/-/debug-0.2.5.tgz",
+      "integrity": "sha512-5yAKsIqcvKUiTYfsEXTt6wiNW2jWVEpa6ej8RSPSRV681av1APBK+2BpEIdOo9DAmq2bwq45Ry3zi/wxBjndaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsite": "^1.0.0",
+        "esprima": "^4.0.1",
+        "esquery": "^1.3.1",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/@phenomnomnominal/tstemplate": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@phenomnomnominal/tstemplate/-/tstemplate-0.1.0.tgz",
+      "integrity": "sha512-/v+GIVNFHAz4+nQtgy9e5ZAXK3xj6TbP5s9JTpnFuqkcLB+gB2lJ6x/nsDhkKhzR6o4REuzhsYoWYnXqKC/UnQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@phenomnomnominal/worker-require": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@phenomnomnominal/worker-require/-/worker-require-0.0.34.tgz",
+      "integrity": "sha512-2GoVa1PRjrCjOpbMdzsZMQzkx/yFKqWizZc+ZNYSWE+Ym8BG+qAGDcWehUmUmGqy22wS13qitdVt6sR/DAWkIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsite": "^1.0.0",
+        "comlink": "^4.3.0",
+        "tslib": "^1.10.0"
+      }
+    },
+    "node_modules/@phenomnomnominal/worker-require/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@pkgr/core": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pkgr"
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz",
+      "integrity": "sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.8.tgz",
+      "integrity": "sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.8.tgz",
+      "integrity": "sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.8.tgz",
+      "integrity": "sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.8.tgz",
+      "integrity": "sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.8.tgz",
+      "integrity": "sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.8.tgz",
+      "integrity": "sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.8.tgz",
+      "integrity": "sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.8.tgz",
+      "integrity": "sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.8.tgz",
+      "integrity": "sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.4.tgz",
+      "integrity": "sha512-0G2c2lpYtbTuXo8KEJkDkClE/+/2AFPdPAbmaHoE870foRFs4pBrDehilMcrSScrN/fB/1HTaWO4bqw+ewBzMQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz",
+      "integrity": "sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==",
+      "cpu": [
+        "loong64"
+      ],
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/http-errors": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
-      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.8.tgz",
+      "integrity": "sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.16",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
-      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.4.tgz",
+      "integrity": "sha512-teSACug1GyZHmPDv14VNbvZFX779UqWTsd7KtTM9JIZRDI5NUwYSIS30kzI8m06gOPB//jtpqlhmraQ68b5X2g==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/jasmine": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.9.tgz",
-      "integrity": "sha512-8t4HtkW4wxiPVedMpeZ63n3vlWxEIquo/zc1Tm8ElU+SqVV7+D3Na2PWaJUp179AzTragMWVwkMv7mvty0NfyQ==",
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.8.tgz",
+      "integrity": "sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "license": "MIT"
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.4.tgz",
+      "integrity": "sha512-1HHmsRyh845QDpEWzOFtMCph5Ts+9+yllCrREuBR/vg2RogAQGGBRC8lDPrPOMnrdOJ+mt1WLMOC2Kao/UwcvA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz",
+      "integrity": "sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==",
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/lodash-es": {
-      "version": "4.17.12",
-      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
-      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.8.tgz",
+      "integrity": "sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/lodash": "*"
-      }
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/luxon": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
-      "integrity": "sha512-H3iskjFIAn5SlJU7OuxUmTEpebK6TKB8rxZShDslBMZJ5u9S//KM1sbdAisiSrqwLQncVjnpi2OK2J51h+4lsg==",
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.8.tgz",
+      "integrity": "sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/mime": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.4.tgz",
+      "integrity": "sha512-1ox+GqgRWqaB1RnyZXL8PD6E5f7YyRUJYnCqKpNzxzP0TkaUh112NDrR9Tt+C8rJ4x5G9Mk8PQR3o7Ku2RKqKA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
     },
-    "node_modules/@types/node": {
-      "version": "24.1.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
-      "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==",
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz",
+      "integrity": "sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "undici-types": "~7.8.0"
-      }
+      "optional": true,
+      "os": [
+        "win32"
+      ]
     },
-    "node_modules/@types/node-forge": {
-      "version": "1.3.14",
-      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.14.tgz",
-      "integrity": "sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==",
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.8.tgz",
+      "integrity": "sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.4.tgz",
+      "integrity": "sha512-UF9KfsH9yEam0UjTwAgdK0anlQ7c8/pWPU2yVjyWcF1I1thABt6WXE47cI71pGiZ8wGvxohBoLnxM04L/wj8mQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz",
+      "integrity": "sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@schematics/angular": {
+      "version": "19.2.17",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.2.17.tgz",
+      "integrity": "sha512-FGNDJXjeCoYz3JMze3JReNOGkPsxLGs5LmLf5Zj3+BYYMsFoDUJD9BMRRf+tmc/epBkiZZtv80c8gmfhqGv4dA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "@angular-devkit/core": "19.2.17",
+        "@angular-devkit/schematics": "19.2.17",
+        "jsonc-parser": "3.3.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@types/node/node_modules/undici-types": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
-      "dev": true
+    "node_modules/@scicatproject/scicat-sdk-ts-angular": {
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@scicatproject/scicat-sdk-ts-angular/-/scicat-sdk-ts-angular-4.24.0.tgz",
+      "integrity": "sha512-bERg4m/yhSZlDkLSn2yRl+rwN8P3UVzFL7zWPgV2O3RWx1VX+yMoFMY2qZcVmqEOELz3p8QqNJG0Ktj6dHvlrQ==",
+      "license": "Unlicense",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "^19.0.0",
+        "rxjs": "^7.4.0"
+      }
     },
-    "node_modules/@types/qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
+    "node_modules/@sigstore/bundle": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz",
+      "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag==",
       "dev": true,
-      "license": "MIT"
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@sigstore/protobuf-specs": "^0.4.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
     },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+    "node_modules/@sigstore/core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz",
+      "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==",
       "dev": true,
-      "license": "MIT"
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
     },
-    "node_modules/@types/retry": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
-      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
+    "node_modules/@sigstore/protobuf-specs": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.3.tgz",
+      "integrity": "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA==",
       "dev": true,
-      "license": "MIT"
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
     },
-    "node_modules/@types/send": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
-      "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
+    "node_modules/@sigstore/sign": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz",
+      "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@sigstore/bundle": "^3.1.0",
+        "@sigstore/core": "^2.0.0",
+        "@sigstore/protobuf-specs": "^0.4.0",
+        "make-fetch-happen": "^14.0.2",
+        "proc-log": "^5.0.0",
+        "promise-retry": "^2.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@sigstore/tuf": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz",
+      "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@types/mime": "^1",
-        "@types/node": "*"
+        "@sigstore/protobuf-specs": "^0.4.1",
+        "tuf-js": "^3.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/@types/serve-index": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
-      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
+    "node_modules/@sigstore/verify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz",
+      "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@types/express": "*"
+        "@sigstore/bundle": "^3.1.0",
+        "@sigstore/core": "^2.0.0",
+        "@sigstore/protobuf-specs": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/@types/serve-static": {
-      "version": "1.15.8",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz",
-      "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==",
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
+      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/http-errors": "*",
-        "@types/node": "*",
-        "@types/send": "*"
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/shortid": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@types/shortid/-/shortid-2.2.0.tgz",
-      "integrity": "sha512-jBG2FgBxcaSf0h662YloTGA32M8UtNbnTPekUr/eCmWXq0JWQXgNEQ/P5Gf05Cv66QZtE1Ttr83I1AJBPdzCBg==",
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/sinonjs__fake-timers": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
-      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/sizzle": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.10.tgz",
-      "integrity": "sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==",
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/sockjs": {
-      "version": "0.3.36",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
-      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tufjs/canonical-json": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz",
+      "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/source-map-support": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.10.tgz",
-      "integrity": "sha512-tgVP2H469x9zq34Z0m/fgPewGhg/MLClalNOiPIzQlXrSS2YrKu/xCdSCKnEDwkFha51VKEKB6A9wW26/ZNwzA==",
+    "node_modules/@tufjs/models": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz",
+      "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "source-map": "^0.6.0"
+        "@tufjs/canonical-json": "2.0.0",
+        "minimatch": "^9.0.5"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/@types/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/@tufjs/models/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@types/ws": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
-      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
+    "node_modules/@types/body-parser": {
+      "version": "1.19.6",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
+      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@types/connect": "*",
         "@types/node": "*"
       }
     },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
+    "node_modules/@types/bonjour": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.41.0.tgz",
-      "integrity": "sha512-8fz6oa6wEKZrhXWro/S3n2eRJqlRcIa6SlDh59FXJ5Wp5XRZ8B9ixpJDcjadHq47hMx0u+HW6SNa6LjJQ6NLtw==",
+    "node_modules/@types/connect": {
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.41.0",
-        "@typescript-eslint/type-utils": "8.41.0",
-        "@typescript-eslint/utils": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^7.0.0",
-        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.41.0",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/project-service": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
-      "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.41.0",
-        "@typescript-eslint/types": "^8.41.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
-      "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
+    "node_modules/@types/cors": {
+      "version": "2.8.19",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
+      "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
-      "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
+    "node_modules/@types/deep-equal": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@types/deep-equal/-/deep-equal-1.0.4.tgz",
+      "integrity": "sha512-tqdiS4otQP4KmY0PR3u6KbZ5EWvhNdUoS/jc93UuK23C220lOZ/9TvjfxdPcKvqwwDVtmtSCrnr0p/2dirAxkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
-      "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
-      "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/express": {
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
+      "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.41.0",
-        "@typescript-eslint/tsconfig-utils": "8.41.0",
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz",
-      "integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==",
+    "node_modules/@types/express-serve-static-core": {
+      "version": "4.19.7",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.7.tgz",
+      "integrity": "sha512-FvPtiIf1LfhzsaIXhv/PHan/2FeQBbtBDtfX2QfvPxdUelMDEckK08SM6nqo1MIZY3RUlfA+HV8+hFUSio78qg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.41.0",
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.41.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
-      "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
+    "node_modules/@types/file-saver": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.7.tgz",
+      "integrity": "sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
+      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.16",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
+      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.41.0",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+    "node_modules/@types/jasmine": {
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.9.tgz",
+      "integrity": "sha512-8t4HtkW4wxiPVedMpeZ63n3vlWxEIquo/zc1Tm8ElU+SqVV7+D3Na2PWaJUp179AzTragMWVwkMv7mvty0NfyQ==",
       "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
+      "license": "MIT"
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
+      "license": "MIT"
     },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.41.0.tgz",
-      "integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==",
+    "node_modules/@types/lodash-es": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.41.0",
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/lodash": "*"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
-      "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
+    "node_modules/@types/luxon": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
+      "integrity": "sha512-H3iskjFIAn5SlJU7OuxUmTEpebK6TKB8rxZShDslBMZJ5u9S//KM1sbdAisiSrqwLQncVjnpi2OK2J51h+4lsg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/mime": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.1.tgz",
+      "integrity": "sha512-CmyhGZanP88uuC5GpWU9q+fI61j2SkhO3UGMUdfYRE6Bcy0ccyzn1Rqj9YAB/ZY4kOXmNf0ocah5GtphmLMP6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.41.0",
-        "@typescript-eslint/types": "^8.41.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "undici-types": "~7.14.0"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
-      "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
+    "node_modules/@types/node-forge": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.14.tgz",
+      "integrity": "sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
-      "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
+    "node_modules/@types/qs": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/retry": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
+      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/send": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.0.tgz",
+      "integrity": "sha512-zBF6vZJn1IaMpg3xUF25VK3gd3l8zwE0ZLRX7dsQyQi+jp4E8mMDJNGDYnYse+bQhYwWERTxVwHpi3dMOq7RKQ==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
-      "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
+    "node_modules/@types/serve-index": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "dependencies": {
+        "@types/express": "*"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
-      "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
+    "node_modules/@types/serve-static": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.9.tgz",
+      "integrity": "sha512-dOTIuqpWLyl3BBXU3maNQsS4A3zuuoYRNIvYSxxhebPfXg2mzWQEPne/nlJ37yOse6uGgR386uTpdsx4D0QZWA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.41.0",
-        "@typescript-eslint/tsconfig-utils": "8.41.0",
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/http-errors": "*",
+        "@types/node": "*",
+        "@types/send": "<1"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
-      "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
+    "node_modules/@types/serve-static/node_modules/@types/send": {
+      "version": "0.17.5",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
+      "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.41.0",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/mime": "^1",
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+    "node_modules/@types/shortid": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@types/shortid/-/shortid-2.2.0.tgz",
+      "integrity": "sha512-jBG2FgBxcaSf0h662YloTGA32M8UtNbnTPekUr/eCmWXq0JWQXgNEQ/P5Gf05Cv66QZtE1Ttr83I1AJBPdzCBg==",
       "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
+      "license": "MIT"
     },
-    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+    "node_modules/@types/sinonjs__fake-timers": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
+      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.10.tgz",
+      "integrity": "sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.44.0.tgz",
-      "integrity": "sha512-87Jv3E+al8wpD+rIdVJm/ItDBe/Im09zXIjFoipOjr5gHUhJmTzfFLuTJ/nPTMc2Srsroy4IBXwcTCHyRR7KzA==",
+    "node_modules/@types/source-map-support": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.10.tgz",
+      "integrity": "sha512-tgVP2H469x9zq34Z0m/fgPewGhg/MLClalNOiPIzQlXrSS2YrKu/xCdSCKnEDwkFha51VKEKB6A9wW26/ZNwzA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.44.0",
-        "@typescript-eslint/visitor-keys": "8.44.0"
-      },
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/@types/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
-      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
+    "node_modules/@types/tmp": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
+      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.41.0.tgz",
-      "integrity": "sha512-63qt1h91vg3KsjVVonFJWjgSK7pZHSQFKH6uwqxAH9bBrsyRhO6ONoKyXxyVBzG1lJnFAJcKAcxLS54N1ee1OQ==",
+    "node_modules/@types/yauzl": {
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.41.0",
-        "@typescript-eslint/utils": "8.41.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/project-service": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
-      "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.0.tgz",
+      "integrity": "sha512-hA8gxBq4ukonVXPy0OKhiaUh/68D0E88GSmtC1iAEnGaieuDi38LhS7jdCHRLi6ErJBNDGCzvh5EnzdPwUc0DA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.41.0",
-        "@typescript-eslint/types": "^8.41.0",
-        "debug": "^4.3.4"
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.46.0",
+        "@typescript-eslint/type-utils": "8.46.0",
+        "@typescript-eslint/utils": "8.46.0",
+        "@typescript-eslint/visitor-keys": "8.46.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^7.0.0",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5954,33 +6768,24 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
+        "@typescript-eslint/parser": "^8.46.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
-      "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.0.tgz",
+      "integrity": "sha512-n1H6IcDhmmUEG7TNVSspGmiHHutt7iVKtZwRppD7e04wha5MrkV1h3pti9xQLcCMt6YWsncpoT0HMjkH1FNwWQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "@typescript-eslint/scope-manager": "8.46.0",
+        "@typescript-eslint/types": "8.46.0",
+        "@typescript-eslint/typescript-estree": "8.46.0",
+        "@typescript-eslint/visitor-keys": "8.46.0",
+        "debug": "^4.3.4"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
-      "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
-      "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -5993,12 +6798,17 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
-      "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.0.tgz",
+      "integrity": "sha512-OEhec0mH+U5Je2NZOeK1AbVCdm0ChyapAyTeXVIYTPXDJ3F07+cu87PPXcGoYqZ7M9YJVvFnfpGg1UmCIqM+QQ==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.46.0",
+        "@typescript-eslint/types": "^8.46.0",
+        "debug": "^4.3.4"
+      },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -6010,23 +6820,15 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
-      "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.0.tgz",
+      "integrity": "sha512-lWETPa9XGcBes4jqAMYD9fW0j4n6hrPtTJwWDmtqgFO/4HF4jmdH/Q6wggTw5qIT5TXjKzbt7GsZUBnWoO3dqw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.41.0",
-        "@typescript-eslint/tsconfig-utils": "8.41.0",
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.1.0"
+        "@typescript-eslint/types": "8.46.0",
+        "@typescript-eslint/visitor-keys": "8.46.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6034,23 +6836,14 @@
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz",
-      "integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==",
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.0.tgz",
+      "integrity": "sha512-WrYXKGAHY836/N7zoK/kzi6p8tXFhasHh8ocFL9VZSAkvH956gfeRfcnhs3xzRy8qQ/dq3q44v1jvQieMFg2cw==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.41.0",
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.41.0"
-      },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -6059,19 +6852,21 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
-      "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.0.tgz",
+      "integrity": "sha512-hy+lvYV1lZpVs2jRaEYvgCblZxUoJiPyCemwbQZ+NGulWkQRy0HRPYAoef/CNSzaLt+MLvMptZsHXHlkEilaeg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.41.0",
-        "eslint-visitor-keys": "^4.2.1"
+        "@typescript-eslint/types": "8.46.0",
+        "@typescript-eslint/typescript-estree": "8.46.0",
+        "@typescript-eslint/utils": "8.46.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6079,44 +6874,18 @@
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.45.0.tgz",
-      "integrity": "sha512-WugXLuOIq67BMgQInIxxnsSyRLFxdkJEJu8r4ngLR56q/4Q5LrbfkFRH27vMTjxEK8Pyz7QfzuZe/G15qQnVRA==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.0.tgz",
+      "integrity": "sha512-bHGGJyVjSE4dJJIO5yyEWt/cHyNwga/zXGJbJJ8TiO01aVREK6gCTu3L+5wrkb1FbDkQ+TKjMNe9R/QQQP9+rA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -6126,17 +6895,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.44.0.tgz",
-      "integrity": "sha512-lqNj6SgnGcQZwL4/SBJ3xdPEfcBuhCG8zdcwCPgYcmiPLgokiNDKlbPzCwEwu7m279J/lBYWtDYL+87OEfn8Jw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.0.tgz",
+      "integrity": "sha512-ekDCUfVpAKWJbRfm8T1YRrCot1KFxZn21oV76v5Fj4tr7ELyk84OS+ouvYdcDAwZL89WpEkEj2DKQ+qg//+ucg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@typescript-eslint/project-service": "8.44.0",
-        "@typescript-eslint/tsconfig-utils": "8.44.0",
-        "@typescript-eslint/types": "8.44.0",
-        "@typescript-eslint/visitor-keys": "8.44.0",
+        "@typescript-eslint/project-service": "8.46.0",
+        "@typescript-eslint/tsconfig-utils": "8.46.0",
+        "@typescript-eslint/types": "8.46.0",
+        "@typescript-eslint/visitor-keys": "8.46.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -6155,69 +6923,12 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/project-service": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.44.0.tgz",
-      "integrity": "sha512-ZeaGNraRsq10GuEohKTo4295Z/SuGcSq2LzfGlqiuEvfArzo/VRrT0ZaJsVPuKZ55lVbNk8U6FcL+ZMH8CoyVA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.44.0",
-        "@typescript-eslint/types": "^8.44.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.44.0.tgz",
-      "integrity": "sha512-x5Y0+AuEPqAInc6yd0n5DAcvtoQ/vyaGwuX5HE9n6qAefk1GaedqrLQF8kQGylLUb9pnZyLf+iEiL9fr8APDtQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/types": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
-      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -6229,17 +6940,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.44.0.tgz",
-      "integrity": "sha512-nktOlVcg3ALo0mYlV+L7sWUD58KG4CMj1rb2HUVOO4aL3K/6wcD+NERqd0rrA5Vg06b42YhF6cFxeixsp9Riqg==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.0.tgz",
+      "integrity": "sha512-nD6yGWPj1xiOm4Gk0k6hLSZz2XkNXhuYmyIrOWcHoPuAhjT9i5bAG+xbWPgFeNR8HPHHtpNKdYUXJl/D3x7f5g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.44.0",
-        "@typescript-eslint/types": "8.44.0",
-        "@typescript-eslint/typescript-estree": "8.44.0"
+        "@typescript-eslint/scope-manager": "8.46.0",
+        "@typescript-eslint/types": "8.46.0",
+        "@typescript-eslint/typescript-estree": "8.46.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6253,29 +6963,14 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
-      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.44.0.tgz",
-      "integrity": "sha512-zaz9u8EJ4GBmnehlrpoKvj/E3dNbuQ7q0ucyZImm3cLqJ8INTc970B1qEqDX/Rzq65r3TvVTN7kHWPBoyW7DWw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.0.tgz",
+      "integrity": "sha512-FrvMpAK+hTbFy7vH5j1+tMYHMSKLE6RzluFJlkFNKD0p9YsUT75JlBSmr5so3QRzvMwU5/bIEdeNrxm8du8l3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.44.0",
+        "@typescript-eslint/types": "8.46.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -6286,20 +6981,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
-      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
@@ -6689,9 +7370,9 @@
       }
     },
     "node_modules/ansi-escapes": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.1.0.tgz",
-      "integrity": "sha512-YdhtCd19sKRKfAAUsrcC1wzm4JuzJoiX4pOJqIoW2qmKj5WzG/dL8uUJ0361zaXtHqK7gEhOwtAtz7t3Yq3X5g==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.1.1.tgz",
+      "integrity": "sha512-Zhl0ErHcSRUaVfGUeUdDuLgpkEo8KIFjB4Y9uAc46ScOpdDiU1Dbyplh7qWJeJ/ZHpbyMSM26+X3BySgnIz40Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7168,9 +7849,9 @@
       }
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.8.6",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.6.tgz",
-      "integrity": "sha512-wrH5NNqren/QMtKUEEJf7z86YjfqW/2uw3IL3/xpqZUC95SSVIFXYQeeGjL6FT/X68IROu6RMehZQS5foy2BXw==",
+      "version": "2.8.15",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.15.tgz",
+      "integrity": "sha512-qsJ8/X+UypqxHXN75M7dF88jNK37dLBRW7LeUzCPz+TNs37G8cfWy9nWzS+LS//g600zrt2le9KuXt0rWfDz5Q==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -7396,9 +8077,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.26.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.2.tgz",
-      "integrity": "sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==",
+      "version": "4.26.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.3.tgz",
+      "integrity": "sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==",
       "dev": true,
       "funding": [
         {
@@ -7416,9 +8097,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.8.3",
-        "caniuse-lite": "^1.0.30001741",
-        "electron-to-chromium": "^1.5.218",
+        "baseline-browser-mapping": "^2.8.9",
+        "caniuse-lite": "^1.0.30001746",
+        "electron-to-chromium": "^1.5.227",
         "node-releases": "^2.0.21",
         "update-browserslist-db": "^1.1.3"
       },
@@ -7590,34 +8271,17 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/cacache/node_modules/mkdirp": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mkdirp": "dist/cjs/src/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/cacache/node_modules/tar": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
-      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz",
+      "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",
         "chownr": "^3.0.0",
         "minipass": "^7.1.2",
-        "minizlib": "^3.0.1",
-        "mkdirp": "^3.0.1",
+        "minizlib": "^3.1.0",
         "yallist": "^5.0.0"
       },
       "engines": {
@@ -7711,9 +8375,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001743",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz",
-      "integrity": "sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==",
+      "version": "1.0.30001749",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001749.tgz",
+      "integrity": "sha512-0rw2fJOmLfnzCRbkm8EyHL8SvI2Apu5UbnQuTsJ0ClgrH8hcwFooJ1s5R0EP8o8aVrFu8++ae29Kt9/gZAZp/Q==",
       "dev": true,
       "funding": [
         {
@@ -7767,14 +8431,12 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/check-more-types": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
-      "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
+    "node_modules/chardet": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.0.tgz",
+      "integrity": "sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==",
       "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
+      "license": "MIT"
     },
     "node_modules/chokidar": {
       "version": "4.0.3",
@@ -7813,9 +8475,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-      "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz",
+      "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==",
       "dev": true,
       "funding": [
         {
@@ -8338,13 +9000,13 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.45.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.1.tgz",
-      "integrity": "sha512-tqTt5T4PzsMIZ430XGviK4vzYSoeNJ6CXODi6c/voxOT6IZqBht5/EKaSNnYiEjjRYxjVz7DQIsOsY0XNi8PIA==",
+      "version": "3.46.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.46.0.tgz",
+      "integrity": "sha512-p9hObIIEENxSV8xIu+V68JjSeARg6UVMG5mR+JEUguG3sI6MsiS1njz2jHmyJDvA+8jX/sytkBHup6kxhM9law==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.25.3"
+        "browserslist": "^4.26.3"
       },
       "funding": {
         "type": "opencollective",
@@ -8572,23 +9234,24 @@
       "license": "MIT"
     },
     "node_modules/cypress": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.1.0.tgz",
-      "integrity": "sha512-jS4EfyOa2W5KXCN02WBdmy4bpBBmLGe+INhZeCvzRksfJuzBSYp3rNg2G+hfOwPzM+wwMwOYCo/kEnH+5RsSjA==",
+      "version": "15.4.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.4.0.tgz",
+      "integrity": "sha512-+GC/Y/LXAcaMCzfuM7vRx5okRmonceZbr0ORUAoOrZt/5n2eGK8yh04bok1bWSjZ32wRHrZESqkswQ6biArN5w==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "@cypress/request": "^3.0.9",
         "@cypress/xvfb": "^1.2.4",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
+        "@types/tmp": "^0.2.3",
         "arch": "^2.2.0",
         "blob-util": "^2.0.2",
         "bluebird": "^3.7.2",
         "buffer": "^5.7.1",
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
-        "check-more-types": "^2.24.0",
         "ci-info": "^4.1.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "0.6.1",
@@ -8605,7 +9268,6 @@
         "fs-extra": "^9.1.0",
         "hasha": "5.2.2",
         "is-installed-globally": "~0.4.0",
-        "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
         "lodash": "^4.17.21",
         "log-symbols": "^4.0.0",
@@ -8627,7 +9289,7 @@
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": "^20.0.0 || ^22.0.0 || >=24.0.0"
+        "node": "^20.1.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/cypress/node_modules/ansi-escapes": {
@@ -9040,9 +9702,9 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz",
-      "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -9264,9 +9926,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.222",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.222.tgz",
-      "integrity": "sha512-gA7psSwSwQRE60CEoLz6JBCQPIxNeuzB2nL8vE03GK/OHxlvykbLyeiumQy1iH5C2f3YbRAZpGCMT12a/9ih9w==",
+      "version": "1.5.234",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.234.tgz",
+      "integrity": "sha512-RXfEp2x+VRYn8jbKfQlRImzoJU01kyDvVPBmG39eU2iuRVhuS6vQNocB8J0/8GrIMLnPzgz4eW6WiRnJkTuNWg==",
       "dev": true,
       "license": "ISC"
     },
@@ -9684,20 +10346,20 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.32.0.tgz",
-      "integrity": "sha512-LSehfdpgMeWcTZkWZVIJl+tkZ2nuSkyyB9C27MZqFWXuph7DvaowgcTvKqxvpLW1JZIk8PN7hFY3Rj9LQ7m7lg==",
+      "version": "9.37.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.37.0.tgz",
+      "integrity": "sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.21.0",
-        "@eslint/config-helpers": "^0.3.0",
-        "@eslint/core": "^0.15.0",
+        "@eslint/config-helpers": "^0.4.0",
+        "@eslint/core": "^0.16.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.32.0",
-        "@eslint/plugin-kit": "^0.3.4",
+        "@eslint/js": "9.37.0",
+        "@eslint/plugin-kit": "^0.4.0",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -9761,10 +10423,11 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.3.tgz",
-      "integrity": "sha512-NAdMYww51ehKfDyDhv59/eIItUVzU0Io9H2E8nHNGKEeeqlnci+1gCvrHib6EmZdf6GxF+LCV5K7UC65Ezvw7w==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.4.tgz",
+      "integrity": "sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0",
         "synckit": "^0.11.7"
@@ -10444,11 +11107,12 @@
       "license": "MIT"
     },
     "node_modules/filesize": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.2.tgz",
-      "integrity": "sha512-s/iAeeWLk5BschUIpmdrF8RA8lhFZ/xDZgKw1Tan72oGws1/dFGB06nYEiyyssWUfjKNQTNRlrwMVjO9/hvXDw==",
+      "version": "11.0.13",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-11.0.13.tgz",
+      "integrity": "sha512-mYJ/qXKvREuO0uH8LTQJ6v7GsUvVOguqxg2VTwQUkyTPXXRRWPdjuUPVqdBrJQhvci48OHlNGRnux+Slr2Rnvw==",
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">= 10.4.0"
+        "node": ">= 10.8.0"
       }
     },
     "node_modules/fill-range": {
@@ -10730,7 +11394,8 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -10925,9 +11590,9 @@
       }
     },
     "node_modules/glob-to-regex.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regex.js/-/glob-to-regex.js-1.0.1.tgz",
-      "integrity": "sha512-CG/iEvgQqfzoVsMUbxSJcwbG2JwyZ3naEqPkeltwl0BSS8Bp83k3xlGms+0QdWFUAwV+uvo80wNswKF6FWEkKg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/glob-to-regex.js/-/glob-to-regex.js-1.2.0.tgz",
+      "integrity": "sha512-QMwlOQKU/IzqMUOAZWubUOT8Qft+Y0KQWnX9nK3ch0CJg0tTp4TvGZsTfudYKv2NzoQSyPcnA6TYeIQ3jGichQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -12294,23 +12959,23 @@
       }
     },
     "node_modules/jasmine": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-5.10.0.tgz",
-      "integrity": "sha512-v4FojO8cXQdx15mJXovGhjJOvyIcVf7AC+H0ZahnfLk52vUbwuLxjVgbikc95yLmgwKQsFT47/FGQ3dOrWVxtQ==",
+      "version": "5.12.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-5.12.0.tgz",
+      "integrity": "sha512-KmKeTNuH8rgAuPRL5AUsXWSdJVlDu+pgqi2dLXoZUSH/g3kR+7Ho8B7hEhwDu0fu1PLuiXZtfaxmQ/mB5wqihw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "glob": "^10.2.2",
-        "jasmine-core": "~5.10.0"
+        "jasmine-core": "~5.12.0"
       },
       "bin": {
         "jasmine": "bin/jasmine.js"
       }
     },
     "node_modules/jasmine-core": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.10.0.tgz",
-      "integrity": "sha512-MrChbWV5LBo+EaeKwTM1eZ6oYSz1brvFExnRafraEkJkbJ9evbUxABhnIgGQimhpMxhg+BD6QmOvb/e3NXsNdg==",
+      "version": "5.12.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.12.0.tgz",
+      "integrity": "sha512-QqO4pX33GEML5JoGQU6BM5NHKPgEsg+TXp3jCIDek9MbfEp2JUYEFBo9EF1+hegWy/bCHS1m5nP0BOp18G6rVA==",
       "dev": true,
       "license": "MIT"
     },
@@ -13033,15 +13698,6 @@
         "shell-quote": "^1.8.3"
       }
     },
-    "node_modules/lazy-ass": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
-      "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
-      "dev": true,
-      "engines": {
-        "node": "> 0.8"
-      }
-    },
     "node_modules/lazystream": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
@@ -13411,13 +14067,17 @@
       }
     },
     "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
+      "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.11.5"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/loader-utils": {
@@ -13874,9 +14534,10 @@
       }
     },
     "node_modules/mathjs": {
-      "version": "14.6.0",
-      "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-14.6.0.tgz",
-      "integrity": "sha512-5vI2BLB5GKQmiSK9BH6hVkZ+GgqpdnOgEfmHl7mqVmdQObLynr63KueyYYLCQMzj66q69mV2XZZGQqqxeftQbA==",
+      "version": "14.9.1",
+      "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-14.9.1.tgz",
+      "integrity": "sha512-xhqv8Xjf+caWG3WlaPekg4v8QFOR3D5+8ycfcjMcPcnCNDgAONQLaLfyGgrggJrcHx2yUGCpACRpiD4GmXwX+Q==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.26.10",
         "complex.js": "^2.2.5",
@@ -13919,9 +14580,9 @@
       }
     },
     "node_modules/memfs": {
-      "version": "4.43.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.43.0.tgz",
-      "integrity": "sha512-XCdhMy33sgxCwJ4JgjSasLGgOjFm9/i+IEhO03gPHroJeTBhM7ZQ1+v3j7di9nNKtcLGjVvKjHVOkTbVop/R/Q==",
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.49.0.tgz",
+      "integrity": "sha512-L9uC9vGuc4xFybbdOpRLoOAOq1YEBBsocCs5NVW32DfU+CZWWIn3OVF+lB8Gp4ttBVSMazwrTrjv8ussX/e3VQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -13932,9 +14593,6 @@
         "tree-dump": "^1.0.3",
         "tslib": "^2.0.0"
       },
-      "engines": {
-        "node": ">= 4.0.0"
-      },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/streamich"
@@ -14253,9 +14911,9 @@
       "license": "ISC"
     },
     "node_modules/minizlib": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
-      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
+      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14550,39 +15208,22 @@
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
       "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/node-gyp/node_modules/mkdirp": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mkdirp": "dist/cjs/src/bin.js"
-      },
+      "license": "ISC",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=16"
       }
     },
     "node_modules/node-gyp/node_modules/tar": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
-      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz",
+      "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",
         "chownr": "^3.0.0",
         "minipass": "^7.1.2",
-        "minizlib": "^3.0.1",
-        "mkdirp": "^3.0.1",
+        "minizlib": "^3.1.0",
         "yallist": "^5.0.0"
       },
       "engines": {
@@ -14616,9 +15257,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.21",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz",
-      "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==",
+      "version": "2.0.23",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.23.tgz",
+      "integrity": "sha512-cCmFDMSm26S6tQSDpBCg/NR8NENrVPhAJSf+XbxBG4rPFaaonlEoE9wHQmun+cls499TQGSb7ZyPBRlzgKfpeg==",
       "dev": true,
       "license": "MIT"
     },
@@ -15924,9 +16565,9 @@
       }
     },
     "node_modules/react": {
-      "version": "19.1.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.1.1.tgz",
-      "integrity": "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==",
+      "version": "19.2.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
+      "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
       "license": "MIT",
       "peer": true,
       "engines": {
@@ -16038,16 +16679,16 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.3.1.tgz",
-      "integrity": "sha512-DzcswPr252wEr7Qz8AyAVbfyBDKLoYp6eRA1We2Fa9qirRFSdtkP5sHr3yglDKy2BbA0fd2T+j/CUSKes3FeVQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.4.0.tgz",
+      "integrity": "sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2",
         "regenerate-unicode-properties": "^10.2.2",
         "regjsgen": "^0.8.0",
-        "regjsparser": "^0.12.0",
+        "regjsparser": "^0.13.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.2.1"
       },
@@ -16063,31 +16704,18 @@
       "license": "MIT"
     },
     "node_modules/regjsparser": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
-      "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.0.tgz",
+      "integrity": "sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "jsesc": "~3.0.2"
+        "jsesc": "~3.1.0"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/request": {
       "version": "2.88.2",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
@@ -16607,9 +17235,9 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+      "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17759,9 +18387,9 @@
       }
     },
     "node_modules/tapable": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.3.tgz",
-      "integrity": "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+      "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -18294,100 +18922,17 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.44.0.tgz",
-      "integrity": "sha512-ib7mCkYuIzYonCq9XWF5XNw+fkj2zg629PSa9KNIQ47RXFF763S5BIX4wqz1+FLPogTZoiw8KmCiRPRa8bL3qw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.44.0",
-        "@typescript-eslint/parser": "8.44.0",
-        "@typescript-eslint/typescript-estree": "8.44.0",
-        "@typescript-eslint/utils": "8.44.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.44.0.tgz",
-      "integrity": "sha512-EGDAOGX+uwwekcS0iyxVDmRV9HX6FLSM5kzrAToLTsr9OWCIKG/y3lQheCq18yZ5Xh78rRKJiEpP0ZaCs4ryOQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.44.0",
-        "@typescript-eslint/type-utils": "8.44.0",
-        "@typescript-eslint/utils": "8.44.0",
-        "@typescript-eslint/visitor-keys": "8.44.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^7.0.0",
-        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.44.0",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/parser": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.44.0.tgz",
-      "integrity": "sha512-VGMpFQGUQWYT9LfnPcX8ouFojyrZ/2w3K5BucvxL/spdNehccKhB4jUyB1yBCXpr2XFm0jkECxgrpXBW2ipoAw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.46.0.tgz",
+      "integrity": "sha512-6+ZrB6y2bT2DX3K+Qd9vn7OFOJR+xSLDj+Aw/N3zBwUt27uTw2sw2TE2+UcY1RiyBZkaGbTkVg9SSdPNUG6aUw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.44.0",
-        "@typescript-eslint/types": "8.44.0",
-        "@typescript-eslint/typescript-estree": "8.44.0",
-        "@typescript-eslint/visitor-keys": "8.44.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/type-utils": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.44.0.tgz",
-      "integrity": "sha512-9cwsoSxJ8Sak67Be/hD2RNt/fsqmWnNE1iHohG8lxqLSNY8xNfyY7wloo5zpW3Nu9hxVgURevqfcH6vvKCt6yg==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@typescript-eslint/types": "8.44.0",
-        "@typescript-eslint/typescript-estree": "8.44.0",
-        "@typescript-eslint/utils": "8.44.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^2.1.0"
+        "@typescript-eslint/eslint-plugin": "8.46.0",
+        "@typescript-eslint/parser": "8.46.0",
+        "@typescript-eslint/typescript-estree": "8.46.0",
+        "@typescript-eslint/utils": "8.46.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -18401,21 +18946,6 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/types": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.0.tgz",
-      "integrity": "sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/ua-parser-js": {
       "version": "0.7.41",
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.41.tgz",
@@ -18443,6 +18973,13 @@
         "node": "*"
       }
     },
+    "node_modules/undici-types": {
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz",
+      "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
@@ -18820,10 +19357,38 @@
         }
       }
     },
+    "node_modules/vite/node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.4.tgz",
+      "integrity": "sha512-BTm2qKNnWIQ5auf4deoetINJm2JzvihvGb9R6K/ETwKLql/Bb3Eg2H1FBp1gUb4YGbydMA3jcmQTR73q7J+GAA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.4.tgz",
+      "integrity": "sha512-P9LDQiC5vpgGFgz7GSM6dKPCiqR3XYN1WwJKA4/BUVDjHpYsf3iBEmVz62uyq20NGYbiGPR5cNHI7T1HqxNs2w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
     "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.52.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.0.tgz",
-      "integrity": "sha512-YCdWlY/8ltN6H78HnMsRHYlPiKvqKagBP1r+D7SSylxX+HnsgXGCmLiV3Y4nSyY9hW8qr8U9LDUx/Lo7M6MfmQ==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.4.tgz",
+      "integrity": "sha512-QRWSW+bVccAvZF6cbNZBJwAehmvG9NwfWHwMy4GbWi/BQIA/laTIktebT2ipVjNncqE6GLPxOok5hsECgAxGZg==",
       "cpu": [
         "arm64"
       ],
@@ -18834,6 +19399,202 @@
         "darwin"
       ]
     },
+    "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.4.tgz",
+      "integrity": "sha512-hZgP05pResAkRJxL1b+7yxCnXPGsXU0fG9Yfd6dUaoGk+FhdPKCJ5L1Sumyxn8kvw8Qi5PvQ8ulenUbRjzeCTw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.4.tgz",
+      "integrity": "sha512-xmc30VshuBNUd58Xk4TKAEcRZHaXlV+tCxIXELiE9sQuK3kG8ZFgSPi57UBJt8/ogfhAF5Oz4ZSUBN77weM+mQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.4.tgz",
+      "integrity": "sha512-WdSLpZFjOEqNZGmHflxyifolwAiZmDQzuOzIq9L27ButpCVpD7KzTRtEG1I0wMPFyiyUdOO+4t8GvrnBLQSwpw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.4.tgz",
+      "integrity": "sha512-xRiOu9Of1FZ4SxVbB0iEDXc4ddIcjCv2aj03dmW8UrZIW7aIQ9jVJdLBIhxBI+MaTnGAKyvMwPwQnoOEvP7FgQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.4.tgz",
+      "integrity": "sha512-FbhM2p9TJAmEIEhIgzR4soUcsW49e9veAQCziwbR+XWB2zqJ12b4i/+hel9yLiD8pLncDH4fKIPIbt5238341Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.4.tgz",
+      "integrity": "sha512-4n4gVwhPHR9q/g8lKCyz0yuaD0MvDf7dV4f9tHt0C73Mp8h38UCtSCSE6R9iBlTbXlmA8CjpsZoujhszefqueg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.4.tgz",
+      "integrity": "sha512-u0n17nGA0nvi/11gcZKsjkLj1QIpAuPFQbR48Subo7SmZJnGxDpspyw2kbpuoQnyK+9pwf3pAoEXerJs/8Mi9g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.4.tgz",
+      "integrity": "sha512-/MOEW3aHjjs1p4Pw1Xk4+3egRevx8Ji9N6HUIA1Ifh8Q+cg9dremvFCUbOX2Zebz80BwJIgCBUemjqhU5XI5Eg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.4.tgz",
+      "integrity": "sha512-seoeZp4L/6D1MUyjWkOMRU6/iLmCU2EjbMTyAG4oIOs1/I82Y5lTeaxW0KBfkUdHAWN7j25bpkt0rjnOgAcQcA==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.4.tgz",
+      "integrity": "sha512-Wi6AXf0k0L7E2gteNsNHUs7UMwCIhsCTs6+tqQ5GPwVRWMaflqGec4Sd8n6+FNFDw9vGcReqk2KzBDhCa1DLYg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.4.tgz",
+      "integrity": "sha512-dtBZYjDmCQ9hW+WgEkaffvRRCKm767wWhxsFW3Lw86VXz/uJRuD438/XvbZT//B96Vs8oTA8Q4A0AfHbrxP9zw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.4.tgz",
+      "integrity": "sha512-8GKr640PdFNXwzIE0IrkMWUNUomILLkfeHjXBi/nUvFlpZP+FA8BKGKpacjW6OUUHaNI6sUURxR2U2g78FOHWQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.4.tgz",
+      "integrity": "sha512-AIy/jdJ7WtJ/F6EcfOb2GjR9UweO0n43jNObQMb6oGxkYTfLcnN7vYYpG+CN3lLxrQkzWnMOoNSHTW54pgbVxw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.4.tgz",
+      "integrity": "sha512-bf9PtUa0u8IXDVxzRToFQKsNCRz9qLYfR/MpECxl4mRoWYjAeFjgxj1XdZr2M/GNVpT05p+LgQOHopYDlUu6/w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/vite/node_modules/postcss": {
       "version": "8.5.6",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
@@ -18864,9 +19625,9 @@
       }
     },
     "node_modules/vite/node_modules/rollup": {
-      "version": "4.52.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.0.tgz",
-      "integrity": "sha512-+IuescNkTJQgX7AkIDtITipZdIGcWF0pnVvZTWStiazUmcGA2ag8dfg0urest2XlXUi9kuhfQ+qmdc5Stc3z7g==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.4.tgz",
+      "integrity": "sha512-CLEVl+MnPAiKh5pl4dEWSyMTpuflgNQiLGhMv8ezD5W/qP8AKvmYpCOKRRNOh7oRKnauBZ4SyeYkMS+1VSyKwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18880,28 +19641,28 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.52.0",
-        "@rollup/rollup-android-arm64": "4.52.0",
-        "@rollup/rollup-darwin-arm64": "4.52.0",
-        "@rollup/rollup-darwin-x64": "4.52.0",
-        "@rollup/rollup-freebsd-arm64": "4.52.0",
-        "@rollup/rollup-freebsd-x64": "4.52.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.52.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.52.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.52.0",
-        "@rollup/rollup-linux-arm64-musl": "4.52.0",
-        "@rollup/rollup-linux-loong64-gnu": "4.52.0",
-        "@rollup/rollup-linux-ppc64-gnu": "4.52.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.52.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.52.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.52.0",
-        "@rollup/rollup-linux-x64-gnu": "4.52.0",
-        "@rollup/rollup-linux-x64-musl": "4.52.0",
-        "@rollup/rollup-openharmony-arm64": "4.52.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.52.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.52.0",
-        "@rollup/rollup-win32-x64-gnu": "4.52.0",
-        "@rollup/rollup-win32-x64-msvc": "4.52.0",
+        "@rollup/rollup-android-arm-eabi": "4.52.4",
+        "@rollup/rollup-android-arm64": "4.52.4",
+        "@rollup/rollup-darwin-arm64": "4.52.4",
+        "@rollup/rollup-darwin-x64": "4.52.4",
+        "@rollup/rollup-freebsd-arm64": "4.52.4",
+        "@rollup/rollup-freebsd-x64": "4.52.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.52.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.52.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.52.4",
+        "@rollup/rollup-linux-arm64-musl": "4.52.4",
+        "@rollup/rollup-linux-loong64-gnu": "4.52.4",
+        "@rollup/rollup-linux-ppc64-gnu": "4.52.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.52.4",
+        "@rollup/rollup-linux-riscv64-musl": "4.52.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.52.4",
+        "@rollup/rollup-linux-x64-gnu": "4.52.4",
+        "@rollup/rollup-linux-x64-musl": "4.52.4",
+        "@rollup/rollup-openharmony-arm64": "4.52.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.52.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.52.4",
+        "@rollup/rollup-win32-x64-gnu": "4.52.4",
+        "@rollup/rollup-win32-x64-msvc": "4.52.4",
         "fsevents": "~2.3.2"
       }
     },

From 0061d8aea2eda5ce5b3bfc65473d3772e73e138a Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 20 Oct 2025 15:23:23 +0000
Subject: [PATCH 243/245] review changes

---
 src/app/app-config.service.ts                                   | 1 +
 .../ingestor.new-transfer-dialog-page.component.ts              | 2 --
 src/assets/config.json                                          | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index b5ab7f73e0..e13aaa9bfc 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -51,6 +51,7 @@ export class MainPageConfiguration {
 
 export class MainMenuOptions {
   datasets: boolean;
+  ingestor:boolean;
   files: boolean;
   instruments: boolean;
   jobs: boolean;
diff --git a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
index d48d945d44..2baa627262 100644
--- a/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/creation-dialog/creation-pages/ingestor.new-transfer-dialog-page.component.ts
@@ -220,8 +220,6 @@ export class IngestorNewTransferDialogPageComponent
     this.createNewTransferData.scicatHeader["type"] = "raw";
     this.createNewTransferData.scicatHeader["dataFormat"] = "root";
     this.createNewTransferData.scicatHeader["owner"] = "User";
-    this.createNewTransferData.scicatHeader["creationLocation"] =
-      this.facilityInfo.description || null;
 
     this.createNewTransferData.scicatHeader["principalInvestigator"] =
       this.userProfile.username;
diff --git a/src/assets/config.json b/src/assets/config.json
index af996da17f..64d542c87b 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -28,7 +28,7 @@
   "jsonMetadataEnabled": true,
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
-  "lbBaseURL": "http://127.0.0.1:3000",
+  "lbBaseURL": "http://127.0.0.0:3000",
   "ingestorComponent": {
     "ingestorEnabled": false,
     "ingestorAutodiscoveryOptions": [

From a07c56750ab4e272a82b4bb4fac9ca3bcbcbc342 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Mon, 20 Oct 2025 15:53:53 +0000
Subject: [PATCH 244/245] fix lint

---
 src/app/app-config.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts
index e13aaa9bfc..ba3931b312 100644
--- a/src/app/app-config.service.ts
+++ b/src/app/app-config.service.ts
@@ -51,7 +51,7 @@ export class MainPageConfiguration {
 
 export class MainMenuOptions {
   datasets: boolean;
-  ingestor:boolean;
+  ingestor: boolean;
   files: boolean;
   instruments: boolean;
   jobs: boolean;

From 5ecada4e82a323cb115e1a0b3a6d9acac421dc27 Mon Sep 17 00:00:00 2001
From: sofyalaski <sofyalaskina@gmail.com>
Date: Fri, 7 Nov 2025 14:05:48 +0000
Subject: [PATCH 245/245] wip: address some of reviewer comments

---
 package-lock.json                             | 3164 ++++++-----------
 package.json                                  |    1 -
 src/app/ingestor/_ingestor-theme.scss         |   19 +-
 .../ingestor.dialog-stepper.component.html    |    2 +-
 ...=> ingestor.dialog-stepper.component.scss} |    2 +-
 .../ingestor.dialog-stepper.component.ts      |    2 +-
 .../customRenderer/all-of-renderer.ts         |   15 -
 .../customRenderer/any-of-renderer.html       |   37 +
 .../customRenderer/any-of-renderer.ts         |   45 +-
 .../customRenderer/array-renderer.html        |   82 +
 .../customRenderer/array-renderer.ts          |   93 +-
 .../customRenderer/custom-renderers.ts        |   34 +-
 .../customRenderer/object-group-renderer.html |   30 +
 .../customRenderer/object-group-renderer.ts   |   37 +-
 .../customRenderer/one-of-renderer.ts         |   88 -
 .../owner-group-field-renderer.html           |   53 +
 .../owner-group-field-renderer.ts             |   56 +-
 .../customRenderer/quantity-field-renderer.ts |    3 +-
 .../quantity-value-layout-renderer.html       |   15 +
 .../quantity-value-layout-renderer.ts         |   18 +-
 .../ingestor-metadata-editor.component.scss   |  351 +-
 .../ingestor-metadata-editor.component.ts     |    1 -
 .../ingestor-creation.component.ts            |    3 +-
 .../ingestor-transfer.component.html          |   10 +-
 .../ingestor-transfer.component.ts            |    3 +-
 .../ingestor-page/ingestor.component.scss     |   31 +-
 src/app/ingestor/ingestor.module.ts           |    2 +
 src/assets/config.json                        |    4 +-
 28 files changed, 1525 insertions(+), 2676 deletions(-)
 rename src/app/ingestor/ingestor-dialogs/dialog-mounting-components/{ingestor.dialog-stepper.component.css => ingestor.dialog-stepper.component.scss} (95%)
 delete mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.html
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.html
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.html
 delete mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.html
 create mode 100644 src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.html

diff --git a/package-lock.json b/package-lock.json
index ccf5ee49ea..a92957f65f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,6 @@
         "@jsonforms/angular": "^3.5.1",
         "@jsonforms/angular-material": "^3.5.1",
         "@jsonforms/core": "^3.5.1",
-        "@jsonforms/react": "^3.5.1",
         "@ngbracket/ngx-layout": "^16.0.0",
         "@ngrx/effects": "^19.1.0",
         "@ngrx/operators": "^19.1.0",
@@ -115,13 +114,13 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1902.18",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.18.tgz",
-      "integrity": "sha512-3AyIlxbJWmWJm/CPS6S57kWBydMdYUPtF+SK8tqzwcBnyRbLwXoI7UbxstZ/C9J1hAY8QdZrDYGotwlHwhiC8g==",
+      "version": "0.1902.19",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.19.tgz",
+      "integrity": "sha512-iexYDIYpGAeAU7T60bGcfrGwtq1bxpZixYxWuHYiaD1b5baQgNSfd1isGEOh37GgDNsf4In9i2LOLPm0wBdtgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "19.2.18",
+        "@angular-devkit/core": "19.2.19",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -130,34 +129,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": {
-      "version": "19.2.18",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.18.tgz",
-      "integrity": "sha512-D/JbeM3yAZ6Cnk/3ez8MvoTjx1pgUnkJHvDkuMhRuelCi3m0b0Qt/3548ie7CU+oLHdzAzjFhEvCPNssdevTRQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "8.17.1",
-        "ajv-formats": "3.0.1",
-        "jsonc-parser": "3.3.1",
-        "picomatch": "4.0.2",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@angular-devkit/architect/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -169,17 +140,17 @@
       }
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "19.2.18",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-19.2.18.tgz",
-      "integrity": "sha512-OFrNsWT7GovW2MX4nDx2U9bEsAhOhJUbTm2qibMUSnVjm/iJhdcZXRB7qmDjetVp68nAXvcHCPPIo+2WlfLdig==",
+      "version": "19.2.19",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-19.2.19.tgz",
+      "integrity": "sha512-uIxi6Vzss6+ycljVhkyPUPWa20w8qxJL9lEn0h6+sX/fhM8Djt0FHIuTQjoX58EoMaQ/1jrXaRaGimkbaFcG9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1902.18",
-        "@angular-devkit/build-webpack": "0.1902.18",
-        "@angular-devkit/core": "19.2.18",
-        "@angular/build": "19.2.18",
+        "@angular-devkit/architect": "0.1902.19",
+        "@angular-devkit/build-webpack": "0.1902.19",
+        "@angular-devkit/core": "19.2.19",
+        "@angular/build": "19.2.19",
         "@babel/core": "7.26.10",
         "@babel/generator": "7.26.10",
         "@babel/helper-annotate-as-pure": "7.25.9",
@@ -190,7 +161,7 @@
         "@babel/preset-env": "7.26.9",
         "@babel/runtime": "7.26.10",
         "@discoveryjs/json-ext": "0.6.3",
-        "@ngtools/webpack": "19.2.18",
+        "@ngtools/webpack": "19.2.19",
         "@vitejs/plugin-basic-ssl": "1.2.0",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.20",
@@ -244,7 +215,7 @@
         "@angular/localize": "^19.0.0 || ^19.2.0-next.0",
         "@angular/platform-server": "^19.0.0 || ^19.2.0-next.0",
         "@angular/service-worker": "^19.0.0 || ^19.2.0-next.0",
-        "@angular/ssr": "^19.2.18",
+        "@angular/ssr": "^19.2.19",
         "@web/test-runner": "^0.20.0",
         "browser-sync": "^3.0.2",
         "jest": "^29.5.0",
@@ -294,34 +265,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
-      "version": "19.2.18",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.18.tgz",
-      "integrity": "sha512-D/JbeM3yAZ6Cnk/3ez8MvoTjx1pgUnkJHvDkuMhRuelCi3m0b0Qt/3548ie7CU+oLHdzAzjFhEvCPNssdevTRQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "8.17.1",
-        "ajv-formats": "3.0.1",
-        "jsonc-parser": "3.3.1",
-        "picomatch": "4.0.2",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -333,13 +276,13 @@
       }
     },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1902.18",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1902.18.tgz",
-      "integrity": "sha512-pOo8HFEE92MdL6BwBvvWb8wiZ8Y3KHRPewG3pwHdJfL3pCVP3oNThJnFVLxrA/LxJK7kFRzKexhqd89OteZiYw==",
+      "version": "0.1902.19",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1902.19.tgz",
+      "integrity": "sha512-x2tlGg5CsUveFzuRuqeHknSbGirSAoRynEh+KqPRGK0G3WpMViW/M8SuVurecasegfIrDWtYZ4FnVxKqNbKwXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/architect": "0.1902.18",
+        "@angular-devkit/architect": "0.1902.19",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -563,14 +506,14 @@
       }
     },
     "node_modules/@angular/build": {
-      "version": "19.2.18",
-      "resolved": "https://registry.npmjs.org/@angular/build/-/build-19.2.18.tgz",
-      "integrity": "sha512-dUpcqiryCunKdIF3FnVeO0tkxXctOk1JTaVoIA9vTW1fV8zdtRMVduq5yikE3Z3ec3AIC/2F+afD6BcF2fqliQ==",
+      "version": "19.2.19",
+      "resolved": "https://registry.npmjs.org/@angular/build/-/build-19.2.19.tgz",
+      "integrity": "sha512-SFzQ1bRkNFiOVu+aaz+9INmts7tDUrsHLEr9HmARXr9qk5UmR8prlw39p2u+Bvi6/lCiJ18TZMQQl9mGyr63lg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1902.18",
+        "@angular-devkit/architect": "0.1902.19",
         "@babel/core": "7.26.10",
         "@babel/helper-annotate-as-pure": "7.25.9",
         "@babel/helper-split-export-declaration": "7.24.7",
@@ -593,7 +536,7 @@
         "sass": "1.85.0",
         "semver": "7.7.1",
         "source-map-support": "0.5.21",
-        "vite": "6.3.6",
+        "vite": "6.4.1",
         "watchpack": "2.4.2"
       },
       "engines": {
@@ -610,7 +553,7 @@
         "@angular/localize": "^19.0.0 || ^19.2.0-next.0",
         "@angular/platform-server": "^19.0.0 || ^19.2.0-next.0",
         "@angular/service-worker": "^19.0.0 || ^19.2.0-next.0",
-        "@angular/ssr": "^19.2.18",
+        "@angular/ssr": "^19.2.19",
         "karma": "^6.4.0",
         "less": "^4.2.0",
         "ng-packagr": "^19.0.0 || ^19.2.0-next.0",
@@ -648,557 +591,147 @@
         }
       }
     },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.5.tgz",
-      "integrity": "sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
+    "node_modules/@angular/cdk": {
+      "version": "19.2.19",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.2.19.tgz",
+      "integrity": "sha512-PCpJagurPBqciqcq4Z8+3OtKLb7rSl4w/qBJoIMua8CgnrjvA1i+SWawhdtfI1zlY8FSwhzLwXV0CmWWfFzQPg==",
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
+      "dependencies": {
+        "parse5": "^7.1.2",
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^19.0.0 || ^20.0.0",
+        "@angular/core": "^19.0.0 || ^20.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
     },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.5.tgz",
-      "integrity": "sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@angular/cli": {
+      "version": "19.2.19",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-19.2.19.tgz",
+      "integrity": "sha512-e9tAzFNOL4mMWfMnpC9Up83OCTOp2siIj8W41FCp8jfoEnw79AXDDLh3d70kOayiObchksTJVShslTogLUyhMw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
+      "dependencies": {
+        "@angular-devkit/architect": "0.1902.19",
+        "@angular-devkit/core": "19.2.19",
+        "@angular-devkit/schematics": "19.2.19",
+        "@inquirer/prompts": "7.3.2",
+        "@listr2/prompt-adapter-inquirer": "2.0.18",
+        "@schematics/angular": "19.2.19",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ini": "5.0.0",
+        "jsonc-parser": "3.3.1",
+        "listr2": "8.2.5",
+        "npm-package-arg": "12.0.2",
+        "npm-pick-manifest": "10.0.0",
+        "pacote": "20.0.0",
+        "resolve": "1.22.10",
+        "semver": "7.7.1",
+        "symbol-observable": "4.0.0",
+        "yargs": "17.7.2"
+      },
+      "bin": {
+        "ng": "bin/ng.js"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
     },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.5.tgz",
-      "integrity": "sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
+    "node_modules/@angular/common": {
+      "version": "19.2.15",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.2.15.tgz",
+      "integrity": "sha512-aVa/ctBYH/4qgA7r4sS7TV+/DzRYmcS+3d6l89pNKUXkI8gpmsd+r3FjccaemX4Wqru1QOrMvC+i+e7IBIVv0g==",
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "19.2.15",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
     },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.5.tgz",
-      "integrity": "sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
+    "node_modules/@angular/compiler": {
+      "version": "19.2.15",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.2.15.tgz",
+      "integrity": "sha512-hMHZU6/03xG0tbPDIm1hbVSTFLnRkGYfh+xdBwUMnIFYYTS0QJ2hdPfEZKCJIXm+fz9IAI5MPdDTfeyp0sgaHQ==",
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+      }
     },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.5.tgz",
-      "integrity": "sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@angular/compiler-cli": {
+      "version": "19.2.15",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-19.2.15.tgz",
+      "integrity": "sha512-4r5tvGA2Ok3o8wROZBkF9qNKS7L0AEpdBIkAVJbLw2rBY2SlyycFIRYyV2+D1lJ1jq/f9U7uN6oon0MjTvNYkA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
+      "dependencies": {
+        "@babel/core": "7.26.9",
+        "@jridgewell/sourcemap-codec": "^1.4.14",
+        "chokidar": "^4.0.0",
+        "convert-source-map": "^1.5.1",
+        "reflect-metadata": "^0.2.0",
+        "semver": "^7.0.0",
+        "tslib": "^2.3.0",
+        "yargs": "^17.2.1"
+      },
+      "bin": {
+        "ng-xi18n": "bundles/src/bin/ng_xi18n.js",
+        "ngc": "bundles/src/bin/ngc.js",
+        "ngcc": "bundles/ngcc/index.js"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler": "19.2.15",
+        "typescript": ">=5.5 <5.9"
+      }
     },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.5.tgz",
-      "integrity": "sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@angular/compiler-cli/node_modules/@babel/core": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz",
+      "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/traverse": "^7.26.9",
+        "@babel/types": "^7.26.9",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
     },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.5.tgz",
-      "integrity": "sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.5.tgz",
-      "integrity": "sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.5.tgz",
-      "integrity": "sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.5.tgz",
-      "integrity": "sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.5.tgz",
-      "integrity": "sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.5.tgz",
-      "integrity": "sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.5.tgz",
-      "integrity": "sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.5.tgz",
-      "integrity": "sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.5.tgz",
-      "integrity": "sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.5.tgz",
-      "integrity": "sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz",
-      "integrity": "sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/vite": {
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz",
-      "integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esbuild": "^0.25.0",
-        "fdir": "^6.4.4",
-        "picomatch": "^4.0.2",
-        "postcss": "^8.5.3",
-        "rollup": "^4.34.9",
-        "tinyglobby": "^0.2.13"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "jiti": ">=1.21.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.16.0",
-        "tsx": "^4.8.1",
-        "yaml": "^2.4.2"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "jiti": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        },
-        "tsx": {
-          "optional": true
-        },
-        "yaml": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular/build/node_modules/vite/node_modules/postcss": {
-      "version": "8.5.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.11",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/@angular/build/node_modules/vite/node_modules/rollup": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.5.tgz",
-      "integrity": "sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "1.0.8"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.52.5",
-        "@rollup/rollup-android-arm64": "4.52.5",
-        "@rollup/rollup-darwin-arm64": "4.52.5",
-        "@rollup/rollup-darwin-x64": "4.52.5",
-        "@rollup/rollup-freebsd-arm64": "4.52.5",
-        "@rollup/rollup-freebsd-x64": "4.52.5",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.52.5",
-        "@rollup/rollup-linux-arm-musleabihf": "4.52.5",
-        "@rollup/rollup-linux-arm64-gnu": "4.52.5",
-        "@rollup/rollup-linux-arm64-musl": "4.52.5",
-        "@rollup/rollup-linux-loong64-gnu": "4.52.5",
-        "@rollup/rollup-linux-ppc64-gnu": "4.52.5",
-        "@rollup/rollup-linux-riscv64-gnu": "4.52.5",
-        "@rollup/rollup-linux-riscv64-musl": "4.52.5",
-        "@rollup/rollup-linux-s390x-gnu": "4.52.5",
-        "@rollup/rollup-linux-x64-gnu": "4.52.5",
-        "@rollup/rollup-linux-x64-musl": "4.52.5",
-        "@rollup/rollup-openharmony-arm64": "4.52.5",
-        "@rollup/rollup-win32-arm64-msvc": "4.52.5",
-        "@rollup/rollup-win32-ia32-msvc": "4.52.5",
-        "@rollup/rollup-win32-x64-gnu": "4.52.5",
-        "@rollup/rollup-win32-x64-msvc": "4.52.5",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/@angular/cdk": {
-      "version": "19.2.19",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.2.19.tgz",
-      "integrity": "sha512-PCpJagurPBqciqcq4Z8+3OtKLb7rSl4w/qBJoIMua8CgnrjvA1i+SWawhdtfI1zlY8FSwhzLwXV0CmWWfFzQPg==",
-      "license": "MIT",
-      "dependencies": {
-        "parse5": "^7.1.2",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "@angular/common": "^19.0.0 || ^20.0.0",
-        "@angular/core": "^19.0.0 || ^20.0.0",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
-    "node_modules/@angular/cli": {
-      "version": "19.2.19",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-19.2.19.tgz",
-      "integrity": "sha512-e9tAzFNOL4mMWfMnpC9Up83OCTOp2siIj8W41FCp8jfoEnw79AXDDLh3d70kOayiObchksTJVShslTogLUyhMw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@angular-devkit/architect": "0.1902.19",
-        "@angular-devkit/core": "19.2.19",
-        "@angular-devkit/schematics": "19.2.19",
-        "@inquirer/prompts": "7.3.2",
-        "@listr2/prompt-adapter-inquirer": "2.0.18",
-        "@schematics/angular": "19.2.19",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ini": "5.0.0",
-        "jsonc-parser": "3.3.1",
-        "listr2": "8.2.5",
-        "npm-package-arg": "12.0.2",
-        "npm-pick-manifest": "10.0.0",
-        "pacote": "20.0.0",
-        "resolve": "1.22.10",
-        "semver": "7.7.1",
-        "symbol-observable": "4.0.0",
-        "yargs": "17.7.2"
-      },
-      "bin": {
-        "ng": "bin/ng.js"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
-      "version": "0.1902.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.19.tgz",
-      "integrity": "sha512-iexYDIYpGAeAU7T60bGcfrGwtq1bxpZixYxWuHYiaD1b5baQgNSfd1isGEOh37GgDNsf4In9i2LOLPm0wBdtgQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@angular-devkit/core": "19.2.19",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@angular/common": {
-      "version": "19.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.2.15.tgz",
-      "integrity": "sha512-aVa/ctBYH/4qgA7r4sS7TV+/DzRYmcS+3d6l89pNKUXkI8gpmsd+r3FjccaemX4Wqru1QOrMvC+i+e7IBIVv0g==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "19.2.15",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
-    "node_modules/@angular/compiler": {
-      "version": "19.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.2.15.tgz",
-      "integrity": "sha512-hMHZU6/03xG0tbPDIm1hbVSTFLnRkGYfh+xdBwUMnIFYYTS0QJ2hdPfEZKCJIXm+fz9IAI5MPdDTfeyp0sgaHQ==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      }
-    },
-    "node_modules/@angular/compiler-cli": {
-      "version": "19.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-19.2.15.tgz",
-      "integrity": "sha512-4r5tvGA2Ok3o8wROZBkF9qNKS7L0AEpdBIkAVJbLw2rBY2SlyycFIRYyV2+D1lJ1jq/f9U7uN6oon0MjTvNYkA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/core": "7.26.9",
-        "@jridgewell/sourcemap-codec": "^1.4.14",
-        "chokidar": "^4.0.0",
-        "convert-source-map": "^1.5.1",
-        "reflect-metadata": "^0.2.0",
-        "semver": "^7.0.0",
-        "tslib": "^2.3.0",
-        "yargs": "^17.2.1"
-      },
-      "bin": {
-        "ng-xi18n": "bundles/src/bin/ng_xi18n.js",
-        "ngc": "bundles/src/bin/ngc.js",
-        "ngcc": "bundles/ngcc/index.js"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler": "19.2.15",
-        "typescript": ">=5.5 <5.9"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz",
-      "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.9",
-        "@babel/helper-compilation-targets": "^7.26.5",
-        "@babel/helper-module-transforms": "^7.26.0",
-        "@babel/helpers": "^7.26.9",
-        "@babel/parser": "^7.26.9",
-        "@babel/template": "^7.26.9",
-        "@babel/traverse": "^7.26.9",
-        "@babel/types": "^7.26.9",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true,
       "license": "MIT"
     },
@@ -1390,9 +923,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz",
-      "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
+      "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1505,18 +1038,18 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.3.tgz",
-      "integrity": "sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.5.tgz",
+      "integrity": "sha512-q3WC4JfdODypvxArsJQROfupPBq9+lMwjKq7C33GhbFYJsufD0yd/ziwD+hJucLeWsnFPWZjsU2DNFqBPE7jwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.27.3",
-        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-member-expression-to-functions": "^7.28.5",
         "@babel/helper-optimise-call-expression": "^7.27.1",
         "@babel/helper-replace-supers": "^7.27.1",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/traverse": "^7.28.3",
+        "@babel/traverse": "^7.28.5",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1550,14 +1083,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz",
-      "integrity": "sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.28.5.tgz",
+      "integrity": "sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "regexpu-core": "^6.2.0",
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "regexpu-core": "^6.3.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1618,14 +1151,14 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
-      "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz",
+      "integrity": "sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/traverse": "^7.28.5",
+        "@babel/types": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1773,9 +1306,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1822,13 +1355,13 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
-      "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.4"
+        "@babel/types": "^7.28.5"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1838,14 +1371,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
-      "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.28.5.tgz",
+      "integrity": "sha512-87GDMS3tsmMSi/3bWOte1UblL+YUTFMV8SZPZ2eSEL17s74Cw/l63rR6NmGVKMYW2GYi85nE+/d6Hw5N0bEk2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/traverse": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2052,9 +1585,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.4.tgz",
-      "integrity": "sha512-1yxmvN0MJHOhPVmAsmoW5liWwoILobu/d/ShymZmj867bAdxGbehIrew1DuLpw2Ukv+qDSSPQdYW1dLNE7t11A==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.5.tgz",
+      "integrity": "sha512-45DmULpySVvmq9Pj3X9B+62Xe+DJGov27QravQJU1LLcapR6/10i+gYVAucGGJpHBp5mYxIMK4nDAT/QDLr47g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2153,14 +1686,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.0.tgz",
-      "integrity": "sha512-v1nrSMBiKcodhsyJ4Gf+Z0U/yawmJDBOTpEB3mcQY52r9RIyPneGyAS/yM6seP/8I+mWI3elOMtT5dB8GJVs+A==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz",
+      "integrity": "sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.28.0"
+        "@babel/traverse": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2236,9 +1769,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
-      "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.28.5.tgz",
+      "integrity": "sha512-D4WIMaFtwa2NizOp+dnoFjRez/ClKiC2BqqImwKd1X28nqBtZEyCYJ2ozQrrzlxAFrcrjxo39S6khe9RNDlGzw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2335,9 +1868,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
-      "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.5.tgz",
+      "integrity": "sha512-axUuqnUTBuXyHGcJEVVh9pORaN6wC5bYfE7FGzPiaWa3syib9m7g+/IT/4VgCOe2Upef43PHzeAvcrVek6QuuA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2401,16 +1934,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz",
-      "integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.28.5.tgz",
+      "integrity": "sha512-vn5Jma98LCOeBy/KpeQhXcV2WZgaRUtjwQmjoBuLNlOmkg0fB5pdvYVeWRYI69wWKwK2cD1QbMiUQnoujWvrew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-module-transforms": "^7.28.3",
         "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2555,9 +2088,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
-      "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.5.tgz",
+      "integrity": "sha512-N6fut9IZlPnjPwgiQkXNhb+cT8wQKFlJNqcZkWlcTqkcqx6/kU4ynGmLFoa4LViBSirn05YAwk+sQBbPfxtYzQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3016,18 +2549,18 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz",
-      "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
+      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.3",
+        "@babel/generator": "^7.28.5",
         "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.4",
+        "@babel/parser": "^7.28.5",
         "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.4",
+        "@babel/types": "^7.28.5",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -3035,14 +2568,14 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz",
-      "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.3",
-        "@babel/types": "^7.28.2",
+        "@babel/parser": "^7.28.5",
+        "@babel/types": "^7.28.5",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -3052,14 +2585,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz",
-      "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1"
+        "@babel/helper-validator-identifier": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3889,9 +3422,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+      "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4066,9 +3599,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.39.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.0.tgz",
-      "integrity": "sha512-BIhe0sW91JGPiaF1mOuPy5v8NflqfjIcDNpC+LbW9f609WVRX1rArrhi6Z2ymvrAry9jw+5POTj4t2t62o8Bmw==",
+      "version": "9.39.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.1.tgz",
+      "integrity": "sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4789,19 +4322,6 @@
         }
       }
     },
-    "node_modules/@jsonforms/react": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@jsonforms/react/-/react-3.6.0.tgz",
-      "integrity": "sha512-dor7FYltCkNkAM+SVZGtabjpUhGlj0/coAqx7GIZ8h+leET+d1sLEAc8kfxxh6gZBq9C4KAErb0Pj3uHedOs9Q==",
-      "license": "MIT",
-      "dependencies": {
-        "lodash": "^4.17.21"
-      },
-      "peerDependencies": {
-        "@jsonforms/core": "3.6.0",
-        "react": "^16.12.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
     "node_modules/@jsonjoy.com/base64": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
@@ -5587,9 +5107,9 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "19.2.18",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.2.18.tgz",
-      "integrity": "sha512-UHwrNcrq1TfiGbQ04xw6rmsijWqTjsh7gTizrJILMDF4U6xVvSth8FolCyLhAjheT5e9zKfIHXeGxUS0Qgrp9A==",
+      "version": "19.2.19",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.2.19.tgz",
+      "integrity": "sha512-R9aeTrOBiRVl8I698JWPniUAAEpSvzc8SUGWSM5UXWMcHnWqd92cOnJJ1aXDGJZKXrbhMhCBx9Dglmcks5IDpg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5916,62 +5436,230 @@
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
       "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@npmcli/run-script/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=16"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@npmcli/run-script/node_modules/which": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
-      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
-      },
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@parcel/watcher": {
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
       "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
-      "dependencies": {
-        "detect-libc": "^1.0.3",
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.0"
-      },
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">= 10.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
@@ -6016,6 +5704,69 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
     "node_modules/@parcel/watcher/node_modules/detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -6176,147 +5927,21 @@
       "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.8.tgz",
       "integrity": "sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==",
       "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.8.tgz",
-      "integrity": "sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.8.tgz",
-      "integrity": "sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.8.tgz",
-      "integrity": "sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.8.tgz",
-      "integrity": "sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz",
-      "integrity": "sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz",
-      "integrity": "sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.8.tgz",
-      "integrity": "sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz",
-      "integrity": "sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.8.tgz",
-      "integrity": "sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==",
-      "cpu": [
-        "riscv64"
+        "x64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "freebsd"
       ]
     },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz",
-      "integrity": "sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==",
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.8.tgz",
+      "integrity": "sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==",
       "cpu": [
-        "riscv64"
+        "arm"
       ],
       "dev": true,
       "license": "MIT",
@@ -6325,12 +5950,12 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
       "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz",
-      "integrity": "sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.8.tgz",
+      "integrity": "sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==",
       "cpu": [
-        "s390x"
+        "arm"
       ],
       "dev": true,
       "license": "MIT",
@@ -6339,12 +5964,12 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
       "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.8.tgz",
-      "integrity": "sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.8.tgz",
+      "integrity": "sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==",
       "cpu": [
-        "x64"
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
@@ -6353,12 +5978,12 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
       "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.8.tgz",
-      "integrity": "sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.8.tgz",
+      "integrity": "sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==",
       "cpu": [
-        "x64"
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
@@ -6367,1040 +5992,761 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-openharmony-arm64": {
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
       "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz",
-      "integrity": "sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz",
+      "integrity": "sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==",
       "cpu": [
-        "arm64"
+        "loong64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "openharmony"
+        "linux"
       ]
     },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
       "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz",
-      "integrity": "sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz",
+      "integrity": "sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==",
       "cpu": [
-        "arm64"
+        "loong64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "win32"
+        "linux"
       ]
     },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
       "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.8.tgz",
-      "integrity": "sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.8.tgz",
+      "integrity": "sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==",
       "cpu": [
-        "ia32"
+        "ppc64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "win32"
+        "linux"
       ]
     },
-    "node_modules/@rollup/rollup-win32-x64-gnu": {
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
       "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz",
-      "integrity": "sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz",
+      "integrity": "sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==",
       "cpu": [
-        "x64"
+        "ppc64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "win32"
+        "linux"
       ]
     },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
       "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz",
-      "integrity": "sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.8.tgz",
+      "integrity": "sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==",
       "cpu": [
-        "x64"
+        "riscv64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@schematics/angular": {
-      "version": "19.2.19",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.2.19.tgz",
-      "integrity": "sha512-6/0pvbPCY4UHeB4lnM/5r250QX5gcLgOYbR5FdhFu+22mOPHfWpRc5tNuY9kCephDHzAHjo6fTW1vefOOmA4jw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@angular-devkit/core": "19.2.19",
-        "@angular-devkit/schematics": "19.2.19",
-        "jsonc-parser": "3.3.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@scicatproject/scicat-sdk-ts-angular": {
-      "version": "4.25.1",
-      "resolved": "https://registry.npmjs.org/@scicatproject/scicat-sdk-ts-angular/-/scicat-sdk-ts-angular-4.25.1.tgz",
-      "integrity": "sha512-HvY4U0cF4Yv5MF+blpYmRqqY3/rbYnmNeCpeYHhTsJ/2BxO9LyQmjIPTiHgVPreEdtwDOPBb156DU3aZwAm3Kg==",
-      "license": "Unlicense",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "^19.0.0",
-        "rxjs": "^7.4.0"
-      }
-    },
-    "node_modules/@sigstore/bundle": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz",
-      "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@sigstore/protobuf-specs": "^0.4.0"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/@sigstore/core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz",
-      "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/@sigstore/protobuf-specs": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.3.tgz",
-      "integrity": "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/@sigstore/sign": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz",
-      "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@sigstore/bundle": "^3.1.0",
-        "@sigstore/core": "^2.0.0",
-        "@sigstore/protobuf-specs": "^0.4.0",
-        "make-fetch-happen": "^14.0.2",
-        "proc-log": "^5.0.0",
-        "promise-retry": "^2.0.1"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/@sigstore/tuf": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz",
-      "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@sigstore/protobuf-specs": "^0.4.1",
-        "tuf-js": "^3.0.1"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/@sigstore/verify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz",
-      "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@sigstore/bundle": "^3.1.0",
-        "@sigstore/core": "^2.0.0",
-        "@sigstore/protobuf-specs": "^0.4.1"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/@sindresorhus/merge-streams": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
-      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
-      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
-      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
-      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tufjs/canonical-json": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz",
-      "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@tufjs/models": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz",
-      "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==",
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz",
+      "integrity": "sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@tufjs/canonical-json": "2.0.0",
-        "minimatch": "^9.0.5"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@tufjs/models/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz",
+      "integrity": "sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==",
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.6",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
-      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.8.tgz",
+      "integrity": "sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
-      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.8.tgz",
+      "integrity": "sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@types/connect": {
-      "version": "3.4.38",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
-      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz",
+      "integrity": "sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
     },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
-      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz",
+      "integrity": "sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
+      "optional": true,
+      "os": [
+        "win32"
+      ]
     },
-    "node_modules/@types/cors": {
-      "version": "2.8.19",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
-      "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==",
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.8.tgz",
+      "integrity": "sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
+      "optional": true,
+      "os": [
+        "win32"
+      ]
     },
-    "node_modules/@types/deep-equal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@types/deep-equal/-/deep-equal-1.0.4.tgz",
-      "integrity": "sha512-tqdiS4otQP4KmY0PR3u6KbZ5EWvhNdUoS/jc93UuK23C220lOZ/9TvjfxdPcKvqwwDVtmtSCrnr0p/2dirAxkA==",
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz",
+      "integrity": "sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
     },
-    "node_modules/@types/eslint": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz",
+      "integrity": "sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
+      "optional": true,
+      "os": [
+        "win32"
+      ]
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+    "node_modules/@schematics/angular": {
+      "version": "19.2.19",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.2.19.tgz",
+      "integrity": "sha512-6/0pvbPCY4UHeB4lnM/5r250QX5gcLgOYbR5FdhFu+22mOPHfWpRc5tNuY9kCephDHzAHjo6fTW1vefOOmA4jw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
+        "@angular-devkit/core": "19.2.19",
+        "@angular-devkit/schematics": "19.2.19",
+        "jsonc-parser": "3.3.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/express": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
-      "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@scicatproject/scicat-sdk-ts-angular": {
+      "version": "4.25.1",
+      "resolved": "https://registry.npmjs.org/@scicatproject/scicat-sdk-ts-angular/-/scicat-sdk-ts-angular-4.25.1.tgz",
+      "integrity": "sha512-HvY4U0cF4Yv5MF+blpYmRqqY3/rbYnmNeCpeYHhTsJ/2BxO9LyQmjIPTiHgVPreEdtwDOPBb156DU3aZwAm3Kg==",
+      "license": "Unlicense",
       "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.33",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "^19.0.0",
+        "rxjs": "^7.4.0"
       }
     },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "4.19.7",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.7.tgz",
-      "integrity": "sha512-FvPtiIf1LfhzsaIXhv/PHan/2FeQBbtBDtfX2QfvPxdUelMDEckK08SM6nqo1MIZY3RUlfA+HV8+hFUSio78qg==",
+    "node_modules/@sigstore/bundle": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz",
+      "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
+        "@sigstore/protobuf-specs": "^0.4.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/@types/file-saver": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.7.tgz",
-      "integrity": "sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==",
+    "node_modules/@sigstore/core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz",
+      "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/http-errors": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
-      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@sigstore/protobuf-specs": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.3.tgz",
+      "integrity": "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA==",
       "dev": true,
-      "license": "MIT"
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
     },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.16",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
-      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
+    "node_modules/@sigstore/sign": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz",
+      "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@types/node": "*"
+        "@sigstore/bundle": "^3.1.0",
+        "@sigstore/core": "^2.0.0",
+        "@sigstore/protobuf-specs": "^0.4.0",
+        "make-fetch-happen": "^14.0.2",
+        "proc-log": "^5.0.0",
+        "promise-retry": "^2.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/@types/jasmine": {
-      "version": "5.1.12",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.12.tgz",
-      "integrity": "sha512-1BzPxNsFDLDfj9InVR3IeY0ZVf4o9XV+4mDqoCfyPkbsA7dYyKAPAb2co6wLFlHcvxPlt1wShm7zQdV7uTfLGA==",
+    "node_modules/@sigstore/tuf": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz",
+      "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "license": "MIT"
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@sigstore/protobuf-specs": "^0.4.1",
+        "tuf-js": "^3.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
     },
-    "node_modules/@types/lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+    "node_modules/@sigstore/verify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz",
+      "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w==",
       "dev": true,
-      "license": "MIT"
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@sigstore/bundle": "^3.1.0",
+        "@sigstore/core": "^2.0.0",
+        "@sigstore/protobuf-specs": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
     },
-    "node_modules/@types/lodash-es": {
-      "version": "4.17.12",
-      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
-      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
+      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/lodash": "*"
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/luxon": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
-      "integrity": "sha512-H3iskjFIAn5SlJU7OuxUmTEpebK6TKB8rxZShDslBMZJ5u9S//KM1sbdAisiSrqwLQncVjnpi2OK2J51h+4lsg==",
-      "dev": true,
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
       "license": "MIT"
     },
-    "node_modules/@types/mime": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/node": {
-      "version": "24.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.0.tgz",
-      "integrity": "sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~7.16.0"
-      }
-    },
-    "node_modules/@types/node-forge": {
-      "version": "1.3.14",
-      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.14.tgz",
-      "integrity": "sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/retry": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
-      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/send": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.0.tgz",
-      "integrity": "sha512-zBF6vZJn1IaMpg3xUF25VK3gd3l8zwE0ZLRX7dsQyQi+jp4E8mMDJNGDYnYse+bQhYwWERTxVwHpi3dMOq7RKQ==",
+    "node_modules/@tufjs/canonical-json": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz",
+      "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/serve-index": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
-      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
+    "node_modules/@tufjs/models": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz",
+      "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/express": "*"
+        "@tufjs/canonical-json": "2.0.0",
+        "minimatch": "^9.0.5"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/@types/serve-static": {
-      "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.9.tgz",
-      "integrity": "sha512-dOTIuqpWLyl3BBXU3maNQsS4A3zuuoYRNIvYSxxhebPfXg2mzWQEPne/nlJ37yOse6uGgR386uTpdsx4D0QZWA==",
+    "node_modules/@tufjs/models/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "@types/http-errors": "*",
-        "@types/node": "*",
-        "@types/send": "<1"
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@types/serve-static/node_modules/@types/send": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
-      "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
+    "node_modules/@types/body-parser": {
+      "version": "1.19.6",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
+      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/mime": "^1",
+        "@types/connect": "*",
         "@types/node": "*"
       }
     },
-    "node_modules/@types/shortid": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@types/shortid/-/shortid-2.2.0.tgz",
-      "integrity": "sha512-jBG2FgBxcaSf0h662YloTGA32M8UtNbnTPekUr/eCmWXq0JWQXgNEQ/P5Gf05Cv66QZtE1Ttr83I1AJBPdzCBg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/sinonjs__fake-timers": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
-      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/sizzle": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.10.tgz",
-      "integrity": "sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/sockjs": {
-      "version": "0.3.36",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
-      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+    "node_modules/@types/bonjour": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
-    "node_modules/@types/source-map-support": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.10.tgz",
-      "integrity": "sha512-tgVP2H469x9zq34Z0m/fgPewGhg/MLClalNOiPIzQlXrSS2YrKu/xCdSCKnEDwkFha51VKEKB6A9wW26/ZNwzA==",
+    "node_modules/@types/connect": {
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/@types/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
+        "@types/node": "*"
       }
     },
-    "node_modules/@types/tmp": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
-      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/ws": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
-      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@types/express-serve-static-core": "*",
         "@types/node": "*"
       }
     },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
+    "node_modules/@types/cors": {
+      "version": "2.8.19",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
+      "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.3.tgz",
-      "integrity": "sha512-sbaQ27XBUopBkRiuY/P9sWGOWUW4rl8fDoHIUmLpZd8uldsTyB4/Zg6bWTegPoTLnKj9Hqgn3QD6cjPNB32Odw==",
+    "node_modules/@types/deep-equal": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@types/deep-equal/-/deep-equal-1.0.4.tgz",
+      "integrity": "sha512-tqdiS4otQP4KmY0PR3u6KbZ5EWvhNdUoS/jc93UuK23C220lOZ/9TvjfxdPcKvqwwDVtmtSCrnr0p/2dirAxkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.46.3",
-        "@typescript-eslint/type-utils": "8.46.3",
-        "@typescript-eslint/utils": "8.46.3",
-        "@typescript-eslint/visitor-keys": "8.46.3",
-        "graphemer": "^1.4.0",
-        "ignore": "^7.0.0",
-        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.46.3",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/estree": "*",
+        "@types/json-schema": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/project-service": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.3.tgz",
-      "integrity": "sha512-Fz8yFXsp2wDFeUElO88S9n4w1I4CWDTXDqDr9gYvZgUpwXQqmZBr9+NTTql5R3J7+hrJZPdpiWaB9VNhAKYLuQ==",
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.46.3",
-        "@typescript-eslint/types": "^8.46.3",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/eslint": "*",
+        "@types/estree": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.3.tgz",
-      "integrity": "sha512-FCi7Y1zgrmxp3DfWfr+3m9ansUUFoy8dkEdeQSgA9gbm8DaHYvZCdkFRQrtKiedFf3Ha6VmoqoAaP68+i+22kg==",
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/express": {
+      "version": "4.17.25",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.25.tgz",
+      "integrity": "sha512-dVd04UKsfpINUnK0yBoYHDF3xu7xVH4BuDotC/xGuycx4CgbP48X/KF/586bcObxT0HENHXEU8Nqtu6NR+eKhw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/visitor-keys": "8.46.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "^1"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.3.tgz",
-      "integrity": "sha512-GLupljMniHNIROP0zE7nCcybptolcH8QZfXOpCfhQDAdwJ/ZTlcaBOYebSOZotpti/3HrHSw7D3PZm75gYFsOA==",
+    "node_modules/@types/express-serve-static-core": {
+      "version": "4.19.7",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.7.tgz",
+      "integrity": "sha512-FvPtiIf1LfhzsaIXhv/PHan/2FeQBbtBDtfX2QfvPxdUelMDEckK08SM6nqo1MIZY3RUlfA+HV8+hFUSio78qg==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.3.tgz",
-      "integrity": "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA==",
+    "node_modules/@types/file-saver": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.7.tgz",
+      "integrity": "sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
+      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.17",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.17.tgz",
+      "integrity": "sha512-ED6LB+Z1AVylNTu7hdzuBqOgMnvG/ld6wGCG8wFnAzKX5uyW2K3WD52v0gnLCTK/VLpXtKckgWuyScYK6cSPaw==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.3.tgz",
-      "integrity": "sha512-f/NvtRjOm80BtNM5OQtlaBdM5BRFUv7gf381j9wygDNL+qOYSNOgtQ/DCndiYi80iIOv76QqaTmp4fa9hwI0OA==",
+    "node_modules/@types/jasmine": {
+      "version": "5.1.12",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.12.tgz",
+      "integrity": "sha512-1BzPxNsFDLDfj9InVR3IeY0ZVf4o9XV+4mDqoCfyPkbsA7dYyKAPAb2co6wLFlHcvxPlt1wShm7zQdV7uTfLGA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/lodash-es": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.46.3",
-        "@typescript-eslint/tsconfig-utils": "8.46.3",
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/visitor-keys": "8.46.3",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/lodash": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.3.tgz",
-      "integrity": "sha512-VXw7qmdkucEx9WkmR3ld/u6VhRyKeiF1uxWwCy/iuNfokjJ7VhsgLSOTjsol8BunSw190zABzpwdNsze2Kpo4g==",
+    "node_modules/@types/luxon": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
+      "integrity": "sha512-H3iskjFIAn5SlJU7OuxUmTEpebK6TKB8rxZShDslBMZJ5u9S//KM1sbdAisiSrqwLQncVjnpi2OK2J51h+4lsg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/mime": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "24.10.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.0.tgz",
+      "integrity": "sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.46.3",
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/typescript-estree": "8.46.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "undici-types": "~7.16.0"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.3.tgz",
-      "integrity": "sha512-uk574k8IU0rOF/AjniX8qbLSGURJVUCeM5e4MIMKBFFi8weeiLrG1fyQejyLXQpRZbU/1BuQasleV/RfHC3hHg==",
+    "node_modules/@types/node-forge": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.14.tgz",
+      "integrity": "sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.46.3",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+    "node_modules/@types/qs": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/retry": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
+      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
       "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
+      "license": "MIT"
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+    "node_modules/@types/send": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz",
+      "integrity": "sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.3.tgz",
-      "integrity": "sha512-6m1I5RmHBGTnUGS113G04DMu3CpSdxCAU/UvtjNWL4Nuf3MW9tQhiJqRlHzChIkhy6kZSAQmc+I1bcGjE3yNKg==",
+    "node_modules/@types/serve-index": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.46.3",
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/typescript-estree": "8.46.3",
-        "@typescript-eslint/visitor-keys": "8.46.3",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/express": "*"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.3.tgz",
-      "integrity": "sha512-Fz8yFXsp2wDFeUElO88S9n4w1I4CWDTXDqDr9gYvZgUpwXQqmZBr9+NTTql5R3J7+hrJZPdpiWaB9VNhAKYLuQ==",
+    "node_modules/@types/serve-static": {
+      "version": "1.15.10",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.10.tgz",
+      "integrity": "sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.46.3",
-        "@typescript-eslint/types": "^8.46.3",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/http-errors": "*",
+        "@types/node": "*",
+        "@types/send": "<1"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.3.tgz",
-      "integrity": "sha512-FCi7Y1zgrmxp3DfWfr+3m9ansUUFoy8dkEdeQSgA9gbm8DaHYvZCdkFRQrtKiedFf3Ha6VmoqoAaP68+i+22kg==",
+    "node_modules/@types/serve-static/node_modules/@types/send": {
+      "version": "0.17.6",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.6.tgz",
+      "integrity": "sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/visitor-keys": "8.46.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/mime": "^1",
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.3.tgz",
-      "integrity": "sha512-GLupljMniHNIROP0zE7nCcybptolcH8QZfXOpCfhQDAdwJ/ZTlcaBOYebSOZotpti/3HrHSw7D3PZm75gYFsOA==",
+    "node_modules/@types/shortid": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@types/shortid/-/shortid-2.2.0.tgz",
+      "integrity": "sha512-jBG2FgBxcaSf0h662YloTGA32M8UtNbnTPekUr/eCmWXq0JWQXgNEQ/P5Gf05Cv66QZtE1Ttr83I1AJBPdzCBg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.3.tgz",
-      "integrity": "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA==",
+    "node_modules/@types/sinonjs__fake-timers": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
+      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
+      "license": "MIT"
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.3.tgz",
-      "integrity": "sha512-f/NvtRjOm80BtNM5OQtlaBdM5BRFUv7gf381j9wygDNL+qOYSNOgtQ/DCndiYi80iIOv76QqaTmp4fa9hwI0OA==",
+    "node_modules/@types/sizzle": {
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.10.tgz",
+      "integrity": "sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.46.3",
-        "@typescript-eslint/tsconfig-utils": "8.46.3",
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/visitor-keys": "8.46.3",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.3.tgz",
-      "integrity": "sha512-uk574k8IU0rOF/AjniX8qbLSGURJVUCeM5e4MIMKBFFi8weeiLrG1fyQejyLXQpRZbU/1BuQasleV/RfHC3hHg==",
+    "node_modules/@types/source-map-support": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.10.tgz",
+      "integrity": "sha512-tgVP2H469x9zq34Z0m/fgPewGhg/MLClalNOiPIzQlXrSS2YrKu/xCdSCKnEDwkFha51VKEKB6A9wW26/ZNwzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.46.3",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "source-map": "^0.6.0"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+    "node_modules/@types/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+    "node_modules/@types/tmp": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
+      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
+      "license": "MIT"
     },
-    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.1.tgz",
-      "integrity": "sha512-FOIaFVMHzRskXr5J4Jp8lFVV0gz5ngv3RHmn+E4HYxSJ3DgDzU7fVI1/M7Ijh1zf6S7HIoaIOtln1H5y8V+9Zg==",
+    "node_modules/@types/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.46.1",
-        "@typescript-eslint/types": "^8.46.1",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.1.tgz",
-      "integrity": "sha512-weL9Gg3/5F0pVQKiF8eOXFZp8emqWzZsOJuWRUNtHT+UNV2xSJegmpCNQHy37aEQIbToTq7RHKhWvOsmbM680A==",
+    "node_modules/@types/yauzl": {
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
+      "optional": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.46.1",
-        "@typescript-eslint/visitor-keys": "8.46.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.1.tgz",
-      "integrity": "sha512-X88+J/CwFvlJB+mK09VFqx5FE4H5cXD+H/Bdza2aEWkSb8hnWIQorNcscRl4IEo1Cz9VI/+/r/jnGWkbWPx54g==",
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.46.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.3.tgz",
+      "integrity": "sha512-sbaQ27XBUopBkRiuY/P9sWGOWUW4rl8fDoHIUmLpZd8uldsTyB4/Zg6bWTegPoTLnKj9Hqgn3QD6cjPNB32Odw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.46.3",
+        "@typescript-eslint/type-utils": "8.46.3",
+        "@typescript-eslint/utils": "8.46.3",
+        "@typescript-eslint/visitor-keys": "8.46.3",
+        "graphemer": "^1.4.0",
+        "ignore": "^7.0.0",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^2.1.0"
+      },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -7409,21 +6755,23 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
+        "@typescript-eslint/parser": "^8.46.3",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
+    "node_modules/@typescript-eslint/parser": {
       "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.3.tgz",
-      "integrity": "sha512-ZPCADbr+qfz3aiTTYNNkCbUt+cjNwI/5McyANNrFBpVxPt7GqpEYz5ZfdwuFyGUnJ9FdDXbGODUu6iRCI6XRXw==",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.3.tgz",
+      "integrity": "sha512-6m1I5RmHBGTnUGS113G04DMu3CpSdxCAU/UvtjNWL4Nuf3MW9tQhiJqRlHzChIkhy6kZSAQmc+I1bcGjE3yNKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@typescript-eslint/scope-manager": "8.46.3",
         "@typescript-eslint/types": "8.46.3",
         "@typescript-eslint/typescript-estree": "8.46.3",
-        "@typescript-eslint/utils": "8.46.3",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^2.1.0"
+        "@typescript-eslint/visitor-keys": "8.46.3",
+        "debug": "^4.3.4"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7437,7 +6785,7 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/project-service": {
+    "node_modules/@typescript-eslint/project-service": {
       "version": "8.46.3",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.3.tgz",
       "integrity": "sha512-Fz8yFXsp2wDFeUElO88S9n4w1I4CWDTXDqDr9gYvZgUpwXQqmZBr9+NTTql5R3J7+hrJZPdpiWaB9VNhAKYLuQ==",
@@ -7459,7 +6807,7 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
+    "node_modules/@typescript-eslint/scope-manager": {
       "version": "8.46.3",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.3.tgz",
       "integrity": "sha512-FCi7Y1zgrmxp3DfWfr+3m9ansUUFoy8dkEdeQSgA9gbm8DaHYvZCdkFRQrtKiedFf3Ha6VmoqoAaP68+i+22kg==",
@@ -7477,7 +6825,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/tsconfig-utils": {
+    "node_modules/@typescript-eslint/tsconfig-utils": {
       "version": "8.46.3",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.3.tgz",
       "integrity": "sha512-GLupljMniHNIROP0zE7nCcybptolcH8QZfXOpCfhQDAdwJ/ZTlcaBOYebSOZotpti/3HrHSw7D3PZm75gYFsOA==",
@@ -7494,36 +6842,17 @@
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.3.tgz",
-      "integrity": "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+    "node_modules/@typescript-eslint/type-utils": {
       "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.3.tgz",
-      "integrity": "sha512-f/NvtRjOm80BtNM5OQtlaBdM5BRFUv7gf381j9wygDNL+qOYSNOgtQ/DCndiYi80iIOv76QqaTmp4fa9hwI0OA==",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.3.tgz",
+      "integrity": "sha512-ZPCADbr+qfz3aiTTYNNkCbUt+cjNwI/5McyANNrFBpVxPt7GqpEYz5ZfdwuFyGUnJ9FdDXbGODUu6iRCI6XRXw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.46.3",
-        "@typescript-eslint/tsconfig-utils": "8.46.3",
         "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/visitor-keys": "8.46.3",
+        "@typescript-eslint/typescript-estree": "8.46.3",
+        "@typescript-eslint/utils": "8.46.3",
         "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
         "ts-api-utils": "^2.1.0"
       },
       "engines": {
@@ -7533,88 +6862,17 @@
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.3.tgz",
-      "integrity": "sha512-VXw7qmdkucEx9WkmR3ld/u6VhRyKeiF1uxWwCy/iuNfokjJ7VhsgLSOTjsol8BunSw190zABzpwdNsze2Kpo4g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.46.3",
-        "@typescript-eslint/types": "8.46.3",
-        "@typescript-eslint/typescript-estree": "8.46.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.46.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.3.tgz",
-      "integrity": "sha512-uk574k8IU0rOF/AjniX8qbLSGURJVUCeM5e4MIMKBFFi8weeiLrG1fyQejyLXQpRZbU/1BuQasleV/RfHC3hHg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.46.3",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.1.tgz",
-      "integrity": "sha512-C+soprGBHwWBdkDpbaRC4paGBrkIXxVlNohadL5o0kfhsXqOC6GYH2S/Obmig+I0HTDl8wMaRySwrfrXVP8/pQ==",
+      "version": "8.46.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.3.tgz",
+      "integrity": "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -7624,17 +6882,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.1.tgz",
-      "integrity": "sha512-uIifjT4s8cQKFQ8ZBXXyoUODtRoAd7F7+G8MKmtzj17+1UbdzFl52AzRyZRyKqPHhgzvXunnSckVu36flGy8cg==",
+      "version": "8.46.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.3.tgz",
+      "integrity": "sha512-f/NvtRjOm80BtNM5OQtlaBdM5BRFUv7gf381j9wygDNL+qOYSNOgtQ/DCndiYi80iIOv76QqaTmp4fa9hwI0OA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@typescript-eslint/project-service": "8.46.1",
-        "@typescript-eslint/tsconfig-utils": "8.46.1",
-        "@typescript-eslint/types": "8.46.1",
-        "@typescript-eslint/visitor-keys": "8.46.1",
+        "@typescript-eslint/project-service": "8.46.3",
+        "@typescript-eslint/tsconfig-utils": "8.46.3",
+        "@typescript-eslint/types": "8.46.3",
+        "@typescript-eslint/visitor-keys": "8.46.3",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -7659,7 +6916,6 @@
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -7671,17 +6927,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.1.tgz",
-      "integrity": "sha512-vkYUy6LdZS7q1v/Gxb2Zs7zziuXN0wxqsetJdeZdRe/f5dwJFglmuvZBfTUivCtjH725C1jWCDfpadadD95EDQ==",
+      "version": "8.46.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.3.tgz",
+      "integrity": "sha512-VXw7qmdkucEx9WkmR3ld/u6VhRyKeiF1uxWwCy/iuNfokjJ7VhsgLSOTjsol8BunSw190zABzpwdNsze2Kpo4g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.46.1",
-        "@typescript-eslint/types": "8.46.1",
-        "@typescript-eslint/typescript-estree": "8.46.1"
+        "@typescript-eslint/scope-manager": "8.46.3",
+        "@typescript-eslint/types": "8.46.3",
+        "@typescript-eslint/typescript-estree": "8.46.3"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7696,14 +6951,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.1.tgz",
-      "integrity": "sha512-ptkmIf2iDkNUjdeu2bQqhFPV1m6qTnFFjg7PPDjxKWaMaP0Z6I9l30Jr3g5QqbZGdw8YdYvLp+XnqnWWZOg/NA==",
+      "version": "8.46.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.3.tgz",
+      "integrity": "sha512-uk574k8IU0rOF/AjniX8qbLSGURJVUCeM5e4MIMKBFFi8weeiLrG1fyQejyLXQpRZbU/1BuQasleV/RfHC3hHg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.46.1",
+        "@typescript-eslint/types": "8.46.3",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -7720,7 +6974,6 @@
       "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -8104,9 +7357,9 @@
       }
     },
     "node_modules/ansi-escapes": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.1.1.tgz",
-      "integrity": "sha512-Zhl0ErHcSRUaVfGUeUdDuLgpkEo8KIFjB4Y9uAc46ScOpdDiU1Dbyplh7qWJeJ/ZHpbyMSM26+X3BySgnIz40Q==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.2.0.tgz",
+      "integrity": "sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8583,9 +7836,9 @@
       }
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.8.16",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.16.tgz",
-      "integrity": "sha512-OMu3BGQ4E7P1ErFsIPpbJh0qvDudM/UuJeHgkAvfWe+0HFJCXh+t/l8L6fVLR55RI/UbKrVLnAXZSVwd9ysWYw==",
+      "version": "2.8.25",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.25.tgz",
+      "integrity": "sha512-2NovHVesVF5TXefsGX1yzx1xgr7+m9JQenvz6FQY3qd+YXkKkYiv+vTCc7OriP9mcDZpTC5mAOYN4ocd29+erA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -8811,9 +8064,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.26.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.3.tgz",
-      "integrity": "sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==",
+      "version": "4.27.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.27.0.tgz",
+      "integrity": "sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==",
       "dev": true,
       "funding": [
         {
@@ -8831,11 +8084,11 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.8.9",
-        "caniuse-lite": "^1.0.30001746",
-        "electron-to-chromium": "^1.5.227",
-        "node-releases": "^2.0.21",
-        "update-browserslist-db": "^1.1.3"
+        "baseline-browser-mapping": "^2.8.19",
+        "caniuse-lite": "^1.0.30001751",
+        "electron-to-chromium": "^1.5.238",
+        "node-releases": "^2.0.26",
+        "update-browserslist-db": "^1.1.4"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -9006,11 +8259,11 @@
       }
     },
     "node_modules/cacache/node_modules/tar": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz",
-      "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.2.tgz",
+      "integrity": "sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",
         "chownr": "^3.0.0",
@@ -9109,9 +8362,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001750",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001750.tgz",
-      "integrity": "sha512-cuom0g5sdX6rw00qOoLNSFCJ9/mYIsuSOA+yzpDw8eopiFqcVwQvZHqov0vmEighRxX++cfC0Vg1G+1Iy/mSpQ==",
+      "version": "1.0.30001754",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001754.tgz",
+      "integrity": "sha512-x6OeBXueoAceOmotzx3PO4Zpt4rzpeIFsSr6AAePTZxSkXiYDUmpypEl7e2+8NCd9bD7bXjqyef8CJYPC1jfxg==",
       "dev": true,
       "funding": [
         {
@@ -9166,9 +8419,9 @@
       }
     },
     "node_modules/chardet": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.0.tgz",
-      "integrity": "sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.1.tgz",
+      "integrity": "sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -9968,9 +9221,9 @@
       "license": "MIT"
     },
     "node_modules/cypress": {
-      "version": "15.5.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.5.0.tgz",
-      "integrity": "sha512-7jXBsh5hTfjxr9QQONC2IbdTj0nxSyU8x4eiarMZBzXzCj3pedKviUx8JnLcE4vL8e0TsOzp70WSLRORjEssRA==",
+      "version": "15.6.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.6.0.tgz",
+      "integrity": "sha512-Vqo66GG1vpxZ7H1oDX9umfmzA3nF7Wy80QAc3VjwPREO5zTY4d1xfQFNPpOWleQl9vpdmR2z1liliOcYlRX6rQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -10246,9 +9499,9 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.18",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz",
-      "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==",
+      "version": "1.11.19",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
+      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
       "license": "MIT"
     },
     "node_modules/debug": {
@@ -10660,9 +9913,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.235",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.235.tgz",
-      "integrity": "sha512-i/7ntLFwOdoHY7sgjlTIDo4Sl8EdoTjWIaKinYOVfC6bOp71bmwenyZthWHcasxgHDNWbWxvG9M3Ia116zIaYQ==",
+      "version": "1.5.248",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.248.tgz",
+      "integrity": "sha512-zsur2yunphlyAO4gIubdJEXCK6KOVvtpiuDfCIqbM9FjcnMYiyn0ICa3hWfPr0nc41zcLWobgy1iL7VvoOyA2Q==",
       "dev": true,
       "license": "ISC"
     },
@@ -11080,9 +10333,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.39.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.0.tgz",
-      "integrity": "sha512-iy2GE3MHrYTL5lrCtMZ0X1KLEKKUjmK0kzwcnefhR66txcEmXZD2YWgR5GNdcEwkNx3a0siYkSvl0vIC+Svjmg==",
+      "version": "9.39.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.1.tgz",
+      "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11092,7 +10345,7 @@
         "@eslint/config-helpers": "^0.4.2",
         "@eslint/core": "^0.17.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.39.0",
+        "@eslint/js": "9.39.1",
         "@eslint/plugin-kit": "^0.4.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -14421,9 +13674,9 @@
       }
     },
     "node_modules/launch-editor": {
-      "version": "2.11.1",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.11.1.tgz",
-      "integrity": "sha512-SEET7oNfgSaB6Ym0jufAdCeo3meJVeCaaDyzRygy0xsp2BFKCprcfHljTq4QkzTLUxEKkFK6OK4811YM2oSrRg==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.12.0.tgz",
+      "integrity": "sha512-giOHXoOtifjdHqUamwKq6c49GzBdLjvxrd2D+Q4V6uOHopJv7p9VJxikDsQ/CBXZbEITgUqSVHXLTG3VhPP1Dg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15267,9 +14520,9 @@
       }
     },
     "node_modules/mathjs": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-15.0.0.tgz",
-      "integrity": "sha512-eXXXRKEl/htny5T/Ce/hbmqa8WZi2RmaCEHBOVtTeYcYyyGvz1UYSdK2ypydDepFF6F7ue0OygXRRIx8lLq/uw==",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-15.1.0.tgz",
+      "integrity": "sha512-HfnAcScQm9drGryodlDqeS3WAl4gUTYGDcOtcqL/8s23MZ28Ib1i8XnYK3ZdjNuaW/L4BAp9lIp8vxAMrcuu1w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.26.10",
@@ -15313,9 +14566,9 @@
       }
     },
     "node_modules/memfs": {
-      "version": "4.49.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.49.0.tgz",
-      "integrity": "sha512-L9uC9vGuc4xFybbdOpRLoOAOq1YEBBsocCs5NVW32DfU+CZWWIn3OVF+lB8Gp4ttBVSMazwrTrjv8ussX/e3VQ==",
+      "version": "4.50.0",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.50.0.tgz",
+      "integrity": "sha512-N0LUYQMUA1yS5tJKmMtU9yprPm6ZIg24yr/OVv/7t6q0kKDIho4cBbXRi1XKttUmNYDYgF/q45qrKE/UhGO0CA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -15886,9 +15139,9 @@
       }
     },
     "node_modules/node-gyp": {
-      "version": "11.4.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.4.2.tgz",
-      "integrity": "sha512-3gD+6zsrLQH7DyYOUIutaauuXrcyxeTPyQuZQCQoNPZMHMMS5m4y0xclNpvYzoK3VNzuyxT6eF4mkIL4WSZ1eQ==",
+      "version": "11.5.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.5.0.tgz",
+      "integrity": "sha512-ra7Kvlhxn5V9Slyus0ygMa2h+UqExPqUIkfk7Pc8QTLT956JLSy51uWFwHtIYy0vI8cB4BDhc/S03+880My/LQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15947,11 +15200,11 @@
       }
     },
     "node_modules/node-gyp/node_modules/tar": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz",
-      "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.2.tgz",
+      "integrity": "sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",
         "chownr": "^3.0.0",
@@ -15990,9 +15243,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.23",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.23.tgz",
-      "integrity": "sha512-cCmFDMSm26S6tQSDpBCg/NR8NENrVPhAJSf+XbxBG4rPFaaonlEoE9wHQmun+cls499TQGSb7ZyPBRlzgKfpeg==",
+      "version": "2.0.27",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
       "dev": true,
       "license": "MIT"
     },
@@ -17297,16 +16550,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/react": {
-      "version": "19.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
-      "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -17948,11 +17191,11 @@
       }
     },
     "node_modules/sax": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
-      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.3.tgz",
+      "integrity": "sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "optional": true
     },
     "node_modules/saxes": {
@@ -18429,9 +17672,9 @@
       }
     },
     "node_modules/simple-git": {
-      "version": "3.28.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.28.0.tgz",
-      "integrity": "sha512-Rs/vQRwsn1ILH1oBUy8NucJlXmnnLeLCfcvbSehkPzbv3wwoFWIdtfd6Ndo6ZPhlPsCZ60CPI4rxurnwAa+a2w==",
+      "version": "3.30.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.30.0.tgz",
+      "integrity": "sha512-q6lxyDsCmEal/MEGhP1aVyQ3oxnagGlBDOVSIB4XUVLl1iZh0Pah6ebC9V4xBap/RfgP2WlI8EKs0WS0rMEJHg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -19655,100 +18898,17 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.46.1.tgz",
-      "integrity": "sha512-VHgijW803JafdSsDO8I761r3SHrgk4T00IdyQ+/UsthtgPRsBWQLqoSxOolxTpxRKi1kGXK0bSz4CoAc9ObqJA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.46.1",
-        "@typescript-eslint/parser": "8.46.1",
-        "@typescript-eslint/typescript-estree": "8.46.1",
-        "@typescript-eslint/utils": "8.46.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.1.tgz",
-      "integrity": "sha512-rUsLh8PXmBjdiPY+Emjz9NX2yHvhS11v0SR6xNJkm5GM1MO9ea/1GoDKlHHZGrOJclL/cZ2i/vRUYVtjRhrHVQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.46.1",
-        "@typescript-eslint/type-utils": "8.46.1",
-        "@typescript-eslint/utils": "8.46.1",
-        "@typescript-eslint/visitor-keys": "8.46.1",
-        "graphemer": "^1.4.0",
-        "ignore": "^7.0.0",
-        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.46.1",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/parser": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.1.tgz",
-      "integrity": "sha512-6JSSaBZmsKvEkbRUkf7Zj7dru/8ZCrJxAqArcLaVMee5907JdtEbKGsZ7zNiIm/UAkpGUkaSMZEXShnN2D1HZA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.46.1",
-        "@typescript-eslint/types": "8.46.1",
-        "@typescript-eslint/typescript-estree": "8.46.1",
-        "@typescript-eslint/visitor-keys": "8.46.1",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/type-utils": {
-      "version": "8.46.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.1.tgz",
-      "integrity": "sha512-+BlmiHIiqufBxkVnOtFwjah/vrkF4MtKKvpXrKSPLCkCtAp8H01/VV43sfqA98Od7nJpDcFnkwgyfQbOG0AMvw==",
+      "version": "8.46.3",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.46.3.tgz",
+      "integrity": "sha512-bAfgMavTuGo+8n6/QQDVQz4tZ4f7Soqg53RbrlZQEoAltYop/XR4RAts/I0BrO3TTClTSTFJ0wYbla+P8cEWJA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.46.1",
-        "@typescript-eslint/typescript-estree": "8.46.1",
-        "@typescript-eslint/utils": "8.46.1",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^2.1.0"
+        "@typescript-eslint/eslint-plugin": "8.46.3",
+        "@typescript-eslint/parser": "8.46.3",
+        "@typescript-eslint/typescript-estree": "8.46.3",
+        "@typescript-eslint/utils": "8.46.3"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -19970,9 +19130,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz",
+      "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
       "dev": true,
       "funding": [
         {
@@ -20104,7 +19264,6 @@
       "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.4.4",
@@ -20186,8 +19345,7 @@
       "optional": true,
       "os": [
         "android"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-android-arm64": {
       "version": "4.52.5",
@@ -20201,8 +19359,7 @@
       "optional": true,
       "os": [
         "android"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": {
       "version": "4.52.5",
@@ -20216,8 +19373,7 @@
       "optional": true,
       "os": [
         "darwin"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": {
       "version": "4.52.5",
@@ -20231,8 +19387,7 @@
       "optional": true,
       "os": [
         "darwin"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": {
       "version": "4.52.5",
@@ -20246,8 +19401,7 @@
       "optional": true,
       "os": [
         "freebsd"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": {
       "version": "4.52.5",
@@ -20261,8 +19415,7 @@
       "optional": true,
       "os": [
         "freebsd"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
       "version": "4.52.5",
@@ -20276,8 +19429,7 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": {
       "version": "4.52.5",
@@ -20291,8 +19443,7 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": {
       "version": "4.52.5",
@@ -20306,8 +19457,7 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": {
       "version": "4.52.5",
@@ -20321,8 +19471,7 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": {
       "version": "4.52.5",
@@ -20336,8 +19485,7 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": {
       "version": "4.52.5",
@@ -20351,8 +19499,7 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": {
       "version": "4.52.5",
@@ -20366,8 +19513,7 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": {
       "version": "4.52.5",
@@ -20381,8 +19527,7 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": {
       "version": "4.52.5",
@@ -20396,8 +19541,7 @@
       "optional": true,
       "os": [
         "win32"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": {
       "version": "4.52.5",
@@ -20411,8 +19555,7 @@
       "optional": true,
       "os": [
         "win32"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": {
       "version": "4.52.5",
@@ -20426,8 +19569,7 @@
       "optional": true,
       "os": [
         "win32"
-      ],
-      "peer": true
+      ]
     },
     "node_modules/vite/node_modules/postcss": {
       "version": "8.5.6",
@@ -20449,7 +19591,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -20465,7 +19606,6 @@
       "integrity": "sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
diff --git a/package.json b/package.json
index 8d0a85cd95..38050d3e69 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "@jsonforms/angular": "^3.5.1",
     "@jsonforms/angular-material": "^3.5.1",
     "@jsonforms/core": "^3.5.1",
-    "@jsonforms/react": "^3.5.1",
     "@ngbracket/ngx-layout": "^16.0.0",
     "@ngrx/effects": "^19.1.0",
     "@ngrx/operators": "^19.1.0",
diff --git a/src/app/ingestor/_ingestor-theme.scss b/src/app/ingestor/_ingestor-theme.scss
index 794f62a937..f1ee5c03cb 100644
--- a/src/app/ingestor/_ingestor-theme.scss
+++ b/src/app/ingestor/_ingestor-theme.scss
@@ -40,7 +40,24 @@
   }
 
   .success-icon {
-    color: green;
+    color: mat.m2-get-color-from-palette($primary, 'default');
+  }
+
+  .green-text,
+  .success-text {
+    color: mat.m2-get-color-from-palette($primary, 'default');
+  }
+
+  .last-used-facility-backends {
+    opacity: 0.6;
+  }
+
+  .ingestor-file-list .mat-list-item-hover:hover {
+    background-color: mat.m2-get-color-from-palette($primary, 'lighter', 0.1);
+  }
+
+  .ingestor-file-list .mat-list-item-hover:active {
+    background-color: mat.m2-get-color-from-palette($primary, 'lighter', 0.2);
   }
 }
 
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
index de3336b4f8..737d6cf7de 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.html
@@ -70,7 +70,7 @@
       [editable]="false"
       [stepControl]="null"
     >
-      <ng-template matStepLabel>Select your ingestion method</ng-template>
+      <ng-template matStepLabel>Ingestion method</ng-template>
     </mat-step>
 
     <mat-step
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.scss
similarity index 95%
rename from src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css
rename to src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.scss
index b0400a5743..c88d3e805b 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.css
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.scss
@@ -30,7 +30,7 @@
   }
 }
 .field-toggle {
-  margin-bottom: 24px;
+  margin-bottom: 1.5em;
   display: block;
 
   mat-slide-toggle {
diff --git a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
index f5cbc134fe..4b5f02c7a3 100644
--- a/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
+++ b/src/app/ingestor/ingestor-dialogs/dialog-mounting-components/ingestor.dialog-stepper.component.ts
@@ -22,7 +22,7 @@ import { CreateDatasetDto } from "@scicatproject/scicat-sdk-ts-angular";
 @Component({
   selector: "ingestor-dialog-stepper",
   templateUrl: "./ingestor.dialog-stepper.component.html",
-  styleUrls: ["./ingestor.dialog-stepper.component.css"],
+  styleUrls: ["./ingestor.dialog-stepper.component.scss"],
   standalone: false,
 })
 export class IngestorDialogStepperComponent implements OnInit, OnDestroy {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
deleted file mode 100644
index bc0df73f5e..0000000000
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/all-of-renderer.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-import { JsonFormsControl } from "@jsonforms/angular";
-
-@Component({
-  selector: "AllOfRenderer",
-  styleUrls: ["../ingestor-metadata-editor.component.scss"],
-  template: `<div>AllOf Renderer</div>`,
-})
-export class AllOfRendererComponent extends JsonFormsControl implements OnInit {
-  data: any[] = [];
-
-  ngOnInit() {
-    this.data = this.uischema?.options?.items || [];
-  }
-}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.html b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.html
new file mode 100644
index 0000000000..3eea1c8845
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.html
@@ -0,0 +1,37 @@
+<mat-card class="anyof-group">
+  <mat-card-title
+    >{{ anyOfTitle }}
+    <span class="spacer"></span>
+    <mat-checkbox
+    *ngIf="options.includes('null')"
+    [(ngModel)]="notNullOptionSelected"
+    (change)="onEnableCheckboxChange($event)"
+    >
+    Enabled
+    </mat-checkbox>
+  </mat-card-title
+    >
+  <mat-card-content *ngIf="notNullOptionSelected">
+    <mat-tab-group *ngIf="tabAmount > 1">
+      animationDuration="0ms" [selectedIndex]="selectedTabIndex" >
+      <mat-tab *ngFor="let option of filteredOptions" label="{{ option }}">
+        <div class="mat-tab-content-renderer" *ngIf="option !== 'null'">
+          <jsonforms-outlet
+          [uischema]="getUISchema(option)"
+          [schema]="getTabSchema(option)"
+          [path]="propsPath"
+          >
+          </jsonforms-outlet>
+        </div>
+      </mat-tab>
+    </mat-tab-group>
+    <div *ngIf="tabAmount === 1">
+      <jsonforms-outlet
+      [uischema]="getUISchema(options[0])"
+      [schema]="getTabSchema(options[0])"
+      [path]="propsPath"
+      >
+      </jsonforms-outlet>
+    </div>
+  </mat-card-content>
+</mat-card>
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
index 7b3b72ac9d..2c0ab65cd5 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer.ts
@@ -5,7 +5,10 @@ import {
   findUISchema,
   Generate,
   GroupLayout,
+  isAnyOfControl,
   JsonSchema,
+  RankedTester,
+  rankWith,
   setReadonly,
   UISchemaElement,
 } from "@jsonforms/core";
@@ -16,45 +19,7 @@ import { cloneDeep, isEmpty, startCase } from "lodash-es";
 @Component({
   selector: "app-anyof-renderer",
   styleUrls: ["../ingestor-metadata-editor.component.scss"],
-  template: `
-    <mat-card class="anyof-group">
-      <mat-card-title
-        >{{ anyOfTitle }}
-        <span class="spacer"></span>
-        <mat-checkbox
-          *ngIf="options.includes('null')"
-          [(ngModel)]="notNullOptionSelected"
-          (change)="onEnableCheckboxChange($event)"
-        >
-          Enabled
-        </mat-checkbox></mat-card-title
-      >
-      <mat-card-content *ngIf="notNullOptionSelected">
-        <mat-tab-group *ngIf="tabAmount > 1">
-          animationDuration="0ms" [selectedIndex]="selectedTabIndex" >
-          <mat-tab *ngFor="let option of filteredOptions" label="{{ option }}">
-            <div class="mat-tab-content-renderer" *ngIf="option !== 'null'">
-              <jsonforms-outlet
-                [uischema]="getUISchema(option)"
-                [schema]="getTabSchema(option)"
-                [path]="propsPath"
-              >
-              </jsonforms-outlet>
-            </div>
-          </mat-tab>
-        </mat-tab-group>
-
-        <div *ngIf="tabAmount === 1">
-          <jsonforms-outlet
-            [uischema]="getUISchema(options[0])"
-            [schema]="getTabSchema(options[0])"
-            [path]="propsPath"
-          >
-          </jsonforms-outlet>
-        </div>
-      </mat-card-content>
-    </mat-card>
-  `,
+  templateUrl: "./any-of-renderer.html",
   standalone: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
@@ -159,3 +124,5 @@ export class AnyOfRendererComponent extends JsonFormsControl {
     this.rendererService.setData(updatedData);
   }
 }
+
+export const anyOfRendererTester: RankedTester = rankWith(4, isAnyOfControl);
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.html b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.html
new file mode 100644
index 0000000000..7af5824f20
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.html
@@ -0,0 +1,82 @@
+<mat-card
+  [ngStyle]="{ display: hidden ? 'none' : '' }"
+  class="array-layout"
+  >
+  <mat-card-title class="array-layout-toolbar">
+    <h2 class="mat-h2 array-layout-title">{{ label }}</h2>
+    <span></span>
+    <mat-icon
+      *ngIf="this.error?.length"
+      color="warn"
+      matBadgeColor="warn"
+      matTooltip="{{ this.error }}"
+      matTooltipClass="error-message-tooltip"
+      >
+      error_outline
+    </mat-icon>
+    <button
+    mat-button
+    matTooltip="{{ translations.addTooltip }}"
+    [disabled]="!isEnabled()"
+    (click)="add()"
+    attr.aria-label="{{ translations.addAriaLabel }}"
+    >
+    <mat-icon>add</mat-icon>
+    </button>
+  </mat-card-title>
+  <mat-card-content *ngIf="noData">
+    <p>{{ translations.noDataMessage }}</p>
+  </mat-card-content>
+  <mat-card-content
+    *ngFor="
+    let item of [].constructor(data);
+    let idx = index;
+    trackBy: trackByFn;
+    last as last;
+    first as first
+    "
+    >
+    <mat-card class="array-item" appearance="outlined">
+      <mat-card-content>
+        <jsonforms-outlet [renderProps]="getProps(idx)"></jsonforms-outlet>
+      </mat-card-content>
+      <mat-card-actions *ngIf="isEnabled()">
+        <button
+        *ngIf="uischema?.options?.showSortButtons"
+        class="item-up"
+        mat-button
+        [disabled]="first"
+        (click)="up(idx)"
+        attr.aria-label="{{ translations.upAriaLabel }}"
+        matTooltip="{{ translations.up }}"
+        matTooltipPosition="right"
+        >
+        <mat-icon>arrow_upward</mat-icon>
+        </button>
+        <button
+        *ngIf="uischema?.options?.showSortButtons"
+        class="item-down"
+        mat-button
+        [disabled]="last"
+        (click)="down(idx)"
+        attr.aria-label="{{ translations.downAriaLabel }}"
+        matTooltip="{{ translations.down }}"
+        matTooltipPosition="right"
+        >
+        <mat-icon>arrow_downward</mat-icon>
+        </button>
+        <button
+        *ngIf="(minOne && [].constructor(data).length > 1) || !minOne"
+        mat-button
+        color="warn"
+        (click)="remove(idx)"
+        attr.aria-label="{{ translations.removeAriaLabel }}"
+        matTooltip="{{ translations.removeTooltip }}"
+        matTooltipPosition="right"
+        >
+        <mat-icon>delete</mat-icon>
+        </button>
+      </mat-card-actions>
+    </mat-card>
+  </mat-card-content>
+</mat-card>
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
index 148273fbd6..5cee48883c 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/array-renderer.ts
@@ -16,11 +16,14 @@ import {
   defaultJsonFormsI18nState,
   findUISchema,
   getArrayTranslations,
+  isObjectArrayWithNesting,
   JsonFormsState,
   mapDispatchToArrayControlProps,
   mapStateToArrayLayoutProps,
   OwnPropsOfRenderer,
   Paths,
+  RankedTester,
+  rankWith,
   setReadonly,
   StatePropsOfArrayLayout,
   UISchemaElement,
@@ -31,90 +34,7 @@ import {
 @Component({
   selector: "app-array-layout-renderer-custom",
   styleUrls: ["../ingestor-metadata-editor.component.scss"],
-  template: `
-    <mat-card
-      [ngStyle]="{ display: hidden ? 'none' : '' }"
-      class="array-layout"
-    >
-      <mat-card-title class="array-layout-toolbar">
-        <h2 class="mat-h2 array-layout-title">{{ label }}</h2>
-        <span></span>
-        <mat-icon
-          *ngIf="this.error?.length"
-          color="warn"
-          matBadgeColor="warn"
-          matTooltip="{{ this.error }}"
-          matTooltipClass="error-message-tooltip"
-        >
-          error_outline
-        </mat-icon>
-        <button
-          mat-button
-          matTooltip="{{ translations.addTooltip }}"
-          [disabled]="!isEnabled()"
-          (click)="add()"
-          attr.aria-label="{{ translations.addAriaLabel }}"
-        >
-          <mat-icon>add</mat-icon>
-        </button>
-      </mat-card-title>
-      <mat-card-content *ngIf="noData">
-        <p>{{ translations.noDataMessage }}</p>
-      </mat-card-content>
-      <mat-card-content
-        *ngFor="
-          let item of [].constructor(data);
-          let idx = index;
-          trackBy: trackByFn;
-          last as last;
-          first as first
-        "
-      >
-        <mat-card class="array-item" appearance="outlined">
-          <mat-card-content>
-            <jsonforms-outlet [renderProps]="getProps(idx)"></jsonforms-outlet>
-          </mat-card-content>
-          <mat-card-actions *ngIf="isEnabled()">
-            <button
-              *ngIf="uischema?.options?.showSortButtons"
-              class="item-up"
-              mat-button
-              [disabled]="first"
-              (click)="up(idx)"
-              attr.aria-label="{{ translations.upAriaLabel }}"
-              matTooltip="{{ translations.up }}"
-              matTooltipPosition="right"
-            >
-              <mat-icon>arrow_upward</mat-icon>
-            </button>
-            <button
-              *ngIf="uischema?.options?.showSortButtons"
-              class="item-down"
-              mat-button
-              [disabled]="last"
-              (click)="down(idx)"
-              attr.aria-label="{{ translations.downAriaLabel }}"
-              matTooltip="{{ translations.down }}"
-              matTooltipPosition="right"
-            >
-              <mat-icon>arrow_downward</mat-icon>
-            </button>
-            <button
-              *ngIf="(minOne && [].constructor(data).length > 1) || !minOne"
-              mat-button
-              color="warn"
-              (click)="remove(idx)"
-              attr.aria-label="{{ translations.removeAriaLabel }}"
-              matTooltip="{{ translations.removeTooltip }}"
-              matTooltipPosition="right"
-            >
-              <mat-icon>delete</mat-icon>
-            </button>
-          </mat-card-actions>
-        </mat-card>
-      </mat-card-content>
-    </mat-card>
-  `,
+  templateUrl: "./array-renderer.html",
   standalone: false,
 
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -211,3 +131,8 @@ export class ArrayLayoutRendererCustom
     return index;
   }
 }
+
+export const arrayLayoutRendererTester: RankedTester = rankWith(
+  4,
+  isObjectArrayWithNesting,
+);
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
index 23e0efdeb4..217a293d17 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/custom-renderers.ts
@@ -1,16 +1,17 @@
+import { JsonFormsRendererRegistryEntry } from "@jsonforms/core";
+import { TableRendererTester } from "@jsonforms/angular-material";
 import {
-  isAnyOfControl,
-  isObjectArrayWithNesting,
-  JsonFormsRendererRegistryEntry,
-} from "@jsonforms/core";
-import { AnyOfRendererComponent } from "ingestor/ingestor-metadata-editor/customRenderer/any-of-renderer";
-import { rankWith } from "@jsonforms/core";
+  AnyOfRendererComponent,
+  anyOfRendererTester,
+} from "./any-of-renderer";
 import {
-  ObjectControlRendererTester,
-  TableRendererTester,
-} from "@jsonforms/angular-material";
-import { ArrayLayoutRendererCustom } from "./array-renderer";
-import { CustomObjectControlRendererComponent } from "./object-group-renderer";
+  ArrayLayoutRendererCustom,
+  arrayLayoutRendererTester,
+} from "./array-renderer";
+import {
+  CustomObjectControlRendererComponent,
+  objectGroupRendererTester,
+} from "./object-group-renderer";
 import {
   OwnerGroupFieldComponent,
   ownerGroupFieldTester,
@@ -34,16 +35,19 @@ export const customRenderers: JsonFormsRendererRegistryEntry[] = [
     renderer: QuantityValueLayoutRendererComponent,
   },
   {
-    tester: rankWith(4, isAnyOfControl),
+    tester: anyOfRendererTester,
     renderer: AnyOfRendererComponent,
   },
   {
-    tester: rankWith(4, isObjectArrayWithNesting),
+    tester: arrayLayoutRendererTester,
+    renderer: ArrayLayoutRendererCustom,
+  },
+  {
+    tester: TableRendererTester,
     renderer: ArrayLayoutRendererCustom,
   },
-  { tester: TableRendererTester, renderer: ArrayLayoutRendererCustom },
   {
-    tester: ObjectControlRendererTester,
+    tester: objectGroupRendererTester,
     renderer: CustomObjectControlRendererComponent,
   },
   {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.html b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.html
new file mode 100644
index 0000000000..27f09cbe5b
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.html
@@ -0,0 +1,30 @@
+<mat-card class="anyof-group">
+  <mat-card-title
+    >
+    {{ objectTitle }}
+    <span class="spacer"></span>
+    <mat-icon
+      *ngIf="this.error !== null && this.error !== ''"
+      color="warn"
+      matBadgeColor="warn"
+      matTooltip="{{ this.error }}"
+      matTooltipClass="error-message-tooltip"
+      >
+      error_outline
+    </mat-icon>
+  </mat-card-title>
+  <mat-card-content>
+    <div *ngIf="errorRecursiveStructure === false">
+      <jsonforms-outlet
+      [uischema]="detailUiSchema"
+      [schema]="scopedSchema"
+      [path]="propsPath"
+      >
+      </jsonforms-outlet>
+    </div>
+    <p *ngIf="errorRecursiveStructure">
+      <mat-icon color="warn">error_outline</mat-icon>
+      Recursive data structure in selected JSON Schema detected.
+    </p>
+  </mat-card-content>
+</mat-card>
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
index 34e05756bc..c698fcb6c9 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/object-group-renderer.ts
@@ -12,9 +12,11 @@ import {
   findUISchema,
   Generate,
   GroupLayout,
+  RankedTester,
   setReadonly,
   UISchemaElement,
 } from "@jsonforms/core";
+import { ObjectControlRendererTester } from "@jsonforms/angular-material";
 import {
   configuredRenderer,
   convertJSONFormsErrorToString,
@@ -25,38 +27,7 @@ import isEmpty from "lodash/isEmpty";
 @Component({
   selector: "app-object-group-renderer",
   styleUrls: ["../ingestor-metadata-editor.component.scss"],
-  template: `
-    <mat-card class="anyof-group">
-      <mat-card-title
-        >{{ objectTitle }}
-        <span class="spacer"></span>
-        <mat-icon
-          *ngIf="this.error !== null && this.error !== ''"
-          color="warn"
-          matBadgeColor="warn"
-          matTooltip="{{ this.error }}"
-          matTooltipClass="error-message-tooltip"
-        >
-          error_outline
-        </mat-icon>
-      </mat-card-title>
-      <mat-card-content>
-        <div *ngIf="errorRecursiveStructure === false">
-          <jsonforms-outlet
-            [uischema]="detailUiSchema"
-            [schema]="scopedSchema"
-            [path]="propsPath"
-          >
-          </jsonforms-outlet>
-        </div>
-
-        <p *ngIf="errorRecursiveStructure">
-          <mat-icon color="warn">error_outline</mat-icon>
-          Recursive data structure in selected JSON Schema detected.
-        </p>
-      </mat-card-content>
-    </mat-card>
-  `,
+  templateUrl: "./object-group-renderer.html",
   standalone: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
@@ -147,3 +118,5 @@ export class CustomObjectControlRendererComponent extends JsonFormsControlWithDe
     return false;
   }
 }
+
+export const objectGroupRendererTester: RankedTester = ObjectControlRendererTester;
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
deleted file mode 100644
index 76324cab20..0000000000
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/one-of-renderer.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { Component } from "@angular/core";
-import { JsonFormsAngularService, JsonFormsControl } from "@jsonforms/angular";
-import { ControlProps, JsonSchema } from "@jsonforms/core";
-import { configuredRenderer } from "../ingestor-metadata-editor-helper";
-
-@Component({
-  selector: "app-oneof-component",
-  styleUrls: ["../ingestor-metadata-editor.component.scss"],
-  template: `
-    <div class="anyof-group">
-      <p>{{ anyOfTitle }}</p>
-      <mat-radio-group [(ngModel)]="selectedOption" (change)="onOptionChange()">
-        <mat-radio-button
-          *ngFor="let option of options"
-          [value]="option"
-          style="margin-right: 10px;"
-        >
-          {{ option }}
-        </mat-radio-button>
-      </mat-radio-group>
-      <div
-        style="margin-top: 20px;"
-        *ngIf="selectedAnyOption && selectedOption !== 'null'"
-      >
-        <jsonforms
-          [schema]="selectedAnyOption"
-          [data]="passedProps.data"
-          [renderers]="defaultRenderer"
-          (dataChange)="onInnerJsonFormsChange($event)"
-        ></jsonforms>
-      </div>
-    </div>
-  `,
-})
-export class OneOfRendererComponent extends JsonFormsControl {
-  dataAsString: string;
-  options: string[] = [];
-  anyOfTitle: string;
-  selectedOption: string;
-  selectedAnyOption: JsonSchema;
-
-  rendererService: JsonFormsAngularService;
-
-  defaultRenderer = configuredRenderer;
-  passedProps: ControlProps;
-
-  constructor(service: JsonFormsAngularService) {
-    super(service);
-    this.rendererService = service;
-  }
-
-  public mapAdditionalProps(props: ControlProps) {
-    this.passedProps = props;
-    this.anyOfTitle = props.label || "AnyOf";
-    this.options = props.schema.anyOf.map(
-      (option: any) => option.title || option.type || JSON.stringify(option),
-    );
-    if (!props.data) {
-      this.selectedOption = "null"; // Auf "null" setzen, wenn die Daten leer sind
-    }
-  }
-
-  public onOptionChange() {
-    this.selectedAnyOption = (this.passedProps.schema.anyOf as any).find(
-      (option: any) =>
-        option.title === this.selectedOption ||
-        option.type === this.selectedOption ||
-        JSON.stringify(option) === this.selectedOption,
-    );
-  }
-
-  public onInnerJsonFormsChange(event: any) {
-    // Check if data is equal to the passedProps.data
-    if (event !== this.passedProps.data) {
-      const updatedData = this.rendererService.getState().jsonforms.core.data;
-
-      // aktualisiere das aktuelle Datenobjekt
-      const pathSegments = this.passedProps.path.split(".");
-      let current = updatedData;
-      for (let i = 0; i < pathSegments.length - 1; i++) {
-        current = current[pathSegments[i]];
-      }
-      current[pathSegments[pathSegments.length - 1]] = event;
-
-      this.rendererService.setData(updatedData);
-    }
-  }
-}
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.html b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.html
new file mode 100644
index 0000000000..9fd88a4d00
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.html
@@ -0,0 +1,53 @@
+<div>
+  <mat-form-field
+  [ngStyle]="{ display: hidden ? 'none' : '' }"
+  *ngIf="userOwnerGroups && userOwnerGroups.length > 0"
+  class="custom-input-box"
+  >
+  <mat-label>{{ label }}</mat-label>
+  <input
+  type="text"
+  class="custom-input-box"
+  matInput
+  [id]="id"
+  [matAutocomplete]="auto"
+  [formControl]="form"
+  (input)="onChange($event)"
+  (focus)="focused = true"
+  (focusout)="focused = false"
+  />
+  <mat-autocomplete
+  #auto="matAutocomplete"
+  (optionSelected)="onSelectAutocompleteValue($event)"
+  >
+  <mat-option
+  *ngFor="let ownerGroup of userOwnerGroups"
+  [value]="ownerGroup"
+  >
+  {{ ownerGroup }}
+  </mat-option>
+  </mat-autocomplete>
+  <mat-hint *ngIf="shouldShowUnfocusedDescription() || focused">{{
+    description
+    }}
+  </mat-hint>
+  <mat-error>{{ error }}</mat-error>
+  </mat-form-field>
+  <mat-form-field
+  [ngStyle]="{ display: hidden ? 'none' : '' }"
+  *ngIf="!userOwnerGroups || userOwnerGroups.length === 0"
+  class="custom-input-box"
+  >
+  <mat-label>{{ label }}</mat-label>
+  <input
+  type="text"
+  class="custom-input-box"
+  matInput
+  [id]="id"
+  [formControl]="form"
+  (input)="onChange($event)"
+  (focus)="focused = true"
+  (focusout)="focused = false"
+  />
+  </mat-form-field>
+</div>
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
index 97a3cace33..64f135bb14 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/owner-group-field-renderer.ts
@@ -15,61 +15,7 @@ import { Subscription } from "rxjs";
 @Component({
   selector: "owner-group-renderer",
   styleUrls: ["../ingestor-metadata-editor.component.scss"],
-  template: `
-    <div>
-      <mat-form-field
-        [ngStyle]="{ display: hidden ? 'none' : '' }"
-        *ngIf="userOwnerGroups && userOwnerGroups.length > 0"
-        class="custom-input-box"
-      >
-        <mat-label>{{ label }}</mat-label>
-        <input
-          type="text"
-          class="custom-input-box"
-          matInput
-          [id]="id"
-          [matAutocomplete]="auto"
-          [formControl]="form"
-          (input)="onChange($event)"
-          (focus)="focused = true"
-          (focusout)="focused = false"
-        />
-        <mat-autocomplete
-          #auto="matAutocomplete"
-          (optionSelected)="onSelectAutocompleteValue($event)"
-        >
-          <mat-option
-            *ngFor="let ownerGroup of userOwnerGroups"
-            [value]="ownerGroup"
-          >
-            {{ ownerGroup }}
-          </mat-option>
-        </mat-autocomplete>
-        <mat-hint *ngIf="shouldShowUnfocusedDescription() || focused">{{
-          description
-        }}</mat-hint>
-        <mat-error>{{ error }}</mat-error>
-      </mat-form-field>
-
-      <mat-form-field
-        [ngStyle]="{ display: hidden ? 'none' : '' }"
-        *ngIf="!userOwnerGroups || userOwnerGroups.length === 0"
-        class="custom-input-box"
-      >
-        <mat-label>{{ label }}</mat-label>
-        <input
-          type="text"
-          class="custom-input-box"
-          matInput
-          [id]="id"
-          [formControl]="form"
-          (input)="onChange($event)"
-          (focus)="focused = true"
-          (focusout)="focused = false"
-        />
-      </mat-form-field>
-    </div>
-  `,
+  templateUrl: "./owner-group-field-renderer.html",
   standalone: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
index e2b6b29dc7..5613eef520 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-field-renderer.ts
@@ -9,7 +9,8 @@ export const isSIFieldTester = rankWith(
 
 @Component({
   selector: "si-field-hider",
-  template: "", // Empty template - renders nothing
+  template: "", // Empty template - renders 
+  standalone: false,
 })
 export class SIFieldHiderRendererComponent extends JsonFormsControl {
   constructor(jsonformsService: JsonFormsAngularService) {
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.html b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.html
new file mode 100644
index 0000000000..fa01eaee3d
--- /dev/null
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.html
@@ -0,0 +1,15 @@
+<div
+  [ngStyle]="{ display: hidden ? 'none' : '' }"
+  class="quantity-value-box"
+  >
+  <div
+    class="quantity-value-element"
+    *ngFor="
+    let props of uischema
+    | customLayoutChildrenRenderProps: schema : path;
+    trackBy: trackElement
+    "
+    >
+    <jsonforms-outlet [renderProps]="props"></jsonforms-outlet>
+  </div>
+</div>
diff --git a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
index 39d5f5b020..f78591db19 100644
--- a/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/customRenderer/quantity-value-layout-renderer.ts
@@ -19,23 +19,7 @@ import { LayoutRenderer } from "@jsonforms/angular-material";
 
 @Component({
   selector: "QuantityValueLayoutRendererComponent",
-  template: `
-    <div
-      [ngStyle]="{ display: hidden ? 'none' : '' }"
-      class="quantity-value-box"
-    >
-      <div
-        class="quantity-value-element"
-        *ngFor="
-          let props of uischema
-            | customLayoutChildrenRenderProps: schema : path;
-          trackBy: trackElement
-        "
-      >
-        <jsonforms-outlet [renderProps]="props"></jsonforms-outlet>
-      </div>
-    </div>
-  `,
+  templateUrl: "./quantity-value-layout-renderer.html",
   styleUrls: ["../ingestor-metadata-editor.component.scss"],
   standalone: false,
 
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
index 3d0b7f61da..1394e26cc1 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.scss
@@ -1,234 +1,122 @@
 .ingestor-metadata-editor {
   width: 100%;
-  font-family:
-    "Inter",
-    -apple-system,
-    BlinkMacSystemFont,
-    "Segoe UI",
-    sans-serif;
 }
 
 .spacer {
   flex: 1 1 auto;
 }
 
-// Modern glassmorphism card styling
+
+// Clean card styling matching codebase standards
 mat-card {
+  margin: 1em;
+
   .mat-mdc-card-title {
     display: flex;
-    padding: 24px;
-    font-weight: 700;
+    padding: 1em;
+    font-weight: 600;
     font-size: 1.2em;
-    background: linear-gradient(
-      135deg,
-      rgba(255, 255, 255, 0.1),
-      rgba(255, 255, 255, 0.05)
-    );
-    backdrop-filter: blur(10px);
-    border: 1px solid rgba(255, 255, 255, 0.18);
-    border-radius: 16px 16px 0 0;
-    color: #1a1a1a;
-    letter-spacing: -0.02em;
+  }
+
+  .mat-mdc-card-content {
+    padding: 1em;
+  }
+
+  .section-icon {
+    height: auto !important;
+    width: auto !important;
+
+    mat-icon {
+      vertical-align: middle;
+    }
   }
 }
 
-// Modern form sections with subtle shadows and gradients
+// Simple form sections
 .form-section {
-  margin-bottom: 32px;
-  padding: 32px;
-  background: linear-gradient(145deg, #ffffff, #f8fafc);
-  border-radius: 20px;
-  border: 1px solid rgba(226, 232, 240, 0.8);
-  box-shadow:
-    0 1px 3px rgba(0, 0, 0, 0.05),
-    0 10px 30px rgba(0, 0, 0, 0.02);
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-
-  &:hover {
-    transform: translateY(-2px);
-    box-shadow:
-      0 4px 12px rgba(0, 0, 0, 0.08),
-      0 20px 40px rgba(0, 0, 0, 0.04);
-  }
+  margin-bottom: 1.5em;
+  padding: 1.5em;
+  border-radius: 4px;
 
   &:last-child {
     margin-bottom: 0;
   }
 }
 
-// Bold, modern section headers
+// Clean section headers
 .section-header {
-  font-size: 1.25em;
-  font-weight: 800;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-  background-clip: text;
-  margin-bottom: 24px;
-  padding-bottom: 12px;
-  border-bottom: 2px solid transparent;
-  border-image: linear-gradient(90deg, #667eea, #764ba2) 1;
-  letter-spacing: -0.03em;
+  font-size: 1.1em;
+  font-weight: 600;
+  margin-bottom: 1em;
+  padding-bottom: 0.5em;
 
   &.major-section {
-    font-size: 1.5em;
-    background: linear-gradient(135deg, #6366f1 0%, #8b5cf6 50%, #d946ef 100%);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-clip: text;
-    margin-bottom: 32px;
+    font-size: 1.3em;
+    margin-bottom: 1.5em;
   }
 }
 
-// Elevated field groups with modern aesthetics
+// Standard field groups
 .field-group {
-  background: rgba(255, 255, 255, 0.7);
-  backdrop-filter: blur(20px);
-  border-radius: 16px;
-  padding: 24px;
-  margin-bottom: 20px;
-  border: 1px solid rgba(255, 255, 255, 0.2);
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.04);
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    height: 3px;
-    background: linear-gradient(90deg, #6366f1, #8b5cf6, #d946ef);
-    border-radius: 16px 16px 0 0;
-  }
+  padding: 1em;
+  margin-bottom: 1em;
+  border-radius: 4px;
 
   &.related-fields {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-    gap: 20px;
+    gap: 1em;
     align-items: start;
   }
 }
 
-// Ultra-modern form controls
+// Standard form controls
 .jsonforms-control {
-  margin-bottom: 24px;
+  margin-bottom: 1em;
 
   .mat-mdc-form-field {
     width: 100%;
-
-    .mat-mdc-text-field-wrapper {
-      border-radius: 12px;
-      background: rgba(255, 255, 255, 0.9);
-      backdrop-filter: blur(10px);
-      transition: all 0.3s ease;
-
-      &:hover {
-        background: rgba(255, 255, 255, 0.95);
-        transform: translateY(-1px);
-      }
-    }
-
-    &.mat-focused .mat-mdc-text-field-wrapper {
-      box-shadow:
-        0 0 0 2px rgba(99, 102, 241, 0.2),
-        0 8px 25px rgba(99, 102, 241, 0.15);
-    }
   }
 
   label {
-    font-weight: 600;
-    color: #374151;
-    margin-bottom: 8px;
+    font-weight: 500;
+    margin-bottom: 0.5em;
     display: block;
-    font-size: 0.95em;
-    letter-spacing: -0.01em;
   }
 }
 
-// Modern grid layouts
+// Grid layouts
 .two-column-fields {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
-  gap: 24px;
-  margin-bottom: 24px;
+  gap: 1em;
+  margin-bottom: 1em;
 }
-
-// Subtle dividers and spacers
+// Spacers
 .form-spacer {
-  height: 32px;
+  height: 1.5em;
 }
 
-.form-divider {
-  height: 1px;
-  background: linear-gradient(90deg, transparent, #e5e7eb, transparent);
-  margin: 40px 0;
-  position: relative;
-
-  &::after {
-    content: "";
-    position: absolute;
-    left: 50%;
-    top: -4px;
-    transform: translateX(-50%);
-    width: 8px;
-    height: 8px;
-    background: linear-gradient(135deg, #6366f1, #8b5cf6);
-    border-radius: 50%;
-  }
-}
-
-// Futuristic array layouts
+// Array layouts
 .array-layout {
   display: flex;
   flex-direction: column;
-  gap: 24px;
-  background: linear-gradient(145deg, #f8fafc, #f1f5f9);
-  border-radius: 20px;
-  padding: 24px;
-  border: 1px solid rgba(226, 232, 240, 0.6);
-  position: relative;
-  overflow: hidden;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: -100%;
-    width: 100%;
-    height: 2px;
-    background: linear-gradient(90deg, transparent, #6366f1, transparent);
-    animation: shimmer 3s infinite;
-  }
-}
-
-@keyframes shimmer {
-  0% {
-    left: -100%;
-  }
-  100% {
-    left: 100%;
-  }
-}
-
-.array-layout > * {
-  flex: 1 1 auto;
+  gap: 1em;
+  padding: 1em;
+  border-radius: 4px;
 }
 
 .array-layout-toolbar {
   display: flex;
   align-items: center;
-  padding-bottom: 16px;
-  border-bottom: 1px solid rgba(226, 232, 240, 0.6);
-  margin-bottom: 20px;
+  padding-bottom: 0.5em;
+  margin-bottom: 1em;
 }
 
 .array-layout-title {
   margin: 0;
-  font-weight: 700;
-  color: #1f2937;
+  font-weight: 600;
   font-size: 1.1em;
-  letter-spacing: -0.02em;
 }
 
 .array-layout-toolbar > span {
@@ -236,132 +124,53 @@ mat-card {
 }
 
 .array-item {
-  padding: 24px;
-  background: rgba(255, 255, 255, 0.9);
-  backdrop-filter: blur(20px);
-  border-radius: 16px;
-  border: 1px solid rgba(255, 255, 255, 0.3);
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.06);
-  transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
-
-  &:hover {
-    transform: translateY(-4px) scale(1.02);
-    box-shadow: 0 20px 50px rgba(0, 0, 0, 0.1);
-  }
+  padding: 1em;
+  border-radius: 4px;
 }
 
-// Modern toggle styling
+
+// Toggle styling (uses Material defaults)
 .field-view-toggle {
-  margin-bottom: 32px;
+  margin-bottom: 1.5em;
   display: block;
-
-  .mat-slide-toggle-bar {
-    background: linear-gradient(135deg, #e5e7eb, #d1d5db);
-  }
-
-  &.mat-checked .mat-slide-toggle-bar {
-    background: linear-gradient(135deg, #6366f1, #8b5cf6);
-  }
-}
-
-// Enhanced error styling
-::ng-deep .error-message-tooltip {
-  white-space: pre-line;
-  background: linear-gradient(135deg, #ef4444, #dc2626);
-  border-radius: 8px;
 }
 
-// Modern input styling
+// Input boxes
 .custom-input-box {
   width: 100%;
-
-  .mat-mdc-form-field {
-    .mat-mdc-text-field-wrapper {
-      background: rgba(255, 255, 255, 0.8);
-      backdrop-filter: blur(10px);
-      border-radius: 12px;
-    }
-  }
 }
 
-// Futuristic quantity value boxes
+// Quantity value boxes
 .quantity-value-box {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-  gap: 20px;
-  padding: 20px;
-  background: linear-gradient(
-    145deg,
-    rgba(255, 255, 255, 0.9),
-    rgba(248, 250, 252, 0.9)
-  );
-  backdrop-filter: blur(20px);
-  border-radius: 16px;
-  border: 1px solid rgba(255, 255, 255, 0.3);
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.04);
+  gap: 1em;
+  padding: 1em;
+  border-radius: 4px;
 }
 
-.quantity-value-element {
-  transition: transform 0.3s ease;
-
-  &:hover {
-    transform: scale(1.02);
-  }
-}
-
-// Modern tab styling
-.mat-tab-content-renderer {
-  margin-top: 20px;
-}
-
-// Cutting-edge step indicator
+// Step indicator
 .step-indicator {
-  margin-bottom: 32px;
+  margin-bottom: 1.5em;
   text-align: center;
 
   .step-title {
-    font-size: 2em;
-    font-weight: 900;
-    background: linear-gradient(135deg, #1f2937 0%, #4f46e5 50%, #7c3aed 100%);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-clip: text;
-    margin-bottom: 12px;
-    letter-spacing: -0.04em;
+    font-size: 1.5em;
+    font-weight: 700;
+    margin-bottom: 0.5em;
   }
 
   .step-description {
-    color: #6b7280;
     font-size: 1em;
-    margin-bottom: 24px;
-    font-weight: 500;
+    margin-bottom: 1em;
   }
 }
 
-// Dark mode support
-@media (prefers-color-scheme: dark) {
-  .form-section {
-    background: linear-gradient(145deg, #1f2937, #111827);
-    border-color: rgba(75, 85, 99, 0.3);
-    color: #f9fafb;
-  }
-
-  .field-group {
-    background: rgba(17, 24, 39, 0.7);
-    border-color: rgba(75, 85, 99, 0.2);
-  }
-
-  .jsonforms-control label {
-    color: #d1d5db;
-  }
-}
-
-// Responsive modern design
+// Responsive design
 @media (max-width: 768px) {
   .form-section {
-    padding: 20px;
-    margin-bottom: 20px;
-    border-radius: 16px;
+    padding: 1em;
+    margin-bottom: 1em;
   }
 
   .field-group.related-fields {
@@ -369,22 +178,6 @@ mat-card {
   }
 
   .step-indicator .step-title {
-    font-size: 1.5em;
-  }
-}
-
-// Micro-animations for enhanced UX
-.jsonforms-control {
-  animation: fadeInUp 0.6s cubic-bezier(0.4, 0, 0.2, 1);
-}
-
-@keyframes fadeInUp {
-  from {
-    opacity: 0;
-    transform: translateY(20px);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
+    font-size: 1.2em;
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
index 5192031d05..40a6b92fcc 100644
--- a/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
+++ b/src/app/ingestor/ingestor-metadata-editor/ingestor-metadata-editor.component.ts
@@ -37,7 +37,6 @@ export class IngestorMetadataEditorComponent implements OnInit {
   @Input() data: object;
   @Input() schema: JsonSchema;
   @Input() renderView: renderView;
-
   @Output() dataChange = new EventEmitter<string>();
   @Output() errors = new EventEmitter<any[]>();
 
diff --git a/src/app/ingestor/ingestor-page/ingestor-creation.component.ts b/src/app/ingestor/ingestor-page/ingestor-creation.component.ts
index 3ca9dea365..5f82b98a2f 100644
--- a/src/app/ingestor/ingestor-page/ingestor-creation.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-creation.component.ts
@@ -32,7 +32,8 @@ export class IngestorCreationComponent {
     let dialogRef = null;
     dialogRef = this.dialog.open(IngestorCreationDialogBaseComponent, {
       disableClose: true,
-      width: "75vw",
+      width: "auto",
+      maxWidth: "1400px",
     });
 
     // Error if the dialog reference is not set
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.html b/src/app/ingestor/ingestor-page/ingestor-transfer.component.html
index 2dd13318ac..bebc7c9a46 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.html
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.html
@@ -17,7 +17,7 @@
   <p>
     <mat-card class="ingestor-card">
       <mat-card-header>
-        <mat-card-title>Control center</mat-card-title>
+        <mat-card-title>Connect to Ingestor Service</mat-card-title>
       </mat-card-header>
       <mat-card-content class="ingestor-vertical-layout">
         <div *ngIf="connectingToFacilityBackend">
@@ -28,13 +28,13 @@
         </div>
         <div *ngIf="!connectingToFacilityBackend">
           <ng-container *ngIf="connectedFacilityBackend === ''">
-            <p class="confirm-message-error">No Backend connected</p>
+            <p class="confirm-message-error">Not connected</p>
 
-            <p>Please provide a valid Backend URL</p>
+            <p>Please provide a valid Ingestor URL of the facility</p>
             <mat-form-field>
               <input
                 matInput
-                placeholder="Backend URL"
+                placeholder="Ingestor URL"
                 [(ngModel)]="forwardFacilityBackend"
               />
             </mat-form-field>
@@ -50,7 +50,7 @@
               *ngIf="lastUsedFacilityBackends.length > 0"
               class="last-used-facility-backends"
             >
-              <p>Last used facility backends:</p>
+              <p>Last used facilities:</p>
               <ul>
                 <li
                   *ngFor="let backend of lastUsedFacilityBackends"
diff --git a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
index 27f48677cd..d7a100e0fd 100644
--- a/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
+++ b/src/app/ingestor/ingestor-page/ingestor-transfer.component.ts
@@ -281,7 +281,8 @@ export class IngestorTransferComponent implements OnInit, OnDestroy {
     let dialogRef = null;
     dialogRef = this.dialog.open(IngestorCreationDialogBaseComponent, {
       disableClose: true,
-      width: "75vw",
+      width: "auto",
+      maxWidth: "1400px",
     });
 
     // Error if the dialog reference is not set
diff --git a/src/app/ingestor/ingestor-page/ingestor.component.scss b/src/app/ingestor/ingestor-page/ingestor.component.scss
index 2cfb6329dd..9af1fbbb31 100644
--- a/src/app/ingestor/ingestor-page/ingestor.component.scss
+++ b/src/app/ingestor/ingestor-page/ingestor.component.scss
@@ -30,19 +30,19 @@
 }
 
 .metadata-preview {
-  height: 50vh !important;
+  height: 50vh;
 }
 
 mat-card {
   margin: 1em;
 
   .mat-mdc-card-content {
-    padding: 16px;
+    padding: 1em;
   }
 
   .section-icon {
-    height: auto !important;
-    width: auto !important;
+    height: auto;
+    width: auto;
 
     mat-icon {
       vertical-align: middle;
@@ -59,8 +59,8 @@ mat-card {
 }
 
 .spinner-text {
-  margin-top: 10px;
-  font-size: 16px;
+  margin-top: 0.5em;
+  font-size: 1em;
   text-align: center;
 }
 
@@ -109,23 +109,11 @@ mat-card {
   margin-top: 1.5em;
 }
 
-.ingestor-file-list .mat-list-item-hover:hover {
-  background-color: rgba(0, 0, 0, 0.04);
-}
-
-.ingestor-file-list .mat-list-item-hover:active {
-  background-color: rgba(0, 0, 0, 0.08);
-}
-
 .file-browser-view-toggle {
   display: flex;
   justify-content: flex-end;
 }
 
-.green-text {
-  color: #4caf50;
-}
-
 .confirm-message-ingestor {
   display: flex;
   flex-direction: column;
@@ -139,10 +127,6 @@ mat-card {
   height: auto;
 }
 
-.confirm-message-error {
-  color: red;
-}
-
 .vertical-center-list-item {
   display: flex;
   align-items: center;
@@ -150,11 +134,10 @@ mat-card {
 }
 
 .last-used-facility-backends {
-  color: grey;
   margin-top: 1em;
 }
 
 .block-button {
   display: block;
-  margin-top: 8px;
+  margin-top: 0.5em;
 }
diff --git a/src/app/ingestor/ingestor.module.ts b/src/app/ingestor/ingestor.module.ts
index 7483f0f805..13e2c945d9 100644
--- a/src/app/ingestor/ingestor.module.ts
+++ b/src/app/ingestor/ingestor.module.ts
@@ -52,6 +52,7 @@ import { IngestorNoRightsDialogPageComponent } from "./ingestor-dialogs/creation
 import { IngestorTransferComponent } from "./ingestor-page/ingestor-transfer.component";
 import { IngestorCreationComponent } from "./ingestor-page/ingestor-creation.component";
 import { IngestorCustomMetadataDialogPageComponent } from "./ingestor-dialogs/creation-dialog/creation-pages/ingestor.custom-metadata-dialog-page.component";
+import { SIFieldHiderRendererComponent } from "./ingestor-metadata-editor/customRenderer/quantity-field-renderer";
 
 @NgModule({
   declarations: [
@@ -68,6 +69,7 @@ import { IngestorCustomMetadataDialogPageComponent } from "./ingestor-dialogs/cr
     AnyOfRendererComponent,
     ArrayLayoutRendererCustom,
     CustomObjectControlRendererComponent,
+    SIFieldHiderRendererComponent,
     IngestorConfirmationDialogComponent,
     ExportTemplateHelperComponent,
     IngestorFileBrowserComponent,
diff --git a/src/assets/config.json b/src/assets/config.json
index 338ecf5a20..3e9c5c50bf 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -29,9 +29,9 @@
   "jsonMetadataEnabled": true,
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
-  "lbBaseURL": "http://127.0.0.0:3000",
+  "lbBaseURL": "http://localhost:3000",
   "ingestorComponent": {
-    "ingestorEnabled": false,
+    "ingestorEnabled": true,
     "ingestorAutodiscoveryOptions": [
       {
         "mailDomain": "university.ch",