@bytebrand/fe-ui-core 4.8.6 → 4.8.8

package/package.json

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

package/source/framework/types/types.ts

@@ -363,7 +363,7 @@ export interface IFinancingUtils {
   co2DefaultCostsMedium: number;
   co2DefaultCostsHigh: number;
   getVehicleTax: (fuelType: string, cubicCapacity: number, co2: number, firstRegistration: number) => number;
-  getFuelPrice: (fuelSelector: string, consumption: IWltpConsumption, hybridPlugin?: boolean) => number;
+  getFuelPrice: (fuelSelector: string, consumption: IWltpConsumption, hybridPlugin: boolean, powerCost: { fuelPrice?: number, powerPrice?: number }) => number;
   getBaseFuelPrice: (fuelSelector: string, hybridPlugin?: boolean) => { fuelPrice: number, powerPrice?: number };
   getCo2Price: (wltpCo2: number) => { co2PriceLow: number, co2PriceMedium: number, co2PriceHigh: number };
 }

package/source/framework/vehiclesProps/decoratedLightProps.tsx

@@ -153,8 +153,8 @@ const getDecoratedLightProps = (
         const wltpWeightedPowerCombined = car.consumption.wltpWeightedPowerCombined;
         const wltpWeightedCombined = car.consumption.wltpWeightedCombined;
 
-        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;
+        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;
 
         if (hybridPlugin) {
           if (wltpWeightedPowerCombinedContent && wltpWeightedCombinedContent && wltpCo2PluginValue) {
@@ -233,8 +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 = t('vehicleProps:value.wltpPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit });
-        const wltpWeightedCombinedContent = t('vehicleProps:value.wltpCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit });
+        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;

package/source/framework/vehiclesProps/decoratedProps.tsx

@@ -1169,7 +1169,7 @@ const getDecoratedProps = (
     wltpCo2Discharged: {
       title: t('vehicleProps:title.wltpCo2Discharged'),
       get value() {
-        const wltpCo2 = car.environmentEmissions.wltpCo2;
+        const wltpCo2 = car.environmentEmissions.wltpCo2Discharged;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         return Number.isFinite(wltpCo2)
@@ -1544,12 +1544,17 @@ const getDecoratedProps = (
       get value() {
         const { fuel } = car.consumption;
         const { wltpCombined, wltpPowerCombined, wltpWeightedCombined, wltpWeightedPowerCombined } = car.consumption;
+        const { powerPrice, fuelPrice } = car.costModel;
+        const powerCost = {
+          fuelPrice,
+          powerPrice
+        }
         const { hybridPlugin } = car.engineData;
         const consumption = {
           wltpCombined, wltpPowerCombined, wltpWeightedCombined, wltpWeightedPowerCombined
         }
         const { getFuelPrice } = financingUtils;
-        const fuelCost = getFuelPrice(fuel, consumption, hybridPlugin);
+        const fuelCost = getFuelPrice(fuel, consumption, hybridPlugin, powerCost);
         return Number.isFinite(fuelCost)
           ? t('vehicleProps:value.pricePerYear', { price: getFormattedPrice(fuelCost, '$,.2f') })
           : t('vehicleProps:value.na');
@@ -1627,7 +1632,7 @@ const getDecoratedProps = (
 
         const { getBaseFuelPrice } = financingUtils;
 
-        const baseFuelPrice = getBaseFuelPrice(fuel, hybridPlugin).fuelPrice;
+        const baseFuelPrice = getBaseFuelPrice(fuel, hybridPlugin) ? getBaseFuelPrice(fuel, hybridPlugin).fuelPrice : null;
 
         const fuelPrice = car.costModel.fuelPrice ? car.costModel.fuelPrice : baseFuelPrice;
         return Number.isFinite(fuelPrice)
@@ -1653,7 +1658,7 @@ const getDecoratedProps = (
         const { getVehicleTax } = financingUtils;
         const tax = car.costModel.tax ? car.costModel.tax : getVehicleTax(fuel, cubicCapacity, wltpCo2, firstRegistration);
         return Number.isFinite(tax)
-          ? t('vehicleProps:value.price', { price: getFormattedPrice(tax, '$,.2f') })
+          ? t('vehicleProps:value.pricePerYear', { price: getFormattedPrice(tax, '$,.2f') })
           : t('vehicleProps:value.na');
       }
     }

package/source/locales/data.ts

@@ -8,7 +8,7 @@ import { sortingOptions } from './sortingOptions';
 import { transformDataForDecoratedCar } from '../framework/DataTransformers'
 import moment from 'moment';
 import { DELIVERY_PERIODS_EXTRA } from '../framework/constants';
-import { getFormattedPrice } from '../framework/utils/CommonUtils';
+import { getFormattedNumber, getFormattedPrice } from '../framework/utils/CommonUtils';
 
 export const vehicleProps = (car?: any, isOfferAvailable: boolean = true) => {
   const vehicleOption = transformDataForDecoratedCar(car);
@@ -84,11 +84,13 @@ export const vehicleProps = (car?: any, isOfferAvailable: boolean = true) => {
         no: 'Nein',
         yes: 'Ja',
         batteryCapacity: `${vehicleOption.batteryCapacity} kWh`,
-        wltpCo2Combined: `${vehicleOption.wltpCo2}g CO2/km (WLTP, 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}kg/100km`
+        wltpCo2Combined: `${getFormattedNumber(vehicleOption.wltpCo2)}g CO2/km (WLTP, komb)*`,
+        wltpCo2WtdCombined: `${getFormattedNumber(vehicleOption.wltpCo2)}g CO2/km (WLTP, gew., komb)*`,
+        wltpCombined: `${getFormattedNumber(vehicleOption.wltpCombined) || getFormattedNumber(vehicleOption.wltpWeightedCombined)}l/100km`,
+        wltpWeightedCombined: `${getFormattedNumber(vehicleOption.wltpWeightedCombined)}l/100km`,
+        wltpWeightedPowerCombined: `${getFormattedNumber(vehicleOption.wltpWeightedPowerCombined)}kWh/100km`,
+        wltpPowerCombined: `${getFormattedNumber(vehicleOption.wltpPowerCombined) || getFormattedNumber(vehicleOption.wltpWeightedPowerCombined)}kWh/100km`,
+        wltpCombinedGas: `${getFormattedNumber(vehicleOption.wltpCombined) || getFormattedNumber(vehicleOption.wltpWeightedCombined)}kg/100km`
       },
       title: {
         'addOfferToMainSlide': 'Zum Schieberegler hinzufügen',