From 37625dedf82be746bb188d61875776433552d287 Mon Sep 17 00:00:00 2001
From: Volha Mardvilka <mardvilka@google.com>
Date: Mon, 21 Oct 2024 11:42:29 +0000
Subject: [PATCH 1/2] 374055268: (fix) prevent overwrite copied profile

---
 .../profile-form/profile-form.component.ts    |  3 ++-
 .../risk-assessment.component.html            |  1 +
 .../risk-assessment.component.spec.ts         | 19 +++++++++++++++++++
 .../risk-assessment.component.ts              |  8 +++++++-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.ts b/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.ts
index fe57d8867..2656221cd 100644
--- a/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.ts
+++ b/modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.ts
@@ -84,6 +84,7 @@ export class ProfileFormComponent implements OnInit, AfterViewInit {
   @ViewChildren(CdkTextareaAutosize)
   autosize!: QueryList<CdkTextareaAutosize>;
   @Input() profileFormat!: ProfileFormat[];
+  @Input() isCopyProfile!: boolean;
   @Input()
   set profiles(profiles: Profile[]) {
     this.profileList = profiles;
@@ -212,7 +213,7 @@ export class ProfileFormComponent implements OnInit, AfterViewInit {
     const request: any = {
       questions: [],
     };
-    if (profile) {
+    if (profile && !this.isCopyProfile) {
       request.name = profile.name;
       request.rename = this.nameControl.value?.trim();
     } else {
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
index c5e38e360..620712a2f 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
@@ -23,6 +23,7 @@ <h2 class="title" tabindex="-1">Risk assessment</h2>
         <div class="main-content">
           <app-profile-form
             [selectedProfile]="vm.selectedProfile"
+            [isCopyProfile]="isCopyProfile"
             [profiles]="vm.profiles"
             [profileFormat]="vm.profileFormat"
             (saveProfile)="saveProfileClicked($event, vm.selectedProfile)"
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts
index 0b6d70210..2be8723c9 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts
@@ -228,6 +228,24 @@ describe('RiskAssessmentComponent', () => {
       });
     });
 
+    it('#profileClicked should call openForm with profile', fakeAsync(() => {
+      spyOn(component, 'openForm');
+
+      component.profileClicked(PROFILE_MOCK);
+      tick();
+
+      expect(component.openForm).toHaveBeenCalledWith(PROFILE_MOCK);
+    }));
+
+    it('#copyProfileAndOpenForm should call openForm with copy of profile', fakeAsync(() => {
+      spyOn(component, 'openForm');
+
+      component.copyProfileAndOpenForm(PROFILE_MOCK);
+      tick();
+
+      expect(component.openForm).toHaveBeenCalledWith(COPY_PROFILE_MOCK);
+    }));
+
     describe('#saveProfile', () => {
       describe('with no profile selected', () => {
         beforeEach(() => {
@@ -384,6 +402,7 @@ class FakeProfileItemComponent {
 })
 class FakeProfileFormComponent {
   @Input() profiles!: Profile[];
+  @Input() isCopyProfile!: boolean;
   @Input() selectedProfile!: Profile;
   @Input() profileFormat!: ProfileFormat[];
 }
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
index b6eae14e2..787a116ef 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
@@ -40,6 +40,7 @@ import { SuccessDialogComponent } from './components/success-dialog/success-dial
 export class RiskAssessmentComponent implements OnInit, OnDestroy {
   viewModel$ = this.store.viewModel$;
   isOpenProfileForm = false;
+  isCopyProfile = false;
   private destroy$: Subject<boolean> = new Subject<boolean>();
   constructor(
     private store: RiskAssessmentStore,
@@ -71,6 +72,7 @@ export class RiskAssessmentComponent implements OnInit, OnDestroy {
   }
 
   async copyProfileAndOpenForm(profile: Profile) {
+    this.isCopyProfile = true;
     await this.openForm(this.getCopyOfProfile(profile));
   }
 
@@ -124,7 +126,10 @@ export class RiskAssessmentComponent implements OnInit, OnDestroy {
     this.liveAnnouncer.clear();
     if (!selectedProfile) {
       this.saveProfile(profile, this.store.setFocusOnCreateButton);
-    } else if (this.compareProfiles(profile, selectedProfile)) {
+    } else if (
+      this.compareProfiles(profile, selectedProfile) ||
+      this.isCopyProfile
+    ) {
       this.saveProfile(profile, this.store.setFocusOnSelectedProfile);
     } else {
       this.openSaveDialog(
@@ -220,6 +225,7 @@ export class RiskAssessmentComponent implements OnInit, OnDestroy {
       },
     });
     this.isOpenProfileForm = false;
+    this.isCopyProfile = false;
   }
 
   private setFocus(index: number): void {

From 5f0ea2b2d69fcc76ac4a20f00e3137079b7a5e86 Mon Sep 17 00:00:00 2001
From: Volha Mardvilka <mardvilka@google.com>
Date: Mon, 21 Oct 2024 12:04:01 +0000
Subject: [PATCH 2/2] 374055268: (fix) prevent overwrite copied profile

---
 .../src/app/pages/risk-assessment/risk-assessment.component.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
index 787a116ef..e30efe710 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
@@ -192,6 +192,7 @@ export class RiskAssessmentComponent implements OnInit, OnDestroy {
   discard(selectedProfile: Profile | null) {
     this.liveAnnouncer.clear();
     this.isOpenProfileForm = false;
+    this.isCopyProfile = false;
     if (selectedProfile) {
       timer(100).subscribe(() => {
         this.store.setFocusOnSelectedProfile();