From aeadd98e7b233289dcb59afc182a163d7515d671 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Thu, 24 Feb 2022 13:29:05 +0300
Subject: [PATCH] =?UTF-8?q?setFilter:=20=D1=83=D0=BA=D0=B0=D0=B7=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=B5=D0=BC=201=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D1=83=D1=81=D1=82-?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Sections/sectionsList.ts         |  2 +-
 .../stores/CalculationStore/Data/values.js      | 17 ++++++++++++++---
 .../reactions/recalcWoRevisionReactions.ts      | 11 -----------
 .../CalculationStore/config/initialFilters.ts   | 13 +++++++++++++
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/client/Containers/Calculation/Components/Sections/sectionsList.ts b/src/client/Containers/Calculation/Components/Sections/sectionsList.ts
index 402f4ab..8284e9d 100644
--- a/src/client/Containers/Calculation/Components/Sections/sectionsList.ts
+++ b/src/client/Containers/Calculation/Components/Sections/sectionsList.ts
@@ -328,7 +328,7 @@ const sections: ISection[] = [
           {
             elements: [
               'selectTechnicalCard',
-              // 'selectFuelCard',
+              'selectFuelCard',
               'selectInsNSIB',
               'radioRequirementTelematic',
               'selectTracker',
diff --git a/src/client/stores/CalculationStore/Data/values.js b/src/client/stores/CalculationStore/Data/values.js
index 6d4cd52..166a4c6 100644
--- a/src/client/stores/CalculationStore/Data/values.js
+++ b/src/client/stores/CalculationStore/Data/values.js
@@ -1,6 +1,7 @@
 import { getValueName } from 'client/Containers/Calculation/Elements/tools';
 import initialFilters, {
-  noResetValueElements
+  autoSetValuesElements,
+  noResetValueElements,
 } from 'client/stores/CalculationStore/config/initialFilters';
 import initialStatuses from 'client/stores/CalculationStore/config/initialStatuses';
 import { isNil, mergeWith, pick } from 'lodash';
@@ -112,13 +113,23 @@ const valuesActions = {
   setFilter(elementName, filter) {
     const valueName = getValueName(elementName);
     const value = this.getValue(valueName);
+
+    const filteredOptions = filter && filter(this.getOptions(elementName));
+    // После установки фильтра проверяем, что значение есть в отфильтрованном списке, иначе сбрасываем значение
     if (
-      filter &&
-      !filter(this.getOptions(elementName)).some(x => x.value === value) &&
+      !filteredOptions?.some(x => x.value === value) &&
       !noResetValueElements.includes(elementName)
     ) {
       this.setValue(valueName, null);
     }
+
+    // После установки фильтра если остается одна запись указываем ее в значение
+    if (
+      autoSetValuesElements.includes(elementName) &&
+      filteredOptions?.length === 1
+    ) {
+      this.setValue(valueName, filteredOptions[0].value);
+    }
     this.filters[elementName] = filter;
   },
   // applyFilters(filters) {
diff --git a/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts
index 1b37230..c38fe27 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts
+++ b/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts
@@ -492,17 +492,6 @@ const reactionEffects: IReactionEffect[] = [
             ),
           ),
         );
-
-        if (!calculationProcess.hasProcess(Process.LoadKp)) {
-          const elementOptions = calculationStore.getOptions(
-            elementName,
-            undefined,
-            true,
-          );
-          //TODO: удалить после рефактора CalculationStore
-          if (elementOptions?.length === 1)
-            calculationStore.setValue(valueName, elementOptions[0].value);
-        }
       });
     },
     options: {
diff --git a/src/client/stores/CalculationStore/config/initialFilters.ts b/src/client/stores/CalculationStore/config/initialFilters.ts
index 2f0fdc4..b7e04c8 100644
--- a/src/client/stores/CalculationStore/config/initialFilters.ts
+++ b/src/client/stores/CalculationStore/config/initialFilters.ts
@@ -4,5 +4,18 @@ import { TElementFilter } from 'core/types/Calculation/Store/filters';
 const initialFilters: Partial<Record<ElementsNames, TElementFilter>> = {};
 
 export const noResetValueElements: ElementsNames[] = ['selectTechnicalCard'];
+export const autoSetValuesElements: ElementsNames[] = [
+  'selectProduct',
+  'selectLeaseObjectType',
+  'selectBrand',
+  'selectModel',
+  'selectConfiguration',
+  'selectTracker',
+  'selectTelematic',
+  'selectTechnicalCard',
+  'selectFuelCard',
+  'selectRegistration',
+  'selectTownRegistration',
+];
 
 export default initialFilters;