feat: ingestor component for datasets

.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",

package.json

@@ -34,6 +34,7 @@
     "@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",

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");
     }
   }

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

@@ -1,13 +1,25 @@
 <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>
           <span>Datasets</span>
         </button>
       </ng-container>
 
+      <ng-container *ngIf="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?.files ?? false">
         <button mat-menu-item routerLink="/files/">
           <mat-icon> text_snippet</mat-icon>
@@ -86,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>
@@ -99,7 +116,6 @@
     <span class="title">
       <h3>{{ siteTitle }}</h3>
     </span>
-
     <span>
       <h6>
         <a class="toplink" [routerLink]="['/help']">
@@ -121,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"
@@ -137,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>

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;
     }
 

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

@@ -25,7 +25,7 @@
   selector: "app-app-header",
   templateUrl: "./app-header.component.html",
   styleUrls: ["./app-header.component.scss"],
   standalone: false,
 })
 export class AppHeaderComponent implements OnInit {
   private sub: Subscription;
@@ -38,6 +38,7 @@
       ? "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);

src/app/app-config.service.spec.ts

@@ -250,6 +250,9 @@
     ],
     conditions: [],
   },
+  ingestorComponent: {
+    ingestorEnabled: true,
+  },
 };
 
 describe("AppConfigService", () => {
@@ -307,7 +310,7 @@
 
     const mockHttpGet = (backendError = false) => {
       spyOn(service["http"], "get").and.callFake(
         (url: string): Observable<any> => {
           if (url === "/api/v3/admin/config") {
             if (backendError) {
               return new Observable((sub) =>

src/app/app-config.service.ts

@@ -5,6 +5,7 @@
 import { catchError, timeout } from "rxjs/operators";
 import {
   DatasetDetailComponentConfig,
+  IngestorComponentConfig,
   LabelsLocalization,
   ListSettings,
   TableColumn,
@@ -73,7 +74,7 @@
   datasetReduceEnabled: boolean;
   datasetDetailsShowMissingProposalId: boolean;
   datafilesActionsEnabled: boolean;
   datafilesActions: any[];
   editDatasetEnabled: boolean;
   editDatasetSampleEnabled: boolean;
   editMetadataEnabled: boolean;
@@ -143,9 +144,10 @@
   mainMenu?: MainMenuConfiguration;
   supportEmail?: string;
   checkBoxFilterClickTrigger?: boolean;
+  ingestorComponent?: IngestorComponentConfig;
 }
 
 function isMainPageConfiguration(obj: any): obj is MainPageConfiguration {
   const validKeys = Object.keys(MainPageOptions);
   return (
     obj &&
@@ -196,12 +198,12 @@
         .pipe(timeout(2000))
         .toPromise();
       this.appConfig = Object.assign({}, this.appConfig, config);
     } catch (err) {
       console.log("No config available in backend, trying with local config.");
       try {
         const config = await this.mergeConfig();
         this.appConfig = Object.assign({}, this.appConfig, config);
       } catch (err) {
         console.error("No config provided.");
       }
     }

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";
 
@@ -108,6 +109,14 @@ export const routes: Routes = [
                 (m) => m.HelpFeatureModule,
               ),
           },
+          {
+            path: "ingestor",
+            loadChildren: () =>
+              import("./lazy/ingestor-routing/ingestor.feature.module").then(
+                (m) => m.IngestorFeatureModule,
+              ),
+            canActivate: [IngestorGuard],
+          },
           {
             path: "logbooks",
             loadChildren: () =>

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;
+    }
+  }
+}

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 {}

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 { IngestorWrapperComponent } from "ingestor/ingestor-page/ingestor-wrapper.component";
+
+const routes: Routes = [
+  {
+    path: "",
+    component: IngestorWrapperComponent,
+  },
+];
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class IngestorRoutingModule {}

src/app/datasets/dashboard/dashboard.component.html

@@ -13,6 +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>
           <mat-card
             *ngIf="appConfig.addDatasetEnabled"
             class="add-card"

src/app/datasets/dashboard/dashboard.component.scss

@@ -1,5 +1,3 @@
-
-
 mat-sidenav-container {
   mat-sidenav-content {
     padding: 0.5rem;

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,20 @@ 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: "[email protected]",
-        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 = {