@bytebrand/fe-ui-core 4.6.10 → 4.6.12

package/package.json

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

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

@@ -85,8 +85,8 @@ const VehicleInfo: React.FC<IVehicleInfoProps> = (props) => {
       description: decoratedProps[prop].value,
       className: styles[decoratedProps[prop].name],
       classNameIcon: (vehicleComponentName === 'search' || 'myVehicles' || 'favorite' || 'recently') && styles.carIconSearch,
-      smalltext: prop === 'consumptionCombinedAlternateView',
-      hybridPlugin: engineData.hybridPlugin 
+      smalltext: prop === ('consumptionCombinedAlternateView' || prop === 'consumptionHydrogenCombinedAlternateView') && vehicleComponentName !== 'search',
+      hybridPlugin: engineData.hybridPlugin && prop === 'consumptionCombinedAlternateView' && vehicleComponentName !== 'search'
     }));
 
     return mainPropertiesList.map((property: any, index: number) => (

package/source/framework/vehiclesProps/decoratedLightProps.tsx

@@ -115,7 +115,7 @@ const getDecoratedLightProps = (
         const consumptionCombined = car.consumption.consumptionCombined;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
         const translatedUnit = t(`cbd:${consumptionUnit}`);
-        const wltpConsumptionCombined = car.consumption.wltpCombined;
+        const wltpConsumptionCombined = car.consumption.wltpCombined || car.consumption.wltpWeightedCombined;
         const wltpCo2 = car.environmentEmissions.wltpCo2 || car.consumption.wltpCo2;
 
         const co2 = car.environmentEmissions.co2;

package/source/framework/vehiclesProps/decoratedProps.tsx

@@ -814,18 +814,27 @@ const getDecoratedProps = (
       get value() {
         const consumptionCombined = +car.consumption.consumptionCombined;
         const consumptionPowerCombined = +car.consumption.consumptionPowerCombined;
-        const wltpWeightedPowerCombined = car.consumption.wltpWeightedPowerCombined;
+        // const wltpPowerCombined = car.consumption.wltpPowerCombined || car.consumption.wltpWeightedPowerCombined;
+        const wltpCombined = car.consumption.wltpCombined || car.consumption.wltpWeightedCombined;
         const wltpWeightedCombined = car.consumption.wltpWeightedCombined;
+        const wltpWeightedPowerCombined = car.consumption.wltpWeightedPowerCombined;
 
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
         const translatedUnit = t(`cbd:${consumptionUnit}`);
 
         const consumptionPowerCombinedContent = t('vehicleProps:value.consumptionPowerCombined', { consumption: consumptionPowerCombined.toLocaleString(language), unit: translatedUnit });
-        const wltpConsumptionPowerCombinedContent = wltpWeightedPowerCombined
+        // const wltpConsumptionPowerCombinedContent = wltpPowerCombined
+        //   ? t('vehicleProps:value.consumptionPowerCombined', { consumption: wltpPowerCombined.toLocaleString(language), unit: translatedUnit })
+        //   : null;
+
+        const wltpConsumptionWeightedPowerCombinedContent = wltpWeightedPowerCombined
           ? t('vehicleProps:value.consumptionPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit })
           : null;
         const consumptionCombinedContent = t('vehicleProps:value.consumptionCombined', { consumption: consumptionCombined.toLocaleString(language), unit: translatedUnit });
-        const wltpConsumptionCombinedContent = wltpWeightedCombined ?
+        const wltpConsumptionCombinedContent = wltpCombined ?
+          t('vehicleProps:value.consumptionCombined', { consumption: wltpCombined.toLocaleString(language), unit: translatedUnit })
+          : null;
+        const wltpConsumptionWeightedCombinedContent = wltpWeightedCombined ?
           t('vehicleProps:value.consumptionCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit })
           : null;
 
@@ -842,12 +851,18 @@ const getDecoratedProps = (
         : null;
         const hybridPlugin = car.engineData.hybridPlugin;
 
+        if (hybridPlugin && wltpConsumptionWeightedPowerCombinedContent && wltpConsumptionWeightedCombinedContent) {
+          return <React.Fragment>
+            {wrapValue(wltpConsumptionWeightedPowerCombinedContent)}{', '}
+            {wrapValue(wltpConsumptionWeightedCombinedContent)}{', '}
+            {wrapValue(wltpCo2PluginValue)}
+          </React.Fragment>
+        }
+
         if (wltpConsumptionCombinedContent && wltpCo2Value) {
           return <React.Fragment>
-            {wltpConsumptionPowerCombinedContent && hybridPlugin ? wrapValue(wltpConsumptionPowerCombinedContent) : ''}
-            {wltpConsumptionPowerCombinedContent && hybridPlugin ? ', ' : ''}
             {wrapValue(wltpConsumptionCombinedContent)}{', '}
-            {hybridPlugin ? wrapValue(wltpCo2PluginValue) : wrapValue(wltpCo2Value)}
+            {wrapValue(wltpCo2Value)}
           </React.Fragment>
         }
 
@@ -1469,7 +1484,7 @@ const getDecoratedProps = (
       }
     },
     wltpPowerCombinedPlugin: {
-      title: t('vehicleProps:title.wltpPowerCombinedPlugin'),
+      title: t('vehicleProps:title.wltpPowerCombined'),
       get value() {
         const wltpPowerCombined = car.consumption.wltpPowerCombined;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
@@ -1480,7 +1495,7 @@ const getDecoratedProps = (
       }
     },
     wltpPowerSlowPlugin: {
-      title: t('vehicleProps:title.wltpPowerSlowPlugin'),
+      title: t('vehicleProps:title.wltpPowerSlow'),
       get value() {
         const wltpPowerSlow = car.consumption.wltpPowerSlow;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
@@ -1491,7 +1506,7 @@ const getDecoratedProps = (
       }
     },
     wltpPowerMediumPlugin: {
-      title: t('vehicleProps:title.wltpPowerMediumPlugin'),
+      title: t('vehicleProps:title.wltpPowerMedium'),
       get value() {
         const wltpPowerMedium = car.consumption.wltpPowerMedium;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
@@ -1502,7 +1517,7 @@ const getDecoratedProps = (
       }
     },
     wltpPowerFastPlugin: {
-      title: t('vehicleProps:title.wltpPowerFastPlugin'),
+      title: t('vehicleProps:title.wltpPowerFast'),
       get value() {
         const wltpPowerFast = car.consumption.wltpPowerFast;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
@@ -1513,7 +1528,7 @@ const getDecoratedProps = (
       }
     },
     wltpPowerVeryFastPlugin: {
-      title: t('vehicleProps:title.wltpPowerVeryFastPlugin'),
+      title: t('vehicleProps:title.wltpPowerVeryFast'),
       get value() {
         const wltpPowerVeryFast = car.consumption.wltpPowerVeryFast;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';

package/source/framework/vehiclesProps/vehicleDetails.ts

@@ -44,7 +44,7 @@ const environmentElectroWLTP = ['wltpPowerCombined', 'wltpCo2', 'wltpRange', 'wl
   'wltpPowerFast', 'wltpPowerVeryFast', 'powerPrice', 'consumptionPriceYear', 'wltpEnergyEfficiencyClass'];
 const environmentPluginHybridWLTP = ['wltpWeightedCombined', 'wltpTotalRange', 'wltpWeightedPowerCombined', 'wltpCo2Plugin',
   'wltpCo2Discharged', 'wltpPowerCombinedPlugin', 'wltpPowerSlowPlugin', 'wltpPowerMediumPlugin', 'wltpPowerFastPlugin', 'wltpPowerVeryFastPlugin',
-  'wltpCombinedPlugin', 'wltpSlowPlugin', 'wltpMediumPlugin', 'wltpFastPlugin', 'wltpPowerFastPlugin',
+  'wltpCombinedPlugin', 'wltpSlowPlugin', 'wltpMediumPlugin', 'wltpFastPlugin', 'wltpVeryFastPlugin',
   'fuelPrice', 'powerPrice', 'consumptionPriceYear', 'wltpEnergyEfficiencyClass'];
 const environmentElectroBenzinDieselEthanolHybridWLTP = ['wltpCombined', 'wltpCo2', 'wltpSlow', 'wltpMedium', 'wltpFast', 'wltpVeryFast', 'fuelPrice', 'consumptionPriceYear', 'wltpEnergyEfficiencyClass'];
 const environmentHydrogenWLTP = ['wltpCombinedGas', 'wltpCo2', 'wltpSlowGas', 'wltpMediumGas', 'wltpFastGas', 'wltpVeryFastGas', 'fuelPrice', 'consumptionPriceYear', 'wltpEnergyEfficiencyClass'];
@@ -276,13 +276,13 @@ export const wltpDetails = [
     ]
   },
   {
-    selector: 'selector_fuel_electrical',
+    selector: 'selector_fuel_hybridElectricalPetrol',
     wltp: [
-      ...environmentElectroWLTP
+      ...environmentElectroBenzinDieselEthanolHybridWLTP
     ]
   },
   {
-    selector: 'selector_fuel_hybridElectricalPetrol',
+    selector: 'selector_fuel_hybridElectricalDiesel',
     wltp: [
       ...environmentElectroBenzinDieselEthanolHybridWLTP
     ]