@bytebrand/fe-ui-core 4.6.5 → 4.6.6

package/package.json

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

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

@@ -72,7 +72,9 @@ const VehicleInfo: React.FC<IVehicleInfoProps> = (props) => {
       consumptionCombined: consumption.consumptionCombined,
       consumptionPowerCombined: consumption.consumptionPowerCombined,
       wltpCombined: consumption.wltpCombined,
-      wltpPowerCombined: consumption.wltpPowerCombined
+      wltpPowerCombined: consumption.wltpPowerCombined,
+      wltpWeightedPowerCombined: consumption.wltpWeightedPowerCombined,
+      wltpWeightedCombined: consumption.wltpWeightedCombined,
     },
   };
 

package/source/framework/vehiclesProps/decoratedLightProps.tsx

@@ -125,7 +125,7 @@ const getDecoratedLightProps = (
           : null;
 
         const wltpCo2Value = Number.isFinite(wltpCo2)
-          ? t('vehicleProps:value.wltpCo2Combined', { co2: wltpCo2.toLocaleString(language) })
+          ? t('vehicleProps:value.wltpCo2WtdCombined', { co2: wltpCo2.toLocaleString(language) })
           : null;
 
         const consumptionValue = Number.isFinite(consumptionCombined)
@@ -136,6 +136,20 @@ const getDecoratedLightProps = (
           ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
           : t('vehicleProps:value.na');
 
+        const hybridPlugin = car.engineData.hybridPlugin;
+        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;
+
+        if (hybridPlugin) {
+            return <React.Fragment>
+              {`${wltpWeightedPowerCombinedContent}, `}
+              {wltpWeightedCombinedContent}, {wltpCo2Value}
+            </React.Fragment>
+        }
+
         if (wltpConsumptionValue && wltpCo2Value) {
           return <>{wltpConsumptionValue}, {wltpCo2Value}</>;
         }
@@ -189,13 +203,17 @@ const getDecoratedLightProps = (
         const wltpConsumptionCombined = car.consumption.wltpCombined;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
         const translatedUnit = t(`cbd:${consumptionUnit}`);
+        const wltpWeightedPowerCombined = car.consumption.wltpWeightedPowerCombined;
+        const wltpWeightedCombined = car.consumption.wltpWeightedCombined;
 
         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 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 wltpConsumptionPowerCombinedContent = wltpConsumptionPowerCombined
           ? t('vehicleProps:value.consumptionPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
           : null;
+
         const wltpConsumptionCombinedContent = wltpConsumptionCombined ?
           t('vehicleProps:value.consumptionCombined', { consumption: wltpConsumptionCombined.toLocaleString(language), unit: translatedUnit })
           : null;
@@ -214,7 +232,15 @@ const getDecoratedLightProps = (
         const hybridPlugin = car.engineData.hybridPlugin;
 
         if (wltpConsumptionCombinedContent && wltpCo2Value) {
+          if (hybridPlugin) {
+              return <React.Fragment>
+              {`${wltpWeightedPowerCombinedContent}, `}
+              {`${wltpWeightedCombinedContent}, `}
+              {wltpConsumptionCombinedContent}, {wltpCo2Value}
+            </React.Fragment>
+          }
           return <React.Fragment>
+            {wltpConsumptionPowerCombinedContent && hybridPlugin ? `${wltpConsumptionPowerCombinedContent}, ` : ''}
             {wltpConsumptionPowerCombinedContent && hybridPlugin ? `${wltpConsumptionPowerCombinedContent}, ` : ''}
             {wltpConsumptionCombinedContent}, {wltpCo2Value}
           </React.Fragment>

package/source/framework/vehiclesProps/decoratedProps.tsx

@@ -610,10 +610,9 @@ const getDecoratedProps = (
       icon: 'fuelConsumption',
       title: t('vehicleProps:title.сonsumptionCombined'),
       get value() {
-        const consumptionCombined = car.consumption.wltpCombined || car.consumption.consumptionCombined;
+        const consumptionCombined = car.consumption.consumptionCombined;
         const consumptionUnit = car.consumption.consumptionUnit || 'consumption_consumptionUnit_l';
         const translatedUnit = t(`cbd:${consumptionUnit}`);
-        console.log('qqqqq consumptionCombined =====', t('vehicleProps:value.consumption', { consumption: consumptionCombined.toLocaleString(language), unit: translatedUnit }));
         return Number.isFinite(consumptionCombined)
           ? t('vehicleProps:value.consumption', { consumption: consumptionCombined.toLocaleString(language), unit: translatedUnit })
           : t('vehicleProps:value.na');
@@ -815,19 +814,19 @@ const getDecoratedProps = (
       get value() {
         const consumptionCombined = +car.consumption.consumptionCombined;
         const consumptionPowerCombined = +car.consumption.consumptionPowerCombined;
-        const wltpConsumptionPowerCombined = car.consumption.wltpPowerCombined;
-        const wltpConsumptionCombined = car.consumption.wltpCombined;
+        const wltpWeightedPowerCombined = car.consumption.wltpWeightedPowerCombined;
+        const wltpWeightedCombined = car.consumption.wltpWeightedCombined;
 
         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 = wltpConsumptionPowerCombined
-          ? t('vehicleProps:value.consumptionPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
+        const wltpConsumptionPowerCombinedContent = 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 = wltpConsumptionCombined ?
-          t('vehicleProps:value.consumptionCombined', { consumption: wltpConsumptionCombined.toLocaleString(language), unit: translatedUnit })
+        const wltpConsumptionCombinedContent = wltpWeightedCombined ?
+          t('vehicleProps:value.consumptionCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit })
           : null;
 
         const co2 = car.environmentEmissions.co2;
@@ -835,17 +834,20 @@ const getDecoratedProps = (
         const co2Value = Number.isFinite(co2)
         ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
         : t('vehicleProps:value.na');
-        const wltpCo2Value = Number.isFinite(co2)
-        ? t('vehicleProps:value.wltpCo2WtdCombined', { co2: wltpCo2.toLocaleString(language) })
+        const wltpCo2Value = Number.isFinite(wltpCo2)
+        ? t('vehicleProps:value.wltpCo2Combined', { co2: wltpCo2.toLocaleString(language) })
+        : null;
+        const wltpCo2PluginValue = Number.isFinite(wltpCo2)
+        ? t('vehicleProps:value.wltpCo2Combined', { co2: wltpCo2.toLocaleString(language) })
         : null;
         const hybridPlugin = car.engineData.hybridPlugin;
 
         if (wltpConsumptionCombinedContent && wltpCo2Value) {
           return <React.Fragment>
             {wltpConsumptionPowerCombinedContent && hybridPlugin ? wrapValue(wltpConsumptionPowerCombinedContent) : ''}
-            {wltpConsumptionPowerCombinedContent && hybridPlugin ? <br /> : ''}
-            {wrapValue(wltpConsumptionCombinedContent)} <br />
-            {wrapValue(wltpCo2Value)}
+            {wltpConsumptionPowerCombinedContent && hybridPlugin ? ', ' : ''}
+            {wrapValue(wltpConsumptionCombinedContent)}{', '}
+            {hybridPlugin ? wrapValue(wltpCo2PluginValue) : wrapValue(wltpCo2Value)}
           </React.Fragment>
         }
 
@@ -1529,7 +1531,7 @@ const getDecoratedProps = (
       get value() {
         const { consumptionPriceYear } = car.costModel;
         return Number.isFinite(consumptionPriceYear)
-          ? t('vehicleProps:value.price', { price: getFormattedPrice(consumptionPriceYear, '$,.2f') })
+          ? consumptionPriceYear
           : t('vehicleProps:value.na');
       }
     },

package/source/framework/vehiclesProps/vehicleDetails.ts

@@ -43,9 +43,10 @@ const consumptionHydrogenCombinedAlternateView = ['consumptionHydrogenCombinedAl
 const environmentElectroWLTP = ['wltpPowerCombined', 'wltpCo2', 'wltpRange', 'wltpPowerSlow', 'wltpPowerMedium',
   'wltpPowerFast', 'wltpPowerVeryFast', 'wltpEnergyEfficiencyClass'];
 const environmentPluginHybridWLTP = ['wltpWeightedCombined', 'wltpTotalRange', 'wltpWeightedPowerCombined', 'wltpCo2',
-  'wltpCo2Discharged', 'wltpPowerSlow', 'wltpPowerMedium', 'wltpPowerFast', 'wltpPowerCombined', 'wltpPowerVeryFast',
-  'wltpCombined', 'wltpSlow', 'wltpMedium', 'wltpFast', 'wltpVeryFast', 'wltpEnergyEfficiencyClass', 'wltpDischargedEnergyEfficiencyClass'];
-const environmentElectroBenzinDieselEthanolHybridWLTP = ['wltpCombined', 'wltpCo2', 'wltpSlow', 'wltpMedium', 'wltpFast', 'wltpVeryFast', 'wltpEnergyEfficiencyClass'];
+  'wltpCo2Discharged', 'wltpPowerCombined', 'wltpPowerSlow', 'wltpPowerMedium', 'wltpPowerFast', 'wltpPowerVeryFast',
+  'wltpPowerCombinedPlugin', 'wltpPowerSlowPlugin', 'wltpPowerMediumPlugin', 'wltpPowerFastPlugin',
+  'fuelPrice', 'powerPrice', 'consumptionPriceYear', 'wltpEnergyEfficiencyClass'];
+const environmentElectroBenzinDieselEthanolHybridWLTP = ['wltpCombined', 'wltpCo2', 'wltpSlow', 'wltpMedium', 'wltpFast', 'wltpVeryFast', 'fuelPrice', 'consumptionPriceYear', 'wltpEnergyEfficiencyClass'];
 const environmentHydrogenWLTP = ['wltpCombined', 'wltpCo2', 'wltpSlow', 'wltpMedium', 'wltpFast', 'wltpVeryFast', 'wltpEnergyEfficiencyClass'];
 // const costModel = ['wltpEnergyCosts', 'wltpCo2CostsLow',, 'wltpCo2CostsMiddle', 'wltpCo2CostsHigh', 'wltpCostModelTax'];