Cherry pick for ga 1.22.0 (#2005)

* Bump mongosh compass-shell to 0.2.2 (#2004)

* Remove shell from readonly (#1989)

* COMPASS-4131: remove compass community (#1982)

Author: Anemy

.evergreen.yml

@@ -396,13 +396,6 @@ tasks:
         vars:
           compass_distribution: compass
       - func: 'save osx artifacts'
-      - func: package
-        vars:
-          compass_distribution: compass-community
-      - func: publish
-        vars:
-          compass_distribution: compass-community
-      - func: 'save osx artifacts'
       - func: package
         vars:
           compass_distribution: compass-isolated
@@ -499,23 +492,6 @@ tasks:
       - func: 'save rhel artifacts'
         variants: [rhel]
 
-  - name: package-and-publish-compass-community
-    depends_on: [compile]
-    commands:
-      - func: restore
-      - func: package
-        vars:
-          compass_distribution: compass-community
-      - func: publish
-        vars:
-          compass_distribution: compass-community
-      - func: 'save windows artifacts'
-        variants: [windows]
-      - func: 'save linux artifacts'
-        variants: [ubuntu]
-      - func: 'save rhel artifacts'
-        variants: [rhel]
-
   - name: package-and-publish-compass-isolated
     depends_on: [compile]
     commands:
@@ -675,7 +651,6 @@ buildvariants:
       # - name: test-functional-34x-server
       # - name: test-functional-26x-server
       - name: package-and-publish-compass
-      - name: package-and-publish-compass-community
       - name: package-and-publish-compass-isolated
       - name: package-and-publish-compass-readonly
 
@@ -694,7 +669,6 @@ buildvariants:
       # - name: test-connect-plugin
       # - name: test-aggregation-builder-plugin
       - name: package-and-publish-compass
-      - name: package-and-publish-compass-community
       - name: package-and-publish-compass-isolated
       - name: package-and-publish-compass-readonly
   - name: rhel
@@ -705,6 +679,5 @@ buildvariants:
       - name: verify
       # - name: test-functional
       - name: package-and-publish-compass
-      - name: package-and-publish-compass-community
       - name: package-and-publish-compass-isolated
       - name: package-and-publish-compass-readonly

package-lock.json

@@ -80,48 +80,6 @@
             "index"
           ]
         },
-        "compass-community": {
-          "name": "mongodb-compass-community",
-          "productName": "MongoDB Compass Community",
-          "bundleId": "com.mongodb.compass-community",
-          "plugins-directory": ".mongodb/compass-community/plugins",
-          "upgradeCode": "EAF69C0D-A16E-44DA-A47F-37745230AAF0",
-          "plugins": [
-            "node_modules/@mongodb-js/compass-app-stores",
-            "node_modules/@mongodb-js/compass-aggregations",
-            "node_modules/@mongodb-js/compass-auto-updates",
-            "node_modules/@mongodb-js/compass-export-to-language",
-            "node_modules/@mongodb-js/compass-collection",
-            "node_modules/@mongodb-js/compass-collections-ddl",
-            "node_modules/@mongodb-js/compass-collection-stats",
-            "node_modules/@mongodb-js/compass-community-warning",
-            "node_modules/@mongodb-js/compass-connect",
-            "node_modules/@mongodb-js/compass-crud",
-            "node_modules/@mongodb-js/compass-database",
-            "node_modules/@mongodb-js/compass-databases-ddl",
-            "node_modules/@mongodb-js/compass-field-store",
-            "node_modules/@mongodb-js/compass-find-in-page",
-            "node_modules/@mongodb-js/compass-home",
-            "node_modules/@mongodb-js/compass-import-export",
-            "node_modules/@mongodb-js/compass-deployment-awareness",
-            "node_modules/@mongodb-js/compass-loading",
-            "node_modules/@mongodb-js/compass-metrics",
-            "node_modules/@mongodb-js/compass-query-bar",
-            "node_modules/@mongodb-js/compass-query-history",
-            "node_modules/@mongodb-js/compass-plugin-info",
-            "node_modules/@mongodb-js/compass-instance",
-            "node_modules/@mongodb-js/compass-server-version",
-            "node_modules/@mongodb-js/compass-shell",
-            "node_modules/@mongodb-js/compass-sidebar",
-            "node_modules/@mongodb-js/compass-ssh-tunnel-status",
-            "node_modules/@mongodb-js/compass-status",
-            "node_modules/@mongodb-js/compass-indexes",
-            "node_modules/@mongodb-js/compass-explain-plan"
-          ],
-          "styles": [
-            "index"
-          ]
-        },
         "compass-readonly": {
           "name": "mongodb-compass-readonly",
           "productName": "MongoDB Compass Readonly",
@@ -159,7 +117,6 @@
             "node_modules/@mongodb-js/compass-instance",
             "node_modules/@mongodb-js/compass-serverstats",
             "node_modules/@mongodb-js/compass-server-version",
-            "node_modules/@mongodb-js/compass-shell",
             "node_modules/@mongodb-js/compass-sidebar",
             "node_modules/@mongodb-js/compass-ssh-tunnel-status",
             "node_modules/@mongodb-js/compass-status",
@@ -299,7 +256,6 @@
     "@mongodb-js/compass-collection": "^2.0.7",
     "@mongodb-js/compass-collection-stats": "^5.0.5",
     "@mongodb-js/compass-collections-ddl": "^3.0.3",
-    "@mongodb-js/compass-community-warning": "^0.0.8",
     "@mongodb-js/compass-connect": "^5.4.11",
     "@mongodb-js/compass-crud": "^9.0.8",
     "@mongodb-js/compass-database": "^1.0.1",
@@ -322,7 +278,7 @@
     "@mongodb-js/compass-schema-validation": "^4.0.5",
     "@mongodb-js/compass-server-version": "^4.0.1",
     "@mongodb-js/compass-serverstats": "^14.0.0",
-    "@mongodb-js/compass-shell": "^0.0.3",
+    "@mongodb-js/compass-shell": "^0.2.2",
     "@mongodb-js/compass-sidebar": "^3.2.6",
     "@mongodb-js/compass-ssh-tunnel-status": "^5.0.1",
     "@mongodb-js/compass-status": "^4.0.1",

package.json

@@ -297,11 +297,6 @@ var Application = View.extend({
         prefs.lastKnownVersion = currentVersion;
         save = true;
       }
-      if (process.env.HADRON_PRODUCT === 'mongodb-compass-community') {
-        prefs.enableMaps = false;
-        prefs.enableFeedbackPanel = false;
-        save = true;
-      }
       if (save) {
         prefs.save(null, {
           success: done.bind(null, null),

src/app/index.js

@@ -7,18 +7,17 @@
         p To enhance the user experience, Compass can integrate with 3rd party services, which requires external network requests. Please choose from the settings below:
         form
           ul
-            if !isCommunity
-              li
-                label
-                  input(type='checkbox', name='enableFeedbackPanel', data-hook='product-feedback-checkbox', data-test-id='product-feedback-checkbox')
-                  span Enable Product Feedback Tool
-                p.option-description Enables a tool for sending feedback or talking to our Product and Development teams directly from Compass.
+            li
+              label
+                input(type='checkbox', name='enableFeedbackPanel', data-hook='product-feedback-checkbox', data-test-id='product-feedback-checkbox')
+                span Enable Product Feedback Tool
+              p.option-description Enables a tool for sending feedback or talking to our Product and Development teams directly from Compass.
 
-              li
-                label
-                  input(type='checkbox', name='enableMaps', data-hook='enable-maps-checkbox', data-test-id='enable-maps-checkbox')
-                  span Enable Geographic Visualizations
-                p.option-description Allow Compass to make requests to a 3rd party mapping service.
+            li
+              label
+                input(type='checkbox', name='enableMaps', data-hook='enable-maps-checkbox', data-test-id='enable-maps-checkbox')
+                span Enable Geographic Visualizations
+              p.option-description Allow Compass to make requests to a 3rd party mapping service.
 
             li
               label

src/app/network-optin/index.jade

@@ -22,11 +22,6 @@ var NetworkOptInView = View.extend({
       type: 'string',
       required: true,
       default: 'Start using Compass'
-    },
-    isCommunity: {
-      type: 'boolean',
-      required: true,
-      default: process.env.HADRON_PRODUCT === 'mongodb-compass-community'
     }
   },
   events: {

src/app/network-optin/index.js

@@ -4,88 +4,77 @@ module.exports = [
     description: 'Real-time server statistics let you view key server metrics and database operations. Drill down into database operations easily and understand your most active collections.',
     image: 'performance.png',
     version: '1.5.0',
-    initial: true,
-    community: false
+    initial: true
   },
   {
     title: 'Sidebar. Redesigned.',
     description: 'See with one glance what server you are connected to. Navigate between instance, database and collection level, with powerful filtering of your namespaces.',
     image: 'sidebar.png',
     version: '1.5.0',
-    initial: true,
-    community: true
+    initial: true
   },
   {
     title: 'Visualize your Schema.',
     description: 'MongoDB Compass analyzes your documents and displays rich structures within your collections through an intuitive GUI. It allows you to quickly visualize and explore your schema to understand the frequency, types and ranges of fields in your data set.',
     image: 'schema.png',
     version: '1.5.0',
-    initial: true,
-    community: false
+    initial: true
   },
   {
     title: 'Build Geo Queries.',
     description: 'Visualize, understand, and work with your geospatial data. Point and click to construct sophisticated queries, execute them with the push of a button and Compass will display your results both graphically and as sets of JSON documents.',
     image: 'geo.png',
     version: '1.5.0',
-    initial: true,
-    community: false
+    initial: true
   },
   {
     title: 'Interactive Document Editor.',
     description: 'Modify existing documents with greater confidence using the intuitive visual editor, or insert new documents and clone or delete existing ones in just a few clicks.',
     image: 'crud.png',
     version: '1.5.0',
-    initial: true,
-    community: true
+    initial: true
   },
   {
     title: 'Visual Explain Plans.',
     description: 'Know how queries are running through an easy-to-understand GUI that helps you identify and resolve performance issues.',
     image: 'explain.png',
     version: '1.5.0',
-    initial: true,
-    community: true
+    initial: true
   },
   {
     title: 'Index Management.',
     description: 'Understand the type and size of your indexes, their utilization and special properties. Add and remove indexes at the click of a button.',
     image: 'indexes.png',
     version: '1.5.0',
-    initial: true,
-    community: true
+    initial: true
   },
   {
     title: 'Schema Validation.',
     description: 'Create schema validation rules with a smart editor that auto-suggests rule components. See immediate results with a live preview and revise rules as needed. See Schema Validation in the MongoDB documentation for more information.',
     image: 'validation.png',
     version: '1.8.0',
     force: true,
-    initial: true,
-    community: false
+    initial: true
   },
   {
     title: 'Improved CRUD',
     description: 'Better editing with validation of individual BSON types.',
     image: 'improved-crud.png',
     version: '1.9.0',
-    initial: true,
-    community: true
+    initial: true
   },
   {
     title: 'Deployment Awareness',
     description: 'Replica set aware connections allow for continued use during replica set configuration changes and provides additional information of the connected cluster.',
     image: 'replica-set-name.png',
     version: '1.9.0',
-    initial: true,
-    community: true
+    initial: true
   },
   {
     title: 'Query History',
     description: 'Easily access and manage executed queries and save favorites for often executed queries.',
     image: 'query-history.png',
     version: '1.9.0',
-    initial: true,
-    community: true
+    initial: true
   }
 ];

src/app/tour/features.js

@@ -118,9 +118,6 @@ var TourView = View.extend({
     var previous = model.previousVersion || '0.0.0';
 
     model.features = _.filter(FEATURES, function(feature) {
-      if (process.env.HADRON_PRODUCT === 'mongodb-compass-community' && !feature.community) {
-        return false;
-      }
       if (model.force && feature.initial) {
         return true;
       }

src/app/tour/index.js

@@ -37,7 +37,6 @@ Application.prototype.setupJavaScriptArguments = function() {
  */
 const API_PRODUCT = {
   'mongodb-compass': 'compass',
-  'mongodb-compass-community': 'compass-community',
   'mongodb-compass-readonly': 'compass-readonly'
 };
 

src/main/application.js

@@ -2,7 +2,7 @@ const pkg = require('../package.json');
 
 /**
  * @note: HADRON_DISTRIBUTION is set via command line args in dev, for example:
- * npm start compass-community
+ * npm start compass-readonly
  */
 if (!process.env.HADRON_DISTRIBUTION) {
   const distribution = pkg.distribution || pkg.config.hadron.distributions.default;