explorer: move export from fileStorage

src/notifications/i18n.ts

@@ -16,11 +16,10 @@ export enum I18nId {
     ExplorerDeleteFileMessage = 'explorer.deleteFile.message',
     ExplorerDeleteFileAction = 'explorer.deleteFile.action',
     ExplorerFailedToImportFiles = 'explorer.failedToImportFiles',
+    ExplorerFailedToCreate = 'explorer.failedToCreate',
+    ExplorerFailedToExport = 'explorer.failedToExport',
     FileStorageFailedToInitialize = 'fileStorage.failedToInitialize',
-    FileStorageFailedToRead = 'fileStorage.failedToRead',
-    FileStorageFailedToWrite = 'fileStorage.failedToWrite',
-    FileStorageFailedToDelete = 'fileStorage.failedToDelete',
-    FileStorageFailedToExport = 'fileStorage.failedToExport',
+    FileStorageFailedToArchive = 'fileStorage.failedToArchive',
     FlashFirmwareTimedOut = 'flashFirmware.timedOut',
     FlashFirmwareBleError = 'flashFirmware.bleError',
     FlashFirmwareDisconnected = 'flashFirmware.disconnected',

src/notifications/sagas.test.ts

@@ -19,12 +19,12 @@ import {
 import {
     explorerDeleteFile,
     explorerDidFailToCreateNewFile,
+    explorerDidFailToExportFile,
     explorerDidFailToImportFiles,
 } from '../explorer/actions';
 import {
     fileStorageDeleteFile,
     fileStorageDidFailToArchiveAllFiles,
-    fileStorageDidFailToExportFile,
     fileStorageDidFailToInitialize,
     fileStorageDidRemoveItem,
 } from '../fileStorage/actions';
@@ -112,10 +112,10 @@ test.each([
     appDidCheckForUpdate(false),
     bleDIServiceDidReceiveFirmwareRevision('3.0.0'),
     fileStorageDidFailToInitialize(new Error('test error')),
-    fileStorageDidFailToExportFile('test.file', new Error('test error')),
     fileStorageDidFailToArchiveAllFiles(new Error('test error')),
     explorerDidFailToImportFiles(new Error('test error')),
     explorerDidFailToCreateNewFile(new Error('test error')),
+    explorerDidFailToExportFile('test.file', new Error('test error')),
 ])('actions that should show notification: %o', async (action: AnyAction) => {
     const { toaster, saga } = createTestToasterSaga();
 
@@ -135,12 +135,12 @@ test.each([
     serviceWorkerDidSucceed(),
     appDidCheckForUpdate(true),
     bleDIServiceDidReceiveFirmwareRevision(firmwareVersion),
-    fileStorageDidFailToExportFile(
+    fileStorageDidFailToArchiveAllFiles(new DOMException('test message', 'AbortError')),
+    explorerDidFailToImportFiles(new DOMException('test message', 'AbortError')),
+    explorerDidFailToExportFile(
         'test.file',
         new DOMException('test message', 'AbortError'),
     ),
-    fileStorageDidFailToArchiveAllFiles(new DOMException('test message', 'AbortError')),
-    explorerDidFailToImportFiles(new DOMException('test message', 'AbortError')),
 ])('actions that should not show a notification: %o', async (action: AnyAction) => {
     const { toaster, saga } = createTestToasterSaga();
 

src/notifications/sagas.ts

@@ -20,12 +20,12 @@ import {
 import {
     explorerDeleteFile,
     explorerDidFailToCreateNewFile,
+    explorerDidFailToExportFile,
     explorerDidFailToImportFiles,
 } from '../explorer/actions';
 import {
     fileStorageDeleteFile,
     fileStorageDidFailToArchiveAllFiles,
-    fileStorageDidFailToExportFile,
     fileStorageDidFailToInitialize,
     fileStorageDidRemoveItem,
 } from '../fileStorage/actions';
@@ -387,17 +387,6 @@ function* showFileStorageFailToInitialize(
     yield* showUnexpectedError(I18nId.FileStorageFailedToInitialize, action.error);
 }
 
-function* showFileStorageFailToExport(
-    action: ReturnType<typeof fileStorageDidFailToExportFile>,
-): Generator {
-    if (action.error.name === 'AbortError') {
-        // user clicked cancel button - not an error
-        return;
-    }
-
-    yield* showUnexpectedError(I18nId.FileStorageFailedToExport, action.error);
-}
-
 function* showFileStorageFailToArchive(
     action: ReturnType<typeof fileStorageDidFailToArchiveAllFiles>,
 ): Generator {
@@ -406,7 +395,7 @@ function* showFileStorageFailToArchive(
         return;
     }
 
-    yield* showUnexpectedError(I18nId.FileStorageFailedToExport, action.error);
+    yield* showUnexpectedError(I18nId.FileStorageFailedToArchive, action.error);
 }
 
 function* showDeleteFileWarning(action: ReturnType<typeof explorerDeleteFile>) {
@@ -458,7 +447,18 @@ function* showExplorerFailToImportFiles(
 function* showExplorerFailToCreateFile(
     action: ReturnType<typeof explorerDidFailToCreateNewFile>,
 ): Generator {
-    yield* showUnexpectedError(I18nId.FileStorageFailedToDelete, action.error);
+    yield* showUnexpectedError(I18nId.ExplorerFailedToCreate, action.error);
+}
+
+function* showExplorerFailToExport(
+    action: ReturnType<typeof explorerDidFailToExportFile>,
+): Generator {
+    if (action.error.name === 'AbortError') {
+        // user clicked cancel button - not an error
+        return;
+    }
+
+    yield* showUnexpectedError(I18nId.ExplorerFailedToExport, action.error);
 }
 
 export default function* (): Generator {
@@ -472,9 +472,9 @@ export default function* (): Generator {
     yield* takeEvery(appDidCheckForUpdate, showNoUpdateInfo);
     yield* takeEvery(bleDIServiceDidReceiveFirmwareRevision, checkVersion);
     yield* takeEvery(fileStorageDidFailToInitialize, showFileStorageFailToInitialize);
-    yield* takeEvery(fileStorageDidFailToExportFile, showFileStorageFailToExport);
     yield* takeEvery(fileStorageDidFailToArchiveAllFiles, showFileStorageFailToArchive);
     yield* takeEvery(explorerDeleteFile, showDeleteFileWarning);
     yield* takeEvery(explorerDidFailToImportFiles, showExplorerFailToImportFiles);
     yield* takeEvery(explorerDidFailToCreateNewFile, showExplorerFailToCreateFile);
+    yield* takeEvery(explorerDidFailToExportFile, showExplorerFailToExport);
 }

src/notifications/translations/en.json

@@ -19,14 +19,13 @@
             "message": "The file {fileName} will be permanently deleted. This cannot be undone.",
             "action": "Delete"
         },
-        "failedToImportFiles": "Failed to import file(s)"
+        "failedToImportFiles": "Failed to import file(s).",
+        "failedToCreate": "Failed to create file.",
+        "failedToExport": "Failed to export file."
     },
     "fileStorage": {
         "failedToInitialize": "Failed to initial file storage. Changes will not be automatically saved.",
-        "failedToRead": "Failed to read file.",
-        "failedToWrite": "Failed to write file.",
-        "failedToDelete": "Failed to delete file.",
-        "failedToExport": "Failed to export file.'"
+        "failedToArchive": "Failed to archive files.'"
     },
     "flashFirmware": {
         "timedOut": "The hub took too long to respond. Restart the hub and try again.",