Merge remote-tracking branch 'origin/master' into excel-import

apps/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime-ui",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "private": true,
   "dependencies": {
     "@chakra-ui/react": "^2.7.0",

apps/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "author": "Carlos Valente",
   "description": "Time keeping for live events",
   "repository": "https://github.com/cpvalente/ontime",

apps/server/package.json

@@ -2,7 +2,7 @@
   "name": "ontime-server",
   "type": "module",
   "main": "src/index.ts",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "exports": "./src/index.js",
   "dependencies": {
     "body-parser": "^1.20.0",

apps/server/src/utils/parser.ts

@@ -106,8 +106,8 @@ export const parseExcel = (excelData: unknown[][], options?: Partial<ExcelImport
     .filter((e) => e.length > 0)
     .forEach((row) => {
       // these fields contain the data to its right
-      let eventTitleNext = false;
       let projectTitleNext = false;
+      let projectDescriptionNext = false;
       let publicUrlNext = false;
       let publicInfoNext = false;
       let backstageUrlNext = false;
@@ -117,12 +117,12 @@ export const parseExcel = (excelData: unknown[][], options?: Partial<ExcelImport
 
       row.forEach((column, j) => {
         // 1. we check if we have set a flag for a known field
-        if (eventTitleNext) {
+        if (projectTitleNext) {
           projectData.title = makeString(column, '');
-          eventTitleNext = false;
-        } else if (projectTitleNext) {
-          projectData.description = makeString(column, '');
           projectTitleNext = false;
+        } else if (projectDescriptionNext) {
+          projectData.description = makeString(column, '');
+          projectDescriptionNext = false;
         } else if (publicUrlNext) {
           projectData.publicUrl = makeString(column, '');
           publicUrlNext = false;
@@ -190,10 +190,10 @@ export const parseExcel = (excelData: unknown[][], options?: Partial<ExcelImport
             // need to make sure it is a string first
             switch (col) {
               case importMap.projectName:
-                eventTitleNext = true;
+                projectTitleNext = true;
                 break;
               case importMap.projectDescription:
-                projectTitleNext = true;
+                projectDescriptionNext = true;
                 break;
               case importMap.publicUrl:
                 publicUrlNext = true;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "description": "Time keeping for live events",
   "keywords": [
     "lighdev",