mirror of
https://github.com/Foundry376/Mailspring.git
synced 2025-12-18 07:38:21 +08:00
Summary:
This diff does a couple things:
- Undo redo with a new undo/redo store that maintains it's own queue of undo/redo tasks. This queue is separate from the TaskQueue because not all tasks should be considered for undo history! Right now just the AddRemoveTagsTask is undoable.
- NylasAPI.makeRequest now returns a promise which resolves with the result or rejects with an error. For things that still need them, there's still `success` and `error` callbacks. I also added `started:(req) ->` which allows you to get the underlying request.
- Aborting a NylasAPI request now makes it call it's error callback / promise reject.
- You can now run code after perform local has completed using this syntax:
```
task = new AddRemoveTagsTask(focused, ['archive'], ['inbox'])
task.waitForPerformLocal().then ->
Actions.setFocus(collection: 'thread', item: nextFocus)
Actions.setCursorPosition(collection: 'thread', item: nextKeyboard)
Actions.queueTask(task)
```
- In specs, you can now use `advanceClock` to get through a Promise.then/catch/finally. Turns out it was using something low level and not using setTimeout(0).
- The TaskQueue uses promises better and defers a lot of the complexity around queueState for performLocal/performRemote to a task subclass called APITask. APITask implements "perform" and breaks it into "performLocal" and "performRemote".
- All tasks either resolve or reject. They're always removed from the queue, unless they resolve with Task.Status.Retry, which means they internally did a .catch (err) => Promise.resolve(Task.Status.Retry) and they want to be run again later.
- API tasks retry until they succeed or receive a NylasAPI.PermanentErrorCode (400,404,500), in which case they revert and finish.
- The AddRemoveTags Task can now take more than one thread! This is super cool because you can undo/redo a bulk action and also because we'll probably have a bulk tag modification API endpoint soon.
Getting undo / redo working revealed that the thread versioning system we built isn't working because the server was incrementing things by more than 1 at a time. Now we count the number of unresolved "optimistic" changes we've made to a given model, and only accept the server's version of it once the number of optimistic changes is back at zero.
Known Issues:
- AddRemoveTagsTasks aren't dependent on each other, so if you (undo/redo x lots) and then come back online, all the tasks try to add / remove all the tags at the same time. To fix this we can either allow the tasks to be merged together into a minimal set or make them block on each other.
- When Offline, you still get errors in the console for GET requests. Need to catch these and display an offline status bar.
- The metadata tasks haven't been updated yet to the new API. Wanted to get it reviewed first!
Test Plan: All the tests still pass!
Reviewers: evan
Reviewed By: evan
Differential Revision: https://phab.nylas.com/D1694
213 lines
6.6 KiB
CoffeeScript
213 lines
6.6 KiB
CoffeeScript
proxyquire = require 'proxyquire'
|
|
_ = require 'underscore'
|
|
NylasAPI = require '../../src/flux/nylas-api'
|
|
File = require '../../src/flux/models/file'
|
|
Task = require '../../src/flux/tasks/task'
|
|
Message = require '../../src/flux/models/message'
|
|
Actions = require '../../src/flux/actions'
|
|
|
|
NamespaceStore = require "../../src/flux/stores/namespace-store"
|
|
DraftStore = require "../../src/flux/stores/draft-store"
|
|
|
|
{APIError,
|
|
OfflineError,
|
|
TimeoutError} = require '../../src/flux/errors'
|
|
|
|
FileUploadTask = proxyquire "../../src/flux/tasks/file-upload-task",
|
|
fs:
|
|
statSync: -> {size: 1234}
|
|
createReadStream: -> "Read Stream"
|
|
"@noCallThru": true
|
|
|
|
test_file_paths = [
|
|
"/fake/file.txt",
|
|
"/fake/file.jpg"
|
|
]
|
|
|
|
noop = ->
|
|
|
|
localId = "local-id_1234"
|
|
|
|
fake_draft = new Message
|
|
id: "draft-id_1234"
|
|
draft: true
|
|
|
|
testResponse = '[
|
|
{
|
|
"content_type": "image/jpeg",
|
|
"filename": "TestFilename.jpg",
|
|
"id": "nylas_id_123",
|
|
"namespace_id": "ns-id",
|
|
"object": "file",
|
|
"size": 19013
|
|
}
|
|
]'
|
|
equivalentFile = (new File).fromJSON(JSON.parse(testResponse)[0])
|
|
|
|
DATE = 1433963615918
|
|
|
|
describe "FileUploadTask", ->
|
|
beforeEach ->
|
|
spyOn(Date, "now").andReturn DATE
|
|
spyOn(FileUploadTask, "idGen").andReturn 3
|
|
|
|
@uploadData =
|
|
uploadId: 3
|
|
startedUploadingAt: DATE
|
|
messageLocalId: localId
|
|
filePath: test_file_paths[0]
|
|
fileSize: 1234
|
|
fileName: "file.txt"
|
|
bytesUploaded: 0
|
|
|
|
@task = new FileUploadTask(test_file_paths[0], localId)
|
|
|
|
@req = jasmine.createSpyObj('req', ['abort'])
|
|
@simulateRequestSuccessImmediately = false
|
|
@simulateRequestSuccess = null
|
|
@simulateRequestFailure = null
|
|
|
|
spyOn(NylasAPI, 'makeRequest').andCallFake (reqParams) =>
|
|
new Promise (resolve, reject) =>
|
|
reqParams.started?(@req)
|
|
@simulateRequestSuccess = (data) =>
|
|
reqParams.success?(data)
|
|
resolve(data)
|
|
@simulateRequestFailure = (err) =>
|
|
reqParams.error?(err)
|
|
reject(err)
|
|
if @simulateRequestSuccessImmediately
|
|
@simulateRequestSuccess(testResponse)
|
|
|
|
it "rejects if not initialized with a path name", (done) ->
|
|
waitsForPromise ->
|
|
(new FileUploadTask).performLocal().catch (err) ->
|
|
expect(err instanceof Error).toBe true
|
|
|
|
it "rejects if not initialized with a messageLocalId", ->
|
|
waitsForPromise ->
|
|
(new FileUploadTask(test_file_paths[0])).performLocal().catch (err) ->
|
|
expect(err instanceof Error).toBe true
|
|
|
|
it 'initializes an uploadId', ->
|
|
task = new FileUploadTask(test_file_paths[0], localId)
|
|
expect(task._uploadId).toBeGreaterThan 2
|
|
|
|
it 'initializes the upload start', ->
|
|
task = new FileUploadTask(test_file_paths[0], localId)
|
|
expect(task._startedUploadingAt).toBe DATE
|
|
|
|
it "notifies when the task locally starts", ->
|
|
spyOn(Actions, "uploadStateChanged")
|
|
|
|
waitsForPromise =>
|
|
@task.performLocal().then =>
|
|
data = _.extend @uploadData, state: "pending", bytesUploaded: 0
|
|
expect(Actions.uploadStateChanged).toHaveBeenCalledWith data
|
|
|
|
describe "when the remote API request fails with an API Error", ->
|
|
it "broadcasts uploadStateChanged", ->
|
|
runs ->
|
|
@task.performRemote().catch (err) => console.log(err)
|
|
waitsFor ->
|
|
@simulateRequestFailure
|
|
runs ->
|
|
spyOn(@task, "_getBytesUploaded").andReturn(0)
|
|
spyOn(Actions, "uploadStateChanged")
|
|
@simulateRequestFailure(new APIError())
|
|
waitsFor ->
|
|
Actions.uploadStateChanged.callCount > 0
|
|
runs ->
|
|
data = _.extend(@uploadData, {state: "failed", bytesUploaded: 0})
|
|
expect(Actions.uploadStateChanged).toHaveBeenCalledWith(data)
|
|
|
|
describe "when the remote API request succeeds", ->
|
|
beforeEach ->
|
|
@testFiles = []
|
|
@changes = []
|
|
@simulateRequestSuccessImmediately = true
|
|
|
|
spyOn(Actions, "uploadStateChanged")
|
|
spyOn(DraftStore, "sessionForLocalId").andCallFake =>
|
|
Promise.resolve(
|
|
draft: => files: @testFiles
|
|
changes:
|
|
add: ({files}) => @changes = @changes.concat(files)
|
|
commit: -> Promise.resolve()
|
|
)
|
|
|
|
it "notifies when the task starts remote", ->
|
|
waitsForPromise =>
|
|
@task.performLocal().then =>
|
|
data = _.extend @uploadData, state: "pending", bytesUploaded: 0
|
|
expect(Actions.uploadStateChanged).toHaveBeenCalledWith data
|
|
|
|
it "should start an API request", ->
|
|
waitsForPromise => @task.performRemote().then ->
|
|
options = NylasAPI.makeRequest.mostRecentCall.args[0]
|
|
expect(options.path).toBe("/n/nsid/files")
|
|
expect(options.method).toBe('POST')
|
|
expect(options.formData.file.value).toBe("Read Stream")
|
|
|
|
it "attaches the file to the draft", ->
|
|
waitsForPromise => @task.performRemote().then =>
|
|
expect(@changes).toEqual [equivalentFile]
|
|
|
|
describe "file upload notifications", ->
|
|
it "correctly fires the fileUploaded action", ->
|
|
spyOn(@task, "_getBytesUploaded").andReturn(1000)
|
|
spyOn(Actions, "fileUploaded")
|
|
@task.performRemote()
|
|
advanceClock()
|
|
@simulateRequestSuccess()
|
|
advanceClock()
|
|
Actions.fileUploaded.calls.length > 0
|
|
expect(Actions.fileUploaded).toHaveBeenCalledWith
|
|
file: equivalentFile
|
|
uploadData: _.extend {}, @uploadData,
|
|
state: "completed"
|
|
bytesUploaded: 1000
|
|
|
|
describe "when attaching a lot of files", ->
|
|
it "attaches them all to the draft", ->
|
|
t1 = new FileUploadTask("1.a", localId)
|
|
t2 = new FileUploadTask("2.b", localId)
|
|
t3 = new FileUploadTask("3.c", localId)
|
|
t4 = new FileUploadTask("4.d", localId)
|
|
|
|
@simulateRequestSuccessImmediately = true
|
|
waitsForPromise => Promise.all([
|
|
t1.performRemote()
|
|
t2.performRemote()
|
|
t3.performRemote()
|
|
t4.performRemote()
|
|
]).then =>
|
|
expect(@changes.length).toBe 4
|
|
|
|
describe "cancel", ->
|
|
it "should not do anything if the request has finished", ->
|
|
runs =>
|
|
@task.performRemote()
|
|
waitsFor =>
|
|
@simulateRequestSuccess
|
|
runs =>
|
|
@simulateRequestSuccess(testResponse)
|
|
waitsFor =>
|
|
@task.req is null
|
|
runs =>
|
|
@task.cancel()
|
|
expect(@req.abort).not.toHaveBeenCalled()
|
|
|
|
it "should cancel the request if it's in flight", ->
|
|
spyOn(Actions, "uploadStateChanged")
|
|
|
|
@task.performRemote()
|
|
advanceClock()
|
|
@task.cancel()
|
|
advanceClock()
|
|
|
|
expect(@req.abort).toHaveBeenCalled()
|
|
data = _.extend @uploadData,
|
|
state: "aborted"
|
|
bytesUploaded: 0
|
|
expect(Actions.uploadStateChanged).toHaveBeenCalledWith(data)
|