feat: Move Database Import option into DB Connection modal #19314

lyndsiWilliams · 2022-03-22T18:03:22Z

SUMMARY

This PR moves the import database from file option inside of the database connection modal.

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

BEFORE:

AFTER:

TESTING INSTRUCTIONS

Open the database connection modal and click "Import database from file" at the bottom
Import a database from file that requires a password to see the new password confirmation
Import a database from file that already exists to see the new overwrite confirmation
If you import a database that doesn't already exist and doesn't require a password, the modal should close and add the database with no further confirmation.

ADDITIONAL INFORMATION

Has associated issue:
Required feature flags:
Changes UI
Includes DB Migration (follow approval process in SIP-59)
- Migration is atomic, supports rollback & is backwards-compatible
- Confirm DB migration upgrade and downgrade tested
- Runtime estimates and downtime expectations provided
Introduces new feature or API
Removes existing feature or API

lyndsiWilliams · 2022-03-29T12:04:56Z

/testenv up

github-actions · 2022-03-29T12:06:28Z

@lyndsiWilliams Container image not yet published for this PR. Please try again when build is complete.

github-actions · 2022-03-29T12:06:29Z

@lyndsiWilliams Ephemeral environment creation failed. Please check the Actions logs for details.

lyndsiWilliams · 2022-03-29T13:43:19Z

/testenv up

github-actions · 2022-03-29T13:47:55Z

@lyndsiWilliams Ephemeral environment spinning up at http://35.87.202.25:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

codecov · 2022-03-29T15:54:27Z

Codecov Report

Merging #19314 (b4c6b6a) into master (b689ac2) will increase coverage by 0.00%.
The diff coverage is 40.21%.

@@           Coverage Diff            @@
##           master   #19314    +/-   ##
========================================
  Coverage   66.43%   66.44%            
========================================
  Files        1670     1678     +8     
  Lines       63958    64243   +285     
  Branches     6506     6584    +78     
========================================
+ Hits        42490    42684   +194     
- Misses      19782    19856    +74     
- Partials     1686     1703    +17

Flag	Coverage Δ
javascript	`51.46% <40.21%> (+0.14%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
superset-frontend/src/components/Button/index.tsx	`100.00% <ø> (ø)`
...tend/src/views/CRUD/data/database/DatabaseList.tsx	`67.94% <ø> (+0.55%)`	⬆️
...c/views/CRUD/data/database/DatabaseModal/index.tsx	`31.80% <37.17%> (-1.10%)`	⬇️
...s/CRUD/data/database/DatabaseModal/ModalHeader.tsx	`66.66% <37.50%> (-3.71%)`	⬇️
superset-frontend/src/views/CRUD/hooks.ts	`46.40% <66.66%> (-0.76%)`	⬇️
...c/views/CRUD/data/database/DatabaseModal/styles.ts	`76.69% <100.00%> (+0.69%)`	⬆️
.../components/ExploreAdditionalActionsMenu/index.jsx	`57.14% <0.00%> (-38.32%)`	⬇️
...set-frontend/src/components/ReportModal/styles.tsx	`87.50% <0.00%> (-12.50%)`	⬇️
...src/BigNumber/BigNumberWithTrendline/buildQuery.ts	`0.00% <0.00%> (-11.12%)`	⬇️
...rc/explore/components/ExploreChartHeader/index.jsx	`42.10% <0.00%> (-6.58%)`	⬇️
... and 117 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b689ac2...b4c6b6a. Read the comment docs.

github-actions · 2022-04-05T21:44:58Z

@lyndsiWilliams Ephemeral environment spinning up at http://35.86.102.143:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

hughhhh · 2022-04-06T15:51:30Z

superset-frontend/src/views/CRUD/hooks.ts

@@ -381,6 +381,7 @@ interface ImportResourceState {
  loading: boolean;
  passwordsNeeded: string[];
  alreadyExists: string[];
+  errored: boolean;


nit: name this failed

Can do! Fixed in this commit.

lyndsiWilliams · 2022-04-07T19:32:50Z

/testenv up

github-actions · 2022-04-07T19:37:11Z

@lyndsiWilliams Ephemeral environment spinning up at http://34.222.96.52:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

github-actions · 2022-04-07T20:25:14Z

Ephemeral environment shutdown and build artifacts deleted.

yousoph · 2022-04-07T20:38:38Z

/testenv up

github-actions · 2022-04-07T20:39:13Z

@yousoph Container image not yet published for this PR. Please try again when build is complete.

github-actions · 2022-04-07T20:39:14Z

@yousoph Ephemeral environment creation failed. Please check the Actions logs for details.

lyndsiWilliams · 2022-04-07T20:56:40Z

/testenv up

github-actions · 2022-04-07T20:58:43Z

@lyndsiWilliams Ephemeral environment spinning up at http://34.218.59.123:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

eschutho · 2022-04-08T16:30:48Z

superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx

-        if (onDatabaseAdd) {
-          onDatabaseAdd();
-        }
+        if (onDatabaseAdd) onDatabaseAdd();


nit, but a little cleaner for next time:

Suggested change

if (onDatabaseAdd) onDatabaseAdd();

onDatabaseAdd && onDatabaseAdd();

eschutho · 2022-04-08T16:36:21Z

superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx

-      setHasConnectedDb(false);
-    }
+    if (editNewDb) setHasConnectedDb(false);
+    if (importingModal) setImportingModal(false);


another nit that we can prob address in a later cleanup. The name importingModal sounds like a current state where the modal is importing.

eschutho

Nice job @lyndsiWilliams!

github-actions · 2022-04-08T17:04:08Z

Ephemeral environment shutdown and build artifacts deleted.

) * rebase * more progress * Fix unintended changes * DB import goes to step 3 * debugging * DB list refreshing properly * import screens flowing properly * Code cleanup * Fixed back button on import flow * Remove import db tooltip test * Fix test * Password field resets properly * Changed import modal state dictators and removed unneeded comment * Removed unneeded param pass and corrected modal spelling * Fixed typos * Changed file to fileList * Clarified import footer comment * Cleaned passwordNeededField and confirmOverwriteField state checks * debugging * Import state flow fixed * Removed unneeded importModal check in unreachable area * Fixed import db footer behavior when pressing back on step 2 * Import db button now at 14px * Removed animation from import db button * Fixed doble-loading successToast * Fixed errored import behavior * Updated import password check info box text * Connect button disables while importing db is loading * Connect button disables while overwrite confirmation is still needed * Connect button disables while password confirmation is still needed * Removed gray line under upload filename * Hide trashcan icon on import filename * Modal scroll behavior fixed for importing filename * Changed errored to failed * RTL testing for db import

superset-github-bot bot added the preset-io label Mar 22, 2022

pull-request-size bot added the size/L label Mar 22, 2022

superset-github-bot bot added the Superset-Community-Partners Preset community partner program participants label Mar 22, 2022

lyndsiWilliams force-pushed the lyndsi/move-db-import branch from a08f7ba to 4f46b15 Compare March 25, 2022 16:57

lyndsiWilliams added 8 commits March 28, 2022 17:43

rebase

2820627

more progress

da40e8d

Fix unintended changes

bc7ef74

DB import goes to step 3

1a53bdb

debugging

84dd7f5

DB list refreshing properly

3a86dea

import screens flowing properly

c4715da

Code cleanup

14ec320

lyndsiWilliams force-pushed the lyndsi/move-db-import branch from f035393 to 14ec320 Compare March 29, 2022 04:48

lyndsiWilliams changed the title ~~[WIP] feature: Move Database Import option into DB Connection modal~~ feature: Move Database Import option into DB Connection modal Mar 29, 2022

apache deleted a comment from github-actions bot Mar 29, 2022

lyndsiWilliams changed the title ~~feature: Move Database Import option into DB Connection modal~~ feat: Move Database Import option into DB Connection modal Mar 29, 2022

Fixed back button on import flow

bcc9a32

lyndsiWilliams removed the Superset-Community-Partners Preset community partner program participants label Mar 29, 2022

lyndsiWilliams marked this pull request as ready for review March 29, 2022 11:47

lyndsiWilliams added 2 commits March 29, 2022 08:49

Remove import db tooltip test

c61e0b1

Fix test

415011e

Updated import password check info box text

0bbf890

hughhhh reviewed Apr 6, 2022

View reviewed changes

lyndsiWilliams added 7 commits April 7, 2022 08:41

Connect button disables while importing db is loading

e5fc92d

Connect button disables while overwrite confirmation is still needed

55eedff

Connect button disables while password confirmation is still needed

48749e4

Removed gray line under upload filename

ca6377c

Hide trashcan icon on import filename

5a4ee8b

Modal scroll behavior fixed for importing filename

87f4cac

Changed errored to failed

b61afd4

yousoph closed this Apr 7, 2022

yousoph reopened this Apr 7, 2022

RTL testing for db import

b4c6b6a

AAfghahi approved these changes Apr 8, 2022

View reviewed changes

eschutho reviewed Apr 8, 2022

View reviewed changes

eschutho approved these changes Apr 8, 2022

View reviewed changes

eschutho merged commit d52e386 into apache:master Apr 8, 2022

mistercrunch added 🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels 🚢 2.0.0 labels Mar 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Move Database Import option into DB Connection modal #19314

feat: Move Database Import option into DB Connection modal #19314

lyndsiWilliams commented Mar 22, 2022 •

edited

lyndsiWilliams commented Mar 29, 2022

github-actions bot commented Mar 29, 2022

github-actions bot commented Mar 29, 2022

lyndsiWilliams commented Mar 29, 2022

github-actions bot commented Mar 29, 2022

codecov bot commented Mar 29, 2022 •

edited

github-actions bot commented Apr 5, 2022

hughhhh Apr 6, 2022

lyndsiWilliams Apr 7, 2022

lyndsiWilliams commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

yousoph commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

lyndsiWilliams commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

eschutho Apr 8, 2022

eschutho Apr 8, 2022

eschutho left a comment

github-actions bot commented Apr 8, 2022

	if (onDatabaseAdd) onDatabaseAdd();
	onDatabaseAdd && onDatabaseAdd();

feat: Move Database Import option into DB Connection modal #19314

feat: Move Database Import option into DB Connection modal #19314

Conversation

lyndsiWilliams commented Mar 22, 2022 • edited

SUMMARY

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

BEFORE:

AFTER:

TESTING INSTRUCTIONS

ADDITIONAL INFORMATION

lyndsiWilliams commented Mar 29, 2022

github-actions bot commented Mar 29, 2022

github-actions bot commented Mar 29, 2022

lyndsiWilliams commented Mar 29, 2022

github-actions bot commented Mar 29, 2022

codecov bot commented Mar 29, 2022 • edited

Codecov Report

github-actions bot commented Apr 5, 2022

hughhhh Apr 6, 2022

Choose a reason for hiding this comment

lyndsiWilliams Apr 7, 2022

Choose a reason for hiding this comment

lyndsiWilliams commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

yousoph commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

lyndsiWilliams commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

eschutho Apr 8, 2022

Choose a reason for hiding this comment

eschutho Apr 8, 2022

Choose a reason for hiding this comment

eschutho left a comment

Choose a reason for hiding this comment

github-actions bot commented Apr 8, 2022

lyndsiWilliams commented Mar 22, 2022 •

edited

codecov bot commented Mar 29, 2022 •

edited