farmcontrol/farmcontrol-ui
farmcontrol/farmcontrol-ui
2
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: farmcontrol:2d36b8ee97665d1e63b65ecbc0dde3a27417da8c
Branches Tags
farmcontrol:main
farmcontrol:development
farmcontrol:windows-auth-fix
farmcontrol:electrobun-migration
...
compare: farmcontrol:696b457978b818c0dc33225fdef201a52d8b73a5
Branches Tags
farmcontrol:main
farmcontrol:development
farmcontrol:windows-auth-fix
farmcontrol:electrobun-migration

3 Commits
2d36b8ee97 ... 696b457978

Author SHA1 Message Date
Tom Butcher
696b457978 Improved product creation.
Some checks are pending
farmcontrol/farmcontrol-ui/pipeline/head Build started...
Details
2026-06-19 21:49:53 +01:00
Tom Butcher
53dce0e024 Excluded reference from summary. 2026-06-19 21:49:41 +01:00
Tom Butcher
de72d1f554 Enhance ApiServerProvider to validate model name before processing filters. 2026-06-19 21:39:32 +01:00
21 changed files with 56 additions and 27 deletions
Show Stats Expand all files Collapse all files

1
src/components/Dashboard/Inventory/FilamentStocks/NewFilamentStock.jsx
View File

@ -36,6 +36,7 @@ const NewFilamentStock = ({ onOk, reset, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Inventory/PartStocks/NewPartStock.jsx
View File

@ -36,6 +36,7 @@ const NewPartStock = ({ onOk, reset, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Inventory/StockAudits/NewStockAudit.jsx
View File

@ -36,6 +36,7 @@ const NewStockAudit = ({ onOk, reset, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Inventory/StockLocations/NewStockLocation.jsx
View File

@ -32,6 +32,7 @@ const NewStockLocation = ({ onOk, reset }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/CourierServices/NewCourierService.jsx
View File

@ -53,6 +53,7 @@ const NewCourierService = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/Couriers/NewCourier.jsx
View File

@ -46,6 +46,7 @@ const NewCourier = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/DocumentPrinters/NewDocumentPrinter.jsx
View File

@ -50,6 +50,7 @@ const NewDocumentPrinter = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/DocumentSizes/NewDocumentSize.jsx
View File

@ -32,6 +32,7 @@ const NewDocumentSize = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/DocumentTemplates/NewDocumentTemplate.jsx
View File

@ -50,6 +50,7 @@ const NewDocumentTemplate = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/Filaments/NewFilament.jsx
View File

@ -46,6 +46,7 @@ const NewFilament = ({ onOk }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/Materials/NewMaterial.jsx
View File

@ -46,6 +46,7 @@ const NewMaterial = ({ onOk }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/NoteTypes/NewNoteType.jsx
View File

@ -51,6 +51,7 @@ const NewNoteType = ({ onOk }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/Parts/NewPart.jsx
View File

@ -88,6 +88,7 @@ const NewPart = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/ProductCategories/NewProductCategory.jsx
View File

@ -32,6 +32,7 @@ const NewProductCategory = ({ onOk }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

17
src/components/Dashboard/Management/Products/NewProduct.jsx
View File

@ -25,7 +25,13 @@ const NewProduct = ({ onOk, defaultValues }) => {
visibleProperties={{
priceMode: false,
margin: false,
amount: false
amount: false,
priceTaxRate: false,
cost: false,
costTaxRate: false,
costWithTax: false,
price: false,
priceWithTax: false
}}
/>
)
@ -44,7 +50,13 @@ const NewProduct = ({ onOk, defaultValues }) => {
visibleProperties={{
priceMode: true,
margin: true,
amount: true
amount: true,
priceTaxRate: true,
cost: true,
costTaxRate: true,
costWithTax: true,
price: true,
priceWithTax: true
}}
/>
)
@ -73,6 +85,7 @@ const NewProduct = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/TaxRates/NewTaxRate.jsx
View File

@ -46,6 +46,7 @@ const NewTaxRate = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/TaxRecords/NewTaxRecord.jsx
View File

@ -46,6 +46,7 @@ const NewTaxRecord = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

1
src/components/Dashboard/Management/Vendors/NewVendor.jsx
View File

@ -49,6 +49,7 @@ const NewVendor = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}

2
src/components/Dashboard/Sales/Clients/NewClient.jsx
View File

@ -49,6 +49,7 @@ const NewClient = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}
@ -84,4 +85,3 @@ NewClient.propTypes = {
}
export default NewClient

2
src/components/Dashboard/context/ApiServerContext.jsx
View File

@ -802,6 +802,7 @@ const ApiServerProvider = ({ children }) => {
if (filter != null && Object.keys(filter).length > 0) {
const model = getModelByName(type)
if (model.name !== 'unknown') {
for (const key of Object.keys(filter)) {
const property = model?.properties?.find((p) => p.name === key)
if (property && property.type === 'object') {
@ -811,6 +812,7 @@ const ApiServerProvider = ({ children }) => {
}
}
}
}
logger.debug('Fetching table data from:', type, {
page,

33
src/database/models/Product.js
View File

@ -178,7 +178,7 @@ export const Product = {
{
name: 'cost',
label: 'Cost',
required: false,
required: true,
type: 'number',
prefix: '£',
min: 0,
@ -188,7 +188,7 @@ export const Product = {
{
name: 'costWithTax',
label: 'Cost w/ Tax',
required: false,
required: true,
readOnly: true,
type: 'number',
prefix: '£',
@ -197,14 +197,13 @@ export const Product = {
columnWidth: 150,
value: (objectData) => {
const cost = objectData?.cost
if (!cost) return undefined
if (!cost) return 0
if (objectData?.costTaxRate?.rateType == 'percentage') {
return (
(cost * (1 + objectData?.costTaxRate?.rate / 100)).toFixed(2) ||
undefined
(cost * (1 + objectData?.costTaxRate?.rate / 100)).toFixed(2) || 0
)
} else if (objectData?.costTaxRate?.rateType == 'amount') {
return (cost + objectData?.costTaxRate?.rate).toFixed(2) || undefined
return (cost + objectData?.costTaxRate?.rate).toFixed(2) || 0
}
return cost
}
@ -212,7 +211,7 @@ export const Product = {
{
name: 'costTaxRate',
label: 'Cost Tax Rate',
required: false,
required: true,
type: 'object',
objectType: 'taxRate',
showHyperlink: true,
@ -221,14 +220,14 @@ export const Product = {
{
name: 'priceMode',
label: 'Price Mode',
required: false,
required: true,
type: 'priceMode',
columnWidth: 150
},
{
name: 'price',
label: 'Price',
required: false,
required: true,
type: 'number',
prefix: '£',
min: 0,
@ -243,8 +242,7 @@ export const Product = {
objectData?.cost != null
) {
return (
(objectData.cost * (1 + objectData.margin / 100)).toFixed(2) ||
undefined
(objectData.cost * (1 + objectData.margin / 100)).toFixed(2) || 0
)
}
return objectData?.price
@ -253,7 +251,7 @@ export const Product = {
{
name: 'margin',
label: 'Margin',
required: false,
required: true,
type: 'number',
disabled: (objectData) => objectData?.priceMode == 'amount',
suffix: '%',
@ -265,7 +263,7 @@ export const Product = {
{
name: 'priceWithTax',
label: 'Price w/ Tax',
required: false,
required: true,
readOnly: true,
type: 'number',
prefix: '£',
@ -283,14 +281,13 @@ export const Product = {
} else {
price = objectData?.price
}
if (!price) return undefined
if (!price) return 0
if (objectData?.priceTaxRate?.rateType == 'percentage') {
return (
(price * (1 + objectData?.priceTaxRate?.rate / 100)).toFixed(2) ||
undefined
(price * (1 + objectData?.priceTaxRate?.rate / 100)).toFixed(2) || 0
)
} else if (objectData?.priceTaxRate?.rateType == 'amount') {
return (price + objectData?.priceTaxRate?.rate).toFixed(2) || undefined
return (price + objectData?.priceTaxRate?.rate).toFixed(2) || 0
}
return price
}
@ -298,7 +295,7 @@ export const Product = {
{
name: 'priceTaxRate',
label: 'Price Tax Rate',
required: false,
required: true,
type: 'object',
objectType: 'taxRate',
showHyperlink: true,