@bytebrand/fe-ui-core 4.6.13 → 4.7.0

package/package.json

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

package/source/framework/constants.ts

@@ -18,6 +18,12 @@ export const FIVE = 5; // tab index
 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',
   flexDirection: 'row',

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 } from '../constants';
+import { DELIVERY_PERIODS_EXTRA, WLTP_COMBINED_DEFAULT, WLTP_CO2_DEFAULT, WLTP_CO2_ELECTRIC_DEFAULT, WLTP_POWER_COMBINED_DEFAULT } from '../constants';
 import moment from 'moment';
 import { IDecoratedProp } from '../types/types';
 
@@ -123,6 +123,7 @@ const getDecoratedLightProps = (
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         const wltpConsumptionCombined = car.consumption.wltpCombined || car.consumption.wltpWeightedCombined;
         const wltpCo2 = car.environmentEmissions.wltpCo2 || car.consumption.wltpCo2;
+        const consumptionPowerCombined = car.consumption.consumptionCombined;
 
         const co2 = car.environmentEmissions.co2;
 
@@ -142,10 +143,23 @@ 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');
 
+
+        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;
@@ -154,17 +168,36 @@ const getDecoratedLightProps = (
         const wltpWeightedCombinedContent = wltpWeightedCombined ? t('vehicleProps:value.wltpCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit }) : null;
 
         if (hybridPlugin) {
-          return <React.Fragment>
-            {wltpWeightedPowerCombinedContent ? `${wltpWeightedPowerCombinedContent}, ` : ''}
-            {wltpWeightedCombinedContent ? `${wltpWeightedCombinedContent}, ` : ''}
-            {wltpCo2PluginValue}
-          </React.Fragment>
+          if (wltpWeightedPowerCombinedContent && wltpWeightedCombinedContent && wltpCo2PluginValue) {
+            return <React.Fragment>
+                {`${wltpWeightedPowerCombinedContent}, `}
+                {`${wltpWeightedCombinedContent}, `}
+                {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}
+            </React.Fragment>
+            : t('vehicleProps:value.na');
+
         }
 
         if (wltpConsumptionValue && wltpCo2Value) {
           return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
 
+        if ((!wltpConsumptionValue || !wltpCo2Value) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
+          return <>{wltpCombinedDefaultValue} {wltpCo2DefaultValue}</>;
+        }
+
         return <>{consumptionValue} <br /> {co2Value}</>;
       }
     },
@@ -177,9 +210,17 @@ const getDecoratedLightProps = (
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         const co2 = car.environmentEmissions.co2;
-        const wltpConsumptionPowerCombined = car.consumption.wltpPowerCombined;
+        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 wltpConsumptionValue = Number.isFinite(wltpConsumptionPowerCombined)
           ? t('vehicleProps:value.wltpPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
           : null;
@@ -200,6 +241,10 @@ const getDecoratedLightProps = (
           return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
 
+        if ((!wltpConsumptionValue && !wltpCo2Value) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
+          return <>{wltpPowerCombinedDefaultValue}, {wltpCo2ElectricDefaultValue}</>;
+        }
+
         return <>{consumptionValue} <br /> {co2Value} </>;
       }
     },
@@ -210,8 +255,10 @@ const getDecoratedLightProps = (
       get value() {
         const consumptionCombined = +car.consumption.consumptionCombined;
         const consumptionPowerCombined = +car.consumption.consumptionPowerCombined;
-        const wltpConsumptionPowerCombined = car.consumption.wltpPowerCombined;
-        const wltpConsumptionCombined = car.consumption.wltpCombined;
+        const wltpConsumptionPowerCombined = car.consumption.wltpPowerCombined || car.consumption.wltpWeightedPowerCombined;
+
+        const wltpConsumptionCombined = car.consumption.wltpCombined || car.consumption.wltpWeightedCombined;
+
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
         const translatedUnit = t(`cbd:${consumptionUnit}`);
         const wltpWeightedPowerCombined = car.consumption.wltpWeightedPowerCombined;
@@ -237,24 +284,54 @@ const getDecoratedLightProps = (
         : t('vehicleProps:value.na');
 
         const wltpCo2Value = Number.isFinite(co2)
-        ? t('vehicleProps:value.wltpCo2WtdCombined', { co2: wltpCo2.toLocaleString(language) })
-        : null;
+          ? t('vehicleProps:value.wltpCo2WtdCombined', { co2: wltpCo2.toLocaleString(language) })
+          : null;
+
+        const wltpCo2PluginValue = Number.isFinite(wltpCo2)
+          ? 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 (wltpWeightedCombinedContent && wltpWeightedPowerCombinedContent && wltpCo2Value) {
-          if (hybridPlugin) {
-              return <React.Fragment>
-              {`${wltpWeightedPowerCombinedContent}, `}
-              {`${wltpWeightedCombinedContent}, `}
-              {wltpCo2Value}
+        if (hybridPlugin) {
+          if (wltpWeightedPowerCombinedContent && wltpWeightedCombinedContent && wltpCo2PluginValue) {
+            return <React.Fragment>
+                {`${wltpWeightedPowerCombinedContent}, `}
+                {`${wltpWeightedCombinedContent}, `}
+                {wltpCo2PluginValue}
+              </React.Fragment>
+          }
+          if ((!wltpWeightedPowerCombinedContent || !wltpWeightedCombinedContent || !wltpCo2PluginValue) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
+            return <React.Fragment>
+              {`${wltpPowerCombinedDefaultValue}, `}
+              {`${wltpCombinedDefaultValue}, `}
+              {wltpCo2DefaultWtdValue}
             </React.Fragment>
           }
+        }
+
+        if (wltpConsumptionPowerCombinedContent && wltpConsumptionCombinedContent && wltpCo2Value) {
           return <React.Fragment>
-            {wltpConsumptionPowerCombinedContent && hybridPlugin ? `${wltpConsumptionPowerCombinedContent}, ` : ''}
-            {wltpConsumptionPowerCombinedContent && hybridPlugin ? `${wltpConsumptionPowerCombinedContent}, ` : ''}
-            {wltpConsumptionCombinedContent}, {wltpCo2Value}
-          </React.Fragment>
+              {`${wltpConsumptionPowerCombinedContent}, `}
+              {`${wltpWeightedCombinedContent}, `}
+              {wltpCo2PluginValue}
+            </React.Fragment>
+        }
+
+        if ((!wltpConsumptionPowerCombinedContent || !wltpConsumptionCombinedContent || !wltpCo2Value) && (mileage <= 1000 || registrationDate >= eightMonthsAgo)) {
+          return <React.Fragment>
+              {`${wltpCombinedDefaultValue}, `}
+              {wltpCo2DefaultValue}
+            </React.Fragment>
         }
 
         return Number.isFinite(consumptionCombined) || Number.isFinite(consumptionPowerCombined)
@@ -292,10 +369,21 @@ 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}</>;
       }
     },
@@ -327,10 +415,21 @@ 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/locales/data.ts

@@ -88,7 +88,7 @@ export const vehicleProps = (car?: any, isOfferAvailable: boolean = true) => {
         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`
+        wltpCombinedGas: `${vehicleOption.wltpCombined || vehicleOption.wltpWeightedCombined}kg/100km`
       },
       title: {
         'addOfferToMainSlide': 'Zum Schieberegler hinzufügen',