This is an automated email from the ASF dual-hosted git repository.
justinpark pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new d23df35087 fix(sqllab): custom url params disappeared (#23952)
d23df35087 is described below
commit d23df35087ff4f896ce8e86d9bb7de88ee576c0d
Author: JUST.in DO IT <[email protected]>
AuthorDate: Mon May 8 11:55:56 2023 -0700
fix(sqllab): custom url params disappeared (#23952)
---
.../TabbedSqlEditors/TabbedSqlEditors.test.jsx | 14 +++-
.../SqlLab/components/TabbedSqlEditors/index.jsx | 80 ++++++++++++----------
2 files changed, 58 insertions(+), 36 deletions(-)
diff --git
a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/TabbedSqlEditors.test.jsx
b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/TabbedSqlEditors.test.jsx
index 105751a4d0..d826a5a9b0 100644
---
a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/TabbedSqlEditors.test.jsx
+++
b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/TabbedSqlEditors.test.jsx
@@ -35,7 +35,7 @@ import { newQueryTabName } from
'src/SqlLab/utils/newQueryTabName';
import QueryProvider from 'src/views/QueryProvider';
fetchMock.get('glob:*/api/v1/database/*', {});
-fetchMock.get('glob:*/savedqueryviewapi/api/get/*', {});
+fetchMock.get('glob:*/api/v1/saved_query/*', {});
fetchMock.get('glob:*/kv/*', {});
describe('TabbedSqlEditors', () => {
@@ -131,6 +131,18 @@ describe('TabbedSqlEditors', () => {
'/superset/sqllab',
);
});
+ it('should handle custom url params', async () => {
+ uriStub.returns({
+ sql: 1,
+ dbid: 1,
+ custom_value: 'str',
+ extra_attr1: 'true',
+ });
+ await mountWithAct();
+ expect(window.history.replaceState.getCall(0).args[2]).toBe(
+ '/superset/sqllab?custom_value=str&extra_attr1=true',
+ );
+ });
});
it('should removeQueryEditor', () => {
wrapper = getWrapper();
diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.jsx
b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.jsx
index 1a6aac0bf8..28f2133a75 100644
--- a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.jsx
+++ b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.jsx
@@ -17,6 +17,7 @@
* under the License.
*/
import React from 'react';
+import pick from 'lodash/pick';
import PropTypes from 'prop-types';
import { EditableTabs } from 'src/components/Tabs';
import { connect } from 'react-redux';
@@ -117,56 +118,64 @@ class TabbedSqlEditors extends React.PureComponent {
// but for some reason this data isn't being passed properly through
// the reducer.
const bootstrapData = getBootstrapData();
- const query = {
+ const queryParameters = URI(window.location).search(true);
+ const {
+ id,
+ name,
+ sql,
+ savedQueryId,
+ datasourceKey,
+ queryId,
+ dbid,
+ dbname,
+ schema,
+ autorun,
+ new: isNewQuery,
+ ...urlParams
+ } = {
...bootstrapData.requested_query,
- ...URI(window.location).search(true),
+ ...queryParameters,
};
// Popping a new tab based on the querystring
- if (
- query.id ||
- query.sql ||
- query.savedQueryId ||
- query.datasourceKey ||
- query.queryId
- ) {
- if (query.id) {
- this.props.actions.popStoredQuery(query.id);
- } else if (query.savedQueryId) {
- this.props.actions.popSavedQuery(query.savedQueryId);
- } else if (query.queryId) {
- this.props.actions.popQuery(query.queryId);
- } else if (query.datasourceKey) {
- this.props.actions.popDatasourceQuery(query.datasourceKey, query.sql);
- } else if (query.sql) {
- let dbId = query.dbid;
- if (dbId) {
- dbId = parseInt(dbId, 10);
+ if (id || sql || savedQueryId || datasourceKey || queryId) {
+ if (id) {
+ this.props.actions.popStoredQuery(id);
+ } else if (savedQueryId) {
+ this.props.actions.popSavedQuery(savedQueryId);
+ } else if (queryId) {
+ this.props.actions.popQuery(queryId);
+ } else if (datasourceKey) {
+ this.props.actions.popDatasourceQuery(datasourceKey, sql);
+ } else if (sql) {
+ let databaseId = dbid;
+ if (databaseId) {
+ databaseId = parseInt(databaseId, 10);
} else {
const { databases } = this.props;
- const dbName = query.dbname;
- if (dbName) {
+ const databaseName = dbname;
+ if (databaseName) {
Object.keys(databases).forEach(db => {
- if (databases[db].database_name === dbName) {
- dbId = databases[db].id;
+ if (databases[db].database_name === databaseName) {
+ databaseId = databases[db].id;
}
});
}
}
const newQueryEditor = {
- name: query.name,
- dbId,
- schema: query.schema,
- autorun: query.autorun,
- sql: query.sql,
+ name,
+ dbId: databaseId,
+ schema,
+ autorun,
+ sql,
};
this.props.actions.addQueryEditor(newQueryEditor);
}
- this.popNewTab();
- } else if (query.new || this.props.queryEditors.length === 0) {
+ this.popNewTab(pick(urlParams, Object.keys(queryParameters)));
+ } else if (isNewQuery || this.props.queryEditors.length === 0) {
this.newQueryEditor();
- if (query.new) {
+ if (isNewQuery) {
window.history.replaceState({}, document.title, this.state.sqlLabUrl);
}
} else {
@@ -187,9 +196,10 @@ class TabbedSqlEditors extends React.PureComponent {
}
}
- popNewTab() {
+ popNewTab(urlParams) {
// Clean the url in browser history
- window.history.replaceState({}, document.title, this.state.sqlLabUrl);
+ const updatedUrl = `${URI(this.state.sqlLabUrl).query(urlParams)}`;
+ window.history.replaceState({}, document.title, updatedUrl);
}
activeQueryEditor() {
