@bytebrand/fe-ui-core 4.8.0 → 4.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/fe-ui-core",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "description": "UI components for the auto.de project",
   "main": "index.ts",
   "module": "dist/common.js",
@@ -13,6 +13,7 @@
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.21.0",
     "@bytebrand/car-schema-selectors": "^2.0.7",
+    "@bytebrand/fe-financing": "^5.10.6",
     "@bytebrand/fe-histoslider": "3.0.0",
     "@bytebrand/i18n-dictionaries": "^0.7.5",
     "@emotion/react": "^11.9.3",

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

@@ -65,7 +65,7 @@ const VehicleInfo: React.FC<IVehicleInfoProps> = (props) => {
     },
     environmentEmissions: {
       co2: environmentEmissions.co2,
-      wltpCo2: environmentEmissions.wltpCo2 || consumption.wltpCo2
+      wltpCo2: environmentEmissions.wltpCo2
     },
     consumption: {
       fuel: consumption.fuel,

package/source/framework/DataTransformers.ts

@@ -68,7 +68,7 @@ export const transformDataForDecoratedCar = (car: any) => {
     tareWeight: _get(car, 'sizeVolumeWeight.emptyWeight', null),
     bootCapacity: _get(car, 'sizeVolumeWeight.cargoCapacity', null),
     capacityLoad: _get(car, 'sizeVolumeWeight.completeCapacity', null),
-    wltpCo2: _get(car, 'consumption.wltpCo2', _get(car, 'environmentEmissions.wltpCo2')),
+    wltpCo2:  _get(car, 'environmentEmissions.wltpCo2', 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)),

package/source/framework/constants.ts

@@ -19,10 +19,6 @@ export const FIFTEEN = 15; // font-size
 export const FOURTEEN = 14;
 export const HUNDRED = 100;
 export const THOUSAND = 1000;
-export const WLTP_COMBINED_DEFAULT = 19.9;
-export const WLTP_POWER_COMBINED_DEFAULT = 29.9;
-export const WLTP_CO2_DEFAULT = 499;
-export const WLTP_CO2_ELECTRIC_DEFAULT = 0;
 
 export const CONTAINER_STYLES = {
   display: 'flex',

package/source/framework/vehiclesProps/decoratedLightProps.tsx

@@ -3,7 +3,7 @@ import * as React from 'react';
 // import { cbdGearbox, cbdFuel } from './cbdSelectors'
 import { formatMileage } from '../utils/CommonUtils';
 import { formatTimestamp } from '../utils/DateUtils';
-import { DELIVERY_PERIODS_EXTRA, WLTP_COMBINED_DEFAULT, WLTP_CO2_DEFAULT, WLTP_CO2_ELECTRIC_DEFAULT, WLTP_POWER_COMBINED_DEFAULT } from '../constants';
+import { DELIVERY_PERIODS_EXTRA } from '../constants';
 import moment from 'moment';
 import { IDecoratedProp } from '../types/types';
 
@@ -122,7 +122,7 @@ const getDecoratedLightProps = (
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         const wltpConsumptionCombined = car.consumption.wltpCombined || car.consumption.wltpWeightedCombined;
-        const wltpCo2 = car.environmentEmissions.wltpCo2 || car.consumption.wltpCo2;
+        const wltpCo2 = car.environmentEmissions.wltpCo2;
         const consumptionPowerCombined = car.consumption.consumptionCombined;
 
         const co2 = car.environmentEmissions.co2;
@@ -149,17 +149,6 @@ const getDecoratedLightProps = (
           ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
           : t('vehicleProps:value.na');
 
-
-        const wltpCo2DefaultWtdValue = t('vehicleProps:value.wltpCo2WtdCombined', { co2: WLTP_CO2_DEFAULT.toLocaleString(language) });
-        const wltpCo2DefaultValue = t('vehicleProps:value.wltpCo2Combined', { co2: WLTP_CO2_DEFAULT.toLocaleString(language) });
-        const wltpPowerCombinedDefaultValue = t('vehicleProps:value.wltpPowerCombined', { consumption: WLTP_POWER_COMBINED_DEFAULT.toLocaleString(language), unit: translatedUnit });
-        const wltpCombinedDefaultValue = t('vehicleProps:value.consumptionCombined', { consumption: WLTP_COMBINED_DEFAULT.toLocaleString(language), unit: translatedUnit });
-
-        const eightMonthsAgo = new Date();
-        eightMonthsAgo.setMonth(eightMonthsAgo.getMonth() - 8); // Subtract 8 months from the current date
-
-        const registrationDate = new Date(firstRegistration * 1000);
-
         const hybridPlugin = car.engineData.hybridPlugin;
         const wltpWeightedPowerCombined = car.consumption.wltpWeightedPowerCombined;
         const wltpWeightedCombined = car.consumption.wltpWeightedCombined;
@@ -175,13 +164,7 @@ const getDecoratedLightProps = (
                 {wltpCo2PluginValue}
               </React.Fragment>
           }
-          if ((!wltpWeightedPowerCombinedContent || !wltpWeightedCombinedContent || !wltpCo2PluginValue) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
-            return <React.Fragment>
-              {`${wltpPowerCombinedDefaultValue}, `}
-              {`${wltpCombinedDefaultValue}, `}
-              {wltpCo2DefaultWtdValue}
-            </React.Fragment>
-          }
+
           return Number.isFinite(consumptionCombined) || Number.isFinite(consumptionPowerCombined)
             ? <React.Fragment>
               {consumptionPowerCombined ? consumptionPowerCombinedContent : t('vehicleProps:value.na')} <br />{consumptionValue} <br /> {co2Value}
@@ -194,10 +177,6 @@ const getDecoratedLightProps = (
           return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
 
-        if ((!wltpConsumptionValue || !wltpCo2Value) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
-          return <>{wltpCombinedDefaultValue} {wltpCo2DefaultValue}</>;
-        }
-
         return <>{consumptionValue} <br /> {co2Value}</>;
       }
     },
@@ -211,15 +190,7 @@ const getDecoratedLightProps = (
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         const co2 = car.environmentEmissions.co2;
         const wltpConsumptionPowerCombined = car.consumption.wltpPowerCombined || car.consumption.wltpWeightedPowerCombined;
-        const wltpCo2 = car.consumption.wltpCo2 || car.environmentEmissions.wltpCo2;
-
-        const wltpCo2ElectricDefaultValue = t('vehicleProps:value.wltpCo2Combined', { co2: WLTP_CO2_ELECTRIC_DEFAULT.toLocaleString(language) });
-        const wltpPowerCombinedDefaultValue = t('vehicleProps:value.wltpPowerCombined', { consumption: WLTP_POWER_COMBINED_DEFAULT.toLocaleString(language), unit: translatedUnit });
-
-        const eightMonthsAgo = new Date();
-        eightMonthsAgo.setMonth(eightMonthsAgo.getMonth() - 8); // Subtract 8 months from the current date
-
-        const registrationDate = new Date(firstRegistration * 1000);
+        const wltpCo2 = car.environmentEmissions.wltpCo2;
 
         const wltpConsumptionValue = Number.isFinite(wltpConsumptionPowerCombined)
           ? t('vehicleProps:value.wltpPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
@@ -241,10 +212,6 @@ const getDecoratedLightProps = (
           return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
 
-        if ((!wltpConsumptionValue && !wltpCo2Value) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
-          return <>{wltpPowerCombinedDefaultValue}, {wltpCo2ElectricDefaultValue}</>;
-        }
-
         return <>{consumptionValue} <br /> {co2Value} </>;
       }
     },
@@ -277,7 +244,7 @@ const getDecoratedLightProps = (
           : null;
 
         const co2 = car.environmentEmissions.co2;
-        const wltpCo2 = car.consumption.wltpCo2 || car.environmentEmissions.wltpCo2;
+        const wltpCo2 = car.environmentEmissions.wltpCo2;
 
         const co2Value = Number.isFinite(co2)
         ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
@@ -291,15 +258,6 @@ const getDecoratedLightProps = (
           ? t('vehicleProps:value.wltpCo2WtdCombined', { co2: wltpCo2.toLocaleString(language), unit: translatedUnit })
           : null;
 
-        const wltpCo2DefaultWtdValue = t('vehicleProps:value.wltpCo2WtdCombined', { co2: WLTP_CO2_DEFAULT.toLocaleString(language) });
-        const wltpCo2DefaultValue = t('vehicleProps:value.wltpCo2Combined', { co2: WLTP_CO2_DEFAULT.toLocaleString(language) });
-        const wltpPowerCombinedDefaultValue = t('vehicleProps:value.wltpPowerCombined', { consumption: WLTP_POWER_COMBINED_DEFAULT.toLocaleString(language), unit: translatedUnit });
-        const wltpCombinedDefaultValue = t('vehicleProps:value.consumptionCombined', { consumption: WLTP_COMBINED_DEFAULT.toLocaleString(language), unit: translatedUnit });
-
-        const eightMonthsAgo = new Date();
-        eightMonthsAgo.setMonth(eightMonthsAgo.getMonth() - 8); // Subtract 8 months from the current date
-        const registrationDate = new Date(firstRegistration * 1000);
-
         const hybridPlugin = car.engineData.hybridPlugin;
 
         if (hybridPlugin) {
@@ -310,13 +268,6 @@ const getDecoratedLightProps = (
                 {wltpCo2PluginValue}
               </React.Fragment>
           }
-          if ((!wltpWeightedPowerCombinedContent || !wltpWeightedCombinedContent || !wltpCo2PluginValue) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
-            return <React.Fragment>
-              {`${wltpPowerCombinedDefaultValue}, `}
-              {`${wltpCombinedDefaultValue}, `}
-              {wltpCo2DefaultWtdValue}
-            </React.Fragment>
-          }
         }
 
         if (wltpConsumptionPowerCombinedContent && wltpConsumptionCombinedContent && wltpCo2Value) {
@@ -327,13 +278,6 @@ const getDecoratedLightProps = (
             </React.Fragment>
         }
 
-        if ((!wltpConsumptionPowerCombinedContent || !wltpConsumptionCombinedContent || !wltpCo2Value) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
-          return <React.Fragment>
-              {`${wltpCombinedDefaultValue}, `}
-              {wltpCo2DefaultValue}
-            </React.Fragment>
-        }
-
         return Number.isFinite(consumptionCombined) || Number.isFinite(consumptionPowerCombined)
           ? <React.Fragment>
             {consumptionPowerCombined ? consumptionPowerCombinedContent : t('vehicleProps:value.na')} <br />{consumptionCombinedContent} <br /> {co2Value}
@@ -352,7 +296,7 @@ const getDecoratedLightProps = (
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         const co2 = car.environmentEmissions.co2;
         const wltpConsumptionCombined = car.consumption.wltpCombined;
-        const wltpCo2 = car.consumption.wltpCo2 || car.environmentEmissions.wltpCo2;
+        const wltpCo2 = car.environmentEmissions.wltpCo2;
 
         const consumptionValue = Number.isFinite(consumptionHydrogenCombined)
           ? t('vehicleProps:value.consumptionGas', { consumption: consumptionHydrogenCombined.toLocaleString(language), unit: translatedUnit })
@@ -369,21 +313,10 @@ const getDecoratedLightProps = (
           ? t('vehicleProps:value.wltpCo2Combined', { co2: wltpCo2.toLocaleString(language) })
           : null;
 
-        const wltpCo2DefaultValue = t('vehicleProps:value.wltpCo2Combined', { co2: WLTP_CO2_DEFAULT.toLocaleString(language) });
-        const wltpCombinedDefaultValue = t('vehicleProps:value.wltpCombinedGas', { consumption: WLTP_COMBINED_DEFAULT.toLocaleString(language), unit: translatedUnit });
-
-        const eightMonthsAgo = new Date();
-        eightMonthsAgo.setMonth(eightMonthsAgo.getMonth() - 8); // Subtract 8 months from the current date
-        const registrationDate = new Date(firstRegistration * 1000);
-
         if (wltpConsumptionValue && wltpCo2Value) {
           return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
 
-        if ((!wltpConsumptionValue || !wltpCo2Value) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
-          return <>{wltpCombinedDefaultValue}, {wltpCo2DefaultValue}</>;
-        }
-
         return <>{consumptionValue} <br /> {co2Value}</>;
       }
     },
@@ -397,7 +330,7 @@ const getDecoratedLightProps = (
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         const co2 = car.environmentEmissions.co2;
         const wltpConsumptionCombined = car.consumption.wltpCombined;
-        const wltpCo2 = car.consumption.wltpCo2 || car.environmentEmissions.wltpCo2;
+        const wltpCo2 = car.environmentEmissions.wltpCo2;
 
         const consumptionValue = Number.isFinite(consumptionGasCombined)
           ? t('vehicleProps:value.consumptionGas', { consumption: consumptionGasCombined.toLocaleString(language), unit: translatedUnit })
@@ -415,21 +348,10 @@ const getDecoratedLightProps = (
           ? t('vehicleProps:value.wltpCo2Combined', { co2: wltpCo2.toLocaleString(language) })
           : null;
 
-        const wltpCo2DefaultValue = t('vehicleProps:value.wltpCo2Combined', { co2: WLTP_CO2_DEFAULT.toLocaleString(language) });
-        const wltpCombinedDefaultValue = t('vehicleProps:value.wltpCombinedGas', { consumption: WLTP_COMBINED_DEFAULT.toLocaleString(language), unit: translatedUnit });
-
-        const eightMonthsAgo = new Date();
-        eightMonthsAgo.setMonth(eightMonthsAgo.getMonth() - 8); // Subtract 8 months from the current date
-        const registrationDate = new Date(firstRegistration * 1000);
-
         if (wltpConsumptionValue && wltpCo2Value) {
           return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
 
-        if ((!wltpConsumptionValue || !wltpCo2Value) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
-          return <>{wltpCombinedDefaultValue}, {wltpCo2DefaultValue}</>;
-        }
-
         return <>{consumptionValue} <br /> {co2Value}</>;
       }
     },

package/source/framework/vehiclesProps/decoratedProps.tsx

@@ -9,7 +9,7 @@ import { EMISSION_STICKERS_ICONS, WP_EMISSION_STICKERS_ICONS } from '../constant
 import { DELIVERY_PERIODS_EXTRA } from '../constants';
 import { IDecoratedProp, ICar } from '../types/types';
 import { getFormattedPrice } from '../utils/CommonUtils';
-import { IWltpConsumption } from '../types/types';
+import { getVehicleTax, getFuelPrice, co2DefaultCostsLow, co2DefaultCostsMedium, co2DefaultCostsHigh, getBaseFuelPrice, getCo2Price } from '@bytebrand/fe-financing';
 
 const formatDeliveryPeriod = (t: (key: string, options?: object) => string, deliveryPeriod: string) => {
   const count: number = +DELIVERY_PERIODS_EXTRA.find((period: any) => period.value === deliveryPeriod).label;
@@ -72,9 +72,7 @@ const getDecoratedProps = (
   car: ICar, // @TODO should have a proper interface
   t: (key: string, options?: object) => string,
   language: string = 'en',
-  simplifiedLabels: boolean = false, // shortened labels for repsonsive layout (see 'power'),
-  getFuelPrice?: (fuelSelector: string, consumption: IWltpConsumption, hybridPlugin?: boolean) => number,
-  getVehicleTax?: (fuelType: string, cubicCapacity: number, co2: number, firstRegistration: number) => number
+  simplifiedLabels: boolean = false // shortened labels for repsonsive layout (see 'power'),
 ): IDecoratedProp => {
   const {
     offer = {},
@@ -1171,7 +1169,7 @@ const getDecoratedProps = (
     wltpCo2Discharged: {
       title: t('vehicleProps:title.wltpCo2Discharged'),
       get value() {
-        const wltpCo2 = car.environmentEmissions.wltpCo2Discharged;
+        const wltpCo2 = car.environmentEmissions.wltpCo2;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         return Number.isFinite(wltpCo2)
@@ -1552,41 +1550,49 @@ const getDecoratedProps = (
         }
         const fuelCost = getFuelPrice(fuel, consumption, hybridPlugin);
         return Number.isFinite(fuelCost)
-          ? t('vehicleProps:value.price', { price: getFormattedPrice(fuelCost, '$,.2f') })
+          ? t('vehicleProps:value.pricePerYear', { price: getFormattedPrice(fuelCost, '$,.2f') })
           : t('vehicleProps:value.na');
       }
     },
     wltpCo2CostsLow: {
-      title: t('vehicleProps:title.wltpCo2LowPrice'),
+      title: t('vehicleProps:title.wltpCo2LowPrice', { price: co2DefaultCostsLow }),
       get value() {
-        const basePrice = car.costModel.co2Costs.low.basePrice || 30;
-        return Number.isFinite(basePrice)
-          ? t('vehicleProps:value.price', { price: getFormattedPrice(basePrice, '$,.2f') })
+        const wltpCo2 = car.environmentEmissions.wltpCo2;
+        const { co2PriceLow } = getCo2Price(wltpCo2);
+        return Number.isFinite(co2PriceLow)
+          ? t('vehicleProps:value.wltpCo2Price', { price: getFormattedPrice(co2PriceLow, '$,.2f') })
           : t('vehicleProps:value.na');
       }
     },
     wltpCo2CostsMiddle: {
-      title: t('vehicleProps:title.wltpCo2MidPrice'),
+      title: t('vehicleProps:title.wltpCo2MidPrice', { price: co2DefaultCostsMedium }),
       get value() {
-        const basePrice = car.costModel.co2Costs.middle.basePrice || 50;
-        return Number.isFinite(basePrice)
-          ? t('vehicleProps:value.price', { price: getFormattedPrice(basePrice, '$,.2f') })
+        const wltpCo2 = car.environmentEmissions.wltpCo2;
+        const { co2PriceMedium } = getCo2Price(wltpCo2);
+        return Number.isFinite(co2PriceMedium)
+          ? t('vehicleProps:value.wltpCo2Price', { price: getFormattedPrice(co2PriceMedium, '$,.2f') })
           : t('vehicleProps:value.na');
       }
     },
     wltpCo2CostsHigh: {
-      title: t('vehicleProps:title.wltpCo2HighPrice'),
+      title: t('vehicleProps:title.wltpCo2HighPrice', { price: co2DefaultCostsHigh }),
       get value() {
-        const basePrice = car.costModel.co2Costs.high.basePrice || 70;
-        return Number.isFinite(basePrice)
-          ? t('vehicleProps:value.price', { price: getFormattedPrice(basePrice, '$,.2f') })
+        const wltpCo2 = car.environmentEmissions.wltpCo2;
+        const { co2PriceHigh } = getCo2Price(wltpCo2);
+        return Number.isFinite(co2PriceHigh)
+          ? t('vehicleProps:value.wltpCo2Price', { price: getFormattedPrice(co2PriceHigh, '$,.2f') })
           : t('vehicleProps:value.na');
       }
     },
     powerPrice: {
       title: t('vehicleProps:title.powerPrice'),
       get value() {
-        const { powerPrice } = car.costModel;
+        const fuel = car.consumption.fuel;
+        const { hybridPlugin } = car.engineData;
+
+        const basePowerPrice = getBaseFuelPrice(fuel, hybridPlugin).powerPrice;
+        const powerPrice = car.costModel.powerPrice ? car.costModel.powerPrice : basePowerPrice;
+
         return Number.isFinite(powerPrice)
           ? t('vehicleProps:value.powerPrice', { price: getFormattedPrice(powerPrice, '$,.2f') })
           : t('vehicleProps:value.na');
@@ -1596,21 +1602,11 @@ const getDecoratedProps = (
       title: t('vehicleProps:title.fuelPrice'),
       get value() {
         const fuel = car.consumption.fuel;
-        const wltpCombined = car.consumption.wltpCombined || car.consumption.wltpWeightedCombined;
-        const wltpPowerCombined = car.consumption.wltpPowerCombined || car.consumption.wltpWeightedPowerCombined;
-        const wltpWeightedCombined = car.consumption.wltpWeightedCombined;
-        const wltpWeightedPowerCombined = car.consumption.wltpWeightedPowerCombined;
-
-        const wltpConsumption = {
-          wltpCombined,
-          wltpPowerCombined,
-          wltpWeightedCombined,
-          wltpWeightedPowerCombined
-        };
-
         const { hybridPlugin } = car.engineData;
 
-        const fuelPrice = car.costModel.fuelPrice ? car.costModel.fuelPrice : getFuelPrice(fuel, wltpConsumption, hybridPlugin);
+        const baseFuelPrice = getBaseFuelPrice(fuel, hybridPlugin);
+
+        const fuelPrice = car.costModel.fuelPrice ? car.costModel.fuelPrice : baseFuelPrice;
         return Number.isFinite(fuelPrice)
           ? t('vehicleProps:value.fuelPrice', { price: getFormattedPrice(fuelPrice, '$,.2f') })
           : t('vehicleProps:value.na');

package/source/framework/vehiclesProps/vehicleDetails.ts

@@ -48,7 +48,7 @@ const environmentPluginHybridWLTP = ['wltpWeightedCombined', 'wltpTotalRange', '
   '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'];
-const costModel = ['wltpEnergyCosts', 'wltpCo2CostsLow', 'wltpCo2CostsMiddle', 'wltpCo2CostsHigh', 'wltpCostModelTax'];
+const costModel = ['wltpEnergyCosts', 'wltpCo2CostsMiddle', 'wltpCo2CostsLow', 'wltpCo2CostsHigh', 'wltpCostModelTax'];
 
 export const engineDetails: IEngineDetails = [
   {