Fixed cape sdk angular standalone and minor fixes

cape-dashboard/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     build:
       context: .
       args:
-        BASE_HREF: /cape-dashboard
+        BASE_HREF: /cape-dashboard/
     ports:
       - '80:80'
     volumes:

cape-online-services/package.json

@@ -15,7 +15,7 @@
   },
   "private": true,
   "dependencies": {
-    "cape-sdk-angular": "1.0.36",
+    "cape-sdk-angular": "1.0.38",
     "@akveo/ng2-completer": "^9.0.1",
     "@angular/animations": "11.2.12",
     "@angular/cdk": "11.2.11",

cape-playground/package.json

@@ -16,7 +16,7 @@
   },
   "private": true,
   "dependencies": {
-    "cape-sdk-angular": "1.0.36",
+    "cape-sdk-angular": "1.0.38",
     "@akveo/ng2-completer": "^9.0.1",
     "@angular/animations": "11.2.12",
     "@angular/cdk": "11.2.11",

cape-playground/src/app/pages/services/mymeasurements/cholesterol/cholesterol.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
+import { Component, OnInit, ChangeDetectorRef, OnDestroy } from '@angular/core';
 import { NgxConfigureService } from 'ngx-configure';
 import { TranslateService } from '@ngx-translate/core';
 import { CapeSdkAngularService, ServiceLinkEvent, ConsentRecordEvent, SlStatusEnum, ConsentStatusEnum } from 'cape-sdk-angular';
@@ -63,7 +63,7 @@ const sampleChartData: any[] = [
   templateUrl: './cholesterol.component.html',
   styleUrls: ['./cholesterol.component.scss'],
 })
-export class CholesterolComponent implements OnInit {
+export class CholesterolComponent implements OnInit, OnDestroy {
   private config: any;
   public locale: string;
   public sdkUrl: string;

cape-sdk/cape-sdk-angular-standalone/package.json

@@ -15,7 +15,7 @@
   },
   "private": true,
   "dependencies": {
-    "cape-sdk-angular": "1.0.36",
+    "cape-sdk-angular": "1.0.38",
     "@akveo/ng2-completer": "^9.0.1",
     "@angular/animations": "11.2.12",
     "@angular/cdk": "11.2.11",

cape-sdk/cape-sdk-angular-standalone/src/app/layout/header/header.component.html

@@ -1,8 +1,8 @@
 <div class="header-container">
   <div class="logo-container">
-    <a (click)="toggleSidebar()" href="#" class="sidebar-toggle">
+    <!-- <a (click)="toggleSidebar()" href="#" class="sidebar-toggle">
       <nb-icon icon="menu-2-outline"></nb-icon>
-    </a>
+    </a> -->
     <a class="logo" href="#" (click)="navigateHome()"
       ><img class="p-1" src="assets\images\cape-logo.png" style="height: 64px" />
       <!-- <span class="ml-3">{{ 'general.services.no_name_welcome' | translate: { name: user?.name } }}</span> -->
@@ -21,7 +21,7 @@
     <!--<nb-action class="control-item" icon="email-outline"></nb-action>-->
     <!-- <nb-action class="control-item" icon="bell-outline"></nb-action>-->
     <nb-action class="user-action">
-      <nb-user [nbContextMenu]="loggedUserMenu" [onlyPicture]="userPictureOnly" [name]="user?.name" [title]="" [picture]="'assets/images/app/default_user.png'">
+      <nb-user [nbContextMenu]="loggedUserMenu" [onlyPicture]="userPictureOnly" [name]="user.name" [title]="" [picture]="'assets/images/app/default_user.png'">
       </nb-user>
 
       <ng-template #elseBlock>

cape-sdk/cape-sdk-angular-standalone/src/app/layout/header/header.component.ts

@@ -5,6 +5,8 @@ import { Subject } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
 import { OidcUserInformationService } from 'src/app/auth/services/oidc-user-information.service';
 import { UserClaims } from 'src/app/auth/model/oidc';
+import { NgxConfigureService } from 'ngx-configure';
+import { AppConfig } from 'src/app/model/appConfig';
 
 @Component({
   selector: 'ngx-header',
@@ -15,6 +17,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
   private destroy$: Subject<void> = new Subject<void>();
   userPictureOnly: boolean = false;
   user: UserClaims;
+  appConfig: AppConfig;
 
   themes = [
     {
@@ -47,10 +50,18 @@ export class HeaderComponent implements OnInit, OnDestroy {
     private breakpointService: NbMediaBreakpointsService,
     private translateService: TranslateService,
     private userService: OidcUserInformationService,
-    private cdr: ChangeDetectorRef
-  ) {}
+    private cdr: ChangeDetectorRef,
+    private configureService: NgxConfigureService
+  ) {
+    this.appConfig = this.configureService.config;
+  }
 
   ngOnInit() {
+    this.loggedUserMenu.push({
+      title: this.translateService.instant('general.go_to_dashboard') as string,
+      url: this.appConfig.system.dashboardUrl,
+      target: '_blank',
+    });
     this.loggedUserMenu.push({ title: this.translateService.instant('login.logout_button') as string, link: '' });
     this.currentTheme = this.themeService.currentTheme;
 

cape-sdk/cape-sdk-angular-standalone/src/app/model/appConfig.ts

@@ -24,6 +24,7 @@ export interface Auth {
 export interface Services {
   sdkUrl: string;
   checkConsentAtOperator: boolean;
+  showAdditionalConsentFormOptions: boolean;
 }
 
 export interface I18n {

cape-sdk/cape-sdk-angular-standalone/src/app/pages/services/services.component.ts

@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core';
 import { Router, ActivatedRoute, NavigationExtras, Params } from '@angular/router';
 import { NgxConfigureService } from 'ngx-configure';
 import { NbDialogService } from '@nebular/theme';
@@ -12,16 +12,19 @@ import {
   CapeSdkDialogService,
   dialogType,
   ConsentFormComponent,
+  ConsentRecordEvent,
 } from 'cape-sdk-angular';
 // import { NbAuthService } from '@nebular/auth';
 import { AppConfig } from 'src/app/model/appConfig';
 import { ErrorDialogService } from '../error-dialog/error-dialog.service';
+import { takeUntil } from 'rxjs/operators';
+import { Subject } from 'rxjs';
 @Component({
   selector: 'app-services',
   templateUrl: './services.component.html',
   styleUrls: ['./services.component.scss'],
 })
-export class ServicesComponent implements AfterViewInit {
+export class ServicesComponent implements AfterViewInit, OnDestroy {
   config: AppConfig;
   private locale: string;
 
@@ -42,6 +45,7 @@ export class ServicesComponent implements AfterViewInit {
   public checkConsentAtOperator: boolean;
   public showConsentAdditionalOptions = false;
   consentRecord: ConsentRecordSigned;
+  private unsubscribe: Subject<void> = new Subject();
 
   constructor(
     private configService: NgxConfigureService,
@@ -81,6 +85,11 @@ export class ServicesComponent implements AfterViewInit {
 
       this.checkAndGo(this.serviceId, this.serviceName, this.serviceRole, queryParams.purposeId);
     }
+
+    // this.capeService.consentRecordStatus$.pipe(takeUntil(this.unsubscribe)).subscribe(async (event) => {
+    //   event = event as ConsentRecordEvent;
+    //   if (event?.serviceId === this.serviceId) this.capeConsentStatus = event.status.consent_status;
+    // });
   }
 
   checkAndGo = async (serviceId: string, serviceName: string, serviceRole: RoleEnum, purposeId: string) => {
@@ -234,7 +243,7 @@ export class ServicesComponent implements AfterViewInit {
             sdkUrl: this.sdkUrl,
             consentForm: await this.capeService.fetchConsentForm(this.sdkUrl, this.serviceAccountId, serviceId, this.operatorId, purposeId, serviceRole),
             locale: sessionStorage.getItem('currentLocale') as string,
-            showAdditionalOptions: true,
+            showAdditionalOptions: this.config.services.showAdditionalConsentFormOptions,
           },
         })
         .onClose.subscribe((accepted) => {
@@ -244,4 +253,9 @@ export class ServicesComponent implements AfterViewInit {
       this.errorDialogService.openErrorDialog(error);
     }
   }
+
+  ngOnDestroy() {
+    this.unsubscribe.next();
+    this.unsubscribe.complete();
+  }
 }

cape-sdk/cape-sdk-angular-standalone/src/assets/config.prod.json

@@ -15,7 +15,8 @@
   },
   "services": {
     "sdkUrl": "https://www.cape-suite.eu/cape-service-sdk",
-    "checkConsentAtOperator": "true"
+    "checkConsentAtOperator": "true",
+    "showAdditionalConsentFormOptions": false
   },
   "i18n": {
     "locale": "en"

cape-sdk/cape-sdk-angular-standalone/src/assets/i18n/en.json

@@ -2,6 +2,7 @@
   "general": {
     "logo_text": "CaPe",
     "home": "Home",
+    "go_to_dashboard": "Go to Cape Dashboard",
     "error": "Error",
     "refresh": "Refresh",
     "close": "Close",

cape-sdk/cape-sdk-angular-standalone/src/assets/i18n/it.json

@@ -2,6 +2,7 @@
   "general": {
     "logo_text": "CaPe",
     "home": "Home",
+    "go_to_dashboard": "Vai a Cape Dashboard",
     "error": "Errore",
     "refresh": "Aggiorna",
     "close": "Chiudi",

cape-sdk/cape-sdk-angular/projects/cape-sdk-angular/assets/i18n/en.json

@@ -53,7 +53,8 @@
       "form": {
         "header": "Data Consent",
         "title": "Data collection and use",
-        "body": "The service requires consent to use data for specific purposes.\r\nCheck the ones you agree to grant consent for the declared purpose.",
+        "body": "The service requires consent to use data for specific purposes.",
+        "dataMapping": "\r\nCheck the ones you agree to grant consent for the declared purpose.",
         "processing": {
           "header": "Purposes and processes",
           "purpose": "These data will be used for:",

cape-sdk/cape-sdk-angular/projects/cape-sdk-angular/assets/i18n/it.json

@@ -53,7 +53,8 @@
       "form": {
         "header": "Consenso Dati",
         "title": "Collezione ed uso dei dati",
-        "body": "Il servizio richiede il consenso ad utilizzare alcuni dati per specifiche finalità.\r\nSeleziona quelle per cui acconsenti a dare il consenso per le finalità dichiarate.",
+        "body": "Il servizio richiede il consenso ad utilizzare alcuni dati per specifiche finalità.",
+        "dataMapping": "\r\nSeleziona quelli per cui acconsenti a dare il consenso per le finalità dichiarate.",
         "processing": {
           "header": "Finalità e processamenti",
           "purpose": "Questi dati verranno usati per:",

cape-sdk/cape-sdk-angular/projects/cape-sdk-angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cape-sdk-angular",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "peerDependencies": {
     "@angular/common": "^11.2.12",
     "@angular/core": "^11.2.12",

cape-sdk/cape-sdk-angular/projects/cape-sdk-angular/src/lib/consent-form/consent-form.component.html

@@ -1,4 +1,4 @@
-<form [formGroup]="userConsentForm" (ngSubmit)="giveConsent(); dialogRef.close(true)">
+<form [formGroup]="userConsentForm" (ngSubmit)="giveConsent()">
   <nb-card>
     <nb-card-header class="d-flex justify-content-between">
       <h5 class="h5 mr-3">{{ 'general.consent.form.header' | translate }}</h5>
@@ -8,15 +8,19 @@ <h5 class="h5 mr-3">{{ 'general.consent.form.header' | translate }}</h5>
     </nb-card-header>
     <nb-card-body class="m-3">
       <h3>{{ 'general.consent.form.title' | translate }}</h3>
-      <div class="row">
-        <span class="col-md">{{ 'general.consent.form.body' | translate }}</span>
+      <span class="col-md">{{ 'general.consent.form.body' | translate }}</span>
+      <div *ngIf="consentForm.resource_set?.datasets[0] != undefined" class="row">
+        <span class="col-md">{{ 'general.consent.form.dataMapping' | translate }}</span>
       </div>
-      <div class="m-2" formGroupName="dataMapping">
-        <div class="" *ngFor="let concept of consentForm.resource_set.datasets[0].dataMappings">
+      <div *ngIf="consentForm.resource_set.datasets[0] !== undefined" class="m-2" formGroupName="dataMapping">
+        <div class="" *ngFor="let concept of consentForm.resource_set?.datasets[0]?.dataMappings">
           <nb-checkbox [formControlName]="concept.name">{{ concept.name }}</nb-checkbox>
         </div>
       </div>
-      <div class="row m-2 font-weight-bold">
+      <div
+        *ngIf="consentForm.usage_rules.policy.policyRef != undefined && consentForm.usage_rules.policy.policyRef != ''"
+        class="row m-2 font-weight-bold"
+      >
         {{ 'general.consent.form.policyRef' | translate }}
         <a href="{{ consentForm.usage_rules.policy.policyRef }}" class="ml-2">{{ consentForm.usage_rules.policy.policyRef }}</a>
       </div>
@@ -36,7 +40,7 @@ <h3>{{ 'general.consent.form.title' | translate }}</h3>
             </nb-accordion-item-body>
           </nb-accordion-item>
 
-          <nb-accordion-item>
+          <nb-accordion-item *ngIf="consentForm.usage_rules.shareWith.length > 0">
             <nb-accordion-item-header>{{ 'general.consent.form.shareWith.header' | translate }}</nb-accordion-item-header>
             <nb-accordion-item-body>
               <div class="row m-1">{{ 'general.consent.form.shareWith.body' | translate }}</div>

cape-sdk/cape-sdk-angular/projects/cape-sdk-angular/src/lib/consent-form/consent-form.component.ts

@@ -30,14 +30,6 @@ export class ConsentFormComponent implements OnInit {
 
   ngOnInit(): void {
     this.userConsentForm = this.fb.group({
-      dataMapping: new FormGroup(
-        Object.fromEntries(
-          this.consentForm.resource_set.datasets[0].dataMappings.map((concept) => [
-            concept.name,
-            new FormControl({ value: concept.required, disabled: concept.required }),
-          ])
-        )
-      ),
       shareWith: new FormGroup(
         Object.fromEntries(
           this.consentForm.usage_rules.shareWith.map((shareWith) => [
@@ -49,19 +41,35 @@ export class ConsentFormComponent implements OnInit {
       collectionOperatorId: new FormControl(''),
     });
 
+    if (this.consentForm.resource_set.datasets[0] !== undefined)
+      this.userConsentForm.addControl(
+        'dataMapping',
+        new FormGroup(
+          Object.fromEntries(
+            this.consentForm.resource_set.datasets[0].dataMappings.map((concept) => [
+              concept.name,
+              new FormControl({ value: concept.required, disabled: concept.required }),
+            ])
+          )
+        )
+      );
+
     this.translateService.use(this.locale);
     this.cdr.detectChanges();
   }
 
   async giveConsent(): Promise<void> {
-    const dataMappingControls = new Map(
-      Object.entries((this.userConsentForm.controls.dataMapping as FormGroup).controls).map((obj) => [obj[0], obj[1]])
-    );
+    if (this.consentForm.resource_set.datasets[0] !== undefined) {
+      const dataMappingControls = new Map(
+        Object.entries((this.userConsentForm.controls.dataMapping as FormGroup).controls).map((obj) => [obj[0], obj[1]])
+      );
+      this.consentForm.resource_set.datasets[0].dataMappings = this.consentForm.resource_set.datasets[0].dataMappings.filter(
+        (concept) => dataMappingControls.get(concept.name)?.value
+      );
+    }
+
     const shareWithControls = new Map(Object.entries((this.userConsentForm.controls.shareWith as FormGroup).controls).map((obj) => [obj[0], obj[1]]));
 
-    this.consentForm.resource_set.datasets[0].dataMappings = this.consentForm.resource_set.datasets[0].dataMappings.filter(
-      (concept) => dataMappingControls.get(concept.name)?.value
-    );
     this.consentForm.usage_rules.shareWith = this.consentForm.usage_rules.shareWith.filter(
       (shareWith) => shareWithControls.get(shareWith.orgName)?.value
     );
@@ -70,6 +78,7 @@ export class ConsentFormComponent implements OnInit {
     this.consentForm.collection_operator_id = (this.userConsentForm.controls.collectionOperatorId as FormControl).value as string;
     try {
       const newConsentRecordSigned = await this.capeService.giveConsent(this.sdkUrl, this.consentForm);
+      this.dialogRef.close(true);
       this.toastrService.primary('', this.translateService.instant('general.consent.giveConsentSuccessful'), {
         position: NbGlobalLogicalPosition.BOTTOM_END,
         duration: 3500,

cape-sdk/service-sdk/src/main/java/it/eng/opsi/cape/sdk/model/consenting/Policy.java

@@ -31,8 +31,8 @@
 @ToString
 public class Policy {
 
-	@NotBlank(message = "policyRef field is mandatory")
-	public @NotBlank(message = "policyRef field is mandatory") String policyRef;
+//	 @NotBlank(message = "policyRef field is mandatory") 
+	public String policyRef;
 	public String policyHash;
 	public String policyVersion;
 

cape-sdk/service-sdk/src/main/java/it/eng/opsi/cape/sdk/model/consenting/UsageRules.java

@@ -64,7 +64,7 @@ public class UsageRules {
 	private Set<ProcessingCategory> processingCategories;
 
 	@Valid
-	@NotNull
+//	@NotNull
 	private Policy policy = new Policy();
 
 	private Storage storage;

cape-server/account-manager/src/main/java/it/eng/opsi/cape/accountmanager/model/consenting/Policy.java

@@ -39,8 +39,8 @@
 @ToString
 public class Policy {
 
-	@NotBlank(message = "policyRef field is mandatory")
-	public @NotBlank(message = "policyRef field is mandatory") String policyRef;
+//	@NotBlank(message = "policyRef field is mandatory")
+	public String policyRef;
 	public String policyHash;
 	public String policyVersion;
 

cape-server/account-manager/src/main/java/it/eng/opsi/cape/accountmanager/model/consenting/UsageRules.java

@@ -64,7 +64,7 @@ public class UsageRules {
 	private Set<ProcessingCategory> processingCategories;
 
 	@Valid
-	@NotNull
+//	@NotNull
 	private Policy policy = new Policy();
 
 	private Storage storage;

cape-server/auditlog-manager/src/main/java/it/eng/opsi/cape/auditlogmanager/model/consent/Policy.java

@@ -39,8 +39,8 @@
 @ToString
 public class Policy {
 
-	@NotBlank(message = "policyRef field is mandatory")
-	public @NotBlank(message = "policyRef field is mandatory") String policyRef;
+//	@NotBlank(message = "policyRef field is mandatory")
+	public String policyRef;
 	public String policyHash;
 	public String policyVersion;