From 5f0fdd15eb46a28aa4c44f26865108ae340bd69c Mon Sep 17 00:00:00 2001 From: azivner Date: Mon, 26 Nov 2018 22:37:59 +0100 Subject: [PATCH] fix adding sync entities during import --- src/services/repository.js | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/services/repository.js b/src/services/repository.js index 453659619..a416050e5 100644 --- a/src/services/repository.js +++ b/src/services/repository.js @@ -94,24 +94,23 @@ async function updateEntity(entity) { const primaryKey = entity[primaryKeyName]; - if (!cls.isEntityEventsDisabled() - && entity.isChanged - && (entityName !== 'options' || entity.isSynced)) { + if (entity.isChanged && (entityName !== 'options' || entity.isSynced)) { await syncTableService.addEntitySync(entityName, primaryKey); - const eventPayload = { - entityName, - entity - }; + if (!cls.isEntityEventsDisabled()) { + const eventPayload = { + entityName, + entity + }; - if (isNewEntity && !entity.isDeleted) { - await eventService.emit(eventService.ENTITY_CREATED, eventPayload); + if (isNewEntity && !entity.isDeleted) { + await eventService.emit(eventService.ENTITY_CREATED, eventPayload); + } + + // it seems to be better to handle deletion and update separately + await eventService.emit(entity.isDeleted ? eventService.ENTITY_DELETED : eventService.ENTITY_CHANGED, eventPayload); } - - // it seems to be better to handle deletion and update separately - await eventService.emit(entity.isDeleted ? eventService.ENTITY_DELETED : eventService.ENTITY_CHANGED, eventPayload); - } }); }