Skip to content

Fix Column is out of page when importing txt file #48640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 4 commits into from
Sep 10, 2024
Merged

Fix Column is out of page when importing txt file #48640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
effc2b2
Fix column header going out of screen
filip-solecki Sep 5, 2024
b32d611
Fix some translations
filip-solecki Sep 5, 2024
13bfe4b
Merge branch 'main' into categories-import/column-header-txt
Guccio163 Sep 10, 2024
0ecea56
change column lines to 1
Guccio163 Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/components/ImportColumn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,17 @@ function ImportColumn({column, columnName, columnRoles, columnIndex}: ImportColu

return (
<View style={[styles.importColumnCard, styles.mt4]}>
<Text style={[styles.textSupporting, styles.mw100]}>{columnHeader}</Text>
<Text
numberOfLines={1}
style={[styles.textSupporting, styles.mw100]}
>
{columnHeader}
</Text>
<View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2]}>
<Text
numberOfLines={2}
ellipsizeMode="tail"
style={[styles.flex1, styles.flexWrap]}
style={[styles.flex1, styles.flexWrap, styles.breakAll]}
>
{columnValuesString}
</Text>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ImportSpreadsheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function ImportSpreedsheet({backTo, goTo}: ImportSpreedsheetProps) {
}

if ((file?.size ?? 0) <= 0) {
setUploadFileError(true, 'attachmentPicker.attachmentTooSmall', 'attachmentPicker.sizeNotMet');
setUploadFileError(true, 'attachmentPicker.attachmentTooSmall', 'spreadsheet.sizeNotMet');
return false;
}
return true;
Expand Down
1 change: 1 addition & 0 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ export default {
importCategoriesSuccessfullDescription: (categories: number) => (categories > 1 ? `${categories} categories have been added.` : '1 category has been added.'),
importFailedTitle: 'Import failed',
importFailedDescription: 'Please ensure all fields are filled out correctly and try again. If the problem persists, please reach out to Concierge.',
sizeNotMet: 'File size must be greater than 0 bytes',
invalidFileMessage:
'The file you uploaded is either empty or contains invalid data. Please ensure that the file is correctly formatted and contains the necessary information before uploading it again.',
importSpreadsheet: 'Import spreadsheet',
Expand Down
3 changes: 2 additions & 1 deletion src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,8 +677,9 @@ export default {
importFailedDescription: 'Por favor, asegúrate de que todos los campos estén llenos correctamente e inténtalo de nuevo. Si el problema persiste, por favor contacta a Concierge.',
importCategoriesSuccessfullDescription: (categories: number) => (categories > 1 ? `Se han agregado ${categories} categorías.` : 'Se ha agregado 1 categoría.'),
importSuccessfullTitle: 'Importar categorías',
sizeNotMet: 'El archivo adjunto debe ser más grande que 0 bytes.',
invalidFileMessage:
'El archivo que ha cargado está vacío o contiene datos no válidos. Asegúrese de que el archivo tiene el formato correcto y contiene la información necesaria antes de volver a cargarlo.',
'El archivo que subiste está vacío o contiene datos no válidos. Asegúrate de que el archivo esté correctamente formateado y contenga la información necesaria antes de volver a subirlo.',
importSpreadsheet: 'Importar hoja de cálculo',
downloadCSV: 'Descargar CSV',
},
Expand Down