Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: DS config saveAndDiscard modal discard flow update (#25955)

Browse Source
This commit is contained in:
ChandanBalajiBP 2023-08-03 17:13:27 +05:30 committed by GitHub
parent e81c06359d
commit bafd3cdd69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/client/src/pages/Editor/DataSourceEditor/index.tsx
View File

@ -251,13 +251,11 @@ class DatasourceEditorRouter extends React.Component<Props, State> {
this.props.switchDatasource(this.props.datasourceId);
}
const urlObject = new URL(window.location.href);
const pluginId = urlObject?.searchParams.get("pluginId");
// update block state when form becomes dirty/view mode is switched on
if (
prevProps.viewMode !== this.props.viewMode &&
!this.props.viewMode &&
!!pluginId
!!this.props.pluginId
) {
this.blockRoutes();
}
@ -312,7 +310,7 @@ class DatasourceEditorRouter extends React.Component<Props, State> {
pluginId,
});
}
if (!this.props.viewMode && !!pluginId) {
if (!this.props.viewMode && !!this.props.pluginId) {
this.blockRoutes();
}
@ -448,7 +446,7 @@ class DatasourceEditorRouter extends React.Component<Props, State> {
}
closeDialog() {
this.setState({ showDialog: false });
this.setState({ showDialog: false, switchFilterBlocked: false });
}
onSave() {
@ -469,7 +467,7 @@ class DatasourceEditorRouter extends React.Component<Props, State> {
this.state.navigation();
this.props.datasourceDiscardAction(this.props?.pluginId);
if (!this.props.viewMode) {
if (!this.props.viewMode && !this.state.switchFilterBlocked) {
this.props.setDatasourceViewMode({
datasourceId: this.props.datasourceId,
viewMode: true,