Bugfix for release v61.4

(cherry picked from commit e83fa7a)

client/src/__tests__/utils/Utils.test.js

@@ -46,6 +46,18 @@ test("Remove duplicates", () => {
     ]);
 });
 
+test("Remove duplicates with undefined", () => {
+    const arr = [
+        {id: 1, name: "one"},
+        {id: 1, name: "one"},
+        undefined
+    ];
+    const unique = removeDuplicates(arr, "id");
+    expect(unique).toEqual([
+        {id: 1, name: "one"},
+    ]);
+});
+
 test("splitListSemantically", () => {
     const arr = ["1", "2", "3", "4"]
     expect(splitListSemantically(arr, "and")).toEqual("1, 2, 3 and 4");

client/src/utils/Utils.js

@@ -105,7 +105,10 @@ export function escapeDeep(obj) {
 }
 
 export const removeDuplicates = (arr, attr) => arr
-    .filter((obj, pos, arr) => arr.map(mapObj => mapObj[attr]).indexOf(obj[attr]) === pos);
+    .filter((obj, pos, arr) => arr
+        .filter(filObj => !isEmpty(filObj))
+        .map(mapObj => mapObj[attr])
+        .indexOf((obj || {})[attr]) === pos);
 
 export const ErrorOrigins = {
     invitationNotFound: "invitationNotFound",