Fixes for eventGroups (#278)

Co-authored-by: Sandor Ban <[email protected]>

Author: sandorbanvitagroup

src/app/events/event-components/event-group-filters/event-group-filters-form-data.ts

@@ -15,8 +15,8 @@ export const FORM_DATA_EVENT_GROUP_FILTERS = [
     fields: [
       {
         ...FORM_DATA_SEARCHBOX,
-        key: 'nameEpidLike',
-        placeholder: 'strings.promptSearch',
+        key: 'freeText',
+        placeholder: 'strings.promptEventsSearchFieldEventGroups',
         className: 'fullwidth',
       },
     ],
@@ -41,8 +41,8 @@ export const FORM_DATA_EVENT_GROUP_FILTERS = [
     fields: [
       {
         ...FORM_DATA_SEARCHBOX,
-        key: 'eventLike',
-        placeholder: 'strings.promptEventsSearchFieldEventGroups',
+        key: 'freeTextEvent',
+        placeholder: 'eventGroupEventSearch',
         className: 'fullwidth',
       },
     ],

src/app/events/event-components/event-groups-list/event-groups-list.component.html

@@ -2,14 +2,18 @@
   <h1 class="page-header-title">
     {{ 'captions.View.groups' | translate }}
   </h1>
+  <div class="page-header-actions">
+    <button mat-flat-button color="primary" (click)="openAddEventModal()">
+      {{ 'captions.eventNewEvent' | translate }}
+    </button>
+  </div>
 </div>
 <app-table
   [resourceService]="eventGroupService"
   [tableColumns]="defaultColumns"
   [isSortable]="true"
   [isHeaderSticky]="true"
   [fullHeight]="true"
-  [appearance]="tableAppearanceOptions.MINIMAL"
   [viewOptions]="actionsViewOption"
 >
 </app-table>

src/app/events/event-components/event-groups-list/event-groups-list.component.spec.ts

@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { MatDialogModule } from '@angular/material/dialog';
 import { EventGroupsListComponent } from './event-groups-list.component';
 
 describe('EventGroupsListComponent', () => {
@@ -11,7 +12,12 @@ describe('EventGroupsListComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [EventGroupsListComponent],
-      imports: [TranslateModule.forRoot(), HttpClientTestingModule, RouterTestingModule],
+      imports: [
+        TranslateModule.forRoot(),
+        HttpClientTestingModule,
+        RouterTestingModule,
+        MatDialogModule,
+      ],
     }).compileComponents();
   });
 

src/app/events/event-components/event-groups-list/event-groups-list.component.ts

@@ -1,9 +1,13 @@
 import { Component, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
+import { MatDialog } from '@angular/material/dialog';
+import { TranslateService } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
+import { AddEditBaseModalComponent } from '../../../shared/modals/add-edit-base-modal/add-edit-base-modal.component';
+import { ADD_MODAL_MAX_WIDTH } from '../../../_constants/common';
 import { TableAppearanceOptions } from '../../../_constants/enums';
 import { NavItem, TableColumn } from '../../../_models/common';
 import { EventGroupService } from '../../../_services/api/event-group.service';
+import { EventAddComponent } from '../../event-add/event-add.component';
 import { viewOptionsDefs } from './event-groups-list-action-data';
 import { defaultColumnDefs } from './event-groups-list-table-data';
 
@@ -18,7 +22,29 @@ export class EventGroupsListComponent implements OnDestroy {
   tableAppearanceOptions = TableAppearanceOptions;
 
   private subscription: Subscription[] = [];
-  constructor(public eventGroupService: EventGroupService, private router: Router) {}
+  constructor(
+    public eventGroupService: EventGroupService,
+    private dialog: MatDialog,
+    private translateService: TranslateService
+  ) {}
+
+  openAddEventModal(): void {
+    const dialogRef = this.dialog.open(AddEditBaseModalComponent, {
+      maxWidth: ADD_MODAL_MAX_WIDTH,
+      data: {
+        title: this.translateService.instant('strings.headingCreateNewEvent'),
+        component: EventAddComponent,
+      },
+    });
+
+    this.subscription.push(
+      dialogRef.afterClosed().subscribe((result) => {
+        if (result) {
+          // callback
+        }
+      })
+    );
+  }
 
   ngOnDestroy(): void {
     this.subscription.forEach((subscription) => subscription.unsubscribe());

src/app/shared/filters/filters-form/filters-form.component.ts

@@ -77,6 +77,7 @@ export class FiltersFormComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
+    this.formActionsService.setDiscard(this.formId);
     this.subscriptions.forEach((subscription) => subscription.unsubscribe());
   }
 }

src/assets/i18n/custom-translations.json

@@ -114,6 +114,7 @@
   "eventGroup.responsibleCommunity": "Responsible community",
   "headingConfirmUnlink": "Confirm unlink",
   "confirmationUnlinkEventFromGroup": "Are you sure you want to unlink this event from this group?",
+  "eventGroupEventSearch": "Search by Event, title, description",
   "aboutSormasGithub": "SORMAS Github",
   "aboutContactSupport": "Contact support",
   "aboutGiveFeedback": "Give feedback",

src/assets/i18n/en.json

@@ -5863,6 +5863,7 @@
   "eventGroup.responsibleCommunity": "Responsible community",
   "headingConfirmUnlink": "Confirm unlink",
   "confirmationUnlinkEventFromGroup": "Are you sure you want to unlink this event from this group?",
+  "eventGroupEventSearch": "Search by Event, title, description",
   "aboutSormasGithub": "SORMAS Github",
   "aboutContactSupport": "Contact support",
   "aboutGiveFeedback": "Give feedback",