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

Jump to bottom

#229 Spreadsheet File Interface #282

Merged
merged 32 commits into from
Dec 14, 2022
Merged

#229 Spreadsheet File Interface #282

merged 32 commits into from
Dec 14, 2022

Conversation

aswallace
Copy link
Collaborator

@aswallace aswallace commented Dec 7, 2022 •
edited
Loading

Spreadsheet upload UI

  • Stepper module
  • New "file preview" and "file drop" components
  • New component for when a page requires login and user is not authenticated
  • Page for viewing the current user's existing datasets
  • Page for viewing the files associated with a specific dataset
  • Submits files using Apollo graphql

Also added unit tests for all new components/pages, as well as new styling

closes #229 #283 #285

aswallace and others added 29 commits August 23, 2022 15:00
@aswallace
#229: Initial UI for spreadsheet upload interface
50f2963
@aswallace
Merge branch '#229_Spreadsheet_file_interface' of https://github.com/…
911d8d6 
…Duke-MatSci/materialsmine into #229_Spreadsheet_file_interface
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
f3852dd 
…into #229_spreadsheet_file_interface
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
f4ed95a 
…into #229_spreadsheet_file_interface
@aswallace
#229: Spreadsheet upload draft
705dc30
@aswallace
Linting errors
f2560d4
@tholulomo
#229: Fixed datasetId mutation bug
3742635
@tholulomo
#229: update failing test
aa5e51f
@aswallace
Merge branch 'hotfix_dataset_mutations' of https://github.com/Duke-Ma…
5d7ecc1 
…tSci/materialsmine into #229_spreadsheet_file_interface
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
e45279d 
…into #229_spreadsheet_file_interface
@aswallace
#229: UI fixes; createdDatasetId working
a51d24b
@aswallace
#229: XML Spreadsheet upload wip
11f8541 
400 error in createDataset file upload: `BAD_USER_INPUT`
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
fff56b8 
…into #229_spreadsheet_file_interface
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
0800dfd 
…into #229_spreadsheet_file_interface
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
e259568 
…into #229_spreadsheet_file_interface
@aswallace
#229: Update curation UI and merge dev
7bca51f
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
2a769af 
…into #229_spreadsheet_file_interface
@tholulomo
[Hotfix]: dataset curation updates
09c93b9
@aswallace
Merge branch 'hotfix_mutations' of https://github.com/Duke-MatSci/mat…
26be688 
…erialsmine into #229_spreadsheet_file_interface
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
19b4333 
…into #229_spreadsheet_file_interface
@aswallace
#229: MVP spreadsheet upload UI
5edaee9
@aswallace
#229: Fix component name and linting
0bebc49
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
a6e9307 
…into #229_spreadsheet_file_interface
@aswallace
#229: Spreadsheet upload - split files and rename
fdd5caf
@aswallace
#229: Fix linting
87e8843
@aswallace
#229: Add unit tests for all supporting components
e7399ce
@aswallace
#229: Add unit test for spreadsheet upload page
96ebba4
@aswallace
Undo accidental package-lock commit
b1a70eb
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
5b498d0 
…into #229_spreadsheet_file_interface
@aswallace aswallace self-assigned this Dec 7, 2022
@aswallace aswallace linked an issue Dec 7, 2022 that may be closed by this pull request
Spreadsheet File Interface #229
Closed
4 tasks
@aswallace
Copy link
Collaborator Author

I know this is a pretty big PR, so let me know if I should split it up into smaller pieces

@aswallace aswallace added this to the 12/1/22 - 12/15/22 milestone Dec 7, 2022
This was referenced Dec 8, 2022
Closed
Closed
Closed
tholulomo
tholulomo reviewed Dec 9, 2022
View reviewed changes
Copy link
Contributor

@tholulomo tholulomo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added few comments/suggestions

app/src/components/LoginRequired.vue Show resolved Hide resolved
app/src/components/curate/CurateNavBar.vue Outdated Show resolved Hide resolved
app/src/components/curate/FileDrop.vue Show resolved Hide resolved
app/src/pages/explorer/curate/spreadsheet/spreadsheet-upload-script.js Show resolved Hide resolved
app/src/pages/explorer/curate/spreadsheet/spreadsheet-upload-script.js Show resolved Hide resolved
app/src/pages/explorer/curate/spreadsheet/spreadsheet-upload-script.js Outdated Show resolved Hide resolved
app/src/pages/explorer/curate/spreadsheet/spreadsheet-upload-script.js Outdated Show resolved Hide resolved
app/src/pages/explorer/curate/spreadsheet/spreadsheet-upload-script.js Outdated Show resolved Hide resolved
app/vue.config.js Show resolved Hide resolved
resfulservice/src/graphql/resolver/dataset/mutation.js Show resolved Hide resolved
@aswallace aswallace mentioned this pull request Dec 14, 2022
Closed
@aswallace aswallace merged commit a0e605e into develop Dec 14, 2022
@tholulomo tholulomo deleted the #229_spreadsheet_file_interface branch December 14, 2022 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tholulomo tholulomo tholulomo approved these changes

Assignees

@aswallace aswallace

Labels
None yet
Projects
None yet
Milestone
12/1/22 - 12/15/22
Development

Successfully merging this pull request may close these issues.

Spreadsheet File Interface
2 participants
@aswallace @tholulomo