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

Enhance model filters across various database models to include '_reference' and additional fields

Browse Source 
- Updated filters in multiple models such as AppPassword, AuditLog, Client, Courier, and others to include '_reference' and other relevant fields like 'createdAt' and 'updatedAt'.
- This change improves data handling and consistency across the application, ensuring that all necessary fields are available for filtering.
This commit is contained in:
Tom Butcher 2026-08-01 14:26:34 +01:00
parent 7b926ec409
commit 9b17253c6d
46 changed files with 455 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/database/models/AppPassword.js
View File

@ -72,7 +72,16 @@ export const AppPassword = {
}
],
columns: ['_reference', 'name', 'user', 'active', 'createdAt', 'updatedAt'],
filters: ['_id', 'name', 'user', 'active', 'user._id'],
filters: [
'_id',
'name',
'user',
'active',
'user._id',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['name', 'user', 'active', 'createdAt', 'updatedAt'],
properties: [
{

11
src/database/models/AuditLog.js
View File

@ -16,8 +16,15 @@ export const AuditLog = {
'changes',
'createdAt'
],
filters: ['_id', 'owner', 'parent', 'operation'],
sorters: ['createdAt'],
filters: [
'parent._id',
'owner._id',
'operation',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['createdAt','updatedAt'],
properties: [
{
name: '_id',

9
src/database/models/Client.js
View File

@ -72,15 +72,12 @@ export const Client = {
'updatedAt'
],
filters: [
'name',
'_id',
'country',
'email',
'phone',
'active',
'marketplace',
'createdAt',
'updatedAt'
'updatedAt',
'name',
'_reference'
],
sorters: [
'name',

21
src/database/models/Courier.js
View File

@ -63,8 +63,25 @@ export const Courier = {
}
],
columns: ['_reference', 'name', 'country', 'email', 'website', 'createdAt'],
filters: ['name', '_id', 'country', 'email'],
sorters: ['name', 'country', 'email', 'createdAt', '_id'],
filters: [
'name',
'website',
'email',
'phone',
'contact',
'country',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',
'country',
'email',
'createdAt',
'_id',
'updatedAt'
],
group: ['country'],
properties: [
{

13
src/database/models/CourierService.js
View File

@ -74,14 +74,18 @@ export const CourierService = {
'active'
],
filters: [
'name',
'_id',
'courier',
'courier._id',
'name',
'active',
'deliveryTime',
'tracked',
'deliveryTime',
'cost',
'costWithTax'
'costWithTax',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',
@ -92,7 +96,8 @@ export const CourierService = {
'costWithTax',
'estimatedDeliveryTime',
'createdAt',
'_id'
'_id',
'updatedAt'
],
group: ['courier'],
properties: [

10
src/database/models/DocumentJob.js
View File

@ -56,7 +56,15 @@ export const DocumentJob = {
}
],
columns: ['_reference', 'name', 'state', 'createdAt', 'updatedAt'],
filters: ['name', '_id', 'state'],
filters: [
'name',
'width',
'height',
'state',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['name', 'state', 'createdAt', 'updatedAt'],
properties: [
{

20
src/database/models/DocumentPrinter.js
View File

@ -63,8 +63,24 @@ export const DocumentPrinter = {
'connectedAt',
'updatedAt'
],
filters: ['name', '_id'],
sorters: ['name', 'documentSize', 'connectedAt', 'updatedAt'],
filters: [
'name',
'tags',
'active',
'isGlobal',
'state',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',
'documentSize',
'connectedAt',
'updatedAt',
'state',
'createdAt'
],
properties: [
{
name: '_id',

9
src/database/models/DocumentSize.js
View File

@ -63,7 +63,14 @@ export const DocumentSize = {
'createdAt',
'updatedAt'
],
filters: ['name', '_id', 'width', 'height', 'infiniteHeight'],
filters: [
'name',
'width',
'height',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',
'width',

11
src/database/models/DocumentTemplate.js
View File

@ -75,7 +75,16 @@ export const DocumentTemplate = {
'createdAt',
'updatedAt'
],
filters: ['name', '_id', 'active', 'tags', 'objectType'],
filters: [
'name',
'tags',
'active',
'global',
'objectType',
'createdAt',
'updatedAt',
'_reference'
],
group: ['documentSize', 'tags'],
sorters: [
'name',

12
src/database/models/Filament.js
View File

@ -90,7 +90,17 @@ export const Filament = {
'createdAt',
'updatedAt'
],
filters: ['_id', 'name', 'vendor', 'material', 'cost', 'costWithTax'],
filters: [
'_id',
'material',
'material._id',
'diameter',
'name',
'cost',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',
'createdAt',

2
src/database/models/FilamentProfile.js
View File

@ -59,7 +59,7 @@ export const FilamentProfile = {
}
],
columns: ['_reference', 'name', 'filamentType', 'filament', 'updatedAt'],
filters: ['_id', 'name', 'filamentType', 'filament'],
filters: ['_id','name','createdAt','updatedAt','_reference'],
sorters: ['name', 'createdAt', 'updatedAt'],
properties: [
{

5
src/database/models/FilamentSku.js
View File

@ -83,7 +83,10 @@ export const FilamentSku = {
'name',
'color',
'cost',
'costWithTax'
'costWithTax',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'barcode',

19
src/database/models/FilamentStock.js
View File

@ -31,13 +31,26 @@ export const FilamentStock = {
'updatedAt'
],
filters: [
'_id',
'filament',
'filament._id',
'filamentSku',
'filamentSku._id'
'state',
'startingWeight',
'currentWeight',
'filamentSku._id',
'stockLocation',
'stockLocation._id',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'createdAt',
'updatedAt',
'filament',
'filamentSku',
'state'
],
sorters: ['createdAt', 'updatedAt', 'filament', 'filamentSku'],
group: ['filament', 'filamentSku'],
properties: [
{

20
src/database/models/File.js
View File

@ -80,8 +80,24 @@ export const File = {
'createdAt',
'updatedAt'
],
filters: ['name', '_id', 'type', 'temp'],
sorters: ['name', 'type', 'size', 'createdAt', 'temp'],
filters: [
'_id',
'name',
'type',
'size',
'extension',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',
'type',
'size',
'createdAt',
'temp',
'updatedAt'
],
group: ['type'],
properties: [
{

6
src/database/models/GCodeFile.js
View File

@ -90,8 +90,10 @@ export const GCodeFile = {
'filament',
'filament._id',
'filamentSku',
'cost',
'updatedAt'
'filamentSku._id',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',

18
src/database/models/Host.js
View File

@ -74,8 +74,22 @@ export const Host = {
}
],
columns: ['_reference', 'name', 'state', 'tags', 'connectedAt'],
filters: ['name', '_id', 'state', 'tags'],
sorters: ['name', 'state', 'connectedAt'],
filters: [
'name',
'_id',
'state',
'tags',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',
'state',
'connectedAt',
'createdAt',
'updatedAt'
],
group: ['tags'],
properties: [
{

14
src/database/models/Invoice.js
View File

@ -132,7 +132,19 @@ export const Invoice = {
}
],
group: ['orderType'],
filters: ['to', 'from', 'orderType'],
filters: [
'vendor',
'client',
'state',
'vendor._id',
'client._id',
'order',
'order._id',
'orderType',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['createdAt', 'state', 'updatedAt', 'invoiceDate', 'dueDate'],
columns: [
'_reference',

18
src/database/models/Job.js
View File

@ -87,8 +87,22 @@ export const Job = {
}
],
columns: ['_reference', 'quantity', 'state', 'gcodeFile', 'createdAt'],
filters: ['state', '_id', 'gcodeFile', 'quantity'],
sorters: ['createdAt', 'state', 'quantity', 'gcodeFile'],
filters: [
'state',
'gcodeFile._id',
'quantity',
'_id',
'_reference',
'createdAt',
'updatedAt'
],
sorters: [
'createdAt',
'state',
'quantity',
'gcodeFile',
'updatedAt'
],
properties: [
{
name: '_id',

6
src/database/models/Listing.js
View File

@ -112,16 +112,16 @@ export const Listing = {
'updatedAt'
],
filters: [
'title',
'_id',
'product',
'vendor',
'stockLocation',
'marketplace',
'courierServices',
'state',
'state.type',
'createdAt',
'updatedAt'
'updatedAt',
'_reference'
],
sorters: [
'title',

6
src/database/models/ListingVarient.js
View File

@ -99,13 +99,15 @@ export const ListingVarient = {
'updatedAt'
],
filters: [
'_id',
'listing',
'listing._id',
'product',
'productSku',
'state',
'state.type',
'createdAt',
'updatedAt'
'updatedAt',
'_reference'
],
sorters: ['state', 'price', 'lastSyncedAt', 'createdAt', 'updatedAt', '_id'],
group: ['listing', 'state'],

7
src/database/models/Marketplace.js
View File

@ -139,13 +139,14 @@ export const Marketplace = {
],
filters: [
'name',
'_id',
'provider',
'active',
'connected',
'state',
'state.type',
'createdAt',
'updatedAt'
'updatedAt',
'state',
'_reference'
],
sorters: [
'name',

9
src/database/models/Material.js
View File

@ -63,7 +63,14 @@ export const Material = {
}
],
columns: ['_reference', 'name', 'tags', 'createdAt', 'updatedAt'],
filters: ['_id', 'name', 'tags'],
filters: [
'_id',
'name',
'tags',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['name', 'createdAt', 'updatedAt', '_id'],
group: ['tags'],
properties: [

10
src/database/models/NoteType.js
View File

@ -53,7 +53,15 @@ export const NoteType = {
}
],
columns: ['_reference', 'name', 'color', 'active', 'createdAt', 'updatedAt'],
filters: ['name', '_id', 'color', 'active'],
filters: [
'name',
'_id',
'color',
'active',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['name', 'color', 'active', 'createdAt', 'updatedAt'],
properties: [
{

25
src/database/models/OrderItem.js
View File

@ -80,8 +80,29 @@ export const OrderItem = {
}
],
group: [],
filters: ['itemType', 'item', 'sku', 'order'],
sorters: ['createdAt', 'updatedAt', 'itemAmount', 'quantity'],
filters: [
'name',
'itemType',
'item',
'item._id',
'order',
'order._id',
'orderType',
'shipment',
'shipment._id',
'state',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'createdAt',
'updatedAt',
'itemAmount',
'quantity',
'state',
'name'
],
columns: [
'_reference',
'name',

11
src/database/models/Part.js
View File

@ -77,13 +77,12 @@ export const Part = {
'updatedAt'
],
filters: [
'name',
'product._id',
'_id',
'priceMode',
'cost',
'costWithTax',
'price',
'priceWithTax'
'name',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',

5
src/database/models/PartSku.js
View File

@ -83,9 +83,10 @@ export const PartSku = {
'part._id',
'name',
'cost',
'costWithTax',
'price',
'priceWithTax'
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'barcode',

22
src/database/models/PartStock.js
View File

@ -18,8 +18,26 @@ export const PartStock = {
url: (_id) => `/dashboard/inventory/partstocks/info?partStockId=${_id}`
}
],
filters: ['_id', 'partSku', 'startingQuantity', 'currentQuantity'],
sorters: ['partSku', 'startingQuantity', 'currentQuantity'],
filters: [
'partSku',
'state',
'startingQuantity',
'currentQuantity',
'partSku._id',
'stockLocation',
'stockLocation._id',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'partSku',
'startingQuantity',
'currentQuantity',
'state',
'createdAt',
'updatedAt'
],
columns: [
'_reference',
'state',

13
src/database/models/Payment.js
View File

@ -130,7 +130,18 @@ export const Payment = {
}
],
group: ['vendor', 'client', 'invoice'],
filters: ['vendor', 'client', 'invoice'],
filters: [
'vendor',
'client',
'state',
'vendor._id',
'client._id',
'invoice',
'invoice._id',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['createdAt', 'state', 'updatedAt', 'paymentDate'],
columns: [
'_reference',

21
src/database/models/Printer.js
View File

@ -226,8 +226,25 @@ export const Printer = {
'connectedAt',
'updatedAt'
],
filters: ['name', '_reference', 'state', 'tags'],
sorters: ['name', 'state', 'connectedAt'],
filters: [
'tags',
'host._id',
'active',
'online',
'name',
'_id',
'_reference',
'state',
'createdAt',
'updatedAt'
],
sorters: [
'name',
'state',
'connectedAt',
'createdAt',
'updatedAt'
],
group: ['tags'],
properties: [
{

2
src/database/models/PrinterProfile.js
View File

@ -337,7 +337,7 @@ export const PrinterProfile = {
'auxiliaryFan',
'updatedAt'
],
filters: ['_id', 'name', 'printer'],
filters: ['_id','name','createdAt','updatedAt','_reference'],
sorters: [
'name',
'printBedWidth',

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

@ -83,14 +83,12 @@ export const Product = {
filters: [
'_id',
'name',
'globalPrice',
'productCategory',
'type',
'color',
'vendor',
'cost',
'costWithTax',
'price',
'priceWithTax'
'productCategory._id',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',

2
src/database/models/ProductCategory.js
View File

@ -65,7 +65,7 @@ export const ProductCategory = {
}
],
columns: ['_reference', 'name', 'createdAt', 'updatedAt'],
filters: ['_id', 'name'],
filters: ['_id','name','createdAt','updatedAt','_reference'],
sorters: ['name', 'createdAt', 'updatedAt', '_id'],
properties: [
{

5
src/database/models/ProductSku.js
View File

@ -83,9 +83,10 @@ export const ProductSku = {
'product._id',
'name',
'cost',
'costWithTax',
'price',
'priceWithTax'
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'barcode',

20
src/database/models/ProductStock.js
View File

@ -86,8 +86,24 @@ export const ProductStock = {
}
}
],
filters: ['_id', 'productSku', 'currentQuantity'],
sorters: ['productSku', 'currentQuantity'],
filters: [
'productSku',
'state',
'currentQuantity',
'productSku._id',
'stockLocation',
'stockLocation._id',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'productSku',
'currentQuantity',
'state',
'createdAt',
'updatedAt'
],
columns: [
'_reference',
'state',

8
src/database/models/PurchaseOrder.js
View File

@ -176,12 +176,18 @@ export const PurchaseOrder = {
group: ['vendor'],
filters: [
'vendor',
'state',
'value',
'vendor._id',
'totalAmount',
'totalAmountWithTax',
'totalTaxAmount',
'shippingAmount',
'shippingAmountWithTax',
'grandTotalAmount'
'grandTotalAmount',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'createdAt',

10
src/database/models/SalesOrder.js
View File

@ -173,7 +173,15 @@ export const SalesOrder = {
}
],
group: ['client'],
filters: ['client', 'marketplace'],
filters: [
'client',
'state',
'value',
'client._id',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['createdAt', 'state', 'updatedAt'],
columns: [
'_reference',

12
src/database/models/Shipment.js
View File

@ -115,7 +115,17 @@ export const Shipment = {
}
],
group: [],
filters: ['orderType', 'order', 'state', 'courierService'],
filters: [
'orderType',
'order',
'state',
'courierService',
'order._id',
'taxRate',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'createdAt',
'state',

12
src/database/models/StockAudit.js
View File

@ -19,8 +19,16 @@ export const StockAudit = {
}
],
columns: ['_reference', 'state', 'createdAt', 'updatedAt'],
filters: ['_id'],
sorters: ['createdAt', 'updatedAt'],
filters: [
'status',
'type',
'createdBy',
'state',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['createdAt','updatedAt','state'],
group: ['state'],
properties: [
{

10
src/database/models/StockEvent.js
View File

@ -9,8 +9,14 @@ export const StockEvent = {
icon: StockEventIcon,
actions: [],
columns: ['_reference', 'owner', 'parent', 'value', 'createdAt', 'updatedAt'],
filters: ['_id', 'owner', 'parent'],
sorters: ['createdAt'],
filters: [
'owner._id',
'parent._id',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['createdAt','updatedAt'],
properties: [
{
name: '_id',

4
src/database/models/StockLocation.js
View File

@ -19,8 +19,8 @@ export const StockLocation = {
`/dashboard/inventory/stocklocations/info?stockLocationId=${_id}`
}
],
filters: ['_id', 'name'],
sorters: ['name', 'createdAt'],
filters: ['name','createdAt','updatedAt','_reference'],
sorters: ['name','createdAt','updatedAt'],
columns: ['_reference', 'name', 'address', 'createdAt', 'updatedAt'],
properties: [
{

18
src/database/models/StockTransfer.js
View File

@ -86,8 +86,22 @@ export const StockTransfer = {
}
}
],
filters: ['_id', 'name', 'state'],
sorters: ['name', 'createdAt', 'postedAt'],
filters: [
'state',
'state.type',
'postedAt',
'name',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',
'createdAt',
'postedAt',
'state',
'updatedAt'
],
columns: [
'_reference',
'name',

12
src/database/models/SubJob.js
View File

@ -40,8 +40,16 @@ export const SubJob = {
'finishedAt',
'createdAt'
],
filters: ['state', '_id', 'job', 'printer'],
sorters: ['createdAt', 'state'],
filters: [
'_id',
'job._id',
'printer._id',
'_reference',
'state',
'createdAt',
'updatedAt'
],
sorters: ['createdAt','state','updatedAt'],
group: ['job'],
properties: [
{

14
src/database/models/TaxRate.js
View File

@ -71,7 +71,16 @@ export const TaxRate = {
'country',
'createdAt'
],
filters: ['name', '_id', 'rate', 'rateType', 'active', 'country'],
filters: [
'name',
'rate',
'rateType',
'active',
'country',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',
'rate',
@ -79,7 +88,8 @@ export const TaxRate = {
'active',
'country',
'createdAt',
'_id'
'_id',
'updatedAt'
],
group: ['country', 'rateType'],
properties: [

19
src/database/models/TaxRecord.js
View File

@ -72,8 +72,23 @@ export const TaxRecord = {
'transactionDate',
'createdAt'
],
filters: ['taxRate', 'transactionType', 'transaction', 'transactionDate'],
sorters: ['transactionDate', 'amount', 'taxAmount', 'createdAt', '_id'],
filters: [
'taxRate',
'transactionType',
'transaction',
'transactionDate',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'transactionDate',
'amount',
'taxAmount',
'createdAt',
'_id',
'updatedAt'
],
group: ['transactionType'],
properties: [
{

20
src/database/models/User.js
View File

@ -39,8 +39,24 @@ export const User = {
}
],
columns: ['_reference', 'name', 'username', 'email', 'role', 'createdAt'],
filters: ['name', '_id', 'email', 'role'],
sorters: ['name', 'email', 'role', 'createdAt', '_id'],
filters: [
'name',
'username',
'firstName',
'lastName',
'email',
'createdAt',
'updatedAt',
'_reference'
],
sorters: [
'name',
'email',
'role',
'createdAt',
'_id',
'updatedAt'
],
properties: [
{
name: '_id',

7
src/database/models/Vendor.js
View File

@ -73,13 +73,12 @@ export const Vendor = {
'updatedAt'
],
filters: [
'name',
'_id',
'country',
'email',
'active',
'createdAt',
'updatedAt'
'updatedAt',
'name',
'_reference'
],
sorters: [
'name',