src/components/Dashboard/common/PropertyChanges.jsx

@@ -18,12 +18,11 @@ const PropertyChanges = ({ type, value }) => {
         const val = obj[key]
         const newKey = prefix ? `${prefix}.${key}` : key
 
-        // Keep model references and special value objects intact
+        // Don't flatten keys that are "state" or "netGross"
         if (
           val &&
           typeof val === 'object' &&
           !Array.isArray(val) &&
-          !Object.prototype.hasOwnProperty.call(val, '_id') &&
           key !== 'state' &&
           key !== 'netGross'
         ) {
@@ -42,9 +41,6 @@ const PropertyChanges = ({ type, value }) => {
     ...flatOld,
     ...flatNew
   }
-
-  console.log(combinedChanges)
-
   return (
     <Descriptions size='small' column={1}>
       {Object.keys(combinedChanges).map((key) => {

src/database/models/GCodeFile.js

@@ -131,14 +131,6 @@ export const GCodeFile = {
       readOnly: true,
       columnWidth: 180
     },
-    {
-      name: 'updatedAt',
-      label: 'Updated At',
-      type: 'dateTime',
-      value: null,
-      readOnly: true,
-      columnWidth: 175
-    },
     {
       name: 'name',
       label: 'Name',
@@ -148,6 +140,14 @@ export const GCodeFile = {
       required: true,
       columnWidth: 200
     },
+    {
+      name: 'updatedAt',
+      label: 'Updated At',
+      type: 'dateTime',
+      value: null,
+      readOnly: true,
+      columnWidth: 175
+    },
     {
       name: 'file',
       label: 'File',

src/database/models/Printer.js

@@ -228,13 +228,6 @@ export const Printer = {
       showCopy: true,
       columnWidth: 140
     },
-    {
-      name: 'createdAt',
-      label: 'Created At',
-      type: 'dateTime',
-      readOnly: true,
-      columnWidth: 175
-    },
     {
       name: '_reference',
       label: 'Reference',
@@ -246,8 +239,8 @@ export const Printer = {
       columnWidth: 180
     },
     {
-      name: 'updatedAt',
+      name: 'createdAt',
-      label: 'Updated At',
+      label: 'Created At',
       type: 'dateTime',
       readOnly: true,
       columnWidth: 175
@@ -260,15 +253,13 @@ export const Printer = {
       columnWidth: 200,
       columnFixed: 'left'
     },
-
     {
-      name: 'connectedAt',
+      name: 'updatedAt',
-      label: 'Connected At',
+      label: 'Updated At',
       type: 'dateTime',
       readOnly: true,
       columnWidth: 175
     },
-
     {
       name: 'state',
       label: 'Status',
@@ -278,6 +269,13 @@ export const Printer = {
       readOnly: true,
       columnWidth: 250
     },
+    {
+      name: 'connectedAt',
+      label: 'Connected At',
+      type: 'dateTime',
+      readOnly: true,
+      columnWidth: 175
+    },
     {
       name: 'online',
       label: 'Online',

src/database/models/SubJob.js

@@ -31,15 +31,7 @@ export const SubJob = {
       }
     }
   ],
-  columns: [
+  columns: ['_reference', 'printer', 'job', 'state', 'createdAt'],
-    '_reference',
-    'printer',
-    'job',
-    'state',
-    'startedAt',
-    'finishedAt',
-    'createdAt'
-  ],
   filters: ['state', '_id', 'job', 'printer'],
   sorters: ['createdAt', 'state'],
   group: ['job'],