Skip to content
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.

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

hotfix: fix error message in bulk import #147

Merged
merged 2 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Fixed

- Fix error message in bulk import

## [1.29.0] - 2024-01-03

### Added
Expand Down
143 changes: 72 additions & 71 deletions messages/ar.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/bg.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/ca.json

Large diffs are not rendered by default.

471 changes: 236 additions & 235 deletions messages/context.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/cs.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/da.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/de.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/el.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
"admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": " Need guidance?",
"admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Check our Best Practices Import Guide",
"admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Download Reviewed .XLSX",
"admin/b2b-organizations.bulk-import.import.errorMessage": "Something went wrong with the import. Please try again.",
"admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Organization Name",
"admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Admin User",
"admin/b2b-organizations.organization-requests-admin.table.column-status.title": "Status",
Expand Down
143 changes: 72 additions & 71 deletions messages/es.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/fi.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/fr.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/id.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/it.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/ja.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/ko.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/nl.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/no.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/pl.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/pt.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/ro.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/ru.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/sk.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/sl.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/sv.json

Large diffs are not rendered by default.

146 changes: 72 additions & 74 deletions messages/th.json

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions messages/uk.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions react/bulkImport/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export type BulkImportMessageKey =
| 'reportInformationStep3Import'
| 'reportInformationStep4'
| 'downloadReviewedLink'
| 'errorMessage'

export const bulkUploadMessages: Record<
BulkImportMessageKey,
Expand Down Expand Up @@ -207,6 +208,9 @@ export const bulkUploadMessages: Record<
downloadReviewedLink: {
id: 'admin/b2b-organizations.bulk-import.import.downloadReviewedLink',
},
errorMessage: {
id: 'admin/b2b-organizations.bulk-import.import.errorMessage',
},
})

export const hasTranslation = (key: string): key is BulkImportMessageKey => {
Expand Down
11 changes: 8 additions & 3 deletions react/components/BulkImportList/BulkImportList.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
import React from 'react'
import { ImportAlertError } from '@vtex/bulk-import-ui'

import { useBulkImportsQuery } from '../../hooks'
import { useBulkImportsQuery, useTranslate } from '../../hooks'
import ImportAlertList from '../ImportAlertList/ImportAlertList'

const BulkImportList = () => {
const { data, error, mutate } = useBulkImportsQuery()

if (error?.message)
const { translate: t } = useTranslate()

if (error?.message) {
console.error(error)

return (
<ImportAlertError onTryAgainClick={mutate}>
{JSON.stringify(error)}
{t('errorMessage')}
</ImportAlertError>
)
}

if (data) return <ImportAlertList data={data} />

Expand Down
Loading