WFPREV-781: Fix request parameter names (#1122)

Co-authored-by: Sukh <6563909+sukhpalp@users.noreply.github.com>
Co-authored-by: Sukhpal <sparmar@vividsolutions.com>

Author: JLeenk

client/wfprev-war/src/main/angular/src/app/components/list-panel/projects-list/projects-list.component.ts

@@ -725,14 +725,14 @@ export class ProjectsListComponent implements OnInit {
 
     if (filters && Object.keys(filters).length > 0) {
       body.projectFilter = {
-        programAreaGuids: filters.programAreaGuid,
-        fiscalYears: filters.fiscalYear,
-        forestRegionOrgUnitIds: filters.forestRegionOrgUnitId,
-        forestDistrictOrgUnitIds: filters.forestDistrictOrgUnitId,
-        fireCentreOrgUnitIds: filters.fireCentreOrgUnitId,
-        activityCategoryCodes: filters.activityCategoryCode,
-        planFiscalStatusCodes: filters.planFiscalStatusCode,
-        projectTypeCodes: filters.projectTypeCode,
+        programAreaGuid: filters.programAreaGuid,
+        fiscalYear: filters.fiscalYear,
+        forestRegionOrgUnitId: filters.forestRegionOrgUnitId,
+        forestDistrictOrgUnitId: filters.forestDistrictOrgUnitId,
+        fireCentreOrgUnitId: filters.fireCentreOrgUnitId,
+        activityCategoryCode: filters.activityCategoryCode,
+        planFiscalStatusCode: filters.planFiscalStatusCode,
+        projectTypeCode: filters.projectTypeCode,
         searchText: filters.searchText
       };
     } else {

client/wfprev-war/src/main/angular/src/app/components/models.ts

@@ -357,14 +357,14 @@ export interface ReportProject {
 }
 
 export interface ProjectFilter {
-  programAreaGuids?: string[];
-  fiscalYears?: string[];
-  forestRegionOrgUnitIds?: string[];
-  forestDistrictOrgUnitIds?: string[];
-  fireCentreOrgUnitIds?: string[];
-  activityCategoryCodes?: string[];
-  planFiscalStatusCodes?: string[];
-  projectTypeCodes?: string[];
+  programAreaGuid?: string[];
+  fiscalYear?: string[];
+  forestRegionOrgUnitId?: string[];
+  forestDistrictOrgUnitId?: string[];
+  fireCentreOrgUnitId?: string[];
+  activityCategoryCode?: string[];
+  planFiscalStatusCode?: string[];
+  projectTypeCode?: string[];
   searchText?: string;
   sortBy?: string;
   sortDirection?: string;

client/wfprev-war/src/main/angular/src/app/components/search-filter/search-filter.component.ts

@@ -46,14 +46,14 @@ export class SearchFilterComponent implements OnInit {
       const saved = this.projectFilterStateService.filters();
       if (saved) {
         this.searchText = saved.searchText ?? "";
-        this.selectedProjectType = saved.projectTypeCodes ?? [];
-        this.selectedBusinessArea = saved.programAreaGuids ?? [];
-        this.selectedFiscalYears = saved.fiscalYears ?? [];
-        this.selectedActivity = saved.activityCategoryCodes ?? [];
-        this.selectedForestRegion =  saved.forestRegionOrgUnitIds ?? [];
-        this.selectedForestDistrict = saved.forestDistrictOrgUnitIds ?? [];
-        this.selectedFireCentre = saved.fireCentreOrgUnitIds ?? [];
-        this.selectedFiscalStatus = saved.planFiscalStatusCodes ?? [];
+        this.selectedProjectType = saved.projectTypeCode ?? [];
+        this.selectedBusinessArea = saved.programAreaGuid ?? [];
+        this.selectedFiscalYears = saved.fiscalYear ?? [];
+        this.selectedActivity = saved.activityCategoryCode ?? [];
+        this.selectedForestRegion =  saved.forestRegionOrgUnitId ?? [];
+        this.selectedForestDistrict = saved.forestDistrictOrgUnitId ?? [];
+        this.selectedFireCentre = saved.fireCentreOrgUnitId ?? [];
+        this.selectedFiscalStatus = saved.planFiscalStatusCode ?? [];
       }
 
     });
@@ -84,14 +84,14 @@ export class SearchFilterComponent implements OnInit {
     const savedFilters = this.projectFilterStateService.filters();
     if (savedFilters) {
       this.searchText = savedFilters?.searchText ?? '';
-      this.selectedProjectType = savedFilters?.projectTypeCodes ?? [];
-      this.selectedBusinessArea = savedFilters?.programAreaGuids ?? [];
-      this.selectedFiscalYears = savedFilters?.fiscalYears ?? [];
-      this.selectedActivity = savedFilters?.activityCategoryCodes ?? [];
-      this.selectedForestRegion = savedFilters?.forestRegionOrgUnitIds ?? [];
-      this.selectedForestDistrict = savedFilters?.forestDistrictOrgUnitIds ?? [];
-      this.selectedFireCentre = savedFilters?.fireCentreOrgUnitIds ?? [];
-      this.selectedFiscalStatus = savedFilters?.planFiscalStatusCodes ?? [];
+      this.selectedProjectType = savedFilters?.projectTypeCode ?? [];
+      this.selectedBusinessArea = savedFilters?.programAreaGuid ?? [];
+      this.selectedFiscalYears = savedFilters?.fiscalYear ?? [];
+      this.selectedActivity = savedFilters?.activityCategoryCode ?? [];
+      this.selectedForestRegion = savedFilters?.forestRegionOrgUnitId ?? [];
+      this.selectedForestDistrict = savedFilters?.forestDistrictOrgUnitId ?? [];
+      this.selectedFireCentre = savedFilters?.fireCentreOrgUnitId ?? [];
+      this.selectedFiscalStatus = savedFilters?.planFiscalStatusCode ?? [];
     }
     this.generateFiscalYearOptions();
     this.setupCodeTableSubscription();
@@ -116,28 +116,28 @@ export class SearchFilterComponent implements OnInit {
 
     this.projectFilterStateService.update({
       searchText: this.searchText,
-      projectTypeCodes: this.selectedProjectType,
-      programAreaGuids: this.selectedBusinessArea,
-      fiscalYears: this.selectedFiscalYears,
-      activityCategoryCodes: this.selectedActivity,
-      forestRegionOrgUnitIds: this.selectedForestRegion,
-      forestDistrictOrgUnitIds: this.selectedForestDistrict,
-      fireCentreOrgUnitIds: this.selectedFireCentre,
-      planFiscalStatusCodes: this.selectedFiscalStatus
+      projectTypeCode: this.selectedProjectType,
+      programAreaGuid: this.selectedBusinessArea,
+      fiscalYear: this.selectedFiscalYears,
+      activityCategoryCode: this.selectedActivity,
+      forestRegionOrgUnitId: this.selectedForestRegion,
+      forestDistrictOrgUnitId: this.selectedForestDistrict,
+      fireCentreOrgUnitId: this.selectedFireCentre,
+      planFiscalStatusCode: this.selectedFiscalStatus
     });
-    const flt = {
+    const filterPrarameters: ProjectFilter = {
       searchText: this.searchText,
-      projectTypeCodes: sanitize(this.selectedProjectType),
-      programAreaGuids: sanitize(this.selectedBusinessArea),
-      fiscalYears: resolveFiscalYears(),
-      activityCategoryCodes: sanitize(this.selectedActivity),
-      forestRegionOrgUnitIds: sanitize(this.selectedForestRegion),
-      forestDistrictOrgUnitIds: sanitize(this.selectedForestDistrict),
-      fireCentreOrgUnitIds: sanitize(this.selectedFireCentre),
-      planFiscalStatusCodes: sanitize(this.selectedFiscalStatus)
+      projectTypeCode: sanitize(this.selectedProjectType),
+      programAreaGuid: sanitize(this.selectedBusinessArea),
+      fiscalYear: resolveFiscalYears(),
+      activityCategoryCode: sanitize(this.selectedActivity),
+      forestRegionOrgUnitId: sanitize(this.selectedForestRegion),
+      forestDistrictOrgUnitId: sanitize(this.selectedForestDistrict),
+      fireCentreOrgUnitId: sanitize(this.selectedFireCentre),
+      planFiscalStatusCode: sanitize(this.selectedFiscalStatus)
     }
 
-    this.sharedService.updateFilters(flt);
+    this.sharedService.updateFilters(filterPrarameters);
   }
 
   onSearch() {
@@ -378,7 +378,7 @@ export class SearchFilterComponent implements OnInit {
   }
 
   assignDefaultFiscalYear(emit: boolean = true): void {
-    if (!this.projectFilterStateService?.filters()?.fiscalYears) {
+    if (!this.projectFilterStateService?.filters()?.fiscalYear) {
       const today = new Date();
       // April has an index of 3
       const fiscalYearStart = today.getMonth() >= 3 ? today.getFullYear() : today.getFullYear() - 1;