fix(organsation): add the organisation to a new project

projects/sonar/src/app/app-routing.module.ts

@@ -96,7 +96,7 @@
 ];
 const fileConfig = {
   enabled: true,
   orderList: (a: any, b: any) => {
     return a.metadata.order - b.metadata.order;
   },
   infoExcludedFields: [
@@ -107,7 +107,7 @@
     'permissions',
   ],
   canAdd: () => of({ can: true, message: '' }),
   canRead: (record: any, file: any) => {
     if (file && file?.metadata?.permissions?.read) {
       return of({
         can: file.metadata.permissions.read,
@@ -116,7 +116,7 @@
     }
     return of({ can: false, message: '' });
   },
   canUpdateMetadata: (record: any, file: any) => {
     if (file && file?.metadata?.permissions?.update) {
       return of({
         can: file.metadata.permissions.update,
@@ -156,7 +156,7 @@
 export class AppRoutingModule {
 
   private translateService: TranslateService = inject(TranslateService);
-  private router: Router= inject(Router);
+  private router: Router = inject(Router);
   private route: ActivatedRoute = inject(ActivatedRoute);
   private userService: UserService = inject(UserService);
   private httpClient: HttpClient = inject(HttpClient);
@@ -279,7 +279,8 @@
             Accept: 'application/rero+json'
           }
         },
-        files: {...fileConfig,
+        files: {
+          ...fileConfig,
           filterList: (item: any) => {
             return (
               item.metadata &&
@@ -396,6 +397,29 @@
         editorSettings: {
           longMode: true,
         },
+        preCreateRecord: (record: any) => {
+          const user = this.userService.currentUser();
+          // add organisation reference to the new record
+          const organisationCode = user.organisation.code;
+          if (organisationCode) {
+            record.metadata.organisation = {
+              $ref: this.apiService.getRefEndpoint(
+                'organisations',
+                organisationCode
+              )
+            };
+          }
+          const userPid = user.pid;
+          if (userPid) {
+            record.metadata.user = {
+              $ref: this.apiService.getRefEndpoint(
+                'users',
+                userPid
+              )
+            };
+          }
+          return record;
+        },
         exportFormats: [
           {
             label: 'CSV',
@@ -474,8 +498,8 @@
       if (user) {
         /** Removes collections and subdivisions routes on the organisation shared */
         if (!('isDedicated' in user.organisation) || !(user.organisation.isDedicated)) {
-          recordsRoutesConfiguration =  recordsRoutesConfiguration
-          .filter(route => !(['collections', 'subdivisions'].includes(route.type)));
+          recordsRoutesConfiguration = recordsRoutesConfiguration
+            .filter(route => !(['collections', 'subdivisions'].includes(route.type)));
         }
 
         recordsRoutesConfiguration.forEach((config: any) => {
@@ -521,6 +545,7 @@
                   recordResource: config.recordResource || null,
                   exportFormats: config.exportFormats || null,
                   sortOptions: config.sortOptions || null,
+                  preCreateRecord: config.preCreateRecord || null,
                   canAdd: () => this._can(config.type, 'add'),
                   canUpdate: (record: any) => this._can(config.type, 'update', record),
                   canDelete: (record: any) => this._can(config.type, 'delete', record),
@@ -634,7 +659,7 @@
   private _documentAggregationsOrder(): Observable<any> {
     return of(null).pipe(
       switchMap(() => {
-        const {view} = this.route.snapshot.children[0].params;
+        const { view } = this.route.snapshot.children[0].params;
 
         let params = new HttpParams();
         if (view) {

projects/sonar/src/app/app.module.ts

@@ -95,6 +95,7 @@ import { BriefViewComponent as ProjectBriefViewComponent } from './record/projec
 import { DetailComponent as ProjectDetailComponent } from './record/project/detail/detail.component';
 import { BriefViewComponent as SubdivisionBriefViewComponent } from './record/subdivision/brief-view/brief-view.component';
 import { UserComponent } from './record/user/user.component';
+import { ValidationComponent } from './record/validation/validation.component';
 import { UserService } from './user.service';
 import { LicensePipe } from './record/document/license.pipe';
 import { BucketNameService } from './bucket-name.service';
@@ -145,7 +146,8 @@ export function minElementError(err: any, field: FormlyFieldConfig) {
     MetadataComponent,
     FilesComponent,
     SwisscoveryComponent,
-    LicensePipe
+    LicensePipe,
+    ValidationComponent
   ],
   bootstrap: [AppComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],

projects/sonar/src/app/deposit/brief-view/brief-view.component.html

@@ -62,22 +62,8 @@ <h4 class="ui:flex-grow">
       @if(!record.metadata.logs || record.metadata.logs.length === 1) {
         <p-tag severity="contrast" [value]="'New' | translate" />
       }
-      @switch(record.metadata.status) {
-        @case('in_progress') {
-          <p-tag severity="primary" [value]="('deposit_status_' + record.metadata.status) | translate" />
-        }
-        @case('to_validate') {
-          <p-tag severity="info" [value]="('deposit_status_' + record.metadata.status) | translate" />
-        }
-        @case('ask_for_changes') {
-          <p-tag severity="warn" [value]="('deposit_status_' + record.metadata.status) | translate" />
-        }
-        @case('validated') {
-          <p-tag severity="success" [value]="('deposit_status_' + record.metadata.status) | translate" />
-        }
-        @case('rejected') {
-          <p-tag severity="danger" [value]="('deposit_status_' + record.metadata.status) | translate" />
-        }
+      @if(statusSeverity) {
+        <p-tag [severity]="statusSeverity" [value]="('deposit_status_' + record.metadata.status) | translate" />
       }
     </div>
 

projects/sonar/src/app/deposit/brief-view/brief-view.component.ts

@@ -16,6 +16,7 @@
  */
 import { Component, computed, inject, OnDestroy, OnInit, signal } from '@angular/core';
 import { Subscription } from 'rxjs';
+import { VALIDATION_STATUS_SEVERITY } from '../../enum/validation';
 import { UserService } from '../../user.service';
 
 @Component({
@@ -48,6 +49,12 @@ export class BriefViewComponent implements OnInit, OnDestroy {
     this.userService.hasRole(['moderator', 'admin', 'superuser'])
   );
 
+  get statusSeverity(): string | null {
+    return this.record?.metadata?.status
+      ? VALIDATION_STATUS_SEVERITY[this.record.metadata.status]
+      : null;
+  }
+
   private subscription: Subscription = new Subscription();
 
   ngOnInit(): void {

projects/sonar/src/app/enum/validation.ts

@@ -30,3 +30,11 @@ export enum validation_action {
   'REJECT' = 'reject',
   'ASK_FOR_CHANGES' = 'ask_for_changes'
 }
+
+export const VALIDATION_STATUS_SEVERITY: Record<string, string> = {
+  [validation_status.IN_PROGRESS]: 'primary',
+  [validation_status.TO_VALIDATE]: 'info',
+  [validation_status.ASK_FOR_CHANGES]: 'warn',
+  [validation_status.VALIDATED]: 'success',
+  [validation_status.REJECTED]: 'danger'
+};

projects/sonar/src/app/record/project/brief-view/brief-view.component.html

@@ -21,8 +21,8 @@ <h5>
   </h5>
   <div class="ui:flex ui:gap-1">
     <p-tag [value]="record.metadata.organisation.name" />
-    @if(record.metadata?.validation?.status !== validationStatus.VALIDATED) {
-      <p-tag severity="warn" [value]="'This record is not published' | translate" />
+    @if(validationSeverity) {
+      <p-tag [severity]="validationSeverity" [value]="record.metadata.validation.status | translate" />
     }
   </div>
   <span>

projects/sonar/src/app/record/project/brief-view/brief-view.component.ts

@@ -16,16 +16,13 @@
  */
 import { Component } from '@angular/core';
 import { ResultItem } from '@rero/ng-core';
-import { validation_status } from '../../../enum/validation';
+import { VALIDATION_STATUS_SEVERITY } from '../../../enum/validation';
 
 @Component({
     templateUrl: './brief-view.component.html',
     standalone: false
 })
 export class BriefViewComponent implements ResultItem {
-  // Constant for validation status.
-  readonly validationStatus = validation_status;
-
   // Record data.
   record: any;
 
@@ -34,4 +31,10 @@ export class BriefViewComponent implements ResultItem {
 
   // Detail URL object.
   detailUrl: { link: string, external: boolean };
+
+  get validationSeverity(): string | null {
+    return this.record?.metadata?.validation?.status
+      ? VALIDATION_STATUS_SEVERITY[this.record.metadata.validation.status]
+      : null;
+  }
 }

projects/sonar/src/app/record/validation/validation.component.html

@@ -0,0 +1,106 @@
+<!--
+  SONAR User Interface
+  Copyright (C) 2021 RERO
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, version 3 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+@if(validation && user && (isModerator() || isOwner())) {
+  <p-panel [header]="'Validation' | translate">
+    <div class="ui:flex ui:flex-col ui:gap-2 ui:justify-center ui:p-2">
+    @if(validation.status === validationStatus.IN_PROGRESS || validation.status === validationStatus.ASK_FOR_CHANGES) {
+      <p-message class="ui:w-full" severity="warn" showTransitionOptions="0ms">
+        {{ "The record is currently in status \"\{\{ status \}\}\". It is not visible in public views." | translate: { status: (validation.status) | translate } }}
+        @if(isOwner()) {
+          <a href="#" class="alert-link" (click)="$event.preventDefault(); updateValidation(validationAction.PUBLISH)" translate>
+            Submit it
+          </a>.
+        }
+      </p-message>
+    }
+    @if(validation.status === validationStatus.TO_VALIDATE) {
+      <p-message class="ui:w-full" severity="warn" showTransitionOptions="0ms">
+        {{"The record is in validation. It will be reviewed by a moderator before publishing." | translate}}
+      </p-message>
+    }
+    @if(validation.status === validationStatus.REJECTED) {
+      <p-message class="ui:w-full" severity="error" showTransitionOptions="0ms">
+        {{ "The record has been rejected after a review from a moderator." | translate}}
+      </p-message>
+    }
+    @if(validation.status === validationStatus.VALIDATED) {
+      <p-message class="ui:w-full" severity="success" showTransitionOptions="0ms">
+        {{ "The record is currently published. It is visible in public views." | translate }}
+      </p-message>
+
+    }
+    @if(validation.status === validationStatus.TO_VALIDATE && isModerator()) {
+      <textarea
+        #comment
+        class="ui:min-w-lg ui:my-4"
+        pTextarea
+        [autoResize]="true"
+        [placeholder]="'Leave a comment...' | translate"
+      ></textarea>
+      <div class="ui:flex ui:justify-center">
+        <p-buttongroup class="ui:mx-auto">
+          <p-button
+            size="large"
+            severity="success"
+            (onClick)="updateValidation(validationAction.APPROVE)"
+            [label]="'Approve' | translate"
+          />
+          <p-button
+            size="large"
+            severity="warn"
+            (onClick)="updateValidation(validationAction.ASK_FOR_CHANGES)"
+            [label]="'Ask for changes' | translate"
+          />
+          <p-button
+            size="large"
+            severity="danger"
+            (onClick)="updateValidation(validationAction.REJECT)"
+            [label]="'Reject' | translate"
+          />
+        </p-buttongroup>
+      </div>
+    }
+    @if(validation.logs) {
+    <p-button
+      [text]="true"
+      [label]="(showLogs ? 'Hide logs' : 'Show logs') | translate"
+      (onClick)="showLogs = !showLogs"
+    />
+        @if(showLogs) {
+        <p-table [value]="validation.logs" [tableStyle]="{ 'min-width': '50rem' }">
+          <ng-template #header>
+            <tr>
+              <th translate>Status</th>
+              <th translate>Date</th>
+              <th translate>User</th>
+              <th translate>Comment</th>
+            </tr>
+          </ng-template>
+          <ng-template #body let-log>
+            <tr>
+              <td>{{ (log.status) | translate }}</td>
+              <td>{{ log.date | dateTranslate: 'medium' }}</td>
+              <td>{{ log.user.name }}</td>
+              <td [innerHtml]="log.comment | nl2br"></td>
+            </tr>
+          </ng-template>
+        </p-table>
+      }
+    }
+    </div>
+  </p-panel>
+}