First attempt at fixing windows auth.

public/electron.js

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

public/mainWindow.js

@@ -7,6 +7,72 @@ 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
@@ -155,13 +221,7 @@ export function setupMainWindowAppEvents(app) {
 
   app.on('open-url', (event, url) => {
     event.preventDefault()
-    if (url.startsWith('farmcontrol://app')) {
+    handleDeepLink(url)
-      // Extract the path/query after 'farmcontrol://app'
-      const redirectPath = url.replace('farmcontrol://app', '') || '/'
-      if (win && win.webContents) {
-        win.webContents.send('navigate', redirectPath)
-      }
-    }
   })
 }
 

src/components/Dashboard/Inventory/FilamentStocks/NewFilamentStock.jsx

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

src/components/Dashboard/Inventory/PartStocks/NewPartStock.jsx

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

src/components/Dashboard/Inventory/StockAudits/NewStockAudit.jsx

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

src/components/Dashboard/Inventory/StockLocations/NewStockLocation.jsx

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

src/components/Dashboard/Management/CourierServices/NewCourierService.jsx

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

src/components/Dashboard/Management/Couriers/NewCourier.jsx

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

src/components/Dashboard/Management/DocumentPrinters/NewDocumentPrinter.jsx

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

src/components/Dashboard/Management/DocumentSizes/NewDocumentSize.jsx

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

src/components/Dashboard/Management/DocumentTemplates/NewDocumentTemplate.jsx

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

src/components/Dashboard/Management/Filaments/NewFilament.jsx

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

src/components/Dashboard/Management/Materials/NewMaterial.jsx

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

src/components/Dashboard/Management/NoteTypes/NewNoteType.jsx

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

src/components/Dashboard/Management/Parts/NewPart.jsx

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

src/components/Dashboard/Management/ProductCategories/NewProductCategory.jsx

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

src/components/Dashboard/Management/Products/NewProduct.jsx

@@ -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
                 }}

src/components/Dashboard/Management/TaxRates/NewTaxRate.jsx

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

src/components/Dashboard/Management/TaxRecords/NewTaxRecord.jsx

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

src/components/Dashboard/Management/Vendors/NewVendor.jsx

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

src/components/Dashboard/Sales/Clients/NewClient.jsx

@@ -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
-

src/components/Dashboard/context/ApiServerContext.jsx

@@ -802,12 +802,14 @@ const ApiServerProvider = ({ children }) => {
     if (filter != null && Object.keys(filter).length > 0) {
       const model = getModelByName(type)
 
-      for (const key of Object.keys(filter)) {
+      if (model.name !== 'unknown') {
-        const property = model?.properties?.find((p) => p.name === key)
+        for (const key of Object.keys(filter)) {
-        if (property && property.type === 'object') {
+          const property = model?.properties?.find((p) => p.name === key)
-          const value = filter[key]
+          if (property && property.type === 'object') {
-          newFilter[`${key}._id`] = value?._id ?? value
+            const value = filter[key]
-          delete newFilter[key]
+            newFilter[`${key}._id`] = value?._id ?? value
+            delete newFilter[key]
+          }
         }
       }
     }

src/database/models/Product.js

@@ -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) ||
+            (cost * (1 + objectData?.costTaxRate?.rate / 100)).toFixed(2) || 0
-            undefined
           )
         } 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) ||
+            (objectData.cost * (1 + objectData.margin / 100)).toFixed(2) || 0
-            undefined
           )
         }
         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) ||
+            (price * (1 + objectData?.priceTaxRate?.rate / 100)).toFixed(2) || 0
-            undefined
           )
         } 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,