Merge branch 'development'

src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts

@@ -1469,35 +1469,6 @@ const reactionEffects: IReactionEffect[] = [
     },
   }),
 
-  (calculationStore, calculationProcess) => ({
-    expression: () => {
-      return calculationStore.getValue('leasingPeriod');
-    },
-    effect: () => {
-      if (calculationProcess.hasProcess(Process.LoadKp)) {
-        return;
-      }
-
-      const fuelCard = calculationStore.getOption('selectFuelCard');
-      if (fuelCard) {
-        const selectFuelCard_filter =
-          calculationStore.getFilter('selectFuelCard');
-        const selectFueldCard_options =
-          calculationStore.getOptions('selectFuelCard');
-
-        if (selectFuelCard_filter && selectFueldCard_options) {
-          const filtered_technicalCards = selectFuelCard_filter(
-            selectFueldCard_options,
-          );
-          calculationStore.setValue(
-            'fuelCard',
-            filtered_technicalCards?.[0]?.evo_addproduct_typeid,
-          );
-        }
-      }
-    },
-  }),
-
   calculationStore => ({
     expression: () => {
       const {
@@ -1710,7 +1681,7 @@ const reactionEffects: IReactionEffect[] = [
               brand,
 
             brand =>
-              brand?.evo_vehicle_type &&
+              brand?.evo_vehicle_type?.length &&
               intersection(
                 brand.evo_vehicle_type?.filter(x => x > 0),
                 leaseObjectType.evo_vehicle_type,
@@ -1719,7 +1690,7 @@ const reactionEffects: IReactionEffect[] = [
 
             brand =>
               brand &&
-              (!subsidy?.evo_brands ||
+              (!subsidy?.evo_brands?.length ||
                 subsidy?.evo_brands?.filter(
                   x => x.evo_brandid === brand.evo_brandid,
                 )?.length),
@@ -1773,7 +1744,7 @@ const reactionEffects: IReactionEffect[] = [
       calculationStore.setFilter('selectLeaseObjectType', types =>
         types.filter(
           type =>
-            !subsidy?.evo_leasingobject_types ||
+            !subsidy?.evo_leasingobject_types?.length ||
             subsidy.evo_leasingobject_types.filter(
               x => x.evo_leasingobject_typeid === type.evo_leasingobject_typeid,
             )?.length,
@@ -1783,7 +1754,7 @@ const reactionEffects: IReactionEffect[] = [
       calculationStore.setFilter('selectDealer', dealers =>
         dealers.filter(
           dealer =>
-            !subsidy?.accounts ||
+            !subsidy?.accounts?.length ||
             subsidy.accounts.filter(x => x.accountid === dealer.accountid)
               ?.length,
         ),
@@ -1792,7 +1763,7 @@ const reactionEffects: IReactionEffect[] = [
       calculationStore.setFilter('selectDealerPerson', dealerPersons =>
         dealerPersons.filter(
           dealerPerson =>
-            !subsidy?.accounts ||
+            !subsidy?.accounts?.length ||
             subsidy.accounts.filter(x => x.accountid === dealerPerson.accountid)
               ?.length,
         ),

src/client/stores/CalculationStore/config/initialFilters.ts

@@ -6,9 +6,6 @@ import { TElementFilter } from 'core/types/Calculation/Store/filters';
 
 const initialFilters: TElements<TElementFilter> = {};
 
-export const noResetValueElements: ElementsNames[] = [
-  'selectTechnicalCard',
-  'selectFuelCard',
-];
+export const noResetValueElements: ElementsNames[] = ['selectTechnicalCard'];
 
 export default initialFilters;