@bytebrand/fe-ui-core 4.8.105 → 4.8.107

package/package.json

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

package/package.json.bak

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

package/source/components/AccordionWidget/AccordionWidget.tsx

@@ -131,17 +131,18 @@ class AccordionWidget extends React.Component<IAccardionSectionProps> {
     const { car } = this.props;
     const autoDeId = car.metaData && car.metaData.vehicleId;
     const { consumption } = car;
-    // ADV-88: only NEW plug-in hybrids get the long weighted+discharged line — only those
-    // need the full-width treatment. Other cars keep their consumption inside the grid cell.
-    const isNewPlugin = !!_get(car, 'engineData.hybridPlugin', false)
-      && (_get(car, 'mainData.condition', '') as unknown as string) === 'selector_condition_new';
+    // ADV-88: ANY plug-in hybrid (new or used) gets the long weighted+discharged line and the
+    // full-width treatment. Gated on hybridPlugin only, no condition check.
+    // ADV-88: "is a hybrid car" is determined by fuel type (hybrid electric + diesel/petrol), not hybridPlugin.
+    const isPluginHybrid = consumption.fuel === 'selector_fuel_hybridElectricalDiesel'
+      || consumption.fuel === 'selector_fuel_hybridElectricalPetrol';
     const mainPropertiesList = getOverviewDetails(consumption.fuel);
     const mainProperties = mainPropertiesList.map((prop: string) => {
       const isConsumptionAlternateView = prop.startsWith('consumption') && prop.endsWith('AlternateView');
       return {
         icon: isConsumptionAlternateView ? '' : this.props.decoratedProps[prop].icon,
         description: this.props.decoratedProps[prop].value,
-        fullWidth: isConsumptionAlternateView && isNewPlugin
+        fullWidth: isConsumptionAlternateView && isPluginHybrid
       };
     });
     return (

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

@@ -82,9 +82,11 @@ const VehicleInfo: React.FC<IVehicleInfoProps> = (props) => {
     },
   };
 
-  // ADV-88: new plug-in hybrids carry the long weighted+discharged consumption/CO2 line —
-  // render it on its own full-width row at the bottom of the card (all breakpoints).
-  const isNewPlugin = !!(engineData && engineData.hybridPlugin) && condition === 'selector_condition_new';
+  // ADV-88: ANY plug-in hybrid (new or used) carries the long weighted+discharged consumption/CO2
+  // line — render it full-width. Gated on hybridPlugin only, no condition check.
+  // ADV-88: "is a hybrid car" is determined by fuel type (hybrid electric + diesel/petrol), not hybridPlugin.
+  const isPluginHybrid = consumption.fuel === 'selector_fuel_hybridElectricalDiesel'
+    || consumption.fuel === 'selector_fuel_hybridElectricalPetrol';
   const decoratedProps = getDecoratedProps(dataDecoratedProps, t, language);
   const renderProperty = (renderProperties: any, vehicleComponentName?: any) => {
     const mainPropertiesList = renderProperties(dataDecoratedProps.consumption.fuel, combineRefAlternative)
@@ -93,14 +95,14 @@ const VehicleInfo: React.FC<IVehicleInfoProps> = (props) => {
       .map((prop: string) => {
       const isConsumption = decoratedProps[prop].name === 'consumptionCombined';
       // On non-SRL cards (and for the full-width plug-in line) drop the fuel-pump icon to free up space.
-      const hideConsumptionIcon = isConsumption && (vehicleComponentName !== 'search' || isNewPlugin);
+      const hideConsumptionIcon = isConsumption && (vehicleComponentName !== 'search' || isPluginHybrid);
       return {
         icon: hideConsumptionIcon ? '' : decoratedProps[prop].icon,
         description: decoratedProps[prop].value,
-        className: classnames(styles[decoratedProps[prop].name], { [styles.pluginFullWidth]: isConsumption && isNewPlugin }),
+        className: classnames(styles[decoratedProps[prop].name], { [styles.pluginFullWidth]: isConsumption && isPluginHybrid }),
         classNameIcon: (vehicleComponentName === 'search' || 'myVehicles' || 'favorite' || 'recently') && styles.carIconSearch,
         smalltext: isConsumption && (vehicleComponentName !== 'search'),
-        hybridPlugin: engineData.hybridPlugin && isConsumption && vehicleComponentName !== 'search'
+        hybridPlugin: isPluginHybrid && isConsumption && vehicleComponentName !== 'search'
       };
     });
 
@@ -115,8 +117,8 @@ const VehicleInfo: React.FC<IVehicleInfoProps> = (props) => {
     { [styles.vehiclePropertiesLanding]: vehicleComponentName === 'landing' },
     { [styles.vehiclePropertiesMain]: vehicleComponentName === 'main' },
     { [styles.vehiclePropertiesSearch]: vehicleComponentName === 'search' },
-    // ADV-88: mark a new plug-in SRL card so its "good price" underline can be dropped on mobile.
-    { [styles.searchPluginInfo]: isNewPlugin && vehicleComponentName === 'search' },
+    // ADV-88: mark a plug-in SRL card so its "good price" underline can be dropped on mobile.
+    { [styles.searchPluginInfo]: isPluginHybrid && vehicleComponentName === 'search' },
     { [styles.vehiclePropertiesFavorite]: vehicleComponentName === 'favorite' },
     { [styles.vehiclePropertiesMyVehicles]: vehicleComponentName === 'myVehicles' },
     { [styles.vehiclePropertiesRecently]: vehicleComponentName === 'recently' },

package/source/components/VehicleSmallCard/VehicleSmallCard.tsx

@@ -152,15 +152,14 @@ const VehicleSmallCard: FunctionComponent<IVehicleSmallCardProps> = (props) => {
   // ADV-88: on the narrow landing/main recommendation cards the long plug-in consumption line
   // doesn't fit the slim `info` column — render it as its own full-width row below the price
   // block (under "Zum Angebot") instead, and suppress it inside VehicleInfo to avoid duplication.
-  // ADV-88: the weighted+discharged consumption/CO2 line is ONLY for NEW plug-in hybrids — only
-  // those get the full-width externalised row. Used plug-ins (and non-plug-ins) keep the normal
-  // consumption inside the info column like any other car.
-  // NOTE: requires `condition` in the card data on every surface (SRL/landing/home/comparable/
-  // favourites). If a projection omits it, the new-plug-in row won't externalise there — keep
-  // mainData.condition in those projections.
-  const isPlugin = !!(engineData && (engineData as any).hybridPlugin);
-  const isNewPlugin = isPlugin && (_get(info, 'condition') as any) === 'selector_condition_new';
-  const externalizeConsumption = isNewPlugin
+  // ADV-88: ANY plug-in hybrid (new or used) carries the long weighted+discharged consumption/CO2
+  // line — externalise it to a full-width row so it doesn't overflow the narrow info column. Gated
+  // on hybridPlugin only, no condition check.
+  // ADV-88: "is a hybrid car" is determined by fuel type (hybrid electric + diesel/petrol), not hybridPlugin.
+  const isPlugin = !!consumption
+    && (consumption.fuel === 'selector_fuel_hybridElectricalDiesel'
+      || consumption.fuel === 'selector_fuel_hybridElectricalPetrol');
+  const externalizeConsumption = isPlugin
     && (vehicleComponentName === 'landing' || vehicleComponentName === 'main'
       || vehicleComponentName === 'search' || vehicleComponentName === 'comparable'
       || vehicleComponentName === 'favorite');

package/source/framework/vehiclesProps/decoratedLightProps.tsx

@@ -150,19 +150,19 @@ const getDecoratedLightProps = (
           ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
           : t('vehicleProps:value.na');
 
-        const hybridPlugin = car.engineData.hybridPlugin;
+        // ADV-88: "is a hybrid car" is now determined by fuel type (hybrid electric + diesel/petrol),
+        // not engineData.hybridPlugin.
+        const hybridPlugin = car.consumption.fuel === 'selector_fuel_hybridElectricalDiesel'
+          || car.consumption.fuel === 'selector_fuel_hybridElectricalPetrol';
         const wltpWeightedPowerCombined = car.consumption.wltpWeightedPowerCombined;
         const wltpWeightedCombined = car.consumption.wltpWeightedCombined;
 
         const wltpWeightedPowerCombinedContent = wltpWeightedPowerCombined ? t('vehicleProps:value.wltpWeightedPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit }) : null;
         const wltpWeightedCombinedContent = wltpWeightedCombined ? t('vehicleProps:value.wltpWeightedCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit }) : null;
 
-        // ADV-88: the whole plug-in consumption treatment (electric kWh + weighted/discharged) is
-        // ONLY for NEW plug-in hybrids. Used plug-ins fall through to the regular consumption line
-        // below, exactly like a non-plug-in car.
-        const isNewPlugin = condition === 'selector_condition_new';
-        if (hybridPlugin && isNewPlugin) {
-          // new plug-in hybrids additionally show discharged (entladen, komb) consumption + CO2 class.
+        // ADV-88: the weighted+discharged (entladen) consumption treatment is shown for ANY plug-in
+        // hybrid (new or used) — gated on hybridPlugin only, no condition check.
+        if (hybridPlugin) {
           if (wltpWeightedPowerCombinedContent && wltpWeightedCombinedContent) {
             const dischargedCombined = Number.isFinite(wltpConsumptionCombined) ? wltpConsumptionCombined : 19.9;
             const dischargedClass = car.environmentEmissions.wltpDischargedEnergyEfficiencyClass || 'selector_energyEfficiencyClass_g';
@@ -306,14 +306,14 @@ const getDecoratedLightProps = (
           ? t('vehicleProps:value.wltpCo2WtdCombined', { co2: wltpCo2.toLocaleString(language), unit: translatedUnit })
           : null;
 
-        const hybridPlugin = car.engineData.hybridPlugin;
+        // ADV-88: "is a hybrid car" is now determined by fuel type (hybrid electric + diesel/petrol),
+        // not engineData.hybridPlugin.
+        const hybridPlugin = car.consumption.fuel === 'selector_fuel_hybridElectricalDiesel'
+          || car.consumption.fuel === 'selector_fuel_hybridElectricalPetrol';
 
-        // ADV-88: the whole plug-in consumption treatment (electric kWh + weighted/discharged) is
-        // ONLY for NEW plug-in hybrids. Used plug-ins fall through to the regular consumption line
-        // below, exactly like a non-plug-in car.
-        const isNewPlugin = condition === 'selector_condition_new';
-        if (hybridPlugin && isNewPlugin) {
-          // new plug-in hybrids additionally show discharged (entladen, komb) consumption + CO2 class.
+        // ADV-88: the weighted+discharged (entladen) consumption treatment is shown for ANY plug-in
+        // hybrid (new or used) — gated on hybridPlugin only, no condition check.
+        if (hybridPlugin) {
           if (wltpWeightedPowerCombinedContent && wltpWeightedCombinedContent) {
             const dischargedCombined = Number.isFinite(wltpConsumptionCombined) ? wltpConsumptionCombined : 19.9;
             const dischargedClass = car.environmentEmissions.wltpDischargedEnergyEfficiencyClass || 'selector_energyEfficiencyClass_g';

package/source/framework/vehiclesProps/decoratedProps.tsx

@@ -874,12 +874,14 @@ const getDecoratedProps = (
         const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
           ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
           : null;
-        const hybridPlugin = car.engineData.hybridPlugin;
+        // ADV-88: "is a hybrid car" is now determined by fuel type (hybrid electric + diesel/petrol),
+        // not engineData.hybridPlugin.
+        const hybridPlugin = car.consumption.fuel === 'selector_fuel_hybridElectricalDiesel'
+          || car.consumption.fuel === 'selector_fuel_hybridElectricalPetrol';
 
-        // ADV-88: new plug-in hybrids show both weighted (gew., komb) and discharged (entladen, komb)
-        // fuel consumption + a discharged CO2 class, in addition to the weighted values.
-        const isNewPlugin = hybridPlugin && condition === 'selector_condition_new';
-        if (isNewPlugin && wltpConsumptionWeightedPowerCombinedContent && wltpConsumptionWeightedCombinedContent) {
+        // ADV-88: ANY hybrid car (new or used) shows both weighted (gew., komb) and discharged
+        // (entladen, komb) fuel consumption + a discharged CO2 class.
+        if (hybridPlugin && wltpConsumptionWeightedPowerCombinedContent && wltpConsumptionWeightedCombinedContent) {
           const ADV88_DEFAULT_DISCHARGED_COMBINED = 19.9;
           const ADV88_DEFAULT_DISCHARGED_CO2_CLASS = 'selector_energyEfficiencyClass_g';