Fix resetting radio button state after closing the modal

apache · Oct 27, 2022 · fb7321c · fb7321c
1 parent 4508e14
commit fb7321c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/superset-frontend/src/explore/components/ExploreViewContainer/index.jsx b/superset-frontend/src/explore/components/ExploreViewContainer/index.jsx
@@ -81,6 +81,7 @@ const propTypes = {
   impressionId: PropTypes.string,
   vizType: PropTypes.string,
   saveAction: PropTypes.string,
+  isSaveModalVisible: PropTypes.bool,
 };
 
 const ExploreContainer = styled.div`
@@ -686,22 +687,32 @@ function ExploreViewContainer(props) {
           {renderChartContainer()}
         </div>
       </ExplorePanelContainer>
-      <SaveModal
-        addDangerToast={props.addDangerToast}
-        actions={props.actions}
-        form_data={props.form_data}
-        sliceName={props.sliceName}
-        dashboardId={props.dashboardId}
-      />
+      {props.isSaveModalVisible && (
+        <SaveModal
+          addDangerToast={props.addDangerToast}
+          actions={props.actions}
+          form_data={props.form_data}
+          sliceName={props.sliceName}
+          dashboardId={props.dashboardId}
+        />
+      )}
     </ExploreContainer>
   );
 }
 
 ExploreViewContainer.propTypes = propTypes;
 
 function mapStateToProps(state) {
-  const { explore, charts, common, impressionId, dataMask, reports, user } =
-    state;
+  const {
+    explore,
+    charts,
+    common,
+    impressionId,
+    dataMask,
+    reports,
+    user,
+    saveModal,
+  } = state;
   const { controls, slice, datasource, metadata } = explore;
   const form_data = getFormDataFromControls(controls);
   const slice_id = form_data.slice_id ?? slice?.slice_id ?? 0; // 0 - unsaved chart
@@ -750,6 +761,7 @@ function mapStateToProps(state) {
     reports,
     metadata,
     saveAction: explore.saveAction,
+    isSaveModalVisible: saveModal.isVisible,
   };
 }
 

diff --git a/superset-frontend/src/explore/components/SaveModal.tsx b/superset-frontend/src/explore/components/SaveModal.tsx
@@ -25,6 +25,7 @@ import ReactMarkdown from 'react-markdown';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import {
+  css,
   t,
   styled,
   DatasourceType,