@bytebrand/fe-ui-core 4.8.29 → 4.8.31

package/__tests__/components/_common/MaterialDatePicker/MaterialDatePicker.test.tsx

@@ -47,7 +47,7 @@ describe('MaterialDatePicker', () => {
     fireEvent.click(okButton);
     fireEvent.focusOut(input);
 
-    expect(handleChange).toHaveBeenCalledTimes(4);
+    expect(handleChange).toHaveBeenCalledTimes(3);
     expect(handleOpen).toHaveBeenCalledTimes(1);
     expect(handleBlur).toHaveBeenCalledTimes(1);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/fe-ui-core",
-  "version": "4.8.29",
+  "version": "4.8.31",
   "description": "UI components for the auto.de project",
   "main": "index.ts",
   "module": "dist/common.js",

package/source/components/VehicleDetailedSidebar/VehicleDetailedSidebar.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, FunctionComponent } from 'react';
+import React, { useState, useEffect, useRef, FunctionComponent } from 'react';
 import _get from 'lodash/get';
 import { Hidden } from 'react-grid-system';
 import PriceContent from './partials/PriceContent';
@@ -104,19 +104,31 @@ const VehicleDetailedSidebar: FunctionComponent<IVehicleDetailedSidebarProps> =
     }
   ];
 
+  const initialDefaultAppliedForPath = useRef<string | null>(null);
+
   useEffect(() => {
     const getlocalStorageActiveTabCDP = localStorage.getItem('activeTabCDP');
-    if (!getlocalStorageActiveTabCDP) return;
-    const activeTab = tabsTitles.findIndex(({ title }: { title: string }) => {
-      return title === getlocalStorageActiveTabCDP;
-    });
-    if (activeTab === -1) {
-      setActiveTab(null, 0);
-    } else {
-      setActiveTab(null, activeTab);
+    if (getlocalStorageActiveTabCDP) {
+      const activeTab = tabsTitles.findIndex(({ title }: { title: string }) => {
+        return title === getlocalStorageActiveTabCDP;
+      });
+      if (activeTab === -1) {
+        setActiveTab(null, 0);
+      } else {
+        setActiveTab(null, activeTab);
+      }
+      localStorage.removeItem('activeTabCDP');
+      initialDefaultAppliedForPath.current = pathname;
+      return;
+    }
+    if (
+      initialDefaultAppliedForPath.current !== pathname
+      && _get(price, 'leasing.isActive', false)
+    ) {
+      setActiveTab(null, 1);
+      initialDefaultAppliedForPath.current = pathname;
     }
-    localStorage.removeItem('activeTabCDP');
-  }, [pathname, activeTab]); // tslint:disable-line:align
+  }, [pathname, activeTab, price]); // tslint:disable-line:align
 
   const priceProps = {
     tabsTitles,

package/source/framework/vehiclesProps/decoratedLightProps.tsx

@@ -143,7 +143,9 @@ const getDecoratedLightProps = (
           ? t('vehicleProps:value.consumptionCombined', { consumption: consumptionCombined.toLocaleString(language), unit: translatedUnit })
           : t('vehicleProps:value.na');
 
-        const consumptionPowerCombinedContent = t('vehicleProps:value.consumptionPowerCombined', { consumption: consumptionPowerCombined.toLocaleString(language), unit: translatedUnit });
+        const consumptionPowerCombinedContent = Number.isFinite(consumptionPowerCombined)
+          ? t('vehicleProps:value.consumptionPowerCombined', { consumption: consumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
+          : null;
 
         const co2Value = Number.isFinite(co2)
           ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
@@ -233,8 +235,12 @@ const getDecoratedLightProps = (
 
         const consumptionPowerCombinedContent = t('vehicleProps:value.consumptionPowerCombined', { consumption: consumptionPowerCombined.toLocaleString(language), unit: translatedUnit });
         const consumptionCombinedContent = t('vehicleProps:value.consumptionCombined', { consumption: consumptionCombined.toLocaleString(language), unit: translatedUnit });        
-        const wltpWeightedPowerCombinedContent = t('vehicleProps:value.wltpWeightedPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit });
-        const wltpWeightedCombinedContent = t('vehicleProps:value.wltpWeightedCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit });
+        const wltpWeightedPowerCombinedContent = Number.isFinite(wltpWeightedPowerCombined)
+          ? t('vehicleProps:value.wltpWeightedPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit })
+          : null;
+        const wltpWeightedCombinedContent = Number.isFinite(wltpWeightedCombined)
+          ? t('vehicleProps:value.wltpWeightedCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit })
+          : null;
         const wltpConsumptionPowerCombinedContent = wltpConsumptionPowerCombined
           ? t('vehicleProps:value.wltpPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
           : null;