mirror of
https://github.com/cpvalente/ontime.git
synced 2026-08-11 18:33:53 +00:00
refactor: simplify custom field shape
This commit is contained in:
committed by
Carlos Valente
parent
cf14b0b427
commit
c4136a0ec7
@@ -883,16 +883,16 @@ describe('parseExcel()', () => {
|
||||
skip: false,
|
||||
note: 'Ballyhoo',
|
||||
custom: {
|
||||
user0: { value: 'a0' },
|
||||
user1: { value: 'a1' },
|
||||
user2: { value: 'a2' },
|
||||
user3: { value: 'a3' },
|
||||
user4: { value: 'a4' },
|
||||
user5: { value: 'a5' },
|
||||
user6: { value: 'a6' },
|
||||
user7: { value: 'a7' },
|
||||
user8: { value: 'a8' },
|
||||
user9: { value: 'a9' },
|
||||
user0: 'a0',
|
||||
user1: 'a1',
|
||||
user2: 'a2',
|
||||
user3: 'a3',
|
||||
user4: 'a4',
|
||||
user5: 'a5',
|
||||
user6: 'a6',
|
||||
user7: 'a7',
|
||||
user8: 'a8',
|
||||
user9: 'a9',
|
||||
},
|
||||
colour: 'red',
|
||||
type: 'event',
|
||||
@@ -908,8 +908,8 @@ describe('parseExcel()', () => {
|
||||
skip: true,
|
||||
note: 'Rainbow chase',
|
||||
custom: {
|
||||
user0: { value: 'b0' },
|
||||
user5: { value: 'b5' },
|
||||
user0: 'b0',
|
||||
user5: 'b5',
|
||||
},
|
||||
colour: '#F00',
|
||||
type: 'event',
|
||||
|
||||
@@ -214,7 +214,7 @@ export const parseExcel = (excelData: unknown[][], options?: Partial<ImportMap>)
|
||||
} else if (j in customFieldIndexes) {
|
||||
const importKey = customFieldIndexes[j];
|
||||
const ontimeKey = customFieldImportKeys[importKey];
|
||||
eventCustomFields[ontimeKey] = { value: makeString(column, '') };
|
||||
eventCustomFields[ontimeKey] = makeString(column, '');
|
||||
} else {
|
||||
// 2. if there is no flag, lets see if we know the field type
|
||||
if (typeof column === 'string') {
|
||||
|
||||
Reference in New Issue
Block a user