Revert D16362778: [rfc][draftjs] catch errors when encoding entity map

Differential Revision:
D16362778

Original commit changeset: 6e2a6041d1a0

fbshipit-source-id: 9c0e3f2c1033c8f6879e03ce4cf8799fab5e0a02

Author: Frank Thompson

src/model/encoding/__tests__/__snapshots__/convertFromDraftStateToRaw-test.js.snap

@@ -1,28 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`must be able to convert from draft state entities not in map 1`] = `
-Object {
-  "blocks": Array [
-    Object {
-      "data": Object {},
-      "depth": 0,
-      "entityRanges": Array [
-        Object {
-          "key": 0,
-          "length": 7,
-          "offset": 0,
-        },
-      ],
-      "inlineStyleRanges": Array [],
-      "key": "a",
-      "text": "badlink",
-      "type": "unstyled",
-    },
-  ],
-  "entityMap": Object {},
-}
-`;
-
 exports[`must be able to convert from draft state with ContentBlock to raw 1`] = `
 Object {
   "blocks": Array [

src/model/encoding/__tests__/convertFromDraftStateToRaw-test.js

@@ -61,8 +61,8 @@ const treeContentState = contentState.set(
   ]),
 );
 
-const getMetadata = (entityKey, length) =>
-  Immutable.Repeat(CharacterMetadata.create({entity: entityKey}), length);
+const getMetadata = entityKey =>
+  Immutable.Repeat(CharacterMetadata.create({entity: entityKey}), 5);
 const getLink = entityKey =>
   new DraftEntityInstance({
     type: 'LINK',
@@ -79,23 +79,23 @@ const contentStateWithNonContiguousEntities = ContentState.createFromBlockArray(
       key: 'a',
       type: 'unstyled',
       text: 'link2 link2 link3',
-      characterList: getMetadata('2', 5)
+      characterList: getMetadata('2')
         .toList()
         .push(CharacterMetadata.EMPTY)
-        .concat(getMetadata('2', 5))
+        .concat(getMetadata('2'))
         .push(CharacterMetadata.EMPTY)
-        .concat(getMetadata('3', 5)),
+        .concat(getMetadata('3')),
     }),
     new ContentBlock({
       key: 'b',
       type: 'unstyled',
       text: 'link4 link2 link5',
-      characterList: getMetadata('4', 5)
+      characterList: getMetadata('4')
         .toList()
         .push(CharacterMetadata.EMPTY)
-        .concat(getMetadata('2', 5))
+        .concat(getMetadata('2'))
         .push(CharacterMetadata.EMPTY)
-        .concat(getMetadata('5', 5)),
+        .concat(getMetadata('5')),
     }),
   ],
 )
@@ -104,15 +104,6 @@ const contentStateWithNonContiguousEntities = ContentState.createFromBlockArray(
   .addEntity(getLink('4'))
   .addEntity(getLink('5'));
 
-const contentStateWithEntitiesNotInMap = ContentState.createFromBlockArray([
-  new ContentBlock({
-    key: 'a',
-    type: 'unstyled',
-    text: 'badlink',
-    characterList: getMetadata('999', 7).toList(),
-  }),
-]);
-
 const assertConvertFromDraftStateToRaw = content => {
   expect(convertFromDraftStateToRaw(content)).toMatchSnapshot();
 };
@@ -128,7 +119,3 @@ test('must be able to convert from draft state with ContentBlockNode to raw', ()
 test('must be able to convert from draft state with noncontiguous entities to raw', () => {
   assertConvertFromDraftStateToRaw(contentStateWithNonContiguousEntities);
 });
-
-test('must be able to convert from draft state entities not in map', () => {
-  assertConvertFromDraftStateToRaw(contentStateWithEntitiesNotInMap);
-});

src/model/encoding/convertFromDraftStateToRaw.js

@@ -19,7 +19,6 @@ import type {RawDraftContentState} from 'RawDraftContentState';
 const ContentBlock = require('ContentBlock');
 const ContentBlockNode = require('ContentBlockNode');
 const DraftStringKey = require('DraftStringKey');
-const FBLogger = require('FBLogger');
 
 const encodeEntityRanges = require('encodeEntityRanges');
 const encodeInlineStyleRanges = require('encodeInlineStyleRanges');
@@ -118,16 +117,12 @@ const encodeRawEntityMap = (
   const rawEntityMap = {};
 
   Object.keys(entityMap).forEach((key, index) => {
-    try {
-      const entity = contentState.getEntity(DraftStringKey.unstringify(key));
-      rawEntityMap[index] = {
-        type: entity.getType(),
-        mutability: entity.getMutability(),
-        data: entity.getData(),
-      };
-    } catch (e) {
-      FBLogger('draft-js-contrib').catching(e);
-    }
+    const entity = contentState.getEntity(DraftStringKey.unstringify(key));
+    rawEntityMap[index] = {
+      type: entity.getType(),
+      mutability: entity.getMutability(),
+      data: entity.getData(),
+    };
   });
 
   return {