From b71537dc64674686fb99013911baa17627459d60 Mon Sep 17 00:00:00 2001 From: Tom Butcher Date: Mon, 14 Jul 2025 23:02:26 +0100 Subject: [PATCH] Updated models --- src/database/models/AuditLog.js | 18 +++++++++-- src/database/models/Job.js | 17 +++------- src/database/models/Note.js | 55 ++++++++++++++++++++++++++++++++- 3 files changed, 75 insertions(+), 15 deletions(-) diff --git a/src/database/models/AuditLog.js b/src/database/models/AuditLog.js index bd80473..ab0c466 100644 --- a/src/database/models/AuditLog.js +++ b/src/database/models/AuditLog.js @@ -6,8 +6,16 @@ export const AuditLog = { prefix: 'ADL', icon: AuditLogIcon, actions: [], - columns: ['_id', 'owner', 'owner._id', 'parent._id', 'changes', 'createdAt'], - filters: ['_id', 'owner._id', 'parent._id'], + columns: [ + '_id', + 'owner', + 'owner._id', + 'parent._id', + 'operation', + 'changes', + 'createdAt' + ], + filters: ['_id', 'owner._id', 'parent._id', 'operation'], sorters: ['createdAt'], properties: [ { @@ -75,6 +83,12 @@ export const AuditLog = { showHyperlink: true, showCopy: true }, + { + name: 'operation', + label: 'Operation', + columnWidth: 120, + type: 'operation' + }, { name: 'changes', label: 'Changes', diff --git a/src/database/models/Job.js b/src/database/models/Job.js index e980e26..7127d2c 100644 --- a/src/database/models/Job.js +++ b/src/database/models/Job.js @@ -1,7 +1,6 @@ import JobIcon from '../../components/Icons/JobIcon' import InfoCircleIcon from '../../components/Icons/InfoCircleIcon' import ReloadIcon from '../../components/Icons/ReloadIcon' -import EditIcon from '../../components/Icons/EditIcon' export const Job = { name: 'job', @@ -22,13 +21,6 @@ export const Job = { label: 'Reload', icon: ReloadIcon, url: (_id) => `/dashboard/production/jobs/info?jobId=${_id}&action=reload` - }, - { - name: 'edit', - label: 'Edit', - row: true, - icon: EditIcon, - url: (_id) => `/dashboard/production/jobs/info?jobId=${_id}&action=edit` } ], columns: [ @@ -68,7 +60,7 @@ export const Job = { type: 'object', columnFixed: 'left', objectType: 'gcodeFile', - readOnly: true + required: true }, { name: 'gcodeFile._id', @@ -98,9 +90,10 @@ export const Job = { }, { name: 'printers', - label: 'Assigned Printers', - type: 'number', - readOnly: true + label: 'Printers', + type: 'objectList', + objectType: 'printer', + required: true } ] } diff --git a/src/database/models/Note.js b/src/database/models/Note.js index 4544c43..58f9405 100644 --- a/src/database/models/Note.js +++ b/src/database/models/Note.js @@ -16,5 +16,58 @@ export const Note = { url: (_id) => `/dashboard/management/notes/info?noteId=${_id}` } ], - url: () => `#` + properties: [ + { + name: '_id', + label: 'ID', + type: 'id', + objectType: 'note', + showCopy: true + }, + { + name: 'createdAt', + label: 'Created At', + type: 'dateTime', + readOnly: true + }, + { + name: 'noteType', + label: 'Note Type', + type: 'object', + objectType: 'noteType', + showHyperlink: true + }, + { + name: 'parent._id', + label: 'Parent ID', + type: 'id', + objectType: (objectData) => { + return objectData.parentType + }, + showHyperlink: true + }, + { + name: 'noteType._id', + label: 'Note Type ID', + type: 'id', + objectType: 'noteType' + }, + { + name: 'user._id', + label: 'User ID', + type: 'id', + objectType: 'user' + }, + { + name: 'content', + label: 'Content', + type: 'markdown' + }, + { + name: 'updatedAt', + label: 'Updated At', + type: 'dateTime', + readOnly: true + } + ] }