Merge pull request #1628 from CSCfi/CSCTTV-2997

CSCTTV-2997

Author: konolak

src/app/layout/footer/footer.component.html

@@ -185,7 +185,7 @@ <h2 i18n="@@followUs" class="header">Seuraa meitä!</h2>
   </div>
 
   <ng-template #reviewDialog>
-    <app-review></app-review>
+    <app-review (onClose)="closeDialog()"></app-review>
   </ng-template>
 
   <app-dialog

src/app/portal/components/accessibility/accessibility.component.html

@@ -39,7 +39,7 @@ <h1 [innerHTML]="content['title' + currentLocale]"></h1>
 </main>
 
 <ng-template #reviewDialog>
-  <app-review></app-review>
+  <app-review (onClose)='toggleReview()'></app-review>
 </ng-template>
 
 <app-dialog

src/app/portal/components/home-page/home-page.component.html

@@ -216,7 +216,7 @@ <h3 class="header">
 </main>
 
 <ng-template #reviewDialog>
-  <app-review></app-review>
+  <app-review (onClose)='toggleReview()'></app-review>
 </ng-template>
 
 <app-dialog

src/app/portal/components/service-info/service-info.component.html

@@ -65,7 +65,7 @@ <h2 [id]="item['title' + currentLocale]">
 </main>
 
 <ng-template #reviewDialog>
-  <app-review></app-review>
+  <app-review (onClose)='toggleReview()'></app-review>
 </ng-template>
 
 <app-dialog

src/app/shared/components/dialog/dialog.component.ts

@@ -160,5 +160,6 @@ export class DialogComponent implements OnInit, OnDestroy, OnChanges {
 
   ngOnDestroy(): void {
     this.dialogResultSub?.unsubscribe();
+    this.dialogRef.close();
   }
 }

src/app/shared/components/review/review.component.ts

@@ -5,7 +5,7 @@
 //  :author: CSC - IT Center for Science Ltd., Espoo Finland [email protected]
 //  :license: MIT
 
-import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
+import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { Router } from '@angular/router';
 import { HttpClient } from '@angular/common/http';
 import { Observable, Subscription } from 'rxjs';
@@ -42,6 +42,8 @@ export class ReviewComponent implements OnInit, OnDestroy {
   success = false;
   faTimes = faTimes;
 
+  @Output() onClose = new EventEmitter<void>();
+
   targets: string[] = [
     $localize`:@@fromAccessibility:Saavutettavuudesta`,
     $localize`:@@fromPrivacy:Tietosuojasta`,
@@ -151,4 +153,8 @@ export class ReviewComponent implements OnInit, OnDestroy {
   ngOnDestroy(): void {
     this.sendPostSub?.unsubscribe();
   }
+
+  close() {
+    this.onClose.emit();
+  }
 }