Skip to content

feat: db modal split #14470

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

Merged
hughhhh merged 3 commits into from
May 5, 2021
Merged

feat: db modal split #14470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cca102
refactor: split db modal file (#14436)
eschutho May 3, 2021
6956b08
fix extra options
eschutho May 4, 2021
5cc4025
update database id methodology
eschutho May 4, 2021
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
18 changes: 18 additions & 0 deletions superset-frontend/cypress-base/cypress/integration/database/modal.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ describe('Add database', () => {
// open modal
cy.get('[data-test="btn-create-database"]').click();

// values should be blank
cy.get('[data-test="database-modal"] input[name="database_name"]').should(
'have.value',
'',
);
cy.get('[data-test="database-modal"] input[name="sqlalchemy_uri"]').should(
'have.value',
'',
);

// type values
cy.get('[data-test="database-modal"] input[name="database_name"]')
.focus()
Expand All @@ -54,6 +64,14 @@ describe('Add database', () => {
// open modal
cy.get('[data-test="database-edit"]:last').click();

// it should show saved values
cy.get('[data-test="database-modal"]:last input[name="sqlalchemy_uri"]')
.invoke('val')
.should('not.be.empty');
cy.get('[data-test="database-modal"] input[name="database_name"]')
.invoke('val')
.should('not.be.empty');

cy.get('[data-test="database-modal"]:last input[name="sqlalchemy_uri"]')
.focus()
.dblclick()
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/spec/helpers/reducerIndex.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ export default {
explore,
sqlLab,
localStorageUsageInKilobytes,
common,
common: () => common,
};
2 changes: 1 addition & 1 deletion superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ function DatabaseList({ addDangerToast, addSuccessToast }: DatabaseListProps) {
<>
<SubMenu {...menuData} />
<DatabaseModal
database={currentDatabase}
databaseId={currentDatabase?.id}
show={databaseModalOpen}
onHide={() => setDatabaseModalOpen(false)}
onDatabaseAdd={() => {
Expand Down
Loading