diff --git a/package-lock.json b/package-lock.json
index 735ee1adf40..35f56caf4b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7790,32 +7790,128 @@
       }
     },
     "node_modules/@leafygreen-ui/select": {
-      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/@leafygreen-ui/select/-/select-14.0.2.tgz",
-      "integrity": "sha512-9SQFkyyXG0x0p5x64yTacVxVUSaRqepHGmJRJqlr0cAeAxJ1S9CT3Cj+V9rMWTbIUlZ6Tgma4WWGt4cav3LZNQ==",
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/select/-/select-16.3.0.tgz",
+      "integrity": "sha512-/UP9NO4HKyOmN8fac8DFQnW2ia/O/odp5LPxehymvRPSSgDGzTBoVK8JPocayEZHTO+kLRjmiJm6QaQ09xmhRQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@leafygreen-ui/button": "^22.0.2",
-        "@leafygreen-ui/emotion": "^4.0.9",
-        "@leafygreen-ui/form-field": "^2.0.2",
-        "@leafygreen-ui/hooks": "^8.3.4",
-        "@leafygreen-ui/icon": "^13.1.2",
-        "@leafygreen-ui/input-option": "^3.0.2",
-        "@leafygreen-ui/lib": "^14.0.2",
-        "@leafygreen-ui/palette": "^4.1.3",
-        "@leafygreen-ui/popover": "^13.0.2",
-        "@leafygreen-ui/tokens": "^2.11.3",
-        "@leafygreen-ui/typography": "^20.0.2",
-        "@lg-tools/test-harnesses": "^0.1.4",
+        "@leafygreen-ui/button": "^25.1.2",
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/form-field": "^4.0.6",
+        "@leafygreen-ui/hooks": "^9.2.2",
+        "@leafygreen-ui/icon": "^14.6.1",
+        "@leafygreen-ui/input-option": "^4.1.2",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2",
+        "@leafygreen-ui/popover": "^14.3.0",
+        "@leafygreen-ui/tokens": "^4.0.0",
+        "@leafygreen-ui/typography": "^22.2.0",
+        "@lg-tools/test-harnesses": "^0.3.4",
         "@types/react-is": "^18.0.0",
         "lodash": "^4.17.21",
         "polished": "^4.1.3",
         "react-is": "^18.0.1"
       },
       "peerDependencies": {
-        "@leafygreen-ui/leafygreen-provider": "^4.0.2"
+        "@leafygreen-ui/leafygreen-provider": ">=3.2.0"
+      }
+    },
+    "node_modules/@leafygreen-ui/select/node_modules/@leafygreen-ui/form-field": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/form-field/-/form-field-4.0.6.tgz",
+      "integrity": "sha512-HgvQRmIavlyH/vZHtbaBIS00fVvTp6wKLz3N3XBHi8I7TLn+tgSyD4sKs5whWj5UDTq8q3+/lNwelV5i+ONF0w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/hooks": "^9.2.2",
+        "@leafygreen-ui/icon": "^14.6.1",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2",
+        "@leafygreen-ui/tokens": "^4.0.0",
+        "@leafygreen-ui/typography": "^22.2.0"
+      },
+      "peerDependencies": {
+        "@leafygreen-ui/leafygreen-provider": ">=3.2.0"
+      }
+    },
+    "node_modules/@leafygreen-ui/select/node_modules/@lg-tools/test-harnesses": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@lg-tools/test-harnesses/-/test-harnesses-0.3.4.tgz",
+      "integrity": "sha512-JfJj2LSMe5vTSDQoLxWUHx2r4wUgKqU1UrgqjvNYM7iebXE0JCE7RvLiEg5SnsRO8xXQbEMjgISErmCDR4DS7Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@testing-library/dom": "9.3.1"
+      }
+    },
+    "node_modules/@leafygreen-ui/select/node_modules/@testing-library/dom": {
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
+      "integrity": "sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^5.0.1",
+        "aria-query": "5.1.3",
+        "chalk": "^4.1.0",
+        "dom-accessibility-api": "^0.5.9",
+        "lz-string": "^1.5.0",
+        "pretty-format": "^27.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@leafygreen-ui/select/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@leafygreen-ui/select/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@leafygreen-ui/select/node_modules/aria-query": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "deep-equal": "^2.0.5"
+      }
+    },
+    "node_modules/@leafygreen-ui/select/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
+    "node_modules/@leafygreen-ui/select/node_modules/pretty-format/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "license": "MIT"
+    },
     "node_modules/@leafygreen-ui/select/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
@@ -10730,49 +10826,6 @@
         "url": "https://opencollective.com/node-fetch"
       }
     },
-    "node_modules/@mongodb-js/diagramming": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@mongodb-js/diagramming/-/diagramming-2.2.1.tgz",
-      "integrity": "sha512-xUaQSyMnyNeXILT+tPl0JoC+hlh38cYltYuL6uniyg36g20cPuCXZ9geQp0sbVt5/p1BtfgdqsKMfox+oaOlIQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@emotion/react": "^11.14.0",
-        "@emotion/styled": "^11.14.0",
-        "@leafygreen-ui/icon": "^14.3.0",
-        "@leafygreen-ui/inline-definition": "^9.0.5",
-        "@leafygreen-ui/leafygreen-provider": "^5.0.2",
-        "@leafygreen-ui/palette": "^5.0.0",
-        "@leafygreen-ui/tokens": "^3.2.1",
-        "@leafygreen-ui/tooltip": "^14.2.1",
-        "@leafygreen-ui/typography": "^22.1.0",
-        "@xyflow/react": "12.5.1",
-        "d3-path": "^3.1.0",
-        "elkjs": "^0.11.0",
-        "react": "17.0.2",
-        "react-dom": "17.0.2"
-      }
-    },
-    "node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/tooltip": {
-      "version": "14.2.2",
-      "resolved": "https://registry.npmjs.org/@leafygreen-ui/tooltip/-/tooltip-14.2.2.tgz",
-      "integrity": "sha512-WqWjHzhK+BZrUaJjgph2LQjvQtEYjjR/uyxRubJVrW9GhzBd9xZ9ztnBnTMGT6rz5aRWptV0iZ0YwS+73KbBEw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@leafygreen-ui/emotion": "^5.1.0",
-        "@leafygreen-ui/hooks": "^9.2.2",
-        "@leafygreen-ui/icon": "^14.6.1",
-        "@leafygreen-ui/lib": "^15.6.2",
-        "@leafygreen-ui/palette": "^5.0.2",
-        "@leafygreen-ui/popover": "^14.3.0",
-        "@leafygreen-ui/tokens": "^4.0.0",
-        "@leafygreen-ui/typography": "^22.2.0",
-        "lodash": "^4.17.21",
-        "polished": "^4.2.2"
-      },
-      "peerDependencies": {
-        "@leafygreen-ui/leafygreen-provider": ">=3.2.0"
-      }
-    },
     "node_modules/@mongodb-js/dl-center": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@mongodb-js/dl-center/-/dl-center-1.3.0.tgz",
@@ -48838,7 +48891,7 @@
         "@leafygreen-ui/radio-group": "^12.0.2",
         "@leafygreen-ui/search-input": "^5.0.2",
         "@leafygreen-ui/segmented-control": "^10.0.2",
-        "@leafygreen-ui/select": "^14.0.2",
+        "@leafygreen-ui/select": "^16.3.0",
         "@leafygreen-ui/skeleton-loader": "^2.0.11",
         "@leafygreen-ui/split-button": "^4.1.5",
         "@leafygreen-ui/table": "^13.0.1",
@@ -48867,7 +48920,7 @@
         "@lg-chat/suggestions": "^0.2.3",
         "@lg-chat/title-bar": "^4.0.7",
         "@mongodb-js/compass-context-menu": "^0.3.0",
-        "@mongodb-js/diagramming": "^2.2.1",
+        "@mongodb-js/diagramming": "^2.2.2",
         "@react-aria/interactions": "^3.9.1",
         "@react-aria/utils": "^3.13.1",
         "@react-aria/visually-hidden": "^3.3.1",
@@ -48979,6 +49032,17 @@
         "polished": "^4.2.2"
       }
     },
+    "packages/compass-components/node_modules/@leafygreen-ui/icon": {
+      "version": "14.7.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon/-/icon-14.7.0.tgz",
+      "integrity": "sha512-qqwAYaLK75RadIezjUH3GlvhBgt+Hezl2c9xIVxC9eZP5vIhikbd1gwKohw42pA15R+IWeeqZKFgII0vWZRLtw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/hooks": "^9.3.0",
+        "lodash": "^4.17.21"
+      }
+    },
     "packages/compass-components/node_modules/@leafygreen-ui/icon-button": {
       "version": "16.0.2",
       "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon-button/-/icon-button-16.0.2.tgz",
@@ -49032,6 +49096,56 @@
         "polished": "^4.2.2"
       }
     },
+    "packages/compass-components/node_modules/@leafygreen-ui/icon/node_modules/@leafygreen-ui/emotion": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/emotion/-/emotion-5.1.0.tgz",
+      "integrity": "sha512-PYTlsJ1gZWmuF549C+/57J3RT31s6KtsoWWe6bng1XAoTE06cvHOVmVC5yOeW2WHhpA3ulLckqX4Qj0kiofdww==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@emotion/css": "^11.1.3",
+        "@emotion/server": "^11.4.0"
+      }
+    },
+    "packages/compass-components/node_modules/@leafygreen-ui/icon/node_modules/@leafygreen-ui/hooks": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/hooks/-/hooks-9.3.0.tgz",
+      "integrity": "sha512-KYLJuCctqIfY/ycIhKTS1PTJTADwBdrEgW31q/FqHKNc0y9C/KcQXjzx4xsYFSLZFoeiPvS+GGQ2rD/LTcCFMw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/tokens": "^4.0.0",
+        "lodash": "^4.17.21"
+      }
+    },
+    "packages/compass-components/node_modules/@leafygreen-ui/icon/node_modules/@leafygreen-ui/lib": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+      "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0"
+      }
+    },
+    "packages/compass-components/node_modules/@leafygreen-ui/icon/node_modules/@leafygreen-ui/palette": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/palette/-/palette-5.0.2.tgz",
+      "integrity": "sha512-+PrfGeJSv4goxm/vKpfJJDOP7t/uElj+14K8jiIyu3qR3TcFRIZ5h1VMvICTUgqvRc8W+xIZYQwsLa2XCu2lvw==",
+      "license": "Apache-2.0"
+    },
+    "packages/compass-components/node_modules/@leafygreen-ui/icon/node_modules/@leafygreen-ui/tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+      "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2"
+      }
+    },
     "packages/compass-components/node_modules/@leafygreen-ui/inline-definition": {
       "version": "8.0.12",
       "resolved": "https://registry.npmjs.org/@leafygreen-ui/inline-definition/-/inline-definition-8.0.12.tgz",
@@ -49255,6 +49369,291 @@
         "polished": "^4.2.2"
       }
     },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@mongodb-js/diagramming/-/diagramming-2.2.2.tgz",
+      "integrity": "sha512-GCI+L9TBC7sbuEeJaazhdz1ELcvPRi6cjuOf9Lhx/9FhyV+7IpIGCQbm4V7OflBrqBTfZD4XrwzlkuZ55hRLaA==",
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/react": "^11.14.0",
+        "@emotion/styled": "^11.14.0",
+        "@leafygreen-ui/icon": "^14.3.0",
+        "@leafygreen-ui/inline-definition": "^9.0.5",
+        "@leafygreen-ui/leafygreen-provider": "^5.0.2",
+        "@leafygreen-ui/palette": "^5.0.0",
+        "@leafygreen-ui/select": "^16.2.0",
+        "@leafygreen-ui/tokens": "^3.2.1",
+        "@leafygreen-ui/tooltip": "^14.2.1",
+        "@leafygreen-ui/typography": "^22.1.0",
+        "@xyflow/react": "12.5.1",
+        "d3-path": "^3.1.0",
+        "elkjs": "^0.11.0",
+        "react": "17.0.2",
+        "react-dom": "17.0.2"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/emotion": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/emotion/-/emotion-5.1.0.tgz",
+      "integrity": "sha512-PYTlsJ1gZWmuF549C+/57J3RT31s6KtsoWWe6bng1XAoTE06cvHOVmVC5yOeW2WHhpA3ulLckqX4Qj0kiofdww==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@emotion/css": "^11.1.3",
+        "@emotion/server": "^11.4.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/hooks": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/hooks/-/hooks-9.3.0.tgz",
+      "integrity": "sha512-KYLJuCctqIfY/ycIhKTS1PTJTADwBdrEgW31q/FqHKNc0y9C/KcQXjzx4xsYFSLZFoeiPvS+GGQ2rD/LTcCFMw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/tokens": "^4.0.0",
+        "lodash": "^4.17.21"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/hooks/node_modules/@leafygreen-ui/lib": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+      "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/hooks/node_modules/@leafygreen-ui/tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+      "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/inline-definition": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/inline-definition/-/inline-definition-9.1.2.tgz",
+      "integrity": "sha512-JHKAEreOhEOUUxNEtNYRKjLbEzURur/JYOoWySJ2JNjdpJCPLk8TIh6vi6jqBB++/FBFXxy+WRB5sIisbhx73Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2",
+        "@leafygreen-ui/tokens": "^4.0.0",
+        "@leafygreen-ui/tooltip": "^14.2.2"
+      },
+      "peerDependencies": {
+        "@leafygreen-ui/leafygreen-provider": ">=3.2.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/inline-definition/node_modules/@leafygreen-ui/lib": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+      "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/inline-definition/node_modules/@leafygreen-ui/tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+      "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/leafygreen-provider": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/leafygreen-provider/-/leafygreen-provider-5.0.4.tgz",
+      "integrity": "sha512-VDlmjTiIqlITVhq4VKUDq8FLySWnHkTxSV2n1sxOanLNPuatOXjxsPmCkPUBXhmQKk/fBf4yQnDKOwJvkyzE6Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/hooks": "^9.1.3",
+        "@leafygreen-ui/lib": "^15.3.0",
+        "react-transition-group": "^4.4.5"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/palette": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/palette/-/palette-5.0.2.tgz",
+      "integrity": "sha512-+PrfGeJSv4goxm/vKpfJJDOP7t/uElj+14K8jiIyu3qR3TcFRIZ5h1VMvICTUgqvRc8W+xIZYQwsLa2XCu2lvw==",
+      "license": "Apache-2.0"
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/polymorphic": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/polymorphic/-/polymorphic-3.1.0.tgz",
+      "integrity": "sha512-5fbXD6ExTmMScvODuipfB1Ti/Dvoaxxg+daSftqXfNQlEkEnd5cPnezOOl1LMsu2xUoZT6NXsFgukZYsmXEVpQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/lib": "^15.4.0",
+        "lodash": "^4.17.21"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/polymorphic/node_modules/@leafygreen-ui/lib": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+      "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/popover": {
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/popover/-/popover-14.3.0.tgz",
+      "integrity": "sha512-fnlI2/zuopP+3m4NrHZWkWk6sjPlnQu4oIsmvDfvnYJGKqnebqfzLpJxh7pCI+M5Df0IAAlnwzGDOW0QrCrbSw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@floating-ui/react": "^0.26.28",
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/hooks": "^9.2.2",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/portal": "^7.1.0",
+        "@leafygreen-ui/tokens": "^4.0.0",
+        "@types/react-transition-group": "^4.4.5",
+        "lodash": "^4.17.21",
+        "react-transition-group": "^4.4.5"
+      },
+      "peerDependencies": {
+        "@leafygreen-ui/leafygreen-provider": ">=3.2.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/popover/node_modules/@leafygreen-ui/lib": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+      "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/popover/node_modules/@leafygreen-ui/portal": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/portal/-/portal-7.1.0.tgz",
+      "integrity": "sha512-wCldB70m/NtlIeVRxi5S/U74W6jxQScqptI2I4+7RweBquBfxIg1SipHXqMC+Zo3aL+s/fCMuFKNlLuwGWu8MA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/hooks": "^9.2.0",
+        "@leafygreen-ui/lib": "^15.6.1"
+      },
+      "peerDependencies": {
+        "react-dom": "^17.0.0 || ^18.0.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/popover/node_modules/@leafygreen-ui/tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+      "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/tooltip": {
+      "version": "14.2.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/tooltip/-/tooltip-14.2.2.tgz",
+      "integrity": "sha512-WqWjHzhK+BZrUaJjgph2LQjvQtEYjjR/uyxRubJVrW9GhzBd9xZ9ztnBnTMGT6rz5aRWptV0iZ0YwS+73KbBEw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/hooks": "^9.2.2",
+        "@leafygreen-ui/icon": "^14.6.1",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2",
+        "@leafygreen-ui/popover": "^14.3.0",
+        "@leafygreen-ui/tokens": "^4.0.0",
+        "@leafygreen-ui/typography": "^22.2.0",
+        "lodash": "^4.17.21",
+        "polished": "^4.2.2"
+      },
+      "peerDependencies": {
+        "@leafygreen-ui/leafygreen-provider": ">=3.2.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/tooltip/node_modules/@leafygreen-ui/lib": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+      "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/tooltip/node_modules/@leafygreen-ui/tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+      "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/typography": {
+      "version": "22.2.1",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/typography/-/typography-22.2.1.tgz",
+      "integrity": "sha512-nUnoUBVfNN+QG8haLP1KDq4+ml/ef67gtzy/D1OMf7bGLj8oWP7e8uc+ianxUJ+6wnXCuw6sCqQgKwJOv+Er8w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/icon": "^14.7.0",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2",
+        "@leafygreen-ui/polymorphic": "^3.1.0",
+        "@leafygreen-ui/tokens": "^4.0.0"
+      },
+      "peerDependencies": {
+        "@leafygreen-ui/leafygreen-provider": "^3.2.0 || workspace:^4.0.0 || workspace:^5.0.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/typography/node_modules/@leafygreen-ui/lib": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+      "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0"
+      }
+    },
+    "packages/compass-components/node_modules/@mongodb-js/diagramming/node_modules/@leafygreen-ui/typography/node_modules/@leafygreen-ui/tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+      "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@leafygreen-ui/emotion": "^5.1.0",
+        "@leafygreen-ui/lib": "^15.6.2",
+        "@leafygreen-ui/palette": "^5.0.2"
+      }
+    },
     "packages/compass-components/node_modules/sinon": {
       "version": "9.2.4",
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz",
@@ -60592,13 +60991,13 @@
       }
     },
     "@leafygreen-ui/select": {
-      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/@leafygreen-ui/select/-/select-14.0.2.tgz",
-      "integrity": "sha512-9SQFkyyXG0x0p5x64yTacVxVUSaRqepHGmJRJqlr0cAeAxJ1S9CT3Cj+V9rMWTbIUlZ6Tgma4WWGt4cav3LZNQ==",
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/@leafygreen-ui/select/-/select-16.3.0.tgz",
+      "integrity": "sha512-/UP9NO4HKyOmN8fac8DFQnW2ia/O/odp5LPxehymvRPSSgDGzTBoVK8JPocayEZHTO+kLRjmiJm6QaQ09xmhRQ==",
       "requires": {
         "@leafygreen-ui/button": "^22.0.2",
         "@leafygreen-ui/emotion": "^4.0.9",
-        "@leafygreen-ui/form-field": "^2.0.2",
+        "@leafygreen-ui/form-field": "^4.0.6",
         "@leafygreen-ui/hooks": "^8.3.4",
         "@leafygreen-ui/icon": "^14.6.0",
         "@leafygreen-ui/input-option": "^3.0.4",
@@ -60607,13 +61006,85 @@
         "@leafygreen-ui/popover": "^13.0.11",
         "@leafygreen-ui/tokens": "^3.2.4",
         "@leafygreen-ui/typography": "^20.0.2",
-        "@lg-tools/test-harnesses": "^0.1.4",
+        "@lg-tools/test-harnesses": "^0.3.4",
         "@types/react-is": "^18.0.0",
         "lodash": "^4.17.21",
         "polished": "^4.1.3",
         "react-is": "^18.0.1"
       },
       "dependencies": {
+        "@leafygreen-ui/form-field": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/@leafygreen-ui/form-field/-/form-field-4.0.6.tgz",
+          "integrity": "sha512-HgvQRmIavlyH/vZHtbaBIS00fVvTp6wKLz3N3XBHi8I7TLn+tgSyD4sKs5whWj5UDTq8q3+/lNwelV5i+ONF0w==",
+          "requires": {
+            "@leafygreen-ui/emotion": "^4.0.9",
+            "@leafygreen-ui/hooks": "^8.3.4",
+            "@leafygreen-ui/icon": "^14.6.0",
+            "@leafygreen-ui/lib": "^15.3.0",
+            "@leafygreen-ui/palette": "^4.1.3",
+            "@leafygreen-ui/tokens": "^3.2.4",
+            "@leafygreen-ui/typography": "^20.0.2"
+          }
+        },
+        "@lg-tools/test-harnesses": {
+          "version": "0.3.4",
+          "resolved": "https://registry.npmjs.org/@lg-tools/test-harnesses/-/test-harnesses-0.3.4.tgz",
+          "integrity": "sha512-JfJj2LSMe5vTSDQoLxWUHx2r4wUgKqU1UrgqjvNYM7iebXE0JCE7RvLiEg5SnsRO8xXQbEMjgISErmCDR4DS7Q==",
+          "requires": {
+            "@testing-library/dom": "9.3.1"
+          }
+        },
+        "@testing-library/dom": {
+          "version": "9.3.1",
+          "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
+          "integrity": "sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==",
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/runtime": "^7.12.5",
+            "@types/aria-query": "^5.0.1",
+            "aria-query": "5.1.3",
+            "chalk": "^4.1.0",
+            "dom-accessibility-api": "^0.5.9",
+            "lz-string": "^1.5.0",
+            "pretty-format": "^27.0.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
+        },
+        "aria-query": {
+          "version": "5.1.3",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+          "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+          "requires": {
+            "deep-equal": "^2.0.5"
+          }
+        },
+        "pretty-format": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+          "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+          "requires": {
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^17.0.1"
+          },
+          "dependencies": {
+            "react-is": {
+              "version": "17.0.2",
+              "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+              "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+            }
+          }
+        },
         "react-is": {
           "version": "18.3.1",
           "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
@@ -63280,7 +63751,7 @@
         "@leafygreen-ui/radio-group": "^12.0.2",
         "@leafygreen-ui/search-input": "^5.0.2",
         "@leafygreen-ui/segmented-control": "^10.0.2",
-        "@leafygreen-ui/select": "^14.0.2",
+        "@leafygreen-ui/select": "^16.3.0",
         "@leafygreen-ui/skeleton-loader": "^2.0.11",
         "@leafygreen-ui/split-button": "^4.1.5",
         "@leafygreen-ui/table": "^13.0.1",
@@ -63309,7 +63780,7 @@
         "@lg-chat/suggestions": "^0.2.3",
         "@lg-chat/title-bar": "^4.0.7",
         "@mongodb-js/compass-context-menu": "^0.3.0",
-        "@mongodb-js/diagramming": "^2.2.1",
+        "@mongodb-js/diagramming": "^2.2.2",
         "@mongodb-js/eslint-config-compass": "^1.4.12",
         "@mongodb-js/mocha-config-compass": "^1.7.2",
         "@mongodb-js/prettier-config-compass": "^1.2.9",
@@ -63406,19 +63877,262 @@
             }
           }
         },
-        "@leafygreen-ui/icon-button": {
-          "version": "16.0.2",
-          "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon-button/-/icon-button-16.0.2.tgz",
-          "integrity": "sha512-nCotpqN4VlGejm0ybzdZH4ExP8bdQZbLElBkTEsPSf4nNCvjC5LsbIqRuK/TGIHTa4tPnTHgnx7QZb5X36Q5Qg==",
+        "@leafygreen-ui/icon": {
+          "version": "14.7.0",
+          "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon/-/icon-14.7.0.tgz",
+          "integrity": "sha512-qqwAYaLK75RadIezjUH3GlvhBgt+Hezl2c9xIVxC9eZP5vIhikbd1gwKohw42pA15R+IWeeqZKFgII0vWZRLtw==",
+          "requires": {
+            "@leafygreen-ui/emotion": "^5.1.0",
+            "@leafygreen-ui/hooks": "^9.3.0",
+            "lodash": "^4.17.21"
+          },
+          "dependencies": {
+            "@leafygreen-ui/emotion": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/emotion/-/emotion-5.1.0.tgz",
+              "integrity": "sha512-PYTlsJ1gZWmuF549C+/57J3RT31s6KtsoWWe6bng1XAoTE06cvHOVmVC5yOeW2WHhpA3ulLckqX4Qj0kiofdww==",
+              "requires": {
+                "@emotion/css": "^11.1.3",
+                "@emotion/server": "^11.4.0"
+              }
+            },
+            "@leafygreen-ui/hooks": {
+              "version": "9.3.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/hooks/-/hooks-9.3.0.tgz",
+              "integrity": "sha512-KYLJuCctqIfY/ycIhKTS1PTJTADwBdrEgW31q/FqHKNc0y9C/KcQXjzx4xsYFSLZFoeiPvS+GGQ2rD/LTcCFMw==",
+              "requires": {
+                "@leafygreen-ui/lib": "^15.6.2",
+                "@leafygreen-ui/tokens": "^4.0.0",
+                "lodash": "^4.17.21"
+              }
+            },
+            "@leafygreen-ui/lib": {
+              "version": "15.6.2",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+              "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+              "requires": {
+                "lodash": "^4.17.21"
+              }
+            },
+            "@leafygreen-ui/palette": {
+              "version": "5.0.2",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/palette/-/palette-5.0.2.tgz",
+              "integrity": "sha512-+PrfGeJSv4goxm/vKpfJJDOP7t/uElj+14K8jiIyu3qR3TcFRIZ5h1VMvICTUgqvRc8W+xIZYQwsLa2XCu2lvw=="
+            },
+            "@leafygreen-ui/tokens": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+              "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+              "requires": {
+                "@leafygreen-ui/emotion": "^5.1.0",
+                "@leafygreen-ui/lib": "^15.6.2",
+                "@leafygreen-ui/palette": "^5.0.2"
+              }
+            }
+          }
+        },
+        "@leafygreen-ui/icon-button": {
+          "version": "16.0.2",
+          "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon-button/-/icon-button-16.0.2.tgz",
+          "integrity": "sha512-nCotpqN4VlGejm0ybzdZH4ExP8bdQZbLElBkTEsPSf4nNCvjC5LsbIqRuK/TGIHTa4tPnTHgnx7QZb5X36Q5Qg==",
+          "requires": {
+            "@leafygreen-ui/a11y": "^2.0.2",
+            "@leafygreen-ui/box": "^4.0.2",
+            "@leafygreen-ui/emotion": "^4.0.9",
+            "@leafygreen-ui/icon": "^13.1.2",
+            "@leafygreen-ui/lib": "^14.0.2",
+            "@leafygreen-ui/palette": "^4.1.3",
+            "@leafygreen-ui/tokens": "^2.11.3",
+            "polished": "^4.2.2"
+          },
+          "dependencies": {
+            "@leafygreen-ui/icon": {
+              "version": "13.4.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon/-/icon-13.4.0.tgz",
+              "integrity": "sha512-GtvdkjPPERf8g0+uXGqBRw7Zgzhj1PH4moGQxNqyOc3IHeVkurAxjF1Oq64pKMLeMwuqFGhVGEVfXi3pixTPFg==",
+              "requires": {
+                "@leafygreen-ui/emotion": "^4.1.1",
+                "lodash": "^4.17.21"
+              }
+            },
+            "@leafygreen-ui/lib": {
+              "version": "14.2.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-14.2.0.tgz",
+              "integrity": "sha512-JWHFwtWXY52YL1uNFpHWvRUWVl5tkXQzyq2uEMFHyZQKYUG0of9o5V+Zc6vAXdMvvAhE3DeYvDjTpaQbUk1PrQ==",
+              "requires": {
+                "lodash": "^4.17.21"
+              }
+            },
+            "@leafygreen-ui/tokens": {
+              "version": "2.12.2",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-2.12.2.tgz",
+              "integrity": "sha512-eVHQOk7lExNjGPVpLv2sGMUmAH0ZIpmu86NHe4n3RzHNQ2ziJUnw1CN94N6Y09qv00LvrZ2I05kbxLfX+kktvw==",
+              "requires": {
+                "@leafygreen-ui/emotion": "^4.1.1",
+                "@leafygreen-ui/lib": "^14.2.0",
+                "@leafygreen-ui/palette": "^4.1.4",
+                "polished": "^4.2.2"
+              }
+            }
+          }
+        },
+        "@leafygreen-ui/inline-definition": {
+          "version": "8.0.12",
+          "resolved": "https://registry.npmjs.org/@leafygreen-ui/inline-definition/-/inline-definition-8.0.12.tgz",
+          "integrity": "sha512-8Jd4hhvUaA5O9zoa41AgX2MqdXmPtIGj43p+gwRkkfXVud7UHfYnrgh6u4+c77dVxW+/ufRLVStto5dUDyAZ+Q==",
+          "requires": {
+            "@leafygreen-ui/emotion": "^4.1.1",
+            "@leafygreen-ui/lib": "^14.2.0",
+            "@leafygreen-ui/palette": "^4.1.4",
+            "@leafygreen-ui/tokens": "^2.12.2",
+            "@leafygreen-ui/tooltip": "^13.0.12"
+          },
+          "dependencies": {
+            "@leafygreen-ui/lib": {
+              "version": "14.2.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-14.2.0.tgz",
+              "integrity": "sha512-JWHFwtWXY52YL1uNFpHWvRUWVl5tkXQzyq2uEMFHyZQKYUG0of9o5V+Zc6vAXdMvvAhE3DeYvDjTpaQbUk1PrQ==",
+              "requires": {
+                "lodash": "^4.17.21"
+              }
+            },
+            "@leafygreen-ui/tokens": {
+              "version": "2.12.2",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-2.12.2.tgz",
+              "integrity": "sha512-eVHQOk7lExNjGPVpLv2sGMUmAH0ZIpmu86NHe4n3RzHNQ2ziJUnw1CN94N6Y09qv00LvrZ2I05kbxLfX+kktvw==",
+              "requires": {
+                "@leafygreen-ui/emotion": "^4.1.1",
+                "@leafygreen-ui/lib": "^14.2.0",
+                "@leafygreen-ui/palette": "^4.1.4",
+                "polished": "^4.2.2"
+              }
+            }
+          }
+        },
+        "@leafygreen-ui/input-option": {
+          "version": "3.0.12",
+          "resolved": "https://registry.npmjs.org/@leafygreen-ui/input-option/-/input-option-3.0.12.tgz",
+          "integrity": "sha512-p4mC9xZiyTapz2Z7vlgb9c839g2fcpi5ssRogn/Ix7uPaBpg6SAwQU1cqve6/55P1ekXVt0cHBTY1S/n+MtMQA==",
+          "requires": {
+            "@leafygreen-ui/a11y": "^2.0.7",
+            "@leafygreen-ui/emotion": "^4.1.1",
+            "@leafygreen-ui/lib": "^14.2.0",
+            "@leafygreen-ui/palette": "^4.1.4",
+            "@leafygreen-ui/polymorphic": "^2.0.9",
+            "@leafygreen-ui/tokens": "^2.12.2",
+            "@leafygreen-ui/typography": "^20.1.9"
+          },
+          "dependencies": {
+            "@leafygreen-ui/lib": {
+              "version": "14.2.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-14.2.0.tgz",
+              "integrity": "sha512-JWHFwtWXY52YL1uNFpHWvRUWVl5tkXQzyq2uEMFHyZQKYUG0of9o5V+Zc6vAXdMvvAhE3DeYvDjTpaQbUk1PrQ==",
+              "requires": {
+                "lodash": "^4.17.21"
+              }
+            },
+            "@leafygreen-ui/tokens": {
+              "version": "2.12.2",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-2.12.2.tgz",
+              "integrity": "sha512-eVHQOk7lExNjGPVpLv2sGMUmAH0ZIpmu86NHe4n3RzHNQ2ziJUnw1CN94N6Y09qv00LvrZ2I05kbxLfX+kktvw==",
+              "requires": {
+                "@leafygreen-ui/emotion": "^4.1.1",
+                "@leafygreen-ui/lib": "^14.2.0",
+                "@leafygreen-ui/palette": "^4.1.4",
+                "polished": "^4.2.2"
+              }
+            }
+          }
+        },
+        "@leafygreen-ui/menu": {
+          "version": "29.0.5",
+          "resolved": "https://registry.npmjs.org/@leafygreen-ui/menu/-/menu-29.0.5.tgz",
+          "integrity": "sha512-QVe4YoNaYEuJnSc9Cd+IJQG2vUykv9g4Az8TcVib4Axb5E0RsLt3EOwGr2WPPCCGktMEpVOT0OwrsbLtDCwopA==",
+          "requires": {
+            "@leafygreen-ui/descendants": "^2.1.5",
+            "@leafygreen-ui/emotion": "^4.1.1",
+            "@leafygreen-ui/hooks": "^8.4.1",
+            "@leafygreen-ui/icon": "^13.4.0",
+            "@leafygreen-ui/icon-button": "^16.0.12",
+            "@leafygreen-ui/input-option": "^3.0.12",
+            "@leafygreen-ui/lib": "^14.2.0",
+            "@leafygreen-ui/palette": "^4.1.4",
+            "@leafygreen-ui/polymorphic": "^2.0.9",
+            "@leafygreen-ui/popover": "^13.0.11",
+            "@leafygreen-ui/tokens": "^2.12.2",
+            "@leafygreen-ui/typography": "^20.1.9",
+            "lodash": "^4.17.21",
+            "polished": "^4.3.1",
+            "react-transition-group": "^4.4.5"
+          },
+          "dependencies": {
+            "@leafygreen-ui/icon": {
+              "version": "13.4.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon/-/icon-13.4.0.tgz",
+              "integrity": "sha512-GtvdkjPPERf8g0+uXGqBRw7Zgzhj1PH4moGQxNqyOc3IHeVkurAxjF1Oq64pKMLeMwuqFGhVGEVfXi3pixTPFg==",
+              "requires": {
+                "@leafygreen-ui/emotion": "^4.1.1",
+                "lodash": "^4.17.21"
+              }
+            },
+            "@leafygreen-ui/icon-button": {
+              "version": "16.0.12",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon-button/-/icon-button-16.0.12.tgz",
+              "integrity": "sha512-EkuAfWe4J14/VEx0BDRNRXbN6QwaLqAnAYPtf/RUOwEqHzgkQQYkVStpEkAqp50k2OSR1FzopznmWxyPnrW55w==",
+              "requires": {
+                "@leafygreen-ui/a11y": "^2.0.7",
+                "@leafygreen-ui/emotion": "^4.1.1",
+                "@leafygreen-ui/icon": "^13.4.0",
+                "@leafygreen-ui/lib": "^14.2.0",
+                "@leafygreen-ui/palette": "^4.1.4",
+                "@leafygreen-ui/polymorphic": "^2.0.9",
+                "@leafygreen-ui/tokens": "^2.12.2",
+                "polished": "^4.2.2"
+              }
+            },
+            "@leafygreen-ui/lib": {
+              "version": "14.2.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-14.2.0.tgz",
+              "integrity": "sha512-JWHFwtWXY52YL1uNFpHWvRUWVl5tkXQzyq2uEMFHyZQKYUG0of9o5V+Zc6vAXdMvvAhE3DeYvDjTpaQbUk1PrQ==",
+              "requires": {
+                "lodash": "^4.17.21"
+              }
+            },
+            "@leafygreen-ui/tokens": {
+              "version": "2.12.2",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-2.12.2.tgz",
+              "integrity": "sha512-eVHQOk7lExNjGPVpLv2sGMUmAH0ZIpmu86NHe4n3RzHNQ2ziJUnw1CN94N6Y09qv00LvrZ2I05kbxLfX+kktvw==",
+              "requires": {
+                "@leafygreen-ui/emotion": "^4.1.1",
+                "@leafygreen-ui/lib": "^14.2.0",
+                "@leafygreen-ui/palette": "^4.1.4",
+                "polished": "^4.2.2"
+              }
+            }
+          }
+        },
+        "@leafygreen-ui/table": {
+          "version": "13.0.1",
+          "resolved": "https://registry.npmjs.org/@leafygreen-ui/table/-/table-13.0.1.tgz",
+          "integrity": "sha512-EmCdXp58RD2gagM9t51ZGTXakEPRvF+u0aJuGSfAgz3X20Y8ZBYRorBc4xRPy35WtkVdnEwQFeuwjaEvroy5cQ==",
           "requires": {
-            "@leafygreen-ui/a11y": "^2.0.2",
-            "@leafygreen-ui/box": "^4.0.2",
+            "@leafygreen-ui/checkbox": "^14.0.2",
             "@leafygreen-ui/emotion": "^4.0.9",
+            "@leafygreen-ui/hooks": "^8.3.4",
             "@leafygreen-ui/icon": "^13.1.2",
+            "@leafygreen-ui/icon-button": "^16.0.2",
             "@leafygreen-ui/lib": "^14.0.2",
             "@leafygreen-ui/palette": "^4.1.3",
+            "@leafygreen-ui/polymorphic": "^2.0.5",
             "@leafygreen-ui/tokens": "^2.11.3",
-            "polished": "^4.2.2"
+            "@leafygreen-ui/typography": "^20.0.2",
+            "@lg-tools/test-harnesses": "^0.1.4",
+            "@tanstack/react-table": "^8.20.5",
+            "@tanstack/react-virtual": "^3.10.7",
+            "lodash": "^4.17.21",
+            "polished": "^4.2.2",
+            "react-fast-compare": "3.2.2",
+            "react-intersection-observer": "^8.25.1"
           },
           "dependencies": {
             "@leafygreen-ui/icon": {
@@ -63451,191 +64165,246 @@
             }
           }
         },
-        "@leafygreen-ui/inline-definition": {
-          "version": "8.0.12",
-          "resolved": "https://registry.npmjs.org/@leafygreen-ui/inline-definition/-/inline-definition-8.0.12.tgz",
-          "integrity": "sha512-8Jd4hhvUaA5O9zoa41AgX2MqdXmPtIGj43p+gwRkkfXVud7UHfYnrgh6u4+c77dVxW+/ufRLVStto5dUDyAZ+Q==",
-          "requires": {
-            "@leafygreen-ui/emotion": "^4.1.1",
-            "@leafygreen-ui/lib": "^14.2.0",
-            "@leafygreen-ui/palette": "^4.1.4",
-            "@leafygreen-ui/tokens": "^2.12.2",
-            "@leafygreen-ui/tooltip": "^13.0.12"
+        "@mongodb-js/diagramming": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/@mongodb-js/diagramming/-/diagramming-2.2.2.tgz",
+          "integrity": "sha512-GCI+L9TBC7sbuEeJaazhdz1ELcvPRi6cjuOf9Lhx/9FhyV+7IpIGCQbm4V7OflBrqBTfZD4XrwzlkuZ55hRLaA==",
+          "requires": {
+            "@emotion/react": "^11.14.0",
+            "@emotion/styled": "^11.14.0",
+            "@leafygreen-ui/icon": "^14.3.0",
+            "@leafygreen-ui/inline-definition": "^9.0.5",
+            "@leafygreen-ui/leafygreen-provider": "^5.0.2",
+            "@leafygreen-ui/palette": "^5.0.0",
+            "@leafygreen-ui/select": "^16.2.0",
+            "@leafygreen-ui/tokens": "^3.2.1",
+            "@leafygreen-ui/tooltip": "^14.2.1",
+            "@leafygreen-ui/typography": "^22.1.0",
+            "@xyflow/react": "12.5.1",
+            "d3-path": "^3.1.0",
+            "elkjs": "^0.11.0",
+            "react": "17.0.2",
+            "react-dom": "17.0.2"
           },
           "dependencies": {
-            "@leafygreen-ui/lib": {
-              "version": "14.2.0",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-14.2.0.tgz",
-              "integrity": "sha512-JWHFwtWXY52YL1uNFpHWvRUWVl5tkXQzyq2uEMFHyZQKYUG0of9o5V+Zc6vAXdMvvAhE3DeYvDjTpaQbUk1PrQ==",
+            "@leafygreen-ui/emotion": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/emotion/-/emotion-5.1.0.tgz",
+              "integrity": "sha512-PYTlsJ1gZWmuF549C+/57J3RT31s6KtsoWWe6bng1XAoTE06cvHOVmVC5yOeW2WHhpA3ulLckqX4Qj0kiofdww==",
               "requires": {
-                "lodash": "^4.17.21"
+                "@emotion/css": "^11.1.3",
+                "@emotion/server": "^11.4.0"
               }
             },
-            "@leafygreen-ui/tokens": {
-              "version": "2.12.2",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-2.12.2.tgz",
-              "integrity": "sha512-eVHQOk7lExNjGPVpLv2sGMUmAH0ZIpmu86NHe4n3RzHNQ2ziJUnw1CN94N6Y09qv00LvrZ2I05kbxLfX+kktvw==",
-              "requires": {
-                "@leafygreen-ui/emotion": "^4.1.1",
-                "@leafygreen-ui/lib": "^14.2.0",
-                "@leafygreen-ui/palette": "^4.1.4",
-                "polished": "^4.2.2"
-              }
-            }
-          }
-        },
-        "@leafygreen-ui/input-option": {
-          "version": "3.0.12",
-          "resolved": "https://registry.npmjs.org/@leafygreen-ui/input-option/-/input-option-3.0.12.tgz",
-          "integrity": "sha512-p4mC9xZiyTapz2Z7vlgb9c839g2fcpi5ssRogn/Ix7uPaBpg6SAwQU1cqve6/55P1ekXVt0cHBTY1S/n+MtMQA==",
-          "requires": {
-            "@leafygreen-ui/a11y": "^2.0.7",
-            "@leafygreen-ui/emotion": "^4.1.1",
-            "@leafygreen-ui/lib": "^14.2.0",
-            "@leafygreen-ui/palette": "^4.1.4",
-            "@leafygreen-ui/polymorphic": "^2.0.9",
-            "@leafygreen-ui/tokens": "^2.12.2",
-            "@leafygreen-ui/typography": "^20.1.9"
-          },
-          "dependencies": {
-            "@leafygreen-ui/lib": {
-              "version": "14.2.0",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-14.2.0.tgz",
-              "integrity": "sha512-JWHFwtWXY52YL1uNFpHWvRUWVl5tkXQzyq2uEMFHyZQKYUG0of9o5V+Zc6vAXdMvvAhE3DeYvDjTpaQbUk1PrQ==",
+            "@leafygreen-ui/hooks": {
+              "version": "9.3.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/hooks/-/hooks-9.3.0.tgz",
+              "integrity": "sha512-KYLJuCctqIfY/ycIhKTS1PTJTADwBdrEgW31q/FqHKNc0y9C/KcQXjzx4xsYFSLZFoeiPvS+GGQ2rD/LTcCFMw==",
               "requires": {
+                "@leafygreen-ui/lib": "^15.6.2",
+                "@leafygreen-ui/tokens": "^4.0.0",
                 "lodash": "^4.17.21"
+              },
+              "dependencies": {
+                "@leafygreen-ui/lib": {
+                  "version": "15.6.2",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+                  "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+                  "requires": {
+                    "lodash": "^4.17.21"
+                  }
+                },
+                "@leafygreen-ui/tokens": {
+                  "version": "4.0.0",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+                  "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+                  "requires": {
+                    "@leafygreen-ui/emotion": "^5.1.0",
+                    "@leafygreen-ui/lib": "^15.6.2",
+                    "@leafygreen-ui/palette": "^5.0.2"
+                  }
+                }
               }
             },
-            "@leafygreen-ui/tokens": {
-              "version": "2.12.2",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-2.12.2.tgz",
-              "integrity": "sha512-eVHQOk7lExNjGPVpLv2sGMUmAH0ZIpmu86NHe4n3RzHNQ2ziJUnw1CN94N6Y09qv00LvrZ2I05kbxLfX+kktvw==",
-              "requires": {
-                "@leafygreen-ui/emotion": "^4.1.1",
-                "@leafygreen-ui/lib": "^14.2.0",
-                "@leafygreen-ui/palette": "^4.1.4",
-                "polished": "^4.2.2"
-              }
-            }
-          }
-        },
-        "@leafygreen-ui/menu": {
-          "version": "29.0.5",
-          "resolved": "https://registry.npmjs.org/@leafygreen-ui/menu/-/menu-29.0.5.tgz",
-          "integrity": "sha512-QVe4YoNaYEuJnSc9Cd+IJQG2vUykv9g4Az8TcVib4Axb5E0RsLt3EOwGr2WPPCCGktMEpVOT0OwrsbLtDCwopA==",
-          "requires": {
-            "@leafygreen-ui/descendants": "^2.1.5",
-            "@leafygreen-ui/emotion": "^4.1.1",
-            "@leafygreen-ui/hooks": "^8.4.1",
-            "@leafygreen-ui/icon": "^13.4.0",
-            "@leafygreen-ui/icon-button": "^16.0.12",
-            "@leafygreen-ui/input-option": "^3.0.12",
-            "@leafygreen-ui/lib": "^14.2.0",
-            "@leafygreen-ui/palette": "^4.1.4",
-            "@leafygreen-ui/polymorphic": "^2.0.9",
-            "@leafygreen-ui/popover": "^13.0.11",
-            "@leafygreen-ui/tokens": "^2.12.2",
-            "@leafygreen-ui/typography": "^20.1.9",
-            "lodash": "^4.17.21",
-            "polished": "^4.3.1",
-            "react-transition-group": "^4.4.5"
-          },
-          "dependencies": {
-            "@leafygreen-ui/icon": {
-              "version": "13.4.0",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon/-/icon-13.4.0.tgz",
-              "integrity": "sha512-GtvdkjPPERf8g0+uXGqBRw7Zgzhj1PH4moGQxNqyOc3IHeVkurAxjF1Oq64pKMLeMwuqFGhVGEVfXi3pixTPFg==",
+            "@leafygreen-ui/inline-definition": {
+              "version": "9.1.2",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/inline-definition/-/inline-definition-9.1.2.tgz",
+              "integrity": "sha512-JHKAEreOhEOUUxNEtNYRKjLbEzURur/JYOoWySJ2JNjdpJCPLk8TIh6vi6jqBB++/FBFXxy+WRB5sIisbhx73Q==",
               "requires": {
-                "@leafygreen-ui/emotion": "^4.1.1",
-                "lodash": "^4.17.21"
+                "@leafygreen-ui/emotion": "^5.1.0",
+                "@leafygreen-ui/lib": "^15.6.2",
+                "@leafygreen-ui/palette": "^5.0.2",
+                "@leafygreen-ui/tokens": "^4.0.0",
+                "@leafygreen-ui/tooltip": "^14.2.2"
+              },
+              "dependencies": {
+                "@leafygreen-ui/lib": {
+                  "version": "15.6.2",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+                  "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+                  "requires": {
+                    "lodash": "^4.17.21"
+                  }
+                },
+                "@leafygreen-ui/tokens": {
+                  "version": "4.0.0",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+                  "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+                  "requires": {
+                    "@leafygreen-ui/emotion": "^5.1.0",
+                    "@leafygreen-ui/lib": "^15.6.2",
+                    "@leafygreen-ui/palette": "^5.0.2"
+                  }
+                }
               }
             },
-            "@leafygreen-ui/icon-button": {
-              "version": "16.0.12",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon-button/-/icon-button-16.0.12.tgz",
-              "integrity": "sha512-EkuAfWe4J14/VEx0BDRNRXbN6QwaLqAnAYPtf/RUOwEqHzgkQQYkVStpEkAqp50k2OSR1FzopznmWxyPnrW55w==",
+            "@leafygreen-ui/leafygreen-provider": {
+              "version": "5.0.4",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/leafygreen-provider/-/leafygreen-provider-5.0.4.tgz",
+              "integrity": "sha512-VDlmjTiIqlITVhq4VKUDq8FLySWnHkTxSV2n1sxOanLNPuatOXjxsPmCkPUBXhmQKk/fBf4yQnDKOwJvkyzE6Q==",
               "requires": {
-                "@leafygreen-ui/a11y": "^2.0.7",
-                "@leafygreen-ui/emotion": "^4.1.1",
-                "@leafygreen-ui/icon": "^13.4.0",
-                "@leafygreen-ui/lib": "^14.2.0",
-                "@leafygreen-ui/palette": "^4.1.4",
-                "@leafygreen-ui/polymorphic": "^2.0.9",
-                "@leafygreen-ui/tokens": "^2.12.2",
-                "polished": "^4.2.2"
+                "@leafygreen-ui/hooks": "^9.1.3",
+                "@leafygreen-ui/lib": "^15.3.0",
+                "react-transition-group": "^4.4.5"
               }
             },
-            "@leafygreen-ui/lib": {
-              "version": "14.2.0",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-14.2.0.tgz",
-              "integrity": "sha512-JWHFwtWXY52YL1uNFpHWvRUWVl5tkXQzyq2uEMFHyZQKYUG0of9o5V+Zc6vAXdMvvAhE3DeYvDjTpaQbUk1PrQ==",
+            "@leafygreen-ui/palette": {
+              "version": "5.0.2",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/palette/-/palette-5.0.2.tgz",
+              "integrity": "sha512-+PrfGeJSv4goxm/vKpfJJDOP7t/uElj+14K8jiIyu3qR3TcFRIZ5h1VMvICTUgqvRc8W+xIZYQwsLa2XCu2lvw=="
+            },
+            "@leafygreen-ui/polymorphic": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/polymorphic/-/polymorphic-3.1.0.tgz",
+              "integrity": "sha512-5fbXD6ExTmMScvODuipfB1Ti/Dvoaxxg+daSftqXfNQlEkEnd5cPnezOOl1LMsu2xUoZT6NXsFgukZYsmXEVpQ==",
               "requires": {
+                "@leafygreen-ui/lib": "^15.4.0",
                 "lodash": "^4.17.21"
+              },
+              "dependencies": {
+                "@leafygreen-ui/lib": {
+                  "version": "15.6.2",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+                  "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+                  "requires": {
+                    "lodash": "^4.17.21"
+                  }
+                }
               }
             },
-            "@leafygreen-ui/tokens": {
-              "version": "2.12.2",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-2.12.2.tgz",
-              "integrity": "sha512-eVHQOk7lExNjGPVpLv2sGMUmAH0ZIpmu86NHe4n3RzHNQ2ziJUnw1CN94N6Y09qv00LvrZ2I05kbxLfX+kktvw==",
-              "requires": {
-                "@leafygreen-ui/emotion": "^4.1.1",
-                "@leafygreen-ui/lib": "^14.2.0",
-                "@leafygreen-ui/palette": "^4.1.4",
-                "polished": "^4.2.2"
-              }
-            }
-          }
-        },
-        "@leafygreen-ui/table": {
-          "version": "13.0.1",
-          "resolved": "https://registry.npmjs.org/@leafygreen-ui/table/-/table-13.0.1.tgz",
-          "integrity": "sha512-EmCdXp58RD2gagM9t51ZGTXakEPRvF+u0aJuGSfAgz3X20Y8ZBYRorBc4xRPy35WtkVdnEwQFeuwjaEvroy5cQ==",
-          "requires": {
-            "@leafygreen-ui/checkbox": "^14.0.2",
-            "@leafygreen-ui/emotion": "^4.0.9",
-            "@leafygreen-ui/hooks": "^8.3.4",
-            "@leafygreen-ui/icon": "^13.1.2",
-            "@leafygreen-ui/icon-button": "^16.0.2",
-            "@leafygreen-ui/lib": "^14.0.2",
-            "@leafygreen-ui/palette": "^4.1.3",
-            "@leafygreen-ui/polymorphic": "^2.0.5",
-            "@leafygreen-ui/tokens": "^2.11.3",
-            "@leafygreen-ui/typography": "^20.0.2",
-            "@lg-tools/test-harnesses": "^0.1.4",
-            "@tanstack/react-table": "^8.20.5",
-            "@tanstack/react-virtual": "^3.10.7",
-            "lodash": "^4.17.21",
-            "polished": "^4.2.2",
-            "react-fast-compare": "3.2.2",
-            "react-intersection-observer": "^8.25.1"
-          },
-          "dependencies": {
-            "@leafygreen-ui/icon": {
-              "version": "13.4.0",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/icon/-/icon-13.4.0.tgz",
-              "integrity": "sha512-GtvdkjPPERf8g0+uXGqBRw7Zgzhj1PH4moGQxNqyOc3IHeVkurAxjF1Oq64pKMLeMwuqFGhVGEVfXi3pixTPFg==",
+            "@leafygreen-ui/popover": {
+              "version": "14.3.0",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/popover/-/popover-14.3.0.tgz",
+              "integrity": "sha512-fnlI2/zuopP+3m4NrHZWkWk6sjPlnQu4oIsmvDfvnYJGKqnebqfzLpJxh7pCI+M5Df0IAAlnwzGDOW0QrCrbSw==",
               "requires": {
-                "@leafygreen-ui/emotion": "^4.1.1",
-                "lodash": "^4.17.21"
+                "@floating-ui/react": "^0.26.28",
+                "@leafygreen-ui/emotion": "^5.1.0",
+                "@leafygreen-ui/hooks": "^9.2.2",
+                "@leafygreen-ui/lib": "^15.6.2",
+                "@leafygreen-ui/portal": "^7.1.0",
+                "@leafygreen-ui/tokens": "^4.0.0",
+                "@types/react-transition-group": "^4.4.5",
+                "lodash": "^4.17.21",
+                "react-transition-group": "^4.4.5"
+              },
+              "dependencies": {
+                "@leafygreen-ui/lib": {
+                  "version": "15.6.2",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+                  "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+                  "requires": {
+                    "lodash": "^4.17.21"
+                  }
+                },
+                "@leafygreen-ui/portal": {
+                  "version": "7.1.0",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/portal/-/portal-7.1.0.tgz",
+                  "integrity": "sha512-wCldB70m/NtlIeVRxi5S/U74W6jxQScqptI2I4+7RweBquBfxIg1SipHXqMC+Zo3aL+s/fCMuFKNlLuwGWu8MA==",
+                  "requires": {
+                    "@leafygreen-ui/hooks": "^9.2.0",
+                    "@leafygreen-ui/lib": "^15.6.1"
+                  }
+                },
+                "@leafygreen-ui/tokens": {
+                  "version": "4.0.0",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+                  "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+                  "requires": {
+                    "@leafygreen-ui/emotion": "^5.1.0",
+                    "@leafygreen-ui/lib": "^15.6.2",
+                    "@leafygreen-ui/palette": "^5.0.2"
+                  }
+                }
               }
             },
-            "@leafygreen-ui/lib": {
-              "version": "14.2.0",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-14.2.0.tgz",
-              "integrity": "sha512-JWHFwtWXY52YL1uNFpHWvRUWVl5tkXQzyq2uEMFHyZQKYUG0of9o5V+Zc6vAXdMvvAhE3DeYvDjTpaQbUk1PrQ==",
+            "@leafygreen-ui/tooltip": {
+              "version": "14.2.2",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/tooltip/-/tooltip-14.2.2.tgz",
+              "integrity": "sha512-WqWjHzhK+BZrUaJjgph2LQjvQtEYjjR/uyxRubJVrW9GhzBd9xZ9ztnBnTMGT6rz5aRWptV0iZ0YwS+73KbBEw==",
               "requires": {
-                "lodash": "^4.17.21"
+                "@leafygreen-ui/emotion": "^5.1.0",
+                "@leafygreen-ui/hooks": "^9.2.2",
+                "@leafygreen-ui/icon": "^14.6.1",
+                "@leafygreen-ui/lib": "^15.6.2",
+                "@leafygreen-ui/palette": "^5.0.2",
+                "@leafygreen-ui/popover": "^14.3.0",
+                "@leafygreen-ui/tokens": "^4.0.0",
+                "@leafygreen-ui/typography": "^22.2.0",
+                "lodash": "^4.17.21",
+                "polished": "^4.2.2"
+              },
+              "dependencies": {
+                "@leafygreen-ui/lib": {
+                  "version": "15.6.2",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+                  "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+                  "requires": {
+                    "lodash": "^4.17.21"
+                  }
+                },
+                "@leafygreen-ui/tokens": {
+                  "version": "4.0.0",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+                  "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+                  "requires": {
+                    "@leafygreen-ui/emotion": "^5.1.0",
+                    "@leafygreen-ui/lib": "^15.6.2",
+                    "@leafygreen-ui/palette": "^5.0.2"
+                  }
+                }
               }
             },
-            "@leafygreen-ui/tokens": {
-              "version": "2.12.2",
-              "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-2.12.2.tgz",
-              "integrity": "sha512-eVHQOk7lExNjGPVpLv2sGMUmAH0ZIpmu86NHe4n3RzHNQ2ziJUnw1CN94N6Y09qv00LvrZ2I05kbxLfX+kktvw==",
+            "@leafygreen-ui/typography": {
+              "version": "22.2.1",
+              "resolved": "https://registry.npmjs.org/@leafygreen-ui/typography/-/typography-22.2.1.tgz",
+              "integrity": "sha512-nUnoUBVfNN+QG8haLP1KDq4+ml/ef67gtzy/D1OMf7bGLj8oWP7e8uc+ianxUJ+6wnXCuw6sCqQgKwJOv+Er8w==",
               "requires": {
-                "@leafygreen-ui/emotion": "^4.1.1",
-                "@leafygreen-ui/lib": "^14.2.0",
-                "@leafygreen-ui/palette": "^4.1.4",
-                "polished": "^4.2.2"
+                "@leafygreen-ui/emotion": "^5.1.0",
+                "@leafygreen-ui/icon": "^14.7.0",
+                "@leafygreen-ui/lib": "^15.6.2",
+                "@leafygreen-ui/palette": "^5.0.2",
+                "@leafygreen-ui/polymorphic": "^3.1.0",
+                "@leafygreen-ui/tokens": "^4.0.0"
+              },
+              "dependencies": {
+                "@leafygreen-ui/lib": {
+                  "version": "15.6.2",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/lib/-/lib-15.6.2.tgz",
+                  "integrity": "sha512-HsjXXovBqyrXL3Y7V09g2bEidGn58AK/mfoIPMlen/hEcWlbXbefoCzXF7AQqWLhd0F/lS2XgX7+BqVUHXx2/Q==",
+                  "requires": {
+                    "lodash": "^4.17.21"
+                  }
+                },
+                "@leafygreen-ui/tokens": {
+                  "version": "4.0.0",
+                  "resolved": "https://registry.npmjs.org/@leafygreen-ui/tokens/-/tokens-4.0.0.tgz",
+                  "integrity": "sha512-8S3/zM+y0ht5mh6sFoTaJYhjMbmhFMvqxpeg38LkIL7rUCVsBNVEJshGx8LouUJbM8ptLCUDTB//mBI236MOog==",
+                  "requires": {
+                    "@leafygreen-ui/emotion": "^5.1.0",
+                    "@leafygreen-ui/lib": "^15.6.2",
+                    "@leafygreen-ui/palette": "^5.0.2"
+                  }
+                }
               }
             }
           }
@@ -67253,46 +68022,6 @@
         }
       }
     },
-    "@mongodb-js/diagramming": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@mongodb-js/diagramming/-/diagramming-2.2.1.tgz",
-      "integrity": "sha512-xUaQSyMnyNeXILT+tPl0JoC+hlh38cYltYuL6uniyg36g20cPuCXZ9geQp0sbVt5/p1BtfgdqsKMfox+oaOlIQ==",
-      "requires": {
-        "@emotion/react": "^11.14.0",
-        "@emotion/styled": "^11.14.0",
-        "@leafygreen-ui/icon": "^14.6.0",
-        "@leafygreen-ui/inline-definition": "^9.0.5",
-        "@leafygreen-ui/leafygreen-provider": "^4.0.2",
-        "@leafygreen-ui/palette": "^4.1.3",
-        "@leafygreen-ui/tokens": "^3.2.4",
-        "@leafygreen-ui/tooltip": "^14.2.1",
-        "@leafygreen-ui/typography": "^20.0.2",
-        "@xyflow/react": "12.5.1",
-        "d3-path": "^3.1.0",
-        "elkjs": "^0.11.0",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.2"
-      },
-      "dependencies": {
-        "@leafygreen-ui/tooltip": {
-          "version": "14.2.2",
-          "resolved": "https://registry.npmjs.org/@leafygreen-ui/tooltip/-/tooltip-14.2.2.tgz",
-          "integrity": "sha512-WqWjHzhK+BZrUaJjgph2LQjvQtEYjjR/uyxRubJVrW9GhzBd9xZ9ztnBnTMGT6rz5aRWptV0iZ0YwS+73KbBEw==",
-          "requires": {
-            "@leafygreen-ui/emotion": "^4.0.9",
-            "@leafygreen-ui/hooks": "^8.3.4",
-            "@leafygreen-ui/icon": "^14.6.0",
-            "@leafygreen-ui/lib": "^15.3.0",
-            "@leafygreen-ui/palette": "^4.1.3",
-            "@leafygreen-ui/popover": "^13.0.11",
-            "@leafygreen-ui/tokens": "^3.2.4",
-            "@leafygreen-ui/typography": "^20.0.2",
-            "lodash": "^4.17.21",
-            "polished": "^4.2.2"
-          }
-        }
-      }
-    },
     "@mongodb-js/dl-center": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@mongodb-js/dl-center/-/dl-center-1.3.0.tgz",
diff --git a/packages/compass-components/package.json b/packages/compass-components/package.json
index 9a72c56b2af..512b2ac3999 100644
--- a/packages/compass-components/package.json
+++ b/packages/compass-components/package.json
@@ -69,7 +69,7 @@
     "@leafygreen-ui/radio-group": "^12.0.2",
     "@leafygreen-ui/search-input": "^5.0.2",
     "@leafygreen-ui/segmented-control": "^10.0.2",
-    "@leafygreen-ui/select": "^14.0.2",
+    "@leafygreen-ui/select": "^16.3.0",
     "@leafygreen-ui/skeleton-loader": "^2.0.11",
     "@leafygreen-ui/split-button": "^4.1.5",
     "@leafygreen-ui/table": "^13.0.1",
@@ -98,7 +98,7 @@
     "@lg-chat/suggestions": "^0.2.3",
     "@lg-chat/title-bar": "^4.0.7",
     "@mongodb-js/compass-context-menu": "^0.3.0",
-    "@mongodb-js/diagramming": "^2.2.1",
+    "@mongodb-js/diagramming": "^2.2.2",
     "@react-aria/interactions": "^3.9.1",
     "@react-aria/utils": "^3.13.1",
     "@react-aria/visually-hidden": "^3.3.1",
diff --git a/packages/compass-crud/src/components/crud-toolbar.spec.tsx b/packages/compass-crud/src/components/crud-toolbar.spec.tsx
index 3e490889ea2..0faa9bb207e 100644
--- a/packages/compass-crud/src/components/crud-toolbar.spec.tsx
+++ b/packages/compass-crud/src/components/crud-toolbar.spec.tsx
@@ -482,8 +482,8 @@ describe('CrudToolbar Component', function () {
   describe('documents per page select', function () {
     it('should render a select to update documents fetched per page', function () {
       renderCrudToolbar();
-      expect(screen.getByLabelText('Update number of documents per page')).to.be
-        .visible;
+      expect(screen.getByLabelText(/Update number of documents per page/i)).to
+        .be.visible;
     });
 
     it('should call updateDocumentsPerPage when select value changes', function () {
@@ -492,7 +492,7 @@ describe('CrudToolbar Component', function () {
         updateMaxDocumentsPerPage: stub,
       });
       userEvent.click(
-        screen.getByLabelText('Update number of documents per page')
+        screen.getByLabelText(/Update number of documents per page/i)
       );
       userEvent.click(screen.getByText('75'));
       expect(stub).to.be.calledWithExactly(75);
diff --git a/packages/compass-crud/src/components/table-view/types-dropdown.tsx b/packages/compass-crud/src/components/table-view/types-dropdown.tsx
index 307613a193d..0ac28f9157b 100644
--- a/packages/compass-crud/src/components/table-view/types-dropdown.tsx
+++ b/packages/compass-crud/src/components/table-view/types-dropdown.tsx
@@ -32,9 +32,6 @@ const TypesDropdown: React.FunctionComponent<TypesDropdownProps> = ({
       onChange={handleTypeChange}
       allowDeselect={false}
       value={element.currentType}
-      readOnly={false}
-      // NOTE: Leafygreen doesn't support aria-label and only understand "aria-labelledby" and "label" instead
-      aria-labelledby=""
       aria-label="Field type"
       className={cx(selectStyles, 'table-view-cell-editor-types')}
       data-testid="table-view-types-dropdown-select"
diff --git a/packages/compass-data-modeling/src/components/diagram-editor.tsx b/packages/compass-data-modeling/src/components/diagram-editor.tsx
index dcc038bba85..1899b16febd 100644
--- a/packages/compass-data-modeling/src/components/diagram-editor.tsx
+++ b/packages/compass-data-modeling/src/components/diagram-editor.tsx
@@ -23,6 +23,7 @@ import {
   deleteRelationship,
   removeField,
   renameField,
+  changeFieldType,
   toggleCollectionExpanded,
 } from '../store/diagram';
 import type {
@@ -60,6 +61,7 @@ import {
   relationshipToDiagramEdge,
 } from '../utils/nodes-and-edges';
 import toNS from 'mongodb-ns';
+import { FIELD_TYPES } from '../utils/field-types';
 import { getNamespaceRelationships } from '../utils/utils';
 import { usePreference } from 'compass-preferences-model/provider';
 
@@ -172,6 +174,11 @@ const DiagramContent: React.FunctionComponent<{
     fieldPath: FieldPath,
     newName: string
   ) => void;
+  onChangeFieldType: (data: {
+    ns: string;
+    fieldPath: FieldPath;
+    newTypes: string[];
+  }) => void;
   onDiagramBackgroundClicked: () => void;
   onDeleteCollection: (ns: string) => void;
   onDeleteRelationship: (rId: string) => void;
@@ -201,6 +208,7 @@ const DiagramContent: React.FunctionComponent<{
   onRelationshipSelect,
   onFieldSelect,
   onRenameField,
+  onChangeFieldType,
   onDiagramBackgroundClicked,
   onCreateNewRelationship,
   onRelationshipDrawn,
@@ -401,6 +409,17 @@ const DiagramContent: React.FunctionComponent<{
     [onAddFieldToObjectField]
   );
 
+  const onFieldTypeChange = useCallback(
+    (ns: string, fieldPath: FieldPath, newTypes: string[]) => {
+      onChangeFieldType({
+        ns,
+        fieldPath,
+        newTypes,
+      });
+    },
+    [onChangeFieldType]
+  );
+
   const deleteItem = useCallback(() => {
     switch (selectedItems?.type) {
       case 'collection':
@@ -449,8 +468,10 @@ const DiagramContent: React.FunctionComponent<{
         onEdgeClick,
         onFieldClick,
         onFieldNameChange: onRenameField,
+        onFieldTypeChange,
         onNodeDragStop,
         onConnect,
+        fieldTypes: FIELD_TYPES,
         onNodeExpandToggle: isCollapseFlagEnabled
           ? handleNodeExpandedToggle
           : undefined,
@@ -467,6 +488,7 @@ const DiagramContent: React.FunctionComponent<{
       onEdgeClick,
       onFieldClick,
       onRenameField,
+      onFieldTypeChange,
       onNodeDragStop,
       onConnect,
       handleNodeExpandedToggle,
@@ -533,6 +555,7 @@ const ConnectedDiagramContent = connect(
     onRelationshipSelect: selectRelationship,
     onFieldSelect: selectField,
     onRenameField: renameField,
+    onChangeFieldType: changeFieldType,
     onDiagramBackgroundClicked: selectBackground,
     onCreateNewRelationship: createNewRelationship,
     onDeleteCollection: deleteCollection,
diff --git a/packages/compass-data-modeling/src/components/drawer/field-drawer-content.tsx b/packages/compass-data-modeling/src/components/drawer/field-drawer-content.tsx
index 6f4b8533468..c3cdb357711 100644
--- a/packages/compass-data-modeling/src/components/drawer/field-drawer-content.tsx
+++ b/packages/compass-data-modeling/src/components/drawer/field-drawer-content.tsx
@@ -9,7 +9,6 @@ import {
   ComboboxOption,
   TextInput,
 } from '@mongodb-js/compass-components';
-import { BSONType } from 'mongodb';
 import {
   changeFieldType,
   createNewRelationship,
@@ -33,6 +32,7 @@ import {
   isIdField,
   isRelationshipOfAField,
 } from '../../utils/utils';
+import { FIELD_TYPES } from '../../utils/field-types';
 
 type FieldDrawerContentProps = {
   namespace: string;
@@ -57,18 +57,14 @@ type FieldDrawerContentProps = {
   onChangeFieldType: ({
     ns,
     fieldPath,
-    oldTypes,
     newTypes,
   }: {
     ns: string;
     fieldPath: FieldPath;
-    oldTypes: string[];
     newTypes: string[];
   }) => void;
 };
 
-const BSON_TYPES = Object.keys(BSONType);
-
 export function getIsFieldNameValid(
   currentFieldPath: FieldPath,
   existingFields: FieldPath[],
@@ -158,7 +154,6 @@ const FieldDrawerContent: React.FunctionComponent<FieldDrawerContentProps> = ({
     onChangeFieldType({
       ns: namespace,
       fieldPath,
-      oldTypes: fieldTypes,
       newTypes,
     });
   };
@@ -195,7 +190,7 @@ const FieldDrawerContent: React.FunctionComponent<FieldDrawerContentProps> = ({
             state={fieldTypeEditErrorMessage ? 'error' : undefined}
             errorMessage={fieldTypeEditErrorMessage}
           >
-            {BSON_TYPES.map((type) => (
+            {FIELD_TYPES.map((type) => (
               <ComboboxOption key={type} value={type} />
             ))}
           </Combobox>
diff --git a/packages/compass-data-modeling/src/store/diagram.ts b/packages/compass-data-modeling/src/store/diagram.ts
index 822c251a9a5..10a5e331c03 100644
--- a/packages/compass-data-modeling/src/store/diagram.ts
+++ b/packages/compass-data-modeling/src/store/diagram.ts
@@ -830,12 +830,10 @@ export function getTypeNameForTelemetry(
 export function changeFieldType({
   ns,
   fieldPath,
-  oldTypes,
   newTypes,
 }: {
   ns: string;
   fieldPath: FieldPath;
-  oldTypes: string[];
   newTypes: string[];
 }): DataModelingThunkAction<void, ApplyEditAction | RevertFailedEditAction> {
   return (dispatch, getState, { track }) => {
@@ -847,6 +845,7 @@ export function changeFieldType({
       jsonSchema: collectionSchema,
       fieldPath: fieldPath,
     });
+    const oldTypes = field?.fieldTypes;
     if (!field) throw new Error('Field not found in schema');
     const to = getSchemaWithNewTypes(field.jsonSchema, newTypes);
 
diff --git a/packages/compass-data-modeling/src/utils/field-types.ts b/packages/compass-data-modeling/src/utils/field-types.ts
new file mode 100644
index 00000000000..da23ba5deca
--- /dev/null
+++ b/packages/compass-data-modeling/src/utils/field-types.ts
@@ -0,0 +1,3 @@
+import { BSONType } from 'mongodb';
+
+export const FIELD_TYPES = Object.keys(BSONType);
diff --git a/packages/compass-import-export/src/components/import-options.tsx b/packages/compass-import-export/src/components/import-options.tsx
index 40a167da3c8..ce03287a26f 100644
--- a/packages/compass-import-export/src/components/import-options.tsx
+++ b/packages/compass-import-export/src/components/import-options.tsx
@@ -116,7 +116,6 @@ function ImportOptions({
             <Select
               className={delimiterSelectStyles}
               id="import-delimiter-select"
-              aria-labelledby="import-delimiter-label"
               aria-label="Delimiter"
               data-testid="import-delimiter-select"
               onChange={(delimiter: string) =>
diff --git a/packages/compass-import-export/src/components/import-preview.tsx b/packages/compass-import-export/src/components/import-preview.tsx
index b18c3ca8496..90f5f578223 100644
--- a/packages/compass-import-export/src/components/import-preview.tsx
+++ b/packages/compass-import-export/src/components/import-preview.tsx
@@ -177,8 +177,6 @@ function SelectFieldType({
 }) {
   return (
     <Select
-      // NOTE: Leafygreen gives an error with only aria-label for select.
-      aria-labelledby={`toggle-import-field-label-${fieldPath}`}
       // leafygreen bases ids inside Select off this id which is why we have it in addition to data-testid
       id={`import-preview-field-type-select-menu-${fieldPath}`}
       data-testid={`import-preview-field-type-select-menu-${fieldPath}`}
diff --git a/packages/compass-settings/src/components/settings/settings-list.tsx b/packages/compass-settings/src/components/settings/settings-list.tsx
index 6a8048caf41..9d5efe8646d 100644
--- a/packages/compass-settings/src/components/settings/settings-list.tsx
+++ b/packages/compass-settings/src/components/settings/settings-list.tsx
@@ -188,7 +188,7 @@ function DefaultSortOrderSetting<PreferenceName extends 'defaultSortOrder'>({
       <Select
         className={inputStyles}
         allowDeselect={false}
-        aria-labelledby={`${name}-label`}
+        aria-label={`${name}-label`}
         id={name}
         name={name}
         data-testid={name}
diff --git a/packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options-list-editor.tsx b/packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options-list-editor.tsx
index 779cffc70d6..7e554e96a6c 100644
--- a/packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options-list-editor.tsx
+++ b/packages/connection-form/src/components/advanced-options-tabs/advanced-tab/url-options-list-editor.tsx
@@ -133,7 +133,7 @@ function UrlOptionsListEditor({
             className={optionSelectStyles}
             placeholder="Select key"
             name="select-url-options-key-name"
-            aria-labelledby={
+            aria-label={
               uriOption.name ? `${uriOption.name} select` : 'new option select'
             }
             onChange={(name, event): void => {