Removing yarn release

Author: jackson

react/.eslintignore

@@ -0,0 +1 @@
+node_modules

react/.yarnrc.yml

@@ -0,0 +1,5 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
+yarnPath: .yarn/releases/yarn-4.4.1.cjs

react/package.json

@@ -10,6 +10,7 @@
     "@mui/lab": "^5.0.0-alpha.152",
     "@mui/material": "^5.14.17",
     "@mui/styled-engine": "^5.14.17",
+    "@mui/system": "^6.0.0",
     "@mui/x-data-grid": "^6.18.0",
     "@mui/x-date-pickers": "^6.18.0",
     "@reduxjs/toolkit": "^1.9.7",
@@ -20,6 +21,8 @@
     "@types/react-dom": "^18.2.14",
     "@types/sinon": "^17.0.3",
     "@types/validator": "^13.11.7",
+    "@typescript-eslint/eslint-plugin": "^8.3.0",
+    "@typescript-eslint/parser": "^8.3.0",
     "axios": "^0.21.1",
     "chart.js": "^4.4.1",
     "chartjs-adapter-moment": "^1.0.1",
@@ -130,5 +133,6 @@
       "^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy",
       "react-markdown": "<rootDir>/node_modules/react-markdown/react-markdown.min.js"
     }
-  }
+  },
+  "packageManager": "[email protected]"
 }

react/src/components/downloadmanager/downloadManagerSagas.ts

@@ -73,6 +73,7 @@ function* handleRequestDownload(action: RequestDownloadActionType) {
     yield put(setDownloadLink(response.data.downloadLink))
   } catch (e) {
     yield put(setStatus('failed'))
+    console.log(e);
   }
 }
 

react/src/components/regionalpressure/RegionalPressureExport.tsx

@@ -44,9 +44,9 @@ const results_to_array = (data: PortsObject, is_hourly: boolean) => {
         regionName: portDataPoint.regionName || '',
         totalPcpPax: portDataPoint.totalPcpPax || 0,
         terminalName: portDataPoint.terminalName || '',
-        EEA: portDataPoint.queueCounts[0]?.count || 0,
-        eGates: portDataPoint.queueCounts[1]?.count || 0,
-        nonEEA: portDataPoint.queueCounts[2]?.count || 0,
+        EEA: portDataPoint.queueCounts![0]?.count || 0,
+        eGates: portDataPoint.queueCounts![1]?.count || 0,
+        nonEEA: portDataPoint.queueCounts![2]?.count || 0,
       }
       data_rows.push(exportDataPoint)
     })

react/src/components/regionalpressure/regionalPressureSagas.ts

@@ -35,6 +35,19 @@ export type TerminalDataPoint = {
   terminalName?: string,
 };
 
+
+export type ExportableDataPoint = {
+  date: string,
+  hour: number,
+  portCode: string,
+  regionName: string,
+  totalPcpPax: number, 
+  terminalName?: string,
+  EEA?: number,
+  nonEEA?:number,
+  eGates?:number,
+};
+
 export type PortsObject = {
   [key:string] :  TerminalDataPoint[]
 }
@@ -66,6 +79,24 @@ export function getHistoricDateByDay(date: Moment) : Moment {
     .isoWeekday(date.isoWeekday())
 }
 
+const createExportableDatapoints = (datapoints: TerminalDataPoint[]) :ExportableDataPoint[] => {
+  let flattenedCurrent: ExportableDataPoint[] = [];
+  datapoints!.forEach((datapoint) => {
+    flattenedCurrent.push({
+      date: datapoint.date,
+      hour: datapoint.hour,
+      portCode: datapoint.portCode,
+      regionName: datapoint.regionName,
+      totalPcpPax: datapoint.totalPcpPax, 
+      terminalName: datapoint.terminalName,
+      EEA: datapoint.queueCounts[0]?.count || 0,
+      eGates: datapoint.queueCounts[1]?.count || 0,
+      nonEEA: datapoint.queueCounts[2]?.count || 0,
+    })
+  }); 
+  return flattenedCurrent
+}
+
 export function* handleRequestPaxTotals(action: RequestPaxTotalsType) {
   try {
     yield(put(setStatus('loading')))
@@ -112,9 +143,10 @@ export function* handleRequestPaxTotals(action: RequestPaxTotalsType) {
     }
 
     if (action.isExport) {
-      
-      const currentCSV = generateCsv({})(current);
-      const historicCSV = generateCsv({})(historic);
+
+
+      const currentCSV = generateCsv({})(createExportableDatapoints(current));
+      const historicCSV = generateCsv({})(createExportableDatapoints(historic));
       download({})(currentCSV);
       download({})(historicCSV);
       yield(put(setStatus('done')))
@@ -127,22 +159,22 @@ export function* handleRequestPaxTotals(action: RequestPaxTotalsType) {
 
       current!.forEach((datapoint) => {
         const portIndex = datapoint.terminalName ? `${datapoint.portCode}-${datapoint.terminalName}` : datapoint.portCode;
-        datapoint.queueCounts.forEach(passengerCount => {
+        datapoint.queueCounts!.forEach(passengerCount => {
           portTotals[portIndex] = (portTotals[portIndex] ? portTotals[portIndex] : 0) + passengerCount.count
         })
         portData[portIndex] ?
-        portData[portIndex].push(datapoint)
-          : portData[portIndex] = [datapoint]
+          portData[portIndex].push(datapoint)
+            : portData[portIndex] = [datapoint]
       })
 
       historic!.forEach((datapoint) => {
         const portIndex = datapoint.terminalName ? `${datapoint.portCode}-${datapoint.terminalName}` : datapoint.portCode;
-        datapoint.queueCounts.forEach(passengerCount => {
+        datapoint.queueCounts!.forEach(passengerCount => {
           historicPortTotals[portIndex] = (historicPortTotals[portIndex] ? historicPortTotals[portIndex] : 0) + passengerCount.count
         })
         historicPortData[portIndex] ?
-        historicPortData[portIndex].push(datapoint)
-          : historicPortData[portIndex] = [datapoint]
+          historicPortData[portIndex].push(datapoint)
+            : historicPortData[portIndex] = [datapoint]
       })
 
       yield(put(setRegionalDashboardState({