feat(publish): default metadata from /formpopulate

package.json

@@ -42,6 +42,9 @@
     "@ngx-translate/core": "^17.0.0",
     "@ngxmc/datetime-picker": "^19.3.1",
     "@scicatproject/scicat-sdk-ts-angular": "^4.27.0",
+    "ajv": "^8.18.0",
+    "ajv-formats": "^3.0.1",
+    "ajv-keywords": "^5.1.0",
     "autolinker": "^4.0.0",
     "deep-equal": "^2.0.5",
     "exceljs": "^4.4.0",

src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.ts

@@ -45,7 +45,7 @@ import {
   OutputDatasetObsoleteDto,
   ProposalClass,
   ReturnedUserDto,
-  SampleClass,
+  OutputSampleDto,
 } from "@scicatproject/scicat-sdk-ts-angular";
 import { AttachmentService } from "shared/services/attachment.service";
 
@@ -80,7 +80,7 @@ export class DatasetDetailComponent implements OnInit, OnDestroy {
   loading$ = this.store.select(selectIsLoading);
   instrument: Instrument | undefined;
   proposal: ProposalClass | undefined;
-  sample: SampleClass | undefined;
+  sample: OutputSampleDto | undefined;
   user: ReturnedUserDto | undefined;
   editingAllowed = false;
   editEnabled = false;

src/app/datasets/publish/publish.component.html

@@ -49,6 +49,7 @@
               [schema]="schema"
               [uischema]="uiSchema"
               [renderers]="renderers"
+              [ajv]="ajv"
               (errors)="onErrors($event)"
               (dataChange)="onMetadataChange($event)"
             ></jsonforms>
@@ -69,9 +70,7 @@
             class="save-and-continue"
             mat-raised-button
             color="primary"
-            [disabled]="
-              !formIsValid() || (panelOpenState() && !metadataIsValid())
-            "
+            [disabled]="!formIsValid()"
           >
             Save and Continue
           </button>

src/app/datasets/publish/publish.component.spec.ts

@@ -24,7 +24,9 @@ import { MatInputModule } from "@angular/material/input";
 import { MatSelectModule } from "@angular/material/select";
 import { MatButtonModule } from "@angular/material/button";
 import { AppConfigService } from "app-config.service";
-import { PublishedDataService } from "@scicatproject/scicat-sdk-ts-angular";
+import { PublishedDataV4Service } from "@scicatproject/scicat-sdk-ts-angular";
+import { AjvService } from "shared/services/ajv.service";
+import { SharedScicatFrontendModule } from "shared/shared.module";
 
 const getConfig = () => ({
   facility: "test",
@@ -49,6 +51,7 @@ describe("PublishComponent", () => {
         MatInputModule,
         MatSelectModule,
         ReactiveFormsModule,
+        SharedScicatFrontendModule,
       ],
       providers: [
         provideMockStore({
@@ -65,7 +68,7 @@ describe("PublishComponent", () => {
           { provide: ActivatedRoute, useClass: MockActivatedRoute },
           { provide: ActionsSubject, useValue: of({}) },
           { provide: AppConfigService, useValue: { getConfig } },
-          { provide: PublishedDataService, useClass: MockPublishedDataApi },
+          { provide: PublishedDataV4Service, useClass: MockPublishedDataApi },
           { provide: Router, useClass: MockRouter },
           { provide: Store, useClass: MockStore },
         ],

src/app/datasets/publish/publish.component.ts

@@ -20,7 +20,7 @@ import { angularMaterialRenderers } from "@jsonforms/angular-material";
 import {
   CreatePublishedDataV4Dto,
   PublishedData,
-  PublishedDataService,
+  PublishedDataV4Service,
 } from "@scicatproject/scicat-sdk-ts-angular";
 import { AppConfigService } from "app-config.service";
 import { EditableComponent } from "app-routing/pending-changes.guard";
@@ -31,6 +31,8 @@ import {
   accordionArrayLayoutRendererTester,
 } from "shared/modules/jsonforms-custom-renderers/expand-panel-renderer/accordion-array-layout-renderer.component";
 import { selectPublishedDataConfig } from "state-management/selectors/published-data.selectors";
+import Ajv2019 from "ajv/dist/2019";
+import { AjvService } from "shared/services/ajv.service";
 
 @Component({
   selector: "publish",
@@ -47,6 +49,7 @@ export class PublishComponent implements OnInit, OnDestroy, EditableComponent {
   private beforeUnloadSubscription: Subscription;
   readonly panelOpenState = signal(false);
 
+  ajv: Ajv2019;
   appConfig = this.appConfigService.getConfig();
   renderers = [
     ...angularMaterialRenderers,
@@ -76,10 +79,13 @@ export class PublishComponent implements OnInit, OnDestroy, EditableComponent {
   constructor(
     private appConfigService: AppConfigService,
     private store: Store,
-    private publishedDataApi: PublishedDataService,
+    private publishedDataApi: PublishedDataV4Service,
     private actionsSubj: ActionsSubject,
     private router: Router,
-  ) {}
+    private ajvService: AjvService,
+  ) {
+    this.ajv = this.ajvService.newInstance();
+  }
 
   public formIsValid() {
     if (!Object.values(this.form).includes(undefined)) {
@@ -127,14 +133,10 @@ export class PublishComponent implements OnInit, OnDestroy, EditableComponent {
     this.publishedDataConfigSubscription = this.publishedDataConfig$.subscribe(
       (publishedDataConfig) => {
         if (!isEmpty(publishedDataConfig)) {
-          this.schema = publishedDataConfig.metadataSchema;
-          // NOTE: We set the publicationYear by the system, so we remove it from the required fields in the frontend
-          this.schema?.required.splice(
-            this.schema.required.indexOf("publicationYear"),
-            1,
+          this.schema = this.ajvService.cleanupSchema(
+            publishedDataConfig.metadataSchema,
           );
           this.uiSchema = publishedDataConfig.uiSchema;
-          this.metadata = cloneDeep(publishedDataConfig.defaultValues) ?? {};
         }
       },
     );
@@ -146,10 +148,11 @@ export class PublishComponent implements OnInit, OnDestroy, EditableComponent {
     });
 
     this.publishedDataApi
-      .publishedDataControllerFormPopulateV3(this.form.datasetPids[0])
+      .publishedDataV4ControllerFormPopulateV4(this.form.datasetPids)
       .subscribe((result) => {
         this.form.abstract = result.abstract;
         this.form.title = result.title;
+        this.metadata = result.metadata;
       });
 
     this.actionSubjectSubscription = this.actionsSubj.subscribe((data) => {

src/app/datasets/sample-edit/sample-edit.component.spec.ts

@@ -31,7 +31,7 @@ import {
 } from "state-management/actions/samples.actions";
 
 import { SampleEditComponent } from "./sample-edit.component";
-import { SampleClass } from "@scicatproject/scicat-sdk-ts-angular";
+import { OutputSampleDto } from "@scicatproject/scicat-sdk-ts-angular";
 
 describe("SampleEditComponent", () => {
   let component: SampleEditComponent;
@@ -162,7 +162,7 @@ describe("SampleEditComponent", () => {
     it("should return false if sample in form has same id as current sample", () => {
       const sampleId = "abc123";
 
-      const sample = createMock<SampleClass>({
+      const sample = createMock<OutputSampleDto>({
         sampleId,
         owner: "test",
         description: "test",
@@ -187,7 +187,7 @@ describe("SampleEditComponent", () => {
     it("should return true if form is valid", () => {
       const sampleId = "abc123";
 
-      const sample = createMock<SampleClass>({
+      const sample = createMock<OutputSampleDto>({
         sampleId: "123abc",
         owner: "test",
         description: "test",
@@ -224,7 +224,7 @@ describe("SampleEditComponent", () => {
     it("should close the dialog and emit data", () => {
       const dialogCloseSpy = spyOn(component.dialogRef, "close");
 
-      const sample = createMock<SampleClass>({
+      const sample = createMock<OutputSampleDto>({
         sampleId: "123abc",
         owner: "test",
         description: "test",

src/app/datasets/sample-edit/sample-edit.component.ts

@@ -21,7 +21,7 @@ import {
   PageChangeEvent,
   SortChangeEvent,
 } from "shared/modules/table/table.component";
-import { SampleClass } from "@scicatproject/scicat-sdk-ts-angular";
+import { OutputSampleDto } from "@scicatproject/scicat-sdk-ts-angular";
 import {
   changePageAction,
   fetchSamplesAction,
@@ -58,7 +58,7 @@ export class SampleEditComponent implements OnInit, OnDestroy {
     );
 
   samplesSubscription: Subscription = new Subscription();
-  samples: SampleClass[] = [];
+  samples: OutputSampleDto[] = [];
 
   selectedSampleId = "";
   displayedColumns = [
@@ -70,7 +70,7 @@ export class SampleEditComponent implements OnInit, OnDestroy {
   ];
 
   form = new FormGroup({
-    sample: new FormControl<SampleClass>(null, [
+    sample: new FormControl<OutputSampleDto>(null, [
       Validators.required,
       this.sampleValidator(),
     ]),
@@ -129,7 +129,7 @@ export class SampleEditComponent implements OnInit, OnDestroy {
       sortByColumnAction({ column: event.active, direction: event.direction }),
     );
 
-  onRowClick = (sample: SampleClass): void => {
+  onRowClick = (sample: OutputSampleDto): void => {
     this.selectedSampleId = sample.sampleId;
     this.sample?.setValue(sample);
   };

src/app/publisheddata/publisheddata-edit/publisheddata-edit.component.html

@@ -55,6 +55,7 @@
               [schema]="schema"
               [uischema]="uiSchema"
               [renderers]="renderers"
+              [ajv]="ajv"
               (errors)="onErrors($event)"
               (dataChange)="onMetadataChange($event)"
             ></jsonforms>
@@ -73,9 +74,7 @@
             color="primary"
             class="save-and-continue"
             (click)="onPublishedDataUpdate(true)"
-            [disabled]="
-              !form.valid || (panelOpenState() && !metadataDataIsValid())
-            "
+            [disabled]="!form.valid"
           >
             Save and continue
           </button>

src/app/publisheddata/publisheddata-edit/publisheddata-edit.component.spec.ts

@@ -26,6 +26,7 @@ import { MatButtonModule } from "@angular/material/button";
 import { FlexLayoutModule } from "@ngbracket/ngx-layout";
 import { PublishedDataService } from "@scicatproject/scicat-sdk-ts-angular";
 import { AppConfigService } from "app-config.service";
+import { SharedScicatFrontendModule } from "shared/shared.module";
 
 describe("PublisheddataEditComponent", () => {
   let component: PublisheddataEditComponent;
@@ -51,6 +52,7 @@ describe("PublisheddataEditComponent", () => {
         MatOptionModule,
         MatSelectModule,
         ReactiveFormsModule,
+        SharedScicatFrontendModule,
       ],
       providers: [
         provideMockStore({

src/app/publisheddata/publisheddata-edit/publisheddata-edit.component.ts

@@ -20,12 +20,15 @@ import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { fromEvent, Observable, Subscription } from "rxjs";
 import { angularMaterialRenderers } from "@jsonforms/angular-material";
 import { EditableComponent } from "app-routing/pending-changes.guard";
-import { isEmpty } from "lodash-es";
+import { cloneDeep, isEmpty } from "lodash-es";
 import { AppConfigService } from "app-config.service";
 import {
   AccordionArrayLayoutRendererComponent,
   accordionArrayLayoutRendererTester,
 } from "shared/modules/jsonforms-custom-renderers/expand-panel-renderer/accordion-array-layout-renderer.component";
+import Ajv2019 from "ajv/dist/2019";
+import { PublishComponent } from "datasets/publish/publish.component";
+import { AjvService } from "shared/services/ajv.service";
 
 @Component({
   selector: "publisheddata-edit",
@@ -38,6 +41,7 @@ export class PublisheddataEditComponent
 {
   private _hasUnsavedChanges = false;
   private publishedDataConfig$ = this.store.select(selectPublishedDataConfig);
+  ajv: Ajv2019;
   renderers = [
     ...angularMaterialRenderers,
     {
@@ -74,7 +78,10 @@ export class PublisheddataEditComponent
     private router: Router,
     private store: Store,
     private appConfigService: AppConfigService,
-  ) {}
+    private ajvService: AjvService,
+  ) {
+    this.ajv = this.ajvService.newInstance();
+  }
 
   public onPublishedDataUpdate(shouldRedirect = false) {
     if (this.form.valid) {
@@ -143,11 +150,8 @@ export class PublisheddataEditComponent
     this.publishedDataConfigSubscription = this.publishedDataConfig$.subscribe(
       (publishedDataConfig) => {
         if (!isEmpty(publishedDataConfig)) {
-          this.schema = publishedDataConfig.metadataSchema;
-          // NOTE: We set the publicationYear by the system, so we remove it from the required fields in the frontend
-          this.schema?.required.splice(
-            this.schema.required.indexOf("publicationYear"),
-            1,
+          this.schema = this.ajvService.cleanupSchema(
+            publishedDataConfig.metadataSchema,
           );
           this.uiSchema = publishedDataConfig.uiSchema;
         }

src/app/samples/sample-dashboard/sample-dashboard.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, OnDestroy, ViewChild } from "@angular/core";
 import { Store } from "@ngrx/store";
-import { SampleClass } from "@scicatproject/scicat-sdk-ts-angular";
+import { OutputSampleDto } from "@scicatproject/scicat-sdk-ts-angular";
 import {
   changePageAction,
   fetchSamplesAction,
@@ -125,8 +125,8 @@ export class SampleDashboardComponent implements OnInit, OnDestroy {
 
   paginationMode: TablePaginationMode = "server-side";
 
-  dataSource: BehaviorSubject<SampleClass[]> = new BehaviorSubject<
-    SampleClass[]
+  dataSource: BehaviorSubject<OutputSampleDto[]> = new BehaviorSubject<
+    OutputSampleDto[]
   >([]);
 
   pagination: TablePagination = {};
@@ -228,7 +228,7 @@ export class SampleDashboardComponent implements OnInit, OnDestroy {
     );
   };
 
-  formatTableData(samples: SampleClass[]): any {
+  formatTableData(samples: OutputSampleDto[]): any {
     if (samples) {
       return samples.map((sample) => ({
         sampleId: sample.sampleId,
@@ -363,7 +363,7 @@ export class SampleDashboardComponent implements OnInit, OnDestroy {
     }
   }
 
-  onRowClick(event: IRowEvent<SampleClass>) {
+  onRowClick(event: IRowEvent<OutputSampleDto>) {
     if (event.event === RowEventType.RowClick) {
       const id = encodeURIComponent(event.sender.row.sampleId);
       this.router.navigateByUrl("/samples/" + id);

src/app/samples/sample-detail/sample-detail.component.ts

@@ -31,7 +31,7 @@ import {
   OutputAttachmentV3Dto,
   OutputDatasetObsoleteDto,
   ReturnedUserDto,
-  SampleClass,
+  OutputSampleDto,
 } from "@scicatproject/scicat-sdk-ts-angular";
 
 export interface TableData {
@@ -58,7 +58,7 @@ export class SampleDetailComponent
 
   appConfig = this.appConfigService.getConfig();
 
-  sample: SampleClass;
+  sample: OutputSampleDto;
   user: ReturnedUserDto;
   attachment: CreateAttachmentV3Dto;
   attachments: OutputAttachmentV3Dto[] = [];