@bytebrand/fe-ui-core 4.8.108 → 4.8.110

package/source/framework/vehiclesProps/decoratedLightProps.tsx

@@ -123,10 +123,7 @@ const getDecoratedLightProps = (
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         const wltpConsumptionCombined = car.consumption.wltpCombined;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
-        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
-        const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
-          ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
-          : null;
+        const consumptionPowerCombined = car.consumption.consumptionCombined;
 
         const co2 = car.environmentEmissions.co2;
 
@@ -146,74 +143,41 @@ 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 co2Value = Number.isFinite(co2)
           ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
           : t('vehicleProps:value.na');
 
-        // 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 hybridPlugin = car.engineData.hybridPlugin;
         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 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';
-            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>
-                {`${wltpWeightedPowerCombinedContent} + `}
-                {`${weightedCombinedLabeled}, `}
-                {`${dischargedCombinedLabeled}`}
-                {co2WeightedContent && <>, {co2WeightedContent}</>}
-                {co2ClassWeighted && <>, {co2ClassWeighted}</>}
-                {<>, {co2ClassDischarged}</>}
-              </React.Fragment>
-          }
-
           if (wltpWeightedPowerCombinedContent && wltpWeightedCombinedContent && wltpCo2PluginValue) {
             return <React.Fragment>
                 {`${wltpWeightedPowerCombinedContent}, `}
                 {`${wltpWeightedCombinedContent}, `}
                 {wltpCo2PluginValue}
-                {co2ClassValue && <>, {co2ClassValue}</>}
               </React.Fragment>
           }
 
-          // ADV-88: only render the electric (kWh) line when the car actually has a combined
-          // power consumption — otherwise we printed "nullkWh/100km" for plug-ins lacking it.
-          const realPowerCombined = car.consumption.consumptionPowerCombined;
-          const powerCombinedLine = Number.isFinite(realPowerCombined)
-            ? t('vehicleProps:value.consumptionPowerCombined', { consumption: realPowerCombined.toLocaleString(language), unit: translatedUnit })
-            : null;
-          return Number.isFinite(consumptionCombined) || Number.isFinite(realPowerCombined)
+          return Number.isFinite(consumptionCombined) || Number.isFinite(consumptionPowerCombined)
             ? <React.Fragment>
-              {powerCombinedLine && <>{powerCombinedLine} <br /></>}{consumptionValue} <br /> {co2Value}
-              {co2ClassValue && <>, {co2ClassValue}</>}
+              {consumptionPowerCombined ? consumptionPowerCombinedContent : t('vehicleProps:value.na')} <br />{consumptionValue} <br /> {co2Value}
             </React.Fragment>
             : t('vehicleProps:value.na');
 
         }
 
         if (wltpConsumptionValue && wltpCo2Value) {
-          return <>{wltpConsumptionValue}, {wltpCo2Value}{co2ClassValue && <>, {co2ClassValue}</>}</>;
+          return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
 
-        return <>{consumptionValue} <br /> {co2Value}{co2ClassValue && <>, {co2ClassValue}</>}</>;
+        return <>{consumptionValue} <br /> {co2Value}</>;
       }
     },
     consumptionPowerCombinedAlternateView: {
@@ -227,10 +191,6 @@ const getDecoratedLightProps = (
         const co2 = car.environmentEmissions.co2;
         const wltpConsumptionPowerCombined = car.consumption.wltpPowerCombined;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
-        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
-        const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
-          ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
-          : null;
 
         const wltpConsumptionValue = Number.isFinite(wltpConsumptionPowerCombined)
           ? t('vehicleProps:value.wltpPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
@@ -249,10 +209,10 @@ const getDecoratedLightProps = (
           : t('vehicleProps:value.na');
 
         if (wltpConsumptionValue && wltpCo2Value) {
-          return <>{wltpConsumptionValue}, {wltpCo2Value}{co2ClassValue && <>, {co2ClassValue}</>}</>;
+          return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
 
-        return <>{consumptionValue} <br /> {co2Value} {co2ClassValue && <>, {co2ClassValue}</>}</>;
+        return <>{consumptionValue} <br /> {co2Value} </>;
       }
     },
 
@@ -273,12 +233,8 @@ 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 = 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 wltpWeightedPowerCombinedContent = t('vehicleProps:value.wltpWeightedPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit });
+        const wltpWeightedCombinedContent = t('vehicleProps:value.wltpWeightedCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit });
         const wltpConsumptionPowerCombinedContent = wltpConsumptionPowerCombined
           ? t('vehicleProps:value.wltpPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
           : null;
@@ -289,10 +245,6 @@ const getDecoratedLightProps = (
 
         const co2 = car.environmentEmissions.co2;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
-        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
-        const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
-          ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
-          : null;
 
         const co2Value = Number.isFinite(co2)
         ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
@@ -306,42 +258,14 @@ const getDecoratedLightProps = (
           ? t('vehicleProps:value.wltpCo2WtdCombined', { co2: wltpCo2.toLocaleString(language), unit: translatedUnit })
           : 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';
+        const hybridPlugin = car.engineData.hybridPlugin;
 
-        // 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';
-            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>
-                {`${wltpWeightedPowerCombinedContent} + `}
-                {`${weightedCombinedLabeled}, `}
-                {`${dischargedCombinedLabeled}`}
-                {co2WeightedContent && <>, {co2WeightedContent}</>}
-                {co2ClassWeighted && <>, {co2ClassWeighted}</>}
-                {<>, {co2ClassDischarged}</>}
-              </React.Fragment>
-          }
-
           if (wltpWeightedPowerCombinedContent && wltpWeightedCombinedContent && wltpCo2PluginValue) {
             return <React.Fragment>
                 {`${wltpWeightedPowerCombinedContent}, `}
                 {`${wltpWeightedCombinedContent}, `}
                 {wltpCo2PluginValue}
-                {co2ClassValue && <>, {co2ClassValue}</>}
               </React.Fragment>
           }
         }
@@ -351,14 +275,12 @@ const getDecoratedLightProps = (
               {`${wltpConsumptionPowerCombinedContent}, `}
               {`${wltpWeightedCombinedContent}, `}
               {wltpCo2PluginValue}
-              {co2ClassValue && <>, {co2ClassValue}</>}
             </React.Fragment>
         }
 
         return Number.isFinite(consumptionCombined) || Number.isFinite(consumptionPowerCombined)
           ? <React.Fragment>
             {consumptionPowerCombined ? consumptionPowerCombinedContent : t('vehicleProps:value.na')} <br />{consumptionCombinedContent} <br /> {co2Value}
-            {co2ClassValue && <>, {co2ClassValue}</>}
           </React.Fragment>
           : t('vehicleProps:value.na');
       }
@@ -375,10 +297,6 @@ const getDecoratedLightProps = (
         const co2 = car.environmentEmissions.co2;
         const wltpConsumptionCombined = car.consumption.wltpCombined;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
-        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
-        const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
-          ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
-          : null;
 
         const consumptionValue = Number.isFinite(consumptionHydrogenCombined)
           ? t('vehicleProps:value.consumptionGas', { consumption: consumptionHydrogenCombined.toLocaleString(language), unit: translatedUnit })
@@ -396,10 +314,10 @@ const getDecoratedLightProps = (
           : null;
 
         if (wltpConsumptionValue && wltpCo2Value) {
-          return <>{wltpConsumptionValue}, {wltpCo2Value}{co2ClassValue && <>, {co2ClassValue}</>}</>;
+          return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
 
-        return <>{consumptionValue} <br /> {co2Value}{co2ClassValue && <>, {co2ClassValue}</>}</>;
+        return <>{consumptionValue} <br /> {co2Value}</>;
       }
     },
     consumptionGasCombinedAlternateView: {
@@ -413,10 +331,6 @@ const getDecoratedLightProps = (
         const co2 = car.environmentEmissions.co2;
         const wltpConsumptionCombined = car.consumption.wltpCombined;
         const wltpCo2 = car.environmentEmissions.wltpCo2;
-        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
-        const co2ClassValue = isPropDefined(wltpEnergyEfficiencyClass)
-          ? t('vehicleProps:value.co2Class', { class: t(`cbd:${wltpEnergyEfficiencyClass}`) })
-          : null;
 
         const consumptionValue = Number.isFinite(consumptionGasCombined)
           ? t('vehicleProps:value.consumptionGas', { consumption: consumptionGasCombined.toLocaleString(language), unit: translatedUnit })
@@ -435,10 +349,10 @@ const getDecoratedLightProps = (
           : null;
 
         if (wltpConsumptionValue && wltpCo2Value) {
-          return <>{wltpConsumptionValue}, {wltpCo2Value}{co2ClassValue && <>, {co2ClassValue}</>}</>;
+          return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
 
-        return <>{consumptionValue} <br /> {co2Value}{co2ClassValue && <>, {co2ClassValue}</>}</>;
+        return <>{consumptionValue} <br /> {co2Value}</>;
       }
     },
     consumptionCombinedDealer: {
@@ -450,7 +364,6 @@ const getDecoratedLightProps = (
         const translatedUnit = t(`cbd:${consumptionUnit}`);
 
         const co2 = car.environmentEmissions.co2;
-        const wltpEnergyEfficiencyClass = car.environmentEmissions.wltpEnergyEfficiencyClass;
 
         const consumptionValue = Number.isFinite(consumptionCombined)
           ? t('vehicleProps:value.consumptionCombined', { consumption: consumptionCombined.toLocaleString(language), unit: translatedUnit })
@@ -460,11 +373,7 @@ const getDecoratedLightProps = (
           ? 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;
-
-        return <>{consumptionValue} | {co2Value}{co2ClassValue ? <> | {co2ClassValue}</> : null}</>;
+        return <>{consumptionValue} | {co2Value}</>;
       }
     },
     gearbox: {

package/source/framework/vehiclesProps/decoratedProps.tsx

@@ -680,7 +680,6 @@ 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;
 
@@ -700,15 +699,11 @@ 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)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
+          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}</>;
         }
 
-        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
+        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}</>;
       }
     },
     consumptionPowerCombinedAlternateView: {
@@ -721,7 +716,6 @@ 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 })
@@ -739,15 +733,11 @@ 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)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
+          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}</>;
         }
 
-        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
+        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}</>;
       }
     },
     consumptionHydrogenCombinedAlternateView: {
@@ -760,7 +750,6 @@ 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 })
@@ -778,15 +767,11 @@ 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)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
+          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}</>;
         }
 
-        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
+        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}</>;
       }
     },
     consumptionGasCombinedAlternateView: {
@@ -800,7 +785,6 @@ 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 })
@@ -818,15 +802,11 @@ 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)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
+          return <>{wrapValue(wltpConsumptionValue)}, {wrapValue(wltpCo2Value)}</>;
         }
 
-        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}{co2ClassValue && <><br />{co2ClassValue}</>}</>;
+        return <>{wrapValue(consumptionValue)} <br /> {wrapValue(co2Value)}</>;
       }
     },
 
@@ -861,7 +841,6 @@ 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');
@@ -871,49 +850,13 @@ const getDecoratedProps = (
         const wltpCo2PluginValue = Number.isFinite(wltpCo2)
         ? t('vehicleProps:value.wltpCo2WtdCombined', { co2: wltpCo2.toLocaleString(language) })
         : null;
-        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>
-        }
+        const hybridPlugin = car.engineData.hybridPlugin;
 
         if (hybridPlugin && wltpConsumptionWeightedPowerCombinedContent && wltpConsumptionWeightedCombinedContent) {
           return <React.Fragment>
             {wrapValue(wltpConsumptionWeightedPowerCombinedContent)}{', '}
             {wrapValue(wltpConsumptionWeightedCombinedContent)}{', '}
             {wrapValue(wltpCo2PluginValue)}
-            {co2ClassValue && <><br />{co2ClassValue}</>}
           </React.Fragment>
         }
 
@@ -921,7 +864,6 @@ const getDecoratedProps = (
           return <React.Fragment>
             {wrapValue(wltpConsumptionCombinedContent)}{', '}
             {wrapValue(wltpCo2Value)}
-            {co2ClassValue && <><br />{co2ClassValue}</>}
           </React.Fragment>
         }
 
@@ -931,7 +873,6 @@ 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,11 +26,9 @@ 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'
+  'usageType', 'gearbox', 'power', 'driveType', 'accidentDamaged', 'fuel', ...offerAvailability
 ];
 const comparableList = ['firstRegistration', 'mileage', 'gearbox'];
 const landingList = ['mileage', 'gearbox', 'fuel'];

package/source/locales/data.ts

@@ -38,8 +38,6 @@ 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.',
@@ -50,9 +48,8 @@ export const vehicleProps = (car?: any, isOfferAvailable: boolean = true) => {
         onRequest: "Auf Anfrage",
         mileage: `${vehicleOption.mileage} km`,
         consumption: `${vehicleOption.consumptionCombined}l/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` : '',
+        consumptionPower: `${vehicleOption.consumptionPowerCombined}kWh/100km`,
+        consumptionPowerCombined: `${vehicleOption.consumptionPowerCombined}kWh/100km`,
         consumptionGas: `${vehicleOption.consumptionCombined}kg/100km`,
         consumptionCombined: `${vehicleOption.consumptionCombined}l/100km`,
         wltpConsumptionCombined: `${vehicleOption.wltpCombined}l/100km`,
@@ -62,7 +59,6 @@ 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.',
@@ -97,13 +93,7 @@ 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`,
-        // 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)`
+        wltpCombinedGas: `${getFormattedNumber(vehicleOption.wltpCombined)}kg/100km`
       },
       title: {
         'addOfferToMainSlide': 'Zum Schieberegler hinzufügen',

package/.husky/pre-push

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npm run test:ci

package/.storybook/addons.js

@@ -1,4 +0,0 @@
-import '@storybook/addon-actions/register';
-import '@storybook/addon-links/register';
-import '@storybook/addon-backgrounds/register';
-import 'storybook-addon-i18next/register';

package/.storybook/config.js

@@ -1,64 +0,0 @@
- import { configure, addDecorator, addParameters } from '@storybook/react';
-
-import i18n from 'i18next';
-import centered from '@storybook/addon-centered/react';
-
-import { reactI18nextModule } from 'react-i18next';
-import { withI18next } from 'storybook-addon-i18next';
-import { en, de } from '@bytebrand/i18n-dictionaries';
-
-import '!style-loader!css-loader!stylus-loader!../source/theme/colors.styl';
-
-i18n
-  .use(reactI18nextModule)
-  .init({
-    whitelist: ['en', 'de'],
-    lng: 'de',
-    fallbackLng: 'de',
-    interpolation: {
-      escapeValue: false,
-    },
-    debug: process.env.NODE_ENV === 'development',
-    react: {
-      wait: true
-    },
-  },
-  (err, t) => {
-    if (err) {
-      return console.error('Something went wrong loading', err);
-    }
-
-    i18n.addResourceBundle('en', 'cbd', en, true, true);
-    i18n.addResourceBundle('de', 'cbd', de, true, true);
-
-  });
-
-addDecorator(withI18next({
-  i18n,
-  languages: {
-    en: 'English',
-    de: 'Deutsch',
-  }
-}));
-
-addParameters({
-  options: {
-    sortStoriesByKind: true
-  },
-  backgrounds: [
-    { name: 'white', value: '#fff' },
-    { name: 'grey', value: '#808080', default: true },
-    { name: 'black', value: '#000' }
-  ]
-});
-
-addDecorator(centered);
-
-// automatically import all files ending in *.stories.js
-const req = require.context('../source/components', true, /.story.js$/);
-
-function loadStories() {
-  req.keys().forEach(filename => req(filename));
-}
-
-configure(loadStories, module);

package/.storybook/postcss.config.js

@@ -1,6 +0,0 @@
-module.exports = ({ file, options, env }) => ({
-  parser: false,
-  plugins: {
-    'autoprefixer': env === 'production' ? options.autoprefixer : false,
-  }
-});

package/.storybook/preview-head.html

@@ -1,10 +0,0 @@
-<link rel="stylesheet" type="text/css" charset="UTF-8"
-    href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.css" />
-<link rel="stylesheet" type="text/css"
-    href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick-theme.min.css" />
-
-<link rel="stylesheet" type="text/css"
-    href="https://cdn.jsdelivr.net/npm/react-checkbox-tree@1.5.1/lib/react-checkbox-tree.css" />
-
-<link rel="stylesheet" type="text/css"
-    href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css" />