Skip to content

Commit 8d8206d

Browse files
committed
ISSUE #4641 remove entry if there's no objects
1 parent 88cf4f5 commit 8d8206d

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

backend/src/v4/models/group.js

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,20 @@ function clean(groupData) {
102102
cleanArray(groupData, "transformation");
103103

104104
if(groupData.objects) {
105-
groupData.objects = groupData.objects.filter(({shared_ids, ...extIds}, i) => {
106-
const shouldKeep = shared_ids || getCommonElements(Object.keys(extIds), Object.values(idTypes)).length;
107-
108-
if(shouldKeep) {
109-
Object.values(idTypes).forEach((idType) => {
110-
if (groupData.objects[i][idType]) {
111-
cleanArray(groupData.objects[i], idType);
112-
}
113-
});
114-
115-
cleanArray(groupData.objects[i], "shared_ids");
116-
if (groupData.objects[i].shared_ids) {
117-
groupData.objects[i].shared_ids = groupData.objects[i].shared_ids.map(utils.uuidToString);
105+
groupData.objects = groupData.objects.filter((entry) => {
106+
107+
Object.values([...Object.values(idTypes), "shared_ids"]).forEach((idType) => {
108+
if (entry[idType]) {
109+
cleanArray(entry, idType);
118110
}
111+
});
112+
113+
if (entry.shared_ids) {
114+
entry.shared_ids = entry.shared_ids.map(utils.uuidToString);
115+
return true;
119116
}
120117

121-
return shouldKeep;
118+
return getCommonElements(Object.keys(entry), Object.values(idTypes)).length;
122119
});
123120
}
124121

0 commit comments

Comments
 (0)