Improve upload progress on android due to null asset IDs.
This commit is contained in:
@@ -32,14 +32,14 @@ const photosReducer = (state = INITIAL_STATE, action) => {
|
||||
case PhotosActionTypes.MEDIA_UPLOAD_PROGRESS_UPDATE_ONE:
|
||||
return {
|
||||
...state,
|
||||
progress: { ...state.progress, [action.payload.assetId]: { ...state.progress[action.payload.assetId], ...action.payload } }
|
||||
progress: { ...state.progress, [action.payload.assetId || action.payload.fileName]: { ...state.progress[action.payload.assetId || action.payload.fileName], ...action.payload } }
|
||||
};
|
||||
case PhotosActionTypes.MEDIA_UPLOAD_SUCCESS_ONE:
|
||||
const { [action.payload.assetId]: _, ...remainingTasks } = state.cancelTasks;
|
||||
const { [action.payload.assetId || action.payload.fileName]: _, ...remainingTasks } = state.cancelTasks;
|
||||
|
||||
return {
|
||||
...state,
|
||||
progress: { ...state.progress, [action.payload.assetId]: { ...state.progress[action.payload.assetId], progress: 1, status: 'completed', endTime: new Date() } },
|
||||
progress: { ...state.progress, [action.payload.assetId || action.payload.fileName]: { ...state.progress[action.payload.assetId || action.payload.fileName], progress: 1, status: 'completed', endTime: new Date() } },
|
||||
cancelTasks: remainingTasks
|
||||
};
|
||||
case PhotosActionTypes.MEDIA_UPLOAD_PROGRESS_UPDATE_BULK:
|
||||
@@ -69,11 +69,11 @@ const photosReducer = (state = INITIAL_STATE, action) => {
|
||||
...state,
|
||||
cancelTasks: {
|
||||
...state.cancelTasks,
|
||||
[action.payload.assetId]: action.payload.cancelTask,
|
||||
[action.payload.assetId || action.payload.fileName]: action.payload.cancelTask,
|
||||
},
|
||||
};
|
||||
case PhotosActionTypes.REMOVE_UPLOAD_CANCEL_TASK:
|
||||
const { [action.payload.assetId]: _2, ...remainingTasks2 } = state.cancelTasks; //2 added for scoped variable conflict.
|
||||
const { [action.payload.assetId || action.payload.fileName]: _2, ...remainingTasks2 } = state.cancelTasks; //2 added for scoped variable conflict.
|
||||
return {
|
||||
...state,
|
||||
cancelTasks: remainingTasks2,
|
||||
|
||||
Reference in New Issue
Block a user