src/components/Dashboard/common/DashboardBreadcrumb.jsx

@@ -77,7 +77,9 @@ const DashboardBreadcrumb = () => {
             }}
           >
             {name}
-            {showFilterIcon && <FilterIcon style={{ fontSize: 12 }} />}
+            {showFilterIcon && (
+              <FilterIcon style={{ fontSize: 12, opacity: 0.65 }} />
+            )}
           </Link>
         ),
         key: url

src/database/models/AppPassword.js

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

src/database/models/AuditLog.js

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

src/database/models/Client.js

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

src/database/models/Courier.js

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

src/database/models/CourierService.js

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

src/database/models/DocumentJob.js

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

src/database/models/DocumentPrinter.js

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

src/database/models/DocumentSize.js

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

src/database/models/DocumentTemplate.js

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

src/database/models/Filament.js

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

src/database/models/FilamentProfile.js

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

src/database/models/FilamentSku.js

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

src/database/models/FilamentStock.js

@@ -31,26 +31,13 @@ export const FilamentStock = {
     'updatedAt'
   ],
   filters: [
+    '_id',
     'filament',
     'filament._id',
     'filamentSku',
-    'state',
+    'filamentSku._id'
-    '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: [
     {

src/database/models/File.js

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

src/database/models/GCodeFile.js

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

src/database/models/Host.js

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

src/database/models/Invoice.js

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

src/database/models/Job.js

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

src/database/models/Listing.js

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

src/database/models/ListingVarient.js

@@ -99,15 +99,13 @@ 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'],

src/database/models/Marketplace.js

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

src/database/models/Material.js

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

src/database/models/NoteType.js

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

src/database/models/OrderItem.js

@@ -80,29 +80,8 @@ export const OrderItem = {
     }
   ],
   group: [],
-  filters: [
+  filters: ['itemType', 'item', 'sku', 'order'],
-    'name',
+  sorters: ['createdAt', 'updatedAt', 'itemAmount', 'quantity'],
-    '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',

src/database/models/Part.js

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

src/database/models/PartSku.js

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

src/database/models/PartStock.js

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

src/database/models/Payment.js

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

src/database/models/Printer.js

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

src/database/models/PrinterProfile.js

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

src/database/models/Product.js

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

src/database/models/ProductCategory.js

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

src/database/models/ProductSku.js

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

src/database/models/ProductStock.js

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

src/database/models/PurchaseOrder.js

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

src/database/models/SalesOrder.js

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

src/database/models/Shipment.js

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

src/database/models/StockAudit.js

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

src/database/models/StockEvent.js

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

src/database/models/StockLocation.js

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

src/database/models/StockTransfer.js

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

src/database/models/SubJob.js

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

src/database/models/TaxRate.js

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

src/database/models/TaxRecord.js

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

src/database/models/User.js

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

src/database/models/Vendor.js

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