Refactor filter handling in various routes to include master filter support

This commit updates multiple routes across the management and inventory modules to enhance the handling of property value requests. The `/values` endpoints are modified to incorporate a filtering mechanism that allows for both a standard filter and an optional master filter, improving the flexibility and accuracy of data retrieval. Additionally, debug logging statements are added to assist in tracking the filter parameters during requests. This refactor aims to streamline the data fetching process and improve the overall user experience when interacting with the API.

src/routes/finance/invoices.js

@@ -84,10 +84,24 @@ router.get('/properties', checkPermissions('invoice', 'list'), isAuthenticated,
   listInvoicesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('invoice', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getInvoicePropertyValuesRouteHandler(req, res, property);
+  checkPermissions('invoice', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true, invoiceModel);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true, invoiceModel
+      );
+    }
+    getInvoicePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('invoice', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchInvoicesRouteHandler(req, res, search);

src/routes/finance/paymentpolicies.js

@@ -65,7 +65,17 @@ router.get(
   checkPermissions('paymentPolicy', 'list'),
   isAuthenticated,
   async (req, res) => {
-    getPaymentPolicyPropertyValuesRouteHandler(req, res, req.query.property);
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getPaymentPolicyPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
   }
 );
 

src/routes/finance/payments.js

@@ -65,10 +65,24 @@ router.get('/properties', checkPermissions('payment', 'list'), isAuthenticated,
   listPaymentsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('payment', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getPaymentPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('payment', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getPaymentPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('payment', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchPaymentsRouteHandler(req, res, search);

src/routes/finance/taxrecords.js

@@ -50,10 +50,24 @@ router.get('/properties', checkPermissions('taxRecord', 'list'), isAuthenticated
   listTaxRecordsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('taxRecord', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getTaxRecordPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('taxRecord', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getTaxRecordPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('taxRecord', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchTaxRecordsRouteHandler(req, res, search);

src/routes/inventory/filamentstocks.js

@@ -60,10 +60,24 @@ router.get('/properties', checkPermissions('filamentStock', 'list'), isAuthentic
   listFilamentStocksByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('filamentStock', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getFilamentStockPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('filamentStock', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getFilamentStockPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('filamentStock', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchFilamentStocksRouteHandler(req, res, search);

src/routes/inventory/orderitems.js

@@ -74,10 +74,24 @@ router.get('/properties', checkPermissions('orderItem', 'list'), isAuthenticated
   listOrderItemsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('orderItem', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getOrderItemPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('orderItem', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getOrderItemPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('orderItem', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchOrderItemsRouteHandler(req, res, search);

src/routes/inventory/partstocks.js

@@ -52,10 +52,24 @@ router.get('/properties', checkPermissions('partStock', 'list'), isAuthenticated
   listPartStocksByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('partStock', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getPartStockPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('partStock', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getPartStockPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('partStock', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchPartStocksRouteHandler(req, res, search);

src/routes/inventory/productstocks.js

@@ -51,10 +51,24 @@ router.get('/properties', checkPermissions('productStock', 'list'), isAuthentica
   listProductStocksByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('productStock', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getProductStockPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('productStock', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getProductStockPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('productStock', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchProductStocksRouteHandler(req, res, search);

src/routes/inventory/purchaseorders.js

@@ -78,10 +78,24 @@ router.get('/properties', checkPermissions('purchaseOrder', 'list'), isAuthentic
   listPurchaseOrdersByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('purchaseOrder', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getPurchaseOrderPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('purchaseOrder', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getPurchaseOrderPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('purchaseOrder', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchPurchaseOrdersRouteHandler(req, res, search);

src/routes/inventory/shipments.js

@@ -83,10 +83,24 @@ router.get('/properties', checkPermissions('shipment', 'list'), isAuthenticated,
   listShipmentsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('shipment', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getShipmentPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('shipment', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getShipmentPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('shipment', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchShipmentsRouteHandler(req, res, search);

src/routes/inventory/stockevents.js

@@ -41,10 +41,24 @@ router.get('/properties', checkPermissions('stockEvent', 'list'), isAuthenticate
   listStockEventsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('stockEvent', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getStockEventPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('stockEvent', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getStockEventPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('stockEvent', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchStockEventsRouteHandler(req, res, search);

src/routes/inventory/stocklocations.js

@@ -40,10 +40,24 @@ router.get('/properties', checkPermissions('stockLocation', 'list'), isAuthentic
   listStockLocationsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('stockLocation', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getStockLocationPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('stockLocation', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getStockLocationPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('stockLocation', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchStockLocationsRouteHandler(req, res, search);

src/routes/inventory/stocktransfers.js

@@ -49,10 +49,24 @@ router.get('/properties', checkPermissions('stockTransfer', 'list'), isAuthentic
   listStockTransfersByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('stockTransfer', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getStockTransferPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('stockTransfer', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getStockTransferPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('stockTransfer', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchStockTransfersRouteHandler(req, res, search);

src/routes/management/apppasswords.js

@@ -46,10 +46,24 @@ router.get('/properties', checkPermissions('appPassword', 'list'), isAuthenticat
   listAppPasswordsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('appPassword', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getAppPasswordPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('appPassword', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getAppPasswordPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('appPassword', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/courier.js

@@ -50,10 +50,24 @@ router.get('/properties', checkPermissions('courier', 'list'), isAuthenticated,
   listCouriersByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('courier', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getCourierPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('courier', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getCourierPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('courier', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/courierservice.js

@@ -76,10 +76,24 @@ router.get('/properties', checkPermissions('courierService', 'list'), isAuthenti
   listCourierServicesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('courierService', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getCourierServicePropertyValuesRouteHandler(req, res, property);
+  checkPermissions('courierService', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getCourierServicePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('courierService', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/documentjobs.js

@@ -49,10 +49,24 @@ router.get('/properties', checkPermissions('documentJob', 'list'), isAuthenticat
   listDocumentJobsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('documentJob', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getDocumentJobPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('documentJob', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getDocumentJobPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('documentJob', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/documentprinters.js

@@ -49,10 +49,24 @@ router.get('/properties', checkPermissions('documentPrinter', 'list'), isAuthent
   listDocumentPrintersByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('documentPrinter', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getDocumentPrinterPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('documentPrinter', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getDocumentPrinterPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('documentPrinter', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/documentsizes.js

@@ -64,10 +64,24 @@ router.get('/properties', checkPermissions('documentSize', 'list'), isAuthentica
   listDocumentSizesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('documentSize', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getDocumentSizePropertyValuesRouteHandler(req, res, property);
+  checkPermissions('documentSize', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getDocumentSizePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('documentSize', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/documenttemplates.js

@@ -66,10 +66,24 @@ router.get('/properties', checkPermissions('documentTemplate', 'list'), isAuthen
   listDocumentTemplatesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('documentTemplate', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getDocumentTemplatePropertyValuesRouteHandler(req, res, property);
+  checkPermissions('documentTemplate', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getDocumentTemplatePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('documentTemplate', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/filaments.js

@@ -70,10 +70,24 @@ router.get('/properties', checkPermissions('filament', 'list'), isAuthenticated,
   listFilamentsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('filament', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getFilamentPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('filament', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getFilamentPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('filament', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/filamentskus.js

@@ -59,10 +59,24 @@ router.get('/properties', checkPermissions('filamentSku', 'list'), isAuthenticat
   listFilamentSkusByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('filamentSku', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getFilamentSkuPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('filamentSku', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getFilamentSkuPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('filamentSku', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchFilamentSkusRouteHandler(req, res, search);

src/routes/management/files.js

@@ -52,10 +52,24 @@ router.get('/properties', checkPermissions('file', 'list'), isAuthenticated, asy
   listFilesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('file', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getFilePropertyValuesRouteHandler(req, res, property);
+  checkPermissions('file', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getFilePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('file', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/hosts.js

@@ -48,10 +48,24 @@ router.get('/properties', checkPermissions('host', 'list'), isAuthenticated, asy
   listHostsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('host', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getHostPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('host', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getHostPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('host', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/materials.js

@@ -48,10 +48,24 @@ router.get('/properties', checkPermissions('material', 'list'), isAuthenticated,
   listMaterialsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('material', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getMaterialPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('material', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getMaterialPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('material', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/notetypes.js

@@ -48,10 +48,24 @@ router.get('/properties', checkPermissions('noteType', 'list'), isAuthenticated,
   listNoteTypesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('noteType', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getNoteTypePropertyValuesRouteHandler(req, res, property);
+  checkPermissions('noteType', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getNoteTypePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('noteType', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchNoteTypesRouteHandler(req, res, search);

src/routes/management/parts.js

@@ -59,10 +59,24 @@ router.get('/properties', checkPermissions('part', 'list'), isAuthenticated, asy
   listPartsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('part', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getPartPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('part', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getPartPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('part', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/partskus.js

@@ -60,10 +60,24 @@ router.get('/properties', checkPermissions('partSku', 'list'), isAuthenticated,
   listPartSkusByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('partSku', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getPartSkuPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('partSku', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getPartSkuPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('partSku', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchPartSkusRouteHandler(req, res, search);

src/routes/management/permissionsetting.js

@@ -48,10 +48,24 @@ router.get('/properties', checkPermissions('permissionSetting', 'list'), isAuthe
   listPermissionSettingsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('permissionSetting', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getPermissionSettingsPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('permissionSetting', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getPermissionSettingsPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('permissionSetting', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/productcategories.js

@@ -46,10 +46,24 @@ router.get('/properties', checkPermissions('productCategory', 'list'), isAuthent
   listProductCategoriesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('productCategory', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getProductCategoryPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('productCategory', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getProductCategoryPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('productCategory', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/products.js

@@ -60,10 +60,24 @@ router.get('/properties', checkPermissions('product', 'list'), isAuthenticated,
   listProductsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('product', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getProductPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('product', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getProductPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('product', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/productskus.js

@@ -60,10 +60,24 @@ router.get('/properties', checkPermissions('productSku', 'list'), isAuthenticate
   listProductSkusByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('productSku', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getProductSkuPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('productSku', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getProductSkuPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('productSku', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchProductSkusRouteHandler(req, res, search);

src/routes/management/taxrates.js

@@ -61,10 +61,24 @@ router.get('/properties', checkPermissions('taxRate', 'list'), isAuthenticated,
   listTaxRatesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('taxRate', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getTaxRatePropertyValuesRouteHandler(req, res, property);
+  checkPermissions('taxRate', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getTaxRatePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('taxRate', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/usergroups.js

@@ -48,10 +48,24 @@ router.get('/properties', checkPermissions('userGroup', 'list'), isAuthenticated
   listUserGroupsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('userGroup', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getUserGroupPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('userGroup', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getUserGroupPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('userGroup', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/management/users.js

@@ -50,10 +50,24 @@ router.get('/properties', checkPermissions('user', 'list'), isAuthenticated, asy
   listUsersByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('user', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getUserPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('user', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getUserPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('user', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchUsersRouteHandler(req, res, search);

src/routes/management/vendors.js

@@ -48,10 +48,24 @@ router.get('/properties', checkPermissions('vendor', 'list'), isAuthenticated, a
   listVendorsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('vendor', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getVendorPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('vendor', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getVendorPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('vendor', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;

src/routes/production/filamentprofiles.js

@@ -46,10 +46,24 @@ router.get('/properties', checkPermissions('filamentProfile', 'list'), isAuthent
   listFilamentProfilesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('filamentProfile', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getFilamentProfilePropertyValuesRouteHandler(req, res, property);
+  checkPermissions('filamentProfile', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getFilamentProfilePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('filamentProfile', 'list'), isAuthenticated, async (req, res) => {
   searchFilamentProfilesRouteHandler(req, res, req.query.search);

src/routes/production/gcodefiles.js

@@ -49,10 +49,24 @@ router.get('/properties', checkPermissions('gcodeFile', 'list'), isAuthenticated
   listGCodeFilesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('gcodeFile', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getGCodeFilePropertyValuesRouteHandler(req, res, property);
+  checkPermissions('gcodeFile', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getGCodeFilePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('gcodeFile', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchGCodeFilesRouteHandler(req, res, search);

src/routes/production/jobs.js

@@ -45,7 +45,17 @@ import { convertPropertiesString, getFilter, getSort } from '../../utils.js';
 router.get('/', isAuthenticated, checkPermissions('job', 'list'), async (req, res) => {
   const { page, limit, property, search, sortProperty, sortOrder } = req.query;
   const filter = await getFilter(req.query, listAllowedFilters);
-  listJobsRouteHandler(req, res, page, limit, property, filter, search, getSort(sortProperty, listAllowedSorters), sortOrder);
+  listJobsRouteHandler(
+    req,
+    res,
+    page,
+    limit,
+    property,
+    filter,
+    search,
+    getSort(sortProperty, listAllowedSorters),
+    sortOrder
+  );
 });
 
 router.get('/properties', checkPermissions('job', 'list'), isAuthenticated, async (req, res) => {
@@ -60,7 +70,12 @@ router.get('/properties', checkPermissions('job', 'list'), isAuthenticated, asyn
 
 router.get('/values', checkPermissions('job', 'list'), isAuthenticated, async (req, res) => {
   const { property } = req.query;
-  getJobPropertyValuesRouteHandler(req, res, property);
+  const filter = await getFilter(req.query, listAllowedFilters, true);
+  var masterFilter = {};
+  if (req.query.masterFilter) {
+    masterFilter = await getFilter(JSON.parse(req.query.masterFilter), listAllowedFilters, true);
+  }
+  getJobPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
 });
 router.get('/search', checkPermissions('job', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
@@ -84,7 +99,16 @@ router.get('/history', isAuthenticated, async (req, res) => {
 router.get('/neighbors', isAuthenticated, async (req, res) => {
   const { property, search, sortProperty, sortOrder, id } = req.query;
   const filter = await getFilter(req.query, listAllowedFilters);
-  getJobNeighborsRouteHandler(req, res, property, filter, search, getSort(sortProperty, listAllowedSorters), sortOrder, id);
+  getJobNeighborsRouteHandler(
+    req,
+    res,
+    property,
+    filter,
+    search,
+    getSort(sortProperty, listAllowedSorters),
+    sortOrder,
+    id
+  );
 });
 
 router.get('/:id', isAuthenticated, checkPermissions('job', 'info'), async (req, res) => {

src/routes/production/printerprofiles.js

@@ -45,10 +45,24 @@ router.get('/properties', checkPermissions('printerProfile', 'list'), isAuthenti
   listPrinterProfilesByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('printerProfile', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getPrinterProfilePropertyValuesRouteHandler(req, res, property);
+  checkPermissions('printerProfile', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getPrinterProfilePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 
 router.get('/search', checkPermissions('printerProfile', 'list'), isAuthenticated, async (req, res) => {
   searchPrinterProfilesRouteHandler(req, res, req.query.search);

src/routes/production/printers.js

@@ -49,10 +49,24 @@ router.get('/properties', checkPermissions('printer', 'list'), isAuthenticated,
   listPrintersByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('printer', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getPrinterPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('printer', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getPrinterPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('printer', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchPrintersRouteHandler(req, res, search);

src/routes/production/subjobs.js

@@ -56,10 +56,24 @@ router.get('/properties', checkPermissions('subJob', 'list'), isAuthenticated, a
   listSubJobsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('subJob', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getSubJobPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('subJob', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getSubJobPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('subJob', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchSubJobsRouteHandler(req, res, search);

src/routes/sales/clients.js

@@ -49,10 +49,24 @@ router.get('/properties', checkPermissions('client', 'list'), isAuthenticated, a
   listClientsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('client', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getClientPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('client', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getClientPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('client', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchClientsRouteHandler(req, res, search);

src/routes/sales/fulfillmentpolicies.js

@@ -76,7 +76,17 @@ router.get(
   checkPermissions('fulfillmentPolicy', 'list'),
   isAuthenticated,
   async (req, res) => {
-    getFulfillmentPolicyPropertyValuesRouteHandler(req, res, req.query.property);
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getFulfillmentPolicyPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
   }
 );
 

src/routes/sales/listings.js

@@ -84,10 +84,24 @@ router.get('/properties', checkPermissions('listing', 'list'), isAuthenticated,
   listListingsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('listing', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getListingPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('listing', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getListingPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('listing', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchListingsRouteHandler(req, res, search);

src/routes/sales/listingvarients.js

@@ -2,6 +2,7 @@ import express from 'express';
 import { isAuthenticated } from '../../keycloak.js';
 import { checkPermissions } from '../../database/permissions.js';
 import { getFilter, convertPropertiesString, getSort } from '../../utils.js';
+import { listingVarientModel } from '../../database/schemas/sales/listingvarient.schema.js';
 
 const router = express.Router();
 
@@ -19,18 +20,26 @@ const listAllowedFilters = [
   'updatedAt',
   '_reference',
 ];
-const listAllowedSorters = ['state', 'stockQuantity', 'price', 'lastSyncedAt', 'createdAt', 'updatedAt', '_id'];
+const listAllowedSorters = [
+  'state',
+  'stockQuantity',
+  'price',
+  'lastSyncedAt',
+  'createdAt',
+  'updatedAt',
+  '_id',
+];
 const propertiesAllowedFilters = [
-    'listing',
+  'listing',
-    'listing._id',
+  'listing._id',
-    'product',
+  'product',
-    'productSku',
+  'productSku',
-    'stockQuantity',
+  'stockQuantity',
-    'state',
+  'state',
-    'state.type',
+  'state.type',
-    'createdAt',
+  'createdAt',
-    'updatedAt',
+  'updatedAt',
-  ];
+];
 import {
   listListingVarientsRouteHandler,
   getListingVarientRouteHandler,
@@ -44,39 +53,77 @@ import {
   unpublishListingVarientRouteHandler,
   searchListingVarientsRouteHandler,
   getListingVarientPropertyValuesRouteHandler,
-
+  getListingVarientNeighborsRouteHandler,
-  getListingVarientNeighborsRouteHandler
 } from '../../services/sales/listingvarients.js';
 
 router.get('/', isAuthenticated, checkPermissions('listingVarient', 'list'), async (req, res) => {
   const { page, limit, property, search, sortProperty, sortOrder } = req.query;
-    const filter = await getFilter(req.query, listAllowedFilters);
+  const filter = await getFilter(req.query, listAllowedFilters);
-  listListingVarientsRouteHandler(req, res, page, limit, property, filter, search, getSort(sortProperty, listAllowedSorters), sortOrder);
+  listListingVarientsRouteHandler(
+    req,
+    res,
+    page,
+    limit,
+    property,
+    filter,
+    search,
+    getSort(sortProperty, listAllowedSorters),
+    sortOrder
+  );
 });
 
-router.get('/properties', checkPermissions('listingVarient', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  let properties = convertPropertiesString(req.query.properties);
+  '/properties',
-  const filter = await getFilter(req.query, propertiesAllowedFilters, false);
+  checkPermissions('listingVarient', 'list'),
-  var masterFilter = {};
+  isAuthenticated,
-  if (req.query.masterFilter) {
+  async (req, res) => {
-    masterFilter = JSON.parse(req.query.masterFilter);
+    let properties = convertPropertiesString(req.query.properties);
+    const filter = await getFilter(req.query, propertiesAllowedFilters, false);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = JSON.parse(req.query.masterFilter);
+    }
+    listListingVarientsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
   }
-  listListingVarientsByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
+);
-});
 
-router.get('/values', checkPermissions('listingVarient', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getListingVarientPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('listingVarient', 'list'),
-});
+  isAuthenticated,
-router.get('/search', checkPermissions('listingVarient', 'list'), isAuthenticated, async (req, res) => {
+  async (req, res) => {
-  const { search } = req.query;
+    const { property } = req.query;
-  searchListingVarientsRouteHandler(req, res, search);
+    const filter = await getFilter(req.query, listAllowedFilters, true, listingVarientModel);
-});
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true,
+        listingVarientModel
+      );
+    }
+    getListingVarientPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
+router.get(
+  '/search',
+  checkPermissions('listingVarient', 'list'),
+  isAuthenticated,
+  async (req, res) => {
+    const { search } = req.query;
+    searchListingVarientsRouteHandler(req, res, search);
+  }
+);
 
-
+router.post(
-router.post('/', isAuthenticated, checkPermissions('listing', 'newListingVarient'), async (req, res) => {
+  '/',
-  newListingVarientRouteHandler(req, res);
+  isAuthenticated,
-});
+  checkPermissions('listing', 'newListingVarient'),
+  async (req, res) => {
+    newListingVarientRouteHandler(req, res);
+  }
+);
 
 router.get('/stats', isAuthenticated, async (req, res) => {
   getListingVarientStatsRouteHandler(req, res);
@@ -86,27 +133,56 @@ router.get('/history', isAuthenticated, async (req, res) => {
   getListingVarientHistoryRouteHandler(req, res);
 });
 
-router.post('/:id/publish', isAuthenticated, checkPermissions('listingVarient', 'publish'), async (req, res) => {
+router.post(
-  publishListingVarientRouteHandler(req, res);
+  '/:id/publish',
-});
+  isAuthenticated,
+  checkPermissions('listingVarient', 'publish'),
+  async (req, res) => {
+    publishListingVarientRouteHandler(req, res);
+  }
+);
 
-router.post('/:id/unpublish', isAuthenticated, checkPermissions('listingVarient', 'unpublish'), async (req, res) => {
+router.post(
-  unpublishListingVarientRouteHandler(req, res);
+  '/:id/unpublish',
-});
+  isAuthenticated,
+  checkPermissions('listingVarient', 'unpublish'),
+  async (req, res) => {
+    unpublishListingVarientRouteHandler(req, res);
+  }
+);
 
 router.get('/neighbors', isAuthenticated, async (req, res) => {
   const { property, search, sortProperty, sortOrder, id } = req.query;
   const filter = await getFilter(req.query, listAllowedFilters);
-  getListingVarientNeighborsRouteHandler(req, res, property, filter, search, getSort(sortProperty, listAllowedSorters), sortOrder, id);
+  getListingVarientNeighborsRouteHandler(
+    req,
+    res,
+    property,
+    filter,
+    search,
+    getSort(sortProperty, listAllowedSorters),
+    sortOrder,
+    id
+  );
 });
 
-router.get('/:id', isAuthenticated, checkPermissions('listingVarient', 'info'), async (req, res) => {
+router.get(
-  getListingVarientRouteHandler(req, res);
+  '/:id',
-});
+  isAuthenticated,
+  checkPermissions('listingVarient', 'info'),
+  async (req, res) => {
+    getListingVarientRouteHandler(req, res);
+  }
+);
 
-router.put('/:id', isAuthenticated, checkPermissions('listingVarient', 'edit'), async (req, res) => {
+router.put(
-  editListingVarientRouteHandler(req, res);
+  '/:id',
-});
+  isAuthenticated,
+  checkPermissions('listingVarient', 'edit'),
+  async (req, res) => {
+    editListingVarientRouteHandler(req, res);
+  }
+);
 
 router.delete('/:id', isAuthenticated, async (req, res) => {
   deleteListingVarientRouteHandler(req, res);

src/routes/sales/marketplaces.js

@@ -101,7 +101,16 @@ router.get(
   isAuthenticated,
   async (req, res) => {
     const { property } = req.query;
-    getMarketplacePropertyValuesRouteHandler(req, res, property);
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getMarketplacePropertyValuesRouteHandler(req, res, property, filter, masterFilter);
   }
 );
 router.get(

src/routes/sales/returnpolicies.js

@@ -81,7 +81,17 @@ router.get(
   checkPermissions('returnPolicy', 'list'),
   isAuthenticated,
   async (req, res) => {
-    getReturnPolicyPropertyValuesRouteHandler(req, res, req.query.property);
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getReturnPolicyPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
   }
 );
 

src/routes/sales/salesorders.js

@@ -51,10 +51,24 @@ router.get('/properties', checkPermissions('salesOrder', 'list'), isAuthenticate
   listSalesOrdersByPropertiesRouteHandler(req, res, properties, filter, masterFilter);
 });
 
-router.get('/values', checkPermissions('salesOrder', 'list'), isAuthenticated, async (req, res) => {
+router.get(
-  const { property } = req.query;
+  '/values',
-  getSalesOrderPropertyValuesRouteHandler(req, res, property);
+  checkPermissions('salesOrder', 'list'),
-});
+  isAuthenticated,
+  async (req, res) => {
+    const { property } = req.query;
+    const filter = await getFilter(req.query, listAllowedFilters, true);
+    var masterFilter = {};
+    if (req.query.masterFilter) {
+      masterFilter = await getFilter(
+        JSON.parse(req.query.masterFilter),
+        listAllowedFilters,
+        true
+      );
+    }
+    getSalesOrderPropertyValuesRouteHandler(req, res, property, filter, masterFilter);
+  }
+);
 router.get('/search', checkPermissions('salesOrder', 'list'), isAuthenticated, async (req, res) => {
   const { search } = req.query;
   searchSalesOrdersRouteHandler(req, res, search);

src/services/finance/invoices.js

@@ -95,10 +95,17 @@ export const listInvoicesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getInvoicePropertyValuesRouteHandler = async (req, res, property) => {
+export const getInvoicePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: invoiceModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/finance/paymentpolicies.js

@@ -89,10 +89,17 @@ export const listPaymentPoliciesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getPaymentPolicyPropertyValuesRouteHandler = async (req, res, property) => {
+export const getPaymentPolicyPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: paymentPolicyModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/finance/payments.js

@@ -84,10 +84,17 @@ export const listPaymentsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getPaymentPropertyValuesRouteHandler = async (req, res, property) => {
+export const getPaymentPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: paymentModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/finance/taxrecords.js

@@ -74,10 +74,17 @@ export const listTaxRecordsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getTaxRecordPropertyValuesRouteHandler = async (req, res, property) => {
+export const getTaxRecordPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: taxRecordModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/inventory/filamentstocks.js

@@ -82,10 +82,17 @@ export const listFilamentStocksByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getFilamentStockPropertyValuesRouteHandler = async (req, res, property) => {
+export const getFilamentStockPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: filamentStockModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/inventory/orderitems.js

@@ -173,10 +173,17 @@ export const listOrderItemsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getOrderItemPropertyValuesRouteHandler = async (req, res, property) => {
+export const getOrderItemPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: orderItemModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/inventory/partstocks.js

@@ -85,10 +85,17 @@ export const listPartStocksByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getPartStockPropertyValuesRouteHandler = async (req, res, property) => {
+export const getPartStockPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: partStockModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/inventory/productstocks.js

@@ -144,10 +144,17 @@ export const listProductStocksByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getProductStockPropertyValuesRouteHandler = async (req, res, property) => {
+export const getProductStockPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: productStockModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/inventory/purchaseorders.js

@@ -81,10 +81,17 @@ export const listPurchaseOrdersByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getPurchaseOrderPropertyValuesRouteHandler = async (req, res, property) => {
+export const getPurchaseOrderPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: purchaseOrderModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/inventory/shipments.js

@@ -82,10 +82,17 @@ export const listShipmentsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getShipmentPropertyValuesRouteHandler = async (req, res, property) => {
+export const getShipmentPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: shipmentModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/inventory/stockevents.js

@@ -79,10 +79,17 @@ export const listStockEventsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getStockEventPropertyValuesRouteHandler = async (req, res, property) => {
+export const getStockEventPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: stockEventModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/inventory/stocklocations.js

@@ -76,10 +76,17 @@ export const listStockLocationsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getStockLocationPropertyValuesRouteHandler = async (req, res, property) => {
+export const getStockLocationPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: stockLocationModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/inventory/stocktransfers.js

@@ -281,10 +281,17 @@ export const listStockTransfersByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getStockTransferPropertyValuesRouteHandler = async (req, res, property) => {
+export const getStockTransferPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: stockTransferModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/apppasswords.js

@@ -82,10 +82,17 @@ export const listAppPasswordsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getAppPasswordPropertyValuesRouteHandler = async (req, res, property) => {
+export const getAppPasswordPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: appPasswordModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/courier.js

@@ -74,10 +74,17 @@ export const listCouriersByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getCourierPropertyValuesRouteHandler = async (req, res, property) => {
+export const getCourierPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: courierModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/courierservice.js

@@ -78,10 +78,17 @@ export const listCourierServicesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getCourierServicePropertyValuesRouteHandler = async (req, res, property) => {
+export const getCourierServicePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: courierServiceModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/documentjobs.js

@@ -75,10 +75,17 @@ export const listDocumentJobsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getDocumentJobPropertyValuesRouteHandler = async (req, res, property) => {
+export const getDocumentJobPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: documentJobModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/documentprinters.js

@@ -78,10 +78,17 @@ export const listDocumentPrintersByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getDocumentPrinterPropertyValuesRouteHandler = async (req, res, property) => {
+export const getDocumentPrinterPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: documentPrinterModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/documentsizes.js

@@ -74,10 +74,17 @@ export const listDocumentSizesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getDocumentSizePropertyValuesRouteHandler = async (req, res, property) => {
+export const getDocumentSizePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: documentSizeModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/documenttemplates.js

@@ -112,10 +112,17 @@ export const listDocumentTemplatesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getDocumentTemplatePropertyValuesRouteHandler = async (req, res, property) => {
+export const getDocumentTemplatePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: documentTemplateModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/filaments.js

@@ -78,10 +78,17 @@ export const listFilamentsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getFilamentPropertyValuesRouteHandler = async (req, res, property) => {
+export const getFilamentPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: filamentModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/filamentskus.js

@@ -76,10 +76,17 @@ export const listFilamentSkusByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getFilamentSkuPropertyValuesRouteHandler = async (req, res, property) => {
+export const getFilamentSkuPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: filamentSkuModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/files.js

@@ -111,10 +111,17 @@ export const listFilesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getFilePropertyValuesRouteHandler = async (req, res, property) => {
+export const getFilePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: fileModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/hosts.js

@@ -74,10 +74,17 @@ export const listHostsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getHostPropertyValuesRouteHandler = async (req, res, property) => {
+export const getHostPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: hostModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/materials.js

@@ -76,10 +76,17 @@ export const listMaterialsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getMaterialPropertyValuesRouteHandler = async (req, res, property) => {
+export const getMaterialPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: materialModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/notetypes.js

@@ -74,10 +74,17 @@ export const listNoteTypesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getNoteTypePropertyValuesRouteHandler = async (req, res, property) => {
+export const getNoteTypePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: noteTypeModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/parts.js

@@ -76,10 +76,17 @@ export const listPartsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getPartPropertyValuesRouteHandler = async (req, res, property) => {
+export const getPartPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: partModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/partskus.js

@@ -82,10 +82,17 @@ export const listPartSkusByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getPartSkuPropertyValuesRouteHandler = async (req, res, property) => {
+export const getPartSkuPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: partSkuModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/permissionsetting.js

@@ -77,10 +77,17 @@ export const listPermissionSettingsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getPermissionSettingsPropertyValuesRouteHandler = async (req, res, property) => {
+export const getPermissionSettingsPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: permissionSettingModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/productcategories.js

@@ -79,10 +79,17 @@ export const listProductCategoriesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getProductCategoryPropertyValuesRouteHandler = async (req, res, property) => {
+export const getProductCategoryPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: productCategoryModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/products.js

@@ -76,10 +76,17 @@ export const listProductsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getProductPropertyValuesRouteHandler = async (req, res, property) => {
+export const getProductPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: productModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/productskus.js

@@ -85,10 +85,17 @@ export const listProductSkusByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getProductSkuPropertyValuesRouteHandler = async (req, res, property) => {
+export const getProductSkuPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: productSkuModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/taxrates.js

@@ -80,10 +80,17 @@ export const listTaxRatesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getTaxRatePropertyValuesRouteHandler = async (req, res, property) => {
+export const getTaxRatePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: taxRateModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/usergroups.js

@@ -83,10 +83,17 @@ export const listUserGroupsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getUserGroupPropertyValuesRouteHandler = async (req, res, property) => {
+export const getUserGroupPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: userGroupModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/users.js

@@ -78,10 +78,17 @@ export const listUsersByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getUserPropertyValuesRouteHandler = async (req, res, property) => {
+export const getUserPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: userModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/management/vendors.js

@@ -74,10 +74,17 @@ export const listVendorsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getVendorPropertyValuesRouteHandler = async (req, res, property) => {
+export const getVendorPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: vendorModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/production/filamentprofiles.js

@@ -225,10 +225,17 @@ export const listFilamentProfilesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getFilamentProfilePropertyValuesRouteHandler = async (req, res, property) => {
+export const getFilamentProfilePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: filamentProfileModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/production/gcodefiles.js

@@ -76,10 +76,17 @@ export const listGCodeFilesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getGCodeFilePropertyValuesRouteHandler = async (req, res, property) => {
+export const getGCodeFilePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: gcodeFileModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/production/jobs.js

@@ -76,11 +76,17 @@ export const listJobsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getJobPropertyValuesRouteHandler = async (req, res, property, filter = {}) => {
+export const getJobPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: jobModel,
     property,
-    filter,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/production/printerprofiles.js

@@ -113,10 +113,17 @@ export const listPrinterProfilesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getPrinterProfilePropertyValuesRouteHandler = async (req, res, property) => {
+export const getPrinterProfilePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: printerProfileModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/production/printers.js

@@ -77,10 +77,17 @@ export const listPrintersByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getPrinterPropertyValuesRouteHandler = async (req, res, property) => {
+export const getPrinterPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: printerModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/production/subjobs.js

@@ -71,10 +71,17 @@ export const listSubJobsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getSubJobPropertyValuesRouteHandler = async (req, res, property) => {
+export const getSubJobPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: subJobModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/sales/clients.js

@@ -74,10 +74,17 @@ export const listClientsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getClientPropertyValuesRouteHandler = async (req, res, property) => {
+export const getClientPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: clientModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/sales/fulfillmentpolicies.js

@@ -95,10 +95,17 @@ export const listFulfillmentPoliciesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getFulfillmentPolicyPropertyValuesRouteHandler = async (req, res, property) => {
+export const getFulfillmentPolicyPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: fulfillmentPolicyModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/sales/listings.js

@@ -144,10 +144,17 @@ export const listListingsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getListingPropertyValuesRouteHandler = async (req, res, property) => {
+export const getListingPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: listingModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/sales/listingvarients.js

@@ -45,13 +45,7 @@ function pushListingToMarketplace(listingId, marketplaceId, user) {
   run();
 }
 
-const POPULATE_FIELDS = [
+const POPULATE_FIELDS = ['listing', 'product', 'productSku', 'priceTaxRate', 'listingImages'];
-  'listing',
-  'product',
-  'productSku',
-  'priceTaxRate',
-  'listingImages',
-];
 
 export const listListingVarientsRouteHandler = async (
   req,
@@ -111,10 +105,17 @@ export const listListingVarientsByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getListingVarientPropertyValuesRouteHandler = async (req, res, property) => {
+export const getListingVarientPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: listingVarientModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/sales/marketplaces.js

@@ -84,10 +84,17 @@ export const listMarketplacesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getMarketplacePropertyValuesRouteHandler = async (req, res, property) => {
+export const getMarketplacePropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: marketplaceModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/sales/returnpolicies.js

@@ -96,10 +96,17 @@ export const listReturnPoliciesByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getReturnPolicyPropertyValuesRouteHandler = async (req, res, property) => {
+export const getReturnPolicyPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: returnPolicyModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/services/sales/salesorders.js

@@ -81,10 +81,17 @@ export const listSalesOrdersByPropertiesRouteHandler = async (
   res.send(result);
 };
 
-export const getSalesOrderPropertyValuesRouteHandler = async (req, res, property) => {
+export const getSalesOrderPropertyValuesRouteHandler = async (
+  req,
+  res,
+  property,
+  filter,
+  masterFilter
+) => {
   const result = await getPropertyValues({
     model: salesOrderModel,
     property,
+    filter: { ...filter, ...masterFilter },
   });
   res.send(result);
 };

src/utils.js

@@ -708,7 +708,6 @@ async function resolveRefLeaf(rawToken, fallbackRefName) {
       return resolveRefOperand(lookupToken.slice(symbol.length), refModelEntry, name);
     }
   }
-
   const objectId = extractObjectIdFromOperand(lookupToken);
   if (objectId) return { value: objectId };
 
@@ -740,6 +739,10 @@ async function parseFilter(property, value, model = null) {
     property = 'state.type';
   }
 
+  console.log('property', property);
+  console.log('value', value);
+  console.log('model', model);
+
   const fieldKind = getFilterFieldKind(property, model);
   const filterProperty = fieldKind.property;
   const isBoolField = isBooleanField(property, model);
@@ -1673,6 +1676,10 @@ function normalizeFilterQuery(query = {}) {
 // Returns a filter object based on allowed filters and req.query
 async function getFilter(query, allowedFilters, parse = true, model = null) {
   const clauses = [];
+  console.log('query', query);
+  console.log('allowedFilters', allowedFilters);
+  console.log('parse', parse);
+  console.log('model', model);
   const queryClean = normalizeFilterQuery(query);
   for (const key of ['sortProperty', 'sortOrder', 'page', 'limit']) {
     if (key in queryClean) delete queryClean[key];