Commit 892338cb authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera Committed by Paul Slaughter
parent 9b28dc85
import Vue from 'vue'; import Vue from 'vue';
import pdfLab from '../../pdf/index.vue'; import PdfViewer from './pdf_viewer.vue';
import { GlLoadingIcon } from '@gitlab/ui';
export default () => { export default () => {
const el = document.getElementById('js-pdf-viewer'); const el = document.getElementById('js-pdf-viewer');
return new Vue({ return new Vue({
el, el,
components: { render(createElement) {
pdfLab, return createElement(PdfViewer, {
GlLoadingIcon, props: {
},
data() {
return {
error: false,
loadError: false,
loading: true,
pdf: el.dataset.endpoint, pdf: el.dataset.endpoint,
};
},
methods: {
onLoad() {
this.loading = false;
},
onError(error) {
this.loading = false;
this.loadError = true;
this.error = error;
}, },
});
}, },
template: `
<div class="js-pdf-viewer container-fluid md prepend-top-default append-bottom-default">
<div
class="text-center loading"
v-if="loading && !error">
<gl-loading-icon class="mt-5" size="lg"/>
</div>
<pdf-lab
v-if="!loadError"
:pdf="pdf"
@pdflabload="onLoad"
@pdflaberror="onError" />
<p
class="text-center"
v-if="error">
<span v-if="loadError">
An error occurred while loading the file. Please try again later.
</span>
<span v-else>
An error occurred while decoding the file.
</span>
</p>
</div>
`,
}); });
}; };
<script>
import PdfLab from '../../pdf/index.vue';
import { GlLoadingIcon } from '@gitlab/ui';
export default {
components: {
PdfLab,
GlLoadingIcon,
},
props: {
pdf: {
type: String,
required: true,
},
},
data() {
return {
error: false,
loadError: false,
loading: true,
};
},
methods: {
onLoad() {
this.loading = false;
},
onError(error) {
this.loading = false;
this.loadError = true;
this.error = error;
},
},
};
</script>
<template>
<div class="js-pdf-viewer container-fluid md prepend-top-default append-bottom-default">
<div v-if="loading && !error" class="text-center loading">
<gl-loading-icon class="mt-5" size="lg" />
</div>
<pdf-lab v-if="!loadError" :pdf="pdf" @pdflabload="onLoad" @pdflaberror="onError" />
<p v-if="error" class="text-center">
<span v-if="loadError" ref="loadError">
{{ __('An error occurred while loading the file. Please try again later.') }}
</span>
<span v-else>{{ __('An error occurred while decoding the file.') }}</span>
</p>
</div>
</template>
...@@ -1786,6 +1786,9 @@ msgstr "" ...@@ -1786,6 +1786,9 @@ msgstr ""
msgid "An error occurred while committing your changes." msgid "An error occurred while committing your changes."
msgstr "" msgstr ""
msgid "An error occurred while decoding the file."
msgstr ""
msgid "An error occurred while deleting the approvers group" msgid "An error occurred while deleting the approvers group"
msgstr "" msgstr ""
...@@ -1927,6 +1930,9 @@ msgstr "" ...@@ -1927,6 +1930,9 @@ msgstr ""
msgid "An error occurred while loading the file." msgid "An error occurred while loading the file."
msgstr "" msgstr ""
msgid "An error occurred while loading the file. Please try again later."
msgstr ""
msgid "An error occurred while loading the merge request changes." msgid "An error occurred while loading the merge request changes."
msgstr "" msgstr ""
......
import { shallowMount } from '@vue/test-utils';
import { GlLoadingIcon } from '@gitlab/ui';
import { FIXTURES_PATH } from 'spec/test_constants'; import { FIXTURES_PATH } from 'spec/test_constants';
import renderPDF from '~/blob/pdf'; import component from '~/blob/pdf/pdf_viewer.vue';
import PdfLab from '~/pdf/index.vue';
const testPDF = `${FIXTURES_PATH}/blob/pdf/test.pdf`; const testPDF = `${FIXTURES_PATH}/blob/pdf/test.pdf`;
describe('PDF renderer', () => { describe('PDF renderer', () => {
let viewer; let wrapper;
let app;
const checkLoaded = done => { const mountComponent = () => {
if (app.loading) { wrapper = shallowMount(component, {
setTimeout(() => { propsData: {
checkLoaded(done); pdf: testPDF,
}, 100); },
} else { });
done();
}
}; };
preloadFixtures('static/pdf_viewer.html'); const findLoading = () => wrapper.find(GlLoadingIcon);
const findPdfLab = () => wrapper.find(PdfLab);
const findLoadError = () => wrapper.find({ ref: 'loadError' });
beforeEach(() => { beforeEach(() => {
loadFixtures('static/pdf_viewer.html'); mountComponent();
viewer = document.getElementById('js-pdf-viewer');
viewer.dataset.endpoint = testPDF;
}); });
it('shows loading icon', () => { afterEach(() => {
renderPDF(); wrapper.destroy();
wrapper = null;
});
expect(document.querySelector('.loading')).not.toBeNull(); it('shows loading icon', () => {
expect(findLoading().exists()).toBe(true);
}); });
describe('successful response', () => { describe('successful response', () => {
beforeEach(done => { beforeEach(() => {
app = renderPDF(); findPdfLab().vm.$emit('pdflabload');
checkLoaded(done);
}); });
it('does not show loading icon', () => { it('does not show loading icon', () => {
expect(document.querySelector('.loading')).toBeNull(); expect(findLoading().exists()).toBe(false);
}); });
it('renders the PDF', () => { it('renders the PDF', () => {
expect(document.querySelector('.pdf-viewer')).not.toBeNull(); expect(findPdfLab().exists()).toBe(true);
});
it('renders the PDF page', () => {
expect(document.querySelector('.pdf-page')).not.toBeNull();
}); });
}); });
describe('error getting file', () => { describe('error getting file', () => {
beforeEach(done => { beforeEach(() => {
viewer.dataset.endpoint = 'invalid/path/to/file.pdf'; findPdfLab().vm.$emit('pdflaberror', 'foo');
app = renderPDF();
checkLoaded(done);
}); });
it('does not show loading icon', () => { it('does not show loading icon', () => {
expect(document.querySelector('.loading')).toBeNull(); expect(findLoading().exists()).toBe(false);
}); });
it('shows error message', () => { it('shows error message', () => {
expect(document.querySelector('.md').textContent.trim()).toBe( expect(findLoadError().text()).toBe(
'An error occurred while loading the file. Please try again later.', 'An error occurred while loading the file. Please try again later.',
); );
}); });
......
<div class="file-content" data-endpoint="/test" id="js-pdf-viewer"></div>
import Vue from 'vue'; import Vue from 'vue';
import { GlobalWorkerOptions } from 'pdfjs-dist/build/pdf';
import workerSrc from 'pdfjs-dist/build/pdf.worker.min';
import { FIXTURES_PATH } from 'spec/test_constants'; import { FIXTURES_PATH } from 'spec/test_constants';
import PDFLab from '~/pdf/index.vue'; import PDFLab from '~/pdf/index.vue';
const pdf = `${FIXTURES_PATH}/blob/pdf/test.pdf`; const pdf = `${FIXTURES_PATH}/blob/pdf/test.pdf`;
GlobalWorkerOptions.workerSrc = workerSrc;
const Component = Vue.extend(PDFLab); const Component = Vue.extend(PDFLab);
describe('PDF component', () => { describe('PDF component', () => {
......
import Vue from 'vue'; import Vue from 'vue';
import pdfjsLib from 'pdfjs-dist/build/pdf'; import pdfjsLib from 'pdfjs-dist/webpack';
import workerSrc from 'pdfjs-dist/build/pdf.worker.min';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import { FIXTURES_PATH } from 'spec/test_constants'; import { FIXTURES_PATH } from 'spec/test_constants';
...@@ -14,7 +13,6 @@ describe('Page component', () => { ...@@ -14,7 +13,6 @@ describe('Page component', () => {
let testPage; let testPage;
beforeEach(done => { beforeEach(done => {
pdfjsLib.GlobalWorkerOptions.workerSrc = workerSrc;
pdfjsLib pdfjsLib
.getDocument(testPDF) .getDocument(testPDF)
.promise.then(pdf => pdf.getPage(1)) .promise.then(pdf => pdf.getPage(1))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment