COMPASS-1738: Use ObjectId in types list

Author: durran

package.json

@@ -161,15 +161,15 @@
     "hadron-app-registry": "^6.0.0",
     "hadron-auto-update-manager": "^0.0.12",
     "hadron-compile-cache": "^1.0.1",
-    "hadron-document": "^2.3.3",
+    "hadron-document": "^3.0.0",
     "hadron-ipc": "^0.0.7",
     "hadron-module-cache": "^0.0.3",
     "hadron-package-manager": "^4.0.0",
     "hadron-react-bson": "^1.4.0",
     "hadron-react-buttons": "^1.5.0",
     "hadron-react-components": "^1.8.0",
     "hadron-style-manager": "^0.1.0",
-    "hadron-type-checker": "^2.1.0",
+    "hadron-type-checker": "^3.0.0",
     "highlight.js": "^8.9.1",
     "jquery": "^2.1.4",
     "keytar": "mongodb-js/node-keytar#fdef09013f576b7a257ad768939e827882bccef5",

src/internal-packages/crud/lib/component/document-list.jsx

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const React = require('react');
 const uuid = require('uuid');
-const ObjectID = require('bson').ObjectID;
+const ObjectId = require('bson').ObjectId;
 const Action = require('../actions');
 const { StatusRow } = require('hadron-react-components');
 const ResetDocumentListStore = require('../store/reset-document-list-store');
@@ -152,7 +152,7 @@ class DocumentList extends React.Component {
   handleRemove(id) {
     const index = _.findIndex(this.state.docs, (component) => {
       const _id = component.props.children.props.doc._id;
-      if (id instanceof ObjectID) {
+      if (id instanceof ObjectId) {
         return id.equals(_id);
       }
       return _id === id;
@@ -181,7 +181,7 @@ class DocumentList extends React.Component {
    * Handle opening of the insert dialog.
    */
   handleOpenInsert() {
-    Actions.openInsertDocumentDialog({ _id: new ObjectID(), '': '' }, false);
+    Actions.openInsertDocumentDialog({ _id: new ObjectId(), '': '' }, false);
   }
 
   /**

src/internal-packages/crud/lib/component/editor/index.js

@@ -5,7 +5,7 @@ const DoubleEditor = require('./double');
 const DateEditor = require('./date');
 const NullEditor = require('./null');
 const UndefinedEditor = require('./undefined');
-const ObjectIDEditor = require('./objectid');
+const ObjectIdEditor = require('./objectid');
 
 const init = (element) => {
   return {
@@ -16,7 +16,7 @@ const init = (element) => {
     'Int32': new Int32Editor(element),
     'Null': new NullEditor(element),
     'Undefined': new UndefinedEditor(element),
-    'ObjectID': new ObjectIDEditor(element)
+    'ObjectId': new ObjectIdEditor(element)
   };
 };
 
@@ -28,4 +28,4 @@ module.exports.DoubleEditor = DoubleEditor;
 module.exports.Int32Editor = Int32Editor;
 module.exports.NullEditor = NullEditor;
 module.exports.UndefinedEditor = UndefinedEditor;
-module.exports.ObjectIDEditor = ObjectIDEditor;
+module.exports.ObjectIdEditor = ObjectIdEditor;

src/internal-packages/crud/lib/component/editor/objectid.js

@@ -5,7 +5,7 @@ const chars = require('../utils');
 /**
  * CRUD editor for object id values.
  */
-class ObjectIDEditor {
+class ObjectIdEditor {
 
   /**
    * Create the editor with the element.
@@ -22,7 +22,7 @@ class ObjectIDEditor {
    */
   complete() {
     if (this.element.isCurrentTypeValid()) {
-      this.element.edit(TypeChecker.cast(this.element.currentValue, 'ObjectID'));
+      this.element.edit(TypeChecker.cast(this.element.currentValue, 'ObjectId'));
     }
   }
 
@@ -33,7 +33,7 @@ class ObjectIDEditor {
    */
   edit(value) {
     try {
-      TypeChecker.cast(value, 'ObjectID');
+      TypeChecker.cast(value, 'ObjectId');
       this.element.currentValue = value;
       this.element.setValid();
       this.element._bubbleUp(Element.Events.Edited);
@@ -70,4 +70,4 @@ class ObjectIDEditor {
   }
 }
 
-module.exports = ObjectIDEditor;
+module.exports = ObjectIdEditor;