### Version 0.36.0

#### Feature - allow resume upload if upload job had stopped - dbl_dot_local_app(5/7/2019): auto link upload job (Merge branch 'auto_resume_uploads')
ubsicap · May 10, 2019 · 69efbdd · 69efbdd
2 parents 790d1ea + e599b26
commit 69efbdd
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
-### Version 0.35.5
-#### Fix
+### Version 0.36.0
+#### Feature
+- allow resume upload if upload job had stopped
 - dbl_dot_local_app(5/7/2019): auto link upload job
 
 ### Version 0.35.4

diff --git a/app/components/DBLEntryRow.js b/app/components/DBLEntryRow.js
@@ -58,7 +58,6 @@ type Props = {
   bundleMatches: {},
   bundlesSaveTo: {},
   progress?: ?number,
-  isDownloaded: ?boolean,
   isUploading?: ?boolean,
   isDownloading?: ?boolean,
   isSelected: ?boolean,

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nathanael",
   "productName": "nathanael",
-  "version": "0.35.5",
+  "version": "0.36.0",
   "description": "Electron frontend to DBL dot Local",
   "main": "./main.prod.js",
   "author": {

diff --git a/app/reducers/bundles.reducer.js b/app/reducers/bundles.reducer.js
@@ -361,9 +361,7 @@ export function bundles(state = initialState, action) {
 export default bundles;
 
 function addBundleDecorators(bundle, addCustomDecoration) {
-  const isDownloaded = bundle.task === 'DOWNLOAD' && bundle.status === 'COMPLETED';
-  const isUploaded = bundle.task === 'UPLOAD' && bundle.status === 'COMPLETED';
-  const coreDecorated = { ...bundle, ...formatDisplayAs(bundle), isDownloaded, isUploaded };
+  const coreDecorated = { ...bundle, ...formatDisplayAs(bundle) };
   if (!addCustomDecoration) {
     return coreDecorated;
   }
@@ -405,11 +403,8 @@ function formatStatus(bundle) {
   const stored = (bundle.resourceCountStored === bundle.resourceCountManifest) ?
     bundle.resourceCountManifest : `${bundle.resourceCountStored}/${bundle.resourceCountManifest || '...'}`;
   let newStatusDisplayAs;
-  if (bundle.isUploading) {
-    const uploadingMessage = (!bundle.resourceCountStored || bundle.resourceCountStored === 0) ? 'metadata' : formattedProgress;
-    newStatusDisplayAs = `Uploading ${uploadingMessage}`;
-  } else if (bundle.task === 'UPLOAD' && bundle.status === 'IN_PROGRESS') {
-    newStatusDisplayAs = 'Uploading';
+  if (bundle.task === 'UPLOAD' && bundle.status === 'IN_PROGRESS') {
+    newStatusDisplayAs = `Uploading ${formattedProgress}`;
   } else if (bundle.status === 'NOT_STARTED') {
     newStatusDisplayAs = 'Download';
   } else if (bundle.task === 'DOWNLOAD' && bundle.status === 'IN_PROGRESS') {

diff --git a/app/services/bundle.service.js b/app/services/bundle.service.js
@@ -502,7 +502,7 @@ function checkAllFields(bundleId) {
 }
 
 function startUploadBundle(bundleId) {
-  return bundleAddTasks(bundleId, '<cancelUploadJobs/><createUploadJob/><uploadResources/><submitJobIfComplete><forkAfterUpload>true</forkAfterUpload></submitJobIfComplete>');
+  return bundleAddTasks(bundleId, '<findUploadJob/><uploadResources/><submitJobIfComplete><forkAfterUpload>true</forkAfterUpload></submitJobIfComplete>');
 }
 
 function deleteForm(bundleId, formKey) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nathanael",
   "productName": "nathanael",
-  "version": "0.35.5",
+  "version": "0.36.0",
   "description": "Electron frontend to DBL dot Local",
   "scripts": {
     "build": "concurrently \"npm run build-main\" \"npm run build-renderer\"",