@bytebrand/fe-ui-core 4.8.112 → 4.8.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/fe-ui-core",
-  "version": "4.8.112",
+  "version": "4.8.114",
   "description": "UI components for the auto.de project",
   "main": "index.ts",
   "module": "dist/common.js",
@@ -104,7 +104,7 @@
     "@types/react": "^16.8.3"
   },
   "scripts": {
-    "prepare": "node -e 0",
+    "prepare": "husky",
     "storybook": "start-storybook -p 6006",
     "clean": "rm -rf ./dist/*.*",
     "build:lib": "yarn clean && webpack --config ./webpack.config.js --progress",

package/source/components/VehicleDetailedSidebar/VehicleDetailedSidebar.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef, FunctionComponent } from 'react';
+import React, { useState, useEffect, FunctionComponent } from 'react';
 import _get from 'lodash/get';
 import { Hidden } from 'react-grid-system';
 import PriceContent from './partials/PriceContent';
@@ -104,31 +104,22 @@ const VehicleDetailedSidebar: FunctionComponent<IVehicleDetailedSidebarProps> =
     }
   ];
 
-  const initialDefaultAppliedForPath = useRef<string | null>(null);
-
+  // ADV-116: the default CDP tab is driven solely by `activeTabCDP` (set to Financing by the
+  // originating card, or to the exact tab when a payment type is clicked directly). No
+  // leasing-based default override.
   useEffect(() => {
     const getlocalStorageActiveTabCDP = localStorage.getItem('activeTabCDP');
-    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;
+    if (!getlocalStorageActiveTabCDP) return;
+    const activeTab = tabsTitles.findIndex(({ title }: { title: string }) => {
+      return title === getlocalStorageActiveTabCDP;
+    });
+    if (activeTab === -1) {
+      setActiveTab(null, 0);
+    } else {
+      setActiveTab(null, activeTab);
     }
-  }, [pathname, activeTab, price]); // tslint:disable-line:align
+    localStorage.removeItem('activeTabCDP');
+  }, [pathname, activeTab]); // tslint:disable-line:align
 
   const priceProps = {
     tabsTitles,

package/source/components/VehicleSmallCard/VehicleData/VehicleInfo/VehicleInfo.tsx

@@ -1,7 +1,6 @@
 /* tslint:disable */
 import * as React from 'react';
 import classnames from 'classnames';
-import _get from 'lodash/get';
 import styles from './VehicleInfo.styl';
 import PriceRating from '../../../PriceRating/PriceRating';
 import { Visible, Hidden } from 'react-grid-system';
@@ -45,7 +44,6 @@ const VehicleInfo: React.FC<IVehicleInfoProps> = (props) => {
     location,
     offer,
     engineData,
-    leasing,
     suppressConsumption
   } = props as (typeof props & { suppressConsumption?: boolean });
   const firstRegistrationDate = regDate && regDate !== 0 ? regDate : 'N/A';
@@ -168,12 +166,8 @@ const VehicleInfo: React.FC<IVehicleInfoProps> = (props) => {
       ),
         ...routeObj,
         className: wrapClasses,
-        onClick: () => localStorage.setItem(
-          'activeTabCDP',
-          _get(leasing, 'isActive', false)
-            ? t('vehicleProps:title.leasing')
-            : t('vehicleProps:title.financing')
-        ),
+        // ADV-116: opening a CDP from a card defaults to the Financing tab.
+        onClick: () => localStorage.setItem('activeTabCDP', t('vehicleProps:title.financing')),
         href: url,
         target,
         rel

package/source/components/VehicleSmallCard/VehicleSmallCard.tsx

@@ -318,12 +318,8 @@ const VehicleSmallCard: FunctionComponent<IVehicleSmallCardProps> = (props) => {
           target,
           rel,
           className: `${styles.redirectClassLink} ${styles.gridAreaTitle}`,
-          onClick: () => localStorage.setItem(
-            'activeTabCDP',
-            _get(price, 'leasing.isActive', false)
-              ? t('vehicleProps:title.leasing')
-              : t('vehicleProps:title.financing')
-          ),
+          // ADV-116: opening a CDP from a card defaults to the Financing tab.
+          onClick: () => localStorage.setItem('activeTabCDP', t('vehicleProps:title.financing')),
           href: url
         })}
 
@@ -376,12 +372,8 @@ const VehicleSmallCard: FunctionComponent<IVehicleSmallCardProps> = (props) => {
           target,
           rel,
           className: `${styles.redirectClassLink} ${styles.gridAreaImage}`,
-          onClick: () => localStorage.setItem(
-            'activeTabCDP',
-            _get(price, 'leasing.isActive', false)
-              ? t('vehicleProps:title.leasing')
-              : t('vehicleProps:title.financing')
-          ),
+          // ADV-116: opening a CDP from a card defaults to the Financing tab.
+          onClick: () => localStorage.setItem('activeTabCDP', t('vehicleProps:title.financing')),
           href: url
         })}
         <VehicleInfo {...vehicleInfoProps} />

package/source/components/_common/withStats/withStats.tsx

@@ -74,20 +74,24 @@ const withStats = (WrappedComponent: any) => ({
   const MIN_PRICE_DIFFERENCE = 500;
 
   const [showByLocalStorage, setShowByLocalStorage] = React.useState(false);
-  const [lsFinancingFirst, setLsFinancingFirst] = React.useState<number | undefined>(undefined);
+  const [anyLsBlocked, setAnyLsBlocked] = React.useState(false);
 
   React.useEffect(() => {
     const raw = localStorage.getItem('financing_store');
     const parsed = raw ? JSON.parse(raw) : null;
     const fin = parsed?.userCommonConfig?.financing?.firstInstallment;
     const lea = parsed?.userCommonConfig?.leasing?.firstInstallment;
-    setLsFinancingFirst(fin);
-    setShowByLocalStorage(fin === 0 || lea === 0);
+    const finBlocked = fin !== undefined && fin !== null && fin !== 0;
+    const leaBlocked = lea !== undefined && lea !== null && lea !== 0;
+    const anyBlocked = finBlocked || leaBlocked;
+    const hasZero = fin === 0 || lea === 0;
+    setAnyLsBlocked(anyBlocked);
+    setShowByLocalStorage(hasZero && !anyBlocked);
   }, []);
 
   const showByBackend = disableDownPaymentLocalStorage
     ? !!showDownPayment
-    : showDownPayment && (lsFinancingFirst === undefined || lsFinancingFirst === null);
+    : showDownPayment && !anyLsBlocked;
   const effectiveShowByLocalStorage = disableDownPaymentLocalStorage ? false : showByLocalStorage;
 
   const onHandleSlideChange = (activeSlide: number) => {