From fe18089cd442bdfe043e4bcb7bc5d3c2011ca366 Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Tue, 20 Jul 2021 15:22:09 +0300
Subject: [PATCH] fix selectRegistration filter

---
 .../Effects/reactions/gibddReactions.ts       | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
index e444a65..442831c 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
+++ b/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
@@ -358,14 +358,18 @@ const gibddReactions: IReactionEffect[] = [
     }) => {
       calculationStore.setFilter('selectRegistration', options =>
         options.filter(x => {
-          if (!(x.evo_whom_register === objectRegistration)) {
+          if (!objectRegionRegistration && !regionRegistration) {
+            return false;
+          }
+
+          if (!(x?.evo_whom_register === objectRegistration)) {
             return false;
           }
 
           if (
             !(
-              x.evo_gibdd_region ===
-              (objectRegionRegistration.evo_regionid === regionRegistration)
+              x?.evo_gibdd_region ===
+              (objectRegionRegistration?.evo_regionid === regionRegistration)
             )
           ) {
             return false;
@@ -373,23 +377,26 @@ const gibddReactions: IReactionEffect[] = [
 
           if (
             (typePTS &&
-              (!x.evo_pts_type ||
-                x.evo_pts_type.filter(t => t > 0).length === 0)) ||
-            x.evo_pts_type?.filter(t => t > 0).includes(typePTS) === false
+              (!x?.evo_pts_type ||
+                x?.evo_pts_type.filter(t => t > 0).length === 0)) ||
+            x?.evo_pts_type?.filter(t => t > 0).includes(typePTS) === false
           ) {
             return false;
           }
 
-          if (!x.evo_accountid) {
+          if (!x?.evo_accountid) {
             return true;
           }
 
-          return objectRegionRegistration.accounts
-            .map(r => r.accountid)
+          return objectRegionRegistration?.accounts
+            ?.map(r => r.accountid)
             .includes(x.evo_accountid);
         }),
       );
     },
+    options: {
+      fireImmediately: true,
+    },
   }),
 
   (calculationStore, calculationProcess) => ({