NEDS-194: Merge upstream DomiSMP version '5.1.0' into SMP '2.2.0'

smp-angular/src/app/app.module.ts

@@ -166,6 +166,28 @@ import {
 } from "./common/dialogs/document-property-dialog/document-property-dialog.component";
 import {NgxTranslateModule} from "./translate/translate.module";
 import {WindowSpinnerService} from "./common/services/window-spinner.service";
+import {
+  ExpandablePanelComponent
+} from "./common/panels/expandable-panel-component/expandable-panel.component";
+import {
+  ExpandableItemComponent
+} from "./common/panels/expandable-panel-component/expandable-item-component/expandable-item.component";
+import {
+  DocumentEventsPanelComponent
+} from "./common/panels/document-events-panel/document-events-panel.component";
+import {
+  DocumentVersionsPanelComponent
+} from "./common/panels/document-versions-panel/document-versions-panel.component";
+import {ReviewTasksComponent} from "./edit/review-task/review-tasks.component";
+import {
+  ReviewTasksPanelComponent
+} from "./common/panels/review-tasks-panel/review-tasks-panel.component";
+import {
+  DocumentEditPanelComponent
+} from "./common/panels/document-edit-panel/document-edit-panel.component";
+import {
+  ReviewDocumentPanelComponent
+} from "./common/panels/review-tasks-panel/review-document-panel/review-document-panel.component";
 
 
 @NgModule({
@@ -198,8 +220,11 @@ import {WindowSpinnerService} from "./common/services/window-spinner.service";
     DnsToolsComponent,
     DnsQueryPanelComponent,
     DocumentWizardDialogComponent,
+    DocumentEditPanelComponent,
+    DocumentEventsPanelComponent,
     DocumentPropertiesPanelComponent,
     DocumentPropertyDialogComponent,
+    DocumentVersionsPanelComponent,
     DomainGroupComponent,
     DomainPanelComponent,
     DomainResourceTypePanelComponent,
@@ -209,6 +234,8 @@ import {WindowSpinnerService} from "./common/services/window-spinner.service";
     EditDomainComponent,
     EditGroupComponent,
     EditResourceComponent,
+    ExpandablePanelComponent,
+    ExpandableItemComponent,
     ExpiredPasswordDialogComponent,
     ExtensionComponent,
     ExtensionPanelComponent,
@@ -236,6 +263,9 @@ import {WindowSpinnerService} from "./common/services/window-spinner.service";
     RowLimiterComponent,
     SaveDialogComponent,
     SearchTableComponent,
+    ReviewDocumentPanelComponent,
+    ReviewTasksComponent,
+    ReviewTasksPanelComponent,
     ResourceSearchComponent,
     SidenavComponent,
     SmpFieldErrorComponent,

smp-angular/src/app/app.routes.ts

@@ -1,28 +1,69 @@
 import {RouterModule, Routes} from '@angular/router';
 import {LoginComponent} from './login/login.component';
-import {ResourceSearchComponent} from './resource-search/resource-search.component';
-import {PropertyComponent} from "./system-settings/admin-properties/property.component";
-import {UserProfileComponent} from "./user-settings/user-profile/user-profile.component";
+import {
+  ResourceSearchComponent
+} from './resource-search/resource-search.component';
+import {
+  PropertyComponent
+} from "./system-settings/admin-properties/property.component";
+import {
+  UserProfileComponent
+} from "./user-settings/user-profile/user-profile.component";
 import {authenticationGuard} from "./guards/authentication.guard";
-import {UserAccessTokensComponent} from "./user-settings/user-access-tokens/user-access-tokens.component";
-import {UserCertificatesComponent} from "./user-settings/user-certificates/user-certificates.component";
-import {ExtensionComponent} from "./system-settings/admin-extension/extension.component";
-import {AdminTruststoreComponent} from "./system-settings/admin-truststore/admin-truststore.component";
-import {AdminKeystoreComponent} from "./system-settings/admin-keystore/admin-keystore.component";
-import {AdminDomainComponent} from "./system-settings/admin-domain/admin-domain.component";
+import {
+  UserAccessTokensComponent
+} from "./user-settings/user-access-tokens/user-access-tokens.component";
+import {
+  UserCertificatesComponent
+} from "./user-settings/user-certificates/user-certificates.component";
+import {
+  ExtensionComponent
+} from "./system-settings/admin-extension/extension.component";
+import {
+  AdminTruststoreComponent
+} from "./system-settings/admin-truststore/admin-truststore.component";
+import {
+  AdminKeystoreComponent
+} from "./system-settings/admin-keystore/admin-keystore.component";
+import {
+  AdminDomainComponent
+} from "./system-settings/admin-domain/admin-domain.component";
 import {dirtyDeactivateGuard} from "./guards/dirty.guard";
-import {AdminUserComponent} from "./system-settings/admin-users/admin-user.component";
+import {
+  AdminUserComponent
+} from "./system-settings/admin-users/admin-user.component";
 import {EditDomainComponent} from "./edit/edit-domain/edit-domain.component";
 import {EditGroupComponent} from "./edit/edit-group/edit-group.component";
-import {EditResourceComponent} from "./edit/edit-resources/edit-resource.component";
-import {ResourceDocumentPanelComponent} from "./edit/edit-resources/resource-document-panel/resource-document-panel.component";
-import {SubresourceDocumentPanelComponent} from "./edit/edit-resources/subresource-document-panel/subresource-document-panel.component";
-import {authorizeChildSystemAdminGuard} from "./guards/authorize-child-system-admin.guard";
-import {activateChildResourceGuard} from "./guards/activate-child-document.guard";
-import {UserAlertsComponent} from "./user-settings/user-alerts/user-alerts.component";
-import {AdminAlertsComponent} from "./system-settings/admin-alerts/admin-alerts.component";
-import {ResetCredentialComponent} from "./security/reset-credential/reset-credential.component";
+import {
+  EditResourceComponent
+} from "./edit/edit-resources/edit-resource.component";
+import {
+  ResourceDocumentPanelComponent
+} from "./edit/edit-resources/resource-document-panel/resource-document-panel.component";
+import {
+  SubresourceDocumentPanelComponent
+} from "./edit/edit-resources/subresource-document-panel/subresource-document-panel.component";
+import {
+  authorizeChildSystemAdminGuard
+} from "./guards/authorize-child-system-admin.guard";
+import {
+  activateChildResourceGuard
+} from "./guards/activate-child-document.guard";
+import {
+  UserAlertsComponent
+} from "./user-settings/user-alerts/user-alerts.component";
+import {
+  AdminAlertsComponent
+} from "./system-settings/admin-alerts/admin-alerts.component";
+import {
+  ResetCredentialComponent
+} from "./security/reset-credential/reset-credential.component";
 import {DnsToolsComponent} from "./tools/dns-tools/dns-tools.component";
+import {ReviewTasksComponent} from "./edit/review-task/review-tasks.component";
+import {
+  ReviewDocumentPanelComponent
+} from "./common/panels/review-tasks-panel/review-document-panel/review-document-panel.component";
+import {activateChildReviewGuard} from "./guards/activate-child-review.guard";
 
 
 const appRoutes: Routes = [
@@ -36,8 +77,16 @@ const appRoutes: Routes = [
     path: 'edit',
     canActivateChild: [authenticationGuard],
     children: [
-      {path: 'edit-domain', component: EditDomainComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'edit-group', component: EditGroupComponent, canDeactivate: [dirtyDeactivateGuard]},
+      {
+        path: 'edit-domain',
+        component: EditDomainComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'edit-group',
+        component: EditGroupComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
       {
         path: 'edit-resource',
         canDeactivate: [dirtyDeactivateGuard],
@@ -54,33 +103,96 @@ const appRoutes: Routes = [
             component: SubresourceDocumentPanelComponent,
             canDeactivate: [dirtyDeactivateGuard]
           },
-          {path: '', component: EditResourceComponent, canDeactivate: [dirtyDeactivateGuard]},
+          {
+            path: '',
+            component: EditResourceComponent,
+            canDeactivate: [dirtyDeactivateGuard]
+          },
         ]
+      },
+      {
+        path: 'review-tasks',
+        children: [
+          {
+            path: 'review-document',
+            canActivate: [activateChildReviewGuard],
+            component: ReviewDocumentPanelComponent,
+            canDeactivate: [dirtyDeactivateGuard]
+          },
+          {path: '', component: ReviewTasksComponent},]
       }
     ]
   },
   {
     path: 'system-settings',
     canActivateChild: [authenticationGuard, authorizeChildSystemAdminGuard],
     children: [
-      {path: 'domain', component: AdminDomainComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'user', component: AdminUserComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'properties', component: PropertyComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'keystore', component: AdminKeystoreComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'truststore', component: AdminTruststoreComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'extension', component: ExtensionComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'alert', component: AdminAlertsComponent, canDeactivate: [dirtyDeactivateGuard]},
+      {
+        path: 'domain',
+        component: AdminDomainComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'user',
+        component: AdminUserComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'properties',
+        component: PropertyComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'keystore',
+        component: AdminKeystoreComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'truststore',
+        component: AdminTruststoreComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'extension',
+        component: ExtensionComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'alert',
+        component: AdminAlertsComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
     ]
   },
   {
     path: 'user-settings',
     canActivateChild: [authenticationGuard],
     children: [
-      {path: 'user-profile', component: UserProfileComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'user-access-token', component: UserAccessTokensComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'user-certificate', component: UserCertificatesComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'user-alert', component: UserAlertsComponent, canDeactivate: [dirtyDeactivateGuard]},
-      {path: 'user-membership', component: UserProfileComponent, canDeactivate: [dirtyDeactivateGuard]},
+      {
+        path: 'user-profile',
+        component: UserProfileComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'user-access-token',
+        component: UserAccessTokensComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'user-certificate',
+        component: UserCertificatesComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'user-alert',
+        component: UserAlertsComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
+      {
+        path: 'user-membership',
+        component: UserProfileComponent,
+        canDeactivate: [dirtyDeactivateGuard]
+      },
     ]
   },
   {path: '**', redirectTo: ''},

smp-angular/src/app/common/alert-message/alert-message.service.ts

@@ -1,7 +1,8 @@
 import {Injectable} from '@angular/core';
 import {NavigationEnd, NavigationStart, Router} from '@angular/router';
-import {Observable, Subject} from 'rxjs';
+import {lastValueFrom, Observable, Subject} from 'rxjs';
 import {HttpErrorResponse} from "@angular/common/http";
+import {TranslateService} from "@ngx-translate/core";
 
 /**
  * AlertMessageRO is the object that will be used to display the message in the SMP alert component in overlay.
@@ -25,7 +26,8 @@ export class AlertMessageService {
   private keepAfterNavigationChange:boolean = false;
   private message: AlertMessageRO;
 
-  constructor(private router: Router) {
+  constructor(private router: Router,
+              private translateService: TranslateService) {
     // clear alert message on route change
     router.events.subscribe(event => {
       if (event instanceof NavigationStart) {
@@ -80,7 +82,6 @@ export class AlertMessageService {
    * @param messageObject
    */
   getObjectMessage(messageObject: any): string {
-    let message = 'An error occurred';
     if (typeof messageObject === 'string') {
       return messageObject;
     }
@@ -124,6 +125,15 @@ export class AlertMessageService {
     this.displayCurrentMessage();
   }
 
+  async showMessageForTranslation(translationCode: string,type: string, keepAfterNavigationChange = false, timeoutInSeconds: number = null) : Promise<void> {
+      let message = await lastValueFrom(this.translateService.get(translationCode))
+      this.showMessage(message, type, keepAfterNavigationChange, timeoutInSeconds);
+  }
+
+  successForTranslation(translationCode: string, keepAfterNavigationChange = false, timeoutInSeconds: number = null) {
+    this.showMessageForTranslation(translationCode, 'success', keepAfterNavigationChange, timeoutInSeconds);
+  }
+
   success(message: string, keepAfterNavigationChange = false, timeoutInSeconds: number = null) {
     this.showMessage(message, 'success', keepAfterNavigationChange, timeoutInSeconds);
   }
@@ -132,6 +142,10 @@ export class AlertMessageService {
     this.showMessage(message, 'warning', keepAfterNavigationChange, timeoutInSeconds);
   }
 
+  errorForTranslation(translationCode: string, keepAfterNavigationChange = false, timeoutInSeconds: number = null) {
+    this.showMessageForTranslation(translationCode, 'error', keepAfterNavigationChange, timeoutInSeconds);
+  }
+
   error(message: any, keepAfterNavigationChange = false, timeoutInSeconds: number = null) {
     this.showMessage(message, 'error', keepAfterNavigationChange, timeoutInSeconds);
   }

smp-angular/src/app/common/components/smp-editor/smp-editor.component.ts

@@ -144,6 +144,7 @@ export class SmpEditorComponent
 
   @Input() set readOnly(readOnly: boolean) {
     this._readOnly = readOnly;
+    console.log("Document readOnly", readOnly)
     this.codeMirror?.dispatch({
       effects: this.readOnlyDocument.reconfigure(EditorState.readOnly.of(readOnly))
     })

smp-angular/src/app/common/dialogs/certificate-dialog/certificate-dialog.component.ts

@@ -1,7 +1,6 @@
 import {Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA} from '@angular/material/dialog';
 import {UntypedFormBuilder} from "@angular/forms";
-import {SmpConstants} from "../../../smp.constants";
 import {CertificateRo} from "../../model/certificate-ro.model";
 import {TranslateService} from "@ngx-translate/core";
 
@@ -10,7 +9,7 @@ import {TranslateService} from "@ngx-translate/core";
   templateUrl: './certificate-dialog.component.html'
 })
 export class CertificateDialogComponent {
-  readonly dateTimeFormat: string = SmpConstants.DATE_TIME_FORMAT;
+
   formTitle: string;
   current: CertificateRo;
 

smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.ts

@@ -1,7 +1,6 @@
 import {Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {FormBuilder, FormControl, FormGroup} from "@angular/forms";
-import {SmpConstants} from "../../../smp.constants";
 import {AccessTokenRo} from "../../model/access-token-ro.model";
 import {CredentialRo} from "../../../security/credential.model";
 import {HttpErrorHandlerService} from "../../error/http-error-handler.service";
@@ -19,7 +18,6 @@ export class CredentialDialogComponent {
   public static CERTIFICATE_TYPE: string = "CERTIFICATE";
   public static ACCESS_TOKEN_TYPE: string = "ACCESS_TOKEN";
 
-  dateTimeFormat: string = SmpConstants.DATE_TIME_FORMAT;
   formTitle: string;
   credentialForm: FormGroup;
   certificateForm: FormGroup;

smp-angular/src/app/common/dialogs/member-dialog/member-dialog.component.css

@@ -1,8 +1,11 @@
+.form-field-full-width {
+  width: 100%;
+}
+
 .empty-field-label {
   color: gray;
 }
 
-
 #custom-file-upload {
   display: none;
 }
@@ -11,3 +14,6 @@
   display: inline-block;
   cursor: pointer;
 }
+#member-user-can-review {
+  max-height: 1.5em
+}