assets/stylesheets/App.css

@@ -314,7 +314,3 @@ body {
 .ant-select-selection-item .ant-tag {
   margin-left: 1px !important;
 }
-
-.ant-badge.ant-badge-status {
-  line-height: 18.5px;
-}

src/components/Dashboard/Management/DocumentJobs/NewDocumentJob.jsx

@@ -68,14 +68,12 @@ const NewDocumentJob = ({ onOk, defaultValues = {} }) => {
             }
             onSubmit={async () => {
               const newDocumentJob = await handleSubmit()
-              await sendObjectAction(
+              if (newDocumentJob.sendToFile == true) {
-                newDocumentJob.documentPrinter._id,
+                sendObjectAction(newDocumentJob._id, 'documentJob', {
-                'documentPrinter',
+                  type: 'print',
-                {
-                  type: 'deploy',
                   data: newDocumentJob
-                }
+                })
-              )
+              }
               if (onOk) {
                 onOk()
               }

src/components/Dashboard/Management/Hosts/HostInfo.jsx

@@ -22,7 +22,6 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import HostOTP from './HostOtp.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import PrinterIcon from '../../../Icons/PrinterIcon.jsx'
-import DocumentPrinterIcon from '../../../Icons/DocumentPrinterIcon.jsx'
 
 const log = loglevel.getLogger('HostInfo')
 log.setLevel(config.logLevel)
@@ -35,7 +34,6 @@ const HostInfo = () => {
   const [collapseState, updateCollapseState] = useCollapseState('HostInfo', {
     info: true,
     printers: true,
-    documentPrinters: true,
     notes: true,
     auditLogs: true
   })
@@ -97,7 +95,6 @@ const HostInfo = () => {
                 items={[
                   { key: 'info', label: 'Host Information' },
                   { key: 'printers', label: 'Printers' },
-                  { key: 'documentPrinters', label: 'Document Printers' },
                   { key: 'notes', label: 'Notes' },
                   { key: 'auditLogs', label: 'Audit Logs' }
                 ]}
@@ -152,6 +149,7 @@ const HostInfo = () => {
                   style={{ height: '100%' }}
                   ref={objectFormRef}
                   onStateChange={(state) => {
+                    console.log('Got edit form state change', state)
                     setEditFormState((prev) => ({ ...prev, ...state }))
                   }}
                 >
@@ -190,28 +188,6 @@ const HostInfo = () => {
                 />
               )}
             </InfoCollapse>
-            <InfoCollapse
-              title='Document Printers'
-              icon={<DocumentPrinterIcon />}
-              active={collapseState.documentPrinters}
-              onToggle={(expanded) =>
-                updateCollapseState('documentPrinters', expanded)
-              }
-              collapseKey='documentPrinters'
-            >
-              {objectFormState.loading ? (
-                <InfoCollapsePlaceholder />
-              ) : (
-                <ObjectTable
-                  type='documentPrinter'
-                  masterFilter={{ 'host._id': hostId }}
-                  visibleColumns={{
-                    host: false,
-                    'host._id': false
-                  }}
-                />
-              )}
-            </InfoCollapse>
 
             <InfoCollapse
               title='Notes'

src/components/Dashboard/common/CustomSelect.jsx

@@ -1,56 +0,0 @@
-import { useEffect, useRef } from 'react'
-import { Select } from 'antd'
-import PropTypes from 'prop-types'
-
-const CustomSelect = ({
-  placeholder,
-  disabled,
-  options = [],
-  value,
-  onChange,
-  ...rest
-}) => {
-  const prevOptionsRef = useRef(options)
-
-  useEffect(() => {
-    // Check if options have changed
-    const optionsChanged =
-      JSON.stringify(prevOptionsRef.current) !== JSON.stringify(options)
-
-    if (optionsChanged && value !== undefined && value !== null) {
-      // Check if current value exists in new options
-      const valueExists =
-        Array.isArray(options) &&
-        options.some((option) => option.value === value)
-
-      // If value doesn't exist in new options, clear it
-      if (!valueExists && onChange) {
-        onChange(undefined)
-      }
-    }
-
-    // Update the ref with current options
-    prevOptionsRef.current = options
-  }, [options, value, onChange])
-
-  return (
-    <Select
-      placeholder={placeholder}
-      disabled={disabled}
-      options={Array.isArray(options) ? options : []}
-      value={value}
-      onChange={onChange}
-      {...rest}
-    />
-  )
-}
-
-CustomSelect.propTypes = {
-  placeholder: PropTypes.string,
-  disabled: PropTypes.bool,
-  options: PropTypes.array,
-  value: PropTypes.any,
-  onChange: PropTypes.func
-}
-
-export default CustomSelect

src/components/Dashboard/common/ObjectForm.jsx

@@ -30,15 +30,13 @@ import { getModelByName } from '../../../database/ObjectModels'
 const ObjectForm = forwardRef(
   ({ id, type, style, children, onEdit, onStateChange }, ref) => {
     const [objectData, setObjectData] = useState(null)
-    const serverObjectData = useRef(null)
+    const [serverObjectData, setServerObjectData] = useState(null)
-    const onStateChangeRef = useRef(onStateChange)
     const [fetchLoading, setFetchLoading] = useState(true)
     const [editLoading, setEditLoading] = useState(false)
     const [lock, setLock] = useState({})
     const [initialized, setInitialized] = useState(false)
     const [isEditing, setIsEditing] = useState(false)
     const [formValid, setFormValid] = useState(false)
-
     const [form] = Form.useForm()
     const formUpdateValues = Form.useWatch([], form)
     const [messageApi, contextHolder] = message.useMessage()
@@ -143,32 +141,26 @@ const ObjectForm = forwardRef(
     // Validate form on change (debounced to avoid heavy work on every keystroke)
     useEffect(() => {
       const timeoutId = setTimeout(() => {
-        const currentFormValues = form.getFieldsValue()
-        const mergedObjectData = {
-          ...serverObjectData.current,
-          ...currentFormValues
-        }
-
         form
           .validateFields({ validateOnly: true })
           .then(() => {
             setFormValid(true)
-            onStateChangeRef.current({
+            onStateChange({
               formValid: true,
-              objectData: mergedObjectData
+              objectData: { ...serverObjectData, ...form.getFieldsValue() }
             })
           })
           .catch(() => {
             setFormValid(false)
-            onStateChangeRef.current({
+            onStateChange({
               formValid: false,
-              objectData: mergedObjectData
+              objectData: { ...serverObjectData, ...form.getFieldsValue() }
             })
           })
       }, 150)
 
       return () => clearTimeout(timeoutId)
-    }, [form, formUpdateValues])
+    }, [form, formUpdateValues, onStateChange, serverObjectData])
 
     // Cleanup on unmount
     useEffect(() => {
@@ -193,13 +185,13 @@ const ObjectForm = forwardRef(
     const handleFetchObject = useCallback(async () => {
       try {
         setFetchLoading(true)
-        onStateChangeRef.current({ loading: true })
+        onStateChange({ loading: true })
         const data = await fetchObject(id, type)
         const lockEvent = await fetchObjectLock(id, type)
         setLock(lockEvent)
-        onStateChangeRef.current({ lock: lockEvent })
+        onStateChange({ lock: lockEvent })
         setObjectData(data)
-        serverObjectData.current = data
+        setServerObjectData(data)
 
         // Calculate and set computed values on initial load
         const computedValues = calculateComputedValues(data, model)
@@ -207,7 +199,7 @@ const ObjectForm = forwardRef(
 
         form.setFieldsValue(initialFormData)
         setFetchLoading(false)
-        onStateChangeRef.current({ loading: false })
+        onStateChange({ loading: false })
       } catch (err) {
         console.error(err)
         messageApi.error('Failed to fetch object info')
@@ -226,7 +218,7 @@ const ObjectForm = forwardRef(
     // Update event handler
     const updateLockEventHandler = useCallback((value) => {
       setLock((prev) => {
-        onStateChangeRef.current({ lock: { ...prev, ...value } })
+        onStateChange({ lock: { ...prev, ...value } })
         return { ...prev, ...value }
       })
     }, [])
@@ -268,31 +260,29 @@ const ObjectForm = forwardRef(
     // Debounce objectData updates sent to parent to limit re-renders
     useEffect(() => {
       const timeoutId = setTimeout(() => {
-        onStateChangeRef.current({ objectData })
+        onStateChange({ objectData })
       }, 150)
+
       return () => clearTimeout(timeoutId)
-    }, [objectData])
+    }, [objectData, onStateChange])
 
     const startEditing = () => {
       setIsEditing(true)
-      onStateChangeRef.current({ isEditing: true })
+      onStateChange({ isEditing: true })
       lockObject(id, type)
     }
 
     const cancelEditing = () => {
-      if (serverObjectData.current) {
+      if (serverObjectData) {
         // Recalculate computed values when canceling
-        const computedValues = calculateComputedValues(
+        const computedValues = calculateComputedValues(serverObjectData, model)
-          serverObjectData.current,
+        const resetFormData = { ...serverObjectData, ...computedValues }
-          model
-        )
-        const resetFormData = { ...serverObjectData.current, ...computedValues }
 
         form.setFieldsValue(resetFormData)
         setObjectData(resetFormData)
       }
       setIsEditing(false)
-      onStateChangeRef.current({ isEditing: false })
+      onStateChange({ isEditing: false })
       unlockObject(id, type)
     }
 
@@ -300,11 +290,11 @@ const ObjectForm = forwardRef(
       try {
         const value = await form.validateFields()
         setEditLoading(true)
-        onStateChangeRef.current({ editLoading: true })
+        onStateChange({ editLoading: true })
         await updateObject(id, type, value)
         setObjectData({ ...objectData, ...value })
         setIsEditing(false)
-        onStateChangeRef.current({ isEditing: false })
+        onStateChange({ isEditing: false })
         messageApi.success('Information updated successfully')
       } catch (err) {
         console.error(err)
@@ -319,7 +309,7 @@ const ObjectForm = forwardRef(
       } finally {
         handleFetchObject()
         setEditLoading(false)
-        onStateChangeRef.current({ editLoading: false })
+        onStateChange({ editLoading: false })
       }
     }
 

src/components/Dashboard/common/ObjectInfo.jsx

@@ -1,10 +1,8 @@
 import { Spin, Descriptions, Flex } from 'antd'
-import { useState, useEffect } from 'react'
 import { LoadingOutlined } from '@ant-design/icons'
 import PropTypes from 'prop-types'
 import ObjectProperty from './ObjectProperty'
 import { getModelProperties } from '../../../database/ObjectModels'
-import merge from 'lodash/merge'
 
 const ObjectInfo = ({
   loading = false,
@@ -29,12 +27,6 @@ const ObjectInfo = ({
 }) => {
   const allItems = getModelProperties(type)
 
-  const [combinedObjectData, setCombinedObjectData] = useState(objectData)
-
-  useEffect(() => {
-    setCombinedObjectData((prev) => merge({}, prev, objectData))
-  }, [objectData])
-
   // If properties array is empty, show all properties
   // Otherwise, filter and order by the properties array
   let items
@@ -90,8 +82,7 @@ const ObjectInfo = ({
           {...item}
           {...objectPropertyProps}
           isEditing={isEditing}
-          objectData={combinedObjectData}
+          objectData={objectData}
-          showSince={true}
         />
       ),
       span: item?.span || undefined

src/components/Dashboard/common/ObjectProperty.jsx

@@ -37,7 +37,6 @@ import ObjectDisplay from './ObjectDisplay'
 import ObjectTypeSelect from './ObjectTypeSelect'
 import ObjectTypeDisplay from './ObjectTypeDisplay'
 import CodeBlockEditor from './CodeBlockEditor'
-import CustomSelect from './CustomSelect'
 import StateDisplay from './StateDisplay'
 import AlertsDisplay from './AlertsDisplay'
 import FileUpload from './FileUpload'
@@ -85,7 +84,6 @@ const ObjectProperty = ({
   options = [],
   roundNumber = false,
   showHyperlink,
-  showSince,
   ...rest
 }) => {
   if (value && typeof value == 'function' && objectData) {
@@ -119,9 +117,6 @@ const ObjectProperty = ({
   if (masterFilter && typeof masterFilter == 'function' && objectData) {
     masterFilter = masterFilter(objectData)
   }
-  if (options && typeof options == 'function' && objectData) {
-    options = options(objectData)
-  }
 
   if (!value) {
     value = getPropertyValue(objectData, name)
@@ -174,9 +169,8 @@ const ObjectProperty = ({
               )
           }
         case 'select': {
-          if (options && Array.isArray(options)) {
+          const selectValue = options.find((option) => option.value === value)
-            const selectValue =
+          if (selectValue) {
-              options.find((option) => option.value === value) || 'n/a'
             return <Text {...textParams}>{selectValue.label}</Text>
           } else {
             return (
@@ -212,9 +206,7 @@ const ObjectProperty = ({
         }
         case 'dateTime': {
           if (value != null) {
-            return (
+            return <TimeDisplay dateTime={value} {...rest} />
-              <TimeDisplay dateTime={value} showSince={showSince} {...rest} />
-            )
           } else {
             return (
               <Text type='secondary' {...textParams}>
@@ -257,7 +249,7 @@ const ObjectProperty = ({
               )
             } else {
               var roundedValue = value
-              if (roundNumber != false && typeof value === 'number') {
+              if (roundNumber != false) {
                 roundedValue = value.toFixed(roundNumber)
               }
 
@@ -516,10 +508,7 @@ const ObjectProperty = ({
 
     // Editable mode: wrap in Form.Item
     // Merge required rule if needed
-    let mergedFormItemProps = {
+    let mergedFormItemProps = { ...formItemProps, style: { flexGrow: 1 } }
-      ...formItemProps,
-      style: { flexGrow: 1, width: '100%' }
-    }
     if (required && disabled == false) {
       let rules
       if (mergedFormItemProps.rules) {
@@ -586,10 +575,11 @@ const ObjectProperty = ({
       case 'select':
         return (
           <Form.Item name={formItemName} {...mergedFormItemProps}>
-            <CustomSelect
+            <Select
+              defaultValue={value}
               placeholder={'Select a ' + label.toLowerCase() + '...'}
               disabled={disabled}
-              options={Array.isArray(options) ? options : []}
+              options={options}
             />
           </Form.Item>
         )
@@ -814,8 +804,7 @@ ObjectProperty.propTypes = {
   previewOpen: PropTypes.bool,
   showPreview: PropTypes.bool,
   showHyperlink: PropTypes.bool,
-  options: PropTypes.array,
+  options: PropTypes.array
-  showSince: PropTypes.bool
 }
 
 export default ObjectProperty

src/components/Dashboard/common/StateDisplay.jsx

@@ -1,18 +1,9 @@
 // PrinterSelect.js
 import PropTypes from 'prop-types'
-import { Progress, Flex, Space, Modal, Button, Typography } from 'antd'
+import { Progress, Flex, Space } from 'antd'
 import StateTag from './StateTag'
-import InfoCircleIcon from '../../Icons/InfoCircleIcon'
-import { useState } from 'react'
 
-const { Text } = Typography
+const StateDisplay = ({ state, showProgress = true, showState = true }) => {
-
-const StateDisplay = ({
-  state,
-  showProgress = true,
-  showState = true,
-  showMessage = true
-}) => {
   const loadingProgressTypes = [
     'loading',
     'processing',
@@ -24,54 +15,33 @@ const StateDisplay = ({
     type: 'unknown',
     progress: 0
   }
-  const [showMessageModal, setShowMessageModal] = useState(false)
-  return (
-    <>
-      <Flex gap='small' align={'center'}>
-        {showState && (
-          <Space>
-            <StateTag state={currentState.type} />
-          </Space>
-        )}
-        {showProgress &&
-        loadingProgressTypes.includes(currentState.type) &&
-        currentState?.progress &&
-        currentState?.progress > 0 ? (
-          <Progress
-            percent={Math.round(currentState.progress * 100)}
-            status={currentState.type === 'used' ? '' : 'active'}
-            strokeColor={currentState.type === 'used' ? 'orange' : ''}
-            style={{ width: '150px', marginBottom: '2px' }}
-          />
-        ) : null}
 
-        {showMessage && currentState?.message && (
+  return (
-          <Button
+    <Flex gap='small' align={'center'}>
-            type='text'
+      {showState && (
-            size='small'
+        <Space>
-            style={{ padding: '4px' }}
+          <StateTag state={currentState.type} />
-            onClick={() => setShowMessageModal(true)}
+        </Space>
-          >
+      )}
-            <InfoCircleIcon />
+      {showProgress &&
-          </Button>
+      loadingProgressTypes.includes(currentState.type) &&
-        )}
+      currentState?.progress &&
-      </Flex>
+      currentState?.progress > 0 ? (
-      <Modal
+        <Progress
-        open={showMessageModal}
+          percent={Math.round(currentState.progress * 100)}
-        onCancel={() => setShowMessageModal(false)}
+          status={currentState.type === 'used' ? '' : 'active'}
-        footer={null}
+          strokeColor={currentState.type === 'used' ? 'orange' : ''}
-      >
+          style={{ width: '150px', marginBottom: '2px' }}
-        <Text>{currentState.message}</Text>
+        />
-      </Modal>
+      ) : null}
-    </>
+    </Flex>
   )
 }
 
 StateDisplay.propTypes = {
   state: PropTypes.object,
   showProgress: PropTypes.bool,
-  showState: PropTypes.bool,
+  showState: PropTypes.bool
-  showMessage: PropTypes.bool
 }
 
 export default StateDisplay

src/components/Dashboard/common/StateTag.jsx

@@ -32,14 +32,6 @@ const StateTag = ({ state, showBadge = true, style = {} }) => {
         status = 'warning'
         text = 'Initializing'
         break
-      case 'connecting':
-        status = 'warning'
-        text = 'Connecting'
-        break
-      case 'deploying':
-        status = 'warning'
-        text = 'Deploying'
-        break
       case 'printing':
         status = 'processing'
         text = 'Printing'

src/components/Dashboard/context/ApiServerContext.jsx

@@ -337,6 +337,8 @@ const ApiServerProvider = ({ children }) => {
         const callbacks = subscribedCallbacksRef.current
           .get(objectType)
           .filter((cb) => cb !== callback)
+        console.log('API: CALLBACKS', callbacks)
+
         if (callbacks.length === 0) {
           subscribedCallbacksRef.current.delete(objectType)
           socketRef.current.emit('unsubscribeObjectTypeUpdate', {

src/components/Dashboard/context/AuthContext.jsx

@@ -613,7 +613,7 @@ const AuthProvider = ({ children }) => {
           <Button
             key='submit'
             onClick={() => {
-              setShowAuthErrorModal(false)
+              showAuthErrorModal(false)
               loginWithSSO()
             }}
           >

src/components/Dashboard/context/SpotlightContext.jsx

@@ -14,8 +14,7 @@ import {
   useEffect,
   useState,
   useRef,
-  createElement,
+  createElement
-  useContext
 } from 'react'
 import axios from 'axios'
 import { LoadingOutlined } from '@ant-design/icons'
@@ -30,8 +29,6 @@ import {
   getModelByPrefix
 } from '../../../database/ObjectModels'
 import InfoCircleIcon from '../../Icons/InfoCircleIcon'
-import { ApiServerContext } from './ApiServerContext'
-import { AuthContext } from './AuthContext'
 
 const SpotlightContext = createContext()
 
@@ -44,8 +41,6 @@ const SpotlightProvider = ({ children }) => {
   const [listData, setListData] = useState([])
   const [messageApi, contextHolder] = message.useMessage()
   const [inputPrefix, setInputPrefix] = useState({ prefix: '', mode: null })
-  const { fetchSpotlightData } = useContext(ApiServerContext)
-  const { token } = useContext(AuthContext)
 
   // Refs for throttling/debouncing
   const lastFetchTime = useRef(0)
@@ -121,7 +116,7 @@ const SpotlightProvider = ({ children }) => {
       setLoading(true)
       setListData([])
 
-      let data
+      let response
 
       // Check if we have a prefix with ? mode (filter mode)
       if (inputPrefix && inputPrefix.mode === '?') {
@@ -133,34 +128,37 @@ const SpotlightProvider = ({ children }) => {
         // Parse the query parameters
         const params = new URLSearchParams(queryParams)
 
-        // For ? mode, use axios directly with query params
+        response = await axios.get(`${config.backendUrl}/spotlight/${prefix}`, {
-        const response = await axios.get(
+          params: params,
-          `${config.backendUrl}/spotlight/${prefix}`,
+          headers: {
+            Accept: 'application/json'
+          },
+          withCredentials: true
+        })
+      } else {
+        // For other modes (:, ^), use the original behavior
+        response = await axios.get(
+          `${config.backendUrl}/spotlight/${encodeURIComponent(searchQuery.trim())}`,
           {
-            params: params,
             headers: {
-              Accept: 'application/json',
+              Accept: 'application/json'
-              Authorization: `Bearer ${token}`
+            },
-            }
+            withCredentials: true
           }
         )
-        data = response.data
-      } else {
-        // For other modes (:, ^), use fetchSpotlightData from ApiServerContext
-        data = await fetchSpotlightData(searchQuery.trim())
       }
 
       setLoading(false)
       // If the query contains a prefix mode character, and the response is an object, wrap it in an array
       if (
         /[:?^]/.test(searchQuery) &&
-        data &&
+        response.data &&
-        !Array.isArray(data) &&
+        !Array.isArray(response.data) &&
-        typeof data === 'object'
+        typeof response.data === 'object'
       ) {
-        setListData([data])
+        setListData([response.data])
       } else {
-        setListData(data)
+        setListData(response.data)
       }
 
       // Check if there's a pending query after this fetch completes
@@ -466,22 +464,11 @@ const SpotlightProvider = ({ children }) => {
                         align='center'
                         justify='space-between'
                       >
-                        <Flex
+                        <Flex gap={'small'} align='center'>
-                          gap={'small'}
-                          align='center'
-                          style={{ flexGrow: 1 }}
-                        >
                           {Icon ? <Icon style={{ fontSize: '20px' }} /> : null}
 
                           {item.name ? (
-                            <Text
+                            <Text ellipsis style={{ maxWidth: 170 }}>
-                              ellipsis
-                              style={{
-                                maxWidth: 170,
-                                flexGrow: 1,
-                                width: '100%'
-                              }}
-                            >
                               {item.name}
                             </Text>
                           ) : null}

src/components/Dashboard/context/ThemeContext.jsx

@@ -90,7 +90,7 @@ export const ThemeProvider = ({ children }) => {
       colorWarning: '#FF9F0A',
       colorInfo: '#0A84FF',
       colorLink: '#5AC8F5',
-      borderRadius: '12px'
+      borderRadius: '10px'
     },
     components: {
       Layout: {

src/database/models/DocumentJob.js

@@ -36,9 +36,9 @@ export const DocumentJob = {
         `/dashboard/management/documentjobs/info?documentJobId=${_id}&action=edit`
     }
   ],
-  columns: ['name', '_id', 'state', 'createdAt', 'updatedAt'],
+  columns: ['name', '_id', 'width', 'height', 'createdAt', 'updatedAt'],
-  filters: ['name', '_id', 'state'],
+  filters: ['name', '_id', 'width', 'height'],
-  sorters: ['name', 'state', 'createdAt', 'updatedAt'],
+  sorters: ['name', 'width', 'height', 'createdAt', 'updatedAt'],
   properties: [
     {
       name: '_id',

src/database/models/DocumentPrinter.js

@@ -38,15 +38,13 @@ export const DocumentPrinter = {
   columns: [
     'name',
     '_id',
-    'state',
+    'documentSize',
-    'host',
+    'documentSize._id',
-    'host._id',
+    'createdAt',
-    'tags',
-    'connectedAt',
     'updatedAt'
   ],
   filters: ['name', '_id'],
-  sorters: ['name', 'documentSize', 'connectedAt', 'updatedAt'],
+  sorters: ['name', 'documentSize', 'createdAt', 'updatedAt'],
   properties: [
     {
       name: '_id',
@@ -84,10 +82,10 @@ export const DocumentPrinter = {
       readOnly: true
     },
     {
-      name: 'connectedAt',
+      name: 'active',
-      label: 'Connected At',
+      label: 'Active',
-      type: 'dateTime',
+      type: 'bool',
-      readOnly: true
+      required: true
     },
     {
       name: 'online',
@@ -95,12 +93,6 @@ export const DocumentPrinter = {
       type: 'bool',
       readOnly: true
     },
-    {
-      name: 'active',
-      label: 'Active',
-      type: 'bool',
-      required: true
-    },
     {
       name: 'host',
       label: 'Host',
@@ -117,6 +109,16 @@ export const DocumentPrinter = {
       showCopy: true,
       showHyperlink: true
     },
+    {
+      name: 'connection.mode',
+      label: 'Mode',
+      type: 'select',
+      options: [
+        { label: 'Network', value: 'network' },
+        { label: 'Serial', value: 'serial' }
+      ],
+      required: true
+    },
     {
       name: 'connection.interface',
       label: 'Interface',
@@ -128,43 +130,12 @@ export const DocumentPrinter = {
       ],
       required: true
     },
-    {
-      name: 'connection.protocol',
-      label: 'Protocol',
-      type: 'select',
-      options: (objectData) => {
-        if (objectData?.connection?.interface == 'cups') {
-          return [
-            { label: 'IPP', value: 'ipp' },
-            { label: 'HTTP', value: 'http' }
-          ]
-        }
-        return [
-          { label: 'TCP', value: 'tcp' },
-          { label: 'Serial', value: 'serial' },
-          { label: 'System', value: 'system' }
-        ]
-      },
-      required: true
-    },
     {
       name: 'connection.host',
-      label: 'Host Name',
+      label: 'Connection String',
       type: 'text',
       required: true
     },
-    {
-      name: 'connection.port',
-      label: 'Port',
-      type: 'number',
-      required: false,
-      disabled: (objectData) => {
-        return (
-          objectData?.connection?.protocol == 'system' ||
-          objectData?.connection?.protocol == 'serial'
-        )
-      }
-    },
     {
       name: 'currentDocumentSize',
       label: 'Current Document Size',

src/database/models/DocumentSize.js

@@ -35,24 +35,9 @@ export const DocumentSize = {
         `/dashboard/management/documentsizes/info?documentSizeId=${_id}&action=edit`
     }
   ],
-  columns: [
+  columns: ['name', '_id', 'width', 'height', 'createdAt', 'updatedAt'],
-    'name',
+  filters: ['name', '_id', 'width', 'height'],
-    '_id',
+  sorters: ['name', 'width', 'height', 'createdAt', 'updatedAt'],
-    'width',
-    'height',
-    'infiniteHeight',
-    'createdAt',
-    'updatedAt'
-  ],
-  filters: ['name', '_id', 'width', 'height', 'infiniteHeight'],
-  sorters: [
-    'name',
-    'width',
-    'height',
-    'infiniteHeight',
-    'createdAt',
-    'updatedAt'
-  ],
   properties: [
     {
       name: '_id',
@@ -95,17 +80,7 @@ export const DocumentSize = {
       required: true,
       columnWidth: 150,
       type: 'number',
-      suffix: 'mm',
+      suffix: 'mm'
-      disabled: (objectData) => {
-        return objectData.infiniteHeight
-      }
-    },
-    {
-      name: 'infiniteHeight',
-      label: 'Infinite Height',
-      required: true,
-      columnWidth: 150,
-      type: 'bool'
     }
   ]
 }

src/database/models/File.js

@@ -96,7 +96,6 @@ export const File = {
       label: 'Size',
       type: 'number',
       readOnly: true,
-      roundNumber: 2,
       required: true,
       suffix: (objectData) => {
         const size = objectData?.size || 0

src/database/models/Printer.js

@@ -167,16 +167,7 @@ export const Printer = {
       ]
     }
   ],
-  columns: [
+  columns: ['name', '_id', 'state', 'tags', 'connectedAt'],
-    'name',
-    '_id',
-    'state',
-    'host',
-    'host._id',
-    'tags',
-    'connectedAt',
-    'updatedAt'
-  ],
   filters: ['name', '_id', 'state', 'tags'],
   sorters: ['name', 'state', 'connectedAt'],
   group: ['tags'],
@@ -189,8 +180,8 @@ export const Printer = {
       showCopy: true
     },
     {
-      name: 'createdAt',
+      name: 'connectedAt',
-      label: 'Created At',
+      label: 'Connected At',
       type: 'dateTime',
       readOnly: true
     },
@@ -202,12 +193,6 @@ export const Printer = {
       columnWidth: 200,
       columnFixed: 'left'
     },
-    {
-      name: 'updatedAt',
-      label: 'Updated At',
-      type: 'dateTime',
-      readOnly: true
-    },
     {
       name: 'state',
       label: 'Status',
@@ -217,10 +202,10 @@ export const Printer = {
       readOnly: true
     },
     {
-      name: 'connectedAt',
+      name: 'active',
-      label: 'Connected At',
+      label: 'Active',
-      type: 'dateTime',
+      type: 'bool',
-      readOnly: true
+      required: true
     },
     {
       name: 'online',
@@ -228,12 +213,6 @@ export const Printer = {
       type: 'bool',
       readOnly: true
     },
-    {
-      name: 'active',
-      label: 'Active',
-      type: 'bool',
-      required: true
-    },
     {
       name: 'vendor',
       label: 'Vendor',