feat(sync): improve error handling #599

johannesjo · Oct 21, 2020 · 6aa0dae · 6aa0dae
1 parent 59897f0
commit 6aa0dae
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/src/app/imex/sync/dropbox/dropbox-sync.service.ts b/src/app/imex/sync/dropbox/dropbox-sync.service.ts
@@ -13,6 +13,7 @@ import { SyncProvider, SyncProviderServiceInterface } from '../sync-provider.mod
 @Injectable({providedIn: 'root'})
 export class DropboxSyncService implements SyncProviderServiceInterface {
   id: SyncProvider = SyncProvider.Dropbox;
+  isUploadForcePossible: boolean = true;
 
   isReady$: Observable<boolean> = this._dataInitService.isAllDataLoadedInitially$.pipe(
     concatMap(() => this._dropboxApiService.isTokenAvailable$),

diff --git a/src/app/imex/sync/sync-provider.model.ts b/src/app/imex/sync/sync-provider.model.ts
@@ -14,6 +14,7 @@ export type SyncFileMeta = DropboxFileMetadata | GoogleDriveFileMeta;
 
 export interface SyncProviderServiceInterface {
   id: SyncProvider;
+  isUploadForcePossible?: boolean;
   isReady$: Observable<boolean>;
   isReadyForRequests$: Observable<boolean>;
 

diff --git a/src/app/imex/sync/sync-provider.service.ts b/src/app/imex/sync/sync-provider.service.ts
@@ -101,7 +101,7 @@ export class SyncProviderService {
       this._snackService.open({
         msg: T.F.SYNC.S.UNKNOWN_ERROR,
         translateParams: {
-          err: truncate(revRes.toString()),
+          err: truncate(revRes.toString(), 100),
         },
         type: 'ERROR'
       });
@@ -244,8 +244,16 @@ export class SyncProviderService {
       this._log(cp, '↑ Uploaded Data ↑ ✓');
     } else {
       this._log(cp, 'X Upload Request Error');
-      if (this._c(T.F.SYNC.C.FORCE_UPLOAD_AFTER_ERROR)) {
-        return this._uploadAppData(cp, data, true);
+      if (cp.isUploadForcePossible && this._c(T.F.SYNC.C.FORCE_UPLOAD_AFTER_ERROR)) {
+        return await this._uploadAppData(cp, data, true);
+      } else {
+        this._snackService.open({
+          msg: T.F.SYNC.S.UPLOAD_ERROR,
+          translateParams: {
+            err: truncate(successRev.toString(), 100),
+          },
+          type: 'ERROR'
+        });
       }
     }
   }

diff --git a/src/app/t.const.ts b/src/app/t.const.ts
@@ -563,7 +563,8 @@ const T = {
         ERROR_INVALID_DATA: 'F.SYNC.S.ERROR_INVALID_DATA',
         IMPORTING: 'F.SYNC.S.IMPORTING',
         SUCCESS: 'F.SYNC.S.SUCCESS',
-        UNKNOWN_ERROR: 'F.SYNC.S.UNKNOWN_ERROR'
+        UNKNOWN_ERROR: 'F.SYNC.S.UNKNOWN_ERROR',
+        UPLOAD_ERROR: 'F.SYNC.S.UPLOAD_ERROR'
       }
     },
     TAG: {

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -563,7 +563,8 @@
         "ERROR_INVALID_DATA": "Error while syncing. Invalid data",
         "IMPORTING": "Importing data",
         "SUCCESS": "Data imported",
-        "UNKNOWN_ERROR": "Unknown error while syncing. Please check console."
+        "UNKNOWN_ERROR": "Unknown Sync Error: {{err}}",
+        "UPLOAD_ERROR": "Unknown Upload Error (Settings correct?): {{err}}"
       }
     },
     "TAG": {