From df51b57eb22eea37b2c3bc5594b705e63c176a63 Mon Sep 17 00:00:00 2001 From: Arthur Andrade Date: Tue, 5 Mar 2024 15:06:20 -0300 Subject: [PATCH 1/5] fix: Apply adjusts in bulk import feature Signed-off-by: Arthur Andrade --- .../CreateOrganizationButton.tsx | 4 +-- .../UploadingScreen/ValidatingScreen.tsx | 32 ++++++++++++------- react/components/UploadingScreen/index.tsx | 2 +- react/hooks/useBulkImportDetailsQuery.ts | 2 +- react/types/BulkImport.d.ts | 4 +-- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/react/components/CreateOrganizationButton/CreateOrganizationButton.tsx b/react/components/CreateOrganizationButton/CreateOrganizationButton.tsx index 7f8022b3..8b09e7ed 100644 --- a/react/components/CreateOrganizationButton/CreateOrganizationButton.tsx +++ b/react/components/CreateOrganizationButton/CreateOrganizationButton.tsx @@ -26,7 +26,7 @@ import type { } from '../../types/BulkImport' import useStartBulkImport from '../../hooks/useStartBulkImport' import ReportDownloadLink from '../ReportDownloadLink/ReportDownloadLink' -import { ValidationScreen } from '../UploadingScreen' +import { UploadingScreen } from '../UploadingScreen' import { ImportInBulkTooltip } from '../ImportInBulkTooltip' import { B2B_BULK_IMPORT_TEMPLATE_LINK, @@ -91,7 +91,7 @@ const CreateOrganizationButton = () => { onOpenChange={setUploadModalOpen} uploadFile={uploadBulkImportFile} onUploadFinish={handleUploadFinish} - uploadingScreen={props => } + uploadingScreen={props => } errorScreen={props => ( )} diff --git a/react/components/UploadingScreen/ValidatingScreen.tsx b/react/components/UploadingScreen/ValidatingScreen.tsx index 979ce77c..c8089377 100644 --- a/react/components/UploadingScreen/ValidatingScreen.tsx +++ b/react/components/UploadingScreen/ValidatingScreen.tsx @@ -23,9 +23,11 @@ const ValidatingScreen = ({ useBulkImportDetailsQuery({ importId, - refreshInterval: 30 * 1000, + refreshInterval: 5 * 1000, onSuccess: data => { - if (data.importState === 'ReadyToImport') { + if (['InValidation', 'InProgress'].includes(data.importState)) return + + if (['ReadyToImport', 'Completed'].includes(data.importState)) { onUploadFinished({ status: 'success', data: { @@ -39,16 +41,22 @@ const ValidatingScreen = ({ return } - onUploadFinished({ - status: 'error', - showReport: data?.importState === 'ValidationFailed', - data: { - error: 'FieldValidationError', - errorDownloadLink: data?.validationResult?.reportDownloadLink ?? '', - validationResult: data?.validationResult?.validationResult ?? [], - fileName: data.fileName, - }, - }) + if ( + ['ValidationFailed', 'CompletedWithError', 'Failed'].includes( + data.importState + ) + ) { + onUploadFinished({ + status: 'error', + showReport: data?.importState === 'ValidationFailed', + data: { + error: 'FieldValidationError', + errorDownloadLink: data?.validationResult?.reportDownloadLink ?? '', + validationResult: data?.validationResult?.validationResult ?? [], + fileName: data.fileName, + }, + }) + } }, }) diff --git a/react/components/UploadingScreen/index.tsx b/react/components/UploadingScreen/index.tsx index 332b1c3e..e9f7043e 100644 --- a/react/components/UploadingScreen/index.tsx +++ b/react/components/UploadingScreen/index.tsx @@ -1,2 +1,2 @@ -export { default as ValidationScreen } from './UploadingScreen' +export { default as UploadingScreen } from './UploadingScreen' export type { UploadingScreenProps } from './UploadingScreen' diff --git a/react/hooks/useBulkImportDetailsQuery.ts b/react/hooks/useBulkImportDetailsQuery.ts index 8d359cbf..8da853a9 100644 --- a/react/hooks/useBulkImportDetailsQuery.ts +++ b/react/hooks/useBulkImportDetailsQuery.ts @@ -11,7 +11,7 @@ export type UseBulkImportDetailsQueryProps = { const useBulkImportDetailsQuery = ({ importId, - onSuccess, + onSuccess = () => {}, refreshInterval = 0, }: UseBulkImportDetailsQueryProps) => { return useSWR( diff --git a/react/types/BulkImport.d.ts b/react/types/BulkImport.d.ts index 2004611c..de41b88c 100644 --- a/react/types/BulkImport.d.ts +++ b/react/types/BulkImport.d.ts @@ -1,10 +1,10 @@ import type { UploadFinishedData } from '@vtex/bulk-import-ui' type ImportState = - | 'ReadyToImport' | 'InProgress' - | 'Completed' | 'InValidation' + | 'ReadyToImport' + | 'Completed' | 'ValidationFailed' | 'CompletedWithError' | 'Failed' From a875a421bcede7a5f2f9ac273c4dfba7c3f51de9 Mon Sep 17 00:00:00 2001 From: Arthur Andrade Date: Tue, 5 Mar 2024 15:19:31 -0300 Subject: [PATCH 2/5] fix: Change a tag for admin ui Anchor Signed-off-by: Arthur Andrade --- react/components/UploadModal/ReportInformationDetails.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react/components/UploadModal/ReportInformationDetails.tsx b/react/components/UploadModal/ReportInformationDetails.tsx index fc700f5f..0965280d 100644 --- a/react/components/UploadModal/ReportInformationDetails.tsx +++ b/react/components/UploadModal/ReportInformationDetails.tsx @@ -1,4 +1,4 @@ -import { Text, csx } from '@vtex/admin-ui' +import { Anchor, Text, csx } from '@vtex/admin-ui' import React from 'react' import { useTranslate } from '../../hooks' @@ -39,10 +39,10 @@ const ReportInformationDetails = ({
    {t('reportInformationStep4', { 'template-link': (content: string) => ( - {content} + {content} ), 'best-practices-link': (content: string) => ( - {content} + {content} ), })}
From a921f8a2712e0ee76699a9ca2bb2f6ef63f0a7f2 Mon Sep 17 00:00:00 2001 From: Arthur Andrade Date: Tue, 5 Mar 2024 15:30:47 -0300 Subject: [PATCH 3/5] fix: Chang translation for permissionAlertTooltip Signed-off-by: Arthur Andrade --- messages/ar.json | 2 +- messages/bg.json | 2 +- messages/ca.json | 2 +- messages/context.json | 2 +- messages/cs.json | 2 +- messages/da.json | 2 +- messages/de.json | 2 +- messages/el.json | 2 +- messages/en.json | 2 +- messages/es.json | 2 +- messages/fi.json | 2 +- messages/fr.json | 2 +- messages/id.json | 2 +- messages/it.json | 2 +- messages/ja.json | 2 +- messages/ko.json | 2 +- messages/nl.json | 2 +- messages/no.json | 2 +- messages/pl.json | 2 +- messages/pt.json | 2 +- messages/ro.json | 2 +- messages/ru.json | 2 +- messages/sk.json | 2 +- messages/sl.json | 2 +- messages/sv.json | 2 +- messages/th.json | 2 +- messages/uk.json | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/messages/ar.json b/messages/ar.json index 9f8a9515..46163749 100644 --- a/messages/ar.json +++ b/messages/ar.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "هل تحتاج للمساعدة؟", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "تحقق من أفضل ممارسات دليل الاستيراد لدينا", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "تحميل XLSX المصحَّح", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "حدث خطأ ما أثناء الاستيراد. الرجاء المحاولة مرة أخرى.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "اسم المنظمة", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "المستخدم المُشرف", diff --git a/messages/bg.json b/messages/bg.json index 1756fe9f..16166b61 100644 --- a/messages/bg.json +++ b/messages/bg.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Нуждаете се от помощ?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Разгледайте нашето Ръководство за най-добри практики при импортиране", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Изтегляне на прегледани XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Нещо се обърка при импортирането. Моля, опитайте отново.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Име на организацията", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Админ потребител", diff --git a/messages/ca.json b/messages/ca.json index c2b72729..97f96d9a 100644 --- a/messages/ca.json +++ b/messages/ca.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Necessiteu ajuda?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Consulteu la nostra Guia d'importació de pràctiques recomanades", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Baixa el fitxer XLSX revisat", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Alguna cosa ha anat malament amb la importació. Torneu-ho a provar.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Nom de l'organització", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Usuari administrador", diff --git a/messages/context.json b/messages/context.json index fbaaf966..69739267 100644 --- a/messages/context.json +++ b/messages/context.json @@ -153,7 +153,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.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "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": "admin/b2b-organizations.organization-requests-admin.table.column-name.title", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "admin/b2b-organizations.organization-requests-admin.table.column-admin.title", diff --git a/messages/cs.json b/messages/cs.json index f2a2fbf1..f12f0cd4 100644 --- a/messages/cs.json +++ b/messages/cs.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Potřebujete pomoc?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Nahlédněte do našeho průvodce osvědčenými postupy při importu", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Stáhnout zkontrolovaný XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Při importu se něco pokazilo. Zkuste to prosím znovu.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Název organizace", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Uživatel správce", diff --git a/messages/da.json b/messages/da.json index 51f2c28c..f91c0845 100644 --- a/messages/da.json +++ b/messages/da.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Brug for hjælp?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Se vores importvejledning til bedste praksis", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Download gennemgået XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Der gik noget galt med importen. Prøv igen.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Organisationens navn", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Admin-bruger", diff --git a/messages/de.json b/messages/de.json index 80c7c0ee..4d66f801 100644 --- a/messages/de.json +++ b/messages/de.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Benötigen Sie Hilfe?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Lesen Sie unseren Best Practices Import Guide", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Überprüftes XLSX herunterladen", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Beim Import ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Name der Organisation", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Admin-Benutzer", diff --git a/messages/el.json b/messages/el.json index 2d9d3f8c..5adba9cd 100644 --- a/messages/el.json +++ b/messages/el.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Χρειάζεστε βοήθεια;", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Ελέγξτε τον Οδηγό εισαγωγής βέλτιστων πρακτικών", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Λήψη αναθεωρημένου XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Κάτι πήγε στραβά με την εισαγωγή. Δοκιμάστε ξανά.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Όνομα οργανισμού", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Χρήστης διαχείρισης", diff --git a/messages/en.json b/messages/en.json index c5261078..fac3a25a 100644 --- a/messages/en.json +++ b/messages/en.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Need help?", "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.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "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", diff --git a/messages/es.json b/messages/es.json index cefd4b4e..21b870cc 100644 --- a/messages/es.json +++ b/messages/es.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "¿Necesitas ayuda?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Consulta nuestra Guía de mejores prácticas de importación", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Descargar XLSX revisado", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Se produjo un error al importar. Por favor, vuelve a intentarlo.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Nombre de la organización", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Usuario admin", diff --git a/messages/fi.json b/messages/fi.json index 584e1abc..b5a2d48b 100644 --- a/messages/fi.json +++ b/messages/fi.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Tarvitsetko apua?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Tutustu parhaiden käytäntöjen tuontioppaaseen", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Lataa tarkistettu XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Jokin meni pieleen tuonnissa. Yritä uudelleen.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Organisaation nimi", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Järjestelmänvalvojakäyttäjä", diff --git a/messages/fr.json b/messages/fr.json index 1adf031e..485d7d4c 100644 --- a/messages/fr.json +++ b/messages/fr.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Besoin d’aide ?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Consultez notre guide d'importation des meilleures pratiques", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Téléchargez le XLSX révisé", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Une erreur est survenue avec l'importation. Veuillez réessayer.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Nom de l’organisation", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Administrateur", diff --git a/messages/id.json b/messages/id.json index add15ede..428c808f 100644 --- a/messages/id.json +++ b/messages/id.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Butuh bantuan?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Lihat Panduan Praktik Impor Terbaik kami", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Unduh Ulasan XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Ada yang tidak beres pada impor. Silakan coba lagi.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Nama Organisasi", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Pengguna Admin", diff --git a/messages/it.json b/messages/it.json index 0274f334..f12f5d81 100644 --- a/messages/it.json +++ b/messages/it.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Hai bisogno di una mano?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Consulta la nostra guida sulle procedure di importazione consigliate", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Scarica il file XLSX revisionato", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Si è verificato un errore durante l'importazione. Riprova.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Nome organizzazione", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Utente admin", diff --git a/messages/ja.json b/messages/ja.json index 0d71229d..c00fea36 100644 --- a/messages/ja.json +++ b/messages/ja.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "ヘルプが必要ですか？", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "ベストプラクティスインポートガイドをご覧ください", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "レビュー済みの XLSX をダウンロードする", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "インポート時にエラーが発生しました。もう一度やり直してください。", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "組織名", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "管理者ユーザー", diff --git a/messages/ko.json b/messages/ko.json index 3a5b799d..07d759f1 100644 --- a/messages/ko.json +++ b/messages/ko.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "도움이 필요하신가요?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "모범 사례 가져오기 가이드 확인", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "검토된 XLSX 다운로드", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "가져오기에 문제가 발생했습니다. 다시 시도해 주세요.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "조직명", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "관리 사용자", diff --git a/messages/nl.json b/messages/nl.json index aa4cc4b9..d728c21d 100644 --- a/messages/nl.json +++ b/messages/nl.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Hulp nodig?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Bekijk onze importgids voor beste praktijken", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Herzien XLSX downloaden", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Er is iets misgegaan bij het importeren. Probeer het opnieuw.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Naam organisatie", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Admin gebruiker", diff --git a/messages/no.json b/messages/no.json index 02d53b2a..08057a7f 100644 --- a/messages/no.json +++ b/messages/no.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Trenger du hjelp?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Ta en titt på veiledningen vår for de beste importløsningene", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Last ned revidert XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Noe gikk galt med importen, prøv igjen.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Organisasjonsnavn", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Administratorbruker", diff --git a/messages/pl.json b/messages/pl.json index e25da8d1..2f4c462f 100644 --- a/messages/pl.json +++ b/messages/pl.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Potrzebujesz pomocy?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Sprawdź nasz Przewodnik po najlepszych praktykach dotyczących importu", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Pobierz sprawdzony plik XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Coś poszło nie tak z importem. Spróbuj ponownie.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Nazwa organizacji", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Użytkownik admin", diff --git a/messages/pt.json b/messages/pt.json index dbeb2ddf..6b7437bf 100644 --- a/messages/pt.json +++ b/messages/pt.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": " Precisa de ajuda?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Consulte nosso Guia de melhores práticas de importação", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Baixar XLSX revisado", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Algo deu errado durante a importação. Tente novamente.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Nome da organização", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Usuário Admin", diff --git a/messages/ro.json b/messages/ro.json index 65687c8b..8bb6558f 100644 --- a/messages/ro.json +++ b/messages/ro.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Ai nevoie de ajutor?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Consultă Ghidul nostru de bune practici privind importul", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Descarcă fișierul XLSX revizuit", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Ceva nu a mers bine la import. Te rugăm să încerci din nou.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Numele organizației", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Utilizator Administrator", diff --git a/messages/ru.json b/messages/ru.json index 35c0bde1..57388ae8 100644 --- a/messages/ru.json +++ b/messages/ru.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Нужна помощь?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Ознакомьтесь с нашим руководством по импортированию", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Скачать проверенный XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Сбой импортирования. Повторите попытку.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Название организации", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Администратор", diff --git a/messages/sk.json b/messages/sk.json index 2265f146..8e4e85ae 100644 --- a/messages/sk.json +++ b/messages/sk.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Potrebujete pomoc?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Pozrite si nášho sprievodcu osvedčenými postupmi importovania", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Stiahnuť skontrolovaný súbor XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Pri importe sa vyskytla chyba. Skúste to znova.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Názov organizácie", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Správca používateľa", diff --git a/messages/sl.json b/messages/sl.json index 2017e732..9f92ddff 100644 --- a/messages/sl.json +++ b/messages/sl.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Potrebujete pomoč?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Oglejte si naš Vodnik po najboljših praksah za uvoz", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Prenesite pregledano XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Pri uvozu je šlo nekaj narobe. Poskusite znova.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Ime organizacije", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Skrbniški uporabnik", diff --git a/messages/sv.json b/messages/sv.json index ca8d9065..edc329d5 100644 --- a/messages/sv.json +++ b/messages/sv.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Behöver du hjälp?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Kolla in vår Importguide för bästa praxis", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Ladda ner granskad XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Något gick fel med importen. Försök igen, tack.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Företagsnamn", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Administratör", diff --git a/messages/th.json b/messages/th.json index 13b7a0ae..656ab378 100644 --- a/messages/th.json +++ b/messages/th.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "ต้องการความช่วยเหลือหรือไม่", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "โปรดดูคู่มือการนำเข้าที่ดีที่สุดของเรา", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "ดาวน์โหลด XLSX ที่ตรวจสอบแล้ว", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "มีบางอย่างผิดปกติกับการนำเข้า โปรดลองอีกครั้ง", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "ชื่อองค์กร", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "ผู้ใช้ Admin", diff --git a/messages/uk.json b/messages/uk.json index 4fd4bfa5..e78257fe 100644 --- a/messages/uk.json +++ b/messages/uk.json @@ -153,7 +153,7 @@ "admin/b2b-organizations.bulk-import.import.reportInformationStep4NeedGuidance": "Потрібна допомога?", "admin/b2b-organizations.bulk-import.import.reportInformationStep4ImportGuide": "Ознайомтеся з нашим посібником з імпортування", "admin/b2b-organizations.bulk-import.import.downloadReviewedLink": "Завантажити перевірений XLSX", - "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "You don't have permission to access the Bulk Import", + "admin/b2b-organizations.bulk-import.import.permissionAlertTooltip": "Permission required", "admin/b2b-organizations.bulk-import.import.errorMessage": "Збій імпортування. Повторіть спробу.", "admin/b2b-organizations.organization-requests-admin.table.column-name.title": "Назва організації", "admin/b2b-organizations.organization-requests-admin.table.column-admin.title": "Адміністратор", From 4d425b6721b2544ca397f67ab8b658946373cad8 Mon Sep 17 00:00:00 2001 From: Arthur Andrade Date: Tue, 5 Mar 2024 15:38:47 -0300 Subject: [PATCH 4/5] feat: update package Signed-off-by: Arthur Andrade --- react/package.json | 2 +- react/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/react/package.json b/react/package.json index eaded097..3420b903 100644 --- a/react/package.json +++ b/react/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "@vtex/admin-ui": "^0.136.1", - "@vtex/bulk-import-ui": "1.1.8", + "@vtex/bulk-import-ui": "1.1.9", "@vtex/css-handles": "^1.0.0", "apollo-client": "^2.6.10", "axios": "1.4.0", diff --git a/react/yarn.lock b/react/yarn.lock index 82933305..dae457a0 100644 --- a/react/yarn.lock +++ b/react/yarn.lock @@ -2192,10 +2192,10 @@ tiny-warning "^1.0.3" use-debounce "^7.0.0" -"@vtex/bulk-import-ui@1.1.8": - version "1.1.8" - resolved "https://registry.yarnpkg.com/@vtex/bulk-import-ui/-/bulk-import-ui-1.1.8.tgz#fcbdda205504b746ae87e1398944e3c14c5d9670" - integrity sha512-wZh6++7yOL8ZY29ga2lEGrpQJVUnDF/9ILIlC/m8grxCKCGu1FsVDL1dDBMtJ8l48sW7SrIquHJTMm5DhTr+QA== +"@vtex/bulk-import-ui@1.1.9": + version "1.1.9" + resolved "https://registry.yarnpkg.com/@vtex/bulk-import-ui/-/bulk-import-ui-1.1.9.tgz#ee6bd3dac6b807eb9c3e3febb38191d06c5fb238" + integrity sha512-qq153m7iUGmzkwkMzDS7GLEU3C1VzOwwSByTCFPuOkTfGyB0//gbGQMvGvkfw4nrKrFThwydgm8LMasQl5595w== dependencies: "@vtex/admin-ui" "^0.136.1" From afe7a0b9383f82a05c580215aef9831228bbb5fb Mon Sep 17 00:00:00 2001 From: Arthur Andrade Date: Tue, 5 Mar 2024 17:49:02 -0300 Subject: [PATCH 5/5] chore: Add Changelog Signed-off-by: Arthur Andrade --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c95fe689..6d81cb34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Fixes + +- Apply fixes on bulk import feature + ## [1.31.0] - 2024-02-27 ### Added