Merge pull request #3740 from ita-social-projects/bugfix/6821-the-location-that-is-outside-of-ukraine-cant-be-entered-manually

Bugfix/6821 the location that is outside of ukraine cant be entered manually

Author: hnativlyubomyr

src/app/greencity/modules/events/components/event-editor/components/create-event-dates/place-online/place-online.component.ts

@@ -40,8 +40,7 @@ export class PlaceOnlineComponent implements OnInit, OnDestroy {
   private readonly defaultPosition = { coords: { lat: 49.84579567734425, lng: 24.025124653312258 } };
 
   private _regionOptions: google.maps.places.AutocompleteOptions = {
-    types: ['address'],
-    componentRestrictions: { country: 'UA' }
+    types: ['address']
   };
   private _lastLocation: { coordinates: PlaceOnline; place: string } = {
     coordinates: null,

src/app/shared/components/dialog-pop-up/dialog-pop-up.component.html

@@ -1,4 +1,6 @@
 <div class="main-container">
+  <img *ngIf="isEditOrPayPopup" [src]="icons.cross" class="cross-img" alt="close-icon" (click)="userReply(undefined)" />
+
   <div class="warning-text">
     <div class="warning-title" *ngIf="popupTitle">{{ popupTitle | translate }}</div>
     <div class="warning-subtitle" *ngIf="popupSubtitle">{{ popupSubtitle | translate }}</div>

src/app/shared/components/dialog-pop-up/dialog-pop-up.component.scss

@@ -131,3 +131,13 @@
     text-align: center;
   }
 }
+
+.cross-img {
+  position: absolute;
+  cursor: pointer;
+  top: 10px;
+  right: 10px;
+  color: var(--ubs-quintynary-light-grey);
+  width: 10px;
+  height: 10px;
+}

src/app/shared/components/dialog-pop-up/dialog-pop-up.component.spec.ts

@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { of } from 'rxjs';
+import { Observable, of, Subject } from 'rxjs';
 
 import { DialogPopUpComponent } from './dialog-pop-up.component';
 
@@ -15,14 +15,14 @@ describe('DialogPopUpComponent', () => {
     popupConfirm: 'popupSubtitle',
     popupCancel: 'popupSubtitle'
   };
-  const dialogRefStub = {
-    keydownEvents() {
-      return of();
-    },
-    backdropClick() {
-      return of();
-    },
-    close() {}
+  const dialogRefStub: {
+    keydownEvents: () => Observable<KeyboardEvent>;
+    backdropClick: () => Observable<void>;
+    close: () => void;
+  } = {
+    keydownEvents: () => of(),
+    backdropClick: () => of(),
+    close: () => {}
   };
 
   beforeEach(waitForAsync(() => {
@@ -45,4 +45,72 @@ describe('DialogPopUpComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('it should set component isEditOrPayPopup to true if data.isEditOrPayPopup set to true', () => {
+    component.data.isEditOrPayPopup = true;
+    component.ngOnInit();
+    expect(component.isEditOrPayPopup).toBeTrue();
+  });
+
+  it('it should set component isEditOrPayPopup to false if data.isEditOrPayPopup set to false', () => {
+    component.data.isEditOrPayPopup = false;
+    component.ngOnInit();
+    expect(component.isEditOrPayPopup).toBeFalsy();
+  });
+
+  it('setTitles should be called onInit', () => {
+    const setTitlesSpy = spyOn(component as any, 'setTitles');
+    component.ngOnInit();
+    expect(setTitlesSpy).toHaveBeenCalled();
+  });
+
+  it('should call userReply with undefined if isEditOrPayPopup is true on a backdrop click', () => {
+    const mockBackdrop = new Subject<void>();
+    dialogRefStub.backdropClick = () => mockBackdrop.asObservable();
+    spyOn(component, 'userReply');
+    component.data.isEditOrPayPopup = true;
+
+    component.ngOnInit();
+    mockBackdrop.next();
+
+    expect(component.isEditOrPayPopup).toBeTrue();
+    expect(component.userReply).toHaveBeenCalledWith(undefined);
+  });
+
+  it('should call userReply with false if isEditOrPayPopup isnt true on a backdrop click', () => {
+    const mockBackdrop = new Subject<void>();
+    dialogRefStub.backdropClick = () => mockBackdrop.asObservable();
+    spyOn(component, 'userReply');
+    component.data.isEditOrPayPopup = false;
+
+    component.ngOnInit();
+    mockBackdrop.next();
+
+    expect(component.isEditOrPayPopup).toBeFalsy();
+    expect(component.userReply).toHaveBeenCalledWith(false);
+  });
+
+  it('should call userReply with undefined if isEditOrPayPopup is true on Escape keydown', () => {
+    const mockKeydown = new Subject<KeyboardEvent>();
+    dialogRefStub.keydownEvents = () => mockKeydown.asObservable();
+    spyOn(component, 'userReply');
+    component.data.isEditOrPayPopup = true;
+
+    component.ngOnInit();
+    mockKeydown.next(new KeyboardEvent('keydown', { key: 'Escape' }));
+
+    expect(component.userReply).toHaveBeenCalledWith(undefined);
+  });
+
+  it('should call userReply with false if isEditOrPayPopup is false on Escape keydown', () => {
+    const mockKeydown = new Subject<KeyboardEvent>();
+    dialogRefStub.keydownEvents = () => mockKeydown.asObservable();
+    spyOn(component, 'userReply');
+    component.data.isEditOrPayPopup = false;
+
+    component.ngOnInit();
+    mockKeydown.next(new KeyboardEvent('keydown', { key: 'Escape' }));
+
+    expect(component.userReply).toHaveBeenCalledWith(false);
+  });
 });

src/app/shared/components/dialog-pop-up/dialog-pop-up.component.ts

@@ -10,6 +10,10 @@ import { PopUpsStyles } from 'src/app/ubs/ubs-admin/components/ubs-admin-employe
   styleUrls: ['./dialog-pop-up.component.scss']
 })
 export class DialogPopUpComponent implements OnInit, OnDestroy {
+  icons = {
+    cross: '././assets/img/ubs/cross.svg'
+  };
+
   private destroy$: Subject<boolean> = new Subject<boolean>();
   popupTitle: string;
   popupSubtitle: string;
@@ -21,6 +25,7 @@ export class DialogPopUpComponent implements OnInit, OnDestroy {
   isItrefund = false;
   іsPermissionConfirm = false;
   isCancelButtonShow = false;
+  isEditOrPayPopup?: boolean;
 
   constructor(
     private matDialogRef: MatDialogRef<DialogPopUpComponent>,
@@ -34,7 +39,7 @@ export class DialogPopUpComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroy$))
       .subscribe((event) => {
         if (event.key === 'Escape') {
-          this.userReply(false);
+          this.userReply(this.isEditOrPayPopup ? undefined : false);
         }
         if (event.key === 'Enter') {
           this.userReply(true);
@@ -44,7 +49,7 @@ export class DialogPopUpComponent implements OnInit, OnDestroy {
       .backdropClick()
       .pipe(takeUntil(this.destroy$))
       .subscribe(() => {
-        this.userReply(false);
+        this.userReply(this.isEditOrPayPopup ? undefined : false);
       });
     this.isCancelButtonShow = !this.isItrefund || !this.іsPermissionConfirm;
   }
@@ -54,14 +59,15 @@ export class DialogPopUpComponent implements OnInit, OnDestroy {
     this.popupSubtitle = this.data.popupSubtitle;
     this.popupConfirm = this.data.popupConfirm;
     this.popupCancel = this.data.popupCancel;
+    this.isEditOrPayPopup = this.data.isEditOrPayPopup;
     this.setBtnStyleGreen = this.data.style === PopUpsStyles.green;
     this.setBtnStyleRed = this.data.style === PopUpsStyles.red;
     this.setBtnStyleLightGreen = this.data.style === PopUpsStyles.lightGreen;
     this.isItrefund = this.data.isItrefund;
     this.іsPermissionConfirm = this.data.іsPermissionConfirm;
   }
 
-  userReply(reply: boolean): void {
+  userReply(reply: boolean | undefined): void {
     this.matDialogRef.close(reply);
   }