-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #505 from Duke-MatSci/xml_input
XML Curation
- Loading branch information
Showing
19 changed files
with
650 additions
and
158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,15 @@ | ||
| <template> | ||
| <div class="page-not-found"> | ||
| <i class="material-icons page-not-found-header u--padding-zero" >lock_person</i> | ||
| <i class="material-icons page-not-found-header u--padding-zero" | ||
| >lock_person</i | ||
| > | ||
| <h2 class="u_margin-bottom-small">Login required</h2> | ||
| <p>The page you are trying to access requires authentication. | ||
| Would you like to <a>log in</a> or return to the | ||
| <router-link to=""><a @click="$router.go(-1)">previous page</a></router-link>? | ||
| <p> | ||
| The page you are trying to access requires authentication. Would you like | ||
| to <a href="/secure">log in</a> or return to the | ||
| <router-link to="" | ||
| ><a @click="$router.go(-1)">previous page</a></router-link | ||
| >? | ||
| </p> | ||
| </div> | ||
| </template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| <template> | ||
| <div class="section_teams"> | ||
| <div> | ||
| <CurateNavBar active="New XML Upload" :navRoutes="navRoutes" /> | ||
| </div> | ||
| <div class="curate"> | ||
| <LoginReq v-if="!isAuth" /> | ||
| <div v-else-if="loading" class="section_loader"> | ||
| <spinner :text="uploadInProgress" /> | ||
| </div> | ||
| <div v-else-if="submitted" class="section_loader"> | ||
| <h2 class="visualize_header-h1">XML Samples Submitted</h2> | ||
| </div> | ||
| <div v-else> | ||
| <h2 class="visualize_header-h1">Upload XML Samples</h2> | ||
| <md-steppers | ||
| md-vertical | ||
| md-linear | ||
| :md-active-step.sync="active" | ||
| class="form__stepper" | ||
| > | ||
| <md-step id="first" md-label="Upload Xml File" :md-done.sync="first"> | ||
| <DropZone class="form__drop-area" @files-dropped="addXmlFile"> | ||
| <label for="xml-file-input"> | ||
| <div class="form__drop-area_label"> | ||
| <div class="explorer_page-nav-card_text"> | ||
| Drag prepared xml files here | ||
| </div> | ||
| <div | ||
| class="md-layout-item_para md-layout-item_para_fl" | ||
| style="text-align: center" | ||
| > | ||
| or click to browse. Accepts .xml files | ||
| </div> | ||
| <input | ||
| type="file" | ||
| id="xml-file-input" | ||
| multiple | ||
| @change="onInputChange" | ||
| accept=".xml" | ||
| /> | ||
| </div> | ||
| </label> | ||
| </DropZone> | ||
| <div class="u--margin-posmd u--color-primary teams_header"> | ||
| <strong>Note:</strong> Title, Author, Citation Type and | ||
| Publication Year, are required entry in the XML. | ||
| </div> | ||
| <div class="md-layout" v-show="xmlFiles.length"> | ||
| <md-list class="md-layout utility-transparentbg md-theme-default"> | ||
| <FilePreview | ||
| v-for="file in xmlFiles" | ||
| :key="file.id" | ||
| :file="file" | ||
| tag="div" | ||
| classname="md-layout-item" | ||
| @remove="removeXmlFile" | ||
| /> | ||
| </md-list> | ||
| </div> | ||
| <md-button | ||
| type="submit" | ||
| :disabled="xmlFiles.length < 1" | ||
| class="md-button_next u--margin-toplg" | ||
| @click="goToStep('first', 'second')" | ||
| > | ||
| Next | ||
| </md-button> | ||
| </md-step> | ||
| <md-step | ||
| id="second" | ||
| md-label="Confirm and submit" | ||
| :md-done.sync="second" | ||
| > | ||
| <div class="u--color-primary teams_header"> | ||
| <strong>Are you sure?</strong> Select | ||
| <strong>Save & Submit</strong> to confirm or | ||
| <strong>Go Back</strong> to cancel | ||
| </div> | ||
| <div class="md-layout"> | ||
| <md-button | ||
| type="submit" | ||
| class="md-layout-item md-button_prev md-size-40" | ||
| @click="goToStep('second', 'first')" | ||
| > | ||
| <md-icon>arrow_back</md-icon>Go Back | ||
| </md-button> | ||
| <md-button | ||
| id="submit" | ||
| type="submit" | ||
| :disabled="xmlFiles.length < 1" | ||
| class="md-layout-item md-button_next md-size-40" | ||
| @click="submitXmlFiles" | ||
| > | ||
| Save and Submit | ||
| </md-button> | ||
| </div> | ||
| </md-step> | ||
| </md-steppers> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import DropZone from '@/components/curate/FileDrop.vue' | ||
| import FilePreview from '@/components/curate/FilePreview.vue' | ||
| import LoginRequired from '@/components/LoginRequired.vue' | ||
| import CurateNavBar from '@/components/curate/CurateNavBar.vue' | ||
| import Spinner from '@/components/Spinner.vue' | ||
| import useFileList from '@/modules/file-list' | ||
| import { mapGetters, mapActions } from 'vuex' | ||
| const xmlFilesFn = useFileList() | ||
| export default { | ||
| name: 'XmlUpload', | ||
| components: { | ||
| DropZone, | ||
| FilePreview, | ||
| CurateNavBar, | ||
| Spinner, | ||
| LoginReq: LoginRequired | ||
| }, | ||
| data () { | ||
| return { | ||
| active: 'first', | ||
| first: false, | ||
| second: false, | ||
| xmlFiles: xmlFilesFn.files, | ||
| loading: false, | ||
| uploadInProgress: null, | ||
| submitted: false, | ||
| navRoutes: [ | ||
| { | ||
| label: 'Curate', | ||
| path: '/explorer/curate' | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| methods: { | ||
| addXmlFile: xmlFilesFn.addFiles, | ||
| removeXmlFile: xmlFilesFn.removeFile, | ||
| modStatXml: xmlFilesFn.modifyStatus, | ||
| ...mapActions({ | ||
| submitXML: 'explorer/curation/submitXmlFiles' | ||
| }), | ||
| goToStep (id, index) { | ||
| // this.clearSnackbar(); | ||
| this[id] = true | ||
| if (index) { | ||
| this.active = index | ||
| } | ||
| }, | ||
| filterXml (files) { | ||
| this.renameXlsx = false | ||
| const newFiles = [...files] | ||
| const filteredFiles = [] | ||
| const regex = /.xml$/gi | ||
| for (let i = 0; i < newFiles.length; i++) { | ||
| if (!regex.test(newFiles[i].name)) { | ||
| this.renameXlsx = true | ||
| } else filteredFiles.push(newFiles[i]) | ||
| } | ||
| return filteredFiles | ||
| }, | ||
| onInputChange (e) { | ||
| // TODO: Remove the if statement below and check that everything works correctly | ||
| if (e.target.id === 'xml-file-input') { | ||
| const uploadedXmlFiles = this.filterXml(e.target.files) | ||
| this.addXmlFile(uploadedXmlFiles) | ||
| } | ||
| // reset so that selecting the same file again will still cause it to fire this change | ||
| e.target.value = null | ||
| }, | ||
| async submitXmlFiles () { | ||
| this.uploadInProgress = 'Uploading...' | ||
| this.loading = true | ||
| await this.submitXML(this.xmlFiles) | ||
| this.loading = false | ||
| this.submitted = true | ||
| this.uploadInProgress = null | ||
| } | ||
| }, | ||
| computed: { | ||
| ...mapGetters({ | ||
| isAuth: 'auth/isAuthenticated' | ||
| }) | ||
| } | ||
| } | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.