Skip to content

Commit f0d5c98

Browse files
committed
fixup: show tooltip after closing new export flow as well
1 parent 226d81c commit f0d5c98

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

packages/compass-schema/src/components/compass-schema.tsx

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,17 @@ const PerformanceAdvisorBanner = () => {
369369

370370
const Schema: React.FunctionComponent<{
371371
analysisState: AnalysisState;
372+
isExportSchemaModalOpen: boolean;
372373
schema: MongodbSchema | null;
373374
onStartAnalysis: () => Promise<void>;
374375
onStopAnalysis: () => void;
375-
}> = ({ analysisState, schema, onStartAnalysis, onStopAnalysis }) => {
376+
}> = ({
377+
analysisState,
378+
isExportSchemaModalOpen,
379+
schema,
380+
onStartAnalysis,
381+
onStopAnalysis,
382+
}) => {
376383
const onApplyClicked = useCallback(() => {
377384
void onStartAnalysis();
378385
}, [onStartAnalysis]);
@@ -395,7 +402,11 @@ const Schema: React.FunctionComponent<{
395402
<SchemaToolbar
396403
onAnalyzeSchemaClicked={onApplyClicked}
397404
onResetClicked={onApplyClicked}
398-
showLegacyExportTooltip={showLegacyExportTooltip}
405+
// Show the tooltip to indicate the new export button when
406+
// the export modal is closed.
407+
showLegacyExportTooltip={
408+
showLegacyExportTooltip && !isExportSchemaModalOpen
409+
}
399410
setShowLegacyExportTooltip={setShowLegacyExportTooltip}
400411
isOutdated={!!outdated}
401412
/>
@@ -428,6 +439,7 @@ const Schema: React.FunctionComponent<{
428439
export default connect(
429440
(state: RootState) => ({
430441
analysisState: state.schemaAnalysis.analysisState,
442+
isExportSchemaModalOpen: state.schemaExport.isOpen,
431443
schema: state.schemaAnalysis.schema,
432444
}),
433445
{

packages/compass-schema/src/components/export-schema-legacy-modal.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,14 @@ const ExportSchemaLegacyModal: React.FunctionComponent<{
491491
]);
492492
const handleSwitchToNew = useCallback(() => {
493493
if (dontShowAgainChecked) stopShowingLegacyModal('export');
494+
setShowLegacyExportTooltip(true);
494495
onSwitchToSchemaExport();
495-
}, [onSwitchToSchemaExport, dontShowAgainChecked, stopShowingLegacyModal]);
496+
}, [
497+
onSwitchToSchemaExport,
498+
dontShowAgainChecked,
499+
stopShowingLegacyModal,
500+
setShowLegacyExportTooltip,
501+
]);
496502
return (
497503
<Modal open={isOpen} setOpen={onClose} contentClassName={containerStyles}>
498504
<ModalHeader

0 commit comments

Comments
 (0)