feat: funding requests component filtering

src/config/mapping/fundingrequests/table-2.json

@@ -24,5 +24,5 @@
       ]
     }
   ],
-  "urlParams": "?$filter=<filterString>&$expand=geography,implementationPeriods($expand=milestones,grant($expand=principalRecipient))"
+  "urlParams": "?$filter=<filterString>&$select=name,submissionDate,reviewApproach,window,reviewOutcome,reviewDate,differentiationCategory&$expand=geography($select=name),implementationPeriods($select=periodStartDate,periodEndDate;$expand=milestones($select=date),grant($select=code;$expand=principalRecipient($select=name)))"
 }

src/controllers/fundingrequests.controller.ts

@@ -36,7 +36,11 @@ export class FundingRequestsController {
 
         const groupedByGeo = _.groupBy(data, Table2FieldsMapping.groupby);
 
-        return {
+        let result: {
+          data: any;
+          signedCount?: any;
+          submittedCount?: any;
+        } = {
           data: _.map(groupedByGeo, (items, key) => {
             return {
               components: key,
@@ -72,15 +76,24 @@ export class FundingRequestsController {
               }),
             };
           }),
-          submittedCount: _.map(groupedByGeo, (items, key) => ({
-            name: key,
-            count: items.length,
-          })),
-          signedCount: _.map(groupedByGeo, (items, key) => ({
-            name: key,
-            count: _.filter(items, (item: any) => item.items.length > 0).length,
-          })),
         };
+
+        if (this.req.query.withCounts) {
+          result = {
+            ...result,
+            submittedCount: _.map(groupedByGeo, (items, key) => ({
+              name: key,
+              count: items.length,
+            })),
+            signedCount: _.map(groupedByGeo, (items, key) => ({
+              name: key,
+              count: _.filter(items, (item: any) => item.items.length > 0)
+                .length,
+            })),
+          };
+        }
+
+        return result;
       })
       .catch(handleDataApiError);
   }
@@ -92,7 +105,7 @@ export class FundingRequestsController {
   ) {
     return axios
       .get(
-        `http://localhost:4200/funding-requests?geographies=${countryCode}&periods=${this.req.query.periods}`,
+        `http://localhost:4200/funding-requests?withCounts=1&geographies=${countryCode}&periods=${this.req.query.periods}`,
       )
       .then((resp: AxiosResponse) => resp.data)
       .catch(handleDataApiError);

src/utils/filtering/fundingRequests.ts

@@ -4,7 +4,7 @@ import {getGeographyValues} from './geographies';
 
 const MAPPING = {
   geography: ['geography/name', 'geography/code'],
-  component: 'activityArea/name',
+  component: 'activityAreas/any(tag:tag/name in (<value>))',
   period: 'periodFrom',
   trpWindow: 'window',
   portfolioCategory: 'differentiationCategory',