hotfix: resolve data directory (#288)

apps/client/src/common/api/ontimeApi.ts

@@ -138,18 +138,18 @@ export const downloadRundown = async () => {
  */
 type UploadDataOptions = {
   onlyRundown?: boolean;
-}
+};
 export const uploadData = async (file: string, setProgress: (value: number) => void, options?: UploadDataOptions) => {
   const formData = new FormData();
   formData.append('userFile', file);
-  const onlyRundown = options?.onlyRundown;
+  const onlyRundown = options?.onlyRundown || 'false';
   await axios
     .post(`${ontimeURL}/db?onlyRundown=${onlyRundown}`, formData, {
       headers: {
         'Content-Type': 'multipart/form-data',
       },
       onUploadProgress: (progressEvent) => {
-        const complete = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+        const complete = progressEvent?.total ? Math.round((progressEvent.loaded * 100) / progressEvent.total) : 0;
         setProgress(complete);
       },
     })

apps/server/src/controllers/ontimeController.js

@@ -27,9 +27,8 @@ export const poll = async (req, res) => {
 export const dbDownload = async (req, res) => {
   const { title } = DataProvider.getEventData();
   const fileTitle = title || 'ontime data';
-  const dbInDisk = resolveDbPath();
 
-  res.download(dbInDisk, `${fileTitle}.json`, (err) => {
+  res.download(resolveDbPath, `${fileTitle}.json`, (err) => {
     if (err) {
       res.status(500).send({
         message: `Could not download the file: ${err}`,

apps/server/src/utils/parser.js

@@ -292,8 +292,7 @@ export const validateEvent = (eventArgs) => {
 
     const e = eventArgs;
     const d = eventDef;
-    const start =
-      e.timeStart != null && typeof e.timeStart === 'number' ? e.timeStart : d.timeStart;
+    const start = e.timeStart != null && typeof e.timeStart === 'number' ? e.timeStart : d.timeStart;
     const end = e.timeEnd != null && typeof e.timeEnd === 'number' ? e.timeEnd : d.timeEnd;
 
     event = {
@@ -344,9 +343,7 @@ export const fileHandler = async (file) => {
     try {
       const excelData = xlsx
         .parse(file, { cellDates: true })
-        .find(
-          ({ name }) => name.toLowerCase() === 'ontime' || name.toLowerCase() === 'event schedule'
-        );
+        .find(({ name }) => name.toLowerCase() === 'ontime' || name.toLowerCase() === 'event schedule');
 
       // we only look at worksheets called ontime or event schedule
       if (excelData?.data) {
@@ -379,7 +376,7 @@ export const fileHandler = async (file) => {
       return { error: true, message: 'Error parsing JSON file' };
     }
 
-    if (uploadedJson.settings.version === 1) {
+    if (uploadedJson.settings.version === 2) {
       try {
         res.data = await parseJson(uploadedJson);
         res.message = 'success';