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

Cancel Import File Error Message #52

Closed
wants to merge 129 commits into from
Closed

Cancel Import File Error Message #52

wants to merge 129 commits into from

Conversation

frakes413
Copy link
Contributor

Types of changes


  • Bugfix (change which fixes an issue)

  • New feature (change which adds functionality)

  • Refactor (change which changes the codebase without affecting its external behavior)

  • Non-breaking change (fix or feature that would causes existing functionality to work as expected)
    
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
    
## Purpose
    To fix the following bug - error message was occurring upon cancellation of file import
    
## Approach

    Utilized the ‘canceled’ property on the result object generated by .showOpenDialog to tailor application response to canceling file import

serenackuo and others added 30 commits September 23, 2020 19:44
@serenackuo
Merge pull request #47 from open-source-labs/staging
b1b4a66 
Data Generator Feature
@muhammadtrad
Merge pull request #49 from open-source-labs/staging
2b4b95a 
Minor edits fixing breaking change.
prepping for first upstream merge
804efa4
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR into ma…
668f2c0 
…ster
merging w upstream rd 2
23e5279
merged w upstream
13d006f
@cwalker3011
installed dependencies
654762d
@cwalker3011
sass compiling package.json
3b8c961
@cwalker3011
set up testing configuration
36be520
@cwalker3011
set up jest and babel to run tests, created a setup file for the enzy…
a8919f5 
…me react adapter, created basic test for splash page
@cwalker3011
Merge pull request #1 from cwalker3011/workingbranch
7821614 
Jest and Enzyme testing suite
@frakes413
Merge pull request #2 from oslabs-beta/staging
b6f6124 
Merge changes to testing in staging into master
@cwalker3011
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR
1916bed
merge from upstream after testing initialized
317c242
@caseyescovedo
Left panel testing started
3004a55
@caseyescovedo
Merge pull request #3 from caseyescovedo/leftPanelTesting
ef7dee8 
Left panel testing started
@frakes413
Merge pull request #4 from oslabs-beta/staging
7abb751 
Left panel testing
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR into ma…
a1f482b 
…ster
changed compare test file name to match convention; completed basic t…
1641213 
…esting for left-panel history component
accidental arbitrary re-save
bf63e48
@JustinD-A
merging with left-panel testing
33e319c
@JustinD-A
(testing) front end testing suite
4feec3d
@JustinD-A
frontend testing suite and live sass compiling bug-fix
2893853
@JustinD-A
Merge pull request #5 from JustinD-A/testing
6a362a8 
Front-end Testing and .sass Compile Bug Fix
@caseyescovedo
Merge pull request #6 from oslabs-beta/staging
d9abe67 
Frontend testing and live sass compiler bug fix
@cwalker3011
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR
367194b
@cwalker3011
added + styled checkbox to track (non-functional)
a5792a3
@cwalker3011
checkbox changes new property in state
4cbe094
@cwalker3011
checkbox works, WIP func for non-tracked queries
5c55fa1
@cwalker3011
everything working with tracked/untracked queries
23e156d
JustinD-A and others added 25 commits October 7, 2020 20:40
@JustinD-A
Merge pull request #30 from oslabs-beta/staging
e73d2ae 
Copy csv files to local file system.
@JustinD-A
merging with upstream
4d31aad
@cwalker3011
removed unused components from app, fixed small UI bugs
eb19a79 
Co-authored-by: Sam Frakes samuelafrakes@gmail.com
@JustinD-A
testing PostgreSQL copy from command on mac
2d2f046
@cwalker3011
Merge branch 'dummy_data' of https://github.com/JustinD-A/SeeQR into …
6e74093 
…componentsUI
dummy data generation functional for DBs w/o FK constraints AND singl…
37dad8e 
…e table

Co-authored-by: Casey Walker casey.e.walker@gmail.com
Co-authored-by: Justin Dury-Agri justin.dury.agri@gmail.com
Co-authored-by: Casey Escovedo caseyjescovedo@gmail.com
@frakes413
Merge pull request #31 from frakes413/csvFileCopy
a0b6220 
Dummy Data Generation: Copying CSV File
@JustinD-A
Merge pull request #32 from oslabs-beta/staging
2426ed6 
Dummy Data Generation: Copying CSV Files to DBs
@cwalker3011
Merge branch 'master' into componentsUI
7ceaafe
@cwalker3011
Merge pull request #33 from cwalker3011/componentsUI
9515580 
Component removal and UI fixes
@frakes413
Merge pull request #34 from oslabs-beta/staging
e758126 
Removed unused components and UI bugfixes
@cwalker3011
DDModal table clears upon submitting request
9776ebc
@cwalker3011
front-end mesages for errors in execute function
f9eb4a7
@cwalker3011
Merge pull request #35 from cwalker3011/ddFrontendFix
3dcb71d 
Dd frontend fix
@JustinD-A
Merge pull request #36 from oslabs-beta/staging
9512b21 
Dummy data table now resets upon submit, error messages from all docker commands now reach front end
all dummy data types that currently have corresponding switch cases n…
1f20576 
…ow generating properly
@frakes413
Merge pull request #37 from frakes413/DD_DataTypes
940e952 
Dummy Data Types Generation
@JustinD-A
(UI improvement) stable coloring for compare graph
3363227
@JustinD-A
Merge pull request #38 from oslabs-beta/staging
2000ec0 
Proper Generation of Existing Dummy Data Types
@JustinD-A
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR into gr…
7862519 
…aph_color
@JustinD-A
Merge pull request #39 from JustinD-A/graph_color
372d91c 
Graph color and refactor of compare file
@frakes413
Merge pull request #40 from oslabs-beta/staging
954f131 
Stable graph coloring and refactor of compare file
removed unnecessary imports from SchemaModal.tsx
a7201ad
bugfix - error pop-up no longer appearing when user chooses 'cancel' …
30472a0 
…while uploading file from schema modal
@frakes413
Merge pull request #41 from frakes413/CancelImportBugfix
6b6aacd 
Cancel Import File Error Message
@frakes413
Copy link
Contributor Author

Accidental PR

@frakes413 frakes413 closed this Oct 10, 2020
frakes413 added a commit to frakes413/SeeQR that referenced this pull request Oct 17, 2020
@frakes413
Merge pull request open-source-labs#52 from oslabs-beta/staging
dfbdbc2 
Fixed path to docker-compose for MacOS packaging executable
cindychau pushed a commit that referenced this pull request Feb 25, 2021
@rlam108
Merge pull request #52 from Claudiohbsantos/font
647713e 
Use Roboto Font
derekoko pushed a commit that referenced this pull request Aug 24, 2023
@peterzepf
Merge pull request #52 from oslabs-beta/annabelle/ui
ab6956b 
Annabelle/UI
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@frakes413 @serenackuo @muhammadtrad @cwalker3011 @caseyescovedo @JustinD-A