fix: Reverts #20749 and #20645 (#20796)

* Revert "fix: Error when saving datasource from Explore (#20749)"

This reverts commit 92f3621c75.

* Revert "refactor: Unify shared datasources reducers and actions (#20645)"

This reverts commit 2a705406e1.
This commit is contained in:
Michael S. Molina
2022-07-20 17:03:19 -03:00
committed by GitHub
parent 84b852c457
commit 3311128c5e
21 changed files with 259 additions and 111 deletions

View File

@@ -46,10 +46,11 @@ import {
import { getUrlParam } from 'src/utils/urlUtils';
import cx from 'classnames';
import * as chartActions from 'src/components/Chart/chartAction';
import { fetchDatasourceMetadata } from 'src/dashboard/util/fetchDatasourceMetadata';
import { fetchDatasourceMetadata } from 'src/dashboard/actions/datasources';
import { chartPropShape } from 'src/dashboard/util/propShapes';
import { mergeExtraFormData } from 'src/dashboard/components/nativeFilters/utils';
import { postFormData, putFormData } from 'src/explore/exploreUtils/formData';
import { datasourcesActions } from 'src/explore/actions/datasourcesActions';
import { mountExploreUrl } from 'src/explore/exploreUtils';
import { getFormDataFromControls } from 'src/explore/controlUtils';
import * as exploreActions from 'src/explore/actions/exploreActions';
@@ -753,6 +754,7 @@ function mapStateToProps(state) {
function mapDispatchToProps(dispatch) {
const actions = {
...exploreActions,
...datasourcesActions,
...saveModalActions,
...chartActions,
...logActions,