From 757141661af4d5452ac76ac477e9bb21205af6e8 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Fri, 4 Jun 2021 14:56:28 +0300
Subject: [PATCH] fix selectRegistration filter

---
 .../Effects/reactions/gibddReactions.ts       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
index 92e1fb9..0d4c5f2 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
+++ b/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
@@ -355,7 +355,7 @@ const gibddReactions: IReactionEffect[] = [
       typePTS,
     }) => {
       calculationStore.setFilter('selectRegistration', options =>
-        options.filter((x, i) => {
+        options.filter(x => {
           if (!(x.evo_whom_register === objectRegistration)) {
             return false;
           }
@@ -379,13 +379,21 @@ const gibddReactions: IReactionEffect[] = [
           }
 
           if (
-            (x.evo_accountid &&
-              (!objectRegionRegistration.accounts ||
-                objectRegionRegistration.accounts.length === 0)) ||
-            objectRegionRegistration.accounts
-              .map(r => r.accountid)
-              .includes(x.evo_accountid) === false
+            objectRegionRegistration.accounts &&
+            objectRegionRegistration.accounts.length > 0
           ) {
+            // 1
+            if (!x.evo_accountid) {
+              return false;
+            }
+            // 4
+            return objectRegionRegistration.accounts
+              .map(r => r.accountid)
+              .includes(x.evo_accountid);
+          }
+
+          //3
+          if (x.evo_accountid) {
             return false;
           }