Merge remote-tracking branch 'origin/master' into v-2

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime-ui",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "private": true,
   "dependencies": {
     "@chakra-ui/react": "^2.4.1",
@@ -17,13 +17,13 @@
     "autosize": "^5.0.1",
     "axios": "^1.2.0",
     "color": "^4.2.3",
-    "express": "^4.18.2",
+    "csv-stringify": "^6.2.3",
     "framer-motion": "^7.5.3",
     "jotai": "^1.10.0",
     "luxon": "^3.1.0",
-    "react": "^18.2.0",
+    "react": "^18.1.0",
     "react-beautiful-dnd": "^13.1.1",
-    "react-dom": "^18.2.0",
+    "react-dom": "^18.1.0",
     "react-fast-compare": "^3.2.0",
     "react-qr-code": "^2.0.5",
     "react-router-dom": "^6.3.0",
@@ -37,7 +37,7 @@
     "build": "vite build",
     "lint": "eslint .",
     "stylelint": "npx stylelint \"**/*.scss\"\n",
-    "test": "vitest ",
+    "test": "vitest",
     "test:pipeline": "vitest run"
   },
   "browserslist": {

client/src/features/table/utils.js

@@ -1,3 +1,5 @@
+import { stringify } from 'csv-stringify/browser/esm/sync';
+
 /**
  * @description parses a field for export
  * @param {string} field
@@ -99,9 +101,6 @@ export const makeTable = (headerData, tableData, userFields) => {
  */
 export const makeCSV = (arrayOfArrays) => {
   let csvData = 'data:text/csv;charset=utf-8,';
-  arrayOfArrays.forEach((rowArray) => {
-    const row = rowArray.join(',');
-    csvData += `${row}\n`;
-  });
-  return csvData;
+  const stringifiedData = stringify(arrayOfArrays);
+  return csvData + stringifiedData;
 };

client/yarn.lock

@@ -2729,6 +2729,11 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5"
   integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==
 
+csv-stringify@^6.2.3:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-6.2.3.tgz#fefd25e66fd48f8f42f43b85a66a4663a2c3e796"
+  integrity sha512-4qGjUMwnlaRc00gc2jrIYh2w/h1fo25B0mTuY9K8fBiIgtmCX3LcgUbrEGViL98Ci4Se/F5LFEtu8k+dItJVZQ==
+
 data-urls@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"