Merge pull request #196 from teamleadercrm/PRO-3146-fix-error-when-me…

…rging-entities

[PRO-3146] Fix error when trying to merge entities

CHANGELOG.md

@@ -1,6 +1,10 @@
 ## Unreleased
 
-## ♻️ Changed
+### 🐛 Fixed
+
+* Fix error when trying to merge entity types that were not present in the store ([ArnaudWeyts](https://github.com/ArnaudWeyts) in [#196](https://github.com/teamleadercrm/react-hooks-api/pull/196))
+
+### ♻️ Changed
 
 * [INTERNAL] Replace deprecated tslint with eslint ([ArnaudWeyts](https://github.com/ArnaudWeyts) in [#194](https://github.com/teamleadercrm/react-hooks-api/pull/194))
 

src/store/entities/__tests__/selectors.spec.ts

@@ -271,5 +271,29 @@ describe('Entities selectors', () => {
 
       expect(mergeEntitiesIntoPaths(entitiesState, paths, mainEntity)).toEqual(result);
     });
+
+    it('Does not crash when the referenced entity type is not in the entities state', () => {
+      const entitiesState = {};
+
+      const mainEntity = {
+        id: 'e6538393-aa7e-4ec2-870b-f75b3d85f706',
+        assignee: {
+          type: 'team',
+          id: '708c8008-3455-49a9-b66a-5222bcadb0cc'
+        },
+      };
+
+      const paths = ['assignee'];
+
+      const result = {
+        id: 'e6538393-aa7e-4ec2-870b-f75b3d85f706',
+        assignee: {
+          type: 'team',
+          id: '708c8008-3455-49a9-b66a-5222bcadb0cc'
+        },
+      };
+
+      expect(mergeEntitiesIntoPaths(entitiesState, paths, mainEntity)).toEqual(result);
+    })
   });
 });

src/store/entities/selectors.ts

@@ -28,7 +28,7 @@ export const mergeEntitiesIntoPaths = (entities: EntitiesState, paths: string[],
 
       if (Array.isArray(sideloadReference)) {
         sideloadReference.forEach((reference, index) => {
-          sideloadedEntity = entities[TYPE_DOMAIN_MAPPING[reference.type]][reference.id];
+          sideloadedEntity = entities[TYPE_DOMAIN_MAPPING[reference.type]]?.[reference.id];
 
           // @TODO, hard coding the keys here means we only allow the first key to be an array of possible references
           // find a way to support every nesting type
@@ -40,7 +40,7 @@ export const mergeEntitiesIntoPaths = (entities: EntitiesState, paths: string[],
         return;
       }
 
-      sideloadedEntity = entities[TYPE_DOMAIN_MAPPING[sideloadReference.type]][sideloadReference.id];
+      sideloadedEntity = entities[TYPE_DOMAIN_MAPPING[sideloadReference.type]]?.[sideloadReference.id];
 
       set(draftEntity, path.split('.').map(camelCase).join('.'), { ...sideloadReference, ...sideloadedEntity });
     });