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:431dd106c9f37f73967616cf3d34da0fee729bee
Branches Tags
farmcontrol:main
farmcontrol:development
farmcontrol:windows-auth-fix
farmcontrol:electrobun-migration
..
compare: farmcontrol:2d36b8ee97665d1e63b65ecbc0dde3a27417da8c
Branches Tags
farmcontrol:main
farmcontrol:development
farmcontrol:windows-auth-fix
farmcontrol:electrobun-migration

No commits in common. "431dd106c9f37f73967616cf3d34da0fee729bee" and "2d36b8ee97665d1e63b65ecbc0dde3a27417da8c" have entirely different histories.
431dd106c9 ... 2d36b8ee97

23 changed files with 43 additions and 139 deletions
Show Stats Expand all files Collapse all files

9
public/electron.js
View File

@ -8,9 +8,7 @@ import {
createWindow,
setupMainWindowIPC,
setupMainWindowAppEvents,
setupDevAuthServer,
setupSingleInstanceLock,
handleDeepLinkFromArgv
setupDevAuthServer
} from './mainWindow.js'
// --- Keytar-backed auth session storage (main process) ---
@ -29,9 +27,6 @@ try {
const KEYTAR_SERVICE = app.name || 'Farm Control'
const KEYTAR_ACCOUNT = 'authSession'
const gotTheLock = setupSingleInstanceLock(app)
if (gotTheLock) {
app.whenReady().then(() => {
createWindow()
registerGlobalShortcuts()
@ -39,9 +34,7 @@ if (gotTheLock) {
setupMainWindowIPC()
setupMainWindowAppEvents(app)
setupDevAuthServer()
handleDeepLinkFromArgv()
})
}
app.on('will-quit', () => {
globalShortcut.unregisterAll()

74
public/mainWindow.js
View File

@ -7,72 +7,6 @@ const __dirname = dirname(__filename)
let win
const PROTOCOL_PREFIX = 'farmcontrol://'
function findProtocolUrl(args) {
return args.find(
(arg) => typeof arg === 'string' && arg.startsWith(PROTOCOL_PREFIX)
)
}
function sendNavigateToRenderer(redirectPath) {
const deliver = () => {
win.webContents.send('navigate', redirectPath)
win.show()
win.focus()
}
if (!win || win.isDestroyed()) {
createWindow()
win.webContents.once('did-finish-load', () => {
setTimeout(deliver, 100)
})
return
}
if (win.webContents.isLoading()) {
win.webContents.once('did-finish-load', () => {
setTimeout(deliver, 100)
})
return
}
deliver()
}
export function handleDeepLink(url) {
if (!url?.startsWith(`${PROTOCOL_PREFIX}app`)) return
const redirectPath = url.replace(`${PROTOCOL_PREFIX}app`, '') || '/'
sendNavigateToRenderer(redirectPath)
}
export function handleDeepLinkFromArgv() {
if (process.platform === 'darwin') return
const url = findProtocolUrl(process.argv)
if (url) handleDeepLink(url)
}
export function setupSingleInstanceLock(app) {
const gotTheLock = app.requestSingleInstanceLock()
if (!gotTheLock) {
app.quit()
return false
}
app.on('second-instance', (_event, commandLine) => {
const url = findProtocolUrl(commandLine)
if (url) {
handleDeepLink(url)
} else if (win && !win.isDestroyed()) {
if (win.isMinimized()) win.restore()
win.show()
win.focus()
}
})
return true
}
function attachKeyboardShortcuts(browserWindow) {
if (!browserWindow) return
// Keyboard shortcuts for the main window can be added here if needed
@ -221,7 +155,13 @@ export function setupMainWindowAppEvents(app) {
app.on('open-url', (event, url) => {
event.preventDefault()
handleDeepLink(url)
if (url.startsWith('farmcontrol://app')) {
// Extract the path/query after 'farmcontrol://app'
const redirectPath = url.replace('farmcontrol://app', '') || '/'
if (win && win.webContents) {
win.webContents.send('navigate', redirectPath)
}
}
})
}

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

@ -36,7 +36,6 @@ 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,7 +36,6 @@ 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,7 +36,6 @@ 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,7 +32,6 @@ 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,7 +53,6 @@ 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,7 +46,6 @@ 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,7 +50,6 @@ 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,7 +32,6 @@ 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,7 +50,6 @@ 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,7 +46,6 @@ 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,7 +46,6 @@ 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,7 +51,6 @@ 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,7 +88,6 @@ 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,7 +32,6 @@ 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,13 +25,7 @@ const NewProduct = ({ onOk, defaultValues }) => {
visibleProperties={{
priceMode: false,
margin: false,
amount: false,
priceTaxRate: false,
cost: false,
costTaxRate: false,
costWithTax: false,
price: false,
priceWithTax: false
amount: false
}}
/>
)
@ -50,13 +44,7 @@ const NewProduct = ({ onOk, defaultValues }) => {
visibleProperties={{
priceMode: true,
margin: true,
amount: true,
priceTaxRate: true,
cost: true,
costTaxRate: true,
costWithTax: true,
price: true,
priceWithTax: true
amount: true
}}
/>
)
@ -85,7 +73,6 @@ 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,7 +46,6 @@ 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,7 +46,6 @@ 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,7 +49,6 @@ 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,7 +49,6 @@ const NewClient = ({ onOk, defaultValues }) => {
bordered={false}
visibleProperties={{
_id: false,
_reference: false,
createdAt: false,
updatedAt: false
}}
@ -85,3 +84,4 @@ NewClient.propTypes = {
}
export default NewClient

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

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