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

Author: github-actions[bot]

.evergreen/start-docker-envs.sh

@@ -14,7 +14,7 @@ else
   LOGS_DIR="$SCRIPT_DIR/logs"
   mkdir -p "$LOGS_DIR"
 
-  git clone -b v1.2.4 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
+  git clone -b v1.2.5 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
   $DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml up -d
   $DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml up -d
   $DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml up -d

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 Tue Sep 26 2023.
+This document was automatically generated on Wed Sep 27 2023.
 
 ## List of dependencies
 

package-lock.json

@@ -136,6 +136,23 @@ describe('storage', function () {
       ).to.deep.equal(getDefaultPreferences());
     });
 
+    it('when invalid json is stored, it sets the defaults', async function () {
+      const storage = new StoragePreferences(tmpDir);
+
+      const preferencesFile = getPreferencesFile(tmpDir);
+      await fs.mkdir(getPreferencesFolder(tmpDir));
+      await fs.writeFile(preferencesFile, '{}}', 'utf-8');
+
+      // Ensure it exists
+      expect(async () => await fs.access(preferencesFile)).to.not.throw;
+
+      await storage.setup();
+
+      expect(
+        JSON.parse((await fs.readFile(preferencesFile)).toString())
+      ).to.deep.equal(getDefaultPreferences());
+    });
+
     it('updates preferences', async function () {
       const storage = new StoragePreferences(tmpDir);
       await storage.setup();

packages/compass-preferences-model/src/storage.spec.ts

@@ -74,11 +74,15 @@ export class StoragePreferences extends BasePreferencesStorage {
     try {
       this.preferences = await this.readPreferences();
     } catch (e) {
-      if ((e as any).code !== 'ENOENT') {
-        throw e;
+      if (
+        (e as any).code === 'ENOENT' || // First time user
+        e instanceof SyntaxError // Invalid json
+      ) {
+        // Create the file for the first time
+        await this.userData.write(this.file, this.defaultPreferences);
+        return;
       }
-      // Create the file for the first time
-      await this.userData.write(this.file, this.defaultPreferences);
+      throw e;
     }
   }
 

packages/compass-preferences-model/src/storage.ts

@@ -29,10 +29,12 @@
   "license": "SSPL",
   "peerDependencies": {
     "@mongodb-js/compass-components": "^1.14.0",
+    "@mongodb-js/compass-logging": "^1.2.0",
     "react": "^17.0.2"
   },
   "dependencies": {
-    "@mongodb-js/compass-components": "^1.14.0"
+    "@mongodb-js/compass-components": "^1.14.0",
+    "@mongodb-js/compass-logging": "^1.2.0"
   },
   "devDependencies": {
     "@mongodb-js/mocha-config-compass": "^1.3.1",

packages/compass-serverstats/package.json

@@ -1,8 +1,10 @@
 const timer = require('d3-timer');
 const React = require('react');
 const PropTypes = require('prop-types');
+const { createLoggerAndTelemetry } = require('@mongodb-js/compass-logging');
 const Actions = require('../actions');
 const DBErrorStore = require('../stores/dberror-store');
+const { track } = createLoggerAndTelemetry('COMPASS-PERFORMANCE-UI');
 
 // const debug = require('debug')('mongodb-compass:server-stats:current-op-component');
 
@@ -92,6 +94,7 @@ class CurrentOpComponent extends React.Component {
    * @param {Object} data - The row data.
    */
   showOperationDetails(data) {
+    track('CurrentOp showOperationDetails');
     Actions.showOperationDetails(data);
   }
 

packages/compass-serverstats/src/components/current-op-component.jsx

@@ -1,6 +1,8 @@
 const React = require('react');
 const Actions = require('../actions');
 const { Button, Icon } = require('@mongodb-js/compass-components');
+const { createLoggerAndTelemetry } = require('@mongodb-js/compass-logging');
+const { track } = createLoggerAndTelemetry('COMPASS-PERFORMANCE-UI');
 
 // const debug = require('debug')('mongodb-compass:server-stats:detailview-component');
 
@@ -37,6 +39,7 @@ class DetailViewComponent extends React.Component {
   }
 
   killOp() {
+    track('DetailView killOp');
     Actions.killOp(this.state.data.opid);
     this.hideOperationDetails();
   }
@@ -45,6 +48,7 @@ class DetailViewComponent extends React.Component {
    * Fire the show operation detail action with the row data.
    */
   hideOperationDetails() {
+    track('DetailView hideOperationDetails');
     Actions.hideOperationDetails();
   }
 

packages/compass-serverstats/src/components/detailview-component.jsx

@@ -1,10 +1,13 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import d3 from 'd3';
 import { Button, Icon, css, cx, spacing, palette, useDarkMode } from '@mongodb-js/compass-components';
+import { createLoggerAndTelemetry } from '@mongodb-js/compass-logging';
 
 import Actions from '../actions';
 import ServerStatsStore from '../stores/server-stats-graphs-store';
 
+const { track } = createLoggerAndTelemetry('COMPASS-PERFORMANCE-UI');
+
 const serverStatsToolbarStyles = css({
   display: 'flex',
   flexDirection: 'row',
@@ -63,6 +66,12 @@ function ServerStatsToolbar({
   }, []);
 
   const onPlayPauseClicked = useCallback(() => {
+    if (isPaused) {
+      track('Performance Resumed');
+    }
+    else {
+      track('Performance Paused');
+    }
     setPaused(!isPaused)
     Actions.pause();
   }, [ isPaused ]);

packages/compass-serverstats/src/components/server-stats-toolbar.tsx

@@ -58,6 +58,7 @@
     "@types/chai": "^4.2.21",
     "@types/mocha": "^9.0.0",
     "@types/sinon-chai": "^3.2.5",
+    "@types/write-file-atomic": "^4.0.1",
     "chai": "^4.3.6",
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
@@ -67,6 +68,7 @@
     "prettier": "^2.7.1",
     "sinon": "^9.2.3",
     "typescript": "^5.0.4",
+    "write-file-atomic": "^5.0.1",
     "zod": "^3.22.2"
   }
 }