Improve spreadsheet import flow (#839)

* feat: add dropdown to worksheet selection

* feat: move revoke to separate button

* refactor: extract excel flow to separate controller and service

* chore: show spinner when uploading sheet and disable the other option

* chore: don't show "success" when canceling the import

* chore: export boolean types properly to sheets

apps/server/src/services/sheet-service/SheetService.ts

@@ -12,7 +12,7 @@ import got from 'got';
 
 import { resolveSheetsDirectory } from '../../setup/index.js';
 import { ensureDirectory } from '../../utils/fileManagement.js';
-import { type ClientSecret, cellRequestFromEvent, getA1Notation, validateClientSecret } from './sheetUtils.js';
+import { cellRequestFromEvent, type ClientSecret, getA1Notation, validateClientSecret } from './sheetUtils.js';
 import { ImportMap } from 'ontime-utils';
 import { parseExcel } from '../../utils/parser.js';
 import { logger } from '../../classes/Logger.js';
@@ -190,11 +190,11 @@ function verifyConnection(
   }
 }
 
-export function hasAuth(): { authenticated: AuthenticationStatus } {
+export function hasAuth(): { authenticated: AuthenticationStatus; sheetId: string } {
   if (cleanupTimeout) {
-    return { authenticated: 'pending' };
+    return { authenticated: 'pending', sheetId: currentSheetId };
   }
-  return { authenticated: currentAuthClient ? 'authenticated' : 'not_authenticated' };
+  return { authenticated: currentAuthClient ? 'authenticated' : 'not_authenticated', sheetId: currentSheetId };
 }
 
 async function verifySheet(

apps/server/src/services/sheet-service/__tests__/sheetUtils.test.ts

@@ -108,7 +108,7 @@ describe('cellRequestFromEvent()', () => {
     expect(result).toStrictEqual(millisToString(event.duration));
   });
 
-  test('boolean to x', () => {
+  test('boolean to TRUE', () => {
     const event: OntimeEvent = {
       type: SupportedEvent.Event,
       cue: '1',
@@ -149,8 +149,8 @@ describe('cellRequestFromEvent()', () => {
       timeDanger: { row: 1, col: 41 },
     };
     const result = cellRequestFromEvent(event, 1, 1234, metadata);
-    expect(result.updateCells.rows[0].values[11].userEnteredValue.stringValue).toStrictEqual('x');
-    expect(result.updateCells.rows[0].values[12].userEnteredValue.stringValue).toStrictEqual('');
+    expect(result.updateCells.rows[0].values[11].userEnteredValue.boolValue).toStrictEqual(true);
+    expect(result.updateCells.rows[0].values[12].userEnteredValue.boolValue).toStrictEqual(false);
   });
 
   test('spacing in metadata', () => {

apps/server/src/services/sheet-service/sheetUtils.ts

@@ -1,4 +1,4 @@
-import { OntimeRundownEntry, isOntimeBlock, isOntimeEvent } from 'ontime-types';
+import { isOntimeBlock, isOntimeEvent, OntimeRundownEntry } from 'ontime-types';
 import { millisToString } from 'ontime-utils';
 
 import { sheets_v4 } from '@googleapis/sheets';
@@ -111,7 +111,7 @@ export function cellRequestFromEvent(
         });
       } else if (typeof event[key] === 'boolean') {
         returnRows.push({
-          userEnteredValue: { stringValue: event[key] ? 'x' : '' },
+          userEnteredValue: { boolValue: event[key] },
         });
       } else {
         returnRows.push({});