github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-27 09:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use pdfDownloadDomain when fetching certain files in the new PDF preview (#5524)

Browse source 
GitOrigin-RevId: d8796d9f86ba87824438f4bd7dcb1a79643654c3
This commit is contained in:
Alf Eaton 2021-10-21 09:10:56 +01:00 committed by Copybot
parent 2bf422b76d
commit 684efaaf5f
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/web/frontend/js/features/pdf-preview/util/output-files.js
View file

@ -80,7 +80,9 @@ export const handleOutputFiles = async (projectId, data) => {
const logFile = outputFiles.get('output.log')
if (logFile) {
const response = await fetch(`${logFile.url}?${params}`)
const response = await fetch(
`${data.pdfDownloadDomain}${logFile.url}?${params}`
)
const log = await response.text()
@ -96,7 +98,9 @@ export const handleOutputFiles = async (projectId, data) => {
const blgFile = outputFiles.get('output.blg')
if (blgFile) {
const response = await fetch(`${blgFile.url}?${params}`)
const response = await fetch(
`${data.pdfDownloadDomain}${blgFile.url}?${params}`
)
const log = await response.text()

24
services/web/test/frontend/features/pdf-preview/components/pdf-preview.test.js
View file

@ -57,7 +57,7 @@ const mockCompile = () =>
status: 'success',
clsiServerId: 'foo',
compileGroup: 'priority',
pdfDownloadDomain: '',
pdfDownloadDomain: 'https://clsi.test-overleaf.com',
outputFiles: cloneDeep(outputFiles),
},
})
@ -85,7 +85,7 @@ const mockClearCache = () =>
fetchMock.delete('express:/project/:projectId/output', 204)
const mockValidPdf = () => {
nock('https://www.test-overleaf.com')
nock('https://clsi.test-overleaf.com')
.get(/^\/build\/output\.pdf/)
.replyWithFile(200, examplePDF)
}
@ -117,7 +117,17 @@ LaTeX Font Info: External font \`cmex10' loaded for size
`,
}
const mockBuildFile = (responses = defaultFileResponses) =>
const mockBuildFile = (responses = defaultFileResponses) => {
fetchMock.get('begin:https://clsi.test-overleaf.com/', _url => {
const url = new URL(_url, 'https://clsi.test-overleaf.com')
if (url.pathname in responses) {
return responses[url.pathname]
}
return 404
})
fetchMock.get('express:/build/:file', (_url, options, request) => {
const url = new URL(_url, 'https://example.com')
@ -127,6 +137,7 @@ const mockBuildFile = (responses = defaultFileResponses) =>
return 404
})
}
const storeAndFireEvent = (key, value) => {
localStorage.setItem(key, value)
@ -378,7 +389,8 @@ describe('<PdfPreview/>', function () {
screen.getByText('Conflicting Paths Found')
expect(fetchMock.called('express:/project/:projectId/compile')).to.be.true // TODO: auto_compile query param
expect(fetchMock.called('express:/build/:file')).to.be.false // TODO: actual path
expect(fetchMock.called('begin:https://clsi.test-overleaf.com/')).to.be
.false // TODO: actual path
})
it('sends a clear cache request when the button is pressed', async function () {
@ -412,7 +424,7 @@ describe('<PdfPreview/>', function () {
})
expect(fetchMock.called('express:/project/:projectId/compile')).to.be.true // TODO: auto_compile query param
expect(fetchMock.called('express:/build/:file')).to.be.true // TODO: actual path
expect(fetchMock.called('begin:https://clsi.test-overleaf.com/')).to.be.true // TODO: actual path
})
it('handle "recompile from scratch"', async function () {
@ -454,7 +466,7 @@ describe('<PdfPreview/>', function () {
expect(fetchMock.called('express:/project/:projectId/compile')).to.be.true // TODO: auto_compile query param
expect(fetchMock.called('express:/project/:projectId/output')).to.be.true
expect(fetchMock.called('express:/build/:file')).to.be.true // TODO: actual path
expect(fetchMock.called('begin:https://clsi.test-overleaf.com/')).to.be.true // TODO: actual path
})
it('shows an error for an invalid URL', async function () {