diff --git a/services/web/app/coffee/Features/Notifications/NotificationsHandler.coffee b/services/web/app/coffee/Features/Notifications/NotificationsHandler.coffee
index a26bfff16a..d3e2cb3cb9 100644
--- a/services/web/app/coffee/Features/Notifications/NotificationsHandler.coffee
+++ b/services/web/app/coffee/Features/Notifications/NotificationsHandler.coffee
@@ -3,14 +3,22 @@ request = require("request")
logger = require("logger-sharelatex")
oneSecond = 1000
+
+makeRequest = (opts, callback)->
+ if !settings.apis.notifications?.url?
+ return callback()
+ else
+ request(opts, callback)
+
module.exports =
getUserNotifications: (user_id, callback)->
opts =
- uri: "#{settings.apis.notifications.url}/user/#{user_id}"
+ uri: "#{settings.apis.notifications?.url}/user/#{user_id}"
json: true
timeout: oneSecond
- request.get opts, (err, res, unreadNotifications)->
+ method: "GET"
+ request opts, (err, res, unreadNotifications)->
statusCode = if res? then res.statusCode else 500
if err? or statusCode != 200
e = new Error("something went wrong getting notifications, #{err}, #{statusCode}")
@@ -23,30 +31,33 @@ module.exports =
createNotification: (user_id, key, templateKey, messageOpts, callback)->
opts =
- uri: "#{settings.apis.notifications.url}/user/#{user_id}"
+ uri: "#{settings.apis.notifications?.url}/user/#{user_id}"
timeout: oneSecond
+ method:"POST"
json: {
key:key
messageOpts:messageOpts
templateKey:templateKey
}
logger.log opts:opts, "creating notification for user"
- request.post opts, callback
+ request opts, callback
markAsReadWithKey: (user_id, key, callback)->
opts =
- uri: "#{settings.apis.notifications.url}/user/#{user_id}"
+ uri: "#{settings.apis.notifications?.url}/user/#{user_id}"
+ method: "DELETE"
timeout: oneSecond
json: {
key:key
}
logger.log user_id:user_id, key:key, "sending mark notification as read with key to notifications api"
- request.del opts, callback
+ request opts, callback
markAsRead: (user_id, notification_id, callback)->
opts =
- uri: "#{settings.apis.notifications.url}/user/#{user_id}/notification/#{notification_id}"
+ method: "DELETE"
+ uri: "#{settings.apis.notifications?.url}/user/#{user_id}/notification/#{notification_id}"
timeout:oneSecond
logger.log user_id:user_id, notification_id:notification_id, "sending mark notification as read to notifications api"
- request.del opts, callback
+ request opts, callback
diff --git a/services/web/app/coffee/Features/References/ReferencesController.coffee b/services/web/app/coffee/Features/References/ReferencesController.coffee
index 0536e3b680..5976af9430 100644
--- a/services/web/app/coffee/Features/References/ReferencesController.coffee
+++ b/services/web/app/coffee/Features/References/ReferencesController.coffee
@@ -15,7 +15,7 @@ module.exports = ReferencesController =
return res.sendStatus 400
logger.log {projectId, docIds: docIds}, "index references for project"
ReferencesHandler.index projectId, docIds, (err, data) ->
- if err
+ if err?
logger.err {err, projectId}, "error indexing all references"
return res.sendStatus 500
ReferencesController._handleIndexResponse(req, res, projectId, shouldBroadcast, data)
@@ -25,13 +25,15 @@ module.exports = ReferencesController =
shouldBroadcast = req.body.shouldBroadcast
logger.log {projectId}, "index all references for project"
ReferencesHandler.indexAll projectId, (err, data) ->
- if err
+ if err?
logger.err {err, projectId}, "error indexing all references"
return res.sendStatus 500
ReferencesController._handleIndexResponse(req, res, projectId, shouldBroadcast, data)
_handleIndexResponse: (req, res, projectId, shouldBroadcast, data) ->
- if shouldBroadcast
+ if !data? or !data.keys?
+ return res.send()
+ else if shouldBroadcast
logger.log {projectId}, "emitting new references keys to connected clients"
EditorRealTimeController.emitToRoom projectId, 'references:keys:updated', data.keys
return res.json data
diff --git a/services/web/app/coffee/Features/References/ReferencesHandler.coffee b/services/web/app/coffee/Features/References/ReferencesHandler.coffee
index 7894ab6915..fa38ddedf6 100644
--- a/services/web/app/coffee/Features/References/ReferencesHandler.coffee
+++ b/services/web/app/coffee/Features/References/ReferencesHandler.coffee
@@ -66,6 +66,8 @@ module.exports = ReferencesHandler =
ReferencesHandler._doIndexOperation(projectId, project, docIds, [], callback)
_doIndexOperation: (projectId, project, docIds, fileIds, callback) ->
+ if !settings.apis?.references?.url?
+ return callback()
ReferencesHandler._isFullIndex project, (err, isFullIndex) ->
if err
logger.err {err, projectId}, "error checking whether to do full index"
diff --git a/services/web/app/coffee/Features/Wiki/WikiController.coffee b/services/web/app/coffee/Features/Wiki/WikiController.coffee
index c75ee06f86..e4f85a6c9f 100644
--- a/services/web/app/coffee/Features/Wiki/WikiController.coffee
+++ b/services/web/app/coffee/Features/Wiki/WikiController.coffee
@@ -39,6 +39,13 @@ module.exports = WikiController =
if pageData.content?.length > 280
if _.include(other_lngs, req.lng)
pageData.title = pageData.title.slice(0, pageData.title.length - (req.lng.length+1) )
+
+ if pageData.title?.toLowerCase()?.indexOf("kb") == 0
+ pageData.title = pageData.title.slice(3)
+
+ if pageData.title?.toLowerCase()?.indexOf("errors") == 0
+ pageData.title = pageData.title.slice(7)
+
WikiController._renderPage(pageData, contents, res)
else
WikiController._getPageContent page, (error, pageData) ->
diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade
index 34c9ece719..75ff03020d 100644
--- a/services/web/app/views/project/editor/pdf.jade
+++ b/services/web/app/views/project/editor/pdf.jade
@@ -106,7 +106,10 @@ div.full-size.pdf(ng-controller="PdfController")
span(ng-show="entry.file") {{ entry.file }}
span(ng-show="entry.line") , line {{ entry.line }}
p.entry-message(ng-show="entry.message") {{ entry.message }}
- .card.card-hint(ng-if="entry.humanReadableHint")
+ .card.card-hint(
+ ng-if="entry.humanReadableHint"
+ stop-propagation="click"
+ )
figure.card-hint-icon-container
i.fa.fa-lightbulb-o(aria-hidden="true")
p.card-hint-text(ng-show="entry.humanReadableHint", ng-bind-html="entry.humanReadableHint")
@@ -122,14 +125,16 @@ div.full-size.pdf(ng-controller="PdfController")
label.card-hint-feedback-label #{translate("log_hint_feedback_label")}
a.card-hint-feedback-positive(
ng-click="feedbackSent = true;"
+ href
) #{translate("answer_yes")}
span /
a.card-hint-feedback-negative(
ng-click="feedbackSent = true;"
+ href
) #{translate("answer_no")}
.card-hint-feedback(ng-show="feedbackSent")
label.card-hint-feedback-label #{translate("log_hint_feedback_gratitude")}
- p.entry-content(ng-show="entry.content") {{ entry.content }}
+ p.entry-content(ng-show="entry.content") {{ entry.content.trim() }}
p
.pull-right
diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index ce95780075..b784088f4b 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -104,10 +104,10 @@ module.exports = settings =
url: "http://localhost:3036"
sixpack:
url: ""
- references:
- url: "http://localhost:3040"
- notifications:
- url: "http://localhost:3042"
+ # references:
+ # url: "http://localhost:3040"
+ # notifications:
+ # url: "http://localhost:3042"
templates:
user_id: process.env.TEMPLATES_USER_ID or "5395eb7aad1f29a88756c7f2"
diff --git a/services/web/public/coffee/ide/human-readable-logs/HumanReadableLogsRules.coffee b/services/web/public/coffee/ide/human-readable-logs/HumanReadableLogsRules.coffee
index a94e756244..b4cb138be8 100644
--- a/services/web/public/coffee/ide/human-readable-logs/HumanReadableLogsRules.coffee
+++ b/services/web/public/coffee/ide/human-readable-logs/HumanReadableLogsRules.coffee
@@ -1,43 +1,91 @@
define -> [
- # regexToMatch: /Too many }'s/
- # extraInfoURL: ""
- # humanReadableHint: """
- # The reason LaTeX thinks there are too many }'s here is that the opening curly brace is missing after the \\date control sequence and before the word December, so the closing curly brace is seen as one too many (which it is!).
- # """
- # ,
- # regexToMatch: /Undefined control sequence/
- # extraInfoURL: "/learn/Errors:Undefined_control_sequence."
- # humanReadableHint: """
- # In this example, LaTeX is complaining that it has no such command ("control sequence") as \\dtae. Obviously it's been mistyped, but only a human can detect that fact: all LaTeX knows is that \\dtae is not a command it knows about: it's undefined.
- # """
- # ,
- # regexToMatch: /Missing \$ inserted/
- # extraInfoURL: "/learn/Errors:Missing_$_inserted"
- # humanReadableHint: """
- # A character that can only be used in the mathematics was inserted in normal text. If you intended to use mathematics mode, then use $...$ or \\begin{math}...\\end{math} or use the 'quick math mode': \\ensuremath{...}.
- # """
- # ,
- # regexToMatch: /Runaway argument/
- # extraInfoURL: "/learn/Errors:Undefined_control_sequence."
- # humanReadableHint: """
- # In this error, the closing curly brace has been omitted from the date. It's the opposite of the error of too many }'s, and it results in \\maketitle trying to format the title page while LaTeX is still expecting more text for the date!
- # """
- # ,
- # regexToMatch: /Underfull \\hbox/
- # extraInfoURL: "/learn/Errors:Underfull_%5Chbox"
- # humanReadableHint: """
- # This is a warning that LaTeX cannot stretch the line wide enough to fit, without making the spacing bigger than its currently permitted maximum. The badness (0-10,000) indicates how severe this is (here you can probably ignore a badness of 1394).
- # """
- # ,
- # regexToMatch: /Overfull \\hbox/
- # extraInfoURL: ""
- # humanReadableHint: """
- # An overfull \\hbox means that there is a hyphenation or justification problem: moving the last word on the line to the next line would make the spaces in the line wider than the current limit; keeping the word on the line would make the spaces smaller than the current limit, so the word is left on the line, but with the minimum allowed space between words, and which makes the line go over the edge.
- # """
- # ,
- # regexToMatch: /LaTeX Error: File .* not found/
- # extraInfoURL: "/learn/Errors:missing_package"
- # humanReadableHint: """
- # When you use the \\usepackage command to request LaTeX to use a certain package, it will look for a file with the specified name and the filetype .sty. In this case the user has mistyped the name of the paralist package, so it's easy to fix.
- # """
+ regexToMatch: /Misplaced alignment tab character \&/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:Misplaced_alignment_tab_character_%26"
+ humanReadableHint: """
+ You have placed an alignment tab character '&' in the wrong place. If you want to align something, you must write it inside an align environment such as \\begin{align} \u2026 \\end{align}, \\begin{tabular} \u2026 \\end{tabular}, etc. If you want to write an ampersand '&' in text, you must write \\& instead.
+ """
+ ,
+ regexToMatch: /Extra alignment tab has been changed to \\cr/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:Extra_alignment_tab_has_been_changed_to_%5Ccr"
+ humanReadableHint: """
+ You have written too many alignment tabs in a table, causing one of them to be turned into a line break. Make sure you have specified the correct number of columns in your table.
+ """
+ ,
+ regexToMatch: /Display math should end with \$\$/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:Display_math_should_end_with_$$."
+ humanReadableHint: """
+ You have forgotten a $ sign at the end of 'display math' mode. When writing in display math mode, you must always math write inside $$ \u2026 $$. Check that the number of $s match around each math expression.
+ """
+ ,
+ regexToMatch: /Missing [{$] inserted./
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:Missing_$_inserted"
+ humanReadableHint: """
+ Check that your $'s match around math expressions. If they do, then you've probably used a symbol in normal text that needs to be in math mode. Symbols such as subscripts ( _ ), integrals ( \\int ), Greek letters ( \\alpha, \\beta, \\delta ), and modifiers (\\vec{x}, \\tilde{x} ) must be written in math mode. See the full list here.
+ """
+ ,
+ regexToMatch: /(undefined )?[rR]eference(s)?.+(undefined)?/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:There_were_undefined_references."
+ humanReadableHint: """
+ You have referenced something which has not yet been labelled. If you have labelled it already, make sure that what is written inside \\ref{...} is the same as what is written inside \\label{...}.
+ """
+ ,
+ regexToMatch: /Citation .+ on page .+ undefined on input line .+/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:Citation_XXX_on_page_XXX_undefined_on_input_line_XXX."
+ humanReadableHint: """
+ You have cited something which is not included in your bibliography. Make sure that the citation (\\cite{...}) has a corresponding key in your bibliography, and that both are spelled the same way.
+ """
+ ,
+ regexToMatch: /(Label .+)? multiply[ -]defined( labels)?/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:There_were_multiply-defined_labels."
+ humanReadableHint: """
+ You have used the same label more than once. Check that each \\label{...} labels only one item.
+ """
+ ,
+ regexToMatch: /`!?h' float specifier changed to `!?ht'/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:%60!h%27_float_specifier_changed_to_%60!ht%27."
+ humanReadableHint: """
+ The float specifier 'h' is too strict of a demand for LaTeX to place your float in a nice way here. Try relaxing it by using 'ht', or even 'htbp' if necessary. If you want to try keep the float here anyway, check out the float package.
+ """
+ ,
+ regexToMatch: /No positions in optional float specifier/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:No_positions_in_optional_float_specifier."
+ humanReadableHint: """
+ You have forgotten to include a float specifier, which tells LaTeX where to position your figure. Find out more about float specifiers here.
+ """
+ ,
+ regexToMatch: /Undefined control sequence/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:Undefined_control_sequence."
+ humanReadableHint: """
+ The compiler is having trouble understanding a command you have used. Check that the command is spelled correctly. If the command is part of a package, make sure you have included the package in your preamble using \\usepackage{...}.
+ """
+ ,
+ regexToMatch: /File .+ not found/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:File_XXX_not_found_on_input_line_XXX."
+ humanReadableHint: """
+ The compiler cannot find the file you want to include. Make sure that you have uploaded the file and specified the file location correctly.
+ """
+ ,
+ regexToMatch: /LaTeX Error: Unknown graphics extension: \..+/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:LaTeX_Error:_Unknown_graphics_extension:_.gif."
+ humanReadableHint: """
+ The compiler does not recognise the file type of one of your images. Make sure you are using a supported image format for your choice of compiler, and check that there are no periods (.) in the name of your image.
+ """
+ ,
+ regexToMatch: /LaTeX Error: Unknown float option `H'/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:LaTeX_Error:_Unknown_float_option_%60H%27."
+ humanReadableHint: """
+ The compiler isn't recognizing the float option 'H'. Include \\usepackage{float} in your preamble to fix this.
+ """
+ ,
+ regexToMatch: /LaTeX Error: Unknown float option `.+'/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:LaTeX_Error:_Unknown_float_option_%60H%27."
+ humanReadableHint: """
+ You have used a float specifier which the compiler does not understand. You can learn more about the different float options available for placing figures here.
+ """
+ ,
+ regexToMatch: /LaTeX Error: \\math.+ allowed only in math mode/
+ extraInfoURL: "https://www.sharelatex.com/learn/Errors:LaTeX_Error:_%5Cmathrm_allowed_only_in_math_mode."
+ humanReadableHint: """
+ You have used a font command which is only available in math mode. To use this command, you must be in maths mode (E.g. $ \u2026 $ or \\begin{math} \u2026 \\end{math}). If you want to use it outside of math mode, use the text version instead: \\textrm, \\textit, etc.
+ """
]
diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
index f503437407..52b243c79b 100644
--- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
+++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
@@ -156,7 +156,7 @@ define [
method:"GET"
params:
clsiserverid:ide.clsiServerId
- if file.url? # FIXME clean this up when we have file.urls out consistently
+ if file?.url? # FIXME clean this up when we have file.urls out consistently
opts.url = file.url
else if file?.build?
opts.url = "/project/#{$scope.project_id}/build/#{file.build}/output/#{name}"
diff --git a/services/web/public/coffee/ide/wordcount/controllers/WordCountModalController.coffee b/services/web/public/coffee/ide/wordcount/controllers/WordCountModalController.coffee
index e880a25eef..2336de614d 100644
--- a/services/web/public/coffee/ide/wordcount/controllers/WordCountModalController.coffee
+++ b/services/web/public/coffee/ide/wordcount/controllers/WordCountModalController.coffee
@@ -4,12 +4,14 @@ define [
App.controller 'WordCountModalController', ($scope, $modalInstance, ide, $http) ->
$scope.status =
loading:true
-
+
+ perUserCompile = window.location?.search?.match(/isolated=true/)? or undefined
opts =
url:"/project/#{ide.project_id}/wordcount"
method:"GET"
params:
clsiserverid:ide.clsiServerId
+ isolated: perUserCompile
$http opts
.success (data) ->
$scope.status.loading = false
diff --git a/services/web/public/stylesheets/app/editor/pdf.less b/services/web/public/stylesheets/app/editor/pdf.less
index f77d497eb0..db29870c1a 100644
--- a/services/web/public/stylesheets/app/editor/pdf.less
+++ b/services/web/public/stylesheets/app/editor/pdf.less
@@ -181,6 +181,8 @@
.card-hint:extend(.card-thin) {
margin-top: 10px;
+ padding-bottom: 7px;
+ cursor: default;
&-icon-container {
background: currentColor;
@@ -217,6 +219,10 @@
margin-bottom: 20px;
}
+ &-text {
+ min-height: 35px;
+ }
+
&-feedback-label {
font-size: inherit;
margin-right: 0.5em;
@@ -230,7 +236,8 @@
font-size: 0.8rem;
}
- &-actions a {
+ &-actions a,
+ &-text a {
.alert-danger & {
color: @alert-danger-text;
}
diff --git a/services/web/test/UnitTests/coffee/Notifications/NotificationsHandlerTests.coffee b/services/web/test/UnitTests/coffee/Notifications/NotificationsHandlerTests.coffee
index 6f10b351df..cfca6dfebe 100644
--- a/services/web/test/UnitTests/coffee/Notifications/NotificationsHandlerTests.coffee
+++ b/services/web/test/UnitTests/coffee/Notifications/NotificationsHandlerTests.coffee
@@ -12,10 +12,7 @@ describe 'NotificationsHandler', ->
notificationUrl = "notification.sharelatex.testing"
beforeEach ->
- @request =
- post: sinon.stub().callsArgWith(1)
- del: sinon.stub().callsArgWith(1)
- get: sinon.stub()
+ @request = sinon.stub().callsArgWith(1)
@handler = SandboxedModule.require modulePath, requires:
"settings-sharelatex": apis:{notifications:{url:notificationUrl}}
"request":@request
@@ -26,18 +23,19 @@ describe 'NotificationsHandler', ->
describe "getUserNotifications", ->
it 'should get unread notifications', (done)->
stubbedNotifications = [{_id: notification_id, user_id: user_id}]
- @request.get.callsArgWith(1, null, {statusCode:200}, stubbedNotifications)
+ @request.callsArgWith(1, null, {statusCode:200}, stubbedNotifications)
@handler.getUserNotifications user_id, (err, unreadNotifications)=>
stubbedNotifications.should.deep.equal unreadNotifications
getOpts =
uri: "#{notificationUrl}/user/#{user_id}"
json:true
timeout:1000
- @request.get.calledWith(getOpts).should.equal true
+ method: "GET"
+ @request.calledWith(getOpts).should.equal true
done()
it 'should return empty arrays if there are no notifications', ->
- @request.get.callsArgWith(1, null, {statusCode:200}, null)
+ @request.callsArgWith(1, null, {statusCode:200}, null)
@handler.getUserNotifications user_id, (err, unreadNotifications)=>
unreadNotifications.length.should.equal 0
@@ -52,7 +50,8 @@ describe 'NotificationsHandler', ->
json:
key:@key
timeout:1000
- @request.del.calledWith(opts).should.equal true
+ method: "DELETE"
+ @request.calledWith(opts).should.equal true
done()
@@ -64,7 +63,7 @@ describe 'NotificationsHandler', ->
it "should post the message over", (done)->
@handler.createNotification user_id, @key, @templateKey, @messageOpts, =>
- args = @request.post.args[0][0]
+ args = @request.args[0][0]
args.uri.should.equal "#{notificationUrl}/user/#{user_id}"
args.timeout.should.equal 1000
expectedJson = {key:@key, templateKey:@templateKey, messageOpts:@messageOpts}
diff --git a/services/web/test/UnitTests/coffee/References/ReferencesControllerTests.coffee b/services/web/test/UnitTests/coffee/References/ReferencesControllerTests.coffee
index 16266c0820..0d58da7631 100644
--- a/services/web/test/UnitTests/coffee/References/ReferencesControllerTests.coffee
+++ b/services/web/test/UnitTests/coffee/References/ReferencesControllerTests.coffee
@@ -32,6 +32,7 @@ describe "ReferencesController", ->
shouldBroadcast: false
@res = new MockResponse()
@res.json = sinon.stub()
+ @res.send = sinon.stub()
@res.sendStatus = sinon.stub()
@fakeResponseData =
projectId: @projectId,
@@ -113,6 +114,30 @@ describe "ReferencesController", ->
@res.json.calledWith(@fakeResponseData).should.equal true
done()
+ describe 'there is no dataaaaaaa', ->
+
+ beforeEach ->
+ @ReferencesHandler.indexAll.callsArgWith(1)
+ @call = (callback) =>
+ @controller.indexAll @req, @res
+ callback()
+
+ it 'should not call EditorRealTimeController.emitToRoom', (done) ->
+ @call () =>
+ @EditorRealTimeController.emitToRoom.callCount.should.equal 0
+ done()
+
+ it 'should not produce an error', (done) ->
+ @call () =>
+ @res.sendStatus.callCount.should.equal 0
+ @res.sendStatus.calledWith(500).should.equal false
+ @res.sendStatus.calledWith(400).should.equal false
+ done()
+
+ it 'should close the response', (done) ->
+ @call () =>
+ @res.send.called.should.equal true
+ done()
describe 'index', ->