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

Enhance allowedFilters in printers.js and subjobs.js to include 'state' and '_reference' for improved filtering capabilities. Cleaned up whitespace for better code readability.
All checks were successful
farmcontrol/farmcontrol-api/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Tom Butcher 2026-08-01 13:31:27 +01:00
parent 664a3a4884
commit c233be5d80
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/routes/production/printers.js
View File

@ -16,7 +16,16 @@ import {
} from '../../services/production/printers.js'; } from '../../services/production/printers.js';
import { convertPropertiesString, getFilter } from '../../utils.js'; import { convertPropertiesString, getFilter } from '../../utils.js';
const listAllowedFilters = ['tags', 'host._id', 'active', 'online', 'name', '_id', '_reference']; const listAllowedFilters = [
'tags',
'host._id',
'active',
'online',
'name',
'_id',
'_reference',
'state',
];
const propertiesAllowedFilters = ['tags']; const propertiesAllowedFilters = ['tags'];
// list of printers // list of printers
router.get('/', isAuthenticated, (req, res) => { router.get('/', isAuthenticated, (req, res) => {

8
src/routes/production/subjobs.js
View File

@ -3,7 +3,7 @@ import { isAuthenticated } from '../../keycloak.js';
const router = express.Router(); const router = express.Router();
const listAllowedFilters = ['_id', 'job._id', 'printer._id']; const listAllowedFilters = ['_id', 'job._id', 'printer._id', '_reference', 'state'];
const propertiesAllowedFilters = ['job']; const propertiesAllowedFilters = ['job'];
import { import {
listSubJobsRouteHandler, listSubJobsRouteHandler,
@ -13,15 +13,14 @@ import {
getSubJobHistoryRouteHandler, getSubJobHistoryRouteHandler,
searchSubJobsRouteHandler, searchSubJobsRouteHandler,
getSubJobPropertyValuesRouteHandler, getSubJobPropertyValuesRouteHandler,
getSubJobNeighborsRouteHandler,
getSubJobNeighborsRouteHandler
} from '../../services/production/subjobs.js'; } from '../../services/production/subjobs.js';
import { getFilter, convertPropertiesString } from '../../utils.js'; import { getFilter, convertPropertiesString } from '../../utils.js';
// list of sub jobs // list of sub jobs
router.get('/', isAuthenticated, (req, res) => { router.get('/', isAuthenticated, (req, res) => {
const { page, limit, property, search, sort, order } = req.query; const { page, limit, property, search, sort, order } = req.query;
const filter = getFilter(req.query, listAllowedFilters); const filter = getFilter(req.query, listAllowedFilters);
listSubJobsRouteHandler(req, res, page, limit, property, filter, search, sort, order); listSubJobsRouteHandler(req, res, page, limit, property, filter, search, sort, order);
}); });
@ -44,7 +43,6 @@ router.get('/search', isAuthenticated, (req, res) => {
searchSubJobsRouteHandler(req, res, search); searchSubJobsRouteHandler(req, res, search);
}); });
// get sub job stats // get sub job stats
router.get('/stats', isAuthenticated, (req, res) => { router.get('/stats', isAuthenticated, (req, res) => {
getSubJobStatsRouteHandler(req, res); getSubJobStatsRouteHandler(req, res);