From a1c1be000f58a7335264caace662e8d9178c4929 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Wed, 26 May 2021 14:02:25 +0300
Subject: [PATCH] fix models & brands filter & query

---
 .../reactions/loadKpReaction/optionsQuery.js  |  3 ++
 .../Effects/reactions/otherReactions.ts       | 28 +++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/optionsQuery.js b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/optionsQuery.js
index 48203a8..a478e69 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/optionsQuery.js
+++ b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/optionsQuery.js
@@ -18,12 +18,15 @@ export default gql`
     $evo_regionid: Uuid!
   ) {
     selectModel: evo_models(statecode: $statecode, evo_brandid: $evo_brandid) {
+      evo_id
       evo_name
       evo_modelid
       evo_leasingobject_risk
       evo_importer_reward_perc
       evo_importer_reward_rub
       evo_impairment_groupid
+      evo_vehicle_type
+      evo_gps
     }
     selectConfiguration: evo_equipments(
       statecode: $statecode
diff --git a/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts
index 3bbf069..dd10afd 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts
+++ b/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts
@@ -1681,18 +1681,18 @@ const reactionEffects: IReactionEffect[] = [
         'selectBrand',
         leaseObjectType ? ElementStatus.Default : ElementStatus.Disabled,
       );
-      calculationStore.setValue('brand', null);
 
-      calculationStore.setFilter('selectBrand', options =>
-        options.filter(
-          option =>
-            option.evo_vehicle_type &&
-            intersection(
-              option.evo_vehicle_type?.filter(x => x > 0),
-              leaseObjectType.evo_vehicle_type,
-            ).length > 0,
-        ),
-      );
+      if (calculationStore.getOptions('selectBrand'))
+        calculationStore.setFilter('selectBrand', options =>
+          options.filter(
+            option =>
+              option.evo_vehicle_type &&
+              intersection(
+                option.evo_vehicle_type?.filter(x => x > 0),
+                leaseObjectType.evo_vehicle_type,
+              ).length > 0,
+          ),
+        );
     },
     options: {
       fireImmediately: true,
@@ -1709,11 +1709,11 @@ const reactionEffects: IReactionEffect[] = [
       );
       calculationStore.setFilter('selectModel', options =>
         options.filter(
-          option =>
-            option.evo_vehicle_type &&
+          model =>
+            model.evo_vehicle_type &&
             leaseObjectType &&
             leaseObjectType.evo_vehicle_type &&
-            leaseObjectType.evo_vehicle_type.includes(option.evo_vehicle_type),
+            leaseObjectType.evo_vehicle_type.includes(model.evo_vehicle_type),
         ),
       );
     },