alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into sk-user-delete-with-cancelled-sub

Browse Source
This commit is contained in:
Shane Kilkelly
2016-12-06 09:31:42 +00:00
parent e03d16e0cd 3da4c104c2
commit 58280bf6ee
13 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/coffee/Features/Docstore/DocstoreManager.coffee
+4 -3
View File
@@ -30,7 +30,7 @@ module.exports = DocstoreManager =
logger.error err: error, project_id: project_id, "error getting all docs from docstore" logger.error err: error, project_id: project_id, "error getting all docs from docstore"
callback(error) callback(error)
getDoc: (project_id, doc_id, options = {}, callback = (error, lines, rev) ->) -> getDoc: (project_id, doc_id, options = {}, callback = (error, lines, rev, version) ->) ->
if typeof(options) == "function" if typeof(options) == "function"
callback = options callback = options
options = {} options = {}
@@ -45,19 +45,20 @@ module.exports = DocstoreManager =
return callback(error) if error? return callback(error) if error?
if 200 <= res.statusCode < 300 if 200 <= res.statusCode < 300
logger.log doc_id: doc_id, project_id: project_id, version: doc.version, rev: doc.rev, "got doc from docstore api" logger.log doc_id: doc_id, project_id: project_id, version: doc.version, rev: doc.rev, "got doc from docstore api"
callback(null, doc.lines, doc.rev) callback(null, doc.lines, doc.rev, doc.version)
else else
error = new Error("docstore api responded with non-success code: #{res.statusCode}") error = new Error("docstore api responded with non-success code: #{res.statusCode}")
logger.error err: error, project_id: project_id, doc_id: doc_id, "error getting doc from docstore" logger.error err: error, project_id: project_id, doc_id: doc_id, "error getting doc from docstore"
callback(error) callback(error)
updateDoc: (project_id, doc_id, lines, callback = (error, modified, rev) ->) -> updateDoc: (project_id, doc_id, lines, version, callback = (error, modified, rev) ->) ->
logger.log project_id: project_id, doc_id: doc_id, "updating doc in docstore api" logger.log project_id: project_id, doc_id: doc_id, "updating doc in docstore api"
url = "#{settings.apis.docstore.url}/project/#{project_id}/doc/#{doc_id}" url = "#{settings.apis.docstore.url}/project/#{project_id}/doc/#{doc_id}"
request.post { request.post {
url: url url: url
json: json:
lines: lines lines: lines
version: version
}, (error, res, result) -> }, (error, res, result) ->
return callback(error) if error? return callback(error) if error?
if 200 <= res.statusCode < 300 if 200 <= res.statusCode < 300
services/web/app/coffee/Features/Documents/DocumentController.coffee
+4 -3
View File
@@ -7,7 +7,7 @@ module.exports =
doc_id = req.params.doc_id doc_id = req.params.doc_id
plain = req?.query?.plain == 'true' plain = req?.query?.plain == 'true'
logger.log doc_id:doc_id, project_id:project_id, "receiving get document request from api (docupdater)" logger.log doc_id:doc_id, project_id:project_id, "receiving get document request from api (docupdater)"
ProjectEntityHandler.getDoc project_id, doc_id, (error, lines, rev) -> ProjectEntityHandler.getDoc project_id, doc_id, (error, lines, rev, version) ->
if error? if error?
logger.err err:error, doc_id:doc_id, project_id:project_id, "error finding element for getDocument" logger.err err:error, doc_id:doc_id, project_id:project_id, "error finding element for getDocument"
return next(error) return next(error)
@@ -18,14 +18,15 @@ module.exports =
res.type "json" res.type "json"
res.send JSON.stringify { res.send JSON.stringify {
lines: lines lines: lines
version: version
} }
setDocument: (req, res, next = (error) ->) -> setDocument: (req, res, next = (error) ->) ->
project_id = req.params.Project_id project_id = req.params.Project_id
doc_id = req.params.doc_id doc_id = req.params.doc_id
lines = req.body.lines {lines, version} = req.body
logger.log doc_id:doc_id, project_id:project_id, "receiving set document request from api (docupdater)" logger.log doc_id:doc_id, project_id:project_id, "receiving set document request from api (docupdater)"
ProjectEntityHandler.updateDocLines project_id, doc_id, lines, (error) -> ProjectEntityHandler.updateDocLines project_id, doc_id, lines, version, (error) ->
if error? if error?
logger.err err:error, doc_id:doc_id, project_id:project_id, "error finding element for getDocument" logger.err err:error, doc_id:doc_id, project_id:project_id, "error finding element for getDocument"
return next(error) return next(error)
services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
+3 -3
View File
@@ -126,7 +126,7 @@ module.exports = ProjectEntityHandler =
doc = new Doc name: docName doc = new Doc name: docName
# Put doc in docstore first, so that if it errors, we don't have a doc_id in the project # Put doc in docstore first, so that if it errors, we don't have a doc_id in the project
# which hasn't been created in docstore. # which hasn't been created in docstore.
DocstoreManager.updateDoc project_id.toString(), doc._id.toString(), docLines, (err, modified, rev) -> DocstoreManager.updateDoc project_id.toString(), doc._id.toString(), docLines, 0, (err, modified, rev) ->
return callback(err) if err? return callback(err) if err?
ProjectEntityHandler._putElement project, folder_id, doc, "doc", (err, result)=> ProjectEntityHandler._putElement project, folder_id, doc, "doc", (err, result)=>
@@ -292,7 +292,7 @@ module.exports = ProjectEntityHandler =
return callback(err) return callback(err)
callback(err, folder, parentFolder_id) callback(err, folder, parentFolder_id)
updateDocLines : (project_id, doc_id, lines, callback = (error) ->)-> updateDocLines : (project_id, doc_id, lines, version, callback = (error) ->)->
ProjectGetter.getProjectWithoutDocLines project_id, (err, project)-> ProjectGetter.getProjectWithoutDocLines project_id, (err, project)->
return callback(err) if err? return callback(err) if err?
return callback(new Errors.NotFoundError("project not found")) if !project? return callback(new Errors.NotFoundError("project not found")) if !project?
@@ -307,7 +307,7 @@ module.exports = ProjectEntityHandler =
return callback(error) return callback(error)
logger.log project_id: project_id, doc_id: doc_id, "telling docstore manager to update doc" logger.log project_id: project_id, doc_id: doc_id, "telling docstore manager to update doc"
DocstoreManager.updateDoc project_id, doc_id, lines, (err, modified, rev) -> DocstoreManager.updateDoc project_id, doc_id, lines, version, (err, modified, rev) ->
if err? if err?
logger.error err: err, doc_id: doc_id, project_id:project_id, lines: lines, "error sending doc to docstore" logger.error err: err, doc_id: doc_id, project_id:project_id, lines: lines, "error sending doc to docstore"
return callback(err) return callback(err)
services/web/app/coffee/infrastructure/Server.coffee
+1
View File
@@ -90,6 +90,7 @@ webRouter.use session
secure: Settings.secureCookie secure: Settings.secureCookie
store: sessionStore store: sessionStore
key: Settings.cookieName key: Settings.cookieName
rolling: true
# passport # passport
webRouter.use passport.initialize() webRouter.use passport.initialize()
services/web/app/views/layout/navbar.jade
+3
View File
@@ -35,6 +35,9 @@ nav.navbar.navbar-default
each child in item.dropdown each child in item.dropdown
if child.divider if child.divider
li.divider li.divider
else if child.user_email
li
div.subdued #{getUserEmail()}
else else
li li
if child.url if child.url
services/web/config/settings.defaults.coffee
+4
View File
@@ -347,6 +347,10 @@ module.exports = settings =
text: "Account" text: "Account"
only_when_logged_in: true only_when_logged_in: true
dropdown: [{ dropdown: [{
user_email: true
},{
divider: true
}, {
text: "Account Settings" text: "Account Settings"
url: "/user/settings" url: "/user/settings"
}, { }, {
services/web/public/img/spellcheck-underline.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 111 B

After

Width:  |  Height:  |  Size: 2.8 KiB

services/web/public/img/spellcheck-underline@2x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

services/web/public/stylesheets/app/editor.less
+4
View File
@@ -138,6 +138,10 @@
.spelling-highlight { .spelling-highlight {
position: absolute; position: absolute;
background-image: url(/img/spellcheck-underline.png); background-image: url(/img/spellcheck-underline.png);
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
background-image: url(/img/spellcheck-underline@2x.png);
background-size: 5px 4px;
}
background-repeat: repeat-x; background-repeat: repeat-x;
background-position: bottom left; background-position: bottom left;
} }
services/web/public/stylesheets/components/dropdowns.less
+6 -3
View File
@@ -58,8 +58,8 @@
.nav-divider(@dropdown-divider-bg); .nav-divider(@dropdown-divider-bg);
} }
// Links within the dropdown menu // Links and other items within the dropdown menu
> li > a { > li > a,div {
display: block; display: block;
padding: 3px 20px; padding: 3px 20px;
clear: both; clear: both;
@@ -67,8 +67,11 @@
line-height: @line-height-base; line-height: @line-height-base;
color: @dropdown-link-color; color: @dropdown-link-color;
white-space: nowrap; // prevent links from randomly breaking onto new lines white-space: nowrap; // prevent links from randomly breaking onto new lines
&.subdued {
color: #7a7a7a
}
.subdued { .subdued {
color: #7a7a7a color: #7a7a7a
} }
} }
} }
services/web/test/UnitTests/coffee/Docstore/DocstoreManagerTests.coffee
+7 -4
View File
@@ -56,12 +56,13 @@ describe "DocstoreManager", ->
beforeEach -> beforeEach ->
@lines = ["mock", "doc", "lines"] @lines = ["mock", "doc", "lines"]
@rev = 5 @rev = 5
@version = 42
@modified = true @modified = true
describe "with a successful response code", -> describe "with a successful response code", ->
beforeEach -> beforeEach ->
@request.post = sinon.stub().callsArgWith(1, null, statusCode: 204, { modified: @modified, rev: @rev }) @request.post = sinon.stub().callsArgWith(1, null, statusCode: 204, { modified: @modified, rev: @rev })
@DocstoreManager.updateDoc @project_id, @doc_id, @lines, @callback @DocstoreManager.updateDoc @project_id, @doc_id, @lines, @version, @callback
it "should update the doc in the docstore api", -> it "should update the doc in the docstore api", ->
@request.post @request.post
@@ -69,6 +70,7 @@ describe "DocstoreManager", ->
url: "#{@settings.apis.docstore.url}/project/#{@project_id}/doc/#{@doc_id}" url: "#{@settings.apis.docstore.url}/project/#{@project_id}/doc/#{@doc_id}"
json: json:
lines: @lines lines: @lines
version: @version
}) })
.should.equal true .should.equal true
@@ -78,7 +80,7 @@ describe "DocstoreManager", ->
describe "with a failed response code", -> describe "with a failed response code", ->
beforeEach -> beforeEach ->
@request.post = sinon.stub().callsArgWith(1, null, statusCode: 500, "") @request.post = sinon.stub().callsArgWith(1, null, statusCode: 500, "")
@DocstoreManager.updateDoc @project_id, @doc_id, @lines, @callback @DocstoreManager.updateDoc @project_id, @doc_id, @lines, @version, @callback
it "should call the callback with an error", -> it "should call the callback with an error", ->
@callback.calledWith(new Error("docstore api responded with non-success code: 500")).should.equal true @callback.calledWith(new Error("docstore api responded with non-success code: 500")).should.equal true
@@ -97,6 +99,7 @@ describe "DocstoreManager", ->
@doc = @doc =
lines: @lines = ["mock", "doc", "lines"] lines: @lines = ["mock", "doc", "lines"]
rev: @rev = 5 rev: @rev = 5
version: @version = 42
describe "with a successful response code", -> describe "with a successful response code", ->
beforeEach -> beforeEach ->
@@ -112,7 +115,7 @@ describe "DocstoreManager", ->
.should.equal true .should.equal true
it "should call the callback with the lines, version and rev", -> it "should call the callback with the lines, version and rev", ->
@callback.calledWith(null, @lines, @rev).should.equal true @callback.calledWith(null, @lines, @rev, @version).should.equal true
describe "with a failed response code", -> describe "with a failed response code", ->
beforeEach -> beforeEach ->
@@ -145,7 +148,7 @@ describe "DocstoreManager", ->
.should.equal true .should.equal true
it "should call the callback with the lines, version and rev", -> it "should call the callback with the lines, version and rev", ->
@callback.calledWith(null, @lines, @rev).should.equal true @callback.calledWith(null, @lines, @rev, @version).should.equal true
describe "getAllDocs", -> describe "getAllDocs", ->
describe "with a successful response code", -> describe "with a successful response code", ->
services/web/test/UnitTests/coffee/Documents/DocumentControllerTests.coffee
+6 -4
View File
@@ -33,7 +33,7 @@ describe "DocumentController", ->
describe "when the document exists", -> describe "when the document exists", ->
beforeEach -> beforeEach ->
@ProjectEntityHandler.getDoc = sinon.stub().callsArgWith(2, null, @doc_lines, @rev) @ProjectEntityHandler.getDoc = sinon.stub().callsArgWith(2, null, @doc_lines, @rev, @version)
@DocumentController.getDocument(@req, @res, @next) @DocumentController.getDocument(@req, @res, @next)
it "should get the document from Mongo", -> it "should get the document from Mongo", ->
@@ -45,6 +45,7 @@ describe "DocumentController", ->
@res.type.should.equal "json" @res.type.should.equal "json"
@res.body.should.equal JSON.stringify @res.body.should.equal JSON.stringify
lines: @doc_lines lines: @doc_lines
version: @version
describe "when the document doesn't exist", -> describe "when the document doesn't exist", ->
beforeEach -> beforeEach ->
@@ -63,14 +64,15 @@ describe "DocumentController", ->
describe "when the document exists", -> describe "when the document exists", ->
beforeEach -> beforeEach ->
@ProjectEntityHandler.updateDocLines = sinon.stub().callsArg(3) @ProjectEntityHandler.updateDocLines = sinon.stub().yields()
@req.body = @req.body =
lines: @doc_lines lines: @doc_lines
version: @version
@DocumentController.setDocument(@req, @res, @next) @DocumentController.setDocument(@req, @res, @next)
it "should update the document in Mongo", -> it "should update the document in Mongo", ->
@ProjectEntityHandler.updateDocLines @ProjectEntityHandler.updateDocLines
.calledWith(@project_id, @doc_id, @doc_lines) .calledWith(@project_id, @doc_id, @doc_lines, @version)
.should.equal true .should.equal true
it "should return a successful response", -> it "should return a successful response", ->
@@ -78,7 +80,7 @@ describe "DocumentController", ->
describe "when the document doesn't exist", -> describe "when the document doesn't exist", ->
beforeEach -> beforeEach ->
@ProjectEntityHandler.updateDocLines = sinon.stub().callsArgWith(3, new Errors.NotFoundError("document does not exist")) @ProjectEntityHandler.updateDocLines = sinon.stub().yields(new Errors.NotFoundError("document does not exist"))
@req.body = @req.body =
lines: @doc_lines lines: @doc_lines
@DocumentController.setDocument(@req, @res, @next) @DocumentController.setDocument(@req, @res, @next)
services/web/test/UnitTests/coffee/Project/ProjectEntityHandlerTests.coffee
+9 -8
View File
@@ -402,7 +402,7 @@ describe 'ProjectEntityHandler', ->
@ProjectEntityHandler._putElement = sinon.stub().callsArgWith(4, null, {path:{fileSystem:@path}}) @ProjectEntityHandler._putElement = sinon.stub().callsArgWith(4, null, {path:{fileSystem:@path}})
@callback = sinon.stub() @callback = sinon.stub()
@tpdsUpdateSender.addDoc = sinon.stub().callsArg(1) @tpdsUpdateSender.addDoc = sinon.stub().callsArg(1)
@DocstoreManager.updateDoc = sinon.stub().callsArgWith(3, null, true, 0) @DocstoreManager.updateDoc = sinon.stub().yields(null, true, 0)
@ProjectEntityHandler.addDoc project_id, folder_id, @name, @lines, @callback @ProjectEntityHandler.addDoc project_id, folder_id, @name, @lines, @callback
@@ -589,6 +589,7 @@ describe 'ProjectEntityHandler', ->
@doc = { @doc = {
_id: doc_id _id: doc_id
} }
@version = 42
@ProjectGetter.getProjectWithoutDocLines = sinon.stub().callsArgWith(1, null, @project) @ProjectGetter.getProjectWithoutDocLines = sinon.stub().callsArgWith(1, null, @project)
@projectLocator.findElement = sinon.stub().callsArgWith(1, null, @doc, {fileSystem: @path}) @projectLocator.findElement = sinon.stub().callsArgWith(1, null, @doc, {fileSystem: @path})
@tpdsUpdateSender.addDoc = sinon.stub().callsArg(1) @tpdsUpdateSender.addDoc = sinon.stub().callsArg(1)
@@ -597,8 +598,8 @@ describe 'ProjectEntityHandler', ->
describe "when the doc has been modified", -> describe "when the doc has been modified", ->
beforeEach -> beforeEach ->
@DocstoreManager.updateDoc = sinon.stub().callsArgWith(3, null, true, @rev = 5) @DocstoreManager.updateDoc = sinon.stub().yields(null, true, @rev = 5)
@ProjectEntityHandler.updateDocLines project_id, doc_id, @lines, @callback @ProjectEntityHandler.updateDocLines project_id, doc_id, @lines, @version, @callback
it "should get the project without doc lines", -> it "should get the project without doc lines", ->
@ProjectGetter.getProjectWithoutDocLines @ProjectGetter.getProjectWithoutDocLines
@@ -616,7 +617,7 @@ describe 'ProjectEntityHandler', ->
it "should update the doc in the docstore", -> it "should update the doc in the docstore", ->
@DocstoreManager.updateDoc @DocstoreManager.updateDoc
.calledWith(project_id, doc_id, @lines) .calledWith(project_id, doc_id, @lines, @version)
.should.equal true .should.equal true
it "should mark the project as updated", -> it "should mark the project as updated", ->
@@ -640,8 +641,8 @@ describe 'ProjectEntityHandler', ->
describe "when the doc has not been modified", -> describe "when the doc has not been modified", ->
beforeEach -> beforeEach ->
@DocstoreManager.updateDoc = sinon.stub().callsArgWith(3, null, false, @rev = 5) @DocstoreManager.updateDoc = sinon.stub().yields(null, false, @rev = 5)
@ProjectEntityHandler.updateDocLines project_id, doc_id, @lines, @callback @ProjectEntityHandler.updateDocLines project_id, doc_id, @lines, @version, @callback
it "should not mark the project as updated", -> it "should not mark the project as updated", ->
@projectUpdater.markAsUpdated.called.should.equal false @projectUpdater.markAsUpdated.called.should.equal false
@@ -655,7 +656,7 @@ describe 'ProjectEntityHandler', ->
describe "when the project is not found", -> describe "when the project is not found", ->
beforeEach -> beforeEach ->
@ProjectGetter.getProjectWithoutDocLines = sinon.stub().callsArgWith(1, null, null) @ProjectGetter.getProjectWithoutDocLines = sinon.stub().callsArgWith(1, null, null)
@ProjectEntityHandler.updateDocLines project_id, doc_id, @lines, @callback @ProjectEntityHandler.updateDocLines project_id, doc_id, @lines, @version, @callback
it "should return a not found error", -> it "should return a not found error", ->
@callback.calledWith(new Errors.NotFoundError()).should.equal true @callback.calledWith(new Errors.NotFoundError()).should.equal true
@@ -663,7 +664,7 @@ describe 'ProjectEntityHandler', ->
describe "when the doc is not found", -> describe "when the doc is not found", ->
beforeEach -> beforeEach ->
@projectLocator.findElement = sinon.stub().callsArgWith(1, null, null, null) @projectLocator.findElement = sinon.stub().callsArgWith(1, null, null, null)
@ProjectEntityHandler.updateDocLines project_id, doc_id, @lines, @callback @ProjectEntityHandler.updateDocLines project_id, doc_id, @lines, @version, @callback
it "should log out the error", -> it "should log out the error", ->
@logger.error @logger.error