From 97d5bfcee7147654246246d15bc06f919367ba68 Mon Sep 17 00:00:00 2001 From: Tom Butcher Date: Mon, 18 Aug 2025 01:05:18 +0100 Subject: [PATCH] Update Filament and Printer models for improved data structure - Added 'createdAt' to the sorters array in the Filament model for enhanced sorting capabilities. - Refactored the Printer model to change 'moonraker.host' to 'host' and introduced a new 'host._id' field for better object representation and clarity. - Updated the 'hostname' field to improve consistency in naming conventions. --- src/database/models/Filament.js | 10 +++++++++- src/database/models/Printer.js | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/database/models/Filament.js b/src/database/models/Filament.js index f767c77..c3bcd0b 100644 --- a/src/database/models/Filament.js +++ b/src/database/models/Filament.js @@ -47,7 +47,15 @@ export const Filament = { 'updatedAt' ], filters: ['_id', 'name', 'type', 'color', 'cost', 'vendor', 'vendor._id'], - sorters: ['name', 'createdAt', 'type', 'vendor', 'cost', 'updatedAt'], + sorters: [ + 'name', + 'createdAt', + 'type', + 'vendor', + 'cost', + 'updatedAt', + 'createdAt' + ], group: ['diameter', 'type', 'vendor'], properties: [ { diff --git a/src/database/models/Printer.js b/src/database/models/Printer.js index 6c4d0e8..5aed554 100644 --- a/src/database/models/Printer.js +++ b/src/database/models/Printer.js @@ -92,8 +92,23 @@ export const Printer = { readOnly: true }, { - name: 'moonraker.host', + name: 'host', label: 'Host', + type: 'object', + objectType: 'host', + required: true + }, + { + name: 'host._id', + label: 'Host ID', + type: 'id', + objectType: 'host', + showHyperlink: true, + readOnly: true + }, + { + name: 'moonraker.host', + label: 'Hostname', type: 'text', required: true },