refactor: update import fields (#433)

* refactor: update import fields + remove end message + add timer type + add end action * chore: update tests * version bump
cpvalente · Jun 11, 2023 · b273ac5 · b273ac5
1 parent 971a766
commit b273ac5
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 897 deletions.
diff --git a/apps/client/package.json b/apps/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ontime-ui",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "private": true,
   "dependencies": {
     "@chakra-ui/react": "^2.5.5",

diff --git a/apps/electron/package.json b/apps/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "author": "Carlos Valente",
   "description": "Time keeping for live events",
   "repository": "https://github.com/cpvalente/ontime",

diff --git a/apps/server/package.json b/apps/server/package.json
@@ -2,7 +2,7 @@
   "name": "ontime-server",
   "type": "module",
   "main": "src/index.ts",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "exports": "./src/index.js",
   "dependencies": {
     "body-parser": "^1.20.0",

diff --git a/apps/server/src/utils/__tests__/parser.test.js b/apps/server/src/utils/__tests__/parser.test.js
@@ -587,10 +587,10 @@ describe('test parseExcel function', () => {
       ['Ontime ┬À Schedule Template'],
       [],
       ['Event Name', 'Test Event'],
-      ['Event URL', 'www.carlosvalente.com'],
+      ['Public URL', 'www.public.com'],
+      ['Backstage URL', 'www.backstage.com'],
       ['Public Info', 'test public info'],
       ['Backstage Info', 'test backstage info'],
-      ['End Message', 'test end message'],
       [],
       [],
       [
@@ -599,6 +599,8 @@ describe('test parseExcel function', () => {
         'Event Title',
         'Presenter Name',
         'Event Subtitle',
+        'End Action',
+        'Timer type',
         'Is Public? (x)',
         'Skip? (x)',
         'Notes',
@@ -620,6 +622,8 @@ describe('test parseExcel function', () => {
         'Guest Welcome',
         'Carlos',
         'Getting things started',
+        '',
+        '',
         'x',
         '',
         'Ballyhoo',
@@ -645,6 +649,8 @@ describe('test parseExcel function', () => {
         'A song from the hearth',
         'Still Carlos',
         'Derailing early',
+        'clock',
+        'load-next',
         '',
         '',
         'Rainbow chase',
@@ -669,11 +675,10 @@ describe('test parseExcel function', () => {
 
     const expectedParsedEvent = {
       title: 'Test Event',
-      publicUrl: '',
-      backstageUrl: '',
+      publicUrl: 'www.public.com',
+      backstageUrl: 'www.backstage.com',
       publicInfo: 'test public info',
       backstageInfo: 'test backstage info',
-      endMessage: 'test end message',
     };
 
     const expectedParsedRundown = [
@@ -683,6 +688,8 @@ describe('test parseExcel function', () => {
         title: 'Guest Welcome',
         presenter: 'Carlos',
         subtitle: 'Getting things started',
+        timerType: 'count-down',
+        endAction: 'none',
         isPublic: true,
         skip: false,
         note: 'Ballyhoo',
@@ -705,6 +712,8 @@ describe('test parseExcel function', () => {
         title: 'A song from the hearth',
         presenter: 'Still Carlos',
         subtitle: 'Derailing early',
+        timerType: 'clock',
+        endAction: 'load-next',
         isPublic: false,
         skip: true,
         note: 'Rainbow chase',