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

Author: github-actions[bot]

THIRD-PARTY-NOTICES.md

@@ -234,6 +234,7 @@ This document was automatically generated on Mon Sep 25 2023.
 | **[debug](#233219ced46fb5b84e28859835e97775eb9d0181f4cb85d6aa5cecb61e595947)**                                              | 2.6.9        | MIT                                 |
 | **[debug](#d17e389ce22af9246d1b07714885a99a0c7ffce55db7f2ecf52bfef063e8c8ac)**                                              | 4.3.1        | MIT                                 |
 | **[decompress-response](#71cad5eab34cc643a6a7853a43d3090ac7e8b6014c9ec55fabb8112cdbfd9fbd)**                                | 5.0.0        | MIT                                 |
+| **[dedent](#339f63cd441e23f69d2d748fb33f2abd1800e36538a684f9005b16194d1c219b)**                                             | 1.5.1        | MIT                                 |
 | **[deep-extend](#654bd7d00073c2195bca924a07d93393b2aaf5cacbb6f52a383877f6f33dbfbf)**                                        | 0.6.0        | MIT                                 |
 | **[default-browser-id](#bc6a381b83371172dbb72cac459792e2d4d55ecb71165c082142ef085b2130ee)**                                 | 3.0.0        | MIT                                 |
 | **[default-browser](#bf5c7331e49e4c648e57747ffd553870a7fe79fea24780366a6bc22ef346f304)**                                    | 4.0.0        | MIT                                 |
@@ -20039,6 +20040,38 @@ License files:
 
       THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+<a id="339f63cd441e23f69d2d748fb33f2abd1800e36538a684f9005b16194d1c219b"></a>
+
+### [dedent](https://www.npmjs.com/package/dedent) (version 1.5.1)
+
+License tags: MIT
+
+License files:
+
+- LICENSE:
+
+      The MIT License (MIT)
+
+      Copyright (c) 2015 Desmond Brand ([email protected])
+
+      Permission is hereby granted, free of charge, to any person obtaining a copy
+      of this software and associated documentation files (the "Software"), to deal
+      in the Software without restriction, including without limitation the rights
+      to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+      copies of the Software, and to permit persons to whom the Software is
+      furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be included in
+      all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+      AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+      THE SOFTWARE.
+
 <a id="654bd7d00073c2195bca924a07d93393b2aaf5cacbb6f52a383877f6f33dbfbf"></a>
 
 ### [deep-extend](https://www.npmjs.com/package/deep-extend) (version 0.6.0)

packages/compass-components/src/components/generative-ai/generative-ai-input.spec.tsx

@@ -101,7 +101,7 @@ describe('GenerativeAIInput Component', function () {
       ],
       [
         'QUERY_GENERATION_FAILED',
-        'Something went wrong, please try again later. If the error persists, try changing your prompt.',
+        'Sorry, we were unable to generate the query, please try again. If the error persists, try changing your prompt.',
       ],
     ].forEach(([errorCode, expectedText]) => {
       it(`renders an error for ${errorCode}`, function () {
@@ -135,7 +135,7 @@ describe('GenerativeAIInput Component', function () {
 
       const errorMsg = screen.getByTestId('ai-error-msg');
       expect(errorMsg).to.have.text(
-        'Something went wrong, please try again later. If the error persists, contact our support team.'
+        'Sorry, we were unable to generate the query, please try again. If the error persists, try changing your prompt.'
       );
       expect(errorMsg).to.be.visible;
     });

packages/compass-components/src/components/generative-ai/generative-ai-input.tsx

@@ -416,20 +416,11 @@ const AIError = ({
     );
   }
 
-  if (errorCode === 'QUERY_GENERATION_FAILED') {
-    return (
-      <>
-        Something went wrong, please try again later. If the error persists, try
-        changing your prompt.
-      </>
-    );
-  }
-
   // We received an errorCode that is not actionable (INTERNAL_SERVER_ERROR, QUERY_GENERATION_FAILED), or unknown.
   return (
     <>
-      Something went wrong, please try again later. If the error persists,
-      contact our support team.
+      Sorry, we were unable to generate the query, please try again. If the
+      error persists, try changing your prompt.
     </>
   );
 };

packages/compass-e2e-tests/tests/collection-ai-query.test.ts

@@ -159,7 +159,7 @@ describe('Collection ai query', function () {
       );
       await errorBanner.waitForDisplayed();
       expect(await errorBanner.getText()).to.equal(
-        'Something went wrong, please try again later. If the error persists, contact our support team.'
+        'Sorry, we were unable to generate the query, please try again. If the error persists, try changing your prompt.'
       );
     });
   });

packages/compass-e2e-tests/tests/collection-documents-tab.test.ts

@@ -6,7 +6,7 @@ import type { Telemetry } from '../helpers/telemetry';
 import { beforeTests, afterTests, afterTest } from '../helpers/compass';
 import type { Compass } from '../helpers/compass';
 import * as Selectors from '../helpers/selectors';
-import type { Element } from 'webdriverio';
+import type { Element, ElementArray } from 'webdriverio';
 import { createNumbersCollection } from '../helpers/insert-data';
 
 const { expect } = chai;
@@ -16,19 +16,31 @@ interface RecentQuery {
 }
 
 async function getRecentQueries(
-  browser: CompassBrowser
+  browser: CompassBrowser,
+  expectQueries = false
 ): Promise<RecentQuery[]> {
   const history = await browser.$(Selectors.QueryBarHistory);
   if (!(await history.isDisplayed())) {
     await browser.clickVisible(Selectors.QueryBarHistoryButton);
     await history.waitForDisplayed();
   }
 
-  const queryTags = await browser.$$(
-    '[data-testid="query-history-query-attributes"]'
-  );
+  let queryTags;
+  await browser.waitUntil(async () => {
+    queryTags = await browser.$$(
+      '[data-testid="query-history-query-attributes"]'
+    );
+    // Usually we expect to find some recents and the most common failure is
+    // that we read out the queries before they are rendered.
+    if (expectQueries) {
+      // Keep going until we find something or timeout if we never do
+      return queryTags.length > 0;
+    }
+    return true;
+  });
+
   return Promise.all(
-    queryTags.map(async (queryTag) => {
+    (queryTags as unknown as ElementArray).map(async (queryTag) => {
       const attributeTags = await queryTag.$$(
         '[data-testid="query-history-query-attribute"]'
       );
@@ -138,7 +150,7 @@ describe('Collection documents tab', function () {
       used_regex: false,
     });
 
-    const queries = await getRecentQueries(browser);
+    const queries = await getRecentQueries(browser, true);
     expect(queries).to.deep.include.members([{ Filter: '{\n i: 5\n}' }]);
   });
 
@@ -168,7 +180,7 @@ describe('Collection documents tab', function () {
       used_regex: false,
     });
 
-    const queries = await getRecentQueries(browser);
+    const queries = await getRecentQueries(browser, true);
     expect(queries).to.deep.include.members([
       {
         Filter: '{\n i: {\n  $gt: 5\n }\n}',
@@ -215,7 +227,7 @@ describe('Collection documents tab', function () {
     const displayText = await documentListActionBarMessageElement.getText();
     expect(displayText).to.equal('1 – 1 of 1');
 
-    const queries = await getRecentQueries(browser);
+    const queries = await getRecentQueries(browser, true);
     expect(queries).to.deep.include.members([
       {
         Filter: "{\n $where: 'function() { return sleep(10000) || true; }'\n}",

packages/compass-e2e-tests/tests/collection-import.test.ts

@@ -1177,6 +1177,10 @@ describe('Collection import', function () {
       const importModal = await browser.$(Selectors.ImportModal);
       await importModal.waitForDisplayed();
 
+      // Wait for the import button to become available because detect can take
+      // a while
+      await browser.$(Selectors.ImportConfirm).waitForEnabled();
+
       // Confirm import.
       await browser.clickVisible(Selectors.ImportConfirm);
 

packages/compass-e2e-tests/tests/instance-sidebar.test.ts

@@ -121,7 +121,9 @@ describe('Instance sidebar', function () {
     const collectionName = 'my-collection';
 
     // open the create database modal from the sidebar
-    await browser.clickVisible(Selectors.SidebarCreateDatabaseButton);
+    await browser.clickVisible(Selectors.SidebarCreateDatabaseButton, {
+      screenshot: 'before-can-create-a-database-and-drop-it-click.png',
+    });
 
     await browser.addDatabase(dbName, collectionName);