Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

.github/workflows/codeql.yml

@@ -62,6 +62,7 @@ jobs:
             - '**/*.spec.ts'
             - '**/*.test.tsx'
             - '**/*.spec.tsx'
+            - 'scripts/**'
 
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)

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 Dec 14 2023.
+This document was automatically generated on Sun Dec 17 2023.
 
 ## List of dependencies
 

packages/compass-aggregations/src/components/stage-wizard/index.tsx

@@ -289,7 +289,9 @@ export default connect(
       return { name, type };
     });
     const previousStageFieldsWithSchema = getSchema(
-      previousStage?.previewDocs ?? []
+      previousStage?.previewDocs?.map((doc) => {
+        return doc.generateObject();
+      }) ?? []
     );
 
     const fields =

packages/compass-aggregations/src/utils/get-schema.spec.ts

@@ -189,4 +189,22 @@ describe('get schema', function () {
       expect(getSchema(input)).to.deep.equal(output);
     });
   });
+
+  it("doesn't break when getting schema from recursive object", function () {
+    const a = {
+      b: {
+        c: {
+          get a() {
+            return a;
+          },
+        },
+      },
+    };
+
+    expect(getSchema([a])).to.deep.eq([
+      { name: 'b', type: 'Object' },
+      { name: 'b.c', type: 'Object' },
+      { name: 'b.c.a', type: 'Object' },
+    ]);
+  });
 });

packages/compass-aggregations/src/utils/get-schema.ts

@@ -22,17 +22,28 @@ const toFieldSchemaWithPrefix = (prefix: string) => {
   });
 };
 
-const getSchemaForObject = (document: Document): DocumentSchema => {
+const getSchemaForObject = (
+  document: Document,
+  seen = new WeakSet()
+): DocumentSchema => {
   const schema: DocumentSchema = [];
+
+  if (seen.has(document)) {
+    return schema;
+  }
+
+  seen.add(document);
+
   for (const key in document) {
     const value = document[key];
+
     schema.push({
       name: key,
       type: TypeChecker.type(value),
     });
 
     if (Array.isArray(value)) {
-      const valueSchema = getSchemaForArray(value).map(
+      const valueSchema = getSchemaForArray(value, seen).map(
         toFieldSchemaWithPrefix(key)
       );
       schema.push(...valueSchema);
@@ -41,7 +52,7 @@ const getSchemaForObject = (document: Document): DocumentSchema => {
       value !== null &&
       !value._bsontype
     ) {
-      const valueSchema = getSchemaForObject(value).map(
+      const valueSchema = getSchemaForObject(value, seen).map(
         toFieldSchemaWithPrefix(key)
       );
       schema.push(...valueSchema);
@@ -50,18 +61,21 @@ const getSchemaForObject = (document: Document): DocumentSchema => {
   return schema;
 };
 
-const getSchemaForArray = (records: Document[]): DocumentSchema => {
+const getSchemaForArray = (
+  records: Document[],
+  seen = new WeakSet()
+): DocumentSchema => {
   const schema: DocumentSchema = [];
 
   for (const record of records) {
     if (Array.isArray(record)) {
-      schema.push(...getSchemaForArray(record));
+      schema.push(...getSchemaForArray(record, seen));
     } else if (
       typeof record === 'object' &&
       record !== null &&
       !record._bsontype
     ) {
-      schema.push(...getSchemaForObject(record));
+      schema.push(...getSchemaForObject(record, seen));
     }
   }
 

packages/compass-crud/src/actions/index.ts

@@ -5,7 +5,7 @@ const configureActions = () => {
     'addColumn',
     'cleanCols',
     'closeInsertDocumentDialog',
-    'closeBulkUpdateDialog',
+    'closeBulkUpdateModal',
     'copyToClipboard',
     'documentRemoved',
     'drillDown',
@@ -19,7 +19,7 @@ const configureActions = () => {
     'toggleInsertDocumentView',
     'toggleInsertDocument',
     'openInsertDocumentDialog',
-    'openBulkUpdateDialog',
+    'openBulkUpdateModal',
     'updateBulkUpdatePreview',
     'runBulkUpdate',
     'openExportFileDialog',

packages/compass-crud/src/components/bulk-delete-modal.spec.tsx

@@ -12,7 +12,7 @@ function renderBulkDeleteModal(
     <BulkDeleteModal
       open={true}
       documentCount={0}
-      filterQuery="{ a: 1 }"
+      filter={{ a: 1 }}
       namespace="mydb.mycoll"
       sampleDocuments={[]}
       onCancel={() => {}}
@@ -68,9 +68,9 @@ describe('BulkDeleteModal Component', function () {
   });
 
   it('shows the provided query', function () {
-    renderBulkDeleteModal({ filterQuery: '{ a: 1 }' });
+    renderBulkDeleteModal({ filter: { a: 1 } });
     expect(screen.getByTestId('readonly-filter').textContent).to.equal(
-      '{ a: 1 }'
+      '{\n a: 1\n}'
     );
   });
 

packages/compass-crud/src/components/bulk-delete-modal.tsx

@@ -12,6 +12,8 @@ import {
   spacing,
   useId,
 } from '@mongodb-js/compass-components';
+import type { BSONObject } from '../stores/crud-store';
+import { toJSString } from 'mongodb-query-parser';
 import { ReadonlyFilter } from './readonly-filter';
 import ReadonlyDocument from './readonly-document';
 
@@ -59,7 +61,7 @@ const exportToLanguageButtonStyles = css({
 type BulkDeleteModalProps = {
   open: boolean;
   documentCount?: number;
-  filterQuery: string;
+  filter: BSONObject;
   namespace: string;
   sampleDocuments: Document[];
   onCancel: () => void;
@@ -70,7 +72,7 @@ type BulkDeleteModalProps = {
 const BulkDeleteModal: React.FunctionComponent<BulkDeleteModalProps> = ({
   open,
   documentCount,
-  filterQuery,
+  filter,
   namespace,
   sampleDocuments,
   onCancel,
@@ -106,7 +108,7 @@ const BulkDeleteModal: React.FunctionComponent<BulkDeleteModalProps> = ({
       />
       <ModalBody variant={'danger'} className={modalBodySpacingStyles}>
         <div className={queryBarStyles}>
-          <ReadonlyFilter queryLabel="Filter" filterQuery={filterQuery} />
+          <ReadonlyFilter filterQuery={toJSString(filter) ?? ''} />
           <Button
             className={exportToLanguageButtonStyles}
             variant="primaryOutline"

…c/components/bulk-update-dialog.spec.tsx …rc/components/bulk-update-modal.spec.tsxpackages/compass-crud/src/components/bulk-update-dialog.spec.tsx renamed to packages/compass-crud/src/components/bulk-update-modal.spec.tsx packages/compass-crud/src/components/bulk-update-dialog.spec.tsx renamed to packages/compass-crud/src/components/bulk-update-modal.spec.tsx

@@ -3,13 +3,13 @@ import { expect } from 'chai';
 import sinon from 'sinon';
 import { render, screen, cleanup, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import BulkUpdateDialog from './bulk-update-dialog';
+import BulkUpdateModal from './bulk-update-modal';
 
-function renderBulkUpdateDialog(
-  props?: Partial<React.ComponentProps<typeof BulkUpdateDialog>>
+function renderBulkUpdateModal(
+  props?: Partial<React.ComponentProps<typeof BulkUpdateModal>>
 ) {
   return render(
-    <BulkUpdateDialog
+    <BulkUpdateModal
       isOpen={true}
       ns="mydb.mycoll"
       filter={{ a: 1 }}
@@ -24,7 +24,7 @@ function renderBulkUpdateDialog(
         ],
       }}
       enablePreview={true}
-      closeBulkUpdateDialog={() => {}}
+      closeBulkUpdateModal={() => {}}
       updateBulkUpdatePreview={() => {}}
       runBulkUpdate={() => {}}
       saveUpdateQuery={() => {}}
@@ -33,18 +33,18 @@ function renderBulkUpdateDialog(
   );
 }
 
-describe('BulkUpdateDialog Component', function () {
+describe('BulkUpdateModal Component', function () {
   afterEach(function () {
     cleanup();
   });
 
   it('does not render if closed', function () {
-    renderBulkUpdateDialog({ isOpen: false });
+    renderBulkUpdateModal({ isOpen: false });
     expect(screen.queryByText(/Update/)).to.not.exist;
   });
 
   it('renders if open', function () {
-    renderBulkUpdateDialog({ count: 42 });
+    renderBulkUpdateModal({ count: 42 });
 
     expect(screen.getByTestId('modal-title').textContent).to.equal(
       'Update 42 documents'
@@ -72,7 +72,7 @@ describe('BulkUpdateDialog Component', function () {
   });
 
   it('hides document count if count is N/A', function () {
-    renderBulkUpdateDialog({ count: undefined });
+    renderBulkUpdateModal({ count: undefined });
 
     expect(screen.getByTestId('modal-title').textContent).to.equal(
       'Update documents'
@@ -82,7 +82,7 @@ describe('BulkUpdateDialog Component', function () {
   });
 
   it('use singular if count is 1', function () {
-    renderBulkUpdateDialog({ count: 1 });
+    renderBulkUpdateModal({ count: 1 });
     expect(screen.getByTestId('modal-title').textContent).to.equal(
       'Update 1 document'
     );
@@ -91,17 +91,17 @@ describe('BulkUpdateDialog Component', function () {
   });
 
   it('renders the empty state if the count is 0', function () {
-    renderBulkUpdateDialog({ count: 0 });
+    renderBulkUpdateModal({ count: 0 });
     expect(screen.getByTestId('bulk-update-preview-empty-state')).to.exist;
   });
 
   it('resets if the modal is re-opened', async function () {
     // initial open
-    const { rerender } = renderBulkUpdateDialog({ isOpen: true });
+    const { rerender } = renderBulkUpdateModal({ isOpen: true });
 
     // close
     rerender(
-      <BulkUpdateDialog
+      <BulkUpdateModal
         isOpen={false}
         ns="mydb.mycoll"
         filter={{ a: 1 }}
@@ -115,7 +115,7 @@ describe('BulkUpdateDialog Component', function () {
             },
           ],
         }}
-        closeBulkUpdateDialog={() => {}}
+        closeBulkUpdateModal={() => {}}
         updateBulkUpdatePreview={() => {}}
         runBulkUpdate={() => {}}
         saveUpdateQuery={() => {}}
@@ -124,7 +124,7 @@ describe('BulkUpdateDialog Component', function () {
 
     // re-open
     rerender(
-      <BulkUpdateDialog
+      <BulkUpdateModal
         isOpen={true}
         ns="mydb.mycoll"
         filter={{ a: 1 }}
@@ -138,7 +138,7 @@ describe('BulkUpdateDialog Component', function () {
             },
           ],
         }}
-        closeBulkUpdateDialog={() => {}}
+        closeBulkUpdateModal={() => {}}
         updateBulkUpdatePreview={() => {}}
         runBulkUpdate={() => {}}
         saveUpdateQuery={() => {}}
@@ -156,15 +156,15 @@ describe('BulkUpdateDialog Component', function () {
 
   it('closes the modal when the close button is clicked', function () {
     const onCloseSpy = sinon.spy();
-    renderBulkUpdateDialog({ closeBulkUpdateDialog: onCloseSpy });
+    renderBulkUpdateModal({ closeBulkUpdateModal: onCloseSpy });
 
     userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
     expect(onCloseSpy).to.have.been.calledOnce;
   });
 
   it('runs the update when the update button is clicked (preview supported)', function () {
     const onUpdateSpy = sinon.spy();
-    renderBulkUpdateDialog({
+    renderBulkUpdateModal({
       enablePreview: true,
       runBulkUpdate: onUpdateSpy,
       count: 60,
@@ -183,7 +183,7 @@ describe('BulkUpdateDialog Component', function () {
 
   it('runs the update when the update button is clicked (preview unsupported)', function () {
     const onUpdateSpy = sinon.spy();
-    renderBulkUpdateDialog({
+    renderBulkUpdateModal({
       enablePreview: false,
       runBulkUpdate: onUpdateSpy,
       count: 60,
@@ -202,7 +202,7 @@ describe('BulkUpdateDialog Component', function () {
 
   it('saves the query when a name is provided', function () {
     const saveUpdateQuerySpy = sinon.spy();
-    renderBulkUpdateDialog({ saveUpdateQuery: saveUpdateQuerySpy });
+    renderBulkUpdateModal({ saveUpdateQuery: saveUpdateQuerySpy });
 
     userEvent.click(screen.getByTestId('inline-save-query-modal-opener'));
     userEvent.type(