From dae006e7452f4a5592780374e360416008ea5dc5 Mon Sep 17 00:00:00 2001
From: Paula Stachova <paula.stachova@mongodb.com>
Date: Fri, 12 Dec 2025 20:37:27 +0100
Subject: [PATCH 1/2] fix: clarify import functionality COMPASS-9833

---
 .../src/components/export-diagram-modal.tsx   |  2 +-
 .../src/components/import-diagram-button.tsx  | 44 ++++++++++++-------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/packages/compass-data-modeling/src/components/export-diagram-modal.tsx b/packages/compass-data-modeling/src/components/export-diagram-modal.tsx
index 6f02559715a..b68149dec29 100644
--- a/packages/compass-data-modeling/src/components/export-diagram-modal.tsx
+++ b/packages/compass-data-modeling/src/components/export-diagram-modal.tsx
@@ -88,7 +88,7 @@ const ExportDiagramModal = ({
                 size="small"
                 description="Importable into Compass and Data Explorer so teammates can collaborate."
               >
-                Diagram File
+                MDM File
               </Radio>
             </div>
             <div className={radioItemStyles}>
diff --git a/packages/compass-data-modeling/src/components/import-diagram-button.tsx b/packages/compass-data-modeling/src/components/import-diagram-button.tsx
index 0aa846018ea..1041b19bcf6 100644
--- a/packages/compass-data-modeling/src/components/import-diagram-button.tsx
+++ b/packages/compass-data-modeling/src/components/import-diagram-button.tsx
@@ -3,6 +3,7 @@ import {
   Button,
   type ButtonProps,
   FileSelector,
+  Tooltip,
 } from '@mongodb-js/compass-components';
 
 type ImportDiagramButtonProps = Omit<ButtonProps, 'onClick'> & {
@@ -14,22 +15,31 @@ export const ImportDiagramButton = ({
   ...buttonProps
 }: ImportDiagramButtonProps) => {
   return (
-    <FileSelector
-      id="import-diagram-file-input"
-      data-testid="import-diagram-file-input"
-      multiple={false}
-      accept=".mdm"
-      onSelect={(files) => {
-        if (files.length === 0) {
-          return;
-        }
-        onImportDiagram(files[0]);
-      }}
-      trigger={({ onClick }) => (
-        <Button {...buttonProps} onClick={onClick}>
-          Import diagram
-        </Button>
-      )}
-    />
+    <Tooltip
+      trigger={
+        <span>
+          <FileSelector
+            id="import-diagram-file-input"
+            data-testid="import-diagram-file-input"
+            multiple={false}
+            accept=".mdm"
+            onSelect={(files) => {
+              if (files.length === 0) {
+                return;
+              }
+              onImportDiagram(files[0]);
+            }}
+            trigger={({ onClick }) => (
+              <Button {...buttonProps} onClick={onClick}>
+                Import diagram
+              </Button>
+            )}
+          />
+        </span>
+      }
+    >
+      Only MDM files exported from Compass or Atlas Data Explorer can be
+      imported.
+    </Tooltip>
   );
 };

From 3d06df59e450651a99e1da104d7fbaf661e48205 Mon Sep 17 00:00:00 2001
From: Paula Stachova <paula.stachova@mongodb.com>
Date: Fri, 12 Dec 2025 20:39:10 +0100
Subject: [PATCH 2/2] .

---
 .../src/components/export-diagram-modal.tsx                     | 2 +-
 packages/compass-e2e-tests/helpers/selectors.ts                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/compass-data-modeling/src/components/export-diagram-modal.tsx b/packages/compass-data-modeling/src/components/export-diagram-modal.tsx
index b68149dec29..f4c0eb4550c 100644
--- a/packages/compass-data-modeling/src/components/export-diagram-modal.tsx
+++ b/packages/compass-data-modeling/src/components/export-diagram-modal.tsx
@@ -83,7 +83,7 @@ const ExportDiagramModal = ({
               <Radio
                 checked={exportFormat === 'diagram'}
                 value="diagram"
-                aria-label="Diagram File"
+                aria-label="MDM File"
                 onClick={() => onSelectFormat('diagram')}
                 size="small"
                 description="Importable into Compass and Data Explorer so teammates can collaborate."
diff --git a/packages/compass-e2e-tests/helpers/selectors.ts b/packages/compass-e2e-tests/helpers/selectors.ts
index f8cdded0908..b58127bf20e 100644
--- a/packages/compass-e2e-tests/helpers/selectors.ts
+++ b/packages/compass-e2e-tests/helpers/selectors.ts
@@ -1460,7 +1460,7 @@ export const DataModelExportButton = 'button[aria-label="Export"]';
 export const DataModelExportModal = '[data-testid="export-diagram-modal"]';
 export const DataModelExportPngOption = `${DataModelExportModal} input[aria-label="PNG"]`;
 export const DataModelExportJsonOption = `${DataModelExportModal} input[aria-label="JSON"]`;
-export const DataModelExportDiagramOption = `${DataModelExportModal} input[aria-label="Diagram File"]`;
+export const DataModelExportDiagramOption = `${DataModelExportModal} input[aria-label="MDM File"]`;
 export const DataModelExportModalConfirmButton =
   '[data-testid="export-button"]';
 export const DataModelsListItem = (diagramName?: string) => {