@bytebrand/fe-ui-core 4.6.11 → 4.6.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/fe-ui-core",
-  "version": "4.6.11",
+  "version": "4.6.13",
   "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/DataTransformers.ts

@@ -68,10 +68,12 @@ export const transformDataForDecoratedCar = (car: any) => {
     tareWeight: _get(car, 'sizeVolumeWeight.emptyWeight', null),
     bootCapacity: _get(car, 'sizeVolumeWeight.cargoCapacity', null),
     capacityLoad: _get(car, 'sizeVolumeWeight.completeCapacity', null),
-    wltpCombined: _get(car, 'consumption.wltpCombined', null),
-    wltpPowerCombined: _get(car, 'consumption.wltpPowerCombined', null),
     wltpCo2: _get(car, 'consumption.wltpCo2', _get(car, 'environmentEmissions.wltpCo2')),
-    pluginHybrid: _get(car, 'engineData.pluginHybrid', null)
+    pluginHybrid: _get(car, 'engineData.pluginHybrid', null),
+    wltpCombined: _get(car, 'consumption.wltpCombined', _get(car, 'consumption.wltpWeightedCombined', null)),
+    wltpPowerCombined: _get(car, 'consumption.wltpPowerCombined', _get(car, 'consumption.wltpWeightedPowerCombined', null)),
+    wltpWeightedCombined: _get(car, 'consumption.wltpWeightedCombined', null),
+    wltpWeightedPowerCombined: _get(car, 'consumption.wltpWeightedPowerCombined', null)
   };
 };
 

package/source/framework/vehiclesProps/decoratedLightProps.tsx

@@ -103,6 +103,12 @@ const getDecoratedLightProps = (
         const consumptionCombined = car.consumption.consumptionCombined;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
         const translatedUnit = t(`cbd:${consumptionUnit}`);
+        const wltpCombined = car.consumption.wltpCombined || car.consumption.wltpWeightedCombined;
+        if (wltpCombined) {
+          return Number.isFinite(wltpCombined)
+            ? t('vehicleProps:value.wltpCombined', { consumption: wltpCombined.toLocaleString(language), unit: translatedUnit })
+            : t('vehicleProps:value.na');
+        }
         return Number.isFinite(consumptionCombined)
           ? t('vehicleProps:value.consumption', { consumption: consumptionCombined.toLocaleString(language), unit: translatedUnit })
           : t('vehicleProps:value.na');
@@ -115,13 +121,13 @@ 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;
 
         const wltpConsumptionValue = Number.isFinite(wltpConsumptionCombined)
-          ? t('vehicleProps:value.consumptionCombined', { consumption: wltpConsumptionCombined.toLocaleString(language), unit: translatedUnit })
+          ? t('vehicleProps:value.wltpCombined', { consumption: wltpConsumptionCombined.toLocaleString(language), unit: translatedUnit })
           : null;
 
         const wltpCo2PluginValue = Number.isFinite(wltpCo2)
@@ -144,13 +150,14 @@ const getDecoratedLightProps = (
         const wltpWeightedPowerCombined = car.consumption.wltpWeightedPowerCombined;
         const wltpWeightedCombined = car.consumption.wltpWeightedCombined;
 
-        const wltpWeightedPowerCombinedContent = wltpWeightedPowerCombined ? t('vehicleProps:value.consumptionPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit }) : null;
-        const wltpWeightedCombinedContent = wltpWeightedCombined ? t('vehicleProps:value.consumptionCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit }) : null;
+        const wltpWeightedPowerCombinedContent = wltpWeightedPowerCombined ? t('vehicleProps:value.wltpPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit }) : null;
+        const wltpWeightedCombinedContent = wltpWeightedCombined ? t('vehicleProps:value.wltpCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit }) : null;
 
         if (hybridPlugin) {
           return <React.Fragment>
-            {`${wltpWeightedPowerCombinedContent}, `}
-            {wltpWeightedCombinedContent}, {wltpCo2PluginValue}
+            {wltpWeightedPowerCombinedContent ? `${wltpWeightedPowerCombinedContent}, ` : ''}
+            {wltpWeightedCombinedContent ? `${wltpWeightedCombinedContent}, ` : ''}
+            {wltpCo2PluginValue}
           </React.Fragment>
         }
 
@@ -174,7 +181,7 @@ const getDecoratedLightProps = (
         const wltpCo2 = car.consumption.wltpCo2 || car.environmentEmissions.wltpCo2;
 
         const wltpConsumptionValue = Number.isFinite(wltpConsumptionPowerCombined)
-          ? t('vehicleProps:value.consumptionPower', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
+          ? t('vehicleProps:value.wltpPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
           : null;
 
         const wltpCo2Value = Number.isFinite(wltpCo2)
@@ -212,14 +219,14 @@ 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 = t('vehicleProps:value.consumptionPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit });
-        const wltpWeightedCombinedContent = t('vehicleProps:value.consumptionCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit });
+        const wltpWeightedPowerCombinedContent = t('vehicleProps:value.wltpPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit });
+        const wltpWeightedCombinedContent = t('vehicleProps:value.wltpCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit });
         const wltpConsumptionPowerCombinedContent = wltpConsumptionPowerCombined
-          ? t('vehicleProps:value.consumptionPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
+          ? t('vehicleProps:value.wltpPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
           : null;
 
         const wltpConsumptionCombinedContent = wltpConsumptionCombined ?
-          t('vehicleProps:value.consumptionCombined', { consumption: wltpConsumptionCombined.toLocaleString(language), unit: translatedUnit })
+          t('vehicleProps:value.wltpCombined', { consumption: wltpConsumptionCombined.toLocaleString(language), unit: translatedUnit })
           : null;
 
         const co2 = car.environmentEmissions.co2;
@@ -235,12 +242,12 @@ const getDecoratedLightProps = (
 
         const hybridPlugin = car.engineData.hybridPlugin;
 
-        if (wltpConsumptionCombinedContent && wltpCo2Value) {
+        if (wltpWeightedCombinedContent && wltpWeightedPowerCombinedContent && wltpCo2Value) {
           if (hybridPlugin) {
               return <React.Fragment>
               {`${wltpWeightedPowerCombinedContent}, `}
               {`${wltpWeightedCombinedContent}, `}
-              {wltpConsumptionCombinedContent}, {wltpCo2Value}
+              {wltpCo2Value}
             </React.Fragment>
           }
           return <React.Fragment>
@@ -279,7 +286,7 @@ const getDecoratedLightProps = (
           : t('vehicleProps:value.na');
 
         const wltpConsumptionValue = Number.isFinite(wltpConsumptionCombined)
-          ? t('vehicleProps:value.consumptionGas', { consumption: wltpConsumptionCombined.toLocaleString(language), unit: translatedUnit })
+          ? t('vehicleProps:value.wltpCombinedGas', { consumption: wltpConsumptionCombined.toLocaleString(language), unit: translatedUnit })
           : null;
         const wltpCo2Value = Number.isFinite(wltpCo2)
           ? t('vehicleProps:value.wltpCo2Combined', { co2: wltpCo2.toLocaleString(language) })

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>
         }
 

package/source/framework/vehiclesProps/vehicleDetails.ts

@@ -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
     ]

package/source/locales/data.ts

@@ -49,6 +49,7 @@ export const vehicleProps = (car?: any, isOfferAvailable: boolean = true) => {
         consumptionPowerCombined: `${vehicleOption.consumptionPowerCombined}kWh/100km`,
         consumptionGas: `${vehicleOption.consumptionCombined}kg/100km`,
         consumptionCombined: `${vehicleOption.consumptionCombined}l/100km`,
+        wltpConsumptionCombined: `${vehicleOption.wltpCombined}l/100km`,
         power: `${vehicleOption.powerKW}\u00A0kW (${vehicleOption.powerPS}\u00A0PS)`,
         powerAlternateView: `${vehicleOption.powerKW}\u00A0kW (${vehicleOption.powerPS}\u00A0PS)`,
         powerPS: `${vehicleOption.powerPS} PS`,
@@ -84,8 +85,10 @@ export const vehicleProps = (car?: any, isOfferAvailable: boolean = true) => {
         yes: 'Ja',
         batteryCapacity: `${vehicleOption.batteryCapacity} kWh`,
         wltpCo2Combined: `${vehicleOption.wltpCo2}g CO2/km (WLTP, komb)*`,
-        wltpCo2WtdCombined: `${vehicleOption.wltpCo2}g CO2/km (WLTP, gew., komb)*`
-
+        wltpCo2WtdCombined: `${vehicleOption.wltpCo2}g CO2/km (WLTP, gew., komb)*`,
+        wltpCombined: `${vehicleOption.wltpCombined || vehicleOption.wltpWeightedCombined}l/100km`,
+        wltpPowerCombined: `${vehicleOption.wltpPowerCombined || vehicleOption.wltpWeightedPowerCombined}kWh/100km`,
+        wltpCombinedGas: `${vehicleOption.wltpCombined || vehicleOption.wltpWeightedCombined}g/100km`
       },
       title: {
         'addOfferToMainSlide': 'Zum Schieberegler hinzufügen',