@bytebrand/fe-ui-core 4.8.111 → 4.8.113

package/source/framework/vehiclesProps/decoratedProps.tsx

@@ -680,6 +680,7 @@ const getDecoratedProps = (
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         const wltpConsumptionCombined = car.consumption.wltpCombined;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
+        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
 
         const co2 = car.environmentEmissions.co2;
 
@@ -699,11 +700,15 @@ const getDecoratedProps = (
           ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
           : t('vehicleProps:value.na');
 
+        const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
+          ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
+          : null;
+
         if (wltpConsumptionValue && wltpCo2Value) {
-          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}</>;
+          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
         }
 
-        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}</>;
+        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
       }
     },
     consumptionPowerCombinedAlternateView: {
@@ -716,6 +721,7 @@ const getDecoratedProps = (
         const co2 = car.environmentEmissions.co2;
         const wltpConsumptionPowerCombined = car.consumption.wltpPowerCombined;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
+        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
 
         const wltpConsumptionValue = Number.isFinite(wltpConsumptionPowerCombined)
           ? t('vehicleProps:value.consumptionPower', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
@@ -733,11 +739,15 @@ const getDecoratedProps = (
           ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
           : t('vehicleProps:value.na');
 
+        const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
+          ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
+          : null;
+
         if (wltpConsumptionValue && wltpCo2Value) {
-          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}</>;
+          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
         }
 
-        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}</>;
+        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
       }
     },
     consumptionHydrogenCombinedAlternateView: {
@@ -750,6 +760,7 @@ const getDecoratedProps = (
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         const co2 = car.environmentEmissions.co2;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
+        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
 
         const consumptionValue = Number.isFinite(consumptionHydrogenCombined)
           ? t('vehicleProps:value.consumptionGas', { consumption: consumptionHydrogenCombined.toLocaleString(language), unit: translatedUnit })
@@ -767,11 +778,15 @@ const getDecoratedProps = (
           ? t('vehicleProps:value.wltpCo2Combined', { co2: wltpCo2.toLocaleString(language) })
           : null;
 
+        const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
+          ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
+          : null;
+
         if (wltpConsumptionValue && wltpCo2Value) {
-          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}</>;
+          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
         }
 
-        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}</>;
+        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
       }
     },
     consumptionGasCombinedAlternateView: {
@@ -785,6 +800,7 @@ const getDecoratedProps = (
 
         const co2 = car.environmentEmissions.co2;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
+        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
 
         const consumptionValue = Number.isFinite(consumptionGasCombined)
           ? t('vehicleProps:value.consumptionGas', { consumption: consumptionGasCombined.toLocaleString(language), unit: translatedUnit })
@@ -802,11 +818,15 @@ const getDecoratedProps = (
           ? t('vehicleProps:value.wltpCo2Combined', { co2: wltpCo2.toLocaleString(language) })
           : null;
 
+        const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
+          ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
+          : null;
+
         if (wltpConsumptionValue && wltpCo2Value) {
-          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}</>;
+          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
         }
 
-        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}</>;
+        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
       }
     },
 
@@ -841,6 +861,7 @@ const getDecoratedProps = (
 
         const co2 = car.environmentEmissions.co2;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
+        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
         const co2Value = Number.isFinite(co2)
         ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
         : t('vehicleProps:value.na');
@@ -850,13 +871,49 @@ const getDecoratedProps = (
         const wltpCo2PluginValue = Number.isFinite(wltpCo2)
         ? t('vehicleProps:value.wltpCo2WtdCombined', { co2: wltpCo2.toLocaleString(language) })
         : null;
-        const hybridPlugin = car.engineData.hybridPlugin;
+        const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
+          ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
+          : null;
+        // 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: 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';
+
+          const dischargedCombined = Number.isFinite(wltpCombined) ? wltpCombined : ADV88_DEFAULT_DISCHARGED_COMBINED;
+          const dischargedClass = car.environmentEmissions.wltpDischargedEnergyEfficiencyClass || ADV88_DEFAULT_DISCHARGED_CO2_CLASS;
+
+          const weightedCombinedLabeled = t('vehicleProps:value.wltpWeightedCombinedLabel', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit });
+          const dischargedCombinedLabeled = t('vehicleProps:value.wltpDischargedCombinedLabel', { consumption: dischargedCombined.toLocaleString(language), unit: translatedUnit });
+          const co2WeightedContent = Number.isFinite(wltpCo2)
+            ? t('vehicleProps:value.wltpCo2WtdCombinedShort', { co2: wltpCo2.toLocaleString(language) })
+            : null;
+          const co2ClassWeighted = isPropDefined(wltpEnergyEfficiencyClass)
+            ? t('vehicleProps:value.co2ClassWeighted', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
+            : null;
+          const co2ClassDischarged = t('vehicleProps:value.co2ClassDischarged', { class: t(`cbd:${dischargedClass}`) });
+
+          return <React.Fragment>
+            {wrapValue(wltpConsumptionWeightedPowerCombinedContent)}{' + '}
+            {wrapValue(weightedCombinedLabeled)}{', '}
+            {wrapValue(dischargedCombinedLabeled)}
+            {co2WeightedContent && <>{', '}{wrapValue(co2WeightedContent)}</>}
+            {co2ClassWeighted && <>{', '}{co2ClassWeighted}</>}
+            {', '}{co2ClassDischarged}
+          </React.Fragment>
+        }
 
         if (hybridPlugin && wltpConsumptionWeightedPowerCombinedContent && wltpConsumptionWeightedCombinedContent) {
           return <React.Fragment>
             {wrapValue(wltpConsumptionWeightedPowerCombinedContent)}{', '}
             {wrapValue(wltpConsumptionWeightedCombinedContent)}{', '}
             {wrapValue(wltpCo2PluginValue)}
+            {co2ClassValue && <><br />{co2ClassValue}</>}
           </React.Fragment>
         }
 
@@ -864,6 +921,7 @@ const getDecoratedProps = (
           return <React.Fragment>
             {wrapValue(wltpConsumptionCombinedContent)}{', '}
             {wrapValue(wltpCo2Value)}
+            {co2ClassValue && <><br />{co2ClassValue}</>}
           </React.Fragment>
         }
 
@@ -873,6 +931,7 @@ const getDecoratedProps = (
             {consumptionPowerCombined && hybridPlugin ? <br /> : ''}
             {wrapValue(consumptionCombinedContent)} <br />
             {wrapValue(co2Value)}
+            {co2ClassValue && <><br />{co2ClassValue}</>}
           </React.Fragment>
           : t('vehicleProps:value.na');
       }

package/source/framework/vehiclesProps/vehicleDetails.ts

@@ -26,9 +26,11 @@ const fuel = ['fuel'];
 const otherData = ['powerAlternateView', 'torque', 'acceleration', 'topSpeed', 'transmission', 'driveType'];
 const otherDataLast = ['hsn', 'tsn'];
 const offerAvailability = ['offerAvailability'];
+// ADV-70: the CDP "Überblick" (Overview) no longer shows the availability ("Sofort"/"Now")
+// row — offerAvailability stays available for the SRL/landing cards via getMainPropertiesForSRL.
 const mainPropertiesList = [
   'mileage', 'firstRegistration', 'numberOfPreviousOwners', 'doorsOnly',
-  'usageType', 'gearbox', 'power', 'driveType', 'accidentDamaged', 'fuel', ...offerAvailability
+  'usageType', 'gearbox', 'power', 'driveType', 'accidentDamaged', 'fuel'
 ];
 const comparableList = ['firstRegistration', 'mileage', 'gearbox'];
 const landingList = ['mileage', 'gearbox', 'fuel'];

package/source/locales/data.ts

@@ -38,6 +38,8 @@ export const vehicleProps = (car?: any, isOfferAvailable: boolean = true) => {
       promoSlider: {
         consumptionCombined: `${vehicleOption.consumptionCombined}l/100km (komb)*`,
         co2: `${vehicleOption.co2} g CO2/km (komb)*`,
+        // wltpEnergyEfficiencyClass arrives as `selector_energyEfficiencyClass_X`; map to the bare letter via cbd dict.
+        co2Class: `CO2-Klasse ${(cbd.cbd as any)[vehicleOption.wltpEnergyEfficiencyClass] || vehicleOption.wltpEnergyEfficiencyClass || ''} (komb)`,
         new: 'neu',
         downPayment: '0€ Anzahlung',
         downPaymentShort: '0€ Anz.',
@@ -48,8 +50,9 @@ export const vehicleProps = (car?: any, isOfferAvailable: boolean = true) => {
         onRequest: "Auf Anfrage",
         mileage: `${vehicleOption.mileage} km`,
         consumption: `${vehicleOption.consumptionCombined}l/100km`,
-        consumptionPower: `${vehicleOption.consumptionPowerCombined}kWh/100km`,
-        consumptionPowerCombined: `${vehicleOption.consumptionPowerCombined}kWh/100km`,
+        // ADV-88: guard against null/undefined so we never render "nullkWh/100km".
+        consumptionPower: vehicleOption.consumptionPowerCombined != null ? `${vehicleOption.consumptionPowerCombined}kWh/100km` : '',
+        consumptionPowerCombined: vehicleOption.consumptionPowerCombined != null ? `${vehicleOption.consumptionPowerCombined}kWh/100km` : '',
         consumptionGas: `${vehicleOption.consumptionCombined}kg/100km`,
         consumptionCombined: `${vehicleOption.consumptionCombined}l/100km`,
         wltpConsumptionCombined: `${vehicleOption.wltpCombined}l/100km`,
@@ -59,6 +62,7 @@ export const vehicleProps = (car?: any, isOfferAvailable: boolean = true) => {
         deliveryPeriodMonths: `${Math.round(monthsTo)} Monat\nab Bestellung`,
         deliveryPeriodDays: `${count} Tag\nab Bestellung`,
         co2Combined: `${vehicleOption.co2}g CO2/km (komb)*`,
+        co2Class: `CO2-Klasse ${(cbd.cbd as any)[vehicleOption.wltpEnergyEfficiencyClass] || vehicleOption.wltpEnergyEfficiencyClass || ''} (komb)`,
         co2: `${vehicleOption.co2} g/km `,
         na: 'N/A',
         priceSub: '/mtl.',
@@ -93,7 +97,13 @@ export const vehicleProps = (car?: any, isOfferAvailable: boolean = true) => {
         wltpWeightedCombined: `${getFormattedNumber(vehicleOption.wltpWeightedCombined)}l/100km`,
         wltpWeightedPowerCombined: `${getFormattedNumber(vehicleOption.wltpWeightedPowerCombined)}kWh/100km`,
         wltpPowerCombined: `${getFormattedNumber(vehicleOption.wltpPowerCombined)}kWh/100km`,
-        wltpCombinedGas: `${getFormattedNumber(vehicleOption.wltpCombined)}kg/100km`
+        wltpCombinedGas: `${getFormattedNumber(vehicleOption.wltpCombined)}kg/100km`,
+        // ADV-88: labelled weighted/discharged consumption + both CO2 classes for new plug-in hybrids.
+        wltpWeightedCombinedLabel: `${getFormattedNumber(vehicleOption.wltpWeightedCombined)}l/100km (gew., komb)`,
+        wltpDischargedCombinedLabel: `${getFormattedNumber(vehicleOption.wltpCombined != null ? vehicleOption.wltpCombined : 19.9)}l/100km (entladen, komb)`,
+        wltpCo2WtdCombinedShort: `${getFormattedNumber(vehicleOption.wltpCo2)}g CO2/km (gew., komb)*`,
+        co2ClassWeighted: `CO2-Klasse ${(cbd.cbd as any)[vehicleOption.wltpEnergyEfficiencyClass] || vehicleOption.wltpEnergyEfficiencyClass || ''} (gew., komb)`,
+        co2ClassDischarged: `CO2-Klasse ${(cbd.cbd as any)[vehicleOption.wltpDischargedEnergyEfficiencyClass || 'selector_energyEfficiencyClass_g'] || ''} (entladen, komb)`
       },
       title: {
         'addOfferToMainSlide': 'Zum Schieberegler hinzufügen',