Merge branch 'main' into update-eslint-to-eight

Author: gribnoysup

.snyk

@@ -65,15 +65,15 @@ ignore:
           Not applicable: requires attacker to render hand crafted HTML snippet
           inside the application. Putting on a short expiration time as we're
           expecting to be able to update to electron v33 (or later) soon
-        expires: 2025-05-16T15:23:35.601Z
+        expires: 2025-06-16T15:23:35.601Z
         created: 2025-03-17T15:23:35.608Z
   SNYK-JS-ELECTRON-9486047:
     - '*':
         reason: >-
           Not applicable: requires attacker to render hand crafted HTML snippet
           inside the application. Putting on a short expiration time as we're
           expecting to be able to update to electron v33 (or later) soon
-        expires: 2025-05-20T04:40:36.098Z
+        expires: 2025-06-20T04:40:36.098Z
         created: 2025-03-21T04:40:36.107Z
 # patches apply the minimum changes required to fix a vulnerability
 patch:

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Thu May 22 2025.
+This document was automatically generated on Fri May 23 2025.
 
 ## List of dependencies
 
@@ -592,7 +592,7 @@ This document was automatically generated on Thu May 22 2025.
 | **[yallist](#63b110ffd18712146937e9f182800c6f2b5783e76d1659a0bd4b457789b0df07)**                                            | 3.1.1        | ISC                                 |
 | **[yallist](#d400799c4e1f58dbbbe68b4d9c1b6e80e023f744bd7d16da491005fd8439200f)**                                            | 4.0.0        | ISC                                 |
 | **[yargs-parser](#617a7401008b7639df8cebae61c9c009bf04ca762c652da0975da4533bf33690)**                                       | 21.1.1       | ISC                                 |
-| **[zod](#750b81338b71d5e78ed66a065d072d2ab6b12e6aed146a736200bc63fc4f721b)**                                                | 3.23.8       | MIT                                 |
+| **[zod](#47d4f8aea57c756d184be32bcd9df03f490606057a940cf6ab006cce6cf81731)**                                                | 3.25.17      | MIT                                 |
 
 ## Package details
 
@@ -39486,9 +39486,9 @@ License files:
       WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
       ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-<a id="750b81338b71d5e78ed66a065d072d2ab6b12e6aed146a736200bc63fc4f721b"></a>
+<a id="47d4f8aea57c756d184be32bcd9df03f490606057a940cf6ab006cce6cf81731"></a>
 
-### [zod](https://www.npmjs.com/package/zod) (version 3.23.8)
+### [zod](https://www.npmjs.com/package/zod) (version 3.25.17)
 
 License tags: MIT
 
@@ -39498,7 +39498,7 @@ License files:
 
       MIT License
 
-      Copyright (c) 2020 Colin McDonnell
+      Copyright (c) 2025 Colin McDonnell
 
       Permission is hereby granted, free of charge, to any person obtaining a copy
       of this software and associated documentation files (the "Software"), to deal

docs/tracking-plan.md

@@ -6,7 +6,7 @@
 > the tracking plan for the specific Compass version you can use the following
 > URL: `https://github.com/mongodb-js/compass/blob/<compass version>/docs/tracking-plan.md`
 
-Generated on Thu, May 22, 2025
+Generated on Fri, May 23, 2025
 
 ## Table of Contents
 

package-lock.json

@@ -1818,18 +1818,21 @@ const connectWithOptions = (
           connectionId: connectionInfo.id,
         });
 
+        const { networkTraffic, showEndOfLifeConnectionModal } =
+          preferences.getPreferences();
+
         if (
           getGenuineMongoDB(connectionInfo.connectionOptions.connectionString)
             .isGenuine === false
         ) {
           dispatch(showNonGenuineMongoDBWarningModal(connectionInfo.id));
-        } else if (preferences.getPreferences().networkTraffic) {
+        } else if (showEndOfLifeConnectionModal) {
           void dataService
             .instance()
             .then(async (instance) => {
               const { version } = instance.build;
               const latestEndOfLifeServerVersion =
-                await getLatestEndOfLifeServerVersion();
+                await getLatestEndOfLifeServerVersion(networkTraffic);
               if (isEndOfLifeVersion(version, latestEndOfLifeServerVersion)) {
                 dispatch(
                   showEndOfLifeMongoDBWarningModal(

packages/compass-connections/src/stores/connections-store-redux.ts

@@ -13,7 +13,13 @@ const {
 
 let latestEndOfLifeServerVersion: Promise<string> | null = null;
 
-export async function getLatestEndOfLifeServerVersion(): Promise<string> {
+export async function getLatestEndOfLifeServerVersion(
+  allowNetworkRequests = true
+): Promise<string> {
+  if (!allowNetworkRequests) {
+    return FALLBACK_END_OF_LIFE_SERVER_VERSION;
+  }
+
   if (!HADRON_AUTO_UPDATE_ENDPOINT) {
     log.debug(
       mongoLogId(1_001_000_356),
@@ -68,7 +74,7 @@ export async function getLatestEndOfLifeServerVersion(): Promise<string> {
 
 export function isEndOfLifeVersion(
   version: string,
-  latestEndOfLifeServerVersion: string
+  latestEndOfLifeServerVersion = FALLBACK_END_OF_LIFE_SERVER_VERSION
 ) {
   try {
     const coercedVersion = semverCoerce(version);

packages/compass-connections/src/utils/end-of-life-server.ts

@@ -19,8 +19,11 @@ import {
   spacing,
   Button,
   palette,
+  ErrorSummary,
 } from '@mongodb-js/compass-components';
 import { cancelAnalysis, retryAnalysis } from '../store/analysis-process';
+import type { Edit, StaticModel } from '../services/data-model-storage';
+import { UUID } from 'bson';
 
 const loadingContainerStyles = css({
   width: '100%',
@@ -73,17 +76,29 @@ const modelPreviewStyles = css({
 });
 
 const editorContainerStyles = css({
-  height: 160 + 34 + 16,
   display: 'flex',
   flexDirection: 'column',
   gap: 8,
   boxShadow: `0 0 0 2px ${palette.gray.light2}`,
 });
 
-const editorContainerApplyButtonStyles = css({
+const editorContainerApplyContainerStyles = css({
   paddingLeft: 8,
   paddingRight: 8,
-  alignSelf: 'flex-end',
+  justifyContent: 'flex-end',
+  gap: spacing[200],
+  display: 'flex',
+  width: '100%',
+  height: spacing[100],
+});
+
+const editorContainerPlaceholderButtonStyles = css({
+  paddingLeft: 8,
+  paddingRight: 8,
+  alignSelf: 'flex-start',
+  display: 'flex',
+  gap: spacing[200],
+  paddingTop: spacing[200],
 });
 
 const DiagramEditor: React.FunctionComponent<{
@@ -92,18 +107,19 @@ const DiagramEditor: React.FunctionComponent<{
   onUndoClick: () => void;
   hasRedo: boolean;
   onRedoClick: () => void;
-  model: unknown;
+  model: StaticModel | null;
+  editErrors?: string[];
   onRetryClick: () => void;
   onCancelClick: () => void;
-  // TODO
-  onApplyClick: (edit: unknown) => void;
+  onApplyClick: (edit: Omit<Edit, 'id' | 'timestamp'>) => void;
 }> = ({
   step,
   hasUndo,
   onUndoClick,
   hasRedo,
   onRedoClick,
   model,
+  editErrors,
   onRetryClick,
   onCancelClick,
   onApplyClick,
@@ -118,6 +134,43 @@ const DiagramEditor: React.FunctionComponent<{
     }
   }, [applyInput]);
 
+  const applyPlaceholder =
+    (type: 'AddRelationship' | 'RemoveRelationship') => () => {
+      let placeholder = {};
+      switch (type) {
+        case 'AddRelationship':
+          placeholder = {
+            type: 'AddRelationship',
+            relationship: {
+              id: new UUID().toString(),
+              relationship: [
+                {
+                  ns: 'db.sourceCollection',
+                  cardinality: 1,
+                  fields: ['field1'],
+                },
+                {
+                  ns: 'db.targetCollection',
+                  cardinality: 1,
+                  fields: ['field2'],
+                },
+              ],
+              isInferred: false,
+            },
+          };
+          break;
+        case 'RemoveRelationship':
+          placeholder = {
+            type: 'RemoveRelationship',
+            relationshipId: new UUID().toString(),
+          };
+          break;
+        default:
+          throw new Error(`Unknown placeholder ${placeholder}`);
+      }
+      setApplyInput(JSON.stringify(placeholder, null, 2));
+    };
+
   const modelStr = useMemo(() => {
     return JSON.stringify(model, null, 2);
   }, [model]);
@@ -172,6 +225,20 @@ const DiagramEditor: React.FunctionComponent<{
           ></CodemirrorMultilineEditor>
         </div>
         <div className={editorContainerStyles} data-testid="apply-editor">
+          <div className={editorContainerPlaceholderButtonStyles}>
+            <Button
+              onClick={applyPlaceholder('AddRelationship')}
+              data-testid="placeholder-addrelationship-button"
+            >
+              Add relationship
+            </Button>
+            <Button
+              onClick={applyPlaceholder('RemoveRelationship')}
+              data-testid="placeholder-removerelationship-button"
+            >
+              Remove relationship
+            </Button>
+          </div>
           <div>
             <CodemirrorMultilineEditor
               language="json"
@@ -180,7 +247,8 @@ const DiagramEditor: React.FunctionComponent<{
               maxLines={10}
             ></CodemirrorMultilineEditor>
           </div>
-          <div className={editorContainerApplyButtonStyles}>
+          <div className={editorContainerApplyContainerStyles}>
+            {editErrors && <ErrorSummary errors={editErrors} />}
             <Button
               onClick={() => {
                 onApplyClick(JSON.parse(applyInput));
@@ -238,6 +306,7 @@ export default connect(
       model: diagram
         ? selectCurrentModel(getCurrentDiagramFromState(state))
         : null,
+      editErrors: diagram?.editErrors,
     };
   },
   {