-
-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: some fixes to ImportRecordsFlow component (#868)
* fix: some fixes to ImportRecordsFlow component * fix: scss font family lint error * fix: drag behavior * fix: improve example * fix: add required and defaultTo to attributes and set the match field as required * fix: read raw values from cells * fix: normalize data types * fix: change data structure send in onComplete event * fix: eslintrc config indent rule * fix: change select field to assign label
- Loading branch information
1 parent
6fcb7b8
commit 6f2f622
Showing
19 changed files
with
392 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 4 additions & 2 deletions
6
src/components/ImportRecordsFlow/helpers/getAssignFieldsData.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 64 additions & 15 deletions
79
src/components/ImportRecordsFlow/helpers/getDataToImport.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,65 @@ | ||
export default function getDataToImport(data, fieldsMap) { | ||
const fields = Object.keys(fieldsMap); | ||
return data.map(item => ({ | ||
...fields.reduce((acc, field) => { | ||
const keys = fieldsMap[field].split(','); | ||
const value = keys.reduce( | ||
(accumulator, key) => `${accumulator} ${item[key]}`.trim(), | ||
'', | ||
); | ||
return { | ||
...acc, | ||
[field]: value, | ||
}; | ||
}, {}), | ||
})); | ||
import ImportRecordsFlow from '../'; | ||
|
||
function getDateValue(value) { | ||
const date = new Date(value); | ||
const isValidDate = !isNaN(date.getTime()); | ||
return isValidDate ? date : ''; | ||
} | ||
|
||
function getTypeValue(value, dataType) { | ||
switch (dataType.name) { | ||
case 'String': | ||
return value; | ||
|
||
case 'Number': | ||
return !isNaN(Number(value)) ? Number(value) : ''; | ||
|
||
case 'Boolean': | ||
return !!value; | ||
|
||
case 'Date': | ||
return getDateValue(value); | ||
|
||
default: | ||
return value || ''; | ||
} | ||
} | ||
|
||
function getNormalizedFieldValue(value, attributeDef) { | ||
if (typeof attributeDef === 'function') { | ||
return getTypeValue(value, attributeDef); | ||
} | ||
if (typeof attributeDef.type === 'function') { | ||
return getTypeValue(value, attributeDef.type); | ||
} | ||
return value || ''; | ||
} | ||
|
||
export default function getDataToImport(params) { | ||
const actionTypeMap = { | ||
'add-records': ImportRecordsFlow.ADD_RECORDS, | ||
'merge-records': ImportRecordsFlow.MERGE_RECORDS, | ||
}; | ||
const { data, fieldsMap, schema, actionOption, matchField } = params; | ||
|
||
return { | ||
collection: schema.collection, | ||
actionType: actionTypeMap[actionOption], | ||
mergeByKey: matchField === 'default' ? '' : matchField, | ||
data: data.map(item => ({ | ||
...Object.keys(fieldsMap).reduce((acc, field) => { | ||
const keys = fieldsMap[field].split(','); | ||
const schemaField = schema.attributes[field]; | ||
const value = | ||
keys.reduce( | ||
(accumulator, key) => `${accumulator} ${item[key] || ''}`.trim(), | ||
'', | ||
) || schemaField.defaultTo; | ||
return { | ||
...acc, | ||
[field]: getNormalizedFieldValue(value, schemaField), | ||
}; | ||
}, {}), | ||
})), | ||
}; | ||
} |
45 changes: 45 additions & 0 deletions
45
src/components/ImportRecordsFlow/helpers/getFieldAssignedPreviewData.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
function getDateValue(value) { | ||
const date = new Date(value); | ||
const isValidDate = !isNaN(date.getTime()); | ||
return isValidDate ? value : ''; | ||
} | ||
|
||
function getTypeValue(value, dataType) { | ||
switch (dataType.name) { | ||
case 'String': | ||
return value; | ||
|
||
case 'Number': | ||
return !isNaN(Number(value)) ? value : ''; | ||
|
||
case 'Boolean': | ||
return value ? 'true' : 'false'; | ||
|
||
case 'Date': | ||
return getDateValue(value); | ||
|
||
default: | ||
return value || ''; | ||
} | ||
} | ||
|
||
function getNormalizedFieldValue(value, attributeDef) { | ||
if (typeof attributeDef === 'function') { | ||
return getTypeValue(value, attributeDef); | ||
} | ||
if (typeof attributeDef.type === 'function') { | ||
return getTypeValue(value, attributeDef.type); | ||
} | ||
return value || ''; | ||
} | ||
|
||
export default function getFieldAssignedPreviewData(data, field, fileFields, attributes) { | ||
return data.map(item => { | ||
const value = | ||
fileFields.reduce((acc, fileField) => `${acc} ${item[fileField] || ''}`.trim(), '') || | ||
attributes[field].defaultTo; | ||
return { | ||
[field]: getNormalizedFieldValue(value, attributes[field]), | ||
}; | ||
}); | ||
} |
49 changes: 49 additions & 0 deletions
49
src/components/ImportRecordsFlow/helpers/getPreviewDataToImport.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
function getDateValue(value) { | ||
const date = new Date(value); | ||
const isValidDate = !isNaN(date.getTime()); | ||
return isValidDate ? value : ''; | ||
} | ||
|
||
function getTypeValue(value, dataType) { | ||
switch (dataType.name) { | ||
case 'String': | ||
return value; | ||
|
||
case 'Number': | ||
return !isNaN(Number(value)) ? value : ''; | ||
|
||
case 'Boolean': | ||
return value ? 'true' : 'false'; | ||
|
||
case 'Date': | ||
return getDateValue(value); | ||
|
||
default: | ||
return value || ''; | ||
} | ||
} | ||
|
||
function getNormalizedFieldValue(value, attributeDef) { | ||
if (typeof attributeDef === 'function') { | ||
return getTypeValue(value, attributeDef); | ||
} | ||
if (typeof attributeDef.type === 'function') { | ||
return getTypeValue(value, attributeDef.type); | ||
} | ||
return value || ''; | ||
} | ||
|
||
export default function getPreviewDataToImport(data, fieldsMap, attributes) { | ||
return data.map(item => ({ | ||
...Object.keys(fieldsMap).reduce((acc, field) => { | ||
const keys = fieldsMap[field].split(','); | ||
const value = | ||
keys.reduce((accumulator, key) => `${accumulator} ${item[key] || ''}`.trim(), '') || | ||
attributes[field].defaultTo; | ||
return { | ||
...acc, | ||
[field]: getNormalizedFieldValue(value, attributes[field]), | ||
}; | ||
}, {}), | ||
})); | ||
} |
9 changes: 9 additions & 0 deletions
9
src/components/ImportRecordsFlow/helpers/isStepThreeNextButtonDisabled.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
export default function isStepThreeNextButtonDisabled(params) { | ||
const { fieldsMap, attributes, matchField } = params; | ||
const fieldsArray = Object.keys(attributes); | ||
return ( | ||
fieldsArray.some( | ||
field => (attributes[field].required || field === matchField) && !fieldsMap[field], | ||
) || fieldsArray.every(field => !fieldsMap[field]) | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.