Skip to content

Commit 8b4cc1a

Browse files
rlinozrlinoz
authored
Merge pull request Expensify#65398 from nkdengineer/fix/65056
fix: update CSV upload options for Members
2 parents 32abd07 + a1d88ad commit 8b4cc1a

24 files changed

Lines changed: 452 additions & 9 deletions

File tree

‎src/ONYXKEYS.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,13 @@ const ONYXKEYS = {
471471

472472
/** Stores the user search value for persistence across the screens */
473473
ROOM_MEMBERS_USER_SEARCH_PHRASE: 'roomMembersUserSearchPhrase',
474+
474475
/** Stores information about recently uploaded spreadsheet file */
475476
IMPORTED_SPREADSHEET: 'importedSpreadsheet',
476477

478+
/** Stores the information about the members imported from the spreadsheet */
479+
IMPORTED_SPREADSHEET_MEMBER_DATA: 'importedSpreadsheetMemberData',
480+
477481
/** Stores the route to open after changing app permission from settings */
478482
LAST_ROUTE: 'lastRoute',
479483

@@ -1200,6 +1204,7 @@ type OnyxValuesMapping = {
12001204
[ONYXKEYS.ROOM_MEMBERS_USER_SEARCH_PHRASE]: string;
12011205
[ONYXKEYS.APPROVAL_WORKFLOW]: OnyxTypes.ApprovalWorkflowOnyx;
12021206
[ONYXKEYS.IMPORTED_SPREADSHEET]: OnyxTypes.ImportedSpreadsheet;
1207+
[ONYXKEYS.IMPORTED_SPREADSHEET_MEMBER_DATA]: OnyxTypes.ImportedSpreadsheetMemberData[];
12031208
[ONYXKEYS.LAST_ROUTE]: string;
12041209
[ONYXKEYS.IS_USING_IMPORTED_STATE]: boolean;
12051210
[ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES]: Record<string, string>;

‎src/ROUTES.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,6 +1366,10 @@ const ROUTES = {
13661366
route: 'workspaces/:policyID/members/imported',
13671367
getRoute: (policyID: string) => `workspaces/${policyID}/members/imported` as const,
13681368
},
1369+
WORKSPACE_MEMBERS_IMPORTED_CONFIRMATION: {
1370+
route: 'workspaces/:policyID/members/imported/confirmation',
1371+
getRoute: (policyID: string) => `workspaces/${policyID}/members/imported/confirmation` as const,
1372+
},
13691373
POLICY_ACCOUNTING: {
13701374
route: 'workspaces/:policyID/accounting',
13711375
getRoute: (policyID: string | undefined, newConnectionName?: ConnectionName, integrationToDisconnect?: ConnectionName, shouldDisconnectIntegrationBeforeConnecting?: boolean) => {

‎src/SCREENS.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,7 @@ const SCREENS = {
552552
MEMBERS: 'Workspace_Members',
553553
MEMBERS_IMPORT: 'Members_Import',
554554
MEMBERS_IMPORTED: 'Members_Imported',
555+
MEMBERS_IMPORTED_CONFIRMATION: 'Members_Imported_Confirmation',
555556
INVITE: 'Workspace_Invite',
556557
INVITE_MESSAGE: 'Workspace_Invite_Message',
557558
INVITE_MESSAGE_ROLE: 'Workspace_Invite_Message_Role',

‎src/languages/de.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,8 @@ const translations = {
646646
getTheApp: 'Hole dir die App',
647647
scanReceiptsOnTheGo: 'Scannen Sie Belege von Ihrem Telefon aus',
648648
headsUp: 'Achtung!',
649+
submitTo: 'Einreichen an',
650+
forwardTo: 'Weiterleiten an',
649651
merge: 'Zusammenführen',
650652
unstableInternetConnection: 'Instabile Internetverbindung. Bitte überprüfe dein Netzwerk und versuche es erneut.',
651653
},
@@ -990,6 +992,11 @@ const translations = {
990992
'Die Datei, die Sie hochgeladen haben, ist entweder leer oder enthält ungültige Daten. Bitte stellen Sie sicher, dass die Datei korrekt formatiert ist und die notwendigen Informationen enthält, bevor Sie sie erneut hochladen.',
991993
importSpreadsheet: 'Tabellenkalkulation importieren',
992994
downloadCSV: 'CSV herunterladen',
995+
importMemberConfirmation: () => ({
996+
one: `Bitte bestätige die folgenden Angaben für ein neues Workspace-Mitglied, das mit diesem Upload hinzugefügt wird. Bestehende Mitglieder erhalten keine Rollenaktualisierungen oder Einladungshinweise.`,
997+
other: (count: number) =>
998+
`Bitte bestätige die folgenden Angaben für die ${count} neuen Workspace-Mitglieder, die mit diesem Upload hinzugefügt werden. Bestehende Mitglieder erhalten keine Rollenaktualisierungen oder Einladungshinweise.`,
999+
}),
9931000
},
9941001
receipt: {
9951002
upload: 'Beleg hochladen',

‎src/languages/en.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,8 @@ const translations = {
637637
getTheApp: 'Get the app',
638638
scanReceiptsOnTheGo: 'Scan receipts from your phone',
639639
headsUp: 'Heads up!',
640+
submitTo: 'Submit to',
641+
forwardTo: 'Forward to',
640642
merge: 'Merge',
641643
unstableInternetConnection: 'Unstable internet connection. Please check your network and try again.',
642644
},
@@ -981,6 +983,11 @@ const translations = {
981983
'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.',
982984
importSpreadsheet: 'Import spreadsheet',
983985
downloadCSV: 'Download CSV',
986+
importMemberConfirmation: () => ({
987+
one: `Please confirm the details below for a new workspace member that will be added as part of this upload. Existing members won’t receive any role updates or invite messages.`,
988+
other: (count: number) =>
989+
`Please confirm the details below for the ${count} new workspace members that will be added as part of this upload. Existing members won’t receive any role updates or invite messages.`,
990+
}),
984991
},
985992
receipt: {
986993
upload: 'Upload receipt',

‎src/languages/es.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,8 @@ const translations = {
627627
getTheApp: 'Descarga la app',
628628
scanReceiptsOnTheGo: 'Escanea recibos desde tu teléfono',
629629
headsUp: '¡Atención!',
630+
submitTo: 'Enviar a',
631+
forwardTo: 'Reenviar a',
630632
merge: 'Fusionar',
631633
unstableInternetConnection: 'Conexión a internet inestable. Por favor, revisa tu red e inténtalo de nuevo.',
632634
},
@@ -974,6 +976,11 @@ const translations = {
974976
'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.',
975977
importSpreadsheet: 'Importar hoja de cálculo',
976978
downloadCSV: 'Descargar CSV',
979+
importMemberConfirmation: () => ({
980+
one: `Por favor confirma los detalles a continuación para un nuevo miembro del espacio de trabajo que se agregará como parte de esta carga. Los miembros existentes no recibirán actualizaciones de rol ni mensajes de invitación.`,
981+
other: (count: number) =>
982+
`Por favor confirma los detalles a continuación para los ${count} nuevos miembros del espacio de trabajo que se agregarán como parte de esta carga. Los miembros existentes no recibirán actualizaciones de rol ni mensajes de invitación.`,
983+
}),
977984
},
978985
receipt: {
979986
upload: 'Subir recibo',

‎src/languages/fr.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,8 @@ const translations = {
646646
getTheApp: "Obtenez l'application",
647647
scanReceiptsOnTheGo: 'Numérisez les reçus depuis votre téléphone',
648648
headsUp: 'Attention !',
649+
submitTo: 'Envoyer à',
650+
forwardTo: 'Transférer à',
649651
merge: 'Fusionner',
650652
unstableInternetConnection: 'Connexion Internet instable. Veuillez vérifier votre réseau et réessayer.',
651653
},
@@ -992,6 +994,11 @@ const translations = {
992994
'Le fichier que vous avez téléchargé est soit vide, soit contient des données invalides. Veuillez vous assurer que le fichier est correctement formaté et contient les informations nécessaires avant de le télécharger à nouveau.',
993995
importSpreadsheet: 'Importer une feuille de calcul',
994996
downloadCSV: 'Télécharger CSV',
997+
importMemberConfirmation: () => ({
998+
one: `Veuillez confirmer les informations ci-dessous pour un nouveau membre de l’espace de travail qui sera ajouté dans le cadre de cet import. Les membres existants ne recevront aucune mise à jour de rôle ni de message d’invitation.`,
999+
other: (count: number) =>
1000+
`Veuillez confirmer les informations ci-dessous pour les ${count} nouveaux membres de l’espace de travail qui seront ajoutés dans le cadre de cet import. Les membres existants ne recevront aucune mise à jour de rôle ni de message d’invitation.`,
1001+
}),
9951002
},
9961003
receipt: {
9971004
upload: 'Télécharger le reçu',

‎src/languages/it.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,8 @@ const translations = {
646646
getTheApp: "Scarica l'app",
647647
scanReceiptsOnTheGo: 'Scansiona le ricevute dal tuo telefono',
648648
headsUp: 'Attenzione!',
649+
submitTo: 'Invia a',
650+
forwardTo: 'Inoltra a',
649651
merge: 'Unisci',
650652
unstableInternetConnection: 'Connessione Internet instabile. Controlla la tua rete e riprova.',
651653
},
@@ -987,6 +989,11 @@ const translations = {
987989
'Il file che hai caricato è vuoto o contiene dati non validi. Assicurati che il file sia formattato correttamente e contenga le informazioni necessarie prima di caricarlo di nuovo.',
988990
importSpreadsheet: 'Importa foglio di calcolo',
989991
downloadCSV: 'Scarica CSV',
992+
importMemberConfirmation: () => ({
993+
one: `Conferma i dettagli di seguito per un nuovo membro del workspace che verrà aggiunto come parte di questo caricamento. I membri esistenti non riceveranno aggiornamenti di ruolo né messaggi di invito.`,
994+
other: (count: number) =>
995+
`Conferma i dettagli di seguito per i ${count} nuovi membri del workspace che verranno aggiunti come parte di questo caricamento. I membri esistenti non riceveranno aggiornamenti di ruolo né messaggi di invito.`,
996+
}),
990997
},
991998
receipt: {
992999
upload: 'Carica ricevuta',

‎src/languages/ja.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,8 @@ const translations = {
646646
getTheApp: 'アプリを入手',
647647
scanReceiptsOnTheGo: '携帯電話から領収書をスキャンする',
648648
headsUp: 'ご注意ください！',
649+
submitTo: '送信先',
650+
forwardTo: '転送先',
649651
merge: 'マージ',
650652
unstableInternetConnection: 'インターネット接続が不安定です。ネットワークを確認してもう一度お試しください。',
651653
},
@@ -989,6 +991,11 @@ const translations = {
989991
'アップロードしたファイルは空であるか、無効なデータが含まれています。ファイルが正しくフォーマットされ、必要な情報が含まれていることを確認してから、再度アップロードしてください。',
990992
importSpreadsheet: 'スプレッドシートをインポート',
991993
downloadCSV: 'CSVをダウンロード',
994+
importMemberConfirmation: () => ({
995+
one: `このアップロードで追加される新しいワークスペースメンバーの詳細を以下で確認してください。既存のメンバーにはロールの更新や招待メッセージは送信されません。`,
996+
other: (count: number) =>
997+
`このアップロードで追加される${count}人の新しいワークスペースメンバーの詳細を以下で確認してください。既存のメンバーにはロールの更新や招待メッセージは送信されません。`,
998+
}),
992999
},
9931000
receipt: {
9941001
upload: '領収書をアップロード',

‎src/languages/nl.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,8 @@ const translations = {
645645
getTheApp: 'Download de app',
646646
scanReceiptsOnTheGo: 'Scan bonnetjes vanaf je telefoon',
647647
headsUp: 'Let op!',
648+
submitTo: 'Sturen naar',
649+
forwardTo: 'Doorsturen naar',
648650
merge: 'Samenvoegen',
649651
unstableInternetConnection: 'Onstabiele internetverbinding. Controleer je netwerk en probeer het opnieuw.',
650652
},
@@ -988,6 +990,11 @@ const translations = {
988990
'Het bestand dat u heeft geüpload is ofwel leeg of bevat ongeldige gegevens. Zorg ervoor dat het bestand correct is opgemaakt en de benodigde informatie bevat voordat u het opnieuw uploadt.',
989991
importSpreadsheet: 'Spreadsheet importeren',
990992
downloadCSV: 'CSV downloaden',
993+
importMemberConfirmation: () => ({
994+
one: `Bevestig hieronder de gegevens voor een nieuw werkruimte-lid dat via deze upload wordt toegevoegd. Bestaande leden ontvangen geen rolupdates of uitnodigingsberichten.`,
995+
other: (count: number) =>
996+
`Bevestig hieronder de gegevens voor de ${count} nieuwe werkruimte-leden die via deze upload worden toegevoegd. Bestaande leden ontvangen geen rolupdates of uitnodigingsberichten.`,
997+
}),
991998
},
992999
receipt: {
9931000
upload: 'Bonnetje uploaden',

0 commit comments

Comments
 (0)