Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.42 Download encrypted submissions #235

Merged
merged 9 commits into from
Jul 26, 2019
Merged

5.42 Download encrypted submissions #235

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d7270f0
Rename FormSubmission* components to Submission*
matthew-white Jul 22, 2019
5b03bde
Move submissions table into its own component
matthew-white Jul 22, 2019
a0cf0ae
Update message for when there are no submissions
matthew-white Jul 22, 2019
437339c
Add "Decrypt and Download" modal to SubmissionList
matthew-white Jul 22, 2019
35c73b2
Change how SubmissionDecrypt detects a Problem response
matthew-white Jul 25, 2019
cec2d3e
Make small changes about Problem checks in SubmissionDecrypt
matthew-white Jul 26, 2019
9d48680
Test more things about SubmissionDecrypt iframe form
matthew-white Jul 26, 2019
459fee1
Add comments about fillForm() and submitForm()
matthew-white Jul 26, 2019
f045400
Add test about SubmissionDecrypt
matthew-white Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ module.exports = function(config) {
frameworks: ['mocha'],
files: [
'test/index.js',
{ pattern: 'public/fonts/icomoon.ttf', included: false, served: true }
{ pattern: 'public/fonts/icomoon.ttf', served: true, included: false },
{ pattern: 'public/blank.html', served: true, included: false },
{ pattern: 'test/files/*', served: true, included: false }
],
proxies: {
'/fonts/': '/base/public/fonts/'
'/fonts/': '/base/public/fonts/',
'/blank.html': '/base/public/blank.html',
'/test/files/': '/base/test/files/'
},
preprocessors: {
'test/index.js': ['webpack', 'sourcemap']
Expand Down
19 changes: 19 additions & 0 deletions public/blank.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<!--
Copyright 2019 ODK Central Developers
See the NOTICE file at the top-level directory of this distribution and at
https://github.com/opendatakit/central-frontend/blob/master/NOTICE.

This file is part of ODK Central. It is subject to the license terms in
the LICENSE file found in the top-level directory of this distribution and at
https://www.apache.org/licenses/LICENSE-2.0. No part of ODK Central,
including this file, may be copied, modified, propagated, or distributed
except according to the terms contained in the LICENSE file.
-->
<html lang="en">
<head>
<meta charset="utf-8">
<title>ODK Central</title>
</head>
<body></body>
</html>
18 changes: 9 additions & 9 deletions src/components/form/show.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ except according to the terms contained in the LICENSE file.
<loading
:state="$store.getters.initiallyLoading(['project', 'form', 'attachments'])"/>
<div v-show="project != null && form != null && attachments != null">
<!-- We only include FormSubmissionList, because it is the only
component whose state we want to preserve when the user navigates to a
different tab. -->
<keep-alive include="FormSubmissionList">
<!-- We only include SubmissionList, because it is the only component
whose state we want to preserve when the user navigates to a different
tab. -->
<keep-alive include="SubmissionList">
<!-- <router-view> is immediately created and can send its own
requests even before the server has responded to the requests from
ProjectHome and FormShow. -->
Expand All @@ -65,7 +65,7 @@ except according to the terms contained in the LICENSE file.
</template>

<script>
import FormSubmissionList from './submission/list.vue';
import SubmissionList from '../submission/list.vue';
import tab from '../../mixins/tab';
import { requestData } from '../../store/modules/request';

Expand All @@ -84,10 +84,10 @@ export default {
},
data() {
return {
// Passing these to FormSubmissionList in order to facilitate
// FormSubmissionList testing.
submissionChunkSizes: FormSubmissionList.props.chunkSizes.default(),
scrolledToBottom: FormSubmissionList.props.scrolledToBottom.default
// Passing these to SubmissionList in order to facilitate SubmissionList
// testing.
submissionChunkSizes: SubmissionList.props.chunkSizes.default(),
scrolledToBottom: SubmissionList.props.scrolledToBottom.default
};
},
computed: {
Expand Down
Loading