INT-1617: Fixing _id edit, object conversion

Author: durran

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

@@ -273,11 +273,7 @@ class Document extends React.Component {
     for (let element of this.state.doc.elements) {
       components.push(<EditableElement key={element.uuid} element={element} />)
     }
-    // Add the hotspot to the end. In the case of insert, we need to guard against
-    // No elements being present.
-    var lastComponent = components[components.length - 1];
-    var lastElement = lastComponent ? lastComponent.props.element : this.state.doc;
-    components.push(<Hotspot key='hotspot' element={lastElement} />);
+    components.push(<Hotspot key='hotspot' element={this.state.doc} />);
     return components;
   }
 

src/internal-packages/crud/lib/component/editable-element.jsx

@@ -186,7 +186,7 @@ class EditableElement extends React.Component {
   renderAction() {
     if (this.element.isEdited() || this.element.isRemoved()) {
       return (<RevertAction element={this.element} />);
-    } else if (this.element.key === '_id') {
+    } else if (this.element.key === '_id' && !this.element.isAdded()) {
       return (<NoAction element={this.element} />);
     }
     return (<RemoveAction element={this.element} />);

src/internal-packages/crud/lib/component/editable-key.jsx

@@ -184,8 +184,7 @@ class EditableKey extends React.Component {
    * @returns {Boolean} If the key can be edited.
    */
   isEditable() {
-    return this.element.isKeyEditable() &&
-      this.element.parent.currentType !== 'Array';
+    return this.element.isKeyEditable() && this.element.parent.currentType !== 'Array';
   }
 
   /**

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

@@ -72,11 +72,7 @@ class InsertDocument extends React.Component {
     for (let element of this.doc.elements) {
       components.push(<EditableElement key={element.uuid} element={element} />)
     }
-    // Add the hotspot to the end. In the case of insert, we need to guard against
-    // No elements being present.
-    var lastComponent = components[components.length - 1];
-    var lastElement = lastComponent ? lastComponent.props.element : this.state.doc;
-    components.push(<Hotspot key='hotspot' element={lastElement} />);
+    components.push(<Hotspot key='hotspot' element={this.doc} />);
     return components;
   }
 }

src/internal-packages/crud/lib/component/types.jsx

@@ -25,7 +25,17 @@ class Types extends React.Component {
    * @param {Event} evt - The event.
    */
   handleTypeChange(evt) {
-    this.element.edit(TypeChecker.cast(this.castableValue(), evt.target.innerText));
+    var newType = evt.target.innerText;
+    if (newType === 'Object') {
+      this.element.edit('{');
+      this.element.next();
+    } else {
+      this.element.edit(TypeChecker.cast(this.castableValue(), newType));
+    }
+  }
+
+  isTypeChangeable() {
+    return this.element.isValueEditable() || this.element.isAdded();
   }
 
   /**
@@ -34,7 +44,7 @@ class Types extends React.Component {
    * @returns {React.Component} The element component.
    */
   render() {
-    return this.element.isValueEditable() ? this.renderDropdown() : this.renderLabel();
+    return this.isTypeChangeable() ? this.renderDropdown() : this.renderLabel();
   }
 
   /**