diff --git a/ui/ui-frontend-common/package-lock.json b/ui/ui-frontend-common/package-lock.json index 7333656491d908d69e25f17e30f33a77d3d4b3c2..743800f0322dcd490014f56cc3e5a793f504dcbb 100644 --- a/ui/ui-frontend-common/package-lock.json +++ b/ui/ui-frontend-common/package-lock.json @@ -1,6 +1,6 @@ { "name": "ui-frontend-common", - "version": "1.0.3", + "version": "1.0.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/ui/ui-frontend-common/package.json b/ui/ui-frontend-common/package.json index b0679e8136fc2adce4b76003b532d04c59d0f78b..2db7845f3c1e36ab43d5c25a9e3b17e3624eca16 100644 --- a/ui/ui-frontend-common/package.json +++ b/ui/ui-frontend-common/package.json @@ -1,6 +1,6 @@ { "name": "ui-frontend-common", - "version": "1.0.3", + "version": "1.0.4", "main": "src/index.ts", "pki": { "path": "../../dev-deployment/environments/certs/server/hosts/localhost", diff --git a/ui/ui-frontend-common/src/app/modules/subrogation/subrogation-banner/subrogation-banner.component.html b/ui/ui-frontend-common/src/app/modules/subrogation/subrogation-banner/subrogation-banner.component.html index 16a7c3daad6ca19e4eafd9d46762be80a5e53409..c19c99138c893352c847123df89fcb8e618ca47d 100644 --- a/ui/ui-frontend-common/src/app/modules/subrogation/subrogation-banner/subrogation-banner.component.html +++ b/ui/ui-frontend-common/src/app/modules/subrogation/subrogation-banner/subrogation-banner.component.html @@ -14,14 +14,3 @@ keyboard_arrow_up </i> </div> - -<ng-template #stopConfirmDialog> - <vitamui-common-confirm-dialog - i18n="@@stopSubrogationConfirmDialogContent" - dialogTitle="Arrêter la subrogation ?" i18n-dialogTitle="@@stopSubrogationConfirmDialogTitle" - confirmLabel="Arrêter" i18n-confirmLabel="@@stopSubrogationConfirmDialogConfirmLabel" - cancelLabel="Annuler" i18n-cancelLabel="@@stopSubrogationConfirmDialogCancelLabel" - > - Êtes vous sûr de vouloir arrêter la subrogation de l'utilisateur {{ authService?.user?.lastname }} {{ authService?.user?.firstname }} ? - </vitamui-common-confirm-dialog> -</ng-template> diff --git a/ui/ui-frontend-common/src/app/modules/subrogation/subrogation-banner/subrogation-banner.component.ts b/ui/ui-frontend-common/src/app/modules/subrogation/subrogation-banner/subrogation-banner.component.ts index 1805fb93013481a125f4e54fb8e90460cd08b1aa..eb7aa6df64dcf60448c56636be491382fee1c1f4 100644 --- a/ui/ui-frontend-common/src/app/modules/subrogation/subrogation-banner/subrogation-banner.component.ts +++ b/ui/ui-frontend-common/src/app/modules/subrogation/subrogation-banner/subrogation-banner.component.ts @@ -35,12 +35,11 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ import * as moment_ from 'moment'; -import { filter, switchMap } from 'rxjs/operators'; +import { filter } from 'rxjs/operators'; -import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { AuthService } from '../../auth.service'; -import { ConfirmDialogService } from '../../components/confirm-dialog/confirm-dialog.service'; import { Subrogation } from '../../models'; import { SubrogationService } from '../subrogation.service'; @@ -53,8 +52,6 @@ const moment = moment_; }) export class SubrogationBannerComponent implements OnInit { - @ViewChild('stopConfirmDialog', { static: true }) stopConfirmDialogTemplateRef: TemplateRef<SubrogationBannerComponent>; - show = false; hidden = false; endDate: Date; @@ -63,8 +60,7 @@ export class SubrogationBannerComponent implements OnInit { constructor( public authService: AuthService, - private subrogationService: SubrogationService, - private confirmDialogService: ConfirmDialogService + private subrogationService: SubrogationService ) { } ngOnInit() { @@ -84,10 +80,7 @@ export class SubrogationBannerComponent implements OnInit { } onStopSubrogation() { - this.confirmDialogService.confirm(this.stopConfirmDialogTemplateRef).pipe( - switchMap(() => this.subrogationService.decline(this.subrogation.id)) - ) - .subscribe(() => { + this.subrogationService.decline(this.subrogation.id).subscribe(() => { this.show = false; this.authService.logoutAndRedirectToUiForUser(this.authService.user.superUser); }); diff --git a/ui/ui-frontend/package.json b/ui/ui-frontend/package.json index 2de4852a03cd7656b4063e395bc881a699dcd39c..9fe661ee67a1eeb747ec401790b86b49c1b7ec59 100644 --- a/ui/ui-frontend/package.json +++ b/ui/ui-frontend/package.json @@ -68,7 +68,7 @@ "popper.js": "^1.16.1", "rxjs": "^6.5.5", "tslib": "^1.13.0", - "ui-frontend-common": "file:../ui-frontend-common/ui-frontend-common-1.0.3.tgz", + "ui-frontend-common": "file:../ui-frontend-common/ui-frontend-common-1.0.4.tgz", "underscore": "^1.10.2", "utf-8-validate": "^5.0.2", "web-animations-js": "^2.3.2",