Skip to content

Commit

Permalink
Merge pull request #1521 from bcgov/LCFS-1515-FuelSupplyOtherJetFuelC…
Browse files Browse the repository at this point in the history
…ategory

LCFS-1515: Fuel supply, Other, Jet fuel category
  • Loading branch information
areyeslo authored Dec 20, 2024
2 parents dfb5501 + 8174d52 commit 882242b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 19 deletions.
2 changes: 1 addition & 1 deletion frontend/src/assets/locales/en/fuelSupply.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"fuelSupplyId": "Fuel supply ID",
"fuelType": "Fuel type",
"fuelTypeOther": "Fuel type other",
"fuelCategory": "Fuel category",
"fuelCategoryId": "Fuel category",
"endUse": "End use",
"provisionOfTheActId": "Determining carbon intensity",
"fuelCode": "Fuel code",
Expand Down
16 changes: 10 additions & 6 deletions frontend/src/views/FuelSupplies/AddEditFuelSupplies.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
useGetFuelSupplies,
useSaveFuelSupply
} from '@/hooks/useFuelSupply'
import { isArrayEmpty } from '@/utils/formatters'
import { isArrayEmpty, cleanEmptyStringValues } from '@/utils/formatters'
import BCTypography from '@/components/BCTypography'
import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
Expand Down Expand Up @@ -161,10 +161,12 @@ export const AddEditFuelSupplies = () => {
(item) => item.fuelCategory
)

params.node.setDataValue(
'fuelCategory',
fuelCategoryOptions[0] ?? null
)
// Set to null if multiple options, otherwise use first item
const categoryValue = fuelCategoryOptions.length === 1
? fuelCategoryOptions[0]
: null

params.node.setDataValue('fuelCategory', categoryValue)
}
}
},
Expand Down Expand Up @@ -199,7 +201,9 @@ export const AddEditFuelSupplies = () => {
severity: 'pending'
})

let updatedData = params.node.data
// clean up any null or empty string values
let updatedData = cleanEmptyStringValues(params.node.data)

if (updatedData.fuelType === 'Other') {
updatedData.ciOfFuel = DEFAULT_CI_FUEL[updatedData.fuelCategory]
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/FuelSupplies/FuelSupplySummary.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const FuelSupplySummary = ({ data, status }) => {
valueGetter: (params) => params.data.fuelType?.fuelType
},
{
headerName: t('fuelSupply:fuelSupplyColLabels.fuelCategory'),
headerName: t('fuelSupply:fuelSupplyColLabels.fuelCategoryId'),
field: 'fuelCategory',
valueGetter: (params) => params.data.fuelCategory?.category
},
Expand Down
14 changes: 3 additions & 11 deletions frontend/src/views/FuelSupplies/_schema.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ export const fuelSupplyColDefs = (optionsData, errors, warnings) => [
params.data.fuelTypeId = fuelType?.fuelTypeId
params.data.fuelTypeOther = null
params.data.fuelCategory = null
params.data.fuelCategoryId = null
params.data.endUseId = null
params.data.endUseType = null
params.data.eer = null
Expand Down Expand Up @@ -147,7 +148,7 @@ export const fuelSupplyColDefs = (optionsData, errors, warnings) => [
{
field: 'fuelCategory',
headerComponent: RequiredHeader,
headerName: i18n.t('fuelSupply:fuelSupplyColLabels.fuelCategory'),
headerName: i18n.t('fuelSupply:fuelSupplyColLabels.fuelCategoryId'),
cellEditor: AutocompleteCellEditor,
cellRenderer: (params) =>
params.value ||
Expand Down Expand Up @@ -182,16 +183,7 @@ export const fuelSupplyColDefs = (optionsData, errors, warnings) => [
},
suppressKeyboardEvent,
minWidth: 135,
valueGetter: (params) => {
const options = optionsData?.fuelTypes
?.find((obj) => params.data.fuelType === obj.fuelType)
?.fuelCategories.map((item) => item.fuelCategory)
if (options?.length === 1) {
return options[0]
} else {
return params.data.fuelCategory
}
},
valueGetter: (params) => params.data.fuelCategory,
editable: (params) =>
optionsData?.fuelTypes
?.find((obj) => params.data.fuelType === obj.fuelType)
Expand Down

0 comments on commit 882242b

Please sign in to comment.