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

Author: github-actions[bot]

THIRD-PARTY-NOTICES.md

@@ -249,7 +249,7 @@ This document was automatically generated on Wed Apr 17 2024.
 | **[ejson-shell-parser](#88e1a447c02d9ef3274034c023a5ebcec8188381b1bd951de7c57c140f7f3d4b)**                                 | 2.0.1        | MIT                                 |
 | **[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)**                                        | 3.5.0        | MIT                                 |
 | **[electron-squirrel-startup](#dcda22e402581a033ec2a017d6d05c094bf3173c1b03ae0471b2ce9078d3f601)**                          | 1.0.0        | Apache-2.0                          |
-| **[electron](#ad35eed0d5dc019b2a1b78fbd7a5cc660fa2de2ca7810045df9fdc1866366e7a)**                                           | 28.2.10      | MIT                                 |
+| **[electron](#c246c219a293f45342a6d310a565ea32e0861f3064f377b40c6036a348c9bd44)**                                           | 29.3.0       | MIT                                 |
 | **[encodeurl](#b89152db475e86531e570f87b45d8a51aa5e5d87d4cc3b960cee7b8febf1d26a)**                                          | 1.0.2        | MIT                                 |
 | **[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)**                                      | 1.4.4        | MIT                                 |
 | **[ensure-error](#3b1eba5276d89414cef21a1007e85c4f1d6749bf57b300e082ab23975a41dbc9)**                                       | 3.0.1        | MIT                                 |
@@ -449,7 +449,7 @@ This document was automatically generated on Wed Apr 17 2024.
 | **[ms](#2083576c5af8054927640b4788059806d07e250a26066c9ccb2d928394fb9226)**                                                 | 2.1.3        | MIT                                 |
 | **[napi-build-utils](#26912b5ff7632f262d64273f99cd1a869376c5c378960e24501585e35b31054a)**                                   | 1.0.2        | MIT                                 |
 | **[negotiator](#e3856213d8f0a7d28cd4166e53ec7e2c019cb7becf4a8535097bac28d21e8579)**                                         | 0.6.3        | MIT                                 |
-| **[node-abi](#20fad7d445931097574f4af1495e728fb65673f1571f4d81ae4f01e6ede407c4)**                                           | 3.57.0       | MIT                                 |
+| **[node-abi](#1205ef3be96460c2364cc79d6bbbfb2f6bf895ce33be64bc8cca25c7c3dfa18c)**                                           | 3.58.0       | MIT                                 |
 | **[node-addon-api](#af9f7588524ca4e68f4efe7b24aea46d9c8004263b1d7cf3b558f86d87a163e8)**                                     | 4.3.0        | MIT                                 |
 | **[node-fetch](#364527ef1b51cc6ac34872b931049c9e25b5014f9b40e3898c84e1a830e21720)**                                         | 2.6.7        | MIT                                 |
 | **[node-fetch](#23d7d5a419e9a25e6384dee4aa24f7162544418f0cdc2d92e94e2cf924507b8c)**                                         | 2.7.0        | MIT                                 |
@@ -20880,9 +20880,9 @@ License files:
       See the License for the specific language governing permissions and
       limitations under the License.
 
-<a id="ad35eed0d5dc019b2a1b78fbd7a5cc660fa2de2ca7810045df9fdc1866366e7a"></a>
+<a id="c246c219a293f45342a6d310a565ea32e0861f3064f377b40c6036a348c9bd44"></a>
 
-### [electron](https://www.npmjs.com/package/electron) (version 28.2.10)
+### [electron](https://www.npmjs.com/package/electron) (version 29.3.0)
 
 License tags: MIT
 
@@ -29884,9 +29884,9 @@ License files:
       TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
       SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-<a id="20fad7d445931097574f4af1495e728fb65673f1571f4d81ae4f01e6ede407c4"></a>
+<a id="1205ef3be96460c2364cc79d6bbbfb2f6bf895ce33be64bc8cca25c7c3dfa18c"></a>
 
-### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.57.0)
+### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.58.0)
 
 License tags: MIT
 

packages/compass-settings/src/components/modal.tsx

@@ -20,17 +20,15 @@ import Sidebar from './sidebar';
 import { saveSettings, closeModal } from '../stores/settings';
 import type { RootState } from '../stores';
 import { getUserInfo } from '../stores/atlas-login';
-import {
-  useIsAIFeatureEnabled,
-  useHasAIFeatureCloudRolloutAccess,
-} from 'compass-preferences-model/provider';
+import { useHasAIFeatureCloudRolloutAccess } from 'compass-preferences-model/provider';
 
 type Settings = {
   name: string;
   component: React.ComponentType;
 };
 
 type SettingsModalProps = {
+  isAIFeatureEnabled: boolean;
   isOpen: boolean;
   isOIDCEnabled: boolean;
   onMount?: () => void;
@@ -60,14 +58,14 @@ const settingsStyles = css(
 );
 
 export const SettingsModal: React.FunctionComponent<SettingsModalProps> = ({
+  isAIFeatureEnabled,
   isOpen,
   onMount,
   onClose,
   onSave,
   isOIDCEnabled,
   hasChangedSettings,
 }) => {
-  const aiFeatureEnabled = useIsAIFeatureEnabled();
   const aiFeatureHasCloudRolloutAccess = useHasAIFeatureCloudRolloutAccess();
   const onMountRef = useRef(onMount);
 
@@ -84,7 +82,7 @@ export const SettingsModal: React.FunctionComponent<SettingsModalProps> = ({
   if (
     isOIDCEnabled ||
     // because oidc options overlap with atlas login used for ai feature
-    aiFeatureEnabled
+    isAIFeatureEnabled
   ) {
     settings.push({
       name: 'OIDC (Preview)',
@@ -151,6 +149,7 @@ export default connect(
     return {
       isOpen:
         state.settings.isModalOpen && state.settings.loadingState === 'ready',
+      isAIFeatureEnabled: !!state.settings.settings.enableGenAIFeatures,
       isOIDCEnabled: !!state.settings.settings.enableOidc,
       hasChangedSettings: state.settings.updatedFields.length > 0,
     };

packages/compass-settings/src/components/settings/gen-ai-settings.tsx

@@ -1,16 +1,18 @@
 import React from 'react';
+import { css, spacing } from '@mongodb-js/compass-components';
+import { connect } from 'react-redux';
+
+import type { RootState } from '../../stores';
 import SettingsList from './settings-list';
-import { useIsAIFeatureEnabled } from 'compass-preferences-model/provider';
 import { ConnectedAtlasLoginSettings } from './atlas-login';
-import { css, spacing } from '@mongodb-js/compass-components';
 
 const atlasSettingsContainerStyles = css({
   marginTop: spacing[3],
 });
 
-export const GenAISettings: React.FunctionComponent = () => {
-  const aiFeatureEnabled = useIsAIFeatureEnabled();
-
+export const GenAISettings: React.FunctionComponent<{
+  isAIFeatureEnabled: boolean;
+}> = ({ isAIFeatureEnabled }) => {
   return (
     <div data-testid="gen-ai-settings">
       <div>
@@ -20,16 +22,24 @@ export const GenAISettings: React.FunctionComponent = () => {
       </div>
       <SettingsList fields={['enableGenAIFeatures']} />
 
-      {aiFeatureEnabled && (
+      {isAIFeatureEnabled && (
         <>
           <div className={atlasSettingsContainerStyles}>
             <ConnectedAtlasLoginSettings></ConnectedAtlasLoginSettings>
           </div>
-          <SettingsList fields={['enableGenAISampleDocumentPassing']} />
+          {/* TODO(COMPASS-7865): We're currently sending our sample field values to the server
+            and into the ai prompt as regular JSON. This means the AI isn't generating good
+            results with certain bson types. It'll take a bit of work server
+            side for us to do this. In the meantime we are hiding this setting. */}
+          {/* <SettingsList fields={['enableGenAISampleDocumentPassing']} /> */}
         </>
       )}
     </div>
   );
 };
 
-export default GenAISettings;
+const mapState = (state: RootState) => ({
+  isAIFeatureEnabled: !!state.settings.settings.enableGenAIFeatures,
+});
+
+export default connect(mapState, null)(GenAISettings);